From a641ae497d209c56aacc2e6ab19fdedf653a544a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= <galder@redhat.com>
Date: Mon, 19 Oct 2020 10:02:52 +0200
Subject: [PATCH 001/681] Output call tree analysis as CSV for use in graph
 database

* Methods and virtual methods are represented with graph nodes.
* Direct, virtual and overriden-by relationships have been mapped.
* Bytecode indexes are part of the relationships.
* A method can interact with others multiple times,
with each bytecode index indicating the origin of the call
with the origin method.
---
 docs/reference-manual/native-image/Reports.md |  13 +
 .../pointsto/reports/CallTreePrinter.java     | 278 ++++++++++++++++++
 2 files changed, 291 insertions(+)

diff --git a/docs/reference-manual/native-image/Reports.md b/docs/reference-manual/native-image/Reports.md
index ee2e5e8dca11..d0aee5feae2b 100644
--- a/docs/reference-manual/native-image/Reports.md
+++ b/docs/reference-manual/native-image/Reports.md
@@ -151,3 +151,16 @@ The call tree report name has the structure `call_tree_<image_name>_<date_time>.
 The object tree report name has the structure: `object_tree_<image_name>_<date_time>.txt`.
 The image name is the name of the generated image, which can be set with the `-H:Name=<name>` option.
 The `<date_time>` is in the `yyyyMMdd_HHmmss` format.
+
+#### CSV files
+
+The reports include a number of CSV files containing raw data for methods and their relationships.
+The aim of these files is to make it enable this raw data to be easily imported into graph databases.
+Graph databases can provide the following functionality:
+
+* Sophisticated graphical visualization of the call tree graph that provide a different perspective compared to text-based formats.
+* Ability to execute complex queries that can for example show a subset of the tree that causes certain code path to be included in the call tree analysis.
+This querying functionality is crucial in making big analysis call trees manageable.
+
+The process to import the files into graph databases is specific to each database.
+Please follow the instructions provided by the graph database providers to find out how to import them.
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
index 1ee89f84013f..a4b3a12e2648 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
@@ -35,24 +35,36 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.flow.InvokeTypeFlow;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 
 import jdk.vm.ci.code.BytecodePosition;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 public final class CallTreePrinter {
 
+    public static final Pattern CAMEL_CASE_PATTERN = Pattern.compile(
+                    "\\b[a-zA-Z]|[A-Z]|\\.");
+
     public static void print(BigBang bb, String reportsPath, String reportName) {
         CallTreePrinter printer = new CallTreePrinter(bb);
         printer.buildCallTree();
@@ -65,6 +77,8 @@ public static void print(BigBang bb, String reportsPath, String reportName) {
                         writer -> printer.printClasses(writer, false));
         ReportUtils.report("list of used packages", reportsPath, "used_packages_" + reportName, "txt",
                         writer -> printer.printClasses(writer, true));
+
+        printCsvFiles(printer.methodToNode, reportsPath, reportName);
     }
 
     interface Node {
@@ -299,4 +313,268 @@ private static String packagePrefix(String name) {
         }
         return name.substring(0, lastDot);
     }
+
+    private static void printCsvFiles(Map<AnalysisMethod, MethodNode> methodToNode, String reportsPath, String reportName) {
+        // Set virtual node at next available method id
+        final AtomicInteger virtualNodeId = new AtomicInteger(MethodNode.methodId);
+
+        Set<Integer> entryPointIds = new HashSet<>();
+        Set<MethodNode> nonVirtualNodes = new HashSet<>();
+        Map<List<String>, Integer> virtualNodes = new HashMap<>();
+
+        Map<Integer, Set<BciEndEdge>> directEdges = new HashMap<>();
+        Map<Integer, Set<BciEndEdge>> virtualEdges = new HashMap<>();
+        Map<Integer, Set<Integer>> overridenByEdges = new HashMap<>();
+
+        final Iterator<MethodNode> iterator = methodToNode.values().stream().filter(n -> n.isEntryPoint).iterator();
+        while (iterator.hasNext()) {
+            final MethodNode node = iterator.next();
+            entryPointIds.add(node.id);
+            walkNodes(node, directEdges, virtualEdges, overridenByEdges, virtualNodes, nonVirtualNodes, virtualNodeId);
+        }
+
+        ReportUtils.report("call tree for vm entry point", reportsPath, "csv_call_tree_vm_" + reportName, "csv",
+                        CallTreePrinter::printVMEntryPoint);
+
+        ReportUtils.report("call tree for methods", reportsPath, "csv_call_tree_methods_" + reportName, "csv",
+                        writer -> printMethodNodes(methodToNode.values(), writer));
+
+        ReportUtils.report("call tree for virtual methods", reportsPath, "csv_call_tree_virtual_methods_" + reportName, "csv",
+                        writer -> printVirtualNodes(virtualNodes, writer));
+
+        ReportUtils.report("call tree for entry points", reportsPath, "csv_call_tree_entry_points_" + reportName, "csv",
+                        writer -> printEntryPointIds(entryPointIds, writer));
+
+        ReportUtils.report("call tree for direct edges", reportsPath, "csv_call_tree_direct_edges_" + reportName, "csv",
+                        writer -> printBciEdges(directEdges, writer));
+
+        ReportUtils.report("call tree for overriden by edges", reportsPath, "csv_call_tree_override_by_edges_" + reportName, "csv",
+                        writer -> printNonBciEdges(overridenByEdges, writer));
+
+        ReportUtils.report("call tree for virtual edges", reportsPath, "csv_call_tree_virtual_edges_" + reportName, "csv",
+                        writer -> printBciEdges(virtualEdges, writer));
+    }
+
+    private static void printVMEntryPoint(PrintWriter writer) {
+        writer.println(convertToCSV("Id", "Name"));
+        writer.println(convertToCSV("0", "VM"));
+    }
+
+    private static void printMethodNodes(Collection<MethodNode> methods, PrintWriter writer) {
+        writer.println(convertToCSV("Id", "Name", "Type", "Parameters", "Return", "Display"));
+        methods.stream()
+                        .map(CallTreePrinter::methodNodeInfo)
+                        .map(CallTreePrinter::convertToCSV)
+                        .forEach(writer::println);
+    }
+
+    private static List<String> methodNodeInfo(MethodNode method) {
+        return resolvedJavaMethodInfo(method.id, method.method);
+    }
+
+    private static void walkNodes(MethodNode methodNode, Map<Integer, Set<BciEndEdge>> directEdges, Map<Integer, Set<BciEndEdge>> virtualEdges, Map<Integer, Set<Integer>> overridenByEdges,
+                    Map<List<String>, Integer> virtualNodes, Set<MethodNode> nonVirtualNodes, AtomicInteger virtualNodeId) {
+        for (InvokeNode invoke : methodNode.invokes) {
+            if (invoke.isDirectInvoke) {
+                if (invoke.callees.size() > 0) {
+                    Node calleeNode = invoke.callees.get(0);
+                    addDirectEdge(methodNode.id, invoke, calleeNode, directEdges, nonVirtualNodes);
+                    if (calleeNode instanceof MethodNode) {
+                        walkNodes((MethodNode) calleeNode, directEdges, virtualEdges, overridenByEdges, virtualNodes, nonVirtualNodes, virtualNodeId);
+                    }
+                }
+            } else {
+                final int nodeId = addVirtualNode(invoke, virtualNodes, virtualNodeId);
+                addVirtualMethodEdge(methodNode.id, invoke, nodeId, virtualEdges);
+                for (Node calleeNode : invoke.callees) {
+                    addOverridenByEdge(nodeId, calleeNode, overridenByEdges, nonVirtualNodes);
+                    if (calleeNode instanceof MethodNode) {
+                        walkNodes((MethodNode) calleeNode, directEdges, virtualEdges, overridenByEdges, virtualNodes, nonVirtualNodes, virtualNodeId);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void addDirectEdge(int nodeId, InvokeNode invoke, Node calleeNode, Map<Integer, Set<BciEndEdge>> edges, Set<MethodNode> nodes) {
+        Set<BciEndEdge> nodeEdges = edges.computeIfAbsent(nodeId, k -> new HashSet<>());
+        MethodNode methodNode = calleeNode instanceof MethodNode
+                        ? (MethodNode) calleeNode
+                        : ((MethodNodeReference) calleeNode).methodNode;
+        nodes.add(methodNode);
+        nodeEdges.add(new BciEndEdge(methodNode.id, bytecodeIndexes(invoke)));
+    }
+
+    private static List<Integer> bytecodeIndexes(InvokeNode node) {
+        return Stream.of(node.sourceReferences)
+                        .map(source -> source.bci)
+                        .collect(Collectors.toList());
+    }
+
+    private static int addVirtualNode(InvokeNode node, Map<List<String>, Integer> virtualNodes, AtomicInteger virtualNodeId) {
+        final List<String> virtualMethodInfo = virtualMethodInfo(node.targetMethod);
+        return virtualNodes.computeIfAbsent(virtualMethodInfo, k -> virtualNodeId.getAndIncrement());
+    }
+
+    private static void addVirtualMethodEdge(int startId, InvokeNode invoke, int endId, Map<Integer, Set<BciEndEdge>> edges) {
+        Set<BciEndEdge> nodeEdges = edges.computeIfAbsent(startId, k -> new HashSet<>());
+        nodeEdges.add(new BciEndEdge(endId, bytecodeIndexes(invoke)));
+    }
+
+    private static void printVirtualNodes(Map<List<String>, Integer> virtualNodes, PrintWriter writer) {
+        writer.println(convertToCSV("Id", "Name", "Type", "Parameters", "Return", "Display"));
+        virtualNodes.entrySet().stream()
+                        .map(CallTreePrinter::virtualMethodAndIdInfo)
+                        .map(CallTreePrinter::convertToCSV)
+                        .forEach(writer::println);
+    }
+
+    private static List<String> virtualMethodAndIdInfo(Map.Entry<List<String>, Integer> entry) {
+        final List<String> methodInfo = entry.getKey();
+        final List<String> result = new ArrayList<>(methodInfo.size() + 1);
+        result.add(String.valueOf(entry.getValue()));
+        for (int i = 1; i < methodInfo.size(); i++) {
+            result.add(i, methodInfo.get(i));
+        }
+        return result;
+    }
+
+    private static void printEntryPointIds(Set<Integer> entryPoints, PrintWriter writer) {
+        writer.println(convertToCSV("Id"));
+        entryPoints.forEach(writer::println);
+    }
+
+    private static void addOverridenByEdge(int nodeId, Node calleeNode, Map<Integer, Set<Integer>> edges, Set<MethodNode> nodes) {
+        Set<Integer> nodeEdges = edges.computeIfAbsent(nodeId, k -> new HashSet<>());
+        MethodNode methodNode = calleeNode instanceof MethodNode
+                        ? (MethodNode) calleeNode
+                        : ((MethodNodeReference) calleeNode).methodNode;
+        nodes.add(methodNode);
+        nodeEdges.add(methodNode.id);
+    }
+
+    private static void printBciEdges(Map<Integer, Set<BciEndEdge>> edges, PrintWriter writer) {
+        final Set<BciEdge> idEdges = edges.entrySet().stream()
+                        .flatMap(entry -> entry.getValue().stream().map(endId -> new BciEdge(entry.getKey(), endId)))
+                        .collect(Collectors.toSet());
+
+        writer.println(convertToCSV("StartId", "EndId", "BytecodeIndexes"));
+        idEdges.stream()
+                        .map(edge -> convertToCSV(String.valueOf(edge.startId), String.valueOf(edge.endEdge.id), showBytecodeIndexes(edge.endEdge.bytecodeIndexes)))
+                        .forEach(writer::println);
+    }
+
+    private static String showBytecodeIndexes(List<Integer> bytecodeIndexes) {
+        return bytecodeIndexes.stream()
+                        .map(String::valueOf)
+                        .collect(Collectors.joining("->"));
+    }
+
+    private static void printNonBciEdges(Map<Integer, Set<Integer>> edges, PrintWriter writer) {
+        final Set<NonBciEdge> idEdges = edges.entrySet().stream()
+                        .flatMap(entry -> entry.getValue().stream().map(endId -> new NonBciEdge(entry.getKey(), endId)))
+                        .collect(Collectors.toSet());
+
+        writer.println(convertToCSV("StartId", "EndId"));
+        idEdges.stream()
+                        .map(edge -> convertToCSV(String.valueOf(edge.startId), String.valueOf(edge.endId)))
+                        .forEach(writer::println);
+    }
+
+    private static List<String> virtualMethodInfo(AnalysisMethod method) {
+        return resolvedJavaMethodInfo(null, method);
+    }
+
+    private static List<String> resolvedJavaMethodInfo(Integer id, ResolvedJavaMethod method) {
+        // TODO method parameter types are opaque, but could in the future be split out and link
+        // together
+        // e.g. each method could BELONG to a type, and a method could have PARAMETER relationships
+        // with N types
+        // see https://neo4j.com/developer/guide-import-csv/#_converting_data_values_with_load_csv
+        // for examples
+        final String parameters = method.getSignature().getParameterCount(false) > 0
+                        ? method.format("%P").replace(",", "")
+                        : "empty";
+
+        return Arrays.asList(
+                        id == null ? null : Integer.toString(id),
+                        method.getName(),
+                        method.getDeclaringClass().toJavaName(true),
+                        parameters,
+                        method.getSignature().getReturnType(null).toJavaName(true),
+                        display(method));
+    }
+
+    private static String display(ResolvedJavaMethod method) {
+        final ResolvedJavaType type = method.getDeclaringClass();
+        final String typeName = type.toJavaName(true);
+        if (type.getJavaKind() == JavaKind.Object) {
+            List<String> matchResults = new ArrayList<>();
+            Matcher matcher = CAMEL_CASE_PATTERN.matcher(typeName);
+            while (matcher.find()) {
+                matchResults.add(matcher.toMatchResult().group());
+            }
+
+            return String.join("", matchResults) + "." + method.getName();
+        }
+
+        return typeName + "." + method.getName();
+    }
+
+    private static String convertToCSV(String... data) {
+        return String.join(",", data);
+    }
+
+    private static String convertToCSV(List<String> data) {
+        return String.join(",", data);
+    }
+
+    private static final class NonBciEdge {
+
+        final int startId;
+        final int endId;
+
+        private NonBciEdge(int startId, int endId) {
+            this.startId = startId;
+            this.endId = endId;
+        }
+    }
+
+    private static final class BciEdge {
+        final int startId;
+        final BciEndEdge endEdge;
+
+        private BciEdge(int startId, BciEndEdge endEdge) {
+            this.startId = startId;
+            this.endEdge = endEdge;
+        }
+    }
+
+    private static final class BciEndEdge {
+        final int id;
+        final List<Integer> bytecodeIndexes;
+
+        private BciEndEdge(int id, List<Integer> bytecodeIndexes) {
+            this.id = id;
+            this.bytecodeIndexes = bytecodeIndexes;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            BciEndEdge endEdge = (BciEndEdge) o;
+            return id == endEdge.id &&
+                            bytecodeIndexes.equals(endEdge.bytecodeIndexes);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, bytecodeIndexes);
+        }
+    }
 }

From 46c20551d46966ea4fab7d7bf64fb0f1ae8c4969 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 26 Aug 2021 18:34:33 +0200
Subject: [PATCH 002/681] Add x82 configuration

---
 bench-common.libsonnet | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bench-common.libsonnet b/bench-common.libsonnet
index f6760bd80fe2..92adc49ec58d 100644
--- a/bench-common.libsonnet
+++ b/bench-common.libsonnet
@@ -49,6 +49,13 @@
       default_numa_node:: 0,
       num_threads:: 72
     },
+    x82:: common.linux + common.amd64 + self._bench_machine + {
+      machine_name:: "x82",
+      capabilities+: ["no_frequency_scaling", "tmpfs25g"],
+      numa_nodes:: [0, 1],
+      default_numa_node:: 0,
+      num_threads:: 96
+    },
     xgene3:: common.linux + common.aarch64 + self._bench_machine + {
       machine_name:: "xgene3",
       capabilities+: [],

From d62e5c10e4c54ce4d07580f8692276fed19f6589 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 26 Aug 2021 18:56:40 +0200
Subject: [PATCH 003/681] Rework math stub gate definition

---
 compiler/ci_includes/gate.jsonnet | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/compiler/ci_includes/gate.jsonnet b/compiler/ci_includes/gate.jsonnet
index e9ada1369f48..7731c1689ccb 100644
--- a/compiler/ci_includes/gate.jsonnet
+++ b/compiler/ci_includes/gate.jsonnet
@@ -1,10 +1,11 @@
 {
-  local common = (import '../../common.jsonnet'),
+  local common = import '../../common.jsonnet',
+  local utils = import '../../common-utils.libsonnet',
   local config = import '../../repo-configuration.libsonnet',
   local linux_amd64 = common["linux-amd64"],
 
-  local gateMathStubsListener = common.daily + linux_amd64 + common.oraclejdk8 + {
-    name: 'daily-hotspot-mathstubs-listener',
+  local gate_math_stubs_listener = {
+    name: 'daily-hotspot-mathstubs-listener-' + utils.prefixed_jdk(self.jdk_version),
     environment+: {
       "HOTSPOT_PORT_SYNC_CHECK" : "true"
     },
@@ -14,12 +15,10 @@
     run+: [
       ["mx", "build"]
     ],
-    notify_emails: [
-      "yudi.zheng@oracle.com"
-    ],
+     notify_groups:: ["compiler_stubs"],
   },
 
   builds: [
-    gateMathStubsListener,
+    common.daily + linux_amd64 + common.oraclejdk8 + gate_math_stubs_listener,
   ]
 }

From 7acefc4a5a8ccaf3dbd2e9c0c0bc8cfaf85f23dd Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Mon, 30 Aug 2021 11:47:44 +0200
Subject: [PATCH 004/681] Migrate javadoc publisher builder to jsonnet

---
 ci.hocon                            |  3 --
 ci.jsonnet                          | 11 +++++-
 ci_includes/publish-javadoc.hocon   | 44 ------------------------
 ci_includes/publish-javadoc.jsonnet | 52 +++++++++++++++++++++++++++++
 compiler/ci_includes/gate.jsonnet   |  3 +-
 5 files changed, 64 insertions(+), 49 deletions(-)
 delete mode 100644 ci_includes/publish-javadoc.hocon
 create mode 100644 ci_includes/publish-javadoc.jsonnet

diff --git a/ci.hocon b/ci.hocon
index 667507ef4749..ccd3bbeb9ed8 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -54,9 +54,6 @@ include "compiler/ci_includes/bench-aarch64-c2.hocon"
 # ------------------ SVM ----------------------
 include "substratevm/ci_includes/gate.hocon"
 
-# Publish Javadoc
-include "ci_includes/publish-javadoc.hocon"
-
 # ------------------- VM ----------------------
 include "vm/ci_common/common.hocon"
 include "vm/ci_common/common-bench.hocon"
diff --git a/ci.jsonnet b/ci.jsonnet
index 3e95ac872dc0..c551f8554803 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -10,6 +10,9 @@ local espresso = import 'espresso/ci.jsonnet';
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
 
+# JavaDoc
+local javadoc = import "ci_includes/publish-javadoc.jsonnet";
+
 # Add a guard to `build` that prevents it from running in the gate
 # for a PR that only touches *.md flles.
 local add_markdown_guard(build) = build + {
@@ -23,5 +26,11 @@ local add_markdown_guard(build) = build + {
   _checkCommon: (import 'common.jsonnet'),
   ci_resources:: (import 'ci-resources.libsonnet'),
   specVersion: "2",
-  builds: [add_markdown_guard(b) for b in (compiler.builds + wasm.builds + espresso.builds + sulong.builds)]
+  builds: [add_markdown_guard(b) for b in (
+    compiler.builds +
+    wasm.builds +
+    espresso.builds +
+    sulong.builds +
+    javadoc.builds
+  )]
 }
diff --git a/ci_includes/publish-javadoc.hocon b/ci_includes/publish-javadoc.hocon
deleted file mode 100644
index 8b9ae71c1e87..000000000000
--- a/ci_includes/publish-javadoc.hocon
+++ /dev/null
@@ -1,44 +0,0 @@
-# Publish Javadoc of graal components post-merge
-
-builds += [
-  ${linux-amd64} ${oraclejdk8} {
-    timelimit : "30:00",
-    run : [
-        [cd, "./sdk"],
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        [cd, "../truffle"],
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        [cd, "../tools"],
-        ["mx", "build"],
-        ["mx", "javadoc"],
-        ["zip", "-r", "javadoc.zip", "javadoc"],
-        [cd, "../compiler"],
-        ["mx", "build"],
-        ["mx", "javadoc", "--projects", "org.graalvm.graphio"],
-        ["cd", "src/org.graalvm.graphio/"],
-        ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
-        [cd, "../../.."],
-        [set-export, GRAAL_REPO, [pwd]],
-        [cd, ".."]
-        ["git", "clone", [mx, urlrewrite, "https://github.com/graalvm/graalvm-website.git"]],
-        [cd, "graalvm-website"]
-        ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
-        ["git", "status" ],
-        ["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"],
-        ["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"],
-        ["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"],
-        ["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
-        ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
-        ["git", "config", "user.name", "Javadoc Publisher"],
-        ["git", "config", "user.email", "graal-dev@openjdk.java.net"],
-        ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ] ],
-        ["git", "push", "origin", "HEAD"],
-    ],
-    targets : [post-merge],
-    name: "graal-publish-javadoc"
-  }
-]
diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet
new file mode 100644
index 000000000000..cdb68e132b8e
--- /dev/null
+++ b/ci_includes/publish-javadoc.jsonnet
@@ -0,0 +1,52 @@
+{
+  local common = import '../common.jsonnet',
+  local utils = import '../common-utils.libsonnet',
+  local linux_amd64 = common["linux-amd64"],
+
+  local javadoc_publisher = {
+    name: 'graal-publish-javadoc-' + utils.prefixed_jdk(self.jdk_version),
+    run+: [
+      ["cd", "./sdk"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../truffle"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../tools"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../compiler"],
+      ["mx", "build"],
+      ["mx", "javadoc", "--projects", "org.graalvm.graphio"],
+      ["cd", "src/org.graalvm.graphio/"],
+      ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
+      ["cd", "../../.."],
+      ["set-export", "GRAAL_REPO", ["pwd"]],
+      ["cd", ".."],
+      ["git", "clone", ["mx", "urlrewrite", "https://github.com/graalvm/graalvm-website.git"]],
+      ["cd", "graalvm-website"],
+      ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "status" ],
+      ["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"],
+      ["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"],
+      ["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"],
+      ["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
+      ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "config", "user.name", "Javadoc Publisher"],
+      ["git", "config", "user.email", "graal-dev@openjdk.java.net"],
+      ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", ["echo", "Javadoc as of", ["date", "+%Y/%m/%d"]]],
+      ["git", "push", "origin", "HEAD"]
+    ],
+     notify_groups:: ["javadoc"],
+     timelimit : "30:00"
+  },
+
+  local all_builds = [
+    common.post_merge + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
+  ],
+  // adds a "defined_in" field to all builds mentioning the location of this current file
+  builds:: [{ defined_in: std.thisFile } + b for b in all_builds]
+}
diff --git a/compiler/ci_includes/gate.jsonnet b/compiler/ci_includes/gate.jsonnet
index 7731c1689ccb..2cf427ef325e 100644
--- a/compiler/ci_includes/gate.jsonnet
+++ b/compiler/ci_includes/gate.jsonnet
@@ -15,7 +15,8 @@
     run+: [
       ["mx", "build"]
     ],
-     notify_groups:: ["compiler_stubs"],
+    timelimit : "10:00",
+    notify_groups:: ["compiler_stubs"],
   },
 
   builds: [

From 3c7c54f3e1379ad29638a5bec8d58fe847019d6e Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 15:44:54 +0200
Subject: [PATCH 005/681] svm: always use SubstrateArraycopyWithExceptionNode

and remove SubstrateArraycopyNode
---
 .../graal/jdk/SubstrateArraycopyNode.java     | 54 -------------------
 .../graal/jdk/SubstrateArraycopySnippets.java | 14 -----
 .../SubstrateArraycopyWithExceptionNode.java  | 16 ------
 3 files changed, 84 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyNode.java

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyNode.java
deleted file mode 100644
index 89920d15f7f4..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.graal.jdk;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
-
-import jdk.vm.ci.meta.JavaKind;
-
-/**
- * Substrate specific intrinisfication for {@link System#arraycopy}.
- *
- * Lowering is implemented in the platform/VM specific
- * {@link org.graalvm.compiler.nodes.spi.LoweringProvider LoweringProvider}. Most of them eventually
- * go through {@link SubstrateArraycopySnippets}.
- *
- * @see SubstrateArraycopyWithExceptionNode Variant with exception edge.
- */
-@NodeInfo
-public final class SubstrateArraycopyNode extends BasicArrayCopyNode {
-    public static final NodeClass<SubstrateArraycopyNode> TYPE = NodeClass.create(SubstrateArraycopyNode.class);
-
-    protected SubstrateArraycopyNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
-        super(TYPE, src, srcPos, dest, destPos, length, elementKind, bci);
-        if (this.elementKind == null) {
-            this.elementKind = ArrayCopy.selectComponentKind(this);
-        }
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
index e9a02b74211f..68813625a6c2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
@@ -30,7 +30,6 @@
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallWithExceptionNode;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
@@ -61,7 +60,6 @@ public static void registerForeignCalls(Providers providers, SubstrateForeignCal
     protected SubstrateArraycopySnippets(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection,
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {
         super(options, factories, providers, snippetReflection);
-        lowerings.put(SubstrateArraycopyNode.class, new SubstrateArraycopyLowering());
         lowerings.put(SubstrateArraycopyWithExceptionNode.class, new SubstrateArraycopyWithExceptionLowering());
     }
 
@@ -112,18 +110,6 @@ private static void boundsCheck(Object fromArray, int fromIndex, Object toArray,
         }
     }
 
-    static final class SubstrateArraycopyLowering implements NodeLoweringProvider<SubstrateArraycopyNode> {
-        @Override
-        public void lower(SubstrateArraycopyNode node, LoweringTool tool) {
-            StructuredGraph graph = node.graph();
-            ForeignCallNode call = graph.add(new ForeignCallNode(ARRAYCOPY, node.getSource(), node.getSourcePosition(), node.getDestination(),
-                            node.getDestinationPosition(), node.getLength()));
-            call.setStateAfter(node.stateAfter());
-            call.setBci(node.getBci());
-            graph.replaceFixedWithFixed(node, call);
-        }
-    }
-
     static final class SubstrateArraycopyWithExceptionLowering implements NodeLoweringProvider<SubstrateArraycopyWithExceptionNode> {
         @Override
         public void lower(SubstrateArraycopyWithExceptionNode node, LoweringTool tool) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
index 14d919c33af5..13fd59e4606f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
@@ -33,14 +33,11 @@
 import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
 
@@ -52,8 +49,6 @@
  * Lowering is implemented in the platform/VM specific
  * {@link org.graalvm.compiler.nodes.spi.LoweringProvider LoweringProvider}. Most of them eventually
  * go through {@link SubstrateArraycopySnippets}.
- *
- * @see SubstrateArraycopyNode Variant without exception edge.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, cyclesRationale = "may be replaced with non-throwing counterpart", size = SIZE_64)
 public class SubstrateArraycopyWithExceptionNode extends WithExceptionNode implements ArrayCopy {
@@ -139,15 +134,4 @@ public int getBci() {
     public JavaKind getElementKind() {
         return elementKind;
     }
-
-    @Override
-    public FixedNode replaceWithNonThrowing() {
-        SubstrateArraycopyNode plainArrayCopy = this.asNode().graph()
-                        .add(new SubstrateArraycopyNode(getSource(), getSourcePosition(), getDestination(), getDestinationPosition(), getLength(), getElementKind(), getBci()));
-        plainArrayCopy.setStateAfter(stateAfter);
-        AbstractBeginNode oldException = this.exceptionEdge;
-        graph().replaceSplitWithFixed(this, plainArrayCopy, this.next());
-        GraphUtil.killCFG(oldException);
-        return plainArrayCopy;
-    }
 }

From 61475aa5453554145cdc28ac6e5409e2b3085c22 Mon Sep 17 00:00:00 2001
From: Roland Schatz <roland.schatz@oracle.com>
Date: Tue, 7 Sep 2021 17:07:13 +0200
Subject: [PATCH 006/681] Unit test for PEA of Array.newInstance.

---
 .../core/test/ea/PartialEscapeAnalysisTest.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
index 019ebb93623f..95643b44be61 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, 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
@@ -25,6 +25,7 @@
 package org.graalvm.compiler.core.test.ea;
 
 import java.lang.ref.SoftReference;
+import java.lang.reflect.Array;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.core.test.TypeSystemTest;
@@ -129,6 +130,18 @@ public static Object test3Snippet(int a) {
         }
     }
 
+    @Test
+    public void testDynArray() {
+        testPartialEscapeAnalysis("testDynArraySnippet", 0, 0);
+    }
+
+    public static Object testDynArraySnippet(int a) {
+        Object[] args = (Object[]) Array.newInstance(Object.class, 2);
+        args[0] = a;
+        args[1] = 42;
+        return (int) args[0] + (int) args[1];
+    }
+
     @Test
     public void testArrayCopy() {
         testPartialEscapeAnalysis("testArrayCopySnippet", 0, 0);

From 20416ad2b842fbedadbab44cf6f6854743813c6a Mon Sep 17 00:00:00 2001
From: Roland Schatz <roland.schatz@oracle.com>
Date: Tue, 7 Sep 2021 17:13:06 +0200
Subject: [PATCH 007/681] Constant folding of RawLoadNode on immutable location
 identities.

---
 .../graalvm/compiler/nodes/extended/RawLoadNode.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
index 3faf761c980f..21f5e1403c05 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
@@ -178,14 +178,14 @@ public Node canonical(CanonicalizerTool tool) {
             if (offset().isConstant() && targetObject.isConstant() && !targetObject.isNullConstant()) {
                 ConstantNode objectConstant = (ConstantNode) targetObject;
                 ResolvedJavaType type = StampTool.typeOrNull(objectConstant);
-                if (type != null && type.isArray()) {
-                    JavaConstant arrayConstant = objectConstant.asJavaConstant();
-                    if (arrayConstant != null) {
+                if (type != null) {
+                    JavaConstant javaConstant = objectConstant.asJavaConstant();
+                    if (javaConstant != null) {
                         int stableDimension = objectConstant.getStableDimension();
-                        if (stableDimension > 0) {
+                        if (locationIdentity.isImmutable() || (type.isArray() && stableDimension > 0)) {
                             NodeView view = NodeView.from(tool);
                             long constantOffset = offset().asJavaConstant().asLong();
-                            Constant constant = stamp(view).readConstant(tool.getConstantReflection().getMemoryAccessProvider(), arrayConstant, constantOffset);
+                            Constant constant = stamp(view).readConstant(tool.getConstantReflection().getMemoryAccessProvider(), javaConstant, constantOffset);
                             boolean isDefaultStable = objectConstant.isDefaultStable();
                             if (constant != null && (isDefaultStable || !constant.isDefaultForKind())) {
                                 /*
@@ -199,7 +199,7 @@ public Node canonical(CanonicalizerTool tool) {
                                  * accesses for building the AST during PE, and should not enforce
                                  * ordering on language side accesses.
                                  */
-                                return ConstantNode.forConstant(stamp(view), constant, stableDimension - 1, isDefaultStable, tool.getMetaAccess());
+                                return ConstantNode.forConstant(stamp(view), constant, Math.max(stableDimension - 1, 0), isDefaultStable, tool.getMetaAccess());
                             }
                         }
                     }

From db11f7b6ae4f09656b1b390183cf26dea83fefa2 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 8 Sep 2021 08:15:45 +0200
Subject: [PATCH 008/681] svm: add simplification to update
 SubstrateArraycopyWithExceptionNode#elementKind

---
 .../jdk/SubstrateArraycopyWithExceptionNode.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
index 13fd59e4606f..4fc947a627cc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
@@ -38,6 +38,8 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
+import org.graalvm.compiler.nodes.spi.Simplifiable;
+import org.graalvm.compiler.nodes.spi.SimplifierTool;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
 
@@ -51,7 +53,7 @@
  * go through {@link SubstrateArraycopySnippets}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, cyclesRationale = "may be replaced with non-throwing counterpart", size = SIZE_64)
-public class SubstrateArraycopyWithExceptionNode extends WithExceptionNode implements ArrayCopy {
+public class SubstrateArraycopyWithExceptionNode extends WithExceptionNode implements ArrayCopy, Simplifiable {
 
     public static final NodeClass<SubstrateArraycopyWithExceptionNode> TYPE = NodeClass.create(SubstrateArraycopyWithExceptionNode.class);
 
@@ -134,4 +136,14 @@ public int getBci() {
     public JavaKind getElementKind() {
         return elementKind;
     }
+
+    @Override
+    public void simplify(SimplifierTool tool) {
+        if (this.elementKind == null) {
+            this.elementKind = ArrayCopy.selectComponentKind(this);
+            if (this.elementKind != null) {
+                tool.addToWorkList(usages());
+            }
+        }
+    }
 }

From 0ebabb230c13f397f4cf12653481276e07ffba09 Mon Sep 17 00:00:00 2001
From: "cengfeng.lzy" <cengfeng.lzy@alibaba-inc.com>
Date: Wed, 8 Sep 2021 16:22:50 +0800
Subject: [PATCH 009/681] Refator NoClassInitializationPlguin to common place

Standalone pointsto needs to use NoClassInitializationPlguin as its
ClassInitializationPlugin, so it is refactored to the pointsto project
for better reusibility.
---
 .../graal/pointsto}/phases/NoClassInitializationPlugin.java     | 2 +-
 .../classinitialization/EarlyClassInitializerAnalysis.java      | 2 +-
 .../hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java | 2 +-
 .../hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java  | 1 +
 .../hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename substratevm/src/{com.oracle.svm.hosted/src/com/oracle/svm/hosted => com.oracle.graal.pointsto/src/com/oracle/graal/pointsto}/phases/NoClassInitializationPlugin.java (98%)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/NoClassInitializationPlugin.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
similarity index 98%
rename from substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/NoClassInitializationPlugin.java
rename to substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
index c55749bf73c2..d7ebceed74da 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/NoClassInitializationPlugin.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.phases;
+package com.oracle.graal.pointsto.phases;
 
 import java.util.function.Supplier;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
index 1aa15f0fc94b..85aca69ae2a8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
@@ -54,6 +54,7 @@
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 import org.graalvm.compiler.phases.util.Providers;
 
+import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.graal.thread.VMThreadLocalAccess;
@@ -61,7 +62,6 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.phases.EarlyConstantFoldLoadFieldPlugin;
-import com.oracle.svm.hosted.phases.NoClassInitializationPlugin;
 import com.oracle.svm.hosted.snippets.ReflectionPlugins;
 import com.oracle.svm.hosted.snippets.SubstrateGraphBuilderPlugins;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
index 7afc2101255b..fe47e4c1bc1d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
@@ -36,8 +36,8 @@
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
+import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
 import com.oracle.svm.hosted.c.GraalAccess;
-import com.oracle.svm.hosted.phases.NoClassInitializationPlugin;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.phases.util.Providers;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
index d591f8808cf2..d796dce91fbd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
@@ -37,6 +37,7 @@
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
+import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
index 54372b325283..7dd4c5130974 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
@@ -74,6 +74,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
 import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.AutomaticFeature;
@@ -87,7 +88,6 @@
 import com.oracle.svm.hosted.SVMHost;
 import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.classinitialization.ClassInitializerGraphBuilderPhase;
-import com.oracle.svm.hosted.phases.NoClassInitializationPlugin;
 import com.oracle.svm.hosted.snippets.ReflectionPlugins;
 
 import jdk.vm.ci.meta.JavaKind;

From 4d897ead28d0e22ee128ee54a166ee7f8d40665f Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 14 Sep 2021 22:22:39 +0300
Subject: [PATCH 010/681] Resubmit a PR to include WASM and NI changelogs

---
 substratevm/CHANGELOG.md |  5 +++++
 wasm/CHANGELOG.md        |  5 +++++
 wasm/README.md           | 37 ++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 substratevm/CHANGELOG.md
 create mode 100644 wasm/CHANGELOG.md

diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md
new file mode 100644
index 000000000000..ef9f442ed7fd
--- /dev/null
+++ b/substratevm/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Native Image Changelog
+
+This changelog summarizes major changes to Native Image, developed under the codename **Substrate VM**.
+
+## Version 21.3.0

diff --git a/wasm/CHANGELOG.md b/wasm/CHANGELOG.md
new file mode 100644
index 000000000000..e6e83856aa7e
--- /dev/null
+++ b/wasm/CHANGELOG.md
@@ -0,0 +1,5 @@
+# Wasm (GraalWasm (GraalVM Implementation of WebAssembly) Changelog
+
+This changelog summarizes major changes to the WebAssembly engine implemented in GraalVM (GraalWasm).
+
+## Version 21.3.0
diff --git a/wasm/README.md b/wasm/README.md
index 5250a7550a22..a62feb7ff021 100644
--- a/wasm/README.md
+++ b/wasm/README.md
@@ -1,7 +1,7 @@
 
 # GraalWasm
 
-GraalWasm is a WebAssembly engine implemented in the GraalVM.
+GraalWasm is a WebAssembly engine implemented in GraalVM.
 It can interpret and compile WebAssembly programs in the binary format,
 or be embedded into other programs.
 
@@ -15,7 +15,7 @@ Feedback, bug reports, and open-source contributions are welcome!
 ### Prerequisites
 
 - Python 3 (required by `mx`)
-- git (to download, update, and locate repositories)
+- GIT (to download, update, and locate repositories)
 - A [JVMCI-enabled JDK 8](https://github.com/graalvm/graal-jvmci-8/releases) or a newer JDK version (JDK 9+)
 - GCC for translating C files
 
@@ -24,32 +24,32 @@ Feedback, bug reports, and open-source contributions are welcome!
 To build GraalWasm, you need to follow the standard workflow for Graal projects.
 We summarize the basic steps below:
 
-1. Create a new folder where your repositories `mx` and `graal` should be located
+1. Create a new folder where your repositories `mx` and `graal` should be located:
 ```bash
 $ mkdir graalvm
 $ cd graalvm
 ```
-2. Clone `mx` and add it to the PATH
+2. Clone `mx` and add it to the `PATH`:
 
 ```bash
 $ git clone https://github.com/graalvm/mx.git
 $ export PATH=$PWD/mx:$PATH
 ```
 
-3. Clone the `graal` repository and enter the wasm directory.
+3. Clone the `graal` repository and enter the wasm directory:
 
 ```bash
 $ git clone https://github.com/oracle/graal.git
 $ cd graal/wasm
 ```
 
-4. Set JAVA_HOME
+4. Set `JAVA_HOME`:
 
 ```bash
 $ export JAVA_HOME=[path to JDK]
 ```
 
-5. Build the project
+5. Build the project:
 ```bash
 $ mx --dy /truffle,/compiler build
 ```
@@ -65,7 +65,7 @@ which contains the GraalWasm implementation.
 The `build` command will also create the `wasm-tests.jar`, which contains the main test cases. To run these tests, the WebAssembly binary toolkit is needed.
 
 1. Download the binary of the [WebAssembly binary toolkit(wabt)](https://github.com/WebAssembly/wabt) and extract it.
-2. Set `WABT_DIR`
+2. Set `WABT_DIR`:
 
 ```bash
 $ export WABT_DIR=[path to wabt]/bin
@@ -98,7 +98,7 @@ This command results in the following output:
 Running: BranchBlockSuite (4/16 tests - you have enabled filters)
 --------------------------------------------------------------------------------
 Using runtime: org.graalvm.compiler.truffle.runtime.hotspot.java.HotSpotTruffleRuntime@7b1d7fff
-😍😍😍😍                                       
+😍😍😍😍
 Finished running: BranchBlockSuite
 🍀 4/4 Wasm tests passed.
 ```
@@ -114,7 +114,7 @@ To compile these programs, you will need to install additional dependencies on y
 To build these additional tests and benchmarks, you need to:
 
 1. Install the [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html). We currently test against Emscripten **1.39.13**.
-   
+
 ```bash
 $ cd [preferred emsdk install location]
 
@@ -134,21 +134,21 @@ $ ./emsdk activate [version number]
 $ source ./emsdk_env.sh
 ```
 
-2. Set `EMCC_DIR` and `GCC_DIR`
+2. Set `EMCC_DIR` and `GCC_DIR`:
 
 ```bash
 $ export EMCC_DIR=[path to emsdk]/upstream/emscripten
 $ export GCC_DIR=[path to gcc (usually /usr/bin)]
 ```
 
-3. Run `emscripten-init`
+3. Run `emscripten-init`:
 
 ```bash
 $ cd grallvm/graal/wasm
 $ mx emscripten-init ~/.emscripten [path to emsdk] --local
 ```
 
-4. Build with additional dependencies
+4. Build with additional dependencies:
 
 ```bash
 $ mx --dy /truffle,/compiler build --all
@@ -177,7 +177,7 @@ This will result in the following output:
 Running: CSuite (1 tests)
 --------------------------------------------------------------------------------
 Using runtime: org.graalvm.compiler.truffle.runtime.hotspot.java.HotSpotTruffleRuntime@368239c8
-😍                 
+😍
 Finished running: CSuite
 🍀 1/1 Wasm tests passed.
 ```
@@ -194,9 +194,9 @@ The GraalWasm project includes a custom JMH-based benchmark suite,
 which is capable of running WebAssembly benchmark programs.
 The benchmark programs consist of several special functions,
 most notably `benchmarkRun`, which runs the body of the benchmark.
-The benchmarks are kept in the `src/com.oracle.truffle.wasm.benchcases` Mx project.
+The benchmarks are kept in the `src/com.oracle.truffle.wasm.benchcases` MX project.
 
-For the benchmarks to run `NODE_DIR` has to be set. You can use the node version that is part of emscripten, for example:
+For the benchmarks to run `NODE_DIR` has to be set. You can use the node version that is part of Emscripten, for example:
 
 ```bash
 $ export NODE_DIR=[path to emsdk]/node/14.15.5_64bit/bin
@@ -256,7 +256,7 @@ If downloading GraalWasm as a separate GraalVM component,
 you can download it as follows (replace JDK and GraalVM versions with appropriate values):
 
 ```bash
-$ graalvm-ce-java8-19.3.0/bin/gu install --force -L wasm-installable-java8-linux-<version>.jar
+$ graalvm-ce-java8-21.2.0/bin/gu install --force -L wasm-installable-java8-linux-<version>.jar
 ```
 
 This will install a launcher, which runs WebAssembly modules.
@@ -314,5 +314,4 @@ mainFunction.execute();
 ```
 
 For more polyglot-related examples, consult the documentation at the
-[GraalVM website](https://www.graalvm.org/docs/reference-manual/polyglot/).
-
+[GraalVM website](https://www.graalvm.org/reference-manual/polyglot-programming/).

From 91a831db836df217c22a18b9bb224e025e184f90 Mon Sep 17 00:00:00 2001
From: Andrew Craik <andrew.craik@oracle.com>
Date: Thu, 26 Aug 2021 11:13:32 +1000
Subject: [PATCH 011/681] Support masked vector shuffles on AMD64

This change adds support for generating vector shuffle operations which
use a zeroing mask on AVX-512 enabled hardware.
---
 .../compiler/asm/amd64/AMD64Assembler.java    | 14 +++++++
 .../lir/amd64/vector/AMD64VectorShuffle.java  | 40 +++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
index e0eb84891213..8c8cbf71a3c9 100644
--- a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
@@ -1396,6 +1396,20 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr
             asm.emitOperandHelper(dst, src, 1, getDisp8Scale(useEvex, size));
             asm.emitByte(imm8);
         }
+
+        public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) {
+            asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b);
+            asm.emitByte(op);
+            asm.emitModRM(dst, src);
+            asm.emitByte(imm8);
+        }
+
+        public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, int imm8, Register mask, int z, int b) {
+            asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b);
+            asm.emitByte(op);
+            asm.emitOperandHelper(dst, src, 1, getDisp8Scale(true, size));
+            asm.emitByte(imm8);
+        }
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
index 4c33ab5d2303..d723c5623982 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
@@ -65,6 +65,7 @@
 import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp;
 import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp;
 import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp;
+import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler;
 import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
 import org.graalvm.compiler.asm.amd64.AVXKind;
 import org.graalvm.compiler.debug.GraalError;
@@ -176,13 +177,17 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static class ShuffleWordOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass<ShuffleWordOp> TYPE = LIRInstructionClass.create(ShuffleWordOp.class);
-        private final VexRMIOp op;
+        protected final VexRMIOp op;
         @Def({REG}) protected AllocatableValue result;
         @Use({REG, STACK}) protected AllocatableValue source;
-        private final int selector;
+        protected final int selector;
 
         public ShuffleWordOp(VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector) {
-            super(TYPE);
+            this(TYPE, op, result, source, selector);
+        }
+
+        protected ShuffleWordOp(LIRInstructionClass<? extends AMD64LIRInstruction> c, VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector) {
+            super(c);
             this.op = op;
             this.result = result;
             this.source = source;
@@ -200,6 +205,35 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
         }
     }
 
+    public static class ShuffleWordOpWithMask extends ShuffleWordOp implements AVX512Support {
+        public static final LIRInstructionClass<ShuffleWordOpWithMask> TYPE = LIRInstructionClass.create(ShuffleWordOpWithMask.class);
+
+        // both used and killed, must be a fixed register
+        @Use({REG}) protected AllocatableValue mask;
+
+        public ShuffleWordOpWithMask(VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector, AllocatableValue mask) {
+            super(TYPE, op, result, source, selector);
+            this.mask = mask;
+        }
+
+        @Override
+        public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+            AMD64Kind kind = (AMD64Kind) source.getPlatformKind();
+            if (isRegister(source)) {
+                op.emit(masm, AVXKind.getRegisterSize(kind), asRegister(result), asRegister(source), selector, asRegister(mask), AMD64BaseAssembler.EVEXPrefixConfig.Z1,
+                                AMD64BaseAssembler.EVEXPrefixConfig.B0);
+            } else {
+                op.emit(masm, AVXKind.getRegisterSize(kind), asRegister(result), (AMD64Address) crb.asAddress(source), selector, asRegister(mask), AMD64BaseAssembler.EVEXPrefixConfig.Z1,
+                                AMD64BaseAssembler.EVEXPrefixConfig.B0);
+            }
+        }
+
+        @Override
+        public AllocatableValue getOpmask() {
+            return mask;
+        }
+    }
+
     public static class ShuffleFloatOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass<ShuffleFloatOp> TYPE = LIRInstructionClass.create(ShuffleFloatOp.class);
         @Def({REG}) protected AllocatableValue result;

From ec7cbf48f3958fecec31055daa362fc8f5d1b883 Mon Sep 17 00:00:00 2001
From: Andrew Craik <andrew.craik@oracle.com>
Date: Tue, 31 Aug 2021 16:05:49 +1000
Subject: [PATCH 012/681] Add support for VPERMT2B

VPERMT2B is a useful instruction for permuting elements of a 512 byte
ZMM register since it allows lane crossing in the permute. This change
adds support for encoding this instruction and adds instruction objects
to represent it during code generation.
---
 .../compiler/asm/amd64/AMD64Assembler.java    | 15 ++++++
 .../lir/amd64/vector/AMD64VectorShuffle.java  | 50 +++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
index 8c8cbf71a3c9..5816bd5d692f 100644
--- a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
@@ -1612,6 +1612,7 @@ public static class VexRVMOp extends VexOp {
         public static final VexRVMOp VPBLENDMQ       = new VexRVMOp("VPBLENDMQ",   P_66, M_0F38, W1,  0x64, VEXOpAssertion.AVX512F_VL,                   EVEXTuple.FVM,       W1);
         public static final VexRVMOp VBLENDMPS       = new VexRVMOp("VBLENDMPS",   P_66, M_0F38, W0,  0x65, VEXOpAssertion.AVX512F_VL,                   EVEXTuple.FVM,       W0);
         public static final VexRVMOp VBLENDMPD       = new VexRVMOp("VBLENDMPD",   P_66, M_0F38, W1,  0x65, VEXOpAssertion.AVX512F_VL,                   EVEXTuple.FVM,       W1);
+        public static final VexRVMOp VPERMT2B        = new VexRVMOp("VPERMT2B",    P_66, M_0F38, W0,  0x7D, VEXOpAssertion.AVX512F_VL,                   EVEXTuple.FVM,       W0);
         // @formatter:on
 
         protected VexRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) {
@@ -1650,6 +1651,20 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1,
             asm.emitOperandHelper(dst, src2, 0, getDisp8Scale(useEvex, size));
         }
 
+        public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) {
+            assert assertion.check((AMD64) asm.target.arch, size, dst, src1, src2);
+            asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b);
+            asm.emitByte(op);
+            asm.emitModRM(dst, src2);
+        }
+
+        public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) {
+            assert assertion.check((AMD64) asm.target.arch, size, dst, src1, null);
+            boolean useEvex = asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b);
+            asm.emitByte(op);
+            asm.emitOperandHelper(dst, src2, 0, getDisp8Scale(useEvex, size));
+        }
+
         public boolean isPacked() {
             return pp == P_ || pp == P_66;
         }
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
index d723c5623982..99c69d7312b9 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
@@ -42,6 +42,7 @@
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRQ;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRW;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
+import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU64;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF128;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X4;
@@ -55,12 +56,14 @@
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X4;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPD;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPS;
+import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPERMT2B;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPSHUFB;
 import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM;
 import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.ZMM;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
+import jdk.vm.ci.code.Register;
 import org.graalvm.compiler.asm.amd64.AMD64Address;
 import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp;
 import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp;
@@ -68,6 +71,7 @@
 import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler;
 import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
 import org.graalvm.compiler.asm.amd64.AVXKind;
+import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
@@ -76,6 +80,7 @@
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
+import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 
 public class AMD64VectorShuffle {
 
@@ -151,6 +156,51 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
         }
     }
 
+    public static final class ConstPermuteBytesUsingTableOp extends AMD64LIRInstruction implements AVX512Support {
+        public static final LIRInstructionClass<ConstPermuteBytesUsingTableOp> TYPE = LIRInstructionClass.create(ConstPermuteBytesUsingTableOp.class);
+        @Def({REG}) protected AllocatableValue result;
+        @Use({REG, STACK}) protected AllocatableValue source;
+        @Use({REG}) protected AllocatableValue mask;
+        @Temp({REG}) protected AllocatableValue selector;
+
+        byte[] selectorData;
+
+        public ConstPermuteBytesUsingTableOp(LIRGeneratorTool tool, AllocatableValue result, AllocatableValue source, byte[] selectorData) {
+            this(tool, result, source, selectorData, null);
+        }
+
+        public ConstPermuteBytesUsingTableOp(LIRGeneratorTool tool, AllocatableValue result, AllocatableValue source, byte[] selectorData, AllocatableValue mask) {
+            super(TYPE);
+            this.result = result;
+            this.source = source;
+            this.selectorData = selectorData;
+            this.selector = tool.newVariable(LIRKind.value(source.getPlatformKind()));
+            this.mask = mask;
+        }
+
+        @Override
+        public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
+            AMD64Kind kind = (AMD64Kind) source.getPlatformKind();
+            int alignment = crb.dataBuilder.ensureValidDataAlignment(selectorData.length);
+            AMD64Address address = (AMD64Address) crb.recordDataReferenceInCode(selectorData, alignment);
+            VMOVDQU64.emit(masm, AVXKind.getRegisterSize(kind), asRegister(selector), address);
+            if (isRegister(source)) {
+                VPERMT2B.emit(masm, AVXKind.getRegisterSize(kind), asRegister(result), asRegister(selector), asRegister(source), mask != null ? asRegister(mask) : Register.None,
+                                AMD64BaseAssembler.EVEXPrefixConfig.Z1,
+                                AMD64BaseAssembler.EVEXPrefixConfig.B0);
+            } else {
+                VPERMT2B.emit(masm, AVXKind.getRegisterSize(kind), asRegister(result), asRegister(selector), (AMD64Address) crb.asAddress(source), mask != null ? asRegister(mask) : Register.None,
+                                AMD64BaseAssembler.EVEXPrefixConfig.Z1,
+                                AMD64BaseAssembler.EVEXPrefixConfig.B0);
+            }
+        }
+
+        @Override
+        public AllocatableValue getOpmask() {
+            return mask;
+        }
+    }
+
     public static final class ConstShuffleBytesOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass<ConstShuffleBytesOp> TYPE = LIRInstructionClass.create(ConstShuffleBytesOp.class);
         @Def({REG}) protected AllocatableValue result;

From 1af214b4cffe77c014dcd88ea08789dfa4247ad9 Mon Sep 17 00:00:00 2001
From: Andrew Craik <andrew.craik@oracle.com>
Date: Mon, 13 Sep 2021 16:43:20 +1000
Subject: [PATCH 013/681] Clean-up and review fixes

---
 .../graalvm/compiler/asm/amd64/AMD64Assembler.java   |  4 ++++
 .../compiler/core/amd64/AMD64LIRGenerator.java       | 12 ++++++++++++
 .../lir/amd64/vector/AMD64VectorShuffle.java         |  1 -
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
index 5816bd5d692f..51428351a555 100644
--- a/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java
@@ -1398,6 +1398,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr
         }
 
         public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) {
+            assert assertion.check((AMD64) asm.target.arch, size, dst, null, src);
             asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b);
             asm.emitByte(op);
             asm.emitModRM(dst, src);
@@ -1405,6 +1406,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i
         }
 
         public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, int imm8, Register mask, int z, int b) {
+            assert assertion.check((AMD64) asm.target.arch, size, dst, null, null);
             asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b);
             asm.emitByte(op);
             asm.emitOperandHelper(dst, src, 1, getDisp8Scale(true, size));
@@ -1691,6 +1693,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1,
             asm.emitModRM(dst, src2);
         }
 
+        @Override
         public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) {
             assert assertion.check((AMD64) asm.target.arch, LZ, dst, src1, src2, null);
             assert size == AVXSize.DWORD || size == AVXSize.QWORD;
@@ -1708,6 +1711,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1,
             asm.emitOperandHelper(dst, src2, 0);
         }
 
+        @Override
         public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) {
             assert assertion.check((AMD64) asm.target.arch, LZ, dst, src1, null, null);
             assert size == AVXSize.DWORD || size == AVXSize.QWORD;
diff --git a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
index 69fd3b4c9c02..c43fc61c27e5 100644
--- a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
@@ -764,4 +764,16 @@ public void emitZeroMemory(Value address, Value length, boolean isAligned) {
         emitMove(lengthReg, length);
         append(new AMD64ZeroMemoryOp(asAddressValue(address), lengthReg));
     }
+
+    public boolean supportsCPUFeature(AMD64.CPUFeature feature) {
+        return ((AMD64) target().arch).getFeatures().contains(feature);
+    }
+
+    public boolean supportsCPUFeature(String feature) {
+        try {
+            return ((AMD64) target().arch).getFeatures().contains(AMD64.CPUFeature.valueOf(feature));
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
index 99c69d7312b9..59560c77ab49 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
@@ -258,7 +258,6 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static class ShuffleWordOpWithMask extends ShuffleWordOp implements AVX512Support {
         public static final LIRInstructionClass<ShuffleWordOpWithMask> TYPE = LIRInstructionClass.create(ShuffleWordOpWithMask.class);
 
-        // both used and killed, must be a fixed register
         @Use({REG}) protected AllocatableValue mask;
 
         public ShuffleWordOpWithMask(VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector, AllocatableValue mask) {

From ffb293005c3c9520eef4d12f0a999f042e6ce4d3 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Wed, 7 Jul 2021 10:44:58 +0300
Subject: [PATCH 014/681] Don't build LibGraal component by default

LibGraal fails to build with upstream OpenJDK 11 due to it's dependency
on HotSpotJVMCIRuntime.getCurrentJavaThread() which has not been
backported to upstream OpenJDK 11. Preventing it from being build by
default enables us to build components of GraalVM that do not depend on
it, e.g., 'Native Image'.
---
 substratevm/mx.substratevm/suite.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 37b2410d8f34..480f790e97b4 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -942,6 +942,7 @@
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
+            "defaultBuild": False,
         },
 
         "com.oracle.svm.configure": {
@@ -1264,6 +1265,7 @@
             "distDependencies": [
                 "SVM",
             ],
+            "defaultBuild": False,
         },
 
         #

From 796e2edb0ba85e4cb9a25f3b0c345147e1efdc41 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Tue, 14 Sep 2021 15:53:46 +0200
Subject: [PATCH 015/681] refactorings

---
 .../compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java   | 3 +++
 .../src/org/graalvm/compiler/nodes/loop/LoopEx.java           | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
index 077c2dbb5639..ead822210245 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -269,6 +269,9 @@ private static boolean isCountedLoopExit(IfNode ifNode, LazyValue<LoopsData> laz
             if (loopEx.detectCounted()) {
                 return ifNode == loopEx.counted().getLimitTest();
             }
+            if (loopEx.canBecomeLimitTestAfterFloatingReads(ifNode)) {
+                return true;
+            }
         }
         return false;
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
index b65a33963d51..9a48948cc5c8 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
@@ -566,4 +566,8 @@ public boolean canStripMine() {
         }
         return true;
     }
+
+    public boolean canBecomeLimitTestAfterFloatingReads(@SuppressWarnings("unused") IfNode ifNode) {
+        return false;
+    }
 }

From 417159ff1f6e530ed240595a103fd9508dc6af95 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 17 Sep 2021 10:23:27 +0300
Subject: [PATCH 016/681] Dynamic Proxy configuration does not support the
 definition of unordered interfaces

---
 docs/reference-manual/native-image/DynamicProxy.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/reference-manual/native-image/DynamicProxy.md b/docs/reference-manual/native-image/DynamicProxy.md
index c56dadc05175..d70cbaf4b534 100644
--- a/docs/reference-manual/native-image/DynamicProxy.md
+++ b/docs/reference-manual/native-image/DynamicProxy.md
@@ -90,9 +90,9 @@ For the exceptional cases where the analysis cannot discover the interface array
 
 ## Manual Configuration
 
-Dynamic proxy classes can be generated at native image build time by specifying the list of interfaces that they implement. Native Image provides two options for this purpose: `-H:DynamicProxyConfigurationFiles=<comma-separated-config-files>` and `-H:DynamicProxyConfigurationResources=<comma-separated-config-resources>`.
+Dynamic proxy classes can be generated at native image build time by specifying the list of interfaces that they implement.
+Native Image provides two options for that: `-H:DynamicProxyConfigurationFiles=<comma-separated-config-files>` and `-H:DynamicProxyConfigurationResources=<comma-separated-config-resources>`. These options accept JSON files whose structure is an array of arrays of fully qualified interface names. For example:
 
-These options accept JSON files whose structure is an array of arrays of fully qualified interface names. For example:
 ```json
 [
     ["java.lang.AutoCloseable", "java.util.Comparator"],
@@ -101,6 +101,8 @@ These options accept JSON files whose structure is an array of arrays of fully q
 ]
 ```
 
+Note that the order of the specified proxy interfaces is significant: two requests for a `Proxy` class with the same combination of interfaces but in a different order will result in two distinct behaviours (for more detailed information, refer to [`Proxy Class `javadoc](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/reflect/Proxy.html).
+
 The `java.lang.reflect.Proxy` API also allows creation of a dynamic proxy that does not implement any user provided interfaces. Therefore the following is a valid configuration:
 ```json
 [

From 5d9846ef69f02e03f380c27bed76468df7dfbf76 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Fri, 17 Sep 2021 10:09:07 +0200
Subject: [PATCH 017/681] make sure we always display error logging even when
 the thread cannot enter the Truffle context

---
 .../jdwp/impl/DebuggerConnection.java         |  12 +-
 .../truffle/espresso/jdwp/impl/JDWP.java      | 106 +++++++++++++-----
 2 files changed, 85 insertions(+), 33 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
index 500ed5c06c73..68f1a7f4294f 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
@@ -587,8 +587,16 @@ private void processPacket(Packet packet) {
                 }
                 handleReply(packet, result);
             } catch (Throwable t) {
-                JDWP.LOGGER.warning(() -> "[Internal error]: " + t.getClass());
-                JDWP.LOGGER.throwing(DebuggerConnection.class.getName(), "processPacket", t);
+                if (entered) {
+                    // we can only use the Truffle logger if we were able to enter the context
+                    JDWP.LOGGER.warning(() -> "[Internal error]");
+                    JDWP.LOGGER.throwing(DebuggerConnection.class.getName(), "processPacket", t);
+                } else {
+                    // Checkstyle: stop allow error output
+                    System.out.println("[internal error]: " + t.getMessage());
+                    t.printStackTrace();
+                    // Checkstyle: resume allow error output
+                }
                 PacketStream reply = new PacketStream().replyPacket().id(packet.id);
                 reply.errorCode(ErrorCodes.INTERNAL);
                 handleReply(packet, new CommandResult(reply));
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index c5cc5a4eb9ee..8200ed62b886 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -1105,10 +1105,27 @@ public Object call() {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            ThreadJob<?>.JobResult<?> result = job.getResult();
-                            writeMethodResult(reply, context, result);
+                            boolean entered = controller.enterTruffleContext();
                             CommandResult commandResult = new CommandResult(reply);
-                            connection.handleReply(packet, commandResult);
+                            try {
+                                ThreadJob<?>.JobResult<?> result = job.getResult();
+                                writeMethodResult(reply, context, result);
+                            } catch (Throwable t) {
+                                reply.errorCode(ErrorCodes.INTERNAL);
+                                // Checkstyle: stop allow error output
+                                if (entered) {
+                                    LOGGER.warning(() -> "Internal Espresso error: " + t);
+                                } else {
+                                    System.err.println("Internal Espresso error: " + t.getMessage());
+                                }
+                                t.printStackTrace();
+                                // Checkstyle: resume allow error output
+                            } finally {
+                                connection.handleReply(packet, commandResult);
+                                if (entered) {
+                                    controller.leaveTruffleContext();
+                                }
+                            }
                         }
                     }).start();
                 } catch (Throwable t) {
@@ -1269,10 +1286,27 @@ public Object call() throws Exception {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            ThreadJob<?>.JobResult<?> result = job.getResult();
-                            writeMethodResult(reply, context, result);
+                            boolean entered = controller.enterTruffleContext();
                             CommandResult commandResult = new CommandResult(reply);
-                            connection.handleReply(packet, commandResult);
+                            try {
+                                ThreadJob<?>.JobResult<?> result = job.getResult();
+                                writeMethodResult(reply, context, result);
+                            } catch (Throwable t) {
+                                reply.errorCode(ErrorCodes.INTERNAL);
+                                // Checkstyle: stop allow error output
+                                if (entered) {
+                                    LOGGER.warning(() -> "Internal Espresso error: " + t);
+                                } else {
+                                    System.err.println("Internal Espresso error: " + t.getMessage());
+                                }
+                                t.printStackTrace();
+                                // Checkstyle: resume allow error output
+                            } finally {
+                                connection.handleReply(packet, commandResult);
+                                if (entered) {
+                                    controller.leaveTruffleContext();
+                                }
+                            }
                         }
                     }).start();
                 } catch (Throwable t) {
@@ -1749,10 +1783,27 @@ public Object call() throws Exception {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            ThreadJob<?>.JobResult<?> result = job.getResult();
-                            writeMethodResult(reply, context, result);
+                            boolean entered = controller.enterTruffleContext();
                             CommandResult commandResult = new CommandResult(reply);
-                            connection.handleReply(packet, commandResult);
+                            try {
+                                ThreadJob<?>.JobResult<?> result = job.getResult();
+                                writeMethodResult(reply, context, result);
+                            } catch (Throwable t) {
+                                reply.errorCode(ErrorCodes.INTERNAL);
+                                // Checkstyle: stop allow error output
+                                if (entered) {
+                                    LOGGER.warning(() -> "Internal Espresso error: " + t);
+                                } else {
+                                    System.err.println("Internal Espresso error: " + t.getMessage());
+                                }
+                                t.printStackTrace();
+                                // Checkstyle: resume allow error output
+                            } finally {
+                                connection.handleReply(packet, commandResult);
+                                if (entered) {
+                                    controller.leaveTruffleContext();
+                                }
+                            }
                         }
                     }).start();
                 } catch (Throwable t) {
@@ -2974,31 +3025,24 @@ public static void writeValue(byte tag, Object value, PacketStream reply, boolea
     }
 
     private static void writeMethodResult(PacketStream reply, JDWPContext context, ThreadJob<?>.JobResult<?> result) {
-        try {
-            if (result.getException() != null) {
-                LOGGER.fine(() -> "method threw exception");
-                reply.writeByte(TagConstants.OBJECT);
-                reply.writeLong(0);
-                reply.writeByte(TagConstants.OBJECT);
-                Object guestException = context.getGuestException(result.getException());
-                reply.writeLong(context.getIds().getIdAsLong(guestException));
-            } else {
-                Object value = context.toGuest(result.getResult());
-                if (value != null) {
-                    byte tag = context.getTag(value);
-                    writeValue(tag, value, reply, true, context);
-                } else { // return value is null
-                    reply.writeByte(TagConstants.OBJECT);
-                    reply.writeLong(0);
-                }
-                // no exception, so zero object ID
+        if (result.getException() != null) {
+            reply.writeByte(TagConstants.OBJECT);
+            reply.writeLong(0);
+            reply.writeByte(TagConstants.OBJECT);
+            Object guestException = context.getGuestException(result.getException());
+            reply.writeLong(context.getIds().getIdAsLong(guestException));
+        } else {
+            Object value = context.toGuest(result.getResult());
+            if (value != null) {
+                byte tag = context.getTag(value);
+                writeValue(tag, value, reply, true, context);
+            } else { // return value is null
                 reply.writeByte(TagConstants.OBJECT);
                 reply.writeLong(0);
             }
-        } catch (Throwable t) {
-            LOGGER.warning(() -> "Internal Espresso error: " + t);
-            LOGGER.throwing(JDWP.class.getName(), "writeMethodResult", t);
-            reply.errorCode(ErrorCodes.INTERNAL);
+            // no exception, so zero object ID
+            reply.writeByte(TagConstants.OBJECT);
+            reply.writeLong(0);
         }
     }
 

From 7ca690a88bccee742be1fb64719599403a9e231e Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Fri, 17 Sep 2021 11:30:19 +0200
Subject: [PATCH 018/681] fix java 9 or later substitution for JDK
 ProxyGenerator class

---
 .../Target_java_lang_reflect_ProxyGenerator.java     |  2 +-
 .../espresso/substitutions/VersionFilter.java        | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_reflect_ProxyGenerator.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_reflect_ProxyGenerator.java
index 5e2aaa7bc249..0f0b5f7db69e 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_reflect_ProxyGenerator.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_reflect_ProxyGenerator.java
@@ -33,7 +33,7 @@
 @EspressoSubstitutions
 public final class Target_java_lang_reflect_ProxyGenerator {
 
-    @Substitution(versionFilter = VersionFilter.Java8OrEarlier.class)
+    @Substitution(versionFilter = VersionFilter.Java9OrLater.class)
     abstract static class GenerateProxyClass extends SubstitutionNode {
 
         abstract @JavaType(byte[].class) StaticObject execute(
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java
index f75994215630..1cbcba54b238 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java
@@ -53,6 +53,18 @@ public boolean isValidFor(JavaVersion version) {
         }
     }
 
+    final class Java9OrLater implements VersionFilter {
+        public static final Java9OrLater INSTANCE = new Java9OrLater();
+
+        private Java9OrLater() {
+        }
+
+        @Override
+        public boolean isValidFor(JavaVersion version) {
+            return version.java9OrLater();
+        }
+    }
+
     final class Java11OrEarlier implements VersionFilter {
         public static final Java11OrEarlier INSTANCE = new Java11OrEarlier();
 

From 211ea12a3f141589a06807f6c7c7b9a3759bd4a6 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Fri, 17 Sep 2021 12:11:32 +0200
Subject: [PATCH 019/681] delay entering truffle context for logging

---
 .../src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index 8200ed62b886..818fc245701c 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -1105,12 +1105,13 @@ public Object call() {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            boolean entered = controller.enterTruffleContext();
+                            boolean entered = false;
                             CommandResult commandResult = new CommandResult(reply);
                             try {
                                 ThreadJob<?>.JobResult<?> result = job.getResult();
                                 writeMethodResult(reply, context, result);
                             } catch (Throwable t) {
+                                entered = controller.enterTruffleContext();
                                 reply.errorCode(ErrorCodes.INTERNAL);
                                 // Checkstyle: stop allow error output
                                 if (entered) {
@@ -1286,12 +1287,13 @@ public Object call() throws Exception {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            boolean entered = controller.enterTruffleContext();
+                            boolean entered = false;
                             CommandResult commandResult = new CommandResult(reply);
                             try {
                                 ThreadJob<?>.JobResult<?> result = job.getResult();
                                 writeMethodResult(reply, context, result);
                             } catch (Throwable t) {
+                                entered = controller.enterTruffleContext();
                                 reply.errorCode(ErrorCodes.INTERNAL);
                                 // Checkstyle: stop allow error output
                                 if (entered) {
@@ -1783,12 +1785,13 @@ public Object call() throws Exception {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            boolean entered = controller.enterTruffleContext();
+                            boolean entered = false;
                             CommandResult commandResult = new CommandResult(reply);
                             try {
                                 ThreadJob<?>.JobResult<?> result = job.getResult();
                                 writeMethodResult(reply, context, result);
                             } catch (Throwable t) {
+                                entered = controller.enterTruffleContext();
                                 reply.errorCode(ErrorCodes.INTERNAL);
                                 // Checkstyle: stop allow error output
                                 if (entered) {

From d9d7eb09fe7546c7b254102a6d5c39f15d2c202d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Fri, 17 Sep 2021 12:13:26 +0200
Subject: [PATCH 020/681] Use labsjdk-ce-11 in SVM gates

---
 substratevm/ci_includes/gate.hocon | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/substratevm/ci_includes/gate.hocon b/substratevm/ci_includes/gate.hocon
index fe41f3535dbf..4f2577c9ba32 100644
--- a/substratevm/ci_includes/gate.hocon
+++ b/substratevm/ci_includes/gate.hocon
@@ -25,8 +25,8 @@ builds += [
   ${oraclejdk8} ${svm-common-darwin-gate} ${gate-svm-js} {
     name: "gate-svm-darwin-js"
   }
-  ${labsjdk-ee-11} ${svm-common-linux-gate} ${linux-deploy} {
-    name: "gate-svm-build-ee-11"
+  ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
+    name: "gate-svm-build-ce-11"
     downloads: {
       "MUSL_LIBS": {
         "name": "musl-libs",
@@ -43,7 +43,7 @@ builds += [
       ${svm-cmd-gate} ["build,helloworld,test,maven,nativeimagehelp,muslcbuild"]
     ]
   }
-  ${labsjdk-ee-11} ${svm-common-linux-gate} ${linux-deploy} {
+  ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
     name: "gate-svm-modules-basic"
     run: [
       ${svm-cmd-gate} ["build,hellomodule,test"]

From 261096af485656b177825e60d59fa60f746bb8a7 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 17 Sep 2021 15:14:37 +0300
Subject: [PATCH 021/681] Add native-image heap size limit in GraalVM
 documentation

---
 docs/reference-manual/native-image/MemoryManagement.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/reference-manual/native-image/MemoryManagement.md b/docs/reference-manual/native-image/MemoryManagement.md
index 6e3fb95e37f8..3df61764ff52 100644
--- a/docs/reference-manual/native-image/MemoryManagement.md
+++ b/docs/reference-manual/native-image/MemoryManagement.md
@@ -48,7 +48,7 @@ Note: The maximum heap size is only the upper limit for the Java heap and not ne
 
 The *Serial GC* is optimized for low footprint and small Java heap sizes.
 If no other GC is specified, the Serial GC will be used implicitly as the default on both GraalVM Community and Enterprise Edition.
-Since GraalVM 20.3, it is also possible to explicitly enable the Serial GC by passing the option `--gc=serial` to the native image builder.
+It is also possible to explicitly enable the Serial GC by passing the option `--gc=serial` to the native image builder.
 
 ```shell
 # Build a native image that uses the serial GC with default settings
@@ -75,6 +75,8 @@ Note that this is just the maximum value.
 Depending on the application, the amount of actually used Java heap memory can be much lower.
 To override this default behavior, either specify a value for `-XX:MaximumHeapSizePercent` or explicitly set the maximum [Java heap size](#java-heap-size).
 
+Be mindful that the GC needs some extra memory when performing a garbage collection (2x is the worst case, usually it significantly less). Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (having little memory available, such as a container).
+
 ### Performance Tuning
 
 For tuning the GC performance and the memory footprint, the following options can be used:

From 73054492c3e6c792274ce332be0b7663ef6aaa89 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 17 Sep 2021 15:15:51 +0300
Subject: [PATCH 022/681] Minor correction

---
 docs/reference-manual/native-image/MemoryManagement.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference-manual/native-image/MemoryManagement.md b/docs/reference-manual/native-image/MemoryManagement.md
index 3df61764ff52..7d95c6a9df5d 100644
--- a/docs/reference-manual/native-image/MemoryManagement.md
+++ b/docs/reference-manual/native-image/MemoryManagement.md
@@ -75,7 +75,7 @@ Note that this is just the maximum value.
 Depending on the application, the amount of actually used Java heap memory can be much lower.
 To override this default behavior, either specify a value for `-XX:MaximumHeapSizePercent` or explicitly set the maximum [Java heap size](#java-heap-size).
 
-Be mindful that the GC needs some extra memory when performing a garbage collection (2x is the worst case, usually it significantly less). Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (having little memory available, such as a container).
+Be mindful that the GC needs some extra memory when performing a garbage collection (2x is the worst case, usually it significantly less). Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (such as a container).
 
 ### Performance Tuning
 

From 3be82c34b62c2a08fbb13664399e0b8871c67e16 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 17 Sep 2021 15:50:33 +0300
Subject: [PATCH 023/681] Follow Ch. Haeubl comment

---
 docs/reference-manual/native-image/MemoryManagement.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/reference-manual/native-image/MemoryManagement.md b/docs/reference-manual/native-image/MemoryManagement.md
index 7d95c6a9df5d..f39af9332cd5 100644
--- a/docs/reference-manual/native-image/MemoryManagement.md
+++ b/docs/reference-manual/native-image/MemoryManagement.md
@@ -75,7 +75,8 @@ Note that this is just the maximum value.
 Depending on the application, the amount of actually used Java heap memory can be much lower.
 To override this default behavior, either specify a value for `-XX:MaximumHeapSizePercent` or explicitly set the maximum [Java heap size](#java-heap-size).
 
-Be mindful that the GC needs some extra memory when performing a garbage collection (2x is the worst case, usually it significantly less). Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (such as a container).
+Be mindful that the GC needs some extra memory when performing a garbage collection (2x of the maximum heap size is the worst case, usually, it is significantly less).
+Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (such as a container).
 
 ### Performance Tuning
 

From b06c8c4b720eb30cd1353cbedd13d256fa9c7463 Mon Sep 17 00:00:00 2001
From: Kevin Menard <kevin.menard@shopify.com>
Date: Mon, 13 Sep 2021 16:19:25 -0400
Subject: [PATCH 024/681] TRegex: Add ASCII encoding to reduce range of Unicode
 char sets to ASCII if match string is ASCII-only.

---
 regex/CHANGELOG.md                            |   4 +
 .../oracle/truffle/regex/RegexOptions.java    |   3 +
 .../tregex/nodes/TRegexExecutorNode.java      |   2 +-
 .../parser/flavors/RubyFlavorProcessor.java   |   8 ++
 .../regex/tregex/string/Encodings.java        |  63 +++++++++-
 .../regex/tregex/string/StringASCII.java      | 112 ++++++++++++++++++
 .../tregex/string/StringBufferASCII.java      |  85 +++++++++++++
 7 files changed, 274 insertions(+), 3 deletions(-)
 create mode 100644 regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringASCII.java
 create mode 100644 regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringBufferASCII.java

diff --git a/regex/CHANGELOG.md b/regex/CHANGELOG.md
index 51d1dc05d849..52fef7b9502f 100644
--- a/regex/CHANGELOG.md
+++ b/regex/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This changelog summarizes major changes between TRegex versions relevant to language implementors integrating TRegex into their language. This document will focus on API changes relevant to integrators of TRegex.
 
+## Version 22.0.0
+
+* Added new `ASCII` encoding that callers can use when compiling a regex to limit the range of code point matches to [0xx, 0x7f].
+
 ## Version 21.3.0
 
 * Support for case-insensitive matching in Ruby regular expressions.
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexOptions.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexOptions.java
index 87ce806df420..d573684d77e7 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexOptions.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexOptions.java
@@ -397,6 +397,9 @@ private int parseEncoding(int i) throws RegexSyntaxException {
                 throw optionsSyntaxErrorUnexpectedValue(iVal, Encodings.ALL_NAMES);
             }
             switch (src.charAt(iVal)) {
+                case 'A':
+                    encoding = Encodings.ASCII;
+                    return expectValue(iVal, Encodings.ASCII.getName(), Encodings.ALL_NAMES);
                 case 'B':
                     encoding = Encodings.LATIN_1;
                     return expectValue(iVal, "BYTES", Encodings.ALL_NAMES);
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
index 36fbe87585c0..4452e0fd89c8 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
@@ -182,7 +182,7 @@ public int inputReadAndDecode(TRegexExecutorLocals locals, int index) {
                 return codepoint | (c & (0xff >>> nBytes)) << (6 * (nBytes - 1));
             }
         } else {
-            assert getEncoding() == Encodings.UTF_16_RAW || getEncoding() == Encodings.UTF_32 || getEncoding() == Encodings.LATIN_1;
+            assert getEncoding() == Encodings.UTF_16_RAW || getEncoding() == Encodings.UTF_32 || getEncoding() == Encodings.LATIN_1 || getEncoding() == Encodings.ASCII;
             locals.setNextIndex(inputIncRaw(index));
             return inputReadRaw(locals);
         }
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyFlavorProcessor.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyFlavorProcessor.java
index e75d986e8c0c..74c7823fedf4 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyFlavorProcessor.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyFlavorProcessor.java
@@ -1088,10 +1088,18 @@ private void escape() {
     }
 
     private CodePointSet getUnicodeCharClass(char className) {
+        if (inSource.getEncoding() == Encodings.ASCII) {
+            return ASCII_CHAR_CLASSES.get(className);
+        }
+
         return trimToEncoding(UNICODE_CHAR_CLASSES.get(className));
     }
 
     private CodePointSet getUnicodePosixCharClass(String className) {
+        if (inSource.getEncoding() == Encodings.ASCII) {
+            return ASCII_POSIX_CHAR_CLASSES.get(className);
+        }
+
         return trimToEncoding(UNICODE_POSIX_CHAR_CLASSES.get(className));
     }
 
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/Encodings.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/Encodings.java
index 68a716a77458..8b8f2caf4a88 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/Encodings.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/Encodings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -62,8 +62,9 @@ public final class Encodings {
     public static final Encoding UTF_32 = new Encoding.UTF32();
     public static final Encoding UTF_16_RAW = new Encoding.UTF16Raw();
     public static final Encoding LATIN_1 = new Encoding.Latin1();
+    public static final Encoding ASCII = new Encoding.Ascii();
 
-    public static final String[] ALL_NAMES = {UTF_8.getName(), UTF_16.getName(), UTF_16_RAW.getName(), UTF_32.getName(), LATIN_1.getName(), "BYTES"};
+    public static final String[] ALL_NAMES = {UTF_8.getName(), UTF_16.getName(), UTF_16_RAW.getName(), UTF_32.getName(), ASCII.getName(), LATIN_1.getName(), "BYTES"};
 
     public static Encoding getEncoding(String name) {
         switch (name) {
@@ -518,5 +519,63 @@ public Matchers toMatchers(Builder matchersBuilder) {
                 return new Matchers.SimpleMatchers(matchersBuilder.materialize(0), matchersBuilder.getNoMatchSuccessor());
             }
         }
+
+        public static final class Ascii extends Encoding {
+
+            @Override
+            public String getName() {
+                return "ASCII";
+            }
+
+            @Override
+            public int getMaxValue() {
+                return 0x7f;
+            }
+
+            @Override
+            public CodePointSet getFullSet() {
+                return Constants.ASCII_RANGE;
+            }
+
+            @Override
+            public int getEncodedSize(int codepoint) {
+                return 1;
+            }
+
+            @Override
+            public boolean isFixedCodePointWidth(CodePointSet set) {
+                return true;
+            }
+
+            @Override
+            public boolean isUnicode() {
+                return false;
+            }
+
+            @Override
+            public AbstractStringBuffer createStringBuffer(int capacity) {
+                return new StringBufferASCII(capacity);
+            }
+
+            @Override
+            public LoopOptimizationNode extractLoopOptNode(CodePointSet cps) {
+                return new LoopOptIndexOfAnyByteNode(cps.inverseToByteArray(this));
+            }
+
+            @Override
+            public int getNumberOfDecodingSteps() {
+                return 1;
+            }
+
+            @Override
+            public void createMatcher(Builder matchersBuilder, int i, CodePointSet cps, CompilationBuffer compilationBuffer) {
+                matchersBuilder.getBuffer(0).set(i, CharMatchers.createMatcher(cps, compilationBuffer));
+            }
+
+            @Override
+            public Matchers toMatchers(Builder matchersBuilder) {
+                return new Matchers.SimpleMatchers(matchersBuilder.materialize(0), matchersBuilder.getNoMatchSuccessor());
+            }
+        }
     }
 }
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringASCII.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringASCII.java
new file mode 100644
index 000000000000..a1deb4121034
--- /dev/null
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringASCII.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.regex.tregex.string;
+
+import java.util.Arrays;
+
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+
+public final class StringASCII implements AbstractString {
+
+    @CompilationFinal(dimensions = 1) private final byte[] str;
+
+    public StringASCII(byte[] str) {
+        this.str = str;
+    }
+
+    @Override
+    public int encodedLength() {
+        return str.length;
+    }
+
+    @Override
+    public Object content() {
+        return str;
+    }
+
+    @Override
+    public String toString() {
+        return defaultToString();
+    }
+
+    @Override
+    public StringASCII substring(int start, int end) {
+        return new StringASCII(Arrays.copyOfRange(str, start, end));
+    }
+
+    @Override
+    public boolean regionMatches(int offset, AbstractString other, int ooffset, int encodedLength) {
+        byte[] o = ((StringASCII) other).str;
+        if (offset + encodedLength > str.length || ooffset + encodedLength > o.length) {
+            return false;
+        }
+        for (int i = 0; i < encodedLength; i++) {
+            if (str[offset + i] != o[ooffset + i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public AbstractStringIterator iterator() {
+        return new StringASCIIIterator(str);
+    }
+
+    private static final class StringASCIIIterator extends AbstractStringIterator {
+
+        private final byte[] str;
+
+        private StringASCIIIterator(byte[] str) {
+            this.str = str;
+        }
+
+        @Override
+        public boolean hasNext() {
+            return i < str.length;
+        }
+
+        @Override
+        public int nextInt() {
+            return Byte.toUnsignedInt(str[i++]);
+        }
+    }
+}
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringBufferASCII.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringBufferASCII.java
new file mode 100644
index 000000000000..950806d27bcf
--- /dev/null
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/string/StringBufferASCII.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.regex.tregex.string;
+
+import com.oracle.truffle.regex.tregex.buffer.ByteArrayBuffer;
+import com.oracle.truffle.regex.tregex.string.Encodings.Encoding;
+
+public final class StringBufferASCII extends ByteArrayBuffer implements AbstractStringBuffer {
+
+    public StringBufferASCII() {
+        this(16);
+    }
+
+    public StringBufferASCII(int capacity) {
+        super(capacity);
+    }
+
+    @Override
+    public Encoding getEncoding() {
+        return Encodings.ASCII;
+    }
+
+    @Override
+    public void append(int codepoint) {
+        assert codepoint <= Encodings.ASCII.getMaxValue();
+        add((byte) codepoint);
+    }
+
+    @Override
+    public void appendOR(int c1, int c2) {
+        assert c1 <= Encodings.ASCII.getMaxValue();
+        assert c2 <= Encodings.ASCII.getMaxValue();
+        add((byte) (c1 | c2));
+    }
+
+    @Override
+    public void appendXOR(int c1, int c2) {
+        assert c1 <= Encodings.ASCII.getMaxValue();
+        assert c2 <= Encodings.ASCII.getMaxValue();
+        add((byte) (c1 ^ c2));
+    }
+
+    @Override
+    public StringASCII materialize() {
+        return new StringASCII(toArray());
+    }
+}

From 24f580349a6ef52b02fc148ec9406929cb954fb6 Mon Sep 17 00:00:00 2001
From: ol-automation_ww <ol-automation_ww@oracle.com>
Date: Fri, 17 Sep 2021 21:15:32 +0000
Subject: [PATCH 025/681] Update truffleruby import.

---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index d674654e2173..21bd52395c5f 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -57,7 +57,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "7dcb07a57591f45c032f463bf4ceec7a49495348",
+                "version": "bbd2a3362f8e84b9bcda5eda6cd3ad36f15d1966",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

From 838ffba4435b58dfe5811eb4356d6a8a54e4d27e Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Sun, 19 Sep 2021 21:21:23 +0200
Subject: [PATCH 026/681] Prepare next dev cycle

---
 compiler/mx.compiler/suite.py                 | 2 +-
 espresso/mx.espresso/suite.py                 | 2 +-
 regex/mx.regex/suite.py                       | 2 +-
 sdk/mx.sdk/suite.py                           | 2 +-
 substratevm/mx.substratevm/suite.py           | 2 +-
 tools/mx.tools/suite.py                       | 2 +-
 truffle/external_repos/simplelanguage/pom.xml | 2 +-
 truffle/external_repos/simplelanguage/sl      | 2 +-
 truffle/external_repos/simpletool/pom.xml     | 2 +-
 truffle/mx.truffle/suite.py                   | 2 +-
 vm/mx.vm/suite.py                             | 2 +-
 wasm/mx.wasm/suite.py                         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index a71c392fd794..c4d7d5abd557 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -4,7 +4,7 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "21.3.0",
+  "version" : "22.0.0",
   "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {
diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
index f45444818a1c..030b5f9e1f77 100644
--- a/espresso/mx.espresso/suite.py
+++ b/espresso/mx.espresso/suite.py
@@ -23,7 +23,7 @@
 suite = {
     "mxversion": "5.280.5",
     "name": "espresso",
-    "version" : "21.3.0",
+    "version" : "22.0.0",
     "release" : False,
     "groupId" : "org.graalvm.espresso",
     "url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
diff --git a/regex/mx.regex/suite.py b/regex/mx.regex/suite.py
index 35df7f695662..7b1cfb295a93 100644
--- a/regex/mx.regex/suite.py
+++ b/regex/mx.regex/suite.py
@@ -43,7 +43,7 @@
 
   "name" : "regex",
 
-  "version" : "21.3.0",
+  "version" : "22.0.0",
   "release" : False,
   "groupId" : "org.graalvm.regex",
   "url" : "http://www.graalvm.org/",
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
index e437c7f85251..15bee000c6b5 100644
--- a/sdk/mx.sdk/suite.py
+++ b/sdk/mx.sdk/suite.py
@@ -41,7 +41,7 @@
 suite = {
   "mxversion" : "5.309.1",
   "name" : "sdk",
-  "version" : "21.3.0",
+  "version" : "22.0.0",
   "release" : False,
   "sourceinprojectwhitelist" : [],
   "url" : "https://github.com/oracle/graal",
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 31e8543fad08..0c863b180c16 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -2,7 +2,7 @@
 suite = {
     "mxversion": "5.308.1",
     "name": "substratevm",
-    "version" : "21.3.0",
+    "version" : "22.0.0",
     "release" : False,
     "url" : "https://github.com/oracle/graal/tree/master/substratevm",
 
diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
index 090f4b1839b9..c1194e2f16f7 100644
--- a/tools/mx.tools/suite.py
+++ b/tools/mx.tools/suite.py
@@ -26,7 +26,7 @@
     "defaultLicense" : "GPLv2-CPE",
 
     "groupId" : "org.graalvm.tools",
-    "version" : "21.3.0",
+    "version" : "22.0.0",
     "release" : False,
     "url" : "http://openjdk.java.net/projects/graal",
     "developer" : {
diff --git a/truffle/external_repos/simplelanguage/pom.xml b/truffle/external_repos/simplelanguage/pom.xml
index fcb929984906..dd31d304f740 100644
--- a/truffle/external_repos/simplelanguage/pom.xml
+++ b/truffle/external_repos/simplelanguage/pom.xml
@@ -48,7 +48,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <m2e.apt.activation>jdt_apt</m2e.apt.activation>
     <!-- If you update this number make sure the VERSION value in ./sl matches -->
-    <graalvm.version>21.3.0-dev</graalvm.version>
+    <graalvm.version>22.0.0-dev</graalvm.version>
   </properties>
   <packaging>pom</packaging>
   <modules>
diff --git a/truffle/external_repos/simplelanguage/sl b/truffle/external_repos/simplelanguage/sl
index 9a87b90ff32a..5cc73def802d 100755
--- a/truffle/external_repos/simplelanguage/sl
+++ b/truffle/external_repos/simplelanguage/sl
@@ -41,7 +41,7 @@
 #
 
 # If you update this number make sure the graalvm.version value in ./pom.xml matches
-VERSION="21.3.0-dev"
+VERSION="22.0.0-dev"
 
 MAIN_CLASS="com.oracle.truffle.sl.launcher.SLMain"
 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd -P)"
diff --git a/truffle/external_repos/simpletool/pom.xml b/truffle/external_repos/simpletool/pom.xml
index 41e9c1cc8690..f34f4be02559 100644
--- a/truffle/external_repos/simpletool/pom.xml
+++ b/truffle/external_repos/simpletool/pom.xml
@@ -49,7 +49,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <graalvm.version>21.3.0-dev</graalvm.version>
+    <graalvm.version>22.0.0-dev</graalvm.version>
   </properties>
   <profiles>
     <profile>
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
index c926eb0743a0..c7fc6b56b372 100644
--- a/truffle/mx.truffle/suite.py
+++ b/truffle/mx.truffle/suite.py
@@ -41,7 +41,7 @@
 suite = {
   "mxversion" : "5.300.4",
   "name" : "truffle",
-  "version" : "21.3.0",
+  "version" : "22.0.0",
   "release" : False,
   "groupId" : "org.graalvm.truffle",
   "sourceinprojectwhitelist" : [],
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 5a0ed0bd459e..3eb70f303099 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -1,6 +1,6 @@
 suite = {
     "name": "vm",
-    "version" : "21.3.0",
+    "version" : "22.0.0",
     "mxversion" : "5.309.2",
     "release" : False,
     "groupId" : "org.graalvm",
diff --git a/wasm/mx.wasm/suite.py b/wasm/mx.wasm/suite.py
index 4bdff093cf08..d7e6ce21cdf2 100644
--- a/wasm/mx.wasm/suite.py
+++ b/wasm/mx.wasm/suite.py
@@ -42,7 +42,7 @@
   "mxversion" : "5.301.0",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
-  "version" : "21.3.0",
+  "version" : "22.0.0",
   "versionConflictResolution" : "latest",
   "url" : "http://graalvm.org/",
   "developer" : {

From bfdae8274fd2730a075d038aad35ce61189011c6 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 23 Aug 2021 08:55:13 +0200
Subject: [PATCH 027/681] compiler: use WorkSnippetID instead snippet info

---
 .../arraycopy/ArrayCopySnippets.java          | 72 ++++++++++++-------
 .../ArrayCopyWithDelayedLoweringNode.java     |  9 ++-
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index dea3f0910c52..fe39750896af 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -119,9 +119,6 @@ protected boolean useOriginalArraycopy() {
      * array copy might be {@linkplain Templates#lower(ArrayCopyNode, boolean, LoweringTool)
      * expanded}.
      *
-     * @param workSnippet is always {@link #exactArraycopyWithSlowPathWork} which calls
-     *            {@link #doExactArraycopyWithSlowPathWork}
-     *
      * @see Templates#lower(ArrayCopyNode, boolean, LoweringTool)
      * @see #exactArraycopyWithSlowPathWork
      * @see #doExactArraycopyWithSlowPathWork
@@ -129,8 +126,8 @@ protected boolean useOriginalArraycopy() {
     @SuppressWarnings("unused")
     @Snippet
     public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
-                    @ConstantParameter SnippetInfo workSnippet, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity,
-                    @ConstantParameter SnippetCounter elementKindCounter, @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
+                    @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity, @ConstantParameter SnippetCounter elementKindCounter,
+                    @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
@@ -140,23 +137,19 @@ public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destP
         elementKindCounter.inc();
         elementKindCopiedCounter.add(length);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, workSnippet, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.exactArraycopyWithSlowPathWork, elementKind);
     }
 
     /**
      * Snippet that performs a stub call for an {@linkplain ArrayCopy#isExact() exact} array copy.
      *
-     * @param workSnippet is always {@link #exactArraycopyWithSlowPathWork} which calls
-     *            {@link #doExactArraycopyWithSlowPathWork}
-     *
      * @see #exactArraycopyWithSlowPathWork
      * @see #doExactArraycopyWithSlowPathWork
      */
-    @SuppressWarnings("unused")
     @Snippet
     public void arraycopyExactStubCallSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
-                    @ConstantParameter SnippetInfo workSnippet, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity,
-                    @ConstantParameter SnippetCounter elementKindCounter, @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
+                    @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity, @ConstantParameter SnippetCounter elementKindCounter,
+                    @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
@@ -173,38 +166,33 @@ public void arraycopyExactStubCallSnippet(Object src, int srcPos, Object dest, i
      * Performs an array copy with a type check for every store. At least one of the involved
      * objects is known to be an object array. Lowering is delayed using an
      * {@link ArrayCopyWithDelayedLoweringNode}.
-     *
-     * @param workSnippet is always {@link #checkcastArraycopyWithSlowPathWork} which calls
-     *            {@link #doCheckcastArraycopyWithSlowPathWork}
      */
     @Snippet
     public void arraycopyCheckcastSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck, @ConstantParameter Counters counters,
-                    @ConstantParameter SnippetInfo workSnippet, @ConstantParameter JavaKind elementKind) {
+                    @ConstantParameter JavaKind elementKind) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
         checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length, counters);
         incrementLengthCounter(length, counters);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, workSnippet, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.checkcastArraycopyWithSlowPathWork, elementKind);
     }
 
     /**
      * Performs an array copy using a generic stub. Used when we do not know anything about the
      * object types. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode}.
-     *
-     * @param workSnippet is always {@link #genericArraycopyWithSlowPathWork}
      */
     @Snippet
     public void arraycopyGenericSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck, @ConstantParameter Counters counters,
-                    @ConstantParameter SnippetInfo workSnippet, @ConstantParameter JavaKind elementKind) {
+                    @ConstantParameter JavaKind elementKind) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
         checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length, counters);
         incrementLengthCounter(length, counters);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, workSnippet, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.genericArraycopyWithSlowPathWork, elementKind);
     }
 
     /**
@@ -391,6 +379,27 @@ void createArraycopyCounter(JavaKind kind, Group counters, Group copiedCounters)
         }
     }
 
+    /**
+     * Identifies snippets used for {@linkplain ArrayCopyWithDelayedLoweringNode delayed lowering}
+     * of {@link ArrayCopyNode}.
+     *
+     * @see Templates#getSnippet(WorkSnippetID)
+     */
+    public enum WorkSnippetID {
+        /**
+         * @see ArrayCopySnippets#exactArraycopyWithSlowPathWork
+         */
+        exactArraycopyWithSlowPathWork,
+        /**
+         * @see ArrayCopySnippets#checkcastArraycopyWithSlowPathWork
+         */
+        checkcastArraycopyWithSlowPathWork,
+        /**
+         * @see ArrayCopySnippets#genericArraycopyWithSlowPathWork
+         */
+        genericArraycopyWithSlowPathWork;
+    }
+
     public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final SnippetInfo arraycopyGenericSnippet;
         private final SnippetInfo arraycopyExactSnippet;
@@ -421,6 +430,18 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
             exactArraycopyWithSlowPathWork = snippet(receiver, "exactArraycopyWithSlowPathWork");
         }
 
+        private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
+            switch (workSnippetID) {
+                case exactArraycopyWithSlowPathWork:
+                    return exactArraycopyWithSlowPathWork;
+                case checkcastArraycopyWithSlowPathWork:
+                    return checkcastArraycopyWithSlowPathWork;
+                case genericArraycopyWithSlowPathWork:
+                    return genericArraycopyWithSlowPathWork;
+            }
+            throw GraalError.shouldNotReachHere(workSnippetID.toString());
+        }
+
         protected SnippetInfo snippet(ArrayCopySnippets receiver, String methodName) {
             SnippetInfo info = snippet(ArrayCopySnippets.class, methodName, originalArraycopy(), receiver, LocationIdentity.any());
             return info;
@@ -439,7 +460,7 @@ public void lower(ArrayCopyNode arraycopy, LoweringTool tool) {
         public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, LoweringTool tool) {
             JavaKind elementKind = ArrayCopy.selectComponentKind(arraycopy);
             SnippetInfo snippetInfo;
-            ArrayCopyTypeCheck arrayTypeCheck;
+            final ArrayCopyTypeCheck arrayTypeCheck;
 
             ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT));
             ResolvedJavaType destType = StampTool.typeOrNull(arraycopy.getDestination().stamp(NodeView.DEFAULT));
@@ -513,7 +534,6 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             Object locationIdentity = arraycopy.killsAnyLocation() ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(elementKind);
             if (snippetInfo == arraycopyExactStubCallSnippet || snippetInfo == arraycopyExactSnippet) {
                 assert elementKind != null;
-                args.addConst("workSnippet", exactArraycopyWithSlowPathWork);
                 args.addConst("elementKind", elementKind);
                 args.addConst("locationIdentity", locationIdentity);
                 args.addConst("elementKindCounter", counters.arraycopyCallCounters.get(elementKind));
@@ -521,11 +541,9 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             }
             args.addConst("counters", counters);
             if (snippetInfo == arraycopyCheckcastSnippet) {
-                args.addConst("workSnippet", checkcastArraycopyWithSlowPathWork);
                 args.addConst("elementKind", JavaKind.Illegal);
             }
             if (snippetInfo == arraycopyGenericSnippet) {
-                args.addConst("workSnippet", genericArraycopyWithSlowPathWork);
                 args.addConst("elementKind", JavaKind.Illegal);
             }
 
@@ -539,7 +557,8 @@ public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, LoweringTool tool)
         public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, boolean mayExpandArraycopyLoops, LoweringTool tool) {
             StructuredGraph graph = arraycopy.graph();
 
-            if (arraycopy.getSnippet() == exactArraycopyWithSlowPathWork && mayExpandArraycopyLoops) {
+            SnippetInfo snippetInfo = getSnippet(arraycopy.getSnippet());
+            if (snippetInfo == exactArraycopyWithSlowPathWork && mayExpandArraycopyLoops) {
                 if (!graph.getGuardsStage().areDeoptsFixed()) {
                     // Don't lower until floating guards are fixed.
                     return;
@@ -551,7 +570,6 @@ public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, boolean mayExpandA
                 }
             }
 
-            SnippetInfo snippetInfo = arraycopy.getSnippet();
             Arguments args = new Arguments(snippetInfo, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("src", arraycopy.getSource());
             args.add("srcPos", arraycopy.getSourcePosition());
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index add1e53c7cae..62fd8e99c7a3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -29,7 +29,6 @@
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.replacements.SnippetTemplate;
 import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
 
 import jdk.vm.ci.code.BytecodeFrame;
@@ -57,19 +56,19 @@ public final class ArrayCopyWithDelayedLoweringNode extends BasicArrayCopyNode {
 
     public static final NodeClass<ArrayCopyWithDelayedLoweringNode> TYPE = NodeClass.create(ArrayCopyWithDelayedLoweringNode.class);
 
-    private final SnippetTemplate.SnippetInfo snippet;
+    private final ArrayCopySnippets.WorkSnippetID snippet;
 
-    public ArrayCopyWithDelayedLoweringNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, SnippetTemplate.SnippetInfo snippet, JavaKind elementKind) {
+    public ArrayCopyWithDelayedLoweringNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, ArrayCopySnippets.WorkSnippetID snippet, JavaKind elementKind) {
         super(TYPE, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
         assert StampTool.isPointerNonNull(src) && StampTool.isPointerNonNull(dest) : "must have been null checked";
         this.snippet = snippet;
     }
 
     @NodeIntrinsic
-    public static native void arraycopy(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, @ConstantNodeParameter SnippetTemplate.SnippetInfo snippet,
+    public static native void arraycopy(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, @ConstantNodeParameter ArrayCopySnippets.WorkSnippetID snippet,
                     @ConstantNodeParameter JavaKind elementKind);
 
-    public SnippetTemplate.SnippetInfo getSnippet() {
+    public ArrayCopySnippets.WorkSnippetID getSnippet() {
         return snippet;
     }
 

From ce178618d054c165ddcb1487e12682100df0249b Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 12:25:49 +0200
Subject: [PATCH 028/681] compiler: ArrayCopyWithDelayedLoweringNode should
 store its lowering stage

---
 .../compiler/nodes/StructuredGraph.java       |  4 +++
 .../arraycopy/ArrayCopySnippets.java          | 31 ++++++-------------
 .../ArrayCopyWithDelayedLoweringNode.java     | 21 +++++++------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 100cae11097a..981440d03157 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -133,6 +133,10 @@ public boolean areDeoptsFixed() {
         public boolean requiresValueProxies() {
             return this != AFTER_FSA;
         }
+
+        public boolean reachedStage(GuardsStage stage) {
+            return this.ordinal() >= stage.ordinal();
+        }
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index fe39750896af..ebe27004f309 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -48,6 +48,7 @@
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.type.StampTool;
@@ -137,7 +138,8 @@ public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destP
         elementKindCounter.inc();
         elementKindCopiedCounter.add(length);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.exactArraycopyWithSlowPathWork, elementKind);
+        // Don't lower until floating guards are fixed.
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.exactArraycopyWithSlowPathWork, GuardsStage.FIXED_DEOPTS, elementKind);
     }
 
     /**
@@ -176,7 +178,8 @@ public void arraycopyCheckcastSnippet(Object src, int srcPos, Object dest, int d
         checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length, counters);
         incrementLengthCounter(length, counters);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.checkcastArraycopyWithSlowPathWork, elementKind);
+        // Don't lower until frame states are assigned to deoptimization points.
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.checkcastArraycopyWithSlowPathWork, GuardsStage.AFTER_FSA, elementKind);
     }
 
     /**
@@ -192,7 +195,8 @@ public void arraycopyGenericSnippet(Object src, int srcPos, Object dest, int des
         checkLimits(nonNullSrc, srcPos, nonNullDest, destPos, length, counters);
         incrementLengthCounter(length, counters);
 
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.genericArraycopyWithSlowPathWork, elementKind);
+        // Don't lower until frame states are assigned to deoptimization points.
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.genericArraycopyWithSlowPathWork, GuardsStage.AFTER_FSA, elementKind);
     }
 
     /**
@@ -551,26 +555,11 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
         }
 
         public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, LoweringTool tool) {
-            lower(arraycopy, false, tool);
-        }
-
-        public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, boolean mayExpandArraycopyLoops, LoweringTool tool) {
-            StructuredGraph graph = arraycopy.graph();
-
-            SnippetInfo snippetInfo = getSnippet(arraycopy.getSnippet());
-            if (snippetInfo == exactArraycopyWithSlowPathWork && mayExpandArraycopyLoops) {
-                if (!graph.getGuardsStage().areDeoptsFixed()) {
-                    // Don't lower until floating guards are fixed.
-                    return;
-                }
-            } else {
-                if (!graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                    // Don't lower until frame states are assigned to deoptimization points.
-                    return;
-                }
+            if (!arraycopy.reachedLoweringStage()) {
+                return;
             }
 
-            Arguments args = new Arguments(snippetInfo, graph.getGuardsStage(), tool.getLoweringStage());
+            Arguments args = new Arguments(getSnippet(arraycopy.getSnippet()), arraycopy.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("src", arraycopy.getSource());
             args.add("srcPos", arraycopy.getSourcePosition());
             args.add("dest", arraycopy.getDestination());
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index 62fd8e99c7a3..e16a19f5d65c 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -27,6 +27,7 @@
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
@@ -41,15 +42,8 @@
  * is delayed to avoid unfavorable interaction with other phases (floating guards, frame state
  * assignment, etc.).
  *
- * Depending on the {@link #snippet}, lowering is delayed until either
- * {@linkplain org.graalvm.compiler.nodes.StructuredGraph.GuardsStage#areDeoptsFixed() floating
- * guards are fixed} or
- * {@linkplain org.graalvm.compiler.nodes.StructuredGraph.GuardsStage#areFrameStatesAtDeopts() frame
- * states are assigned to deoptimization points}. See
- * {@link ArrayCopySnippets.Templates#lower(ArrayCopyWithDelayedLoweringNode, boolean, org.graalvm.compiler.nodes.spi.LoweringTool)}
- * for more details.
- *
  * @see ArrayCopyNode
+ * @see ArrayCopySnippets
  */
 @NodeInfo(allowedUsageTypes = InputType.Memory)
 public final class ArrayCopyWithDelayedLoweringNode extends BasicArrayCopyNode {
@@ -57,16 +51,19 @@ public final class ArrayCopyWithDelayedLoweringNode extends BasicArrayCopyNode {
     public static final NodeClass<ArrayCopyWithDelayedLoweringNode> TYPE = NodeClass.create(ArrayCopyWithDelayedLoweringNode.class);
 
     private final ArrayCopySnippets.WorkSnippetID snippet;
+    private final StructuredGraph.GuardsStage delayUntil;
 
-    public ArrayCopyWithDelayedLoweringNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, ArrayCopySnippets.WorkSnippetID snippet, JavaKind elementKind) {
+    public ArrayCopyWithDelayedLoweringNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, ArrayCopySnippets.WorkSnippetID snippet,
+                    StructuredGraph.GuardsStage delayUntil, JavaKind elementKind) {
         super(TYPE, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
         assert StampTool.isPointerNonNull(src) && StampTool.isPointerNonNull(dest) : "must have been null checked";
         this.snippet = snippet;
+        this.delayUntil = delayUntil;
     }
 
     @NodeIntrinsic
     public static native void arraycopy(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, @ConstantNodeParameter ArrayCopySnippets.WorkSnippetID snippet,
-                    @ConstantNodeParameter JavaKind elementKind);
+                    @ConstantNodeParameter StructuredGraph.GuardsStage delayUntil, @ConstantNodeParameter JavaKind elementKind);
 
     public ArrayCopySnippets.WorkSnippetID getSnippet() {
         return snippet;
@@ -75,4 +72,8 @@ public ArrayCopySnippets.WorkSnippetID getSnippet() {
     public void setBci(int bci) {
         this.bci = bci;
     }
+
+    public boolean reachedLoweringStage() {
+        return graph().getGuardsStage().reachedStage(delayUntil);
+    }
 }

From 3853dc6c367d4972571fc9d34fad394d2a351f9a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 13:27:26 +0200
Subject: [PATCH 029/681] compiler: rename arraycopyExactSnippet to
 delayedExactArraycopyWithSlowPathWork

---
 .../arraycopy/ArrayCopySnippets.java          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index ebe27004f309..8501039b1b29 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -118,7 +118,8 @@ protected boolean useOriginalArraycopy() {
     /**
      * Snippet that performs an {@linkplain ArrayCopy#isExact() exact} array copy. Used when the
      * array copy might be {@linkplain Templates#lower(ArrayCopyNode, boolean, LoweringTool)
-     * expanded}.
+     * expanded}. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode} which will
+     * dispatch to {@link #exactArraycopyWithSlowPathWork}.
      *
      * @see Templates#lower(ArrayCopyNode, boolean, LoweringTool)
      * @see #exactArraycopyWithSlowPathWork
@@ -126,7 +127,7 @@ protected boolean useOriginalArraycopy() {
      */
     @SuppressWarnings("unused")
     @Snippet
-    public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
+    public void delayedExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
                     @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity, @ConstantParameter SnippetCounter elementKindCounter,
                     @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
@@ -144,9 +145,6 @@ public void arraycopyExactSnippet(Object src, int srcPos, Object dest, int destP
 
     /**
      * Snippet that performs a stub call for an {@linkplain ArrayCopy#isExact() exact} array copy.
-     *
-     * @see #exactArraycopyWithSlowPathWork
-     * @see #doExactArraycopyWithSlowPathWork
      */
     @Snippet
     public void arraycopyExactStubCallSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
@@ -214,7 +212,8 @@ public static void arraycopyNativeSnippet(Object src, int srcPos, Object dest, i
     }
 
     /**
-     * @see #doExactArraycopyWithSlowPathWork
+     * Inlines a loop that performs an {@linkplain ArrayCopy#isExact() exact} element-by-element
+     * array copy. The explict loop allows subsequent phases to optimize the code.
      */
     @SuppressWarnings("unused")
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
@@ -224,8 +223,7 @@ public void exactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest,
     }
 
     /**
-     * Inlines a loop that performs an {@linkplain ArrayCopy#isExact() exact} element-by-element
-     * array copy. The explict loop allows subsequent phases to optimize the code.
+     * @see #exactArraycopyWithSlowPathWork
      */
     protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters,
                     MetaAccessProvider metaAccess);
@@ -406,7 +404,7 @@ public enum WorkSnippetID {
 
     public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final SnippetInfo arraycopyGenericSnippet;
-        private final SnippetInfo arraycopyExactSnippet;
+        private final SnippetInfo delayedExactArraycopyWithSlowPathWork;
         private final SnippetInfo arraycopyExactStubCallSnippet;
         private final SnippetInfo arraycopyCheckcastSnippet;
         private final SnippetInfo arraycopyNativeSnippet;
@@ -425,7 +423,7 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
 
             useOriginalArraycopy = receiver.useOriginalArraycopy();
             arraycopyGenericSnippet = snippet(receiver, "arraycopyGenericSnippet");
-            arraycopyExactSnippet = snippet(receiver, "arraycopyExactSnippet");
+            delayedExactArraycopyWithSlowPathWork = snippet(receiver, "delayedExactArraycopyWithSlowPathWork");
             arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet");
             arraycopyCheckcastSnippet = snippet(receiver, "arraycopyCheckcastSnippet");
             arraycopyNativeSnippet = snippet(null, "arraycopyNativeSnippet");
@@ -521,7 +519,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             }
 
             if (mayExpandThisArraycopy && snippetInfo == arraycopyExactStubCallSnippet) {
-                snippetInfo = arraycopyExactSnippet;
+                snippetInfo = delayedExactArraycopyWithSlowPathWork;
             }
 
             // create the snippet
@@ -536,7 +534,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                 args.addConst("arrayTypeCheck", arrayTypeCheck);
             }
             Object locationIdentity = arraycopy.killsAnyLocation() ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(elementKind);
-            if (snippetInfo == arraycopyExactStubCallSnippet || snippetInfo == arraycopyExactSnippet) {
+            if (snippetInfo == arraycopyExactStubCallSnippet || snippetInfo == delayedExactArraycopyWithSlowPathWork) {
                 assert elementKind != null;
                 args.addConst("elementKind", elementKind);
                 args.addConst("locationIdentity", locationIdentity);

From 4c8008ae1f4e07e9295b0ef44186071aba645045 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 13:27:44 +0200
Subject: [PATCH 030/681] compiler: rename arraycopyCheckcastSnippet to
 delayedCheckcastArraycopySnippet

---
 .../arraycopy/HotSpotArraycopySnippets.java   |  2 +-
 .../arraycopy/ArrayCopySnippets.java          | 45 ++++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index 0bc3530f26d4..89a6ae8ce7c2 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -116,7 +116,7 @@ protected void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object d
 
     @Override
     @SuppressWarnings("unused")
-    protected void doCheckcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
+    protected void doCheckcastArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
         if (probability(FREQUENT_PROBABILITY, length > 0)) {
             Object nonNullSrc = PiNode.asNonNullObject(src);
             Object nonNullDest = PiNode.asNonNullObject(dest);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 8501039b1b29..6f687f492402 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -165,11 +165,14 @@ public void arraycopyExactStubCallSnippet(Object src, int srcPos, Object dest, i
     /**
      * Performs an array copy with a type check for every store. At least one of the involved
      * objects is known to be an object array. Lowering is delayed using an
-     * {@link ArrayCopyWithDelayedLoweringNode}.
+     * {@link ArrayCopyWithDelayedLoweringNode} which will dispatch to
+     * {@link #checkcastArraycopySnippet}.
+     *
+     * @see #checkcastArraycopySnippet
      */
     @Snippet
-    public void arraycopyCheckcastSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck, @ConstantParameter Counters counters,
-                    @ConstantParameter JavaKind elementKind) {
+    public void delayedCheckcastArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
+                    @ConstantParameter Counters counters, @ConstantParameter JavaKind elementKind) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
@@ -177,7 +180,7 @@ public void arraycopyCheckcastSnippet(Object src, int srcPos, Object dest, int d
         incrementLengthCounter(length, counters);
 
         // Don't lower until frame states are assigned to deoptimization points.
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.checkcastArraycopyWithSlowPathWork, GuardsStage.AFTER_FSA, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.checkcastArraycopySnippet, GuardsStage.AFTER_FSA, elementKind);
     }
 
     /**
@@ -229,21 +232,19 @@ protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos,
                     MetaAccessProvider metaAccess);
 
     /**
-     * @see #doCheckcastArraycopyWithSlowPathWork
+     * Performs an array copy via fast checkcast stub.
      */
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
-    public void checkcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind,
+    public void checkcastArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind,
                     @ConstantParameter LocationIdentity arrayLocation,
                     @ConstantParameter Counters counters) {
-        doCheckcastArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
+        doCheckcastArraycopySnippet(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
     }
 
     /**
-     * Performs an array copy via {@link CheckcastArrayCopyCallNode}.
-     *
-     * @see CheckcastArrayCopyCallNode
+     * @see #checkcastArraycopySnippet
      */
-    protected abstract void doCheckcastArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
+    protected abstract void doCheckcastArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
 
     /**
      * Performs an array copy via {@link GenericArrayCopyCallNode}.
@@ -393,9 +394,9 @@ public enum WorkSnippetID {
          */
         exactArraycopyWithSlowPathWork,
         /**
-         * @see ArrayCopySnippets#checkcastArraycopyWithSlowPathWork
+         * @see ArrayCopySnippets#checkcastArraycopySnippet
          */
-        checkcastArraycopyWithSlowPathWork,
+        checkcastArraycopySnippet,
         /**
          * @see ArrayCopySnippets#genericArraycopyWithSlowPathWork
          */
@@ -406,9 +407,9 @@ public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final SnippetInfo arraycopyGenericSnippet;
         private final SnippetInfo delayedExactArraycopyWithSlowPathWork;
         private final SnippetInfo arraycopyExactStubCallSnippet;
-        private final SnippetInfo arraycopyCheckcastSnippet;
+        private final SnippetInfo delayedCheckcastArraycopySnippet;
         private final SnippetInfo arraycopyNativeSnippet;
-        private final SnippetInfo checkcastArraycopyWithSlowPathWork;
+        private final SnippetInfo checkcastArraycopySnippet;
         private final SnippetInfo genericArraycopyWithSlowPathWork;
         private final SnippetInfo exactArraycopyWithSlowPathWork;
 
@@ -425,9 +426,9 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
             arraycopyGenericSnippet = snippet(receiver, "arraycopyGenericSnippet");
             delayedExactArraycopyWithSlowPathWork = snippet(receiver, "delayedExactArraycopyWithSlowPathWork");
             arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet");
-            arraycopyCheckcastSnippet = snippet(receiver, "arraycopyCheckcastSnippet");
+            delayedCheckcastArraycopySnippet = snippet(receiver, "delayedCheckcastArraycopySnippet");
             arraycopyNativeSnippet = snippet(null, "arraycopyNativeSnippet");
-            checkcastArraycopyWithSlowPathWork = snippet(receiver, "checkcastArraycopyWithSlowPathWork");
+            checkcastArraycopySnippet = snippet(receiver, "checkcastArraycopySnippet");
             genericArraycopyWithSlowPathWork = snippet(receiver, "genericArraycopyWithSlowPathWork");
             exactArraycopyWithSlowPathWork = snippet(receiver, "exactArraycopyWithSlowPathWork");
         }
@@ -436,8 +437,8 @@ private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
             switch (workSnippetID) {
                 case exactArraycopyWithSlowPathWork:
                     return exactArraycopyWithSlowPathWork;
-                case checkcastArraycopyWithSlowPathWork:
-                    return checkcastArraycopyWithSlowPathWork;
+                case checkcastArraycopySnippet:
+                    return checkcastArraycopySnippet;
                 case genericArraycopyWithSlowPathWork:
                     return genericArraycopyWithSlowPathWork;
             }
@@ -492,7 +493,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                     if (!srcComponentType.isPrimitive() && !destComponentType.isPrimitive()) {
                         // it depends on the array content if the copy succeeds - we need
                         // a type check for every store
-                        snippetInfo = arraycopyCheckcastSnippet;
+                        snippetInfo = delayedCheckcastArraycopySnippet;
                         arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
                     } else {
                         // one object is an object array, the other one is a primitive array.
@@ -512,7 +513,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                     } else {
                         // one involved object is an object array - the other array's element type
                         // may be primitive or object, hence we compare the layout helper.
-                        snippetInfo = arraycopyCheckcastSnippet;
+                        snippetInfo = delayedCheckcastArraycopySnippet;
                         arrayTypeCheck = ArrayCopyTypeCheck.LAYOUT_HELPER_BASED_ARRAY_TYPE_CHECK;
                     }
                 }
@@ -542,7 +543,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                 args.addConst("elementKindCopiedCounter", counters.arraycopyCallCopiedCounters.get(elementKind));
             }
             args.addConst("counters", counters);
-            if (snippetInfo == arraycopyCheckcastSnippet) {
+            if (snippetInfo == delayedCheckcastArraycopySnippet) {
                 args.addConst("elementKind", JavaKind.Illegal);
             }
             if (snippetInfo == arraycopyGenericSnippet) {

From c10fa2f603ecb8e8a01eaa4a8ea569623703ad29 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 13:27:49 +0200
Subject: [PATCH 031/681] compiler: rename arraycopyGenericSnippet to
 delayedGenericArraycopySnippet

---
 .../arraycopy/HotSpotArraycopySnippets.java   | 19 ++++++
 .../arraycopy/ArrayCopySnippets.java          | 61 +++++++++----------
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index 89a6ae8ce7c2..dc239cdf7a08 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -33,6 +33,7 @@
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
+import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.PiNode;
@@ -44,6 +45,7 @@
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
 import org.graalvm.compiler.replacements.arraycopy.CheckcastArrayCopyCallNode;
+import org.graalvm.compiler.replacements.arraycopy.GenericArrayCopyCallNode;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
@@ -146,4 +148,21 @@ protected void doCheckcastArraycopySnippet(Object src, int srcPos, Object dest,
             }
         }
     }
+
+    @Override
+    protected void doGenericArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
+        // The length > 0 check should not be placed here because generic array copy stub should
+        // enforce type check. This is fine performance-wise because this snippet is rarely used.
+        counters.genericArraycopyDifferentTypeCounter.inc();
+        counters.genericArraycopyDifferentTypeCopiedCounter.add(length);
+        int copiedElements = GenericArrayCopyCallNode.genericArraycopy(src, srcPos, dest, destPos, length);
+        if (probability(SLOW_PATH_PROBABILITY, copiedElements != 0)) {
+            /*
+             * the stub doesn't throw the ArrayStoreException, but returns the number of copied
+             * elements (xor'd with -1).
+             */
+            copiedElements ^= -1;
+            System.arraycopy(src, srcPos + copiedElements, dest, destPos + copiedElements, length - copiedElements);
+        }
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 6f687f492402..6a6231d84daf 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -27,7 +27,6 @@
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.EnumMap;
@@ -185,11 +184,14 @@ public void delayedCheckcastArraycopySnippet(Object src, int srcPos, Object dest
 
     /**
      * Performs an array copy using a generic stub. Used when we do not know anything about the
-     * object types. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode}.
+     * object types. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode} which
+     * will dispatch to {@link #genericArraycopySnippet}.
+     *
+     * @see #genericArraycopySnippet
      */
     @Snippet
-    public void arraycopyGenericSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck, @ConstantParameter Counters counters,
-                    @ConstantParameter JavaKind elementKind) {
+    public void delayedGenericArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
+                    @ConstantParameter Counters counters, @ConstantParameter JavaKind elementKind) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
         Object nonNullDest = GraalDirectives.guardingNonNull(dest);
         checkArrayTypes(nonNullSrc, nonNullDest, arrayTypeCheck);
@@ -197,7 +199,7 @@ public void arraycopyGenericSnippet(Object src, int srcPos, Object dest, int des
         incrementLengthCounter(length, counters);
 
         // Don't lower until frame states are assigned to deoptimization points.
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.genericArraycopyWithSlowPathWork, GuardsStage.AFTER_FSA, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.genericArraycopySnippet, GuardsStage.AFTER_FSA, elementKind);
     }
 
     /**
@@ -247,31 +249,24 @@ public void checkcastArraycopySnippet(Object src, int srcPos, Object dest, int d
     protected abstract void doCheckcastArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
 
     /**
-     * Performs an array copy via {@link GenericArrayCopyCallNode}.
+     * Performs a generic array copy with all required type and store checks.
      *
-     * @see GenericArrayCopyCallNode
-     * @see #arraycopyGenericSnippet
+     * @see #delayedGenericArraycopySnippet
+     * @see #doGenericArraycopySnippet
      */
     @SuppressWarnings("unused")
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
-    public void genericArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind,
+    public void genericArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind,
                     @ConstantParameter LocationIdentity arrayLocation,
                     @ConstantParameter Counters counters) {
-        // The length > 0 check should not be placed here because generic array copy stub should
-        // enforce type check. This is fine performance-wise because this snippet is rarely used.
-        counters.genericArraycopyDifferentTypeCounter.inc();
-        counters.genericArraycopyDifferentTypeCopiedCounter.add(length);
-        int copiedElements = GenericArrayCopyCallNode.genericArraycopy(src, srcPos, dest, destPos, length);
-        if (probability(SLOW_PATH_PROBABILITY, copiedElements != 0)) {
-            /*
-             * the stub doesn't throw the ArrayStoreException, but returns the number of copied
-             * elements (xor'd with -1).
-             */
-            copiedElements ^= -1;
-            System.arraycopy(src, srcPos + copiedElements, dest, destPos + copiedElements, length - copiedElements);
-        }
+        doGenericArraycopySnippet(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
     }
 
+    /**
+     * @see #genericArraycopySnippet
+     */
+    protected abstract void doGenericArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
+
     private static void incrementLengthCounter(int length, Counters counters) {
         if (!IS_BUILDING_NATIVE_IMAGE) {
             counters.lengthHistogram.inc(length);
@@ -398,19 +393,19 @@ public enum WorkSnippetID {
          */
         checkcastArraycopySnippet,
         /**
-         * @see ArrayCopySnippets#genericArraycopyWithSlowPathWork
+         * @see ArrayCopySnippets#genericArraycopySnippet
          */
-        genericArraycopyWithSlowPathWork;
+        genericArraycopySnippet;
     }
 
     public static class Templates extends SnippetTemplate.AbstractTemplates {
-        private final SnippetInfo arraycopyGenericSnippet;
+        private final SnippetInfo delayedGenericArraycopySnippet;
         private final SnippetInfo delayedExactArraycopyWithSlowPathWork;
         private final SnippetInfo arraycopyExactStubCallSnippet;
         private final SnippetInfo delayedCheckcastArraycopySnippet;
         private final SnippetInfo arraycopyNativeSnippet;
         private final SnippetInfo checkcastArraycopySnippet;
-        private final SnippetInfo genericArraycopyWithSlowPathWork;
+        private final SnippetInfo genericArraycopySnippet;
         private final SnippetInfo exactArraycopyWithSlowPathWork;
 
         private final boolean useOriginalArraycopy;
@@ -423,13 +418,13 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
             this.counters = new Counters(factory);
 
             useOriginalArraycopy = receiver.useOriginalArraycopy();
-            arraycopyGenericSnippet = snippet(receiver, "arraycopyGenericSnippet");
+            delayedGenericArraycopySnippet = snippet(receiver, "delayedGenericArraycopySnippet");
             delayedExactArraycopyWithSlowPathWork = snippet(receiver, "delayedExactArraycopyWithSlowPathWork");
             arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet");
             delayedCheckcastArraycopySnippet = snippet(receiver, "delayedCheckcastArraycopySnippet");
             arraycopyNativeSnippet = snippet(null, "arraycopyNativeSnippet");
             checkcastArraycopySnippet = snippet(receiver, "checkcastArraycopySnippet");
-            genericArraycopyWithSlowPathWork = snippet(receiver, "genericArraycopyWithSlowPathWork");
+            genericArraycopySnippet = snippet(receiver, "genericArraycopySnippet");
             exactArraycopyWithSlowPathWork = snippet(receiver, "exactArraycopyWithSlowPathWork");
         }
 
@@ -439,8 +434,8 @@ private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
                     return exactArraycopyWithSlowPathWork;
                 case checkcastArraycopySnippet:
                     return checkcastArraycopySnippet;
-                case genericArraycopyWithSlowPathWork:
-                    return genericArraycopyWithSlowPathWork;
+                case genericArraycopySnippet:
+                    return genericArraycopySnippet;
             }
             throw GraalError.shouldNotReachHere(workSnippetID.toString());
         }
@@ -482,12 +477,12 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                     arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
                 } else if (srcComponentType == null && destComponentType == null) {
                     // we don't know anything about the types - use the generic copying
-                    snippetInfo = arraycopyGenericSnippet;
+                    snippetInfo = delayedGenericArraycopySnippet;
                     // no need for additional type check to avoid duplicated work
                     arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
                 } else if (GeneratePIC.getValue(options)) {
                     // use generic copying for AOT compilation
-                    snippetInfo = arraycopyGenericSnippet;
+                    snippetInfo = delayedGenericArraycopySnippet;
                     arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
                 } else if (srcComponentType != null && destComponentType != null) {
                     if (!srcComponentType.isPrimitive() && !destComponentType.isPrimitive()) {
@@ -546,7 +541,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             if (snippetInfo == delayedCheckcastArraycopySnippet) {
                 args.addConst("elementKind", JavaKind.Illegal);
             }
-            if (snippetInfo == arraycopyGenericSnippet) {
+            if (snippetInfo == delayedGenericArraycopySnippet) {
                 args.addConst("elementKind", JavaKind.Illegal);
             }
 

From 381f8a756808556bdfcb23fe7db5e1b22cc5b8d9 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 13:43:26 +0200
Subject: [PATCH 032/681] compiler: rename
 ArrayCopySnippets#arraycopyNativeSnippet to #arraycopyNativeExceptionSnippet

---
 .../replacements/arraycopy/ArrayCopySnippets.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 6a6231d84daf..a86a985288ab 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -48,6 +48,7 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
+import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.type.StampTool;
@@ -207,13 +208,15 @@ public void delayedGenericArraycopySnippet(Object src, int srcPos, Object dest,
      * only used in cases where we already know that the operation will fail.
      */
     @Snippet
-    public static void arraycopyNativeSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter Counters counters) {
+    public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter Counters counters) {
         // all checks are done in the native method, so no need to emit additional checks here
         incrementLengthCounter(length, counters);
         counters.systemArraycopyCounter.inc();
         counters.systemArraycopyCopiedCounter.add(length);
 
         System.arraycopy(src, srcPos, dest, destPos, length);
+        // the call will never return
+        UnreachableNode.unreachable();
     }
 
     /**
@@ -403,7 +406,7 @@ public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final SnippetInfo delayedExactArraycopyWithSlowPathWork;
         private final SnippetInfo arraycopyExactStubCallSnippet;
         private final SnippetInfo delayedCheckcastArraycopySnippet;
-        private final SnippetInfo arraycopyNativeSnippet;
+        private final SnippetInfo arraycopyNativeExceptionSnippet;
         private final SnippetInfo checkcastArraycopySnippet;
         private final SnippetInfo genericArraycopySnippet;
         private final SnippetInfo exactArraycopyWithSlowPathWork;
@@ -422,7 +425,7 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
             delayedExactArraycopyWithSlowPathWork = snippet(receiver, "delayedExactArraycopyWithSlowPathWork");
             arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet");
             delayedCheckcastArraycopySnippet = snippet(receiver, "delayedCheckcastArraycopySnippet");
-            arraycopyNativeSnippet = snippet(null, "arraycopyNativeSnippet");
+            arraycopyNativeExceptionSnippet = snippet(null, "arraycopyNativeExceptionSnippet");
             checkcastArraycopySnippet = snippet(receiver, "checkcastArraycopySnippet");
             genericArraycopySnippet = snippet(receiver, "genericArraycopySnippet");
             exactArraycopyWithSlowPathWork = snippet(receiver, "exactArraycopyWithSlowPathWork");
@@ -465,7 +468,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             if (!canBeArray(srcType) || !canBeArray(destType)) {
                 // at least one of the objects is definitely not an array - use the native call
                 // right away as the copying will fail anyways
-                snippetInfo = arraycopyNativeSnippet;
+                snippetInfo = arraycopyNativeExceptionSnippet;
                 arrayTypeCheck = ArrayCopyTypeCheck.UNDEFINED_ARRAY_TYPE_CHECK;
             } else {
                 ResolvedJavaType srcComponentType = srcType == null ? null : srcType.getComponentType();
@@ -494,7 +497,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                         // one object is an object array, the other one is a primitive array.
                         // this copy will always fail - use the native call right away
                         assert !srcComponentType.equals(destComponentType) : "must be handled by arraycopy.isExact()";
-                        snippetInfo = arraycopyNativeSnippet;
+                        snippetInfo = arraycopyNativeExceptionSnippet;
                         arrayTypeCheck = ArrayCopyTypeCheck.UNDEFINED_ARRAY_TYPE_CHECK;
                     }
                 } else {
@@ -525,7 +528,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             args.add("dest", arraycopy.getDestination());
             args.add("destPos", arraycopy.getDestinationPosition());
             args.add("length", arraycopy.getLength());
-            if (snippetInfo != arraycopyNativeSnippet) {
+            if (snippetInfo != arraycopyNativeExceptionSnippet) {
                 assert arrayTypeCheck != ArrayCopyTypeCheck.UNDEFINED_ARRAY_TYPE_CHECK;
                 args.addConst("arrayTypeCheck", arrayTypeCheck);
             }

From 947e5d0fd56ffbbba60c6e67a0d36b05f345fb0a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 30 Aug 2021 11:58:23 +0200
Subject: [PATCH 033/681] compiler: move GenericArrayCopyCallNode and
 CheckcastArrayCopyCallNode into hotspot specific project

---
 .../compiler/hotspot/HotSpotBackend.java      |  2 +-
 .../meta/HotSpotHostForeignCallsProvider.java | 26 +++++++++++++++--
 .../arraycopy/CheckcastArrayCopyCallNode.java | 12 +++++---
 .../arraycopy/GenericArrayCopyCallNode.java   |  8 ++++--
 .../arraycopy/HotSpotArraycopySnippets.java   |  3 --
 .../arraycopy/ArrayCopyCallNode.java          |  8 ++----
 .../arraycopy/ArrayCopyLookup.java            | 28 -------------------
 .../meta/SubstrateForeignCallsProvider.java   |  9 ------
 8 files changed, 40 insertions(+), 56 deletions(-)
 rename compiler/src/{org.graalvm.compiler.replacements/src/org/graalvm/compiler => org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot}/replacements/arraycopy/CheckcastArrayCopyCallNode.java (93%)
 rename compiler/src/{org.graalvm.compiler.replacements/src/org/graalvm/compiler => org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot}/replacements/arraycopy/GenericArrayCopyCallNode.java (92%)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
index 47aeb87f705c..ad8074b5c8d0 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
@@ -30,9 +30,9 @@
 import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO;
 import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT;
 import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS;
+import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.UNSAFE_ARRAYCOPY;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION;
-import static org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls.UNSAFE_ARRAYCOPY;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.util.EnumSet;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 2f5397769357..1f3d18cd84ce 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -114,6 +114,7 @@
 import org.graalvm.compiler.hotspot.CompilerRuntimeHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
+import org.graalvm.compiler.hotspot.replacements.arraycopy.CheckcastArrayCopyCallNode;
 import org.graalvm.compiler.hotspot.stubs.ArrayStoreExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.ClassCastExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.CreateExceptionStub;
@@ -130,8 +131,8 @@
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
 import org.graalvm.compiler.replacements.ArrayIndexOf;
+import org.graalvm.compiler.replacements.SnippetTemplate;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.compiler.word.Word;
@@ -157,6 +158,23 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall
 
     public static final HotSpotForeignCallDescriptor INVOKE_STATIC_METHOD_ONE_ARG = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS,
                     "JVMCIRuntime::invoke_static_method_one_arg", long.class, Word.class, Word.class, long.class);
+    /**
+     * Signature of an unsafe {@link System#arraycopy} stub.
+     *
+     * The signature is equivalent to {@link sun.misc.Unsafe#copyMemory(long, long, long)}. For the
+     * semantics refer to {@link sun.misc.Unsafe#copyMemory(Object, long, Object, long, long)}.
+     *
+     * @see sun.misc.Unsafe#copyMemory
+     */
+    public static final ForeignCallSignature UNSAFE_ARRAYCOPY = new ForeignCallSignature("unsafe_arraycopy", void.class, Word.class, Word.class, Word.class);
+    /**
+     * Signature of a generic {@link System#arraycopy} stub.
+     *
+     * Instead of throwing an {@link ArrayStoreException}, the stub is expected to return the number
+     * of copied elements xor'd with {@code -1}. A return value of {@code 0} indicates that the
+     * operation was successful.
+     */
+    public static final ForeignCallSignature GENERIC_ARRAYCOPY = new ForeignCallSignature("generic_arraycopy", int.class, Word.class, int.class, Word.class, int.class, int.class);
 
     public static class TestForeignCalls {
         public static final HotSpotForeignCallDescriptor BOOLEAN_RETURNS_BOOLEAN = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "boolean returns boolean",
@@ -217,7 +235,11 @@ protected static void link(Stub stub) {
         stub.getLinkage().setCompiledStub(stub);
     }
 
-    @Override
+    /**
+     * Looks up the call descriptor for a fast checkcast {@link System#arraycopy} stub.
+     *
+     * @see CheckcastArrayCopyCallNode
+     */
     public ForeignCallDescriptor lookupCheckcastArraycopyDescriptor(boolean uninit) {
         return checkcastArraycopyDescriptors[uninit ? 1 : 0];
     }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
similarity index 93%
rename from compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java
rename to compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
index 6c996eb0229e..ab358f9024b9 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/CheckcastArrayCopyCallNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
@@ -23,7 +23,7 @@
  * questions.
  */
 //JaCoCo Exclude
-package org.graalvm.compiler.replacements.arraycopy;
+package org.graalvm.compiler.hotspot.replacements.arraycopy;
 
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
@@ -32,6 +32,7 @@
 import org.graalvm.compiler.core.common.type.PrimitiveStamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -49,6 +50,8 @@
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.compiler.word.WordTypes;
 import org.graalvm.word.LocationIdentity;
@@ -60,7 +63,8 @@
  * Implements {@link System#arraycopy} via a {@linkplain ForeignCallNode stub call} that performs a
  * fast {@code CHECKCAST} check.
  *
- * The target of the call is queried via {@link ArrayCopyLookup#lookupCheckcastArraycopyDescriptor}.
+ * The target of the call is queried via
+ * {@link HotSpotHostForeignCallsProvider#lookupCheckcastArraycopyDescriptor}.
  *
  * Instead of throwing an {@link ArrayStoreException}, the stub is expected to return the number of
  * copied elements xor'd with {@code -1}. Users of this node are responsible for converting that
@@ -76,7 +80,7 @@ public final class CheckcastArrayCopyCallNode extends AbstractMemoryCheckpoint i
 
     public static final NodeClass<CheckcastArrayCopyCallNode> TYPE = NodeClass.create(CheckcastArrayCopyCallNode.class);
 
-    private final ArrayCopyForeignCalls foreignCalls;
+    private final HotSpotHostForeignCallsProvider foreignCalls;
     private final JavaKind wordKind;
 
     @Input ValueNode src;
@@ -94,7 +98,7 @@ protected CheckcastArrayCopyCallNode(@InjectedNodeParameter ArrayCopyForeignCall
                     ValueNode destPos, ValueNode length,
                     ValueNode superCheckOffset, ValueNode destElemKlass, boolean uninit) {
         super(TYPE, StampFactory.forKind(JavaKind.Int));
-        this.foreignCalls = foreignCalls;
+        this.foreignCalls = (HotSpotHostForeignCallsProvider) foreignCalls;
         this.wordKind = wordTypes.getWordKind();
         this.src = src;
         this.srcPos = srcPos;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
similarity index 92%
rename from compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java
rename to compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
index 2cc41f6a59d3..57b179381d89 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/GenericArrayCopyCallNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
@@ -23,15 +23,16 @@
  * questions.
  */
 //JaCoCo Exclude
-package org.graalvm.compiler.replacements.arraycopy;
+package org.graalvm.compiler.hotspot.replacements.arraycopy;
 
+import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.GENERIC_ARRAYCOPY;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls.GENERIC_ARRAYCOPY;
 
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.GetObjectAddressNode;
@@ -42,13 +43,14 @@
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
 
 /**
  * Implements {@link System#arraycopy} via a {@link ForeignCallNode call} to a
- * {@linkplain ArrayCopyLookup#GENERIC_ARRAYCOPY generic stub}.
+ * {@linkplain HotSpotHostForeignCallsProvider#GENERIC_ARRAYCOPY generic stub}.
  *
  * Instead of throwing an {@link ArrayStoreException}, the stub is expected to return the number of
  * copied elements xor'd with {@code -1}. Users of this node are responsible for converting that
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index dc239cdf7a08..c9a3233e99b5 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -33,7 +33,6 @@
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.PiNode;
@@ -44,8 +43,6 @@
 import org.graalvm.compiler.replacements.ReplacementsUtil;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
-import org.graalvm.compiler.replacements.arraycopy.CheckcastArrayCopyCallNode;
-import org.graalvm.compiler.replacements.arraycopy.GenericArrayCopyCallNode;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
index efe3aa2b058a..5621210e8ff3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
@@ -36,8 +36,6 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -56,6 +54,8 @@
 import org.graalvm.compiler.nodes.memory.MemoryKill;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.word.WordTypes;
@@ -72,10 +72,6 @@
  * based on the element type and memory properties.
  *
  * The target of the call is queried via {@link ArrayCopyLookup#lookupArraycopyDescriptor}.
- *
- * @see GenericArrayCopyCallNode A generic {@link System#arraycopy} stub call node.
- * @see CheckcastArrayCopyCallNode A {@link System#arraycopy} stub call node that performs a fast
- *      check cast.
  */
 @NodeInfo(allowedUsageTypes = {Memory}, cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN)
 public final class ArrayCopyCallNode extends AbstractMemoryCheckpoint implements Lowerable, SingleMemoryKill, MemoryAccess, Canonicalizable {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java
index abad4aa1ccd7..a70088d8c239 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java
@@ -25,40 +25,12 @@
 package org.graalvm.compiler.replacements.arraycopy;
 
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
 
 public interface ArrayCopyLookup {
 
-    /**
-     * Signature of an unsafe {@link System#arraycopy} stub.
-     *
-     * The signature is equivalent to {@link sun.misc.Unsafe#copyMemory(long, long, long)}. For the
-     * semantics refer to {@link sun.misc.Unsafe#copyMemory(Object, long, Object, long, long)}.
-     *
-     * @see sun.misc.Unsafe#copyMemory
-     */
-    ForeignCallSignature UNSAFE_ARRAYCOPY = new ForeignCallSignature("unsafe_arraycopy", void.class, Word.class, Word.class, Word.class);
-
-    /**
-     * Signature of a generic {@link System#arraycopy} stub.
-     *
-     * Instead of throwing an {@link ArrayStoreException}, the stub is expected to return the number
-     * of copied elements xor'd with {@code -1}. A return value of {@code 0} indicates that the
-     * operation was successful.
-     */
-    ForeignCallSignature GENERIC_ARRAYCOPY = new ForeignCallSignature("generic_arraycopy", int.class, Word.class, int.class, Word.class, int.class, int.class);
-
-    /**
-     * Looks up the call descriptor for a fast checkcast {@link System#arraycopy} stub.
-     *
-     * @see CheckcastArrayCopyCallNode
-     */
-    ForeignCallDescriptor lookupCheckcastArraycopyDescriptor(boolean uninit);
-
     /**
      * Looks up the call descriptor for a specialized {@link System#arraycopy} stub.
      *
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
index e0aba1ccdc70..ba47837024ea 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
@@ -98,15 +98,6 @@ public void registerArrayCopyForeignCallsDelegate(ArrayCopyLookup arraycopyForei
         this.arrayCopyLookup = arraycopyForeignCalls;
     }
 
-    @Override
-    public ForeignCallDescriptor lookupCheckcastArraycopyDescriptor(boolean uninit) {
-        if (arrayCopyLookup != null) {
-            return arrayCopyLookup.lookupCheckcastArraycopyDescriptor(uninit);
-        } else {
-            throw VMError.unsupportedFeature("Fast checkcast ArrayCopy not supported yet.");
-        }
-    }
-
     @Override
     public ForeignCallDescriptor lookupArraycopyDescriptor(JavaKind kind, boolean aligned, boolean disjoint, boolean uninit, LocationIdentity killedLocation) {
         if (arrayCopyLookup != null) {

From 4dbd8bde23d10a5be02dbe49416b73adcec172db Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 30 Aug 2021 10:58:41 +0200
Subject: [PATCH 034/681] compiler: document lowering strategies of
 ArrayCopySnippets

---
 .../arraycopy/ArrayCopySnippets.java          | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index a86a985288ab..fc37e92ed2b4 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -77,6 +77,37 @@
 
 /**
  * Snippets for lowering {@link System#arraycopy}.
+ *
+ * <ul>
+ * <li>{@link #arraycopyNativeExceptionSnippet}: this snippet is used when the array copy is know to
+ * fail, either because at least on of the objects is not an array, or one is an object array and
+ * the other one a primitive array.</li>
+ * <li>{@link #arraycopyExactStubCallSnippet}: this snippet is used for array copies that do not
+ * require a store check. This is the case if the array copy is either
+ * {@linkplain ArrayCopy#isExact() exact}, i.e., we can prove that the source array type is
+ * assignable to the destination array types, or if one of the objects is a primitive array (and the
+ * other is unknown). In the latter case, it is sufficient to dynamically check that the array types
+ * are the same. No store check is needed.</li>
+ * <li>{@link #exactArraycopyWithSlowPathWork}: if we can do an
+ * {@linkplain #arraycopyExactStubCallSnippet array copy without store check}, it might be better to
+ * inline the copy loop to allow further compiler phases to optimize the code, instead of doing a
+ * stub call. This is only done if {@code mayExpandThisArraycopy} is {@code true}. Lowering is
+ * delayed until {@linkplain GuardsStage#FIXED_DEOPTS deopts are fixed} using
+ * {@link #delayedExactArraycopyWithSlowPathWork}.</li>
+ * <li>{@link #checkcastArraycopySnippet}: this snippet is used if at least one of the objects is an
+ * object array, but the compatibility of source and destination cannot be proven statically. We
+ * need to perform a store check on every element. Lowering is delayed {@link GuardsStage#AFTER_FSA
+ * after framestate assignment} via {@link #delayedCheckcastArraycopySnippet})</li>
+ * <li>{@link #genericArraycopySnippet}: this snippet is used if we have no information about the
+ * types of the objects. The snippet needs to perform all required type and store checks. Lowering
+ * is delayed {@link GuardsStage#AFTER_FSA after framestate assignment} via
+ * {@link #delayedGenericArraycopySnippet}.</li>
+ * </ul>
+ *
+ * See {@link Templates#lower(ArrayCopyNode, boolean, LoweringTool)} for the implementation details
+ * of the lowering strategies.
+ *
+ * @see Templates#lower(ArrayCopyNode, boolean, LoweringTool)
  */
 public abstract class ArrayCopySnippets implements Snippets {
 
@@ -453,10 +484,13 @@ public void lower(ArrayCopyNode arraycopy, LoweringTool tool) {
         }
 
         /**
-         * Lowers an {@link ArrayCopyNode}.
+         * Lowers an {@link ArrayCopyNode}. See the documentation of {@link ArrayCopySnippets} for
+         * an overview of the lowering strategies.
          *
          * @param mayExpandThisArraycopy {@code true} if the array copy might be expanded to a copy
          *            loop.
+         *
+         * @see ArrayCopySnippets
          */
         public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, LoweringTool tool) {
             JavaKind elementKind = ArrayCopy.selectComponentKind(arraycopy);

From 4804a0ba89ee791aa0ceae805fb268dfa1080b2f Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 09:28:25 +0200
Subject: [PATCH 035/681] compiler: make INJECTED_META_ACCESS accessible in
 subclasses

---
 .../replacements/arraycopy/HotSpotArraycopySnippets.java  | 8 +++-----
 .../replacements/arraycopy/ArrayCopySnippets.java         | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index c9a3233e99b5..c9a40828622f 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -49,7 +49,6 @@
 import org.graalvm.word.WordFactory;
 
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.MetaAccessProvider;
 
 public class HotSpotArraycopySnippets extends ArrayCopySnippets {
 
@@ -91,10 +90,9 @@ protected int heapWordSize() {
     }
 
     @Override
-    protected void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters,
-                    MetaAccessProvider metaAccess) {
-        int scale = ReplacementsUtil.arrayIndexScale(metaAccess, elementKind);
-        int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(metaAccess, elementKind);
+    protected void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
+        int scale = ReplacementsUtil.arrayIndexScale(INJECTED_META_ACCESS, elementKind);
+        int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(INJECTED_META_ACCESS, elementKind);
         long sourceOffset = arrayBaseOffset + (long) srcPos * scale;
         long destOffset = arrayBaseOffset + (long) destPos * scale;
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index fc37e92ed2b4..00f7218afade 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -123,7 +123,7 @@ private enum ArrayCopyTypeCheck {
     }
 
     /** Marker value for the {@link InjectedParameter} injected parameter. */
-    static final MetaAccessProvider INJECTED_META_ACCESS = null;
+    protected static final MetaAccessProvider INJECTED_META_ACCESS = null;
 
     /**
      * Checks whether the hubs for the given objects are equal. The objects must be non-null.
@@ -258,14 +258,13 @@ public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Objec
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
     public void exactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity arrayLocation,
                     @ConstantParameter Counters counters) {
-        doExactArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters, INJECTED_META_ACCESS);
+        doExactArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
     }
 
     /**
      * @see #exactArraycopyWithSlowPathWork
      */
-    protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters,
-                    MetaAccessProvider metaAccess);
+    protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
 
     /**
      * Performs an array copy via fast checkcast stub.

From ef0c03ac149f12567159102c9f7ca3ecad8321cf Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 1 Sep 2021 14:41:22 +0200
Subject: [PATCH 036/681] compiler: fix ArrayCopyIntrinsificationTest Javadoc

---
 .../compiler/hotspot/test/ArrayCopyIntrinsificationTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java
index 117014cbff43..f13944ee997a 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java
@@ -163,7 +163,7 @@ public void testObject() {
     }
 
     /**
-     * Tests {@link ArrayCopySnippets#arraycopyGenericSnippet} with checkcast.
+     * Tests {@link ArrayCopySnippets#genericArraycopySnippet} with checkcast.
      */
     @Test
     public void testArrayStoreException() {

From 841650f73e892f7a84f5121fb4b0431fe51a631c Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 2 Sep 2021 16:20:52 +0200
Subject: [PATCH 037/681] compiler: fix Javadoc typos in ArrayCopySnippets

---
 .../hotspot/meta/HotSpotHostForeignCallsProvider.java     | 1 +
 .../replacements/arraycopy/ArrayCopySnippets.java         | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 1f3d18cd84ce..ac90f8639539 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -167,6 +167,7 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall
      * @see sun.misc.Unsafe#copyMemory
      */
     public static final ForeignCallSignature UNSAFE_ARRAYCOPY = new ForeignCallSignature("unsafe_arraycopy", void.class, Word.class, Word.class, Word.class);
+
     /**
      * Signature of a generic {@link System#arraycopy} stub.
      *
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 00f7218afade..2d0561ecd308 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -80,12 +80,12 @@
  *
  * <ul>
  * <li>{@link #arraycopyNativeExceptionSnippet}: this snippet is used when the array copy is know to
- * fail, either because at least on of the objects is not an array, or one is an object array and
- * the other one a primitive array.</li>
+ * throw an exception, either because at least one of the objects is not an array, or one is an
+ * object array and the other one a primitive array.</li>
  * <li>{@link #arraycopyExactStubCallSnippet}: this snippet is used for array copies that do not
  * require a store check. This is the case if the array copy is either
  * {@linkplain ArrayCopy#isExact() exact}, i.e., we can prove that the source array type is
- * assignable to the destination array types, or if one of the objects is a primitive array (and the
+ * assignable to the destination array type, or if one of the objects is a primitive array (and the
  * other is unknown). In the latter case, it is sufficient to dynamically check that the array types
  * are the same. No store check is needed.</li>
  * <li>{@link #exactArraycopyWithSlowPathWork}: if we can do an
@@ -236,7 +236,7 @@ public void delayedGenericArraycopySnippet(Object src, int srcPos, Object dest,
 
     /**
      * Performs an array copy using the original {@link System#arraycopy} call. Currently, this is
-     * only used in cases where we already know that the operation will fail.
+     * only used in cases where we already know that the operation will throw an exception.
      */
     @Snippet
     public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter Counters counters) {

From 5bd9d0d9066ef0ab1eedfb501f53d0db49dc6f15 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 2 Sep 2021 16:24:49 +0200
Subject: [PATCH 038/681] compiler: rename
 ArrayCopySnippets#delayedExactArraycopyWithSlowPathWork to
 delayedExactArraycopyWithExpandedLoopSnippet

---
 .../arraycopy/HotSpotArraycopySnippets.java   |  2 +-
 .../arraycopy/ArrayCopySnippets.java          | 45 ++++++++++---------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index c9a40828622f..c854699812d0 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -90,7 +90,7 @@ protected int heapWordSize() {
     }
 
     @Override
-    protected void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
+    protected void doExactArraycopyWithExpandedLoopSnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
         int scale = ReplacementsUtil.arrayIndexScale(INJECTED_META_ACCESS, elementKind);
         int arrayBaseOffset = ReplacementsUtil.getArrayBaseOffset(INJECTED_META_ACCESS, elementKind);
         long sourceOffset = arrayBaseOffset + (long) srcPos * scale;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 2d0561ecd308..a238beec2dcf 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -88,12 +88,12 @@
  * assignable to the destination array type, or if one of the objects is a primitive array (and the
  * other is unknown). In the latter case, it is sufficient to dynamically check that the array types
  * are the same. No store check is needed.</li>
- * <li>{@link #exactArraycopyWithSlowPathWork}: if we can do an
+ * <li>{@link #exactArraycopyWithExpandedLoopSnippet}: if we can do an
  * {@linkplain #arraycopyExactStubCallSnippet array copy without store check}, it might be better to
  * inline the copy loop to allow further compiler phases to optimize the code, instead of doing a
  * stub call. This is only done if {@code mayExpandThisArraycopy} is {@code true}. Lowering is
  * delayed until {@linkplain GuardsStage#FIXED_DEOPTS deopts are fixed} using
- * {@link #delayedExactArraycopyWithSlowPathWork}.</li>
+ * {@link #delayedExactArraycopyWithExpandedLoopSnippet}.</li>
  * <li>{@link #checkcastArraycopySnippet}: this snippet is used if at least one of the objects is an
  * object array, but the compatibility of source and destination cannot be proven statically. We
  * need to perform a store check on every element. Lowering is delayed {@link GuardsStage#AFTER_FSA
@@ -150,15 +150,15 @@ protected boolean useOriginalArraycopy() {
      * Snippet that performs an {@linkplain ArrayCopy#isExact() exact} array copy. Used when the
      * array copy might be {@linkplain Templates#lower(ArrayCopyNode, boolean, LoweringTool)
      * expanded}. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode} which will
-     * dispatch to {@link #exactArraycopyWithSlowPathWork}.
+     * dispatch to {@link #exactArraycopyWithExpandedLoopSnippet}.
      *
      * @see Templates#lower(ArrayCopyNode, boolean, LoweringTool)
-     * @see #exactArraycopyWithSlowPathWork
-     * @see #doExactArraycopyWithSlowPathWork
+     * @see #exactArraycopyWithExpandedLoopSnippet
+     * @see #doExactArraycopyWithExpandedLoopSnippet
      */
     @SuppressWarnings("unused")
     @Snippet
-    public void delayedExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
+    public void delayedExactArraycopyWithExpandedLoopSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
                     @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity locationIdentity, @ConstantParameter SnippetCounter elementKindCounter,
                     @ConstantParameter SnippetCounter elementKindCopiedCounter, @ConstantParameter Counters counters) {
         Object nonNullSrc = GraalDirectives.guardingNonNull(src);
@@ -171,7 +171,7 @@ public void delayedExactArraycopyWithSlowPathWork(Object src, int srcPos, Object
         elementKindCopiedCounter.add(length);
 
         // Don't lower until floating guards are fixed.
-        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.exactArraycopyWithSlowPathWork, GuardsStage.FIXED_DEOPTS, elementKind);
+        ArrayCopyWithDelayedLoweringNode.arraycopy(nonNullSrc, srcPos, nonNullDest, destPos, length, WorkSnippetID.exactArraycopyWithExpandedLoopSnippet, GuardsStage.FIXED_DEOPTS, elementKind);
     }
 
     /**
@@ -256,15 +256,16 @@ public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Objec
      */
     @SuppressWarnings("unused")
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
-    public void exactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind, @ConstantParameter LocationIdentity arrayLocation,
-                    @ConstantParameter Counters counters) {
-        doExactArraycopyWithSlowPathWork(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
+    public void exactArraycopyWithExpandedLoopSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter JavaKind elementKind,
+                    @ConstantParameter LocationIdentity arrayLocation, @ConstantParameter Counters counters) {
+        doExactArraycopyWithExpandedLoopSnippet(src, srcPos, dest, destPos, length, elementKind, arrayLocation, counters);
     }
 
     /**
-     * @see #exactArraycopyWithSlowPathWork
+     * @see #exactArraycopyWithExpandedLoopSnippet
      */
-    protected abstract void doExactArraycopyWithSlowPathWork(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters);
+    protected abstract void doExactArraycopyWithExpandedLoopSnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation,
+                    Counters counters);
 
     /**
      * Performs an array copy via fast checkcast stub.
@@ -418,9 +419,9 @@ void createArraycopyCounter(JavaKind kind, Group counters, Group copiedCounters)
      */
     public enum WorkSnippetID {
         /**
-         * @see ArrayCopySnippets#exactArraycopyWithSlowPathWork
+         * @see ArrayCopySnippets#exactArraycopyWithExpandedLoopSnippet
          */
-        exactArraycopyWithSlowPathWork,
+        exactArraycopyWithExpandedLoopSnippet,
         /**
          * @see ArrayCopySnippets#checkcastArraycopySnippet
          */
@@ -433,13 +434,13 @@ public enum WorkSnippetID {
 
     public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final SnippetInfo delayedGenericArraycopySnippet;
-        private final SnippetInfo delayedExactArraycopyWithSlowPathWork;
+        private final SnippetInfo delayedExactArraycopyWithExpandedLoopSnippet;
         private final SnippetInfo arraycopyExactStubCallSnippet;
         private final SnippetInfo delayedCheckcastArraycopySnippet;
         private final SnippetInfo arraycopyNativeExceptionSnippet;
         private final SnippetInfo checkcastArraycopySnippet;
         private final SnippetInfo genericArraycopySnippet;
-        private final SnippetInfo exactArraycopyWithSlowPathWork;
+        private final SnippetInfo exactArraycopyWithExpandedLoopSnippet;
 
         private final boolean useOriginalArraycopy;
         private ResolvedJavaMethod originalArraycopy;
@@ -452,19 +453,19 @@ public Templates(ArrayCopySnippets receiver, OptionValues options, Iterable<Debu
 
             useOriginalArraycopy = receiver.useOriginalArraycopy();
             delayedGenericArraycopySnippet = snippet(receiver, "delayedGenericArraycopySnippet");
-            delayedExactArraycopyWithSlowPathWork = snippet(receiver, "delayedExactArraycopyWithSlowPathWork");
+            delayedExactArraycopyWithExpandedLoopSnippet = snippet(receiver, "delayedExactArraycopyWithExpandedLoopSnippet");
             arraycopyExactStubCallSnippet = snippet(receiver, "arraycopyExactStubCallSnippet");
             delayedCheckcastArraycopySnippet = snippet(receiver, "delayedCheckcastArraycopySnippet");
             arraycopyNativeExceptionSnippet = snippet(null, "arraycopyNativeExceptionSnippet");
             checkcastArraycopySnippet = snippet(receiver, "checkcastArraycopySnippet");
             genericArraycopySnippet = snippet(receiver, "genericArraycopySnippet");
-            exactArraycopyWithSlowPathWork = snippet(receiver, "exactArraycopyWithSlowPathWork");
+            exactArraycopyWithExpandedLoopSnippet = snippet(receiver, "exactArraycopyWithExpandedLoopSnippet");
         }
 
         private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
             switch (workSnippetID) {
-                case exactArraycopyWithSlowPathWork:
-                    return exactArraycopyWithSlowPathWork;
+                case exactArraycopyWithExpandedLoopSnippet:
+                    return exactArraycopyWithExpandedLoopSnippet;
                 case checkcastArraycopySnippet:
                     return checkcastArraycopySnippet;
                 case genericArraycopySnippet:
@@ -551,7 +552,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             }
 
             if (mayExpandThisArraycopy && snippetInfo == arraycopyExactStubCallSnippet) {
-                snippetInfo = delayedExactArraycopyWithSlowPathWork;
+                snippetInfo = delayedExactArraycopyWithExpandedLoopSnippet;
             }
 
             // create the snippet
@@ -566,7 +567,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                 args.addConst("arrayTypeCheck", arrayTypeCheck);
             }
             Object locationIdentity = arraycopy.killsAnyLocation() ? LocationIdentity.any() : NamedLocationIdentity.getArrayLocation(elementKind);
-            if (snippetInfo == arraycopyExactStubCallSnippet || snippetInfo == delayedExactArraycopyWithSlowPathWork) {
+            if (snippetInfo == arraycopyExactStubCallSnippet || snippetInfo == delayedExactArraycopyWithExpandedLoopSnippet) {
                 assert elementKind != null;
                 args.addConst("elementKind", elementKind);
                 args.addConst("locationIdentity", locationIdentity);

From 6a87a0f7ee6bef3835e8066f11c10a5474664b6a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 3 Sep 2021 12:18:48 +0200
Subject: [PATCH 039/681] compiler: remove obsolete comment from
 HotSpotArraycopySnippets#doGenericArraycopySnippet

---
 .../replacements/arraycopy/HotSpotArraycopySnippets.java        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
index c854699812d0..573ebaa88924 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
@@ -146,8 +146,6 @@ protected void doCheckcastArraycopySnippet(Object src, int srcPos, Object dest,
 
     @Override
     protected void doGenericArraycopySnippet(Object src, int srcPos, Object dest, int destPos, int length, JavaKind elementKind, LocationIdentity arrayLocation, Counters counters) {
-        // The length > 0 check should not be placed here because generic array copy stub should
-        // enforce type check. This is fine performance-wise because this snippet is rarely used.
         counters.genericArraycopyDifferentTypeCounter.inc();
         counters.genericArraycopyDifferentTypeCopiedCounter.add(length);
         int copiedElements = GenericArrayCopyCallNode.genericArraycopy(src, srcPos, dest, destPos, length);

From d153cede3b4969de9a690c263fa0c14180d3533f Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 7 Sep 2021 10:25:40 +0200
Subject: [PATCH 040/681] compiler: rename
 ArrayCopyWithDelayedLoweringNode#reachedRequiredLoweringStage

---
 .../compiler/replacements/arraycopy/ArrayCopySnippets.java      | 2 +-
 .../arraycopy/ArrayCopyWithDelayedLoweringNode.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index a238beec2dcf..e5c31ad0b7d5 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -586,7 +586,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
         }
 
         public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, LoweringTool tool) {
-            if (!arraycopy.reachedLoweringStage()) {
+            if (!arraycopy.reachedRequiredLoweringStage()) {
                 return;
             }
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index e16a19f5d65c..299bbb1fbfd5 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -73,7 +73,7 @@ public void setBci(int bci) {
         this.bci = bci;
     }
 
-    public boolean reachedLoweringStage() {
+    public boolean reachedRequiredLoweringStage() {
         return graph().getGuardsStage().reachedStage(delayUntil);
     }
 }

From f8904bf8692dd249a53ac96aabd138017d186bca Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 7 Sep 2021 10:26:51 +0200
Subject: [PATCH 041/681] compiler: reformat HotSpotHostForeignCallsProvider

---
 .../compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index ac90f8639539..721104ea0a12 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -158,6 +158,7 @@ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCall
 
     public static final HotSpotForeignCallDescriptor INVOKE_STATIC_METHOD_ONE_ARG = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS,
                     "JVMCIRuntime::invoke_static_method_one_arg", long.class, Word.class, Word.class, long.class);
+
     /**
      * Signature of an unsafe {@link System#arraycopy} stub.
      *

From 914af4ca23e6d540d879ad3face4482f1603c930 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 7 Sep 2021 10:47:40 +0200
Subject: [PATCH 042/681] compiler: rename StructuredGraph#reachedGuardStage

---
 .../src/org/graalvm/compiler/nodes/StructuredGraph.java         | 2 +-
 .../arraycopy/ArrayCopyWithDelayedLoweringNode.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 981440d03157..27e3a26e1b5f 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -134,7 +134,7 @@ public boolean requiresValueProxies() {
             return this != AFTER_FSA;
         }
 
-        public boolean reachedStage(GuardsStage stage) {
+        public boolean reachedGuardsStage(GuardsStage stage) {
             return this.ordinal() >= stage.ordinal();
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index 299bbb1fbfd5..ad387562b569 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -74,6 +74,6 @@ public void setBci(int bci) {
     }
 
     public boolean reachedRequiredLoweringStage() {
-        return graph().getGuardsStage().reachedStage(delayUntil);
+        return graph().getGuardsStage().reachedGuardsStage(delayUntil);
     }
 }

From 6f4612494641fc38b9a61f0c626052ec02827d70 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 20 Sep 2021 09:29:26 +0200
Subject: [PATCH 043/681] compiler: fix typo in ArrayCopySnippets Javadoc

---
 .../compiler/replacements/arraycopy/ArrayCopySnippets.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index e5c31ad0b7d5..3aa0459427d2 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -79,8 +79,8 @@
  * Snippets for lowering {@link System#arraycopy}.
  *
  * <ul>
- * <li>{@link #arraycopyNativeExceptionSnippet}: this snippet is used when the array copy is know to
- * throw an exception, either because at least one of the objects is not an array, or one is an
+ * <li>{@link #arraycopyNativeExceptionSnippet}: this snippet is used when the array copy is known
+ * to throw an exception, either because at least one of the objects is not an array, or one is an
  * object array and the other one a primitive array.</li>
  * <li>{@link #arraycopyExactStubCallSnippet}: this snippet is used for array copies that do not
  * require a store check. This is the case if the array copy is either

From c97ad05262851506b5337acf8b862de0b16eacfa Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 13:43:19 +0200
Subject: [PATCH 044/681] compiler: print killedLocationIdentities in dumps

---
 .../graalvm/compiler/printer/BinaryGraphPrinter.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
index 343a6463af3c..200566ee9404 100644
--- a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
+++ b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
@@ -64,6 +64,8 @@
 import org.graalvm.compiler.nodes.VirtualState;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.util.JavaConstantFormattable;
 import org.graalvm.graphio.GraphBlocks;
 import org.graalvm.graphio.GraphElements;
@@ -271,6 +273,14 @@ public void nodeProperties(GraphInfo info, Node node, Map<String, Object> props)
             }
             props.put("category", "floating");
         }
+
+        if (node instanceof SingleMemoryKill) {
+            props.put("killedLocationIdentity", ((SingleMemoryKill) node).getKilledLocationIdentity());
+        }
+        if (node instanceof MultiMemoryKill) {
+            props.put("killedLocationIdentities", ((MultiMemoryKill) node).getKilledLocationIdentities());
+        }
+
         if (getSnippetReflectionProvider() != null) {
             for (Map.Entry<String, Object> prop : props.entrySet()) {
                 if (prop.getValue() instanceof JavaConstantFormattable) {

From fc69cefdfad42fe08b9a8d895cf7ed68302b8c30 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 11:22:25 +0200
Subject: [PATCH 045/681] compiler: remove unused method
 MacroStateSplitNode#replaceSnippetInvokes

---
 .../replacements/nodes/MacroStateSplitNode.java    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
index c6596ba6c23c..3245de4faee6 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
@@ -74,18 +74,4 @@ public boolean hasSideEffect() {
     public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
-
-    protected void replaceSnippetInvokes(StructuredGraph snippetGraph) {
-        for (MethodCallTargetNode call : snippetGraph.getNodes(MethodCallTargetNode.TYPE)) {
-            Invoke invoke = call.invoke();
-            if (!call.targetMethod().equals(getTargetMethod())) {
-                throw new GraalError("unexpected invoke %s in snippet", getClass().getSimpleName());
-            }
-            assert invoke.stateAfter().bci == BytecodeFrame.AFTER_BCI;
-            // Here we need to fix the bci of the invoke
-            InvokeNode newInvoke = snippetGraph.add(new InvokeNode(invoke.callTarget(), bci(), invoke.getKilledLocationIdentity()));
-            newInvoke.setStateAfter(invoke.stateAfter());
-            snippetGraph.replaceFixedWithFixed((InvokeNode) invoke.asNode(), newInvoke);
-        }
-    }
 }

From 4c23ecd11157b7e70754b1c830588ea67534d432 Mon Sep 17 00:00:00 2001
From: Michael Simacek <michael.simacek@oracle.com>
Date: Mon, 26 Jul 2021 19:40:23 +0200
Subject: [PATCH 046/681] Avoid building multiple images for python benchmarks

---
 vm/mx.vm/ce-python | 3 +--
 vm/mx.vm/mx_vm.py  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vm/mx.vm/ce-python b/vm/mx.vm/ce-python
index a1b48d31433c..c7ea6e78e539 100644
--- a/vm/mx.vm/ce-python
+++ b/vm/mx.vm/ce-python
@@ -1,4 +1,3 @@
 # Do not modify this env file without updating the Graal.Python benchmark builders
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js,graalpython
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+NATIVE_IMAGES=graalpython,lib:jvmcicompiler
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index 46b09a207f27..a1f7a979916f 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -131,7 +131,7 @@
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_complete_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
-ce_python_components = ['bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
+ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bllimul', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']
 ce_no_native_components = ['bgu', 'bjs', 'blli', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'bnative-image', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lsp', 'nfi', 'ni', 'nil', 'polynative', 'pro', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'libpoly', 'poly', 'vvm']
 

From 5d50cfcd1b4f3033c3fd0ee89a9ea2836b717a89 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 11:38:35 +0200
Subject: [PATCH 047/681] compiler: merge MacroStateSplitNode into MacroNode

Every MacroNode is a StateSplit because every Invoke is a StateSplit.
---
 .../replacements/CallSiteTargetNode.java      |  4 +-
 .../nodes/BasicObjectCloneNode.java           |  2 +-
 .../replacements/nodes/MacroInvokable.java    |  3 +-
 .../replacements/nodes/MacroNode.java         | 28 ++++++-
 .../nodes/MacroStateSplitNode.java            | 77 -------------------
 .../MacroStateSplitWithExceptionNode.java     |  4 +-
 .../replacements/nodes/MethodHandleNode.java  |  2 +-
 .../nodes/ProfileBooleanNode.java             |  2 +-
 .../nodes/PureFunctionMacroNode.java          |  2 +-
 .../nodes/ReflectionGetCallerClassNode.java   |  2 +-
 .../nodes/VirtualizableInvokeMacroNode.java   |  2 +-
 11 files changed, 36 insertions(+), 92 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java
index 51eab2f950e9..774c74f2ea86 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java
@@ -34,7 +34,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.replacements.nodes.MacroStateSplitNode;
+import org.graalvm.compiler.replacements.nodes.MacroNode;
 
 import jdk.vm.ci.hotspot.HotSpotObjectConstant;
 import jdk.vm.ci.meta.Assumptions;
@@ -42,7 +42,7 @@
 import jdk.vm.ci.meta.MetaAccessProvider;
 
 @NodeInfo
-public final class CallSiteTargetNode extends MacroStateSplitNode implements Canonicalizable, Lowerable {
+public final class CallSiteTargetNode extends MacroNode implements Canonicalizable, Lowerable {
 
     public static final NodeClass<CallSiteTargetNode> TYPE = NodeClass.create(CallSiteTargetNode.class);
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
index fcbc4dc80e08..7cb6319c1ec9 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
@@ -32,7 +32,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, cyclesRationale = "see rationale in MacroNode", size = SIZE_8)
-public abstract class BasicObjectCloneNode extends MacroStateSplitNode implements ObjectClone {
+public abstract class BasicObjectCloneNode extends MacroNode implements ObjectClone {
 
     public static final NodeClass<BasicObjectCloneNode> TYPE = NodeClass.create(BasicObjectCloneNode.class);
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
index 093b1b7cabb6..c0c09e76c9ec 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
@@ -57,8 +57,7 @@
  * used as a replacement.</li>
  * <li>If a {@link MethodSubstitution} for the target method is found, this substitution is used as
  * a replacement.</li>
- * <li>Otherwise, the macro node is replaced with an {@link InvokeNode}. Note that this is only
- * possible if the macro node is a {@link MacroStateSplitNode}.</li>
+ * <li>Otherwise, the macro node is replaced with an {@link InvokeNode}.</li>
  * </ul>
  */
 public interface MacroInvokable extends Invokable, Lowerable {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index c5dfbe023d47..01443e1c876c 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -33,6 +33,7 @@
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
 import org.graalvm.compiler.nodes.FixedNode;
@@ -40,9 +41,11 @@
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeNode;
+import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -57,10 +60,11 @@
           size = SIZE_UNKNOWN,
           sizeRationale = "If this node is not optimized away it will be lowered to a call, which we cannot estimate")
 //@formatter:on
-public abstract class MacroNode extends FixedWithNextNode implements MacroInvokable {
+public abstract class MacroNode extends FixedWithNextNode implements MacroInvokable, StateSplit, SingleMemoryKill {
 
     public static final NodeClass<MacroNode> TYPE = NodeClass.create(MacroNode.class);
     @Input protected NodeInputList<ValueNode> arguments;
+    @OptionalInput(InputType.State) protected FrameState stateAfter;
 
     protected final int bci;
     protected final ResolvedJavaMethod callerMethod;
@@ -154,8 +158,26 @@ public InvokeKind getInvokeKind() {
         return invokeKind;
     }
 
-    protected FrameState stateAfter() {
-        return null;
+    @Override
+    public FrameState stateAfter() {
+        return stateAfter;
+    }
+
+    @Override
+    public void setStateAfter(FrameState x) {
+        assert x == null || x.isAlive() : "frame state must be in a graph";
+        updateUsages(stateAfter, x);
+        stateAfter = x;
+    }
+
+    @Override
+    public boolean hasSideEffect() {
+        return true;
+    }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return LocationIdentity.any();
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
deleted file mode 100644
index 3245de4faee6..000000000000
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitNode.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2013, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.replacements.nodes;
-
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.code.BytecodeFrame;
-
-/**
- * This is an extension of {@link MacroNode} that is a {@link StateSplit} and a {@link MemoryKill}.
- */
-@NodeInfo
-public abstract class MacroStateSplitNode extends MacroNode implements StateSplit, SingleMemoryKill {
-
-    public static final NodeClass<MacroStateSplitNode> TYPE = NodeClass.create(MacroStateSplitNode.class);
-    @OptionalInput(InputType.State) protected FrameState stateAfter;
-
-    protected MacroStateSplitNode(NodeClass<? extends MacroNode> c, MacroParams p) {
-        super(c, p);
-    }
-
-    @Override
-    public FrameState stateAfter() {
-        return stateAfter;
-    }
-
-    @Override
-    public void setStateAfter(FrameState x) {
-        assert x == null || x.isAlive() : "frame state must be in a graph";
-        updateUsages(stateAfter, x);
-        stateAfter = x;
-    }
-
-    @Override
-    public boolean hasSideEffect() {
-        return true;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java
index 29cf0e41362e..d9a88896bc1a 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java
@@ -52,12 +52,12 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
- * This duplicates a {@link MacroStateSplitNode} using {@link WithExceptionNode} as a base class.
+ * This duplicates a {@link MacroNode} using {@link WithExceptionNode} as a base class.
  *
  * See the documentation of {@link MacroInvokable} for more information.
  *
  * @see MacroInvokable
- * @see MacroStateSplitNode
+ * @see MacroNode
  */
 //@formatter:off
 @NodeInfo(cycles = CYCLES_UNKNOWN,
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
index c925cb20beec..abd90e9ac8e9 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
@@ -76,7 +76,7 @@
  * Node for invocation methods defined on the class {@link MethodHandle}.
  */
 @NodeInfo(cycles = CYCLES_UNKNOWN, cyclesRationale = "see MacroNode", size = SIZE_UNKNOWN, sizeRationale = "see MacroNode")
-public final class MethodHandleNode extends MacroStateSplitNode implements Simplifiable {
+public final class MethodHandleNode extends MacroNode implements Simplifiable {
     public static final NodeClass<MethodHandleNode> TYPE = NodeClass.create(MethodHandleNode.class);
 
     protected final IntrinsicMethod intrinsicMethod;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java
index 478bcdf8e05e..07edfde9db91 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java
@@ -46,7 +46,7 @@
 import jdk.vm.ci.meta.JavaConstant;
 
 @NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN)
-public class ProfileBooleanNode extends MacroStateSplitNode implements Simplifiable {
+public class ProfileBooleanNode extends MacroNode implements Simplifiable {
     public static final NodeClass<ProfileBooleanNode> TYPE = NodeClass.create(ProfileBooleanNode.class);
     private final ConstantReflectionProvider constantProvider;
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java
index feaaf177c047..3e0ca1fdcd5b 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java
@@ -40,7 +40,7 @@
  * {@link System#identityHashCode(Object)}.
  */
 @NodeInfo
-public abstract class PureFunctionMacroNode extends MacroStateSplitNode implements Canonicalizable {
+public abstract class PureFunctionMacroNode extends MacroNode implements Canonicalizable {
 
     public static final NodeClass<PureFunctionMacroNode> TYPE = NodeClass.create(PureFunctionMacroNode.class);
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
index 11d72e287572..7af8659f1f48 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
@@ -42,7 +42,7 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 @NodeInfo
-public abstract class ReflectionGetCallerClassNode extends MacroStateSplitNode implements Canonicalizable, Lowerable {
+public abstract class ReflectionGetCallerClassNode extends MacroNode implements Canonicalizable, Lowerable {
 
     public static final NodeClass<ReflectionGetCallerClassNode> TYPE = NodeClass.create(ReflectionGetCallerClassNode.class);
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
index f2d10adbea9c..78c14a10e152 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
@@ -36,7 +36,7 @@
  * analysis.
  */
 @NodeInfo
-public class VirtualizableInvokeMacroNode extends MacroStateSplitNode implements Virtualizable {
+public class VirtualizableInvokeMacroNode extends MacroNode implements Virtualizable {
 
     public static final NodeClass<VirtualizableInvokeMacroNode> TYPE = NodeClass.create(VirtualizableInvokeMacroNode.class);
 

From 35d7f750d7cbd50cfcc4fc9b25ffd8dd9b2b122f Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 11:40:42 +0200
Subject: [PATCH 048/681] compiler: rename MacroStateSplitWithExceptionNode to
 MacroWithExceptionNode

---
 .../graalvm/compiler/replacements/SnippetTemplate.java    | 8 ++++----
 .../nodes/FallbackInvokeWithExceptionNode.java            | 8 ++++----
 ...WithExceptionNode.java => MacroWithExceptionNode.java} | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/{MacroStateSplitWithExceptionNode.java => MacroWithExceptionNode.java} (94%)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 7dd3066e6bcb..28e80a58854d 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -172,7 +172,7 @@
 import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode;
 import org.graalvm.compiler.replacements.nodes.FallbackInvokeWithExceptionNode;
 import org.graalvm.compiler.replacements.nodes.LoadSnippetVarargParameterNode;
-import org.graalvm.compiler.replacements.nodes.MacroStateSplitWithExceptionNode;
+import org.graalvm.compiler.replacements.nodes.MacroWithExceptionNode;
 import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
 import org.graalvm.util.CollectionsUtil;
 import org.graalvm.word.LocationIdentity;
@@ -1708,10 +1708,10 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
             }
 
             if (fallbackInvoke != null) {
-                GraalError.guarantee(replacee instanceof MacroStateSplitWithExceptionNode, "%s can only be used in snippets replacing %s", FallbackInvokeWithExceptionNode.class.getSimpleName(),
-                                MacroStateSplitWithExceptionNode.class.getSimpleName());
+                GraalError.guarantee(replacee instanceof MacroWithExceptionNode, "%s can only be used in snippets replacing %s", FallbackInvokeWithExceptionNode.class.getSimpleName(),
+                                MacroWithExceptionNode.class.getSimpleName());
                 WithExceptionNode fallbackInvokeNode = (WithExceptionNode) duplicates.get(fallbackInvoke);
-                MacroStateSplitWithExceptionNode macroNode = (MacroStateSplitWithExceptionNode) replacee;
+                MacroWithExceptionNode macroNode = (MacroWithExceptionNode) replacee;
                 // create fallback invoke
                 InvokeWithExceptionNode invoke = macroNode.createInvoke(returnValue);
                 // replace placeholder
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
index cba202eb723b..690d1a107db8 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
@@ -39,12 +39,12 @@
 import org.graalvm.word.LocationIdentity;
 
 /**
- * Placeholder for a fallback call from a {@link MacroStateSplitWithExceptionNode}.
+ * Placeholder for a fallback call from a {@link MacroWithExceptionNode}.
  *
  * The {@link #fallbackFunctionCall()} intrinsic can be used in snippets that lower a
- * {@link MacroStateSplitWithExceptionNode}. The {@link FallbackInvokeWithExceptionNode} will be
- * replaced with the {@linkplain MacroStateSplitWithExceptionNode#createInvoke original call} of the
- * macro node. This can be useful for handling exceptional and/or slow path cases.
+ * {@link MacroWithExceptionNode}. The {@link FallbackInvokeWithExceptionNode} will be replaced with
+ * the {@linkplain MacroWithExceptionNode#createInvoke original call} of the macro node. This can be
+ * useful for handling exceptional and/or slow path cases.
  *
  * Currently, only one {@link FallbackInvokeWithExceptionNode} is allowed per snippet.
  */
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
similarity index 94%
rename from compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java
rename to compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index d9a88896bc1a..26aba2ee9c62 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroStateSplitWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -65,9 +65,9 @@
           size = SIZE_UNKNOWN,
           sizeRationale = "If this node is not optimized away it will be lowered to a call, which we cannot estimate")
 //@formatter:on
-public abstract class MacroStateSplitWithExceptionNode extends WithExceptionNode implements MacroInvokable, StateSplit, SingleMemoryKill {
+public abstract class MacroWithExceptionNode extends WithExceptionNode implements MacroInvokable, StateSplit, SingleMemoryKill {
 
-    public static final NodeClass<MacroStateSplitWithExceptionNode> TYPE = NodeClass.create(MacroStateSplitWithExceptionNode.class);
+    public static final NodeClass<MacroWithExceptionNode> TYPE = NodeClass.create(MacroWithExceptionNode.class);
     @Input protected NodeInputList<ValueNode> arguments;
     @OptionalInput(InputType.State) protected FrameState stateAfter;
 
@@ -77,7 +77,7 @@ public abstract class MacroStateSplitWithExceptionNode extends WithExceptionNode
     protected final InvokeKind invokeKind;
     protected final StampPair returnStamp;
 
-    protected MacroStateSplitWithExceptionNode(NodeClass<? extends MacroStateSplitWithExceptionNode> c, MacroParams p) {
+    protected MacroWithExceptionNode(NodeClass<? extends MacroWithExceptionNode> c, MacroParams p) {
         super(c, p.returnStamp != null ? p.returnStamp.getTrustedStamp() : null);
         this.arguments = new NodeInputList<>(this, p.arguments);
         this.bci = p.bci;

From 34eb27d057b3b31c4b8a29f6ca66325f53e67b25 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 11:42:58 +0200
Subject: [PATCH 049/681] compiler: every MacroInvokable is a SingleMemoryKill
 and a StateSplit

---
 .../graalvm/compiler/replacements/nodes/MacroInvokable.java   | 4 +++-
 .../org/graalvm/compiler/replacements/nodes/MacroNode.java    | 4 +---
 .../compiler/replacements/nodes/MacroWithExceptionNode.java   | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
index c0c09e76c9ec..8a84ca1a5086 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
@@ -34,8 +34,10 @@
 import org.graalvm.compiler.nodes.Invokable;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeNode;
+import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
@@ -60,7 +62,7 @@
  * <li>Otherwise, the macro node is replaced with an {@link InvokeNode}.</li>
  * </ul>
  */
-public interface MacroInvokable extends Invokable, Lowerable {
+public interface MacroInvokable extends Invokable, Lowerable, StateSplit, SingleMemoryKill {
 
     CallTargetNode.InvokeKind getInvokeKind();
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index 01443e1c876c..2577ba0c5d8a 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -41,11 +41,9 @@
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -60,7 +58,7 @@
           size = SIZE_UNKNOWN,
           sizeRationale = "If this node is not optimized away it will be lowered to a call, which we cannot estimate")
 //@formatter:on
-public abstract class MacroNode extends FixedWithNextNode implements MacroInvokable, StateSplit, SingleMemoryKill {
+public abstract class MacroNode extends FixedWithNextNode implements MacroInvokable {
 
     public static final NodeClass<MacroNode> TYPE = NodeClass.create(MacroNode.class);
     @Input protected NodeInputList<ValueNode> arguments;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index 26aba2ee9c62..a8e331ed20d9 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -40,11 +40,9 @@
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
 import org.graalvm.word.LocationIdentity;
 
@@ -65,7 +63,7 @@
           size = SIZE_UNKNOWN,
           sizeRationale = "If this node is not optimized away it will be lowered to a call, which we cannot estimate")
 //@formatter:on
-public abstract class MacroWithExceptionNode extends WithExceptionNode implements MacroInvokable, StateSplit, SingleMemoryKill {
+public abstract class MacroWithExceptionNode extends WithExceptionNode implements MacroInvokable {
 
     public static final NodeClass<MacroWithExceptionNode> TYPE = NodeClass.create(MacroWithExceptionNode.class);
     @Input protected NodeInputList<ValueNode> arguments;

From 7881c90935c9865c04f848d9f069d074bc76818e Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 16 Jul 2021 11:47:56 +0200
Subject: [PATCH 050/681] compiler: remove unused method
 MacroWithExceptionNode#getLocationIdentity

---
 .../compiler/replacements/nodes/MacroWithExceptionNode.java   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index a8e331ed20d9..dc11570b441d 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -132,10 +132,6 @@ public Invoke replaceWithInvoke() {
         }
     }
 
-    public LocationIdentity getLocationIdentity() {
-        return LocationIdentity.any();
-    }
-
     protected InvokeWithExceptionNode createInvoke() {
         return createInvoke(this);
     }

From dd7cb84e496914212dccd25eed1359c424136286 Mon Sep 17 00:00:00 2001
From: Marouane el hallaoui <marouane.el.hallaoui@oracle.com>
Date: Tue, 31 Aug 2021 17:30:00 +0100
Subject: [PATCH 051/681] update to jvmci-21.3-b03

---
 common.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common.json b/common.json
index eed1172ae295..c599e129d6de 100644
--- a/common.json
+++ b/common.json
@@ -2,20 +2,20 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b02", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+06-jvmci-21.3-b02", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+06-jvmci-21.3-b02-fastdebug", "platformspecific": true },
+    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b03", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03-fastdebug", "platformspecific": true },
 
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+6-jvmci-21.3-b02", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+9-jvmci-21.3-b03", "platformspecific": true },
 
     "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b02-debug", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+7-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+7-jvmci-21.3-b02-debug", "platformspecific": true }
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03-debug", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03-debug", "platformspecific": true }
   },
 
   "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

From fce66273894a724b565521ae27a88b87e90988e1 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Fri, 20 Aug 2021 12:32:11 +0200
Subject: [PATCH 052/681] type checking: common hub access and slot check on
 svm

---
 .../graalvm/compiler/core/phases/MidTier.java |   5 +
 .../micro/benchmarks/TypecheckBenchmark.java  | 309 ++++++++++++++++++
 .../meta/SubstrateBasicLoweringProvider.java  |   2 +-
 .../graal/snippets/SubstrateIntrinsics.java   |   4 +
 .../svm/core/graal/snippets/TypeSnippets.java |  55 ++--
 .../svm/core/graal/word/DynamicHubAccess.java |  36 ++
 .../core/graal/word/SubstrateOperation.java   |  42 +++
 .../word/SubstrateWordOperationPlugins.java   |  91 ++++++
 .../svm/hosted/NativeImageGenerator.java      |   3 +-
 9 files changed, 523 insertions(+), 24 deletions(-)
 create mode 100644 compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateOperation.java
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java

diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
index 5ad2da686d68..7227895cbae1 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
@@ -36,6 +36,7 @@
 import static org.graalvm.compiler.core.common.SpectrePHTMitigations.NonDeoptGuardTargets;
 import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
 
+import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.loop.phases.LoopPartialUnrollPhase;
 import org.graalvm.compiler.loop.phases.LoopPredicationPhase;
 import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase;
@@ -102,6 +103,10 @@ public MidTier(OptionValues options) {
 
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER));
 
+        if (GraalOptions.ConditionalElimination.getValue(options)) {
+            appendPhase(new IterativeConditionalEliminationPhase(canonicalizer, false));
+        }
+
         appendPhase(new OptimizeDivPhase());
 
         appendPhase(new FrameStateAssignmentPhase());
diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
new file mode 100644
index 000000000000..e4f749be75e7
--- /dev/null
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2017, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package micro.benchmarks;
+
+import java.lang.reflect.Array;
+import java.util.Random;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+
+public class TypecheckBenchmark extends BenchmarkBase {
+
+    static class A {
+
+    }
+
+    static class B {
+
+    }
+
+    static class C {
+
+    }
+
+    static class AA {
+
+    }
+
+    static class AA1 extends AA {
+
+    }
+
+    static class AA2 extends AA1 {
+
+    }
+
+    static class BB {
+
+    }
+
+    static class BB1 extends BB {
+
+    }
+
+    static class BB2 extends BB1 {
+
+    }
+
+    static class CC {
+
+    }
+
+    static class CC1 extends CC {
+
+    }
+
+    static class CC2 extends CC1 {
+
+    }
+
+    @State(Scope.Benchmark)
+    public static class ThreadState {
+
+        private static final int N = 100000;
+
+        final Random r = new Random(17);
+
+        final C c = new C();
+        final B b = new B();
+        final A a = new A();
+        final CC2 cc2 = new CC2();
+        final CC1 cc1 = new CC1();
+        final CC cc = new CC();
+        final BB2 bb2 = new BB2();
+        final BB1 bb1 = new BB1();
+        final BB bb = new BB();
+        final AA2 aa2 = new AA2();
+        final AA1 aa1 = new AA1();
+        final AA aa = new AA();
+        Random r1 = new Random(31);
+
+        int magic = 14;
+
+        Object[] aas = createAAs();
+        Class<?>[] classes = createClasses(N);
+        Object[] object = createObjects(N);
+
+        private Object[] createAAs() {
+            Object[] source = new Object[N];
+            for (int i = 0; i < N; i++) {
+                if (i == magic) {
+                    source[i] = new CC();
+                }
+                int rand = r.nextInt(3);
+                if (rand <= 1) {
+                    source[i] = new AA2();
+                } else {
+                    source[i] = new AA1();
+                }
+            }
+            return source;
+        }
+
+        private Class<?>[] createClasses(int n2) {
+            Class<?>[] ccs = new Class<?>[n2];
+            for (int i = 0; i < N; i++) {
+                ccs[i] = nextClass();
+            }
+            return ccs;
+        }
+
+        private Object[] createObjects(int n2) {
+            Object[] o = new Object[n2];
+            for (int i = 0; i < N; i++) {
+                o[i] = nextElement();
+            }
+            return o;
+        }
+
+        private Object nextElement() {
+            int rand = r.nextInt(12);
+
+            if (rand == 10) {
+                return aa2;
+            } else if (rand == 11) {
+                return bb2;
+            } else if (rand == 12) {
+                return cc2;
+            } else if (rand == 9) {
+                return c;
+            } else if (rand == 8) {
+                return b;
+            } else if (rand == 7) {
+                return a;
+            } else if (rand == 6) {
+                return cc1;
+            } else if (rand == 5) {
+                return cc;
+            } else if (rand == 4) {
+                return bb1;
+            } else if (rand == 3) {
+                return bb;
+            } else if (rand == 2) {
+                return aa1;
+            }
+            return aa;
+        }
+
+        private Class<?> nextClass() {
+            int rand = r1.nextInt(10);
+
+            if (rand == 9) {
+                return C.class;
+            } else if (rand == 8) {
+                return B.class;
+            } else if (rand == 7) {
+                return A.class;
+            } else if (rand == 6) {
+                return CC1.class;
+            } else if (rand == 5) {
+                return CC.class;
+            } else if (rand == 4) {
+                return BB1.class;
+            } else if (rand == 3) {
+                return BB.class;
+            } else if (rand == 2) {
+                return AA1.class;
+            }
+            return AA.class;
+        }
+    }
+
+    @Benchmark
+    public void benchArrayStore(ThreadState state) {
+        Object[] target = (Object[]) Array.newInstance(state.aas[0].getClass().getSuperclass(), state.aas.length);
+        for (int i = 0; i < state.aas.length; i++) {
+            if (i == state.magic) {
+                continue;
+            }
+            target[i] = state.aas[i];
+        }
+    }
+
+    @Benchmark
+    public int repetitiveTypeCheckExact(ThreadState state) {
+        int res = 0;
+        for (int i = 0; i < state.object.length; i++) {
+            Object o = state.object[i];
+            if (o instanceof A) {
+                res++;
+            } else if (o instanceof B) {
+                res += 2;
+            } else if (o instanceof C) {
+                res += 4;
+            }
+        }
+        return res;
+    }
+
+    @Benchmark
+    public int repetitiveTypeCheckSubclasses(ThreadState state) {
+        int res = 0;
+        for (int i = 0; i < state.object.length; i++) {
+            Object o = state.object[i];
+            if (o == null) {
+                return 0;
+            }
+            if (o instanceof AA1) {
+                res += 7;
+            } else if (o instanceof BB1) {
+                res += 5;
+            } else if (o instanceof CC1) {
+                res += 3;
+            } else if (o instanceof AA) {
+                res++;
+            } else if (o instanceof BB) {
+                res += 2;
+            } else if (o instanceof CC) {
+                res += 4;
+            }
+        }
+        return res;
+    }
+
+    @Benchmark
+    public int repetitiveClassIsAssignable(ThreadState state) {
+        int res = 0;
+        for (int i = 0; i < state.object.length; i++) {
+            Object o = state.object[i];
+            if (o == null) {
+                return 0;
+            }
+            if (AA1.class.isAssignableFrom(o.getClass())) {
+                res += 7;
+            } else if (BB1.class.isAssignableFrom(o.getClass())) {
+                res += 3;
+            } else if (CC1.class.isAssignableFrom(o.getClass())) {
+                res += 5;
+            } else if (AA.class.isAssignableFrom(o.getClass())) {
+                res++;
+            } else if (BB.class.isAssignableFrom(o.getClass())) {
+                res += 2;
+            } else if (CC.class.isAssignableFrom(o.getClass())) {
+                res += 4;
+            }
+        }
+        return res;
+    }
+
+    @Benchmark
+    public int repetitiveInstanceOfDynamic(ThreadState state) {
+        int res = 0;
+        for (int i = 0; i < state.object.length / 8; i += 8) {
+            Object o1 = state.object[i];
+            Object o2 = state.object[i + 1];
+            Object o3 = state.object[i + 2];
+            Object o4 = state.object[i + 3];
+            Object o5 = state.object[i + 4];
+            Object o6 = state.object[i + 5];
+            Object o7 = state.object[i + 6];
+            Object o8 = state.object[i + 7];
+            Class<?> c = state.classes[i];
+
+            if (c.isInstance(o1)) {
+                res++;
+            } else if (c.isInstance(o2)) {
+                res++;
+            } else if (c.isInstance(o3)) {
+                res++;
+            } else if (c.isInstance(o4)) {
+                res++;
+            } else if (c.isInstance(o5)) {
+                res++;
+            } else if (c.isInstance(o6)) {
+                res++;
+            } else if (c.isInstance(o7)) {
+                res++;
+            } else if (c.isInstance(o8)) {
+                res++;
+            }
+        }
+
+        return res;
+    }
+
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
index 037bec25405d..64769d770b2d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
@@ -175,7 +175,7 @@ protected ValueNode createReadHub(StructuredGraph graph, ValueNode object, Lower
             return graph.unique(new LoadHubNode(tool.getStampProvider(), object));
         }
 
-        assert !object.isConstant() || object.asJavaConstant().isNull();
+        assert !object.isConstant() || object.asJavaConstant().isNull() : "Object should either not be a constant or the null constant" + object;
 
         ObjectLayout objectLayout = getObjectLayout();
         Stamp headerBitsStamp = StampFactory.forUnsignedInteger(8 * objectLayout.getReferenceSize());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
index bd151312aaa8..fb5aad712efb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
@@ -30,6 +30,7 @@
 import org.graalvm.compiler.nodes.BreakpointNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.LoadHubNode;
+import org.graalvm.compiler.nodes.extended.LoadHubOrNullNode;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.hub.DynamicHub;
@@ -44,6 +45,9 @@ protected interface Any {
     @NodeIntrinsic(LoadHubNode.class)
     public static native DynamicHub loadHub(Object object);
 
+    @NodeIntrinsic(LoadHubOrNullNode.class)
+    public static native DynamicHub loadHubOrNull(Object object);
+
     @NodeIntrinsic(value = ForeignCallNode.class)
     public static native void runtimeCall(@ConstantNodeParameter ForeignCallDescriptor descriptor);
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
index 7f6b3c5c7305..fc62f5662a3a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
@@ -25,6 +25,7 @@
 package com.oracle.svm.core.graal.snippets;
 
 import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.loadHub;
+import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.loadHubOrNull;
 
 import java.util.Map;
 
@@ -38,6 +39,7 @@
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.SnippetAnchorNode;
 import org.graalvm.compiler.nodes.calc.FloatingNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode;
 import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
 import org.graalvm.compiler.nodes.java.InstanceOfNode;
@@ -47,11 +49,11 @@
 import org.graalvm.compiler.replacements.InstanceOfSnippetsTemplates;
 import org.graalvm.compiler.replacements.SnippetTemplate;
 import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.word.ObjectAccess;
 
 import com.oracle.svm.core.annotate.DuplicatedInNativeCode;
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
+import com.oracle.svm.core.graal.word.DynamicHubAccess;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.meta.SharedType;
 
@@ -66,16 +68,16 @@ protected static SubstrateIntrinsics.Any typeEqualitySnippet(
                     SubstrateIntrinsics.Any falseValue,
                     @Snippet.ConstantParameter boolean allowsNull,
                     DynamicHub exactType) {
-
-        if (object == null) {
-            return allowsNull ? trueValue : falseValue;
+        if (allowsNull) {
+            if (object == null) {
+                return trueValue;
+            }
         }
-        Object objectNonNull = PiNode.piCastNonNull(object, SnippetAnchorNode.anchor());
-
-        if (loadHub(objectNonNull) == exactType) {
-            return trueValue;
+        Object hubOrNull = loadHubOrNull(object);
+        if (hubOrNull != exactType) {
+            return falseValue;
         }
-        return falseValue;
+        return trueValue;
     }
 
     @Snippet
@@ -87,12 +89,16 @@ protected static SubstrateIntrinsics.Any instanceOfSnippet(
                     short start, short range, short slot,
                     @Snippet.ConstantParameter int typeIDSlotOffset) {
         if (object == null) {
-            return allowsNull ? trueValue : falseValue;
+            if (allowsNull) {
+                return trueValue;
+            }
+            return falseValue;
         }
-        Object objectNonNull = PiNode.piCastNonNull(object, SnippetAnchorNode.anchor());
-        DynamicHub objectHub = loadHub(objectNonNull);
-
-        return slotTypeCheck(start, range, slot, typeIDSlotOffset, objectHub, trueValue, falseValue);
+        GuardingNode guard = SnippetAnchorNode.anchor();
+        Object nonNullObject = PiNode.piCastNonNull(object, guard);
+        DynamicHub hubNoneNull = loadHub(nonNullObject);
+        // no need to guard, guarded via hub
+        return slotTypeCheck(start, range, slot, typeIDSlotOffset, hubNoneNull, trueValue, falseValue, null);
     }
 
     @Snippet
@@ -104,12 +110,16 @@ protected static SubstrateIntrinsics.Any instanceOfDynamicSnippet(
                     @Snippet.ConstantParameter boolean allowsNull,
                     @Snippet.ConstantParameter int typeIDSlotOffset) {
         if (object == null) {
-            return allowsNull ? trueValue : falseValue;
+            if (allowsNull) {
+                return trueValue;
+            }
+            return falseValue;
         }
-        Object objectNonNull = PiNode.piCastNonNull(object, SnippetAnchorNode.anchor());
-        DynamicHub objectHub = loadHub(objectNonNull);
-
-        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, objectHub, trueValue, falseValue);
+        GuardingNode guard = SnippetAnchorNode.anchor();
+        Object nonNullObject = PiNode.piCastNonNull(object, guard);
+        DynamicHub hubNoneNull = loadHub(nonNullObject);
+        // no need to guard, guarded via hub
+        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, hubNoneNull, trueValue, falseValue, null);
     }
 
     @Snippet
@@ -119,7 +129,8 @@ protected static SubstrateIntrinsics.Any classIsAssignableFromSnippet(
                     SubstrateIntrinsics.Any trueValue,
                     SubstrateIntrinsics.Any falseValue,
                     @Snippet.ConstantParameter int typeIDSlotOffset) {
-        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, checkedHub, trueValue, falseValue);
+        // no guard needed, b guaranteed to be non null
+        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, checkedHub, trueValue, falseValue, null);
     }
 
     @DuplicatedInNativeCode
@@ -128,12 +139,12 @@ private static SubstrateIntrinsics.Any slotTypeCheck(
                     int typeIDSlotOffset,
                     DynamicHub checkedHub,
                     SubstrateIntrinsics.Any trueValue,
-                    SubstrateIntrinsics.Any falseValue) {
+                    SubstrateIntrinsics.Any falseValue, GuardingNode guard) {
         int typeCheckStart = Short.toUnsignedInt(start);
         int typeCheckRange = Short.toUnsignedInt(range);
         int typeCheckSlot = Short.toUnsignedInt(slot) * 2;
 
-        int checkedTypeID = Short.toUnsignedInt(ObjectAccess.readShort(checkedHub, typeIDSlotOffset + typeCheckSlot, NamedLocationIdentity.FINAL_LOCATION));
+        int checkedTypeID = Short.toUnsignedInt(DynamicHubAccess.readShort(checkedHub, typeIDSlotOffset + typeCheckSlot, NamedLocationIdentity.FINAL_LOCATION, guard));
 
         if (UnsignedMath.belowThan(checkedTypeID - typeCheckStart, typeCheckRange)) {
             return trueValue;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
new file mode 100644
index 000000000000..e926f9110bb1
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2012, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.graal.word;
+
+import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.word.LocationIdentity;
+
+import com.oracle.svm.core.graal.word.SubstrateOperation.SubstrateOpcode;
+
+public final class DynamicHubAccess {
+
+    @SubstrateOperation(opcode = SubstrateOpcode.READ_FROM_HUB)
+    public static native short readShort(Object object, int offset, LocationIdentity identity, GuardingNode guard);
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateOperation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateOperation.java
new file mode 100644
index 000000000000..1227bb12af05
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.graal.word;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SubstrateOperation {
+
+    enum SubstrateOpcode {
+        READ_FROM_HUB
+    }
+
+    SubstrateOpcode opcode();
+
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
new file mode 100644
index 000000000000..62c782a0fda7
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2012, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.graal.word;
+
+import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.word.WordOperationPlugin;
+import org.graalvm.compiler.word.WordTypes;
+import org.graalvm.util.GuardedAnnotationAccess;
+import org.graalvm.word.LocationIdentity;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+public class SubstrateWordOperationPlugins extends WordOperationPlugin {
+
+    public SubstrateWordOperationPlugins(SnippetReflectionProvider snippetReflection, WordTypes wordTypes) {
+        super(snippetReflection, wordTypes);
+    }
+
+    @Override
+    public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
+        if (!wordTypes.isWordOperation(method)) {
+            if (!method.getDeclaringClass().equals(b.getMetaAccess().lookupJavaType(DynamicHubAccess.class))) {
+                return false;
+            }
+        }
+
+        SubstrateOperation operation = GuardedAnnotationAccess.getAnnotation(method, SubstrateOperation.class);
+        if (operation == null) {
+            processWordOperation(b, args, wordTypes.getWordOperation(method, b.getMethod().getDeclaringClass()));
+            return true;
+        }
+        processSubstrateOperation(b, method, args, operation);
+        return true;
+    }
+
+    protected void processSubstrateOperation(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args, SubstrateOperation operation) {
+        switch (operation.opcode()) {
+            case READ_FROM_HUB:
+                JavaKind returnKind = method.getSignature().getReturnKind();
+                assert args.length == 4 : "arg length=" + args.length + " operation=" + operation;
+                JavaKind readKind = wordTypes.asKind(method.getSignature().getReturnType(method.getDeclaringClass()));
+                AddressNode address = makeAddress(b, args[0], args[1]);
+                LocationIdentity location;
+                assert args[2].isConstant() : args[2];
+                location = snippetReflection.asObject(LocationIdentity.class, args[2].asJavaConstant());
+                assert location != null : snippetReflection.asObject(Object.class, args[2].asJavaConstant());
+                FixedAccessNode read = b.add(new ReadNode(address, location, StampFactory.forKind(readKind), BarrierType.NONE));
+                if (!(args[3] instanceof ConstantNode)) {
+                    // guard can be the null constant
+                    read.setGuard((GuardingNode) args[3]);
+                }
+                b.push(returnKind, read);
+                break;
+            default:
+                throw GraalError.shouldNotReachHere("Unkown operation " + operation);
+        }
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index e6df8a8d4b78..5773e53793b5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -192,6 +192,7 @@
 import com.oracle.svm.core.graal.snippets.ExceptionSnippets;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
 import com.oracle.svm.core.graal.snippets.TypeSnippets;
+import com.oracle.svm.core.graal.word.SubstrateWordOperationPlugins;
 import com.oracle.svm.core.graal.word.SubstrateWordTypes;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
@@ -1109,7 +1110,7 @@ public static void registerGraphBuilderPlugins(FeatureHandler featureHandler, Ru
                     TargetDescription target) {
         GraphBuilderConfiguration.Plugins plugins = new GraphBuilderConfiguration.Plugins(new SubstitutionInvocationPlugins(annotationSubstitutionProcessor));
 
-        WordOperationPlugin wordOperationPlugin = new WordOperationPlugin(providers.getSnippetReflection(), providers.getWordTypes());
+        WordOperationPlugin wordOperationPlugin = new SubstrateWordOperationPlugins(providers.getSnippetReflection(), providers.getWordTypes());
 
         SubstrateReplacements replacements = (SubstrateReplacements) providers.getReplacements();
         plugins.appendInlineInvokePlugin(replacements);

From 9737841a11961a21c67c934ccd8a8077cb34199d Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Fri, 27 Aug 2021 18:00:08 +0200
Subject: [PATCH 053/681] consider load hub or null on constants if canon did
 not catch it

---
 .../replacements/DefaultJavaLoweringProvider.java         | 8 ++++++++
 .../src/micro/benchmarks/TypecheckBenchmark.java          | 2 +-
 .../core/graal/meta/SubstrateBasicLoweringProvider.java   | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 9d69d73b4fb1..039abf9ef396 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -620,6 +620,14 @@ protected void lowerLoadHubOrNullNode(LoadHubOrNullNode loadHubOrNullNode, Lower
         if (graph.getGuardsStage().allowsFloatingGuards()) {
             return;
         }
+        ValueNode object = loadHubOrNullNode.getValue();
+        if (object.isConstant() && !object.asJavaConstant().isNull()) {
+            ValueNode synonym = LoadHubNode.findSynonym(object, loadHubOrNullNode.stamp(NodeView.DEFAULT), tool.getMetaAccess(), tool.getConstantReflection());
+            if (synonym != null) {
+                loadHubOrNullNode.replaceAtUsagesAndDelete(graph.maybeAddOrUnique(synonym));
+                return;
+            }
+        }
         final FixedWithNextNode predecessor = tool.lastFixedNode();
         final ValueNode value = loadHubOrNullNode.getValue();
         AbstractPointerStamp stamp = (AbstractPointerStamp) value.stamp(NodeView.DEFAULT);
diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
index e4f749be75e7..2a548c8f152e 100644
--- a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
index 64769d770b2d..6869ecabd713 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
@@ -69,8 +69,8 @@
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.graal.nodes.FloatingWordCastNode;
-import com.oracle.svm.core.graal.nodes.SubstrateCompressionNode;
 import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode;
+import com.oracle.svm.core.graal.nodes.SubstrateCompressionNode;
 import com.oracle.svm.core.graal.nodes.SubstrateFieldLocationIdentity;
 import com.oracle.svm.core.graal.nodes.SubstrateNarrowOopStamp;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;

From 095271d347ab4685ccdb2ae31cc9c8ea79ee5d39 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 1 Sep 2021 13:36:23 +0200
Subject: [PATCH 054/681] schedule phase: respect target arch that do not
 support implicit null checks

---
 .../core/aarch64/AArch64SuitesCreator.java    | 10 +--
 .../compiler/core/test/GraalCompilerTest.java |  7 +-
 .../compiler/core/test/GraphScheduleTest.java |  3 +-
 .../core/test/GuardPrioritiesTest.java        |  2 +-
 .../compiler/core/test/LongNodeChainTest.java |  2 +-
 .../core/test/MemoryScheduleTest.java         |  2 +-
 .../core/test/ReentrantBlockIteratorTest.java |  2 +-
 .../compiler/core/test/SchedulingTest.java    |  2 +-
 .../compiler/core/test/SchedulingTest2.java   |  4 +-
 .../compiler/core/test/TypeSystemTest.java    |  3 +-
 .../core/test/ea/EscapeAnalysisTest.java      |  2 +-
 .../hotspot/SymbolicSnippetEncoder.java       |  3 +-
 .../phases/aot/ReplaceConstantNodesPhase.java |  9 +--
 .../graal/SchedulePhaseBenchmark.java         | 18 ++---
 .../graal/util/ScheduleState.java             |  9 +--
 .../compiler/nodes/cfg/ControlFlowGraph.java  |  4 ++
 .../compiler/nodes/spi/LoweringProvider.java  |  5 ++
 .../common/ConditionalEliminationPhase.java   |  2 +-
 .../compiler/phases/common/FixReadsPhase.java |  9 ++-
 .../phases/common/GuardLoweringPhase.java     |  2 +-
 .../compiler/phases/common/LoweringPhase.java |  2 +-
 .../common/ProfileCompiledMethodsPhase.java   |  4 +-
 .../graalvm/compiler/phases/BasePhase.java    |  2 +-
 .../phases/contract/NodeCostUtil.java         |  3 +-
 .../phases/schedule/SchedulePhase.java        | 65 +++++++++++++------
 .../compiler/phases/util/GraphOrder.java      |  3 +-
 .../printer/GraalDebugHandlersFactory.java    |  3 +-
 .../compiler/printer/GraphPrinter.java        |  3 +-
 .../DefaultJavaLoweringProvider.java          |  5 ++
 .../truffle/compiler/ExpansionStatistics.java |  3 +-
 .../virtual/phases/ea/EffectsPhase.java       |  2 +-
 .../graal/meta/SubstrateLoweringProvider.java |  4 ++
 32 files changed, 113 insertions(+), 86 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java
index f484cd6351d5..18aa11bb7e2a 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java
@@ -30,23 +30,23 @@
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.java.DefaultSuitesCreator;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.Phase;
 import org.graalvm.compiler.phases.PhaseSuite;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
 import org.graalvm.compiler.phases.tiers.LowTierContext;
 import org.graalvm.compiler.phases.tiers.Suites;
 
 public class AArch64SuitesCreator extends DefaultSuitesCreator {
-    private final List<Class<? extends Phase>> insertReadReplacementBeforePositions;
+    private final List<Class<? extends BasePhase<? super CoreProviders>>> insertReadReplacementBeforePositions;
 
-    public AArch64SuitesCreator(CompilerConfiguration compilerConfiguration, Plugins plugins, List<Class<? extends Phase>> insertReadReplacementBeforePositions) {
+    public AArch64SuitesCreator(CompilerConfiguration compilerConfiguration, Plugins plugins, List<Class<? extends BasePhase<? super CoreProviders>>> insertReadReplacementBeforePositions) {
         super(compilerConfiguration, plugins);
         this.insertReadReplacementBeforePositions = insertReadReplacementBeforePositions;
     }
 
-    public AArch64SuitesCreator(CompilerConfiguration compilerConfiguration, List<Class<? extends Phase>> insertReadReplacementBeforePositions) {
+    public AArch64SuitesCreator(CompilerConfiguration compilerConfiguration, List<Class<? extends BasePhase<? super CoreProviders>>> insertReadReplacementBeforePositions) {
         super(compilerConfiguration);
         this.insertReadReplacementBeforePositions = insertReadReplacementBeforePositions;
     }
@@ -55,7 +55,7 @@ public AArch64SuitesCreator(CompilerConfiguration compilerConfiguration, List<Cl
     public Suites createSuites(OptionValues options) {
         Suites suites = super.createSuites(options);
         ListIterator<BasePhase<? super LowTierContext>> findPhase = null;
-        for (Class<? extends Phase> phase : insertReadReplacementBeforePositions) {
+        for (Class<? extends BasePhase<? super CoreProviders>> phase : insertReadReplacementBeforePositions) {
             findPhase = suites.getLowTier().findPhase(phase);
             if (findPhase != null) {
                 // Put AArch64ReadReplacementPhase right before the requested phase
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
index b5ec3198abd5..22e42e8edfc1 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
@@ -496,8 +496,8 @@ protected void assertConstantReturn(StructuredGraph graph, int value) {
     }
 
     protected static String getCanonicalGraphString(StructuredGraph graph, boolean excludeVirtual, boolean checkConstants) {
-        SchedulePhase schedule = new SchedulePhase(SchedulingStrategy.EARLIEST);
-        schedule.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulingStrategy.EARLIEST);
+
         ScheduleResult scheduleResult = graph.getLastSchedule();
 
         NodeMap<Integer> canonicalId = graph.createNodeMap();
@@ -575,8 +575,7 @@ private static int filteredUsageCount(Node node) {
      * @return a scheduled textual dump of {@code graph} .
      */
     protected static String getScheduledGraphString(StructuredGraph graph) {
-        SchedulePhase schedule = new SchedulePhase(SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
-        schedule.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
         ScheduleResult scheduleResult = graph.getLastSchedule();
 
         StringBuilder result = new StringBuilder();
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java
index 6d4eaa4d8171..dcae927ece3d 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java
@@ -43,8 +43,7 @@ protected void assertOrderedAfterSchedule(StructuredGraph graph, Node a, Node b)
     }
 
     protected void assertOrderedAfterSchedule(StructuredGraph graph, SchedulePhase.SchedulingStrategy strategy, Node a, Node b) {
-        SchedulePhase ibp = new SchedulePhase(strategy);
-        ibp.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph, strategy);
         assertOrderedAfterLastSchedule(graph, a, b);
     }
 
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
index 1f50d8435ed8..0ad459b9021f 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java
@@ -111,7 +111,7 @@ public void unknownTest() {
         assumeTrue("GuardPriorities must be turned one", GraalOptions.GuardPriorities.getValue(getInitialOptions()));
         StructuredGraph graph = prepareGraph("unknownCondition");
 
-        new SchedulePhase(SchedulePhase.SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER).apply(graph);
+        new SchedulePhase(SchedulePhase.SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER).apply(graph, getDefaultHighTierContext());
         for (GuardNode g1 : graph.getNodes(GuardNode.TYPE)) {
             for (GuardNode g2 : graph.getNodes(GuardNode.TYPE)) {
                 if (g1.getSpeculation().equals(SpeculationLog.NO_SPECULATION) ^ g2.getSpeculation().equals(SpeculationLog.NO_SPECULATION)) {
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
index 021cdd58f715..96ac33582e24 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java
@@ -80,7 +80,7 @@ private void longAddChain(boolean reverse) {
         graph.start().setNext(returnNode);
 
         for (SchedulingStrategy s : Strategies) {
-            new SchedulePhase(s).apply(graph);
+            SchedulePhase.runWithoutContextOptimizations(graph, s);
         }
 
         this.createCanonicalizerPhase().apply(graph, context);
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
index 55b8feda603b..92e7914468db 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java
@@ -718,7 +718,7 @@ private ScheduleResult getFinalSchedule(final String snippet, final TestMode mod
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER).apply(graph, midContext);
 
             SchedulePhase schedule = new SchedulePhase(schedulingStrategy);
-            schedule.apply(graph);
+            schedule.apply(graph, getDefaultLowTierContext());
             return graph.getLastSchedule();
         } catch (Throwable e) {
             throw debug.handle(e);
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java
index d0216e1a7e90..4443313e5e84 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java
@@ -244,7 +244,7 @@ protected List<VoidState> processLoop(Loop<Block> loop, VoidState initialState)
         ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, true, true, false);
         ReentrantBlockIterator.apply(closure, cfg.getStartBlock());
         // schedule for IGV
-        new SchedulePhase(graph.getOptions()).apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph);
         return blocks;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java
index d43d6a3c2148..de17b0293ee8 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest.java
@@ -64,7 +64,7 @@ public void testValueProxyInputs() {
         }
         graph.clearAllStateAfter();
         SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.LATEST);
-        schedulePhase.apply(graph);
+        schedulePhase.apply(graph, getDefaultHighTierContext());
         ScheduleResult schedule = graph.getLastSchedule();
         NodeMap<Block> nodeToBlock = schedule.getCFG().getNodeToBlock();
         assertTrue(graph.getNodes().filter(LoopExitNode.class).count() == 1);
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
index 380b3e3390e5..cf343b349622 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java
@@ -72,7 +72,7 @@ public void testValueProxyInputs() {
         beginNode.setNext(returnNode);
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
         SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
-        schedulePhase.apply(graph);
+        schedulePhase.apply(graph, getDefaultHighTierContext());
         ScheduleResult schedule = graph.getLastSchedule();
         BlockMap<List<Node>> blockToNodesMap = schedule.getBlockToNodesMap();
         NodeMap<Block> nodeToBlock = schedule.getNodeToBlockMap();
@@ -106,7 +106,7 @@ public void testValueProxyInputs() {
         FrameStateAssignmentPhase phase = new FrameStateAssignmentPhase();
         phase.apply(graph);
 
-        schedulePhase.apply(graph);
+        schedulePhase.apply(graph, midContext);
         schedule = graph.getLastSchedule();
         blockToNodesMap = schedule.getBlockToNodesMap();
         nodeToBlock = schedule.getNodeToBlockMap();
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
index 05c2f94a1d89..44aa8ad47b67 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java
@@ -209,8 +209,7 @@ protected void assertEquals(StructuredGraph expected, StructuredGraph graph) {
 
     public static void outputGraph(StructuredGraph graph, String message) {
         TTY.println("========================= " + message);
-        SchedulePhase schedulePhase = new SchedulePhase(graph.getOptions());
-        schedulePhase.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph);
         ScheduleResult schedule = graph.getLastSchedule();
         for (Block block : schedule.getCFG().getBlocks()) {
             TTY.print("Block " + block + " ");
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
index 5706749921e5..6e9d60e35cd7 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
@@ -471,7 +471,7 @@ public static Object testPeeledLoopSnippet() {
     public void testPeeledLoop() {
         prepareGraph("testPeeledLoopSnippet", false);
         new LoopPeelingPhase(new DefaultLoopPolicies()).apply(graph, getDefaultHighTierContext());
-        new SchedulePhase(graph.getOptions()).apply(graph);
+        new SchedulePhase(graph.getOptions()).apply(graph, getDefaultHighTierContext());
     }
 
     public static void testDeoptMonitorSnippetInner(Object o2, Object t, int i) {
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
index 23cee691847c..b15c52dc2678 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
@@ -928,8 +928,7 @@ private static String compareGraphStrings(StructuredGraph expectedGraph, String
     }
 
     private static String getCanonicalGraphString(StructuredGraph graph, boolean excludeVirtual, boolean checkConstants) {
-        SchedulePhase schedule = new SchedulePhase(SchedulePhase.SchedulingStrategy.EARLIEST);
-        schedule.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulePhase.SchedulingStrategy.EARLIEST);
         StructuredGraph.ScheduleResult scheduleResult = graph.getLastSchedule();
 
         NodeMap<Integer> canonicalId = graph.createNodeMap();
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
index 9872c70c1705..a41598fae333 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
@@ -523,7 +523,7 @@ private static void handleLoadMethodCounters(StructuredGraph graph, FrameStateMa
      * @param context
      */
     private static void replaceLoadMethodCounters(StructuredGraph graph, FrameStateMapperClosure stateMapper, CoreProviders context) {
-        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, false);
+        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, context, false);
 
         for (LoadMethodCountersNode node : getLoadMethodCountersNodes(graph)) {
             if (anyUsagesNeedReplacement(node)) {
@@ -538,9 +538,10 @@ private static void replaceLoadMethodCounters(StructuredGraph graph, FrameStateM
      * @param graph
      * @param stateMapper
      * @param classInfo
+     * @param context
      */
-    private void replaceKlassesAndObjects(StructuredGraph graph, FrameStateMapperClosure stateMapper, ClassInfo classInfo) {
-        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, false);
+    private void replaceKlassesAndObjects(StructuredGraph graph, FrameStateMapperClosure stateMapper, ClassInfo classInfo, CoreProviders context) {
+        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, context, false);
 
         for (ConstantNode node : getConstantNodes(graph)) {
             Constant constant = node.asConstant();
@@ -580,7 +581,7 @@ protected void run(StructuredGraph graph, CoreProviders context) {
 
             // Replace object and klass constants (including the ones added in the previous pass)
             // with resolution nodes.
-            replaceKlassesAndObjects(graph, stateMapper, new ClassInfo(context.getMetaAccess()));
+            replaceKlassesAndObjects(graph, stateMapper, new ClassInfo(context.getMetaAccess()), context);
         } else {
             replaceKlassesWithoutResolution(graph, new ClassInfo(context.getMetaAccess()));
         }
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java
index f9d1e8bfb278..940c0f836b55 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java
@@ -39,7 +39,7 @@ public static class StringEquals extends ScheduleState {
 
     @Benchmark
     public void stringEquals(StringEquals s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph);
     }
 
     @Benchmark
@@ -95,7 +95,7 @@ public IntersectionState_LATEST_OPTIMAL() {
 
     @Benchmark
     public void intersection_LATEST_OPTIMAL(IntersectionState_LATEST_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhaseBenchmark.class, name = "intersectionSnippet")
@@ -107,7 +107,7 @@ public IntersectionState_LATEST_OUT_OF_LOOPS_OPTIMAL() {
 
     @Benchmark
     public void intersection_LATEST_OUT_OF_LOOPS_OPTIMAL(IntersectionState_LATEST_OUT_OF_LOOPS_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhaseBenchmark.class, name = "intersectionSnippet")
@@ -119,7 +119,7 @@ public IntersectionState_EARLIEST_OPTIMAL() {
 
     @Benchmark
     public void intersection_EARLIEST_OPTIMAL(IntersectionState_EARLIEST_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhaseBenchmark.class, name = "intersectionSnippet")
@@ -131,7 +131,7 @@ public IntersectionState_EARLIEST_WITH_GUARD_ORDER_OPTIMAL() {
 
     @Benchmark
     public void intersection_EARLIEST_WITH_GUARD_ORDER_OPTIMAL(IntersectionState_EARLIEST_WITH_GUARD_ORDER_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
     // Checkstyle: resume method name check
 
@@ -145,7 +145,7 @@ public ScheduleEarliestIterative_LATEST_OPTIMAL() {
 
     @Benchmark
     public void scheduleEarliestIterative_LATEST_OPTIMAL(ScheduleEarliestIterative_LATEST_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhase.Instance.class, name = "scheduleEarliestIterative")
@@ -157,7 +157,7 @@ public ScheduleEarliestIterative_LATEST_OUT_OF_LOOPS_OPTIMAL() {
 
     @Benchmark
     public void scheduleEarliestIterative_LATEST_OUT_OF_LOOPS_OPTIMAL(ScheduleEarliestIterative_LATEST_OUT_OF_LOOPS_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhase.Instance.class, name = "scheduleEarliestIterative")
@@ -169,7 +169,7 @@ public ScheduleEarliestIterative_EARLIEST_OPTIMAL() {
 
     @Benchmark
     public void scheduleEarliestIterative_EARLIEST_OPTIMAL(ScheduleEarliestIterative_EARLIEST_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
 
     @MethodSpec(declaringClass = SchedulePhase.Instance.class, name = "scheduleEarliestIterative")
@@ -181,7 +181,7 @@ public ScheduleEarliestIterative_EARLIEST_WITH_GUARD_ORDER_OPTIMAL() {
 
     @Benchmark
     public void scheduleEarliestIterative_EARLIEST_WITH_GUARD_ORDER_OPTIMAL(ScheduleEarliestIterative_EARLIEST_WITH_GUARD_ORDER_OPTIMAL s) {
-        s.schedule.apply(s.graph);
+        SchedulePhase.runWithoutContextOptimizations(s.graph, s.getSelectedStrategy());
     }
     // Checkstyle: resume method name check
 }
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java
index 434d5a30f717..9c621cddb796 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java
@@ -27,14 +27,11 @@
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 
 public class ScheduleState extends GraphState {
 
-    public SchedulePhase schedule;
-
     private final SchedulingStrategy selectedStrategy;
 
     public ScheduleState(SchedulingStrategy selectedStrategy) {
@@ -45,10 +42,8 @@ public ScheduleState() {
         this(SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
     }
 
-    @Override
-    public void beforeInvocation() {
-        schedule = new SchedulePhase(selectedStrategy);
-        super.beforeInvocation();
+    public SchedulingStrategy getSelectedStrategy() {
+        return selectedStrategy;
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index ba9ba7b1b89e..25d1e232b507 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -77,6 +77,10 @@ public interface RecursiveVisitor<V> {
         void exit(Block b, V value);
     }
 
+    public static ControlFlowGraph computeForSchedule(StructuredGraph graph) {
+        return compute(graph, true, true, true, false);
+    }
+
     public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlocks, boolean computeLoops, boolean computeDominators, boolean computePostdominators) {
         ControlFlowGraph cfg = new ControlFlowGraph(graph);
         cfg.identifyBlocks();
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java
index 0d6f17e84f10..dc151a686aea 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java
@@ -70,4 +70,9 @@ public interface LoweringProvider {
      */
     boolean supportsRounding();
 
+    /**
+     * Indicates whether this target platform supports the usage of implicit (trapping) null checks.
+     */
+    boolean supportsImplicitNullChecks();
+
 }
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
index 75691ae9c145..12d16801dd20 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
@@ -190,7 +190,7 @@ protected void run(StructuredGraph graph, CoreProviders context) {
                     cfg.visitDominatorTree(new MoveGuardsUpwards(), graph.isBeforeStage(StageFlag.VALUE_PROXY_REMOVAL));
                 }
                 try (DebugContext.Scope scheduleScope = graph.getDebug().scope(SchedulePhase.class)) {
-                    SchedulePhase.run(graph, SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER, cfg);
+                    SchedulePhase.run(graph, SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER, cfg, context, false);
                 } catch (Throwable t) {
                     throw graph.getDebug().handle(t);
                 }
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java
index 7180e65fc88e..da3e25601d27 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FixReadsPhase.java
@@ -77,7 +77,6 @@
 import org.graalvm.compiler.nodes.util.GraphUtil;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.Phase;
 import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
 import org.graalvm.compiler.phases.graph.ScheduledNodeIterator;
 import org.graalvm.compiler.phases.schedule.SchedulePhase;
@@ -104,7 +103,7 @@ public class FixReadsPhase extends BasePhase<CoreProviders> {
     private static final CounterKey counterBetterMergedStamps = DebugContext.counter("FixReads_BetterMergedStamp");
 
     protected boolean replaceInputsWithConstants;
-    protected Phase schedulePhase;
+    protected BasePhase<? super CoreProviders> schedulePhase;
     protected CanonicalizerPhase canonicalizerPhase;
 
     @Override
@@ -595,7 +594,7 @@ public void exit(Block b, Integer state) {
 
     }
 
-    public FixReadsPhase(boolean replaceInputsWithConstants, Phase schedulePhase, CanonicalizerPhase canonicalizerPhase) {
+    public FixReadsPhase(boolean replaceInputsWithConstants, BasePhase<? super CoreProviders> schedulePhase, CanonicalizerPhase canonicalizerPhase) {
         this.replaceInputsWithConstants = replaceInputsWithConstants;
         this.schedulePhase = schedulePhase;
         this.canonicalizerPhase = canonicalizerPhase;
@@ -605,7 +604,7 @@ public FixReadsPhase(boolean replaceInputsWithConstants, Phase schedulePhase, Ca
     @SuppressWarnings("try")
     protected void run(StructuredGraph graph, CoreProviders context) {
         assert graph.verify();
-        schedulePhase.apply(graph);
+        schedulePhase.apply(graph, context);
         ScheduleResult schedule = graph.getLastSchedule();
         FixReadsClosure fixReadsClosure = new FixReadsClosure();
         EconomicSetNodeEventListener ec = new EconomicSetNodeEventListener();
@@ -642,7 +641,7 @@ protected CharSequence getName() {
         protected void run(StructuredGraph graph, LowTierContext context) {
             if (GraalOptions.RawConditionalElimination.getValue(graph.getOptions())) {
                 SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.LATEST, true);
-                schedulePhase.apply(graph);
+                schedulePhase.apply(graph, context);
                 ScheduleResult schedule = graph.getLastSchedule();
                 schedule.getCFG().visitDominatorTree(new RawConditionalEliminationVisitor(graph, schedule, context.getMetaAccess(), replaceInputsWithConstants), false);
             }
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
index 94be0fd4a1cc..6b89d95fff98 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
@@ -110,7 +110,7 @@ private void lowerToIf(GuardNode guard) {
     protected void run(StructuredGraph graph, CoreProviders context) {
         if (graph.getGuardsStage().allowsFloatingGuards()) {
             SchedulePhase schedulePhase = new SchedulePhase(SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
-            schedulePhase.apply(graph);
+            schedulePhase.apply(graph, context);
             ScheduleResult schedule = graph.getLastSchedule();
 
             for (Block block : schedule.getCFG().getBlocks()) {
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
index c0e5d0db99eb..c71b8c737046 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
@@ -370,7 +370,7 @@ public boolean checkContract() {
 
         @Override
         public void run(StructuredGraph graph) {
-            schedulePhase.apply(graph, false);
+            schedulePhase.apply(graph, context, false);
             schedule = graph.getLastSchedule();
             schedule.getCFG().computePostdominators();
             Block startBlock = schedule.getCFG().getStartBlock();
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
index b682e26d4ed2..95450a4bb237 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
@@ -103,10 +103,8 @@ private static String getProperty(String name, String def) {
 
     @Override
     protected void run(StructuredGraph graph) {
-        SchedulePhase schedule = new SchedulePhase(graph.getOptions());
-        schedule.apply(graph, false);
-
         ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, true, true, true);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulePhase.getDefaultStrategy(graph.getOptions()), cfg, true);
         for (Loop<Block> loop : cfg.getLoops()) {
             double loopProbability = cfg.blockFor(loop.getHeader().getBeginNode()).getRelativeFrequency();
             if (loopProbability > (1D / Integer.MAX_VALUE)) {
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java
index e5035282a2a7..8f605e75d2a3 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/BasePhase.java
@@ -184,7 +184,7 @@ protected boolean shouldDumpAfterAtBasicLevel() {
     }
 
     @SuppressWarnings("try")
-    protected final void apply(final StructuredGraph graph, final C context, final boolean dumpGraph) {
+    public final void apply(final StructuredGraph graph, final C context, final boolean dumpGraph) {
         if (ExcludePhaseFilter.exclude(graph.getOptions(), this, graph.asJavaMethod())) {
             return;
         }
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
index f1a1a86b0deb..dd5f43e06124 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
@@ -71,8 +71,7 @@ public static double computeGraphCycles(StructuredGraph graph, boolean fullSched
         Function<Block, Iterable<? extends Node>> blockToNodes;
         ControlFlowGraph cfg;
         if (fullSchedule) {
-            SchedulePhase schedule = new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS, true);
-            schedule.apply(graph);
+            SchedulePhase.runWithoutContextOptimizations(graph, SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS, true);
             cfg = graph.getLastSchedule().getCFG();
             blockToNodes = b -> graph.getLastSchedule().getBlockToNodesMap().get(b);
         } else {
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
index ce14a1970e53..4b3667f07091 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
@@ -85,12 +85,13 @@
 import org.graalvm.compiler.nodes.memory.FloatingReadNode;
 import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.ValueProxy;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.Phase;
+import org.graalvm.compiler.phases.BasePhase;
 import org.graalvm.word.LocationIdentity;
 
-public final class SchedulePhase extends Phase {
+public final class SchedulePhase extends BasePhase<CoreProviders> {
 
     public enum SchedulingStrategy {
         EARLIEST_WITH_GUARD_ORDER,
@@ -125,7 +126,7 @@ public SchedulePhase(OptionValues options) {
     }
 
     public SchedulePhase(boolean immutableGraph, OptionValues options) {
-        this(OptScheduleOutOfLoops.getValue(options) ? SchedulingStrategy.LATEST_OUT_OF_LOOPS : SchedulingStrategy.LATEST, immutableGraph);
+        this(getDefaultStrategy(options), immutableGraph);
     }
 
     public SchedulePhase(SchedulingStrategy strategy) {
@@ -137,6 +138,10 @@ public SchedulePhase(SchedulingStrategy strategy, boolean immutableGraph) {
         this.immutableGraph = immutableGraph;
     }
 
+    public static SchedulingStrategy getDefaultStrategy(OptionValues options) {
+        return OptScheduleOutOfLoops.getValue(options) ? SchedulingStrategy.LATEST_OUT_OF_LOOPS : SchedulingStrategy.LATEST;
+    }
+
     private NodeEventScope verifyImmutableGraph(StructuredGraph graph) {
         if (immutableGraph && Assertions.assertionsEnabled()) {
             return graph.trackNodeEvents(new NodeEventListener() {
@@ -152,16 +157,33 @@ public void changed(NodeEvent e, Node node) {
 
     @Override
     @SuppressWarnings("try")
-    protected void run(StructuredGraph graph) {
+    protected void run(StructuredGraph graph, CoreProviders context) {
         try (NodeEventScope scope = verifyImmutableGraph(graph)) {
-            Instance inst = new Instance();
+            Instance inst = new Instance(context.getLowerer().supportsImplicitNullChecks());
             inst.run(graph, selectedStrategy, immutableGraph);
         }
     }
 
-    public static void run(StructuredGraph graph, SchedulingStrategy strategy, ControlFlowGraph cfg) {
-        Instance inst = new Instance(cfg);
-        inst.run(graph, strategy, false);
+    public static void runWithoutContextOptimizations(StructuredGraph graph) {
+        runWithoutContextOptimizations(graph, getDefaultStrategy(graph.getOptions()));
+    }
+
+    public static void runWithoutContextOptimizations(StructuredGraph graph, SchedulingStrategy strategy) {
+        runWithoutContextOptimizations(graph, strategy, ControlFlowGraph.computeForSchedule(graph), false);
+    }
+
+    public static void runWithoutContextOptimizations(StructuredGraph graph, SchedulingStrategy strategy, boolean immutable) {
+        runWithoutContextOptimizations(graph, strategy, ControlFlowGraph.computeForSchedule(graph), immutable);
+    }
+
+    public static void runWithoutContextOptimizations(StructuredGraph graph, SchedulingStrategy strategy, ControlFlowGraph cfg, boolean immutable) {
+        Instance inst = new Instance(cfg, false);
+        inst.run(graph, strategy, immutable);
+    }
+
+    public static void run(StructuredGraph graph, SchedulingStrategy strategy, ControlFlowGraph cfg, CoreProviders context, boolean immutable) {
+        Instance inst = new Instance(cfg, context.getLowerer().supportsImplicitNullChecks());
+        inst.run(graph, strategy, immutable);
     }
 
     public static class Instance {
@@ -173,19 +195,19 @@ public static class Instance {
         protected ControlFlowGraph cfg;
         protected BlockMap<List<Node>> blockToNodesMap;
         protected NodeMap<Block> nodeToBlockMap;
+        protected boolean supportsImplicitNullChecks;
 
-        public Instance() {
-            this(null);
+        public Instance(boolean supportsImplicitNullChecks) {
+            this(null, supportsImplicitNullChecks);
         }
 
-        public Instance(ControlFlowGraph cfg) {
+        public Instance(ControlFlowGraph cfg, boolean supportsImplicitNullChecks) {
             this.cfg = cfg;
+            this.supportsImplicitNullChecks = supportsImplicitNullChecks;
         }
 
         @SuppressWarnings("try")
         public void run(StructuredGraph graph, SchedulingStrategy selectedStrategy, boolean immutableGraph) {
-            // assert GraphOrder.assertNonCyclicGraph(graph);
-
             if (this.cfg == null) {
                 this.cfg = ControlFlowGraph.compute(graph, true, true, true, false);
             }
@@ -206,7 +228,7 @@ public void run(StructuredGraph graph, SchedulingStrategy selectedStrategy, bool
                 }
 
                 BlockMap<ArrayList<FloatingReadNode>> watchListMap = calcLatestBlocks(selectedStrategy, currentNodeMap, earliestBlockToNodesMap, visited, latestBlockToNodesMap, immutableGraph);
-                sortNodesLatestWithinBlock(cfg, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited);
+                sortNodesLatestWithinBlock(cfg, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited, supportsImplicitNullChecks);
 
                 assert verifySchedule(cfg, latestBlockToNodesMap, currentNodeMap);
                 assert (!Assertions.detailedAssertionsEnabled(graph.getOptions())) ||
@@ -409,14 +431,14 @@ private static void fillKillSet(LocationSet killed, List<Node> subList) {
         }
 
         private static void sortNodesLatestWithinBlock(ControlFlowGraph cfg, BlockMap<List<Node>> earliestBlockToNodesMap, BlockMap<List<Node>> latestBlockToNodesMap, NodeMap<Block> currentNodeMap,
-                        BlockMap<ArrayList<FloatingReadNode>> watchListMap, NodeBitMap visited) {
+                        BlockMap<ArrayList<FloatingReadNode>> watchListMap, NodeBitMap visited, boolean supportsImplicitNullChecks) {
             for (Block b : cfg.getBlocks()) {
-                sortNodesLatestWithinBlock(b, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited);
+                sortNodesLatestWithinBlock(b, earliestBlockToNodesMap, latestBlockToNodesMap, currentNodeMap, watchListMap, visited, supportsImplicitNullChecks);
             }
         }
 
         private static void sortNodesLatestWithinBlock(Block b, BlockMap<List<Node>> earliestBlockToNodesMap, BlockMap<List<Node>> latestBlockToNodesMap, NodeMap<Block> nodeMap,
-                        BlockMap<ArrayList<FloatingReadNode>> watchListMap, NodeBitMap unprocessed) {
+                        BlockMap<ArrayList<FloatingReadNode>> watchListMap, NodeBitMap unprocessed, boolean supportsImplicitNullChecks) {
             List<Node> earliestSorting = earliestBlockToNodesMap.get(b);
             ArrayList<Node> result = new ArrayList<>(earliestSorting.size());
             ArrayList<FloatingReadNode> watchList = null;
@@ -452,7 +474,7 @@ private static void sortNodesLatestWithinBlock(Block b, BlockMap<List<Node>> ear
                         sortIntoList(n, b, result, nodeMap, unprocessed, null);
                     } else if (nodeMap.get(n) == b && n instanceof FloatingReadNode) {
                         FloatingReadNode floatingReadNode = (FloatingReadNode) n;
-                        if (isImplicitNullOpportunity(floatingReadNode, b)) {
+                        if (isImplicitNullOpportunity(floatingReadNode, b, supportsImplicitNullChecks)) {
                             // Schedule at the beginning of the block.
                             sortIntoList(floatingReadNode, b, result, nodeMap, unprocessed, null);
                         } else {
@@ -596,7 +618,7 @@ protected void calcLatestBlock(Block earliestBlock, SchedulingStrategy strategy,
                 }
             }
 
-            if (latestBlock != earliestBlock && strategy.considerImplicitNullChecks() && isImplicitNullOpportunity(currentNode, earliestBlock) &&
+            if (latestBlock != earliestBlock && strategy.considerImplicitNullChecks() && isImplicitNullOpportunity(currentNode, earliestBlock, supportsImplicitNullChecks) &&
                             earliestBlock.getRelativeFrequency() < latestBlock.getRelativeFrequency() * IMPLICIT_NULL_CHECK_OPPORTUNITY_PROBABILITY_FACTOR) {
                 latestBlock = earliestBlock;
             }
@@ -604,7 +626,10 @@ protected void calcLatestBlock(Block earliestBlock, SchedulingStrategy strategy,
             selectLatestBlock(currentNode, earliestBlock, latestBlock, currentNodeMap, watchListMap, constrainingLocation, latestBlockToNodesMap);
         }
 
-        protected static boolean isImplicitNullOpportunity(Node currentNode, Block block) {
+        protected static boolean isImplicitNullOpportunity(Node currentNode, Block block, boolean supportsImplicitNullChecks) {
+            if (!supportsImplicitNullChecks) {
+                return false;
+            }
             if (currentNode instanceof FloatingReadNode) {
                 FloatingReadNode floatingReadNode = (FloatingReadNode) currentNode;
                 Node pred = block.getBeginNode().predecessor();
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java
index 2eebfa16ecac..d9ca05e27db8 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/util/GraphOrder.java
@@ -159,9 +159,8 @@ private static void visitForward(ArrayList<Node> nodes, NodeBitMap visited, Node
     public static boolean assertSchedulableGraph(final StructuredGraph graph) {
         assert graph.getGuardsStage() != GuardsStage.AFTER_FSA : "Cannot use the BlockIteratorClosure after FrameState Assignment, HIR Loop Data Structures are no longer valid.";
         try (DebugContext.Scope s = graph.getDebug().scope("AssertSchedulableGraph")) {
-            final SchedulePhase schedulePhase = new SchedulePhase(getSchedulingPolicy(graph), true);
+            SchedulePhase.runWithoutContextOptimizations(graph, getSchedulingPolicy(graph), true);
             final EconomicMap<LoopBeginNode, NodeBitMap> loopEntryStates = EconomicMap.create(Equivalence.IDENTITY);
-            schedulePhase.apply(graph, false);
             final ScheduleResult schedule = graph.getLastSchedule();
 
             BlockIteratorClosure<NodeBitMap> closure = new BlockIteratorClosure<NodeBitMap>() {
diff --git a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java
index 1a1978fa47e2..018d1f2695c4 100644
--- a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java
+++ b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java
@@ -101,8 +101,7 @@ static ScheduleResult tryGetSchedule(DebugContext debug, StructuredGraph graph)
             // Also provide a schedule when an error occurs
             if (DebugOptions.PrintGraphWithSchedule.getValue(graph.getOptions()) || debug.contextLookup(Throwable.class) != null) {
                 try (DebugCloseable noIntercept = debug.disableIntercept()) {
-                    SchedulePhase schedule = new SchedulePhase(graph.getOptions());
-                    schedule.apply(graph);
+                    SchedulePhase.runWithoutContextOptimizations(graph);
                     scheduleResult = graph.getLastSchedule();
                 } catch (Throwable t) {
                 }
diff --git a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
index e4ae066bc3ed..16b790efd6ec 100644
--- a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
+++ b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java
@@ -249,8 +249,7 @@ static StructuredGraph.ScheduleResult getScheduleOrNull(Graph graph) {
             if (scheduleResult == null) {
                 DebugContext debug = graph.getDebug();
                 try (Scope scope = debug.disable()) {
-                    SchedulePhase schedule = new SchedulePhase(graph.getOptions());
-                    schedule.apply(sgraph);
+                    SchedulePhase.runWithoutContextOptimizations(sgraph);
                     scheduleResult = sgraph.getLastSchedule();
                 } catch (Throwable t) {
                 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 039abf9ef396..301056e12482 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -208,6 +208,11 @@ public void initialize(OptionValues options, Iterable<DebugHandlersFactory> fact
         providers.getReplacements().registerSnippetTemplateCache(new SnippetCounterNode.SnippetCounterSnippets.Templates(options, factories, providers, snippetReflection, target));
     }
 
+    @Override
+    public boolean supportsImplicitNullChecks() {
+        return target.implicitNullCheckLimit > 0;
+    }
+
     public final TargetDescription getTarget() {
         return target;
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java
index f7896f79c9ec..0b082d3f76e8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java
@@ -294,8 +294,7 @@ private static <T> int orderBySumDesc(Entry<T, Stats> e0, Entry<T, Stats> e1) {
 
     private static TreeNode buildMethodTree(StructuredGraph graph) {
         TreeNode root = new TreeNode(null, null, ExpansionStatistics::buildMethodTreeLabel);
-        SchedulePhase schedule = new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS, true);
-        schedule.apply(graph);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS, true);
         ControlFlowGraph cfg = graph.getLastSchedule().getCFG();
         for (Node node : graph.getNodes()) {
             NodeSourcePosition nodeSourcePosition = node.getNodeSourcePosition();
diff --git a/compiler/src/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java b/compiler/src/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java
index 66f4511bb201..e0f37ee06461 100644
--- a/compiler/src/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java
+++ b/compiler/src/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java
@@ -95,7 +95,7 @@ public boolean runAnalysis(StructuredGraph graph, CoreProvidersT context) {
                     schedule = null;
                     cfg = ControlFlowGraph.compute(graph, true, true, false, false);
                 } else {
-                    new SchedulePhase(strategy).apply(graph, false);
+                    new SchedulePhase(strategy).apply(graph, context, false);
                     schedule = graph.getLastSchedule();
                     cfg = schedule.getCFG();
                 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
index bc7e984939fe..4f75702cb5ac 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
@@ -61,4 +61,8 @@ static LoweringProvider create(MetaAccessProvider metaAccess, ForeignCallsProvid
 
     }
 
+    @Override
+    default boolean supportsImplicitNullChecks() {
+        return false;
+    }
 }

From 5d4e39ce7da51854489c944a2454a3d81c18f99d Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Mon, 6 Sep 2021 10:21:32 +0200
Subject: [PATCH 055/681] address review comments

---
 .../DefaultJavaLoweringProvider.java          |  4 ++++
 .../meta/SubstrateBasicLoweringProvider.java  |  3 ++-
 .../svm/core/graal/snippets/TypeSnippets.java | 19 ++++++++-----------
 .../word/SubstrateWordOperationPlugins.java   |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 301056e12482..1c69da41509f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -627,6 +627,10 @@ protected void lowerLoadHubOrNullNode(LoadHubOrNullNode loadHubOrNullNode, Lower
         }
         ValueNode object = loadHubOrNullNode.getValue();
         if (object.isConstant() && !object.asJavaConstant().isNull()) {
+            /*
+             * Special case: insufficient canonicalization was run since the last lowering, if we
+             * are loading the hub from a constant we want to still fold it.
+             */
             ValueNode synonym = LoadHubNode.findSynonym(object, loadHubOrNullNode.stamp(NodeView.DEFAULT), tool.getMetaAccess(), tool.getConstantReflection());
             if (synonym != null) {
                 loadHubOrNullNode.replaceAtUsagesAndDelete(graph.maybeAddOrUnique(synonym));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
index 6869ecabd713..a57361ac5bf7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
@@ -36,6 +36,7 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.CompressionNode.CompressionOp;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -175,7 +176,7 @@ protected ValueNode createReadHub(StructuredGraph graph, ValueNode object, Lower
             return graph.unique(new LoadHubNode(tool.getStampProvider(), object));
         }
 
-        assert !object.isConstant() || object.asJavaConstant().isNull() : "Object should either not be a constant or the null constant" + object;
+        GraalError.guarantee(!object.isConstant() || object.asJavaConstant().isNull(), "Object should either not be a constant or the null constant %s", object);
 
         ObjectLayout objectLayout = getObjectLayout();
         Stamp headerBitsStamp = StampFactory.forUnsignedInteger(8 * objectLayout.getReferenceSize());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
index fc62f5662a3a..ec5bf7fd65c3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
@@ -96,9 +96,8 @@ protected static SubstrateIntrinsics.Any instanceOfSnippet(
         }
         GuardingNode guard = SnippetAnchorNode.anchor();
         Object nonNullObject = PiNode.piCastNonNull(object, guard);
-        DynamicHub hubNoneNull = loadHub(nonNullObject);
-        // no need to guard, guarded via hub
-        return slotTypeCheck(start, range, slot, typeIDSlotOffset, hubNoneNull, trueValue, falseValue, null);
+        DynamicHub nonNullHub = loadHub(nonNullObject);
+        return slotTypeCheck(start, range, slot, typeIDSlotOffset, nonNullHub, trueValue, falseValue);
     }
 
     @Snippet
@@ -117,9 +116,8 @@ protected static SubstrateIntrinsics.Any instanceOfDynamicSnippet(
         }
         GuardingNode guard = SnippetAnchorNode.anchor();
         Object nonNullObject = PiNode.piCastNonNull(object, guard);
-        DynamicHub hubNoneNull = loadHub(nonNullObject);
-        // no need to guard, guarded via hub
-        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, hubNoneNull, trueValue, falseValue, null);
+        DynamicHub nonNullHub = loadHub(nonNullObject);
+        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, nonNullHub, trueValue, falseValue);
     }
 
     @Snippet
@@ -129,8 +127,7 @@ protected static SubstrateIntrinsics.Any classIsAssignableFromSnippet(
                     SubstrateIntrinsics.Any trueValue,
                     SubstrateIntrinsics.Any falseValue,
                     @Snippet.ConstantParameter int typeIDSlotOffset) {
-        // no guard needed, b guaranteed to be non null
-        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, checkedHub, trueValue, falseValue, null);
+        return slotTypeCheck(type.getTypeCheckStart(), type.getTypeCheckRange(), type.getTypeCheckSlot(), typeIDSlotOffset, checkedHub, trueValue, falseValue);
     }
 
     @DuplicatedInNativeCode
@@ -139,13 +136,13 @@ private static SubstrateIntrinsics.Any slotTypeCheck(
                     int typeIDSlotOffset,
                     DynamicHub checkedHub,
                     SubstrateIntrinsics.Any trueValue,
-                    SubstrateIntrinsics.Any falseValue, GuardingNode guard) {
+                    SubstrateIntrinsics.Any falseValue) {
         int typeCheckStart = Short.toUnsignedInt(start);
         int typeCheckRange = Short.toUnsignedInt(range);
         int typeCheckSlot = Short.toUnsignedInt(slot) * 2;
-
+        // No need to guard reading from hub as `checkedHub` is guaranteed to be non-null.
+        final GuardingNode guard = null;
         int checkedTypeID = Short.toUnsignedInt(DynamicHubAccess.readShort(checkedHub, typeIDSlotOffset + typeCheckSlot, NamedLocationIdentity.FINAL_LOCATION, guard));
-
         if (UnsignedMath.belowThan(checkedTypeID - typeCheckStart, typeCheckRange)) {
             return trueValue;
         }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
index 62c782a0fda7..248e60b1e005 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
@@ -70,7 +70,7 @@ protected void processSubstrateOperation(GraphBuilderContext b, ResolvedJavaMeth
         switch (operation.opcode()) {
             case READ_FROM_HUB:
                 JavaKind returnKind = method.getSignature().getReturnKind();
-                assert args.length == 4 : "arg length=" + args.length + " operation=" + operation;
+                GraalError.guarantee(args.length == 4, "arg length=%d operation=%s", args.length, operation);
                 JavaKind readKind = wordTypes.asKind(method.getSignature().getReturnType(method.getDeclaringClass()));
                 AddressNode address = makeAddress(b, args[0], args[1]);
                 LocationIdentity location;

From dcb74580d6f4c0b5685c08dd0e7c17327bbb4698 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Mon, 20 Sep 2021 16:10:13 +0200
Subject: [PATCH 056/681] Bump ci-overlay version

---
 graal-common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graal-common.json b/graal-common.json
index 13410b510ccd..e6854c6c3b14 100644
--- a/graal-common.json
+++ b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "b6feed939cb56920c218bad4cd64e2f475eaacf1"
+    "overlay": "32cfe3bc1cae2b79569d17017dc83ba8d494a4c9"
   },
   "mx_version" : "HEAD"
 }

From 02e6ef6726fdefbecaffda62886dc8941fec58de Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Mon, 20 Sep 2021 16:12:42 +0200
Subject: [PATCH 057/681] Prevent timeouts in dacapo weekly forks

---
 compiler/ci_common/benchmark-suites.libsonnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/ci_common/benchmark-suites.libsonnet b/compiler/ci_common/benchmark-suites.libsonnet
index 27cde8cf4168..187f49a3a176 100644
--- a/compiler/ci_common/benchmark-suites.libsonnet
+++ b/compiler/ci_common/benchmark-suites.libsonnet
@@ -42,7 +42,7 @@
     ],
     timelimit: "45:00",
     forks_batches:: 1,
-    forks_timelimit:: "02:45:00",
+    forks_timelimit:: "04:00:00",
     min_jdk_version:: 8,
     max_jdk_version:: null
   },

From b4030240301c95f3c3d357c7f8b5ba666a61cac0 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Mon, 20 Sep 2021 18:23:57 +0200
Subject: [PATCH 058/681] Add renaissance 0.12.0 and 0.13.0

---
 .../mx.java-benchmarks/mx_java_benchmarks.py      | 15 +++++++++++++--
 java-benchmarks/mx.java-benchmarks/suite.py       | 10 ++++++++++
 .../mx.substratevm/mx_substratevm_benchmark.py    |  2 +-
 substratevm/mx.substratevm/suite.py               | 10 ++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index bd89ba573067..dd5c0d0ab500 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1839,16 +1839,27 @@ def renaissanceIterations(self):
         benchmarks = _renaissanceConfig.copy()
         if self.version() == "0.9.0":
             del benchmarks["scala-doku"]  # was introduced in 0.10.0
+        if mx.get_jdk().javaCompliance >= '17' and self.version() in ["0.9.0", "0.10.0", "0.11.0", "0.12.0"]:
+            # JDK17 support for Spark benchmarks was added in 0.13.0
+            # See: https://github.com/renaissance-benchmarks/renaissance/issues/295
+            del benchmarks["als"]
+            del benchmarks["chi-square"]
+            del benchmarks["dec-tree"]
+            del benchmarks["gauss-mix"]
+            del benchmarks["log-regression"]
+            del benchmarks["movie-lens"]
+            del benchmarks["naive-bayes"]
+            del benchmarks["page-rank"]
         return benchmarks
 
     def version(self):
         return super(RenaissanceBenchmarkSuite, self).version()
 
     def defaultSuiteVersion(self):
-        return "0.11.0"
+        return self.availableSuiteVersions()[-1]
 
     def availableSuiteVersions(self):
-        return ["0.9.0", "0.10.0", "0.11.0"]
+        return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0"]
 
     def renaissancePath(self):
         lib = mx.library(self.renaissanceLibraryName())
diff --git a/java-benchmarks/mx.java-benchmarks/suite.py b/java-benchmarks/mx.java-benchmarks/suite.py
index 5a6d8bfad05b..3cd82714bd1e 100644
--- a/java-benchmarks/mx.java-benchmarks/suite.py
+++ b/java-benchmarks/mx.java-benchmarks/suite.py
@@ -77,6 +77,16 @@
       "sha1" : "613f7615179ea364116cdd68aa41ad44a9cc49e4",
     },
 
+    "RENAISSANCE_0.12.0" : {
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-gpl-0.12.0.jar"],
+      "sha1" : "5bf404f875622a714f9b5c772b52ad857b97658d",
+    },
+
+    "RENAISSANCE_0.13.0" : {
+      "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-gpl-0.13.0.jar"],
+      "sha1" : "65eaca6ec6ba4c7293b82644bbdefd5cb2178825",
+    },
+
     "UBENCH_AGENT_DIST" : {
       "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/java-ubench-agent-2e5becaf97afcf64fd8aef3ac84fc05a3157bff5.zip"],
       "sha1" : "19087a34b80be8845e9a3e7f927ceb592de83762",
diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
index 0db79674e2a4..ab64cb709e27 100644
--- a/substratevm/mx.substratevm/mx_substratevm_benchmark.py
+++ b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
@@ -166,7 +166,7 @@ def harness_path(self):
     # Before supporting new Renaissance versions, we must cross-compile Renaissance harness project
     # with scala 11 for benchmarks compiled with this version of Scala.
     def availableSuiteVersions(self):
-        return ["0.9.0", "0.10.0", "0.11.0"]
+        return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0"]
 
     def renaissance_unpacked(self):
         return extract_archive(self.renaissancePath(), 'renaissance.extracted')
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 31e8543fad08..0de5c71a4e7d 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -53,6 +53,16 @@
             "sha1" : "8d402c1e7c972badfcffdd6c64ed4e791b0dea02",
             "packedResource": True,
         },
+        "RENAISSANCE_HARNESS_v0.12" : {
+            "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-harness_v0.12.0.tar.gz"],
+            "sha1" : "c061f62ce6f2758ec30b92e69f20f14b93e34b35",
+            "packedResource": True,
+        },
+        "RENAISSANCE_HARNESS_v0.13" : {
+            "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-harness_v0.13.0.tar.gz"],
+            "sha1" : "ca32c080016c5659bbf3eddc184e14b742769372",
+            "packedResource": True,
+        },
         "DACAPO_SVM" : {
             "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/dacapo-9.12-native-image.jar"],
             "sha1" : "5d534f0b7aa9124d9797a180688468d2f126039a",

From 736f76a1f168c750fbe722fac1180dfc0a44c8b5 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Thu, 26 Aug 2021 16:34:12 +0200
Subject: [PATCH 059/681] Conditionalize loading of JNI library 'harfbuzz'

It only was a separate library for a while in OpenJDK [11.0.10,
11.0.12], OracleJDK [11.0.10, 11.0.11] and OpenJDK 16. The patch
got reverted later on. Only add the extra library when it's
actually needed.
---
 .../hosted/jdk/JNIRegistrationAWTSupport.java   | 17 ++++++++++++++++-
 .../svm/hosted/jdk/JNIRegistrationAwt.java      | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
index 1fbae0accd3e..dcf75b097238 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java
@@ -25,6 +25,10 @@
 package com.oracle.svm.hosted.jdk;
 
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+
+import java.util.Optional;
+
+import org.graalvm.compiler.serviceprovider.GraalServices;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -32,9 +36,15 @@
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.hosted.FeatureImpl.BeforeImageWriteAccessImpl;
 
+import jdk.vm.ci.services.Services;
+
 @Platforms(Platform.WINDOWS.class)
 @AutomaticFeature
 public class JNIRegistrationAWTSupport implements Feature {
+
+    private static final int JDK_UPDATE = GraalServices.getJavaUpdateVersion();
+    private static final boolean IS_OPENJDK = Optional.ofNullable(Services.getSavedProperties().get("java.vm.name")).orElse("").startsWith("OpenJDK");
+
     @Override
     public void beforeImageWrite(BeforeImageWriteAccess access) {
         JNIRegistrationSupport jniRegistrationSupport = JNIRegistrationSupport.singleton();
@@ -79,7 +89,12 @@ public void beforeImageWrite(BeforeImageWriteAccess access) {
             jniRegistrationSupport.addJavaShimExports(
                             "JNU_ThrowClassNotFoundException");
         }
-        if (jniRegistrationSupport.isRegisteredLibrary("fontmanager") && JavaVersionUtil.JAVA_SPEC >= 11) {
+        // harfbuzz became a separate library in OpenJDK 16/11.0.10 (JDK-8249821) and then went back
+        // to be included in fontmanager library in OpenJDK 17/11.0.13 (or 11.0.12 for OracleJDK).
+        // See JDK-8255790.
+        int jdk11HbUpdateBound = IS_OPENJDK ? 12 : 11;
+        if (jniRegistrationSupport.isRegisteredLibrary("fontmanager") &&
+                        ((JavaVersionUtil.JAVA_SPEC == 11 && JDK_UPDATE >= 10 && JDK_UPDATE <= jdk11HbUpdateBound) || JavaVersionUtil.JAVA_SPEC == 16)) {
             /*
              * Dependency on `harfbuzz` may not be expressed in Java, so we register it manually
              * here just in case.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java
index d3f4f829fb93..3586b1225d3a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java
@@ -33,7 +33,11 @@
 import com.oracle.svm.core.jni.JNIRuntimeAccess;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.c.NativeLibraries;
+
+import jdk.vm.ci.services.Services;
+
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.compiler.serviceprovider.GraalServices;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -42,12 +46,16 @@
 import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import java.awt.GraphicsEnvironment;
+import java.util.Optional;
 
 @Platforms({InternalPlatform.PLATFORM_JNI.class})
 @AutomaticFeature
 @SuppressWarnings({"unused"})
 public class JNIRegistrationAwt extends JNIRegistrationUtil implements Feature {
 
+    private static final int JDK_UPDATE = GraalServices.getJavaUpdateVersion();
+    private static final boolean IS_OPENJDK = Optional.ofNullable(Services.getSavedProperties().get("java.vm.name")).orElse("").startsWith("OpenJDK");
+
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         if (JavaVersionUtil.JAVA_SPEC >= 11 && Platform.includedIn(Platform.LINUX.class)) {
@@ -161,7 +169,13 @@ private static void registerFreeType(DuringAnalysisAccess access) {
 
         NativeLibrarySupport.singleton().preregisterUninitializedBuiltinLibrary("fontmanager");
         nativeLibraries.addStaticJniLibrary("fontmanager", isHeadless() ? "awt_headless" : "awt_xawt");
-        nativeLibraries.addStaticJniLibrary("harfbuzz");
+        // harfbuzz became a separate library in OpenJDK 16/11.0.10 (JDK-8249821) and then went back
+        // to be included in fontmanager library in OpenJDK 17/11.0.13 (or 11.0.12 for OracleJDK).
+        // See JDK-8255790.
+        int jdk11HbUpdateBound = IS_OPENJDK ? 12 : 11;
+        if (JavaVersionUtil.JAVA_SPEC == 16 || (JavaVersionUtil.JAVA_SPEC == 11 && JDK_UPDATE >= 10 && JDK_UPDATE <= jdk11HbUpdateBound)) {
+            nativeLibraries.addStaticJniLibrary("harfbuzz");
+        }
 
         nativeLibraries.addDynamicNonJniLibrary("freetype");
 

From e3df2fbb0b009823037a61fc2ac95142e9322335 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Fri, 17 Sep 2021 15:38:54 -0700
Subject: [PATCH 060/681] Remove analysis Arrays.copyOf optimization.

---
 .../pointsto/flow/MethodTypeFlowBuilder.java  | 103 ------------------
 .../nodes/AnalysisArraysCopyOfNode.java       |  79 --------------
 .../plugins/PointstoGraphBuilderPlugins.java  |  28 -----
 3 files changed, 210 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisArraysCopyOfNode.java

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index 2157a3fb4b28..e7172a1cf51f 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -121,7 +121,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
-import com.oracle.graal.pointsto.nodes.AnalysisArraysCopyOfNode;
 import com.oracle.graal.pointsto.nodes.UnsafePartitionLoadNode;
 import com.oracle.graal.pointsto.nodes.UnsafePartitionStoreNode;
 import com.oracle.graal.pointsto.phases.InlineBeforeAnalysis;
@@ -129,7 +128,6 @@
 
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
 
 public class MethodTypeFlowBuilder {
@@ -1171,10 +1169,6 @@ protected void node(FixedNode n) {
                     state.add(node, wordToObjectBuilder);
                 }
 
-            } else if (n instanceof AnalysisArraysCopyOfNode) {
-                AnalysisArraysCopyOfNode node = (AnalysisArraysCopyOfNode) n;
-                processArraysCopyOf(node, node.getOriginal(), node.getNewArrayType(), state);
-
             } else if (n instanceof InvokeNode || n instanceof InvokeWithExceptionNode) {
                 Invoke invoke = (Invoke) n;
                 if (invoke.callTarget() instanceof MethodCallTargetNode) {
@@ -1496,101 +1490,4 @@ protected NewInstanceTypeFlow createNewArrayTypeFlow(NewArrayNode node, Analysis
     protected void checkUnsafeOffset(@SuppressWarnings("unused") ValueNode base, @SuppressWarnings("unused") ValueNode offset) {
     }
 
-    protected void processArraysCopyOf(ValueNode node, ValueNode original, ValueNode newArrayType, TypeFlowsOfNodes state) {
-        TypeFlowBuilder<?> originalArrayBuilder = state.lookup(original);
-
-        Object key = uniqueKey(node);
-        BytecodeLocation newArrayLabel = bb.analysisPolicy().createAllocationSite(bb, key, methodFlow.getMethod());
-
-        /*
-         * Arrays.copyOf is essentially a dynamic new instance plus a System.arrayCopy.
-         */
-
-        /*
-         * First we determine the type of the new array and create a dynamic new instance flow to
-         * allocate it.
-         */
-        TypeFlowBuilder<?> newArrayTypeBuilder;
-        if (newArrayType == null) {
-            /*
-             * The type of the new array and that of the original are the same. The dynamic new
-             * instance flow will create a new heap object for each incoming type and for each
-             * different heap context.
-             */
-            newArrayTypeBuilder = originalArrayBuilder;
-        } else {
-            /*
-             * The type of the new array and that of the original are different. The elements are
-             * copied from the original array but the type of the resulting objects are given by the
-             * new type. Both the original 'values' and the 'new type' are needed for a proper
-             * intercept when the analysis is context sensitive.
-             */
-            newArrayTypeBuilder = getDynamicTypeFlow(node, newArrayType, true, state);
-        }
-
-        TypeFlowBuilder<?> newArrayBuilder = TypeFlowBuilder.create(bb, node, DynamicNewInstanceTypeFlow.class, () -> {
-            DynamicNewInstanceTypeFlow newArrayFlow = new DynamicNewInstanceTypeFlow(newArrayTypeBuilder.get(), bb.getObjectArrayType(), node, newArrayLabel);
-            methodFlow.addMiscEntry(newArrayFlow);
-            return newArrayFlow;
-        });
-
-        if (newArrayType != null && (newArrayType instanceof GetClassNode || newArrayType.isConstant())) {
-            newArrayBuilder.addObserverDependency(newArrayTypeBuilder);
-        }
-
-        state.add(node, newArrayBuilder);
-
-        /*
-         * Then we use an array copy type flow to propagate the elements type state from the
-         * original array into the copy.
-         */
-        TypeFlowBuilder<?> arrayCopyBuilder = TypeFlowBuilder.create(bb, node, ArrayCopyTypeFlow.class, () -> {
-            ArrayCopyTypeFlow arrayCopyFlow = new ArrayCopyTypeFlow(node, null, originalArrayBuilder.get(), newArrayBuilder.get());
-            methodFlow.addMiscEntry(arrayCopyFlow);
-            return arrayCopyFlow;
-        });
-
-        arrayCopyBuilder.addObserverDependency(originalArrayBuilder);
-        arrayCopyBuilder.addObserverDependency(newArrayBuilder);
-
-        /* Array copies must not be removed. */
-        typeFlowGraphBuilder.registerSinkBuilder(arrayCopyBuilder);
-    }
-
-    /**
-     * Get the type flow of a dynamic type. If the type results from a GetClassNode or a
-     * JavaConstant this method will return accurate type information. Otherwise it will return all
-     * instantiated types or, if it is an array, all instantiated array types.
-     */
-    protected TypeFlowBuilder<?> getDynamicTypeFlow(ValueNode node, ValueNode typeSource, boolean isArrayType, TypeFlowsOfNodes state) {
-        TypeFlowBuilder<?> dynamicTypeBuilder;
-        if (typeSource instanceof GetClassNode) {
-            GetClassNode getClassNode = (GetClassNode) typeSource;
-            dynamicTypeBuilder = state.lookup(getClassNode.getObject());
-
-        } else if (typeSource.isConstant()) {
-            assert state.lookup(typeSource).getFlowClass() == SourceTypeFlow.class;
-
-            Constant constant = typeSource.asJavaConstant();
-            AnalysisType exactType = (AnalysisType) bb.getProviders().getConstantReflection().asJavaType(constant);
-            exactType.registerAsAllocated(node);
-
-            dynamicTypeBuilder = TypeFlowBuilder.create(bb, node, SourceTypeFlow.class, () -> {
-                SourceTypeFlow dynamicTypeFlow = new SourceTypeFlow(node, TypeState.forExactType(bb, exactType, false));
-                methodFlow.addMiscEntry(dynamicTypeFlow);
-                return dynamicTypeFlow;
-            });
-        } else {
-            /*
-             * Without precise type information either the type flow corresponding to all
-             * instantiated object types or all instantiated array types will be returned.
-             */
-            AnalysisType arrayType = isArrayType ? bb.getObjectArrayType() : bb.getObjectType();
-            dynamicTypeBuilder = TypeFlowBuilder.create(bb, node, AllInstantiatedTypeFlow.class, () -> {
-                return arrayType.getTypeFlow(bb, false);
-            });
-        }
-
-        return dynamicTypeBuilder;
-    }
 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisArraysCopyOfNode.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisArraysCopyOfNode.java
deleted file mode 100644
index 73a9e41d9e52..000000000000
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisArraysCopyOfNode.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.pointsto.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import jdk.vm.ci.meta.ConstantReflectionProvider;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-
-@NodeInfo(size = SIZE_IGNORED, cycles = CYCLES_IGNORED)
-public class AnalysisArraysCopyOfNode extends FixedWithNextNode implements ArrayLengthProvider {
-    public static final NodeClass<AnalysisArraysCopyOfNode> TYPE = NodeClass.create(AnalysisArraysCopyOfNode.class);
-
-    @Input ValueNode original;
-    @Input ValueNode newLength;
-    @OptionalInput ValueNode newArrayType;
-
-    public AnalysisArraysCopyOfNode(@InjectedNodeParameter Stamp stamp, ValueNode original, ValueNode newLength) {
-        this(stamp, original, newLength, null);
-    }
-
-    public AnalysisArraysCopyOfNode(@InjectedNodeParameter Stamp stamp, ValueNode original, ValueNode newLength, ValueNode newArrayType) {
-        super(TYPE, computeStamp(stamp));
-        this.original = original;
-        this.newLength = newLength;
-        this.newArrayType = newArrayType;
-    }
-
-    public ValueNode getOriginal() {
-        return original;
-    }
-
-    public ValueNode getNewArrayType() {
-        return newArrayType;
-    }
-
-    @Override
-    public ValueNode findLength(FindLengthMode mode, ConstantReflectionProvider constantReflection) {
-        return newLength;
-    }
-
-    private static Stamp computeStamp(Stamp result) {
-        if (result instanceof ObjectStamp) {
-            return result.join(StampFactory.objectNonNull());
-        }
-        return result;
-    }
-
-}
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
index b4f27ef4cad5..1453aec85c53 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
@@ -24,10 +24,7 @@
  */
 package com.oracle.graal.pointsto.plugins;
 
-import java.util.Arrays;
-
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
@@ -36,7 +33,6 @@
 import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
 import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
 
-import com.oracle.graal.pointsto.nodes.AnalysisArraysCopyOfNode;
 import com.oracle.graal.pointsto.nodes.AnalysisObjectCloneNode;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -44,30 +40,6 @@
 
 public class PointstoGraphBuilderPlugins {
 
-    public static void registerArraysPlugins(InvocationPlugins plugins) {
-        Registration r = new Registration(plugins, Arrays.class).setAllowOverwrite(true);
-
-        r.register2("copyOf", Object[].class, int.class, new InvocationPlugin() {
-            @Override
-            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode original, ValueNode newLength) {
-                b.addPush(JavaKind.Object, new AnalysisArraysCopyOfNode(b.getInvokeReturnStamp(b.getAssumptions()).getTrustedStamp(), original, newLength));
-                return true;
-            }
-        });
-
-        r.register3("copyOf", Object[].class, int.class, Class.class, new InvocationPlugin() {
-            @Override
-            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode original, ValueNode newLength, ValueNode newObjectElementType) {
-                if (newObjectElementType instanceof GetClassNode || newObjectElementType.isConstant()) {
-                    // We can infer the concrete type of the new array
-                    b.addPush(JavaKind.Object, new AnalysisArraysCopyOfNode(b.getInvokeReturnStamp(b.getAssumptions()).getTrustedStamp(), original, newLength, newObjectElementType));
-                    return true;
-                }
-                return false;
-            }
-        });
-    }
-
     public static void registerSystemPlugins(InvocationPlugins plugins) {
         Registration r = new Registration(plugins, System.class).setAllowOverwrite(true);
         r.register5("arraycopy", Object.class, int.class, Object.class, int.class, int.class, new InvocationPlugin() {

From dbeba5eb16bb3580a761f00653deb68f59770fd6 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Fri, 17 Sep 2021 15:49:26 -0700
Subject: [PATCH 061/681] Filter MacroInvokable return when the inferred stamp
 is more precise the the return type.

---
 .../pointsto/flow/MethodTypeFlowBuilder.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index e7172a1cf51f..58e5bc85844e 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -1330,6 +1330,25 @@ private void processMethodInvocation(ValueNode invoke, InvokeKind invokeKind, in
                     return actualReturn;
                 });
 
+                ObjectStamp stamp = (ObjectStamp) invoke.stamp(NodeView.DEFAULT);
+                if (stamp.nonNull() && !returnType.equals(stamp.type()) && returnType.isAssignableFrom(stamp.type())) {
+                    /*
+                     * If the invoke stamp has a more precise type than the return type use that to
+                     * filter the returned values. This can happen for example for MacroInvokable
+                     * nodes when more concrete stamp information can be inferred for example from
+                     * parameter types. In that case the Graal graph optimizations may decide to
+                     * remove a checkcast that would normally follow the invoke, so we need to
+                     * introduce the filter to avoid loosing precision.
+                     */
+                    TypeFlowBuilder<?> filterBuilder = TypeFlowBuilder.create(bb, invoke, FilterTypeFlow.class, () -> {
+                        FilterTypeFlow filterFlow = new FilterTypeFlow(invoke, (AnalysisType) stamp.type(), stamp.isExactType(), true, true);
+                        methodFlow.addMiscEntry(filterFlow);
+                        return filterFlow;
+                    });
+                    filterBuilder.addUseDependency(actualReturnBuilder);
+                    actualReturnBuilder = filterBuilder;
+                }
+
                 if (bb.strengthenGraalGraphs()) {
                     typeFlowGraphBuilder.registerSinkBuilder(actualReturnBuilder);
                 }

From 7333e1db43a7f3738d0783a83d1a3d8cfb2daf9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Mon, 20 Sep 2021 22:42:39 +0200
Subject: [PATCH 062/681] Remove obsolete JUnit substitution

---
 .../Target_org_junit_runner_Description.java  | 57 -------------------
 ...get_org_junit_runners_model_TestClass.java | 13 +++--
 2 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runner_Description.java

diff --git a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runner_Description.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runner_Description.java
deleted file mode 100644
index 733f3e2356f9..000000000000
--- a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runner_Description.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2017, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.junit;
-
-import org.junit.runner.Description;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.CustomFieldValueComputer;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.annotate.TargetClass;
-
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaField;
-
-@TargetClass(className = "org.junit.runner.Description", onlyWith = JUnitFeature.IsEnabled.class)
-public final class Target_org_junit_runner_Description {
-
-    public static final class TestClassComputer implements CustomFieldValueComputer {
-
-        @Override
-        public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original, ResolvedJavaField annotated, Object receiver) {
-            Description description = (Description) receiver;
-            return description.getTestClass();
-        }
-    }
-
-    @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = TestClassComputer.class) Class<?> fTestClass;
-
-    @Substitute
-    public Class<?> getTestClass() {
-        return fTestClass;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runners_model_TestClass.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runners_model_TestClass.java
index 66f1ade67a62..5edc311842df 100644
--- a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runners_model_TestClass.java
+++ b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/Target_org_junit_runners_model_TestClass.java
@@ -28,12 +28,11 @@
 
 import java.lang.reflect.Constructor;
 
-import com.oracle.svm.core.annotate.Alias;
-import jdk.vm.ci.meta.MetaAccessProvider;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.junit.Assert;
 import org.junit.runners.model.TestClass;
 
+import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Inject;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.CustomFieldValueComputer;
@@ -41,18 +40,20 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
+import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
 
 @TargetClass(className = "org.junit.runners.model.TestClass", onlyWith = JUnitFeature.IsEnabled.class)
 public final class Target_org_junit_runners_model_TestClass {
 
     public static final class OnlyConstructorComputer implements CustomFieldValueComputer {
-
         @Override
         public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original, ResolvedJavaField annotated, Object receiver) {
-            TestClass clazz = (TestClass) receiver;
-            if (clazz.getJavaClass() != null) {
-                Constructor<?> constructor = clazz.getOnlyConstructor();
+            TestClass testClass = (TestClass) receiver;
+            if (testClass.getJavaClass() != null) {
+                /* Make sure Class.forName works because Description.getTestClass can use it. */
+                RuntimeReflection.register(testClass.getJavaClass());
+                Constructor<?> constructor = testClass.getOnlyConstructor();
                 RuntimeReflection.register(constructor);
                 return constructor;
             } else {

From 96bc6229464bb5e115e65e3d1bc712a226eee911 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Fri, 4 Jun 2021 20:00:06 +0200
Subject: [PATCH 063/681] Add helper method to AArch64Address.

---
 .../org/graalvm/compiler/asm/aarch64/AArch64Address.java | 9 +++++++++
 .../graalvm/compiler/asm/aarch64/AArch64Assembler.java   | 2 +-
 .../replacements/arraycopy/ArrayCopyCallNode.java        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java
index f7cd220d04df..da9733e7ee79 100644
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java
@@ -315,6 +315,15 @@ public static AArch64Address createPCLiteralAddress(int bitMemoryTransferSize) {
         return new AArch64Address(bitMemoryTransferSize, zr, zr, 0, false, null, AddressingMode.PC_LITERAL);
     }
 
+    /**
+     * @param bitMemoryTransferSize Memory operation size.
+     * @param base May not be null or the zero register.
+     * @return an address specifying the address pointed to by base.
+     */
+    public static AArch64Address createPairBaseRegisterOnlyAddress(int bitMemoryTransferSize, Register base) {
+        return createImmediateAddress(bitMemoryTransferSize, AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED, base, 0);
+    }
+
     /**
      * AArch64Address specifying a structure memory access of the form "[Xn|SP]".
      */
diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
index 479122cbc938..bd38d2f567dd 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
@@ -1077,7 +1077,7 @@ private void unconditionalBranchRegInstruction(Instruction instr, Register reg)
     /**
      * Returns the log2 size of the number of bytes expected to be transferred.
      */
-    protected static int getLog2TransferSize(int bitMemoryTransferSize) {
+    public static int getLog2TransferSize(int bitMemoryTransferSize) {
         switch (bitMemoryTransferSize) {
             case 8:
                 return 0;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
index 5621210e8ff3..3e9c19deb54d 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
@@ -306,7 +306,7 @@ public void updateAlignedDisjoint(MetaAccessProvider metaAccess) {
                 aligned = isHeapWordAligned(metaAccess, constantSrc, componentKind) && isHeapWordAligned(metaAccess, constantDst, componentKind);
             }
             if (constantSrc.asInt() >= constantDst.asInt()) {
-                // low to high copy so treat as disjoint
+                // low to high copy (copying forwards) so treat as disjoint
                 disjoint = true;
             }
         }

From 241163db34b6f72c95393b842baec3838a1f356b Mon Sep 17 00:00:00 2001
From: Andrew Craik <andrew.craik@oracle.com>
Date: Tue, 21 Sep 2021 20:16:57 +1000
Subject: [PATCH 064/681] Fix DerivedConvertedInductionVariable zero extend

Zero extension was added to DerivedConvertedInductionVariable to
correctly handle some induction variables. The use of zero extension in
the stride node is not correct since the direction is encoded in the
sign and it must be preserved. This change forces the stride node to use
signed extension in all cases.
---
 .../loop/DerivedConvertedInductionVariable.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
index 67a9205a5ed5..0be5c1f04009 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
@@ -53,12 +53,12 @@ public Direction direction() {
 
     @Override
     public ValueNode initNode() {
-        return op(base.initNode());
+        return op(base.initNode(), true);
     }
 
     @Override
     public ValueNode strideNode() {
-        return op(base.strideNode());
+        return op(base.strideNode(), false);
     }
 
     @Override
@@ -88,7 +88,7 @@ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp s) {
 
     @Override
     public ValueNode exitValueNode() {
-        return op(base.exitValueNode());
+        return op(base.exitValueNode(), true);
     }
 
     @Override
@@ -105,8 +105,8 @@ public long constantExtremum() {
     public void deleteUnusedNodes() {
     }
 
-    public ValueNode op(ValueNode v) {
-        boolean zeroExtend = value instanceof ZeroExtendNode;
+    private ValueNode op(ValueNode v, boolean allowZeroExtend) {
+        boolean zeroExtend = allowZeroExtend && value instanceof ZeroExtendNode;
         return IntegerConvertNode.convert(v, stamp, zeroExtend, graph(), NodeView.DEFAULT);
     }
 
@@ -122,7 +122,7 @@ public InductionVariable copy(InductionVariable newBase, ValueNode newValue) {
 
     @Override
     public ValueNode copyValue(InductionVariable newBase) {
-        return op(newBase.valueNode());
+        return op(newBase.valueNode(), true);
     }
 
 }

From 16814aa7748a0b5a9683394aef97e4b8188243fe Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 21 Sep 2021 13:18:35 +0200
Subject: [PATCH 065/681] compiler: add Javadoc to
 MacroNode#getKilledLocationIdentity

---
 .../org/graalvm/compiler/replacements/nodes/MacroNode.java  | 6 ++++++
 .../compiler/replacements/nodes/MacroWithExceptionNode.java | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index 2577ba0c5d8a..500aa02e314a 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -173,6 +173,12 @@ public boolean hasSideEffect() {
         return true;
     }
 
+    /**
+     * Returns {@link LocationIdentity#any()}. This node needs to kill any location because it might
+     * get {@linkplain #replaceWithInvoke() replaced with an invoke} and
+     * {@link InvokeNode#getKilledLocationIdentity()} kills {@link LocationIdentity#any()} and the
+     * kill location must not get broader.
+     */
     @Override
     public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index dc11570b441d..158fc20bf7f3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -173,6 +173,9 @@ public boolean hasSideEffect() {
         return true;
     }
 
+    /**
+     * @see MacroNode#getKilledLocationIdentity()
+     */
     @Override
     public LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();

From b5289c0e4407c88451bee54d91a83bfcb60aa760 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 9 Sep 2021 10:28:11 +0200
Subject: [PATCH 066/681] Set x-GraalVM-Working-Directories attr for tools.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 79bcabb6ba4d..e8fdeec90e1e 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2137,8 +2137,9 @@ def _gen_gu_manifest(components, formatter, bundled=False):
     dependencies = sorted(dependencies)
     if dependencies:
         manifest["Require-Bundle"] = ','.join(("org.graalvm." + d for d in dependencies))
-    if isinstance(main_component, mx_sdk.GraalVmLanguage):
-        _wd_base = join('jre', 'languages') if _src_jdk_version < 9 else 'languages'
+    if isinstance(main_component, (mx_sdk.GraalVmLanguage, mx_sdk.GraalVmTool)):
+        _component_type_base = 'languages' if isinstance(main_component, mx_sdk.GraalVmLanguage) else 'tools'
+        _wd_base = join('jre', _component_type_base) if _src_jdk_version < 9 else _component_type_base
         manifest["x-GraalVM-Working-Directories"] = join(_wd_base, main_component.dir_name)
 
     post_install_msg = None

From 8213042537979111c299877cef8a34b826f47d10 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <code@fniephaus.com>
Date: Tue, 24 Nov 2020 17:22:04 +0100
Subject: [PATCH 067/681] Fix ArrayFullWrapper example.

---
 .../src/com/oracle/truffle/api/library/ExportLibrary.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/ExportLibrary.java b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/ExportLibrary.java
index 352c00d16d48..d980a653f16f 100644
--- a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/ExportLibrary.java
+++ b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/ExportLibrary.java
@@ -295,7 +295,7 @@
      *
      * <pre>
      * &#64;ExportLibrary(value = ArrayLibrary.class, delegateTo = "delegate")
-     * &#64;ExportLibrary(ReflectionLibrary.class, delegateTo = "delegate")
+     * &#64;ExportLibrary(value = ReflectionLibrary.class, delegateTo = "delegate")
      * final class ArrayFullWrapper {
      *
      *     final Object delegate;

From bc56ffa797b3bb70dfb1d9e345d3458976adc7d4 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <code@fniephaus.com>
Date: Wed, 10 Feb 2021 11:16:28 +0100
Subject: [PATCH 068/681] Improve TruffleObject wording.

---
 .../src/com/oracle/truffle/api/interop/InteropLibrary.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
index 8f6977a9dbbd..3eb3726b9421 100644
--- a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
+++ b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
@@ -105,9 +105,9 @@
  * The interop protocol only allows <i>interop values</i> to be used as receivers, return values or
  * parameters of messages. Allowed Java types of interop values are:
  * <ul>
- * <li>{@link TruffleObject}: Any subclass of {@link TruffleObject} is interpreted depending on the
- * interop messages it {@link ExportLibrary exports}. Truffle objects are expected but not required
- * to export interop library messages.
+ * <li>{@link TruffleObject}: Any object that implements the {@link TruffleObject} interface is
+ * interpreted according to the interop messages it {@link ExportLibrary exports}. Truffle objects
+ * are expected but not required to export interop library messages.
  * <li>{@link String} and {@link Character} are interpreted as {@link #isString(Object) string}
  * value.
  * <li>{@link Boolean} is interpreted as {@link #isBoolean(Object) boolean} value.

From f5332e432e4d6700c5db3c51218b55da918aa6dd Mon Sep 17 00:00:00 2001
From: Jirka Marsik <jiri.marsik@oracle.com>
Date: Tue, 21 Sep 2021 12:53:57 +0000
Subject: [PATCH 069/681] Fix changelog message for TRegex ASCII encoding

---
 regex/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regex/CHANGELOG.md b/regex/CHANGELOG.md
index 52fef7b9502f..49f8154f8996 100644
--- a/regex/CHANGELOG.md
+++ b/regex/CHANGELOG.md
@@ -4,7 +4,7 @@ This changelog summarizes major changes between TRegex versions relevant to lang
 
 ## Version 22.0.0
 
-* Added new `ASCII` encoding that callers can use when compiling a regex to limit the range of code point matches to [0xx, 0x7f].
+* Added new `ASCII` encoding that callers can use when compiling a regex to limit the range of code point matches to [0x00, 0x7f].
 
 ## Version 21.3.0
 

From c809a41293cd43f3cda9b535d6b8fed515810c2f Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 21 Sep 2021 15:08:47 +0100
Subject: [PATCH 070/681] Fix flamegraph width to take scrollbars into account.

---
 .../truffle/tools/profiler/impl/SVGSamplerOutput.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index c881096c782f..25af6887cc38 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -464,7 +464,7 @@ public String initFunction(String argName) {
         public String resizeFunction() {
             StringBuilder result = new StringBuilder();
             result.append("function resize() {\n");
-            result.append("owner_resize(window.innerWidth);\n");
+            result.append("owner_resize(document.firstElementChild.clientWidth);\n");
             for (SVGComponent component : components) {
                 result.append(component.resizeFunction());
             }
@@ -828,7 +828,7 @@ public double height() {
         }
 
         public String resizeFunction() {
-            return "fg_resize(window.innerWidth);\n";
+            return "fg_resize(document.firstElementChild.clientWidth);\n";
         }
 
         public String initFunction(String argName) {
@@ -1018,7 +1018,7 @@ public double height() {
         }
 
         public String resizeFunction() {
-            return "h_resize(window.innerWidth);\n";
+            return "h_resize(document.firstElementChild.clientWidth);\n";
         }
 
         public String initFunction(String argName) {

From d20d4ef9e929a3c29c33a829223cb962f9b621e5 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 21 Sep 2021 16:35:07 +0200
Subject: [PATCH 071/681] bump timeout for
 gate-compiler-test-labsjdk-ee-11-linux-amd64-avx3 to 45:00

---
 compiler/ci_common/gate_tasks.hocon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
index 24c3d028996c..82d03f98bb6f 100644
--- a/compiler/ci_common/gate_tasks.hocon
+++ b/compiler/ci_common/gate_tasks.hocon
@@ -34,7 +34,7 @@ builds += [
   ${gateStyle}         ${oraclejdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64", timelimit: "45:00"}
   ${gateCoverage}      ${oraclejdk8}       ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64"} ${graalWeekly} {timelimit: "1:50:00"}
 
-  ${gateTest}          ${labsjdk-ee-11}    ${gateLinuxAMD64AVX3}   {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64-avx3", targets: [gate]}
+  ${gateTest}          ${labsjdk-ee-11}    ${gateLinuxAMD64AVX3}   {name: "gate-compiler-test-labsjdk-ee-11-linux-amd64-avx3", targets: [gate], timelimit: "45:00"}
   ${gateTestCompileImmediately}     ${oraclejdk8}     ${gateLinuxAMD64}   {name: "gate-compiler-test-truffle-compile-immediately-8-linux-amd64", timelimit: "1:00:00"}
 
   # Linux AArch64

From 0e73661abe28efdc9358c9f97c7be99c13100b74 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 9 Sep 2021 12:00:04 +0200
Subject: [PATCH 072/681] Support newlines in Truffle's OptionProcessor.

---
 .../truffle/options/PolyglotCompilerOptions.java   |  8 ++++----
 .../src/org/graalvm/launcher/Launcher.java         |  5 ++++-
 .../src/org/graalvm/options/OptionDescriptor.java  |  7 ++++---
 .../api/test/option/OptionProcessorTest.java       | 14 ++++++++------
 .../truffle/dsl/processor/OptionProcessor.java     | 13 +++++++++++--
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.options/src/org/graalvm/compiler/truffle/options/PolyglotCompilerOptions.java b/compiler/src/org.graalvm.compiler.truffle.options/src/org/graalvm/compiler/truffle/options/PolyglotCompilerOptions.java
index e10baf55e52b..8bcd42f7d6d0 100644
--- a/compiler/src/org.graalvm.compiler.truffle.options/src/org/graalvm/compiler/truffle/options/PolyglotCompilerOptions.java
+++ b/compiler/src/org.graalvm.compiler.truffle.options/src/org/graalvm/compiler/truffle/options/PolyglotCompilerOptions.java
@@ -178,7 +178,7 @@ public ExceptionAction apply(String s) {
             try {
                 return ExceptionAction.valueOf(s);
             } catch (IllegalArgumentException e) {
-                throw new IllegalArgumentException(ExceptionAction.HELP);
+                throw new IllegalArgumentException(String.format(ExceptionAction.HELP));
             }
         }
     });
@@ -365,10 +365,10 @@ private String indent(int nameLength) {
     private static final String EXPANSION_VALUES = "Accepted values are:%n" +
                     "    true - Collect data for the default tier 'truffleTier'.%n" +
                     "    false - No data will be collected.%n" +
-                    "Or one or multiple tiers separated by comma (e.g. truffleTier,lowTier) :%n" +
+                    "Or one or multiple tiers separated by comma (e.g. truffleTier,lowTier):%n" +
                     "    peTier - After partial evaluation without additional phases applied.%n" +
                     "    truffleTier - After partial evaluation with additional phases applied.%n" +
-                    "    lowTier - After low tier phases were applied.%n";
+                    "    lowTier - After low tier phases were applied.";
 
     @Option(help = "Print a tree of all expanded Java methods with statistics after each compilation. " + EXPANSION_VALUES, category = OptionCategory.INTERNAL)
     public static final OptionKey<Set<CompilationTier>> TraceMethodExpansion = new OptionKey<>(Collections.emptySet(), COMPILATION_TIERS_TYPE);
@@ -498,7 +498,7 @@ private String indent(int nameLength) {
             "On runtimes which doesn't support it the option has no effect.",
             category = OptionCategory.EXPERT)
     public static final OptionKey<Integer> EncodedGraphCachePurgeDelay = new OptionKey<>(10_000);
-    
+
     @Option(help = "Forces the frame clearing mechanism to be executed, even if Frame.clear() is not used.",
             category = OptionCategory.EXPERT)
     public static final OptionKey<Boolean> ForceFrameLivenessAnalysis = new OptionKey<>(false);
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
index 8df6e4e1c20b..1b02e4cce29c 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
@@ -973,9 +973,12 @@ private static String wrap(String s) {
 
     private void printOption(String option, String description, int indentStart, int optionWidth) {
         String indent = spaces(indentStart);
-        String desc = wrap(description != null ? description : "");
+        String desc = description != null ? description : "";
         String nl = System.lineSeparator();
         String[] descLines = desc.split(nl);
+        for (int i = 0; i < descLines.length; i++) {
+            descLines[i] = wrap(descLines[i]);
+        }
         if (option.length() >= optionWidth && description != null) {
             out.println(indent + option + nl + indent + spaces(optionWidth) + descLines[0]);
         } else {
diff --git a/sdk/src/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java b/sdk/src/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java
index 9b88f8120277..429cbdb5ccff 100644
--- a/sdk/src/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java
+++ b/sdk/src/org.graalvm.options/src/org/graalvm/options/OptionDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -96,7 +96,7 @@ public boolean isDeprecated() {
     }
 
     /**
-     * Returns the deprecation reason and the recommended fix.
+     * Returns the deprecation reason and the recommended fix. For newlines, use <code>%n</code>.
      *
      * @since 20.1.0
      */
@@ -133,7 +133,8 @@ public OptionStability getStability() {
     }
 
     /**
-     * Returns a human-readable description on how to use the option.
+     * Returns a human-readable description on how to use the option. For newlines, use
+     * <code>%n</code>.
      *
      * @since 19.0
      */
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/option/OptionProcessorTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/option/OptionProcessorTest.java
index 95eaddb72684..cbcf2cecdeae 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/option/OptionProcessorTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/option/OptionProcessorTest.java
@@ -86,6 +86,7 @@ public void testTestLang() {
         descriptor1 = descriptor = descriptors.get("optiontestlang1.StringOption1");
         assertNotNull(descriptor);
         assertTrue(descriptor.isDeprecated());
+        assertEquals(String.format("Deprecation message%nwith newline"), descriptor.getDeprecationMessage());
         assertFalse(descriptor.isOptionMap());
         assertSame(OptionCategory.USER, descriptor.getCategory());
         assertSame(OptionStability.EXPERIMENTAL, descriptor.getStability());
@@ -94,7 +95,7 @@ public void testTestLang() {
 
         descriptor2 = descriptor = descriptors.get("optiontestlang1.StringOption2");
         assertNotNull(descriptor);
-        assertEquals("StringOption2 help", descriptor.getHelp());
+        assertEquals(String.format("StringOption2 help%nwith newline"), descriptor.getHelp());
         assertFalse(descriptor.isDeprecated());
         assertFalse(descriptor.isOptionMap());
         assertSame(OptionCategory.EXPERT, descriptor.getCategory());
@@ -166,6 +167,7 @@ public void testOptionsInstrument() {
         descriptor1 = descriptor = descriptors.get("optiontestinstr1.StringOption1");
         assertNotNull(descriptor);
         assertTrue(descriptor.isDeprecated());
+        assertEquals(String.format("Deprecation message%nwith newline"), descriptor.getDeprecationMessage());
         assertFalse(descriptor.isOptionMap());
         assertSame(OptionCategory.USER, descriptor.getCategory());
         assertEquals("StringOption1 help", descriptor.getHelp());
@@ -173,7 +175,7 @@ public void testOptionsInstrument() {
 
         descriptor2 = descriptor = descriptors.get("optiontestinstr1.StringOption2");
         assertNotNull(descriptor);
-        assertEquals("StringOption2 help", descriptor.getHelp());
+        assertEquals(String.format("StringOption2 help%nwith newline"), descriptor.getHelp());
         assertFalse(descriptor.isDeprecated());
         assertFalse(descriptor.isOptionMap());
         assertSame(OptionCategory.EXPERT, descriptor.getCategory());
@@ -357,10 +359,10 @@ public enum EnumValue {
     @Registration(id = "optiontestlang1", version = "1.0", name = "optiontestlang1")
     public static class OptionTestLang1 extends TruffleLanguage<Env> {
 
-        @Option(help = "StringOption1 help", deprecated = true, category = OptionCategory.USER) //
+        @Option(help = "StringOption1 help", deprecated = true, deprecationMessage = "Deprecation message%nwith newline", category = OptionCategory.USER) //
         static final OptionKey<String> StringOption1 = new OptionKey<>("defaultValue");
 
-        @Option(help = "StringOption2 help", deprecated = false, category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL) //
+        @Option(help = "StringOption2 help%nwith newline", deprecated = false, category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL) //
         public static final OptionKey<String> StringOption2 = new OptionKey<>("defaultValue");
 
         // The variable name differs from the option name on purpose, to test they can be different
@@ -397,10 +399,10 @@ public static Env getCurrentContext() {
     @TruffleInstrument.Registration(id = "optiontestinstr1", services = OptionValues.class)
     public static class OptionTestInstrument1 extends TruffleInstrument {
 
-        @Option(help = "StringOption1 help", deprecated = true, category = OptionCategory.USER, stability = OptionStability.STABLE) //
+        @Option(help = "StringOption1 help", deprecated = true, deprecationMessage = "Deprecation message%nwith newline", category = OptionCategory.USER, stability = OptionStability.STABLE) //
         public static final OptionKey<String> StringOption1 = new OptionKey<>("defaultValue");
 
-        @Option(help = "StringOption2 help", deprecated = false, category = OptionCategory.EXPERT) //
+        @Option(help = "StringOption2 help%nwith newline", deprecated = false, category = OptionCategory.EXPERT) //
         public static final OptionKey<String> StringOption2 = new OptionKey<>("defaultValue");
 
         @Option(help = "Instrument user-defined thresholds", deprecated = false, category = OptionCategory.EXPERT) //
diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/OptionProcessor.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/OptionProcessor.java
index 5f5b7a00ad11..a254eae51230 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/OptionProcessor.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/OptionProcessor.java
@@ -451,11 +451,12 @@ private static CodeTree createBuildOptionDescriptor(ProcessorContext context, Op
         builder.end(); // newBuilder call
         if (info.deprecated) {
             builder.startCall("", "deprecated").string("true").end();
-            builder.startCall("", "deprecationMessage").doubleQuote(info.deprecationMessage).end();
+            addCallWithStringWithPossibleNewlines(builder, context, "deprecationMessage", info.deprecationMessage);
         } else {
             builder.startCall("", "deprecated").string("false").end();
         }
-        builder.startCall("", "help").doubleQuote(info.help).end();
+        addCallWithStringWithPossibleNewlines(builder, context, "help", info.help);
+
         builder.startCall("", "category").staticReference(types.OptionCategory, info.category).end();
         builder.startCall("", "stability").staticReference(types.OptionStability, info.stability).end();
 
@@ -463,6 +464,14 @@ private static CodeTree createBuildOptionDescriptor(ProcessorContext context, Op
         return builder.build();
     }
 
+    private static void addCallWithStringWithPossibleNewlines(CodeTreeBuilder builder, ProcessorContext context, String callName, String value) {
+        if (value.contains("%n")) {
+            builder.startCall("", callName).startStaticCall(context.getType(String.class), "format").doubleQuote(value).end().end();
+        } else {
+            builder.startCall("", callName).doubleQuote(value).end();
+        }
+    }
+
     static class OptionInfo implements Comparable<OptionInfo> {
 
         boolean valid = true;

From 98ed01b8cf23696fc10e6b6eb8fd0f26e4f98c42 Mon Sep 17 00:00:00 2001
From: aben20807 <aben20807@gmail.com>
Date: Tue, 13 Jul 2021 10:16:58 +0800
Subject: [PATCH 073/681] Fix typo in get-started-graalvm-community.md

---
 .../graalvm-community/get-started-graalvm-community.md          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index 4945739eea13..f6142b394a12 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -14,7 +14,7 @@ GraalVM's polyglot capabilities make it possible to mix multiple programming lan
 Here you will find information about installing GraalVM Community Edition, running basic applications with it, and adding support for accompanying features.
 Further, you will learn about the polyglot capabilities of GraalVM and see how to build platform-specific native executables of JVM-based applications.
 
-If you are new to GraaVM, we recommend starting with [Introduction to GraalVM](/docs/introduction/), where you will find information about GraalVM's architecture, distributions available, supported platforms, core and additional features, and much more.
+If you are new to GraalVM, we recommend starting with [Introduction to GraalVM](/docs/introduction/), where you will find information about GraalVM's architecture, distributions available, supported platforms, core and additional features, and much more.
 
 If you have GraalVM already installed and have experience using it, you can skip this getting started guide and proceed to the in-depth [Reference Manuals](/reference-manual/).
 

From a19006f595b95d6401cb6c0408bc5a5de6058812 Mon Sep 17 00:00:00 2001
From: Regan-Koopmans <regan.koopmans@teampicnic.com>
Date: Tue, 23 Feb 2021 16:23:14 +0200
Subject: [PATCH 074/681] Improve substitution conflict error message

Fixes #1715
---
 .../hosted/substitute/AnnotationSubstitutionProcessor.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java
index 4837c9c75d1e..756fab20323b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java
@@ -819,11 +819,13 @@ private static boolean isIncluded(TargetElement targetElementAnnotation, Class<?
 
     private static <T> void register(Map<T, T> substitutions, T annotated, T original, T target) {
         if (annotated != null) {
-            guarantee(!substitutions.containsKey(annotated) || substitutions.get(annotated) == original || substitutions.get(annotated) == target, "Already registered: %s", annotated);
+            guarantee(!substitutions.containsKey(annotated) || substitutions.get(annotated) == original || substitutions.get(annotated) == target,
+                            "Substition: %s conflicts with previously registered: %s", annotated, substitutions.get(annotated));
             substitutions.put(annotated, target);
         }
         if (original != null) {
-            guarantee(!substitutions.containsKey(original) || substitutions.get(original) == original || substitutions.get(original) == target, "Already registered: %s", original);
+            guarantee(!substitutions.containsKey(original) || substitutions.get(original) == original || substitutions.get(original) == target,
+                            "Substition: %s conflicts with previously registered: %s", original, substitutions.get(original));
             substitutions.put(original, target);
         }
     }

From 267cc9557bdcb1d366589fc4295fa5f3f37c1b54 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 21 Sep 2021 14:28:06 +0200
Subject: [PATCH 075/681] Fix a typo.

---
 .../oracle/truffle/api/instrumentation/TruffleInstrument.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java
index e081314cdba6..c7aee91c0dae 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/TruffleInstrument.java
@@ -232,7 +232,7 @@ protected OptionDescriptors getOptionDescriptors() {
      * }
      *
      * &#64;Registration(...)
-     * class MyInstrument extends TruffleInstruement {
+     * class MyInstrument extends TruffleInstrument {
      *
      *   static final OptionDescriptors CONTEXT_OPTIONS = new MyContextOptionDescriptors();
      *

From f4595ad28028cdb5efeac66e961adb991e92f6ac Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 19:01:14 +0200
Subject: [PATCH 076/681] Inline Node.getParent() into Node.getRootNode().

---
 .../src/com/oracle/truffle/api/nodes/Node.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java
index e90776cc40cf..48b7935ac2fb 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java
@@ -524,7 +524,7 @@ private RootNode getRootNodeImpl() {
         Node prev;
         do {
             prev = node;
-            node = node.getParent();
+            node = node.parent;
         } while (node != null);
 
         if (prev instanceof RootNode) {

From eb69c07999e0d2ad78f0547eda020c5eb29f5ed9 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 21 Sep 2021 17:39:17 +0100
Subject: [PATCH 077/681] Improve the tooltips.

---
 .../tools/profiler/impl/SVGSamplerOutput.java | 47 +++++++++++++++++--
 .../profiler/impl/resources/flamegraph.js     |  8 ++--
 .../profiler/impl/resources/graphowner.js     |  4 ++
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index 25af6887cc38..b0ea04e60cfd 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -218,8 +218,11 @@ private static class GraphOwner implements SVGComponent {
         private Map<GraphColorMap, Map<String, String>> colorsForNames = new HashMap<>();
         private int sampleId;
         public final Map<String, Integer> nameHash = new HashMap<>();
+        public final Map<String, Integer> sourceHash = new HashMap<>();
         public int nameCounter = 0;
+        public int sourceCounter = 0;
         public final JSONArray sampleNames = new JSONArray();
+        public final JSONArray sourceNames = new JSONArray();
         public final JSONObject sampleData = new JSONObject();
 
         GraphOwner(StringBuilder output, Map<TruffleContext, CPUSamplerData> data) {
@@ -294,8 +297,12 @@ public String script() {
 
         private void buildSampleData() {
             sampleData.put("n", nameCounter);
+            sampleData.put("f", sourceCounter);
+            sampleData.put("fl", 0);
             nameHash.put("<top>", nameCounter++);
             sampleNames.put("<top>");
+            sourceHash.put("<none>", sourceCounter++);
+            sourceNames.put("<none>");
             sampleData.put("id", sampleId++);
             sampleData.put("i", 0);
             sampleData.put("c", 0);
@@ -326,6 +333,11 @@ private JSONObject threadSampelData(Thread thread, List<ProfilerNode<CPUSampler.
                 sampleNames.put(thread.getName());
                 return nameCounter++;
             }));
+            result.put("f", sourceHash.computeIfAbsent("<none>", k -> {
+                sourceNames.put("<none>");
+                return sourceCounter++;
+            }));
+            result.put("fl", 0);
             result.put("id", sampleId++);
             result.put("i", 0);
             result.put("c", 0);
@@ -350,6 +362,9 @@ public String samples() {
             result.append("var profileNames = ");
             result.append(sampleNames.toString());
             result.append(";\n");
+            result.append("var sourceNames = ");
+            result.append(sourceNames.toString());
+            result.append(";\n");
             result.append("var profileData = ");
             result.append(sampleData.toString());
             result.append(";\n");
@@ -392,6 +407,30 @@ public JSONObject sampleData(ProfilerNode<CPUSampler.Payload> sample, long x) {
                 return nameCounter++;
             });
             result.put("n", nameId);
+            final String sourceName;
+            int sourceLine = 0;
+            SourceSection section = sample.getSourceSection();
+            if (section != null && section.isAvailable()) {
+                sourceLine = section.getStartLine();
+                Source source = section.getSource();
+                if (source != null) {
+                    String path = source.getPath();
+                    if (path != null) {
+                        sourceName = path;
+                    } else {
+                        sourceName = source.getName();
+                    }
+                } else {
+                    sourceName = "<none>";
+                }
+            } else {
+                sourceName = "<none>";
+            }
+            result.put("f", sourceHash.computeIfAbsent(sourceName, k -> {
+                sourceNames.put(k);
+                return sourceCounter++;
+            }));
+            result.put("fl", sourceLine);
             result.put("id", sampleId++);
             result.put("i", sample.getPayload().getTierSelfCount(0));
             int compiledSelfHits = 0;
@@ -793,14 +832,16 @@ private String drawSample(double y, JSONObject sample) {
             groupAttrs.put("onmouseout", "c(this)");
             groupAttrs.put("id", "f_" + Integer.toString(id));
             StringBuilder title = new StringBuilder();
-            title.append("Function: ");
             title.append(fullText);
             title.append("\n");
             int interpreted = sample.getInt("i");
             int compiled = sample.getInt("c");
-            title.append(String.format("%d samples (%d interpreted, %d compiled).\n", interpreted + compiled, interpreted, compiled));
+            int total = sample.getInt("h");
             double percent = 100.0 * (compiled + interpreted) / sampleCount;
-            title.append(String.format("%.2f%% of displayed samples.\n", percent));
+            double totalPercent = 100.0 * total / sampleCount;
+            title.append(String.format("Self samples: %d (%.2f%%)\n", interpreted + compiled, percent));
+            title.append(String.format("total samples:  %d (%.2f%%)\n", total, totalPercent));
+            title.append(String.format("Source location: %s\n", owner.sourceHash.get(sample.getInt("f")), sample.getInt("fl")));
             groupAttrs.put("title", escape(title.toString()));
             output.append(startGroup(groupAttrs));
 
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index e52aed1756e6..944f2b57c020 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -118,10 +118,12 @@ function zoom_child(sample) {
     let r = e.children[1];
     let t = e.lastElementChild;
     let name = name_for_sample(sample);
+    let source = source_for_sample(sample);
 
-    title.textContent = "Function: " + name + "\n" +
-        sample.h + " samples (" + sample.i + " interpreted, " + sample.c + " compiled).\n" +
-        (100 * (sample.c + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "% of displayed samples.\n";
+    title.textContent = name + "\n" +
+        "Self samples: " + (sample.i + sample.c) + " (" + (100 * (sample.c + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
+        "Total samples: " + (sample.h) + " (" + (100 * (sample.h + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
+        "Source location: " + source + ":" + sample.fl + "\n";
 
     r.x.baseVal.value = x;
     t.x.baseVal[0].value = x + 3;
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index d07c2db9e87c..cc09b66d8101 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -208,6 +208,10 @@ function name_for_sample(sample) {
     return profileNames[sample.n];
 }
 
+function source_for_sample(sample) {
+    return sourceNames[sample.f];
+}
+
 function function_name(e) {
     return title(e);
 }

From bc03928d0dcad4766f1abafcaa87ba48a59ea476 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 19:01:01 +0200
Subject: [PATCH 078/681] LoopNode OSR should preserve the frame in stack
 frames.

---
 .../runtime/GraalOSRFrameInstance.java        | 12 +++++++-
 .../truffle/runtime/OptimizedOSRLoopNode.java | 28 ++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
index 276287b47499..5a15680220f8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
@@ -25,6 +25,8 @@
 package org.graalvm.compiler.truffle.runtime;
 
 import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.nodes.RootNode;
+
 import jdk.vm.ci.code.stack.InspectedFrame;
 
 /**
@@ -42,7 +44,15 @@ public final class GraalOSRFrameInstance extends GraalFrameInstance {
 
     @Override
     public Frame getFrame(FrameAccess access) {
-        return getFrameFrom(osrFrame, access);
+        Frame materializedOSRFrame = getFrameFrom(osrFrame, access);
+        if (getOSRRootNode() instanceof OptimizedOSRLoopNode.LoopOSRRootNode) {
+            return (Frame) materializedOSRFrame.getArguments()[0];
+        }
+        return materializedOSRFrame;
+    }
+
+    private RootNode getOSRRootNode() {
+        return ((OptimizedCallTarget) osrFrame.getLocal(GraalFrameInstance.CALL_TARGET_INDEX)).getRootNode();
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
index d64dd580dab7..dcd1a67d49f4 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
@@ -83,7 +83,7 @@ private OptimizedOSRLoopNode(RepeatingNode repeatingNode, int osrThreshold, bool
     /**
      * @param rootFrameDescriptor may be {@code null}.
      */
-    protected LoopOSRRootNode createRootNode(FrameDescriptor rootFrameDescriptor, Class<? extends VirtualFrame> clazz) {
+    protected AbstractLoopOSRRootNode createRootNode(FrameDescriptor rootFrameDescriptor, Class<? extends VirtualFrame> clazz) {
         /*
          * Use a new frame descriptor, because the frame that this new root node creates is not
          * used.
@@ -252,7 +252,7 @@ public void run() {
         });
     }
 
-    private LoopOSRRootNode createRootNodeImpl(RootNode root, Class<? extends VirtualFrame> frameClass) {
+    private AbstractLoopOSRRootNode createRootNodeImpl(RootNode root, Class<? extends VirtualFrame> frameClass) {
         return createRootNode(root == null ? null : root.getFrameDescriptor(), frameClass);
     }
 
@@ -415,7 +415,7 @@ private OptimizedVirtualizingOSRLoopNode(RepeatingNode repeatableNode, int osrTh
         }
 
         @Override
-        protected LoopOSRRootNode createRootNode(FrameDescriptor rootFrameDescriptor, Class<? extends VirtualFrame> clazz) {
+        protected AbstractLoopOSRRootNode createRootNode(FrameDescriptor rootFrameDescriptor, Class<? extends VirtualFrame> clazz) {
             if (readFrameSlots == null || writtenFrameSlots == null) {
                 return super.createRootNode(rootFrameDescriptor, clazz);
             } else {
@@ -433,7 +433,7 @@ protected LoopOSRRootNode createRootNode(FrameDescriptor rootFrameDescriptor, Cl
 
     }
 
-    public static class LoopOSRRootNode extends BaseOSRRootNode {
+    abstract static class AbstractLoopOSRRootNode extends BaseOSRRootNode {
 
         protected final Class<? extends VirtualFrame> clazz;
 
@@ -443,7 +443,7 @@ public static class LoopOSRRootNode extends BaseOSRRootNode {
          */
         @Child protected OptimizedOSRLoopNode loopNode;
 
-        LoopOSRRootNode(OptimizedOSRLoopNode loop, FrameDescriptor frameDescriptor, Class<? extends VirtualFrame> clazz) {
+        AbstractLoopOSRRootNode(OptimizedOSRLoopNode loop, FrameDescriptor frameDescriptor, Class<? extends VirtualFrame> clazz) {
             super(null, frameDescriptor);
             this.loopNode = loop;
             this.clazz = clazz;
@@ -457,10 +457,11 @@ public SourceSection getSourceSection() {
         @Override
         protected Object executeOSR(VirtualFrame frame) {
             VirtualFrame parentFrame = clazz.cast(frame.getArguments()[0]);
+            RepeatingNode loopBody = loopNode.repeatingNode;
             Object status;
-            while (loopNode.repeatingNode.shouldContinue(status = loopNode.getRepeatingNode().executeRepeatingWithValue(parentFrame))) {
+            while (loopBody.shouldContinue(status = loopBody.executeRepeatingWithValue(parentFrame))) {
                 if (CompilerDirectives.inInterpreter()) {
-                    return loopNode.repeatingNode.initialLoopStatus();
+                    return loopBody.initialLoopStatus();
                 }
                 TruffleSafepoint.poll(this);
             }
@@ -478,7 +479,13 @@ public final String toString() {
         }
     }
 
-    private static final class VirtualizingLoopOSRRootNode extends LoopOSRRootNode {
+    static final class LoopOSRRootNode extends AbstractLoopOSRRootNode {
+        LoopOSRRootNode(OptimizedOSRLoopNode loop, FrameDescriptor frameDescriptor, Class<? extends VirtualFrame> clazz) {
+            super(loop, frameDescriptor, clazz);
+        }
+    }
+
+    private static final class VirtualizingLoopOSRRootNode extends AbstractLoopOSRRootNode {
 
         @CompilationFinal(dimensions = 1) private final FrameSlot[] readFrameSlots;
         @CompilationFinal(dimensions = 1) private final FrameSlot[] writtenFrameSlots;
@@ -534,10 +541,11 @@ protected Object executeOSR(VirtualFrame originalFrame) {
             FrameWithoutBoxing parentFrame = (FrameWithoutBoxing) (loopFrame.getArguments()[0]);
             executeTransfer(parentFrame, loopFrame, readFrameSlots, readFrameSlotsTags);
             try {
+                RepeatingNode loopBody = loopNode.repeatingNode;
                 Object status;
-                while (loopNode.repeatingNode.shouldContinue(status = loopNode.getRepeatingNode().executeRepeatingWithValue(loopFrame))) {
+                while (loopBody.shouldContinue(status = loopBody.executeRepeatingWithValue(loopFrame))) {
                     if (CompilerDirectives.inInterpreter()) {
-                        return loopNode.repeatingNode.initialLoopStatus();
+                        return loopBody.initialLoopStatus();
                     }
                     TruffleSafepoint.poll(this);
                 }

From 22181b8aadc9a127bf2c8366933893a4c71630a1 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 19:40:12 +0200
Subject: [PATCH 079/681] [GR-33890] Add OSR stack frame introspection
 regression test.

---
 .../truffle/test/LoopNodeOSRTest.java         | 131 ++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java

diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java
new file mode 100644
index 000000000000..1e39f6bbdde0
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.truffle.test;
+
+import java.util.stream.IntStream;
+
+import org.graalvm.compiler.truffle.runtime.BytecodeOSRMetadata;
+import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
+import com.oracle.truffle.api.frame.FrameSlot;
+import com.oracle.truffle.api.frame.FrameSlotKind;
+import com.oracle.truffle.api.frame.FrameUtil;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.LoopNode;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RepeatingNode;
+import com.oracle.truffle.api.nodes.RootNode;
+
+public class LoopNodeOSRTest extends TestWithSynchronousCompiling {
+
+    static final Object[] ARGUMENTS = IntStream.range(21, 36).mapToObj(Integer::valueOf).toArray();
+
+    private static class TestLoopRootNode extends RootNode {
+        @Child private LoopNode loop;
+        private final FrameSlot iterationSlot;
+
+        TestLoopRootNode(RepeatingNode body, FrameDescriptor frameDescriptor, FrameSlot iterationSlot) {
+            super(null, frameDescriptor);
+            this.loop = Truffle.getRuntime().createLoopNode(body);
+            this.iterationSlot = iterationSlot;
+        }
+
+        @Override
+        public Object execute(VirtualFrame frame) {
+            frame.setInt(iterationSlot, 0);
+            return loop.execute(frame);
+        }
+    }
+
+    private final class CheckStackWalkBody extends Node implements RepeatingNode {
+        private final int total;
+        private final FrameSlot iterationSlot;
+        private final FrameDescriptor frameDescriptor;
+        boolean compiled;
+
+        private CheckStackWalkBody(int total, FrameDescriptor frameDescriptor, FrameSlot iterationSlot) {
+            this.total = total;
+            this.iterationSlot = iterationSlot;
+            this.frameDescriptor = frameDescriptor;
+        }
+
+        @Override
+        public boolean executeRepeating(VirtualFrame frame) {
+            int iteration = FrameUtil.getIntSafe(frame, iterationSlot);
+            if (iteration < total) {
+                if (iteration % (total / 10) == 0) {
+                    checkStack();
+                }
+                iteration++;
+                frame.setInt(iterationSlot, iteration);
+                return true;
+            } else {
+                if (CompilerDirectives.inCompiledCode()) {
+                    compiled = true;
+                }
+                iteration = 0;
+                frame.setInt(iterationSlot, iteration);
+                return false;
+            }
+        }
+
+        @TruffleBoundary
+        private void checkStack() {
+            Truffle.getRuntime().iterateFrames(frameInstance -> {
+                Frame frame = frameInstance.getFrame(FrameAccess.READ_ONLY);
+                Assert.assertArrayEquals(ARGUMENTS, frame.getArguments());
+                Assert.assertSame(frameDescriptor, frame.getFrameDescriptor());
+                return null;
+            });
+        }
+    }
+
+    @Test
+    public void testOSRStackFrame() {
+        int osrThreshold = 10 * BytecodeOSRMetadata.OSR_POLL_INTERVAL;
+        setupContext("engine.MultiTier", "false",
+                        "engine.OSR", "true",
+                        "engine.OSRCompilationThreshold", String.valueOf(osrThreshold));
+
+        FrameDescriptor desc = new FrameDescriptor();
+        FrameSlot iterationSlot = desc.addFrameSlot("iteration", FrameSlotKind.Int);
+        CheckStackWalkBody loop = new CheckStackWalkBody(osrThreshold * 2, desc, iterationSlot);
+        TestLoopRootNode rootNode = new TestLoopRootNode(loop, desc, iterationSlot);
+        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode);
+
+        target.call(ARGUMENTS);
+
+        Assert.assertTrue("Loop should have been OSR compiled", loop.compiled);
+    }
+
+}

From d7b2c25254c4b6f2d1093bd86ec7dfeb36d3f341 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 21:00:57 +0200
Subject: [PATCH 080/681] Add TruffleBoundary to GraalFrameInstance methods;
 required on SVM.

---
 .../compiler/truffle/runtime/GraalFrameInstance.java      | 8 +++++++-
 .../compiler/truffle/runtime/GraalOSRFrameInstance.java   | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalFrameInstance.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalFrameInstance.java
index 18990eb4c02f..0cd277794331 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalFrameInstance.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalFrameInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -86,31 +86,37 @@ protected Frame getFrameFrom(InspectedFrame inspectedFrame, FrameAccess access)
         return frame;
     }
 
+    @TruffleBoundary
     @Override
     public Frame getFrame(FrameAccess access) {
         return getFrameFrom(callTargetFrame, access);
     }
 
+    @TruffleBoundary
     @Override
     public boolean isVirtualFrame() {
         return callTargetFrame.isVirtual(FRAME_INDEX);
     }
 
+    @TruffleBoundary
     @Override
     public int getCompilationTier() {
         return ((CompilationState) callTargetFrame.getLocal(OPTIMIZATION_TIER_FRAME_INDEX)).getTier();
     }
 
+    @TruffleBoundary
     @Override
     public boolean isCompilationRoot() {
         return ((CompilationState) callTargetFrame.getLocal(OPTIMIZATION_TIER_FRAME_INDEX)).isCompilationRoot();
     }
 
+    @TruffleBoundary
     @Override
     public CallTarget getCallTarget() {
         return (CallTarget) callTargetFrame.getLocal(CALL_TARGET_INDEX);
     }
 
+    @TruffleBoundary
     @Override
     public final Node getCallNode() {
         if (callNodeFrame != null) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
index 5a15680220f8..d597132758eb 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalOSRFrameInstance.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.truffle.runtime;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -42,6 +43,7 @@ public final class GraalOSRFrameInstance extends GraalFrameInstance {
         this.osrFrame = osrFrame;
     }
 
+    @TruffleBoundary
     @Override
     public Frame getFrame(FrameAccess access) {
         Frame materializedOSRFrame = getFrameFrom(osrFrame, access);
@@ -55,16 +57,19 @@ private RootNode getOSRRootNode() {
         return ((OptimizedCallTarget) osrFrame.getLocal(GraalFrameInstance.CALL_TARGET_INDEX)).getRootNode();
     }
 
+    @TruffleBoundary
     @Override
     public boolean isVirtualFrame() {
         return osrFrame.isVirtual(FRAME_INDEX);
     }
 
+    @TruffleBoundary
     @Override
     public int getCompilationTier() {
         return ((CompilationState) osrFrame.getLocal(OPTIMIZATION_TIER_FRAME_INDEX)).getTier();
     }
 
+    @TruffleBoundary
     @Override
     public boolean isCompilationRoot() {
         return ((CompilationState) osrFrame.getLocal(OPTIMIZATION_TIER_FRAME_INDEX)).isCompilationRoot();

From a273a1c73400439883e6ed7b2fd51900bb6a55f4 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 21:51:25 +0200
Subject: [PATCH 081/681] Avoid redundant field loads.

---
 .../src/com/oracle/truffle/api/nodes/ExecutableNode.java     | 5 +++--
 .../com/oracle/truffle/polyglot/PolyglotLanguageContext.java | 5 +++--
 .../src/com/oracle/truffle/polyglot/WeakAssumedValue.java    | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExecutableNode.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExecutableNode.java
index 1b7828b408c2..0d0c605d83a1 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExecutableNode.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ExecutableNode.java
@@ -89,8 +89,9 @@ protected ExecutableNode(TruffleLanguage<?> language) {
     }
 
     final TruffleLanguage<?> getLanguage() {
-        if (engineRef instanceof TruffleLanguage<?>) {
-            return (TruffleLanguage<?>) engineRef;
+        Object ref = engineRef;
+        if (ref instanceof TruffleLanguage<?>) {
+            return (TruffleLanguage<?>) ref;
         } else {
             return null;
         }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
index 702183b069d0..7e8e8a3d707e 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
@@ -304,8 +304,9 @@ private void checkThreadAccess(Env localEnv) {
     }
 
     Object getContextImpl() {
-        if (env != null) {
-            return LANGUAGE.getContext(env);
+        Env localEnv = env;
+        if (localEnv != null) {
+            return LANGUAGE.getContext(localEnv);
         } else {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             return null;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/WeakAssumedValue.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/WeakAssumedValue.java
index b393e1281159..fe4e0a29f4cc 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/WeakAssumedValue.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/WeakAssumedValue.java
@@ -174,10 +174,11 @@ private Profile(V value, String name) {
         }
 
         V get() {
-            if (reference == null) {
+            TruffleWeakReference<V> ref = reference;
+            if (ref == null) {
                 return null;
             }
-            return reference.get();
+            return ref.get();
         }
     }
 

From f3cdb4963e9983042ec342516138b72af7f919a8 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 22:45:57 +0200
Subject: [PATCH 082/681] Avoid redundant field accesses in
 reportChildLoopCount.

---
 .../compiler/truffle/runtime/OptimizedOSRLoopNode.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
index dcd1a67d49f4..4dc7e495564e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
@@ -176,10 +176,11 @@ private void reportLoopIterations(long iterations) {
     }
 
     final void reportChildLoopCount(int iterations) {
-        baseLoopCount += iterations;
-        if (baseLoopCount < 0) {
-            baseLoopCount = Integer.MAX_VALUE;
+        int newBaseLoopCount = baseLoopCount + iterations;
+        if (newBaseLoopCount < 0) { // overflowed
+            newBaseLoopCount = Integer.MAX_VALUE;
         }
+        baseLoopCount = newBaseLoopCount;
     }
 
     /**

From 897064936ad882feed7ea69fc9e262e7995d01bd Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 21 Sep 2021 23:00:20 +0200
Subject: [PATCH 083/681] Avoid redundant field loads.

---
 .../truffle/runtime/OptimizedOSRLoopNode.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
index 4dc7e495564e..66561b8a20b8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedOSRLoopNode.java
@@ -100,10 +100,11 @@ public final Node copy() {
 
     @Override
     public Object execute(VirtualFrame frame) {
+        RepeatingNode loopBody = repeatingNode;
         if (CompilerDirectives.inInterpreter()) {
             try {
-                Object status = repeatingNode.initialLoopStatus();
-                while (repeatingNode.shouldContinue(status)) {
+                Object status = loopBody.initialLoopStatus();
+                while (loopBody.shouldContinue(status)) {
                     if (compiledOSRLoop == null) {
                         status = profilingLoop(frame);
                     } else {
@@ -118,7 +119,7 @@ public Object execute(VirtualFrame frame) {
             long iterationsCompleted = 0;
             Object status;
             try {
-                while (inject(repeatingNode.shouldContinue((status = repeatingNode.executeRepeatingWithValue(frame))))) {
+                while (inject(loopBody.shouldContinue((status = loopBody.executeRepeatingWithValue(frame))))) {
                     iterationsCompleted++;
                     if (CompilerDirectives.inInterpreter()) {
                         // compiled method got invalidated. We might need OSR again.
@@ -134,7 +135,7 @@ public Object execute(VirtualFrame frame) {
             return status;
         } else {
             Object status;
-            while (inject(repeatingNode.shouldContinue((status = repeatingNode.executeRepeatingWithValue(frame))))) {
+            while (inject(loopBody.shouldContinue((status = loopBody.executeRepeatingWithValue(frame))))) {
                 if (CompilerDirectives.inInterpreter()) {
                     // compiled method got invalidated. We might need OSR again.
                     return execute(frame);
@@ -150,10 +151,11 @@ static int toIntOrMaxInt(long i) {
     }
 
     private Object profilingLoop(VirtualFrame frame) {
+        RepeatingNode loopBody = repeatingNode;
         long iterations = 0;
         try {
             Object status;
-            while (repeatingNode.shouldContinue(status = repeatingNode.executeRepeatingWithValue(frame))) {
+            while (loopBody.shouldContinue(status = loopBody.executeRepeatingWithValue(frame))) {
                 // the baseLoopCount might be updated from a child loop during an iteration.
                 if (++iterations + baseLoopCount > osrThreshold && !compilationDisabled) {
                     compileLoop(frame);
@@ -198,24 +200,25 @@ public final OptimizedCallTarget getCompiledOSRLoop() {
     }
 
     private Object compilingLoop(VirtualFrame frame) {
+        RepeatingNode loopBody = repeatingNode;
         long iterations = 0;
         try {
             Object status;
             do {
                 OptimizedCallTarget target = compiledOSRLoop;
                 if (target == null) {
-                    return repeatingNode.initialLoopStatus();
+                    return loopBody.initialLoopStatus();
                 }
                 if (!target.isSubmittedForCompilation()) {
                     if (target.isValid()) {
                         return callOSR(target, frame);
                     }
                     invalidateOSRTarget("OSR compilation failed or cancelled");
-                    return repeatingNode.initialLoopStatus();
+                    return loopBody.initialLoopStatus();
                 }
                 iterations++;
                 TruffleSafepoint.poll(this);
-            } while (repeatingNode.shouldContinue(status = repeatingNode.executeRepeatingWithValue(frame)));
+            } while (loopBody.shouldContinue(status = loopBody.executeRepeatingWithValue(frame)));
             return status;
         } finally {
             reportLoopIterations(iterations);

From d72f22ab97a017becd5272f841d4f040f8f82983 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 22 Sep 2021 00:27:12 +0000
Subject: [PATCH 084/681] [GR-33413] Next dev cycle.

PullRequest: graalpython/1965
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 3eb70f303099..0aa0eb86e58b 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "421dd8b08e0c329924705b5567c50771984c7774",
+                "version": "4130a1090c486309114e8f773c39ed31a21c887b",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From e0b4f4535bef624096382ee1974488015ac6c3f4 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 22 Sep 2021 06:08:16 +0000
Subject: [PATCH 085/681] [GR-33413] Next dev cycle.

PullRequest: js/2153
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 0aa0eb86e58b..5e92b2fb0538 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "35a10cf868b801c69651155c2dd3306405c9975f",
+                "version": "5d6e27792ff4814ce47ff49f7b9845231e2048ec",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "35a10cf868b801c69651155c2dd3306405c9975f",
+                "version": "5d6e27792ff4814ce47ff49f7b9845231e2048ec",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From ed577f5e41280eea401d67a15bdb7d0f1c0c3142 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yudi.zheng@oracle.com>
Date: Thu, 16 Sep 2021 22:31:33 +0200
Subject: [PATCH 086/681] Update digests of the HotSpot stub.

---
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java    | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java    | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java  | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java    | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java    | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java    | 4 ++--
 .../src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java
index 62a466425fe2..f6e22a38f003 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java
@@ -204,8 +204,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_cos.cpp",
           lineStart = 0,
           lineEnd   = 630,
-          commit    = "12bac3a02d7b0f17da78d5ee810fd2742ec43ba6",
-          sha1      = "1961922e2fb08f172595d18e5fe9bd79d9e3cc7a")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "cb83822ed974ba4181ff2d55869b301686e0c8c3")
 // @formatter:on
 public final class AMD64MathCosOp extends AMD64MathIntrinsicUnaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java
index d717e4817bb8..151a00f889f5 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java
@@ -89,8 +89,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_exp.cpp",
           lineStart = 0,
           lineEnd   = 406,
-          commit    = "51b218842f001f1c4fd5ca7a02a2ba21e9e8a82c",
-          sha1      = "d21d2a3439932fdbdcf20274798d8488ae1153a9")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "e8777563cb0f0f275a490992a36bbdf06bb4c4af")
 // @formatter:on
 public final class AMD64MathExpOp extends AMD64MathIntrinsicUnaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java
index 6972244f26eb..99904c9ce5d0 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java
@@ -82,8 +82,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_log10.cpp",
           lineStart = 0,
           lineEnd   = 382,
-          commit    = "12bac3a02d7b0f17da78d5ee810fd2742ec43ba6",
-          sha1      = "ce7879887e5360ad4c1ca8b776daca5497d6b349")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "e03b4280eebe9392433389ab16c4aa52bb01270b")
 // @formatter:on
 public final class AMD64MathLog10Op extends AMD64MathIntrinsicUnaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java
index c36a872271d4..2cf8c42ebf34 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java
@@ -84,8 +84,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_log.cpp",
           lineStart = 0,
           lineEnd   = 362,
-          commit    = "51b218842f001f1c4fd5ca7a02a2ba21e9e8a82c",
-          sha1      = "7711be0c6b6e72c57b39578e00000205f1315cde")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "4fc26bdb838040042ba0a4f5c04d737705ad4a7a")
 // @formatter:on
 public final class AMD64MathLogOp extends AMD64MathIntrinsicUnaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java
index cc25c363fc9f..a4b218d6d012 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java
@@ -113,8 +113,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp",
           lineStart = 0,
           lineEnd   = 1880,
-          commit    = "51b218842f001f1c4fd5ca7a02a2ba21e9e8a82c",
-          sha1      = "b9ee010c248b0a1ccb29e3348fc158eafbe00115")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "ff1905731c30cf343460e72d58537d4672b0dce2")
 // @formatter:on
 public final class AMD64MathPowOp extends AMD64MathIntrinsicBinaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java
index ef63e1e43be7..5b32f31c2c54 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java
@@ -207,8 +207,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_sin.cpp",
           lineStart = 0,
           lineEnd   = 848,
-          commit    = "12bac3a02d7b0f17da78d5ee810fd2742ec43ba6",
-          sha1      = "2ee75c53633f6044ce351d90bbb79081bfad1663")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "4ac9bd6f8b98df9a93ab8ef7de250421605b323c")
 // @formatter:on
 public final class AMD64MathSinOp extends AMD64MathIntrinsicUnaryOp {
 
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java
index d2ebccf59bfd..917e1f89419a 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java
@@ -133,8 +133,8 @@
 @StubPort(path      = "src/hotspot/cpu/x86/macroAssembler_x86_tan.cpp",
           lineStart = 0,
           lineEnd   = 1059,
-          commit    = "12bac3a02d7b0f17da78d5ee810fd2742ec43ba6",
-          sha1      = "466fa030d8bf2c1ba0630839bce6f46549a4ebe0")
+          commit    = "e58c12e61828485bfffbc9d1b865302b93a94158",
+          sha1      = "1f1f3a6d2437b250c0d5b13e596d9ed5a14c869e")
 // @formatter:on
 public final class AMD64MathTanOp extends AMD64MathIntrinsicUnaryOp {
 

From 6c47ab69ac8b81da8f3d7aea9ee529394636b26b Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Wed, 22 Sep 2021 13:37:07 +0100
Subject: [PATCH 087/681] Include the language name in the tooltip.

---
 .../oracle/truffle/tools/profiler/impl/resources/flamegraph.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 944f2b57c020..33c906daaf91 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -120,7 +120,7 @@ function zoom_child(sample) {
     let name = name_for_sample(sample);
     let source = source_for_sample(sample);
 
-    title.textContent = name + "\n" +
+    title.textContent = name + " (" + languageNames[sample.l] + ")\n" +
         "Self samples: " + (sample.i + sample.c) + " (" + (100 * (sample.c + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
         "Total samples: " + (sample.h) + " (" + (100 * (sample.h + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
         "Source location: " + source + ":" + sample.fl + "\n";

From d11728e723493af8c5c2cf71752f6e3d55d06213 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Thu, 9 Sep 2021 19:44:30 +0200
Subject: [PATCH 088/681] Properly quote arguments passed via argument files

NativeImage passes some arguments via the @file feature of the
JDK launcher. When some arguments, separated by new lines, contain
whitespace *and* aren't properly quoted, the JDK launcher code fails
to parse the argument file and the native image generator class is
never launched.

Shell-quoting arguments before writing them to an @argument file
avoids this issue. Due to a Windows argument file quirk, where
'\' don't need to be escaped if NOT quoted, but DO need escaping
when they are quoted we unconditionally escape '\'.

Closes #3769
---
 .../src/com/oracle/svm/driver/NativeImage.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index ba01e3d1a970..06c3b8a07f46 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -50,6 +50,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.StringJoiner;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -1301,7 +1302,22 @@ protected static List<String> createImageBuilderArgs(ArrayList<String> imageArgs
     protected static String createVMInvocationArgumentFile(List<String> arguments) {
         try {
             Path argsFile = Files.createTempFile("vminvocation", ".args");
-            String joinedOptions = String.join("\n", arguments);
+            StringJoiner joiner = new StringJoiner("\n");
+            for (String arg : arguments) {
+                // Options in @argfile need to be properly quoted as
+                // this relies on the JDK's @argfile parsing when the
+                // native image generator is being launched.
+                String quoted = SubstrateUtil.quoteShellArg(arg);
+                // @argfile rules for Windows quirk: backslashes don't need to be
+                // escaped if the option they are used in isn't quoted. If it is
+                // though, then they need to be escaped. This might mean that
+                // user-supplied arguments containing '\' will be double escaped.
+                if (quoted.startsWith("'")) {
+                    quoted = quoted.replace("\\", "\\\\");
+                }
+                joiner.add(quoted);
+            }
+            String joinedOptions = joiner.toString();
             Files.write(argsFile, joinedOptions.getBytes());
             argsFile.toFile().deleteOnExit();
             return "@" + argsFile;

From 62154ef0fce75dc17d48865bac876276e64e58ab Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 22 Sep 2021 16:18:02 +0200
Subject: [PATCH 089/681] Extract ShapeImpl.getLayoutStrategy().

---
 .../object/DynamicObjectLibraryImpl.java       | 18 +++++++++---------
 .../oracle/truffle/object/PropertyImpl.java    |  4 ++--
 .../com/oracle/truffle/object/ShapeImpl.java   | 18 +++++++++++-------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
index 9dd2cadb47ee..dade8737f479 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
@@ -279,7 +279,7 @@ public static boolean updateShape(DynamicObject object,
 
     @TruffleBoundary
     static boolean updateShapeImpl(DynamicObject object) {
-        return ((ShapeImpl) object.getShape()).getLayout().getStrategy().updateShape(object);
+        return ((ShapeImpl) object.getShape()).getLayoutStrategy().updateShape(object);
     }
 
     @ExportMessage
@@ -338,12 +338,12 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
                 if (Flags.isSetExisting(putFlags)) {
                     return false;
                 } else {
-                    LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                    LayoutStrategy strategy = oldShape.getLayoutStrategy();
                     newShape = strategy.defineProperty(oldShape, key, value, Flags.getPropertyFlags(putFlags), null, existingProperty, putFlags);
                     property = newShape.getProperty(key);
                 }
             } else if (Flags.isUpdateFlags(putFlags) && Flags.getPropertyFlags(putFlags) != existingProperty.getFlags()) {
-                LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                LayoutStrategy strategy = oldShape.getLayoutStrategy();
                 newShape = strategy.defineProperty(oldShape, key, value, Flags.getPropertyFlags(putFlags), null, existingProperty, putFlags);
                 property = newShape.getProperty(key);
             } else {
@@ -351,7 +351,7 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
                     newShape = oldShape;
                     property = existingProperty;
                 } else {
-                    LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                    LayoutStrategy strategy = oldShape.getLayoutStrategy();
                     newShape = strategy.defineProperty(oldShape, key, value, existingProperty.getFlags(), null, existingProperty, putFlags);
                     property = newShape.getProperty(key);
                 }
@@ -380,7 +380,7 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
 
     static RemovePlan prepareRemove(ShapeImpl shapeBefore, ShapeImpl shapeAfter) {
         assert !shapeBefore.isShared();
-        LayoutStrategy strategy = shapeBefore.getLayout().getStrategy();
+        LayoutStrategy strategy = shapeBefore.getLayoutStrategy();
         List<Move> moves = new ArrayList<>();
         boolean canMoveInPlace = shapeAfter.getObjectArrayCapacity() <= shapeBefore.getObjectArrayCapacity() &&
                         shapeAfter.getPrimitiveArrayCapacity() <= shapeBefore.getPrimitiveArrayCapacity();
@@ -1514,7 +1514,7 @@ private ShapeImpl getNewShape(DynamicObject object, Object value, long putFlags,
                     return oldShape;
                 } else {
                     int propertyFlags = Flags.getPropertyFlags(putFlags);
-                    LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                    LayoutStrategy strategy = oldShape.getLayoutStrategy();
                     return strategy.defineProperty(oldShape, cachedKey, value, propertyFlags, null, putFlags);
                 }
             }
@@ -1522,7 +1522,7 @@ private ShapeImpl getNewShape(DynamicObject object, Object value, long putFlags,
             if (Flags.isUpdateFlags(putFlags)) {
                 if (Flags.getPropertyFlags(putFlags) != property.getFlags()) {
                     int propertyFlags = Flags.getPropertyFlags(putFlags);
-                    LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                    LayoutStrategy strategy = oldShape.getLayoutStrategy();
                     return strategy.defineProperty(oldShape, cachedKey, value, propertyFlags, null, putFlags);
                 }
             }
@@ -1531,13 +1531,13 @@ private ShapeImpl getNewShape(DynamicObject object, Object value, long putFlags,
             if (!location.isDeclared() && !location.canSet(value)) {
                 // generalize
                 assert oldShape == ACCESS.getShape(object);
-                LayoutStrategy strategy = oldShape.getLayout().getStrategy();
+                LayoutStrategy strategy = oldShape.getLayoutStrategy();
                 ShapeImpl newShape = strategy.definePropertyGeneralize(oldShape, property, value, null, putFlags);
                 assert newShape != oldShape;
                 return newShape;
             } else if (location.isDeclared()) {
                 // redefine declared
-                LayoutStrategy strategy = oldShape.layout.getStrategy();
+                LayoutStrategy strategy = oldShape.getLayoutStrategy();
                 return strategy.defineProperty(oldShape, cachedKey, value, property.getFlags(), null, putFlags);
             } else {
                 // set existing
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
index 496e3845608c..8115e9b57391 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
@@ -249,12 +249,12 @@ public final Location getLocation() {
 
     private void setSlowCase(DynamicObject store, Object value) {
         ShapeImpl oldShape = (ShapeImpl) store.getShape();
-        oldShape.getLayout().getStrategy().propertySetFallback(this, store, value, oldShape);
+        oldShape.getLayoutStrategy().propertySetFallback(this, store, value, oldShape);
     }
 
     private void setWithShapeSlowCase(DynamicObject store, Object value, Shape currentShape, Shape nextShape) {
         ShapeImpl oldShape = (ShapeImpl) currentShape;
-        oldShape.getLayout().getStrategy().propertySetWithShapeFallback(this, store, value, oldShape, (ShapeImpl) nextShape);
+        oldShape.getLayoutStrategy().propertySetWithShapeFallback(this, store, value, oldShape, (ShapeImpl) nextShape);
     }
 
     /** @since 0.17 or earlier */
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java
index 3e2785e6a0e5..a9ae65730339 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java
@@ -563,7 +563,7 @@ public final <R> R iterateTransitions(BiFunction<Transition, ShapeImpl, R> consu
     public ShapeImpl addProperty(Property property) {
         assert isValid();
 
-        return layout.getStrategy().addProperty(this, property);
+        return getLayoutStrategy().addProperty(this, property);
     }
 
     /** @since 0.17 or earlier */
@@ -588,14 +588,14 @@ final void onPropertyTransitionWithKey(Object propertyKey) {
     @TruffleBoundary
     @Override
     public ShapeImpl defineProperty(Object key, Object value, int propertyFlags) {
-        return layout.getStrategy().defineProperty(this, key, value, propertyFlags, null);
+        return getLayoutStrategy().defineProperty(this, key, value, propertyFlags, null);
     }
 
     /** @since 0.17 or earlier */
     @TruffleBoundary
     @Override
     public ShapeImpl defineProperty(Object key, Object value, int propertyFlags, LocationFactory locationFactory) {
-        return layout.getStrategy().defineProperty(this, key, value, propertyFlags, locationFactory);
+        return getLayoutStrategy().defineProperty(this, key, value, propertyFlags, locationFactory);
     }
 
     /** @since 0.17 or earlier */
@@ -907,7 +907,7 @@ public final boolean hasProperty(Object name) {
     public final ShapeImpl removeProperty(Property prop) {
         onPropertyTransition(prop);
 
-        return layout.getStrategy().removeProperty(this, prop);
+        return getLayoutStrategy().removeProperty(this, prop);
     }
 
     /** @since 0.17 or earlier */
@@ -920,7 +920,7 @@ public final ShapeImpl append(Property oldProperty) {
     /** @since 0.17 or earlier */
     @Override
     public final BaseAllocator allocator() {
-        return layout.getStrategy().createAllocator(this);
+        return getLayoutStrategy().createAllocator(this);
     }
 
     /**
@@ -934,7 +934,7 @@ public ShapeImpl replaceProperty(Property oldProperty, Property newProperty) {
         assert oldProperty.getKey().equals(newProperty.getKey());
         onPropertyTransition(oldProperty);
 
-        return layout.getStrategy().replaceProperty(this, oldProperty, newProperty);
+        return getLayoutStrategy().replaceProperty(this, oldProperty, newProperty);
     }
 
     /**
@@ -1040,6 +1040,10 @@ public final LayoutImpl getLayout() {
         return layout;
     }
 
+    public final LayoutStrategy getLayoutStrategy() {
+        return getLayout().getStrategy();
+    }
+
     /** @since 0.17 or earlier */
     @Override
     public final Object getSharedData() {
@@ -1151,7 +1155,7 @@ protected ShapeImpl setFlags(int newShapeFlags) {
     @Override
     public final ShapeImpl reservePrimitiveExtensionArray() {
         if (layout.hasPrimitiveExtensionArray() && !hasPrimitiveArray()) {
-            return layout.getStrategy().addPrimitiveExtensionArray(this);
+            return getLayoutStrategy().addPrimitiveExtensionArray(this);
         }
         return this;
     }

From 7e7f2e651702e5c2dd9ed82112bff4fa0684071a Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Thu, 9 Sep 2021 15:20:07 +0200
Subject: [PATCH 090/681] [GR-33657] Extend CEntryPoint annotation by include
 attribute.

---
 sdk/CHANGELOG.md                              |   3 +
 .../org.graalvm.nativeimage/snapshot.sigtest  |  19 ++
 .../nativeimage/c/function/CEntryPoint.java   |  57 +++-
 .../llvm/runtime/LLVMExceptionUnwind.java     |   4 +-
 .../posix/PosixSubstrateSegfaultHandler.java  |   4 +-
 .../core/posix/thread/PosixJavaThreads.java   |   4 +-
 .../svm/core/windows/WindowsJavaThreads.java  |   4 +-
 .../WindowsSubstrateSegfaultHandler.java      |   5 +-
 .../com/oracle/svm/core/JavaMainWrapper.java  |   4 +-
 .../core/c/function/CEntryPointOptions.java   |  20 +-
 .../hotspot/libgraal/LibGraalEntryPoints.java |   4 +-
 ...solateAwareConstantReflectionProvider.java |  32 +--
 ...ateAwareObjectConstantEqualityFeature.java |   8 +-
 .../graal/isolated/IsolatedCompileClient.java |   4 +-
 .../isolated/IsolatedCompileContext.java      |   8 +-
 .../graal/isolated/IsolatedGraalUtils.java    |  12 +-
 .../isolated/IsolatedObjectConstant.java      |   8 +-
 .../graal/isolated/IsolatedObjectProxy.java   |   8 +-
 .../IsolatedRuntimeCodeInstaller.java         |  20 +-
 .../isolated/IsolatedSpeculationLog.java      |  16 +-
 .../svm/hosted/NativeImageGenerator.java      |  15 +-
 .../svm/jni/functions/JNIFunctions.java       | 244 +++++++++---------
 .../jni/functions/JNIInvocationInterface.java |  32 +--
 .../oracle/svm/truffle/nfi/NativeAPIImpl.java |  44 ++--
 .../oracle/svm/truffle/nfi/NativeClosure.java |  16 +-
 .../isolated/IsolateAwareTruffleCompiler.java |  12 +-
 .../IsolatedCompilableTruffleAST.java         |  60 ++---
 .../IsolatedCompilationIdentifier.java        |   8 +-
 .../isolated/IsolatedTruffleCallNode.java     |  12 +-
 .../IsolatedTruffleCompilationTask.java       |  20 +-
 ...IsolatedTruffleCompilerEventForwarder.java |  28 +-
 .../isolated/IsolatedTruffleInlining.java     |  32 +--
 .../IsolatedTruffleRuntimeSupport.java        |  24 +-
 ...IsolatedTruffleSourceLanguagePosition.java |  16 +-
 34 files changed, 453 insertions(+), 354 deletions(-)

diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
index 3d7ca70b21f8..063ed15bffd5 100644
--- a/sdk/CHANGELOG.md
+++ b/sdk/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes between GraalVM SDK versions. The main focus is on APIs exported by GraalVM SDK.
 
+## Version 22.0.0
+* (GR-33657) Native Image API: Added `CEntryPoint#include` attribute which can be used to controll if the entry point should be automatically added to the shared library.
+
 ## Version 21.3.0
 * Added the ability to share values between contexts. Please see  `Context.Builder.allowValueSharing(boolean)` for further details. 
 * (GR-20286) Polyglot API: Added support for scoped values in guest-to-host callbacks. [Scoped values](https://www.graalvm.org/reference-manual/embed-languages/#controlling-host-callback-parameter-scoping) are automatically released when the callback returns. They can be configured in `HostAccess`.
diff --git a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest
index df2964afe9ff..5dc7f0afe64f 100644
--- a/sdk/src/org.graalvm.nativeimage/snapshot.sigtest
+++ b/sdk/src/org.graalvm.nativeimage/snapshot.sigtest
@@ -114,6 +114,10 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.annotation.ElementType[] value()
 
+CLSS public abstract interface java.util.function.BooleanSupplier
+ anno 0 java.lang.FunctionalInterface()
+meth public abstract boolean getAsBoolean()
+
 CLSS public final org.graalvm.nativeimage.CurrentIsolate
 meth public static org.graalvm.nativeimage.Isolate getIsolate()
 meth public static org.graalvm.nativeimage.IsolateThread getCurrentThread()
@@ -457,13 +461,22 @@ CLSS public abstract interface !annotation org.graalvm.nativeimage.c.function.CE
 innr public abstract interface static !annotation IsolateContext
 innr public abstract interface static !annotation IsolateThreadContext
 innr public final static !enum Builtin
+innr public final static AlwaysIncluded
 innr public final static FatalExceptionHandler
+innr public final static NotIncludedAutomatically
 intf java.lang.annotation.Annotation
+meth public abstract !hasdefault java.lang.Class<? extends java.util.function.BooleanSupplier> include()
 meth public abstract !hasdefault java.lang.Class<?> exceptionHandler()
 meth public abstract !hasdefault java.lang.String name()
 meth public abstract !hasdefault java.lang.String[] documentation()
 meth public abstract !hasdefault org.graalvm.nativeimage.c.function.CEntryPoint$Builtin builtin()
 
+CLSS public final static org.graalvm.nativeimage.c.function.CEntryPoint$AlwaysIncluded
+ outer org.graalvm.nativeimage.c.function.CEntryPoint
+intf java.util.function.BooleanSupplier
+meth public boolean getAsBoolean()
+supr java.lang.Object
+
 CLSS public final static !enum org.graalvm.nativeimage.c.function.CEntryPoint$Builtin
  outer org.graalvm.nativeimage.c.function.CEntryPoint
 fld public final static org.graalvm.nativeimage.c.function.CEntryPoint$Builtin ATTACH_THREAD
@@ -493,6 +506,12 @@ CLSS public abstract interface static !annotation org.graalvm.nativeimage.c.func
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER])
 intf java.lang.annotation.Annotation
 
+CLSS public final static org.graalvm.nativeimage.c.function.CEntryPoint$NotIncludedAutomatically
+ outer org.graalvm.nativeimage.c.function.CEntryPoint
+intf java.util.function.BooleanSupplier
+meth public boolean getAsBoolean()
+supr java.lang.Object
+
 CLSS public final org.graalvm.nativeimage.c.function.CEntryPointLiteral<%0 extends org.graalvm.nativeimage.c.function.CFunctionPointer>
 meth public !varargs static <%0 extends org.graalvm.nativeimage.c.function.CFunctionPointer> org.graalvm.nativeimage.c.function.CEntryPointLiteral<{%%0}> create(java.lang.Class<?>,java.lang.String,java.lang.Class<?>[])
 meth public {org.graalvm.nativeimage.c.function.CEntryPointLiteral%0} getFunctionPointer()
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/c/function/CEntryPoint.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/c/function/CEntryPoint.java
index 89c27d7207dc..853d0a91d48b 100644
--- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/c/function/CEntryPoint.java
+++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/c/function/CEntryPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -44,6 +44,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.function.BooleanSupplier;
 
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolate;
@@ -135,6 +136,60 @@ private FatalExceptionHandler() {
      */
     Builtin builtin() default Builtin.NO_BUILTIN;
 
+    /**
+     * If the supplier returns {@code true}, this entry point is added automatically when building a
+     * shared library. This means the method is a root method for compilation, and everything
+     * reachable from it is compiled too.
+     *
+     * The provided class must have a nullary constructor, which is used to instantiate the class.
+     * Then the supplier function is called on the newly instantiated instance.
+     *
+     * @since 22.0
+     */
+    Class<? extends BooleanSupplier> include() default AlwaysIncluded.class;
+
+    /**
+     * A {@link BooleanSupplier} that always returns {@code true}.
+     *
+     * @since 22.0
+     */
+    final class AlwaysIncluded implements BooleanSupplier {
+
+        private AlwaysIncluded() {
+        }
+
+        /**
+         * Returns {@code true}.
+         *
+         * @since 22.0
+         */
+        @Override
+        public boolean getAsBoolean() {
+            return true;
+        }
+    }
+
+    /**
+     * A {@link BooleanSupplier} that always returns {@code false}.
+     *
+     * @since 22.0
+     */
+    final class NotIncludedAutomatically implements BooleanSupplier {
+
+        private NotIncludedAutomatically() {
+        }
+
+        /**
+         * Returns {@code false}.
+         *
+         * @since 22.0
+         */
+        @Override
+        public boolean getAsBoolean() {
+            return false;
+        }
+    }
+
     /**
      * The built-in methods which can be {@linkplain #builtin() aliased}.
      *
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
index 114528940cd3..d37a21b2c15c 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
@@ -82,8 +82,8 @@ public class LLVMExceptionUnwind {
      * from which it will get extracted after the landingpad instruction (see
      * NodeLLVMBuilder.emitReadExceptionObject).
      */
-    @CEntryPoint
-    @CEntryPointOptions(include = IncludeForLLVMOnly.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = IncludeForLLVMOnly.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     @SuppressWarnings("unused")
     public static int personality(int version, int action, IsolateThread thread, _Unwind_Exception unwindException, _Unwind_Context context) {
         Pointer ip = getIP(context);
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java
index 14edd6ac3147..4a407624f6c1 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSegfaultHandler.java
@@ -60,8 +60,8 @@ public void afterRegistration(AfterRegistrationAccess access) {
 }
 
 class PosixSubstrateSegfaultHandler extends SubstrateSegfaultHandler {
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate in segfault signal handler.")
     @Uninterruptible(reason = "Must be uninterruptible until it gets immune to safepoints")
     private static void dispatch(@SuppressWarnings("unused") int signalNumber, @SuppressWarnings("unused") siginfo_t sigInfo, ucontext_t uContext) {
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixJavaThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixJavaThreads.java
index c43b00e95c14..8bb596508002 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixJavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixJavaThreads.java
@@ -183,8 +183,8 @@ static void enter(ThreadStartData data) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = PthreadStartRoutinePrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = PthreadStartRoutinePrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished)
     static WordBase pthreadStartRoutine(ThreadStartData data) {
         ObjectHandle threadHandle = data.getThreadHandle();
         UnmanagedMemory.free(data);
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaThreads.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaThreads.java
index 3f548cd0e44a..6ccec99fb0da 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaThreads.java
@@ -127,8 +127,8 @@ static void enter(WindowsThreadStartData data) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = OSThreadStartRoutinePrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = OSThreadStartRoutinePrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished)
     static WordBase osThreadStartRoutine(WindowsThreadStartData data) {
         ObjectHandle threadHandle = data.getThreadHandle();
         WinBase.HANDLE osThreadHandle = data.getOSThreadHandle();
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java
index 1d9788b83e81..52c1c497b65c 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSubstrateSegfaultHandler.java
@@ -44,7 +44,6 @@
 import com.oracle.svm.core.c.function.CEntryPointOptions;
 import com.oracle.svm.core.c.function.CEntryPointOptions.NoEpilogue;
 import com.oracle.svm.core.c.function.CEntryPointOptions.NoPrologue;
-import com.oracle.svm.core.c.function.CEntryPointOptions.NotIncludedAutomatically;
 import com.oracle.svm.core.c.function.CEntryPointOptions.Publish;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.util.VMError;
@@ -89,8 +88,8 @@ protected void installInternal() {
     private static final CEntryPointLiteral<CFunctionPointer> HANDLER_LITERAL = CEntryPointLiteral.create(WindowsSubstrateSegfaultHandler.class,
                     "handler", ErrHandlingAPI.EXCEPTION_POINTERS.class);
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly, include = NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly)
     @Uninterruptible(reason = "Must be uninterruptible until we get immune to safepoints.")
     @RestrictHeapAccess(access = NO_HEAP_ACCESS, reason = "We have yet to enter the isolate.")
     private static int handler(ErrHandlingAPI.EXCEPTION_POINTERS exceptionInfo) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
index 8a10aa7acef5..21bb27cc087e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
@@ -176,8 +176,8 @@ public static int runCore() {
         return exitCode;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterCreateIsolateWithCArgumentsPrologue.class, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterCreateIsolateWithCArgumentsPrologue.class)
     @SuppressWarnings("unused")
     public static int run(int argc, CCharPointerPointer argv) {
         return runCore();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java
index 61eaef0a2e63..aebf9b37560b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -74,10 +74,18 @@ public String apply(String name) {
      *
      * The provided class must have a nullary constructor, which is used to instantiate the class.
      * Then the supplier function is called on the newly instantiated instance.
+     *
+     * @deprecated Use {@link CEntryPoint#include()}.
      */
+    @Deprecated
     Class<? extends BooleanSupplier> include() default CEntryPointOptions.AlwaysIncluded.class;
 
-    /** A {@link BooleanSupplier} that always returns {@code true}. */
+    /**
+     * A {@link BooleanSupplier} that always returns {@code true}.
+     *
+     * @deprecated Use {@link org.graalvm.nativeimage.c.function.CEntryPoint.AlwaysIncluded}.
+     */
+    @Deprecated
     class AlwaysIncluded implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {
@@ -85,7 +93,13 @@ public boolean getAsBoolean() {
         }
     }
 
-    /** A {@link BooleanSupplier} that always returns {@code false}. */
+    /**
+     * A {@link BooleanSupplier} that always returns {@code false}.
+     *
+     * @deprecated Use
+     *             {@link org.graalvm.nativeimage.c.function.CEntryPoint.NotIncludedAutomatically}.
+     */
+    @Deprecated
     class NotIncludedAutomatically implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
index d84475bac3cb..549fafd4f2c7 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
@@ -60,7 +60,6 @@
 
 import com.oracle.svm.core.c.CGlobalData;
 import com.oracle.svm.core.c.CGlobalDataFactory;
-import com.oracle.svm.core.c.function.CEntryPointOptions;
 
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
@@ -202,8 +201,7 @@ public static long getIsolateId(PointerBase jniEnv,
      * @return a handle to a {@link InstalledCode} in HotSpot's heap or 0 if compilation failed
      */
     @SuppressWarnings({"unused", "try"})
-    @CEntryPoint(name = "Java_org_graalvm_compiler_hotspot_test_CompileTheWorld_compileMethodInLibgraal")
-    @CEntryPointOptions(include = LibGraalFeature.IsEnabled.class)
+    @CEntryPoint(name = "Java_org_graalvm_compiler_hotspot_test_CompileTheWorld_compileMethodInLibgraal", include = LibGraalFeature.IsEnabled.class)
     private static long compileMethod(PointerBase jniEnv,
                     PointerBase jclass,
                     @CEntryPoint.IsolateThreadContext long isolateThread,
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
index 3b2ab8058d84..f928c83d731a 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
@@ -85,8 +85,8 @@ private static JavaConstant read(JavaKind kind, Constant base, long displacement
             return ConstantDataConverter.toCompiler(resultData);
         }
 
-        @CEntryPoint
-        @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+        @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
         private static void read0(@SuppressWarnings("unused") ClientIsolateThread client, char kindChar, ConstantData baseData, long displacement,
                         int primitiveBits, long compressBase, int compressShift, ConstantData resultData) {
             JavaConstant base = ConstantDataConverter.toClient(baseData);
@@ -131,8 +131,8 @@ public Integer readArrayLength(JavaConstant array) {
         return Array.getLength(arrayObj);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int readArrayLength0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> arrayHandle) {
         Object array = IsolatedCompileClient.get().unhand(arrayHandle);
         if (!array.getClass().isArray()) {
@@ -156,8 +156,8 @@ public JavaConstant readArrayElement(JavaConstant array, int index) {
         return ConstantDataConverter.toCompiler(resultData);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void readArrayElement0(@SuppressWarnings("unused") ClientIsolateThread client, ConstantData arrayData, int index, ConstantData resultData) {
         JavaConstant array = ConstantDataConverter.toClient(arrayData);
         Object a = SubstrateObjectConstant.asObject(array);
@@ -185,8 +185,8 @@ public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receive
         return ConstantDataConverter.toCompiler(resultData);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void readFieldValue0(@SuppressWarnings("unused") ClientIsolateThread client, ImageHeapRef<SubstrateField> fieldRef, ConstantData receiverData, ConstantData resultData) {
         JavaConstant receiver = ConstantDataConverter.toClient(receiverData);
         Constant result = readFieldValue(ImageHeapObjects.deref(fieldRef), receiver);
@@ -208,8 +208,8 @@ public JavaConstant boxPrimitive(JavaConstant primitive) {
         return ConstantDataConverter.toCompiler(resultData);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void boxPrimitive0(@SuppressWarnings("unused") ClientIsolateThread client, ConstantData primitiveData, ConstantData resultData) {
         JavaConstant primitive = ConstantDataConverter.toClient(primitiveData);
         Constant result = SubstrateObjectConstant.forObject(primitive.asBoxedPrimitive());
@@ -229,8 +229,8 @@ public JavaConstant unboxPrimitive(JavaConstant boxed) {
         return super.unboxPrimitive(boxed);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void unboxPrimitive0(@SuppressWarnings("unused") ClientIsolateThread client, ConstantData boxedData, ConstantData resultData) {
         Constant boxed = ConstantDataConverter.toClient(boxedData);
         Constant result = JavaConstant.forBoxedPrimitive(SubstrateObjectConstant.asObject(boxed));
@@ -254,8 +254,8 @@ public ResolvedJavaType asJavaType(Constant hub) {
         return super.asJavaType(resolved);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ImageHeapRef<DynamicHub> getHubConstantAsImageHeapRef(@SuppressWarnings("unused") ClientIsolateThread client, ConstantData hubData) {
         JavaConstant hub = ConstantDataConverter.toClient(hubData);
         Object target = SubstrateObjectConstant.asObject(hub);
@@ -283,8 +283,8 @@ public int getImageHeapOffset(JavaConstant constant) {
         return super.getImageHeapOffset(constant);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getImageHeapOffset0(@SuppressWarnings("unused") ClientIsolateThread client, ConstantData constantData) {
         Constant constant = ConstantDataConverter.toClient(constantData);
         return getImageHeapOffsetInternal((SubstrateObjectConstant) constant);
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareObjectConstantEqualityFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareObjectConstantEqualityFeature.java
index 32176312fc61..bd73afd2c54e 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareObjectConstantEqualityFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareObjectConstantEqualityFeature.java
@@ -65,14 +65,14 @@ private static boolean compareIsolatedConstant(IsolatedObjectConstant a, Constan
         throw VMError.shouldNotReachHere("Unknown object constant: " + b);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     static boolean isolatedConstantHandleTargetsEqual(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> x, ClientHandle<?> y) {
         return IsolatedCompileClient.get().unhand(x) == IsolatedCompileClient.get().unhand(y);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isolatedHandleTargetEqualImageObject(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> x, ImageHeapRef<?> y) {
         return IsolatedCompileClient.get().unhand(x) == ImageHeapObjects.deref(y);
     }
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
index 20ffe9e193cb..b8f31b310517 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
@@ -87,8 +87,8 @@ public CompilerHandle<String> createStringInCompiler(String s) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> createStringInCompiler0(@SuppressWarnings("unused") CompilerIsolateThread compiler, CCharPointer cstr) {
         return IsolatedCompileContext.get().hand(CTypeConversion.toJavaString(cstr));
     }
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
index d286403f4e25..f7b28a3dae60 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
@@ -88,14 +88,14 @@ public ClientHandle<String[]> createStringArrayInClient(String[] array) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String> createStringInClient0(@SuppressWarnings("unused") ClientIsolateThread client, CCharPointer cstr) {
         return IsolatedCompileClient.get().hand(CTypeConversion.toJavaString(cstr));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String[]> createStringArrayInClient0(@SuppressWarnings("unused") ClientIsolateThread client, int length, CCharPointerPointer ptrs) {
         String[] array = new String[length];
         for (int i = 0; i < length; i++) {
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
index b15a60762744..04cd8adca1ca 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
@@ -78,8 +78,8 @@ public static InstalledCode compileInNewIsolateAndInstall(SubstrateMethod method
         return installedCode;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SubstrateInstalledCode> compileInNewIsolateAndInstall0(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext CompilerIsolateThread isolate,
                     ClientIsolateThread clientIsolate, ImageHeapRef<SubstrateMethod> methodRef, ClientHandle<byte[]> encodedOptions, int encodedOptionsLength) {
 
@@ -115,8 +115,8 @@ public static void compileInNewIsolate(SubstrateMethod method) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void compileInNewIsolate0(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext CompilerIsolateThread isolate, ClientIsolateThread clientIsolate,
                     ImageHeapRef<SubstrateMethod> methodRef, ClientHandle<byte[]> encodedOptions, int encodedOptionsLength) {
 
@@ -158,8 +158,8 @@ public static void applyClientRuntimeOptionValues(ClientHandle<byte[]> encodedOp
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void copyOptions(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext ClientIsolateThread isolate, ClientHandle<byte[]> encodedOptionsHandle, PointerBase buffer) {
         byte[] encodedOptions = IsolatedCompileClient.get().unhand(encodedOptionsHandle);
         CTypeConversion.asByteBuffer(buffer, encodedOptions.length).put(encodedOptions);
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java
index 3ed71f59624c..7e4190067799 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectConstant.java
@@ -63,8 +63,8 @@ private Class<?> getObjectClass() {
         return cachedClass;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ImageHeapRef<Class<?>> getObjectClass0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> h) {
         Object target = IsolatedCompileClient.get().unhand(h);
         return ImageHeapObjects.ref(target.getClass());
@@ -98,8 +98,8 @@ public int getIdentityHashCode() {
         return h;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getIdentityHashCode0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> h) {
         Object target = IsolatedCompileClient.get().unhand(h);
         return computeIdentityHashCode(target);
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectProxy.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectProxy.java
index 915d4fe9d009..ca8d5a8dfcbc 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectProxy.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedObjectProxy.java
@@ -81,14 +81,14 @@ public String toString() {
         return s;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int hashCode0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> handle) {
         return IsolatedCompileClient.get().unhand(handle).hashCode();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> toString0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<?> handle) {
         Object obj = IsolatedCompileClient.get().unhand(handle);
         String s = "Isolated: " + obj;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
index 5326f0b09add..7a7a1a284fe8 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
@@ -60,8 +60,8 @@ public static ClientHandle<SubstrateInstalledCode> installInClientIsolate(ImageH
         return installInClientIsolate0(clientIsolate, methodRef, installInfo, installedCodeFactoryHandle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SubstrateInstalledCode> installInClientIsolate0(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext ClientIsolateThread isolate,
                     ImageHeapRef<SubstrateMethod> methodRef, CodeInstallInfo installInfo, ClientHandle<? extends SubstrateInstalledCode.Factory> installedCodeFactoryHandle) {
 
@@ -92,8 +92,8 @@ public static ClientHandle<SubstrateInstalledCode> installInClientIsolate(Shared
         return installInClientIsolate1(clientIsolate, clientMethodHandle, installInfo, installedCodeFactoryHandle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SubstrateInstalledCode> installInClientIsolate1(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext ClientIsolateThread isolate,
                     ClientHandle<? extends SharedRuntimeMethod> methodHandle, CodeInstallInfo installInfo, ClientHandle<? extends SubstrateInstalledCode.Factory> installedCodeFactoryHandle) {
 
@@ -154,8 +154,8 @@ protected Pointer allocateCodeMemory(long size) {
         return (Pointer) memory;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CodePointer allocateCodeMemory0(@SuppressWarnings("unused") IsolateThread targetIsolate, UnsignedWord size) {
         return RuntimeCodeInfoAccess.allocateCodeMemory(size);
     }
@@ -165,8 +165,8 @@ protected void makeCodeMemoryReadOnly(Pointer start, long size) {
         makeCodeMemoryReadOnly0(targetIsolate, start, size);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void makeCodeMemoryReadOnly0(@SuppressWarnings("unused") IsolateThread targetIsolate, Pointer start, long size) {
         RuntimeCodeInfoAccess.makeCodeMemoryExecutableReadOnly((CodePointer) start, WordFactory.unsigned(size));
     }
@@ -176,8 +176,8 @@ protected void makeCodeMemoryWriteableNonExecutable(Pointer start, long size) {
         makeCodeMemoryWriteableNonExecutable0(targetIsolate, start, size);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void makeCodeMemoryWriteableNonExecutable0(@SuppressWarnings("unused") IsolateThread targetIsolate, Pointer start, long size) {
         RuntimeCodeInfoAccess.makeCodeMemoryWriteableNonExecutable((CodePointer) start, WordFactory.unsigned(size));
     }
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
index 7dde34be0877..058f5058b007 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
@@ -159,20 +159,20 @@ public Speculation lookupSpeculation(JavaConstant constant) {
         throw VMError.shouldNotReachHere("not required");
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void collectFailedSpeculations0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SpeculationLog> logHandle) {
         IsolatedCompileClient.get().unhand(logHandle).collectFailedSpeculations();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean hasSpeculations0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SpeculationLog> logHandle) {
         return IsolatedCompileClient.get().unhand(logHandle).hasSpeculations();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean maySpeculate0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SpeculationLog> logHandle, PointerBase arrayData, int length) {
         byte[] bytes = new byte[length];
         ByteBuffer.wrap(bytes).put(CTypeConversion.asByteBuffer(arrayData, length));
@@ -180,8 +180,8 @@ private static boolean maySpeculate0(@SuppressWarnings("unused") ClientIsolateTh
         return log.maySpeculate(new EncodedSpeculationReason(bytes));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SpeculationReason> speculate0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SpeculationLog> logHandle, PointerBase arrayData, int length) {
         byte[] bytes = new byte[length];
         ByteBuffer.wrap(bytes).put(CTypeConversion.asByteBuffer(arrayData, length));
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 5773e53793b5..ff3fea8a9152 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -55,6 +55,7 @@
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -1059,16 +1060,26 @@ private NativeLibraries setupNativeLibraries(String imageName, ConstantReflectio
         }
     }
 
+    @SuppressWarnings("deprecation")
     private void registerEntryPoints(Map<Method, CEntryPointData> entryPoints) {
         for (Method m : loader.findAnnotatedMethods(CEntryPoint.class)) {
             if (!Modifier.isStatic(m.getModifiers())) {
                 throw UserError.abort("Entry point method %s.%s is not static. Add a static modifier to the method.", m.getDeclaringClass().getName(), m.getName());
             }
 
-            boolean include = true;
+            Class<? extends BooleanSupplier> cEntryPointIncludeClass = m.getAnnotation(CEntryPoint.class).include();
+            boolean include = ReflectionUtil.newInstance(cEntryPointIncludeClass).getAsBoolean();
             CEntryPointOptions options = m.getAnnotation(CEntryPointOptions.class);
             if (options != null) {
-                include = ReflectionUtil.newInstance(options.include()).getAsBoolean();
+                Class<? extends BooleanSupplier> cEntryPointOptionsIncludeClass = options.include();
+                if (cEntryPointOptionsIncludeClass != CEntryPointOptions.AlwaysIncluded.class) {
+                    if (cEntryPointIncludeClass != CEntryPoint.AlwaysIncluded.class) {
+                        throw UserError.abort(
+                                        "The 'include' attribute for entry point method %s.%s is specified both in 'CEntryPoint' and 'CEntryPointOptions' annotations. Remove the deprecated 'CEntryPointOptions#include' attribute.",
+                                        m.getDeclaringClass().getName(), m.getName());
+                    }
+                    include = ReflectionUtil.newInstance(cEntryPointOptionsIncludeClass).getAsBoolean();
+                }
             }
             if (include) {
                 entryPoints.put(m, CEntryPointData.create(m));
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
index ac3e41004243..32815f040dcd 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
@@ -146,8 +146,8 @@ public final class JNIFunctions {
 
     private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = CEntryPointOptions.NoPrologue.class, epilogue = CEntryPointOptions.NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = CEntryPointOptions.NoPrologue.class, epilogue = CEntryPointOptions.NoEpilogue.class, publishAs = Publish.NotPublished)
     @Uninterruptible(reason = "No need to enter the isolate and also no way to report errors if unable to.")
     static int GetVersion(JNIEnvironment env) {
         return JNIVersion.JNI_VERSION_1_8();
@@ -157,8 +157,8 @@ static int GetVersion(JNIEnvironment env) {
      * jobject NewLocalRef(JNIEnv *env, jobject ref);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewLocalRef(JNIEnvironment env, JNIObjectHandle ref) {
         return JNIObjectHandles.newLocalRef(ref);
     }
@@ -167,8 +167,8 @@ static JNIObjectHandle NewLocalRef(JNIEnvironment env, JNIObjectHandle ref) {
      * void DeleteLocalRef(JNIEnv *env, jobject localRef);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void DeleteLocalRef(JNIEnvironment env, JNIObjectHandle localRef) {
         JNIObjectHandles.deleteLocalRef(localRef);
     }
@@ -177,8 +177,8 @@ static void DeleteLocalRef(JNIEnvironment env, JNIObjectHandle localRef) {
      * jint EnsureLocalCapacity(JNIEnv *env, jint capacity);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int EnsureLocalCapacity(JNIEnvironment env, int capacity) {
         if (capacity < 0) {
             return JNIErrors.JNI_ERR();
@@ -191,8 +191,8 @@ static int EnsureLocalCapacity(JNIEnvironment env, int capacity) {
      * jint PushLocalFrame(JNIEnv *env, jint capacity);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int PushLocalFrame(JNIEnvironment env, int capacity) {
         if (capacity < 0) {
             return JNIErrors.JNI_ERR();
@@ -205,8 +205,8 @@ static int PushLocalFrame(JNIEnvironment env, int capacity) {
      * jobject PopLocalFrame(JNIEnv *env, jobject result);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle PopLocalFrame(JNIEnvironment env, JNIObjectHandle handle) {
         Object obj = JNIObjectHandles.getObject(handle);
         JNIObjectHandles.popLocalFrame();
@@ -217,8 +217,8 @@ static JNIObjectHandle PopLocalFrame(JNIEnvironment env, JNIObjectHandle handle)
      * jboolean IsSameObject(JNIEnv *env, jobject ref1, jobject ref2);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static boolean IsSameObject(JNIEnvironment env, JNIObjectHandle ref1, JNIObjectHandle ref2) {
         Object obj1 = JNIObjectHandles.getObject(ref1);
         Object obj2 = JNIObjectHandles.getObject(ref2);
@@ -229,8 +229,8 @@ static boolean IsSameObject(JNIEnvironment env, JNIObjectHandle ref1, JNIObjectH
      * jboolean IsInstanceOf(JNIEnv *env, jobject obj, jclass clazz);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static boolean IsInstanceOf(JNIEnvironment env, JNIObjectHandle obj, JNIObjectHandle clazz) {
         Object o = JNIObjectHandles.getObject(obj);
         if (o == null) {
@@ -245,8 +245,8 @@ static boolean IsInstanceOf(JNIEnvironment env, JNIObjectHandle obj, JNIObjectHa
      * jclass GetObjectClass(JNIEnv *env, jobject obj);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle GetObjectClass(JNIEnvironment env, JNIObjectHandle handle) {
         Object obj = JNIObjectHandles.getObject(handle);
         Class<?> clazz = obj.getClass();
@@ -257,8 +257,8 @@ static JNIObjectHandle GetObjectClass(JNIEnvironment env, JNIObjectHandle handle
      * jclass GetSuperclass(JNIEnv *env, jclass clazz);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle GetSuperclass(JNIEnvironment env, JNIObjectHandle handle) {
         Class<?> clazz = JNIObjectHandles.getObject(handle);
         return JNIObjectHandles.createLocal(clazz.getSuperclass());
@@ -268,8 +268,8 @@ static JNIObjectHandle GetSuperclass(JNIEnvironment env, JNIObjectHandle handle)
      * jboolean IsAssignableFrom(JNIEnv *env, jclass clazz1, jclass clazz2);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnFalse.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static boolean IsAssignableFrom(JNIEnvironment env, JNIObjectHandle handle1, JNIObjectHandle handle2) {
         Class<?> clazz1 = JNIObjectHandles.getObject(handle1);
         Class<?> clazz2 = JNIObjectHandles.getObject(handle2);
@@ -280,8 +280,8 @@ static boolean IsAssignableFrom(JNIEnvironment env, JNIObjectHandle handle1, JNI
      * jobject NewGlobalRef(JNIEnv *env, jobject obj);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewGlobalRef(JNIEnvironment env, JNIObjectHandle handle) {
         return JNIObjectHandles.newGlobalRef(handle);
     }
@@ -290,8 +290,8 @@ static JNIObjectHandle NewGlobalRef(JNIEnvironment env, JNIObjectHandle handle)
      * void DeleteGlobalRef(JNIEnv *env, jobject globalRef);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void DeleteGlobalRef(JNIEnvironment env, JNIObjectHandle globalRef) {
         JNIObjectHandles.deleteGlobalRef(globalRef);
     }
@@ -300,8 +300,8 @@ static void DeleteGlobalRef(JNIEnvironment env, JNIObjectHandle globalRef) {
      * jweak NewWeakGlobalRef(JNIEnv *env, jobject obj);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewWeakGlobalRef(JNIEnvironment env, JNIObjectHandle handle) {
         return JNIObjectHandles.newWeakGlobalRef(handle);
     }
@@ -310,8 +310,8 @@ static JNIObjectHandle NewWeakGlobalRef(JNIEnvironment env, JNIObjectHandle hand
      * void DeleteWeakGlobalRef(JNIEnv *env, jweak obj);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void DeleteWeakGlobalRef(JNIEnvironment env, JNIObjectHandle weak) {
         JNIObjectHandles.deleteWeakGlobalRef(weak);
     }
@@ -320,8 +320,8 @@ static void DeleteWeakGlobalRef(JNIEnvironment env, JNIObjectHandle weak) {
      * jobjectRefType GetObjectRefType(JNIEnv* env, jobject obj);
      */
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectRefType GetObjectRefType(JNIEnvironment env, JNIObjectHandle handle) {
         try {
             return JNIObjectHandles.getHandleType(handle);
@@ -334,8 +334,8 @@ static JNIObjectRefType GetObjectRefType(JNIEnvironment env, JNIObjectHandle han
      * jclass FindClass(JNIEnv *env, const char *name);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle FindClass(JNIEnvironment env, CCharPointer cname) {
         String name = Utf8.utf8ToString(cname);
         if (!name.startsWith("[")) {
@@ -355,8 +355,8 @@ static JNIObjectHandle FindClass(JNIEnvironment env, CCharPointer cname) {
      * nMethods);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int RegisterNatives(JNIEnvironment env, JNIObjectHandle hclazz, JNINativeMethod methods, int nmethods) {
         Class<?> clazz = JNIObjectHandles.getObject(hclazz);
         Pointer p = (Pointer) methods;
@@ -389,8 +389,8 @@ static int RegisterNatives(JNIEnvironment env, JNIObjectHandle hclazz, JNINative
      * jint UnregisterNatives(JNIEnv *env, jclass clazz);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int UnregisterNatives(JNIEnvironment env, JNIObjectHandle hclazz) {
         Class<?> clazz = JNIObjectHandles.getObject(hclazz);
         String internalName = MetaUtil.toInternalName(clazz.getName());
@@ -404,14 +404,14 @@ static int UnregisterNatives(JNIEnvironment env, JNIObjectHandle hclazz) {
      * jmethodID GetStaticMethodID(JNIEnv *env, jclass clazz, const char *name, const char *sig);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIMethodId GetMethodID(JNIEnvironment env, JNIObjectHandle hclazz, CCharPointer cname, CCharPointer csig) {
         return Support.getMethodID(hclazz, cname, csig, false);
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIMethodId GetStaticMethodID(JNIEnvironment env, JNIObjectHandle hclazz, CCharPointer cname, CCharPointer csig) {
         return Support.getMethodID(hclazz, cname, csig, true);
     }
@@ -422,14 +422,14 @@ static JNIMethodId GetStaticMethodID(JNIEnvironment env, JNIObjectHandle hclazz,
      * jfieldID GetStaticFieldID(JNIEnv *env, jclass clazz, const char *name, const char *sig);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIFieldId GetFieldID(JNIEnvironment env, JNIObjectHandle hclazz, CCharPointer cname, CCharPointer csig) {
         return Support.getFieldID(hclazz, cname, csig, false);
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIFieldId GetStaticFieldID(JNIEnvironment env, JNIObjectHandle hclazz, CCharPointer cname, CCharPointer csig) {
         return Support.getFieldID(hclazz, cname, csig, true);
     }
@@ -438,8 +438,8 @@ static JNIFieldId GetStaticFieldID(JNIEnvironment env, JNIObjectHandle hclazz, C
      * jobject AllocObject(JNIEnv *env, jclass clazz);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle AllocObject(JNIEnvironment env, JNIObjectHandle classHandle) {
         Class<?> clazz = JNIObjectHandles.getObject(classHandle);
         Object instance;
@@ -455,8 +455,8 @@ static JNIObjectHandle AllocObject(JNIEnvironment env, JNIObjectHandle classHand
      * jstring NewString(JNIEnv *env, const jchar *unicodeChars, jsize len);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewString(JNIEnvironment env, CShortPointer unicode, int len) {
         String str;
         char[] chars = new char[len];
@@ -472,8 +472,8 @@ static JNIObjectHandle NewString(JNIEnvironment env, CShortPointer unicode, int
      * jstring NewStringUTF(JNIEnv *env, const char *bytes);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewStringUTF(JNIEnvironment env, CCharPointer bytes) {
         return JNIObjectHandles.createLocal(Utf8.utf8ToString(bytes));
     }
@@ -482,8 +482,8 @@ static JNIObjectHandle NewStringUTF(JNIEnvironment env, CCharPointer bytes) {
      * jsize GetStringLength(JNIEnv *env, jstring string);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int GetStringLength(JNIEnvironment env, JNIObjectHandle hstr) {
         String str = JNIObjectHandles.getObject(hstr);
         return (str != null) ? str.length() : 0;
@@ -493,8 +493,8 @@ static int GetStringLength(JNIEnvironment env, JNIObjectHandle hstr) {
      * jsize GetStringUTFLength(JNIEnv *env, jstring string);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int GetStringUTFLength(JNIEnvironment env, JNIObjectHandle hstr) {
         String str = JNIObjectHandles.getObject(hstr);
         return Utf8.utf8Length(str);
@@ -506,14 +506,14 @@ static int GetStringUTFLength(JNIEnvironment env, JNIObjectHandle hstr) {
      * void ReleaseStringChars(JNIEnv *env, jstring string, const jchar *chars);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static CShortPointer GetStringChars(JNIEnvironment env, JNIObjectHandle hstr, CCharPointer isCopy) {
         return Support.getNulTerminatedStringCharsAndPin(hstr, isCopy);
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ReleaseStringChars(JNIEnvironment env, JNIObjectHandle hstr, CShortPointer chars) {
         Support.unpinString(chars);
     }
@@ -524,8 +524,8 @@ static void ReleaseStringChars(JNIEnvironment env, JNIObjectHandle hstr, CShortP
      * void ReleaseStringUTFChars(JNIEnv *env, jstring string, const char *utf);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static CCharPointer GetStringUTFChars(JNIEnvironment env, JNIObjectHandle hstr, CCharPointer isCopy) {
         String str = JNIObjectHandles.getObject(hstr);
         if (str == null) {
@@ -538,8 +538,8 @@ static CCharPointer GetStringUTFChars(JNIEnvironment env, JNIObjectHandle hstr,
         return JNIThreadLocalPinnedObjects.pinArrayAndGetAddress(utf);
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ReleaseStringUTFChars(JNIEnvironment env, JNIObjectHandle hstr, CCharPointer chars) {
         JNIThreadLocalPinnedObjects.unpinArrayByAddress(chars);
     }
@@ -550,14 +550,14 @@ static void ReleaseStringUTFChars(JNIEnvironment env, JNIObjectHandle hstr, CCha
      * void ReleaseStringCritical(JNIEnv *env, jstring string, const jchar *carray);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static CShortPointer GetStringCritical(JNIEnvironment env, JNIObjectHandle hstr, CCharPointer isCopy) {
         return Support.getNulTerminatedStringCharsAndPin(hstr, isCopy);
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ReleaseStringCritical(JNIEnvironment env, JNIObjectHandle hstr, CShortPointer carray) {
         Support.unpinString(carray);
     }
@@ -566,8 +566,8 @@ static void ReleaseStringCritical(JNIEnvironment env, JNIObjectHandle hstr, CSho
      * void GetStringRegion(JNIEnv *env, jstring str, jsize start, jsize len, jchar *buf);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void GetStringRegion(JNIEnvironment env, JNIObjectHandle hstr, int start, int len, CShortPointer buf) {
         String str = JNIObjectHandles.getObject(hstr);
         if (start < 0) {
@@ -589,8 +589,8 @@ static void GetStringRegion(JNIEnvironment env, JNIObjectHandle hstr, int start,
      * void GetStringUTFRegion(JNIEnv *env, jstring str, jsize start, jsize len, char *buf);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void GetStringUTFRegion(JNIEnvironment env, JNIObjectHandle hstr, int start, int len, CCharPointer buf) {
         String str = JNIObjectHandles.getObject(hstr);
         if (start < 0) {
@@ -612,8 +612,8 @@ static void GetStringUTFRegion(JNIEnvironment env, JNIObjectHandle hstr, int sta
      * jobject NewDirectByteBuffer(JNIEnv* env, void* address, jlong capacity);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewDirectByteBuffer(JNIEnvironment env, WordPointer address, long capacity) {
         Target_java_nio_DirectByteBuffer bb = new Target_java_nio_DirectByteBuffer(address.rawValue(), (int) capacity);
         return JNIObjectHandles.createLocal(bb);
@@ -628,8 +628,8 @@ static final class Target_java_nio_Buffer {
         @Alias long address;
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static WordPointer GetDirectBufferAddress(JNIEnvironment env, JNIObjectHandle handle) {
         WordPointer address = WordFactory.nullPointer();
         Object obj = JNIObjectHandles.getObject(handle);
@@ -644,8 +644,8 @@ static WordPointer GetDirectBufferAddress(JNIEnvironment env, JNIObjectHandle ha
      * jlong GetDirectBufferCapacity(JNIEnv* env, jobject buf);
      */
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static long GetDirectBufferCapacity(JNIEnvironment env, JNIObjectHandle hbuf) {
         Buffer buffer = JNIObjectHandles.getObject(hbuf);
         return buffer.capacity();
@@ -655,8 +655,8 @@ static long GetDirectBufferCapacity(JNIEnvironment env, JNIObjectHandle hbuf) {
      * jobjectArray NewObjectArray(JNIEnv *env, jsize length, jclass elementClass, jobject
      * initialElement);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle NewObjectArray(JNIEnvironment env, int length, JNIObjectHandle hElementClass, JNIObjectHandle hInitialElement) {
         if (length < 0) {
             return JNIObjectHandles.nullHandle();
@@ -674,8 +674,8 @@ static JNIObjectHandle NewObjectArray(JNIEnvironment env, int length, JNIObjectH
     /*
      * jobject GetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize index);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle GetObjectArrayElement(JNIEnvironment env, JNIObjectHandle harray, int index) {
         Object[] array = JNIObjectHandles.getObject(harray);
         Object value = array[index];
@@ -685,8 +685,8 @@ static JNIObjectHandle GetObjectArrayElement(JNIEnvironment env, JNIObjectHandle
     /*
      * void SetObjectArrayElement(JNIEnv *env, jobjectArray array, jsize index, jobject value);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void SetObjectArrayElement(JNIEnvironment env, JNIObjectHandle harray, int index, JNIObjectHandle hvalue) {
         Object[] array = JNIObjectHandles.getObject(harray);
         Object value = JNIObjectHandles.getObject(hvalue);
@@ -696,8 +696,8 @@ static void SetObjectArrayElement(JNIEnvironment env, JNIObjectHandle harray, in
     /*
      * jvoid * GetPrimitiveArrayCritical(JNIEnv *env, jarray array, jboolean *isCopy);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static WordPointer GetPrimitiveArrayCritical(JNIEnvironment env, JNIObjectHandle harray, CCharPointer isCopy) {
         Object array = JNIObjectHandles.getObject(harray);
         if (array == null) {
@@ -712,8 +712,8 @@ static WordPointer GetPrimitiveArrayCritical(JNIEnvironment env, JNIObjectHandle
     /*
      * void ReleasePrimitiveArrayCritical(JNIEnv *env, jarray array, void *carray, jint mode);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ReleasePrimitiveArrayCritical(JNIEnvironment env, JNIObjectHandle harray, WordPointer carray, int mode) {
         JNIThreadLocalPinnedObjects.unpinArrayByAddress(carray);
     }
@@ -721,8 +721,8 @@ static void ReleasePrimitiveArrayCritical(JNIEnvironment env, JNIObjectHandle ha
     /*
      * jsize GetArrayLength(JNIEnv *env, jarray array);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnMinusOne.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnMinusOneOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int GetArrayLength(JNIEnvironment env, JNIObjectHandle harray) {
         /*
          * JNI does not specify the behavior for illegal arguments (e.g. null or non-array objects);
@@ -739,14 +739,14 @@ static int GetArrayLength(JNIEnvironment env, JNIObjectHandle harray) {
      * jthrowable ExceptionOccurred(JNIEnv *env);
      */
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static boolean ExceptionCheck(JNIEnvironment env) {
         return JNIThreadLocalPendingException.get() != null;
     }
 
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle ExceptionOccurred(JNIEnvironment env) {
         return JNIObjectHandles.createLocal(JNIThreadLocalPendingException.get());
     }
@@ -754,8 +754,8 @@ static JNIObjectHandle ExceptionOccurred(JNIEnvironment env) {
     /*
      * void ExceptionClear(JNIEnv *env);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ExceptionClear(JNIEnvironment env) {
         JNIThreadLocalPendingException.clear();
     }
@@ -763,8 +763,8 @@ static void ExceptionClear(JNIEnvironment env) {
     /*
      * void ExceptionDescribe(JNIEnv *env);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static void ExceptionDescribe(JNIEnvironment env) {
         Throwable t = JNIThreadLocalPendingException.get();
         JNIThreadLocalPendingException.clear();
@@ -786,8 +786,8 @@ static void ExceptionDescribe(JNIEnvironment env) {
     /*
      * jint Throw(JNIEnv *env, jthrowable obj);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnZero.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnZero.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int Throw(JNIEnvironment env, JNIObjectHandle handle) throws Throwable {
         throw (Throwable) JNIObjectHandles.getObject(handle);
     }
@@ -800,8 +800,8 @@ interface NewObjectWithObjectArrayArgFunctionPointer extends CFunctionPointer {
     /*
      * jint ThrowNew(JNIEnv *env, jclass clazz, const char *message);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnZero.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnZero.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int ThrowNew(JNIEnvironment env, JNIObjectHandle clazzHandle, CCharPointer message) throws Throwable {
         Class<?> clazz = JNIObjectHandles.getObject(clazzHandle);
         JNIMethodId ctor = Support.getMethodID(clazz, "<init>", "(Ljava/lang/String;)V", false);
@@ -822,8 +822,8 @@ static int ThrowNew(JNIEnvironment env, JNIObjectHandle clazzHandle, CCharPointe
     /*
      * void FatalError(JNIEnv *env, const char *msg);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     @NeverInline("Access of caller frame.")
     static void FatalError(JNIEnvironment env, CCharPointer message) {
         CodePointer callerIP = KnownIntrinsics.readReturnAddress();
@@ -846,8 +846,8 @@ static void FatalError(JNIEnvironment env, CCharPointer message) {
     /*
      * jint GetJavaVM(JNIEnv *env, JavaVM **vm);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int GetJavaVM(JNIEnvironment env, JNIJavaVMPointer vm) {
         vm.write(JNIFunctionTables.singleton().getGlobalJavaVM());
         return JNIErrors.JNI_OK();
@@ -856,8 +856,8 @@ static int GetJavaVM(JNIEnvironment env, JNIJavaVMPointer vm) {
     /*
      * jfieldID FromReflectedField(JNIEnv *env, jobject field);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIFieldId FromReflectedField(JNIEnvironment env, JNIObjectHandle fieldHandle) {
         JNIFieldId fieldId = WordFactory.zero();
         Field obj = JNIObjectHandles.getObject(fieldHandle);
@@ -871,8 +871,8 @@ static JNIFieldId FromReflectedField(JNIEnvironment env, JNIObjectHandle fieldHa
     /*
      * jobject ToReflectedField(JNIEnv *env, jclass cls, jfieldID fieldID, jboolean isStatic);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle ToReflectedField(JNIEnvironment env, JNIObjectHandle classHandle, JNIFieldId fieldId) {
         Field field = null;
         Class<?> clazz = JNIObjectHandles.getObject(classHandle);
@@ -892,8 +892,8 @@ static JNIObjectHandle ToReflectedField(JNIEnvironment env, JNIObjectHandle clas
     /*
      * jmethodID FromReflectedMethod(JNIEnv *env, jobject method);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullWord.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullWordOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIMethodId FromReflectedMethod(JNIEnvironment env, JNIObjectHandle methodHandle) {
         JNIMethodId methodId = WordFactory.nullPointer();
         Executable method = JNIObjectHandles.getObject(methodHandle);
@@ -908,8 +908,8 @@ static JNIMethodId FromReflectedMethod(JNIEnvironment env, JNIObjectHandle metho
     /*
      * jobject ToReflectedMethod(JNIEnv *env, jclass cls, jmethodID methodID, jboolean isStatic);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnNullHandle.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnNullHandleOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static JNIObjectHandle ToReflectedMethod(JNIEnvironment env, JNIObjectHandle classHandle, JNIMethodId methodId, boolean isStatic) {
         Executable result = null;
         JNIAccessibleMethod jniMethod = JNIReflectionDictionary.getMethodByID(methodId);
@@ -940,8 +940,8 @@ static JNIObjectHandle ToReflectedMethod(JNIEnvironment env, JNIObjectHandle cla
     /*
      * jint MonitorEnter(JNIEnv *env, jobject obj);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int MonitorEnter(JNIEnvironment env, JNIObjectHandle handle) {
         Object obj = JNIObjectHandles.getObject(handle);
         if (obj == null) {
@@ -956,8 +956,8 @@ static int MonitorEnter(JNIEnvironment env, JNIObjectHandle handle) {
     /*
      * jint MonitorExit(JNIEnv *env, jobject obj);
      */
-    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class)
-    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(exceptionHandler = JNIExceptionHandlerReturnJniErr.class, include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIEnvEnterReturnEDetachedOnFailurePrologue.class, publishAs = Publish.NotPublished)
     static int MonitorExit(JNIEnvironment env, JNIObjectHandle handle) {
         Object obj = JNIObjectHandles.getObject(handle);
         if (obj == null) {
@@ -1179,8 +1179,8 @@ static class UnimplementedWithJNIEnvArgument {
         /**
          * Stub for unimplemented JNI functionality with a JNIEnv argument.
          */
-        @CEntryPoint
-        @CEntryPointOptions(prologue = JNIEnvUnimplementedPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+        @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(prologue = JNIEnvUnimplementedPrologue.class, publishAs = Publish.NotPublished)
         static int unimplemented(JNIEnvironment env) {
             /*
              * We do not catch and preserve this exception like we normally would with JNI because
@@ -1206,8 +1206,8 @@ static class UnimplementedWithJavaVMArgument {
         /**
          * Stub for unimplemented JNI functionality with a JavaVM argument.
          */
-        @CEntryPoint
-        @CEntryPointOptions(prologue = JNIJavaVMUnimplementedPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+        @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(prologue = JNIJavaVMUnimplementedPrologue.class, publishAs = Publish.NotPublished)
         static int unimplemented(JNIJavaVM vm) {
             throw VMError.shouldNotReachHere("An unimplemented JNI function was called. Please refer to the stack trace.");
         }
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIInvocationInterface.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIInvocationInterface.java
index a12e7892a2f4..6b4e969b7354 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIInvocationInterface.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIInvocationInterface.java
@@ -93,8 +93,8 @@ static class Exports {
          * jint JNI_GetCreatedJavaVMs(JavaVM **vmBuf, jsize bufLen, jsize *nVMs);
          */
 
-        @CEntryPoint(name = "JNI_GetCreatedJavaVMs")
-        @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly, include = CEntryPointOptions.NotIncludedAutomatically.class)
+        @CEntryPoint(name = "JNI_GetCreatedJavaVMs", include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly)
         @Uninterruptible(reason = "No Java context.")
         static int JNI_GetCreatedJavaVMs(JNIJavaVMPointer vmBuf, int bufLen, CIntPointer nVMs) {
             JNIJavaVMList.gather(vmBuf, bufLen, nVMs);
@@ -160,8 +160,8 @@ static void enter(JNIJavaVMPointer vmBuf, JNIEnvironmentPointer penv, JNIJavaVMI
          * @see LogHandler
          * @see "https://docs.oracle.com/en/java/javase/14/docs/specs/jni/invocation.html#jni_createjavavm"
          */
-        @CEntryPoint(name = "JNI_CreateJavaVM")
-        @CEntryPointOptions(prologue = JNICreateJavaVMPrologue.class, publishAs = Publish.SymbolOnly, include = CEntryPointOptions.NotIncludedAutomatically.class)
+        @CEntryPoint(name = "JNI_CreateJavaVM", include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(prologue = JNICreateJavaVMPrologue.class, publishAs = Publish.SymbolOnly)
         static int JNI_CreateJavaVM(JNIJavaVMPointer vmBuf, JNIEnvironmentPointer penv, JNIJavaVMInitArgs vmArgs) {
             // NOTE: could check version, extra options (-verbose etc.), hooks etc.
             WordPointer javavmIdPointer = WordFactory.nullPointer();
@@ -206,8 +206,8 @@ public void run() {
         /*
          * jint JNI_GetDefaultJavaVMInitArgs(void *vm_args);
          */
-        @CEntryPoint(name = "JNI_GetDefaultJavaVMInitArgs")
-        @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly, include = CEntryPointOptions.NotIncludedAutomatically.class)
+        @CEntryPoint(name = "JNI_GetDefaultJavaVMInitArgs", include = CEntryPoint.NotIncludedAutomatically.class)
+        @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.SymbolOnly)
         @Uninterruptible(reason = "No Java context")
         static int JNI_GetDefaultJavaVMInitArgs(JNIJavaVMInitArgs vmArgs) {
             int version = vmArgs.getVersion();
@@ -224,8 +224,8 @@ static int JNI_GetDefaultJavaVMInitArgs(JNIJavaVMInitArgs vmArgs) {
     /*
      * jint AttachCurrentThread(JavaVM *vm, void **p_env, void *thr_args);
      */
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadManualJavaThreadPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadManualJavaThreadPrologue.class, publishAs = Publish.NotPublished)
     static int AttachCurrentThread(JNIJavaVM vm, JNIEnvironmentPointer penv, JNIJavaVMAttachArgs args) {
         return Support.attachCurrentThread(vm, penv, args, false);
     }
@@ -233,8 +233,8 @@ static int AttachCurrentThread(JNIJavaVM vm, JNIEnvironmentPointer penv, JNIJava
     /*
      * jint AttachCurrentThreadAsDaemon(JavaVM *vm, void **p_env, void *thr_args);
      */
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadManualJavaThreadPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadManualJavaThreadPrologue.class, publishAs = Publish.NotPublished)
     static int AttachCurrentThreadAsDaemon(JNIJavaVM vm, JNIEnvironmentPointer penv, JNIJavaVMAttachArgs args) {
         return Support.attachCurrentThread(vm, penv, args, true);
     }
@@ -242,8 +242,8 @@ static int AttachCurrentThreadAsDaemon(JNIJavaVM vm, JNIEnvironmentPointer penv,
     /*
      * jint DetachCurrentThread(JavaVM *vm);
      */
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadEnsureJavaThreadPrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadEnsureJavaThreadPrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished)
     static int DetachCurrentThread(JNIJavaVM vm) {
         int result = JNIErrors.JNI_OK();
         if (!vm.equal(JNIFunctionTables.singleton().getGlobalJavaVM())) {
@@ -257,8 +257,8 @@ static int DetachCurrentThread(JNIJavaVM vm) {
     /*
      * jint DestroyJavaVM(JavaVM *vm);
      */
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadEnsureJavaThreadPrologue.class, epilogue = LeaveTearDownIsolateEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIJavaVMEnterAttachThreadEnsureJavaThreadPrologue.class, epilogue = LeaveTearDownIsolateEpilogue.class, publishAs = Publish.NotPublished)
     @SuppressWarnings("unused")
     static int DestroyJavaVM(JNIJavaVM vm) {
         JavaThreads.singleton().joinAllNonDaemons();
@@ -268,8 +268,8 @@ static int DestroyJavaVM(JNIJavaVM vm) {
     /*
      * jint GetEnv(JavaVM *vm, void **env, jint version);
      */
-    @CEntryPoint
-    @CEntryPointOptions(prologue = JNIGetEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = JNIGetEnvPrologue.class, publishAs = Publish.NotPublished)
     @SuppressWarnings("unused")
     static int GetEnv(JNIJavaVM vm, WordPointer env, int version) {
         env.write(JNIThreadLocalEnvironment.getAddress());
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java
index e428be3604ee..9ec0934e8dde 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeAPIImpl.java
@@ -75,28 +75,28 @@ private static Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext lookup
         return support.resolveContextHandle(context.contextHandle());
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static NativeTruffleContext getTruffleContext(NativeTruffleEnv env) {
         return env.context();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static TruffleObjectHandle newObjectRef(@SuppressWarnings("unused") NativeTruffleEnv env, TruffleObjectHandle handle) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Object object = support.resolveHandle(handle);
         return support.createGlobalHandle(object);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static void releaseObjectRef(@SuppressWarnings("unused") NativeTruffleEnv env, TruffleObjectHandle handle) {
         ImageSingletons.lookup(TruffleNFISupport.class).destroyGlobalHandle(handle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static TruffleObjectHandle releaseAndReturn(@SuppressWarnings("unused") NativeTruffleEnv env, TruffleObjectHandle handle) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Object object = support.resolveHandle(handle);
@@ -104,8 +104,8 @@ static TruffleObjectHandle releaseAndReturn(@SuppressWarnings("unused") NativeTr
         return TruffleNFISupport.createLocalHandle(object);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static int isSameObject(@SuppressWarnings("unused") NativeTruffleEnv env, TruffleObjectHandle handle1, TruffleObjectHandle handle2) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Object object1 = support.resolveHandle(handle1);
@@ -113,22 +113,22 @@ static int isSameObject(@SuppressWarnings("unused") NativeTruffleEnv env, Truffl
         return object1 == object2 ? 1 : 0;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static void newClosureRef(NativeTruffleEnv env, PointerBase closure) {
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext context = lookupContext(env.context());
         context.newClosureRef(closure.rawValue());
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static void releaseClosureRef(NativeTruffleEnv env, PointerBase closure) {
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext context = lookupContext(env.context());
         context.releaseClosureRef(closure.rawValue());
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static TruffleObjectHandle getClosureObject(NativeTruffleEnv env, PointerBase closure) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext context = lookupContext(env.context());
@@ -136,8 +136,8 @@ static TruffleObjectHandle getClosureObject(NativeTruffleEnv env, PointerBase cl
         return support.createGlobalHandle(ret);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = GetTruffleEnvPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = GetTruffleEnvPrologue.class, publishAs = Publish.NotPublished)
     static NativeTruffleEnv getTruffleEnv(NativeTruffleContext context) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext ctx = support.resolveContextHandle(context.contextHandle());
@@ -152,8 +152,8 @@ static void enter(NativeTruffleContext context) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = AttachCurrentThreadPrologue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = AttachCurrentThreadPrologue.class, publishAs = Publish.NotPublished)
     static NativeTruffleEnv attachCurrentThread(NativeTruffleContext context) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext ctx = support.resolveContextHandle(context.contextHandle());
@@ -172,8 +172,8 @@ static void enter(NativeTruffleContext context) {
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = EnterNativeTruffleContextPrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = EnterNativeTruffleContextPrologue.class, epilogue = LeaveDetachThreadEpilogue.class, publishAs = Publish.NotPublished)
     static void detachCurrentThread(@SuppressWarnings("unused") NativeTruffleContext context) {
         TruffleNFISupport support = ImageSingletons.lookup(TruffleNFISupport.class);
         Target_com_oracle_truffle_nfi_backend_libffi_LibFFIContext ctx = support.resolveContextHandle(context.contextHandle());
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
index ddba7e7517f8..3b07efe23f00 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
@@ -186,8 +186,8 @@ private static PointerBase serializeStringRet(Object retValue) {
 
     static final FastThreadLocalObject<Throwable> pendingException = FastThreadLocalFactory.createObject(Throwable.class);
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
     @Uninterruptible(reason = "contains prologue and epilogue for thread state transition", calleeMustBe = false)
     static void invokeClosureBufferRet(@SuppressWarnings("unused") ffi_cif cif, Pointer ret, WordPointer args, ClosureData user) {
         /* Read the C error number before transitioning into the Java state. */
@@ -238,8 +238,8 @@ private static void doInvokeClosureBufferRet(Pointer ret, WordPointer args, Clos
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
     @Uninterruptible(reason = "contains prologue and epilogue for thread state transition", calleeMustBe = false)
     static void invokeClosureVoidRet(@SuppressWarnings("unused") ffi_cif cif, @SuppressWarnings("unused") WordPointer ret, WordPointer args, ClosureData user) {
         /* Read the C error number before transitioning into the Java state. */
@@ -271,8 +271,8 @@ private static void doInvokeClosureVoidRet(WordPointer args, ClosureData user) {
         lookup(user).call(args, null);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
     @Uninterruptible(reason = "contains prologue and epilogue for thread state transition", calleeMustBe = false)
     static void invokeClosureStringRet(@SuppressWarnings("unused") ffi_cif cif, WordPointer ret, WordPointer args, ClosureData user) {
         /* Read the C error number before transitioning into the Java state. */
@@ -305,8 +305,8 @@ private static void doInvokeClosureStringRet(WordPointer ret, WordPointer args,
         ret.write(serializeStringRet(retValue));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished, include = CEntryPointOptions.NotIncludedAutomatically.class)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
     @Uninterruptible(reason = "contains prologue and epilogue for thread state transition", calleeMustBe = false)
     static void invokeClosureObjectRet(@SuppressWarnings("unused") ffi_cif cif, WordPointer ret, WordPointer args, ClosureData user) {
         /* Read the C error number before transitioning into the Java state. */
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
index 3f6e10a56ea4..a55709a476ff 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
@@ -168,8 +168,8 @@ private void sharedIsolateShutdown() {
         Isolates.detachThread(context);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     protected static void compilerIsolateThreadShutdown(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext CompilerIsolateThread context) {
         VMRuntime.shutdown();
     }
@@ -179,8 +179,8 @@ protected void afterCompilation(CompilerIsolateThread context) {
         Isolates.detachThread(context);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String> doCompile0(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext CompilerIsolateThread context,
                     ClientIsolateThread client,
                     ImageHeapRef<SubstrateTruffleCompiler> delegateRef,
@@ -232,8 +232,8 @@ private static Map<String, Object> decodeOptions(ClientIsolateThread client, Cli
         return OptionsEncoder.decode(encodedOptions);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void copyEncodedOptions(@SuppressWarnings("unused") @CEntryPoint.IsolateThreadContext ClientIsolateThread client, ClientHandle<byte[]> encodedOptionsHandle, PointerBase buffer) {
         byte[] encodedOptions = IsolatedCompileClient.get().unhand(encodedOptionsHandle);
         CTypeConversion.asByteBuffer(buffer, encodedOptions.length).put(encodedOptions);
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
index 1e7fdbc4a6d0..0f0a8fe1abd1 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
@@ -153,16 +153,16 @@ public boolean isTrivial() {
         return isTrivial0(IsolatedCompileContext.get().getClient(), handle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SpeculationLog> getCompilationSpeculationLog0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(compilableHandle);
         SpeculationLog log = compilable.getCompilationSpeculationLog();
         return IsolatedCompileClient.get().hand(log);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onCompilationFailed0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle,
                     CompilerHandle<Supplier<String>> serializedExceptionHandle, boolean silent, boolean bailout, boolean permanentBailout, boolean graphTooBig) {
 
@@ -173,30 +173,30 @@ private static void onCompilationFailed0(@SuppressWarnings("unused") ClientIsola
         IsolatedCompileClient.get().unhand(compilableHandle).onCompilationFailed(serializedException, silent, bailout, permanentBailout, graphTooBig);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String> getReasonAndStackTrace0(@SuppressWarnings("unused") CompilerIsolateThread compiler, CompilerHandle<Supplier<String>> reasonAndStackTraceHandle) {
 
         Supplier<String> supplier = IsolatedCompileContext.get().unhand(reasonAndStackTraceHandle);
         return IsolatedCompileContext.get().createStringInClient(supplier.get());
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> getName0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         String name = IsolatedCompileClient.get().unhand(compilableHandle).getName();
         return IsolatedCompileClient.get().createStringInCompiler(name);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getNonTrivialNodeCount0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(compilableHandle);
         return compilable.getNonTrivialNodeCount();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<IsolatedTruffleCallNode[]> getCallNodes0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(compilableHandle);
         TruffleCallNode[] nodes = compilable.getCallNodes();
@@ -209,8 +209,8 @@ private static CompilerHandle<IsolatedTruffleCallNode[]> getCallNodes0(@Suppress
         }
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<IsolatedTruffleCallNode[]> getCallNodes1(@SuppressWarnings("unused") CompilerIsolateThread compiler, WordPointer nodeHandleArray, int length) {
 
         IsolatedTruffleCallNode[] nodes = new IsolatedTruffleCallNode[length];
@@ -221,15 +221,15 @@ private static CompilerHandle<IsolatedTruffleCallNode[]> getCallNodes1(@Suppress
         return IsolatedCompileContext.get().hand(nodes);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getCallCount0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(compilableHandle);
         return compilable.getCallCount();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean cancelCompilation0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle, ClientHandle<String> reasonHandle) {
         final IsolatedCompileClient isolatedCompileClient = IsolatedCompileClient.get();
         final SubstrateCompilableTruffleAST compilable = isolatedCompileClient.unhand(compilableHandle);
@@ -237,16 +237,16 @@ private static boolean cancelCompilation0(@SuppressWarnings("unused") ClientIsol
         return compilable.cancelCompilation(reason);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void dequeueInlined0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> handle) {
         final IsolatedCompileClient isolatedCompileClient = IsolatedCompileClient.get();
         final SubstrateCompilableTruffleAST compilable = isolatedCompileClient.unhand(handle);
         compilable.dequeueInlined();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isSameOrSplit0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<SubstrateCompilableTruffleAST> compilableHandle, ClientHandle<SubstrateCompilableTruffleAST> otherHandle) {
 
@@ -255,15 +255,15 @@ private static boolean isSameOrSplit0(@SuppressWarnings("unused") ClientIsolateT
         return compilable.isSameOrSplit(other);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getKnownCallSiteCount0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> compilableHandle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(compilableHandle);
         return compilable.getKnownCallSiteCount();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<Assumption> getNodeRewritingAssumption0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> handle) {
         CompilableTruffleAST ast = IsolatedCompileClient.get().unhand(handle);
         JavaConstant assumptionConstant = ast.getNodeRewritingAssumptionConstant();
@@ -271,8 +271,8 @@ private static ClientHandle<Assumption> getNodeRewritingAssumption0(@SuppressWar
         return IsolatedCompileClient.get().hand(assumption);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<Assumption> getValidRootAssumption0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> handle) {
         CompilableTruffleAST ast = IsolatedCompileClient.get().unhand(handle);
         JavaConstant assumptionConstant = ast.getValidRootAssumptionConstant();
@@ -280,8 +280,8 @@ private static ClientHandle<Assumption> getValidRootAssumption0(@SuppressWarning
         return IsolatedCompileClient.get().hand(assumption);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isTrivial0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> handle) {
         SubstrateCompilableTruffleAST compilable = IsolatedCompileClient.get().unhand(handle);
         return compilable.isTrivial();
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilationIdentifier.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilationIdentifier.java
index 74efce924e50..b09c3d070678 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilationIdentifier.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilationIdentifier.java
@@ -72,14 +72,14 @@ public String toString(Verbosity verbosity) {
         return descriptions[ordinal];
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void close0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationIdentifier> compilationHandle) {
         IsolatedCompileClient.get().unhand(compilationHandle).close();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> toString0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationIdentifier> idHandle, int verbosityOrdinal) {
         TruffleCompilationIdentifier id = IsolatedCompileClient.get().unhand(idHandle);
         String description = id.toString(VERBOSITIES[verbosityOrdinal]);
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCallNode.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCallNode.java
index 084c59838fd7..dab534d82fe8 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCallNode.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCallNode.java
@@ -57,23 +57,23 @@ public boolean isInliningForced() {
         return isInliningForced0(IsolatedCompileContext.get().getClient(), handle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<SubstrateCompilableTruffleAST> getCurrentCallTarget0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCallNode> nodeHandle) {
         TruffleCallNode node = IsolatedCompileClient.get().unhand(nodeHandle);
         CompilableTruffleAST target = node.getCurrentCallTarget();
         return IsolatedCompileClient.get().hand((SubstrateCompilableTruffleAST) target);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int getCallCount0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCallNode> nodeHandle) {
         TruffleCallNode node = IsolatedCompileClient.get().unhand(nodeHandle);
         return node.getCallCount();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isInliningForced0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCallNode> nodeHandle) {
         TruffleCallNode node = IsolatedCompileClient.get().unhand(nodeHandle);
         return node.isInliningForced();
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationTask.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationTask.java
index d4e3422b2622..d39687089e1d 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationTask.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationTask.java
@@ -67,32 +67,32 @@ public boolean hasNextTier() {
         return hasNextTier0(IsolatedCompileContext.get().getClient(), handle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isCancelled0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationTask> taskHandle) {
         return IsolatedCompileClient.get().unhand(taskHandle).isCancelled();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isLastTier0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationTask> taskHandle) {
         return IsolatedCompileClient.get().unhand(taskHandle).isLastTier();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isFirstTier0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationTask> taskHandle) {
         return IsolatedCompileClient.get().unhand(taskHandle).isFirstTier();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean hasNextTier0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationTask> taskHandle) {
         return IsolatedCompileClient.get().unhand(taskHandle).hasNextTier();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<TruffleInliningData> inliningData0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleCompilationTask> taskHandle) {
         TruffleInliningData inliningData = IsolatedCompileClient.get().unhand(taskHandle).inliningData();
         return IsolatedCompileClient.get().hand(inliningData);
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
index 5e015ce40697..ad5e1e046153 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
@@ -89,24 +89,24 @@ public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
         onCompilationRetry0(IsolatedCompileContext.get().getClient(), contextHandle, tier);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onGraalTierFinished0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<IsolatedEventContext> contextHandle, CompilerHandle<GraphInfo> graphInfo, int nodeCount) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
         context.listener.onGraalTierFinished(context.compilable, new IsolatedGraphInfo(graphInfo, nodeCount));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onTruffleTierFinished0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<IsolatedEventContext> contextHandle, CompilerHandle<GraphInfo> graphInfo, int nodeCount) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
         context.listener.onTruffleTierFinished(context.compilable, context.task.inliningData(), new IsolatedGraphInfo(graphInfo, nodeCount));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onSuccess0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle,
                     CompilerHandle<GraphInfo> graphInfo, int nodeCount, IsolatedCompilationResultData resultData, int tier) {
 
@@ -114,16 +114,16 @@ private static void onSuccess0(@SuppressWarnings("unused") ClientIsolateThread c
         context.listener.onSuccess(context.compilable, context.task.inliningData(), new IsolatedGraphInfo(graphInfo, nodeCount), new IsolatedCompilationResultInfo(resultData), tier);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onFailure0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle,
                     CCharPointer reason, boolean bailout, boolean permanentBailout, int tier) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
         context.listener.onFailure(context.compilable, CTypeConversion.toJavaString(reason), bailout, permanentBailout, tier);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle, int tier) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
         context.listener.onCompilationRetry(context.compilable, tier);
@@ -163,8 +163,8 @@ public String[] getNodeTypes(boolean simpleNames) {
         return IsolatedCompileClient.get().unhand(handle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String[]> getNodeTypes0(@SuppressWarnings("unused") CompilerIsolateThread compiler, CompilerHandle<GraphInfo> infoHandle, boolean simpleNames) {
         GraphInfo info = IsolatedCompileContext.get().unhand(infoHandle);
         return IsolatedCompileContext.get().createStringArrayInClient(info.getNodeTypes(simpleNames));
@@ -226,8 +226,8 @@ public int getDataPatchesCount() {
         return dataPatchesCount;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String[]> getInfopoints0(@SuppressWarnings("unused") CompilerIsolateThread compiler, CompilerHandle<CompilationResultInfo> infoHandle) {
         CompilationResultInfo info = IsolatedCompileContext.get().unhand(infoHandle);
         return IsolatedCompileContext.get().createStringArrayInClient(info.getInfopoints());
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleInlining.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleInlining.java
index d96b0c1cce89..5496a7ef5c49 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleInlining.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleInlining.java
@@ -94,8 +94,8 @@ public void addInlinedTarget(CompilableTruffleAST target) {
         addInlinedTarget0(IsolatedCompileContext.get().getClient(), handle, targetHandle);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<TruffleCallNode> findCallNode0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> inliningHandle, ClientHandle<?> callNodeConstantHandle) {
 
@@ -105,8 +105,8 @@ private static ClientHandle<TruffleCallNode> findCallNode0(@SuppressWarnings("un
         return IsolatedCompileClient.get().hand(callNode);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<TruffleSourceLanguagePosition> getPosition0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> inliningHandle, ClientHandle<?> callNodeConstantHandle) {
 
@@ -120,8 +120,8 @@ private static CompilerHandle<TruffleSourceLanguagePosition> getPosition0(@Suppr
                         position.getLineNumber(), position.getOffsetStart(), position.getOffsetEnd(), position.getNodeId());
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void addTargetToDequeue0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> providerHandle,
                     ClientHandle<SubstrateCompilableTruffleAST> targetHandle) {
@@ -130,8 +130,8 @@ private static void addTargetToDequeue0(@SuppressWarnings("unused") ClientIsolat
         truffleInliningData.addTargetToDequeue(isolatedCompileClient.unhand(targetHandle));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void addInlinedTarget0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> providerHandle,
                     ClientHandle<SubstrateCompilableTruffleAST> targetHandle) {
@@ -140,31 +140,31 @@ private static void addInlinedTarget0(@SuppressWarnings("unused") ClientIsolateT
         truffleInliningData.addInlinedTarget(isolatedCompileClient.unhand(targetHandle));
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void setCallCount0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> handle, int count) {
         TruffleInliningData truffleInliningData = IsolatedCompileClient.get().unhand(handle);
         truffleInliningData.setCallCount(count);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void setInlinedCallCount0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<? extends TruffleInliningData> handle, int count) {
         TruffleInliningData truffleInliningData = IsolatedCompileClient.get().unhand(handle);
         truffleInliningData.setInlinedCallCount(count);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static int countInlinedCalls0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<? extends TruffleInliningData> handle) {
         TruffleInliningData truffleInliningData = IsolatedCompileClient.get().unhand(handle);
         return truffleInliningData.countInlinedCalls();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<TruffleSourceLanguagePosition> createPositionInCompiler(@SuppressWarnings("unused") CompilerIsolateThread compiler,
                     ClientHandle<TruffleSourceLanguagePosition> positionHandle, int lineNumber, int offsetStart, int offsetEnd, int nodeId) {
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleRuntimeSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleRuntimeSupport.java
index f8312145b6c5..a9cc201b2feb 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleRuntimeSupport.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleRuntimeSupport.java
@@ -72,8 +72,8 @@ public static Consumer<OptimizedAssumptionDependency> registerOptimizedAssumptio
         };
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<Consumer<OptimizedAssumptionDependency>> registerOptimizedAssumptionDependency0(
                     @SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<OptimizedAssumption> assumptionHandle) {
 
@@ -82,8 +82,8 @@ private static ClientHandle<Consumer<OptimizedAssumptionDependency>> registerOpt
         return IsolatedCompileClient.get().hand(observer);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void notifyAssumption0(@SuppressWarnings("unused") ClientIsolateThread client,
                     ClientHandle<Consumer<OptimizedAssumptionDependency>> consumerHandle,
                     ClientHandle<? extends OptimizedAssumptionDependency> dependencyHandle) {
@@ -101,8 +101,8 @@ public static JavaConstant getCallTargetForCallNode(JavaConstant callNodeConstan
         return new IsolatedObjectConstant(getCallTargetForCallNode0(IsolatedCompileContext.get().getClient(), callNodeHandle), false);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<OptimizedCallTarget> getCallTargetForCallNode0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<OptimizedDirectCallNode> callNode) {
 
         OptimizedDirectCallNode node = IsolatedCompileClient.get().unhand(callNode);
@@ -127,8 +127,8 @@ public static boolean tryLog(String loggerId, CompilableTruffleAST compilable, S
         return false;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static void log0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<String> id, ClientHandle<SubstrateCompilableTruffleAST> ast, ClientHandle<String> msg) {
 
         SubstrateTruffleRuntime runtime = (SubstrateTruffleRuntime) SubstrateTruffleRuntime.getRuntime();
@@ -146,8 +146,8 @@ public static TriState tryIsSuppressedFailure(CompilableTruffleAST compilable, S
         return TriState.UNDEFINED;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static boolean isSuppressedFailure0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<SubstrateCompilableTruffleAST> ast,
                     CompilerHandle<Supplier<String>> serializedExceptionHandle) {
         Supplier<String> serializedException = () -> {
@@ -158,8 +158,8 @@ private static boolean isSuppressedFailure0(@SuppressWarnings("unused") ClientIs
         return runtime.isSuppressedFailure(IsolatedCompileClient.get().unhand(ast), serializedException);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static ClientHandle<String> getReasonAndStackTrace0(@SuppressWarnings("unused") CompilerIsolateThread compiler, CompilerHandle<Supplier<String>> reasonAndStackTraceHandle) {
         Supplier<String> supplier = IsolatedCompileContext.get().unhand(reasonAndStackTraceHandle);
         return IsolatedCompileContext.get().createStringInClient(supplier.get());
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleSourceLanguagePosition.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleSourceLanguagePosition.java
index 367a6b6f63d2..26e98898cbfc 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleSourceLanguagePosition.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleSourceLanguagePosition.java
@@ -103,29 +103,29 @@ public int getNodeId() {
         return nodeId;
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> getDescription0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleSourceLanguagePosition> positionHandle) {
         String description = IsolatedCompileClient.get().unhand(positionHandle).getDescription();
         return IsolatedCompileClient.get().createStringInCompiler(description);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> getURIString0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleSourceLanguagePosition> positionHandle) {
         URI uri = IsolatedCompileClient.get().unhand(positionHandle).getURI();
         return (uri != null) ? IsolatedCompileClient.get().createStringInCompiler(uri.toString()) : IsolatedHandles.nullHandle();
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> getLanguage0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleSourceLanguagePosition> positionHandle) {
         String language = IsolatedCompileClient.get().unhand(positionHandle).getLanguage();
         return IsolatedCompileClient.get().createStringInCompiler(language);
     }
 
-    @CEntryPoint
-    @CEntryPointOptions(include = CEntryPointOptions.NotIncludedAutomatically.class, publishAs = CEntryPointOptions.Publish.NotPublished)
+    @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
+    @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
     private static CompilerHandle<String> getNodeClassName0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<TruffleSourceLanguagePosition> positionHandle) {
         String language = IsolatedCompileClient.get().unhand(positionHandle).getNodeClassName();
         return IsolatedCompileClient.get().createStringInCompiler(language);

From 71526f374a70481442d0f4c26e654a94af0423c4 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Wed, 22 Sep 2021 20:53:29 +0200
Subject: [PATCH 091/681] Fix static guards cannot be asserted in fallback
 guard, they always need to be executed.

---
 .../truffle/api/dsl/test/FallbackTest.java    | 41 +++++++++++++++++++
 .../generator/FlatNodeGenFactory.java         |  4 +-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java
index ee1b846ce816..b758ce2bb5ff 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java
@@ -44,6 +44,7 @@
 import static com.oracle.truffle.api.dsl.test.TestHelper.assertRuns;
 import static com.oracle.truffle.api.dsl.test.TestHelper.createRoot;
 import static com.oracle.truffle.api.dsl.test.TestHelper.executeWith;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -76,6 +77,7 @@
 import com.oracle.truffle.api.dsl.test.FallbackTestFactory.FallbackWithAssumptionNodeGen;
 import com.oracle.truffle.api.dsl.test.FallbackTestFactory.FallbackWithCachedNodeGen;
 import com.oracle.truffle.api.dsl.test.FallbackTestFactory.ImplicitCastInFallbackNodeGen;
+import com.oracle.truffle.api.dsl.test.FallbackTestFactory.InvertedGuardNodeGen;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode;
 import com.oracle.truffle.api.dsl.test.examples.ExampleTypes;
@@ -770,4 +772,43 @@ protected String f0(Object arg0,
 
     }
 
+    /*
+     * Test for GR-33857.
+     */
+    @Test
+    public void testInvertedStaticGuard() {
+        setupEnv();
+        InvertedGuardNode node;
+
+        node = adoptNode(InvertedGuardNodeGen.create()).get();
+
+        assertEquals("f", node.execute(42L));
+        assertEquals("f", node.execute(42L));
+    }
+
+    @SuppressWarnings("unused")
+    abstract static class InvertedGuardNode extends Node {
+
+        public abstract String execute(Object left);
+
+        @Specialization(guards = {"dynamicGuard(arg0)", "staticGuard()"})
+        protected String s0(long arg0) {
+            return "s0";
+        }
+
+        static boolean staticGuard() {
+            return false;
+        }
+
+        static boolean dynamicGuard(long arg0) {
+            return arg0 == 42;
+        }
+
+        @Fallback
+        protected String f(Object arg0) {
+            return "f";
+        }
+
+    }
+
 }
diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
index fe5f87eaac2d..1dcd40c130b7 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
@@ -5038,12 +5038,12 @@ private IfTriple createMethodGuardCheck(FrameState frameState, SpecializationDat
         }
 
         CodeTree assertion = null; // overrule with assertion
-        if (mode.isFastPath() || mode.isGuardFallback()) {
+        if (mode.isFastPath()) {
             if (!specialization.isDynamicParameterBound(expression, true) && !guard.isWeakReferenceGuard()) {
                 assertion = CodeTreeBuilder.createBuilder().startAssert().tree(expressionCode).end().build();
                 expressionCode = null;
             }
-        } else {
+        } else if (mode.isSlowPath() || mode.isUncached()) {
             if (guard.isConstantTrueInSlowPath(context, mode.isUncached())) {
                 assertion = CodeTreeBuilder.createBuilder().startStatement().string("// assert ").tree(expressionCode).end().build();
                 expressionCode = null;

From fddc9c8ab2cc1eda36d1c1f4646eab03a1de7596 Mon Sep 17 00:00:00 2001
From: Kevin Menard <kevin.menard@shopify.com>
Date: Wed, 22 Sep 2021 18:02:11 -0400
Subject: [PATCH 092/681] TRegex: Update assertion to allow usage of ASCII
 encoding.

---
 .../oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
index 4452e0fd89c8..240d3d0871ae 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecutorNode.java
@@ -261,7 +261,7 @@ protected void inputSkipIntl(TRegexExecutorLocals locals, boolean forward) {
                 } while (inputHasNext(locals, false) && inputUTF8IsTrailingByte(c));
             }
         } else {
-            assert getEncoding() == Encodings.UTF_16_RAW || getEncoding() == Encodings.UTF_32 || getEncoding() == Encodings.LATIN_1;
+            assert getEncoding() == Encodings.UTF_16_RAW || getEncoding() == Encodings.UTF_32 || getEncoding() == Encodings.LATIN_1 || getEncoding() == Encodings.ASCII;
             inputIncRaw(locals, forward);
         }
     }

From b24fd0b3c3228f04b0d24b2211e167445d4f2cbd Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 22 Sep 2021 08:27:29 +0200
Subject: [PATCH 093/681] compiler: make getKilledLocationIdentity and
 hasSideEffect of MacroNode final

---
 .../org/graalvm/compiler/replacements/nodes/MacroNode.java    | 4 ++--
 .../compiler/replacements/nodes/MacroWithExceptionNode.java   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index 500aa02e314a..3f057960e741 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -169,7 +169,7 @@ public void setStateAfter(FrameState x) {
     }
 
     @Override
-    public boolean hasSideEffect() {
+    public final boolean hasSideEffect() {
         return true;
     }
 
@@ -180,7 +180,7 @@ public boolean hasSideEffect() {
      * kill location must not get broader.
      */
     @Override
-    public LocationIdentity getKilledLocationIdentity() {
+    public final LocationIdentity getKilledLocationIdentity() {
         return LocationIdentity.any();
     }
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index 158fc20bf7f3..2b0b9dccb2ac 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -169,12 +169,14 @@ public void setStateAfter(FrameState x) {
     }
 
     @Override
-    public boolean hasSideEffect() {
+    public final boolean hasSideEffect() {
         return true;
     }
 
     /**
      * @see MacroNode#getKilledLocationIdentity()
+     *
+     *      FIXME: make this final once [GR-32638] is fixed
      */
     @Override
     public LocationIdentity getKilledLocationIdentity() {

From 2da5878b8b98ea5066da724af29d3348b599a7b3 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Fri, 28 May 2021 15:50:44 +0200
Subject: [PATCH 094/681] cfg: new reverse post order with loop body before
 exit first

---
 compiler/CHANGELOG.md                         |   3 +
 .../test/IterationDirectiveTest.java          |   8 +-
 .../core/common/type/IntegerStamp.java        |  20 +-
 .../compiler/core/test/GraalCompilerTest.java |  18 -
 .../core/test/NodePropertiesTest.java         |  10 +-
 .../compiler/core/test/SimpleCFGTest.java     | 139 +++++
 .../compiler/core/test/SpectreFenceTest.java  |   5 +
 .../graalvm/compiler/java/BytecodeParser.java |   1 -
 .../java/ComputeLoopFrequenciesClosure.java   | 135 -----
 .../loop/phases/LoopTransformations.java      |  59 +-
 .../phases/SpeculativeGuardMovementPhase.java |   4 +-
 .../loop/test/LoopPartialUnrollTest.java      |   2 -
 .../graalvm/compiler/nodes/LoopBeginNode.java |  15 -
 .../org/graalvm/compiler/nodes/PiNode.java    |   9 +
 .../graalvm/compiler/nodes/ProfileData.java   |   1 +
 .../compiler/nodes/calc/IntegerTestNode.java  |   4 +-
 .../org/graalvm/compiler/nodes/cfg/Block.java |  22 +-
 .../compiler/nodes/cfg/ControlFlowGraph.java  | 559 +++++++++++++-----
 .../compiler/nodes/cfg/ReversePostOrder.java  | 388 ++++++++++++
 .../nodes/loop/DefaultLoopPolicies.java       |   6 +-
 .../graalvm/compiler/nodes/loop/LoopEx.java   |   9 +
 .../nodes/loop/LoopFragmentInside.java        |   1 -
 .../FixedNodeRelativeFrequencyCache.java      |   9 +-
 .../compiler/printer/BinaryGraphPrinter.java  |  10 +
 .../truffle/compiler/PartialEvaluator.java    |   3 -
 .../test/InstrumentBranchesPhaseTest.java     |  20 +-
 .../test/LoopNodePartialEvaluationTest.java   |   7 +-
 .../test/SimplePartialEvaluationTest.java     |  24 +-
 .../truffle/test/nodes/AddTestNode.java       |  16 +-
 .../truffle/test/nodes/RootTestNode.java      |  18 +-
 .../nodes/explosion/UnrollingTestNode.java    |   9 +
 31 files changed, 1152 insertions(+), 382 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java
 create mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java

diff --git a/compiler/CHANGELOG.md b/compiler/CHANGELOG.md
index f6f999f8baef..955871e68ff4 100644
--- a/compiler/CHANGELOG.md
+++ b/compiler/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This changelog summarizes newly introduced optimizations that may be relevant to other teams.
 
+## Version 21.3.0
+* (GR-22707) (GR-30838): New, inner loops first, reverse post order and loop frequency calculations for the compiler.
+
 ## Version 21.2.0
 * (GR-29770) Loop safepoint elimination: Not only consider 32bit loops for safepoint removal but also 64bit ones
 that iterate in 32bit ranges.
diff --git a/compiler/src/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java b/compiler/src/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java
index d32454431078..800f0baf3095 100644
--- a/compiler/src/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java
+++ b/compiler/src/org.graalvm.compiler.api.directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java
@@ -24,14 +24,14 @@
  */
 package org.graalvm.compiler.api.directives.test;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class IterationDirectiveTest extends GraalCompilerTest {
 
@@ -59,6 +59,6 @@ protected void checkLowTierGraph(StructuredGraph graph) {
         Assert.assertEquals("LoopBeginNode count", 1, loopBeginNodes.count());
 
         LoopBeginNode loopBeginNode = loopBeginNodes.first();
-        Assert.assertEquals("loop frequency of " + loopBeginNode, 128, loopBeginNode.loopFrequency(), 0);
+        Assert.assertEquals("loop frequency of " + loopBeginNode, 128, ControlFlowGraph.compute(graph, false, false, false, false).localLoopFrequency(loopBeginNode), 0);
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
index 80763dc56fb7..abc5b5b156d6 100644
--- a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
+++ b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
@@ -43,6 +43,7 @@
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
 import org.graalvm.compiler.debug.GraalError;
+
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
@@ -77,6 +78,8 @@ private IntegerStamp(int bits, long lowerBound, long upperBound, long downMask,
         assert upperBound <= CodeUtil.maxValue(bits) : this;
         assert (downMask & CodeUtil.mask(bits)) == downMask : this;
         assert (upMask & CodeUtil.mask(bits)) == upMask : this;
+        // Check for valid masks or the empty encoding
+        assert (downMask & ~upMask) == 0 || (upMask == 0 && downMask == CodeUtil.mask(bits)) : String.format("\u21ca: %016x \u21c8: %016x", downMask, upMask);
     }
 
     public static IntegerStamp create(int bits, long lowerBoundInput, long upperBoundInput) {
@@ -132,7 +135,7 @@ private static long significantBit(long bits, long value) {
     private static long minValueForMasks(int bits, long downMask, long upMask) {
         if (significantBit(bits, upMask) == 0) {
             // Value is always positive. Minimum value always positive.
-            assert significantBit(bits, downMask) == 0;
+            assert significantBit(bits, downMask) == 0 : String.format("\u21ca: %016x \u21c8: %016x", downMask, upMask);
             return downMask;
         } else {
             // Value can be positive or negative. Minimum value always negative.
@@ -152,6 +155,15 @@ private static long maxValueForMasks(int bits, long downMask, long upMask) {
     }
 
     public static IntegerStamp stampForMask(int bits, long downMask, long upMask) {
+        /*
+         * Determine if the new stamp created by down & upMask would be contradicting, i.e., empty
+         * by definition. This can happen for example if binary logic operations are evaluated
+         * repetitively on different branches creating values that are infeasible by definition
+         * (logic nodes on phi nodes of false evaluated predecessors).
+         */
+        if ((downMask & ~upMask) != 0L) {
+            return createEmptyStamp(bits);
+        }
         return new IntegerStamp(bits, minValueForMasks(bits, downMask, upMask), maxValueForMasks(bits, downMask, upMask), downMask, upMask);
     }
 
@@ -162,7 +174,11 @@ public IntegerStamp unrestricted() {
 
     @Override
     public IntegerStamp empty() {
-        return new IntegerStamp(getBits(), CodeUtil.maxValue(getBits()), CodeUtil.minValue(getBits()), CodeUtil.mask(getBits()), 0);
+        return createEmptyStamp(getBits());
+    }
+
+    private static IntegerStamp createEmptyStamp(int bits) {
+        return new IntegerStamp(bits, CodeUtil.maxValue(bits), CodeUtil.minValue(bits), CodeUtil.mask(bits), 0);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
index 22e42e8edfc1..94eaf3642c3a 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java
@@ -70,7 +70,6 @@
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.ComputeLoopFrequenciesClosure;
 import org.graalvm.compiler.java.GraphBuilderPhase;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
 import org.graalvm.compiler.lir.phases.LIRSuites;
@@ -266,23 +265,6 @@ protected Suites createSuites(OptionValues opts) {
              */
             iter = ret.getHighTier().findPhase(CanonicalizerPhase.class);
         }
-        iter.add(new Phase() {
-
-            @Override
-            protected void run(StructuredGraph graph) {
-                ComputeLoopFrequenciesClosure.compute(graph);
-            }
-
-            @Override
-            public float codeSizeIncrease() {
-                return NodeSize.IGNORE_SIZE_CONTRACT_FACTOR;
-            }
-
-            @Override
-            protected CharSequence getName() {
-                return "ComputeLoopFrequenciesPhase";
-            }
-        });
         ret.getHighTier().appendPhase(new Phase() {
 
             @Override
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
index 472ab5aea744..42b1b325dffe 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java
@@ -27,13 +27,13 @@
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.java.ComputeLoopFrequenciesClosure;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
+import org.graalvm.compiler.nodes.spi.SimplifierTool;
 import org.graalvm.compiler.phases.BasePhase;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase.CustomSimplification;
@@ -177,14 +177,12 @@ public void testCanonicalizationExample() {
     private void prepareGraphForLoopFrequencies(StructuredGraph g, HighTierContext htc) {
         // let canonicalizer work away branch probability nodes
         createCanonicalizerPhase().apply(g, htc);
-        // recompute the loop frequencies
-        ComputeLoopFrequenciesClosure.compute(g);
     }
 
     private static void assertFrequency(StructuredGraph g, int iterations) {
         NodeIterable<LoopBeginNode> loopBeginNodes = g.getNodes(LoopBeginNode.TYPE);
         LoopBeginNode loopBeginNode = loopBeginNodes.first();
-        Assert.assertEquals("loop frequency of " + loopBeginNode, iterations, loopBeginNode.loopFrequency(), 0);
+        Assert.assertEquals("loop frequency of " + loopBeginNode, iterations, ControlFlowGraph.compute(g, false, false, false, false).localLoopFrequency(loopBeginNode), 0);
     }
 
     @Test
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java
index 2c90d3408a77..2b997db480b6 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java
@@ -24,13 +24,24 @@
  */
 package org.graalvm.compiler.core.test;
 
+import org.graalvm.compiler.api.directives.GraalDirectives;
+import org.graalvm.compiler.core.common.PermanentBailoutException;
+import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.DebugContext.Builder;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodeinfo.InputType;
+import org.graalvm.compiler.nodeinfo.NodeCycles;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodeinfo.NodeSize;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.AbstractMergeNode;
 import org.graalvm.compiler.nodes.BeginNode;
+import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.EndNode;
+import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.MergeNode;
 import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
 import org.graalvm.compiler.nodes.ReturnNode;
@@ -38,6 +49,8 @@
 import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
 import org.graalvm.compiler.nodes.cfg.Block;
 import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
+import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
 import org.junit.Assert;
@@ -50,6 +63,132 @@ private static void dumpGraph(final StructuredGraph graph) {
         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
     }
 
+    @NodeInfo(allowedUsageTypes = InputType.Anchor, cycles = NodeCycles.CYCLES_0, size = NodeSize.SIZE_0)
+    static class SingleSplit extends ControlSplitNode implements ControlFlowAnchored {
+        public static final NodeClass<SingleSplit> TYPE = NodeClass.create(SingleSplit.class);
+
+        @Successor AbstractBeginNode singleSuccessor;
+
+        protected SingleSplit() {
+            super(TYPE, StampFactory.forVoid());
+        }
+
+        void setSingleSuccessor(AbstractBeginNode node) {
+            updatePredecessor(singleSuccessor, node);
+            singleSuccessor = node;
+        }
+
+        @Override
+        public double probability(AbstractBeginNode successor) {
+            return getProfileData().getDesignatedSuccessorProbability();
+        }
+
+        @Override
+        public int getSuccessorCount() {
+            return 1;
+        }
+
+        @Override
+        public boolean setProbability(AbstractBeginNode successor, BranchProbabilityData profileData) {
+            throw new PermanentBailoutException("There is only one successor, so probability cannot change");
+        }
+
+        @Override
+        public BranchProbabilityData getProfileData() {
+            return BranchProbabilityNode.ALWAYS_TAKEN_PROFILE;
+        }
+
+        @Override
+        public AbstractBeginNode getPrimarySuccessor() {
+            return singleSuccessor;
+        }
+
+    }
+
+    static int single() {
+        GraalDirectives.deoptimizeAndInvalidate();
+        return -1;
+    }
+
+    @Test
+    public void testSingleSplit() {
+        StructuredGraph g = parseEager(getResolvedJavaMethod("single"), AllowAssumptions.NO);
+        FixedNode next = g.start().next();
+        g.start().setNext(null);
+        SingleSplit s = g.add(new SingleSplit());
+        AbstractBeginNode b = g.add(new BeginNode());
+        b.setNext(next);
+        s.setSingleSuccessor(b);
+        g.start().setNext(s);
+
+        g.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, g, "after build");
+        ControlFlowGraph.compute(g, true, true, true, true);
+    }
+
+    static int singleLoop(int end) {
+        int i = 0;
+        while (true) {
+            switch (i) {
+                default:
+            }
+            if (i == end) {
+                break;
+            }
+            i++;
+            continue;
+        }
+        return i;
+    }
+
+    @Test
+    public void testSingleSplitLoop() {
+        StructuredGraph g = parseEager(getResolvedJavaMethod("singleLoop"), AllowAssumptions.NO);
+        g.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, g, "after build");
+        ControlFlowGraph.compute(g, true, true, true, true);
+    }
+
+    static int foo(int a, int b) {
+        int res = 0;
+        int i = 0;
+        while (true) {
+            if (i >= a) {
+                break;
+            }
+            if (i == 123) {
+                GraalDirectives.deoptimizeAndInvalidate();
+            }
+            if (i == 126) {
+                GraalDirectives.deoptimizeAndInvalidate();
+            }
+            res += i;
+            i++;
+        }
+        if (b == 42) {
+            GraalDirectives.deoptimizeAndInvalidate();
+        }
+        return res;
+    }
+
+    @Override
+    protected void checkHighTierGraph(StructuredGraph graph) {
+        super.checkHighTierGraph(graph);
+        if (!modify) {
+            return;
+        }
+        for (LoopExitNode lex : graph.getNodes().filter(LoopExitNode.class)) {
+            lex.setStateAfter(lex.loopBegin().stateAfter());
+        }
+    }
+
+    private boolean modify = false;
+
+    @Test
+    public void testFoo() {
+        modify = true;
+        test("foo", 12, 12);
+        modify = false;
+    }
+
     @Test
     public void testImplies() {
         OptionValues options = getInitialOptions();
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java
index 201de65bf866..c75cf4417726 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java
@@ -64,6 +64,7 @@ public static long test1Snippet(double a) {
         } else {
             SideEffectL = UNSAFE.getLong(m, ARRAY_LONG_BASE_OFFSET);
         }
+        GraalDirectives.controlFlowAnchor();
         return UNSAFE.getLong(m, ARRAY_LONG_BASE_OFFSET);
     }
 
@@ -75,7 +76,9 @@ public static long test2Snippet(double a) {
             } else {
                 return Memory[1];
             }
+            GraalDirectives.controlFlowAnchor();
         }
+        GraalDirectives.controlFlowAnchor();
         return Memory[2];
     }
 
@@ -88,6 +91,7 @@ public static long test3Snippet(double a) {
                 return 1;
             }
         }
+        GraalDirectives.controlFlowAnchor();
         return 4;
     }
 
@@ -102,6 +106,7 @@ private void assertNumberOfFences(String snip, int fences) {
             if (beginNode.hasSpeculationFence()) {
                 computedFences++;
             }
+            GraalDirectives.controlFlowAnchor();
         }
         Assert.assertEquals("Expected fences", fences, computedFences);
     }
diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index ef93c22ae97f..3eda28121872 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -1031,7 +1031,6 @@ protected void buildRootMethod() {
         }
 
         cleanupFinalGraph();
-        ComputeLoopFrequenciesClosure.compute(graph);
     }
 
     protected BciBlockMapping generateBlockMap() {
diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java
deleted file mode 100644
index 3771cdf022a1..000000000000
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/ComputeLoopFrequenciesClosure.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2011, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.java;
-
-import static org.graalvm.compiler.nodes.cfg.ControlFlowGraph.multiplyRelativeFrequencies;
-
-import java.util.List;
-
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-
-public final class ComputeLoopFrequenciesClosure extends ReentrantNodeIterator.NodeIteratorClosure<BranchProbabilityData> {
-
-    private static final ComputeLoopFrequenciesClosure INSTANCE = new ComputeLoopFrequenciesClosure();
-
-    private static final BranchProbabilityData ZERO = BranchProbabilityData.create(0.0, ProfileSource.UNKNOWN);
-    private static final BranchProbabilityData ONE = BranchProbabilityData.create(1.0, ProfileSource.UNKNOWN);
-
-    private ComputeLoopFrequenciesClosure() {
-        // nothing to do
-    }
-
-    private static BranchProbabilityData add(BranchProbabilityData x, BranchProbabilityData y) {
-        double p = x.getDesignatedSuccessorProbability() + y.getDesignatedSuccessorProbability();
-        return BranchProbabilityData.create(p, x.getProfileSource().combine(y.getProfileSource()));
-    }
-
-    private static BranchProbabilityData scale(BranchProbabilityData x, double scaleFactor) {
-        return scaleAndCombine(x, scaleFactor, x.getProfileSource());
-    }
-
-    private static BranchProbabilityData scaleAndCombine(BranchProbabilityData x, double scaleFactor, ProfileSource otherSource) {
-        double p = multiplyRelativeFrequencies(x.getDesignatedSuccessorProbability(), scaleFactor);
-        return BranchProbabilityData.create(p, x.getProfileSource().combine(otherSource));
-    }
-
-    @Override
-    protected BranchProbabilityData processNode(FixedNode node, BranchProbabilityData currentState) {
-        // normal nodes never change the probability of a path
-        return currentState;
-    }
-
-    @Override
-    protected BranchProbabilityData merge(AbstractMergeNode merge, List<BranchProbabilityData> states) {
-        // a merge has the sum of all predecessor probabilities
-        BranchProbabilityData result = ZERO;
-        for (BranchProbabilityData s : states) {
-            result = add(result, s);
-        }
-        return result;
-    }
-
-    @Override
-    protected BranchProbabilityData afterSplit(AbstractBeginNode node, BranchProbabilityData oldState) {
-        // a control split splits up the probability
-        ControlSplitNode split = (ControlSplitNode) node.predecessor();
-        return scaleAndCombine(oldState, split.probability(node), split.getProfileData().getProfileSource());
-    }
-
-    @Override
-    protected EconomicMap<LoopExitNode, BranchProbabilityData> processLoop(LoopBeginNode loop, BranchProbabilityData initialState) {
-        EconomicMap<LoopExitNode, BranchProbabilityData> exitStates = ReentrantNodeIterator.processLoop(this, loop, ONE).exitStates;
-
-        BranchProbabilityData exitState = ZERO;
-        for (BranchProbabilityData e : exitStates.getValues()) {
-            exitState = add(exitState, e);
-        }
-        double exitRelativeFrequency = exitState.getDesignatedSuccessorProbability();
-        exitRelativeFrequency = Math.min(1.0, exitRelativeFrequency);
-        exitRelativeFrequency = Math.max(ControlFlowGraph.MIN_RELATIVE_FREQUENCY, exitRelativeFrequency);
-        double loopFrequency = 1.0 / exitRelativeFrequency;
-        loop.setLoopFrequency(LoopFrequencyData.create(loopFrequency, exitState.getProfileSource()));
-
-        double adjustmentFactor = initialState.getDesignatedSuccessorProbability() * loopFrequency;
-        exitStates.replaceAll((exitNode, state) -> scale(state, adjustmentFactor));
-
-        return exitStates;
-    }
-
-    /**
-     * Computes the frequencies of all loops in the given graph. This is done by performing a
-     * reverse postorder iteration and computing the probability of all fixed nodes. The combined
-     * probability of all exits of a loop can be used to compute the loop's expected frequency.
-     */
-    public static void compute(StructuredGraph graph) {
-        if (graph.hasLoops()) {
-            ReentrantNodeIterator.apply(INSTANCE, graph.start(), ONE);
-        }
-    }
-
-    public static class ComputeLoopFrequencyPhase extends Phase {
-
-        @Override
-        protected void run(StructuredGraph graph) {
-            compute(graph);
-        }
-    }
-
-    public static final ComputeLoopFrequencyPhase PHASE_INSTANCE = new ComputeLoopFrequencyPhase();
-
-}
diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
index e400b0f1065e..90510c6243cb 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
@@ -55,7 +55,6 @@
 import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
 import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.SafepointNode;
 import org.graalvm.compiler.nodes.StateSplit;
@@ -63,6 +62,7 @@
 import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
 import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
 import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
 import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.calc.CompareNode;
@@ -92,12 +92,17 @@ private LoopTransformations() {
 
     public static void peel(LoopEx loop) {
         loop.detectCounted();
-        loop.inside().duplicate().insertBefore(loop);
+        double frequencyBefore = -1D;
+        AbstractBeginNode countedExit = null;
         if (loop.isCounted()) {
-            // For counted loops we assume that we have an effect on the loop frequency.
-            loop.loopBegin().setLoopFrequency(loop.loopBegin().profileData().decrementFrequency(1.0));
+            frequencyBefore = loop.localLoopFrequency();
+            countedExit = loop.counted().getCountedExit();
         }
+        loop.inside().duplicate().insertBefore(loop);
         loop.loopBegin().incrementPeelings();
+        if (countedExit != null) {
+            adaptCountedLoopExitProbability(countedExit, frequencyBefore - 1D);
+        }
     }
 
     @SuppressWarnings("try")
@@ -208,20 +213,9 @@ public static void unswitch(LoopEx loop, List<ControlSplitNode> controlSplitNode
     public static void partialUnroll(LoopEx loop, EconomicMap<LoopBeginNode, OpaqueNode> opaqueUnrolledStrides) {
         assert loop.loopBegin().isMainLoop();
         loop.loopBegin().graph().getDebug().log("LoopPartialUnroll %s", loop);
-
+        adaptCountedLoopExitProbability(loop.counted().getCountedExit(), loop.localLoopFrequency() / 2D);
         LoopFragmentInside newSegment = loop.inside().duplicate();
         newSegment.insertWithinAfter(loop, opaqueUnrolledStrides);
-
-        // Try to update the corresponding post loop's frequency.
-        for (LoopExitNode exit : loop.loopBegin().loopExits()) {
-            if (exit.next().hasExactlyOneUsage() && exit.next().usages().first() instanceof LoopBeginNode) {
-                LoopBeginNode possiblePostLoopBegin = (LoopBeginNode) exit.next().usages().first();
-                if (possiblePostLoopBegin.isPostLoop()) {
-                    possiblePostLoopBegin.setLoopFrequency(loop.loopBegin().profileData().copy(loop.loopBegin().getUnrollFactor() - 1));
-                    break;
-                }
-            }
-        }
     }
 
     /**
@@ -416,14 +410,18 @@ public static PreMainPostResult insertPrePostLoops(LoopEx loop) {
         } else {
             updatePreLoopLimit(preCounted);
         }
-        double originalFrequency = loop.loopBegin().loopFrequency();
-        preLoopBegin.setLoopFrequency(LoopFrequencyData.injected(1.0));
-        mainLoopBegin.setLoopFrequency(mainLoopBegin.profileData().decrementFrequency(2.0));
-        postLoopBegin.setLoopFrequency(LoopFrequencyData.injected(1.0));
+        double originalFrequency = loop.localLoopFrequency();
         preLoopBegin.setLoopOrigFrequency(originalFrequency);
         mainLoopBegin.setLoopOrigFrequency(originalFrequency);
         postLoopBegin.setLoopOrigFrequency(originalFrequency);
 
+        assert preLoopExitNode.predecessor() instanceof IfNode;
+        assert mainLoopExitNode.predecessor() instanceof IfNode;
+        assert postLoopExitNode.predecessor() instanceof IfNode;
+
+        setSingleVisitedLoopFrequencySplitProbability(preLoopExitNode);
+        setSingleVisitedLoopFrequencySplitProbability(postLoopExitNode);
+
         if (graph.isAfterStage(StageFlag.VALUE_PROXY_REMOVAL)) {
             // The pre and post loops don't require safepoints at all
             for (SafepointNode safepoint : preLoop.nodes().filter(SafepointNode.class)) {
@@ -438,6 +436,27 @@ public static PreMainPostResult insertPrePostLoops(LoopEx loop) {
         return new PreMainPostResult(preLoopBegin, mainLoopBegin, postLoopBegin, preLoop, mainLoop, postLoop);
     }
 
+    /**
+     * Inject a split probability for the (counted) loop check that will result in a loop frequency
+     * of 1 (in case this is the only loop exit).
+     */
+    private static void setSingleVisitedLoopFrequencySplitProbability(AbstractBeginNode lex) {
+        IfNode ifNode = ((IfNode) lex.predecessor());
+        boolean trueSucc = ifNode.trueSuccessor() == lex;
+        ifNode.setTrueSuccessorProbability(BranchProbabilityData.injected(0.01, trueSucc));
+    }
+
+    public static void adaptCountedLoopExitProbability(AbstractBeginNode lex, double newFrequency) {
+        double d = Math.abs(1D - newFrequency);
+        if (d <= 1D) {
+            setSingleVisitedLoopFrequencySplitProbability(lex);
+            return;
+        }
+        IfNode ifNode = ((IfNode) lex.predecessor());
+        boolean trueSucc = ifNode.trueSuccessor() == lex;
+        ifNode.setTrueSuccessorProbability(BranchProbabilityData.injected((newFrequency - 1) / newFrequency, trueSucc));
+    }
+
     public static class PreMainPostResult {
         private final LoopBeginNode preLoop;
         private final LoopBeginNode mainLoop;
diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
index f8735ab9788a..1d387a867079 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
@@ -46,6 +46,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
+import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.calc.CompareNode;
 import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
@@ -435,7 +436,8 @@ private boolean shouldOptimizeCompare(InductionVariable iv, ValueNode bound, Gua
                         loopFreqThreshold++;
                     }
                 }
-                if (loopBeginNode.loopFrequency() < loopFreqThreshold) {
+                if (ProfileSource.isTrusted(loopEx.localFrequencySource()) &&
+                                loopEx.localLoopFrequency() < loopFreqThreshold) {
                     debug.log("shouldOptimizeCompare(%s):loop frequency too low.", guard);
                     // loop frequency is too low -- the complexity introduced by hoisting this guard
                     // will not pay off.
diff --git a/compiler/src/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java b/compiler/src/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
index 50f392394f9f..15d150ae2f63 100644
--- a/compiler/src/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
+++ b/compiler/src/org.graalvm.compiler.loop.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java
@@ -35,7 +35,6 @@
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.java.ComputeLoopFrequenciesClosure;
 import org.graalvm.compiler.loop.phases.LoopPartialUnrollPhase;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -315,7 +314,6 @@ public String toString(Verbosity verbosity) {
             new FloatingReadPhase().apply(graph);
             new DeadCodeEliminationPhase().apply(graph);
             new ConditionalEliminationPhase(true).apply(graph, context);
-            ComputeLoopFrequenciesClosure.compute(graph);
             new GuardLoweringPhase().apply(graph, context);
             new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
             new FrameStateAssignmentPhase().apply(graph);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
index 196531c2b868..a0c6bb5b1daa 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java
@@ -36,7 +36,6 @@
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
 import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerificationFeature;
 import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
@@ -53,7 +52,6 @@
 public final class LoopBeginNode extends AbstractMergeNode implements IterableNodeType, LIRLowerable {
 
     public static final NodeClass<LoopBeginNode> TYPE = NodeClass.create(LoopBeginNode.class);
-    private LoopFrequencyData profileData;
     protected double loopOrigFrequency;
     protected int nextEndIndex;
     protected int unswitches;
@@ -139,7 +137,6 @@ public boolean isProtectedNonOverflowingUnsigned() {
 
     public LoopBeginNode() {
         super(TYPE);
-        profileData = LoopFrequencyData.DEFAULT;
         loopOrigFrequency = 1;
         unswitches = 0;
         splits = 0;
@@ -262,18 +259,6 @@ public void setLoopOrigFrequency(double loopOrigFrequency) {
         this.loopOrigFrequency = loopOrigFrequency;
     }
 
-    public LoopFrequencyData profileData() {
-        return profileData;
-    }
-
-    public double loopFrequency() {
-        return profileData.getLoopFrequency();
-    }
-
-    public void setLoopFrequency(LoopFrequencyData newProfileData) {
-        this.profileData = newProfileData;
-    }
-
     /**
      * Returns the <b>unordered</b> set of {@link LoopEndNode} that correspond to back-edges for
      * this loop. The order of the back-edges is unspecified, if you need to get an ordering
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
index 7b86b3f80b16..036ba0df7646 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
@@ -231,6 +231,15 @@ public Node canonical(CanonicalizerTool tool) {
         if (value != null) {
             return value;
         }
+        if (tool.allUsagesAvailable()) {
+            for (Node usage : usages()) {
+                if (!(usage instanceof VirtualState)) {
+                    return this;
+                }
+            }
+            // Only state usages: for them a more precise stamp does not matter.
+            return object;
+        }
         return this;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProfileData.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProfileData.java
index 966200aa5ea1..d7f7977f1aad 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProfileData.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ProfileData.java
@@ -86,6 +86,7 @@ public ProfileSource combine(ProfileSource other) {
         public static boolean isTrusted(ProfileSource source) {
             return source == INJECTED || source == PROFILED;
         }
+
     }
 
     public ProfileSource getProfileSource() {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java
index b50dedbb1eb9..5bb1dc835bce 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java
@@ -30,14 +30,14 @@
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.BinaryOpLogicNode;
 import org.graalvm.compiler.nodes.LogicConstantNode;
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
index d91d2d74821b..f75f0a7b367c 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/Block.java
@@ -39,6 +39,7 @@
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopEndNode;
 import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
+import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
@@ -51,7 +52,8 @@ public final class Block extends AbstractBlockBase<Block> {
 
     protected FixedNode endNode;
 
-    protected double relativeFrequency;
+    protected double relativeFrequency = -1D;
+    protected ProfileSource frequencySource;
     private Loop<Block> loop;
 
     protected Block postdominator;
@@ -192,7 +194,13 @@ public String toString() {
     public String toString(Verbosity verbosity) {
         StringBuilder sb = new StringBuilder();
         sb.append('B').append(id);
-        if (verbosity != Verbosity.Id) {
+        if (verbosity == Verbosity.Name) {
+            sb.append("{");
+            sb.append(getBeginNode());
+            sb.append("->");
+            sb.append(getEndNode());
+            sb.append("}");
+        } else if (verbosity != Verbosity.Id) {
             if (isLoopHeader()) {
                 sb.append(" lh");
             }
@@ -299,10 +307,18 @@ public double getRelativeFrequency() {
     }
 
     public void setRelativeFrequency(double relativeFrequency) {
-        assert relativeFrequency >= 0 && Double.isFinite(relativeFrequency);
+        assert relativeFrequency >= 0 && Double.isFinite(relativeFrequency) : "Relative Frequency=" + relativeFrequency;
         this.relativeFrequency = relativeFrequency;
     }
 
+    public void setFrequencySource(ProfileSource frequencySource) {
+        this.frequencySource = frequencySource;
+    }
+
+    public ProfileSource getFrequencySource() {
+        return frequencySource;
+    }
+
     @Override
     public Block getDominator(int distance) {
         Block result = this;
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index 25d1e232b507..bc751a9c5e68 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -30,27 +30,29 @@
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.List;
+import java.util.function.Consumer;
 
+import org.graalvm.collections.EconomicMap;
 import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
 import org.graalvm.compiler.core.common.cfg.CFGVerifier;
 import org.graalvm.compiler.core.common.cfg.Loop;
+import org.graalvm.compiler.debug.Assertions;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopEndNode;
 import org.graalvm.compiler.nodes.LoopExitNode;
+import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
+import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
+import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 
 public final class ControlFlowGraph implements AbstractControlFlowGraph<Block> {
@@ -70,6 +72,7 @@ public final class ControlFlowGraph implements AbstractControlFlowGraph<Block> {
     private Block[] reversePostOrder;
     private List<Loop<Block>> loops;
     private int maxDominatorDepth;
+    private EconomicMap<LoopBeginNode, LoopFrequencyData> localLoopFrequencyData;
 
     public interface RecursiveVisitor<V> {
         V enter(Block b);
@@ -83,7 +86,9 @@ public static ControlFlowGraph computeForSchedule(StructuredGraph graph) {
 
     public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlocks, boolean computeLoops, boolean computeDominators, boolean computePostdominators) {
         ControlFlowGraph cfg = new ControlFlowGraph(graph);
+
         cfg.identifyBlocks();
+
         cfg.computeFrequencies();
 
         if (computeLoops) {
@@ -91,6 +96,7 @@ public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlo
         }
         if (computeDominators) {
             cfg.computeDominators();
+            assert cfg.verifyRPOInnerLoopsFirst();
         }
         if (computePostdominators) {
             cfg.computePostdominators();
@@ -101,6 +107,28 @@ public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlo
         return cfg;
     }
 
+    private void identifyBlocks() {
+        int numBlocks = 0;
+        for (AbstractBeginNode begin : graph.getNodes(AbstractBeginNode.TYPE)) {
+            Block block = new Block(begin);
+            identifyBlock(block);
+            numBlocks++;
+        }
+        reversePostOrder = ReversePostOrder.identifyBlocks(this, numBlocks);
+    }
+
+    public double localLoopFrequency(LoopBeginNode lb) {
+        return localLoopFrequencyData.get(lb).getLoopFrequency();
+    }
+
+    public ProfileSource localLoopFrequencySource(LoopBeginNode lb) {
+        return localLoopFrequencyData.get(lb).getProfileSource();
+    }
+
+    public EconomicMap<LoopBeginNode, LoopFrequencyData> getLocalLoopFrequencyData() {
+        return localLoopFrequencyData;
+    }
+
     public String dominatorTreeString() {
         return dominatorTreeString(getStartBlock());
     }
@@ -309,6 +337,197 @@ private ControlFlowGraph(StructuredGraph graph) {
         this.nodeToBlock = graph.createNodeMap();
     }
 
+    /**
+     * Utility class to verify that {@link ReversePostOrder} only produces reverse post order
+     * traversals of the graph that contain inner loops before outer ones.
+     */
+    private static class RPOLoopVerification {
+        int endsVisited;
+        int exitsVisited;
+        LoopBeginNode lb;
+
+        RPOLoopVerification(LoopBeginNode lb) {
+            this.lb = lb;
+        }
+
+        boolean loopFullyProcessed() {
+            return lb.getLoopEndCount() == endsVisited && exitsVisited == lb.loopExits().count();
+        }
+
+        boolean allEndsVisited() {
+            return lb.getLoopEndCount() == endsVisited;
+        }
+
+    }
+
+    /**
+     * Verification method to ensure that inner loops are processed before outer ones: see
+     * {@link ControlFlowGraph#computeFrequencies()} for details.
+     */
+    private boolean verifyRPOInnerLoopsFirst() {
+        return rpoInnerLoopsFirst(b -> {
+        }, b -> {
+        });
+    }
+
+    /**
+     * Special note on loop exit nodes and dominator tree loop exits: Graal has a "closed" loop
+     * form, this means every {@link LoopBeginNode} needs explicit {@link LoopEndNode} nodes and (if
+     * it is not an endless loop) {@link LoopExitNode}. For every path exiting a loop a
+     * {@link LoopExitNode} is required. There is one exception to that rule:
+     * {@link DeoptimizeNode}.
+     *
+     * Graal does not mandate that a {@link DeoptimizeNode} is preceded by a {@link LoopExitNode}.
+     * In the following example
+     *
+     * <pre>
+     * for (int i = 0; i < end; i++) {
+     *     if (condition) {
+     *         deoptimize;
+     *     }
+     * }
+     * </pre>
+     *
+     * the IR does not have a preceding loop exit node before the deopt node. However, for regular
+     * control flow sinks (returns, throws, etc) like in the following example
+     *
+     * <pre>
+     * for (int i = 0; i < end; i++) {
+     *     if (condition) {
+     *         return;
+     *     }
+     * }
+     * </pre>
+     *
+     * Graal IR creates a {@link LoopExitNode} before the {@link ReturnNode}.
+     *
+     * Because of the "imprecision" in the definition a regular basic block exiting a loop and a
+     * "dominator tree" loop exit are not necessarily the same. If a path after a control flow split
+     * unconditionally flows into a deopt it is a "dominator loop exit" while a regular loop exit
+     * block contains a {@linkplain LoopExitNode}.
+     */
+    private boolean rpoInnerLoopsFirst(Consumer<Block> perBasicBlockOption, Consumer<LoopBeginNode> loopClosedAction) {
+        // worst case all loops in the graph are nested
+        RPOLoopVerification[] openLoops = new RPOLoopVerification[graph.getNodes(LoopBeginNode.TYPE).count()];
+        int tos = 0;
+        for (Block b : reversePostOrder) {
+            // we see a loop end, open a new verification level in the loop stack
+            if (b.isLoopHeader()) {
+                RPOLoopVerification lv = new RPOLoopVerification((LoopBeginNode) b.getBeginNode());
+                openLoops[tos++] = lv;
+            }
+
+            // process this basic block
+            perBasicBlockOption.accept(b);
+
+            /*
+             * General note on the verification of loop exits: A loop exit node and a dominator tree
+             * loop exit are not necessarily the same, see javadoc of this method. Ideally, we would
+             * like to visit all dominator loop exits during RPO verification, however we do not
+             * know how many there are (given the deopt issue above), thus we just determine by the
+             * loop exit nodes seen.
+             */
+            boolean wasExit = predecessorBlockSequentialLoopExit(b);
+
+            FixedNode f = b.getBeginNode();
+            while (true) {
+                if (f instanceof LoopExitNode) {
+                    LoopBeginNode closedLoop = ((LoopExitNode) f).loopBegin();
+                    RPOLoopVerification lv = openLoops[tos - 1];
+                    assert lv.lb == closedLoop : "Must close inner loops first before closing other ones stackLoop=" + lv.lb + " exited loop=" + closedLoop + " block=" + b;
+                    if (!lv.allEndsVisited()) {
+                        throw GraalError.shouldNotReachHere(
+                                        "Loop ends should be visited before exits. This is a major error in the reverse post order of the control " +
+                                                        "flow graph of this method. This typically means wrongly specified control-split nodes have been processed in ReversePostOrder.java.");
+                    }
+                    lv.exitsVisited++;
+                    if (lv.loopFullyProcessed()) {
+                        loopClosedAction.accept(lv.lb);
+                        tos--;
+                    }
+                    wasExit = true;
+                }
+                if (f == b.getEndNode()) {
+                    break;
+                }
+                f = ((FixedWithNextNode) f).next();
+            }
+
+            if (b.isLoopEnd()) {
+                RPOLoopVerification lv = null;
+                LoopEndNode len = (LoopEndNode) b.getEndNode();
+                int index = tos - 1;
+                if (wasExit) {
+                    // irregular case a basic block that is a loop exit to an inner loop followed by
+                    // a loop end to an outer loop, while the inner loop potentially is not
+                    // finished, we still need to allow such cases since the code in the fraction
+                    // between loop exit inner and end outer is fine, it does not change the
+                    // verification logic since its a single basic block
+                    while (openLoops[index].lb != len.loopBegin()) {
+                        index--;
+                    }
+                    lv = openLoops[index];
+                } else {
+                    // regular case, this block contains a loop end to the inner most loop
+                    lv = openLoops[tos - 1];
+                }
+                LoopBeginNode closedLoop = ((LoopEndNode) b.getEndNode()).loopBegin();
+                assert lv.lb == closedLoop : "Must close inner loops first before closing other ones stackLoop=" + lv.lb + " ended loop=" + closedLoop + " block=" + b;
+                lv.endsVisited++;
+                if (lv.loopFullyProcessed()) {
+                    loopClosedAction.accept(lv.lb);
+                    // the current loop was exited but we also end an outer loop, find this one and
+                    // remove it from the verification stack since its done
+                    if (lv.lb != openLoops[tos - 1].lb) {
+                        // we actually finished the outer loop already completely through this
+                        // exit-end scenario, remove it from the stack
+                        RPOLoopVerification[] tmp = new RPOLoopVerification[openLoops.length];
+                        System.arraycopy(openLoops, 0, tmp, 0, index);
+                        System.arraycopy(openLoops, index + 1, tmp, index, openLoops.length - (index + 1));
+                        openLoops = tmp;
+                    }
+                    tos--;
+                }
+            }
+        }
+        assert tos == 0 : "Unfinished loops on stack " + tos;
+        return true;
+    }
+
+    /**
+     * Determine if sequential predecessor blocks of this block in a not-fully-canonicalized graph
+     * exit a loop.
+     *
+     * Example: Sequential basic block: loop exit -> invoke -> killing begin -> loopend/exit
+     *
+     * These cases cause problems in the {@link #verifyRPOInnerLoopsFirst()} loop verification of
+     * inner loop blocks because the granularity of loop ends and exits are not on block boundaries:
+     * a loop exit block can also be a loop end to an outer loop, which makes verification that the
+     * inner loop is fully processed before we process the rest of the outer loop tricky (since we
+     * already visit a loop end to an outer loop while we should first stricly process all loop
+     * ends/exits of inner loops).
+     */
+    private static boolean predecessorBlockSequentialLoopExit(Block b) {
+        Block cur = b;
+        // while cur has a single predecessor which has a single successor which is cur, i.e., a
+        // sequential successor, this typically only happens in not-fully-canonicalized graphs
+        while (cur.getPredecessorCount() == 1 && cur.getPredecessors()[0].getSuccessorCount() == 1) {
+            Block pred = cur.getPredecessors()[0];
+            FixedNode f = pred.getBeginNode();
+            while (true) {
+                if (f instanceof LoopExitNode) {
+                    return true;
+                }
+                if (f == pred.getEndNode()) {
+                    break;
+                }
+                f = ((FixedWithNextNode) f).next();
+            }
+            cur = cur.getPredecessors()[0];
+        }
+        return false;
+    }
+
     private void computeDominators() {
         assert reversePostOrder[0].getPredecessorCount() == 0 : "start block has no predecessor and therefore no dominator";
         Block[] blocks = reversePostOrder;
@@ -460,155 +679,215 @@ private void identifyBlock(Block block) {
         }
     }
 
-    /**
-     * Identify and connect blocks (including loop backward edges). Predecessors need to be in the
-     * order expected when iterating phi inputs.
-     */
-    private void identifyBlocks() {
-        // Find all block headers.
-        int numBlocks = 0;
-        for (AbstractBeginNode begin : graph.getNodes(AbstractBeginNode.TYPE)) {
-            Block block = new Block(begin);
-            identifyBlock(block);
-            numBlocks++;
+    private void finishLocalLoopFrequency(LoopBeginNode lb) {
+        calculateLocalLoopFrequency(lb);
+        for (LoopExitNode lex : lb.loopExits()) {
+            Block lexBlock = blockFor(lex);
+            assert lexBlock != null;
+            final double lexFrequency = lexBlock.getRelativeFrequency();
+            final double localLoopFrequency = localLoopFrequencyData.get(lb).getLoopFrequency();
+            /*
+             * While the local loop frequency is calculated without the predecessor frequency, the
+             * exit frequency needs to be adjusted already to compute any outer loop local
+             * frequencies correctly.
+             */
+            final double loopPredFrequency = blockFor(lb.forwardEnd()).relativeFrequency;
+            final double virginExitFrequency = multiplyRelativeFrequencies(lexFrequency, localLoopFrequency, loopPredFrequency);
+            // exit path, we set the exit probability
+            lexBlock.setRelativeFrequency(virginExitFrequency);
         }
+    }
 
-        // Compute reverse post order.
-        int count = 0;
-        NodeMap<Block> nodeMap = this.nodeToBlock;
-        Block[] stack = new Block[numBlocks];
-        int tos = 0;
-        Block startBlock = blockFor(graph.start());
-        stack[0] = startBlock;
-        startBlock.setPredecessors(Block.EMPTY_ARRAY);
-        do {
-            Block block = stack[tos];
-            int id = block.getId();
-            if (id == BLOCK_ID_INITIAL) {
-                // First time we see this block: push all successors.
-                FixedNode last = block.getEndNode();
-                if (last instanceof EndNode) {
-                    EndNode endNode = (EndNode) last;
-                    Block suxBlock = nodeMap.get(endNode.merge());
-                    if (suxBlock.getId() == BLOCK_ID_INITIAL) {
-                        stack[++tos] = suxBlock;
-                    }
-                    block.setSuccessors(new Block[]{suxBlock});
-                } else if (last instanceof IfNode) {
-                    IfNode ifNode = (IfNode) last;
-                    Block trueSucc = nodeMap.get(ifNode.trueSuccessor());
-                    stack[++tos] = trueSucc;
-                    Block falseSucc = nodeMap.get(ifNode.falseSuccessor());
-                    stack[++tos] = falseSucc;
-                    block.setSuccessors(new Block[]{trueSucc, falseSucc});
-                    Block[] ifPred = new Block[]{block};
-                    trueSucc.setPredecessors(ifPred);
-                    falseSucc.setPredecessors(ifPred);
-                } else if (last instanceof LoopEndNode) {
-                    LoopEndNode loopEndNode = (LoopEndNode) last;
-                    block.setSuccessors(new Block[]{nodeMap.get(loopEndNode.loopBegin())});
-                    // Nothing to do push onto the stack.
-                } else if (last instanceof ControlSinkNode) {
-                    block.setSuccessors(Block.EMPTY_ARRAY);
-                } else {
-                    assert !(last instanceof AbstractEndNode) : "Algorithm only supports EndNode and LoopEndNode.";
-                    int startTos = tos;
-                    Block[] ifPred = new Block[]{block};
-                    for (Node suxNode : last.successors()) {
-                        Block sux = nodeMap.get(suxNode);
-                        stack[++tos] = sux;
-                        sux.setPredecessors(ifPred);
-                    }
-                    int suxCount = tos - startTos;
-                    Block[] successors = new Block[suxCount];
-                    System.arraycopy(stack, startTos + 1, successors, 0, suxCount);
-                    block.setSuccessors(successors);
-                }
-                block.setId(BLOCK_ID_VISITED);
-                AbstractBeginNode beginNode = block.getBeginNode();
-                if (beginNode instanceof LoopBeginNode) {
-                    computeLoopPredecessors(nodeMap, block, (LoopBeginNode) beginNode);
-                } else if (beginNode instanceof AbstractMergeNode) {
-                    AbstractMergeNode mergeNode = (AbstractMergeNode) beginNode;
-                    int forwardEndCount = mergeNode.forwardEndCount();
-                    Block[] predecessors = new Block[forwardEndCount];
-                    for (int i = 0; i < forwardEndCount; ++i) {
-                        predecessors[i] = nodeMap.get(mergeNode.forwardEndAt(i));
-                    }
-                    block.setPredecessors(predecessors);
-                }
-
-            } else if (id == BLOCK_ID_VISITED) {
-                // Second time we see this block: All successors have been processed, so add block
-                // to result list. Can safely reuse the stack for this.
-                --tos;
-                count++;
-                int index = numBlocks - count;
-                stack[index] = block;
-                block.setId(index);
-            } else {
-                throw GraalError.shouldNotReachHere();
-            }
-        } while (tos >= 0);
-
-        // Compute reverse postorder and number blocks.
-        assert count == numBlocks : "all blocks must be reachable";
-        this.reversePostOrder = stack;
+    private void computeLocalLoopFrequencies() {
+        rpoInnerLoopsFirst(b -> {
+            perBasicBlockFrequencyAction(b, true);
+        }, lb -> {
+            finishLocalLoopFrequency(lb);
+        });
     }
 
-    private static void computeLoopPredecessors(NodeMap<Block> nodeMap, Block block, LoopBeginNode loopBeginNode) {
-        int forwardEndCount = loopBeginNode.forwardEndCount();
-        LoopEndNode[] loopEnds = loopBeginNode.orderedLoopEnds();
-        Block[] predecessors = new Block[forwardEndCount + loopEnds.length];
-        for (int i = 0; i < forwardEndCount; ++i) {
-            predecessors[i] = nodeMap.get(loopBeginNode.forwardEndAt(i));
+    private double calculateLocalLoopFrequency(LoopBeginNode lb) {
+        Block header = blockFor(lb);
+        assert header != null;
+        double loopEndFrequency = 0D;
+        ProfileSource source = ProfileSource.UNKNOWN;
+        for (LoopEndNode len : lb.loopEnds()) {
+            Block endBlock = blockFor(len);
+            assert endBlock != null;
+            assert endBlock.relativeFrequency >= 0D;
+            loopEndFrequency += endBlock.relativeFrequency;
+            source = source.combine(endBlock.frequencySource);
         }
-        for (int i = 0; i < loopEnds.length; ++i) {
-            predecessors[i + forwardEndCount] = nodeMap.get(loopEnds[i]);
+
+        loopEndFrequency = Math.min(1, loopEndFrequency);
+        loopEndFrequency = Math.max(ControlFlowGraph.MIN_RELATIVE_FREQUENCY, loopEndFrequency);
+
+        double loopFrequency = -1;
+        if (loopEndFrequency == 1D) {
+            // endless loop, loop with exit and deopt unconditionally after the exit
+            loopFrequency = MAX_RELATIVE_FREQUENCY;
+        } else {
+            double exitFrequency = 1D - loopEndFrequency;
+            loopFrequency = 1D / exitFrequency;
+
+            assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " endFrequency=" + loopEndFrequency;
+            assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " endFrequency=" + loopEndFrequency;
         }
-        block.setPredecessors(predecessors);
+        localLoopFrequencyData.put(lb, LoopFrequencyData.create(loopFrequency, source));
+        return loopFrequency;
     }
 
-    /**
-     * Computes the frequencies of all blocks relative to the start block. It uses the probability
-     * information attached to control flow splits to calculate the frequency of a block based on
-     * the frequency of its predecessor and the probability of its incoming control flow branch.
-     */
-    private void computeFrequencies() {
+    private void resetBlockFrequencies() {
+        for (Block block : reversePostOrder) {
+            block.setRelativeFrequency(0);
+        }
+    }
 
+    private void computeFrequenciesFromLocal() {
         for (Block block : reversePostOrder) {
-            Block[] predecessors = block.getPredecessors();
-
-            double relativeFrequency;
-            if (predecessors.length == 0) {
-                relativeFrequency = 1D;
-            } else if (predecessors.length == 1) {
-                Block pred = predecessors[0];
-                relativeFrequency = pred.relativeFrequency;
-                if (pred.getSuccessorCount() > 1) {
-                    assert pred.getEndNode() instanceof ControlSplitNode;
-                    ControlSplitNode controlSplit = (ControlSplitNode) pred.getEndNode();
-                    relativeFrequency = multiplyRelativeFrequencies(relativeFrequency, controlSplit.probability(block.getBeginNode()));
-                }
-            } else {
-                relativeFrequency = predecessors[0].relativeFrequency;
-                for (int i = 1; i < predecessors.length; ++i) {
-                    relativeFrequency += predecessors[i].relativeFrequency;
-                }
+            perBasicBlockFrequencyAction(block, false);
+        }
+    }
 
-                if (block.getBeginNode() instanceof LoopBeginNode) {
-                    LoopBeginNode loopBegin = (LoopBeginNode) block.getBeginNode();
-                    relativeFrequency = multiplyRelativeFrequencies(relativeFrequency, loopBegin.loopFrequency());
+    private void perBasicBlockFrequencyAction(Block b, boolean computingLocalLoopFrequencies) {
+        double relativeFrequency = -1D;
+        ProfileSource source = ProfileSource.UNKNOWN;
+        Block[] predecessors = b.getPredecessors();
+        if (predecessors.length == 0) {
+            relativeFrequency = 1D;
+        } else if (predecessors.length == 1) {
+            Block pred = predecessors[0];
+            relativeFrequency = pred.relativeFrequency;
+            if (pred.getSuccessorCount() > 1) {
+                assert pred.getEndNode() instanceof ControlSplitNode;
+                ControlSplitNode controlSplit = (ControlSplitNode) pred.getEndNode();
+                relativeFrequency = multiplyRelativeFrequencies(relativeFrequency, controlSplit.probability(b.getBeginNode()));
+                if (computingLocalLoopFrequencies) {
+                    source = controlSplit.getProfileData().getProfileSource();
                 }
             }
-            if (relativeFrequency < MIN_RELATIVE_FREQUENCY) {
-                relativeFrequency = MIN_RELATIVE_FREQUENCY;
-            } else if (relativeFrequency > MAX_RELATIVE_FREQUENCY) {
-                relativeFrequency = MAX_RELATIVE_FREQUENCY;
+        } else {
+            relativeFrequency = predecessors[0].relativeFrequency;
+            for (int i = 1; i < predecessors.length; ++i) {
+                relativeFrequency += predecessors[i].relativeFrequency;
+                if (computingLocalLoopFrequencies) {
+                    if (predecessors[i].frequencySource != null) {
+                        source = source.combine(predecessors[i].frequencySource);
+                    }
+                }
+            }
+            if (b.getBeginNode() instanceof LoopBeginNode) {
+                if (computingLocalLoopFrequencies) {
+                    // start with a "local" loop, i.e., assume no dominating code with different
+                    // frequencies
+                    relativeFrequency = 1D;
+                    source = ProfileSource.UNKNOWN;
+                } else {
+                    // take the previously computed local frequency
+                    LoopBeginNode loopBegin = (LoopBeginNode) b.getBeginNode();
+                    relativeFrequency = multiplyRelativeFrequencies(relativeFrequency, localLoopFrequencyData.get(loopBegin).getLoopFrequency());
+                }
             }
-            block.setRelativeFrequency(relativeFrequency);
         }
+        if (relativeFrequency < MIN_RELATIVE_FREQUENCY) {
+            relativeFrequency = MIN_RELATIVE_FREQUENCY;
+        } else if (relativeFrequency > MAX_RELATIVE_FREQUENCY) {
+            relativeFrequency = MAX_RELATIVE_FREQUENCY;
+        }
+        b.setRelativeFrequency(relativeFrequency);
+        if (computingLocalLoopFrequencies) {
+            b.setFrequencySource(source);
+        }
+    }
+
+    //@formatter:off
+    /*
+     * Compute the frequency data for the entire control flow graph.
+     * In the following documentation the term "local loop frequency" describes the frequency of a loop
+     * without any enclosing code, i.e., the loop in a form where it is not dominated by any other control flow.
+     *
+     * The real frequency of a loop is then the result of multiplying the local loop frequency with the frequency
+     * of the basic block dominating the loop.
+     *
+     * Consider the following CFG:
+     *
+     *
+     *
+     *                                [B0: Loop 1 Header]
+     *                                        |
+     *                                     [B1:if]
+     *                                      /  \
+     *                    [B2: Loop 2 Header]  [B9: Loop Exit Loop1 + Return]
+     *                              |
+     *                          [B3: If]
+     *                           /    \
+     *         [B4: LoopEnd Loop2]    [B5: LoopExit Loop2 + If]
+     *                                         /     \
+     *                                      [B6]     [B7]
+     *                                         \     /
+     *                                [B8:Merge + LoopEnd Loop1]
+     *
+     *
+     *  The frequency of the loop exit basic blocks depends on the frequency of the loop header.
+     *  Why? Because the loop header is visited multiple times so the frequency of the loop exit block
+     *  has to be multiplied by the frequency of the loop header (which is the frequency of all loop
+     *  end blocks combined). The frequency of the loop header can be derived by summing up the frequency
+     *  of all loop end blocks which gives us the frequency for exiting the loop (1- sumLoopEndFrequency).
+     *  The frequency of the loop can then be calculated by 1 / frequencyToExitTheLoop.
+     *
+     *  In a final step we  multiply the frequency of each exit with the frequency to exit the overall
+     *  loop to account for the loop frequency.
+     *
+     *  Ideally we would only process all basic blocks once here, however, given that the frequency of an
+     *  outer loop depends on loop end frequencies which can depend on the frequency of inner loops,
+     *  we either ensure to process inner loops first or perform the entire process until a fix point is reached.
+     *
+     *  However, we can utilize a "smart" reverse post order with inner loops first to reach that goal.
+     *
+     *  Graph theory states that there are multiple correct reverse post order (RPO) traversals
+     *  for any given graph. Consider for example the following RPO for the CFG above:
+     *      [B0,B1,B2,B3,B4,B5,B6,B7,B8,B9]
+     *
+     *  The inner loop is sequentially in the traversal, thus we can compute its local frequency and
+     *  then propagate it outwards by processing the entire CFG once again.
+     *
+     *  However, there are other valid RPOs that do not allow a single pass over all loops to calculate local
+     *  frequencies: e.g. [B0,B1,B9,B2,B3,B5,B6,B7,B8,B4], thus this phase ensures that we have the "right" RPO.
+     *
+     *  Implementation notes:
+     *  The algorithm to compute the loop frequencies works in two passes: the first pass computes
+     *  the local loop frequencies, i.e., for every loop predecessor block a relative frequency of 1
+     *  is assumed, then the frequency inside the loop is propagated and multiplied by control split
+     *  probabilities. If a loop is finished the exit frequency is set accordingly.
+     *
+     *  The second pass then propagates relative frequencies into the entire CFG by using the,
+     *  already correct, local loop frequencies for the body of the loop.
+     */
+    //@formatter:on
+    private void computeFrequencies() {
+        /*
+         * General note: While it is not verified that the reverse post order contains inner loops
+         * first yet, this will be verified once we calculate dominance information, thus we should
+         * be good here.
+         */
+        localLoopFrequencyData = EconomicMap.create();
+
+        // pass 1 compute "local" loop frequencies, i.e., the actual frequency of each self
+        // contained loop, inner loops first, then outer loops
+        computeLocalLoopFrequencies();
 
+        // reset everything again
+        resetBlockFrequencies();
+
+        // pass 2 propagate the outer frequencies into the inner ones multiplying the local loop
+        // frequencies by the loop predecessor frequencies
+        computeFrequenciesFromLocal();
+
+        if (Assertions.assertionsEnabled()) {
+            for (Block block : reversePostOrder) {
+                assert block.getRelativeFrequency() >= 0 : "Must have a relative frequency set, block " + block;
+            }
+        }
     }
 
     private void computeLoopInformation() {
@@ -758,6 +1037,10 @@ public void setNodeToBlock(NodeMap<Block> nodeMap) {
         this.nodeToBlock = nodeMap;
     }
 
+    public static double multiplyRelativeFrequencies(double a, double b, double c) {
+        return multiplyRelativeFrequencies(multiplyRelativeFrequencies(a, b), c);
+    }
+
     /**
      * Multiplies a and b and clamps the between {@link ControlFlowGraph#MIN_RELATIVE_FREQUENCY} and
      * {@link ControlFlowGraph#MAX_RELATIVE_FREQUENCY}.
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java
new file mode 100644
index 000000000000..3711039030ef
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.nodes.cfg;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.Iterator;
+
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.collections.Equivalence;
+import org.graalvm.collections.MapCursor;
+import org.graalvm.compiler.debug.Assertions;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
+import org.graalvm.compiler.graph.NodeMap;
+import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.AbstractEndNode;
+import org.graalvm.compiler.nodes.AbstractMergeNode;
+import org.graalvm.compiler.nodes.ControlSinkNode;
+import org.graalvm.compiler.nodes.ControlSplitNode;
+import org.graalvm.compiler.nodes.EndNode;
+import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.LoopBeginNode;
+import org.graalvm.compiler.nodes.LoopEndNode;
+import org.graalvm.compiler.nodes.LoopExitNode;
+import org.graalvm.compiler.nodes.MergeNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.Simplifiable;
+
+/**
+ * Utility class computing a reverse post order of the {@link ControlFlowGraph}.
+ *
+ * The block order is special in that {@linkplain LoopEndNode blocks} are processed before
+ * {@linkplain LoopExitNode blocks}. This has the advantage that for
+ * {@linkplain Block#getRelativeFrequency() basic block frequency calculations} nested loops are
+ * processed before the outer loop exit blocks allowing a linear computation of loop frequencies.
+ */
+public class ReversePostOrder {
+
+    /**
+     * Utility class for eager basic block creation. The CFG will create the shortest possible basic
+     * blocks within the given control flow graph: this class has to ensure that predecessor and
+     * successor blocks are set accordingly.
+     *
+     * "Shortest" possible is a special case in that, if a {@link StructuredGraph} is not fully
+     * {@linkplain Canonicalizable canonicalized}, i.e., it contains redundant
+     * {@link AbstractBeginNode}, each {@link AbstractBeginNode} will form a new basic block.
+     *
+     * This is necessary given that we do not want to run a full canonicalization and CFG
+     * {@linkplain Simplifiable simplification}} every time to compute the {@link ControlFlowGraph}.
+     */
+    private static class TraversalQueueHandler {
+        private final ControlFlowGraph cfg;
+        /**
+         * The result reverse post order block list.
+         */
+        private final Block[] reversePostOrder;
+        /**
+         * Index of the next block to be added to {@link #reversePostOrder}.
+         */
+        private int nextBlockIndex;
+        private final NodeMap<Block> nodeMap;
+
+        TraversalQueueHandler(ControlFlowGraph cfg, int numBlocks) {
+            this.cfg = cfg;
+            this.nodeMap = cfg.getNodeToBlock();
+            reversePostOrder = new Block[numBlocks];
+            nextBlockIndex = 0;
+        }
+
+        /**
+         * Graal IR has certain requirements with respect to what can be a
+         * {@link Block#getBeginNode()} and {@link Block#getEndNode()}: Every
+         * {@link AbstractBeginNode} forms a new {@link Block}. This method must ensure
+         * {@link Block#getPredecessors()} and {@link Block#getSuccessors()} are set accordingly.
+         */
+        protected Block potentiallySplitBlock(FixedNode currentNode, Block currentBlock) {
+            assert currentBlock != null : "Block must not be null for node " + currentNode;
+            if (currentBlock.getBeginNode() == currentNode) {
+                /*
+                 * We process a block begin node add the block to the next index in the traversal
+                 * and set the predecessors accordingly.
+                 */
+                Block b = cfg.blockFor(currentNode);
+                reversePostOrder[nextBlockIndex] = b;
+                b.setId(nextBlockIndex);
+                nextBlockIndex++;
+
+                if (currentNode instanceof LoopBeginNode) {
+                    computeLoopPredecessors(nodeMap, currentBlock, (LoopBeginNode) currentNode);
+                } else if (currentNode instanceof AbstractMergeNode) {
+                    AbstractMergeNode mergeNode = (AbstractMergeNode) currentNode;
+                    int forwardEndCount = mergeNode.forwardEndCount();
+                    Block[] predecessors = new Block[forwardEndCount];
+                    for (int i = 0; i < forwardEndCount; ++i) {
+                        predecessors[i] = nodeMap.get(mergeNode.forwardEndAt(i));
+                    }
+                    currentBlock.setPredecessors(predecessors);
+                }
+            }
+            if (currentBlock.getEndNode() == currentNode) {
+                /**
+                 * We process a block end node: create the necessary successor and set them
+                 * accordingly.
+                 */
+                if (currentNode instanceof EndNode) {
+                    // next node is a merge, update successors
+                    EndNode endNode = (EndNode) currentNode;
+                    Block suxBlock = nodeMap.get(endNode.merge());
+                    currentBlock.setSuccessors(new Block[]{suxBlock});
+                } else if (currentNode instanceof ControlSplitNode) {
+                    // next is a split, set successors and predecessors accordingly for the split
+                    ArrayList<Block> succ = new ArrayList<>();
+                    Block[] ifPred = new Block[]{currentBlock};
+                    for (Node sux : currentNode.successors()) {
+                        Block sucBlock = nodeMap.get(sux);
+                        succ.add(sucBlock);
+                        sucBlock.setPredecessors(ifPred);
+                    }
+                    currentBlock.setSuccessors(succ.toArray(new Block[succ.size()]));
+                } else if (currentNode instanceof LoopEndNode) {
+                    LoopEndNode loopEndNode = (LoopEndNode) currentNode;
+                    currentBlock.setSuccessors(new Block[]{nodeMap.get(loopEndNode.loopBegin())});
+                } else if (currentNode instanceof ControlSinkNode) {
+                    currentBlock.setSuccessors(Block.EMPTY_ARRAY);
+                } else {
+                    assert !(currentNode instanceof AbstractEndNode) : "Algorithm only supports EndNode and LoopEndNode.";
+                    Block[] ifPred = new Block[]{currentBlock};
+                    for (Node suxNode : currentNode.successors()) {
+                        Block sux = nodeMap.get(suxNode);
+                        sux.setPredecessors(ifPred);
+                    }
+                    assert currentNode.successors().count() == 1 : "Node " + currentNode;
+                    Block sequentialSuc = nodeMap.get(currentNode.successors().first());
+                    currentBlock.setSuccessors(new Block[]{sequentialSuc});
+                    return sequentialSuc;
+                }
+            }
+            return currentBlock;
+        }
+
+        private LoopInfo processLoop(LoopBeginNode loop) {
+            EconomicMap<FixedNode, Block> blockEndStates = apply(this, loop, cfg.blockFor(loop), loop);
+            LoopInfo info = new LoopInfo(loop.loopEnds().count(), loop.loopExits().count());
+            for (LoopEndNode end : loop.loopEnds()) {
+                if (blockEndStates.containsKey(end)) {
+                    info.endStates.put(end, blockEndStates.get(end));
+                    blockEndStates.removeKey(end);
+                }
+            }
+            for (LoopExitNode exit : loop.loopExits()) {
+                if (blockEndStates.containsKey(exit)) {
+                    info.exitStates.put(exit, blockEndStates.get(exit));
+                    blockEndStates.removeKey(exit);
+                }
+            }
+            /*
+             * Deopt grouping can create loop exits without loop exit nodes that do not sink but
+             * merge
+             */
+            for (FixedNode f : blockEndStates.getKeys()) {
+                info.naturalExits.put(f, blockEndStates.get(f));
+            }
+            return info;
+        }
+
+        private Block enqueBlockUnconditionally(FixedNode newBlockBegin) {
+            return cfg.blockFor(newBlockBegin);
+        }
+
+    }
+
+    private static class LoopInfo {
+        public final EconomicMap<LoopEndNode, Block> endStates;
+        public final EconomicMap<LoopExitNode, Block> exitStates;
+        public final EconomicMap<FixedNode, Block> naturalExits;
+
+        LoopInfo(int endCount, int exitCount) {
+            endStates = EconomicMap.create(Equivalence.IDENTITY, endCount);
+            exitStates = EconomicMap.create(Equivalence.IDENTITY, exitCount);
+            naturalExits = EconomicMap.create(Equivalence.IDENTITY, exitCount);
+        }
+    }
+
+    private static EconomicMap<FixedNode, Block> apply(TraversalQueueHandler traversalHandler, FixedNode start, Block initialBlock, LoopBeginNode boundary) {
+        assert start != null;
+        Deque<AbstractBeginNode> nodeQueue = new ArrayDeque<>();
+        EconomicMap<FixedNode, Block> blockEndStates = EconomicMap.create(Equivalence.IDENTITY);
+
+        Block currentBlock = initialBlock;
+
+        FixedNode currentFixedNode = start;
+
+        do {
+            while (currentFixedNode instanceof FixedWithNextNode) {
+                if (boundary != null && currentFixedNode instanceof LoopExitNode && ((LoopExitNode) currentFixedNode).loopBegin() == boundary) {
+                    blockEndStates.put(currentFixedNode, currentBlock);
+                    currentFixedNode = null;
+                } else {
+                    FixedNode next = ((FixedWithNextNode) currentFixedNode).next();
+                    currentBlock = traversalHandler.potentiallySplitBlock(currentFixedNode, currentBlock);
+                    currentFixedNode = next;
+                }
+            }
+
+            if (currentFixedNode != null) {
+                currentBlock = traversalHandler.potentiallySplitBlock(currentFixedNode, currentBlock);
+
+                Iterator<Node> successors = currentFixedNode.successors().iterator();
+                if (!successors.hasNext()) {
+                    if (currentFixedNode instanceof LoopEndNode) {
+                        blockEndStates.put(currentFixedNode, currentBlock);
+                    } else if (currentFixedNode instanceof EndNode) {
+                        // add the end node and see if the merge is ready for processing
+                        AbstractMergeNode merge = ((EndNode) currentFixedNode).merge();
+                        if (merge instanceof LoopBeginNode) {
+                            Block toProcess = processLoop(merge, currentFixedNode, currentBlock, blockEndStates, nodeQueue, traversalHandler);
+                            if (toProcess != null) {
+                                currentBlock = toProcess;
+                            }
+                        } else {
+                            if (endsVisited(merge, currentFixedNode, blockEndStates)) {
+                                currentBlock = merge(merge, currentFixedNode, currentBlock, blockEndStates, nodeQueue, traversalHandler);
+                            } else {
+                                assert !blockEndStates.containsKey(currentFixedNode);
+                                blockEndStates.put(currentFixedNode, currentBlock);
+                            }
+                        }
+                    }
+                } else {
+                    FixedNode firstSuccessor = (FixedNode) successors.next();
+                    if (!successors.hasNext()) {
+                        if (currentFixedNode instanceof ControlSplitNode) {
+                            // strange split with a single successor, do not record the block end
+                            // state since we will immediately process the next block
+                            currentBlock = traversalHandler.enqueBlockUnconditionally(firstSuccessor);
+                        }
+                        currentFixedNode = firstSuccessor;
+                        continue;
+                    } else {
+                        // first direct successor
+                        currentBlock = traversalHandler.enqueBlockUnconditionally(firstSuccessor);
+                        nodeQueue.addLast((AbstractBeginNode) firstSuccessor);
+                        blockEndStates.put(firstSuccessor, currentBlock);
+                        do {
+                            AbstractBeginNode successor = (AbstractBeginNode) successors.next();
+                            Block successorState = traversalHandler.enqueBlockUnconditionally(successor);
+                            blockEndStates.put(successor, successorState);
+                            nodeQueue.addLast(successor);
+
+                        } while (successors.hasNext());
+                    }
+
+                }
+            }
+            if (nodeQueue.isEmpty()) {
+                return blockEndStates;
+            } else {
+                currentFixedNode = nodeQueue.removeFirst();
+                assert blockEndStates.containsKey(currentFixedNode);
+                currentBlock = blockEndStates.removeKey(currentFixedNode);
+            }
+        } while (true);
+    }
+
+    private static Block processLoop(AbstractMergeNode merge, FixedNode currentFixedNode, Block currentBlock, EconomicMap<FixedNode, Block> blockEndStates, Deque<AbstractBeginNode> nodeQueue,
+                    TraversalQueueHandler blockSplitter) {
+
+        Block nextCurrentBlock = null;
+        LoopInfo loopInfo = blockSplitter.processLoop((LoopBeginNode) merge);
+        EconomicMap<LoopExitNode, Block> loopExitState = loopInfo.exitStates;
+        MapCursor<LoopExitNode, Block> entry = loopExitState.getEntries();
+
+        // process loop exit blocks in their increasing node id next
+        ArrayList<LoopExitNode> lexs = new ArrayList<>();
+        while (entry.advance()) {
+            blockEndStates.put(entry.getKey(), entry.getValue());
+            lexs.add(entry.getKey());
+        }
+        for (int i = lexs.size() - 1; i >= 0; i--) {
+            // process loop exits next
+            nodeQueue.addFirst(lexs.get(i));
+        }
+        MapCursor<FixedNode, Block> naturalExits = loopInfo.naturalExits.getEntries();
+        while (naturalExits.advance()) {
+            FixedNode naturalExit = naturalExits.getKey();
+            if (naturalExit instanceof EndNode) {
+                blockEndStates.put(naturalExit, naturalExits.getValue());
+                MergeNode mergeAfter = (MergeNode) ((EndNode) naturalExit).merge();
+                if (endsVisited(mergeAfter, currentFixedNode, blockEndStates)) {
+                    nextCurrentBlock = merge(mergeAfter, currentFixedNode, currentBlock, blockEndStates, nodeQueue, blockSplitter);
+                }
+            } else {
+                GraalError.shouldNotReachHere("Can only exit a loop " + merge + " naturally with a merge without a loop exit " + naturalExit);
+            }
+        }
+
+        return nextCurrentBlock;
+    }
+
+    private static boolean endsVisited(AbstractMergeNode merge, FixedNode currentFixedNode, EconomicMap<FixedNode, Block> blockEndStates) {
+        for (AbstractEndNode forwardEnd : merge.forwardEnds()) {
+            if (forwardEnd != currentFixedNode && !blockEndStates.containsKey(forwardEnd)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static Block merge(AbstractMergeNode merge, FixedNode currentFixedNode, Block currentBlock, EconomicMap<FixedNode, Block> blockEndStates, Deque<AbstractBeginNode> nodeQueue,
+                    TraversalQueueHandler blockSplitter) {
+        ArrayList<Block> states = new ArrayList<>(merge.forwardEndCount());
+        for (int i = 0; i < merge.forwardEndCount(); i++) {
+            AbstractEndNode forwardEnd = merge.forwardEndAt(i);
+            assert forwardEnd == currentFixedNode || blockEndStates.containsKey(forwardEnd);
+            Block other = forwardEnd == currentFixedNode ? currentBlock : blockEndStates.removeKey(forwardEnd);
+            states.add(other);
+        }
+        Block nextCurrentBlock = blockSplitter.enqueBlockUnconditionally(merge);
+        nodeQueue.addLast(merge);
+        blockEndStates.put(merge, nextCurrentBlock);
+        return nextCurrentBlock;
+    }
+
+    private static void computeLoopPredecessors(NodeMap<Block> nodeMap, Block block, LoopBeginNode loopBeginNode) {
+        int forwardEndCount = loopBeginNode.forwardEndCount();
+        LoopEndNode[] loopEnds = loopBeginNode.orderedLoopEnds();
+        Block[] predecessors = new Block[forwardEndCount + loopEnds.length];
+        for (int i = 0; i < forwardEndCount; ++i) {
+            predecessors[i] = nodeMap.get(loopBeginNode.forwardEndAt(i));
+        }
+        for (int i = 0; i < loopEnds.length; ++i) {
+            predecessors[i + forwardEndCount] = nodeMap.get(loopEnds[i]);
+        }
+        block.setPredecessors(predecessors);
+    }
+
+    public static Block[] identifyBlocks(ControlFlowGraph cfg, int numBlocks) {
+        NodeMap<Block> nodeMap = cfg.getNodeToBlock();
+        TraversalQueueHandler c = new TraversalQueueHandler(cfg, numBlocks);
+        Block startBlock = cfg.blockFor(cfg.graph.start());
+        startBlock.setPredecessors(Block.EMPTY_ARRAY);
+        apply(c, cfg.graph.start(), startBlock, null);
+        if (Assertions.detailedAssertionsEnabled(cfg.graph.getOptions())) {
+            outer: for (Block b : nodeMap.getValues()) {
+                for (int i = 0; i < c.reversePostOrder.length; i++) {
+                    if (c.reversePostOrder[i] == b) {
+                        continue outer;
+                    }
+                }
+                GraalError.shouldNotReachHere("No mapping in reverse post oder for block " + b);
+            }
+            for (int i = 0; i < c.reversePostOrder.length; i++) {
+                assert c.reversePostOrder[i] != null : "Null entry for block " + i + " Blocks " + Arrays.toString(c.reversePostOrder);
+                assert c.reversePostOrder[i].getPredecessors() != null : "Pred null for block " + c.reversePostOrder[i];
+                assert c.reversePostOrder[i].getSuccessors() != null : "Succ null for block " + c.reversePostOrder[i];
+            }
+        }
+        return c.reversePostOrder;
+    }
+
+}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java
index d8cf93ae83ea..bb77250f3c1c 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java
@@ -204,7 +204,7 @@ public boolean shouldPartiallyUnroll(LoopEx loop, CoreProviders providers) {
         int size = Math.max(1, loop.size() - 1 - loop.loopBegin().phis().count());
         int unrollFactor = loopBegin.getUnrollFactor();
         if (unrollFactor == 1) {
-            double loopFrequency = loopBegin.loopFrequency();
+            double loopFrequency = loop.localLoopFrequency();
             if (loopBegin.isSimpleLoop() && loopFrequency < 5.0) {
                 loopBegin.getDebug().log(DebugContext.VERBOSE_LEVEL, "shouldPartiallyUnroll %s frequency too low %s ", loopBegin, loopFrequency);
                 return false;
@@ -239,7 +239,7 @@ public boolean shouldPartiallyUnroll(LoopEx loop, CoreProviders providers) {
     @Override
     public boolean shouldTryUnswitch(LoopEx loop) {
         LoopBeginNode loopBegin = loop.loopBegin();
-        double loopFrequency = loopBegin.loopFrequency();
+        double loopFrequency = loop.localLoopFrequency();
         if (loopFrequency <= 1.0) {
             return false;
         }
@@ -285,7 +285,7 @@ public UnswitchingDecision shouldUnswitch(LoopEx loop, List<ControlSplitNode> co
         int inBranchTotal = branchNodes.count();
 
         CountingClosure stateNodesCount = new CountingClosure();
-        double loopFrequency = loop.loopBegin().loopFrequency();
+        double loopFrequency = loop.localLoopFrequency();
         OptionValues options = loop.loopBegin().getOptions();
         int maxDiff = Options.LoopUnswitchTrivial.getValue(options) + (int) (Options.LoopUnswitchFrequencyBoost.getValue(options) * (loopFrequency - 1.0 + phis));
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
index 9a48948cc5c8..a2b1ccc42269 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopEx.java
@@ -57,6 +57,7 @@
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.ValuePhiNode;
+import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
 import org.graalvm.compiler.nodes.calc.CompareNode;
@@ -90,6 +91,14 @@ protected LoopEx(Loop<Block> loop, LoopsData data) {
         this.data = data;
     }
 
+    public double localLoopFrequency() {
+        return data.getCFG().localLoopFrequency(loopBegin());
+    }
+
+    public ProfileSource localFrequencySource() {
+        return data.getCFG().localLoopFrequencySource(loopBegin());
+    }
+
     public Loop<Block> loop() {
         return loop;
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java
index fc7619bd48d2..2bb380b9789d 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java
@@ -233,7 +233,6 @@ public void insertWithinAfter(LoopEx loop, EconomicMap<LoopBeginNode, OpaqueNode
             }
         }
         mainLoopBegin.setUnrollFactor(mainLoopBegin.getUnrollFactor() * 2);
-        mainLoopBegin.setLoopFrequency(mainLoopBegin.profileData().scaleFrequency(1 / 2.0));
         graph.getDebug().dump(DebugContext.DETAILED_LEVEL, graph, "LoopPartialUnroll %s", loop);
 
         mainLoopBegin.getDebug().dump(DebugContext.VERBOSE_LEVEL, mainLoopBegin.graph(), "After insertWithinAfter %s", mainLoopBegin);
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
index 55b090988e88..e8981b2caf8e 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
@@ -42,6 +42,7 @@
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.StartNode;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 
 /**
  * Compute relative frequencies for fixed nodes on the fly and cache them at
@@ -101,10 +102,12 @@ public double applyAsDouble(FixedNode node) {
             return cachedValue;
         }
 
+        ControlFlowGraph cfg = ControlFlowGraph.compute(node.graph(), false, false, false, false);
+
         double relativeFrequency = 0.0;
         if (current.predecessor() == null) {
             if (current instanceof AbstractMergeNode) {
-                relativeFrequency = handleMerge(current, relativeFrequency);
+                relativeFrequency = handleMerge(current, relativeFrequency, cfg);
             } else {
                 assert current instanceof StartNode;
                 relativeFrequency = 1D;
@@ -118,7 +121,7 @@ public double applyAsDouble(FixedNode node) {
         return relativeFrequency;
     }
 
-    private double handleMerge(FixedNode current, double relativeFrequency) {
+    private double handleMerge(FixedNode current, double relativeFrequency, ControlFlowGraph cfg) {
         double result = relativeFrequency;
         AbstractMergeNode currentMerge = (AbstractMergeNode) current;
         NodeInputList<EndNode> currentForwardEnds = currentMerge.forwardEnds();
@@ -130,7 +133,7 @@ private double handleMerge(FixedNode current, double relativeFrequency) {
             result += applyAsDouble(endNode);
         }
         if (current instanceof LoopBeginNode) {
-            result = multiplyRelativeFrequencies(result, ((LoopBeginNode) current).loopFrequency());
+            result = multiplyRelativeFrequencies(result, cfg.localLoopFrequency(((LoopBeginNode) current)));
         }
         return result;
     }
diff --git a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
index 343a6463af3c..6891f7af3e48 100644
--- a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
+++ b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
@@ -58,6 +58,7 @@
 import org.graalvm.compiler.nodes.ControlSinkNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.PhiNode;
 import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -246,6 +247,15 @@ public void nodeProperties(GraphInfo info, Node node, Map<String, Object> props)
             }
         }
 
+        if (info.cfg != null) {
+            if (node instanceof LoopBeginNode) {
+                // check if cfg is up to date
+                if (info.cfg.getLocalLoopFrequencyData().containsKey((LoopBeginNode) node)) {
+                    props.put("localLoopFrequency", info.cfg.localLoopFrequency((LoopBeginNode) node));
+                }
+            }
+        }
+
         if (node instanceof ControlSinkNode) {
             props.put("category", "controlSink");
         } else if (node instanceof ControlSplitNode) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java
index 305730f02adc..f3e588ee394a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java
@@ -49,7 +49,6 @@
 import org.graalvm.compiler.debug.TimerKey;
 import org.graalvm.compiler.graph.SourceLanguagePosition;
 import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.java.ComputeLoopFrequenciesClosure;
 import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.DeoptimizeNode;
@@ -351,8 +350,6 @@ public final StructuredGraph evaluate(Request request) {
                 inliningGraphPE(request);
                 assert GraphOrder.assertSchedulableGraph(request.graph) : "PE result must be schedulable in order to apply subsequent phases";
                 truffleTier(request);
-                // recompute loop frequencies now that BranchProbabilities have been canonicalized
-                ComputeLoopFrequenciesClosure.compute(request.graph);
                 applyInstrumentationPhases(request);
                 handler.reportPerformanceWarnings(request.compilable, request.graph);
                 if (request.task.isCancelled()) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java
index 7b89c3bba841..213c069afabb 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java
@@ -24,22 +24,23 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.test.ReflectionUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
 import org.graalvm.compiler.truffle.compiler.phases.InstrumentPhase;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
 import org.graalvm.compiler.truffle.test.nodes.RootTestNode;
+import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import org.graalvm.polyglot.Context;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import com.oracle.truffle.api.test.ReflectionUtils;
 
 public class InstrumentBranchesPhaseTest extends PartialEvaluationTest {
 
@@ -52,11 +53,14 @@ public SimpleIfTestNode(int constant) {
 
         @Override
         public int execute(VirtualFrame frame) {
+            int res;
             if (constant < 0) {
-                return -1 * constant;
+                res = -1 * constant;
             } else {
-                return 1;
+                res = 1;
             }
+            GraalDirectives.controlFlowAnchor();
+            return res;
         }
     }
 
@@ -124,7 +128,7 @@ private InstrumentPhase.Instrumentation getInstrumentation(OptimizedCallTarget t
     public void twoIfsTest() {
         FrameDescriptor descriptor = new FrameDescriptor();
         TwoIfsTestNode result = new TwoIfsTestNode(5, -1);
-        RootTestNode rootNode = new RootTestNode(descriptor, "twoIfsRoot", result);
+        RootTestNode rootNode = new RootTestNode(descriptor, "twoIfsRoot", result, true);
         OptimizedCallTarget target = compileHelper("twoIfsRoot", rootNode, new Object[0]);
         Assert.assertTrue(target.isValid());
         // We run this twice to make sure that it comes first in the sorted access list.
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
index ba3a573974c7..5456c05dd8e9 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
@@ -30,6 +30,7 @@
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
@@ -106,8 +107,9 @@ public void testLoopConditionProfile() {
 
         List<LoopBeginNode> loopBegins = graph.getNodes().filter(LoopBeginNode.class).snapshot();
         Assert.assertEquals(loopBegins.toString(), 1, loopBegins.size());
+        ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, false, false, false);
         for (LoopBeginNode loopBegin : loopBegins) {
-            Assert.assertEquals("Expected loop frequency", 10.0, loopBegin.loopFrequency(), 0.01);
+            Assert.assertEquals("Expected loop frequency", 10.0, cfg.localLoopFrequency(loopBegin), 0.01);
         }
     }
 
@@ -129,8 +131,9 @@ public void testPrepareLoopForAOT() {
 
         List<LoopBeginNode> loopBegins = graph.getNodes().filter(LoopBeginNode.class).snapshot();
         Assert.assertEquals(loopBegins.toString(), 1, loopBegins.size());
+        ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, false, false, false);
         for (LoopBeginNode loopBegin : loopBegins) {
-            Assert.assertEquals("Expected loop frequency", 2.0, loopBegin.loopFrequency(), 0.01);
+            Assert.assertEquals("Expected loop frequency", 2.0, cfg.localLoopFrequency(loopBegin), 0.01);
         }
 
         target.compile(true);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java
index 72a9ecce3660..78d0f7644e1b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java
@@ -225,8 +225,8 @@ public void unrollUntilReturnNestedLoopsContinueOuter01() {
         FrameDescriptor fd = new FrameDescriptor();
         final int loopIterations = 2;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
-        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter01(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter01(), new ConstantTestNode(37), true);
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         Assert.assertEquals(UnrollingTestNode.INSIDE_LOOP_MARKER, 4, UnrollingTestNode.countBlackholeNodes(peResult, UnrollingTestNode.INSIDE_LOOP_MARKER));
@@ -238,8 +238,8 @@ public void unrollUntilReturnNestedLoopsContinueOuter02() {
         FrameDescriptor fd = new FrameDescriptor();
         final int loopIterations = 2;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
-        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter02(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter02(), new ConstantTestNode(37), true);
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         Assert.assertEquals(UnrollingTestNode.INSIDE_LOOP_MARKER, 8, UnrollingTestNode.countBlackholeNodes(peResult, UnrollingTestNode.INSIDE_LOOP_MARKER));
@@ -251,8 +251,8 @@ public void unrollUntilReturnNestedLoopsContinueOuter03() {
         FrameDescriptor fd = new FrameDescriptor();
         final int loopIterations = 2;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
-        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter03(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter03(), new ConstantTestNode(37), true);
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         Assert.assertEquals(UnrollingTestNode.INSIDE_LOOP_MARKER, 4, UnrollingTestNode.countBlackholeNodes(peResult, UnrollingTestNode.INSIDE_LOOP_MARKER));
@@ -264,8 +264,8 @@ public void unrollUntilReturnNestedLoopsContinueOuter04() {
         FrameDescriptor fd = new FrameDescriptor();
         final int loopIterations = 2;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
-        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter04(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter04(), new ConstantTestNode(37), true);
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         Assert.assertEquals(UnrollingTestNode.INSIDE_LOOP_MARKER, 4, UnrollingTestNode.countBlackholeNodes(peResult, UnrollingTestNode.INSIDE_LOOP_MARKER));
@@ -277,8 +277,8 @@ public void unrollUntilReturnNestedLoopsContinueOuter05() {
         FrameDescriptor fd = new FrameDescriptor();
         final int loopIterations = 2;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
-        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter05(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        AbstractTestNode result = new AddTestNode(t.new FullUnrollUntilReturnNestedLoopsContinueOuter05(), new ConstantTestNode(37), true);
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         Assert.assertEquals(UnrollingTestNode.INSIDE_LOOP_MARKER, 6, UnrollingTestNode.countBlackholeNodes(peResult, UnrollingTestNode.INSIDE_LOOP_MARKER));
@@ -458,7 +458,7 @@ public void complexUnrollFullUnrollUntilReturn() {
         final int loopIterations = 5;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
         AbstractTestNode result = new AddTestNode(t.new Unroll01(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
         //@formatter:off
         /*
@@ -499,7 +499,7 @@ public void complexUnrollFullExplodeUntilReturn() throws Exception {
         final int loopIterations = 5;
         UnrollingTestNode t = new UnrollingTestNode(loopIterations);
         AbstractTestNode result = new AddTestNode(t.new Unroll02(), new ConstantTestNode(37));
-        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result), new Object[]{});
+        compileHelper("Test", new RootTestNode(fd, "nestedLoopExplosion", result, true), new Object[]{});
         StructuredGraph peResult = lastCompiledGraph;
 
         //@formatter:off
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java
index f2adf0c8001f..5ac71ed93ed8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java
@@ -24,20 +24,32 @@
  */
 package org.graalvm.compiler.truffle.test.nodes;
 
+import org.graalvm.compiler.api.directives.GraalDirectives;
+
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class AddTestNode extends AbstractTestNode {
 
     @Child private AbstractTestNode left;
     @Child private AbstractTestNode right;
+    private final boolean cfgAnchorBeforeReturn;
 
-    public AddTestNode(AbstractTestNode left, AbstractTestNode right) {
+    public AddTestNode(AbstractTestNode left, AbstractTestNode right, boolean cfgAnchorBeforeReturn) {
         this.left = left;
         this.right = right;
+        this.cfgAnchorBeforeReturn = cfgAnchorBeforeReturn;
+    }
+
+    public AddTestNode(AbstractTestNode left, AbstractTestNode right) {
+        this(left, right, false);
     }
 
     @Override
     public int execute(VirtualFrame frame) {
-        return left.execute(frame) + right.execute(frame);
+        int res = left.execute(frame) + right.execute(frame);
+        if (cfgAnchorBeforeReturn) {
+            GraalDirectives.controlFlowAnchor();
+        }
+        return res;
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java
index 52832610d95e..a3ab16d791db 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java
@@ -24,6 +24,8 @@
  */
 package org.graalvm.compiler.truffle.test.nodes;
 
+import org.graalvm.compiler.api.directives.GraalDirectives;
+
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.NodeInfo;
@@ -35,6 +37,7 @@ public class RootTestNode extends RootNode {
     private final String name;
     private final boolean internal;
     private final boolean captureFramesForTrace;
+    private final boolean cfgAnchorBeforeReturn;
 
     @Child private AbstractTestNode node;
 
@@ -46,17 +49,30 @@ public RootTestNode(FrameDescriptor descriptor, String name, AbstractTestNode no
         this(descriptor, name, node, false, false);
     }
 
+    public RootTestNode(FrameDescriptor descriptor, String name, AbstractTestNode node, boolean cfgAnchorBeforeReturn) {
+        this(descriptor, name, node, false, false, cfgAnchorBeforeReturn);
+    }
+
     public RootTestNode(FrameDescriptor descriptor, String name, AbstractTestNode node, boolean internal, boolean captureFramesForTrace) {
+        this(descriptor, name, node, captureFramesForTrace, internal, false);
+    }
+
+    public RootTestNode(FrameDescriptor descriptor, String name, AbstractTestNode node, boolean internal, boolean captureFramesForTrace, boolean cfgAnchorBeforeReturn) {
         super(null, descriptor);
         this.name = name;
         this.node = node;
         this.internal = internal;
         this.captureFramesForTrace = captureFramesForTrace;
+        this.cfgAnchorBeforeReturn = cfgAnchorBeforeReturn;
     }
 
     @Override
     public Object execute(VirtualFrame frame) {
-        return node.execute(frame);
+        Object o = node.execute(frame);
+        if (cfgAnchorBeforeReturn) {
+            GraalDirectives.controlFlowAnchor();
+        }
+        return o;
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java
index efa16263af76..180aa75cf7e5 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java
@@ -361,6 +361,7 @@ public int execute(VirtualFrame frame) {
                 GraalDirectives.blackhole(OUTSIDE_LOOP_MARKER);
                 GraalDirectives.blackhole(i);
                 CompilerAsserts.partialEvaluationConstant(i);
+                GraalDirectives.controlFlowAnchor();
             }
             outer: for (int i = 0; i < count; i++) {
                 GraalDirectives.blackhole(OUTER_LOOP_INSIDE_LOOP_MARKER);
@@ -376,6 +377,7 @@ public int execute(VirtualFrame frame) {
                         SideEffect1 = x;
                         continue outer;
                     }
+                    GraalDirectives.controlFlowAnchor();
                     if (j == SideEffect2) {
                         GraalDirectives.blackhole(CONTINUE_LOOP_MARKER);
                         CompilerAsserts.partialEvaluationConstant(j);
@@ -385,6 +387,7 @@ public int execute(VirtualFrame frame) {
                         SideEffect1 = x;
                         break;
                     }
+                    GraalDirectives.controlFlowAnchor();
                     if (j == SideEffect1) {
                         GraalDirectives.blackhole(CONTINUE_LOOP_MARKER);
                         CompilerAsserts.partialEvaluationConstant(j);
@@ -394,6 +397,7 @@ public int execute(VirtualFrame frame) {
                         SideEffect1 = x;
                         continue outer;
                     }
+                    GraalDirectives.controlFlowAnchor();
                 }
             }
             GraalDirectives.blackhole(AFTER_LOOP_MARKER);
@@ -614,6 +618,7 @@ public int execute(VirtualFrame frame) {
                     // LEX 1 -> constant number of loop iterations
                     break;
                 }
+                GraalDirectives.controlFlowAnchor();
                 GraalDirectives.blackhole(INSIDE_LOOP_MARKER);
                 SideEffect = i;
                 if (i == SideEffect2) {
@@ -626,6 +631,7 @@ public int execute(VirtualFrame frame) {
                     CompilerAsserts.partialEvaluationConstant(i);
                     return i;
                 }
+                GraalDirectives.controlFlowAnchor();
                 if (i == SideEffect3) {
                     // LEN 1 -> continue at header
                     // that is the difference of unroll vs explode:unrolling will merge the ends,
@@ -633,13 +639,16 @@ public int execute(VirtualFrame frame) {
                     i++;
                     continue;
                 }
+                GraalDirectives.controlFlowAnchor();
                 if (i == SideEffect1) {
                     // LEX 3 (2) -> continue at AFTER_LOOP_MARKER
                     break;
                 }
+                GraalDirectives.controlFlowAnchor();
                 i++;
                 // LEN 2 -> continue at header
             }
+            GraalDirectives.controlFlowAnchor();
             GraalDirectives.blackhole(AFTER_LOOP_MARKER);
             return count;
         }

From eb9403833b855cbc055726be7fa0fb5dfea6a5a2 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Thu, 16 Sep 2021 16:24:40 +0200
Subject: [PATCH 095/681] fixes after rebase

---
 .../org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java | 5 ++++-
 .../compiler/truffle/test/LoopNodePartialEvaluationTest.java | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
index 97b8ab13cc99..50643b2ee0e7 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
@@ -30,7 +30,7 @@
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-public class IntegerBoxEqualsTest extends SubprocessTest {
+public class IntegerBoxEqualsTest extends GraalCompilerTest {
 
     class Cell {
         private final Integer value;
@@ -65,6 +65,9 @@ public void cellTest() {
         test(get, null, cell, value);
         final int equalsCount = lastCompiledGraph.getNodes().filter(ObjectEqualsNode.class).count();
         final int ifCount = lastCompiledGraph.getNodes().filter(IfNode.class).count();
+        if (!(equalsCount == 0 || ifCount > 1)) {
+            lastCompiledGraph.getDebug().forceDump(lastCompiledGraph, "There must be no reference comparisons in the graph, or everything reachable in equals.");
+        }
         assertTrue(equalsCount == 0 || ifCount > 1, "There must be no reference comparisons in the graph, or everything reachable in equals.");
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
index 5456c05dd8e9..7d909a7789f4 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
@@ -267,8 +267,9 @@ public void testPropagateInjectedProfile(boolean twoEnds, boolean trueContinue)
 
         List<LoopBeginNode> loopBegins = graph.getNodes().filter(LoopBeginNode.class).snapshot();
         Assert.assertEquals(loopBegins.toString(), 1, loopBegins.size());
+        ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, false, false, false);
         for (LoopBeginNode loopBegin : loopBegins) {
-            Assert.assertEquals("Expected loop frequency", 10.0, loopBegin.loopFrequency(), 0.01);
+            Assert.assertEquals("Expected loop frequency", 10.0, cfg.localLoopFrequency(loopBegin), 0.01);
         }
     }
 

From 3837bf70f17bf32e524168b0a7ab283c7c714df9 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 22 Sep 2021 10:53:04 +0200
Subject: [PATCH 096/681] update changelog version

---
 compiler/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/CHANGELOG.md b/compiler/CHANGELOG.md
index 955871e68ff4..9dbdd4837d9d 100644
--- a/compiler/CHANGELOG.md
+++ b/compiler/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 This changelog summarizes newly introduced optimizations that may be relevant to other teams.
 
-## Version 21.3.0
+## Version 22.0.0
 * (GR-22707) (GR-30838): New, inner loops first, reverse post order and loop frequency calculations for the compiler.
 
 ## Version 21.2.0

From 840a0cbae4068b96e2c951308c09267f06bf034d Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 22 Sep 2021 10:59:22 +0200
Subject: [PATCH 097/681] integer box equals test: make test more resilient
 towards bad profiles

---
 .../compiler/core/test/IntegerBoxEqualsTest.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
index 50643b2ee0e7..2d53f24f18f5 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.core.test;
 
+import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
 import org.junit.Test;
@@ -40,11 +41,16 @@ class Cell {
         }
 
         public String check(Integer i) {
-            if (value == i || value.equals(i)) {
-                return "";
-            } else {
+            b: {
+                if (GraalDirectives.injectBranchProbability(0.01, value == i)) {
+                    break b;
+                }
+                if (value.equals(i)) {
+                    break b;
+                }
                 return "nope";
             }
+            return "";
         }
     }
 

From 21174300c731ec37a8ee48232689b6034197b920 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 22 Sep 2021 11:24:34 +0200
Subject: [PATCH 098/681] style fixes

---
 .../loop/phases/SpeculativeGuardMovementPhase.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
index 1d387a867079..b162697cc935 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
@@ -41,13 +41,13 @@
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PhiNode;
+import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
+import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.ShortCircuitOrNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.calc.CompareNode;
 import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
 import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
@@ -421,7 +421,6 @@ private boolean shouldOptimizeCompare(InductionVariable iv, ValueNode bound, Gua
                 return false; // the bound must be loop invariant and schedulable above the loop.
             }
 
-            LoopBeginNode loopBeginNode = loopEx.loopBegin();
             CountedLoopInfo countedLoop = loopEx.counted();
 
             if (profilingInfo != null && !(profilingInfo instanceof DefaultProfilingInfo)) {

From 6d332cca0a226495cccd7e6df708e7e0b869af57 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Thu, 23 Sep 2021 08:34:02 +0200
Subject: [PATCH 099/681] loop partial unroll: run canon without simplification
 to avoid simplifications destroying counted loops

---
 .../loop/phases/LoopPartialUnrollPhase.java   | 109 ++++++++++--------
 1 file changed, 64 insertions(+), 45 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java
index de173df37bd0..56fea99a1af7 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java
@@ -47,63 +47,82 @@ public LoopPartialUnrollPhase(LoopPolicies policies, CanonicalizerPhase canonica
         this.canonicalizer = canonicalizer;
     }
 
-    @Override
     @SuppressWarnings("try")
-    protected void run(StructuredGraph graph, CoreProviders context) {
-        if (graph.hasLoops()) {
-            EconomicSetNodeEventListener listener = new EconomicSetNodeEventListener();
-            boolean changed = true;
-            EconomicMap<LoopBeginNode, OpaqueNode> opaqueUnrolledStrides = null;
-            boolean prePostInserted = false;
-            while (changed) {
-                changed = false;
-                try (Graph.NodeEventScope nes = graph.trackNodeEvents(listener)) {
-                    LoopsData dataCounted = context.getLoopsDataProvider().getLoopsData(graph);
-                    dataCounted.detectedCountedLoops();
-                    Graph.Mark mark = graph.getMark();
-                    for (LoopEx loop : dataCounted.countedLoops()) {
-                        if (!LoopTransformations.isUnrollableLoop(loop)) {
-                            continue;
-                        }
-                        if (getPolicies().shouldPartiallyUnroll(loop, context)) {
-                            if (loop.loopBegin().isSimpleLoop()) {
-                                // First perform the pre/post transformation and do the partial
-                                // unroll when we come around again.
-                                LoopTransformations.insertPrePostLoops(loop);
-                                prePostInserted = true;
-                                changed = true;
-                            } else if (prePostInserted) {
-                                if (opaqueUnrolledStrides == null) {
-                                    opaqueUnrolledStrides = EconomicMap.create(Equivalence.IDENTITY);
-                                }
-                                LoopTransformations.partialUnroll(loop, opaqueUnrolledStrides);
-                                changed = true;
+    private void unroll(StructuredGraph graph, CoreProviders context) {
+        /*
+         * We run a canonicalizer without simplification here because simplifications after
+         * inserting pre/main/post can make loops non-counted: For example the ifNode swap
+         * optimization can cause the counted condition being swapped with another one destroying
+         * counted loop info.
+         */
+        final CanonicalizerPhase canonicalizerWithoutSimplification = canonicalizer.copyWithoutSimplification();
+        EconomicSetNodeEventListener listener = new EconomicSetNodeEventListener();
+        boolean changed = true;
+        EconomicMap<LoopBeginNode, OpaqueNode> opaqueUnrolledStrides = null;
+        boolean prePostInserted = false;
+        while (changed) {
+            changed = false;
+            try (Graph.NodeEventScope nes = graph.trackNodeEvents(listener)) {
+                LoopsData dataCounted = context.getLoopsDataProvider().getLoopsData(graph);
+                dataCounted.detectedCountedLoops();
+                Graph.Mark mark = graph.getMark();
+                for (LoopEx loop : dataCounted.countedLoops()) {
+                    if (!LoopTransformations.isUnrollableLoop(loop)) {
+                        continue;
+                    }
+                    if (getPolicies().shouldPartiallyUnroll(loop, context)) {
+                        if (loop.loopBegin().isSimpleLoop()) {
+                            // First perform the pre/post transformation and do the partial
+                            // unroll when we come around again.
+                            LoopTransformations.insertPrePostLoops(loop);
+                            prePostInserted = true;
+                            changed = true;
+                        } else if (prePostInserted) {
+                            if (opaqueUnrolledStrides == null) {
+                                opaqueUnrolledStrides = EconomicMap.create(Equivalence.IDENTITY);
                             }
+                            LoopTransformations.partialUnroll(loop, opaqueUnrolledStrides);
+                            changed = true;
                         }
                     }
-                    dataCounted.deleteUnusedNodes();
-
-                    if (!listener.getNodes().isEmpty()) {
-                        canonicalizer.applyIncremental(graph, context, listener.getNodes());
-                        listener.getNodes().clear();
-                    }
+                }
+                dataCounted.deleteUnusedNodes();
 
-                    assert !prePostInserted || checkCounted(graph, context.getLoopsDataProvider(), mark);
+                if (!listener.getNodes().isEmpty()) {
+                    canonicalizerWithoutSimplification.applyIncremental(graph, context, listener.getNodes());
+                    listener.getNodes().clear();
                 }
+
+                assert !prePostInserted || checkCounted(graph, context.getLoopsDataProvider(), mark);
             }
-            if (opaqueUnrolledStrides != null) {
-                try (Graph.NodeEventScope nes = graph.trackNodeEvents(listener)) {
-                    for (OpaqueNode opaque : opaqueUnrolledStrides.getValues()) {
-                        opaque.remove();
-                    }
-                    if (!listener.getNodes().isEmpty()) {
-                        canonicalizer.applyIncremental(graph, context, listener.getNodes());
-                    }
+        }
+        if (opaqueUnrolledStrides != null) {
+            try (Graph.NodeEventScope nes = graph.trackNodeEvents(listener)) {
+                for (OpaqueNode opaque : opaqueUnrolledStrides.getValues()) {
+                    opaque.remove();
+                }
+                if (!listener.getNodes().isEmpty()) {
+                    canonicalizer.applyIncremental(graph, context, listener.getNodes());
                 }
             }
         }
     }
 
+    @Override
+    @SuppressWarnings("try")
+    protected void run(StructuredGraph graph, CoreProviders context) {
+        EconomicSetNodeEventListener listener = new EconomicSetNodeEventListener();
+        if (graph.hasLoops()) {
+            try (Graph.NodeEventScope nes = graph.trackNodeEvents(listener)) {
+                unroll(graph, context);
+            }
+            if (!listener.getNodes().isEmpty()) {
+                // run a regular canonicalization with simplification after the entire unrolling
+                canonicalizer.applyIncremental(graph, context, listener.getNodes());
+            }
+        }
+    }
+
     private static boolean checkCounted(StructuredGraph graph, LoopsDataProvider loopsDataProvider, Graph.Mark mark) {
         LoopsData dataCounted;
         dataCounted = loopsDataProvider.getLoopsData(graph);

From 1b318313107791ecb146bdf84cbabfd74e5ade75 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 22 Sep 2021 14:42:34 +0200
Subject: [PATCH 100/681] compiler: unconditional deopts in snippets are not
 yet supported [GR-33909]

---
 .../replacements/arraycopy/ArrayCopySnippets.java         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 3aa0459427d2..3e00988f67f4 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -48,7 +48,6 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
-import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.type.StampTool;
@@ -246,8 +245,11 @@ public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Objec
         counters.systemArraycopyCopiedCounter.add(length);
 
         System.arraycopy(src, srcPos, dest, destPos, length);
-        // the call will never return
-        UnreachableNode.unreachable();
+        /*
+         * Since the call will never return, we would want an Unreachable here. Unfortunately
+         * unconditional deopts are not yet supported in snippets [GR-33909].
+         */
+        // UnreachableNode.unreachable();
     }
 
     /**

From bc36bf66d5d2ab33384daaf823f5cfae8573c3cf Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 23 Sep 2021 14:33:29 +0200
Subject: [PATCH 101/681] Disable db-shootout on unsupported architectures
 (GR-33879)

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index dd5c0d0ab500..7509c01151e1 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1850,6 +1850,11 @@ def renaissanceIterations(self):
             del benchmarks["movie-lens"]
             del benchmarks["naive-bayes"]
             del benchmarks["page-rank"]
+
+        if mx.get_arch() != "amd64":
+            # GR-33879
+            # JNA libraries needed are currently limited to amd64: https://github.com/renaissance-benchmarks/renaissance/issues/153
+            del benchmarks["db-shootout"]
         return benchmarks
 
     def version(self):
@@ -1895,7 +1900,7 @@ def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
         return (self.vmArgs(bmSuiteArgs) + ["-jar", self.renaissancePath()] + runArgs + [benchArg])
 
     def benchmarkList(self, bmSuiteArgs):
-        return sorted(_renaissanceConfig.keys())
+        return [b for b, it in self.renaissanceIterations().items() if it != -1]
 
     def successPatterns(self):
         return []

From a754ba1a599b2da975558f1b6203c5af7c113d4e Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 23 Sep 2021 14:49:19 +0200
Subject: [PATCH 102/681] Add JDK range check for renaissance benchmark
 filtering

---
 .../mx.java-benchmarks/mx_java_benchmarks.py        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 7509c01151e1..fcdf2b39f391 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1838,7 +1838,9 @@ def renaissanceLibraryName(self):
     def renaissanceIterations(self):
         benchmarks = _renaissanceConfig.copy()
         if self.version() == "0.9.0":
-            del benchmarks["scala-doku"]  # was introduced in 0.10.0
+            # benchmark was introduced in 0.10.0
+            del benchmarks["scala-doku"]
+
         if mx.get_jdk().javaCompliance >= '17' and self.version() in ["0.9.0", "0.10.0", "0.11.0", "0.12.0"]:
             # JDK17 support for Spark benchmarks was added in 0.13.0
             # See: https://github.com/renaissance-benchmarks/renaissance/issues/295
@@ -1851,10 +1853,17 @@ def renaissanceIterations(self):
             del benchmarks["naive-bayes"]
             del benchmarks["page-rank"]
 
-        if mx.get_arch() != "amd64":
+        if mx.get_arch() != "amd64" or mx.get_jdk().javaCompliance >= '11':
             # GR-33879
             # JNA libraries needed are currently limited to amd64: https://github.com/renaissance-benchmarks/renaissance/issues/153
             del benchmarks["db-shootout"]
+
+        if self.version() in ["0.9.0", "0.10.0", "0.11.0"]:
+            if mx.get_jdk().javaCompliance >= '11':
+                del benchmarks["neo4j-analytics"]
+        else:
+            if mx.get_jdk().javaCompliance < '11' or mx.get_jdk().javaCompliance >= '15':
+                del benchmarks["neo4j-analytics"]
         return benchmarks
 
     def version(self):

From d9f08d8184d0774fb2536e3064f25014179e5771 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 23 Sep 2021 16:47:23 +0200
Subject: [PATCH 103/681] Send toNative when memcpy-ing to native

---
 .../memory/ManagedMemMoveHelperNode.java      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/ManagedMemMoveHelperNode.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/ManagedMemMoveHelperNode.java
index b13e220c24fe..eea2519f814a 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/ManagedMemMoveHelperNode.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/memory/ManagedMemMoveHelperNode.java
@@ -31,15 +31,19 @@
 
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.llvm.runtime.except.LLVMPolyglotException;
 import com.oracle.truffle.llvm.runtime.interop.access.LLVMInteropType;
 import com.oracle.truffle.llvm.runtime.library.internal.LLVMManagedReadLibrary;
 import com.oracle.truffle.llvm.runtime.library.internal.LLVMManagedWriteLibrary;
+import com.oracle.truffle.llvm.runtime.library.internal.LLVMNativeLibrary;
 import com.oracle.truffle.llvm.runtime.nodes.api.LLVMNode;
 import com.oracle.truffle.llvm.runtime.nodes.memory.ManagedMemMoveHelperNodeGen.MemReadI16NodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.memory.ManagedMemMoveHelperNodeGen.MemReadI32NodeGen;
@@ -479,6 +483,41 @@ void doNativeI32(LLVMNativePointer target, long value, @SuppressWarnings("unused
         void doNativeI64(LLVMNativePointer target, long value, @SuppressWarnings("unused") int unitSize) {
             getLanguage().getLLVMMemory().putI64(this, target, value);
         }
+
+        private static long asPointer(LLVMPointer value, LLVMNativeLibrary lib) {
+            if (!lib.isPointer(value)) {
+                lib.toNativePointer(value);
+            }
+            try {
+                return lib.asPointer(value);
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere();
+            }
+        }
+
+        @Specialization(guards = "unitSize == 1")
+        void doObjectI8(LLVMNativePointer target, LLVMPointer value, @SuppressWarnings("unused") int unitSize,
+                        @Shared("lib") @CachedLibrary(limit = "3") LLVMNativeLibrary lib) {
+            getLanguage().getLLVMMemory().putI8(this, target, (byte) asPointer(value, lib));
+        }
+
+        @Specialization(guards = "unitSize == 2")
+        void doObjectI16(LLVMNativePointer target, LLVMPointer value, @SuppressWarnings("unused") int unitSize,
+                        @Shared("lib") @CachedLibrary(limit = "3") LLVMNativeLibrary lib) {
+            getLanguage().getLLVMMemory().putI16(this, target, (short) asPointer(value, lib));
+        }
+
+        @Specialization(guards = "unitSize == 4")
+        void doObjectI32(LLVMNativePointer target, LLVMPointer value, @SuppressWarnings("unused") int unitSize,
+                        @Shared("lib") @CachedLibrary(limit = "3") LLVMNativeLibrary lib) {
+            getLanguage().getLLVMMemory().putI32(this, target, (int) asPointer(value, lib));
+        }
+
+        @Specialization(guards = "unitSize == 8")
+        void doObjectI64(LLVMNativePointer target, LLVMPointer value, @SuppressWarnings("unused") int unitSize,
+                        @Shared("lib") @CachedLibrary(limit = "3") LLVMNativeLibrary lib) {
+            getLanguage().getLLVMMemory().putI64(this, target, asPointer(value, lib));
+        }
     }
 
     abstract static class MemWriteManaged extends MemWriteHelperNode {

From 1c46cec2686acf82ffeb36c1dc624d3373a9f38b Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 22 Sep 2021 18:58:38 +0200
Subject: [PATCH 104/681] Extract field to local variable.

---
 .../com/oracle/truffle/object/DynamicObjectLibraryImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
index dade8737f479..dc14eb70e9dc 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
@@ -1736,7 +1736,8 @@ static class MutateCacheData extends CacheData<MutateCacheData> {
 
         @Override
         protected boolean isValid() {
-            return newShapeValidAssumption == neverValidAssumption() || newShapeValidAssumption == alwaysValidAssumption() || newShapeValidAssumption.isValid();
+            Assumption newShapeValid = newShapeValidAssumption;
+            return newShapeValid == neverValidAssumption() || newShapeValid == alwaysValidAssumption() || newShapeValid.isValid();
         }
 
         protected void maybeUpdateShape(DynamicObject store) {

From 846e2857d2decd210f35ee171680e4ce3e784544 Mon Sep 17 00:00:00 2001
From: Felix Berlakovich <felix.berlakovich@oracle.com>
Date: Wed, 8 Sep 2021 13:26:31 +0200
Subject: [PATCH 105/681] Add option for working directory to SubprocessUtil

---
 .../graalvm/compiler/test/SubprocessUtil.java | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
index 14d3de8bd567..7de08a0d0103 100644
--- a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
+++ b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
@@ -278,7 +278,7 @@ public static Subprocess java(List<String> vmArgs, String... mainClassAndArgs) t
      * @param mainClassAndArgs the main class and its arguments
      */
     public static Subprocess java(List<String> vmArgs, List<String> mainClassAndArgs) throws IOException, InterruptedException {
-        return javaHelper(vmArgs, null, mainClassAndArgs, null);
+        return javaHelper(vmArgs, null, null, mainClassAndArgs, null);
     }
 
     /**
@@ -289,7 +289,20 @@ public static Subprocess java(List<String> vmArgs, List<String> mainClassAndArgs
      * @param timeout the timeout duration until the process is killed
      */
     public static Subprocess java(List<String> vmArgs, List<String> mainClassAndArgs, Duration timeout) throws IOException, InterruptedException {
-        return javaHelper(vmArgs, null, mainClassAndArgs, timeout);
+        return javaHelper(vmArgs, null, null, mainClassAndArgs, timeout);
+    }
+
+    /**
+     * Executes a Java subprocess with a timeout in the specified working directory.
+     *
+     * @param vmArgs the VM arguments
+     * @param workingDir the working directory of the subprocess. If null, the working directory of
+     *            the current process is used.
+     * @param mainClassAndArgs the main class and its arguments
+     * @param timeout the timeout duration until the process is killed
+     */
+    public static Subprocess java(List<String> vmArgs, File workingDir, List<String> mainClassAndArgs, Duration timeout) throws IOException, InterruptedException {
+        return javaHelper(vmArgs, null, workingDir, mainClassAndArgs, timeout);
     }
 
     /**
@@ -311,19 +324,23 @@ public static Subprocess java(List<String> vmArgs, Map<String, String> env, Stri
      * @param mainClassAndArgs the main class and its arguments
      */
     public static Subprocess java(List<String> vmArgs, Map<String, String> env, List<String> mainClassAndArgs) throws IOException, InterruptedException {
-        return javaHelper(vmArgs, env, mainClassAndArgs, null);
+        return javaHelper(vmArgs, env, null, mainClassAndArgs, null);
     }
 
     /**
      * Executes a Java subprocess.
      *
-     * @param vmArgs the VM arguments
+     * @param vmArgs the VM arguments. If {@code vmArgs} contains {@link #PACKAGE_OPENING_OPTIONS},
+     *            the argument is replaced with arguments to do package opening (see
+     *            {@link SubprocessUtil#getPackageOpeningOptions()}
      * @param env the environment variables
+     * @param workingDir the working directory of the subprocess. If null, the working directory of
+     *            the current process is used.
      * @param mainClassAndArgs the main class and its arguments
      * @param timeout the duration to wait for the process to finish. If null, the calling thread
      *            waits for the process indefinitely.
      */
-    private static Subprocess javaHelper(List<String> vmArgs, Map<String, String> env, List<String> mainClassAndArgs, Duration timeout) throws IOException, InterruptedException {
+    private static Subprocess javaHelper(List<String> vmArgs, Map<String, String> env, File workingDir, List<String> mainClassAndArgs, Duration timeout) throws IOException, InterruptedException {
         List<String> command = new ArrayList<>(vmArgs.size());
         Path packageOpeningOptionsArgumentsFile = null;
         for (String vmArg : vmArgs) {
@@ -342,6 +359,9 @@ private static Subprocess javaHelper(List<String> vmArgs, Map<String, String> en
         }
         command.addAll(mainClassAndArgs);
         ProcessBuilder processBuilder = new ProcessBuilder(command);
+        if (workingDir != null) {
+            processBuilder.directory(workingDir);
+        }
         if (env != null) {
             Map<String, String> processBuilderEnv = processBuilder.environment();
             processBuilderEnv.putAll(env);

From b62c298da649c92462bf45504d685c2c9ad9f65b Mon Sep 17 00:00:00 2001
From: Felix Berlakovich <felix.berlakovich@oracle.com>
Date: Thu, 9 Sep 2021 22:02:50 +0200
Subject: [PATCH 106/681] Add generic method to launch non-java subprocess

---
 .../graalvm/compiler/test/SubprocessUtil.java | 80 +++++++++++--------
 1 file changed, 48 insertions(+), 32 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
index 7de08a0d0103..a512ad51ad75 100644
--- a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
+++ b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
@@ -358,6 +358,30 @@ private static Subprocess javaHelper(List<String> vmArgs, Map<String, String> en
             }
         }
         command.addAll(mainClassAndArgs);
+        try {
+            return process(command, env, workingDir, timeout);
+        } finally {
+            if (packageOpeningOptionsArgumentsFile != null) {
+                if (!Boolean.getBoolean(KEEP_TEMPORARY_ARGUMENT_FILES_PROPERTY_NAME)) {
+                    Files.delete(packageOpeningOptionsArgumentsFile);
+                }
+            }
+        }
+    }
+
+    /**
+     * Executes a command in a subprocess.
+     *
+     * @param command the command to be executed in a separate process.
+     * @param env environment variables of the subprocess. If null, no environment variables are
+     *            passed.
+     * @param workingDir the working directory of the subprocess. If null, the working directory of
+     *            the current process is used.
+     * @param timeout the duration to wait for the process to finish. When the timeout is reached,
+     *            the subprocess is terminated forcefully. If the timeout is null, the calling
+     *            thread waits for the process indefinitely.
+     */
+    public static Subprocess process(List<String> command, Map<String, String> env, File workingDir, Duration timeout) throws IOException, InterruptedException {
         ProcessBuilder processBuilder = new ProcessBuilder(command);
         if (workingDir != null) {
             processBuilder.directory(workingDir);
@@ -367,40 +391,32 @@ private static Subprocess javaHelper(List<String> vmArgs, Map<String, String> en
             processBuilderEnv.putAll(env);
         }
         processBuilder.redirectErrorStream(true);
-        try {
-            Process process = processBuilder.start();
-            BufferedReader stdout = new BufferedReader(new InputStreamReader(process.getInputStream()));
-            List<String> output = new ArrayList<>();
-            if (timeout == null) {
-                String line;
-                while ((line = stdout.readLine()) != null) {
-                    output.add(line);
-                }
-                return new Subprocess(command, env, process.waitFor(), output, false);
-            } else {
-                // The subprocess might produce output forever. We need to grab the output in a
-                // separate thread, so we can terminate the process after the timeout if necessary.
-                Thread outputReader = new Thread(() -> {
-                    try {
-                        String line;
-                        while ((line = stdout.readLine()) != null) {
-                            output.add(line);
-                        }
-                    } catch (IOException e) {
-                        // happens when the process ends
-                    }
-                });
-                outputReader.start();
-                boolean finishedOnTime = process.waitFor(timeout.getSeconds(), TimeUnit.SECONDS);
-                int exitCode = process.destroyForcibly().waitFor();
-                return new Subprocess(command, env, exitCode, output, !finishedOnTime);
+        Process process = processBuilder.start();
+        BufferedReader stdout = new BufferedReader(new InputStreamReader(process.getInputStream()));
+        List<String> output = new ArrayList<>();
+        if (timeout == null) {
+            String line;
+            while ((line = stdout.readLine()) != null) {
+                output.add(line);
             }
-        } finally {
-            if (packageOpeningOptionsArgumentsFile != null) {
-                if (!Boolean.getBoolean(KEEP_TEMPORARY_ARGUMENT_FILES_PROPERTY_NAME)) {
-                    Files.delete(packageOpeningOptionsArgumentsFile);
+            return new Subprocess(command, env, process.waitFor(), output, false);
+        } else {
+            // The subprocess might produce output forever. We need to grab the output in a
+            // separate thread, so we can terminate the process after the timeout if necessary.
+            Thread outputReader = new Thread(() -> {
+                try {
+                    String line;
+                    while ((line = stdout.readLine()) != null) {
+                        output.add(line);
+                    }
+                } catch (IOException e) {
+                    // happens when the process ends
                 }
-            }
+            });
+            outputReader.start();
+            boolean finishedOnTime = process.waitFor(timeout.getSeconds(), TimeUnit.SECONDS);
+            int exitCode = process.destroyForcibly().waitFor();
+            return new Subprocess(command, env, exitCode, output, !finishedOnTime);
         }
     }
 

From 5a2fa17cd10391de1b22cb127197997edb804ee8 Mon Sep 17 00:00:00 2001
From: Felix Berlakovich <felix.berlakovich@oracle.com>
Date: Mon, 13 Sep 2021 14:32:45 +0200
Subject: [PATCH 107/681] Fix race condition in SubprocessUtil output handling

---
 .../src/org/graalvm/compiler/test/SubprocessUtil.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
index a512ad51ad75..a44688f1b45e 100644
--- a/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
+++ b/compiler/src/org.graalvm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java
@@ -415,8 +415,11 @@ public static Subprocess process(List<String> command, Map<String, String> env,
             });
             outputReader.start();
             boolean finishedOnTime = process.waitFor(timeout.getSeconds(), TimeUnit.SECONDS);
-            int exitCode = process.destroyForcibly().waitFor();
-            return new Subprocess(command, env, exitCode, output, !finishedOnTime);
+            if (!finishedOnTime) {
+                process.destroyForcibly().waitFor();
+            }
+            outputReader.join();
+            return new Subprocess(command, env, process.exitValue(), output, !finishedOnTime);
         }
     }
 

From 51a681f6320e1abec4c27772907f96881b81115a Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Thu, 23 Sep 2021 18:47:43 +0200
Subject: [PATCH 108/681] [GR-33933] HostClassLoader does not provide
 ProtectionDomain.

---
 .../test/polyglot/HostClassLoadingTest.java   | 36 +++++++++++++
 .../oracle/truffle/host/HostClassLoader.java  | 50 +++++++++++++++----
 2 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostClassLoadingTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostClassLoadingTest.java
index da4b3226fbfa..2391d513263a 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostClassLoadingTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostClassLoadingTest.java
@@ -58,6 +58,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -388,6 +390,40 @@ public void testResourceBundleFolder() throws IOException {
         }
     }
 
+    @Test
+    public void testProtectionDomainJar() throws IOException {
+        setupEnv();
+        Class<?> hostClass = HostClassLoadingTestClass1.class;
+        Path tempDir = renameHostClass(hostClass, TEST_REPLACE_CLASS_NAME);
+        Path jar = createJar(tempDir);
+        languageEnv.addToHostClassPath(languageEnv.getPublicTruffleFile(jar.toString()));
+        Object newSymbol = languageEnv.lookupHostSymbol(hostClass.getPackage().getName() + "." + TEST_REPLACE_CLASS_NAME);
+        Class<?> clz = (Class<?>) languageEnv.asHostObject(newSymbol);
+        ProtectionDomain protectionDomain = clz.getProtectionDomain();
+        assertNotNull(protectionDomain);
+        CodeSource codeSource = protectionDomain.getCodeSource();
+        assertNotNull(codeSource);
+        assertEquals(jar.toUri().toURL().toString(), codeSource.getLocation().toString());
+        Files.deleteIfExists(jar);
+        deleteDir(tempDir);
+    }
+
+    @Test
+    public void testProtectionDomainFolder() throws IOException {
+        setupEnv();
+        Class<?> hostClass = HostClassLoadingTestClass1.class;
+        Path tempDir = renameHostClass(hostClass, TEST_REPLACE_CLASS_NAME);
+        languageEnv.addToHostClassPath(languageEnv.getPublicTruffleFile(tempDir.toString()));
+        Object newSymbol = languageEnv.lookupHostSymbol(hostClass.getPackage().getName() + "." + TEST_REPLACE_CLASS_NAME);
+        Class<?> clz = (Class<?>) languageEnv.asHostObject(newSymbol);
+        ProtectionDomain protectionDomain = clz.getProtectionDomain();
+        assertNotNull(protectionDomain);
+        CodeSource codeSource = protectionDomain.getCodeSource();
+        assertNotNull(codeSource);
+        assertEquals(tempDir.toUri().toURL().toString(), codeSource.getLocation().toString());
+        deleteDir(tempDir);
+    }
+
     private static void assertHostClassPath(Env env, final Class<?> hostClass, String newName, TruffleFile classPathEntry) {
         String newClassName = hostClass.getPackage().getName() + "." + newName;
 
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
index b5f3bfe1ff29..d6f5a7565cac 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
@@ -54,6 +54,9 @@
 import java.nio.ByteOrder;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.StandardOpenOption;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -157,7 +160,7 @@ protected Class<?> findClass(String className) throws ClassNotFoundException {
         try {
             byte[] content = res.getContent();
             definePackage(className);
-            return defineClass(className, content, 0, content.length);
+            return defineClass(className, content, 0, content.length, res.getProtectionDomain());
         } catch (IOException ioe) {
             throw new ClassNotFoundException("Cannot load class: " + className, ioe);
         }
@@ -223,12 +226,22 @@ private static String getPackageName(String className) {
 
     private abstract static class Resource {
 
+        private final ProtectionDomain protectionDomain;
+
+        Resource(ProtectionDomain protectionDomain) {
+            this.protectionDomain = protectionDomain;
+        }
+
         abstract URL getURL();
 
         abstract long getLength() throws IOException;
 
         abstract InputStream getInputStream() throws IOException;
 
+        final ProtectionDomain getProtectionDomain() {
+            return protectionDomain;
+        }
+
         byte[] getContent() throws IOException {
             long lenl = getLength();
             if (lenl > Integer.MAX_VALUE) {
@@ -273,8 +286,23 @@ byte[] getContent() throws IOException {
         }
     }
 
-    private interface Loader extends Closeable {
-        Resource findResource(String name);
+    private abstract static class Loader implements Closeable {
+
+        final TruffleFile root;
+        final ProtectionDomain protectionDomain;
+
+        Loader(TruffleFile root) {
+            this.root = root;
+            URL rootURL;
+            try {
+                rootURL = root.toUri().toURL();
+            } catch (MalformedURLException e) {
+                rootURL = null;
+            }
+            this.protectionDomain = rootURL == null ? null : new ProtectionDomain(new CodeSource(rootURL, (CodeSigner[]) null), null);
+        }
+
+        abstract Resource findResource(String name);
     }
 
     private static final class ResourceURLStreamHandler extends URLStreamHandler {
@@ -300,11 +328,10 @@ public InputStream getInputStream() throws IOException {
         }
     }
 
-    private static final class FolderLoader implements Loader {
-        private final TruffleFile root;
+    private static final class FolderLoader extends Loader {
 
         FolderLoader(TruffleFile root) {
-            this.root = root;
+            super(root);
         }
 
         @Override
@@ -313,7 +340,8 @@ public Resource findResource(String name) {
             if (!file.isRegularFile()) {
                 return null;
             }
-            return new Resource() {
+            return new Resource(protectionDomain) {
+
                 @Override
                 public URL getURL() {
                     try {
@@ -345,15 +373,15 @@ public void close() throws IOException {
         }
     }
 
-    private static final class JarLoader implements Loader {
-        private final TruffleFile root;
+    private static final class JarLoader extends Loader {
+
         /**
          * Cache for fast resource lookup. Map of folder to files in the folder.
          */
         private volatile Map<String, Map<String, ZipUtils.Info>> content;
 
         JarLoader(TruffleFile root) {
-            this.root = root;
+            super(root);
         }
 
         @Override
@@ -369,7 +397,7 @@ public Resource findResource(String name) {
                     return null;
                 }
 
-                return new Resource() {
+                return new Resource(protectionDomain) {
 
                     @Override
                     URL getURL() {

From 3a22e5bdeded804efe20275458f076de9df4fed0 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Thu, 23 Sep 2021 19:18:49 +0200
Subject: [PATCH 109/681] Inherit user declared constructor parameter
 annotations and copy them to generated node create factory methods.

---
 truffle/CHANGELOG.md                          |  4 +
 .../truffle/api/dsl/test/NodeFieldTest.java   | 87 +++++++++++++++++++
 .../processor/generator/GeneratorUtils.java   |  2 +-
 3 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index ebd44af3e83a..ef1717fe3721 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This changelog summarizes major changes between Truffle versions relevant to languages implementors building upon the Truffle framework. The main focus is on APIs exported by Truffle.
 
+## Version 22.0.0
+* Truffle DSL generated code now inherits all annotations on constructor parameters to the static create factory method.
+
+
 ## Version 21.3.0
 * Added a `@GenerateWrapper.Ignore` annotation to prevent methods from being instrumented in wrapper classes.
 * The native image `TruffleCheckBlackListedMethods` option was deprecated and replaced by the `TruffleCheckBlockListMethods` option.
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java
index 8b0b1536a284..b9728b27e861 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeFieldTest.java
@@ -43,13 +43,20 @@
 import static com.oracle.truffle.api.dsl.test.TestHelper.createCallTarget;
 import static com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest.assertFails;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+
 import org.junit.Test;
 
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NodeField;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.ConstructorAnnotationsTestNodeGen;
 import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldNoGetterTestNodeFactory;
 import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.IntFieldTestNodeFactory;
 import com.oracle.truffle.api.dsl.test.NodeFieldTestFactory.MultipleFieldsTestNodeFactory;
@@ -295,4 +302,84 @@ Object s0() {
         }
     }
 
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface OtherAnnotations {
+
+        OtherAnnotation[] value();
+
+    }
+
+    @Repeatable(OtherAnnotations.class)
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface OtherAnnotation {
+
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface MyAnnotation {
+
+        String string();
+
+        String[] stringArray();
+
+        int primitive();
+
+        int[] primitiveArray();
+
+        Class<?> type();
+
+        Class<?>[] typeArray();
+
+        OtherAnnotation annotation();
+
+        OtherAnnotation[] annotationArray();
+
+    }
+
+    public abstract static class ConstructorAnnotationsTestNode extends Node {
+
+        private final int field;
+
+        ConstructorAnnotationsTestNode(@MyAnnotation(string = "42", stringArray = {"41", "42"}, //
+                        primitive = 42, primitiveArray = {41, 42}, //
+                        type = ConstructorAnnotationsTestNode.class, //
+                        typeArray = {ConstructorAnnotationsTestNode.class, ConstructorAnnotationsTestNode.class}, //
+                        annotation = @OtherAnnotation, //
+                        annotationArray = {@OtherAnnotation, @OtherAnnotation}) int arg0,
+                        @OtherAnnotation @OtherAnnotation int arg1) { // also test repeatable
+            this.field = arg0 + arg1;
+        }
+
+        abstract Object execute();
+
+        @Specialization
+        int s0() {
+            return field;
+        }
+    }
+
+    @Test
+    public void testConstructorAnnotations() throws NoSuchMethodException, SecurityException {
+        assertEquals(42, ConstructorAnnotationsTestNodeGen.create(21, 21).execute());
+        Method method = ConstructorAnnotationsTestNodeGen.class.getMethod("create", int.class, int.class);
+        MyAnnotation annotation = method.getParameters()[0].getAnnotation(MyAnnotation.class);
+        assertEquals("42", annotation.string());
+        assertEquals("41", annotation.stringArray()[0]);
+        assertEquals("42", annotation.stringArray()[1]);
+        assertEquals(42, annotation.primitive());
+        assertEquals(41, annotation.primitiveArray()[0]);
+        assertEquals(42, annotation.primitiveArray()[1]);
+        assertSame(ConstructorAnnotationsTestNode.class, annotation.type());
+        assertSame(ConstructorAnnotationsTestNode.class, annotation.typeArray()[0]);
+        assertSame(ConstructorAnnotationsTestNode.class, annotation.typeArray()[1]);
+
+        assertNotNull(annotation.annotation());
+        assertNotNull(annotation.annotationArray()[0]);
+        assertNotNull(annotation.annotationArray()[1]);
+
+        OtherAnnotations other = method.getParameters()[1].getAnnotation(OtherAnnotations.class);
+        assertNotNull(other.value()[0]);
+        assertNotNull(other.value()[1]);
+    }
+
 }
diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java
index 1fcd50c9785c..2c7bc75d09ce 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/GeneratorUtils.java
@@ -209,7 +209,7 @@ public static CodeExecutableElement createConstructorUsingFields(Set<Modifier> m
             builder.startStatement();
             builder.startSuperCall();
             for (VariableElement parameter : superConstructor.getParameters()) {
-                method.addParameter(new CodeVariableElement(parameter.asType(), parameter.getSimpleName().toString()));
+                method.addParameter(CodeVariableElement.clone(parameter));
                 builder.string(parameter.getSimpleName().toString());
             }
             builder.end(); // super

From fc02a67fd8422e969a8762b1145d21d4b47a5aa8 Mon Sep 17 00:00:00 2001
From: Jakub Chaloupka <jakub.chaloupka@oracle.com>
Date: Thu, 23 Sep 2021 21:19:08 +0200
Subject: [PATCH 110/681] Fix blockSizes array length in partial blocks
 computation.

---
 .../truffle/runtime/OptimizedBlockNode.java   | 12 +++++--
 .../truffle/test/OptimizedBlockNodeTest.java  | 32 +++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
index 723b319415a7..f49f7851c0eb 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
@@ -320,10 +320,18 @@ private static <T extends Node> PartialBlocks<T> computePartialBlocks(OptimizedC
                     if (i > 0) {
                         if (blockRanges == null) {
                             blockRanges = new int[8];
-                            blockSizes = new int[8];
+                            /*
+                             * blockSizes array needs one more slot than blockRanges because of the
+                             * assignment below the for-loop.
+                             */
+                            blockSizes = new int[blockRanges.length + 1];
                         } else if (currentBlockIndex >= blockRanges.length) {
                             blockRanges = Arrays.copyOf(blockRanges, blockRanges.length * 2);
-                            blockSizes = Arrays.copyOf(blockSizes, blockSizes.length * 2);
+                            /*
+                             * blockSizes array needs one more slot than blockRanges because of the
+                             * assignment below the for-loop.
+                             */
+                            blockSizes = Arrays.copyOf(blockSizes, blockRanges.length + 1);
                         }
                         blockSizes[currentBlockIndex] = currentBlockSize;
                         blockRanges[currentBlockIndex++] = i;
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
index ec5d8bb04f85..67fcc6961b86 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
@@ -104,6 +104,38 @@ public void testFirstBlockElementExceedsLimit() {
         assertEquals(1, target.call());
     }
 
+    @Test
+    public void testBoundaryBlockSize() {
+        /*
+         * Internal blockRanges and blockSizes arrays grow during partial blocks computation as
+         * needed. This test tests that the growth of the arrays works correctly.
+         */
+        for (int blockSize = 2; blockSize < 20; blockSize++) {
+            setup(1);
+            OptimizedBlockNode<TestElement> block = createBlock(blockSize, 1);
+            OptimizedCallTarget target = createTest(block);
+            target.computeBlockCompilations();
+            target.call();
+            target.compile(true);
+
+            // should not trigger and block compilation
+            PartialBlocks<TestElement> partialBlocks = block.getPartialBlocks();
+            assertNotNull(partialBlocks);
+            assertNotNull(partialBlocks.getBlockRanges());
+            assertEquals(blockSize - 1, partialBlocks.getBlockRanges().length);
+            for (int i = 0; i < (blockSize - 1); i++) {
+                assertEquals(i + 1, partialBlocks.getBlockRanges()[i]);
+            }
+            assertNotNull(partialBlocks.getBlockTargets());
+            assertEquals(blockSize, partialBlocks.getBlockTargets().length);
+            for (int i = 0; i < blockSize; i++) {
+                assertTrue(partialBlocks.getBlockTargets()[i].isValid());
+            }
+
+            assertEquals(blockSize - 1, target.call());
+        }
+    }
+
     @Test
     public void testBlockSizePlusOne() {
         int groupSize = 1;

From c623a19f2d44ba3f6d2d460aceb5e9578bddb516 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 22 Sep 2021 15:08:02 +0200
Subject: [PATCH 111/681] compiler: verify snippet has returnNode [GR-33909].

---
 .../compiler/replacements/SnippetTemplate.java        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 7dd3066e6bcb..ada40300aa07 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -1601,6 +1601,17 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
      */
     @SuppressWarnings("try")
     public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAccess, FixedNode replacee, UsageReplacer replacer, Arguments args, boolean killReplacee) {
+        if (!(replacee instanceof ControlSinkNode)) {
+            /*
+             * For all use cases of this, the replacee is killed sooner ({@code killReplacee ==
+             * true}) or later (by the caller of this method). However, we cannot do that if the
+             * snippet does not have a return node we because that means we kill the {@code
+             * replacee.next()} which might be connected to a merge whose next node has not yet been
+             * lowered [GR-33909].
+             */
+            GraalError.guarantee(this.returnNode != null, "Cannot kill %s because snippet %s does not have a return node", replacee, this);
+        }
+
         DebugContext debug = replacee.getDebug();
         assert assertSnippetKills(replacee);
         try (DebugCloseable a = args.info.instantiationTimer.start(debug)) {

From 15dd587fd17bf2a5187dcd0a12ce5b75dbed2cb8 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 23 Sep 2021 13:45:50 +0200
Subject: [PATCH 112/681] Revert "compiler: unconditional deopts in snippets
 are not yet supported [GR-33909]"

This reverts commit 477c0dae39a7c1ecec5d84d4d72569f45f9a05b5.
---
 .../replacements/arraycopy/ArrayCopySnippets.java         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 3e00988f67f4..3aa0459427d2 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -48,6 +48,7 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.GuardsStage;
+import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.type.StampTool;
@@ -245,11 +246,8 @@ public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Objec
         counters.systemArraycopyCopiedCounter.add(length);
 
         System.arraycopy(src, srcPos, dest, destPos, length);
-        /*
-         * Since the call will never return, we would want an Unreachable here. Unfortunately
-         * unconditional deopts are not yet supported in snippets [GR-33909].
-         */
-        // UnreachableNode.unreachable();
+        // the call will never return
+        UnreachableNode.unreachable();
     }
 
     /**

From 41c189caf11ffa9d5f452c23cc6d93503d046fb7 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 24 Sep 2021 10:21:32 +0200
Subject: [PATCH 113/681] Add test

---
 .../interop/polyglotArrayToNative.c           |  60 ++++++
 .../interop/PolyglotArrayToNativeTest.java    | 177 ++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
 create mode 100644 sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java

diff --git a/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c b/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
new file mode 100644
index 000000000000..9825627b3496
--- /dev/null
+++ b/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdlib.h>
+
+#include <graalvm/llvm/polyglot.h>
+
+typedef void* VoidPtr;
+
+typedef struct {
+    void *payload;
+} Simple;
+
+POLYGLOT_DECLARE_TYPE(Simple);
+POLYGLOT_DECLARE_TYPE(VoidPtr);
+
+void get_Simple_typeid(void (*ret)(polyglot_typeid typeid)) {
+    ret(polyglot_Simple_typeid());
+}
+
+void get_Simple_array_typeid(uint64_t len, void (*ret)(polyglot_typeid typeid)) {
+    ret(polyglot_array_typeid(polyglot_VoidPtr_typeid(), len));
+}
+
+#define WRAP(x) ((Simple){(x)})
+
+void *simple_array_to_native(VoidPtr *polyglot_array, uint64_t size) {
+    Simple *native = (Simple *) malloc(size * sizeof(Simple));
+    uint64_t i;
+    for (i = 0; i < size; i++) {
+        native[i] = WRAP(polyglot_array[i]);
+    }
+    return polyglot_from_Simple_array(native, size);
+}
diff --git a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
new file mode 100644
index 000000000000..5d88781a2025
--- /dev/null
+++ b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
@@ -0,0 +1,177 @@
+package com.oracle.truffle.llvm.tests.interop;
+
+import org.graalvm.polyglot.Value;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.llvm.spi.NativeTypeLibrary;
+import com.oracle.truffle.llvm.tests.interop.values.TestCallback;
+
+public class PolyglotArrayToNativeTest extends PolyglotArrayTestBase {
+    public static final String PAYLOAD = "payload";
+    public static final int ARRAY_SIZE = 10;
+    private static Value polyglotReadPointerLibrary;
+    private static Object pointerTypeId;
+    private static Value getArrayType;
+
+    /**
+     * Load bitcode library. Method name needs to be different than in the base class, otherwise it
+     * is not executed.
+     */
+    @BeforeClass
+    public static void loadPolygloArrayToNativeLibrary() {
+        polyglotReadPointerLibrary = loadTestBitcodeValue("polyglotArrayToNative.c");
+        Value lib = runWithPolyglot.getPolyglotContext().asValue(polyglotReadPointerLibrary);
+        Value getTypes = lib.getMember("get_Simple_typeid");
+
+        getTypes.execute(new TestCallback(1, args -> {
+            pointerTypeId = args[0];
+            return null;
+        }));
+
+        getArrayType = lib.getMember("get_Simple_array_typeid");
+
+    }
+
+    @ExportLibrary(InteropLibrary.class)
+    @ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
+    @SuppressWarnings("static-method")
+    static class SimpleWrapper implements TruffleObject {
+        private final long delegate;
+
+        private SimpleWrapper(long l) {
+            this.delegate = l;
+        }
+
+        @ExportMessage
+        boolean hasMembers() {
+            return true;
+        }
+
+        @ExportMessage
+        Object getMembers(@SuppressWarnings("unused") boolean b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        @ExportMessage
+        boolean isMemberReadable(String key) {
+            return PAYLOAD.equals(key);
+        }
+
+        @ExportMessage
+        Object readMember(String key) throws UnknownIdentifierException {
+            if (PAYLOAD.equals(key)) {
+                return delegate;
+            }
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            throw UnknownIdentifierException.create(key);
+        }
+
+        @ExportMessage
+        boolean isPointer() {
+            return true;
+        }
+
+        @ExportMessage
+        void toNative() {
+            // nop
+        }
+
+        @ExportMessage
+        long asPointer() {
+            return delegate;
+        }
+
+        @ExportMessage
+        boolean hasNativeType() {
+            return true;
+        }
+
+        @ExportMessage
+        Object getNativeType() {
+            return pointerTypeId;
+        }
+    }
+
+    @ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
+    @ExportLibrary(InteropLibrary.class)
+    @SuppressWarnings("static-method")
+    static class SimpleArrayWrapper implements TruffleObject {
+        private final SimpleWrapper[] objects;
+
+        private SimpleArrayWrapper(SimpleWrapper[] objects) {
+            this.objects = objects;
+        }
+
+        @ExportMessage
+        boolean hasArrayElements() {
+            return true;
+        }
+
+        @ExportMessage
+        boolean isArrayElementReadable(long idx) {
+            return 0 <= idx && idx < objects.length;
+        }
+
+        @ExportMessage
+        long getArraySize() {
+            return objects.length;
+        }
+
+        @ExportMessage
+        Object readArrayElement(long idx) {
+            return objects[(int) idx];
+        }
+
+        @ExportMessage
+        boolean hasNativeType() {
+            return true;
+        }
+
+        @ExportMessage
+        Object getNativeType() {
+            try {
+                Object[] result = new Object[1];
+                getArrayType.execute((long) objects.length, new TestCallback(1, args -> {
+                    result[0] = args[0];
+                    return null;
+                }));
+                return result[0];
+            } catch (AbstractTruffleException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
+        }
+    }
+
+    @Test
+    public void test() {
+        Value read = polyglotReadPointerLibrary.getMember("simple_array_to_native");
+        Assert.assertNotNull("Function not found: simple_array_to_native", read);
+        SimpleWrapper[] objects = new SimpleWrapper[ARRAY_SIZE];
+        for (int i = 0; i < ARRAY_SIZE; i++) {
+            objects[i] = new SimpleWrapper(i);
+        }
+        Value ret = read.execute(new SimpleArrayWrapper(objects), (long) ARRAY_SIZE);
+        Assert.assertTrue(ret.hasArrayElements());
+        Assert.assertEquals(ARRAY_SIZE, ret.getArraySize());
+        /*
+         * 'ret' is of type 'Simple[]'; and 'Simple' is a struct with one field 'void *payload'. We
+         * want to have the int value of the pointer.
+         */
+        for (int i = 0; i < ARRAY_SIZE; i++) {
+            Value arrayElement = ret.getArrayElement(i);
+            Assert.assertTrue(arrayElement.hasMember(PAYLOAD));
+            Value payload = arrayElement.getMember(PAYLOAD);
+            Assert.assertTrue(payload.isNativePointer());
+            Assert.assertEquals(i, payload.asNativePointer());
+        }
+    }
+}
\ No newline at end of file

From a88c591b157c0cb31a36aa17109224086ea86cd7 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Wed, 26 Aug 2020 12:53:50 +0200
Subject: [PATCH 114/681] Each CallTarget should have its own RootNode for
 InterpreterCallBenchmark

* Remove unused state class.
---
 .../benchmark/InterpreterCallBenchmark.java   | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
index 43f595c7d6dc..7ba718f6d1ec 100644
--- a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
+++ b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
@@ -85,11 +85,7 @@ public static class BenchmarkState {
 
             for (int i = 0; i < ROOT_CLASSES.length; i++) {
                 Class<?> rootClass = ROOT_CLASSES[i];
-                try {
-                    rootNodes[i] = (AbstractRootNode) rootClass.getConstructor().newInstance();
-                } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                    throw new AssertionError(e);
-                }
+                rootNodes[i] = createRootNode(rootClass);
                 callTargets[i] = Truffle.getRuntime().createCallTarget(rootNodes[i]);
                 directCallNodes[i] = Truffle.getRuntime().createDirectCallNode(callTargets[i]);
             }
@@ -98,6 +94,14 @@ public static class BenchmarkState {
             indirectCall = Truffle.getRuntime().createIndirectCallNode();
         }
 
+        protected static AbstractRootNode createRootNode(Class<?> rootClass) {
+            try {
+                return (AbstractRootNode) rootClass.getConstructor().newInstance();
+            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                throw new AssertionError(e);
+            }
+        }
+
         @TearDown
         public void tearDown() {
             context.leave();
@@ -133,7 +137,8 @@ public static class FirstCallState extends BenchmarkState {
         @Setup(Level.Invocation)
         public void setup() {
             for (int i = 0; i < TARGETS; i++) {
-                callTargets[i] = Truffle.getRuntime().createCallTarget(rootNodes[i % rootNodes.length]);
+                AbstractRootNode rootNode = createRootNode(ROOT_CLASSES[i % ROOT_CLASSES_LENGTH]);
+                callTargets[i] = Truffle.getRuntime().createCallTarget(rootNode);
             }
         }
 
@@ -180,20 +185,6 @@ public int secondCall(SecondCallState state) {
         return sum;
     }
 
-    @State(Scope.Thread)
-    public static class CallTargetCreateState extends BenchmarkState {
-
-        final CallTarget[] callTargets = new CallTarget[TARGETS];
-
-        @Setup(Level.Invocation)
-        public void setup() {
-            for (int i = 0; i < TARGETS; i++) {
-                callTargets[i] = Truffle.getRuntime().createCallTarget(rootNodes[i % rootNodes.length]);
-            }
-        }
-
-    }
-
     @Benchmark
     public Object callTargetCreate() {
         return Truffle.getRuntime().createCallTarget(new RootNode1());

From 31d315e9386ba88b5be936d393f2498072fe09e4 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 9 Sep 2021 13:43:14 +0200
Subject: [PATCH 115/681] Extend JavaDoc for TruffleRuntime::iterateFrames.

---
 .../src/com/oracle/truffle/api/TruffleRuntime.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
index bb8183c717f1..55d8a713fbcf 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
@@ -43,6 +43,7 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameInstance;
+import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
 import com.oracle.truffle.api.frame.FrameInstanceVisitor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -167,6 +168,14 @@ public interface TruffleRuntime {
      * every {@link FrameInstance}, returns null. Any non-null result of the visitor indicates that
      * frame iteration should stop.
      *
+     * <p>
+     * Note that this method can cause deoptimization if
+     * {@link FrameInstance#getFrame(FrameInstance.FrameAccess)} is called with
+     * {@link FrameAccess#READ_WRITE} or {@link FrameAccess#MATERIALIZE} on the fast path.
+     * Instructions and flags for debugging such deoptimizations can be found in <a href=
+     * "https://github.com/oracle/graal/blob/master/truffle/docs/Optimizing.md#debugging-deoptimizations">/truffle/docs/Optimizing.md#debugging-deoptimizations</a>
+     *
+     * <p>
      * To get possible asynchronous stack frames, use
      * {@link TruffleStackTrace#getAsynchronousStackTrace(CallTarget, Frame)} and provide call
      * target and frame from the last {@link FrameInstance}.

From 53bcb65ba1c2a4eb1240a2027d500ad492d600a7 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Sun, 12 Sep 2021 17:36:32 +0200
Subject: [PATCH 116/681] Add Espresso to Languages.md.

---
 truffle/docs/Languages.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/truffle/docs/Languages.md b/truffle/docs/Languages.md
index 28322dda2ac9..ed6fd6ea70ef 100644
--- a/truffle/docs/Languages.md
+++ b/truffle/docs/Languages.md
@@ -9,6 +9,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/Languages/
 This page is intended to keep track of the growing number of language implementations and experiments on top of Truffle.
 The following language implementations exist already:
 
+* [Espresso](https://github.com/oracle/graal/tree/master/espresso), a meta-circular Java bytecode interpreter. *
 * [FastR](https://github.com/graalvm/fastr), an implementation of GNU R. *
 * [Graal.js](https://github.com/graalvm/graaljs), an ECMAScript 2020 compliant JavaScript implementation. *
 * [Graal.Python](https://github.com/graalvm/graalpython), an early-stage implementation of Python. *

From 69970372063deeb98c5293edbc547f96432fa7cd Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 21 Sep 2021 09:48:15 +0200
Subject: [PATCH 117/681] Create CallTargets lazily.

---
 .../truffle/runtime/GraalRuntimeSupport.java  |  9 +++++++
 .../truffle/runtime/GraalTruffleRuntime.java  |  9 +++----
 .../truffle/runtime/OptimizedCallTarget.java  |  3 +--
 truffle/CHANGELOG.md                          |  3 +++
 .../truffle/api/test/TruffleRuntimeTest.java  |  2 ++
 .../com.oracle.truffle.api/snapshot.sigtest   |  1 +
 .../oracle/truffle/api/TruffleRuntime.java    |  4 ++-
 .../com/oracle/truffle/api/impl/Accessor.java |  4 +--
 .../truffle/api/impl/DefaultCallTarget.java   |  1 -
 .../api/impl/DefaultRuntimeAccessor.java      |  8 ++++++
 .../api/impl/DefaultTruffleRuntime.java       |  4 +--
 .../truffle/api/nodes/NodeAccessor.java       |  5 ----
 .../oracle/truffle/api/nodes/RootNode.java    | 27 +++++++++++++++++--
 13 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
index 247866ee18d3..00c3f356eab9 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
@@ -32,6 +32,7 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.frame.Frame;
@@ -55,6 +56,14 @@ final class GraalRuntimeSupport extends RuntimeSupport {
         super(permission);
     }
 
+    @Override
+    public RootCallTarget newCallTarget(RootNode rootNode) {
+        CompilerAsserts.neverPartOfCompilation();
+        final OptimizedCallTarget target = GraalTruffleRuntime.getRuntime().newCallTarget(rootNode, null);
+        TruffleSplittingStrategy.newTargetCreated(target);
+        return target;
+    }
+
     @ExplodeLoop
     @Override
     public void onLoopCount(Node source, int count) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index 624cae5c5496..ca53b6c4e9ba 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -692,13 +692,10 @@ public <T> T getCapability(Class<T> capability) {
 
     @Override
     public final RootCallTarget createCallTarget(RootNode rootNode) {
-        CompilerAsserts.neverPartOfCompilation();
-        final OptimizedCallTarget target = createClonedCallTarget(rootNode, null);
-        TruffleSplittingStrategy.newTargetCreated(target);
-        return target;
+        return rootNode.getCallTarget();
     }
 
-    public final OptimizedCallTarget createClonedCallTarget(RootNode rootNode, OptimizedCallTarget source) {
+    public final OptimizedCallTarget newCallTarget(RootNode rootNode, OptimizedCallTarget source) {
         CompilerAsserts.neverPartOfCompilation();
         OptimizedCallTarget target = createOptimizedCallTarget(source, rootNode);
         GraalRuntimeAccessor.INSTRUMENT.onLoad(target.getRootNode());
@@ -713,7 +710,7 @@ public final OptimizedCallTarget createClonedCallTarget(RootNode rootNode, Optim
     public final OptimizedCallTarget createOSRCallTarget(RootNode rootNode) {
         CompilerAsserts.neverPartOfCompilation();
         OptimizedCallTarget target = createOptimizedCallTarget(null, rootNode);
-        GraalRuntimeAccessor.INSTRUMENT.onLoad(target.getRootNode());
+        GraalRuntimeAccessor.INSTRUMENT.onLoad(rootNode);
         return target;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
index f12f710637a0..e4c5c33eab42 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
@@ -339,7 +339,6 @@ protected OptimizedCallTarget(OptimizedCallTarget sourceCallTarget, RootNode roo
         // Do not adopt children of OSRRootNodes; we want to preserve the parent of the child
         // node(s).
         this.uninitializedNodeCount = !isOSR() ? GraalRuntimeAccessor.NODES.adoptChildrenAndCount(rootNode) : -1;
-        GraalRuntimeAccessor.NODES.setCallTarget(rootNode, this);
     }
 
     final Assumption getNodeRewritingAssumption() {
@@ -840,7 +839,7 @@ final OptimizedCallTarget cloneUninitialized() {
         } else {
             clonedRoot = NodeUtil.cloneNode(uninitializedRootNode);
         }
-        return runtime().createClonedCallTarget(clonedRoot, this);
+        return runtime().newCallTarget(clonedRoot, this);
     }
 
     /**
diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index ebd44af3e83a..be71a4f1f14f 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes between Truffle versions relevant to languages implementors building upon the Truffle framework. The main focus is on APIs exported by Truffle.
 
+## Version 22.0.0
+*  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` is deprecated and so will be `TruffleRuntime#createCallTarget()` soon. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
+
 ## Version 21.3.0
 * Added a `@GenerateWrapper.Ignore` annotation to prevent methods from being instrumented in wrapper classes.
 * The native image `TruffleCheckBlackListedMethods` option was deprecated and replaced by the `TruffleCheckBlockListMethods` option.
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
index a7a19619b957..2da778bf60d4 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
@@ -114,6 +114,8 @@ public void testCreateCallTarget() {
         RootNode rootNode = createTestRootNode(null);
         RootCallTarget target = runtime.createCallTarget(rootNode);
         assertNotNull(target);
+        assertSame(target, rootNode.getCallTarget());
+        assertSame(target, runtime.createCallTarget(rootNode));
         for (int i = 0; i < 10000; i++) {
             assertEquals(target.call(), 42);
         }
diff --git a/truffle/src/com.oracle.truffle.api/snapshot.sigtest b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
index d3b4dd7e95f2..624aa717e19d 100644
--- a/truffle/src/com.oracle.truffle.api/snapshot.sigtest
+++ b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
@@ -1325,6 +1325,7 @@ meth protected boolean isTrivial()
 meth protected com.oracle.truffle.api.nodes.ExecutionSignature prepareForAOT()
 meth protected com.oracle.truffle.api.nodes.RootNode cloneUninitialized()
 meth protected final void setCallTarget(com.oracle.truffle.api.RootCallTarget)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object translateStackTraceElement(com.oracle.truffle.api.TruffleStackTraceElement)
 meth protected java.util.List<com.oracle.truffle.api.TruffleStackTraceElement> findAsynchronousFrames(com.oracle.truffle.api.frame.Frame)
 meth public abstract java.lang.Object execute(com.oracle.truffle.api.frame.VirtualFrame)
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
index 55d8a713fbcf..526e7f2ac618 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
@@ -70,7 +70,9 @@ public interface TruffleRuntime {
     String getName();
 
     /**
-     * Creates a new call target for a given root node.
+     * Creates a new call target for a given root node if none exists. Otherwise, the existing call
+     * target is returned. Note that this method is only kept for backward compatibility and will
+     * soon be deprecated. Please use {@link RootNode#getCallTarget()} instead.
      *
      * @param rootNode the root node whose
      *            {@link RootNode#execute(com.oracle.truffle.api.frame.VirtualFrame)} method
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
index ee6ef15bd88d..a71a3669320c 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
@@ -153,8 +153,6 @@ protected NodeSupport() {
 
         public abstract boolean isInstrumentable(RootNode rootNode);
 
-        public abstract void setCallTarget(RootNode rootNode, RootCallTarget callTarget);
-
         public abstract boolean isCloneUninitializedSupported(RootNode rootNode);
 
         public abstract RootNode cloneUninitialized(RootNode rootNode);
@@ -969,6 +967,8 @@ protected RuntimeSupport(Object permission) {
             }
         }
 
+        public abstract RootCallTarget newCallTarget(RootNode rootNode);
+
         public ThreadLocalHandshake getThreadLocalHandshake() {
             return DefaultThreadLocalHandshake.SINGLETON;
         }
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
index 8eb6dd87f62c..b73ead50676e 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
@@ -63,7 +63,6 @@ public final class DefaultCallTarget implements RootCallTarget {
     DefaultCallTarget(RootNode function) {
         this.rootNode = function;
         this.rootNode.adoptChildren();
-        DefaultRuntimeAccessor.NODES.setCallTarget(function, this);
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultRuntimeAccessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultRuntimeAccessor.java
index e0bb95e361bd..f35dc930ed76 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultRuntimeAccessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultRuntimeAccessor.java
@@ -49,6 +49,7 @@
 import org.graalvm.options.OptionValues;
 
 import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.nodes.BlockNode;
 import com.oracle.truffle.api.nodes.BlockNode.ElementExecutor;
@@ -76,6 +77,13 @@ static final class DefaultRuntimeSupport extends RuntimeSupport {
             super(permission);
         }
 
+        @Override
+        public RootCallTarget newCallTarget(RootNode rootNode) {
+            DefaultCallTarget target = new DefaultCallTarget(rootNode);
+            DefaultRuntimeAccessor.INSTRUMENT.onLoad(rootNode);
+            return target;
+        }
+
         @Override
         public ThreadLocalHandshake getThreadLocalHandshake() {
             return DefaultThreadLocalHandshake.SINGLETON;
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
index 214f255aa188..548653969f93 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
@@ -120,9 +120,7 @@ public String getName() {
     @SuppressWarnings("deprecation")
     @Override
     public RootCallTarget createCallTarget(RootNode rootNode) {
-        DefaultCallTarget target = new DefaultCallTarget(rootNode);
-        DefaultRuntimeAccessor.INSTRUMENT.onLoad(target.getRootNode());
-        return target;
+        return rootNode.getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeAccessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeAccessor.java
index 87d139a98baf..13853cf49091 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeAccessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeAccessor.java
@@ -73,11 +73,6 @@ public boolean isInstrumentable(RootNode rootNode) {
             return rootNode.isInstrumentable();
         }
 
-        @Override
-        public void setCallTarget(RootNode rootNode, RootCallTarget callTarget) {
-            rootNode.setCallTarget(callTarget);
-        }
-
         @Override
         public boolean isCloneUninitializedSupported(RootNode rootNode) {
             return rootNode.isCloneUninitializedSupported();
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
index c3580d28146c..d7bf912541bc 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
@@ -47,6 +47,7 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.CompilerOptions;
@@ -345,7 +346,21 @@ protected RootNode cloneUninitialized() {
 
     /** @since 0.8 or earlier */
     public final RootCallTarget getCallTarget() {
-        return callTarget;
+        RootCallTarget target = this.callTarget;
+        if (target == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            ReentrantLock l = getLazyLock();
+            l.lock();
+            try {
+                target = this.callTarget;
+                if (target == null) {
+                    this.callTarget = target = NodeAccessor.RUNTIME.newCallTarget(this);
+                }
+            } finally {
+                l.unlock();
+            }
+        }
+        return target;
     }
 
     /** @since 0.8 or earlier */
@@ -353,8 +368,16 @@ public final FrameDescriptor getFrameDescriptor() {
         return frameDescriptor;
     }
 
-    /** @since 19.0 */
+    /**
+     * @throws UnsupportedOperationException if a call target already exists.
+     * @since 19.0
+     * @deprecated in 22.0, call targets are lazily initialized in {@link #getCallTarget()} now.
+     */
+    @Deprecated
     protected final void setCallTarget(RootCallTarget callTarget) {
+        if (this.callTarget != null) {
+            throw new UnsupportedOperationException();
+        }
         this.callTarget = callTarget;
     }
 

From 449042237ddbbe3b25ac9a88d52eb1a7465a7c69 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 24 Sep 2021 10:49:51 +0200
Subject: [PATCH 118/681] Fix style and copyright.

---
 .../interop/PolyglotArrayToNativeTest.java    | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
index 5d88781a2025..146976c75407 100644
--- a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
+++ b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package com.oracle.truffle.llvm.tests.interop;
 
 import org.graalvm.polyglot.Value;
@@ -44,7 +73,7 @@ public static void loadPolygloArrayToNativeLibrary() {
     @ExportLibrary(InteropLibrary.class)
     @ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
     @SuppressWarnings("static-method")
-    static class SimpleWrapper implements TruffleObject {
+    static final class SimpleWrapper implements TruffleObject {
         private final long delegate;
 
         private SimpleWrapper(long l) {
@@ -104,7 +133,7 @@ Object getNativeType() {
     @ExportLibrary(value = NativeTypeLibrary.class, useForAOT = false)
     @ExportLibrary(InteropLibrary.class)
     @SuppressWarnings("static-method")
-    static class SimpleArrayWrapper implements TruffleObject {
+    static final class SimpleArrayWrapper implements TruffleObject {
         private final SimpleWrapper[] objects;
 
         private SimpleArrayWrapper(SimpleWrapper[] objects) {
@@ -174,4 +203,4 @@ public void test() {
             Assert.assertEquals(i, payload.asNativePointer());
         }
     }
-}
\ No newline at end of file
+}

From 5464d007c023fa12a57c946cad683bff4e5a4643 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 24 Sep 2021 13:34:58 +0200
Subject: [PATCH 119/681] Fix: add TruffleBoundary to getNativeType

---
 .../truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
index 146976c75407..97c8f1570e52 100644
--- a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
+++ b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/PolyglotArrayToNativeTest.java
@@ -29,6 +29,7 @@
  */
 package com.oracle.truffle.llvm.tests.interop;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import org.graalvm.polyglot.Value;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -166,6 +167,7 @@ boolean hasNativeType() {
         }
 
         @ExportMessage
+        @TruffleBoundary
         Object getNativeType() {
             try {
                 Object[] result = new Object[1];

From 4f74d7871513f7123c87ad248ee7a2b3775a1170 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 24 Sep 2021 15:14:52 +0200
Subject: [PATCH 120/681] Fix format

---
 .../interop/polyglotArrayToNative.c                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c b/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
index 9825627b3496..b8fa7649a561 100644
--- a/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
+++ b/sulong/tests/com.oracle.truffle.llvm.tests.interop.native/interop/polyglotArrayToNative.c
@@ -31,7 +31,7 @@
 
 #include <graalvm/llvm/polyglot.h>
 
-typedef void* VoidPtr;
+typedef void *VoidPtr;
 
 typedef struct {
     void *payload;
@@ -48,7 +48,7 @@ void get_Simple_array_typeid(uint64_t len, void (*ret)(polyglot_typeid typeid))
     ret(polyglot_array_typeid(polyglot_VoidPtr_typeid(), len));
 }
 
-#define WRAP(x) ((Simple){(x)})
+#define WRAP(x) ((Simple){ (x) })
 
 void *simple_array_to_native(VoidPtr *polyglot_array, uint64_t size) {
     Simple *native = (Simple *) malloc(size * sizeof(Simple));

From ad99cf7c1d5acef45fbb0c76fdc2bf4b9f7baeff Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Fri, 24 Sep 2021 16:19:16 +0200
Subject: [PATCH 121/681] Add multi-version renaissance support to native-image
 and upgrade to renaissance 0.13

---
 .../mx_substratevm_benchmark.py               | 174 ++++++++++++------
 substratevm/mx.substratevm/suite.py           |   4 +-
 2 files changed, 123 insertions(+), 55 deletions(-)

diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
index ab64cb709e27..eb8a0e702f17 100644
--- a/substratevm/mx.substratevm/mx_substratevm_benchmark.py
+++ b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
@@ -91,48 +91,114 @@ def list_jars(path):
 }
 
 _renaissance_config = {
-    "akka-uct"         : ("actors", 11), # GR-17994
-    "reactors"         : ("actors", 11),
-    "scala-kmeans"     : ("scala-stdlib", 12),
-    "mnemonics"        : ("jdk-streams", 12),
-    "par-mnemonics"    : ("jdk-streams", 12),
-    "rx-scrabble"      : ("rx", 12),
-    "als"              : ("apache-spark", 11),
-    "chi-square"       : ("apache-spark", 11),
-    "db-shootout"      : ("database", 11), # GR-17975, GR-17943 (with --report-unsupported-elements-at-runtime)
-    "dec-tree"         : ("apache-spark", 11),
-    "dotty"            : ("scala-dotty", 12), # GR-17985
-    "finagle-chirper"  : ("twitter-finagle", 11),
-    "finagle-http"     : ("twitter-finagle", 11),
-    "fj-kmeans"        : ("jdk-concurrent", 12),
-    "future-genetic"   : ("jdk-concurrent", 12), # GR-17988
-    "gauss-mix"        : ("apache-spark", 11),
-    "log-regression"   : ("apache-spark", 11),
-    "movie-lens"       : ("apache-spark", 11),
-    "naive-bayes"      : ("apache-spark", 11),
-    "neo4j-analytics"  : ("neo4j", 11),
-    "page-rank"        : ("apache-spark", 11),
-    "philosophers"     : ("scala-stm", 12),
-    "scala-stm-bench7" : ("scala-stm", 12),
-    "scrabble"         : ("jdk-streams", 12)
+    "akka-uct": {
+        "group": "actors-akka",
+        "legacy-group": "actors",
+        "requires-recompiled-harness": ["0.9.0", "0.10.0", "0.11.0"]
+    },
+    "reactors": {
+        "group": "actors-reactors",
+        "legacy-group": "actors",
+        "requires-recompiled-harness": True
+    },
+    "scala-kmeans": {
+        "group": "scala-stdlib"
+    },
+    "scala-doku": {
+        "group": "scala-sat"
+    },
+    "mnemonics": {
+        "group": "jdk-streams"
+    },
+    "par-mnemonics": {
+        "group": "jdk-streams"
+    },
+    "rx-scrabble": {
+        "group": "rx"
+    },
+    "als": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "chi-square": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "db-shootout": {  # GR-17975, GR-17943 (with --report-unsupported-elements-at-runtime)
+        "group": "database",
+        "requires-recompiled-harness": ["0.9.0", "0.10.0", "0.11.0"]
+    },
+    "dec-tree": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "dotty": {
+        "group": "scala-dotty"
+    },
+    "finagle-chirper": {
+        "group": "twitter-finagle",
+        "requires-recompiled-harness": True
+    },
+    "finagle-http": {
+        "group": "twitter-finagle",
+        "requires-recompiled-harness": True
+    },
+    "fj-kmeans": {
+        "group": "jdk-concurrent"
+    },
+    "future-genetic": {
+        "group": "jdk-concurrent"
+    },
+    "gauss-mix": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "log-regression": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "movie-lens": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "naive-bayes": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "page-rank": {
+        "group": "apache-spark",
+        "requires-recompiled-harness": True
+    },
+    "neo4j-analytics": {
+        "group": "neo4j",
+        "requires-recompiled-harness": True
+    },
+    "philosophers": {
+        "group": "scala-stm",
+        "requires-recompiled-harness": ["0.12.0", "0.13.0"]
+    },
+    "scala-stm-bench7": {
+        "group": "scala-stm",
+        "requires-recompiled-harness": ["0.12.0", "0.13.0"]
+    },
+    "scrabble": {
+        "group": "jdk-streams"
+    }
 }
 
-# breeze jar is replaced with a patched jar because of IncompatibleClassChange errors due to a bug in the Scala compiler.
-_renaissance_additional_lib = {
-    'apache-spark'               : ['SPARK_BREEZE_PATCHED']
-}
-
-_renaissance_exclude_lib = {
-    'apache-spark'               : ['breeze_2.11-0.11.2.jar']
-}
 
+def benchmark_group(benchmark, suite_version):
+    if suite_version in ["0.9.0", "0.10.0", "0.11.0"]:
+        return _renaissance_config[benchmark].get("legacy-group", _renaissance_config[benchmark]["group"])
+    else:
+        return _renaissance_config[benchmark]["group"]
 
-def benchmark_group(benchmark):
-    return _renaissance_config[benchmark][0]
 
-
-def benchmark_scalaversion(benchmark):
-    return _renaissance_config[benchmark][1]
+def requires_recompiled_harness(benchmark, suite_version):
+    requires_harness = _renaissance_config[benchmark].get("requires-recompiled-harness", False)
+    if isinstance(requires_harness, list):
+        return suite_version in requires_harness
+    return requires_harness
 
 
 class RenaissanceNativeImageBenchmarkSuite(mx_java_benchmarks.RenaissanceBenchmarkSuite, mx_sdk_benchmark.NativeImageBenchmarkMixin): #pylint: disable=too-many-ancestors
@@ -153,7 +219,7 @@ def benchSuiteName(self, bmSuiteArgs=None):
         return 'renaissance'
 
     def renaissance_harness_lib_name(self):
-        version_to_run = super(RenaissanceNativeImageBenchmarkSuite, self).version()
+        version_to_run = self.version()
         version_end_index = str(version_to_run).rindex('.')
         return 'RENAISSANCE_HARNESS_v' + str(version_to_run)[0:version_end_index]
 
@@ -216,9 +282,10 @@ def successPatterns(self):
             _successful_stage_pattern
         ]
 
-    def create_classpath(self, benchArg):
-        harness_project = RenaissanceNativeImageBenchmarkSuite.RenaissanceProject('harness', benchmark_scalaversion(benchArg), self)
-        group_project = RenaissanceNativeImageBenchmarkSuite.RenaissanceProject(benchmark_group(benchArg), benchmark_scalaversion(benchArg), self, harness_project)
+    def create_classpath(self, benchmarkName):
+        custom_harness = requires_recompiled_harness(benchmarkName, self.version())
+        harness_project = RenaissanceNativeImageBenchmarkSuite.RenaissanceProject('harness', custom_harness, self)
+        group_project = RenaissanceNativeImageBenchmarkSuite.RenaissanceProject(benchmark_group(benchmarkName, self.version()), custom_harness, self, harness_project)
         return ':'.join([mx.classpath(harness_project), mx.classpath(group_project)])
 
     class RenaissanceDependency(mx.ClasspathDependency):
@@ -233,10 +300,10 @@ def _walk_deps_visit_edges(self, *args, **kwargs):
             pass
 
     class RenaissanceProject(mx.ClasspathDependency):
-        def __init__(self, group, scala_version=12, renaissance_suite=None, dep_project=None): # pylint: disable=super-init-not-called
+        def __init__(self, group, requires_recompiled_harness, renaissance_suite, dep_project=None): # pylint: disable=super-init-not-called
             mx.Dependency.__init__(self, _suite, group, None)
             self.suite = renaissance_suite
-            self.deps = self.collect_group_dependencies(group, scala_version)
+            self.deps = self.collect_group_dependencies(group, requires_recompiled_harness)
             if dep_project is not None:
                 self.deps.append(dep_project)
 
@@ -251,24 +318,25 @@ def get_dependencies(self, path, group):
             deps = []
             for jar in list_jars(path):
                 deps.append(RenaissanceNativeImageBenchmarkSuite.RenaissanceDependency(os.path.basename(jar), mx.join(path, jar)))
-            if group in _renaissance_exclude_lib:
-                for lib in _renaissance_exclude_lib[group]:
-                    lib_dep = RenaissanceNativeImageBenchmarkSuite.RenaissanceDependency(lib, mx.join(path, lib))
+
+            if self.suite.version() in ["0.9.0", "0.10.0", "0.11.0"]:
+                if group == 'apache-spark':
+                    # breeze jar is replaced with a patched jar because of IncompatibleClassChange errors due to a bug in the Scala compiler
+                    invalid_bytecode_jar = 'breeze_2.11-0.11.2.jar'
+                    lib_dep = RenaissanceNativeImageBenchmarkSuite.RenaissanceDependency(invalid_bytecode_jar, mx.join(path, invalid_bytecode_jar))
                     if lib_dep in deps:
                         deps.remove(lib_dep)
-            if group in _renaissance_additional_lib:
-                for lib in _renaissance_additional_lib[group]:
-                    lib_path = RenaissanceNativeImageBenchmarkSuite.renaissance_additional_lib(self.suite, lib)
+                    lib_path = RenaissanceNativeImageBenchmarkSuite.renaissance_additional_lib(self.suite, 'SPARK_BREEZE_PATCHED')
                     deps.append(RenaissanceNativeImageBenchmarkSuite.RenaissanceDependency(os.path.basename(lib_path), lib_path))
             return deps
 
-        def collect_group_dependencies(self, group, scala_version):
+        def collect_group_dependencies(self, group, requires_recompiled_harness):
             if group == 'harness':
-                if scala_version == 12:
+                if requires_recompiled_harness:
+                    path = RenaissanceNativeImageBenchmarkSuite.harness_path(self.suite)
+                else:
                     unpacked_renaissance = RenaissanceNativeImageBenchmarkSuite.renaissance_unpacked(self.suite)
                     path = mx.join(unpacked_renaissance, 'renaissance-harness')
-                else:
-                    path = RenaissanceNativeImageBenchmarkSuite.harness_path(self.suite)
             else:
                 unpacked_renaissance = RenaissanceNativeImageBenchmarkSuite.renaissance_unpacked(self.suite)
                 path = mx.join(unpacked_renaissance, 'benchmarks', group)
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 0de5c71a4e7d..cc3da43c8acc 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -55,12 +55,12 @@
         },
         "RENAISSANCE_HARNESS_v0.12" : {
             "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-harness_v0.12.0.tar.gz"],
-            "sha1" : "c061f62ce6f2758ec30b92e69f20f14b93e34b35",
+            "sha1" : "84592bedd6f0afa842aadb8813d395317b1fa385",
             "packedResource": True,
         },
         "RENAISSANCE_HARNESS_v0.13" : {
             "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/renaissance/renaissance-harness_v0.13.0.tar.gz"],
-            "sha1" : "ca32c080016c5659bbf3eddc184e14b742769372",
+            "sha1" : "8edc1db5c7ea977e2a9c037b5324bb4cbee40082",
             "packedResource": True,
         },
         "DACAPO_SVM" : {

From b19128328f93f8cfd4c7702ba9118cdf772648f4 Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.m.marek@oracle.com>
Date: Fri, 24 Sep 2021 16:40:07 +0200
Subject: [PATCH 122/681] Do not use GNUR_FC env var

---
 vm/ci_common/common.hocon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index 21b8c9f98e51..32202174f47f 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -141,7 +141,6 @@ fastr_darwin: ${fastr} {
   environment:  {
     PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH"
     FASTR_FC: "/cm/shared/apps/gcc/8.3.0/bin/gfortran"
-    GNUR_FC: "/cm/shared/apps/gcc/8.3.0/bin/gfortran"
     TZDIR: "/usr/share/zoneinfo"
     FASTR_LIBZ_VER: "1.2.11"
     PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/pcre2/pcre2-10.37/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include"

From b94039578d2181b9d48b841c14fd4bd559ae327c Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 22 Sep 2021 18:50:02 +0200
Subject: [PATCH 123/681] Refactor property locations.

---
 .../oracle/truffle/object/CoreLocations.java  | 193 +++++++++---------
 .../truffle/object/DynamicObjectBasic.java    |  30 +--
 .../object/DynamicObjectLibraryImpl.java      | 142 ++++---------
 .../oracle/truffle/object/LocationImpl.java   | 133 +++++++++---
 .../com/oracle/truffle/object/Locations.java  |  23 +--
 5 files changed, 268 insertions(+), 253 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
index 4c4aa5cc9217..a88467793811 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
@@ -84,9 +84,9 @@ public interface ObjectLocation extends TypedLocation, com.oracle.truffle.api.ob
     }
 
     public interface IntLocation extends TypedLocation, com.oracle.truffle.api.object.IntLocation {
-        int getInt(DynamicObject store, boolean condition);
+        int getInt(DynamicObject store, boolean guard);
 
-        void setInt(DynamicObject store, int value, boolean condition);
+        void setInt(DynamicObject store, int value, boolean guard, boolean init);
 
         default Class<Integer> getType() {
             return int.class;
@@ -101,26 +101,26 @@ default int getInt(DynamicObject store, Shape shape) {
 
         @Override
         default void setInt(DynamicObject store, int value, Shape shape) throws FinalLocationException {
-            setInt(store, value, store.getShape() == shape);
+            setInt(store, value, store.getShape() == shape, false);
         }
 
         @Override
         default void setInt(DynamicObject store, int value) throws FinalLocationException {
-            setInt(store, value, false);
+            setInt(store, value, false, false);
         }
 
         @Override
         default void setInt(DynamicObject store, int value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
-            setInt(store, value, false);
+            setInt(store, value, false, false);
             ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
     public interface LongLocation extends TypedLocation, com.oracle.truffle.api.object.LongLocation {
-        long getLong(DynamicObject store, boolean condition);
+        long getLong(DynamicObject store, boolean guard);
 
-        void setLong(DynamicObject store, long value, boolean condition);
+        void setLong(DynamicObject store, long value, boolean guard, boolean init);
 
         default Class<Long> getType() {
             return long.class;
@@ -137,26 +137,26 @@ default long getLong(DynamicObject store, Shape shape) {
 
         @Override
         default void setLong(DynamicObject store, long value, Shape shape) throws FinalLocationException {
-            setLong(store, value, store.getShape() == shape);
+            setLong(store, value, store.getShape() == shape, false);
         }
 
         @Override
         default void setLong(DynamicObject store, long value) throws FinalLocationException {
-            setLong(store, value, false);
+            setLong(store, value, false, false);
         }
 
         @Override
         default void setLong(DynamicObject store, long value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
-            setLong(store, value, false);
+            setLong(store, value, false, false);
             ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
     public interface DoubleLocation extends TypedLocation, com.oracle.truffle.api.object.DoubleLocation {
-        double getDouble(DynamicObject store, boolean condition);
+        double getDouble(DynamicObject store, boolean guard);
 
-        void setDouble(DynamicObject store, double value, boolean condition);
+        void setDouble(DynamicObject store, double value, boolean guard, boolean init);
 
         default Class<Double> getType() {
             return double.class;
@@ -173,26 +173,26 @@ default double getDouble(DynamicObject store, Shape shape) {
 
         @Override
         default void setDouble(DynamicObject store, double value, Shape shape) throws FinalLocationException {
-            setDouble(store, value, store.getShape() == shape);
+            setDouble(store, value, store.getShape() == shape, false);
         }
 
         @Override
         default void setDouble(DynamicObject store, double value) throws FinalLocationException {
-            setDouble(store, value, false);
+            setDouble(store, value, false, false);
         }
 
         @Override
         default void setDouble(DynamicObject store, double value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
-            setDouble(store, value, false);
+            setDouble(store, value, false, false);
             ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
 
     public interface BooleanLocation extends TypedLocation, com.oracle.truffle.api.object.BooleanLocation {
-        boolean getBoolean(DynamicObject store, boolean condition);
+        boolean getBoolean(DynamicObject store, boolean guard);
 
-        void setBoolean(DynamicObject store, boolean value, boolean condition);
+        void setBoolean(DynamicObject store, boolean value, boolean guard, boolean init);
 
         default Class<Boolean> getType() {
             return boolean.class;
@@ -207,18 +207,18 @@ default boolean getBoolean(DynamicObject store, Shape shape) {
 
         @Override
         default void setBoolean(DynamicObject store, boolean value, Shape shape) throws FinalLocationException {
-            setBoolean(store, value, store.getShape() == shape);
+            setBoolean(store, value, store.getShape() == shape, false);
         }
 
         @Override
         default void setBoolean(DynamicObject store, boolean value) throws FinalLocationException {
-            setBoolean(store, value, false);
+            setBoolean(store, value, false, false);
         }
 
         @Override
         default void setBoolean(DynamicObject store, boolean value, Shape oldShape, Shape newShape) {
             ACCESS.grow(store, oldShape, newShape);
-            setBoolean(store, value, false);
+            setBoolean(store, value, false, false);
             ACCESS.setShapeWithStoreFence(store, newShape);
         }
     }
@@ -246,7 +246,7 @@ public boolean equals(Object obj) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
+        public final Object get(DynamicObject store, boolean guard) {
             return value;
         }
 
@@ -256,17 +256,14 @@ public boolean canStore(Object val) {
         }
 
         @Override
-        public final void set(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException, FinalLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
             if (!canStore(value)) {
-                throw finalLocation();
-            }
-        }
-
-        @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
-            if (!canStore(value)) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new UnsupportedOperationException();
+                if (init) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    throw new UnsupportedOperationException();
+                } else {
+                    throw finalLocation();
+                }
             }
         }
 
@@ -318,9 +315,9 @@ protected ArrayLocation(int index, CoreLocation arrayLocation) {
             this.arrayLocation = arrayLocation;
         }
 
-        protected final Object getArray(DynamicObject store, boolean condition) {
+        protected final Object getArray(DynamicObject store, boolean guard) {
             // non-null cast
-            return arrayLocation.get(store, condition);
+            return arrayLocation.get(store, guard);
         }
 
         @Override
@@ -410,13 +407,13 @@ protected ObjectArrayLocation(int index, CoreLocation arrayLocation) {
         }
 
         @Override
-        public Object get(DynamicObject store, boolean condition) {
-            return ((Object[]) getArray(store, condition))[index];
+        public Object get(DynamicObject store, boolean guard) {
+            return ((Object[]) getArray(store, guard))[index];
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) {
-            ((Object[]) getArray(store, condition))[index] = value;
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) {
+            ((Object[]) getArray(store, guard))[index] = value;
         }
 
         @Override
@@ -435,7 +432,7 @@ public final boolean isNonNull() {
 
         @Override
         protected void clear(DynamicObject store) {
-            setInternal(store, null, false);
+            set(store, null, false, true);
         }
 
         @Override
@@ -456,10 +453,10 @@ protected SimpleObjectFieldLocation(int index) {
         }
 
         @Override
-        public abstract Object get(DynamicObject store, boolean condition);
+        public abstract Object get(DynamicObject store, boolean guard);
 
         @Override
-        public abstract void setInternal(DynamicObject store, Object value, boolean condition);
+        public abstract void set(DynamicObject store, Object value, boolean guard, boolean init);
 
         @Override
         public boolean canStore(Object value) {
@@ -477,7 +474,7 @@ public boolean isNonNull() {
 
         @Override
         protected void clear(DynamicObject store) {
-            setInternal(store, null, false);
+            set(store, null, false, true);
         }
 
         @Override
@@ -509,14 +506,14 @@ protected LongArrayLocation(int index, CoreLocation arrayLocation) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getLong(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getLong(store, guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setLongInternal(store, longValue(value));
+                setLong(store, longValue(value), guard, init);
             } else {
                 throw incompatibleLocation();
             }
@@ -531,8 +528,8 @@ private long longValue(Object value) {
         }
 
         @Override
-        public long getLong(DynamicObject store, boolean condition) {
-            int[] array = (int[]) getArray(store, condition);
+        public long getLong(DynamicObject store, boolean guard) {
+            int[] array = (int[]) getArray(store, guard);
             return UNSAFE.getLong(array, getOffset(array));
         }
 
@@ -543,7 +540,7 @@ public final void setLongInternal(DynamicObject store, long value) {
         }
 
         @Override
-        public void setLong(DynamicObject store, long value, boolean condition) {
+        public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
             setLongInternal(store, value);
         }
 
@@ -604,27 +601,27 @@ protected LongLocationDecorator(LongLocation longLocation, boolean allowInt) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getLong(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getLong(store, guard);
         }
 
         @Override
-        public long getLong(DynamicObject store, boolean condition) {
-            return super.getLongInternal(store, condition);
+        public long getLong(DynamicObject store, boolean guard) {
+            return super.getLongInternal(store, guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setLong(store, longValue(value), condition);
+                setLong(store, longValue(value), guard, init);
             } else {
                 throw incompatibleLocation();
             }
         }
 
         @Override
-        public void setLong(DynamicObject store, long value, boolean condition) {
-            super.setLongInternal(store, value, condition);
+        public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
+            super.setLongInternal(store, value, guard);
         }
 
         private long longValue(Object value) {
@@ -663,14 +660,14 @@ protected SimpleLongFieldLocation(int index) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getLong(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getLong(store, guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setLong(store, ((Long) value).longValue(), condition);
+                setLong(store, ((Long) value).longValue(), guard, init);
             } else {
                 throw incompatibleLocation();
             }
@@ -682,7 +679,7 @@ public final boolean canStore(Object value) {
         }
 
         @Override
-        public abstract long getLong(DynamicObject store, boolean condition);
+        public abstract long getLong(DynamicObject store, boolean guard);
 
         @Override
         public final long getLong(DynamicObject store, Shape shape) {
@@ -690,7 +687,7 @@ public final long getLong(DynamicObject store, Shape shape) {
         }
 
         @Override
-        public abstract void setLong(DynamicObject store, long value, boolean condition);
+        public abstract void setLong(DynamicObject store, long value, boolean guard, boolean init);
 
         @Override
         public int primitiveFieldCount() {
@@ -720,12 +717,12 @@ protected PrimitiveLocationDecorator(LongLocation longLocation) {
             this.longLocation = longLocation;
         }
 
-        public final long getLongInternal(DynamicObject store, boolean condition) {
-            return longLocation.getLong(store, condition);
+        public final long getLongInternal(DynamicObject store, boolean guard) {
+            return longLocation.getLong(store, guard);
         }
 
-        public final void setLongInternal(DynamicObject store, long value, boolean condition) {
-            longLocation.setLong(store, value, condition);
+        public final void setLongInternal(DynamicObject store, long value, boolean guard) {
+            longLocation.setLong(store, value, guard, true);
         }
 
         public final LongLocation getInternalLongLocation() {
@@ -774,24 +771,24 @@ protected IntLocationDecorator(LongLocation longLocation) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getInt(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getInt(store, guard);
         }
 
         @Override
-        public int getInt(DynamicObject store, boolean condition) {
-            return (int) getLongInternal(store, condition);
+        public int getInt(DynamicObject store, boolean guard) {
+            return (int) getLongInternal(store, guard);
         }
 
         @Override
-        public void setInt(DynamicObject store, int value, boolean condition) {
-            setLongInternal(store, value, condition);
+        public void setInt(DynamicObject store, int value, boolean guard, boolean init) {
+            setLongInternal(store, value, guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setLongInternal(store, (int) value, condition);
+                setLongInternal(store, (int) value, guard);
             } else {
                 throw incompatibleLocation();
             }
@@ -822,24 +819,24 @@ protected DoubleLocationDecorator(LongLocation longLocation, boolean allowInt) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getDouble(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getDouble(store, guard);
         }
 
         @Override
-        public double getDouble(DynamicObject store, boolean condition) {
-            return Double.longBitsToDouble(getLongInternal(store, condition));
+        public double getDouble(DynamicObject store, boolean guard) {
+            return Double.longBitsToDouble(getLongInternal(store, guard));
         }
 
         @Override
-        public void setDouble(DynamicObject store, double value, boolean condition) {
-            setLongInternal(store, Double.doubleToRawLongBits(value), condition);
+        public void setDouble(DynamicObject store, double value, boolean guard, boolean init) {
+            setLongInternal(store, Double.doubleToRawLongBits(value), guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setDouble(store, doubleValue(value), condition);
+                setDouble(store, doubleValue(value), guard, init);
             } else {
                 throw incompatibleLocation();
             }
@@ -885,24 +882,24 @@ protected BooleanLocationDecorator(LongLocation longLocation) {
         }
 
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
-            return getBoolean(store, condition);
+        public final Object get(DynamicObject store, boolean guard) {
+            return getBoolean(store, guard);
         }
 
         @Override
-        public boolean getBoolean(DynamicObject store, boolean condition) {
-            return getLongInternal(store, condition) != 0;
+        public boolean getBoolean(DynamicObject store, boolean guard) {
+            return getLongInternal(store, guard) != 0;
         }
 
         @Override
-        public void setBoolean(DynamicObject store, boolean value, boolean condition) {
-            setLongInternal(store, value ? 1 : 0, condition);
+        public void setBoolean(DynamicObject store, boolean value, boolean guard, boolean init) {
+            setLongInternal(store, value ? 1 : 0, guard);
         }
 
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (canStore(value)) {
-                setBoolean(store, (boolean) value, condition);
+                setBoolean(store, (boolean) value, guard, init);
             } else {
                 throw incompatibleLocation();
             }
@@ -958,13 +955,13 @@ private DynamicObjectFieldLocation(int index, long offset, Class<? extends Dynam
         }
 
         @Override
-        public Object get(DynamicObject store, boolean condition) {
+        public Object get(DynamicObject store, boolean guard) {
             receiverCheck(store);
             return UNSAFE.getObject(store, offset);
         }
 
         @Override
-        public void setInternal(DynamicObject store, Object value, boolean condition) {
+        public void set(DynamicObject store, Object value, boolean guard, boolean init) {
             receiverCheck(store);
             UNSAFE.putObject(store, offset, value);
         }
@@ -991,13 +988,13 @@ static final class DynamicLongFieldLocation extends SimpleLongFieldLocation {
         }
 
         @Override
-        public long getLong(DynamicObject store, boolean condition) {
+        public long getLong(DynamicObject store, boolean guard) {
             receiverCheck(store);
             return UNSAFE.getLong(store, offset);
         }
 
         @Override
-        public void setLong(DynamicObject store, long value, boolean condition) {
+        public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
             receiverCheck(store);
             UNSAFE.putLong(store, offset, value);
         }
@@ -1038,12 +1035,12 @@ static Unsafe getUnsafe() {
         int index = 0;
         OBJECT_ARRAY_LOCATION = new SimpleObjectFieldLocation(index++) {
             @Override
-            public Object[] get(DynamicObject store, boolean condition) {
+            public Object[] get(DynamicObject store, boolean guard) {
                 return LayoutImpl.ACCESS.getObjectArray(store);
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 LayoutImpl.ACCESS.setObjectArray(store, (Object[]) value);
             }
 
@@ -1055,12 +1052,12 @@ public Class<? extends DynamicObject> getDeclaringClass() {
 
         PRIMITIVE_ARRAY_LOCATION = new SimpleObjectFieldLocation(index++) {
             @Override
-            public int[] get(DynamicObject store, boolean condition) {
+            public int[] get(DynamicObject store, boolean guard) {
                 return LayoutImpl.ACCESS.getPrimitiveArray(store);
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 LayoutImpl.ACCESS.setPrimitiveArray(store, (int[]) value);
             }
 
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
index 8f1234bbd00b..35845839be7d 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -280,32 +280,32 @@ public final Class<? extends DynamicObject> getDeclaringClass() {
         index = 0;
         PRIMITIVE_FIELD_LOCATIONS = new BasicLongFieldLocation[]{new BasicLongFieldLocation(index++) {
             @Override
-            public long getLong(DynamicObject store, boolean condition) {
+            public long getLong(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).primitive1;
             }
 
             @Override
-            public void setLong(DynamicObject store, long value, boolean condition) {
+            public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).primitive1 = value;
             }
         }, new BasicLongFieldLocation(index++) {
             @Override
-            public long getLong(DynamicObject store, boolean condition) {
+            public long getLong(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).primitive2;
             }
 
             @Override
-            public void setLong(DynamicObject store, long value, boolean condition) {
+            public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).primitive2 = value;
             }
         }, new BasicLongFieldLocation(index++) {
             @Override
-            public long getLong(DynamicObject store, boolean condition) {
+            public long getLong(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).primitive3;
             }
 
             @Override
-            public void setLong(DynamicObject store, long value, boolean condition) {
+            public void setLong(DynamicObject store, long value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).primitive3 = value;
             }
         }};
@@ -313,42 +313,42 @@ public void setLong(DynamicObject store, long value, boolean condition) {
         index = 0;
         OBJECT_FIELD_LOCATIONS = new BasicObjectFieldLocation[]{new BasicObjectFieldLocation(index++) {
             @Override
-            public Object get(DynamicObject store, boolean condition) {
+            public Object get(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).object1;
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).object1 = value;
             }
         }, new BasicObjectFieldLocation(index++) {
             @Override
-            public Object get(DynamicObject store, boolean condition) {
+            public Object get(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).object2;
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).object2 = value;
             }
         }, new BasicObjectFieldLocation(index++) {
             @Override
-            public Object get(DynamicObject store, boolean condition) {
+            public Object get(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).object3;
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).object3 = value;
             }
         }, new BasicObjectFieldLocation(index++) {
             @Override
-            public Object get(DynamicObject store, boolean condition) {
+            public Object get(DynamicObject store, boolean guard) {
                 return ((DynamicObjectBasic) store).object4;
             }
 
             @Override
-            public void setInternal(DynamicObject store, Object value, boolean condition) {
+            public void set(DynamicObject store, Object value, boolean guard, boolean init) {
                 ((DynamicObjectBasic) store).object4 = value;
             }
         }};
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
index dc14eb70e9dc..7b697ff15259 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
@@ -73,9 +73,7 @@
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
-import com.oracle.truffle.api.object.FinalLocationException;
 import com.oracle.truffle.api.object.HiddenKey;
-import com.oracle.truffle.api.object.IncompatibleLocationException;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
@@ -301,7 +299,7 @@ public static Property[] getPropertyArray(@SuppressWarnings("unused") DynamicObj
         return ((ShapeImpl) cachedShape).getPropertyArray();
     }
 
-    private static LocationImpl getLocation(Property existing) {
+    static LocationImpl getLocation(Property existing) {
         return (LocationImpl) existing.getLocation();
     }
 
@@ -313,11 +311,7 @@ protected static boolean putUncached(DynamicObject object, Object key, Object va
             return false;
         }
         if (existingProperty != null && !Flags.isUpdateFlags(putFlags) && existingProperty.getLocation().canSet(value)) {
-            try {
-                getLocation(existingProperty).set(object, value, false);
-            } catch (IncompatibleLocationException | FinalLocationException e) {
-                throw shouldNotHappen(e);
-            }
+            getLocation(existingProperty).setSafe(object, value, false, false);
             return true;
         } else {
             return putUncachedSlow(object, key, value, putFlags);
@@ -359,21 +353,14 @@ private static boolean putUncachedSlow(DynamicObject object, Object key, Object
         } while (updateShapeImpl(object));
 
         assert ACCESS.getShape(object) == oldShape;
+        LocationImpl location = getLocation(property);
         if (oldShape != newShape) {
             ACCESS.grow(object, oldShape, newShape);
-            try {
-                getLocation(property).setInternal(object, value, false);
-            } catch (IncompatibleLocationException e) {
-                throw shouldNotHappen(e);
-            }
+            location.setSafe(object, value, false, true);
             ACCESS.setShapeWithStoreFence(object, newShape);
             updateShapeImpl(object);
         } else {
-            try {
-                getLocation(property).set(object, value, false);
-            } catch (IncompatibleLocationException | FinalLocationException e) {
-                throw shouldNotHappen(e);
-            }
+            location.setSafe(object, value, false, false);
         }
         return true;
     }
@@ -440,11 +427,7 @@ Object performGet(DynamicObject obj) {
         }
 
         void performSet(DynamicObject obj, Object value) {
-            try {
-                toLoc.setInternal(obj, value, false);
-            } catch (IncompatibleLocationException e) {
-                throw shouldNotHappen(e);
-            }
+            toLoc.setSafe(obj, value, false, true);
         }
 
         void clear(DynamicObject obj) {
@@ -1240,16 +1223,12 @@ protected boolean putImpl(DynamicObject object, Shape cachedShape, Object key, O
                             Shape newShape = c.newShape;
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.set(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1284,64 +1263,48 @@ protected boolean putIntImpl(DynamicObject object, Shape cachedShape, Object key
                         if (location.isIntLocation()) {
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setIntSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.setInt(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setIntSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
                         } else if (location.isImplicitCastIntToLong()) {
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setLongSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.setLong(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setLongSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
                         } else if (location.isImplicitCastIntToDouble()) {
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setDoubleSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.setDouble(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setDoubleSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
                         } else if (location.canStore(value)) {
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.set(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1374,16 +1337,12 @@ protected boolean putLongImpl(DynamicObject object, Shape cachedShape, Object ke
                             Shape newShape = c.newShape;
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setLongSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.setLong(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setLongSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1391,16 +1350,12 @@ protected boolean putLongImpl(DynamicObject object, Shape cachedShape, Object ke
                             Shape newShape = c.newShape;
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.set(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1433,16 +1388,12 @@ protected boolean putDoubleImpl(DynamicObject object, Shape cachedShape, Object
                             Shape newShape = c.newShape;
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setDoubleSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.setDouble(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setDoubleSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1450,16 +1401,12 @@ protected boolean putDoubleImpl(DynamicObject object, Shape cachedShape, Object
                             Shape newShape = c.newShape;
                             if (newShape != oldShape) {
                                 ACCESS.grow(object, oldShape, newShape);
+                                location.setSafe(object, value, guardCondition, true);
+                                ACCESS.setShapeWithStoreFence(object, newShape);
                             } else if (location.isFinal()) {
                                 continue;
-                            }
-                            try {
-                                location.set(object, value, guardCondition);
-                            } catch (IncompatibleLocationException | FinalLocationException e) {
-                                throw shouldNotHappen(e);
-                            }
-                            if (newShape != oldShape) {
-                                ACCESS.setShapeWithStoreFence(object, newShape);
+                            } else {
+                                location.setSafe(object, value, guardCondition, false);
                             }
                             c.maybeUpdateShape(object);
                             return true;
@@ -1703,11 +1650,6 @@ static <T extends CacheData<T>> T filterValid(T cache) {
         }
     }
 
-    static RuntimeException shouldNotHappen(Exception e) {
-        CompilerDirectives.transferToInterpreterAndInvalidate();
-        throw new IllegalStateException(e);
-    }
-
     abstract static class CacheData<T extends CacheData<T>> {
         final T next;
 
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
index d85d1e197149..ed40279f81a5 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
@@ -41,6 +41,7 @@
 package com.oracle.truffle.object;
 
 import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
@@ -86,7 +87,7 @@ public interface LocationVisitor {
     /** @since 0.17 or earlier */
     @Override
     public void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
-        set(store, value, checkShape(store, shape));
+        set(store, value, checkShape(store, shape), false);
     }
 
     @Override
@@ -96,7 +97,7 @@ public void set(DynamicObject store, Object value, Shape oldShape, Shape newShap
             try {
                 setInternal(store, value);
             } catch (IncompatibleLocationException ex) {
-                throw DynamicObjectLibraryImpl.shouldNotHappen(ex);
+                throw shouldNotHappen(ex);
             }
             LayoutImpl.ACCESS.setShapeWithStoreFence(store, newShape);
         } else {
@@ -113,33 +114,75 @@ protected final Object getInternal(DynamicObject store) {
     /**
      * Get object value as object at this location in store. For internal use only.
      *
-     * @param condition the result of a shape check or {@code false}
+     * @param guard the result of a shape check or {@code false}
      */
     @Override
-    public abstract Object get(DynamicObject store, boolean condition);
+    public abstract Object get(DynamicObject store, boolean guard);
 
-    protected long getLong(DynamicObject store, boolean condition) throws UnexpectedResultException {
-        return expectLong(get(store, condition));
+    /**
+     * @see #get(DynamicObject, boolean)
+     */
+    protected long getLong(DynamicObject store, boolean guard) throws UnexpectedResultException {
+        return expectLong(get(store, guard));
     }
 
-    protected int getInt(DynamicObject store, boolean condition) throws UnexpectedResultException {
-        return expectInteger(get(store, condition));
+    /**
+     * @see #get(DynamicObject, boolean)
+     */
+    protected int getInt(DynamicObject store, boolean guard) throws UnexpectedResultException {
+        return expectInteger(get(store, guard));
     }
 
-    protected double getDouble(DynamicObject store, boolean condition) throws UnexpectedResultException {
-        return expectDouble(get(store, condition));
+    /**
+     * @see #get(DynamicObject, boolean)
+     */
+    protected double getDouble(DynamicObject store, boolean guard) throws UnexpectedResultException {
+        return expectDouble(get(store, guard));
     }
 
-    protected boolean getBoolean(DynamicObject store, boolean condition) throws UnexpectedResultException {
-        return expectBoolean(get(store, condition));
+    /**
+     * @see #get(DynamicObject, boolean)
+     */
+    protected boolean getBoolean(DynamicObject store, boolean guard) throws UnexpectedResultException {
+        return expectBoolean(get(store, guard));
     }
 
-    @SuppressWarnings("unused")
-    protected void set(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException, FinalLocationException {
-        setInternal(store, value, condition);
+    /**
+     * Sets the value of this property storage location.
+     *
+     * @param store the {@link DynamicObject} that holds this storage location.
+     * @param value the value to be stored.
+     * @param guard the result of the shape check guarding this property write or {@code false}.
+     * @param init if true, this is the initial assignment of a property location; ignore final.
+     * @throws IncompatibleLocationException if the value cannot be stored in this storage location.
+     * @throws FinalLocationException if the property location is effectively final and init=false.
+     * @see #setSafe(DynamicObject, Object, boolean, boolean)
+     */
+    protected abstract void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException;
+
+    /**
+     * @see #set(DynamicObject, Object, boolean, boolean)
+     * @see #setIntSafe(DynamicObject, int, boolean, boolean)
+     */
+    protected void setInt(DynamicObject store, int value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+        set(store, value, guard, init);
+    }
+
+    /**
+     * @see #set(DynamicObject, Object, boolean, boolean)
+     * @see #setLongSafe(DynamicObject, long, boolean, boolean)
+     */
+    protected void setLong(DynamicObject store, long value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+        set(store, value, guard, init);
     }
 
-    protected abstract void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException;
+    /**
+     * @see #set(DynamicObject, Object, boolean, boolean)
+     * @see #setDoubleSafe(DynamicObject, double, boolean, boolean)
+     */
+    protected void setDouble(DynamicObject store, double value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+        set(store, value, guard, init);
+    }
 
     /**
      * Equivalent to {@link Shape#check(DynamicObject)}.
@@ -151,7 +194,11 @@ protected static final boolean checkShape(DynamicObject store, Shape shape) {
     /** @since 0.17 or earlier */
     @Override
     protected final void setInternal(DynamicObject store, Object value) throws IncompatibleLocationException {
-        setInternal(store, value, false);
+        try {
+            set(store, value, false, true);
+        } catch (FinalLocationException e) {
+            throw shouldNotHappen(e);
+        }
     }
 
     /** @since 0.17 or earlier */
@@ -279,19 +326,48 @@ static boolean isSameLocation(LocationImpl loc1, LocationImpl loc2) {
         return loc1 == loc2 || loc1.getInternalLocation().equals(loc2.getInternalLocation());
     }
 
-    @SuppressWarnings("unused")
-    protected void setInt(DynamicObject store, int value, boolean condition) throws IncompatibleLocationException, FinalLocationException {
-        set(store, value, condition);
+    /**
+     * @see #set(DynamicObject, Object, boolean, boolean)
+     */
+    protected final void setSafe(DynamicObject store, Object value, boolean guard, boolean init) {
+        try {
+            set(store, value, guard, init);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            throw shouldNotHappen(e);
+        }
     }
 
-    @SuppressWarnings("unused")
-    protected void setLong(DynamicObject store, long value, boolean condition) throws IncompatibleLocationException, FinalLocationException {
-        set(store, value, condition);
+    /**
+     * @see #setInt(DynamicObject, int, boolean, boolean)
+     */
+    protected final void setIntSafe(DynamicObject store, int value, boolean guard, boolean init) {
+        try {
+            setInt(store, value, guard, init);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            throw shouldNotHappen(e);
+        }
     }
 
-    @SuppressWarnings("unused")
-    protected void setDouble(DynamicObject store, double value, boolean condition) throws IncompatibleLocationException, FinalLocationException {
-        set(store, value, condition);
+    /**
+     * @see #setLong(DynamicObject, long, boolean, boolean)
+     */
+    protected final void setLongSafe(DynamicObject store, long value, boolean guard, boolean init) {
+        try {
+            setLong(store, value, guard, init);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            throw shouldNotHappen(e);
+        }
+    }
+
+    /**
+     * @see #setDouble(DynamicObject, double, boolean, boolean)
+     */
+    protected final void setDoubleSafe(DynamicObject store, double value, boolean guard, boolean init) {
+        try {
+            setDouble(store, value, guard, init);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            throw shouldNotHappen(e);
+        }
     }
 
     protected boolean isIntLocation() {
@@ -358,6 +434,11 @@ public Assumption getFinalAssumption() {
         return neverValidAssumption();
     }
 
+    protected static RuntimeException shouldNotHappen(Exception e) {
+        CompilerDirectives.transferToInterpreterAndInvalidate();
+        throw new IllegalStateException(e);
+    }
+
     /** Not using NeverValidAssumption.INSTANCE in order not to pollute profiles. */
     protected static Assumption neverValidAssumption() {
         return NEVER_VALID_ASSUMPTION;
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
index f585d2b76bdc..649f765c3c10 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -95,18 +95,10 @@ public boolean equals(Object obj) {
 
         /** @since 0.17 or earlier */
         @Override
-        public final Object get(DynamicObject store, boolean condition) {
+        public final Object get(DynamicObject store, boolean guard) {
             return value;
         }
 
-        /** @since 0.17 or earlier */
-        @Override
-        public final void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
-            if (!canStore(value)) {
-                throw finalLocation();
-            }
-        }
-
         /** @since 0.17 or earlier */
         @SuppressWarnings("deprecation")
         @Override
@@ -114,12 +106,15 @@ public boolean canStore(Object val) {
             return CoreLocation.valueEquals(this.value, val);
         }
 
-        /** @since 0.17 or earlier */
         @Override
-        public final void setInternal(DynamicObject store, Object value, boolean condition) throws IncompatibleLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
             if (!canStore(value)) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new UnsupportedOperationException();
+                if (init) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    throw new UnsupportedOperationException();
+                } else {
+                    throw finalLocation();
+                }
             }
         }
 

From d77b8f758ca65386d496015ae82b15cf8e9cedb2 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 23 Sep 2021 17:42:06 +0200
Subject: [PATCH 124/681] Simplify DynamicObjectSupport.grow method.

---
 .../truffle/object/DynamicObjectSupport.java  | 125 ++++++++----------
 1 file changed, 57 insertions(+), 68 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectSupport.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectSupport.java
index 103fa0186762..8659c0609303 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectSupport.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectSupport.java
@@ -52,20 +52,49 @@
 import com.oracle.truffle.api.object.Property;
 import com.oracle.truffle.api.object.Shape;
 
-@SuppressWarnings({"static-method", "deprecation"})
+@SuppressWarnings("deprecation")
 final class DynamicObjectSupport {
 
     private DynamicObjectSupport() {
     }
 
     static void ensureCapacity(DynamicObject object, Shape otherShape) {
-        growObjectStore(object, object.getShape(), otherShape);
-        growPrimitiveStore(object, object.getShape(), otherShape);
+        grow(object, object.getShape(), otherShape);
     }
 
     static void grow(DynamicObject object, Shape thisShape, Shape otherShape) {
-        growObjectStore(object, thisShape, otherShape);
-        growPrimitiveStore(object, thisShape, otherShape);
+        ShapeImpl thisShapeImpl = (ShapeImpl) thisShape;
+        ShapeImpl otherShapeImpl = (ShapeImpl) otherShape;
+        int sourceObjectCapacity = thisShapeImpl.getObjectArrayCapacity();
+        int targetObjectCapacity = otherShapeImpl.getObjectArrayCapacity();
+        if (sourceObjectCapacity < targetObjectCapacity) {
+            growObjectStore(object, thisShapeImpl, sourceObjectCapacity, targetObjectCapacity);
+        }
+        int sourcePrimitiveCapacity = thisShapeImpl.getPrimitiveArrayCapacity();
+        int targetPrimitiveCapacity = otherShapeImpl.getPrimitiveArrayCapacity();
+        if (sourcePrimitiveCapacity < targetPrimitiveCapacity) {
+            growPrimitiveStore(object, thisShapeImpl, sourcePrimitiveCapacity, targetPrimitiveCapacity);
+        }
+    }
+
+    private static void growObjectStore(DynamicObject object, ShapeImpl thisShape, int sourceCapacity, int targetCapacity) {
+        Object[] newObjectStore = new Object[targetCapacity];
+        if (sourceCapacity != 0) {
+            int sourceSize = thisShape.getObjectArraySize();
+            Object[] oldObjectStore = ACCESS.getObjectArray(object);
+            ACCESS.arrayCopy(oldObjectStore, newObjectStore, sourceSize);
+        }
+        ACCESS.setObjectArray(object, newObjectStore);
+    }
+
+    private static void growPrimitiveStore(DynamicObject object, ShapeImpl thisShape, int sourceCapacity, int targetCapacity) {
+        int[] newPrimitiveArray = new int[targetCapacity];
+        if (sourceCapacity != 0) {
+            int sourceSize = thisShape.getPrimitiveArraySize();
+            int[] oldPrimitiveArray = ACCESS.getPrimitiveArray(object);
+            ACCESS.arrayCopy(oldPrimitiveArray, newPrimitiveArray, sourceSize);
+        }
+        ACCESS.setPrimitiveArray(object, newPrimitiveArray);
     }
 
     static void resize(DynamicObject object, Shape thisShape, Shape otherShape) {
@@ -78,32 +107,20 @@ static void trimToSize(DynamicObject object, Shape thisShape, Shape otherShape)
         trimPrimitiveStore(object, thisShape, otherShape);
     }
 
-    private static void growObjectStore(DynamicObject object, Shape oldShape, Shape newShape) {
-        int sourceCapacity = getObjectArrayCapacity(oldShape);
-        int destinationCapacity = getObjectArrayCapacity(newShape);
-        if (sourceCapacity < destinationCapacity) {
-            Object[] newObjectStore = new Object[destinationCapacity];
-            if (sourceCapacity != 0) {
-                int sourceSize = getObjectArraySize(oldShape);
-                Object[] oldObjectStore = ACCESS.getObjectArray(object);
-                ACCESS.arrayCopy(oldObjectStore, newObjectStore, sourceSize);
-            }
-            ACCESS.setObjectArray(object, newObjectStore);
-        }
-    }
-
     private static void resizeObjectStore(DynamicObject object, Shape oldShape, Shape newShape) {
-        int destinationCapacity = getObjectArrayCapacity(newShape);
+        ShapeImpl oldShapeImpl = (ShapeImpl) oldShape;
+        ShapeImpl newShapeImpl = (ShapeImpl) newShape;
+        int destinationCapacity = newShapeImpl.getObjectArrayCapacity();
         if (destinationCapacity == 0) {
             ACCESS.setObjectArray(object, null);
         } else {
-            int sourceCapacity = getObjectArrayCapacity(oldShape);
+            int sourceCapacity = oldShapeImpl.getObjectArrayCapacity();
             if (sourceCapacity != destinationCapacity) {
-                int sourceSize = getObjectArraySize(oldShape);
+                int sourceSize = oldShapeImpl.getObjectArraySize();
                 Object[] newObjectStore = new Object[destinationCapacity];
                 if (sourceSize != 0) {
                     Object[] oldObjectStore = ACCESS.getObjectArray(object);
-                    int destinationSize = getObjectArraySize(newShape);
+                    int destinationSize = newShapeImpl.getObjectArraySize();
                     int length = Math.min(sourceSize, destinationSize);
                     ACCESS.arrayCopy(oldObjectStore, newObjectStore, length);
                 }
@@ -112,33 +129,21 @@ private static void resizeObjectStore(DynamicObject object, Shape oldShape, Shap
         }
     }
 
-    private static void growPrimitiveStore(DynamicObject object, Shape oldShape, Shape newShape) {
-        int sourceCapacity = getPrimitiveArrayCapacity(oldShape);
-        int destinationCapacity = getPrimitiveArrayCapacity(newShape);
-        if (sourceCapacity < destinationCapacity) {
-            int[] newPrimitiveArray = new int[destinationCapacity];
-            if (sourceCapacity != 0) {
-                int sourceSize = getPrimitiveArraySize(oldShape);
-                int[] oldPrimitiveArray = ACCESS.getPrimitiveArray(object);
-                ACCESS.arrayCopy(oldPrimitiveArray, newPrimitiveArray, sourceSize);
-            }
-            ACCESS.setPrimitiveArray(object, newPrimitiveArray);
-        }
-    }
-
     private static void resizePrimitiveStore(DynamicObject object, Shape oldShape, Shape newShape) {
-        assert hasPrimitiveArray(newShape);
-        int destinationCapacity = getPrimitiveArrayCapacity(newShape);
+        ShapeImpl oldShapeImpl = (ShapeImpl) oldShape;
+        ShapeImpl newShapeImpl = (ShapeImpl) newShape;
+        assert newShapeImpl.hasPrimitiveArray();
+        int destinationCapacity = newShapeImpl.getPrimitiveArrayCapacity();
         if (destinationCapacity == 0) {
             ACCESS.setPrimitiveArray(object, null);
         } else {
-            int sourceCapacity = getPrimitiveArrayCapacity(oldShape);
+            int sourceCapacity = oldShapeImpl.getPrimitiveArrayCapacity();
             if (sourceCapacity != destinationCapacity) {
-                int sourceSize = getPrimitiveArraySize(oldShape);
+                int sourceSize = oldShapeImpl.getPrimitiveArraySize();
                 int[] newPrimitiveArray = new int[destinationCapacity];
                 if (sourceSize != 0) {
                     int[] oldPrimitiveArray = ACCESS.getPrimitiveArray(object);
-                    int destinationSize = getPrimitiveArraySize(newShape);
+                    int destinationSize = newShapeImpl.getPrimitiveArraySize();
                     int length = Math.min(sourceSize, destinationSize);
                     ACCESS.arrayCopy(oldPrimitiveArray, newPrimitiveArray, length);
                 }
@@ -148,18 +153,20 @@ private static void resizePrimitiveStore(DynamicObject object, Shape oldShape, S
     }
 
     private static void trimObjectStore(DynamicObject object, Shape thisShape, Shape newShape) {
+        ShapeImpl thisShapeImpl = (ShapeImpl) thisShape;
+        ShapeImpl newShapeImpl = (ShapeImpl) newShape;
         Object[] oldObjectStore = ACCESS.getObjectArray(object);
-        int destinationCapacity = getObjectArrayCapacity(newShape);
+        int destinationCapacity = newShapeImpl.getObjectArrayCapacity();
         if (destinationCapacity == 0) {
             if (oldObjectStore != null) {
                 ACCESS.setObjectArray(object, null);
             }
             // else nothing to do
         } else {
-            int sourceCapacity = getObjectArrayCapacity(thisShape);
+            int sourceCapacity = thisShapeImpl.getObjectArrayCapacity();
             if (sourceCapacity > destinationCapacity) {
                 Object[] newObjectStore = new Object[destinationCapacity];
-                int destinationSize = getObjectArraySize(newShape);
+                int destinationSize = newShapeImpl.getObjectArraySize();
                 ACCESS.arrayCopy(oldObjectStore, newObjectStore, destinationSize);
                 ACCESS.setObjectArray(object, newObjectStore);
             }
@@ -167,44 +174,26 @@ private static void trimObjectStore(DynamicObject object, Shape thisShape, Shape
     }
 
     private static void trimPrimitiveStore(DynamicObject object, Shape thisShape, Shape newShape) {
+        ShapeImpl thisShapeImpl = (ShapeImpl) thisShape;
+        ShapeImpl newShapeImpl = (ShapeImpl) newShape;
         int[] oldPrimitiveStore = ACCESS.getPrimitiveArray(object);
-        int destinationCapacity = getPrimitiveArrayCapacity(newShape);
+        int destinationCapacity = newShapeImpl.getPrimitiveArrayCapacity();
         if (destinationCapacity == 0) {
             if (oldPrimitiveStore != null) {
                 ACCESS.setPrimitiveArray(object, null);
             }
             // else nothing to do
         } else {
-            int sourceCapacity = getPrimitiveArrayCapacity(thisShape);
+            int sourceCapacity = thisShapeImpl.getPrimitiveArrayCapacity();
             if (sourceCapacity > destinationCapacity) {
                 int[] newPrimitiveStore = new int[destinationCapacity];
-                int destinationSize = getPrimitiveArraySize(newShape);
+                int destinationSize = newShapeImpl.getPrimitiveArraySize();
                 ACCESS.arrayCopy(oldPrimitiveStore, newPrimitiveStore, destinationSize);
                 ACCESS.setPrimitiveArray(object, newPrimitiveStore);
             }
         }
     }
 
-    private static int getObjectArrayCapacity(Shape shape) {
-        return ((ShapeImpl) shape).getObjectArrayCapacity();
-    }
-
-    private static int getObjectArraySize(Shape shape) {
-        return ((ShapeImpl) shape).getObjectArraySize();
-    }
-
-    private static int getPrimitiveArrayCapacity(Shape shape) {
-        return ((ShapeImpl) shape).getPrimitiveArrayCapacity();
-    }
-
-    private static int getPrimitiveArraySize(Shape shape) {
-        return ((ShapeImpl) shape).getPrimitiveArraySize();
-    }
-
-    private static boolean hasPrimitiveArray(Shape shape) {
-        return ((ShapeImpl) shape).hasPrimitiveArray();
-    }
-
     static Map<Object, Object> archive(DynamicObject object) {
         Map<Object, Object> archive = new HashMap<>();
         Property[] properties = ((ShapeImpl) object.getShape()).getPropertyArray();

From 369330939957d6dc4c3d0a44489b3387d1168832 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 23 Sep 2021 17:49:45 +0200
Subject: [PATCH 125/681] Make leaf classes final.

---
 .../object/DynamicObjectLibraryImpl.java      |  8 ++---
 .../oracle/truffle/object/PropertyImpl.java   | 36 ++++++++-----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
index 7b697ff15259..ec5932ebc900 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectLibraryImpl.java
@@ -566,7 +566,7 @@ public boolean acceptsKey(@SuppressWarnings("unused") Object key) {
         }
     }
 
-    static class Generic extends KeyCacheEntry {
+    static final class Generic extends KeyCacheEntry {
         private static final Generic INSTANCE = new Generic();
 
         Generic() {
@@ -696,7 +696,7 @@ public boolean removeKey(DynamicObject obj, Shape cachedShape, Object key) {
      * The generic case is used if the number of property keys accessed overflows the limit of the
      * polymorphic inline cache.
      */
-    static class AnyKey extends KeyCacheNode {
+    static final class AnyKey extends KeyCacheNode {
 
         @Child private KeyCacheEntry keyCache;
 
@@ -1169,7 +1169,7 @@ public boolean removeKey(DynamicObject object, Shape cachedShape, Object key) {
             }
         }
 
-        static class ExistingKeyIdentity extends ExistingKey {
+        static final class ExistingKeyIdentity extends ExistingKey {
             ExistingKeyIdentity(Object key, Property property, KeyCacheEntry next) {
                 super(key, property, next);
             }
@@ -1185,7 +1185,7 @@ boolean isIdentity() {
             }
         }
 
-        static class MissingKeyIdentity extends MissingKey {
+        static final class MissingKeyIdentity extends MissingKey {
             MissingKeyIdentity(Object key, KeyCacheEntry next) {
                 super(key, next);
             }
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
index 8115e9b57391..affaefec1966 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/PropertyImpl.java
@@ -58,7 +58,7 @@
  * @since 0.17 or earlier
  */
 @SuppressWarnings("deprecation")
-public class PropertyImpl extends Property {
+public final class PropertyImpl extends Property {
     private final Object key;
     private final Location location;
     private final int flags;
@@ -80,7 +80,7 @@ public class PropertyImpl extends Property {
 
     /** @since 0.17 or earlier */
     @Override
-    public final Object getKey() {
+    public Object getKey() {
         return key;
     }
 
@@ -94,26 +94,26 @@ public int getFlags() {
     @Override
     public Property relocate(Location newLocation) {
         if (!getLocation().equals(newLocation)) {
-            return construct(key, newLocation, flags);
+            return new PropertyImpl(key, newLocation, flags);
         }
         return this;
     }
 
     /** @since 0.17 or earlier */
     @Override
-    public final Object get(DynamicObject store, Shape shape) {
+    public Object get(DynamicObject store, Shape shape) {
         return getLocation().get(store, shape);
     }
 
     /** @since 0.17 or earlier */
     @Override
-    public final Object get(DynamicObject store, boolean condition) {
+    public Object get(DynamicObject store, boolean condition) {
         return getLocation().get(store, condition);
     }
 
     /** @since 0.17 or earlier */
     @Override
-    public final void setInternal(DynamicObject store, Object value) {
+    public void setInternal(DynamicObject store, Object value) {
         try {
             ((LocationImpl) getLocation()).setInternal(store, value);
         } catch (IncompatibleLocationException e) {
@@ -128,14 +128,14 @@ private static boolean verifyShapeParameter(DynamicObject store, Shape shape) {
 
     /** @since 0.17 or earlier */
     @Override
-    public final void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
+    public void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
         assert verifyShapeParameter(store, shape);
         getLocation().set(store, value, shape);
     }
 
     /** @since 0.17 or earlier */
     @Override
-    public final void setSafe(DynamicObject store, Object value, Shape shape) {
+    public void setSafe(DynamicObject store, Object value, Shape shape) {
         assert verifyShapeParameter(store, shape);
         try {
             getLocation().set(store, value, shape);
@@ -146,7 +146,7 @@ public final void setSafe(DynamicObject store, Object value, Shape shape) {
 
     /** @since 0.17 or earlier */
     @Override
-    public final void setGeneric(DynamicObject store, Object value, Shape shape) {
+    public void setGeneric(DynamicObject store, Object value, Shape shape) {
         assert verifyShapeParameter(store, shape);
         try {
             set(store, value, shape);
@@ -163,14 +163,14 @@ private static boolean verifyShapeParameters(DynamicObject store, Shape oldShape
 
     /** @since 0.17 or earlier */
     @Override
-    public final void set(DynamicObject store, Object value, Shape oldShape, Shape newShape) throws IncompatibleLocationException {
+    public void set(DynamicObject store, Object value, Shape oldShape, Shape newShape) throws IncompatibleLocationException {
         assert verifyShapeParameters(store, oldShape, newShape);
         getLocation().set(store, value, oldShape, newShape);
     }
 
     /** @since 0.17 or earlier */
     @Override
-    public final void setSafe(DynamicObject store, Object value, Shape oldShape, Shape newShape) {
+    public void setSafe(DynamicObject store, Object value, Shape oldShape, Shape newShape) {
         assert verifyShapeParameters(store, oldShape, newShape);
         try {
             getLocation().set(store, value, oldShape, newShape);
@@ -181,7 +181,7 @@ public final void setSafe(DynamicObject store, Object value, Shape oldShape, Sha
 
     /** @since 0.17 or earlier */
     @Override
-    public final void setGeneric(DynamicObject store, Object value, Shape oldShape, Shape newShape) {
+    public void setGeneric(DynamicObject store, Object value, Shape oldShape, Shape newShape) {
         assert verifyShapeParameters(store, oldShape, newShape);
         try {
             getLocation().set(store, value, oldShape, newShape);
@@ -243,7 +243,7 @@ public String toString() {
 
     /** @since 0.17 or earlier */
     @Override
-    public final Location getLocation() {
+    public Location getLocation() {
         return location;
     }
 
@@ -259,20 +259,14 @@ private void setWithShapeSlowCase(DynamicObject store, Object value, Shape curre
 
     /** @since 0.17 or earlier */
     @Override
-    public final boolean isHidden() {
+    public boolean isHidden() {
         return key instanceof HiddenKey;
     }
 
-    /** @since 0.17 or earlier */
-    @SuppressWarnings("hiding")
-    protected Property construct(Object name, Location location, int flags) {
-        return new PropertyImpl(name, location, flags);
-    }
-
     /** @since 0.17 or earlier */
     @Override
     public Property copyWithFlags(int newFlags) {
-        return construct(key, location, newFlags);
+        return new PropertyImpl(key, location, newFlags);
     }
 
     /** @since 0.17 or earlier */

From 7668e0370995d6f53d4bec0ead349080ac49a4f5 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 23 Sep 2021 19:05:35 +0200
Subject: [PATCH 126/681] Remove legacy DynamicObject grow/resize code.

---
 .../truffle/object/DynamicObjectBasic.java    | 88 -------------------
 .../truffle/object/DynamicObjectImpl.java     | 22 +----
 2 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
index 35845839be7d..73abc95bc509 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectBasic.java
@@ -74,76 +74,6 @@ protected final void initialize(Shape shape) {
         }
     }
 
-    /**
-     * Simpler version of {@link #resizeObjectStore} when the object is only increasing in size.
-     */
-    @Override
-    protected final void growObjectStore(Shape oldShape, Shape newShape) {
-        int oldObjectArrayCapacity = ((ShapeImpl) oldShape).getObjectArrayCapacity();
-        int newObjectArrayCapacity = ((ShapeImpl) newShape).getObjectArrayCapacity();
-        if (oldObjectArrayCapacity != newObjectArrayCapacity) {
-            growObjectStoreIntl(oldObjectArrayCapacity, newObjectArrayCapacity, oldShape);
-        }
-    }
-
-    private void growObjectStoreIntl(int oldObjectArrayCapacity, int newObjectArrayCapacity, Shape newShape) {
-        Object[] newObjectStore = new Object[newObjectArrayCapacity];
-        if (oldObjectArrayCapacity != 0) {
-            // monotonic growth assumption
-            assert oldObjectArrayCapacity < newObjectArrayCapacity;
-            Object[] oldObjectStore = this.getObjectStore(newShape);
-            for (int i = 0; i < oldObjectArrayCapacity; ++i) {
-                newObjectStore[i] = oldObjectStore[i];
-            }
-        }
-        this.setObjectStore(newObjectStore, newShape);
-    }
-
-    /**
-     * Simpler version of {@link #resizePrimitiveStore} when the object is only increasing in size.
-     */
-    @Override
-    protected final void growPrimitiveStore(Shape oldShape, Shape newShape) {
-        assert ((ShapeImpl) newShape).hasPrimitiveArray();
-        int oldPrimitiveCapacity = ((ShapeImpl) oldShape).getPrimitiveArrayCapacity();
-        int newPrimitiveCapacity = ((ShapeImpl) newShape).getPrimitiveArrayCapacity();
-        if (newPrimitiveCapacity == 0) {
-            // due to obsolescence, we might have to reserve an empty primitive array slot
-            this.setPrimitiveStore(null, newShape);
-        } else if (oldPrimitiveCapacity != newPrimitiveCapacity) {
-            growPrimitiveStoreIntl(oldPrimitiveCapacity, newPrimitiveCapacity, oldShape);
-        }
-    }
-
-    private void growPrimitiveStoreIntl(int oldPrimitiveCapacity, int newPrimitiveCapacity, Shape newShape) {
-        int[] newPrimitiveArray = new int[newPrimitiveCapacity];
-        if (oldPrimitiveCapacity != 0) {
-            // primitive array can shrink due to type changes
-            int[] oldPrimitiveArray = this.getPrimitiveStore(newShape);
-            for (int i = 0; i < Math.min(oldPrimitiveCapacity, newPrimitiveCapacity); ++i) {
-                newPrimitiveArray[i] = oldPrimitiveArray[i];
-            }
-        }
-        this.setPrimitiveStore(newPrimitiveArray, newShape);
-    }
-
-    @Override
-    protected final void resizeObjectStore(Shape oldShape, Shape newShape) {
-        Object[] newObjectStore = null;
-        int destinationCapacity = ((ShapeImpl) newShape).getObjectArrayCapacity();
-        if (destinationCapacity != 0) {
-            newObjectStore = new Object[destinationCapacity];
-            int sourceCapacity = ((ShapeImpl) oldShape).getObjectArrayCapacity();
-            if (sourceCapacity != 0) {
-                Object[] oldObjectStore = getObjectStore(newShape);
-                for (int i = 0; i < Math.min(sourceCapacity, destinationCapacity); ++i) {
-                    newObjectStore[i] = oldObjectStore[i];
-                }
-            }
-        }
-        this.setObjectStore(newObjectStore, newShape);
-    }
-
     private Object[] getObjectStore(@SuppressWarnings("unused") Shape currentShape) {
         return LayoutImpl.ACCESS.getObjectArray(this);
     }
@@ -160,24 +90,6 @@ private void setPrimitiveStore(int[] newArray, @SuppressWarnings("unused") Shape
         LayoutImpl.ACCESS.setPrimitiveArray(this, newArray);
     }
 
-    @Override
-    protected final void resizePrimitiveStore(Shape oldShape, Shape newShape) {
-        assert ((ShapeImpl) newShape).hasPrimitiveArray();
-        int[] newPrimitiveArray = null;
-        int destinationCapacity = ((ShapeImpl) newShape).getPrimitiveArrayCapacity();
-        if (destinationCapacity != 0) {
-            newPrimitiveArray = new int[destinationCapacity];
-            int sourceCapacity = ((ShapeImpl) oldShape).getPrimitiveArrayCapacity();
-            if (sourceCapacity != 0) {
-                int[] oldPrimitiveArray = this.getPrimitiveStore(newShape);
-                for (int i = 0; i < Math.min(sourceCapacity, destinationCapacity); ++i) {
-                    newPrimitiveArray[i] = oldPrimitiveArray[i];
-                }
-            }
-        }
-        this.setPrimitiveStore(newPrimitiveArray, newShape);
-    }
-
     /**
      * Check whether fast transition is valid.
      *
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java
index dafa8135e336..246981ce9fd6 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/DynamicObjectImpl.java
@@ -126,31 +126,13 @@ public final void setShapeAndGrow(Shape oldShape, Shape newShape) {
      * Simpler version of {@link #resizeStore} when the object is only increasing in size.
      */
     private void growStore(Shape oldShape, Shape newShape) {
-        growObjectStore(oldShape, newShape);
-        if (((ShapeImpl) newShape).hasPrimitiveArray) {
-            growPrimitiveStore(oldShape, newShape);
-        }
+        DynamicObjectSupport.grow(this, oldShape, newShape);
     }
 
-    /** @since 0.17 or earlier */
-    protected abstract void growObjectStore(Shape oldShape, Shape newShape);
-
-    /** @since 0.17 or earlier */
-    protected abstract void growPrimitiveStore(Shape oldShape, Shape newShape);
-
     protected void resizeStore(Shape oldShape, Shape newShape) {
-        resizeObjectStore(oldShape, newShape);
-        if (((ShapeImpl) newShape).hasPrimitiveArray) {
-            resizePrimitiveStore(oldShape, newShape);
-        }
+        DynamicObjectSupport.resize(this, oldShape, newShape);
     }
 
-    /** @since 0.17 or earlier */
-    protected abstract void resizePrimitiveStore(Shape oldShape, Shape newShape);
-
-    /** @since 0.17 or earlier */
-    protected abstract void resizeObjectStore(Shape oldShape, Shape newShape);
-
     /**
      * Check whether fast transition is valid.
      *

From 8380dd90cf13d1da2f993af711a395e462f0ff38 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 23 Sep 2021 19:55:11 +0200
Subject: [PATCH 127/681] Assert that always valid assumption is valid.

---
 .../src/com/oracle/truffle/object/LocationImpl.java              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
index ed40279f81a5..dbf67e3751c6 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
@@ -446,6 +446,7 @@ protected static Assumption neverValidAssumption() {
 
     /** Not using AlwaysValidAssumption.INSTANCE in order not to pollute profiles. */
     protected static Assumption alwaysValidAssumption() {
+        assert ALWAYS_VALID_ASSUMPTION.isValid();
         return ALWAYS_VALID_ASSUMPTION;
     }
 

From 8b871e7d849b1c1582a4635ba4a8a8c300619e5c Mon Sep 17 00:00:00 2001
From: Andrew Graham <andrew.graham@arm.com>
Date: Wed, 21 Apr 2021 14:12:21 +0100
Subject: [PATCH 128/681] AArch64: Changes to combine shift and negate to a
 single instruction.

Add three node match rules to handle the three varieties
of shift, together with capability to emit a combined negate
instruction with shift.

Change-Id: I151b787742d1d7ff0401ab9270af9f000e736d53
---
 .../asm/aarch64/AArch64MacroAssembler.java    |  17 ++-
 .../aarch64/test/AArch64BitFieldTest.java     |   6 +-
 .../aarch64/test/AArch64NegateShiftTest.java  | 102 ++++++++++++++++++
 .../core/aarch64/AArch64NodeMatchRules.java   |  19 +++-
 .../lir/aarch64/AArch64ArithmeticOp.java      |  30 +++++-
 5 files changed, 167 insertions(+), 7 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java

diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
index 82e56e994a80..2de2d574e462 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -965,7 +965,7 @@ public void add(int size, Register dst, Register src1, Register src2, ShiftType
     }
 
     /**
-     * dst = src1 + shiftType(src2, shiftAmt & (size-1)) and sets condition flags.
+     * dst = src1 - shiftType(src2, shiftAmt & (size-1)) and sets condition flags.
      *
      * @param size register size. Has to be 32 or 64.
      * @param dst general purpose register. May not be null or stackpointer.
@@ -986,7 +986,7 @@ public void sub(int size, Register dst, Register src1, Register src2, ShiftType
     }
 
     /**
-     * dst = -src1.
+     * dst = -src.
      *
      * @param size register size. Has to be 32 or 64.
      * @param dst general purpose register. May not be null or stackpointer.
@@ -996,6 +996,19 @@ public void neg(int size, Register dst, Register src) {
         sub(size, dst, zr, src);
     }
 
+    /**
+     * dst = -(shiftType(src, shiftAmt & (size - 1))).
+     *
+     * @param size register size. Has to be 32 or 64.
+     * @param dst general purpose register. May not be null or stackpointer.
+     * @param src general purpose register. May not be null or stackpointer.
+     * @param shiftType right or left shift, arithmetic or logical.
+     * @param shiftAmt number of shift bits. Has to be between 0 and (size - 1).
+     */
+    public void neg(int size, Register dst, Register src, ShiftType shiftType, int shiftAmt) {
+        sub(size, dst, zr, src, shiftType, shiftAmt);
+    }
+
     /**
      * dst = src + immediate.
      *
diff --git a/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java
index 7212af4f80fd..18ed28f5b4bd 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2019, 2020, Arm Limited and affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Arm Limited and 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
@@ -207,7 +207,7 @@ public void testSignedI2LInsert() {
     // SBFIZ with B2I.
     public int signedB2IInsert(int input) {
         byte b = (byte) input;
-        return b << 31;
+        return b << 30;
     }
 
     @Test
diff --git a/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java
new file mode 100644
index 000000000000..0f74f5096bc7
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, Arm Limited and 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.core.aarch64.test;
+
+import org.graalvm.compiler.lir.LIRInstruction;
+import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp;
+import org.junit.Test;
+
+import java.util.function.Predicate;
+
+public class AArch64NegateShiftTest extends AArch64MatchRuleTest {
+    private static final Predicate<LIRInstruction> predicate = op -> (op instanceof AArch64ArithmeticOp.NegShiftOp);
+
+    /**
+     * negateShift match rule tests for shift operations with int type.
+     */
+    public int negShiftLeftLogicInt(int input) {
+        return -(input << 5);
+    }
+
+    @Test
+    public void testNegShiftLeftLogicInt() {
+        test("negShiftLeftLogicInt", 123);
+        checkLIR("negShiftLeftLogicInt", predicate, 1);
+    }
+
+    public int negShiftRightLogicInt(int input) {
+        return -(input >>> 6);
+    }
+
+    @Test
+    public void testNegShiftRightLogicInt() {
+        test("negShiftRightLogicInt", 123);
+        checkLIR("negShiftRightLogicInt", predicate, 1);
+    }
+
+    public int negShiftRightArithInt(int input) {
+        return -(input >> 7);
+    }
+
+    @Test
+    public void testNegShiftRightArithInt() {
+        test("negShiftRightArithInt", 123);
+        checkLIR("negShiftRightArithInt", predicate, 1);
+    }
+
+    /**
+     * negateShift match rule tests for shift operations with long type.
+     */
+    public long negShiftLeftLogicLong(long input) {
+        return -(input << 8);
+    }
+
+    @Test
+    public void testNegShiftLeftLogicLong() {
+        test("negShiftLeftLogicLong", 123L);
+        checkLIR("negShiftLeftLogicLong", predicate, 1);
+    }
+
+    public long negShiftRightLogicLong(long input) {
+        return -(input >>> 9);
+    }
+
+    @Test
+    public void testNegShiftRightLogicLong() {
+        test("negShiftRightLogicLong", 123L);
+        checkLIR("negShiftRightLogicLong", predicate, 1);
+    }
+
+    public long negShiftRightArithLong(long input) {
+        return -(input >> 10);
+    }
+
+    @Test
+    public void testNegShiftRightArithLong() {
+        test("negShiftRightArithLong", 123L);
+        checkLIR("negShiftRightArithLong", predicate, 1);
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
index 4b5aab8615c5..103d8f5cb21b 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -27,6 +27,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
+import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
 import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.core.common.LIRKind;
@@ -667,6 +668,22 @@ public ComplexMatchResult logicShift(BinaryNode binary, ValueNode a, BinaryNode
         return emitBinaryShift(op, a, (ShiftNode<?>) shift);
     }
 
+    @MatchRule("(Negate (UnsignedRightShift=shift a Constant=b))")
+    @MatchRule("(Negate (RightShift=shift a Constant=b))")
+    @MatchRule("(Negate (LeftShift=shift a Constant=b))")
+    public ComplexMatchResult negShift(BinaryNode shift, ValueNode a, ConstantNode b) {
+        assert b.getStackKind().isNumericInteger();
+        assert a.getStackKind().isNumericInteger();
+        int shiftAmt = b.asJavaConstant().asInt();
+        AArch64Assembler.ShiftType shiftType = shiftTypeMap.get(shift.getClass());
+        return builder -> {
+            AllocatableValue src = moveSp(gen.asAllocatable(operand(a)));
+            Variable result = gen.newVariable(LIRKind.combine(operand(a)));
+            gen.append(new AArch64ArithmeticOp.NegShiftOp(result, src, shiftType, shiftAmt));
+            return result;
+        };
+    }
+
     /**
      * Goal: use AArch64's and not (bic) & or not (orn) instructions.
      */
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
index 349f3f3b7a33..8f44d473baa3 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, 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
@@ -679,6 +679,34 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         }
     }
 
+    public static class NegShiftOp extends AArch64LIRInstruction {
+        private static final LIRInstructionClass<NegShiftOp> TYPE = LIRInstructionClass.create(NegShiftOp.class);
+        @Def(REG) protected AllocatableValue result;
+        @Use(REG) protected AllocatableValue src;
+        private final AArch64Assembler.ShiftType shiftType;
+        private final int shiftAmt;
+
+        /**
+         * Computes <code>result = - shiftType(src, shiftAmt)</code>.
+         *
+         * @param shiftType defines left shift, right shift, arithmetic, logical.
+         * @param shiftAmt must be in range 0 to 31 for ints (63 for longs).
+         */
+        public NegShiftOp(AllocatableValue result, AllocatableValue src, AArch64Assembler.ShiftType shiftType, int shiftAmt) {
+            super(TYPE);
+            this.result = result;
+            this.src = src;
+            this.shiftType = shiftType;
+            this.shiftAmt = shiftAmt;
+        }
+
+        @Override
+        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+            int size = result.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+            masm.neg(size, asRegister(result), asRegister(src), shiftType, shiftAmt);
+        }
+    }
+
     public static class MultiplyAddSubOp extends AArch64LIRInstruction {
         private static final LIRInstructionClass<MultiplyAddSubOp> TYPE = LIRInstructionClass.create(MultiplyAddSubOp.class);
 

From 9d47e4a939c73a495e4a7bf97ae104494a2a0b54 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 24 Sep 2021 18:05:45 +0200
Subject: [PATCH 129/681] Make WasmVoidResult.instance field final.

---
 .../src/org/graalvm/wasm/WasmVoidResult.java              | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmVoidResult.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmVoidResult.java
index ab1c6061ba5c..a888c10e080b 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmVoidResult.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmVoidResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -49,11 +49,7 @@
 @ExportLibrary(InteropLibrary.class)
 @SuppressWarnings({"static-method", "unused"})
 public final class WasmVoidResult implements TruffleObject {
-    private static WasmVoidResult instance;
-
-    static {
-        instance = new WasmVoidResult();
-    }
+    private static final WasmVoidResult instance = new WasmVoidResult();
 
     private WasmVoidResult() {
     }

From 6518d7cd857440fee036a868ed9085d601c00e16 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 24 Sep 2021 18:21:03 +0200
Subject: [PATCH 130/681] Make constant fields static final.

---
 .../src/org.graalvm.wasm/src/org/graalvm/wasm/ModuleLimits.java | 2 +-
 wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Ciovec.java      | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Dirent.java      | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Event.java       | 2 +-
 .../graalvm/wasm/predefined/wasi/types/EventFdReadwrite.java    | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Fdstat.java      | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Filestat.java    | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Iovec.java       | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/Prestat.java     | 2 +-
 .../src/org/graalvm/wasm/predefined/wasi/types/PrestatDir.java  | 2 +-
 .../org/graalvm/wasm/predefined/wasi/types/Subscription.java    | 2 +-
 .../graalvm/wasm/predefined/wasi/types/SubscriptionClock.java   | 2 +-
 .../wasm/predefined/wasi/types/SubscriptionFdReadwrite.java     | 2 +-
 .../org/graalvm/wasm/predefined/wasi/types/SubscriptionU.java   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/ModuleLimits.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/ModuleLimits.java
index a65ec680c326..14214b479dde 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/ModuleLimits.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/ModuleLimits.java
@@ -87,7 +87,7 @@ private static int minUnsigned(int a, int b) {
         return Integer.compareUnsigned(a, b) < 0 ? a : b;
     }
 
-    static ModuleLimits DEFAULTS = new ModuleLimits(
+    static final ModuleLimits DEFAULTS = new ModuleLimits(
                     Integer.MAX_VALUE,
                     Integer.MAX_VALUE,
                     Integer.MAX_VALUE,
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
index 7b3ccef9fab7..93ed2ce3e0c3 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
@@ -66,7 +66,7 @@ public enum ConstantsStorePolicy {
         NONE
     }
 
-    public static OptionType<ConstantsStorePolicy> StoreConstantsPolicyOptionType = new OptionType<>("StoreConstantsPolicy", ConstantsStorePolicy::valueOf);
+    public static final OptionType<ConstantsStorePolicy> StoreConstantsPolicyOptionType = new OptionType<>("StoreConstantsPolicy", ConstantsStorePolicy::valueOf);
 
     @Option(help = "Whenever to store the constants in a pool or not. Deprecated: no longer has any effect.", category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL, deprecated = true)//
     public static final OptionKey<ConstantsStorePolicy> StoreConstantsPolicy = new OptionKey<>(ConstantsStorePolicy.NONE, StoreConstantsPolicyOptionType);
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Ciovec.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Ciovec.java
index cfb7f9e1dddf..cbba481cf5c7 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Ciovec.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Ciovec.java
@@ -56,7 +56,7 @@ private Ciovec() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 8;
+    public static final int BYTES = 8;
 
     /** Reads the address of the buffer to be written. */
     public static int readBuf(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Dirent.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Dirent.java
index 0319de30ecad..d982bdcc482a 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Dirent.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Dirent.java
@@ -56,7 +56,7 @@ private Dirent() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 24;
+    public static final int BYTES = 24;
 
     /** Reads the offset of the next directory entry stored in this directory. */
     public static long readDNext(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Event.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Event.java
index d1000ce896b2..fd54d1d2341b 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Event.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Event.java
@@ -56,7 +56,7 @@ private Event() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 32;
+    public static final int BYTES = 32;
 
     /** Reads user-provided value that got attached to {@code subscription::userdata}. */
     public static long readUserdata(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/EventFdReadwrite.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/EventFdReadwrite.java
index 43aa0f4785b5..47d279abbd55 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/EventFdReadwrite.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/EventFdReadwrite.java
@@ -59,7 +59,7 @@ private EventFdReadwrite() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 16;
+    public static final int BYTES = 16;
 
     /** Reads the number of bytes available for reading or writing. */
     public static long readNbytes(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Fdstat.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Fdstat.java
index 296470607f49..9aeb8bb11c74 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Fdstat.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Fdstat.java
@@ -56,7 +56,7 @@ private Fdstat() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 24;
+    public static final int BYTES = 24;
 
     /** Reads file type. */
     public static Filetype readFsFiletype(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Filestat.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Filestat.java
index 6255ed530af6..e766fc4d5ab1 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Filestat.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Filestat.java
@@ -56,7 +56,7 @@ private Filestat() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 64;
+    public static final int BYTES = 64;
 
     /** Reads device id of device containing the file. */
     public static long readDev(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Iovec.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Iovec.java
index 911be6c10f3b..07a5eb95d085 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Iovec.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Iovec.java
@@ -56,7 +56,7 @@ private Iovec() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 8;
+    public static final int BYTES = 8;
 
     /** Reads the address of the buffer to be filled. */
     public static int readBuf(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Prestat.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Prestat.java
index f01585dddd29..24975c663163 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Prestat.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Prestat.java
@@ -56,7 +56,7 @@ private Prestat() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int CONTENTSOFFSET = 4;
+    public static final int CONTENTSOFFSET = 4;
 
     /** Reads union tag. */
     public static Preopentype readTag(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/PrestatDir.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/PrestatDir.java
index 8b83d4b8b4a4..c132106daa2c 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/PrestatDir.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/PrestatDir.java
@@ -56,7 +56,7 @@ private PrestatDir() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 4;
+    public static final int BYTES = 4;
 
     /** Reads the length of the directory name for use with {@code fd_prestat_dir_name}. */
     public static int readPrNameLen(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Subscription.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Subscription.java
index 4ffae02dd2e5..9a08817b8ecd 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Subscription.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/Subscription.java
@@ -56,7 +56,7 @@ private Subscription() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 48;
+    public static final int BYTES = 48;
 
     /**
      * Reads user-provided value that is attached to the subscription in the implementation and
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionClock.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionClock.java
index 5a666267171c..12a58bd06047 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionClock.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionClock.java
@@ -56,7 +56,7 @@ private SubscriptionClock() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 32;
+    public static final int BYTES = 32;
 
     /** Reads the clock against which to compare the timestamp. */
     public static Clockid readId(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionFdReadwrite.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionFdReadwrite.java
index 2265aa337298..c5d4bd9c6da5 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionFdReadwrite.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionFdReadwrite.java
@@ -59,7 +59,7 @@ private SubscriptionFdReadwrite() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int BYTES = 4;
+    public static final int BYTES = 4;
 
     /** Reads the file descriptor on which to wait for it to become ready for reading or writing. */
     public static int readFileDescriptor(Node node, WasmMemory memory, int address) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionU.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionU.java
index f47bc9e01ae1..437b86d284d1 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionU.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/wasi/types/SubscriptionU.java
@@ -56,7 +56,7 @@ private SubscriptionU() {
     }
 
     /** Size of this structure, in bytes. */
-    public static int CONTENTSOFFSET = 8;
+    public static final int CONTENTSOFFSET = 8;
 
     /** Reads union tag. */
     public static Eventtype readTag(Node node, WasmMemory memory, int address) {

From 36111c3e126fc5a153e1ebc92e7bfbdea9622ec3 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 7 Sep 2021 14:53:15 +0200
Subject: [PATCH 131/681] Make UnsafeWasmMemory implement isPointer(),
 asPointer().

---
 .../org/graalvm/wasm/memory/UnsafeWasmMemory.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
index 040f212b0c41..3b3eb0dd9677 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
@@ -55,10 +55,14 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 
 import sun.misc.Unsafe;
 
+@ExportLibrary(InteropLibrary.class)
 public final class UnsafeWasmMemory extends WasmMemory implements AutoCloseable {
     /**
      * @see #declaredMinSize()
@@ -360,6 +364,17 @@ public void close() {
         }
     }
 
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean isPointer() {
+        return true;
+    }
+
+    @ExportMessage
+    public long asPointer() {
+        return startAddress;
+    }
+
     static {
         try {
             final Field f = Unsafe.class.getDeclaredField("theUnsafe");

From ade781816b068eb3f18f4ca5f8ec571e0fb875e5 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Fri, 24 Sep 2021 11:16:56 +0200
Subject: [PATCH 132/681] Update graal-nodejs and graal-js imports.

---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 58d333064c9c..d42698e45da2 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "5d6e27792ff4814ce47ff49f7b9845231e2048ec",
+                "version": "cfd51cdf034ed67678574ad99b957cb7cb752c31",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "5d6e27792ff4814ce47ff49f7b9845231e2048ec",
+                "version": "cfd51cdf034ed67678574ad99b957cb7cb752c31",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From 09348a3a3a0ec7e7972d7b93ff796f53a26b6e67 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Fri, 24 Sep 2021 15:39:41 -0700
Subject: [PATCH 133/681] Refactor FastThreadLocal to take a name argument.

---
 .../genscavenge/ThreadLocalAllocation.java    |  3 +-
 .../oracle/svm/core/SubstrateDiagnostics.java |  2 +-
 .../core/deopt/DeoptimizationCounters.java    |  2 +-
 .../svm/core/graal/snippets/DeoptTester.java  |  2 +-
 .../snippets/StackOverflowCheckImpl.java      |  4 +-
 .../svm/core/heap/NoAllocationVerifier.java   |  2 +-
 .../IdentityHashCodeSupport.java              |  2 +-
 .../monitor/MultiThreadedMonitorSupport.java  |  2 +-
 .../svm/core/snippets/ExceptionUnwind.java    |  2 +-
 .../svm/core/snippets/ImplicitExceptions.java |  2 +-
 .../svm/core/stack/JavaFrameAnchors.java      |  2 +-
 .../oracle/svm/core/thread/JavaThreads.java   |  2 +-
 .../com/oracle/svm/core/thread/Safepoint.java |  2 +-
 .../svm/core/thread/ThreadingSupportImpl.java |  4 +-
 .../com/oracle/svm/core/thread/VMThreads.java | 26 ++++++-------
 .../svm/core/threadlocal/FastThreadLocal.java | 15 ++++++--
 .../threadlocal/FastThreadLocalBytes.java     |  3 +-
 .../threadlocal/FastThreadLocalFactory.java   | 35 +++++++++++++++---
 .../core/threadlocal/FastThreadLocalInt.java  |  3 +-
 .../core/threadlocal/FastThreadLocalLong.java |  3 +-
 .../threadlocal/FastThreadLocalObject.java    |  3 +-
 .../core/threadlocal/FastThreadLocalWord.java |  3 +-
 .../core/threadlocal/VMThreadLocalInfo.java   |  4 +-
 .../graal/isolated/IsolatedCompileClient.java |  2 +-
 .../isolated/IsolatedCompileContext.java      |  2 +-
 .../hosted/thread/VMThreadLocalCollector.java | 37 +------------------
 .../svm/hosted/thread/VMThreadMTFeature.java  |  2 +-
 .../svm/hosted/thread/VMThreadSTFeature.java  |  2 +-
 .../com/oracle/svm/jfr/JfrThreadLocal.java    | 13 ++++---
 .../com/oracle/svm/jni/JNIObjectHandles.java  |  2 +-
 .../svm/jni/JNIThreadLocalEnvironment.java    |  3 +-
 .../jni/JNIThreadLocalPendingException.java   |  2 +-
 .../svm/jni/JNIThreadLocalPinnedObjects.java  |  3 +-
 .../svm/jni/JNIThreadOwnedMonitors.java       |  2 +-
 .../oracle/svm/truffle/nfi/ErrnoMirror.java   |  2 +-
 .../oracle/svm/truffle/nfi/NativeClosure.java |  2 +-
 .../svm/truffle/nfi/TruffleNFISupport.java    |  2 +-
 .../truffle/api/SubstrateFastThreadLocal.java |  2 +-
 .../api/SubstrateThreadLocalHandshake.java    |  4 +-
 .../polyglot/nativeapi/PolyglotNativeAPI.java |  2 +-
 40 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
index 40219c028e52..323dbc14b516 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -112,7 +112,8 @@ public interface Descriptor extends PointerBase {
      * Don't read this value directly, use the {@link Uninterruptible} accessor methods instead.
      * This is necessary to avoid races between the GC and code that accesses or modifies the TLAB.
      */
-    private static final FastThreadLocalBytes<Descriptor> regularTLAB = FastThreadLocalFactory.createBytes(ThreadLocalAllocation::getTlabDescriptorSize).setMaxOffset(FastThreadLocal.BYTE_OFFSET);
+    private static final FastThreadLocalBytes<Descriptor> regularTLAB = FastThreadLocalFactory.createBytes(ThreadLocalAllocation::getTlabDescriptorSize, "ThreadLocalAllocation.regularTLAB")
+                    .setMaxOffset(FastThreadLocal.BYTE_OFFSET);
 
     private ThreadLocalAllocation() {
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
index 2ae835b6f177..f2fb6cc092bc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
@@ -79,7 +79,7 @@
 import com.oracle.svm.core.util.Counter;
 
 public class SubstrateDiagnostics {
-    private static final FastThreadLocalBytes<CCharPointer> threadOnlyAttachedForCrashHandler = FastThreadLocalFactory.createBytes(() -> 1);
+    private static final FastThreadLocalBytes<CCharPointer> threadOnlyAttachedForCrashHandler = FastThreadLocalFactory.createBytes(() -> 1, "SubstrateDiagnostics.threadOnlyAttachedForCrashHandler");
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static void setOnlyAttachedForCrashHandler(IsolateThread thread) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
index de24ee4fea0c..98d3a00f1761 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
@@ -51,7 +51,7 @@ public static class Options {
      * Rewriting the stack pointer does not allow passing the start time properly through the call
      * stack.
      */
-    static final FastThreadLocalLong startTime = FastThreadLocalFactory.createLong();
+    static final FastThreadLocalLong startTime = FastThreadLocalFactory.createLong("DeoptimizationCounters.startTime");
 
     @Fold
     public static DeoptimizationCounters counters() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
index c76f5a555165..cf23fa5a53ae 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
@@ -71,7 +71,7 @@ public static class Options {
 
     private static final Set<Long> handledPCs = new HashSet<>();
 
-    private static final FastThreadLocalInt inDeoptTest = FastThreadLocalFactory.createInt();
+    private static final FastThreadLocalInt inDeoptTest = FastThreadLocalFactory.createInt("DeoptTester.inDeoptTest");
 
     private static final StackFrameVisitor collectPcVisitor = new StackFrameVisitor() {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
index bc9e1cbeaef1..79d6808d1aad 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
@@ -100,7 +100,7 @@
 
 public final class StackOverflowCheckImpl implements StackOverflowCheck {
     // The stack boundary for the stack overflow check
-    public static final FastThreadLocalWord<UnsignedWord> stackBoundaryTL = FastThreadLocalFactory.createWord().setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
+    public static final FastThreadLocalWord<UnsignedWord> stackBoundaryTL = FastThreadLocalFactory.createWord("StackOverflowCheckImpl.stackBoundaryTL").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
     /**
      * Stores a counter how often the yellow zone has been made available, so that the yellow zone
@@ -108,7 +108,7 @@ public final class StackOverflowCheckImpl implements StackOverflowCheck {
      * 0 is the default value of thread local variables, so disallowing 0 as a valid value allows us
      * to to detect error in the state transitions.
      */
-    static final FastThreadLocalInt yellowZoneStateTL = FastThreadLocalFactory.createInt();
+    static final FastThreadLocalInt yellowZoneStateTL = FastThreadLocalFactory.createInt("StackOverflowCheckImpl.yellowZoneStateTL");
     static final int STATE_UNINITIALIZED = 0;
     static final int STATE_YELLOW_ENABLED = 1;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
index 031de7685d7c..047ca080dbc2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
@@ -61,7 +61,7 @@ public static void exit(final String callSite, final String typeName) {
         throw VMError.shouldNotReachHere(ERROR_MSG);
     }
 
-    private static final FastThreadLocalObject<NoAllocationVerifier> openVerifiers = FastThreadLocalFactory.createObject(NoAllocationVerifier.class);
+    private static final FastThreadLocalObject<NoAllocationVerifier> openVerifiers = FastThreadLocalFactory.createObject(NoAllocationVerifier.class, "NoAllocationVerifier.openVerifiers");
 
     /**
      * Create an opened instance.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
index 8796e8e3ddf2..f58dcb60df8b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
@@ -46,7 +46,7 @@
 public final class IdentityHashCodeSupport {
     public static final LocationIdentity IDENTITY_HASHCODE_LOCATION = NamedLocationIdentity.mutable("identityHashCode");
 
-    private static final FastThreadLocalObject<SplittableRandom> hashCodeGeneratorTL = FastThreadLocalFactory.createObject(SplittableRandom.class);
+    private static final FastThreadLocalObject<SplittableRandom> hashCodeGeneratorTL = FastThreadLocalFactory.createObject(SplittableRandom.class, "IdentityHashCodeSupport.hashCodeGeneratorTL");
 
     /**
      * Initialization can require synchronization which is not allowed during safepoints, so this
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
index 04fc1fa38d78..558def22f7aa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
@@ -100,7 +100,7 @@ public class MultiThreadedMonitorSupport extends MonitorSupport {
      * This is only used for preempting a continuation in the experimental Loom JDK support. There's
      * performance impact in this solution.
      */
-    protected static final FastThreadLocalInt lockedMonitors = FastThreadLocalFactory.createInt();
+    protected static final FastThreadLocalInt lockedMonitors = FastThreadLocalFactory.createInt("MultiThreadedMonitorSupport.lockedMonitors");
 
     protected static void onMonitorLocked() {
         if (JavaContinuations.useLoom()) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java
index 65cf964e0130..89d65429ac00 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ExceptionUnwind.java
@@ -68,7 +68,7 @@ public abstract class ExceptionUnwind {
                     UNWIND_EXCEPTION_WITH_CALLEE_SAVED_REGISTERS
     };
 
-    public static final FastThreadLocalObject<Throwable> currentException = FastThreadLocalFactory.createObject(Throwable.class);
+    public static final FastThreadLocalObject<Throwable> currentException = FastThreadLocalFactory.createObject(Throwable.class, "ExceptionUnwind.currentException");
 
     @Uninterruptible(reason = "Called from uninterruptible callers.", mayBeInlined = true)
     static boolean exceptionsAreFatal() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
index 3c9c511c6984..0d77e718dcc5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
@@ -113,7 +113,7 @@ public class ImplicitExceptions {
                     THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION, THROW_CACHED_ARITHMETIC_EXCEPTION, THROW_CACHED_ASSERTION_ERROR,
     };
 
-    private static final FastThreadLocalInt implicitExceptionsAreFatal = FastThreadLocalFactory.createInt();
+    private static final FastThreadLocalInt implicitExceptionsAreFatal = FastThreadLocalFactory.createInt("ImplicitExceptions.implicitExceptionsAreFatal");
 
     /**
      * Switch the current thread into a mode where implicit exceptions such as NullPointerException
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java
index cbc86c4908f0..1156f3bdea51 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/JavaFrameAnchors.java
@@ -36,7 +36,7 @@
  */
 public class JavaFrameAnchors {
 
-    private static final FastThreadLocalWord<JavaFrameAnchor> lastAnchor = FastThreadLocalFactory.createWord().setMaxOffset(FastThreadLocal.BYTE_OFFSET);
+    private static final FastThreadLocalWord<JavaFrameAnchor> lastAnchor = FastThreadLocalFactory.createWord("JavaFrameAnchors.lastAnchor").setMaxOffset(FastThreadLocal.BYTE_OFFSET);
 
     public static void pushFrameAnchor(JavaFrameAnchor anchor) {
         anchor.setPreviousAnchor(lastAnchor.get());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index 76d3e06361c3..bb208acc802d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -86,7 +86,7 @@ public static JavaThreads singleton() {
     }
 
     /** The {@link java.lang.Thread} for the {@link IsolateThread}. */
-    static final FastThreadLocalObject<Thread> currentThread = FastThreadLocalFactory.createObject(Thread.class).setMaxOffset(FastThreadLocal.BYTE_OFFSET);
+    static final FastThreadLocalObject<Thread> currentThread = FastThreadLocalFactory.createObject(Thread.class, "JavaThreads.currentThread").setMaxOffset(FastThreadLocal.BYTE_OFFSET);
 
     /**
      * The number of running non-daemon threads. The initial value accounts for the main thread,
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index 5d6be7983115..e7dd8fa0483c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -329,7 +329,7 @@ private static void notInlinedLockNoTransition() {
      * value.</li>
      * </ul>
      */
-    static final FastThreadLocalInt safepointRequested = FastThreadLocalFactory.createInt().setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
+    static final FastThreadLocalInt safepointRequested = FastThreadLocalFactory.createInt("Safepoint.safepointRequested").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
     /** The value to reset a thread's {@link #safepointRequested} value to after a safepoint. */
     static final int THREAD_REQUEST_RESET = Integer.MAX_VALUE;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
index 990d9b3db3bb..d250d33229f8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
@@ -233,9 +233,9 @@ private void invokeCallback() {
         }
     }
 
-    private static final FastThreadLocalObject<RecurringCallbackTimer> activeTimer = FastThreadLocalFactory.createObject(RecurringCallbackTimer.class);
+    private static final FastThreadLocalObject<RecurringCallbackTimer> activeTimer = FastThreadLocalFactory.createObject(RecurringCallbackTimer.class, "ThreadingSupportImpl.activeTimer");
 
-    private static final FastThreadLocalInt currentPauseDepth = FastThreadLocalFactory.createInt();
+    private static final FastThreadLocalInt currentPauseDepth = FastThreadLocalFactory.createInt("ThreadingSupportImpl.currentPauseDepth");
 
     private static final String enableSupportOption = SubstrateOptionsParser.commandArgument(SupportRecurringCallback, "+");
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 25d7d2c58f7c..1cb5883f88b4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -138,17 +138,17 @@ public static VMThreads singleton() {
      * The next element in the linked list of {@link IsolateThread}s. A thread points to itself with
      * this field after being removed from the linked list.
      */
-    public static final FastThreadLocalWord<IsolateThread> nextTL = FastThreadLocalFactory.createWord();
-    private static final FastThreadLocalWord<OSThreadId> OSThreadIdTL = FastThreadLocalFactory.createWord();
-    protected static final FastThreadLocalWord<OSThreadHandle> OSThreadHandleTL = FastThreadLocalFactory.createWord();
-    public static final FastThreadLocalWord<Isolate> IsolateTL = FastThreadLocalFactory.createWord();
+    public static final FastThreadLocalWord<IsolateThread> nextTL = FastThreadLocalFactory.createWord("VMThreads.nextTL");
+    private static final FastThreadLocalWord<OSThreadId> OSThreadIdTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadIdTL");
+    protected static final FastThreadLocalWord<OSThreadHandle> OSThreadHandleTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadHandleTL");
+    public static final FastThreadLocalWord<Isolate> IsolateTL = FastThreadLocalFactory.createWord("VMThreads.IsolateTL");
     /** The highest stack address. */
-    public static final FastThreadLocalWord<UnsignedWord> StackBase = FastThreadLocalFactory.createWord();
+    public static final FastThreadLocalWord<UnsignedWord> StackBase = FastThreadLocalFactory.createWord("VMThreads.StackBase");
     /**
      * The lowest stack address. Note that this value does not necessarily match the value that is
      * used for the stack overflow check.
      */
-    public static final FastThreadLocalWord<UnsignedWord> StackEnd = FastThreadLocalFactory.createWord();
+    public static final FastThreadLocalWord<UnsignedWord> StackEnd = FastThreadLocalFactory.createWord("VMThreads.StackEnd");
 
     private static final int STATE_UNINITIALIZED = 1;
     private static final int STATE_INITIALIZING = 2;
@@ -206,7 +206,7 @@ public static boolean ensureInitialized() {
      * Stores the unaligned memory address returned by calloc, so that we can properly free the
      * memory again.
      */
-    private static final FastThreadLocalWord<Pointer> unalignedIsolateThreadMemoryTL = FastThreadLocalFactory.createWord();
+    private static final FastThreadLocalWord<Pointer> unalignedIsolateThreadMemoryTL = FastThreadLocalFactory.createWord("VMThreads.unalignedIsolateThreadMemoryTL");
 
     /**
      * Allocate native memory for a {@link IsolateThread}. The returned memory must be initialized
@@ -611,7 +611,7 @@ public static boolean printLocationInfo(Log log, UnsignedWord value, boolean all
     public static class StatusSupport {
 
         /** The status of a {@link IsolateThread}. */
-        public static final FastThreadLocalInt statusTL = FastThreadLocalFactory.createInt().setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
+        public static final FastThreadLocalInt statusTL = FastThreadLocalFactory.createInt("StatusSupport.statusTL").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
         /**
          * Boolean flag whether safepoints are disabled. This is a separate thread local in addition
@@ -620,7 +620,7 @@ public static class StatusSupport {
          * detached, or a fatal error occurred and we are printing diagnostics before killing the
          * VM.
          */
-        private static final FastThreadLocalInt safepointsDisabledTL = FastThreadLocalFactory.createInt();
+        private static final FastThreadLocalInt safepointsDisabledTL = FastThreadLocalFactory.createInt("StatusSupport.safepointsDisabledTL");
 
         /** An illegal thread state for places where we need to pass a value. */
         public static final int STATUS_ILLEGAL = -1;
@@ -834,7 +834,7 @@ public static int getNewThreadStatus(CFunctionOptions.Transition transition) {
     public static class ActionOnTransitionToJavaSupport {
 
         /** The actions to be performed. */
-        private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt();
+        private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt("ActionOnTransitionToJavaSupport.actionTL");
 
         /** The thread does not need to take any action. */
         private static final int NO_ACTION = 0;
@@ -878,7 +878,7 @@ public static void requestAllThreadsSynchronizeCode() {
      */
     public static class ActionOnExitSafepointSupport {
 
-        private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt();
+        private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt("ActionOnExitSafepointSupport.actionTL");
         private static final int NO_ACTION = 0;
         /**
          * The thread needs to start execution from a different stack, used for preempting a
@@ -887,8 +887,8 @@ public static class ActionOnExitSafepointSupport {
         private static final int SWITCH_STACK = NO_ACTION + 1;
 
         /** Target of stack switching. */
-        private static final FastThreadLocalWord<Pointer> returnSP = FastThreadLocalFactory.createWord();
-        private static final FastThreadLocalWord<CodePointer> returnIP = FastThreadLocalFactory.createWord();
+        private static final FastThreadLocalWord<Pointer> returnSP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnSP");
+        private static final FastThreadLocalWord<CodePointer> returnIP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnIP");
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static boolean isActionPending() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocal.java
index e243629930ec..58d4a2a26a89 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocal.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocal.java
@@ -32,8 +32,7 @@
  * Base class for fast thread local variables.
  */
 public abstract class FastThreadLocal {
-
-    static class FastThreadLocalLocationIdentity extends LocationIdentity {
+    class FastThreadLocalLocationIdentity extends LocationIdentity {
         @Override
         public boolean isImmutable() {
             return false;
@@ -41,15 +40,18 @@ public boolean isImmutable() {
 
         @Override
         public String toString() {
-            return "THREAD_LOCAL@" + Integer.toHexString(hashCode());
+            return "FastThreadLocal:" + name;
         }
+
     }
 
     private final LocationIdentity locationIdentity;
+    private final String name;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocal() {
+    FastThreadLocal(String name) {
         this.locationIdentity = new FastThreadLocalLocationIdentity();
+        this.name = name;
     }
 
     /**
@@ -122,4 +124,9 @@ public <T extends FastThreadLocal> T setAllowFloatingReads(boolean allow) {
     public boolean getAllowFloatingReads() {
         return this.allowFloatingReads;
     }
+
+    public String getName() {
+        return name;
+    }
+
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalBytes.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalBytes.java
index 9c0bd277f9af..1c6c6de2f290 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalBytes.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalBytes.java
@@ -49,7 +49,8 @@ public final class FastThreadLocalBytes<T extends PointerBase> extends FastThrea
     private final IntSupplier sizeSupplier;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocalBytes(IntSupplier sizeSupplier) {
+    FastThreadLocalBytes(IntSupplier sizeSupplier, String name) {
+        super(name);
         this.sizeSupplier = sizeSupplier;
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalFactory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalFactory.java
index a731255b7f64..bac87244c121 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalFactory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalFactory.java
@@ -68,35 +68,60 @@ private FastThreadLocalFactory() {
     /**
      * Creates a new fast thread local variable of the primitive type {@code int}.
      */
+    public static FastThreadLocalInt createInt(String name) {
+        return new FastThreadLocalInt(name);
+    }
+
+    @Deprecated
     public static FastThreadLocalInt createInt() {
-        return new FastThreadLocalInt();
+        return new FastThreadLocalInt("FastThreadLocalInt");
     }
 
     /**
      * Creates a new fast thread local variable of the primitive type {@code long}.
      */
+    public static FastThreadLocalLong createLong(String name) {
+        return new FastThreadLocalLong(name);
+    }
+
+    @Deprecated
     public static FastThreadLocalLong createLong() {
-        return new FastThreadLocalLong();
+        return new FastThreadLocalLong("FastThreadLocalLong");
     }
 
     /**
      * Creates a new fast thread local variable of type {@link WordBase word}.
      */
+    public static <T extends WordBase> FastThreadLocalWord<T> createWord(String name) {
+        return new FastThreadLocalWord<>(name);
+    }
+
+    @Deprecated
     public static <T extends WordBase> FastThreadLocalWord<T> createWord() {
-        return new FastThreadLocalWord<>();
+        return new FastThreadLocalWord<>("FastThreadLocalWord");
     }
 
     /**
      * Creates a new fast thread local variable of type {@link Object}.
      */
+    public static <T> FastThreadLocalObject<T> createObject(Class<T> valueClass, String name) {
+        return new FastThreadLocalObject<>(valueClass, name);
+    }
+
+    @Deprecated
     public static <T> FastThreadLocalObject<T> createObject(Class<T> valueClass) {
-        return new FastThreadLocalObject<>(valueClass);
+        return new FastThreadLocalObject<>(valueClass, "FastThreadLocalObject");
     }
 
     /**
      * Creates a new fast thread local memory block that has a user-defined size.
      */
+    public static <T extends PointerBase> FastThreadLocalBytes<T> createBytes(IntSupplier sizeSupplier, String name) {
+        return new FastThreadLocalBytes<>(sizeSupplier, name);
+    }
+
+    @Deprecated
     public static <T extends PointerBase> FastThreadLocalBytes<T> createBytes(IntSupplier sizeSupplier) {
-        return new FastThreadLocalBytes<>(sizeSupplier);
+        return new FastThreadLocalBytes<>(sizeSupplier, "FastThreadLocalBytes");
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalInt.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalInt.java
index 8061c247cdc5..5612a73ff261 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalInt.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalInt.java
@@ -36,7 +36,8 @@
 public final class FastThreadLocalInt extends FastThreadLocal {
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocalInt() {
+    FastThreadLocalInt(String name) {
+        super(name);
     }
 
     public int get() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalLong.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalLong.java
index 3cba1561ddd6..c54ecaafe33e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalLong.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalLong.java
@@ -36,7 +36,8 @@
 public final class FastThreadLocalLong extends FastThreadLocal {
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocalLong() {
+    FastThreadLocalLong(String name) {
+        super(name);
     }
 
     public long get() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalObject.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalObject.java
index 65ed12d1abf7..59956878ffd9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalObject.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalObject.java
@@ -44,7 +44,8 @@ public final class FastThreadLocalObject<T> extends FastThreadLocal {
     private final Class<T> valueClass;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocalObject(Class<T> clazz) {
+    FastThreadLocalObject(Class<T> clazz, String name) {
+        super(name);
         this.valueClass = clazz;
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalWord.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalWord.java
index e39681199ea1..c07b761f9c63 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalWord.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/FastThreadLocalWord.java
@@ -38,7 +38,8 @@
 public final class FastThreadLocalWord<T extends WordBase> extends FastThreadLocal {
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FastThreadLocalWord() {
+    FastThreadLocalWord(String name) {
+        super(name);
     }
 
     public T get() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java
index ef08028e9fc0..fda3e4039cda 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfo.java
@@ -36,7 +36,6 @@
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.FrameAccess;
-import com.oracle.svm.core.annotate.UnknownObjectField;
 import com.oracle.svm.core.annotate.UnknownPrimitiveField;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -74,8 +73,8 @@ public static Class<?> getValueClass(Class<? extends FastThreadLocal> threadLoca
     public final Class<?> valueClass;
     public final int maxOffset;
     public final boolean allowFloatingReads;
+    public final String name;
 
-    @UnknownObjectField(types = {String.class}) public String name;
     @UnknownPrimitiveField public int offset;
     @UnknownPrimitiveField public int sizeInBytes;
 
@@ -85,6 +84,7 @@ public VMThreadLocalInfo(FastThreadLocal threadLocal) {
         this.locationIdentity = threadLocal.getLocationIdentity();
         this.maxOffset = threadLocal.getMaxOffset();
         this.allowFloatingReads = threadLocal.getAllowFloatingReads();
+        this.name = threadLocal.getName();
 
         if (threadLocalClass == FastThreadLocalBytes.class) {
             sizeSupplier = ((FastThreadLocalBytes<?>) threadLocal).getSizeSupplier();
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
index b8f31b310517..2483a24f3f66 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileClient.java
@@ -44,7 +44,7 @@
 public final class IsolatedCompileClient {
 
     private static final FastThreadLocalObject<IsolatedCompileClient> currentClient = //
-                    FastThreadLocalFactory.createObject(IsolatedCompileClient.class);
+                    FastThreadLocalFactory.createObject(IsolatedCompileClient.class, "IsolatedCompileClient.currentClient");
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static IsolatedCompileClient get() {
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
index f7b28a3dae60..c4e58c8ec915 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedCompileContext.java
@@ -44,7 +44,7 @@
  */
 public final class IsolatedCompileContext {
     private static final FastThreadLocalObject<IsolatedCompileContext> currentContext = //
-                    FastThreadLocalFactory.createObject(IsolatedCompileContext.class);
+                    FastThreadLocalFactory.createObject(IsolatedCompileContext.class, "IsolatedCompileContext.currentContext");
 
     public static IsolatedCompileContext get() {
         return currentContext.get();
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
index 2c709b5aa467..6850a186cb57 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
@@ -36,17 +36,11 @@
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.threadlocal.FastThreadLocal;
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfo;
-import com.oracle.svm.hosted.FeatureImpl.CompilationAccessImpl;
-import com.oracle.svm.hosted.meta.HostedField;
-
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaField;
 
 /**
  * Collects all {@link FastThreadLocal} instances that are actually used by the application.
@@ -90,37 +84,9 @@ public VMThreadLocalInfo findInfo(GraphBuilderContext b, ValueNode threadLocalNo
         return result;
     }
 
-    public List<VMThreadLocalInfo> sortThreadLocals(Feature.CompilationAccess a) {
-        CompilationAccessImpl config = (CompilationAccessImpl) a;
-
+    public List<VMThreadLocalInfo> sortThreadLocals() {
         sealed = true;
-
-        /*
-         * Find a unique static field for every VM thread local object. The field name is used to
-         * make the layout of VMThread deterministic.
-         */
-        for (ResolvedJavaField f : config.getFields()) {
-            HostedField field = (HostedField) f;
-            if (field.isStatic() && field.getStorageKind() == JavaKind.Object) {
-                Object fieldValue = SubstrateObjectConstant.asObject(field.readValue(null));
-                if (fieldValue instanceof FastThreadLocal) {
-                    FastThreadLocal threadLocal = (FastThreadLocal) fieldValue;
-                    VMThreadLocalInfo info = threadLocals.get(threadLocal);
-                    String fieldName = field.format("%H.%n");
-                    if (!field.isFinal()) {
-                        throw shouldNotReachHere("VMThreadLocal referenced from non-final field: " + fieldName);
-                    } else if (info.name != null) {
-                        throw shouldNotReachHere("VMThreadLocal referenced from two static final fields: " + info.name + ", " + fieldName);
-                    }
-                    info.name = fieldName;
-                }
-            }
-        }
         for (VMThreadLocalInfo info : threadLocals.values()) {
-            if (info.name == null) {
-                shouldNotReachHere("VMThreadLocal found that is not referenced from a static final field");
-            }
-
             assert info.sizeInBytes == -1;
             if (info.sizeSupplier != null) {
                 int unalignedSize = info.sizeSupplier.getAsInt();
@@ -158,7 +124,6 @@ private static int compareThreadLocal(VMThreadLocalInfo info1, VMThreadLocalInfo
                 }
             }
         }
-        assert result != 0 : "not distinguishable: " + info1 + ", " + info2;
         return result;
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
index aecf007945d6..815d2acefc0e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
@@ -238,7 +238,7 @@ public void duringAnalysis(DuringAnalysisAccess access) {
 
     @Override
     public void beforeCompilation(BeforeCompilationAccess config) {
-        List<VMThreadLocalInfo> sortedThreadLocalInfos = threadLocalCollector.sortThreadLocals(config);
+        List<VMThreadLocalInfo> sortedThreadLocalInfos = threadLocalCollector.sortThreadLocals();
         SubstrateReferenceMap referenceMap = new SubstrateReferenceMap();
         int nextOffset = 0;
         for (VMThreadLocalInfo info : sortedThreadLocalInfos) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
index e585700d56c4..13ec85cf0ca4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
@@ -217,7 +217,7 @@ public void duringAnalysis(DuringAnalysisAccess access) {
 
     @Override
     public void beforeCompilation(BeforeCompilationAccess config) {
-        List<VMThreadLocalInfo> sortedThreadLocalInfos = threadLocalCollector.sortThreadLocals(config);
+        List<VMThreadLocalInfo> sortedThreadLocalInfos = threadLocalCollector.sortThreadLocals();
         ObjectLayout layout = ConfigurationValues.getObjectLayout();
         int nextObject = 0;
         int nextPrimitive = 0;
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java
index 0bee57ab6d75..06cac6b8d089 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrThreadLocal.java
@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.jfr;
 
-import com.oracle.svm.core.thread.VMOperation;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
@@ -38,6 +37,7 @@
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.thread.Target_java_lang_Thread;
 import com.oracle.svm.core.thread.ThreadListener;
+import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.threadlocal.FastThreadLocalFactory;
 import com.oracle.svm.core.threadlocal.FastThreadLocalLong;
 import com.oracle.svm.core.threadlocal.FastThreadLocalObject;
@@ -63,11 +63,12 @@
  * modify the buffers of other threads).
  */
 public class JfrThreadLocal implements ThreadListener {
-    private static final FastThreadLocalObject<Target_jdk_jfr_internal_EventWriter> javaEventWriter = FastThreadLocalFactory.createObject(Target_jdk_jfr_internal_EventWriter.class);
-    private static final FastThreadLocalWord<JfrBuffer> javaBuffer = FastThreadLocalFactory.createWord();
-    private static final FastThreadLocalWord<JfrBuffer> nativeBuffer = FastThreadLocalFactory.createWord();
-    private static final FastThreadLocalWord<UnsignedWord> dataLost = FastThreadLocalFactory.createWord();
-    private static final FastThreadLocalLong traceId = FastThreadLocalFactory.createLong();
+    private static final FastThreadLocalObject<Target_jdk_jfr_internal_EventWriter> javaEventWriter = FastThreadLocalFactory.createObject(Target_jdk_jfr_internal_EventWriter.class,
+                    "JfrThreadLocal.javaEventWriter");
+    private static final FastThreadLocalWord<JfrBuffer> javaBuffer = FastThreadLocalFactory.createWord("JfrThreadLocal.javaBuffer");
+    private static final FastThreadLocalWord<JfrBuffer> nativeBuffer = FastThreadLocalFactory.createWord("JfrThreadLocal.nativeBuffer");
+    private static final FastThreadLocalWord<UnsignedWord> dataLost = FastThreadLocalFactory.createWord("JfrThreadLocal.dataLost");
+    private static final FastThreadLocalLong traceId = FastThreadLocalFactory.createLong("JfrThreadLocal.traceId");
 
     private long threadLocalBufferSize;
 
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIObjectHandles.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIObjectHandles.java
index 42479d409c0a..55331510b234 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIObjectHandles.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIObjectHandles.java
@@ -80,7 +80,7 @@ public static <T extends SignedWord> T nullHandle() {
     static final int NATIVE_CALL_MIN_LOCAL_HANDLE_CAPACITY = 16;
 
     @SuppressWarnings("rawtypes") private static final FastThreadLocalObject<ThreadLocalHandles> handles //
-                    = FastThreadLocalFactory.createObject(ThreadLocalHandles.class);
+                    = FastThreadLocalFactory.createObject(ThreadLocalHandles.class, "JNIObjectHandles.handles");
 
     @Fold
     static boolean useImageHeapHandles() {
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalEnvironment.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalEnvironment.java
index 7c9806ce0b6e..9dc92fae76fa 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalEnvironment.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalEnvironment.java
@@ -41,7 +41,8 @@ public class JNIThreadLocalEnvironment {
      * structure. For that reason, it has the same address as the VMThread and can be used to
      * restore the designated VMThread register when transitioning from native to Java.
      */
-    static final FastThreadLocalBytes<JNIEnvironment> jniFunctions = FastThreadLocalFactory.createBytes(() -> SizeOf.get(JNIEnvironment.class)).setMaxOffset(0);
+    static final FastThreadLocalBytes<JNIEnvironment> jniFunctions = FastThreadLocalFactory.createBytes(() -> SizeOf.get(JNIEnvironment.class), "JNIThreadLocalEnvironment.jniFunctions")
+                    .setMaxOffset(0);
 
     public static JNIEnvironment getAddress() {
         JNIEnvironment env = jniFunctions.getAddress();
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPendingException.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPendingException.java
index 37e1a3d427f4..fcc91a33b110 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPendingException.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPendingException.java
@@ -31,7 +31,7 @@
  * Retains one exception per thread that is pending to be handled in that thread (or none).
  */
 public class JNIThreadLocalPendingException {
-    private static final FastThreadLocalObject<Throwable> pendingException = FastThreadLocalFactory.createObject(Throwable.class);
+    private static final FastThreadLocalObject<Throwable> pendingException = FastThreadLocalFactory.createObject(Throwable.class, "JNIThreadLocalPendingException.pendingException");
 
     public static Throwable get() {
         return pendingException.get();
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPinnedObjects.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPinnedObjects.java
index d93e7ab170f2..9f30fc6cf3dd 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPinnedObjects.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadLocalPinnedObjects.java
@@ -47,7 +47,8 @@ private static class PinnedObjectListNode {
         }
     }
 
-    private static final FastThreadLocalObject<PinnedObjectListNode> pinnedObjectsListHead = FastThreadLocalFactory.createObject(PinnedObjectListNode.class);
+    private static final FastThreadLocalObject<PinnedObjectListNode> pinnedObjectsListHead = FastThreadLocalFactory.createObject(PinnedObjectListNode.class,
+                    "JNIThreadLocalPinnedObjects.pinnedObjectsListHead");
 
     public static <T extends PointerBase> T pinArrayAndGetAddress(Object array) {
         PinnedObject pin = PinnedObject.create(array);
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadOwnedMonitors.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadOwnedMonitors.java
index 83a29bda54c4..2b3e8e40550a 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadOwnedMonitors.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIThreadOwnedMonitors.java
@@ -36,7 +36,7 @@
 public class JNIThreadOwnedMonitors {
 
     @SuppressWarnings("rawtypes") //
-    private static final FastThreadLocalObject<IdentityHashMap> ownedMonitors = FastThreadLocalFactory.createObject(IdentityHashMap.class);
+    private static final FastThreadLocalObject<IdentityHashMap> ownedMonitors = FastThreadLocalFactory.createObject(IdentityHashMap.class, "JNIThreadOwnedMonitors.ownedMonitors");
 
     @SuppressWarnings("unchecked")
     private static IdentityHashMap<Object, Integer> mutableMap() {
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/ErrnoMirror.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/ErrnoMirror.java
index 48c49e780739..753c717d03a3 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/ErrnoMirror.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/ErrnoMirror.java
@@ -43,7 +43,7 @@
 @SuppressWarnings("static-method")
 public final class ErrnoMirror implements TruffleObject {
 
-    static final FastThreadLocalBytes<CIntPointer> errnoMirror = FastThreadLocalFactory.createBytes(() -> SizeOf.get(CIntPointer.class));
+    static final FastThreadLocalBytes<CIntPointer> errnoMirror = FastThreadLocalFactory.createBytes(() -> SizeOf.get(CIntPointer.class), "ErrnoMirror.errnoMirror");
 
     private static final KeysArray KEYS = new KeysArray(new String[]{"bind"});
 
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
index 3b07efe23f00..20c932efc479 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/NativeClosure.java
@@ -184,7 +184,7 @@ private static PointerBase serializeStringRet(Object retValue) {
         }
     }
 
-    static final FastThreadLocalObject<Throwable> pendingException = FastThreadLocalFactory.createObject(Throwable.class);
+    static final FastThreadLocalObject<Throwable> pendingException = FastThreadLocalFactory.createObject(Throwable.class, "NativeClosure.pendingException");
 
     @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
     @CEntryPointOptions(prologue = NoPrologue.class, epilogue = NoEpilogue.class, publishAs = Publish.NotPublished)
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFISupport.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFISupport.java
index 18c449f6ed88..1466a40415ec 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFISupport.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/TruffleNFISupport.java
@@ -47,7 +47,7 @@ public abstract class TruffleNFISupport {
 
     static final Charset UTF8 = Charset.forName("utf8");
 
-    private static final FastThreadLocalObject<LocalNativeScope> currentScope = FastThreadLocalFactory.createObject(LocalNativeScope.class);
+    private static final FastThreadLocalObject<LocalNativeScope> currentScope = FastThreadLocalFactory.createObject(LocalNativeScope.class, "TruffleNFISupport.currentScope");
 
     private final ObjectHandles globalHandles;
     private final ObjectHandles closureHandles;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateFastThreadLocal.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateFastThreadLocal.java
index 0630dfe5b98e..a39dcd4e284b 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateFastThreadLocal.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateFastThreadLocal.java
@@ -36,7 +36,7 @@
 final class SubstrateFastThreadLocal extends GraalFastThreadLocal {
 
     static final SubstrateFastThreadLocal SINGLETON = new SubstrateFastThreadLocal();
-    private static final FastThreadLocalObject<Object[]> CONTEXT = FastThreadLocalFactory.createObject(Object[].class)
+    private static final FastThreadLocalObject<Object[]> CONTEXT = FastThreadLocalFactory.createObject(Object[].class, "SubstrateFastThreadLocal.CONTEXT")
                     .setAllowFloatingReads(true)
                     .setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java
index cc841c2ec78c..39cb82a86fb2 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshake.java
@@ -65,8 +65,8 @@ public final class SubstrateThreadLocalHandshake extends ThreadLocalHandshake {
 
     static final SubstrateThreadLocalHandshake SINGLETON = new SubstrateThreadLocalHandshake();
 
-    static final FastThreadLocalInt PENDING = FastThreadLocalFactory.createInt().setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
-    static final FastThreadLocalObject<TruffleSafepointImpl> STATE = FastThreadLocalFactory.createObject(TruffleSafepointImpl.class)
+    static final FastThreadLocalInt PENDING = FastThreadLocalFactory.createInt("SubstrateThreadLocalHandshake.PENDING").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
+    static final FastThreadLocalObject<TruffleSafepointImpl> STATE = FastThreadLocalFactory.createObject(TruffleSafepointImpl.class, "SubstrateThreadLocalHandshake.STATE")
                     .setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
     @Platforms(Platform.HOSTED_ONLY.class)//
diff --git a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java
index 2985cb89487b..c48b15321432 100644
--- a/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java
+++ b/substratevm/src/org.graalvm.polyglot.nativeapi/src/org/graalvm/polyglot/nativeapi/PolyglotNativeAPI.java
@@ -119,7 +119,7 @@ public final class PolyglotNativeAPI {
 
     private static ThreadLocal<CallbackException> exceptionsTL = new ThreadLocal<>();
     private static ThreadLocal<ErrorStateHolder> errorHolder = new ThreadLocal<>();
-    @SuppressWarnings("rawtypes") private static final FastThreadLocalObject<ThreadLocalHandles> handles = FastThreadLocalFactory.createObject(ThreadLocalHandles.class);
+    @SuppressWarnings("rawtypes") private static final FastThreadLocalObject<ThreadLocalHandles> handles = FastThreadLocalFactory.createObject(ThreadLocalHandles.class, "PolyglotNativeAPI.handles");
 
     @SuppressWarnings("unchecked")
     private static ThreadLocalHandles<PolyglotNativeAPITypes.PolyglotHandle> getHandles() {

From 3467df19e881c672d11b8d7352af285935ca1c5c Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 24 Sep 2021 13:31:19 +0200
Subject: [PATCH 134/681] compiler: guarantee that the last fixed node was not
 deleted by a previous lowering

---
 .../src/org/graalvm/compiler/phases/common/LoweringPhase.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
index c0e5d0db99eb..e0892b30c18c 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
@@ -190,11 +190,12 @@ public GuardingNode createGuard(FixedNode before, LogicNode condition, Deoptimiz
 
         @Override
         public FixedWithNextNode lastFixedNode() {
+            GraalError.guarantee(lastFixedNode.isAlive(), "The last fixed node %s was deleted by a previous lowering", lastFixedNode);
             return lastFixedNode;
         }
 
         private void setLastFixedNode(FixedWithNextNode n) {
-            assert n.isAlive() : n;
+            GraalError.guarantee(n.isAlive(), "Cannot add last fixed node %s because it is not alive", n);
             lastFixedNode = n;
         }
     }

From d1479fd0a6afaa944351401b594ead2b3169e9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 10 Sep 2021 13:59:26 +0200
Subject: [PATCH 135/681] Remove obsolete special handling in
 org.graalvm.compiler.options.ModuleSupport

---
 .../compiler/options/ModuleSupport.java       |  5 ---
 .../compiler/options/ModuleSupport.java       |  6 ----
 .../com/oracle/svm/driver/NativeImage.java    |  6 ++--
 ...veImageClassLoaderSupportJDK11OrLater.java |  2 +-
 .../com/oracle/svm/util/ModuleSupport.java    |  2 +-
 .../com/oracle/svm/util/ModuleSupport.java    |  2 +-
 .../oracle/svm/util/ModuleSupportBase.java    | 34 +++++++++++++++++++
 7 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupportBase.java

diff --git a/compiler/src/org.graalvm.compiler.options.jdk11/src/org/graalvm/compiler/options/ModuleSupport.java b/compiler/src/org.graalvm.compiler.options.jdk11/src/org/graalvm/compiler/options/ModuleSupport.java
index 04a67c8a9616..b2025d468faf 100644
--- a/compiler/src/org.graalvm.compiler.options.jdk11/src/org/graalvm/compiler/options/ModuleSupport.java
+++ b/compiler/src/org.graalvm.compiler.options.jdk11/src/org/graalvm/compiler/options/ModuleSupport.java
@@ -28,8 +28,6 @@
 
 public class ModuleSupport {
 
-    public static final boolean USE_NI_JPMS = Boolean.parseBoolean(System.getenv().get("USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM"));
-
     static Iterable<OptionDescriptors> getOptionsLoader() {
         /*
          * The Graal module (i.e., jdk.internal.vm.compiler) is loaded by the platform class loader
@@ -37,9 +35,6 @@ static Iterable<OptionDescriptors> getOptionsLoader() {
          * As such, we need to start the provider search at the app class loader instead of the
          * platform class loader.
          */
-        if (USE_NI_JPMS) {
-            return ServiceLoader.load(ModuleSupport.class.getModule().getLayer(), OptionDescriptors.class);
-        }
         return ServiceLoader.load(OptionDescriptors.class, ClassLoader.getSystemClassLoader());
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModuleSupport.java b/compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModuleSupport.java
index e93e35cfc103..6e101bb5cff5 100644
--- a/compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModuleSupport.java
+++ b/compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModuleSupport.java
@@ -28,12 +28,6 @@
 
 public class ModuleSupport {
 
-    public static final boolean USE_NI_JPMS;
-
-    static {
-        USE_NI_JPMS = false;
-    }
-
     static Iterable<OptionDescriptors> getOptionsLoader() {
         // On JDK 8, Graal and its extensions are loaded by the same class loader.
         return ServiceLoader.load(OptionDescriptors.class, OptionDescriptors.class.getClassLoader());
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index 06c3b8a07f46..23b737a9f4b6 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -91,8 +91,6 @@
 
 public class NativeImage {
 
-    private static final String ENV_VAR_USE_MODULE_SYSTEM = "USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM";
-
     private static final String DEFAULT_GENERATOR_CLASS_NAME = NativeImageGeneratorRunner.class.getName();
     private static final String DEFAULT_GENERATOR_MODULE_NAME = ModuleSupport.getModuleName(NativeImageGeneratorRunner.class);
 
@@ -280,7 +278,7 @@ protected BuildConfiguration(List<String> args) {
 
         @SuppressWarnings("deprecation")
         BuildConfiguration(Path rootDir, Path workDir, List<String> args) {
-            modulePathBuild = Boolean.parseBoolean(System.getenv().get(ENV_VAR_USE_MODULE_SYSTEM));
+            modulePathBuild = Boolean.parseBoolean(System.getenv().get(ModuleSupport.ENV_VAR_USE_MODULE_SYSTEM));
             this.args = args;
             this.workDir = workDir != null ? workDir : Paths.get(".").toAbsolutePath().normalize();
             if (rootDir != null) {
@@ -1401,7 +1399,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> bcp, LinkedH
             ProcessBuilder pb = new ProcessBuilder();
             pb.command(command);
             if (config.modulePathBuild) {
-                pb.environment().put(ENV_VAR_USE_MODULE_SYSTEM, Boolean.toString(true));
+                pb.environment().put(ModuleSupport.ENV_VAR_USE_MODULE_SYSTEM, Boolean.toString(true));
             }
             p = pb.inheritIO().start();
             exitStatus = p.waitFor();
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
index b828e15acc54..4be2040efd4d 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
@@ -150,7 +150,7 @@ private void adjustLibrarySupportReadAllUnnamed() {
                 VMError.shouldNotReachHere("Could not adjust org.graalvm.nativeimage.librarysupport to read all unnamed modules", e);
             }
         } else {
-            VMError.guarantee(!org.graalvm.compiler.options.ModuleSupport.USE_NI_JPMS,
+            VMError.guarantee(!ModuleSupport.modulePathBuild,
                             "Image-builder on module-path requires module org.graalvm.nativeimage.librarysupport");
         }
     }
diff --git a/substratevm/src/com.oracle.svm.util.jdk11/src/com/oracle/svm/util/ModuleSupport.java b/substratevm/src/com.oracle.svm.util.jdk11/src/com/oracle/svm/util/ModuleSupport.java
index d33b3e208d21..7fd67edbf257 100644
--- a/substratevm/src/com.oracle.svm.util.jdk11/src/com/oracle/svm/util/ModuleSupport.java
+++ b/substratevm/src/com.oracle.svm.util.jdk11/src/com/oracle/svm/util/ModuleSupport.java
@@ -43,7 +43,7 @@
 import jdk.internal.module.Modules;
 
 @Platforms(Platform.HOSTED_ONLY.class)
-public final class ModuleSupport {
+public final class ModuleSupport extends ModuleSupportBase {
     private ModuleSupport() {
     }
 
diff --git a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java
index 2f451deab2d2..677786c41e06 100644
--- a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java
+++ b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java
@@ -35,7 +35,7 @@
 import org.graalvm.nativeimage.Platforms;
 
 @Platforms(Platform.HOSTED_ONLY.class)
-public final class ModuleSupport {
+public final class ModuleSupport extends ModuleSupportBase {
     private ModuleSupport() {
     }
 
diff --git a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupportBase.java b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupportBase.java
new file mode 100644
index 000000000000..ccde5b99230f
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupportBase.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.util;
+
+public class ModuleSupportBase {
+
+    public static final String ENV_VAR_USE_MODULE_SYSTEM = "USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM";
+
+    public static final boolean modulePathBuild = Boolean.parseBoolean(System.getenv().get(ENV_VAR_USE_MODULE_SYSTEM));
+
+}

From 3b30905ed4f17add51d3a9a134e488e542c43c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 10 Sep 2021 18:43:00 +0200
Subject: [PATCH 136/681] Decouple HostedOptionParser setup from
 classpath/modulepath scanning

---
 substratevm/mx.substratevm/suite.py           |  1 +
 .../oracle/svm/driver/APIOptionHandler.java   | 15 +++-----
 ...veImageClassLoaderSupportJDK11OrLater.java |  7 ++--
 ...AbstractNativeImageClassLoaderSupport.java | 26 +++++++++++++-
 .../oracle/svm/hosted/ImageClassLoader.java   |  5 ---
 .../hosted/NativeImageClassLoaderSupport.java |  2 +-
 .../hosted/NativeImageGeneratorRunner.java    | 36 +++++++++----------
 .../svm/hosted/option/HostedOptionParser.java | 24 ++++---------
 8 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 0c863b180c16..32c101a167b8 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1121,6 +1121,7 @@
                 ],
                 "uses" : [
                     "org.graalvm.nativeimage.Platform",
+                    "org.graalvm.compiler.options.OptionDescriptors",
                     "com.oracle.truffle.api.TruffleLanguage.Provider",
                     "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider",
                     "com.oracle.svm.hosted.agent.NativeImageBytecodeInstrumentationAgentExtension",
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
index 8c52503484ae..987c8340a069 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
@@ -106,20 +106,15 @@ boolean isDeprecated() {
             groupInfos = support.groupInfos;
             apiOptions = support.options;
         } else {
-            List<Class<? extends OptionDescriptors>> optionDescriptorsList = new ArrayList<>();
-            ServiceLoader<OptionDescriptors> serviceLoader = ServiceLoader.load(OptionDescriptors.class, nativeImage.getClass().getClassLoader());
-            for (OptionDescriptors optionDescriptors : serviceLoader) {
-                optionDescriptorsList.add(optionDescriptors.getClass());
-            }
             groupInfos = new HashMap<>();
-            apiOptions = extractOptions(optionDescriptorsList, groupInfos);
+            apiOptions = extractOptions(ServiceLoader.load(OptionDescriptors.class, nativeImage.getClass().getClassLoader()), groupInfos);
         }
     }
 
-    static SortedMap<String, OptionInfo> extractOptions(List<Class<? extends OptionDescriptors>> optionsClasses, Map<String, GroupInfo> groupInfos) {
+    static SortedMap<String, OptionInfo> extractOptions(ServiceLoader<OptionDescriptors> optionDescriptors, Map<String, GroupInfo> groupInfos) {
         EconomicMap<String, OptionDescriptor> hostedOptions = EconomicMap.create();
         EconomicMap<String, OptionDescriptor> runtimeOptions = EconomicMap.create();
-        HostedOptionParser.collectOptions(optionsClasses, hostedOptions, runtimeOptions);
+        HostedOptionParser.collectOptions(optionDescriptors, hostedOptions, runtimeOptions);
         SortedMap<String, OptionInfo> apiOptions = new TreeMap<>();
         Map<Class<? extends APIOptionGroup>, APIOptionGroup> groupInstances = new HashMap<>();
         hostedOptions.getValues().forEach(o -> extractOption(NativeImage.oH, o, apiOptions, groupInfos, groupInstances));
@@ -450,9 +445,9 @@ final class APIOptionFeature implements Feature {
     @Override
     public void duringSetup(DuringSetupAccess access) {
         FeatureImpl.DuringSetupAccessImpl accessImpl = (FeatureImpl.DuringSetupAccessImpl) access;
-        List<Class<? extends OptionDescriptors>> optionClasses = accessImpl.getImageClassLoader().findSubclasses(OptionDescriptors.class, true);
         Map<String, GroupInfo> groupInfos = new HashMap<>();
-        SortedMap<String, APIOptionHandler.OptionInfo> options = APIOptionHandler.extractOptions(optionClasses, groupInfos);
+        ServiceLoader<OptionDescriptors> optionDescriptors = ServiceLoader.load(OptionDescriptors.class, accessImpl.getImageClassLoader().getClassLoader());
+        SortedMap<String, APIOptionHandler.OptionInfo> options = APIOptionHandler.extractOptions(optionDescriptors, groupInfos);
         ImageSingletons.add(APIOptionSupport.class, new APIOptionSupport(groupInfos, options));
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
index 4be2040efd4d..ed31cde2e425 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
@@ -77,8 +77,6 @@ public NativeImageClassLoaderSupportJDK11OrLater(ClassLoader defaultSystemClassL
         adjustBootLayerQualifiedExports(moduleLayer);
         moduleLayerForImageBuild = moduleLayer;
         classLoader = getSingleClassloader(moduleLayer);
-
-        adjustLibrarySupportReadAllUnnamed();
     }
 
     private static ModuleLayer createModuleLayer(Path[] modulePaths, ClassLoader parent) {
@@ -171,7 +169,7 @@ protected Optional<Module> findModule(String moduleName) {
     }
 
     @Override
-    protected void processAddExportsAndAddOpens(OptionValues parsedHostedOptions) {
+    protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
         LocatableMultiOptionValue.Strings addExports = NativeImageClassLoaderOptions.AddExports.getValue(parsedHostedOptions);
         addExports.getValuesWithOrigins().map(this::asAddExportsAndOpensFormatValue).forEach(val -> {
             if (val.targetModules.isEmpty()) {
@@ -192,6 +190,9 @@ protected void processAddExportsAndAddOpens(OptionValues parsedHostedOptions) {
                 }
             }
         });
+
+        /* TODO: Implement real --add-reads instead */
+        adjustLibrarySupportReadAllUnnamed();
     }
 
     private static final class AddExportsAndOpensFormatValue {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
index 38e429d4abac..0a5a8a6aa2e0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
@@ -62,6 +62,7 @@
 import com.oracle.svm.core.util.InterruptImageBuilding;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.option.HostedOptionParser;
 
 public abstract class AbstractNativeImageClassLoaderSupport {
 
@@ -109,7 +110,30 @@ public ClassLoader getClassLoader() {
 
     protected abstract Optional<? extends Object> findModule(String moduleName);
 
-    protected abstract void processAddExportsAndAddOpens(OptionValues parsedHostedOptions);
+    private HostedOptionParser hostedOptionParser;
+    private OptionValues parsedHostedOptions;
+    private List<String> remainingArguments;
+
+    public void setupHostedOptionParser(List<String> arguments) {
+        hostedOptionParser = new HostedOptionParser(getClassLoader());
+        remainingArguments = Collections.unmodifiableList(Arrays.asList(hostedOptionParser.parse(arguments.toArray(new String[0]))));
+        parsedHostedOptions = new OptionValues(hostedOptionParser.getHostedValues());
+        processClassLoaderOptions(parsedHostedOptions);
+    }
+
+    public HostedOptionParser getHostedOptionParser() {
+        return hostedOptionParser;
+    };
+
+    public List<String> getRemainingArguments() {
+        return remainingArguments;
+    }
+
+    public OptionValues getParsedHostedOptions() {
+        return parsedHostedOptions;
+    }
+
+    protected abstract void processClassLoaderOptions(OptionValues parsedHostedOptions);
 
     protected abstract void initAllClasses(ForkJoinPool executor, ImageClassLoader imageClassLoader);
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
index be8f57d91714..7ab7aa98bd6c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
@@ -44,7 +44,6 @@
 import java.util.stream.StreamSupport;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -427,8 +426,4 @@ public Optional<String> getMainClassFromModule(Object module) {
     public Optional<? extends Object> findModule(String moduleName) {
         return classLoaderSupport.findModule(moduleName);
     }
-
-    public void processAddExportsAndAddOpens(OptionValues parsedHostedOptions) {
-        classLoaderSupport.processAddExportsAndAddOpens(parsedHostedOptions);
-    }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
index 8ac65f886623..ab62ac5c4a67 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
@@ -54,7 +54,7 @@ protected Optional<Object> findModule(String moduleName) {
     }
 
     @Override
-    protected void processAddExportsAndAddOpens(OptionValues parsedHostedOptions) {
+    protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
         /* Nothing to do for Java 8 */
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 6c50c57e7ae6..56efbffcb0f3 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -118,8 +118,12 @@ public void run() {
         int exitStatus;
         ClassLoader applicationClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            ImageClassLoader imageClassLoader = installNativeImageClassLoader(classPath, modulePath);
-            exitStatus = new NativeImageGeneratorRunner().build(arguments.toArray(new String[0]), imageClassLoader);
+            ImageClassLoader imageClassLoader = installNativeImageClassLoader(classPath, modulePath, arguments);
+            List<String> remainingArguments = imageClassLoader.classLoaderSupport.getRemainingArguments();
+            if (!remainingArguments.isEmpty()) {
+                throw UserError.abort("Unknown options: %s", String.join(" ", remainingArguments));
+            }
+            exitStatus = new NativeImageGeneratorRunner().build(imageClassLoader);
         } finally {
             uninstallNativeImageClassLoader();
             Thread.currentThread().setContextClassLoader(applicationClassLoader);
@@ -149,12 +153,14 @@ public static void uninstallNativeImageClassLoader() {
      *
      * @param classpath for the application and image should be built for.
      * @param modulepath for the application and image should be built for (only for Java >= 11).
+     * @param arguments
      * @return NativeImageClassLoaderSupport that exposes the {@code ClassLoader} for image building
      *         via {@link NativeImageClassLoaderSupport#getClassLoader()}.
      */
-    public static ImageClassLoader installNativeImageClassLoader(String[] classpath, String[] modulepath) {
+    public static ImageClassLoader installNativeImageClassLoader(String[] classpath, String[] modulepath, List<String> arguments) {
         NativeImageSystemClassLoader nativeImageSystemClassLoader = NativeImageSystemClassLoader.singleton();
         AbstractNativeImageClassLoaderSupport nativeImageClassLoaderSupport = createNativeImageClassLoaderSupport(nativeImageSystemClassLoader.defaultSystemClassLoader, classpath, modulepath);
+        nativeImageClassLoaderSupport.setupHostedOptionParser(arguments);
         ClassLoader nativeImageClassLoader = nativeImageClassLoaderSupport.getClassLoader();
         Thread.currentThread().setContextClassLoader(nativeImageClassLoader);
         /*
@@ -259,32 +265,24 @@ private static boolean isValidOperatingSystem() {
     }
 
     @SuppressWarnings("try")
-    private int buildImage(String[] arguments, ImageClassLoader classLoader) {
+    private int buildImage(ImageClassLoader classLoader) {
         if (!verifyValidJavaVersionAndPlatform()) {
             return 1;
         }
         String imageName = null;
         Timer totalTimer = new Timer("[total]", false);
+
+        HostedOptionParser optionParser = classLoader.classLoaderSupport.getHostedOptionParser();
+        OptionValues parsedHostedOptions = classLoader.classLoaderSupport.getParsedHostedOptions();
+
         ForkJoinPool analysisExecutor = null;
         ForkJoinPool compilationExecutor = null;
-        OptionValues parsedHostedOptions = null;
         try (StopTimer ignored = totalTimer.start()) {
             Timer classlistTimer = new Timer("classlist", false);
             try (StopTimer ignored1 = classlistTimer.start()) {
                 classLoader.initAllClasses();
             }
 
-            HostedOptionParser optionParser = new HostedOptionParser(classLoader);
-            String[] remainingArgs = optionParser.parse(arguments);
-            if (remainingArgs.length > 0) {
-                throw UserError.abort("Unknown options: %s", Arrays.toString(remainingArgs));
-            }
-
-            /*
-             * We do not have the VMConfiguration and the HostedOptionValues set up yet, so we need
-             * to pass the OptionValues explicitly when accessing options.
-             */
-            parsedHostedOptions = new OptionValues(optionParser.getHostedValues());
             DebugContext debug = new DebugContext.Builder(parsedHostedOptions, new GraalDebugHandlersFactory(GraalAccess.getOriginalSnippetReflection())).build();
 
             imageName = SubstrateOptions.Name.getValue(parsedHostedOptions);
@@ -323,8 +321,6 @@ private int buildImage(String[] arguments, ImageClassLoader classLoader) {
                                 SubstrateOptionsParser.commandArgument(SubstrateOptions.Class, "<fully-qualified-class-name>"));
             }
 
-            classLoader.processAddExportsAndAddOpens(parsedHostedOptions);
-
             if (!className.isEmpty() || !moduleName.isEmpty()) {
                 Method mainEntryPoint;
                 Class<?> mainClass;
@@ -565,8 +561,8 @@ private static void warn(String msg) {
         System.err.println("Warning: " + msg);
     }
 
-    public int build(String[] args, ImageClassLoader imageClassLoader) {
-        return buildImage(args, imageClassLoader);
+    public int build(ImageClassLoader imageClassLoader) {
+        return buildImage(imageClassLoader);
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
index d3cc32ea3c04..6654e36002b6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
@@ -27,17 +27,16 @@
 import static com.oracle.svm.core.option.SubstrateOptionsParser.BooleanOptionFormat.PLUS_MINUS;
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.compiler.options.OptionDescriptor;
 import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionDescriptorsMap;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.nativeimage.Platforms;
@@ -47,7 +46,6 @@
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.InterruptImageBuilding;
 import com.oracle.svm.core.util.UserError;
-import com.oracle.svm.hosted.ImageClassLoader;
 
 public class HostedOptionParser implements HostedOptionProvider {
 
@@ -56,24 +54,14 @@ public class HostedOptionParser implements HostedOptionProvider {
     private EconomicMap<String, OptionDescriptor> allHostedOptions = EconomicMap.create();
     private EconomicMap<String, OptionDescriptor> allRuntimeOptions = EconomicMap.create();
 
-    public HostedOptionParser(ImageClassLoader imageClassLoader) {
-        collectOptions(imageClassLoader.findSubclasses(OptionDescriptors.class, true), allHostedOptions, allRuntimeOptions);
+    public HostedOptionParser(ClassLoader imageClassLoader) {
+        collectOptions(ServiceLoader.load(OptionDescriptors.class, imageClassLoader), allHostedOptions, allRuntimeOptions);
     }
 
-    public static void collectOptions(List<Class<? extends OptionDescriptors>> optionsClasses, EconomicMap<String, OptionDescriptor> allHostedOptions,
+    public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescriptors, EconomicMap<String, OptionDescriptor> allHostedOptions,
                     EconomicMap<String, OptionDescriptor> allRuntimeOptions) {
-        for (Class<? extends OptionDescriptors> optionsClass : optionsClasses) {
-            if (Modifier.isAbstract(optionsClass.getModifiers()) || OptionDescriptorsMap.class.isAssignableFrom(optionsClass)) {
-                continue;
-            }
-
-            OptionDescriptors descriptors;
-            try {
-                descriptors = optionsClass.getDeclaredConstructor().newInstance();
-            } catch (Exception ex) {
-                throw shouldNotReachHere(ex);
-            }
-            for (OptionDescriptor descriptor : descriptors) {
+        for (OptionDescriptors optionDescriptor : optionDescriptors) {
+            for (OptionDescriptor descriptor : optionDescriptor) {
                 String name = descriptor.getName();
 
                 if (descriptor.getDeclaringClass().getAnnotation(Platforms.class) != null) {

From ba6c9b2fe611d1842062b1128531f67f6aa9c98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 10 Sep 2021 22:28:30 +0200
Subject: [PATCH 137/681] Implement --add-reads and use it to make
 library-support read ALL_UNNAMED

---
 substratevm/mx.substratevm/suite.py           |  5 +-
 .../jdk11/NativeImageClassLoaderOptions.java  |  6 ++
 ...veImageClassLoaderSupportJDK11OrLater.java | 66 ++++++++++---------
 .../native-image.properties                   |  1 +
 4 files changed, 45 insertions(+), 33 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 32c101a167b8..a158ba35e9b9 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -645,7 +645,10 @@
 
         "com.oracle.svm.junit": {
             "subDir": "src",
-            "sourceDirs": ["src"],
+            "sourceDirs": [
+                "src",
+                "resources",
+            ],
             "dependencies": [
                 "com.oracle.svm.reflect",
                 "mx:JUNIT_TOOL",
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java
index 36847454afe9..8f1dec73a5cb 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java
@@ -32,6 +32,7 @@
 
 public class NativeImageClassLoaderOptions {
     static final String AddExportsAndOpensFormat = "<module>/<package>=<target-module>(,<target-module>)*";
+    static final String AddReadsFormat = "<module>=<target-module>(,<target-module>)*";
 
     @APIOption(name = "add-exports", extra = true)//
     @Option(help = "Value " + AddExportsAndOpensFormat + " updates <module> to export <package> to <target-module>, regardless of module declaration." +
@@ -41,4 +42,9 @@ public class NativeImageClassLoaderOptions {
     @APIOption(name = "add-opens", extra = true)//
     @Option(help = "Value " + AddExportsAndOpensFormat + " updates <module> to open <package> to <target-module>, regardless of module declaration.")//
     public static final HostedOptionKey<LocatableMultiOptionValue.Strings> AddOpens = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
+
+    @APIOption(name = "add-reads", extra = true)//
+    @Option(help = "Value " + AddReadsFormat + " updates <module> to read <target-module>, regardless of module declaration." +
+                    " <target-module> can be ALL-UNNAMED to read all unnamed modules.")//
+    public static final HostedOptionKey<LocatableMultiOptionValue.Strings> AddReads = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
 }
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
index ed31cde2e425..e757507c4f9b 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
@@ -127,29 +127,14 @@ private ClassLoader getSingleClassloader(ModuleLayer moduleLayer) {
         return singleClassloader;
     }
 
-    private void adjustLibrarySupportReadAllUnnamed() {
-        /*
-         * org.graalvm.nativeimage.librarysupport depends on junit. Unfortunately using junit as
-         * automatic module is not possible because we have to support non-modularized tests as
-         * well. Thus, we have to explicitly allow org.graalvm.nativeimage.librarysupport to read
-         * ALL-UNNAMED so that junit from classpath is accessible to it.
-         *
-         * This workaround can be replaced with --add-reads use once GR-33504 is implemented.
-         */
-        Optional<Module> librarySupportModule = findModule("org.graalvm.nativeimage.librarysupport");
-        if (!librarySupportModule.isEmpty()) {
-            try {
-                Module moduleLibrarySupport = librarySupportModule.get();
-                Method implAddReadsAllUnnamed = Module.class.getDeclaredMethod("implAddReadsAllUnnamed");
-                ModuleSupport.openModuleByClass(Module.class, NativeImageClassLoaderSupportJDK11OrLater.class);
-                implAddReadsAllUnnamed.setAccessible(true);
-                implAddReadsAllUnnamed.invoke(moduleLibrarySupport);
-            } catch (ReflectiveOperationException | NoSuchElementException e) {
-                VMError.shouldNotReachHere("Could not adjust org.graalvm.nativeimage.librarysupport to read all unnamed modules", e);
-            }
-        } else {
-            VMError.guarantee(!ModuleSupport.modulePathBuild,
-                            "Image-builder on module-path requires module org.graalvm.nativeimage.librarysupport");
+    private void implAddReadsAllUnnamed(Module module) {
+        try {
+            Method implAddReadsAllUnnamed = Module.class.getDeclaredMethod("implAddReadsAllUnnamed");
+            ModuleSupport.openModuleByClass(Module.class, NativeImageClassLoaderSupportJDK11OrLater.class);
+            implAddReadsAllUnnamed.setAccessible(true);
+            implAddReadsAllUnnamed.invoke(module);
+        } catch (ReflectiveOperationException | NoSuchElementException e) {
+            VMError.shouldNotReachHere("Could reflectively call Module.implAddReadsAllUnnamed", e);
         }
     }
 
@@ -191,27 +176,44 @@ protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
             }
         });
 
-        /* TODO: Implement real --add-reads instead */
-        adjustLibrarySupportReadAllUnnamed();
+        LocatableMultiOptionValue.Strings addReads = NativeImageClassLoaderOptions.AddReads.getValue(parsedHostedOptions);
+        addReads.getValuesWithOrigins().map(this::asAddReadsFormatValue).forEach(val -> {
+            if (val.targetModules.isEmpty()) {
+                implAddReadsAllUnnamed(val.module);
+            } else {
+                for (Module targetModule : val.targetModules) {
+                    Modules.addReads(val.module, targetModule);
+                }
+            }
+        });
     }
 
-    private static final class AddExportsAndOpensFormatValue {
+    private static final class AddExportsAndOpensAndReadsFormatValue {
         private final Module module;
         private final String packageName;
         private final List<Module> targetModules;
 
-        private AddExportsAndOpensFormatValue(Module module, String packageName, List<Module> targetModules) {
+        private AddExportsAndOpensAndReadsFormatValue(Module module, String packageName, List<Module> targetModules) {
             this.module = module;
             this.packageName = packageName;
             this.targetModules = targetModules;
         }
     }
 
-    private AddExportsAndOpensFormatValue asAddExportsAndOpensFormatValue(Pair<String, String> valueOrigin) {
+    private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensFormatValue(Pair<String, String> valueOrigin) {
+        return asAddExportsAndOpensAndReadsFormatValue(valueOrigin, false);
+    }
+
+    private AddExportsAndOpensAndReadsFormatValue asAddReadsFormatValue(Pair<String, String> valueOrigin) {
+        return asAddExportsAndOpensAndReadsFormatValue(valueOrigin, true);
+    }
+
+    private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensAndReadsFormatValue(Pair<String, String> valueOrigin, boolean reads) {
         String optionOrigin = valueOrigin.getRight();
         String optionValue = valueOrigin.getLeft();
 
-        String syntaxErrorMessage = " Allowed value format: " + NativeImageClassLoaderOptions.AddExportsAndOpensFormat;
+        String format = reads ? NativeImageClassLoaderOptions.AddReadsFormat : NativeImageClassLoaderOptions.AddExportsAndOpensFormat;
+        String syntaxErrorMessage = " Allowed value format: " + format;
 
         String[] modulePackageAndTargetModules = optionValue.split("=", 2);
         if (modulePackageAndTargetModules.length != 2) {
@@ -221,11 +223,11 @@ private AddExportsAndOpensFormatValue asAddExportsAndOpensFormatValue(Pair<Strin
         String targetModuleNames = modulePackageAndTargetModules[1];
 
         String[] moduleAndPackage = modulePackage.split("/");
-        if (moduleAndPackage.length != 2) {
+        if (moduleAndPackage.length > 1 + (reads ? 0 : 1)) {
             throw userErrorAddExportsAndOpens(optionOrigin, optionValue, syntaxErrorMessage);
         }
         String moduleName = moduleAndPackage[0];
-        String packageName = moduleAndPackage[1];
+        String packageName = moduleAndPackage.length > 1 ? moduleAndPackage[1] : null;
 
         List<String> targetModuleNamesList = Arrays.asList(targetModuleNames.split(","));
         if (targetModuleNamesList.isEmpty()) {
@@ -245,7 +247,7 @@ private AddExportsAndOpensFormatValue asAddExportsAndOpensFormatValue(Pair<Strin
                 });
             }).collect(Collectors.toList());
         }
-        return new AddExportsAndOpensFormatValue(module, packageName, targetModules);
+        return new AddExportsAndOpensAndReadsFormatValue(module, packageName, targetModules);
     }
 
     private static UserError.UserException userErrorAddExportsAndOpens(String origin, String value, String detailMessage) {
diff --git a/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties b/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
new file mode 100644
index 000000000000..e0e5fcbb6694
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
@@ -0,0 +1 @@
+Args = --add-reads=org.graalvm.nativeimage.librarysupport=ALL-UNNAMED

From a35748adf981fdd7aae35741b971751ab0fbaedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Mon, 13 Sep 2021 14:17:40 +0200
Subject: [PATCH 138/681] Refactor NativeImageClassLoaderOptions processing

Having Options defined in a JDK11 only is not compatible with
Multi-release jar standard (JEP 238 states META-INF/services is not
versioned) thus NativeImageClassLoaderOptions need to moved to base.

In case the image builder runs on classpath we need to be tolerant
towards invalid use of --add-exports -add-opens and --add-reads.  This
should be removed once we switch to unconditionally running image
builder on module-path.
---
 ...veImageClassLoaderSupportJDK11OrLater.java | 61 +++++++++++--------
 ...AbstractNativeImageClassLoaderSupport.java |  6 +-
 .../NativeImageClassLoaderOptions.java        |  6 +-
 .../hosted/NativeImageClassLoaderSupport.java |  2 +-
 .../svm/hosted/option/HostedOptionParser.java |  4 +-
 5 files changed, 46 insertions(+), 33 deletions(-)
 rename substratevm/src/{com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11 => com.oracle.svm.hosted/src/com/oracle/svm/hosted}/NativeImageClassLoaderOptions.java (91%)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
index e757507c4f9b..8fd5e7c4f666 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
@@ -46,6 +46,7 @@
 import java.util.stream.Stream;
 
 import org.graalvm.collections.Pair;
+import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionValues;
 
 import com.oracle.svm.core.option.LocatableMultiOptionValue;
@@ -54,6 +55,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.AbstractNativeImageClassLoaderSupport;
 import com.oracle.svm.hosted.ImageClassLoader;
+import com.oracle.svm.hosted.NativeImageClassLoaderOptions;
 import com.oracle.svm.util.ModuleSupport;
 
 import jdk.internal.module.Modules;
@@ -154,9 +156,8 @@ protected Optional<Module> findModule(String moduleName) {
     }
 
     @Override
-    protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
-        LocatableMultiOptionValue.Strings addExports = NativeImageClassLoaderOptions.AddExports.getValue(parsedHostedOptions);
-        addExports.getValuesWithOrigins().map(this::asAddExportsAndOpensFormatValue).forEach(val -> {
+    protected void processClassLoaderOptions(OptionValues optionValues) {
+        processOption(optionValues, NativeImageClassLoaderOptions.AddExports).forEach(val -> {
             if (val.targetModules.isEmpty()) {
                 Modules.addExportsToAllUnnamed(val.module, val.packageName);
             } else {
@@ -165,8 +166,7 @@ protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
                 }
             }
         });
-        LocatableMultiOptionValue.Strings addOpens = NativeImageClassLoaderOptions.AddOpens.getValue(parsedHostedOptions);
-        addOpens.getValuesWithOrigins().map(this::asAddExportsAndOpensFormatValue).forEach(val -> {
+        processOption(optionValues, NativeImageClassLoaderOptions.AddOpens).forEach(val -> {
             if (val.targetModules.isEmpty()) {
                 Modules.addOpensToAllUnnamed(val.module, val.packageName);
             } else {
@@ -175,9 +175,7 @@ protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
                 }
             }
         });
-
-        LocatableMultiOptionValue.Strings addReads = NativeImageClassLoaderOptions.AddReads.getValue(parsedHostedOptions);
-        addReads.getValuesWithOrigins().map(this::asAddReadsFormatValue).forEach(val -> {
+        processOption(optionValues, NativeImageClassLoaderOptions.AddReads).forEach(val -> {
             if (val.targetModules.isEmpty()) {
                 implAddReadsAllUnnamed(val.module);
             } else {
@@ -188,6 +186,28 @@ protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
         });
     }
 
+    private Stream<AddExportsAndOpensAndReadsFormatValue> processOption(OptionValues parsedHostedOptions, OptionKey<LocatableMultiOptionValue.Strings> specificOption) {
+        Stream<Pair<String, String>> valuesWithOrigins = specificOption.getValue(parsedHostedOptions).getValuesWithOrigins();
+        Stream<AddExportsAndOpensAndReadsFormatValue> parsedOptions = valuesWithOrigins.flatMap(valWithOrig -> {
+            try {
+                return Stream.of(asAddExportsAndOpensAndReadsFormatValue(specificOption, valWithOrig));
+            } catch (UserError.UserException e) {
+                if (ModuleSupport.modulePathBuild) {
+                    throw e;
+                } else {
+                    /*
+                     * Until we switch to always running the image-builder on module-path we have to
+                     * be tolerant if invalid --add-exports -add-opens or --add-reads options are
+                     * used. GR-30433
+                     */
+                    System.out.println("Warning: " + e.getMessage());
+                    return Stream.empty();
+                }
+            }
+        });
+        return parsedOptions;
+    }
+
     private static final class AddExportsAndOpensAndReadsFormatValue {
         private final Module module;
         private final String packageName;
@@ -200,42 +220,35 @@ private AddExportsAndOpensAndReadsFormatValue(Module module, String packageName,
         }
     }
 
-    private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensFormatValue(Pair<String, String> valueOrigin) {
-        return asAddExportsAndOpensAndReadsFormatValue(valueOrigin, false);
-    }
-
-    private AddExportsAndOpensAndReadsFormatValue asAddReadsFormatValue(Pair<String, String> valueOrigin) {
-        return asAddExportsAndOpensAndReadsFormatValue(valueOrigin, true);
-    }
-
-    private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensAndReadsFormatValue(Pair<String, String> valueOrigin, boolean reads) {
+    private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensAndReadsFormatValue(OptionKey<?> option, Pair<String, String> valueOrigin) {
         String optionOrigin = valueOrigin.getRight();
         String optionValue = valueOrigin.getLeft();
 
+        boolean reads = option.equals(NativeImageClassLoaderOptions.AddReads);
         String format = reads ? NativeImageClassLoaderOptions.AddReadsFormat : NativeImageClassLoaderOptions.AddExportsAndOpensFormat;
         String syntaxErrorMessage = " Allowed value format: " + format;
 
         String[] modulePackageAndTargetModules = optionValue.split("=", 2);
         if (modulePackageAndTargetModules.length != 2) {
-            throw userErrorAddExportsAndOpens(optionOrigin, optionValue, syntaxErrorMessage);
+            throw userErrorAddExportsAndOpensAndReads(option, optionOrigin, optionValue, syntaxErrorMessage);
         }
         String modulePackage = modulePackageAndTargetModules[0];
         String targetModuleNames = modulePackageAndTargetModules[1];
 
         String[] moduleAndPackage = modulePackage.split("/");
         if (moduleAndPackage.length > 1 + (reads ? 0 : 1)) {
-            throw userErrorAddExportsAndOpens(optionOrigin, optionValue, syntaxErrorMessage);
+            throw userErrorAddExportsAndOpensAndReads(option, optionOrigin, optionValue, syntaxErrorMessage);
         }
         String moduleName = moduleAndPackage[0];
         String packageName = moduleAndPackage.length > 1 ? moduleAndPackage[1] : null;
 
         List<String> targetModuleNamesList = Arrays.asList(targetModuleNames.split(","));
         if (targetModuleNamesList.isEmpty()) {
-            throw userErrorAddExportsAndOpens(optionOrigin, optionValue, syntaxErrorMessage);
+            throw userErrorAddExportsAndOpensAndReads(option, optionOrigin, optionValue, syntaxErrorMessage);
         }
 
         Module module = findModule(moduleName).orElseThrow(() -> {
-            return userErrorAddExportsAndOpens(optionOrigin, optionValue, " Specified module '" + moduleName + "' is unknown.");
+            return userErrorAddExportsAndOpensAndReads(option, optionOrigin, optionValue, " Specified module '" + moduleName + "' is unknown.");
         });
         List<Module> targetModules;
         if (targetModuleNamesList.contains("ALL-UNNAMED")) {
@@ -243,16 +256,16 @@ private AddExportsAndOpensAndReadsFormatValue asAddExportsAndOpensAndReadsFormat
         } else {
             targetModules = targetModuleNamesList.stream().map(mn -> {
                 return findModule(mn).orElseThrow(() -> {
-                    throw userErrorAddExportsAndOpens(optionOrigin, optionValue, " Specified target-module '" + mn + "' is unknown.");
+                    throw userErrorAddExportsAndOpensAndReads(option, optionOrigin, optionValue, " Specified target-module '" + mn + "' is unknown.");
                 });
             }).collect(Collectors.toList());
         }
         return new AddExportsAndOpensAndReadsFormatValue(module, packageName, targetModules);
     }
 
-    private static UserError.UserException userErrorAddExportsAndOpens(String origin, String value, String detailMessage) {
+    private static UserError.UserException userErrorAddExportsAndOpensAndReads(OptionKey<?> option, String origin, String value, String detailMessage) {
         Objects.requireNonNull(detailMessage, "missing detailMessage");
-        return UserError.abort("Invalid option %s provided by %s." + detailMessage, SubstrateOptionsParser.commandArgument(NativeImageClassLoaderOptions.AddExports, value), origin);
+        return UserError.abort("Invalid option %s provided by %s." + detailMessage, SubstrateOptionsParser.commandArgument(option, value), origin);
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
index 0a5a8a6aa2e0..37c0e461fbf5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java
@@ -116,14 +116,14 @@ public ClassLoader getClassLoader() {
 
     public void setupHostedOptionParser(List<String> arguments) {
         hostedOptionParser = new HostedOptionParser(getClassLoader());
-        remainingArguments = Collections.unmodifiableList(Arrays.asList(hostedOptionParser.parse(arguments.toArray(new String[0]))));
+        remainingArguments = Collections.unmodifiableList((hostedOptionParser.parse(arguments)));
         parsedHostedOptions = new OptionValues(hostedOptionParser.getHostedValues());
         processClassLoaderOptions(parsedHostedOptions);
     }
 
     public HostedOptionParser getHostedOptionParser() {
         return hostedOptionParser;
-    };
+    }
 
     public List<String> getRemainingArguments() {
         return remainingArguments;
@@ -133,7 +133,7 @@ public OptionValues getParsedHostedOptions() {
         return parsedHostedOptions;
     }
 
-    protected abstract void processClassLoaderOptions(OptionValues parsedHostedOptions);
+    protected abstract void processClassLoaderOptions(OptionValues optionValues);
 
     protected abstract void initAllClasses(ForkJoinPool executor, ImageClassLoader imageClassLoader);
 
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java
similarity index 91%
rename from substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java
rename to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java
index 8f1dec73a5cb..58fa54f1cde3 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderOptions.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.jdk11;
+package com.oracle.svm.hosted;
 
 import org.graalvm.compiler.options.Option;
 
@@ -31,8 +31,8 @@
 import com.oracle.svm.core.option.LocatableMultiOptionValue;
 
 public class NativeImageClassLoaderOptions {
-    static final String AddExportsAndOpensFormat = "<module>/<package>=<target-module>(,<target-module>)*";
-    static final String AddReadsFormat = "<module>=<target-module>(,<target-module>)*";
+    public static final String AddExportsAndOpensFormat = "<module>/<package>=<target-module>(,<target-module>)*";
+    public static final String AddReadsFormat = "<module>=<target-module>(,<target-module>)*";
 
     @APIOption(name = "add-exports", extra = true)//
     @Option(help = "Value " + AddExportsAndOpensFormat + " updates <module> to export <package> to <target-module>, regardless of module declaration." +
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
index ab62ac5c4a67..a21f19a7e8b2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
@@ -54,7 +54,7 @@ protected Optional<Object> findModule(String moduleName) {
     }
 
     @Override
-    protected void processClassLoaderOptions(OptionValues parsedHostedOptions) {
+    protected void processClassLoaderOptions(OptionValues optionValues) {
         /* Nothing to do for Java 8 */
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
index 6654e36002b6..657da655ed43 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
@@ -85,7 +85,7 @@ public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescrip
         }
     }
 
-    public String[] parse(String[] args) {
+    public List<String> parse(List<String> args) {
 
         List<String> remainingArgs = new ArrayList<>();
         Set<String> errors = new HashSet<>();
@@ -124,7 +124,7 @@ public String[] parse(String[] args) {
             }
         }
 
-        return remainingArgs.toArray(new String[remainingArgs.size()]);
+        return remainingArgs;
     }
 
     @Override

From 64cc9ba7362f0a0ab90ec7cec6c2dd10998021b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Mon, 13 Sep 2021 18:00:58 +0200
Subject: [PATCH 139/681] Run mx native-unittest always with imagebuilder on
 module-path

1. Moved com.oracle.svm.junit into its own module so that
org.graalvm.nativeimage.librarysupport does not contain code that is
only needed when building junit-images. 2. Adjusted --add-reads to make
org.graalvm.nativeimage.junitsupport read ALL-UNNAMED. 3. Adjusted junit
macro option to have org.graalvm.nativeimage.junitsupport on the
module-path. This also takes care of making the imagebuilder run on
module-path (ImageModulePath counts as module-related option for the
driver). 4. Remove now obsolete hacks to have com.oracle.mxtool.junit,
junit, hamcrest as optional module dependencies all over the place.
---
 compiler/mx.compiler/suite.py                 |  2 +-
 .../mx.substratevm/macro-junit.properties     |  1 +
 substratevm/mx.substratevm/mx_substratevm.py  |  2 +-
 substratevm/mx.substratevm/suite.py           | 53 ++++++++-----------
 .../native-image.properties                   |  2 +-
 5 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index c4d7d5abd557..44c8551c3b11 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -2173,7 +2173,7 @@
           "org.graalvm.compiler.debug                  to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.hotspot                to jdk.internal.vm.compiler.management",
           "org.graalvm.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver",
-          "org.graalvm.compiler.options                to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport",
+          "org.graalvm.compiler.options                to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport",
           "org.graalvm.compiler.phases.common          to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure",
           "org.graalvm.compiler.phases.common.jmx      to jdk.internal.vm.compiler.management",
           "org.graalvm.compiler.serviceprovider        to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
diff --git a/substratevm/mx.substratevm/macro-junit.properties b/substratevm/mx.substratevm/macro-junit.properties
index 8c093a44d0f1..6f802d0e00a0 100644
--- a/substratevm/mx.substratevm/macro-junit.properties
+++ b/substratevm/mx.substratevm/macro-junit.properties
@@ -2,6 +2,7 @@
 
 ImageName = svmjunit
 
+ImageModulePath = ${.}/junit-support.jar
 ImageClasspath = ${.}/junit-tool.jar:${.}/junit.jar:${.}/hamcrest.jar
 
 Args = -H:Features=com.oracle.svm.junit.JUnitFeature \
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 2e5dc90cb77f..a0b45889c280 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -928,7 +928,7 @@ def _native_image_launcher_extra_jvm_args():
     license_files=[],
     third_party_license_files=[],
     dependencies=['SubstrateVM'],
-    jar_distributions=['mx:JUNIT_TOOL', 'mx:JUNIT', 'mx:HAMCREST'],
+    jar_distributions=['substratevm:JUNIT_SUPPORT', 'mx:JUNIT_TOOL', 'mx:JUNIT', 'mx:HAMCREST'],
     support_distributions=['substratevm:NATIVE_IMAGE_JUNIT_SUPPORT'],
     jlink=False,
 ))
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index a158ba35e9b9..53e0398678b8 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1103,7 +1103,7 @@
                     "com.oracle.svm.hosted                        to java.base",
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
-                    "* to jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
+                    "* to jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
                 ],
                 "opens" : [
                     "com.oracle.svm.core.nodes                    to jdk.internal.vm.compiler",
@@ -1192,11 +1192,6 @@
                     "com.oracle.svm.jvmtiagentbase",
                     "com.oracle.svm.jvmtiagentbase.jvmti",
                 ],
-                "requires" : [
-                    "static com.oracle.mxtool.junit",
-                    "static junit",
-                    "static hamcrest",
-                ],
             },
         },
 
@@ -1204,27 +1199,43 @@
             "subDir": "src",
             "description" : "SubstrateVM basic library-support components",
             "dependencies": [
-                "com.oracle.svm.junit",
                 "com.oracle.svm.polyglot",
                 "com.oracle.svm.thirdparty",
             ],
             "distDependencies": [
                 "sdk:GRAAL_SDK",
                 "SVM",
-                "OBJECTFILE",
+            ],
+            "moduleInfo" : {
+                "name" : "org.graalvm.nativeimage.librarysupport",
+                "exports" : [
+                    "* to org.graalvm.nativeimage.builder",
+                ],
+            },
+        },
+
+        "JUNIT_SUPPORT": {
+            "subDir": "src",
+            "description" : "SubstrateVM suppoprt for building JUnit test into image",
+            "dependencies": [
+                "com.oracle.svm.junit",
+            ],
+            "distDependencies": [
+                "sdk:GRAAL_SDK",
+                "SVM",
                 "compiler:GRAAL",
                 "mx:JUNIT_TOOL",
             ],
             "moduleInfo" : {
-                "name" : "org.graalvm.nativeimage.librarysupport",
+                "name" : "org.graalvm.nativeimage.junitsupport",
+                "exports" : [
+                    "* to org.graalvm.nativeimage.builder",
+                ],
                 "requires" : [
                     "static com.oracle.mxtool.junit",
                     "static junit",
                     "static hamcrest",
                 ],
-                "exports" : [
-                    "* to org.graalvm.nativeimage.builder",
-                ],
             },
         },
 
@@ -1322,9 +1333,6 @@
                 "org.graalvm.nativeimage.builder",
                 "java.management",
                 "jdk.management",
-                "static com.oracle.mxtool.junit",
-                "static junit",
-                "static hamcrest",
               ],
             },
         },
@@ -1347,11 +1355,6 @@
                 "exports" : [
                     "com.oracle.svm.agent",
                 ],
-                "requires" : [
-                    "static com.oracle.mxtool.junit",
-                    "static junit",
-                    "static hamcrest",
-                ],
                 "requiresConcealed" : {
                     "jdk.internal.vm.ci" : [
                         "jdk.vm.ci.meta",
@@ -1376,11 +1379,6 @@
                 "exports" : [
                     "com.oracle.svm.diagnosticsagent",
                 ],
-                "requires" : [
-                    "static com.oracle.mxtool.junit",
-                    "static junit",
-                    "static hamcrest",
-                ],
             },
         },
 
@@ -1401,11 +1399,6 @@
                     "* to org.graalvm.nativeimage.agent.tracing",
                     "com.oracle.svm.configure",
                 ],
-                "requires" : [
-                    "static com.oracle.mxtool.junit",
-                    "static junit",
-                    "static hamcrest",
-                ],
             },
         },
 
diff --git a/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties b/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
index e0e5fcbb6694..14446be07331 100644
--- a/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
+++ b/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
@@ -1 +1 @@
-Args = --add-reads=org.graalvm.nativeimage.librarysupport=ALL-UNNAMED
+Args = --add-reads=org.graalvm.nativeimage.junitsupport=ALL-UNNAMED

From 8b5111adf50afe51fc7a8dd0f10f9ddf008ffee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Wed, 15 Sep 2021 17:43:32 +0200
Subject: [PATCH 140/681] Use builder on mp only when running Task('native
 unittests')

---
 .../mx.substratevm/macro-junitcp.properties   | 10 ++++++++
 substratevm/mx.substratevm/mx_substratevm.py  | 25 +++++++++++++++----
 substratevm/mx.substratevm/suite.py           |  8 ++++++
 .../native-image.properties                   |  0
 4 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 substratevm/mx.substratevm/macro-junitcp.properties
 rename substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/{org.graalvm.nativeimage.librarysupport => org.graalvm.nativeimage.junitsupport}/com.oracle.svm.junit/native-image.properties (100%)

diff --git a/substratevm/mx.substratevm/macro-junitcp.properties b/substratevm/mx.substratevm/macro-junitcp.properties
new file mode 100644
index 000000000000..3fb002782ec9
--- /dev/null
+++ b/substratevm/mx.substratevm/macro-junitcp.properties
@@ -0,0 +1,10 @@
+# This file contains support for building a set of junit tests into a native-image
+
+ImageName = svmjunit
+
+ImageClasspath = ${.}/junit-support.jar:${.}/junit-tool.jar:${.}/junit.jar:${.}/hamcrest.jar
+
+Args = -H:Features=com.oracle.svm.junit.JUnitFeature \
+       -H:Class=com.oracle.svm.junit.SVMJUnitRunner \
+       -H:TestFile=${*} \
+       --initialize-at-build-time=org.junit,com.oracle.mxtool.junit.MxJUnitRequest
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index a0b45889c280..b9ddd68be848 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -434,7 +434,7 @@ def native_unittests_task():
         '-H:AdditionalSecurityServiceTypes=com.oracle.svm.test.SecurityServiceTest$JCACompliantNoOpService'
     ]
 
-    native_unittest(['--build-args', _native_unittest_features] + additional_build_args)
+    native_unittest(['--builder-on-modulepath', '--build-args', _native_unittest_features] + additional_build_args)
 
 
 def javac_image_command(javac_path):
@@ -442,7 +442,7 @@ def javac_image_command(javac_path):
             join(mx_compiler.jdk.home, "jre", "lib", "rt.jar")]
 
 
-def _native_junit(native_image, unittest_args, build_args=None, run_args=None, blacklist=None, whitelist=None, preserve_image=False):
+def _native_junit(native_image, unittest_args, build_args=None, run_args=None, blacklist=None, whitelist=None, preserve_image=False, builder_on_modulepath=False):
     build_args = build_args or []
     javaProperties = {}
     for dist in suite.dists:
@@ -469,7 +469,8 @@ def dummy_harness(test_deps, vm_launcher, vm_args):
         with open(unittest_file, 'r') as f:
             mx.log('Building junit image for matching: ' + ' '.join(l.rstrip() for l in f))
         extra_image_args = mx.get_runtime_jvm_args(unittest_deps, jdk=mx_compiler.jdk, exclude_names=['substratevm:LIBRARY_SUPPORT'])
-        unittest_image = native_image(['-ea', '-esa'] + build_args + extra_image_args + ['--macro:junit=' + unittest_file, '-H:Path=' + junit_test_dir])
+        macro_junit = '--macro:junit' + ('' if builder_on_modulepath else 'cp')
+        unittest_image = native_image(['-ea', '-esa'] + build_args + extra_image_args + [macro_junit + '=' + unittest_file, '-H:Path=' + junit_test_dir])
         mx.log('Running: ' + ' '.join(map(pipes.quote, [unittest_image] + run_args)))
         mx.run([unittest_image] + run_args)
     finally:
@@ -492,13 +493,14 @@ def unmask(args):
 
 def _native_unittest(native_image, cmdline_args):
     parser = ArgumentParser(prog='mx native-unittest', description='Run unittests as native image.')
-    all_args = ['--build-args', '--run-args', '--blacklist', '--whitelist', '-p', '--preserve-image']
+    all_args = ['--build-args', '--run-args', '--blacklist', '--whitelist', '-p', '--preserve-image', '--builder-on-modulepath']
     cmdline_args = [_mask(arg, all_args) for arg in cmdline_args]
     parser.add_argument(all_args[0], metavar='ARG', nargs='*', default=[])
     parser.add_argument(all_args[1], metavar='ARG', nargs='*', default=[])
     parser.add_argument('--blacklist', help='run all testcases not specified in <file>', metavar='<file>')
     parser.add_argument('--whitelist', help='run testcases specified in <file> only', metavar='<file>')
     parser.add_argument('-p', '--preserve-image', help='do not delete the generated native image', action='store_true')
+    parser.add_argument('--builder-on-modulepath', help='perform image build with builder on module-path', action='store_true')
     parser.add_argument('unittest_args', metavar='TEST_ARG', nargs='*')
     pargs = parser.parse_args(cmdline_args)
 
@@ -519,7 +521,7 @@ def _native_unittest(native_image, cmdline_args):
             mx.log('warning: could not read blacklist: ' + blacklist)
 
     unittest_args = unmask(pargs.unittest_args) if unmask(pargs.unittest_args) else ['com.oracle.svm.test', 'com.oracle.svm.configure.test']
-    _native_junit(native_image, unittest_args, unmask(pargs.build_args), unmask(pargs.run_args), blacklist, whitelist, pargs.preserve_image)
+    _native_junit(native_image, unittest_args, unmask(pargs.build_args), unmask(pargs.run_args), blacklist, whitelist, pargs.preserve_image, pargs.builder_on_modulepath)
 
 
 def js_image_test(binary, bench_location, name, warmup_iterations, iterations, timeout=None, bin_args=None):
@@ -933,6 +935,19 @@ def _native_image_launcher_extra_jvm_args():
     jlink=False,
 ))
 
+mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVMSvmMacro(
+    suite=suite,
+    name='Native Image JUnit with image-builder on classpath',
+    short_name='njucp',
+    dir_name='junitcp',
+    license_files=[],
+    third_party_license_files=[],
+    dependencies=['SubstrateVM'],
+    jar_distributions=['substratevm:JUNIT_SUPPORT', 'mx:JUNIT_TOOL', 'mx:JUNIT', 'mx:HAMCREST'],
+    support_distributions=['substratevm:NATIVE_IMAGE_JUNITCP_SUPPORT'],
+    jlink=False,
+))
+
 jar_distributions = [
     'substratevm:GRAAL_HOTSPOT_LIBRARY',
     'compiler:GRAAL_TRUFFLE_COMPILER_LIBGRAAL',
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 53e0398678b8..a0ef98a360cf 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1569,6 +1569,14 @@
             },
         },
 
+        "NATIVE_IMAGE_JUNITCP_SUPPORT" : {
+            "native" : True,
+            "description" : "Native-image based junit testing support but with running image-builder on classpath",
+            "layout" : {
+                "native-image.properties" : "file:mx.substratevm/macro-junitcp.properties",
+            },
+        },
+
         "SVM_LLVM" : {
             "subDir" : "src",
             "description" : "LLVM backend for Native Image",
diff --git a/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties b/substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.junitsupport/com.oracle.svm.junit/native-image.properties
similarity index 100%
rename from substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.librarysupport/com.oracle.svm.junit/native-image.properties
rename to substratevm/src/com.oracle.svm.junit/resources/META-INF/native-image/org.graalvm.nativeimage.junitsupport/com.oracle.svm.junit/native-image.properties

From 82b2acd45565ab3611338d548f5469fcc1f0ca6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Wed, 15 Sep 2021 18:05:50 +0200
Subject: [PATCH 141/681] Add newly added njucp to graalvm components list

---
 vm/mx.vm/mx_vm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index a1f7a979916f..23527feb4938 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -131,7 +131,7 @@
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_complete_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
-ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bllimul', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
+ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bllimul', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']
 ce_no_native_components = ['bgu', 'bjs', 'blli', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'bnative-image', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lsp', 'nfi', 'ni', 'nil', 'polynative', 'pro', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'libpoly', 'poly', 'vvm']
 
@@ -153,9 +153,9 @@
 mx_sdk_vm.register_vm_config('ce', ce_components + ['llmulrl'], _suite, env_file='ce-llimul')
 
 if mx.get_os() == 'windows':
-    mx_sdk_vm.register_vm_config('svm', ['bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'gvm', 'nfi', 'ni', 'nil', 'nju', 'nic', 'poly', 'polynative', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file=False)
+    mx_sdk_vm.register_vm_config('svm', ['bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'gvm', 'nfi', 'ni', 'nil', 'nju', 'njucp', 'nic', 'poly', 'polynative', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file=False)
 else:
-    mx_sdk_vm.register_vm_config('svm', ['bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'gu', 'gvm', 'nfi', 'ni', 'nil', 'nju', 'nic', 'poly', 'polynative', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm'], _suite, env_file=False)
+    mx_sdk_vm.register_vm_config('svm', ['bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'gu', 'gvm', 'nfi', 'ni', 'nil', 'nju', 'njucp', 'nic', 'poly', 'polynative', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm'], _suite, env_file=False)
 # pylint: enable=line-too-long
 
 

From d93cfbe2cff0b3b04687b0bd83447b0c78ef29fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 10:10:37 +0200
Subject: [PATCH 142/681] Add missing org.graalvm.nativeimage.builder
 moduleinfo

---
 substratevm/mx.substratevm/suite.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index a0ef98a360cf..dfb7d69b4a81 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1106,6 +1106,7 @@
                     "* to jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
                 ],
                 "opens" : [
+                    "com.oracle.svm.core                          to jdk.internal.vm.compiler",
                     "com.oracle.svm.core.nodes                    to jdk.internal.vm.compiler",
                     "com.oracle.svm.core.graal.nodes              to jdk.internal.vm.compiler",
                     "com.oracle.svm.core.graal.snippets           to jdk.internal.vm.compiler",

From 88b055ff473f1a1a60e450917de69932847097c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 10:33:07 +0200
Subject: [PATCH 143/681] Ensure mx native-unittest remains usable on Java 8

---
 substratevm/mx.substratevm/mx_substratevm.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index b9ddd68be848..a87f11929cfc 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -521,7 +521,11 @@ def _native_unittest(native_image, cmdline_args):
             mx.log('warning: could not read blacklist: ' + blacklist)
 
     unittest_args = unmask(pargs.unittest_args) if unmask(pargs.unittest_args) else ['com.oracle.svm.test', 'com.oracle.svm.configure.test']
-    _native_junit(native_image, unittest_args, unmask(pargs.build_args), unmask(pargs.run_args), blacklist, whitelist, pargs.preserve_image, pargs.builder_on_modulepath)
+    builder_on_modulepath = pargs.builder_on_modulepath
+    if builder_on_modulepath and svm_java8():
+        mx.log('On Java 8, unittests cannot be built with imagebuilder on module-path. Reverting to imagebuilder on classpath.')
+        builder_on_modulepath = False
+    _native_junit(native_image, unittest_args, unmask(pargs.build_args), unmask(pargs.run_args), blacklist, whitelist, pargs.preserve_image, builder_on_modulepath)
 
 
 def js_image_test(binary, bench_location, name, warmup_iterations, iterations, timeout=None, bin_args=None):

From 728da3c6138dbff4fb230a0c95c6647fc3f2150e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 10:47:01 +0200
Subject: [PATCH 144/681] Add missing org.graalvm.nativeimage.builder
 moduleinfo

---
 substratevm/mx.substratevm/suite.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index dfb7d69b4a81..341eeaefee3e 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1111,6 +1111,7 @@
                     "com.oracle.svm.core.graal.nodes              to jdk.internal.vm.compiler",
                     "com.oracle.svm.core.graal.snippets           to jdk.internal.vm.compiler",
                     "com.oracle.svm.hosted.fieldfolding           to jdk.internal.vm.compiler",
+                    "com.oracle.svm.reflect.hosted                to jdk.internal.vm.compiler",
                 ],
                 "requires": [
                     "java.management",

From 5bfb17dcb74aea3ec80bf08f1565207a496334cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 11:03:07 +0200
Subject: [PATCH 145/681] Add newly added njucp to EXCLUDE_COMPONENTS

---
 vm/mx.vm/ce           | 2 +-
 vm/mx.vm/ce-aarch64   | 2 +-
 vm/mx.vm/ce-complete  | 2 +-
 vm/mx.vm/ce-fastr     | 2 +-
 vm/mx.vm/ce-llimul    | 2 +-
 vm/mx.vm/ce-no_native | 2 +-
 vm/mx.vm/ce-nodejs    | 2 +-
 vm/mx.vm/ce-win       | 2 +-
 vm/mx.vm/libgraal     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/vm/mx.vm/ce b/vm/mx.vm/ce
index 676188ca8274..7b181de18acf 100644
--- a/vm/mx.vm/ce
+++ b/vm/mx.vm/ce
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
 FORCE_BASH_LAUNCHERS=polyglot,polybench
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-aarch64 b/vm/mx.vm/ce-aarch64
index 676188ca8274..7b181de18acf 100644
--- a/vm/mx.vm/ce-aarch64
+++ b/vm/mx.vm/ce-aarch64
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
 FORCE_BASH_LAUNCHERS=polyglot,polybench
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index ce308d20846d..29f1021891a8 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs,truffleruby,graalpython,/wasm,/espresso
 DISABLE_INSTALLABLES=true
-EXCLUDE_COMPONENTS=nju,nic,dis,pbm,pmh,llmulrl,elau
+EXCLUDE_COMPONENTS=nju,njucp,nic,dis,pbm,pmh,llmulrl,elau
 FORCE_BASH_LAUNCHERS=polyglot
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-fastr b/vm/mx.vm/ce-fastr
index e0b62f319b2b..f2b4758d9b82 100644
--- a/vm/mx.vm/ce-fastr
+++ b/vm/mx.vm/ce-fastr
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js,fastr
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,dis,pbm,pmh,llmulrl
 FORCE_BASH_LAUNCHERS=polyglot,polybench,RMain
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-llimul b/vm/mx.vm/ce-llimul
index 546fc458261a..fc626e8b25f3 100644
--- a/vm/mx.vm/ce-llimul
+++ b/vm/mx.vm/ce-llimul
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp,dis,pbm,pmh
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh
 FORCE_BASH_LAUNCHERS=polyglot,polybench
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-no_native b/vm/mx.vm/ce-no_native
index 73ac59f549d2..8372159778ee 100644
--- a/vm/mx.vm/ce-no_native
+++ b/vm/mx.vm/ce-no_native
@@ -2,4 +2,4 @@ DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
 DISABLE_INSTALLABLES=ni,nil
 FORCE_BASH_LAUNCHERS=true
 SKIP_LIBRARIES=true
-EXCLUDE_COMPONENTS=nju,nic,llp,lg,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,llp,lg,dis,pbm,pmh,llmulrl
diff --git a/vm/mx.vm/ce-nodejs b/vm/mx.vm/ce-nodejs
index 50467538a39f..faeee88a6033 100644
--- a/vm/mx.vm/ce-nodejs
+++ b/vm/mx.vm/ce-nodejs
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
 FORCE_BASH_LAUNCHERS=polyglot,polybench
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-win b/vm/mx.vm/ce-win
index 792bb33844e1..e4da0dd26b49 100644
--- a/vm/mx.vm/ce-win
+++ b/vm/mx.vm/ce-win
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/graal-js
-EXCLUDE_COMPONENTS=nju,nic,ni,nil,svml,llp,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,svml,llp,dis,pbm,pmh,llmulrl
 FORCE_BASH_LAUNCHERS=polyglot
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/libgraal b/vm/mx.vm/libgraal
index ec20d587bb20..258f33eb5bd8 100644
--- a/vm/mx.vm/libgraal
+++ b/vm/mx.vm/libgraal
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/substratevm
 FORCE_BASH_LAUNCHERS=true
 DISABLE_LIBPOLYGLOT=true
-EXCLUDE_COMPONENTS=svmag,nju,nic,ni,nil,llp,pbm,pmh
+EXCLUDE_COMPONENTS=svmag,nju,njucp,nic,ni,nil,llp,pbm,pmh

From 94573d875e8aedccc3e37a94965328cb45cfa007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 15:54:18 +0200
Subject: [PATCH 146/681] Move InterruptImageBuilding handling outer so that it
 catches InterruptImageBuilding used in HostedOptionParser

---
 .../hosted/NativeImageGeneratorRunner.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 56efbffcb0f3..62fa12334605 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -124,6 +124,16 @@ public void run() {
                 throw UserError.abort("Unknown options: %s", String.join(" ", remainingArguments));
             }
             exitStatus = new NativeImageGeneratorRunner().build(imageClassLoader);
+        } catch (InterruptImageBuilding e) {
+            if (e.getReason().isPresent()) {
+                if (!e.getReason().get().isEmpty()) {
+                    NativeImageGeneratorRunner.info(e.getReason().get());
+                }
+                exitStatus = 0;
+            } else {
+                /* InterruptImageBuilding without explicit reason is exit code 3 */
+                exitStatus = 3;
+            }
         } finally {
             uninstallNativeImageClassLoader();
             Thread.currentThread().setContextClassLoader(applicationClassLoader);
@@ -405,15 +415,7 @@ private int buildImage(ImageClassLoader classLoader) {
             if (compilationExecutor != null) {
                 compilationExecutor.shutdownNow();
             }
-            if (e.getReason().isPresent()) {
-                if (!e.getReason().get().isEmpty()) {
-                    NativeImageGeneratorRunner.info(e.getReason().get());
-                }
-                return 0;
-            } else {
-                /* InterruptImageBuilding without explicit reason is exit code 3 */
-                return 3;
-            }
+            throw e;
         } catch (FallbackFeature.FallbackImageRequest e) {
             if (FallbackExecutor.class.getName().equals(SubstrateOptions.Class.getValue())) {
                 NativeImageGeneratorRunner.reportFatalError(e, "FallbackImageRequest while building fallback image.");

From 37dd4e1e9b2284a2c8c911b686063d5725bb04e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 16 Sep 2021 16:09:40 +0200
Subject: [PATCH 147/681] Ensure UserException during HostedOptionParser
 parsing gets handled

---
 .../src/com/oracle/svm/core/option/SubstrateOptionsParser.java | 2 +-
 .../src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index f049bd43c7e9..0a7c8961ad3b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -224,7 +224,7 @@ static OptionParseResult parseOption(EconomicMap<String, OptionDescriptor> optio
                     msg.append(' ').append(match.getName());
                 }
             }
-            msg.append(". Use ").append(optionPrefix).append(SubstrateOptions.PrintFlags.getName()).append("= to list all available options.");
+            msg.append(". Use --expert-options-all to list all available options.");
             return OptionParseResult.error(msg.toString());
         }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 62fa12334605..e6b41c5127fe 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -124,6 +124,9 @@ public void run() {
                 throw UserError.abort("Unknown options: %s", String.join(" ", remainingArguments));
             }
             exitStatus = new NativeImageGeneratorRunner().build(imageClassLoader);
+        } catch (UserException e) {
+            reportUserError(e.getMessage());
+            exitStatus = 1;
         } catch (InterruptImageBuilding e) {
             if (e.getReason().isPresent()) {
                 if (!e.getReason().get().isEmpty()) {

From 62dd4db0b34cbef8f1378959f766f9f7c80ad7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 17 Sep 2021 15:42:37 +0200
Subject: [PATCH 148/681] Require mx version with fix for META-INF/services in
 stripped jars

---
 substratevm/mx.substratevm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 341eeaefee3e..d293d7acf91c 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion": "5.308.1",
+    "mxversion": "5.310.0",
     "name": "substratevm",
     "version" : "22.0.0",
     "release" : False,

From ac5c420b430883fecaa7970f45330a348e920a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 17 Sep 2021 17:28:09 +0200
Subject: [PATCH 149/681] Revert to more general error message for
 image-runtime compatibility

---
 .../src/com/oracle/svm/core/option/SubstrateOptionsParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index 0a7c8961ad3b..f049bd43c7e9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -224,7 +224,7 @@ static OptionParseResult parseOption(EconomicMap<String, OptionDescriptor> optio
                     msg.append(' ').append(match.getName());
                 }
             }
-            msg.append(". Use --expert-options-all to list all available options.");
+            msg.append(". Use ").append(optionPrefix).append(SubstrateOptions.PrintFlags.getName()).append("= to list all available options.");
             return OptionParseResult.error(msg.toString());
         }
 

From 1760897a441a7b4fcac1b5cd8a02ffbb6693acb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Tue, 21 Sep 2021 13:12:56 +0200
Subject: [PATCH 150/681] Fix moduleinfo to build
 com.oracle.svm.test.jdk11.jfr.JFRTests with mx native-unittest
 --builder-on-modulepath

---
 substratevm/mx.substratevm/suite.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index d293d7acf91c..7ef121a698ca 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1100,6 +1100,7 @@
                     "com.oracle.svm.core.snippets", # Uses of com.oracle.svm.core.snippets.KnownIntrinsics
                     "com.oracle.svm.core", # Uses of com.oracle.svm.core.TypeResult
                     "com.oracle.svm.core.util", # Uses of com.oracle.svm.core.util.VMError
+                    "com.oracle.svm.jfr", # Uses of com.oracle.svm.jfr.JfrEnabled
                     "com.oracle.svm.hosted                        to java.base",
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",

From d9dc2df98180c2bc250ed26c131c8fb4ff2523d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Thu, 23 Sep 2021 15:47:06 +0200
Subject: [PATCH 151/681] Handle service loading related errors during
 HostedOptionParser#collectOptions

---
 .../com/oracle/svm/hosted/NativeImageGeneratorRunner.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index e6b41c5127fe..4c7f6f0e60cd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -137,6 +137,9 @@ public void run() {
                 /* InterruptImageBuilding without explicit reason is exit code 3 */
                 exitStatus = 3;
             }
+        } catch (Throwable err) {
+            reportFatalError(err);
+            exitStatus = 1;
         } finally {
             uninstallNativeImageClassLoader();
             Thread.currentThread().setContextClassLoader(applicationClassLoader);
@@ -497,7 +500,7 @@ public static String getJavaVersion() {
      * @param e error to be reported.
      */
     protected static void reportFatalError(Throwable e) {
-        System.err.print("Fatal error:");
+        System.err.print("Fatal error: ");
         e.printStackTrace();
     }
 

From c5748a3dd96f2ba454ab3adca7ac7e42bc75ea5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Mon, 27 Sep 2021 09:54:37 +0200
Subject: [PATCH 152/681] Add changelog entries

---
 substratevm/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md
index ef9f442ed7fd..5a799f92a3d2 100644
--- a/substratevm/CHANGELOG.md
+++ b/substratevm/CHANGELOG.md
@@ -2,4 +2,8 @@
 
 This changelog summarizes major changes to Native Image, developed under the codename **Substrate VM**.
 
+## Version 22.0.0
+* (GR-33930) Decouple HostedOptionParser setup from classpath/modulepath scanning (use ServiceLoader for collecting options).
+* (GR-33504) Implement --add-reads for native-image and fix --add-opens error handling.
+
 ## Version 21.3.0


From a923eb1c1f9a47ed4c6f59317622dfdd7b35a803 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 23 Sep 2021 16:05:45 +0200
Subject: [PATCH 153/681] compiler: insert artificial return node for snippets
 that do not have one

---
 .../replacements/SnippetTemplate.java         | 79 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index ada40300aa07..c1d879df51af 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -98,8 +98,10 @@
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
+import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.InliningLog;
 import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
+import org.graalvm.compiler.nodes.LogicConstantNode;
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.LoopExitNode;
@@ -109,6 +111,7 @@
 import org.graalvm.compiler.nodes.PhiNode;
 import org.graalvm.compiler.nodes.PiNode.Placeholder;
 import org.graalvm.compiler.nodes.PiNode.PlaceholderStamp;
+import org.graalvm.compiler.nodes.ProfileData;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StartNode;
 import org.graalvm.compiler.nodes.StateSplit;
@@ -139,6 +142,8 @@
 import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.spi.MemoryEdgeProxy;
@@ -1057,10 +1062,34 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
             debug.dump(DebugContext.INFO_LEVEL, snippet, "SnippetTemplate after fixing memory anchoring");
             List<ReturnNode> returnNodes = snippet.getNodes(ReturnNode.TYPE).snapshot();
             if (returnNodes.isEmpty()) {
-                this.returnNode = null;
+                /*
+                 * The snippet does not have a return node. That can cause issues for subsequent
+                 * lowerings if the replacee gets killed, because killCFG might kill a MergeNode
+                 * that is still referenced by the LoweringTool. To solve this, we create an
+                 * artificial return node and insert it into a temporary branch right after the
+                 * start node. That way, the next node of the replacee will be attached to the
+                 * artificial branch and killing the replacee will not affect its successor. The
+                 * branch will fold away after snippet instantiation during canonicalization,
+                 * together with the original successor.
+                 */
+                this.returnNode = snippet.add(new ReturnNode(getDefaultReturnValue(snippet, replacee)));
+                // insert empty memory map
+                MemoryMapImpl mmap = new MemoryMapImpl();
+                MemoryMapNode memoryMap = snippet.unique(new MemoryMapNode(mmap.getMap()));
+                returnNode.setMemoryMap(memoryMap);
+                // this is the condition that controls the lifetime of the branch
+                this.artificialReturnCondition = snippet.unique(new PlaceholderLogicNode());
+                // insert the temporary branch
+                FixedWithNextNode insertAfter = snippet.start();
+                FixedNode next = insertAfter.next();
+                insertAfter.setNext(null);
+                IfNode branch = snippet.add(new IfNode(artificialReturnCondition, next, this.returnNode, ProfileData.BranchProbabilityData.unknown()));
+                insertAfter.setNext(branch);
             } else if (returnNodes.size() == 1) {
+                this.artificialReturnCondition = null;
                 this.returnNode = returnNodes.get(0);
             } else {
+                this.artificialReturnCondition = null;
                 AbstractMergeNode merge = snippet.add(new MergeNode());
                 List<MemoryMapNode> memMaps = new ArrayList<>();
                 for (ReturnNode retNode : returnNodes) {
@@ -1125,6 +1154,19 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
         }
     }
 
+    /**
+     * Gets a default return value that is compatible with {@code replacee}.
+     */
+    private static ValueNode getDefaultReturnValue(StructuredGraph snippet, Node replacee) {
+        if (replacee instanceof ValueNode) {
+            JavaKind javaKind = ((ValueNode) replacee).stamp(NodeView.DEFAULT).getStackKind();
+            if (javaKind != JavaKind.Void) {
+                return ConstantNode.defaultForKind(javaKind, snippet);
+            }
+        }
+        return null;
+    }
+
     private static boolean verifyIntrinsicsProcessed(StructuredGraph snippetCopy) {
         if (IS_IN_NATIVE_IMAGE) {
             return true;
@@ -1244,6 +1286,14 @@ private static boolean checkNonNull(ResolvedJavaMethod method, String parameterN
      */
     private final ReturnNode returnNode;
 
+    /**
+     * The condition that keeps an artificial return node alive or {@code null} if no such return
+     * node has been added. During {@link SnippetTemplate#instantiate},
+     * {@link PlaceholderLogicNode#markForDeletion()} will be called which cause the branch with the
+     * artificial return to fold away.
+     */
+    private final PlaceholderLogicNode artificialReturnCondition;
+
     /**
      * The node that will be replaced with the exception handler of the replacee node, or null if
      * the snippet does not have an exception handler path.
@@ -1718,6 +1768,10 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
                 }
             }
 
+            if (artificialReturnCondition != null) {
+                ((PlaceholderLogicNode) duplicates.get(artificialReturnCondition)).markForDeletion();
+            }
+
             if (fallbackInvoke != null) {
                 GraalError.guarantee(replacee instanceof MacroStateSplitWithExceptionNode, "%s can only be used in snippets replacing %s", FallbackInvokeWithExceptionNode.class.getSimpleName(),
                                 MacroStateSplitWithExceptionNode.class.getSimpleName());
@@ -2187,3 +2241,26 @@ public void simplify(SimplifierTool tool) {
         graph().removeSplit(this, next());
     }
 }
+
+@NodeInfo(size = NodeSize.SIZE_0, cycles = NodeCycles.CYCLES_0, cyclesRationale = "This node is immediately removed on next simplification pass")
+final class PlaceholderLogicNode extends LogicNode implements Canonicalizable {
+    static final NodeClass<PlaceholderLogicNode> TYPE = NodeClass.create(PlaceholderLogicNode.class);
+    private boolean delete;
+
+    protected PlaceholderLogicNode() {
+        super(TYPE);
+        delete = false;
+    }
+
+    public void markForDeletion() {
+        delete = true;
+    }
+
+    @Override
+    public Node canonical(CanonicalizerTool tool) {
+        if (delete) {
+            return LogicConstantNode.tautology();
+        }
+        return this;
+    }
+}

From 71008c5b1b32063fed4f836db882cb0cf27df6b7 Mon Sep 17 00:00:00 2001
From: Aleksandar Gradinac <aleksandar.gradinac@oracle.com>
Date: Thu, 23 Sep 2021 17:26:17 +0200
Subject: [PATCH 154/681] Fix substitution of macro options that contain a path
 on Windows

---
 .../src/com/oracle/svm/driver/NativeImage.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index 23b737a9f4b6..1373baa0d0c9 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1873,7 +1873,7 @@ static String resolvePropertyValue(String val, String optionArg, Path componentD
              * substitutions of kind ${<argName>} -> <argValue> on resultVal.
              */
             for (String argNameValue : optionArg.split(",")) {
-                String[] splitted = argNameValue.split(":");
+                String[] splitted = argNameValue.split(":", 2);
                 if (splitted.length == 2) {
                     String argName = splitted[0];
                     String argValue = splitted[1];

From cb671ab1621b165a15d258f6dada4509fbb1afc6 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Mon, 27 Sep 2021 11:14:45 +0200
Subject: [PATCH 155/681] The arrays in array-based SOM are final non-null

---
 .../api/staticobject/ArrayBasedStaticShape.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
index 08ac9c352156..3c6cde4010af 100644
--- a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
+++ b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
@@ -40,17 +40,17 @@
  */
 package com.oracle.truffle.api.staticobject;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import static com.oracle.truffle.api.staticobject.StaticPropertyKind.N_PRIMITIVES;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import sun.misc.Unsafe;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 
-import static com.oracle.truffle.api.staticobject.StaticPropertyKind.N_PRIMITIVES;
+import sun.misc.Unsafe;
 
 final class ArrayBasedStaticShape<T> extends StaticShape<T> {
     @CompilationFinal(dimensions = 1) //
@@ -94,7 +94,13 @@ Object getStorage(Object obj, boolean primitive) {
         } else {
             assert checkShape(receiverObject);
         }
-        return UNSAFE.getObject(receiverObject, (long) (primitive ? propertyLayout.generator.getByteArrayOffset() : propertyLayout.generator.getObjectArrayOffset()));
+        if (primitive) {
+            Object storage = UNSAFE.getObject(receiverObject, (long) propertyLayout.generator.getByteArrayOffset());
+            return SomAccessor.RUNTIME.unsafeCast(storage, byte[].class, true, true, true);
+        } else {
+            Object storage = UNSAFE.getObject(receiverObject, (long) propertyLayout.generator.getObjectArrayOffset());
+            return SomAccessor.RUNTIME.unsafeCast(storage, Object[].class, true, true, true);
+        }
     }
 
     private boolean checkShape(Object receiverObject) {

From 296a36182ec2a34ba4e168541df971fe94f0755f Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 10:54:00 +0100
Subject: [PATCH 156/681] Fix size of docs flamegraph screenshot.

---
 docs/tools/img/profiler_flamegraph.png | Bin 15652 -> 10072 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/tools/img/profiler_flamegraph.png b/docs/tools/img/profiler_flamegraph.png
index 86a0deb01d5c1c06d65c443b54afbb57b5a1f70e..4d849d45ff4453a7355c6776210105640312b7a5 100644
GIT binary patch
literal 10072
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

literal 15652
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
X_NK~vv-8eh(xf1(DpU6K)w}-%cFUB-


From f35e913eed71fc7d3da88f08b272e2b3473ed245 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 10:53:37 +0200
Subject: [PATCH 157/681] Avoid createCallTarget() in regex, nfi, sl, and tck.

---
 .../src/com/oracle/truffle/regex/RegexLanguage.java       | 3 +--
 .../src/com/oracle/truffle/regex/RegexObject.java         | 3 +--
 .../oracle/truffle/regex/tregex/nodes/TRegexExecNode.java | 6 ++----
 .../oracle/truffle/nfi/backend/libffi/LibFFIClosure.java  | 3 +--
 .../oracle/truffle/nfi/backend/libffi/LibFFILanguage.java | 4 ++--
 .../truffle/nfi/backend/libffi/LibFFINFIBackend.java      | 3 +--
 .../truffle/nfi/backend/libffi/LibFFISignature.java       | 3 +--
 .../oracle/truffle/nfi/test/ImplicitConvertNFITest.java   | 5 ++---
 .../src/com/oracle/truffle/nfi/test/NFITest.java          | 5 ++---
 .../truffle/nfi/test/parser/backend/NFITestBackend.java   | 8 +++-----
 .../src/com/oracle/truffle/nfi/NFILanguage.java           | 7 ++++---
 .../src/com/oracle/truffle/nfi/NFISignature.java          | 5 ++---
 .../com/oracle/truffle/sl/test/SLParseInContextTest.java  | 5 ++---
 .../src/com/oracle/truffle/sl/SLLanguage.java             | 8 ++++----
 .../src/com/oracle/truffle/sl/parser/SLNodeFactory.java   | 3 +--
 .../src/com/oracle/truffle/tck/impl/TckLanguage.java      | 2 +-
 16 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexLanguage.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexLanguage.java
index d44c86e330e0..e58ca41393a5 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexLanguage.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexLanguage.java
@@ -43,7 +43,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.instrumentation.ProvidedTags;
@@ -147,7 +146,7 @@ public GroupBoundaries[] getCachedGroupBoundaries() {
 
     @Override
     protected CallTarget parse(ParsingRequest parsingRequest) {
-        return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(createRegexObject(createRegexSource(parsingRequest.getSource()))));
+        return RootNode.createConstantNode(createRegexObject(createRegexSource(parsingRequest.getSource()))).getCallTarget();
     }
 
     private static RegexSource createRegexSource(Source source) {
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexObject.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexObject.java
index 8bd0171d0682..2355339ac7f0 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexObject.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/RegexObject.java
@@ -45,7 +45,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -136,7 +135,7 @@ public RegexObject(RegexExecNode execNode, RegexSource source, AbstractRegexObje
         this.flags = flags;
         this.numberOfCaptureGroups = numberOfCaptureGroups;
         this.namedCaptureGroups = namedCaptureGroups != null ? createNamedCaptureGroupMap(namedCaptureGroups) : TruffleNull.INSTANCE;
-        this.execCallTarget = Truffle.getRuntime().createCallTarget(new RegexRootNode(execNode.getRegexLanguage(), execNode));
+        this.execCallTarget = new RegexRootNode(execNode.getRegexLanguage(), execNode).getCallTarget();
         this.backtracking = execNode.isBacktracking();
     }
 
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecNode.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecNode.java
index b5477d6f7e43..b97cfd5c168b 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecNode.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/nodes/TRegexExecNode.java
@@ -43,7 +43,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.regex.RegexBodyNode;
@@ -408,7 +407,7 @@ public LazyCaptureGroupRegexSearchNode(RegexLanguage language,
                 } else {
                     bodyNode = new TRegexLazyFindStartRootNode(language, source, backwardNode, captureGroupNode == null);
                 }
-                backwardCallTarget = Truffle.getRuntime().createCallTarget(new RegexRootNode(language, bodyNode));
+                backwardCallTarget = new RegexRootNode(language, bodyNode).getCallTarget();
             }
             this.captureGroupEntryNode = insert(captureGroupNode);
             if (captureGroupNode == null) {
@@ -420,8 +419,7 @@ public LazyCaptureGroupRegexSearchNode(RegexLanguage language,
                 } else {
                     findStartCallTarget = backwardCallTarget;
                 }
-                captureGroupCallTarget = Truffle.getRuntime().createCallTarget(
-                                new RegexRootNode(language, new TRegexLazyCaptureGroupsRootNode(language, source, captureGroupNode, rootNode, findStartCallTarget)));
+                captureGroupCallTarget = new RegexRootNode(language, new TRegexLazyCaptureGroupsRootNode(language, source, captureGroupNode, rootNode, findStartCallTarget)).getCallTarget();
             }
         }
 
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFIClosure.java b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFIClosure.java
index 291ba1616c4f..a729ee8d232b 100644
--- a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFIClosure.java
+++ b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFIClosure.java
@@ -43,7 +43,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -115,7 +114,7 @@ abstract static class CachedClosureInfo {
         final CallTarget closureCallTarget;
 
         CachedClosureInfo(RootNode rootNode) {
-            this.closureCallTarget = Truffle.getRuntime().createCallTarget(rootNode);
+            this.closureCallTarget = rootNode.getCallTarget();
         }
     }
 
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFILanguage.java b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFILanguage.java
index 75f19415579e..938a34c028b1 100644
--- a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFILanguage.java
+++ b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFILanguage.java
@@ -136,14 +136,14 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
 
             @Override
             public Object execute(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreter();
                 throw new UnsupportedOperationException("illegal access to internal language");
             }
-        });
+        }.getCallTarget();
     }
 
     protected static LibFFIContext getCurrentContext() {
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFINFIBackend.java b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFINFIBackend.java
index e3a311c37fc9..30db9edd30fe 100644
--- a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFINFIBackend.java
+++ b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFINFIBackend.java
@@ -42,7 +42,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -112,7 +111,7 @@ public CallTarget parse(NativeLibraryDescriptor descriptor) {
             }
             root = new LoadLibraryNode(language, descriptor.getFilename(), flags);
         }
-        return Truffle.getRuntime().createCallTarget(root);
+        return root.getCallTarget();
     }
 
     private static class LoadLibraryNode extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFISignature.java b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFISignature.java
index 2e95a41e93db..34f3ba23d54f 100644
--- a/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFISignature.java
+++ b/truffle/src/com.oracle.truffle.nfi.backend.libffi/src/com/oracle/truffle/nfi/backend/libffi/LibFFISignature.java
@@ -44,7 +44,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateAOT;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -244,7 +243,7 @@ static final class CachedSignatureInfo {
             this.objectCount = objectCount;
             this.allowedCallDirection = allowedCallDirection;
 
-            this.callTarget = Truffle.getRuntime().createCallTarget(new SignatureExecuteNode(language, this));
+            this.callTarget = new SignatureExecuteNode(language, this).getCallTarget();
         }
 
         NativeArgumentBuffer.Array prepareBuffer() {
diff --git a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/ImplicitConvertNFITest.java b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/ImplicitConvertNFITest.java
index d0084cbb160b..c790c3c8376a 100644
--- a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/ImplicitConvertNFITest.java
+++ b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/ImplicitConvertNFITest.java
@@ -56,7 +56,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.nfi.backend.spi.types.NativeSimpleType;
@@ -128,12 +127,12 @@ public void testConvert(@Inject(TestConvertNode.class) CallTarget callTarget) {
     }
 
     private static boolean isCompileImmediately() {
-        CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        CallTarget target = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return CompilerDirectives.inCompiledCode();
             }
-        });
+        }.getCallTarget();
         return (boolean) target.call();
     }
 
diff --git a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/NFITest.java b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/NFITest.java
index 405fde7022df..610d9be02a92 100644
--- a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/NFITest.java
+++ b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/NFITest.java
@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.nfi.test;
 
+import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -47,14 +48,12 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.tck.TruffleRunner;
-import org.graalvm.polyglot.Context;
 
 public class NFITest {
 
@@ -85,7 +84,7 @@ protected static Object loadLibrary(String lib) {
     public static void loadLibraries() {
         defaultLibrary = loadLibrary("default");
         testLibrary = loadLibrary("load '" + System.getProperty("native.test.lib") + "'");
-        lookupAndBind = Truffle.getRuntime().createCallTarget(new LookupAndBindNode());
+        lookupAndBind = new LookupAndBindNode().getCallTarget();
     }
 
     private static final class LookupAndBindNode extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/parser/backend/NFITestBackend.java b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/parser/backend/NFITestBackend.java
index ea5fe16dae8d..5ee52d0cf8d4 100644
--- a/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/parser/backend/NFITestBackend.java
+++ b/truffle/src/com.oracle.truffle.nfi.test/src/com/oracle/truffle/nfi/test/parser/backend/NFITestBackend.java
@@ -43,7 +43,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
@@ -84,7 +83,7 @@ static final class NFITestBackendImpl implements NFIBackend {
 
         @Override
         public CallTarget parse(NativeLibraryDescriptor descriptor) {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new TestLibrary(descriptor)));
+            return RootNode.createConstantNode(new TestLibrary(descriptor)).getCallTarget();
         }
 
         @ExportMessage
@@ -129,14 +128,13 @@ public NFIBackend createBackend(NFIBackendTools t) {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
-
+        return new RootNode(this) {
             @Override
             public Object execute(VirtualFrame frame) {
                 CompilerDirectives.transferToInterpreter();
                 throw new UnsupportedOperationException("illegal access to internal language");
             }
-        });
+        }.getCallTarget();
     }
 
     private static final LanguageReference<NFITestBackend> REFERENCE = LanguageReference.create(NFITestBackend.class);
diff --git a/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFILanguage.java b/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFILanguage.java
index c42aa389ed2b..75b33d728d1b 100644
--- a/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFILanguage.java
+++ b/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFILanguage.java
@@ -93,14 +93,15 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
 
         Content c = source.getContent();
         assert c != null;
+        RootNode root;
         if (c instanceof ParsedLibrary) {
             ParsedLibrary lib = (ParsedLibrary) c;
-            return Truffle.getRuntime().createCallTarget(new NFIRootNode(this, lib, backendId));
+            root = new NFIRootNode(this, lib, backendId);
         } else {
             ParsedSignature sig = (ParsedSignature) c;
-            RootNode buildSignature = new SignatureRootNode(this, backendId, sig.getBuildSignatureNode());
-            return Truffle.getRuntime().createCallTarget(buildSignature);
+            root = new SignatureRootNode(this, backendId, sig.getBuildSignatureNode());
         }
+        return root.getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFISignature.java b/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFISignature.java
index 9c3b2825ffba..ab5df26a8a95 100644
--- a/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFISignature.java
+++ b/truffle/src/com.oracle.truffle.nfi/src/com/oracle/truffle/nfi/NFISignature.java
@@ -43,7 +43,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -205,7 +204,7 @@ private synchronized void initPolymorphicSignatureCall() {
             if (polymorphicSignatureCall == null) {
                 CallSignatureNode call = createOptimizedSignatureCall();
                 CallSignatureRootNode rootNode = new CallSignatureRootNode(NFILanguage.get(null), call);
-                polymorphicSignatureCall = Truffle.getRuntime().createCallTarget(rootNode);
+                polymorphicSignatureCall = rootNode.getCallTarget();
             }
         }
 
@@ -222,7 +221,7 @@ private synchronized void initPolymorphicClosureCall() {
             if (polymorphicClosureCall == null) {
                 CallSignatureNode call = createOptimizedClosureCall();
                 CallSignatureRootNode rootNode = new CallSignatureRootNode(NFILanguage.get(null), call);
-                polymorphicClosureCall = Truffle.getRuntime().createCallTarget(rootNode);
+                polymorphicClosureCall = rootNode.getCallTarget();
             }
         }
 
diff --git a/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLParseInContextTest.java b/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLParseInContextTest.java
index 69524487e7a6..13ad88e6bdcd 100644
--- a/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLParseInContextTest.java
+++ b/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLParseInContextTest.java
@@ -52,7 +52,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -89,7 +88,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Override
                 public Object execute(VirtualFrame frame) {
@@ -101,7 +100,7 @@ private Object parseAndEval() {
                     Source aPlusB = Source.newBuilder("sl", "a + b", "plus.sl").build();
                     return CONTEXT_REF.get(this).parsePublic(aPlusB, "a", "b").call(30, 12);
                 }
-            });
+            }.getCallTarget();
         }
 
         private static final ContextReference<Env> CONTEXT_REF = ContextReference.create(EvalLang.class);
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
index 4f0e8a6f1463..2c74950dec77 100644
--- a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
@@ -230,7 +230,7 @@ protected boolean patchContext(SLContext context, Env newEnv) {
     public RootCallTarget getOrCreateUndefinedFunction(String name) {
         RootCallTarget target = undefinedFunctions.get(name);
         if (target == null) {
-            target = Truffle.getRuntime().createCallTarget(new SLUndefinedFunctionRootNode(this, name));
+            target = new SLUndefinedFunctionRootNode(this, name).getCallTarget();
             RootCallTarget other = undefinedFunctions.putIfAbsent(name, target);
             if (other != null) {
                 target = other;
@@ -275,8 +275,8 @@ public RootCallTarget lookupBuiltin(NodeFactory<? extends SLBuiltinNode> factory
          * Register the builtin function in the builtin registry. Call targets for builtins may be
          * reused across multiple contexts.
          */
-        RootCallTarget newTarget = Truffle.getRuntime().createCallTarget(rootNode);
-        RootCallTarget oldTarget = builtinTargets.put(factory, newTarget);
+        RootCallTarget newTarget = rootNode.getCallTarget();
+        RootCallTarget oldTarget = builtinTargets.putIfAbsent(factory, newTarget);
         if (oldTarget != null) {
             return oldTarget;
         }
@@ -339,7 +339,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
              */
             evalMain = new SLEvalRootNode(this, null, functions);
         }
-        return Truffle.getRuntime().createCallTarget(evalMain);
+        return evalMain.getCallTarget();
     }
 
     /**
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java
index 8bfc5e2f2fd0..b27392cb2909 100644
--- a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/parser/SLNodeFactory.java
@@ -50,7 +50,6 @@
 import org.antlr.v4.runtime.Token;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -189,7 +188,7 @@ public void finishFunction(SLStatementNode bodyNode) {
             functionBodyNode.setSourceSection(functionSrc.getCharIndex(), functionSrc.getCharLength());
 
             final SLRootNode rootNode = new SLRootNode(language, frameDescriptor, functionBodyNode, functionSrc, functionName);
-            allFunctions.put(functionName, Truffle.getRuntime().createCallTarget(rootNode));
+            allFunctions.put(functionName, rootNode.getCallTarget());
         }
 
         functionStartPos = 0;
diff --git a/truffle/src/com.oracle.truffle.tck/src/com/oracle/truffle/tck/impl/TckLanguage.java b/truffle/src/com.oracle.truffle.tck/src/com/oracle/truffle/tck/impl/TckLanguage.java
index 60f92a051d03..282ba989f862 100644
--- a/truffle/src/com.oracle.truffle.tck/src/com/oracle/truffle/tck/impl/TckLanguage.java
+++ b/truffle/src/com.oracle.truffle.tck/src/com/oracle/truffle/tck/impl/TckLanguage.java
@@ -78,7 +78,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             final double value = Double.parseDouble(txt);
             root = RootNode.createConstantNode(value);
         }
-        return Truffle.getRuntime().createCallTarget(root);
+        return root.getCallTarget();
     }
 
     @ExportLibrary(InteropLibrary.class)

From ac8868b6114640fffddb77cf9e46f0b340848d6f Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 22 Sep 2021 16:50:11 +0200
Subject: [PATCH 158/681] induction variable duplication must not gvn

---
 .../nodes/calc/IntegerConvertNode.java        | 41 +++++++++++++++----
 .../DerivedConvertedInductionVariable.java    | 10 ++++-
 .../nodes/loop/DerivedInductionVariable.java  |  4 +-
 .../loop/DerivedOffsetInductionVariable.java  | 17 ++++++--
 .../loop/DerivedScaledInductionVariable.java  |  7 +++-
 .../graalvm/compiler/nodes/loop/MathUtil.java | 37 ++++++++++++++---
 6 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java
index 3a030a21841f..40ac5dc7342d 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java
@@ -28,11 +28,11 @@
 
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.PrimitiveStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ArithmeticOperation;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -40,6 +40,7 @@
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.StampInverter;
 
 import jdk.vm.ci.meta.Constant;
@@ -119,14 +120,24 @@ public static ValueNode convert(ValueNode input, Stamp stamp, NodeView view) {
     }
 
     public static ValueNode convert(ValueNode input, Stamp stamp, StructuredGraph graph, NodeView view) {
-        return convert(input, stamp, false, graph, view);
+        return convert(input, stamp, false, graph, view, true);
     }
 
     public static ValueNode convert(ValueNode input, Stamp stamp, boolean zeroExtend, StructuredGraph graph, NodeView view) {
-        ValueNode convert = convert(input, stamp, zeroExtend, view);
-        if (!convert.isAlive()) {
-            assert !convert.isDeleted();
-            convert = graph.addOrUniqueWithInputs(convert);
+        return convert(input, stamp, zeroExtend, graph, view, true);
+    }
+
+    public static ValueNode convert(ValueNode input, Stamp stamp, boolean zeroExtend, StructuredGraph graph, NodeView view, boolean gvn) {
+        ValueNode convert = convert(input, stamp, zeroExtend, view, gvn);
+        if (gvn) {
+            if (!convert.isAlive()) {
+                assert !convert.isDeleted();
+                convert = graph.addOrUniqueWithInputs(convert);
+            }
+        } else {
+            GraalError.guarantee(!convert.isAlive(), "Convert must not GVN");
+            GraalError.guarantee(!convert.isDeleted(), "Convert must not GVN");
+            convert = graph.addWithoutUniqueWithInputs(convert);
         }
         return convert;
     }
@@ -145,20 +156,32 @@ public static ValueNode convertUnsigned(ValueNode input, Stamp stamp, Structured
     }
 
     public static ValueNode convert(ValueNode input, Stamp stamp, boolean zeroExtend, NodeView view) {
+        return convert(input, stamp, zeroExtend, view, true);
+    }
+
+    private static ValueNode convert(ValueNode input, Stamp stamp, boolean zeroExtend, NodeView view, boolean gvn) {
         IntegerStamp fromStamp = (IntegerStamp) input.stamp(view);
         IntegerStamp toStamp = (IntegerStamp) stamp;
 
         ValueNode result;
-        if (toStamp.getBits() == fromStamp.getBits()) {
+        if (gvn && toStamp.getBits() == fromStamp.getBits()) {
             result = input;
         } else if (toStamp.getBits() < fromStamp.getBits()) {
             result = new NarrowNode(input, fromStamp.getBits(), toStamp.getBits());
         } else if (zeroExtend) {
             // toStamp.getBits() > fromStamp.getBits()
-            result = ZeroExtendNode.create(input, toStamp.getBits(), view);
+            if (gvn) {
+                result = ZeroExtendNode.create(input, toStamp.getBits(), view);
+            } else {
+                result = new ZeroExtendNode(input, toStamp.getBits());
+            }
         } else {
             // toStamp.getBits() > fromStamp.getBits()
-            result = SignExtendNode.create(input, toStamp.getBits(), view);
+            if (gvn) {
+                result = SignExtendNode.create(input, toStamp.getBits(), view);
+            } else {
+                result = new SignExtendNode(input, toStamp.getBits());
+            }
         }
 
         IntegerStamp resultStamp = (IntegerStamp) result.stamp(view);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
index 0be5c1f04009..30e780e5607a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
@@ -106,8 +106,12 @@ public void deleteUnusedNodes() {
     }
 
     private ValueNode op(ValueNode v, boolean allowZeroExtend) {
+        return op(v, allowZeroExtend, true);
+    }
+
+    private ValueNode op(ValueNode v, boolean allowZeroExtend, boolean gvn) {
         boolean zeroExtend = allowZeroExtend && value instanceof ZeroExtendNode;
-        return IntegerConvertNode.convert(v, stamp, zeroExtend, graph(), NodeView.DEFAULT);
+        return IntegerConvertNode.convert(v, stamp, zeroExtend, graph(), NodeView.DEFAULT, gvn);
     }
 
     @Override
@@ -125,4 +129,8 @@ public ValueNode copyValue(InductionVariable newBase) {
         return op(newBase.valueNode(), true);
     }
 
+    @Override
+    public ValueNode copyValue(InductionVariable newBase, boolean gvn) {
+        return op(newBase.valueNode(), true, gvn);
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java
index adb08ee01be5..7e2a54d75aa8 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java
@@ -51,10 +51,12 @@ public InductionVariable getBase() {
     @Override
     public InductionVariable duplicate() {
         InductionVariable newBase = base.duplicate();
-        return copy(newBase, copyValue(newBase));
+        return copy(newBase, copyValue(newBase, false/* no gvn */));
     }
 
     public abstract ValueNode copyValue(InductionVariable newBase);
 
+    public abstract ValueNode copyValue(InductionVariable newBase, boolean gvn);
+
     public abstract InductionVariable copy(InductionVariable newBase, ValueNode newValue);
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java
index c530f73189e6..eb94eed1af83 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java
@@ -141,15 +141,19 @@ private long op(long b, long o) {
     }
 
     public ValueNode op(ValueNode b, ValueNode o) {
+        return op(b, o, true);
+    }
+
+    public ValueNode op(ValueNode b, ValueNode o, boolean gvn) {
         if (value instanceof AddNode) {
-            return add(graph(), b, o);
+            return add(graph(), b, o, gvn);
         }
         if (value instanceof SubNode) {
             if (base.valueNode() == value.getX()) {
-                return sub(graph(), b, o);
+                return sub(graph(), b, o, gvn);
             } else {
                 assert base.valueNode() == value.getY();
-                return sub(graph(), o, b);
+                return sub(graph(), o, b, gvn);
             }
         }
         throw GraalError.shouldNotReachHere();
@@ -197,7 +201,12 @@ public String toString() {
 
     @Override
     public ValueNode copyValue(InductionVariable newBase) {
-        return op(newBase.valueNode(), offset);
+        return copyValue(newBase, true);
+    }
+
+    @Override
+    public ValueNode copyValue(InductionVariable newBase, boolean gvn) {
+        return op(newBase.valueNode(), offset, gvn);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java
index 2ce1afbd55f6..56e28cf51f3e 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java
@@ -167,9 +167,14 @@ public String toString() {
         return String.format("DerivedScaleInductionVariable base (%s) %s %s", base, value.getNodeClass().shortName(), scale);
     }
 
+    @Override
+    public ValueNode copyValue(InductionVariable newBase, boolean gvn) {
+        return MathUtil.mul(graph(), newBase.valueNode(), scale, gvn);
+    }
+
     @Override
     public ValueNode copyValue(InductionVariable newBase) {
-        return MathUtil.mul(graph(), newBase.valueNode(), scale);
+        return copyValue(newBase, true);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/MathUtil.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/MathUtil.java
index 3759c3404300..788ea54cceeb 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/MathUtil.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/MathUtil.java
@@ -24,19 +24,22 @@
  */
 package org.graalvm.compiler.nodes.loop;
 
+import java.util.function.BiFunction;
+
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
 import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
+import org.graalvm.compiler.nodes.calc.MulNode;
 import org.graalvm.compiler.nodes.calc.SignedDivNode;
+import org.graalvm.compiler.nodes.calc.SubNode;
 import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 
-import java.util.function.BiFunction;
-
 /**
  * Utility methods to perform integer math with some obvious constant folding first.
  */
@@ -50,30 +53,54 @@ private static boolean isConstantZero(ValueNode v1) {
     }
 
     public static ValueNode add(StructuredGraph graph, ValueNode v1, ValueNode v2) {
+        return add(graph, v1, v2, true);
+    }
+
+    public static ValueNode add(StructuredGraph graph, ValueNode v1, ValueNode v2, boolean gvn) {
         if (isConstantZero(v1)) {
             return v2;
         }
         if (isConstantZero(v2)) {
             return v1;
         }
-        return BinaryArithmeticNode.add(graph, v1, v2, NodeView.DEFAULT);
+        if (gvn) {
+            return BinaryArithmeticNode.add(graph, v1, v2, NodeView.DEFAULT);
+        } else {
+            return graph.addWithoutUniqueWithInputs(new AddNode(v1, v2));
+        }
     }
 
     public static ValueNode mul(StructuredGraph graph, ValueNode v1, ValueNode v2) {
+        return mul(graph, v1, v2, true);
+    }
+
+    public static ValueNode mul(StructuredGraph graph, ValueNode v1, ValueNode v2, boolean gvn) {
         if (isConstantOne(v1)) {
             return v2;
         }
         if (isConstantOne(v2)) {
             return v1;
         }
-        return BinaryArithmeticNode.mul(graph, v1, v2, NodeView.DEFAULT);
+        if (gvn) {
+            return BinaryArithmeticNode.mul(graph, v1, v2, NodeView.DEFAULT);
+        } else {
+            return graph.addWithoutUniqueWithInputs(new MulNode(v1, v2));
+        }
     }
 
     public static ValueNode sub(StructuredGraph graph, ValueNode v1, ValueNode v2) {
+        return sub(graph, v1, v2, true);
+    }
+
+    public static ValueNode sub(StructuredGraph graph, ValueNode v1, ValueNode v2, boolean gvn) {
         if (isConstantZero(v2)) {
             return v1;
         }
-        return BinaryArithmeticNode.sub(graph, v1, v2, NodeView.DEFAULT);
+        if (gvn) {
+            return BinaryArithmeticNode.sub(graph, v1, v2, NodeView.DEFAULT);
+        } else {
+            return graph.addWithoutUniqueWithInputs(new SubNode(v1, v2));
+        }
     }
 
     public static ValueNode divBefore(StructuredGraph graph, FixedNode before, ValueNode dividend, ValueNode divisor, GuardingNode zeroCheck) {

From f982ad40b54a3d3944d56539e76e7c8f883ace0a Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 11:28:41 +0100
Subject: [PATCH 159/681] Add small help text to legend.

---
 .../tools/profiler/impl/resources/color_change.js   | 13 ++++++++++++-
 .../tools/profiler/impl/resources/graphowner.js     |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 8a47d40fd927..97263e6a4cbf 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -128,8 +128,19 @@ function color_create_legend() {
     t.style.fill = "rgb(0, 0, 0)";
     t.textContent = "Legend";
 
+    let t2 = document.createElementNS("http://www.w3.org/2000/svg", "text");
+    t2.className.baseVal = "title";
+    t2.style.textAnchor = "middle";
+    t2.setAttribute("x", 125);
+    t2.setAttribute("y", fg_frameheight * 3);
+    t2.style.fontSize = fontSize;
+    t2.style.fontFamily = "Verdana";
+    t2.style.fill = "rgb(0, 0, 0)";
+    t2.textContent = "Press \"l\" to toggle legend";
+
     e.appendChild(r);
     e.appendChild(t);
+    e.appendChild(t2);
     e.style.display = "none";
     svg.appendChild(e);
 
@@ -176,7 +187,7 @@ function color_insert_legend(e) {
 }
 
 function color_legend_entry(e, i, color, text) {
-    let y = (fg_frameheight * 2) + (i + 1) * fg_frameheight * 1.5;
+    let y = (fg_frameheight * 2.3) + (i + 1) * fg_frameheight * 1.5;
 
     let box = document.createElementNS("http://www.w3.org/2000/svg", "rect");
     box.x.baseVal.value = xpad;
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index cc09b66d8101..0f79a98ae683 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -399,8 +399,10 @@ function graph_popup_fix_width(e, right_justify) {
             max_label_end = label_end;
         }
     }
-    let title = e.getElementsByClassName("title")[0];
-    title.x.baseVal.value = max_label_end / 2;
+    let titles = e.getElementsByClassName("title");
+    for (const title of titles) {
+        title.x.baseVal.value = max_label_end / 2;
+    }
     let popup = e.getElementsByClassName("popup")[0];
     popup.width.baseVal.value = max_label_end;
     if (right_justify) {

From 3f8f0481eb2a5d5b2b4e75e4d6e023b2009046e6 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 11:41:39 +0100
Subject: [PATCH 160/681] Improve text shown at bottom of graph.

---
 .../truffle/tools/profiler/impl/resources/graphowner.js    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 0f79a98ae683..95c1333d5c5d 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -26,8 +26,11 @@
 // highlighting and info text
 
 function s(node) {        // show
-    let info = title(node);
-    flamegraph_details.nodeValue = "function: " + info;
+    let sample = sample_for_id(node.getAttribute("id").substring(2));
+    let name = name_for_sample(sample)
+    flamegraph_details.textContent = name + " (" + languageNames[sample.l] + ") - " +
+        "(Self:" + (sample.i + sample.c) + " samples " +
+        "Total: " + (sample.h) + " samples)";
 }
 
 function c(node) {            // clear

From e3421d145b0af0c075bd3c160fbee3d72a14ecc2 Mon Sep 17 00:00:00 2001
From: Aleksandar Prokopec <aleksandar.prokopec@oracle.com>
Date: Mon, 27 Sep 2021 12:50:21 +0200
Subject: [PATCH 161/681] Add changelog entries for GraalWasm 21.3.0 release.

---
 wasm/CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/wasm/CHANGELOG.md b/wasm/CHANGELOG.md
index e6e83856aa7e..1737d16dbd21 100644
--- a/wasm/CHANGELOG.md
+++ b/wasm/CHANGELOG.md
@@ -3,3 +3,24 @@
 This changelog summarizes major changes to the WebAssembly engine implemented in GraalVM (GraalWasm).
 
 ## Version 21.3.0
+
+* (GR-32924) Add support for importing and exporting mutable globals to GraalWasm,
+  as defined by the respective WebAssembly proposal:
+  https://github.com/WebAssembly/mutable-global/blob/master/proposals/mutable-global/Overview.md
+* (GR-26941) Ensure that the module is completely validated when it is first parsed,
+  instead of being validated late, during linking and instantiation. 
+  All validation errors are now properly reported when `Context#eval` from the Polyglot API is invoked,
+  and similarly when invoking `WebAssembly.validate` from the JS-WebAssembly Interface API.
+* (GR-33183) Memory-access performance is improved by avoiding a branch due to a out-of-bounds check.
+* (GR-32714) Loop-profiling in GraalWasm was made more accurate to enable more loop optimizations.
+* (GR-33227) Change the Interop objects in GraalWasm to allow object-caching in the
+  JS-WebAssembly Interface: https://webassembly.github.io/spec/js-api/index.html#object-caches
+* (GR-32356) Fix bug in which memory or table initialization could lead to an integer overflow.
+* (GR-33296) Notify JavaScript when the memory grows (i.e. `mem_grow` instruction executes).
+  This improves the compliance of the JS-WebAssembly Interface API.
+* (GR-33333) Add support for `BigInt`-to-`i64` conversion in the JS-WebAssembly Interface API:
+  https://github.com/WebAssembly/JS-BigInt-integration
+* (GR-32590) Improve internal design of GraalWasm to make JS-WebAssembly Interface API
+  more compliant.
+
+

From fabb4bf858cc5f4a3b0624c5d13ba211ec7ccce4 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:16:06 +0200
Subject: [PATCH 162/681] Avoid createCallTarget() in Truffle polyglot.

---
 .../truffle/polyglot/HostToGuestRootNode.java |  6 -----
 .../truffle/polyglot/PolyglotEngineImpl.java  |  2 +-
 .../truffle/polyglot/PolyglotFunction.java    |  2 +-
 .../PolyglotFunctionProxyHandler.java         |  2 +-
 .../truffle/polyglot/PolyglotIterable.java    |  4 ++--
 .../truffle/polyglot/PolyglotIterator.java    |  6 ++---
 .../polyglot/PolyglotLanguageInstance.java    |  3 +--
 .../oracle/truffle/polyglot/PolyglotList.java | 14 +++++-------
 .../oracle/truffle/polyglot/PolyglotMap.java  | 22 ++++++++-----------
 .../truffle/polyglot/PolyglotMapEntry.java    | 10 +++------
 .../polyglot/PolyglotObjectProxyHandler.java  |  2 +-
 .../polyglot/PolyglotValueDispatch.java       |  3 +--
 12 files changed, 28 insertions(+), 48 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/HostToGuestRootNode.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/HostToGuestRootNode.java
index 50ca69331d49..362b85221831 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/HostToGuestRootNode.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/HostToGuestRootNode.java
@@ -40,10 +40,8 @@
  */
 package com.oracle.truffle.polyglot;
 
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -151,10 +149,6 @@ private <E extends Throwable> E handleException(PolyglotLanguageContext language
 
     protected abstract Object executeImpl(PolyglotLanguageContext languageContext, Object receiver, Object[] args);
 
-    protected static CallTarget createTarget(HostToGuestRootNode node) {
-        return Truffle.getRuntime().createCallTarget(node);
-    }
-
     static <T> T installHostCodeCache(PolyglotLanguageContext languageContext, Object key, T value, Class<T> expectedType) {
         T result = expectedType.cast(languageContext.getLanguageInstance().hostToGuestCodeCache.putIfAbsent(key, value));
         if (result != null) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
index 5918313ebc90..7445dfed8b22 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
@@ -355,7 +355,7 @@ private PolyglotLanguage[] createLanguageStaticIndex() {
     private static UncachedLocationNode createUncachedLocation(TruffleLanguage<?> hostLanguage) {
         UncachedLocationNode location = new UncachedLocationNode(hostLanguage);
         // this is intended to trigger Truffle runtime initialization in the background
-        Truffle.getRuntime().createCallTarget(location);
+        location.getCallTarget();
         return location;
     }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunction.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunction.java
index a95b327a521d..f85c21fbcecd 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunction.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunction.java
@@ -170,7 +170,7 @@ private static CallTarget lookup(PolyglotLanguageContext languageContext, Class<
             Apply apply = new Apply(receiverClass, returnClass, returnType, paramClass, paramType);
             CallTarget target = lookupHostCodeCache(languageContext, apply, CallTarget.class);
             if (target == null) {
-                target = installHostCodeCache(languageContext, apply, createTarget(apply), CallTarget.class);
+                target = installHostCodeCache(languageContext, apply, apply.getCallTarget(), CallTarget.class);
             }
             return target;
         }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunctionProxyHandler.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunctionProxyHandler.java
index 0eb056327a8a..1715e3e2ab4e 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunctionProxyHandler.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotFunctionProxyHandler.java
@@ -255,7 +255,7 @@ static CallTarget lookup(PolyglotLanguageContext languageContext, Class<?> recei
             FunctionProxyNode node = FunctionProxyNodeGen.create(receiverClass, method);
             CallTarget target = lookupHostCodeCache(languageContext, node, CallTarget.class);
             if (target == null) {
-                target = installHostCodeCache(languageContext, node, createTarget(node), CallTarget.class);
+                target = installHostCodeCache(languageContext, node, node.getCallTarget(), CallTarget.class);
             }
             return target;
         }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterable.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterable.java
index 87651c5f24b4..e0b57e270723 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterable.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterable.java
@@ -121,8 +121,8 @@ private Cache(Class<?> receiverClass, Class<?> valueClass, Type valueType) {
             this.receiverClass = receiverClass;
             this.valueClass = valueClass;
             this.valueType = valueType;
-            this.getIterator = HostToGuestRootNode.createTarget(GetIteratorNodeGen.create(this));
-            this.apply = HostToGuestRootNode.createTarget(new Apply(this));
+            this.getIterator = GetIteratorNodeGen.create(this).getCallTarget();
+            this.apply = new Apply(this).getCallTarget();
             this.iteratorType = new ParameterizedIteratorType(valueType);
         }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterator.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterator.java
index f375440c1cad..9050be8b613e 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterator.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotIterator.java
@@ -168,9 +168,9 @@ private Cache(Class<?> receiverClass, Class<?> valueClass, Type valueType) {
             this.receiverClass = receiverClass;
             this.valueClass = valueClass;
             this.valueType = valueType;
-            this.hasNext = HostToGuestRootNode.createTarget(HasNextNodeGen.create(this));
-            this.next = HostToGuestRootNode.createTarget(NextNodeGen.create(this));
-            this.apply = HostToGuestRootNode.createTarget(new Apply(this));
+            this.hasNext = HasNextNodeGen.create(this).getCallTarget();
+            this.next = NextNodeGen.create(this).getCallTarget();
+            this.apply = new Apply(this).getCallTarget();
         }
 
         static Cache lookup(PolyglotLanguageContext languageContext, Class<?> receiverClass, Class<?> valueClass, Type valueType) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageInstance.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageInstance.java
index a3b0146faaad..214af67e179e 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageInstance.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageInstance.java
@@ -52,7 +52,6 @@
 import org.graalvm.polyglot.Source;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -105,7 +104,7 @@ CallTarget lookupCallTarget(Class<? extends RootNode> rootNodeClass) {
     }
 
     CallTarget installCallTarget(RootNode rootNode) {
-        return callTargetCache.computeIfAbsent(rootNode.getClass(), (r) -> Truffle.getRuntime().createCallTarget(rootNode));
+        return callTargetCache.computeIfAbsent(rootNode.getClass(), (r) -> rootNode.getCallTarget());
     }
 
     public PolyglotEngineImpl getEngine() {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotList.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotList.java
index 7d3ccc97a277..563650e08c6c 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotList.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotList.java
@@ -158,15 +158,11 @@ static final class Cache {
             this.receiverClass = receiverClass;
             this.valueClass = valueClass;
             this.valueType = valueType;
-            this.get = initializeCall(PolyglotListFactory.CacheFactory.GetNodeGen.create(this));
-            this.size = initializeCall(SizeNodeGen.create(this));
-            this.set = initializeCall(SetNodeGen.create(this));
-            this.remove = initializeCall(RemoveNodeGen.create(this));
-            this.apply = initializeCall(new Apply(this));
-        }
-
-        private static CallTarget initializeCall(PolyglotListNode node) {
-            return HostToGuestRootNode.createTarget(node);
+            this.get = PolyglotListFactory.CacheFactory.GetNodeGen.create(this).getCallTarget();
+            this.size = SizeNodeGen.create(this).getCallTarget();
+            this.set = SetNodeGen.create(this).getCallTarget();
+            this.remove = RemoveNodeGen.create(this).getCallTarget();
+            this.apply = new Apply(this).getCallTarget();
         }
 
         static Cache lookup(PolyglotLanguageContext languageContext, Class<?> receiverClass, Class<?> valueClass, Type valueType) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMap.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMap.java
index b92fb51ddc0a..b153b85eea46 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMap.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMap.java
@@ -402,19 +402,15 @@ static final class Cache {
             this.valueType = valueType;
             this.memberKey = keyClass == Object.class || keyClass == String.class || keyClass == CharSequence.class;
             this.numberKey = keyClass == Object.class || keyClass == Number.class || keyClass == Integer.class || keyClass == Long.class || keyClass == Short.class || keyClass == Byte.class;
-            this.get = initializeCall(PolyglotMapFactory.CacheFactory.GetNodeGen.create(this));
-            this.containsKey = initializeCall(PolyglotMapFactory.CacheFactory.ContainsKeyNodeGen.create(this));
-            this.entrySet = initializeCall(EntrySetNodeGen.create(this));
-            this.put = initializeCall(PutNodeGen.create(this));
-            this.remove = initializeCall(PolyglotMapFactory.CacheFactory.RemoveNodeGen.create(this));
-            this.removeBoolean = initializeCall(RemoveBooleanNodeGen.create(this));
-            this.hashEntriesIterator = initializeCall(HashEntriesIteratorNodeGen.create(this));
-            this.hashSize = initializeCall(HashSizeNodeGen.create(this));
-            this.apply = initializeCall(new Apply(this));
-        }
-
-        private static CallTarget initializeCall(PolyglotMapNode node) {
-            return HostToGuestRootNode.createTarget(node);
+            this.get = PolyglotMapFactory.CacheFactory.GetNodeGen.create(this).getCallTarget();
+            this.containsKey = PolyglotMapFactory.CacheFactory.ContainsKeyNodeGen.create(this).getCallTarget();
+            this.entrySet = EntrySetNodeGen.create(this).getCallTarget();
+            this.put = PutNodeGen.create(this).getCallTarget();
+            this.remove = PolyglotMapFactory.CacheFactory.RemoveNodeGen.create(this).getCallTarget();
+            this.removeBoolean = RemoveBooleanNodeGen.create(this).getCallTarget();
+            this.hashEntriesIterator = HashEntriesIteratorNodeGen.create(this).getCallTarget();
+            this.hashSize = HashSizeNodeGen.create(this).getCallTarget();
+            this.apply = new Apply(this).getCallTarget();
         }
 
         static Cache lookup(PolyglotLanguageContext languageContext, Class<?> receiverClass, Class<?> keyClass, Type keyType, Class<?> valueClass, Type valueType) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMapEntry.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMapEntry.java
index 8795064fe88e..1b1133fef7ba 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMapEntry.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotMapEntry.java
@@ -144,13 +144,9 @@ static final class Cache {
             this.keyType = keyType;
             this.valueClass = valueClass;
             this.valueType = valueType;
-            this.getKey = initializeCall(PolyglotMapEntryFactory.CacheFactory.GetNodeGen.create(this, "getKey", 0, keyClass, keyType));
-            this.getValue = initializeCall(PolyglotMapEntryFactory.CacheFactory.GetNodeGen.create(this, "getValue", 1, valueClass, valueType));
-            this.apply = initializeCall(new Apply(this));
-        }
-
-        private static CallTarget initializeCall(PolyglotMapEntry.Cache.PolyglotMapEntryNode node) {
-            return HostToGuestRootNode.createTarget(node);
+            this.getKey = PolyglotMapEntryFactory.CacheFactory.GetNodeGen.create(this, "getKey", 0, keyClass, keyType).getCallTarget();
+            this.getValue = PolyglotMapEntryFactory.CacheFactory.GetNodeGen.create(this, "getValue", 1, valueClass, valueType).getCallTarget();
+            this.apply = new Apply(this).getCallTarget();
         }
 
         static PolyglotMapEntry.Cache lookup(PolyglotLanguageContext languageContext, Class<?> receiverClass,
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotObjectProxyHandler.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotObjectProxyHandler.java
index d072e09b66b3..f5f635e7c1e0 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotObjectProxyHandler.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotObjectProxyHandler.java
@@ -168,7 +168,7 @@ static CallTarget lookup(PolyglotLanguageContext languageContext, Class<?> recei
             ObjectProxyNode node = new ObjectProxyNode(receiverClass, interfaceClass);
             CallTarget target = lookupHostCodeCache(languageContext, node, CallTarget.class);
             if (target == null) {
-                target = installHostCodeCache(languageContext, node, createTarget(node), CallTarget.class);
+                target = installHostCodeCache(languageContext, node, node.getCallTarget(), CallTarget.class);
             }
             return target;
         }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
index b0879dce2736..d91475da8fd3 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
@@ -67,7 +67,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.ArityException;
@@ -1601,7 +1600,7 @@ public String getMetaSimpleName(Object languageContext, Object receiver) {
     }
 
     static CallTarget createTarget(InteropNode root) {
-        CallTarget target = Truffle.getRuntime().createCallTarget(root);
+        CallTarget target = root.getCallTarget();
         Class<?>[] types = root.getArgumentTypes();
         if (types != null) {
             RUNTIME.initializeProfile(target, types);

From 65b28e7c8d8d0063fa89a2658fcd799a2ebae3af Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:16:20 +0200
Subject: [PATCH 163/681] Avoid createCallTarget() in Truffle host.

---
 .../truffle/host/GuestToHostCodeCache.java    | 121 +++++++++---------
 .../truffle/host/GuestToHostRootNode.java     |   5 -
 .../com/oracle/truffle/host/HostLanguage.java |   5 +-
 3 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostCodeCache.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostCodeCache.java
index e3fa175edde6..458150273424 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostCodeCache.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostCodeCache.java
@@ -40,8 +40,6 @@
  */
 package com.oracle.truffle.host;
 
-import static com.oracle.truffle.host.GuestToHostRootNode.createGuestToHost;
-
 import java.lang.invoke.MethodHandle;
 import java.time.Duration;
 import java.time.Instant;
@@ -50,8 +48,6 @@
 import java.time.ZoneId;
 import java.util.NoSuchElementException;
 
-import com.oracle.truffle.api.interop.InteropException;
-import com.oracle.truffle.api.interop.StopIterationException;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.ProxyArray;
 import org.graalvm.polyglot.proxy.ProxyDate;
@@ -69,9 +65,11 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleOptions;
+import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.interop.StopIterationException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.host.HostMethodDesc.SingleMethod;
 import com.oracle.truffle.host.HostMethodDesc.SingleMethod.MHBase;
@@ -84,7 +82,7 @@ final class GuestToHostCodeCache {
         this.language = language;
     }
 
-    final CallTarget methodHandleHostInvoke = GuestToHostRootNode.createGuestToHost(new GuestToHostRootNode(HostObject.class, "doInvoke") {
+    final CallTarget methodHandleHostInvoke = new GuestToHostRootNode(HostObject.class, "doInvoke") {
         @Override
         protected Object executeImpl(Object receiver, Object[] callArguments) {
             if (TruffleOptions.AOT) {
@@ -101,9 +99,9 @@ protected Object executeImpl(Object receiver, Object[] callArguments) {
             }
             return ret;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget reflectionHostInvoke = GuestToHostRootNode.createGuestToHost(new GuestToHostRootNode(HostObject.class, "doInvoke") {
+    final CallTarget reflectionHostInvoke = new GuestToHostRootNode(HostObject.class, "doInvoke") {
         @Override
         protected Object executeImpl(Object obj, Object[] callArguments) {
             SingleMethod.ReflectBase method = (SingleMethod.ReflectBase) callArguments[ARGUMENT_OFFSET];
@@ -116,9 +114,9 @@ protected Object executeImpl(Object obj, Object[] callArguments) {
             }
             return ret;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget execute = createGuestToHost(new GuestToHostRootNode(ProxyExecutable.class, "execute") {
+    final CallTarget execute = new GuestToHostRootNode(ProxyExecutable.class, "execute") {
 
         @Override
         @TruffleBoundary
@@ -129,18 +127,18 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws Unsupporte
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget asPointer = createGuestToHost(new GuestToHostRootNode(ProxyNativeObject.class, "asPointer") {
+    final CallTarget asPointer = new GuestToHostRootNode(ProxyNativeObject.class, "asPointer") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyNativeObject) proxy).asPointer();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget instantiate = createGuestToHost(new GuestToHostRootNode(ProxyInstantiable.class, "newInstance") {
+    final CallTarget instantiate = new GuestToHostRootNode(ProxyInstantiable.class, "newInstance") {
 
         @Override
         @TruffleBoundary
@@ -151,9 +149,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws Unsupporte
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget arrayGet = createGuestToHost(new GuestToHostRootNode(ProxyArray.class, "get") {
+    final CallTarget arrayGet = new GuestToHostRootNode(ProxyArray.class, "get") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArrayIndexException, UnsupportedMessageException {
@@ -171,9 +169,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArr
         private Object boundaryGet(ProxyArray proxy, long index) {
             return proxy.get(index);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget arraySet = createGuestToHost(new GuestToHostRootNode(ProxyArray.class, "set") {
+    final CallTarget arraySet = new GuestToHostRootNode(ProxyArray.class, "set") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArrayIndexException, UnsupportedMessageException {
@@ -192,9 +190,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArr
         private void boundarySet(ProxyArray proxy, long index, Value value) {
             proxy.set(index, value);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget arrayRemove = createGuestToHost(new GuestToHostRootNode(ProxyArray.class, "remove") {
+    final CallTarget arrayRemove = new GuestToHostRootNode(ProxyArray.class, "remove") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArrayIndexException, UnsupportedMessageException {
@@ -212,27 +210,27 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws InvalidArr
         private boolean boundaryRemove(ProxyArray proxy, long index) {
             return proxy.remove(index);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget arraySize = createGuestToHost(new GuestToHostRootNode(ProxyArray.class, "getSize") {
+    final CallTarget arraySize = new GuestToHostRootNode(ProxyArray.class, "getSize") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyArray) proxy).getSize();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget memberKeys = createGuestToHost(new GuestToHostRootNode(ProxyObject.class, "getMemberKeys") {
+    final CallTarget memberKeys = new GuestToHostRootNode(ProxyObject.class, "getMemberKeys") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyObject) proxy).getMemberKeys();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getMember = createGuestToHost(new GuestToHostRootNode(ProxyObject.class, "getMember") {
+    final CallTarget getMember = new GuestToHostRootNode(ProxyObject.class, "getMember") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws UnsupportedMessageException {
@@ -247,9 +245,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws Unsupporte
         private Object boundaryGetMember(ProxyObject proxy, String argument) {
             return proxy.getMember(argument);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget putMember = createGuestToHost(new GuestToHostRootNode(ProxyObject.class, "putMember") {
+    final CallTarget putMember = new GuestToHostRootNode(ProxyObject.class, "putMember") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws UnsupportedMessageException {
@@ -265,9 +263,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws Unsupporte
         private void boundaryPutMember(ProxyObject proxy, String member, Value value) {
             proxy.putMember(member, value);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget removeMember = createGuestToHost(new GuestToHostRootNode(ProxyObject.class, "removeMember") {
+    final CallTarget removeMember = new GuestToHostRootNode(ProxyObject.class, "removeMember") {
 
         @Override
         protected Object executeImpl(Object proxy, Object[] arguments) throws UnsupportedMessageException {
@@ -282,18 +280,18 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws Unsupporte
         private boolean removeBoundary(ProxyObject proxy, String member) {
             return proxy.removeMember(member);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget hasMember = createGuestToHost(new GuestToHostRootNode(ProxyObject.class, "hasMember") {
+    final CallTarget hasMember = new GuestToHostRootNode(ProxyObject.class, "hasMember") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyObject) proxy).hasMember((String) arguments[ARGUMENT_OFFSET]);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget asTimezone = createGuestToHost(new GuestToHostRootNode(ProxyTimeZone.class, "asTimeZone") {
+    final CallTarget asTimezone = new GuestToHostRootNode(ProxyTimeZone.class, "asTimeZone") {
 
         @Override
         @TruffleBoundary
@@ -304,9 +302,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) {
             }
             return zone;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget asDate = createGuestToHost(new GuestToHostRootNode(ProxyDate.class, "asDate") {
+    final CallTarget asDate = new GuestToHostRootNode(ProxyDate.class, "asDate") {
 
         @Override
         @TruffleBoundary
@@ -317,8 +315,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) {
             }
             return date;
         }
-    });
-    final CallTarget asTime = createGuestToHost(new GuestToHostRootNode(ProxyTime.class, "asTime") {
+    }.getCallTarget();
+
+    final CallTarget asTime = new GuestToHostRootNode(ProxyTime.class, "asTime") {
 
         @Override
         @TruffleBoundary
@@ -329,9 +328,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) {
             }
             return time;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget asInstant = createGuestToHost(new GuestToHostRootNode(ProxyInstant.class, "asInstant") {
+    final CallTarget asInstant = new GuestToHostRootNode(ProxyInstant.class, "asInstant") {
 
         @Override
         @TruffleBoundary
@@ -342,9 +341,9 @@ protected Object executeImpl(Object proxy, Object[] arguments) {
             }
             return instant;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget asDuration = createGuestToHost(new GuestToHostRootNode(ProxyDuration.class, "asDuration") {
+    final CallTarget asDuration = new GuestToHostRootNode(ProxyDuration.class, "asDuration") {
 
         @Override
         @TruffleBoundary
@@ -355,27 +354,27 @@ protected Object executeImpl(Object proxy, Object[] arguments) {
             }
             return duration;
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getIterator = createGuestToHost(new GuestToHostRootNode(ProxyIterable.class, "getIterator") {
+    final CallTarget getIterator = new GuestToHostRootNode(ProxyIterable.class, "getIterator") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyIterable) proxy).getIterator();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget hasIteratorNextElement = createGuestToHost(new GuestToHostRootNode(ProxyIterator.class, "hasIteratorNextElement") {
+    final CallTarget hasIteratorNextElement = new GuestToHostRootNode(ProxyIterator.class, "hasIteratorNextElement") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object proxy, Object[] arguments) {
             return ((ProxyIterator) proxy).hasNext();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getIteratorNextElement = createGuestToHost(new GuestToHostRootNode(ProxyIterator.class, "getIteratorNextElement") {
+    final CallTarget getIteratorNextElement = new GuestToHostRootNode(ProxyIterator.class, "getIteratorNextElement") {
 
         @Override
         @TruffleBoundary
@@ -388,27 +387,27 @@ protected Object executeImpl(Object proxy, Object[] arguments) throws StopIterat
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget hasHashEntry = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "hasEntry") {
+    final CallTarget hasHashEntry = new GuestToHostRootNode(ProxyHashMap.class, "hasEntry") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
             return ((ProxyHashMap) receiver).hasHashEntry((Value) arguments[ARGUMENT_OFFSET]);
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getHashSize = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "getSize") {
+    final CallTarget getHashSize = new GuestToHostRootNode(ProxyHashMap.class, "getSize") {
 
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
             return ((ProxyHashMap) receiver).getHashSize();
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getHashValue = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "getValue") {
+    final CallTarget getHashValue = new GuestToHostRootNode(ProxyHashMap.class, "getValue") {
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
@@ -418,9 +417,9 @@ protected Object executeImpl(Object receiver, Object[] arguments) throws Interop
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget putHashEntry = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "putEntry") {
+    final CallTarget putHashEntry = new GuestToHostRootNode(ProxyHashMap.class, "putEntry") {
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
@@ -431,9 +430,9 @@ protected Object executeImpl(Object receiver, Object[] arguments) throws Interop
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget removeHashEntry = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "removeEntry") {
+    final CallTarget removeHashEntry = new GuestToHostRootNode(ProxyHashMap.class, "removeEntry") {
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
@@ -443,13 +442,13 @@ protected Object executeImpl(Object receiver, Object[] arguments) throws Interop
                 throw UnsupportedMessageException.create();
             }
         }
-    });
+    }.getCallTarget();
 
-    final CallTarget getHashEntriesIterator = createGuestToHost(new GuestToHostRootNode(ProxyHashMap.class, "getEntriesIterator") {
+    final CallTarget getHashEntriesIterator = new GuestToHostRootNode(ProxyHashMap.class, "getEntriesIterator") {
         @Override
         @TruffleBoundary
         protected Object executeImpl(Object receiver, Object[] arguments) throws InteropException {
             return ((ProxyHashMap) receiver).getHashEntriesIterator();
         }
-    });
+    }.getCallTarget();
 }
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostRootNode.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostRootNode.java
index 66e5fdb3d5c9..993c67079712 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostRootNode.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/GuestToHostRootNode.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.host;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
@@ -93,10 +92,6 @@ static <E extends Throwable> RuntimeException silenceException(Class<E> type, Th
 
     protected abstract Object executeImpl(Object receiver, Object[] arguments) throws InteropException;
 
-    static CallTarget createGuestToHost(GuestToHostRootNode rootNode) {
-        return Truffle.getRuntime().createCallTarget(rootNode);
-    }
-
     static Object guestToHostCall(Node node, CallTarget target, Object... arguments) {
         Node encapsulatingNode;
         if (node.isAdoptable()) {
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostLanguage.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostLanguage.java
index 05f3cf3797ee..c77631432843 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostLanguage.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostLanguage.java
@@ -51,7 +51,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -176,13 +175,13 @@ protected Object getLanguageView(HostContext hostContext, Object value) {
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
         String sourceString = request.getSource().getCharacters().toString();
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
 
             @Override
             public Object execute(VirtualFrame frame) {
                 return service.findDynamicClass(HostContext.get(this), sourceString);
             }
-        });
+        }.getCallTarget();
     }
 
     static final LanguageReference<HostLanguage> REFERENCE = LanguageReference.create(HostLanguage.class);

From 9066a6f3d2d45f7a3748baf3f32e2bc28dbf7dc8 Mon Sep 17 00:00:00 2001
From: Aleksandar Prokopec <aleksandar.prokopec@oracle.com>
Date: Mon, 27 Sep 2021 13:35:04 +0200
Subject: [PATCH 164/681] Address style comments.

---
 wasm/CHANGELOG.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/wasm/CHANGELOG.md b/wasm/CHANGELOG.md
index 1737d16dbd21..bab45fba70f3 100644
--- a/wasm/CHANGELOG.md
+++ b/wasm/CHANGELOG.md
@@ -4,23 +4,23 @@ This changelog summarizes major changes to the WebAssembly engine implemented in
 
 ## Version 21.3.0
 
-* (GR-32924) Add support for importing and exporting mutable globals to GraalWasm,
+* (GR-32924) Added support for importing and exporting mutable globals to GraalWasm,
   as defined by the respective WebAssembly proposal:
   https://github.com/WebAssembly/mutable-global/blob/master/proposals/mutable-global/Overview.md
-* (GR-26941) Ensure that the module is completely validated when it is first parsed,
-  instead of being validated late, during linking and instantiation. 
+* (GR-26941) Moved the module-validation checks to an earlier stage, so that the module
+  is completely validated during parsing, instead of being validated late, during linking and instantiation.
   All validation errors are now properly reported when `Context#eval` from the Polyglot API is invoked,
   and similarly when invoking `WebAssembly.validate` from the JS-WebAssembly Interface API.
-* (GR-33183) Memory-access performance is improved by avoiding a branch due to a out-of-bounds check.
+* (GR-33183) Memory-access performance was improved by avoiding a branch due to a out-of-bounds check.
 * (GR-32714) Loop-profiling in GraalWasm was made more accurate to enable more loop optimizations.
-* (GR-33227) Change the Interop objects in GraalWasm to allow object-caching in the
+* (GR-33227) Changed the Interop objects in GraalWasm to allow object-caching in the
   JS-WebAssembly Interface: https://webassembly.github.io/spec/js-api/index.html#object-caches
-* (GR-32356) Fix bug in which memory or table initialization could lead to an integer overflow.
-* (GR-33296) Notify JavaScript when the memory grows (i.e. `mem_grow` instruction executes).
+* (GR-32356) Fixed a bug that caused an overflow during memory or table initialization.
+* (GR-33296) Added notifications to JavaScript when the memory grows (i.e., when `mem_grow` instruction executes).
   This improves the compliance of the JS-WebAssembly Interface API.
-* (GR-33333) Add support for `BigInt`-to-`i64` conversion in the JS-WebAssembly Interface API:
+* (GR-33333) Added support for `BigInt`-to-`i64` conversion in the JS-WebAssembly Interface API:
   https://github.com/WebAssembly/JS-BigInt-integration
-* (GR-32590) Improve internal design of GraalWasm to make JS-WebAssembly Interface API
+* (GR-32590) Improved internal implementation of GraalWasm to make JS-WebAssembly Interface API
   more compliant.
 
 

From a708515ef3fda6e74c484770dfcb65c4a46aa47f Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 12:41:05 +0100
Subject: [PATCH 165/681] Fix compiled / interpreted colors.

---
 .../oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index b0ea04e60cfd..d0beb461df43 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -434,7 +434,7 @@ public JSONObject sampleData(ProfilerNode<CPUSampler.Payload> sample, long x) {
             result.put("id", sampleId++);
             result.put("i", sample.getPayload().getTierSelfCount(0));
             int compiledSelfHits = 0;
-            for (int i = 0; i < sample.getPayload().getNumberOfTiers(); i++) {
+            for (int i = 1; i < sample.getPayload().getNumberOfTiers(); i++) {
                 compiledSelfHits += sample.getPayload().getTierSelfCount(i);
             }
             result.put("c", compiledSelfHits);

From 0c72ea2a267cceed41ffe0cac61b39dc1415e936 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 12:49:42 +0100
Subject: [PATCH 166/681] Change help text at top of graph and make legend off
 by default.

---
 .../oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java    | 2 +-
 .../oracle/truffle/tools/profiler/impl/resources/flamegraph.js  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index d0beb461df43..4a26747fd3b6 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -790,7 +790,7 @@ public String drawCanvas(double x, double y) {
             output.append(ttfString(black(), owner.fontName(), owner.fontSize() + 5, width() / 2, owner.fontSize() * 2,
                             "Flamegraph", "middle", "id=\"fg_title\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), width() / 2, owner.fontSize() * 3,
-                            "Press \"?\" for help", "middle", "id=\"fg_help\""));
+                            "Press \"?\" for help, or \"l\" for legend.", "middle", "id=\"fg_help\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), XPAD, owner.fontSize() * 2,
                             "Reset zoom", "", "id=\"unzoom\" onclick=\"unzoom()\" style=\"opacity:0.1;cursor:pointer\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), width() - XPAD, owner.fontSize() * 2,
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 33c906daaf91..183deb9358c4 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -36,7 +36,6 @@ function fg_init(evt) {
     var el = flamegraph.getElementsByTagName("g");
     for(let i=0;i<el.length;i++)
         update_text(el[i]);
-    color_legend();
 }
 
 function fg_element_for_sample(sample) {

From 5ff5508bf3b2b7701b593f18368446aa2e80deee Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 13:33:05 +0100
Subject: [PATCH 167/681] Generate the correct details for histogram entries.

---
 .../profiler/impl/resources/graphowner.js     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 95c1333d5c5d..5d43edab3e37 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -26,11 +26,22 @@
 // highlighting and info text
 
 function s(node) {        // show
-    let sample = sample_for_id(node.getAttribute("id").substring(2));
+    let sample = null;
+    if (node.getAttribute("class") == "func_g") {
+        sample = sample_for_id(node.getAttribute("id").substring(2));
+    } else if (node.getAttribute("class") == "func_h") {
+        sample = histogram_entry_for_id(node.getAttribute("id").substring(2));
+    }
     let name = name_for_sample(sample)
-    flamegraph_details.textContent = name + " (" + languageNames[sample.l] + ") - " +
-        "(Self:" + (sample.i + sample.c) + " samples " +
-        "Total: " + (sample.h) + " samples)";
+    let details = name + " (" + languageNames[sample.l] + ") - ";
+    if (sample.hasOwnProperty("h")) {
+        details = details + "(Self:" + (sample.i + sample.c) + " samples " +
+            "Total: " + (sample.h) + " samples)";
+    } else {
+        details = details + "(" + (sample.i + sample.c) + " samples)";
+    }
+
+    flamegraph_details.textContent = details;
 }
 
 function c(node) {            // clear

From 3a837503e306b6c8fafd040f02b7024a058ab78b Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Mon, 27 Sep 2021 15:48:12 +0300
Subject: [PATCH 168/681] Include no_jlinking option in GraalVM distribution's
 hash encoding

Makes the following two commands return a different GraalVM
distribution:

```
mx --primary-suite-path substratevm graalvm-show
mx --primary-suite-path substratevm --no-jlinking graalvm-show
```
---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 07c320137872..d17455695618 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -958,6 +958,10 @@ def _get_graalvm_configuration(base_name, components=None, stage1=False):
             m = hashlib.sha1()
             for component in components_sorted_set:
                 m.update(_encode(component))
+            if _jlink_libraries():
+                m.update(_encode("jlinked"))
+            else:
+                m.update(_encode("not-jlinked"))
             short_sha1_digest = m.hexdigest()[:10]  # to keep paths short
             base_dir = '{base_name}_{hash}_java{jdk_version}'.format(base_name=base_name, hash=short_sha1_digest, jdk_version=_src_jdk_version)
             name = '{base_dir}{stage_suffix}'.format(base_dir=base_dir, stage_suffix='_stage1' if stage1 else '')

From ac0db4894e9ca029a6ac810c252c7c1d2c542e0f Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 27 Sep 2021 15:18:19 +0100
Subject: [PATCH 169/681] Overwrite profile output files if they already exist.

---
 .../com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
index 2cf63856aff8..879333a6a402 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
@@ -312,9 +312,6 @@ protected static PrintStream chooseOutputStream(TruffleInstrument.Env env, Optio
             if (option.hasBeenSet(env.getOptions())) {
                 final String outputPath = option.getValue(env.getOptions());
                 final File file = new File(outputPath);
-                if (file.exists()) {
-                    throw new IllegalArgumentException("Cannot redirect output to an existing file!");
-                }
                 return new PrintStream(new FileOutputStream(file));
             } else {
                 return new PrintStream(env.out());

From dca89bbec0f8a869178ef3913cc15649dd062690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gergo.barany@oracle.com>
Date: Mon, 27 Sep 2021 17:31:08 +0200
Subject: [PATCH 170/681] Avoid ConcurrentModificationException in GraphUtil

---
 .../src/org/graalvm/compiler/nodes/util/GraphUtil.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
index 0b5e8c8b7923..33fa9efc4c11 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/util/GraphUtil.java
@@ -536,7 +536,7 @@ private static void normalizeLoopBegin(LoopBeginNode begin) {
         for (PhiNode phi : begin.phis().snapshot()) {
             GraphUtil.checkRedundantPhi(phi);
         }
-        for (LoopExitNode exit : begin.loopExits()) {
+        for (LoopExitNode exit : begin.loopExits().snapshot()) {
             for (ProxyNode vpn : exit.proxies().snapshot()) {
                 GraphUtil.checkRedundantProxy(vpn);
             }

From 35cdc326041ace8ff23b1fd3b36e97e47ea6c889 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 24 Sep 2021 16:47:25 +0200
Subject: [PATCH 171/681] Make ValueLocation.set throw
 IncompatibleLocationException, not FinalLocationException.

---
 .../truffle/object/basic/test/ConstantLocationTest.java    | 7 ++++---
 .../truffle/object/basic/test/DeclaredLocationTest.java    | 7 ++++---
 .../object/basic/test/LegacyConstantLocationTest.java      | 7 ++++---
 .../object/basic/test/LegacyDeclaredLocationTest.java      | 7 ++++---
 .../src/com/oracle/truffle/object/CoreLocations.java       | 4 ++--
 .../src/com/oracle/truffle/object/Locations.java           | 5 ++---
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/ConstantLocationTest.java b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/ConstantLocationTest.java
index 5813ff0fe4e6..544a08475083 100644
--- a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/ConstantLocationTest.java
+++ b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/ConstantLocationTest.java
@@ -43,6 +43,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -100,8 +101,8 @@ public void testConstantLocation() {
         try {
             property.set(object, newValue, shapeWithConstant);
             Assert.fail();
-        } catch (FinalLocationException | IncompatibleLocationException e) {
-            Assert.assertTrue(e instanceof FinalLocationException);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
 
         Assert.assertSame(value, library.getOrDefault(object, "constant", null));
@@ -143,7 +144,7 @@ public void testAddConstantLocation() {
             property.set(object2, newValue, rootShape, shapeWithConstant);
             Assert.fail();
         } catch (IncompatibleLocationException e) {
-            // Expected
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
         Assert.assertSame(rootShape, object2.getShape());
         Assert.assertEquals(false, library.containsKey(object2, "constant"));
diff --git a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DeclaredLocationTest.java b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DeclaredLocationTest.java
index 5946a9e949d9..7d8959904a9e 100644
--- a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DeclaredLocationTest.java
+++ b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/DeclaredLocationTest.java
@@ -43,6 +43,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -100,8 +101,8 @@ public void testDeclaredLocation() {
         try {
             property.set(object, newValue, shapeWithDeclared);
             Assert.fail();
-        } catch (FinalLocationException | IncompatibleLocationException e) {
-            Assert.assertTrue(e instanceof FinalLocationException);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
 
         Assert.assertSame(value, library.getOrDefault(object, "declared", null));
@@ -143,7 +144,7 @@ public void testAddDeclaredLocation() {
             property.set(object2, newValue, rootShape, shapeWithDeclared);
             Assert.fail();
         } catch (IncompatibleLocationException e) {
-            // Expected
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
         Assert.assertSame(rootShape, object2.getShape());
         Assert.assertEquals(false, library.containsKey(object2, "declared"));
diff --git a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyConstantLocationTest.java b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyConstantLocationTest.java
index edbc1fec1766..7034da727042 100644
--- a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyConstantLocationTest.java
+++ b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyConstantLocationTest.java
@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.object.basic.test;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -83,8 +84,8 @@ public void testConstantLocation() {
         try {
             property.set(object, newValue, shapeWithConstant);
             Assert.fail();
-        } catch (FinalLocationException | IncompatibleLocationException e) {
-            Assert.assertTrue(e instanceof FinalLocationException);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
 
         Assert.assertSame(value, object.get("constant"));
@@ -119,7 +120,7 @@ public void testAddConstantLocation() {
             property.set(object2, newValue, rootShape, shapeWithConstant);
             Assert.fail();
         } catch (IncompatibleLocationException e) {
-            // Expected
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
         Assert.assertSame(rootShape, object2.getShape());
         Assert.assertEquals(false, object2.containsKey("constant"));
diff --git a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyDeclaredLocationTest.java b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyDeclaredLocationTest.java
index 60a51f77682f..e4febd05afa3 100644
--- a/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyDeclaredLocationTest.java
+++ b/truffle/src/com.oracle.truffle.object.basic.test/src/com/oracle/truffle/object/basic/test/LegacyDeclaredLocationTest.java
@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.object.basic.test;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -83,8 +84,8 @@ public void testDeclaredLocation() {
         try {
             property.set(object, newValue, shapeWithDeclared);
             Assert.fail();
-        } catch (FinalLocationException | IncompatibleLocationException e) {
-            Assert.assertTrue(e instanceof FinalLocationException);
+        } catch (IncompatibleLocationException | FinalLocationException e) {
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
 
         Assert.assertSame(value, object.get("declared"));
@@ -119,7 +120,7 @@ public void testAddDeclaredLocation() {
             property.set(object2, newValue, rootShape, shapeWithDeclared);
             Assert.fail();
         } catch (IncompatibleLocationException e) {
-            // Expected
+            Assert.assertThat(e, CoreMatchers.instanceOf(IncompatibleLocationException.class));
         }
         Assert.assertSame(rootShape, object2.getShape());
         Assert.assertEquals(false, object2.containsKey("declared"));
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
index a88467793811..93e5c4d6fbd6 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
@@ -256,13 +256,13 @@ public boolean canStore(Object val) {
         }
 
         @Override
-        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (!canStore(value)) {
                 if (init) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     throw new UnsupportedOperationException();
                 } else {
-                    throw finalLocation();
+                    throw incompatibleLocation();
                 }
             }
         }
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
index 649f765c3c10..933197736736 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/Locations.java
@@ -44,7 +44,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.FinalLocationException;
 import com.oracle.truffle.api.object.IncompatibleLocationException;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Property;
@@ -107,13 +106,13 @@ public boolean canStore(Object val) {
         }
 
         @Override
-        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+        public final void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException {
             if (!canStore(value)) {
                 if (init) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
                     throw new UnsupportedOperationException();
                 } else {
-                    throw finalLocation();
+                    throw incompatibleLocation();
                 }
             }
         }

From 3dd6c84ea0a22f972e28e20710e876862018f9fe Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 24 Sep 2021 16:58:00 +0200
Subject: [PATCH 172/681] LocationImpl.set no longer throws
 FinalLocationException.

---
 .../oracle/truffle/object/CoreLocations.java  | 17 ++++++------
 .../oracle/truffle/object/LocationImpl.java   | 26 +++++++------------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
index 93e5c4d6fbd6..266d33c37e79 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/CoreLocations.java
@@ -48,7 +48,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.FinalLocationException;
 import com.oracle.truffle.api.object.IncompatibleLocationException;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.Property;
@@ -100,12 +99,12 @@ default int getInt(DynamicObject store, Shape shape) {
         }
 
         @Override
-        default void setInt(DynamicObject store, int value, Shape shape) throws FinalLocationException {
+        default void setInt(DynamicObject store, int value, Shape shape) {
             setInt(store, value, store.getShape() == shape, false);
         }
 
         @Override
-        default void setInt(DynamicObject store, int value) throws FinalLocationException {
+        default void setInt(DynamicObject store, int value) {
             setInt(store, value, false, false);
         }
 
@@ -136,12 +135,12 @@ default long getLong(DynamicObject store, Shape shape) {
         }
 
         @Override
-        default void setLong(DynamicObject store, long value, Shape shape) throws FinalLocationException {
+        default void setLong(DynamicObject store, long value, Shape shape) {
             setLong(store, value, store.getShape() == shape, false);
         }
 
         @Override
-        default void setLong(DynamicObject store, long value) throws FinalLocationException {
+        default void setLong(DynamicObject store, long value) {
             setLong(store, value, false, false);
         }
 
@@ -172,12 +171,12 @@ default double getDouble(DynamicObject store, Shape shape) {
         }
 
         @Override
-        default void setDouble(DynamicObject store, double value, Shape shape) throws FinalLocationException {
+        default void setDouble(DynamicObject store, double value, Shape shape) {
             setDouble(store, value, store.getShape() == shape, false);
         }
 
         @Override
-        default void setDouble(DynamicObject store, double value) throws FinalLocationException {
+        default void setDouble(DynamicObject store, double value) {
             setDouble(store, value, false, false);
         }
 
@@ -206,12 +205,12 @@ default boolean getBoolean(DynamicObject store, Shape shape) {
         }
 
         @Override
-        default void setBoolean(DynamicObject store, boolean value, Shape shape) throws FinalLocationException {
+        default void setBoolean(DynamicObject store, boolean value, Shape shape) {
             setBoolean(store, value, store.getShape() == shape, false);
         }
 
         @Override
-        default void setBoolean(DynamicObject store, boolean value) throws FinalLocationException {
+        default void setBoolean(DynamicObject store, boolean value) {
             setBoolean(store, value, false, false);
         }
 
diff --git a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
index dbf67e3751c6..d480f864d544 100644
--- a/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
+++ b/truffle/src/com.oracle.truffle.object/src/com/oracle/truffle/object/LocationImpl.java
@@ -45,7 +45,6 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.FinalLocationException;
 import com.oracle.truffle.api.object.IncompatibleLocationException;
 import com.oracle.truffle.api.object.Location;
 import com.oracle.truffle.api.object.LongLocation;
@@ -86,7 +85,7 @@ public interface LocationVisitor {
 
     /** @since 0.17 or earlier */
     @Override
-    public void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
+    public void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException {
         set(store, value, checkShape(store, shape), false);
     }
 
@@ -155,16 +154,15 @@ protected boolean getBoolean(DynamicObject store, boolean guard) throws Unexpect
      * @param guard the result of the shape check guarding this property write or {@code false}.
      * @param init if true, this is the initial assignment of a property location; ignore final.
      * @throws IncompatibleLocationException if the value cannot be stored in this storage location.
-     * @throws FinalLocationException if the property location is effectively final and init=false.
      * @see #setSafe(DynamicObject, Object, boolean, boolean)
      */
-    protected abstract void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException;
+    protected abstract void set(DynamicObject store, Object value, boolean guard, boolean init) throws IncompatibleLocationException;
 
     /**
      * @see #set(DynamicObject, Object, boolean, boolean)
      * @see #setIntSafe(DynamicObject, int, boolean, boolean)
      */
-    protected void setInt(DynamicObject store, int value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+    protected void setInt(DynamicObject store, int value, boolean guard, boolean init) throws IncompatibleLocationException {
         set(store, value, guard, init);
     }
 
@@ -172,7 +170,7 @@ protected void setInt(DynamicObject store, int value, boolean guard, boolean ini
      * @see #set(DynamicObject, Object, boolean, boolean)
      * @see #setLongSafe(DynamicObject, long, boolean, boolean)
      */
-    protected void setLong(DynamicObject store, long value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+    protected void setLong(DynamicObject store, long value, boolean guard, boolean init) throws IncompatibleLocationException {
         set(store, value, guard, init);
     }
 
@@ -180,7 +178,7 @@ protected void setLong(DynamicObject store, long value, boolean guard, boolean i
      * @see #set(DynamicObject, Object, boolean, boolean)
      * @see #setDoubleSafe(DynamicObject, double, boolean, boolean)
      */
-    protected void setDouble(DynamicObject store, double value, boolean guard, boolean init) throws IncompatibleLocationException, FinalLocationException {
+    protected void setDouble(DynamicObject store, double value, boolean guard, boolean init) throws IncompatibleLocationException {
         set(store, value, guard, init);
     }
 
@@ -194,11 +192,7 @@ protected static final boolean checkShape(DynamicObject store, Shape shape) {
     /** @since 0.17 or earlier */
     @Override
     protected final void setInternal(DynamicObject store, Object value) throws IncompatibleLocationException {
-        try {
-            set(store, value, false, true);
-        } catch (FinalLocationException e) {
-            throw shouldNotHappen(e);
-        }
+        set(store, value, false, true);
     }
 
     /** @since 0.17 or earlier */
@@ -332,7 +326,7 @@ static boolean isSameLocation(LocationImpl loc1, LocationImpl loc2) {
     protected final void setSafe(DynamicObject store, Object value, boolean guard, boolean init) {
         try {
             set(store, value, guard, init);
-        } catch (IncompatibleLocationException | FinalLocationException e) {
+        } catch (IncompatibleLocationException e) {
             throw shouldNotHappen(e);
         }
     }
@@ -343,7 +337,7 @@ protected final void setSafe(DynamicObject store, Object value, boolean guard, b
     protected final void setIntSafe(DynamicObject store, int value, boolean guard, boolean init) {
         try {
             setInt(store, value, guard, init);
-        } catch (IncompatibleLocationException | FinalLocationException e) {
+        } catch (IncompatibleLocationException e) {
             throw shouldNotHappen(e);
         }
     }
@@ -354,7 +348,7 @@ protected final void setIntSafe(DynamicObject store, int value, boolean guard, b
     protected final void setLongSafe(DynamicObject store, long value, boolean guard, boolean init) {
         try {
             setLong(store, value, guard, init);
-        } catch (IncompatibleLocationException | FinalLocationException e) {
+        } catch (IncompatibleLocationException e) {
             throw shouldNotHappen(e);
         }
     }
@@ -365,7 +359,7 @@ protected final void setLongSafe(DynamicObject store, long value, boolean guard,
     protected final void setDoubleSafe(DynamicObject store, double value, boolean guard, boolean init) {
         try {
             setDouble(store, value, guard, init);
-        } catch (IncompatibleLocationException | FinalLocationException e) {
+        } catch (IncompatibleLocationException e) {
             throw shouldNotHappen(e);
         }
     }

From 61537f5a55c47b8da97d94c93148a19387b67795 Mon Sep 17 00:00:00 2001
From: Cosmin Basca <cosmin.basca@oracle.com>
Date: Mon, 27 Sep 2021 18:39:16 +0200
Subject: [PATCH 173/681] mx_vm_benchmark.py: hardcode and fix name of host-vm
 field when measuring binary file sizes

---
 vm/mx.vm/mx_vm_benchmark.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vm/mx.vm/mx_vm_benchmark.py b/vm/mx.vm/mx_vm_benchmark.py
index c4f1a44f76bd..9101e681b099 100644
--- a/vm/mx.vm/mx_vm_benchmark.py
+++ b/vm/mx.vm/mx_vm_benchmark.py
@@ -1063,6 +1063,9 @@ def get_vm_registry(self):
         return _polybench_vm_registry
 
     def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
+        from mx_sdk_vm import graalvm_components, GraalVmLanguage, GraalVmJreComponent
+        from mx_sdk_vm_impl import get_native_image_locations, has_component
+
         vm = self.get_vm_registry().get_vm_from_suite_args(bmSuiteArgs)
         vm.extract_vm_info(self.vmArgs(bmSuiteArgs))
         host_vm = None
@@ -1071,15 +1074,13 @@ def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
             assert host_vm
         dims = {
             "vm": vm.name(),
-            "host-vm": host_vm.name() if host_vm else vm.name(),
+            # the host-vm is hardcoded to one of the accepted names of the field
+            "host-vm": 'graalvm-ee' if has_component('svmee') else 'graalvm-ce',
             "host-vm-config": self.host_vm_config_name(host_vm, vm),
             "guest-vm": vm.name() if host_vm else "none",
             "guest-vm-config": self.guest_vm_config_name(host_vm, vm),
         }
 
-        from mx_sdk_vm import graalvm_components, GraalVmLanguage, GraalVmJreComponent
-        from mx_sdk_vm_impl import get_native_image_locations
-
         out = ""
         for gcomponent in graalvm_components():
             sz_msg = None

From 43535a7d5014814309d9833690c0d71a93a10560 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 27 Sep 2021 18:42:52 +0200
Subject: [PATCH 174/681] Fix JVMCI reserved field method lookup did not find
 accessor method on JDK >= 11; Add test to validate all JVMCI features are
 available in the gate.

---
 .../hotspot/AbstractHotSpotTruffleRuntime.java    | 15 +++++++++++++--
 .../truffle/runtime/GraalTruffleRuntime.java      |  4 ++++
 .../test/ContextLookupCompilationTest.java        | 13 +++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
index ae911adc5ed9..2cf0b48d2099 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
@@ -181,9 +181,9 @@ public AbstractHotSpotTruffleRuntime() {
             installReservedOopMethods(null);
 
             try {
-                setReservedReference0 = MethodHandles.publicLookup().findVirtual(HotSpotJVMCIRuntime.class,
+                setReservedReference0 = MethodHandles.lookup().findVirtual(HotSpotJVMCIRuntime.class,
                                 "setThreadLocalObject", MethodType.methodType(void.class, int.class, Object.class));
-                getReservedReference0 = MethodHandles.publicLookup().findVirtual(HotSpotJVMCIRuntime.class,
+                getReservedReference0 = MethodHandles.lookup().findVirtual(HotSpotJVMCIRuntime.class,
                                 "getThreadLocalObject", MethodType.methodType(Object.class, int.class));
             } catch (NoSuchMethodException | IllegalAccessException e) {
                 /*
@@ -268,6 +268,17 @@ public void accept(CompilationTask task) {
         }
     }
 
+    @Override
+    public boolean isLatestJVMCI() {
+        if (getJVMCIReservedReference0 == null) {
+            return false;
+        }
+        if (getJVMCIReservedLongOffset0() == -1) {
+            return false;
+        }
+        return true;
+    }
+
     /*
      * Used reflectively in CompilerInitializationTest.
      */
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index ca53b6c4e9ba..5adb60c3040a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -186,6 +186,10 @@ public GraalTruffleRuntime(Iterable<Class<?>> extraLookupTypes) {
         this.floodControlHandler = loadGraalRuntimeServiceProvider(FloodControlHandler.class, null, false);
     }
 
+    public boolean isLatestJVMCI() {
+        return true;
+    }
+
     public abstract ThreadLocalHandshake getThreadLocalHandshake();
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
index 393d7ea59abd..e4149a45b545 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
@@ -36,11 +36,13 @@
 import org.graalvm.compiler.nodes.FieldLocationIdentity;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.word.LocationIdentity;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CompilerAsserts;
@@ -48,6 +50,7 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.ContextLocal;
 import com.oracle.truffle.api.ContextThreadLocal;
+import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
@@ -92,6 +95,16 @@ private static Context enter(Context context) {
         return context;
     }
 
+    /*
+     * This test verifies that JVMCI has all the features it needs for a GraalTruffleRuntime.
+     */
+    @Test
+    public void testJVMCIIsLatest() {
+        Assume.assumeTrue(Truffle.getRuntime() instanceof GraalTruffleRuntime);
+        GraalTruffleRuntime runtime = (GraalTruffleRuntime) Truffle.getRuntime();
+        assertTrue(runtime.isLatestJVMCI());
+    }
+
     @Test
     public void testContextLocalRead() {
         Engine engine = Engine.create();

From bb3f0d13bd4478776e2f4101b4d710eb26e9b9d8 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Tue, 21 Sep 2021 11:34:05 -0700
Subject: [PATCH 175/681] Be more strict about InputType.Memory

---
 .../compiler/graph/MemoryKillMarker.java      | 33 +++++++++++++++++++
 .../org/graalvm/compiler/graph/NodeClass.java |  4 +++
 .../replacements/UnsafeCopyMemoryNode.java    | 10 +++---
 .../compiler/nodes/extended/BoxNode.java      |  8 ++---
 .../compiler/nodes/extended/UnboxNode.java    |  6 ++--
 .../compiler/nodes/memory/MemoryKill.java     |  3 +-
 .../replacements/nodes/ArrayEqualsNode.java   |  6 ++--
 .../replacements/nodes/ZeroMemoryNode.java    |  8 ++++-
 8 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/MemoryKillMarker.java

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/MemoryKillMarker.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/MemoryKillMarker.java
new file mode 100644
index 000000000000..9f3db2a57b31
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/MemoryKillMarker.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.graph;
+
+/**
+ * Any node that includes {@link org.graalvm.compiler.nodeinfo.InputType#Memory InputType.Memory} in
+ * {@link org.graalvm.compiler.nodeinfo.NodeInfo#allowedUsageTypes() NodeInfo.allowedUsageTypes}
+ * must also implement a subtype of this interface.
+ */
+public interface MemoryKillMarker {
+}
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
index 74ae7c4b5751..d1a4c0d57027 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
@@ -222,6 +222,8 @@ public NodeClass(Class<T> clazz, NodeClass<? super T> superNodeClass, FieldsScan
         try (DebugCloseable t1 = Init_AllowedUsages.start(debug)) {
             allowedUsageTypes = superNodeClass == null ? EnumSet.noneOf(InputType.class) : superNodeClass.allowedUsageTypes.clone();
             allowedUsageTypes.addAll(Arrays.asList(info.allowedUsageTypes()));
+            GraalError.guarantee(!allowedUsageTypes.contains(InputType.Memory) || MemoryKillMarker.class.isAssignableFrom(clazz),
+                            "Node of type %s with allowedUsageType of memory must inherit from MemoryKill", clazz);
         }
 
         if (presetIterableIds != null) {
@@ -503,6 +505,8 @@ protected void scanField(Field field, long offset) {
                     } else {
                         inputType = optionalInputAnnotation.value();
                     }
+                    GraalError.guarantee(inputType != InputType.Memory || MemoryKillMarker.class.isAssignableFrom(type) || NodeInputList.class.isAssignableFrom(type),
+                                    "field type of input annotated with Memory must inherit from MemoryKill: %s", field);
                     inputs.add(new InputInfo(offset, field.getName(), type, field.getDeclaringClass(), inputType, field.isAnnotationPresent(Node.OptionalInput.class)));
                 } else if (successorAnnotation != null) {
                     if (SUCCESSOR_LIST_CLASS.isAssignableFrom(type)) {
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java
index e4d98f92c5db..be4063ea21bd 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java
@@ -29,7 +29,6 @@
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
 
 import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.AbstractStateSplit;
@@ -53,7 +52,7 @@ public class UnsafeCopyMemoryNode extends AbstractStateSplit implements Lowerabl
     @Input ValueNode desOffset;
     @Input ValueNode bytes;
 
-    @OptionalInput(Memory) Node lastLocationAccess;
+    @OptionalInput(Memory) MemoryKill lastLocationAccess;
 
     private final boolean guarded;
 
@@ -85,14 +84,13 @@ public LocationIdentity getLocationIdentity() {
 
     @Override
     public MemoryKill getLastLocationAccess() {
-        return (MemoryKill) lastLocationAccess;
+        return lastLocationAccess;
     }
 
     @Override
     public void setLastLocationAccess(MemoryKill lla) {
-        Node newLla = ValueNodeUtil.asNode(lla);
-        updateUsages(lastLocationAccess, newLla);
-        lastLocationAccess = newLla;
+        updateUsages(ValueNodeUtil.asNode(lastLocationAccess), ValueNodeUtil.asNode(lla));
+        lastLocationAccess = lla;
     }
 
     @NodeIntrinsic
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
index 3e3798cd662c..bb109c7a7d37 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
@@ -36,8 +36,6 @@
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -48,6 +46,8 @@
 import org.graalvm.compiler.nodes.calc.FloatingNode;
 import org.graalvm.compiler.nodes.java.MonitorIdNode;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
@@ -65,7 +65,7 @@
  * This node represents the boxing of a primitive value. This corresponds to a call to the valueOf
  * methods in Integer, Long, etc.
  */
-@NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_16, allowedUsageTypes = {InputType.Memory, InputType.Value})
+@NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_16, allowedUsageTypes = {InputType.Value})
 public abstract class BoxNode extends AbstractBoxingNode implements IterableNodeType, VirtualizableAllocation, Lowerable, Canonicalizable.Unary<ValueNode>, IndirectCanonicalization {
 
     public static final NodeClass<BoxNode> TYPE = NodeClass.create(BoxNode.class);
@@ -154,7 +154,7 @@ public void virtualize(VirtualizerTool tool) {
         tool.replaceWithVirtual(newVirtual);
     }
 
-    @NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8, allowedUsageTypes = {InputType.Memory, InputType.Value})
+    @NodeInfo(cycles = NodeCycles.CYCLES_8, size = SIZE_8, allowedUsageTypes = {InputType.Value})
     private static class PureBoxNode extends BoxNode {
         public static final NodeClass<PureBoxNode> TYPE = NodeClass.create(PureBoxNode.class);
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java
index 35dcb908bec3..883ac62796e4 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/UnboxNode.java
@@ -29,13 +29,13 @@
 
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.FieldLocationIdentity;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
@@ -49,7 +49,7 @@
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
-@NodeInfo(cycles = CYCLES_2, size = SIZE_16, allowedUsageTypes = {InputType.Memory, InputType.Value})
+@NodeInfo(cycles = CYCLES_2, size = SIZE_16, allowedUsageTypes = {InputType.Value})
 public final class UnboxNode extends AbstractBoxingNode implements Virtualizable, Lowerable, Canonicalizable.Unary<ValueNode> {
 
     public static final NodeClass<UnboxNode> TYPE = NodeClass.create(UnboxNode.class);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryKill.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryKill.java
index e0c4c01230d2..0d6e46acf625 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryKill.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryKill.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.nodes.memory;
 
+import org.graalvm.compiler.graph.MemoryKillMarker;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.ValueNodeInterface;
 import org.graalvm.word.LocationIdentity;
@@ -36,6 +37,6 @@
  * i.e., nodes in the memory graph that mark the last accesses to such a location, like a
  * {@linkplain MemoryPhiNode} node.
  */
-public interface MemoryKill extends ValueNodeInterface {
+public interface MemoryKill extends ValueNodeInterface, MemoryKillMarker {
 
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
index b52e59130570..c490fbf9bd3e 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
@@ -33,8 +33,6 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodeinfo.NodeSize;
@@ -46,6 +44,8 @@
 import org.graalvm.compiler.nodes.ValueNodeUtil;
 import org.graalvm.compiler.nodes.memory.MemoryAccess;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
@@ -64,7 +64,7 @@
 /**
  * Compares two arrays with the same length.
  */
-@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = NodeSize.SIZE_128, allowedUsageTypes = {Memory})
+@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = NodeSize.SIZE_128)
 public class ArrayEqualsNode extends FixedWithNextNode implements LIRLowerable, Canonicalizable, Virtualizable, MemoryAccess {
 
     public static final NodeClass<ArrayEqualsNode> TYPE = NodeClass.create(ArrayEqualsNode.class);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java
index 7d2ece935f3c..f3e41dc2dceb 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java
@@ -33,6 +33,7 @@
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
@@ -44,7 +45,7 @@
  * Zeros a chunk of memory.
  */
 @NodeInfo(nameTemplate = "ZeroMemory#{p#location/s}", allowedUsageTypes = {InputType.Memory}, cycles = CYCLES_8, size = SIZE_8)
-public class ZeroMemoryNode extends FixedAccessNode implements LIRLowerable {
+public class ZeroMemoryNode extends FixedAccessNode implements LIRLowerable, SingleMemoryKill {
     public static final NodeClass<ZeroMemoryNode> TYPE = NodeClass.create(ZeroMemoryNode.class);
 
     @Input ValueNode length;
@@ -72,4 +73,9 @@ public boolean canNullCheck() {
 
     @NodeIntrinsic
     public static native void zero(Word address, long length, @ConstantNodeParameter boolean isAligned, @ConstantNodeParameter LocationIdentity locationIdentity);
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return location;
+    }
 }

From b0fe420c074f8e34aa60a65f60a8ca0a17f8bd40 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Wed, 22 Sep 2021 22:09:40 -0700
Subject: [PATCH 176/681] Add isAssignableFrom checks in edge updates

---
 .../src/org/graalvm/compiler/graph/Edges.java |  8 ++++++--
 .../org/graalvm/compiler/graph/NodeClass.java | 20 +++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java
index 19533162e23d..e77fffef5da4 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Edges.java
@@ -77,6 +77,11 @@ public static NodeList<Node> getNodeListUnsafe(Node node, long offset) {
         return (NodeList<Node>) UNSAFE.getObject(node, offset);
     }
 
+    public void putNodeUnsafeChecked(Node node, long offset, Node value, int index) {
+        verifyUpdateValid(node, index, value);
+        putNodeUnsafe(node, offset, value);
+    }
+
     public static void putNodeUnsafe(Node node, long offset, Node value) {
         UNSAFE.putObject(node, offset, value);
     }
@@ -208,8 +213,7 @@ public void copy(Node fromNode, Node toNode) {
      * @param value the node to be written to the edge
      */
     public void initializeNode(Node node, int index, Node value) {
-        verifyUpdateValid(node, index, value);
-        putNodeUnsafe(node, offsets[index], value);
+        putNodeUnsafeChecked(node, offsets[index], value, index);
     }
 
     public void initializeList(Node node, int index, NodeList<Node> value) {
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
index d1a4c0d57027..17533816a7cf 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
@@ -1254,14 +1254,15 @@ private static void pushAllHelper(NodeStack stack, Node node, long offset) {
     }
 
     public void applySuccessors(Node node, EdgeVisitor consumer) {
-        applyEdges(node, consumer, this.successorIteration);
+        applyEdges(node, consumer, this.successorIteration, successors);
     }
 
     public void applyInputs(Node node, EdgeVisitor consumer) {
-        applyEdges(node, consumer, this.inputsIteration);
+        applyEdges(node, consumer, this.inputsIteration, inputs);
     }
 
-    private static void applyEdges(Node node, EdgeVisitor consumer, long mask) {
+    private static void applyEdges(Node node, EdgeVisitor consumer, long mask, Edges edges) {
+        int index = 0;
         long myMask = mask;
         while (myMask != 0) {
             long offset = (myMask & OFFSET_MASK);
@@ -1270,13 +1271,14 @@ private static void applyEdges(Node node, EdgeVisitor consumer, long mask) {
                 if (curNode != null) {
                     Node newNode = consumer.apply(node, curNode);
                     if (newNode != curNode) {
-                        Edges.putNodeUnsafe(node, offset, newNode);
+                        edges.putNodeUnsafeChecked(node, offset, newNode, index);
                     }
                 }
             } else {
                 applyHelper(node, consumer, offset);
             }
             myMask >>>= NEXT_EDGE;
+            index++;
         }
     }
 
@@ -1356,21 +1358,22 @@ private static void registerAtSuccessorsAsPredecessorHelper(Node node, long offs
     }
 
     public boolean replaceFirstInput(Node node, Node key, Node replacement) {
-        return replaceFirstEdge(node, key, replacement, this.inputsIteration);
+        return replaceFirstEdge(node, key, replacement, this.inputsIteration, inputs);
     }
 
     public boolean replaceFirstSuccessor(Node node, Node key, Node replacement) {
-        return replaceFirstEdge(node, key, replacement, this.successorIteration);
+        return replaceFirstEdge(node, key, replacement, this.successorIteration, successors);
     }
 
-    public static boolean replaceFirstEdge(Node node, Node key, Node replacement, long mask) {
+    public static boolean replaceFirstEdge(Node node, Node key, Node replacement, long mask, Edges edges) {
+        int index = 0;
         long myMask = mask;
         while (myMask != 0) {
             long offset = (myMask & OFFSET_MASK);
             if ((myMask & LIST_MASK) == 0) {
                 Object curNode = Edges.getNodeUnsafe(node, offset);
                 if (curNode == key) {
-                    Edges.putNodeUnsafe(node, offset, replacement);
+                    edges.putNodeUnsafeChecked(node, offset, replacement, index);
                     return true;
                 }
             } else {
@@ -1380,6 +1383,7 @@ public static boolean replaceFirstEdge(Node node, Node key, Node replacement, lo
                 }
             }
             myMask >>>= NEXT_EDGE;
+            index++;
         }
         return false;
     }

From 05ec8fc466943966136821022774785caa7767c5 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Mon, 27 Sep 2021 16:22:20 -0700
Subject: [PATCH 177/681] Add check for implementing either SingleMemoryKill or
 MultiMemoryKill

---
 .../graalvm/compiler/core/test/CheckGraalInvariants.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
index 66219aeaec90..bd0cc6fc1601 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
@@ -74,6 +74,9 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
+import org.graalvm.compiler.nodes.memory.MemoryKill;
+import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionDescriptor;
@@ -579,6 +582,10 @@ private static void checkClass(Class<?> c, MetaAccessProvider metaAccess, List<V
                 throw new AssertionError(String.format("Node subclass %s requires %s annotation", c.getName(), NodeClass.class.getSimpleName()));
             }
             VerifyNodeCosts.verifyNodeClass(c);
+            // Any concrete class which implements MemoryKill must actually implement either
+            // SingleMemoryKill or MultiMemoryKill.
+            assert !MemoryKill.class.isAssignableFrom(c) || Modifier.isAbstract(c.getModifiers()) || SingleMemoryKill.class.isAssignableFrom(c) || MultiMemoryKill.class.isAssignableFrom(c) : c +
+                            " must inherit from either SingleMemoryKill or MultiMemoryKill";
         }
         for (VerifyPhase<CoreProviders> verifier : verifiers) {
             verifier.verifyClass(c, metaAccess);

From fd3ae9cca0aca715bd6a4fb0556ca8cdd50f5646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Mon, 27 Sep 2021 17:06:22 +0200
Subject: [PATCH 178/681] Don't create DebugContext when scanning objects

---
 .../com/oracle/graal/pointsto/ObjectScanner.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
index b633afcb2b81..5d33edfcaf97 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
@@ -30,10 +30,14 @@
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.IdentityHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.DebugHandlersFactory;
+import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.word.WordBase;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
@@ -42,6 +46,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
+import com.oracle.graal.pointsto.util.CompletionExecutor.DebugContextRunnable;
 
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.JavaConstant;
@@ -102,12 +107,19 @@ public void scanBootImageHeapRoots(Comparator<AnalysisField> fieldComparator, Co
 
     private void execute(Runnable runnable) {
         if (executor != null) {
-            executor.execute(debug -> runnable.run());
+            executor.execute((ObjectScannerRunnable) debug -> runnable.run());
         } else {
             runnable.run();
         }
     }
 
+    private interface ObjectScannerRunnable extends DebugContextRunnable {
+        @Override
+        default DebugContext getDebug(OptionValues options, List<DebugHandlersFactory> factories) {
+            return DebugContext.disabled(null);
+        }
+    }
+
     private void scanEmbeddedRoot(JavaConstant root, BytecodePosition position) {
         AnalysisMethod method = (AnalysisMethod) position.getMethod();
         try {
@@ -256,7 +268,7 @@ public final void scanConstant(JavaConstant value, ScanReason reason, WorklistEn
                 scannedObjects.release(valueObj);
                 WorklistEntry worklistEntry = new WorklistEntry(previous, value, reason);
                 if (executor != null) {
-                    executor.execute(debug -> doScan(worklistEntry));
+                    executor.execute((ObjectScannerRunnable) debug -> doScan(worklistEntry));
                 } else {
                     worklist.push(worklistEntry);
                 }

From 75a32e3a6b04ff49e1c84cc83aa6520f2a5dcd66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= <galder@redhat.com>
Date: Tue, 28 Sep 2021 10:58:33 +0200
Subject: [PATCH 179/681] Add call tree csv links for easier imports into graph
 db

---
 .../pointsto/reports/CallTreePrinter.java     | 51 ++++++++++++-------
 .../graal/pointsto/reports/ReportUtils.java   |  3 +-
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
index a4b3a12e2648..8f0c4d7ed3a6 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
@@ -31,7 +31,12 @@
 import static com.oracle.graal.pointsto.reports.ReportUtils.invokeComparator;
 import static com.oracle.graal.pointsto.reports.ReportUtils.methodComparator;
 
+import java.io.IOException;
 import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,6 +51,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -333,26 +339,33 @@ private static void printCsvFiles(Map<AnalysisMethod, MethodNode> methodToNode,
             walkNodes(node, directEdges, virtualEdges, overridenByEdges, virtualNodes, nonVirtualNodes, virtualNodeId);
         }
 
-        ReportUtils.report("call tree for vm entry point", reportsPath, "csv_call_tree_vm_" + reportName, "csv",
-                        CallTreePrinter::printVMEntryPoint);
-
-        ReportUtils.report("call tree for methods", reportsPath, "csv_call_tree_methods_" + reportName, "csv",
-                        writer -> printMethodNodes(methodToNode.values(), writer));
-
-        ReportUtils.report("call tree for virtual methods", reportsPath, "csv_call_tree_virtual_methods_" + reportName, "csv",
-                        writer -> printVirtualNodes(virtualNodes, writer));
-
-        ReportUtils.report("call tree for entry points", reportsPath, "csv_call_tree_entry_points_" + reportName, "csv",
-                        writer -> printEntryPointIds(entryPointIds, writer));
-
-        ReportUtils.report("call tree for direct edges", reportsPath, "csv_call_tree_direct_edges_" + reportName, "csv",
-                        writer -> printBciEdges(directEdges, writer));
-
-        ReportUtils.report("call tree for overriden by edges", reportsPath, "csv_call_tree_override_by_edges_" + reportName, "csv",
-                        writer -> printNonBciEdges(overridenByEdges, writer));
+        toCsvFile("call tree for vm entry point", reportsPath, "csv_call_tree_vm", reportName, CallTreePrinter::printVMEntryPoint);
+        toCsvFile("call tree for methods", reportsPath, "csv_call_tree_methods", reportName, writer -> printMethodNodes(methodToNode.values(), writer));
+        toCsvFile("call tree for virtual methods", reportsPath, "csv_call_tree_virtual_methods", reportName, writer -> printVirtualNodes(virtualNodes, writer));
+        toCsvFile("call tree for entry points", reportsPath, "csv_call_tree_entry_points", reportName, writer -> printEntryPointIds(entryPointIds, writer));
+        toCsvFile("call tree for direct edges", reportsPath, "csv_call_tree_direct_edges", reportName, writer -> printBciEdges(directEdges, writer));
+        toCsvFile("call tree for overriden by edges", reportsPath, "csv_call_tree_override_by_edges", reportName, writer -> printNonBciEdges(overridenByEdges, writer));
+        toCsvFile("call tree for virtual edges", reportsPath, "csv_call_tree_virtual_edges", reportName, writer -> printBciEdges(virtualEdges, writer));
+    }
+
+    private static void toCsvFile(String description, String reportsPath, String prefix, String reportName, Consumer<PrintWriter> reporter) {
+        final String name = prefix + "_" + reportName;
+        final String csvFile = ReportUtils.report(description, reportsPath, name, "csv", reporter);
+        final Path csvLink = Paths.get(reportsPath).resolve(prefix + ".csv");
+
+        if (Files.exists(csvLink, LinkOption.NOFOLLOW_LINKS)) {
+            try {
+                Files.delete(csvLink);
+            } catch (IOException e) {
+                // Ignore
+            }
+        }
 
-        ReportUtils.report("call tree for virtual edges", reportsPath, "csv_call_tree_virtual_edges_" + reportName, "csv",
-                        writer -> printBciEdges(virtualEdges, writer));
+        try {
+            Files.createSymbolicLink(csvLink, Paths.get(csvFile));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private static void printVMEntryPoint(PrintWriter writer) {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ReportUtils.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ReportUtils.java
index 8b743b0544a0..63e4a8218dfa 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ReportUtils.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ReportUtils.java
@@ -75,10 +75,11 @@ public class ReportUtils {
      * @param extension the extension of the report
      * @param reporter a consumer that writes to a PrintWriter
      */
-    public static void report(String description, String path, String name, String extension, Consumer<PrintWriter> reporter) {
+    public static String report(String description, String path, String name, String extension, Consumer<PrintWriter> reporter) {
         String fileName = timeStampedFileName(name, extension);
         Path reportDir = Paths.get(path);
         reportImpl(description, reportDir, fileName, reporter);
+        return fileName;
     }
 
     public static String timeStampedFileName(String name, String extension) {

From 83464af7dd45f84b406fe4abc2918a93734975a5 Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Tue, 28 Sep 2021 11:45:57 +0200
Subject: [PATCH 180/681] Overlays for Reference.refersTo

---
 espresso/mx.espresso/suite.py                 | 33 ++++++++++++++
 .../espresso/overlay/ReferenceSupport.java    | 38 ++++++++++++++++
 .../espresso/overlay/ReferenceSupport.java    | 44 +++++++++++++++++++
 .../com/oracle/truffle/espresso/vm/VM.java    | 20 ++++++---
 4 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 espresso/src/com.oracle.truffle.espresso.jdk17/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java

diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
index 030b5f9e1f77..211446bf9dbd 100644
--- a/espresso/mx.espresso/suite.py
+++ b/espresso/mx.espresso/suite.py
@@ -121,6 +121,39 @@
             "checkPackagePrefix": False,  # java.lang.ref.PublicFinalReference
         },
 
+        "com.oracle.truffle.espresso.jdk8": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "overlayTarget": "com.oracle.truffle.espresso",
+            "checkPackagePrefix": "false",
+            "checkstyle": "com.oracle.truffle.espresso",
+            "javaCompliance": "8",
+        },
+
+        "com.oracle.truffle.espresso.jdk11": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "overlayTarget": "com.oracle.truffle.espresso",
+            "checkPackagePrefix": "false",
+            "multiReleaseJarVersion": "11",
+            "checkstyle": "com.oracle.truffle.espresso",
+            "javaCompliance": "11+",
+        },
+
+        "com.oracle.truffle.espresso.jdk17": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "overlayTarget": "com.oracle.truffle.espresso",
+            "dependencies": [
+                "com.oracle.truffle.espresso",
+            ],
+            "checkPackagePrefix": "false",
+            "multiReleaseJarVersion": "17",
+            "checkstyle": "com.oracle.truffle.espresso",
+            "javaCompliance": "17+",
+        },
+
+
         "com.oracle.truffle.espresso.processor": {
             "subDir": "src",
             "sourceDirs": ["src"],
diff --git a/espresso/src/com.oracle.truffle.espresso.jdk17/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java b/espresso/src/com.oracle.truffle.espresso.jdk17/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java
new file mode 100644
index 000000000000..9800ede6ec92
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso.jdk17/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.overlay;
+
+import java.lang.ref.Reference;
+
+import com.oracle.truffle.espresso.runtime.StaticObject;
+
+public class ReferenceSupport {
+    public static boolean phantomReferenceRefersTo(Reference<StaticObject> ref, StaticObject object) {
+        return ref.refersTo(object);
+    }
+
+    public static boolean referenceRefersTo(Reference<StaticObject> ref, StaticObject object) {
+        return ref.refersTo(object);
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java
new file mode 100644
index 000000000000..009da4415068
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/overlay/ReferenceSupport.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.overlay;
+
+import java.lang.ref.PhantomReference;
+import java.lang.ref.Reference;
+
+import com.oracle.truffle.espresso.runtime.StaticObject;
+
+public class ReferenceSupport {
+    @SuppressWarnings("unused")
+    public static boolean phantomReferenceRefersTo(Reference<StaticObject> ref, StaticObject object) {
+        assert (ref instanceof PhantomReference);
+        return false;
+    }
+
+    public static boolean referenceRefersTo(Reference<StaticObject> ref, StaticObject object) {
+        assert !(ref instanceof PhantomReference);
+        StaticObject value = ref.get();
+        value = value == null ? StaticObject.NULL : value;
+        return value == object;
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
index 8879610cd08b..0611052872ce 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
@@ -128,6 +128,7 @@
 import com.oracle.truffle.espresso.nodes.EspressoRootNode;
 import com.oracle.truffle.espresso.nodes.interop.ToEspressoNode;
 import com.oracle.truffle.espresso.nodes.interop.ToEspressoNodeGen;
+import com.oracle.truffle.espresso.overlay.ReferenceSupport;
 import com.oracle.truffle.espresso.runtime.Attribute;
 import com.oracle.truffle.espresso.runtime.Classpath;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
@@ -138,6 +139,7 @@
 import com.oracle.truffle.espresso.runtime.MethodHandleIntrinsics;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 import com.oracle.truffle.espresso.substitutions.CallableFromNative;
+import com.oracle.truffle.espresso.substitutions.EspressoReference;
 import com.oracle.truffle.espresso.substitutions.GenerateNativeEnv;
 import com.oracle.truffle.espresso.substitutions.Inject;
 import com.oracle.truffle.espresso.substitutions.JavaType;
@@ -3432,19 +3434,21 @@ public boolean JVM_HasReferencePendingList() {
         return getContext().hasReferencePendingList();
     }
 
+    @SuppressWarnings({"rawtypes", "unchecked"})
     @VmImpl(isJni = true)
-    public boolean JVM_PhantomReferenceRefersTo(@JavaType(Reference.class) StaticObject ref, @SuppressWarnings("unused") @JavaType(Object.class) StaticObject object,
+    public boolean JVM_PhantomReferenceRefersTo(@JavaType(Reference.class) StaticObject ref, @JavaType(Object.class) StaticObject object,
                     @Inject SubstitutionProfiler profiler) {
         if (StaticObject.isNull(ref)) {
             profiler.profile(0);
             getMeta().throwNullPointerException();
         }
-        assert InterpreterToVM.instanceOf(ref, getMeta().java_lang_ref_PhantomReference) : "Cannot call Reference.get on PhantomReference";
-        // At this point, we would need to call the host's PhantomReference.refersTo() method, but
-        // it is not available in Java 8 or 11.
-        return false;
+        EspressoReference host = (EspressoReference) getMeta().HIDDEN_HOST_REFERENCE.getHiddenObject(ref);
+        assert host instanceof Reference;
+        // Call host's refersTo. Not available in 8 or 11.
+        return ReferenceSupport.phantomReferenceRefersTo((Reference) host, object);
     }
 
+    @SuppressWarnings({"rawtypes", "unchecked"})
     @VmImpl(isJni = true)
     public boolean JVM_ReferenceRefersTo(@JavaType(Reference.class) StaticObject ref, @JavaType(Object.class) StaticObject object,
                     @Inject SubstitutionProfiler profiler) {
@@ -3452,8 +3456,10 @@ public boolean JVM_ReferenceRefersTo(@JavaType(Reference.class) StaticObject ref
             profiler.profile(0);
             getMeta().throwNullPointerException();
         }
-        assert !InterpreterToVM.instanceOf(ref, getMeta().java_lang_ref_PhantomReference) : "Cannot call Reference.get on PhantomReference";
-        return Target_java_lang_ref_Reference.get(ref, getMeta()) == object;
+        EspressoReference host = (EspressoReference) getMeta().HIDDEN_HOST_REFERENCE.getHiddenObject(ref);
+        assert host instanceof Reference;
+        // Call host's refersTo. Not available in 8 or 11.
+        return ReferenceSupport.referenceRefersTo((Reference) host, object);
     }
 
     @VmImpl(isJni = true)

From a7da464c538fc039289954af837c552c15cdbf88 Mon Sep 17 00:00:00 2001
From: Loic Ottet <loic.ottet@oracle.com>
Date: Tue, 2 Mar 2021 08:54:17 +0100
Subject: [PATCH 181/681] Support illegal constant types

---
 .../oracle/svm/core/graal/llvm/LLVMGenerator.java    |  4 ++++
 .../oracle/svm/core/graal/llvm/NodeLLVMBuilder.java  | 12 ++++++++++--
 .../svm/core/graal/llvm/util/LLVMIRBuilder.java      |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
index c120085082ae..fc117c5a3ae1 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
@@ -63,6 +63,7 @@
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.spi.LIRKindTool;
+import org.graalvm.compiler.core.common.type.IllegalStamp;
 import org.graalvm.compiler.core.common.type.RawPointerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
@@ -365,6 +366,9 @@ LLVMTypeRef getLLVMType(Stamp stamp) {
         if (stamp instanceof RawPointerStamp) {
             return builder.rawPointerType();
         }
+        if (stamp instanceof IllegalStamp) {
+            return builder.undefType();
+        }
         return getLLVMType(getTypeKind(stamp.javaType(getMetaAccess()), false), stamp instanceof NarrowOopStamp);
     }
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
index 8e9a5f4e1936..0b2ea1f335e3 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
@@ -35,6 +35,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import jdk.vm.ci.meta.PlatformKind;
+import jdk.vm.ci.meta.ValueKind;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.calc.Condition;
@@ -760,8 +762,14 @@ public Value setResult(ValueNode node, Value operand) {
         if (operand instanceof LLVMValueWrapper) {
             llvmOperand = (LLVMValueWrapper) operand;
         } else if (operand instanceof ConstantValue) {
-            /* This only happens when emitting null object constants */
-            llvmOperand = new LLVMVariable(builder.constantNull(((LLVMKind) operand.getPlatformKind()).get()));
+            /* This only happens when emitting null or illegal object constants */
+            PlatformKind kind = operand.getPlatformKind();
+            if (kind instanceof LLVMKind) {
+                llvmOperand = new LLVMVariable(builder.constantNull(((LLVMKind) kind).get()));
+            } else {
+                assert kind == ValueKind.Illegal.getPlatformKind();
+                llvmOperand = new LLVMVariable(builder.getUndef());
+            }
         } else if (operand instanceof LLVMAddressValue) {
             LLVMAddressValue addressValue = (LLVMAddressValue) operand;
             Value wrappedBase = addressValue.getBase();
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
index 10604167a0ac..55fa100c396d 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
@@ -464,6 +464,11 @@ private LLVMTypeRef metadataType() {
         return LLVM.LLVMMetadataTypeInContext(context);
     }
 
+    public LLVMTypeRef undefType() {
+        /* Use a non-standard integer size to make sure the value is never used in an instruction */
+        return integerType(42);
+    }
+
     public static boolean compatibleTypes(LLVMTypeRef a, LLVMTypeRef b) {
         int aKind = LLVM.LLVMGetTypeKind(a);
         int bKind = LLVM.LLVMGetTypeKind(b);
@@ -655,6 +660,10 @@ public void setValueName(LLVMValueRef value, String name) {
         LLVM.LLVMSetValueName(value, name);
     }
 
+    public LLVMValueRef getUndef() {
+        return LLVM.LLVMGetUndef(undefType());
+    }
+
     /* Control flow */
 
     public LLVMValueRef buildCall(LLVMValueRef callee, LLVMValueRef... args) {

From de91bd789151d02b2292be96687681ede9717c67 Mon Sep 17 00:00:00 2001
From: Aleksandar Gradinac <aleksandar.gradinac@oracle.com>
Date: Tue, 28 Sep 2021 12:18:29 +0200
Subject: [PATCH 182/681] Reinitialize ThreadLocalRandom at runtime for JDK 17
 or higher

---
 .../src/com/oracle/svm/hosted/jdk/JDKRegistrations.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
index 0cb6f66e0d64..fc7f993d28d8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
@@ -62,6 +62,9 @@ public void duringSetup(DuringSetupAccess a) {
              */
             rerunClassInit(a, "sun.nio.ch.UnixDomainSockets");
         }
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
+            rerunClassInit(a, "java.util.concurrent.ThreadLocalRandom$ThreadLocalRandomProxy");
+        }
 
         /*
          * Re-initialize the registered shutdown hooks, because any hooks registered during native

From 3e90ff7d8264bef580eb89c1dd4ea53422d369b8 Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Tue, 28 Sep 2021 13:07:17 +0200
Subject: [PATCH 183/681] Invalidate interface methods leaf assumptions during
 itable creation

---
 .../espresso/impl/InterfaceTables.java        | 47 ++++++++++++++++++-
 .../oracle/truffle/espresso/impl/Method.java  |  9 +---
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/InterfaceTables.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/InterfaceTables.java
index b31c19e8e121..706a6fb725c7 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/InterfaceTables.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/InterfaceTables.java
@@ -197,6 +197,7 @@ public static CreationResult create(ObjectKlass superKlass, ObjectKlass[] superI
      * @return the final itable
      */
     public static Method[][] fixTables(Method[] vtable, Method[] mirandas, Method[] declaredMethods, Entry[][] tables, ObjectKlass[] iklassTable) {
+        assert tables.length == iklassTable.length;
         ArrayList<Method[]> tmpTables = new ArrayList<>();
 
         // Second step
@@ -205,12 +206,54 @@ public static Method[][] fixTables(Method[] vtable, Method[] mirandas, Method[]
             fixVTable(tables[i], vtable, mirandas, declaredMethods, iklassTable[i].getInterfaceMethodsTable());
         }
         // Third step
-        for (Entry[] entries : tables) {
-            tmpTables.add(getITable(entries, vtable, mirandas, declaredMethods));
+        for (int tableIndex = 0; tableIndex < tables.length; tableIndex++) {
+            Entry[] entries = tables[tableIndex];
+            Method[] itable = getITable(entries, vtable, mirandas, declaredMethods);
+            tmpTables.add(itable);
+
+            // Update leaf assumptions for super interfaces
+            ObjectKlass currInterface = iklassTable[tableIndex];
+            updateLeafAssumptions(itable, currInterface);
+
         }
         return tmpTables.toArray(EMPTY_METHOD_DUAL_ARRAY);
     }
 
+    /**
+     * Note: Leaf assumptions are not invalidated on creation of an interface. This means that in
+     * the following example:
+     * 
+     * <pre>
+     * interface A {
+     *     default void m() {
+     *     }
+     * }
+     * 
+     * interface B extends A {
+     *     default void m() {
+     *     }
+     * }
+     * </pre>
+     * 
+     * Unless a concrete class that implements B is loaded, the leaf assumption for A.m() will not
+     * be invalidated.
+     */
+    private static void updateLeafAssumptions(Method[] itable, ObjectKlass currInterface) {
+        for (int methodIndex = 0; methodIndex < itable.length; methodIndex++) {
+            Method m = itable[methodIndex];
+            // This class' itable entry for this method is not the interface's declared method.
+            if (m.getDeclaringKlass() != currInterface) {
+                Method intfMethod = currInterface.getInterfaceMethodsTable()[methodIndex];
+                // sanity checks
+                assert intfMethod.getDeclaringKlass() == currInterface;
+                assert m.canOverride(intfMethod) && m.getName() == intfMethod.getName() && m.getRawSignature() == intfMethod.getRawSignature();
+                if (intfMethod.leafAssumption()) {
+                    intfMethod.invalidateLeaf();
+                }
+            }
+        }
+    }
+
     // Actual implementations
 
     private CreationResult create() {
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
index b6b86f7830cc..613c06fa6562 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
@@ -263,13 +263,8 @@ private Method(Method method, CodeAttribute split) {
         initRefKind();
         this.proxy = null;
 
-        if (getDeclaringKlass().isInterface() || isAbstract()) {
-            /*
-             * TODO(peterssen): GR-33781 Leaf method assumption cannot be trusted for default
-             * methods.
-             *
-             * Also disabled for abstract methods to reduce footprint.
-             */
+        if (isAbstract()) {
+            // Disabled for abstract methods to reduce footprint.
             this.isLeaf = NeverValidAssumption.INSTANCE;
         } else if (isStatic() || isPrivate() || isFinalFlagSet() || getDeclaringKlass().isFinalFlagSet()) {
             // Nothing to assume, spare an assumption.

From 0794624cf1999ba0ef233f74db343211b4c1e8bd Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:16:40 +0200
Subject: [PATCH 184/681] Avoid createCallTarget() in Truffle API.

---
 .../benchmark/EncapsulatingNodeBenchmark.java |  9 ++-
 .../api/benchmark/EngineBenchmark.java        |  7 +-
 .../benchmark/InterpreterCallBenchmark.java   |  8 +--
 .../api/debug/test/DebugStackFrameTest.java   | 15 ++--
 .../api/debug/test/DebugValueTest.java        |  6 +-
 .../InstrumentablePositionsTestLanguage.java  |  3 +-
 .../debug/test/NoCallNodeTestLanguage.java    |  5 +-
 .../debug/test/TestDebugBuggyLanguage.java    |  7 +-
 .../test/TestDebugNoContentLanguage.java      |  3 +-
 .../test/TestExecutableNamesLanguage.java     | 11 ++-
 .../api/debug/test/TestFramesRootTag.java     | 10 +--
 .../debug/test/TestLazyParsingLanguage.java   |  5 +-
 .../test/TestNonInteractiveInlineParse.java   |  6 +-
 .../api/debug/test/TestReceiverLanguage.java  |  3 +-
 .../debug/test/ValueLanguageLegacyTest.java   |  5 +-
 .../api/debug/test/ValueLanguageTest.java     |  5 +-
 .../truffle/api/dsl/test/AOTSupportTest.java  |  2 +-
 .../truffle/api/dsl/test/ArrayTest.java       |  3 +-
 .../truffle/api/dsl/test/CachedTest.java      | 11 ++-
 .../api/dsl/test/CachedThreadSafetyTest.java  |  3 +-
 .../truffle/api/dsl/test/TestHelper.java      |  8 +--
 .../api/dsl/test/examples/AOTTutorial.java    |  7 +-
 .../api/dsl/test/examples/ExampleNode.java    |  5 +-
 .../test/AllocationReporterTest.java          |  5 +-
 .../test/CompileImmediatelyCheck.java         |  5 +-
 .../test/ContextInterruptStandaloneTest.java  |  9 ++-
 .../test/ContextsEventsTest.java              |  5 +-
 .../instrumentation/test/DeadlockTest.java    | 13 ++--
 .../test/FindSourcesVisitorNestingTest.java   |  9 ++-
 .../api/instrumentation/test/GR25718Test.java | 11 ++-
 .../test/InstrumentableNodeTest.java          |  5 +-
 .../test/InstrumentationTest.java             | 14 ++--
 .../test/InstrumentationTestLanguage.java     |  6 +-
 .../test/InstrumentationUpdateTest.java       |  3 +-
 ...aterializationAssertionsViolationTest.java |  5 +-
 .../test/ParsingFromInstrumentTest.java       | 22 +++---
 .../test/SourceListenerTest.java              | 19 +++---
 .../test/SourceSectionFilterTest.java         |  3 +-
 .../test/SourceSectionListenerTest.java       |  5 +-
 .../api/instrumentation/test/TagsTest.java    | 11 ++-
 .../test/ThreadsActivationListenerTest.java   | 16 ++---
 .../test/TruffleContextTest.java              | 11 ++-
 .../test/VariablesScopeLegacyTest.java        |  3 +-
 .../test/VariablesScopeTest.java              | 12 ++--
 .../instrumentation/InstrumentableNode.java   |  9 ++-
 .../instrumentation/LoadSourceListener.java   |  8 +--
 .../LoadSourceSectionListener.java            |  8 +--
 .../library/test/examples/ArrayStrategy1.java |  3 +-
 .../library/test/examples/ArrayStrategy2.java |  5 +-
 .../library/test/examples/ArrayStrategy3.java |  3 +-
 .../test/examples/DynamicDispatchExample.java |  5 +-
 .../test/examples/TaintTrackingExample.java   |  5 +-
 .../truffle/api/test/ArgumentsTest.java       |  6 +-
 .../api/test/AssumptionInvalidationTest.java  |  2 +-
 .../com/oracle/truffle/api/test/CallTest.java | 15 ++--
 .../truffle/api/test/ChildNodeTest.java       |  5 +-
 .../truffle/api/test/ChildrenNodesTest.java   |  8 +--
 .../api/test/CompileImmediatelyCheck.java     |  5 +-
 .../truffle/api/test/FinalFieldTest.java      |  7 +-
 .../test/FrameSlotTypeSpecializationTest.java |  7 +-
 .../oracle/truffle/api/test/FrameTest.java    |  7 +-
 .../api/test/InterfaceChildFieldTest.java     |  8 +--
 .../oracle/truffle/api/test/IteratorTest.java |  2 +-
 .../api/test/LegacyTruffleExceptionTest.java  | 14 ++--
 .../oracle/truffle/api/test/LoopNodeTest.java |  2 +-
 .../oracle/truffle/api/test/ReplaceTest.java  |  5 +-
 .../test/ReturnTypeSpecializationTest.java    |  7 +-
 .../oracle/truffle/api/test/RootNodeTest.java | 30 ++++----
 .../truffle/api/test/StackTraceTest.java      |  2 +-
 .../truffle/api/test/ThreadSafetyTest.java    |  8 +--
 .../api/test/TruffleExceptionTest.java        | 66 +++++++++---------
 .../api/test/TruffleSafepointTest.java        |  5 +-
 .../oracle/truffle/api/test/host/GR31558.java |  7 +-
 .../api/test/host/HostExceptionTest.java      |  3 +-
 .../api/test/host/MultiClassLoaderTest.java   |  7 +-
 .../truffle/api/test/nodes/BlockNodeTest.java |  3 +-
 .../nodes/EncapsulatedNodeLegacyTest.java     | 17 ++---
 .../api/test/nodes/EncapsulatedNodeTest.java  | 25 +++----
 .../truffle/api/test/parser/PEParser.java     |  2 +-
 .../test/polyglot/AbstractPolyglotTest.java   |  4 +-
 .../api/test/polyglot/ChildContextTest.java   |  3 +-
 .../api/test/polyglot/ContextAPITest.java     | 13 ++--
 .../ContextAPITestInternalLanguage.java       |  3 +-
 .../test/polyglot/ContextAPITestLanguage.java |  5 +-
 .../api/test/polyglot/ContextPolicyTest.java  |  7 +-
 .../polyglot/ContextPolyglotAccessTest.java   |  3 +-
 ...ntextPreInitializationNativeImageTest.java |  5 +-
 .../ContextPreInitializationTest.java         |  5 +-
 .../api/test/polyglot/EngineAPITest.java      |  2 +-
 .../test/polyglot/EngineAPITestLanguage.java  |  3 +-
 .../api/test/polyglot/FileSystemsTest.java    |  5 +-
 .../api/test/polyglot/HostStackTraceTest.java |  3 +-
 .../test/polyglot/InteractiveEvalTest.java    |  9 ++-
 .../test/polyglot/LanguageSPIOrderTest.java   |  3 +-
 .../api/test/polyglot/LanguageSPITest.java    | 31 ++++-----
 .../polyglot/LanguageSPITestLanguage.java     |  5 +-
 .../api/test/polyglot/LoggingTest.java        |  3 +-
 .../api/test/polyglot/MIMETypeTest.java       |  9 ++-
 .../test/polyglot/MultiThreadedCloseTest.java | 16 +++--
 .../test/polyglot/MultiThreadedLanguage.java  |  5 +-
 .../test/polyglot/PolyglotCachingTest.java    |  9 ++-
 .../test/polyglot/PolyglotExceptionTest.java  | 15 ++--
 .../api/test/polyglot/RequireContextTest.java | 16 ++---
 .../RetainedSizeContextBoundaryTest.java      |  8 +--
 .../test/polyglot/ScopedViewLegacyTest.java   |  2 +-
 .../api/test/polyglot/ScopedViewTest.java     |  2 +-
 .../test/polyglot/SourceAPITestLanguage.java  |  3 +-
 .../api/test/polyglot/ValueAPITest.java       |  3 +-
 .../polyglot/ValueHostConversionTest.java     | 68 +++++++++----------
 .../com/oracle/truffle/api/CallTarget.java    |  5 +-
 .../oracle/truffle/api/RootCallTarget.java    |  4 +-
 .../oracle/truffle/api/TruffleLanguage.java   |  8 +--
 .../truffle/api/impl/DefaultCallTarget.java   |  3 +-
 .../api/impl/DefaultTruffleRuntime.java       |  2 +-
 .../oracle/truffle/api/nodes/RootNode.java    | 15 ++--
 115 files changed, 413 insertions(+), 552 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EncapsulatingNodeBenchmark.java b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EncapsulatingNodeBenchmark.java
index 17991f066e81..3556e4293811 100644
--- a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EncapsulatingNodeBenchmark.java
+++ b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EncapsulatingNodeBenchmark.java
@@ -48,7 +48,6 @@
 import org.openjdk.jmh.annotations.TearDown;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
 import com.oracle.truffle.api.nodes.Node;
@@ -69,7 +68,7 @@ public static class PushPopOldCompiled {
             context.initialize(TEST_LANGUAGE);
         }
         final Integer intValue = 42;
-        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        final CallTarget callTarget = new RootNode(null) {
 
             private final Integer constant = 42;
 
@@ -84,7 +83,7 @@ public Object execute(VirtualFrame frame) {
                 NodeUtil.popEncapsulatingNode(prev0);
                 return constant;
             }
-        });
+        }.getCallTarget();
 
         private final Node node = new Node() {
         };
@@ -143,7 +142,7 @@ public static class PushPopNewCompiled {
             context.initialize(TEST_LANGUAGE);
         }
         final Integer intValue = 42;
-        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        final CallTarget callTarget = new RootNode(null) {
 
             @Override
             public Object execute(VirtualFrame frame) {
@@ -162,7 +161,7 @@ public Object execute(VirtualFrame frame) {
                 nodeRef0.set(prev0);
                 return null;
             }
-        });
+        }.getCallTarget();
 
         final Node node = new Node() {
         };
diff --git a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EngineBenchmark.java b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EngineBenchmark.java
index 8838052dbe5a..fa7dcd2d6c88 100644
--- a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EngineBenchmark.java
+++ b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/EngineBenchmark.java
@@ -60,7 +60,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
@@ -329,7 +328,7 @@ public static class CallTargetCallState {
             context.initialize(TEST_LANGUAGE);
         }
         final Integer intValue = 42;
-        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        final CallTarget callTarget = new RootNode(null) {
 
             private final Integer constant = 42;
 
@@ -337,7 +336,7 @@ public static class CallTargetCallState {
             public Object execute(VirtualFrame frame) {
                 return constant;
             }
-        });
+        }.getCallTarget();
 
         @TearDown
         public void tearDown() {
@@ -489,7 +488,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             } else {
                 result = getCurrentContext(BenchmarkTestLanguage.class).object;
             }
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(result));
+            return RootNode.createConstantNode(result).getCallTarget();
         }
 
     }
diff --git a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
index 7ba718f6d1ec..bb89d833be8b 100644
--- a/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
+++ b/truffle/src/com.oracle.truffle.api.benchmark/src/com/oracle/truffle/api/benchmark/InterpreterCallBenchmark.java
@@ -86,7 +86,7 @@ public static class BenchmarkState {
             for (int i = 0; i < ROOT_CLASSES.length; i++) {
                 Class<?> rootClass = ROOT_CLASSES[i];
                 rootNodes[i] = createRootNode(rootClass);
-                callTargets[i] = Truffle.getRuntime().createCallTarget(rootNodes[i]);
+                callTargets[i] = rootNodes[i].getCallTarget();
                 directCallNodes[i] = Truffle.getRuntime().createDirectCallNode(callTargets[i]);
             }
 
@@ -138,7 +138,7 @@ public static class FirstCallState extends BenchmarkState {
         public void setup() {
             for (int i = 0; i < TARGETS; i++) {
                 AbstractRootNode rootNode = createRootNode(ROOT_CLASSES[i % ROOT_CLASSES_LENGTH]);
-                callTargets[i] = Truffle.getRuntime().createCallTarget(rootNode);
+                callTargets[i] = rootNode.getCallTarget();
             }
         }
 
@@ -186,8 +186,8 @@ public int secondCall(SecondCallState state) {
     }
 
     @Benchmark
-    public Object callTargetCreate() {
-        return Truffle.getRuntime().createCallTarget(new RootNode1());
+    public Object callTargetCreation() {
+        return new RootNode1().getCallTarget();
     }
 
     @Benchmark
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugStackFrameTest.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugStackFrameTest.java
index 3eb7b0365373..377e53fec570 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugStackFrameTest.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugStackFrameTest.java
@@ -49,11 +49,11 @@
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import com.oracle.truffle.api.frame.FrameInstance;
-import com.oracle.truffle.api.instrumentation.test.InstrumentationTestLanguage;
+import org.graalvm.polyglot.Source;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
@@ -67,6 +67,7 @@
 import com.oracle.truffle.api.debug.DebuggerSession;
 import com.oracle.truffle.api.debug.SuspendedEvent;
 import com.oracle.truffle.api.frame.Frame;
+import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
@@ -76,14 +77,12 @@
 import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
+import com.oracle.truffle.api.instrumentation.test.InstrumentationTestLanguage;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-import java.util.Arrays;
-
-import org.graalvm.polyglot.Source;
 
 public class DebugStackFrameTest extends AbstractDebugTest {
 
@@ -592,7 +591,7 @@ static final class TestStackLanguage extends ProxyLanguage {
         @Override
         protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
             com.oracle.truffle.api.source.Source source = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new TestStackRootNode(languageInstance, source, DEPTH));
+            return new TestStackRootNode(languageInstance, source, DEPTH).getCallTarget();
         }
 
         private static final class TestStackRootNode extends RootNode {
@@ -652,7 +651,7 @@ protected List<TruffleStackTraceElement> findAsynchronousFrames(Frame frame) {
                 List<TruffleStackTraceElement> asyncStack = new ArrayList<>(depth);
                 TestStackRootNode asyncRoot = new TestStackRootNode(language, rootSection.getSource(), depth - 1);
                 do {
-                    RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(asyncRoot);
+                    RootCallTarget callTarget = asyncRoot.getCallTarget();
                     TestNode leaf = asyncRoot.child;
                     while (leaf.testChild != null) {
                         leaf = leaf.testChild;
@@ -678,7 +677,7 @@ protected List<TruffleStackTraceElement> findAsynchronousFrames(Frame frame) {
             private TestNode createTestNodes() {
                 TestNode node;
                 if (depth > 0) {
-                    RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(new TestStackRootNode(language, rootSection.getSource(), depth - 1));
+                    RootCallTarget callTarget = new TestStackRootNode(language, rootSection.getSource(), depth - 1).getCallTarget();
                     DirectCallNode callNode = Truffle.getRuntime().createDirectCallNode(callTarget);
                     if (depth % 2 == 0) {
                         node = new TestNode() {
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugValueTest.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugValueTest.java
index d2780a976541..11783f784388 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugValueTest.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/DebugValueTest.java
@@ -52,14 +52,12 @@
 import java.util.List;
 import java.util.Map;
 
+import org.graalvm.collections.Pair;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
-import org.graalvm.collections.Pair;
-
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.DebugStackFrame;
 import com.oracle.truffle.api.debug.DebugValue;
@@ -318,7 +316,7 @@ public void testNull() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance));
+                return new TestRootNode(languageInstance).getCallTarget();
             }
 
             final class TestRootNode extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/InstrumentablePositionsTestLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/InstrumentablePositionsTestLanguage.java
index 07e625bcc223..a524a3265049 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/InstrumentablePositionsTestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/InstrumentablePositionsTestLanguage.java
@@ -54,7 +54,6 @@
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.Option;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -287,7 +286,7 @@ TestNode getNode() {
                 synchronized (this) {
                     if (node == null) {
                         if (hasTag('F')) {
-                            RootCallTarget taget = Truffle.getRuntime().createCallTarget(new TestRootNode(lang, this));
+                            RootCallTarget taget = new TestRootNode(lang, this).getCallTarget();
                             node = new CallNode(taget);
                         } else {
                             node = new BaseNode(this);
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/NoCallNodeTestLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/NoCallNodeTestLanguage.java
index d90b11b689e5..f6dcd648f169 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/NoCallNodeTestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/NoCallNodeTestLanguage.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.api.debug.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.debug.DebuggerTags;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -64,7 +63,7 @@ public class NoCallNodeTestLanguage extends ProxyLanguage {
     protected CallTarget parse(ParsingRequest request) throws Exception {
         Source source = request.getSource();
         NCRootNode root = new NCRootNode(source.createSection(0, source.getLength()));
-        return Truffle.getRuntime().createCallTarget(root);
+        return root.getCallTarget();
     }
 
     private static final class NCRootNode extends RootNode {
@@ -104,7 +103,7 @@ static class NCStatement extends Node implements InstrumentableNode {
             if (sectionLength > 1) {
                 Source source = sourceSection.getSource();
                 SourceSection childSection = source.createSection(sourceSection.getCharIndex() + 1, sectionLength - 1);
-                childTarget = Truffle.getRuntime().createCallTarget(new NCRootNode(childSection));
+                childTarget = new NCRootNode(childSection).getCallTarget();
             } else {
                 childTarget = null;
             }
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugBuggyLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugBuggyLanguage.java
index 75b710fa955f..404a036fce06 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugBuggyLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugBuggyLanguage.java
@@ -40,12 +40,13 @@
  */
 package com.oracle.truffle.api.debug.test;
 
+import java.util.Objects;
 import java.util.function.BiFunction;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -59,7 +60,6 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.interop.NodeLibrary;
-import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -70,7 +70,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.ProxyInteropObject;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-import java.util.Objects;
 
 /**
  * A buggy language for debugger tests. Use {@link ProxyLanguage#setDelegate(ProxyLanguage)} to
@@ -116,7 +115,7 @@ protected final Object getDefaultScope(Node node, Frame frame, boolean enterNode
 
     @Override
     protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, request.getSource(), scopeProvider()));
+        return new TestRootNode(languageInstance, request.getSource(), scopeProvider()).getCallTarget();
     }
 
     @SuppressWarnings("static-method")
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugNoContentLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugNoContentLanguage.java
index 91b65d463f28..359760420ba6 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugNoContentLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestDebugNoContentLanguage.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.api.debug.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -90,7 +89,7 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
             }
         }
         varLocation = sourceInfo.copySection(source.createSection(varStartPos, source.getLength() - varStartPos));
-        return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, source, sourceInfo));
+        return new TestRootNode(languageInstance, source, sourceInfo).getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestExecutableNamesLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestExecutableNamesLanguage.java
index 618b95d7f4ea..9077688d292d 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestExecutableNamesLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestExecutableNamesLanguage.java
@@ -85,7 +85,7 @@ public TestExecutableNamesLanguage(int depth, String rootName, String... executa
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
         Source source = request.getSource();
-        return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+        return new RootNode(languageInstance) {
             @Override
             public Object execute(VirtualFrame frame) {
                 CallTarget target = createCallTarget();
@@ -102,10 +102,9 @@ public Object execute(VirtualFrame frame) {
 
             @TruffleBoundary
             private CallTarget createCallTarget() {
-                TestNamedRoot root = new TestNamedRoot(languageInstance, depth, rootName, source);
-                return Truffle.getRuntime().createCallTarget(root);
+                return new TestNamedRoot(languageInstance, depth, rootName, source).getCallTarget();
             }
-        });
+        }.getCallTarget();
     }
 
     private static class TestNamedRoot extends RootNode {
@@ -121,7 +120,7 @@ private static class TestNamedRoot extends RootNode {
             CallTarget target = null;
             TestNamedRootStatement statement = null;
             if (depth > 0) {
-                target = Truffle.getRuntime().createCallTarget(new TestNamedRoot(language, depth - 1, rootName, source));
+                target = new TestNamedRoot(language, depth - 1, rootName, source).getCallTarget();
             } else {
                 statement = new TestNamedRootStatement(source.createSection(1));
             }
@@ -323,7 +322,7 @@ static class Executable implements TruffleObject {
 
         Executable(String name, RootNode rootNode) {
             this.name = name;
-            this.target = Truffle.getRuntime().createCallTarget(rootNode);
+            this.target = rootNode.getCallTarget();
         }
 
         @ExportMessage
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestFramesRootTag.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestFramesRootTag.java
index 6a98eeb95522..e1181dae2eb4 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestFramesRootTag.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestFramesRootTag.java
@@ -44,10 +44,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
 import java.util.Iterator;
 
+import org.graalvm.polyglot.Source;
+import org.junit.Test;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -66,8 +68,6 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 
-import org.graalvm.polyglot.Source;
-
 /**
  * Test that debugger stack frames are based only on call nodes that are enclosed in a node tagged
  * with {@link StandardTags.RootTag}.
@@ -163,11 +163,11 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                 if (root == null) {
                     root = newRoot;
                 } else {
-                    lastRoot.setDescendant(Truffle.getRuntime().createCallTarget(newRoot));
+                    lastRoot.setDescendant(newRoot.getCallTarget());
                 }
                 lastRoot = newRoot;
             }
-            return Truffle.getRuntime().createCallTarget(root);
+            return root.getCallTarget();
         }
 
         private static final class TestRoot extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestLazyParsingLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestLazyParsingLanguage.java
index 4f8edee3acac..7124f413d912 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestLazyParsingLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestLazyParsingLanguage.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.api.debug.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -65,7 +64,7 @@ public class TestLazyParsingLanguage extends ProxyLanguage {
 
     @Override
     protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new LazyRootNode(languageInstance, request.getSource(), 1));
+        return new LazyRootNode(languageInstance, request.getSource(), 1).getCallTarget();
     }
 
     private static class LazyRootNode extends RootNode {
@@ -137,7 +136,7 @@ public Object execute(VirtualFrame frame) {
             Source source = sourceSection.getSource();
             if (nextLine <= source.getLineCount()) {
                 LazyRootNode root = new LazyRootNode(language, source, nextLine);
-                Truffle.getRuntime().createCallTarget(root).call();
+                root.getCallTarget().call();
             }
             return 42;
         }
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestNonInteractiveInlineParse.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestNonInteractiveInlineParse.java
index 83f8ae65c279..dad760cf9e6f 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestNonInteractiveInlineParse.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestNonInteractiveInlineParse.java
@@ -41,10 +41,11 @@
 package com.oracle.truffle.api.debug.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.debug.DebugStackFrame;
@@ -65,7 +66,6 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
-import static org.junit.Assert.fail;
 
 /**
  * Test that {@link TruffleLanguage#parse(TruffleLanguage.InlineParsingRequest)} is called for
@@ -86,7 +86,7 @@ protected Object createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new TestRootNode(this, request.getSource()));
+            return new TestRootNode(this, request.getSource()).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestReceiverLanguage.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestReceiverLanguage.java
index 5cd025aaac99..54435975c611 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestReceiverLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/TestReceiverLanguage.java
@@ -45,7 +45,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -81,7 +80,7 @@ public TestReceiverLanguage() {
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
         Source source = request.getSource();
-        return Truffle.getRuntime().createCallTarget(new TestReceiverRootNode(languageInstance, source));
+        return new TestReceiverRootNode(languageInstance, source).getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageLegacyTest.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageLegacyTest.java
index ddf5064b1d82..31aaf3e026a2 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageLegacyTest.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageLegacyTest.java
@@ -57,7 +57,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.Breakpoint;
 import com.oracle.truffle.api.debug.DebugStackFrame;
@@ -289,7 +288,7 @@ protected Context createContext(TruffleLanguage.Env env) {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             final com.oracle.truffle.api.source.Source source = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Node.Child private BlockNode variables = parse(source);
 
@@ -298,7 +297,7 @@ public Object execute(VirtualFrame frame) {
                     return variables.execute(frame);
                 }
 
-            });
+            }.getCallTarget();
         }
 
         private BlockNode parse(com.oracle.truffle.api.source.Source source) {
diff --git a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageTest.java b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageTest.java
index dd8198266f31..4e92427d970c 100644
--- a/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageTest.java
+++ b/truffle/src/com.oracle.truffle.api.debug.test/src/com/oracle/truffle/api/debug/test/ValueLanguageTest.java
@@ -57,7 +57,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.debug.Breakpoint;
 import com.oracle.truffle.api.debug.DebugStackFrame;
@@ -302,7 +301,7 @@ protected Context createContext(TruffleLanguage.Env env) {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             final com.oracle.truffle.api.source.Source source = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Node.Child private BlockNode variables = parse(source);
 
@@ -311,7 +310,7 @@ public Object execute(VirtualFrame frame) {
                     return variables.execute(frame);
                 }
 
-            });
+            }.getCallTarget();
         }
 
         private BlockNode parse(com.oracle.truffle.api.source.Source source) {
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AOTSupportTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AOTSupportTest.java
index df3effcb051b..15b5fcc4324b 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AOTSupportTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AOTSupportTest.java
@@ -242,7 +242,7 @@ private TestRootNode setup(BaseNode node) {
         context.initialize(LANGUAGE_ID);
         context.enter();
         TestRootNode root = new TestRootNode(TestLanguage.getCurrentLanguage(), node, null);
-        Truffle.getRuntime().createCallTarget(root);
+        root.getCallTarget();
         context.leave();
         return root;
     }
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java
index 865ed40bce1f..ef8cb70b7f19 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ArrayTest.java
@@ -44,7 +44,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.ImplicitCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -71,7 +70,7 @@ public Object execute(VirtualFrame frame) {
                 return test.executeWith(frame, frame.getArguments()[0]);
             }
         };
-        CallTarget target = Truffle.getRuntime().createCallTarget(root);
+        CallTarget target = root.getCallTarget();
 
         Assert.assertEquals(1, (int) target.call(1));
         Assert.assertArrayEquals(new double[0], (double[]) target.call(new int[0]), 0.0d);
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java
index caba5c7b36e1..fc85a5bbf2ed 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedTest.java
@@ -51,16 +51,12 @@
 
 import java.lang.reflect.Field;
 
-import com.oracle.truffle.api.dsl.test.CachedTestFactory.ProfileNodeGen;
-import com.oracle.truffle.api.profiles.ConditionProfile;
-import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NodeChild;
@@ -89,6 +85,7 @@
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.ChildrenNoAdoption6Factory;
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.NullChildAdoptionNodeGen;
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.NullLiteralNodeGen;
+import com.oracle.truffle.api.dsl.test.CachedTestFactory.ProfileNodeGen;
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestBoundCacheOverflowContainsFactory;
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestCacheFieldFactory;
 import com.oracle.truffle.api.dsl.test.CachedTestFactory.TestCacheMethodFactory;
@@ -106,6 +103,8 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInterface;
 import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.profiles.LoopConditionProfile;
 
 @SuppressWarnings("unused")
 public class CachedTest {
@@ -332,12 +331,12 @@ static boolean someMethod(int value) {
     }
 
     private static boolean isCompileImmediately() {
-        CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        CallTarget target = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return CompilerDirectives.inCompiledCode();
             }
-        });
+        }.getCallTarget();
         return (boolean) target.call();
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedThreadSafetyTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedThreadSafetyTest.java
index 78db84b5655b..e375075da215 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedThreadSafetyTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/CachedThreadSafetyTest.java
@@ -54,7 +54,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -119,7 +118,7 @@ private static SingleCachedFieldNode[] createNodes() {
         for (int nodeIndex = 0; nodeIndex < nodes.length; nodeIndex++) {
             SingleCachedFieldNode node = SingleCachedFieldNodeGen.create();
             TestRootNode root = new TestRootNode(null, node);
-            Truffle.getRuntime().createCallTarget(root);
+            root.getCallTarget();
             nodes[nodeIndex] = node;
             assertNotNull(node.getParent());
         }
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java
index 0fce30e10381..f891b982b41c 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/TestHelper.java
@@ -119,15 +119,11 @@ static <E extends ValueNode> TestRootNode<E> createRootPrefix(NodeFactory<E> fac
     }
 
     static CallTarget createCallTarget(ValueNode node) {
-        return createCallTarget(new TestRootNode<>(node));
-    }
-
-    static CallTarget createCallTarget(TestRootNode<? extends ValueNode> node) {
-        return Truffle.getRuntime().createCallTarget(node);
+        return new TestRootNode<>(node).getCallTarget();
     }
 
     static RootCallTarget createCallTarget(NodeFactory<? extends ValueNode> factory, Object... constants) {
-        return Truffle.getRuntime().createCallTarget(createRoot(factory, constants));
+        return createRoot(factory, constants).getCallTarget();
     }
 
     static boolean assertionsEnabled() {
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
index 3f5f3556dbc8..9bf7876dbd75 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
@@ -55,7 +55,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
@@ -210,9 +209,7 @@ protected static boolean isString(Object a, Object b) {
 
         /**
          * The doDouble specialization is only enabled depending on an option stored in the language
-         * instance. Note that only the current language associated with the RootNode maybe used in
-         * {@link CachedLanguage}. Any other language instance used will result in a
-         * {@link IllegalStateException} when the node is prepared for AOT.
+         * instance.
          *
          * In this case since doublesEnabled is not set to true this specialization will not produce
          * any code after AOT preparation.
@@ -348,7 +345,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                 // program
                 // this is equivalent to (arg0 + arg1) + arg2
                 BaseNode body = AddNodeGen.create(AddNodeGen.create(new ArgumentNode(0), new ArgumentNode(1)), new ArgumentNode(2));
-                return Truffle.getRuntime().createCallTarget(new AOTRootNode(this, body, returnType, argumentTypes));
+                return new AOTRootNode(this, body, returnType, argumentTypes).getCallTarget();
             } else {
                 throw CompilerDirectives.shouldNotReachHere("not-implemented");
             }
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java
index 39928a7a8b5d..754ef00c1884 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/ExampleNode.java
@@ -42,7 +42,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -76,7 +75,7 @@ public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
     }
 
     public static CallTarget createTarget(ExampleNode node) {
-        return Truffle.getRuntime().createCallTarget(new ExampleRootNode(node));
+        return new ExampleRootNode(node).getCallTarget();
     }
 
     public static ExampleArgumentNode[] getArguments(CallTarget target) {
@@ -160,7 +159,7 @@ public long executeLong(VirtualFrame frame) throws UnexpectedResultException {
     }
 
     public static CallTarget createDummyTarget(int argumentIndex) {
-        return Truffle.getRuntime().createCallTarget(new DummyCallRootNode(argumentIndex));
+        return new DummyCallRootNode(argumentIndex).getCallTarget();
     }
 
     private static class DummyCallRootNode extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/AllocationReporterTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/AllocationReporterTest.java
index d98a34a52158..e86ed794f726 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/AllocationReporterTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/AllocationReporterTest.java
@@ -64,7 +64,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.AllocationEvent;
@@ -626,7 +625,7 @@ public static class AllocationReporterLanguage extends ProxyLanguage {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             final com.oracle.truffle.api.source.Source code = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Node.Child private AllocNode alloc = parse(code.getCharacters().toString());
 
@@ -635,7 +634,7 @@ public Object execute(VirtualFrame frame) {
                     return alloc.execute(frame);
                 }
 
-            });
+            }.getCallTarget();
         }
 
         private static AllocNode parse(String code) {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/CompileImmediatelyCheck.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/CompileImmediatelyCheck.java
index 5b4acb33d1f9..26efb042266a 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/CompileImmediatelyCheck.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/CompileImmediatelyCheck.java
@@ -42,19 +42,18 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
 public class CompileImmediatelyCheck {
 
     public static boolean isCompileImmediately() {
-        CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        CallTarget target = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return CompilerDirectives.inCompiledCode();
             }
-        });
+        }.getCallTarget();
         return (boolean) target.call();
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptStandaloneTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptStandaloneTest.java
index 72ec1094de1c..1a964516bc2c 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptStandaloneTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptStandaloneTest.java
@@ -67,7 +67,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -103,7 +102,7 @@ public void testCancelDuringHostSleep() throws ExecutionException, InterruptedEx
                         new ProxyLanguage() {
                             @Override
                             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                                return new RootNode(languageInstance) {
                                     @Child InteropLibrary library = InteropLibrary.getFactory().createDispatched(1);
 
                                     @Override
@@ -122,7 +121,7 @@ private void callHostSleep() {
                                             throw new AssertionError(e);
                                         }
                                     }
-                                });
+                                }.getCallTarget();
                             }
 
                             @Override
@@ -179,7 +178,7 @@ private void testCancelFromHostCall(boolean nestedContextEntered) {
                         new ProxyLanguage() {
                             @Override
                             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                                return new RootNode(languageInstance) {
                                     @Child InteropLibrary library = InteropLibrary.getFactory().createDispatched(1);
 
                                     @Override
@@ -192,7 +191,7 @@ public Object execute(VirtualFrame frame) {
                                         }
                                         return 0;
                                     }
-                                });
+                                }.getCallTarget();
                             }
                         });
         try {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextsEventsTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextsEventsTest.java
index ec356274b917..f9be601b2365 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextsEventsTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextsEventsTest.java
@@ -61,7 +61,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.ContextsListener;
@@ -493,12 +492,12 @@ static class LanguageContextFailureLanguage extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+            return new RootNode(languageInstance) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return null;
                 }
-            });
+            }.getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/DeadlockTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/DeadlockTest.java
index 6c39b4519b40..cc8310b61160 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/DeadlockTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/DeadlockTest.java
@@ -55,7 +55,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.ExecuteSourceEvent;
@@ -203,14 +202,14 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             final CharSequence codeCharacters = code.getCharacters();
             if (CODE_LATCH.equals(codeCharacters)) {
                 ((InstrumentationThread) Thread.currentThread()).setExecutionLatch(executionLatch);
-                return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+                return new RootNode(this) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return Boolean.TRUE;
                     }
-                });
+                }.getCallTarget();
             }
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Override
                 public Object execute(VirtualFrame frame) {
@@ -240,13 +239,13 @@ public SourceSection getSourceSection() {
                             } catch (InterruptedException ex) {
                             }
                         }
-                        codeExec = Truffle.getRuntime().createCallTarget(codeExecRoot);
+                        codeExec = codeExecRoot.getCallTarget();
                     }
                     targets.add(codeExec);
                     return codeExec.call();
                 }
 
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
@@ -320,7 +319,7 @@ public SourceSection getSourceSection() {
 
                     };
                     synchronized (language.lock) {
-                        this.statementCall = Truffle.getRuntime().createCallTarget(codeExecRoot);
+                        this.statementCall = codeExecRoot.getCallTarget();
                     }
                 }
                 return this;
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/FindSourcesVisitorNestingTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/FindSourcesVisitorNestingTest.java
index d5042e83fad3..31c1dea84518 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/FindSourcesVisitorNestingTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/FindSourcesVisitorNestingTest.java
@@ -52,7 +52,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
@@ -190,7 +189,7 @@ public InstrumentableNode materializeInstrumentableNodes(Set<Class<? extends Tag
                 return this;
             }
 
-            Truffle.getRuntime().createCallTarget(new RootNode(this.language) {
+            new RootNode(this.language) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return 0;
@@ -201,7 +200,7 @@ public SourceSection getSourceSection() {
                     return CreateCallTargetOnMaterializeNode.this.sourceSection;
                 }
 
-            });
+            }.getCallTarget();
             return new CreateCallTargetOnMaterializeNode(this.env, this.language, this.sourceSection.getSource(), true);
         }
     }
@@ -214,7 +213,7 @@ public void setup() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
                 com.oracle.truffle.api.source.Source source = request.getSource();
-                CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                CallTarget target = new RootNode(languageInstance) {
 
                     @Node.Child private CreateCallTargetOnMaterializeNode child = new CreateCallTargetOnMaterializeNode(instrumentEnv, languageInstance, source, false);
 
@@ -228,7 +227,7 @@ public SourceSection getSourceSection() {
                         return source.createSection(1);
                     }
 
-                });
+                }.getCallTarget();
                 targets.add(target);
                 return target;
             }
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/GR25718Test.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/GR25718Test.java
index b295a0ddfe93..2e985b11f98a 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/GR25718Test.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/GR25718Test.java
@@ -54,7 +54,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.ExecuteSourceEvent;
 import com.oracle.truffle.api.instrumentation.ExecuteSourceListener;
@@ -182,14 +181,14 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             final CharSequence codeCharacters = code.getCharacters();
             if (CODE_LATCHES.equals(codeCharacters)) {
                 ((InstrumentationThread) Thread.currentThread()).setExecutionLatches(executionLatchList);
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return Boolean.TRUE;
                     }
-                });
+                }.getCallTarget();
             }
-            return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+            return new RootNode(languageInstance) {
 
                 @Override
                 public Object execute(VirtualFrame frame) {
@@ -213,7 +212,7 @@ public SourceSection getSourceSection() {
                         }
 
                     };
-                    CallTarget codeExec = Truffle.getRuntime().createCallTarget(codeExecRoot);
+                    CallTarget codeExec = codeExecRoot.getCallTarget();
                     codeExec.call();
                     // Resume instrumentation thread
                     executionLatches.next().countDown();
@@ -231,7 +230,7 @@ public SourceSection getSourceSection() {
                     return Source.newBuilder(ID, "test", "name").build().createSection(1);
                 }
 
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentableNodeTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentableNodeTest.java
index 2deed0c758c3..176b9ea9cafa 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentableNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentableNodeTest.java
@@ -57,7 +57,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventContext;
@@ -348,7 +347,7 @@ public static class MaterializationLanguage extends ProxyLanguage {
         protected CallTarget parse(ParsingRequest request) throws Exception {
             com.oracle.truffle.api.source.Source source = request.getSource();
             String code = source.getCharacters().toString();
-            CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            CallTarget target = new RootNode(this) {
 
                 @Node.Children private MaterializableNode[] children = code.startsWith("num") ? new MaterializableNode[]{} : createChildren(MaterializationLanguage.this, source, 1);
 
@@ -373,7 +372,7 @@ public SourceSection getSourceSection() {
                     return source.createSection(1);
                 }
 
-            });
+            }.getCallTarget();
             targets.add(target);
             return target;
         }
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTest.java
index 586a6ddd77ce..1891fea7871c 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTest.java
@@ -409,7 +409,7 @@ protected InstrumentContext createContext(com.oracle.truffle.api.TruffleLanguage
 
         @Override
         protected CallTarget parse(ParsingRequest request) {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Child private BaseNode base = parse(request.getSource());
 
@@ -417,7 +417,7 @@ protected CallTarget parse(ParsingRequest request) {
                 public Object execute(VirtualFrame frame) {
                     return base.execute(frame);
                 }
-            });
+            }.getCallTarget();
         }
 
     }
@@ -1577,7 +1577,7 @@ protected InstrumentContext createContext(com.oracle.truffle.api.TruffleLanguage
 
         @Override
         protected CallTarget parse(ParsingRequest request) {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Child private BaseNode base = parse(request.getSource());
 
@@ -1585,7 +1585,7 @@ protected CallTarget parse(ParsingRequest request) {
                 public Object execute(VirtualFrame frame) {
                     return base.execute(frame);
                 }
-            });
+            }.getCallTarget();
         }
 
     }
@@ -2299,7 +2299,7 @@ public Object execute(VirtualFrame frame) {
                 return 42;
             }
         };
-        Truffle.getRuntime().createCallTarget(root);
+        root.getCallTarget();
         Frame frame = Truffle.getRuntime().createMaterializedFrame(new Object[]{}, root.getFrameDescriptor());
         List<TruffleStackTraceElement> stack = TruffleStackTrace.getAsynchronousStackTrace(root.getCallTarget(), frame);
         // No asynchronous stack by default
@@ -2311,7 +2311,7 @@ public void testAsynchronousStacks3() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new AsyncRootNode(language, 0));
+                return new AsyncRootNode(language, 0).getCallTarget();
             }
 
             class AsyncRootNode extends RootNode {
@@ -2356,7 +2356,7 @@ protected boolean isInstrumentable() {
                 protected List<TruffleStackTraceElement> findAsynchronousFrames(Frame frame) {
                     assertSame(this.getFrameDescriptor(), frame.getFrameDescriptor());
                     AsyncRootNode invoker = new AsyncRootNode(language, level + 1);
-                    RootCallTarget invokerTarget = Truffle.getRuntime().createCallTarget(invoker);
+                    RootCallTarget invokerTarget = invoker.getCallTarget();
                     Frame invokerFrame = Truffle.getRuntime().createMaterializedFrame(new Object[]{level + 1}, invoker.getFrameDescriptor());
                     TruffleStackTraceElement element = TruffleStackTraceElement.create(invoker.child, invokerTarget, invokerFrame);
                     return Collections.singletonList(element);
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
index 72f10961af0b..a337f9457c59 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
@@ -258,7 +258,7 @@ protected void initializeContext(InstrumentContext context) throws Exception {
         if (code != null) {
             SourceSection outer = code.createSection(0, code.getLength());
             BaseNode node = parse(code);
-            RootCallTarget rct = Truffle.getRuntime().createCallTarget(new InstrumentationTestRootNode(this, "", outer, node));
+            RootCallTarget rct = new InstrumentationTestRootNode(this, "", outer, node).getCallTarget();
             rct.call();
             if (context.runInitAfterExec) {
                 context.afterTarget = rct;
@@ -282,7 +282,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             throw new IOException(e);
         }
         RootCallTarget afterTarget = InstrumentContext.get(null).afterTarget;
-        return lastParsed = Truffle.getRuntime().createCallTarget(new InstrumentationTestRootNode(this, "", outer, afterTarget, node));
+        return lastParsed = new InstrumentationTestRootNode(this, "", outer, afterTarget, node).getCallTarget();
     }
 
     public static RootNode parse(String code) {
@@ -1456,7 +1456,7 @@ static class DefineNode extends InstrumentedNode {
             int index = code.indexOf('(') + 1;
             index = code.indexOf(',', index) + 1;
             SourceSection functionSection = source.getSource().createSection(source.getCharIndex() + index, source.getCharLength() - index - 1);
-            this.target = Truffle.getRuntime().createCallTarget(new InstrumentationTestRootNode(lang, identifier, functionSection, children));
+            this.target = new InstrumentationTestRootNode(lang, identifier, functionSection, children).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationUpdateTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationUpdateTest.java
index 7f5740411e0f..3da32c61d445 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationUpdateTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationUpdateTest.java
@@ -52,7 +52,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventBinding;
@@ -346,7 +345,7 @@ public static class InstrumentationUpdateLanguage extends TruffleLanguage<Object
         @Override
         protected CallTarget parse(@SuppressWarnings("hiding") com.oracle.truffle.api.TruffleLanguage.ParsingRequest request) throws Exception {
             this.request = request;
-            return Truffle.getRuntime().createCallTarget(run.apply(this));
+            return run.apply(this).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/MaterializationAssertionsViolationTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/MaterializationAssertionsViolationTest.java
index dbb01f525095..9bf96a2f11ba 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/MaterializationAssertionsViolationTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/MaterializationAssertionsViolationTest.java
@@ -56,7 +56,6 @@
 import org.junit.rules.ExpectedException;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventBinding;
 import com.oracle.truffle.api.instrumentation.EventContext;
@@ -212,7 +211,7 @@ CustomMaterializeNode parseNode(String code, com.oracle.truffle.api.source.Sourc
             protected CallTarget parse(ParsingRequest request) throws Exception {
                 com.oracle.truffle.api.source.Source source = request.getSource();
                 String code = source.getCharacters().toString();
-                CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                CallTarget target = new RootNode(languageInstance) {
 
                     @Node.Children private CustomMaterializeNode[] children = parseNodes(code, source);
 
@@ -231,7 +230,7 @@ public SourceSection getSourceSection() {
                         return source.createSection(1);
                     }
 
-                });
+                }.getCallTarget();
                 targets.add(target);
                 return target;
             }
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ParsingFromInstrumentTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ParsingFromInstrumentTest.java
index b33c448c09a6..a64546d8498f 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ParsingFromInstrumentTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ParsingFromInstrumentTest.java
@@ -40,9 +40,19 @@
  */
 package com.oracle.truffle.api.instrumentation.test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.io.IOException;
+import java.util.function.Function;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.Source;
+import org.junit.Test;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.ContextLocal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.ContextsListener;
@@ -50,14 +60,6 @@
 import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-import java.io.IOException;
-import java.util.function.Function;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Engine;
-import org.graalvm.polyglot.Source;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import org.junit.Test;
 
 public class ParsingFromInstrumentTest {
     public static final class ParsingTestLanguage extends ProxyLanguage {
@@ -70,7 +72,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
 
             int idx = request.getArgumentNames().indexOf("emptyList");
 
-            return Truffle.getRuntime().createCallTarget(new ParsingNode(idx));
+            return new ParsingNode(idx).getCallTarget();
         }
 
         class ParsingNode extends RootNode {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceListenerTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceListenerTest.java
index 01af34b2495c..930c2b6ac0b7 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceListenerTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceListenerTest.java
@@ -70,7 +70,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventBinding;
@@ -503,14 +502,14 @@ private static void testNoRootSectionImpl(TestLoadExecuteSource impl) throws Exc
         Node node1 = new SourceSectionFilterTest.SourceSectionNode(source1.createSection(1));
         RootNode rootA = SourceSectionFilterTest.createRootNode(null, Boolean.FALSE, node1);
         impl.assertAllEvents();
-        Truffle.getRuntime().createCallTarget(rootA).call();
+        rootA.getCallTarget().call();
         impl.assertAllEvents(source1);
 
         Node node2 = new SourceSectionFilterTest.SourceSectionNode(source2.createSection(2));
         Node node3 = new SourceSectionFilterTest.SourceSectionNode(source3.createSection(2));
         RootNode rootB = SourceSectionFilterTest.createRootNode(null, Boolean.FALSE, node2, node3);
         impl.assertAllEvents(source1);
-        Truffle.getRuntime().createCallTarget(rootB).call();
+        rootB.getCallTarget().call();
         impl.assertAllEvents(source1, source2, source3);
     }
 
@@ -523,8 +522,8 @@ public void testExecutionAndSourceListeners() throws Exception {
         Node node2 = new SourceSectionFilterTest.SourceSectionNode(source2.createSection(1));
         RootNode root1 = SourceSectionFilterTest.createRootNode(source1.createSection(1, 1, 2, 5), Boolean.FALSE, node1);
         RootNode root2 = SourceSectionFilterTest.createRootNode(source2.createSection(1, 1, 2, 5), Boolean.FALSE, node2);
-        Truffle.getRuntime().createCallTarget(root1).call();
-        Truffle.getRuntime().createCallTarget(root2);
+        root1.getCallTarget().call();
+        root2.getCallTarget();
         // source1 was loaded and executed, source 2 was loaded only
 
         Set<String> executedSources = new TreeSet<>();
@@ -588,7 +587,7 @@ private void testBindingDisposalImpl(boolean load) throws Exception {
         Node node2a = new SourceSectionFilterTest.SourceSectionNode(source2a.createSection(1));
         Node node2b = new SourceSectionFilterTest.SourceSectionNode(source2b.createSection(1));
         RootNode root2 = SourceSectionFilterTest.createRootNode(null, Boolean.FALSE, node2a, node2b);
-        Truffle.getRuntime().createCallTarget(root2).call();
+        root2.getCallTarget().call();
         assertEvents(impl.onlyNewEvents, source1);
         assertEvents(impl.allEvents, source1);
 
@@ -870,7 +869,7 @@ public void testNoMaterializationOnSourceListener() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
                 com.oracle.truffle.api.source.Source source = request.getSource();
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Node.Child private NeverMaterializedNode child = new NeverMaterializedNode();
 
                     @Override
@@ -882,7 +881,7 @@ public Object execute(VirtualFrame frame) {
                     public SourceSection getSourceSection() {
                         return source.createSection(1);
                     }
-                });
+                }.getCallTarget();
             }
         });
         context.eval(Source.create(ProxyLanguage.ID, "a"));
@@ -1414,7 +1413,7 @@ static class MultiSourceASTLanguage extends ProxyLanguage {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             com.oracle.truffle.api.source.Source source = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+            return new RootNode(languageInstance) {
                 @Node.Child private MultiSourceBlock block = new MultiSourceBlock(source, source.getCharacters().toString());
 
                 @Override
@@ -1426,7 +1425,7 @@ public Object execute(VirtualFrame frame) {
                 public SourceSection getSourceSection() {
                     return source.createSection(1);
                 }
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionFilterTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionFilterTest.java
index 8ee8a95e4b63..2726d2e71f2b 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionFilterTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionFilterTest.java
@@ -51,7 +51,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode;
@@ -1048,7 +1047,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             Assert.assertTrue(SourceSectionFilter.ANY.includes(rootNode, rootNode.getSourceSection(), rootTags));
             Assert.assertTrue(SourceSectionFilter.newBuilder().tagIs(StandardTags.RootTag.class).build().includes(rootNode, rootNode.getSourceSection(), rootTags));
             Assert.assertFalse(SourceSectionFilter.newBuilder().tagIs(StandardTags.RootTag.class).build().includes(rootNode, rootNode.getSourceSection(), statementTags));
-            return Truffle.getRuntime().createCallTarget(rootNode);
+            return rootNode.getCallTarget();
         }
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionListenerTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionListenerTest.java
index bc02d92531d1..4b10e2739c2a 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionListenerTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/SourceSectionListenerTest.java
@@ -54,7 +54,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
@@ -394,7 +393,7 @@ static class SingleSourceSectionLanguage extends ProxyLanguage {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             com.oracle.truffle.api.source.Source source = request.getSource();
-            return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+            return new RootNode(languageInstance) {
                 @Node.Child private SingleSourceSectionNode onlyChild = new SingleSourceSectionNode(source);
 
                 @Override
@@ -406,7 +405,7 @@ public Object execute(VirtualFrame frame) {
                 public com.oracle.truffle.api.source.SourceSection getSourceSection() {
                     return source.createSection(1);
                 }
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TagsTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TagsTest.java
index 11d89a6fd340..baf575f707c7 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TagsTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TagsTest.java
@@ -45,13 +45,13 @@
 import static org.junit.Assert.assertSame;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -79,7 +79,6 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.ProxyInstrument;
-import org.graalvm.polyglot.PolyglotException;
 
 public class TagsTest {
 
@@ -189,7 +188,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Child private TaggedNode child = new TaggedNode(request.getSource().getCharacters().toString());
 
@@ -202,7 +201,7 @@ protected boolean isInstrumentable() {
                 public Object execute(VirtualFrame frame) {
                     return child.execute(frame);
                 }
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
@@ -299,7 +298,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Child private RWTaggedNode child = new RWTaggedNode(request.getSource());
 
@@ -312,7 +311,7 @@ protected boolean isInstrumentable() {
                 public Object execute(VirtualFrame frame) {
                     return child.execute(frame);
                 }
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
index b313814784ca..ccf3a6c7b7a8 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
@@ -50,12 +50,12 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.PolyglotException;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.instrumentation.EventBinding;
 import com.oracle.truffle.api.instrumentation.ThreadsActivationListener;
@@ -64,8 +64,6 @@
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage.LanguageContext;
 
-import org.graalvm.polyglot.PolyglotException;
-
 public class ThreadsActivationListenerTest extends AbstractPolyglotTest {
 
     public ThreadsActivationListenerTest() {
@@ -78,7 +76,7 @@ public void testInternalContext() {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
         });
 
@@ -158,7 +156,7 @@ public void testMultiContext() {
         setupEnv(Context.newBuilder().engine(engine).build(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
         });
         Context c0 = this.context;
@@ -167,7 +165,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         setupEnv(Context.newBuilder().engine(engine).build(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
         });
 
@@ -230,7 +228,7 @@ public void testSingleContext() {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
         });
         List<TruffleContext> entered = new ArrayList<>();
@@ -289,7 +287,7 @@ public void testMultiThreading() throws InterruptedException {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
 
             @Override
@@ -387,7 +385,7 @@ private void testExceptionImpl(Runnable body, boolean throwOnEnter, boolean thro
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
         });
 
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
index 1648c70e5f3e..d7c3ba496aa7 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
@@ -77,7 +77,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleSafepoint;
@@ -356,7 +355,7 @@ protected CallTarget parse(ParsingRequest request) {
                     default:
                         throw CompilerDirectives.shouldNotReachHere("Unknown request: " + command);
                 }
-                return Truffle.getRuntime().createCallTarget(rootNode);
+                return rootNode.getCallTarget();
             }
         });
         context.eval(Source.newBuilder(ProxyLanguage.ID, "controller", "test").buildLiteral());
@@ -643,7 +642,7 @@ public void testNoInitializeMultiContextForInnerContext() {
 
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
 
             @Override
@@ -669,7 +668,7 @@ public void testInitializeMultiContextForInnerContext() {
 
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+                return RootNode.createConstantNode(42).getCallTarget();
             }
 
             @Override
@@ -690,7 +689,7 @@ private void setupLanguageThatReturns(Supplier<Object> supplier) {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return get();
@@ -700,7 +699,7 @@ public Object execute(VirtualFrame frame) {
                     private Object get() {
                         return supplier.get();
                     }
-                });
+                }.getCallTarget();
             }
         });
     }
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeLegacyTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeLegacyTest.java
index 80a867dc9483..65ded08d7f2e 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeLegacyTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeLegacyTest.java
@@ -55,7 +55,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.Frame;
@@ -289,7 +288,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new CustomRoot(this));
+            return new CustomRoot(this).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeTest.java
index b6dfd6cbfae3..61a1496530c4 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/VariablesScopeTest.java
@@ -45,13 +45,14 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.Frame;
@@ -82,9 +83,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
 
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Value;
-
 /**
  * Test of {@link Scope}.
  */
@@ -352,7 +350,7 @@ private static void createDefaultScopeLanguage(Context context) {
         ProxyLanguage language = new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
 
                     @Node.Child private DefaultRootBlockNode block = insert(new DefaultRootBlockNode());
 
@@ -365,7 +363,7 @@ protected boolean isInstrumentable() {
                     public Object execute(VirtualFrame frame) {
                         return block.execute(frame);
                     }
-                });
+                }.getCallTarget();
             }
         };
         ProxyLanguage.setDelegate(language);
@@ -463,7 +461,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new CustomRoot(this));
+            return new CustomRoot(this).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentableNode.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentableNode.java
index e50598280705..de68601f0187 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentableNode.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentableNode.java
@@ -45,7 +45,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
@@ -109,8 +108,8 @@ public interface InstrumentableNode extends NodeInterface {
      * <p>
      * The implementation of this method must ensure that its result is stable after the parent
      * {@link RootNode root node} was wrapped in a {@link CallTarget} using
-     * {@link TruffleRuntime#createCallTarget(RootNode)}. The result is stable if the result of
-     * calling this method remains always the same.
+     * {@link RootNode#getCallTarget()}. The result is stable if the result of calling this method
+     * remains always the same.
      * <p>
      * This method might be called in parallel from multiple threads even if the language is single
      * threaded. The method may be invoked without a language context currently being active.
@@ -183,8 +182,8 @@ public interface InstrumentableNode extends NodeInterface {
      * <p>
      * The implementation of hasTag method must ensure that its result is stable after the parent
      * {@link RootNode root node} was wrapped in a {@link CallTarget} using
-     * {@link TruffleRuntime#createCallTarget(RootNode)}. The result is stable if the result of
-     * calling this method for a particular tag remains always the same.
+     * {@link RootNode#getCallTarget()}. The result is stable if the result of calling this method
+     * for a particular tag remains always the same.
      * <p>
      * This method might be called in parallel from multiple threads even if the language is single
      * threaded. The method may be invoked without a language context currently being active.
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceListener.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceListener.java
index 737d83c93793..8a3160ab2aa2 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceListener.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceListener.java
@@ -40,7 +40,6 @@
  */
 package com.oracle.truffle.api.instrumentation;
 
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -60,10 +59,9 @@ public interface LoadSourceListener {
      * attached}.
      * <p>
      * <b>Implementation Note:</b> Source load events are notified when the guest language
-     * implementation uses a new {@link Source source} by invoking
-     * {@link TruffleRuntime#createCallTarget(RootNode)} with a root node that uses a new source in
-     * {@link Node#getSourceSection()}. It assumes that all nodes of an AST have the same
-     * {@link Source source} as their root.
+     * implementation uses a new {@link Source source} by invoking {@link RootNode#getCallTarget()}
+     * with a root node that uses a new source in {@link Node#getSourceSection()}. It assumes that
+     * all nodes of an AST have the same {@link Source source} as their root.
      * </p>
      *
      * @param event an event with context information
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceSectionListener.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceSectionListener.java
index 45ab2bcd2b84..f0a10ecfca02 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceSectionListener.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/LoadSourceSectionListener.java
@@ -40,7 +40,6 @@
  */
 package com.oracle.truffle.api.instrumentation;
 
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -63,10 +62,9 @@ public interface LoadSourceSectionListener {
      * attached}.
      *
      * <b>Implementation Note:</b> Source load events are notified when the guest language
-     * implementation uses a new {@link Source source} by invoking
-     * {@link TruffleRuntime#createCallTarget(RootNode)} with a root node that uses a new source in
-     * {@link Node#getSourceSection()}. It assumes that all nodes of an AST have the same
-     * {@link Source source} as their root.
+     * implementation uses a new {@link Source source} by invoking {@link RootNode#getCallTarget()}
+     * with a root node that uses a new source in {@link Node#getSourceSection()}. It assumes that
+     * all nodes of an AST have the same {@link Source source} as their root.
      * </p>
      *
      * @param event an event with context information
diff --git a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy1.java b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy1.java
index 5ea7f97b30aa..9baf83f5054f 100644
--- a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy1.java
+++ b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy1.java
@@ -45,7 +45,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -133,7 +132,7 @@ public Object execute(VirtualFrame frame) {
     @Test
     public void runExample() {
         ArrayReadNode read = ArrayReadNodeGen.create(new ArgumentNode(0), new ArgumentNode(1));
-        CallTarget target = Truffle.getRuntime().createCallTarget(new ExampleRootNode(read));
+        CallTarget target = new ExampleRootNode(read).getCallTarget();
 
         assertEquals(3, target.call(new SequenceArray(1, 2, 3), 1));
         assertEquals(0, target.call(new BufferArray(2), 1));
diff --git a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy2.java b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy2.java
index 773c9769ba66..3cbe24ecefbe 100644
--- a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy2.java
+++ b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy2.java
@@ -45,13 +45,12 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 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.library.test.examples.ArrayStrategy1.ArgumentNode;
-import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExampleRootNode;
+import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy2Factory.ArrayReadNodeGen;
 
 /**
@@ -118,7 +117,7 @@ int doDefault(Array array, int index) {
     @Test
     public void runExample() {
         ArrayReadNode read = ArrayReadNodeGen.create(new ArgumentNode(0), new ArgumentNode(1));
-        CallTarget target = Truffle.getRuntime().createCallTarget(new ExampleRootNode(read));
+        CallTarget target = new ExampleRootNode(read).getCallTarget();
 
         assertEquals(3, target.call(new SequenceArray(1, 2, 3), 1));
         assertEquals(0, target.call(new BufferArray(2), 1));
diff --git a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy3.java b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy3.java
index 3fb4dfb3c6ec..e88148de590b 100644
--- a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy3.java
+++ b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/ArrayStrategy3.java
@@ -47,7 +47,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
@@ -142,7 +141,7 @@ int doDefault(Object array, int index,
     @Test
     public void runExample() {
         ArrayReadNode read = ArrayReadNodeGen.create(new ArgumentNode(0), new ArgumentNode(1));
-        CallTarget target = Truffle.getRuntime().createCallTarget(new ExampleRootNode(read));
+        CallTarget target = new ExampleRootNode(read).getCallTarget();
 
         assertEquals(3, target.call(new SequenceArray(1, 2, 3), 1));
         assertEquals(0, target.call(new BufferArray(2), 1));
diff --git a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/DynamicDispatchExample.java b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/DynamicDispatchExample.java
index 9b8d585eefe1..f73c6564651f 100644
--- a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/DynamicDispatchExample.java
+++ b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/DynamicDispatchExample.java
@@ -45,7 +45,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
@@ -55,8 +54,8 @@
 import com.oracle.truffle.api.library.GenerateLibrary;
 import com.oracle.truffle.api.library.Library;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ArgumentNode;
-import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExampleRootNode;
+import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.DynamicDispatchExampleFactory.SampleOperationNodeGen;
 
 /**
@@ -120,7 +119,7 @@ String doDefault(Object sample,
     @Test
     public void runExample() {
         SampleOperationNode read = SampleOperationNodeGen.create(new ArgumentNode(0));
-        CallTarget target = Truffle.getRuntime().createCallTarget(new ExampleRootNode(read));
+        CallTarget target = new ExampleRootNode(read).getCallTarget();
 
         assertEquals("export1", target.call(new DynamicDispatchObject(SampleExport1.class)));
         assertEquals("export2", target.call(new DynamicDispatchObject(SampleExport2.class)));
diff --git a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/TaintTrackingExample.java b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/TaintTrackingExample.java
index cb3099f4aef1..857fc5b07e85 100644
--- a/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/TaintTrackingExample.java
+++ b/truffle/src/com.oracle.truffle.api.library.test/src/com/oracle/truffle/api/library/test/examples/TaintTrackingExample.java
@@ -46,7 +46,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
@@ -58,8 +57,8 @@
 import com.oracle.truffle.api.library.Message;
 import com.oracle.truffle.api.library.ReflectionLibrary;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ArgumentNode;
-import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExampleRootNode;
+import com.oracle.truffle.api.library.test.examples.ArrayStrategy1.ExpressionNode;
 import com.oracle.truffle.api.library.test.examples.TaintTrackingExampleFactory.UnknownOperationNodeGen;
 
 /**
@@ -159,7 +158,7 @@ Object doDefault(Object sample,
     public void runExample() {
         TaintLibrary taintLibrary = LibraryFactory.resolve(TaintLibrary.class).getUncached();
         UnknownOperationNode sample = UnknownOperationNodeGen.create(new ArgumentNode(0));
-        CallTarget target = Truffle.getRuntime().createCallTarget(new ExampleRootNode(sample));
+        CallTarget target = new ExampleRootNode(sample).getCallTarget();
 
         Object value = new UnknownValue();
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java
index d23bf8905f20..eecbd871ae1b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ArgumentsTest.java
@@ -44,8 +44,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -75,10 +73,8 @@ public class ArgumentsTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestRootNode rootNode = new TestRootNode(new TestArgumentNode[]{new TestArgumentNode(0), new TestArgumentNode(1)});
-        CallTarget target = runtime.createCallTarget(rootNode);
-        Object result = target.call(new Object[]{20, 22});
+        Object result = rootNode.getCallTarget().call(new Object[]{20, 22});
         Assert.assertEquals(42, result);
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/AssumptionInvalidationTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/AssumptionInvalidationTest.java
index 319e961a267b..c06426e4414f 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/AssumptionInvalidationTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/AssumptionInvalidationTest.java
@@ -63,7 +63,7 @@ public void test() throws InterruptedException {
         Assumption assumption = runtime.createAssumption("propagated assumption invalidation");
         CountingNode countingNode = new CountingNode(assumption);
         TestRootNode countingRootNode = new TestRootNode(countingNode);
-        final CallTarget countingTarget = runtime.createCallTarget(countingRootNode);
+        final CallTarget countingTarget = countingRootNode.getCallTarget();
 
         Thread thread = new Thread(new Runnable() {
             public void run() {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java
index 75a4cf441c17..afa7f040389b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CallTest.java
@@ -44,8 +44,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -53,9 +51,9 @@
  * <h3>Calling Another Tree</h3>
  *
  * <p>
- * A guest language implementation can create multiple call targets using the
- * {@link TruffleRuntime#createCallTarget(RootNode)} method. Those call targets can be passed around
- * as normal Java objects and used for calling guest language methods.
+ * A guest language implementation can create multiple root nodes and thus multiple call targets
+ * using the {@link RootNode#getCallTarget()} method. Those call targets can be passed around as
+ * normal Java objects and used for calling guest language methods.
  * </p>
  *
  * <p>
@@ -67,10 +65,9 @@ public class CallTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
-        CallTarget foo = runtime.createCallTarget(new ConstantRootNode(20));
-        CallTarget bar = runtime.createCallTarget(new ConstantRootNode(22));
-        CallTarget main = runtime.createCallTarget(new DualCallNode(foo, bar));
+        CallTarget foo = new ConstantRootNode(20).getCallTarget();
+        CallTarget bar = new ConstantRootNode(22).getCallTarget();
+        CallTarget main = new DualCallNode(foo, bar).getCallTarget();
         Object result = main.call();
         Assert.assertEquals(42, result);
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java
index 9e7cb53ec9d6..a98df47593ec 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildNodeTest.java
@@ -49,8 +49,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.Node.Child;
@@ -80,11 +78,10 @@ public class ChildNodeTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestChildNode leftChild = new TestChildNode();
         TestChildNode rightChild = new TestChildNode();
         TestRootNode rootNode = new TestRootNode(leftChild, rightChild);
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         assertEquals(rootNode, leftChild.getParent());
         assertEquals(rootNode, rightChild.getParent());
         Iterator<Node> iterator = rootNode.getChildren().iterator();
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java
index f10178ba477a..4344fd73e5dc 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ChildrenNodesTest.java
@@ -46,8 +46,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -73,11 +71,10 @@ public class ChildrenNodesTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestChildNode firstChild = new TestChildNode();
         TestChildNode secondChild = new TestChildNode();
         TestRootNode rootNode = new TestRootNode(new TestChildNode[]{firstChild, secondChild});
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         Assert.assertEquals(rootNode, firstChild.getParent());
         Assert.assertEquals(rootNode, secondChild.getParent());
         Iterator<Node> iterator = rootNode.getChildren().iterator();
@@ -119,13 +116,12 @@ public int execute() {
 
     @Test
     public void testMultipleChildrenFields() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestChildNode firstChild = new TestChildNode();
         TestChildNode secondChild = new TestChildNode();
         TestChildNode thirdChild = new TestChildNode();
         TestChildNode forthChild = new TestChildNode();
         TestRootNode rootNode = new TestRoot2Node(new TestChildNode[]{firstChild, secondChild}, new TestChildNode[]{thirdChild, forthChild});
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         Assert.assertEquals(rootNode, firstChild.getParent());
         Assert.assertEquals(rootNode, secondChild.getParent());
         Assert.assertEquals(rootNode, thirdChild.getParent());
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CompileImmediatelyCheck.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CompileImmediatelyCheck.java
index d90cffa550f8..5b16117c7422 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CompileImmediatelyCheck.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/CompileImmediatelyCheck.java
@@ -42,7 +42,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -51,12 +50,12 @@ public class CompileImmediatelyCheck {
     public static boolean isCompileImmediately() {
         // we try twice, as sometimes some classes deopt.
         for (int i = 0; i < 2; i++) {
-            CallTarget target = Truffle.getRuntime().createCallTarget(new RootNode(null) {
+            CallTarget target = new RootNode(null) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return CompilerDirectives.inCompiledCode();
                 }
-            });
+            }.getCallTarget();
             boolean result = (boolean) target.call();
             if (result) {
                 return true;
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java
index 5ca406f63b52..73058b0cf17b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FinalFieldTest.java
@@ -43,9 +43,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -75,10 +72,8 @@ public class FinalFieldTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestRootNode rootNode = new TestRootNode(new TestChildNode[]{new TestChildNode(20), new TestChildNode(22)});
-        CallTarget target = runtime.createCallTarget(rootNode);
-        Object result = target.call();
+        Object result = rootNode.getCallTarget().call();
         Assert.assertEquals(42, result);
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java
index 271e9a5570f9..cd52f5ba559b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java
@@ -43,9 +43,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -72,13 +69,11 @@ public class FrameSlotTypeSpecializationTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         FrameSlot slot = frameDescriptor.addFrameSlot("localVar", FrameSlotKind.Int);
         TestRootNode rootNode = new TestRootNode(frameDescriptor, new IntAssignLocal(slot, new StringTestChildNode()), new IntReadLocal(slot));
-        CallTarget target = runtime.createCallTarget(rootNode);
         Assert.assertEquals(FrameSlotKind.Int, frameDescriptor.getFrameSlotKind(slot));
-        Object result = target.call();
+        Object result = rootNode.getCallTarget().call();
         Assert.assertEquals("42", result);
         Assert.assertEquals(FrameSlotKind.Object, frameDescriptor.getFrameSlotKind(slot));
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java
index 2da8901c604a..5a8c72fa341b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java
@@ -47,7 +47,6 @@
 import org.junit.Assume;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.Frame;
@@ -96,13 +95,11 @@ public class FrameTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         String varName = "localVar";
         FrameSlot slot = frameDescriptor.addFrameSlot(varName, FrameSlotKind.Int);
         TestRootNode rootNode = new TestRootNode(frameDescriptor, new AssignLocal(slot), new ReadLocal(slot));
-        CallTarget target = runtime.createCallTarget(rootNode);
-        Object result = target.call();
+        Object result = rootNode.getCallTarget().call();
         assertEquals(42, result);
         frameDescriptor.removeFrameSlot(varName);
         assertNull(frameDescriptor.findFrameSlot(varName));
@@ -195,7 +192,7 @@ public Object execute(VirtualFrame frame) {
         }
 
         FrameRootNode frn = new FrameRootNode();
-        Object ret = Truffle.getRuntime().createCallTarget(frn).call();
+        Object ret = frn.getCallTarget().call();
         assertEquals("Returns itself", frn, ret);
     }
 }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java
index 722b625239e0..fa47a8332192 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java
@@ -47,8 +47,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInterface;
@@ -62,12 +60,11 @@ public class InterfaceChildFieldTest {
 
     @Test
     public void testChild() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestChildInterface leftChild = new TestLeafNode();
         TestChildInterface rightChild = new TestLeafNode();
         TestChildNode parent = new TestChildNode(leftChild, rightChild);
         TestRootNode rootNode = new TestRootNode(parent);
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         Iterator<Node> iterator = parent.getChildren().iterator();
         Assert.assertEquals(leftChild, iterator.next());
         Assert.assertEquals(rightChild, iterator.next());
@@ -81,14 +78,13 @@ public void testChild() {
 
     @Test
     public void testChildren() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestChildInterface[] children = new TestChildInterface[5];
         for (int i = 0; i < children.length; i++) {
             children[i] = new TestLeafNode();
         }
         TestChildrenNode parent = new TestChildrenNode(children);
         TestRootNode rootNode = new TestRootNode(parent);
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         Iterator<Node> iterator = parent.getChildren().iterator();
         for (int i = 0; i < children.length; i++) {
             Assert.assertEquals(children[i], iterator.next());
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/IteratorTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/IteratorTest.java
index c01ec2c24890..307958632e68 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/IteratorTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/IteratorTest.java
@@ -493,7 +493,7 @@ private static CallTarget createAST(TruffleLanguage<?> lang, Object iterable) {
         StatementNode main = new BlockStatement(
                         new ExpressionStatement(IteratorTestFactory.WriteVariableNodeGen.create(new ConstantNode(iterable), iterableSlot)),
                         new ForEachStatement(iterableSlot, itemSlot, log));
-        return Truffle.getRuntime().createCallTarget(new TestRootNode(lang, fd, main));
+        return new TestRootNode(lang, fd, main).getCallTarget();
     }
 
     private static Context createContext(VerifyingHandler handler) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LegacyTruffleExceptionTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LegacyTruffleExceptionTest.java
index c9368d5ad7da..1e246814368f 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LegacyTruffleExceptionTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LegacyTruffleExceptionTest.java
@@ -43,8 +43,13 @@
 import static com.oracle.truffle.api.test.TruffleExceptionTest.createAST;
 import static com.oracle.truffle.api.test.TruffleExceptionTest.createContext;
 
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.interop.ExceptionType;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -58,11 +63,6 @@
 import com.oracle.truffle.api.test.TruffleExceptionTest.ThrowNode;
 import com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.PolyglotException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 public class LegacyTruffleExceptionTest extends AbstractPolyglotTest {
 
@@ -135,7 +135,7 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                 ThrowNode throwNode = new ThrowNode((n) -> {
                     return new LegacyCatchableException("Test exception", n);
                 });
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test", null, throwNode));
+                return new TestRootNode(languageInstance, "test", null, throwNode).getCallTarget();
             }
         });
         assertFails(() -> context.eval(ProxyLanguage.ID, "Test"), PolyglotException.class, (pe) -> {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LoopNodeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LoopNodeTest.java
index 342841113ed9..2a7dfbc4568c 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LoopNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/LoopNodeTest.java
@@ -162,7 +162,7 @@ public Object execute(VirtualFrame frame) {
             }
         };
 
-        CallTarget target = Truffle.getRuntime().createCallTarget(root);
+        CallTarget target = root.getCallTarget();
         for (int i = 0; i < 1000; i++) {
             Assert.assertEquals(15, target.call());
         }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java
index 3e31f31af6cd..8c97e49e3caa 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReplaceTest.java
@@ -48,8 +48,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -77,11 +75,10 @@ public class ReplaceTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         UnresolvedNode leftChild = new UnresolvedNode("20");
         UnresolvedNode rightChild = new UnresolvedNode("22");
         TestRootNode rootNode = new TestRootNode(new ValueNode[]{leftChild, rightChild});
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         assertEquals(rootNode, leftChild.getParent());
         assertEquals(rootNode, rightChild.getParent());
         Iterator<Node> iterator = rootNode.getChildren().iterator();
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java
index 1dd0ca1a93bc..62b0de0f7d96 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java
@@ -43,9 +43,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -72,13 +69,11 @@ public class ReturnTypeSpecializationTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         FrameSlot slot = frameDescriptor.addFrameSlot("localVar", FrameSlotKind.Int);
         TestRootNode rootNode = new TestRootNode(frameDescriptor, new IntAssignLocal(slot, new StringTestChildNode()), new IntReadLocal(slot));
-        CallTarget target = runtime.createCallTarget(rootNode);
         Assert.assertEquals(FrameSlotKind.Int, frameDescriptor.getFrameSlotKind(slot));
-        Object result = target.call();
+        Object result = rootNode.getCallTarget().call();
         Assert.assertEquals("42", result);
         Assert.assertEquals(FrameSlotKind.Object, frameDescriptor.getFrameSlotKind(slot));
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java
index c70087c8abab..184a09daa711 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/RootNodeTest.java
@@ -42,13 +42,12 @@
 
 import java.util.List;
 
+import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
@@ -62,7 +61,6 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest;
-import org.graalvm.polyglot.Context;
 
 /**
  * <h3>Creating a Root Node</h3>
@@ -71,10 +69,9 @@
  * A Truffle root node is the entry point into a Truffle tree that represents a guest language
  * method. It contains a {@link RootNode#execute(VirtualFrame)} method that can return a
  * {@link java.lang.Object} value as the result of the guest language method invocation. This method
- * must however never be called directly. Instead, the Truffle runtime must be used to create a
- * {@link CallTarget} object from a root node using the
- * {@link TruffleRuntime#createCallTarget(RootNode)} method. This call target object can then be
- * executed using the {@link CallTarget#call(Object...)} method or one of its overloads.
+ * must however never be called directly. Instead, its {@link CallTarget} object must be obtained
+ * via {@link RootNode#getCallTarget()}. This call target object can then be executed using the
+ * {@link CallTarget#call(Object...)} method or one of its overloads.
  * </p>
  *
  * <p>
@@ -86,10 +83,7 @@ public class RootNodeTest {
 
     @Test
     public void test() {
-        TruffleRuntime runtime = Truffle.getRuntime();
-        TestRootNode rootNode = new TestRootNode();
-        CallTarget target = runtime.createCallTarget(rootNode);
-        Object result = target.call();
+        Object result = new TestRootNode().getCallTarget().call();
         Assert.assertEquals(42, result);
     }
 
@@ -122,7 +116,7 @@ public void testNotCapturingFrames() {
         TestRootNode3 rootNode = new TestRootNode3(false);
         Object marker = new Object();
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call(marker);
+            rootNode.getCallTarget().call(marker);
             Assert.fail();
         } catch (TestException e) {
             List<TruffleStackTraceElement> stackTrace = TruffleStackTrace.getStackTrace(e);
@@ -138,7 +132,7 @@ public void testCapturingFrames() {
         TestRootNode3 rootNode = new TestRootNode3(true);
         Object marker = new Object();
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call(marker);
+            rootNode.getCallTarget().call(marker);
             Assert.fail();
         } catch (TestException e) {
             asserCapturedFrames(rootNode, marker, e, e.frame);
@@ -150,7 +144,7 @@ public void testCapturingFramesLegacyException() {
         TestRootNode4 rootNode = new TestRootNode4(true);
         Object marker = new Object();
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call(marker);
+            rootNode.getCallTarget().call(marker);
             Assert.fail();
         } catch (LegacyTestException e) {
             asserCapturedFrames(rootNode, marker, e, e.frame);
@@ -161,7 +155,7 @@ public void testCapturingFramesLegacyException() {
     public void testTranslateStackTraceElementNotEntered() {
         RootNode rootNode = new TestRootNode3(true);
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call();
+            rootNode.getCallTarget().call();
             Assert.fail();
         } catch (TestException e) {
             TruffleStackTraceElement stackTraceElement = getStackTraceElementFor(e, rootNode);
@@ -176,7 +170,7 @@ public void testTranslateStackTraceElementEntered() throws UnsupportedMessageExc
             ctx.enter();
             RootNode rootNode = new TestRootNode3(true);
             try {
-                Truffle.getRuntime().createCallTarget(rootNode).call();
+                rootNode.getCallTarget().call();
                 Assert.fail();
             } catch (TestException e) {
                 TruffleStackTraceElement stackTraceElement = getStackTraceElementFor(e, rootNode);
@@ -202,7 +196,7 @@ private static void testTranslateStackTraceElementCustomGuestObjectImpl(boolean
                     boolean hasDeclaringMetaObject, boolean isString, boolean isMetaObject) throws UnsupportedMessageException {
         RootNode rootNode = new TestRootNode5(hasExecutableName, hasDeclaringMetaObject, isString, isMetaObject);
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call();
+            rootNode.getCallTarget().call();
             Assert.fail();
         } catch (TestException e) {
             TruffleStackTraceElement stackTraceElement = getStackTraceElementFor(e, rootNode);
@@ -225,7 +219,7 @@ private static void testTranslateStackTraceElementInvalidCustomGuestObjectImpl(b
                     boolean hasDeclaringMetaObject, boolean isString, boolean isMetaObject) {
         RootNode rootNode = new TestRootNode5(hasExecutableName, hasDeclaringMetaObject, isString, isMetaObject);
         try {
-            Truffle.getRuntime().createCallTarget(rootNode).call();
+            rootNode.getCallTarget().call();
             Assert.fail();
         } catch (TestException e) {
             TruffleStackTraceElement stackTraceElement = getStackTraceElementFor(e, rootNode);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/StackTraceTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/StackTraceTest.java
index 96cbdaa11c21..f5ab296fafd0 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/StackTraceTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/StackTraceTest.java
@@ -326,7 +326,7 @@ private static void assertFrameEquals(FrameInstance expected, FrameInstance othe
     }
 
     private static CallTarget createCallTarget(TestCallNode callNode) {
-        return Truffle.getRuntime().createCallTarget(new TestRootNode(callNode));
+        return new TestRootNode(callNode).getCallTarget();
     }
 
     private static class TestCallWithCallTargetNode extends TestCallNode {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java
index 765c6179d026..806c62439b6b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ThreadSafetyTest.java
@@ -54,7 +54,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
@@ -69,15 +68,14 @@ public class ThreadSafetyTest {
     @Test
     @Ignore("sporadic failures with \"expected:<1000000> but was:<999999>\"")
     public void test() throws InterruptedException {
-        TruffleRuntime runtime = Truffle.getRuntime();
         TestRootNode rootNode1 = new TestRootNode(new RewritingNode(new RewritingNode(new RewritingNode(new RewritingNode(new RewritingNode(new ConstNode(42)))))));
-        final CallTarget target1 = runtime.createCallTarget(rootNode1);
+        final CallTarget target1 = rootNode1.getCallTarget();
         NodeUtil.verify(rootNode1);
 
         RecursiveCallNode callNode = new RecursiveCallNode(new ConstNode(42));
         TestRootNode rootNode2 = new TestRootNode(new RewritingNode(new RewritingNode(new RewritingNode(new RewritingNode(new RewritingNode(callNode))))));
-        final CallTarget target2 = runtime.createCallTarget(rootNode2);
-        callNode.setCallNode(runtime.createDirectCallNode(target2));
+        final CallTarget target2 = rootNode2.getCallTarget();
+        callNode.setCallNode(Truffle.getRuntime().createDirectCallNode(target2));
         NodeUtil.verify(rootNode2);
 
         testTarget(target1, 47, 1_000_000);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleExceptionTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleExceptionTest.java
index afc924f5ef6a..351f29854faa 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleExceptionTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleExceptionTest.java
@@ -42,6 +42,26 @@
 
 import static com.oracle.truffle.api.test.RootNodeTest.verifyStackTraceElementGuestObject;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+import java.util.regex.Pattern;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -50,12 +70,12 @@
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
+import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ExceptionType;
+import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
-import com.oracle.truffle.api.exception.AbstractTruffleException;
-import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
@@ -69,24 +89,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-import java.util.regex.Pattern;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.PolyglotException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
 public class TruffleExceptionTest extends AbstractPolyglotTest {
 
@@ -129,7 +131,7 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                 ThrowNode throwNode = new ThrowNode((n) -> {
                     return new TruffleExceptionImpl("Test exception", n);
                 });
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test", null, throwNode));
+                return new TestRootNode(languageInstance, "test", null, throwNode).getCallTarget();
             }
         },
                         "<proxyLanguage> test",
@@ -144,9 +146,9 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                 ThrowNode throwNode = new ThrowNode((n) -> {
                     return new TruffleExceptionImpl("Test exception", n);
                 });
-                CallTarget throwTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-throw", null, throwNode));
-                CallTarget innerInvokeTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-call-inner", null, new InvokeNode(throwTarget)));
-                CallTarget outerInvokeTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-call-outer", null, new InvokeNode(innerInvokeTarget)));
+                CallTarget throwTarget = new TestRootNode(languageInstance, "test-throw", null, throwNode).getCallTarget();
+                CallTarget innerInvokeTarget = new TestRootNode(languageInstance, "test-call-inner", null, new InvokeNode(throwTarget)).getCallTarget();
+                CallTarget outerInvokeTarget = new TestRootNode(languageInstance, "test-call-outer", null, new InvokeNode(innerInvokeTarget)).getCallTarget();
                 return outerInvokeTarget;
             }
         },
@@ -164,10 +166,10 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                 ThrowNode throwNode = new ThrowNode((n) -> {
                     return new TruffleExceptionImpl("Test exception", n);
                 });
-                CallTarget throwTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-throw-internal", null, true, throwNode));
-                CallTarget innerInvokeTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-call-inner", null, new InvokeNode(throwTarget)));
-                CallTarget internalInvokeTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-call-internal", null, true, new InvokeNode(innerInvokeTarget)));
-                CallTarget outerInvokeTarget = Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test-call-outer", null, new InvokeNode(internalInvokeTarget)));
+                CallTarget throwTarget = new TestRootNode(languageInstance, "test-throw-internal", null, true, throwNode).getCallTarget();
+                CallTarget innerInvokeTarget = new TestRootNode(languageInstance, "test-call-inner", null, new InvokeNode(throwTarget)).getCallTarget();
+                CallTarget internalInvokeTarget = new TestRootNode(languageInstance, "test-call-internal", null, true, new InvokeNode(innerInvokeTarget)).getCallTarget();
+                CallTarget outerInvokeTarget = new TestRootNode(languageInstance, "test-call-outer", null, new InvokeNode(internalInvokeTarget)).getCallTarget();
                 return outerInvokeTarget;
             }
         },
@@ -186,7 +188,7 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                     TruffleStackTrace.fillIn(e);
                     return e;
                 });
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test", null, throwNode));
+                return new TestRootNode(languageInstance, "test", null, throwNode).getCallTarget();
             }
         },
                         "<proxyLanguage> test",
@@ -199,7 +201,7 @@ public void testPolyglotStackTraceInternalError() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
                 ThrowNode throwNode = new ThrowNode(new InternalExceptionFactory());
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test", null, throwNode));
+                return new TestRootNode(languageInstance, "test", null, throwNode).getCallTarget();
             }
         },
                         Pattern.quote("com.oracle.truffle.api.test.TruffleExceptionTest$InternalExceptionFactory.apply"),
@@ -270,7 +272,7 @@ private void testExceptionFromPolyglotExceptionConstructorImpl(ExceptionType typ
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
                 ThrowNode throwNode = new ThrowNode((n) -> new TruffleExceptionImpl("test", n, type, new InjectException(failOn)));
-                return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, "test", "unnamed", throwNode));
+                return new TestRootNode(languageInstance, "test", "unnamed", throwNode).getCallTarget();
             }
         });
         assertFails(() -> context.eval(ProxyLanguage.ID, "Test"), PolyglotException.class, (pe) -> {
@@ -288,7 +290,7 @@ static CallTarget createAST(Class<?> testClass, TruffleLanguage<ProxyLanguage.La
         TryCatchNode tryCatch = new TryCatchNode(new BlockNode(testClass, BlockNode.Kind.TRY, throwNode),
                         new BlockNode(testClass, BlockNode.Kind.CATCH),
                         new BlockNode(testClass, BlockNode.Kind.FINALLY));
-        return Truffle.getRuntime().createCallTarget(new TestRootNode(lang, "test", customStackTraceElementGuestObject ? "unnamed" : null, tryCatch));
+        return new TestRootNode(lang, "test", customStackTraceElementGuestObject ? "unnamed" : null, tryCatch).getCallTarget();
     }
 
     @SuppressWarnings({"unchecked", "unused"})
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
index c629c23ba38f..d61359d39964 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
@@ -92,7 +92,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.ThreadLocalAction;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
@@ -1280,7 +1279,7 @@ public boolean call(TestSetup setup, TestRootNode node) {
 
         @TruffleBoundary
         private void initialize() {
-            target = Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            target = RootNode.createConstantNode(42).getCallTarget();
             try {
                 awaitSubmit.acquire();
             } catch (InterruptedException e) {
@@ -1659,7 +1658,7 @@ private TestSetup setupSafepointLoop(int threads, NodeCallable callable, Consume
 
             TestSetup finalSetup = setup = new TestSetup(c, env, instrument, stopped);
             setup.root = new TestRootNode(proxyLanguage, stopped, setup, latch, callable);
-            setup.target = Truffle.getRuntime().createCallTarget(setup.root);
+            setup.target = setup.root.getCallTarget();
             env.getContext().leave(null, targetEnter);
             setup.futures = new ArrayList<>();
             for (int i = 0; i < threads; i++) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/GR31558.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/GR31558.java
index 148639959c7d..e627d926ce5e 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/GR31558.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/GR31558.java
@@ -60,7 +60,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -97,7 +96,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                 String src = request.getSource().getCharacters().toString();
                 RootCallTarget invokeTestApi;
                 if ("testFunction".equals(src)) {
-                    invokeTestApi = Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                    invokeTestApi = new RootNode(ProxyLanguage.get(null)) {
                         @Override
                         public Object execute(VirtualFrame frame) {
                             try {
@@ -128,11 +127,11 @@ public Object execute(VirtualFrame frame) {
                                 throw new AssertionError(e);
                             }
                         }
-                    });
+                    }.getCallTarget();
                 } else {
                     throw new IllegalArgumentException(src);
                 }
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new HostExceptionTest.CatcherObject(invokeTestApi)));
+                return RootNode.createConstantNode(new HostExceptionTest.CatcherObject(invokeTestApi)).getCallTarget();
             }
         });
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/HostExceptionTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/HostExceptionTest.java
index 8147731cc64d..cce233012a8e 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/HostExceptionTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/HostExceptionTest.java
@@ -66,7 +66,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -118,7 +117,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                     default:
                         throw new IllegalArgumentException();
                 }
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new CatcherObject(Truffle.getRuntime().createCallTarget(rootNode))));
+                return RootNode.createConstantNode(new CatcherObject(rootNode.getCallTarget())).getCallTarget();
             }
         });
         context.initialize(ProxyLanguage.ID);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/MultiClassLoaderTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/MultiClassLoaderTest.java
index 20b7cc4fc381..5843d4751ade 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/MultiClassLoaderTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/MultiClassLoaderTest.java
@@ -56,7 +56,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -85,7 +84,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                 String req = request.getSource().getCharacters().toString();
                 if (req.startsWith("get:")) {
                     String name = req.substring(4);
-                    RootCallTarget reader = Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                    RootCallTarget reader = new RootNode(ProxyLanguage.get(null)) {
                         @Override
                         public Object execute(VirtualFrame frame) {
                             Object obj = frame.getArguments()[0];
@@ -96,8 +95,8 @@ public Object execute(VirtualFrame frame) {
                                 throw new IllegalStateException(e);
                             }
                         }
-                    });
-                    return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new CatcherObject(reader)));
+                    }.getCallTarget();
+                    return RootNode.createConstantNode(new CatcherObject(reader)).getCallTarget();
                 }
                 throw new IllegalArgumentException();
             }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/BlockNodeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/BlockNodeTest.java
index 441f55d15635..dc2cd4a0adc5 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/BlockNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/BlockNodeTest.java
@@ -56,7 +56,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.BlockNode;
 import com.oracle.truffle.api.nodes.ControlFlowException;
@@ -309,7 +308,7 @@ static BlockNode<TestBlockElement> create(TestBlockElement[] elements, BlockNode
         DummyRootNode root = new DummyRootNode();
         BlockNode<TestBlockElement> block = BlockNode.create(elements, executor);
         root.block = block;
-        Truffle.getRuntime().createCallTarget(root);
+        root.getCallTarget();
         assertNotNull(root.block.getParent());
         return block;
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeLegacyTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeLegacyTest.java
index 0233d67a39cb..701e5af92488 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeLegacyTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeLegacyTest.java
@@ -53,7 +53,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -68,22 +67,22 @@ public class EncapsulatedNodeLegacyTest {
     @Test
     @SuppressWarnings("unchecked")
     public void testCallNodePickedByCallTargetCall() {
-        CallTarget iterateFrames = create(new RootNode(null) {
+        CallTarget iterateFrames = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return captureStack();
             }
-        });
+        }.getCallTarget();
         Node callLocation = adopt(new Node() {
         });
 
-        CallTarget root = create(new RootNode(null) {
+        CallTarget root = new RootNode(null) {
 
             @Override
             public Object execute(VirtualFrame frame) {
                 return boundary(callLocation, () -> IndirectCallNode.getUncached().call(iterateFrames, new Object[0]));
             }
-        });
+        }.getCallTarget();
         List<TruffleStackTraceElement> frames = (List<TruffleStackTraceElement>) root.call();
         assertEquals(2, frames.size());
         Iterator<TruffleStackTraceElement> iterator = frames.iterator();
@@ -103,12 +102,12 @@ public Object execute(VirtualFrame frame) {
     public void testCallNodePickedWithoutCallTarget() {
         Node callLocation = adopt(new Node() {
         });
-        CallTarget root = create(new RootNode(null) {
+        CallTarget root = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return boundary(callLocation, () -> captureStack());
             }
-        });
+        }.getCallTarget();
 
         List<TruffleStackTraceElement> frames = (List<TruffleStackTraceElement>) root.call();
         assertEquals(1, frames.size());
@@ -209,10 +208,6 @@ private static void assertAssertionError(Runnable r) {
         fail();
     }
 
-    static CallTarget create(RootNode root) {
-        return Truffle.getRuntime().createCallTarget(root);
-    }
-
     @TruffleBoundary
     private static Object captureStack() {
         Exception e = new Exception();
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeTest.java
index 8d25e4b4310f..4d337cdabce7 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/nodes/EncapsulatedNodeTest.java
@@ -53,17 +53,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import com.oracle.truffle.api.nodes.IndirectCallNode;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleStackTrace;
 import com.oracle.truffle.api.TruffleStackTraceElement;
-import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
+import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
+import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -75,7 +74,7 @@ public void testCallNodePickedByCallTargetCall() {
         CallTarget getStackTrace = createGetStackTraceNode();
         Node callLocation = adopt(new Node() {
         });
-        CallTarget root = create(new RootNode(null) {
+        CallTarget root = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 try {
@@ -84,7 +83,7 @@ public Object execute(VirtualFrame frame) {
                     return TruffleStackTrace.getStackTrace(e);
                 }
             }
-        });
+        }.getCallTarget();
 
         Supplier<Object> eager = EncapsulatedNodeTest::captureStackEagerly;
         List<TruffleStackTraceElement> framesEager = (List<TruffleStackTraceElement>) root.call(eager);
@@ -101,7 +100,7 @@ public void testCallNodePickedByUncachedIndirectCallNode() {
         CallTarget getStackTrace = createGetStackTraceNode();
         Node callLocation = adopt(new Node() {
         });
-        CallTarget root = create(new RootNode(null) {
+        CallTarget root = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 try {
@@ -110,7 +109,7 @@ public Object execute(VirtualFrame frame) {
                     return TruffleStackTrace.getStackTrace(e);
                 }
             }
-        });
+        }.getCallTarget();
 
         Supplier<Object> eager = EncapsulatedNodeTest::captureStackEagerly;
         List<TruffleStackTraceElement> framesEager = (List<TruffleStackTraceElement>) root.call(eager);
@@ -136,13 +135,13 @@ private static void assertCorrectStackTrace(CallTarget getStackTrace, Node callL
     }
 
     private static CallTarget createGetStackTraceNode() {
-        return create(new RootNode(null) {
+        return new RootNode(null) {
             @SuppressWarnings("unchecked")
             @Override
             public Object execute(VirtualFrame frame) {
                 return ((Supplier<Object>) frame.getArguments()[0]).get();
             }
-        });
+        }.getCallTarget();
     }
 
     @Test
@@ -162,12 +161,12 @@ public void testAccessWrongThread() throws InterruptedException, ExecutionExcept
     public void testCallNodePickedWithoutCallTarget() {
         Node callLocation = adopt(new Node() {
         });
-        CallTarget root = create(new RootNode(null) {
+        CallTarget root = new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return boundary(callLocation, () -> captureStackEagerly());
             }
-        });
+        }.getCallTarget();
 
         List<TruffleStackTraceElement> frames = (List<TruffleStackTraceElement>) root.call();
         assertEquals(1, frames.size());
@@ -273,10 +272,6 @@ private static void assertAssertionError(Runnable r) {
         fail();
     }
 
-    static CallTarget create(RootNode root) {
-        return Truffle.getRuntime().createCallTarget(root);
-    }
-
     @TruffleBoundary
     private static List<TruffleStackTraceElement> captureStackEagerly() {
         Exception e = new Exception();
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/parser/PEParser.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/parser/PEParser.java
index 2348123a78cb..e3710e089fe0 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/parser/PEParser.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/parser/PEParser.java
@@ -201,7 +201,7 @@ final class Rule<T> extends Element<T> {
 
     public CallTarget getCallTarget() {
         if (target == null) {
-            target = Truffle.getRuntime().createCallTarget(new RuleRootNode(this));
+            target = new RuleRootNode(this).getCallTarget();
         }
         return target;
     }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/AbstractPolyglotTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/AbstractPolyglotTest.java
index 5f85c87bb9e8..b2952e8e0afe 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/AbstractPolyglotTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/AbstractPolyglotTest.java
@@ -51,7 +51,6 @@
 import org.graalvm.polyglot.Instrument;
 import org.junit.After;
 
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
@@ -194,9 +193,8 @@ protected final <T extends Node> Supplier<T> adoptNode(T node) {
     @SuppressWarnings({"unchecked", "static-method"})
     protected final <T extends Node> Supplier<T> adoptNode(TruffleLanguage<?> lang, T node) {
         TestRootNode root = new TestRootNode(lang, node);
-        CallTarget target = Truffle.getRuntime().createCallTarget(root);
         // execute it to trigger instrumentations
-        target.call();
+        root.getCallTarget().call();
         return () -> (T) root.node;
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
index fa81cc3971b6..9c8edaca978b 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
@@ -44,7 +44,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -97,7 +96,7 @@ protected LanguageContext createContext(Env env) {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             REFERENCE.get(null).env.newContextBuilder().build();
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode("foo"));
+            return RootNode.createConstantNode("foo").getCallTarget();
         }
 
         private static final ContextReference<LanguageContext> REFERENCE = ContextReference.create(InternalLang.class);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITest.java
index a14bd244a5ac..b6cb37aceb77 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITest.java
@@ -90,7 +90,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.ContextLocal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -325,7 +324,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
                     throw new SyntaxError(request.getSource().createSection(0, 5));
                 }
 
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
                     private final com.oracle.truffle.api.source.Source source = request.getSource();
 
                     @Override
@@ -337,7 +336,7 @@ public Object execute(VirtualFrame frame) {
                         }
                         return source.getCharacters();
                     }
-                });
+                }.getCallTarget();
             }
         });
     }
@@ -905,7 +904,7 @@ public void testTransferControlToOtherThreadWhileEntered() {
                         new ProxyLanguage() {
                             @Override
                             protected CallTarget parse(ParsingRequest request) throws Exception {
-                                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                                return new RootNode(ProxyLanguage.get(null)) {
                                     @Override
                                     public Object execute(VirtualFrame frame) {
                                         try {
@@ -921,7 +920,7 @@ private Object boundary() throws UnsupportedMessageException, UnsupportedTypeExc
                                                         "test");
                                         return InteropLibrary.getUncached().execute(o);
                                     }
-                                });
+                                }.getCallTarget();
                             }
                         });
         context.enter();
@@ -1229,14 +1228,14 @@ private static void testContextClassLoaderImpl(Context context, ClassLoader expe
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(this.languageInstance) {
+                return new RootNode(this.languageInstance) {
                     @Override
                     @TruffleBoundary
                     public Object execute(VirtualFrame frame) {
                         assertEquals(expectedContextClassLoader, Thread.currentThread().getContextClassLoader());
                         return true;
                     }
-                });
+                }.getCallTarget();
             }
         });
         context.eval(Source.newBuilder(ProxyLanguage.ID, "", "test").cached(false).buildLiteral());
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestInternalLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestInternalLanguage.java
index 6654c3536f9b..ef8257740f3c 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestInternalLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestInternalLanguage.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.api.test.polyglot;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -57,7 +56,7 @@ protected Object createContext(Env env) {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(""));
+        return RootNode.createConstantNode("").getCallTarget();
     }
 
 }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestLanguage.java
index 156e9a928f79..588e7e93229e 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextAPITestLanguage.java
@@ -44,7 +44,6 @@
 import java.util.function.Function;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -81,12 +80,12 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             result = "null result";
         }
         final Object finalResult = result;
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return finalResult;
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
index 33daf2c48018..755085e63133 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
@@ -64,7 +64,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
@@ -642,7 +641,7 @@ static class SharedObject implements TruffleObject {
             this.context = context;
             this.expectedLanguage = language;
             this.expectedEnvironment = env;
-            this.target = Truffle.getRuntime().createCallTarget(new RootNode(language) {
+            this.target = new RootNode(language) {
                 @Child InteropLibrary library = InteropLibrary.getFactory().createDispatched(5);
 
                 @SuppressWarnings("unchecked")
@@ -663,7 +662,7 @@ public Object execute(VirtualFrame frame) {
                         return "done";
                     }
                 }
-            });
+            }.getCallTarget();
         }
 
         @ExportMessage
@@ -793,7 +792,7 @@ protected OptionDescriptors getOptionDescriptors() {
         protected CallTarget parse(ParsingRequest request) throws Exception {
             parseRequest.add(this);
             boolean innerContext = request.getSource().getName().equals(RUN_INNER_CONTEXT);
-            return Truffle.getRuntime().createCallTarget(new LanguageRootNode(this, innerContext));
+            return new LanguageRootNode(this, innerContext).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolyglotAccessTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolyglotAccessTest.java
index 6117135f0a7a..b4ebfef74446 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolyglotAccessTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolyglotAccessTest.java
@@ -57,7 +57,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
@@ -819,7 +818,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
+            return RootNode.createConstantNode(true).getCallTarget();
         }
 
         public static Env getContext(String language) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationNativeImageTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationNativeImageTest.java
index ffdb56ff1125..9a03673559b2 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationNativeImageTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationNativeImageTest.java
@@ -51,7 +51,6 @@
 import com.oracle.truffle.api.ContextLocal;
 import com.oracle.truffle.api.ContextThreadLocal;
 import com.oracle.truffle.api.ThreadLocalAction;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleOptions;
@@ -127,7 +126,7 @@ protected void perform(Access access) {
                 }
             });
 
-            Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            new RootNode(this) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     /*
@@ -160,7 +159,7 @@ public Object execute(VirtualFrame frame) {
                     return null;
                 }
 
-            }).call();
+            }.getCallTarget().call();
 
         }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
index 4dfbe0c2af34..ea13b05bcd00 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
@@ -102,7 +102,6 @@
 import com.oracle.truffle.api.InstrumentInfo;
 import com.oracle.truffle.api.Option;
 import com.oracle.truffle.api.ThreadLocalAction;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -2293,13 +2292,13 @@ protected void disposeThread(CountingContext context, Thread thread) {
         @Override
         protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
             final CharSequence result = request.getSource().getCharacters();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     executeImpl(getContextReference0().get(this));
                     return result;
                 }
-            });
+            }.getCallTarget();
         }
 
         protected abstract ContextReference<CountingContext> getContextReference0();
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITest.java
index e3869b26aa5c..a9be81eb73ee 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITest.java
@@ -262,7 +262,7 @@ public void testEngineName() {
         Engine engine = Engine.create();
         String implName = engine.getImplementationName();
         assertEquals(Truffle.getRuntime().getName(), engine.getImplementationName());
-        String name = Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(0)).getClass().getSimpleName();
+        String name = RootNode.createConstantNode(0).getCallTarget().getClass().getSimpleName();
         if (name.equals("DefaultCallTarget")) {
             assertEquals(implName, "Interpreted");
         } else if (name.endsWith("OptimizedCallTarget")) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITestLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITestLanguage.java
index 8ffb8441b86a..05ad908c33a1 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/EngineAPITestLanguage.java
@@ -46,7 +46,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.polyglot.EngineAPITestLanguage.LanguageContext;
@@ -99,7 +98,7 @@ protected OptionDescriptors getOptionDescriptors() {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        return RootNode.createConstantNode(42).getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/FileSystemsTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/FileSystemsTest.java
index 5a919c7630d5..b988719220db 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/FileSystemsTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/FileSystemsTest.java
@@ -106,7 +106,6 @@
 import org.junit.runners.Parameterized;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
@@ -2157,13 +2156,13 @@ protected LanguageContext createContext(Env env) {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             final CharSequence result = request.getSource().getCharacters();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     languageAction.accept(CONTEXT_REF.get(this).env());
                     return result;
                 }
-            });
+            }.getCallTarget();
         }
 
         private static final ContextReference<LanguageContext> CONTEXT_REF = ContextReference.create(VirtualizedFileSystemTestLanguage.class);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostStackTraceTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostStackTraceTest.java
index 6f134ba7b1dd..d7e83d0e79e1 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostStackTraceTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostStackTraceTest.java
@@ -55,7 +55,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
@@ -79,7 +78,7 @@ class HostStackTraceExecutable implements TruffleObject {
         final CallTarget callTarget;
 
         HostStackTraceExecutable(String name, SourceSection rootSection, SourceSection callSection) {
-            this.callTarget = Truffle.getRuntime().createCallTarget(new ExecuteRootNode(name, rootSection, callSection));
+            this.callTarget = new ExecuteRootNode(name, rootSection, callSection).getCallTarget();
         }
 
         @ExportMessage
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/InteractiveEvalTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/InteractiveEvalTest.java
index 68c9573fe97d..9746eb95a8ff 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/InteractiveEvalTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/InteractiveEvalTest.java
@@ -58,7 +58,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -148,13 +147,13 @@ protected InteractiveContext createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return CONTEXT_REF.get(this).getValue();
                 }
-            });
+            }.getCallTarget();
         }
 
         private static final ContextReference<InteractiveContext> CONTEXT_REF = ContextReference.create(DefaultInteractiveLanguage.class);
@@ -172,7 +171,7 @@ protected InteractiveContext createContext(Env env) {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
             boolean interactive = request.getSource().isInteractive();
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Override
                 public Object execute(VirtualFrame frame) {
@@ -192,7 +191,7 @@ public Object execute(VirtualFrame frame) {
                 private void write(InteractiveContext ic, Object value) throws IOException {
                     ic.env.out().write(("\"" + value + "\"").getBytes(StandardCharsets.UTF_8));
                 }
-            });
+            }.getCallTarget();
         }
 
         private static final ContextReference<InteractiveContext> CONTEXT_REF = ContextReference.create(SpecialInteractiveLanguage.class);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPIOrderTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPIOrderTest.java
index b098e4dccc5a..e9e03d63cdfe 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPIOrderTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPIOrderTest.java
@@ -58,7 +58,6 @@
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.source.Source;
 
 public class LanguageSPIOrderTest {
@@ -292,7 +291,7 @@ private static int nextId() {
 
         @Override
         protected CallTarget parse(com.oracle.truffle.api.TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITest.java
index 7638b3865a3a..ab2deb9d04c0 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITest.java
@@ -95,7 +95,6 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.InstrumentInfo;
 import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
@@ -814,7 +813,7 @@ public static LanguageContext getContext() {
         protected CallTarget parse(ParsingRequest request) throws Exception {
             executionIndex++;
             parseCalled.add(request.getSource());
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
 
         @Override
@@ -1222,7 +1221,7 @@ protected Object findMetaObject(LanguageContext context, Object value) {
 
             @Override
             protected CallTarget parse(com.oracle.truffle.api.TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(testObject));
+                return RootNode.createConstantNode(testObject).getCallTarget();
             }
 
             @Override
@@ -1845,12 +1844,12 @@ public void testPolyglotBindings() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return LanguageContext.get(this).env.getPolyglotBindings();
                     }
-                });
+                }.getCallTarget();
             }
         });
 
@@ -1883,12 +1882,12 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
 
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return LanguageContext.get(this).env.getPolyglotBindings();
                     }
-                });
+                }.getCallTarget();
             }
         });
 
@@ -1931,7 +1930,7 @@ public void testFindSourceLocation() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new SourceHolder(request.getSource())));
+                return RootNode.createConstantNode(new SourceHolder(request.getSource())).getCallTarget();
             }
 
             @Override
@@ -1968,7 +1967,7 @@ public void testToString() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new SourceHolder(request.getSource())));
+                return RootNode.createConstantNode(new SourceHolder(request.getSource())).getCallTarget();
             }
 
             @Override
@@ -2109,7 +2108,7 @@ protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Except
                 } catch (IllegalStateException e) {
                     // expected
                 }
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
+                return RootNode.createConstantNode(true).getCallTarget();
             }
         };
         ProxyLanguage.setDelegate(registerServiceLanguage);
@@ -2201,7 +2200,7 @@ private static void testInitializeInternalImpl(Context context, Function<Truffle
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         Env env = LanguageContext.get(this).getEnv();
@@ -2214,7 +2213,7 @@ public Object execute(VirtualFrame frame) {
                         }
                         return true;
                     }
-                });
+                }.getCallTarget();
             }
         });
         assertTrue(context.eval(ProxyLanguage.ID, "").asBoolean());
@@ -2239,7 +2238,7 @@ private static void testInitializeFromServiceImpl(Context context, Function<Env,
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         Env env = LanguageContext.get(this).getEnv();
@@ -2253,7 +2252,7 @@ public Object execute(VirtualFrame frame) {
                         assertTrue(verifier.get());
                         return true;
                     }
-                });
+                }.getCallTarget();
             }
         });
         assertTrue(context.eval(ProxyLanguage.ID, "").asBoolean());
@@ -2322,7 +2321,7 @@ protected void initializeContext(Env context) throws Exception {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
+            return RootNode.createConstantNode(true).getCallTarget();
         }
 
         abstract LanguageInfo getLanguageInfo(Env env);
@@ -2405,7 +2404,7 @@ public ThrowInLanguageInitializer() {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITestLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITestLanguage.java
index 857e84a426f7..da43e68b6631 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageSPITestLanguage.java
@@ -47,7 +47,6 @@
 import java.util.function.Function;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -82,7 +81,7 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
             @Override
             public Object execute(VirtualFrame frame) {
                 getContext(); // We must have the context here
@@ -99,7 +98,7 @@ public Object execute(VirtualFrame frame) {
                 }
                 return result;
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
index 7878adc5284e..33c8e09915dd 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
@@ -74,7 +74,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.InstrumentInfo;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLogger;
@@ -1537,7 +1536,7 @@ public Object execute(VirtualFrame frame) {
                     return getReference().get(this).getEnv().asGuestValue(null);
                 }
             };
-            return Truffle.getRuntime().createCallTarget(root);
+            return root.getCallTarget();
         }
 
         private void doLog() {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MIMETypeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MIMETypeTest.java
index ad67bce6dc7e..81977b49c917 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MIMETypeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MIMETypeTest.java
@@ -57,7 +57,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.ExpectError;
@@ -163,7 +162,7 @@ public void testDefaultMimeBytes() throws IOException {
     public static class MIMETypeLanguage5 extends ProxyLanguage {
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
     }
 
@@ -215,7 +214,7 @@ public static class MIMETypeLanguage6 extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
     }
 
@@ -242,7 +241,7 @@ public static class MIMETypeLanguage7 extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
     }
 
@@ -269,7 +268,7 @@ public static class MIMETypeLanguage8 extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+            return RootNode.createConstantNode(42).getCallTarget();
         }
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedCloseTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedCloseTest.java
index d95b84127229..5dc367ec2a0e 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedCloseTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedCloseTest.java
@@ -40,21 +40,23 @@
  */
 package com.oracle.truffle.api.test.polyglot;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleLanguage.Env;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.source.Source;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
+
 import org.graalvm.polyglot.Context;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.TruffleLanguage.Env;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.source.Source;
+
 public class MultiThreadedCloseTest extends AbstractPolyglotTest {
 
     public MultiThreadedCloseTest() {
@@ -173,7 +175,7 @@ protected void finalizeContext(LanguageContext context) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
+            return RootNode.createConstantNode(true).getCallTarget();
         }
     }
 }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedLanguage.java
index 6ed758de88a1..6e6073987cb3 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/MultiThreadedLanguage.java
@@ -44,7 +44,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -131,7 +130,7 @@ protected void disposeThread(LanguageContext context, Thread thread) {
 
     @Override
     protected CallTarget parse(ParsingRequest request) throws Exception {
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
             @Override
             public Object execute(VirtualFrame frame) {
                 Object result = run();
@@ -152,7 +151,7 @@ private Object run() {
                 }
                 return "null result";
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotCachingTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotCachingTest.java
index 78fd59dc3175..d745db17acec 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotCachingTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotCachingTest.java
@@ -63,7 +63,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
 import com.oracle.truffle.api.TruffleLanguage.ParsingRequest;
@@ -83,7 +82,7 @@ public void testDisableCaching() throws Exception {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
                 parseCalled.incrementAndGet();
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(""));
+                return RootNode.createConstantNode("").getCallTarget();
             }
         });
         Context c = Context.create();
@@ -115,7 +114,7 @@ public void testLanguageSourceInstanceIsEqualToEmbedder() throws Exception {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
                 innerSource.set(request.getSource());
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(""));
+                return RootNode.createConstantNode("").getCallTarget();
             }
         });
         Context c = Context.create();
@@ -246,7 +245,7 @@ private CallTarget parse(ProxyLanguage languageInstance, String testString, Pars
         int index = Integer.parseInt(request.getSource().getCharacters().toString());
         parseCount++;
         lastLanguage = languageInstance;
-        lastParsedTarget = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+        lastParsedTarget = new RootNode(languageInstance) {
             /*
              * Typical root nodes have a strong reference to source. We need to ensure that we can
              * still collect the cache if that happens.
@@ -259,7 +258,7 @@ private CallTarget parse(ProxyLanguage languageInstance, String testString, Pars
             public Object execute(VirtualFrame frame) {
                 return "foobar";
             }
-        });
+        }.getCallTarget();
         return lastParsedTarget;
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotExceptionTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotExceptionTest.java
index 5b9b748ae1e1..c4289b4d6414 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotExceptionTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/PolyglotExceptionTest.java
@@ -74,7 +74,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -354,7 +353,7 @@ public void testGuestOOMResourceLimit() {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
 
                     @Override
                     public Object execute(VirtualFrame frame) {
@@ -375,7 +374,7 @@ public String getName() {
                         return "testRootName";
                     }
 
-                });
+                }.getCallTarget();
             }
         });
 
@@ -404,7 +403,7 @@ public void testGuestStackOverflowResourceLimit() {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
 
                     @Override
                     @TruffleBoundary
@@ -417,7 +416,7 @@ public String getName() {
                         return "testRootName";
                     }
 
-                });
+                }.getCallTarget();
             }
         });
         assertFails(() -> context.eval(ProxyLanguage.ID, "test"), PolyglotException.class, (e) -> {
@@ -487,7 +486,7 @@ protected CallTarget parse(ParsingRequest request) {
                 Source source = request.getSource();
                 SizeNode callHost = PolyglotExceptionTestFactory.SizeNodeGen.create(
                                 PolyglotExceptionTestFactory.ReadBindingsNodeGen.create());
-                return Truffle.getRuntime().createCallTarget(new CallHostRootNode(languageInstance, source, callHost));
+                return new CallHostRootNode(languageInstance, source, callHost).getCallTarget();
             }
         });
         context.getPolyglotBindings().putMember("receiver", new BrokenList<>());
@@ -538,7 +537,7 @@ public void testCancelDoesNotMaskInternalError() throws InterruptedException, Ex
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(new RootNode(ProxyLanguage.get(null)) {
+                return new RootNode(ProxyLanguage.get(null)) {
 
                     @Override
                     public Object execute(VirtualFrame frame) {
@@ -568,7 +567,7 @@ public String getName() {
                         return "testRootName";
                     }
 
-                });
+                }.getCallTarget();
             }
         });
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RequireContextTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RequireContextTest.java
index c063990414c0..ab921c36c958 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RequireContextTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RequireContextTest.java
@@ -40,23 +40,23 @@
  */
 package com.oracle.truffle.api.test.polyglot;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.nio.file.Paths;
+import java.util.function.Consumer;
+
+import org.graalvm.polyglot.Context;
+import org.junit.Test;
+
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage.LanguageContext;
 
-import java.nio.file.Paths;
-import java.util.function.Consumer;
-import org.graalvm.polyglot.Context;
-import org.junit.Test;
-
 public class RequireContextTest extends AbstractPolyglotTest {
 
     public RequireContextTest() {
@@ -82,7 +82,7 @@ public void testInstrument() throws Exception {
         setupEnv(Context.create(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
+                return RootNode.createConstantNode(true).getCallTarget();
             }
         });
         assertFails(() -> instrumentEnv.getTruffleFile("file"), IllegalStateException.class, NoCurrentContextVerifier.INSTANCE);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RetainedSizeContextBoundaryTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RetainedSizeContextBoundaryTest.java
index 1b39fcdf0949..8da9b19a1915 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RetainedSizeContextBoundaryTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/RetainedSizeContextBoundaryTest.java
@@ -234,7 +234,7 @@ public void testRetainedSizeWithHostToGuestRootNode() {
             protected CallTarget parse(ParsingRequest request) {
                 com.oracle.truffle.api.source.Source source = request.getSource();
                 if (target == null) {
-                    target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    target = new RootNode(languageInstance) {
 
                         @Override
                         public Object execute(VirtualFrame frame) {
@@ -246,7 +246,7 @@ public SourceSection getSourceSection() {
                             return source.createSection(1);
                         }
 
-                    });
+                    }.getCallTarget();
                 }
                 return target;
             }
@@ -279,7 +279,7 @@ public void testRetainedSizeWithGuestToHostRootNode() {
             protected CallTarget parse(ParsingRequest request) {
                 com.oracle.truffle.api.source.Source source = request.getSource();
                 if (target == null) {
-                    target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    target = new RootNode(languageInstance) {
 
                         @Override
                         public Object execute(VirtualFrame frame) {
@@ -296,7 +296,7 @@ public SourceSection getSourceSection() {
                             return source.createSection(1);
                         }
 
-                    });
+                    }.getCallTarget();
                 }
                 return target;
             }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewLegacyTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewLegacyTest.java
index d95a3aa3ff08..59aa14b300f8 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewLegacyTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewLegacyTest.java
@@ -164,7 +164,7 @@ public Object execute(VirtualFrame frame) {
 
     static TestRootNode createRoot(TruffleLanguage<?> lang) {
         TestRootNode root = new TestRootNode(lang);
-        Truffle.getRuntime().createCallTarget(new TestRootNode(lang));
+        root.getCallTarget();
         return root;
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewTest.java
index 9d4ea4f6a584..4ade6cba89d0 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ScopedViewTest.java
@@ -146,7 +146,7 @@ public Object execute(VirtualFrame frame) {
 
     static TestRootNode createRoot(TruffleLanguage<?> lang) {
         TestRootNode root = new TestRootNode(lang);
-        Truffle.getRuntime().createCallTarget(new TestRootNode(lang));
+        root.getCallTarget();
         return root;
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITestLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITestLanguage.java
index 4bbb31806e8f..3c9327ea3ac9 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITestLanguage.java
@@ -43,7 +43,6 @@
 import java.util.function.Function;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.polyglot.SourceAPITestLanguage.LanguageContext;
@@ -81,7 +80,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         if (result == null) {
             result = "null result";
         }
-        return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(result));
+        return RootNode.createConstantNode(result).getCallTarget();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueAPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueAPITest.java
index 96dd4a4195a3..7b78cd9b0cf0 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueAPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueAPITest.java
@@ -123,7 +123,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -1875,7 +1874,7 @@ public void testValueContextPropagation() {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) throws Exception {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(o));
+                return RootNode.createConstantNode(o).getCallTarget();
             }
 
             @Override
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueHostConversionTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueHostConversionTest.java
index 1e39a407e918..881485b2ecb6 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueHostConversionTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ValueHostConversionTest.java
@@ -40,24 +40,20 @@
  */
 package com.oracle.truffle.api.test.polyglot;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleOptions;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.test.examples.TargetMappings;
-import com.oracle.truffle.tck.tests.ValueAssert.Trait;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.HostAccess;
-import org.graalvm.polyglot.HostAccess.TargetMappingPrecedence;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.PolyglotException.StackFrame;
-import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.proxy.Proxy;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import static com.oracle.truffle.tck.tests.ValueAssert.assertUnsupported;
+import static com.oracle.truffle.tck.tests.ValueAssert.assertValue;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.BOOLEAN;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.HOST_OBJECT;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.MEMBERS;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.NULL;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.NUMBER;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.PROXY_OBJECT;
+import static com.oracle.truffle.tck.tests.ValueAssert.Trait.STRING;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -72,20 +68,24 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.BOOLEAN;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.HOST_OBJECT;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.MEMBERS;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.NULL;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.NUMBER;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.PROXY_OBJECT;
-import static com.oracle.truffle.tck.tests.ValueAssert.Trait.STRING;
-import static com.oracle.truffle.tck.tests.ValueAssert.assertUnsupported;
-import static com.oracle.truffle.tck.tests.ValueAssert.assertValue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.HostAccess;
+import org.graalvm.polyglot.HostAccess.TargetMappingPrecedence;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.PolyglotException.StackFrame;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.proxy.Proxy;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.TruffleOptions;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.test.examples.TargetMappings;
+import com.oracle.truffle.tck.tests.ValueAssert.Trait;
 
 /**
  * Tests class for {@link Context#asValue(Object)}.
@@ -280,12 +280,12 @@ private Value getStaticClass(Class<?> clazz) {
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         return LanguageContext.get(this).env.lookupHostSymbol(clazz.getName());
                     }
-                });
+                }.getCallTarget();
             }
         });
         return context.asValue(context.eval(ProxyLanguage.ID, clazz.getName()));
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/CallTarget.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/CallTarget.java
index 796e3f6b6793..b1a1a087c894 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/CallTarget.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/CallTarget.java
@@ -44,9 +44,8 @@
 
 /**
  * Represents the target of a call. Do not subclass {@link CallTarget} directly but implement
- * {@link RootNode} instead and create a {@link CallTarget target} using {@link Truffle}.
- * {@link Truffle#getRuntime() getRuntime()}.{@link TruffleRuntime#createCallTarget(RootNode)
- * createCallTarget(rootNode)}.
+ * {@link RootNode} instead and retrieve its {@link CallTarget target} via
+ * {@link RootNode#getCallTarget()}.
  *
  * @see RootNode
  * @since 0.8 or earlier
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java
index c8186229118f..2c28b3776015 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/RootCallTarget.java
@@ -44,8 +44,8 @@
 
 /**
  * Represents the target of a call to a {@link RootNode}, i.e., to another tree of nodes. Instances
- * of this class can be created using {@link TruffleRuntime#createCallTarget(RootNode)}.
- * 
+ * of this class are created lazily and can be accessed via {@link RootNode#getCallTarget()}.
+ *
  * @since 0.8 or earlier
  */
 public interface RootCallTarget extends CallTarget {
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
index d60d2c71baa0..5413cbe096c1 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
@@ -1570,7 +1570,7 @@ protected static <C, T extends TruffleLanguage<C>> C getCurrentContext(Class<T>
      *
      *     &#64;Override
      *     protected CallTarget parse(ParsingRequest request) throws Exception {
-     *         return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+     *         return new RootNode(this) {
      *             &#64;Override
      *             public Object execute(VirtualFrame frame) {
      *                 // fast read
@@ -1578,7 +1578,7 @@ protected static <C, T extends TruffleLanguage<C>> C getCurrentContext(Class<T>
      *                 // access local
      *                 return "";
      *             }
-     *         });
+     *         }.getCallTarget();
      *     }
      *
      *     static final class ExampleLocal {
@@ -1640,7 +1640,7 @@ protected final <T> ContextLocal<T> createContextLocal(ContextLocalFactory<C, T>
      *
      *     &#64;Override
      *     protected CallTarget parse(ParsingRequest request) throws Exception {
-     *         return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+     *         return new RootNode(this) {
      *             &#64;Override
      *             public Object execute(VirtualFrame frame) {
      *                 // fast read
@@ -1648,7 +1648,7 @@ protected final <T> ContextLocal<T> createContextLocal(ContextLocalFactory<C, T>
      *                 // access local
      *                 return "";
      *             }
-     *         });
+     *         }.getCallTarget();
      *     }
      *
      *     static final class ExampleLocal {
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
index b73ead50676e..c3a06b1f654f 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultCallTarget.java
@@ -43,7 +43,6 @@
 import static com.oracle.truffle.api.impl.DefaultTruffleRuntime.getRuntime;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.impl.DefaultTruffleRuntime.DefaultFrameInstance;
 import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
@@ -52,7 +51,7 @@
 
 /**
  * This is an implementation-specific class. Do not use or instantiate it. Instead, use
- * {@link TruffleRuntime#createCallTarget(RootNode)} to create a {@link RootCallTarget}.
+ * {@link RootNode#getCallTarget()} to get the {@link RootCallTarget} of a root node.
  */
 public final class DefaultCallTarget implements RootCallTarget {
 
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
index 548653969f93..74b34ea6207e 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java
@@ -89,7 +89,7 @@ protected Closeable createTestContext(String testName) {
 
         @Override
         public CallTarget createTestCallTarget(Closeable testContext, RootNode testNode) {
-            return createCallTarget(testNode);
+            return testNode.getCallTarget();
         }
 
         @Override
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
index d7bf912541bc..c1febe3c9bbd 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
@@ -57,7 +57,6 @@
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.ParsingRequest;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -85,13 +84,13 @@
  *
  * <h4>Execution</h4>
  *
- * In order to execute a root node, a call target needs to be created using
- * {@link TruffleRuntime#createCallTarget(RootNode)}. This allows the runtime system to optimize the
- * execution of the AST. The {@link CallTarget} can either be {@link CallTarget#call(Object...)
- * called} directly from runtime code or {@link DirectCallNode direct} and {@link IndirectCallNode
- * indirect} call nodes can be created, inserted in a child field and
- * {@link DirectCallNode#call(Object[]) called}. The use of direct call nodes allows the framework
- * to automatically inline and further optimize call sites based on heuristics.
+ * In order to execute a root node, its call target is lazily created and can be accessed via
+ * {@link RootNode#getCallTarget()}. This allows the runtime system to optimize the execution of the
+ * AST. The {@link CallTarget} can either be {@link CallTarget#call(Object...) called} directly from
+ * runtime code or {@link DirectCallNode direct} and {@link IndirectCallNode indirect} call nodes
+ * can be created, inserted in a child field and {@link DirectCallNode#call(Object[]) called}. The
+ * use of direct call nodes allows the framework to automatically inline and further optimize call
+ * sites based on heuristics.
  * <p>
  * After several calls to a call target or call node, the root node might get compiled using partial
  * evaluation. The details of the compilation heuristic are unspecified, therefore the Truffle

From 8d7cf23dabfa9a15d26b620f83c423ff39b95013 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:17:11 +0200
Subject: [PATCH 185/681] Avoid createCallTarget() in compiler.

---
 .../truffle/runtime/GraalTestTVMCI.java       |  2 +-
 .../truffle/runtime/OptimizedBlockNode.java   |  2 +-
 .../jdk11/VarHandlePartialEvaluationTest.java |  3 +-
 .../test/AOTSupportCompilationTest.java       |  3 +-
 .../test/AbstractSplittingStrategyTest.java   |  2 +-
 .../test/AgnosticInliningPhaseTest.java       |  6 +-
 ...locationReporterPartialEvaluationTest.java | 12 +--
 .../AssumedValuePartialEvaluationTest.java    | 12 +--
 ...ecodeInterpreterPartialEvaluationTest.java |  3 +-
 .../truffle/test/BytecodeOSRNodeTest.java     | 79 +++++++++---------
 .../test/CastExactPartialEvaluationTest.java  |  3 +-
 .../truffle/test/ClearFrameSlotTest.java      |  3 +-
 .../truffle/test/CodeInvalidationTest.java    |  4 +-
 .../truffle/test/CompilationMemoryTest.java   | 11 +--
 .../truffle/test/CompilerLoggingTest.java     |  2 +-
 ...rolFlowExceptionPartialEvaluationTest.java |  2 +-
 .../test/DFAPartialEvaluationTest.java        |  5 +-
 .../truffle/test/EncodedGraphCacheTest.java   |  5 +-
 .../compiler/truffle/test/EngineModeTest.java | 20 ++---
 .../truffle/test/ExceptionActionTest.java     | 21 ++---
 .../test/ExplodeLoopBlockDuplicationTest.java |  3 +-
 .../truffle/test/FlushEngineQueueTest.java    |  5 +-
 .../test/GraalTruffleRuntimeListenerTest.java | 12 +--
 .../truffle/test/IndirectCallSiteTest.java    | 38 ++++-----
 .../test/LanguageContextFreedTest.java        |  7 +-
 .../truffle/test/LazyClassLoadingTest.java    |  4 +-
 .../test/LibrarySplittingStrategyTest.java    | 27 +++----
 .../truffle/test/LoopNodeOSRTest.java         |  2 +-
 .../test/LoopNodePartialEvaluationTest.java   |  8 +-
 .../truffle/test/MaterializedFrameTest.java   |  3 +-
 .../truffle/test/MergeExplodeProxyTest.java   | 15 ++--
 .../test/MultiTierCompilationTest.java        | 24 +++---
 .../compiler/truffle/test/NodeLimitTest.java  |  9 +--
 .../test/NodeSplittingStrategyTest.java       | 81 +++++++++----------
 .../compiler/truffle/test/OSRCancelTest.java  |  4 +-
 ...tsRequireNonNullPartialEvaluationTest.java |  9 +--
 .../truffle/test/OptimizedBlockNodeTest.java  |  2 +-
 .../truffle/test/OptimizedCallTargetTest.java | 54 ++++++-------
 .../test/OptimizedOSRLoopNodeTest.java        | 54 ++++++-------
 .../truffle/test/OverrideOptionsTest.java     |  3 +-
 .../truffle/test/PartialEvaluationTest.java   | 12 ++-
 .../truffle/test/PerformanceWarningTest.java  | 10 +--
 ...hiStampInferencePartialEvaluationTest.java |  3 +-
 .../test/PolyglotEngineOptionsTest.java       |  7 +-
 .../test/RewriteDuringCompilationTest.java    |  4 +-
 .../ThreadsActivationCompilationTest.java     |  4 +-
 .../truffle/test/TraceCompilationTest.java    | 18 +++--
 .../test/TransferToInterpreterTest.java       |  2 +-
 .../test/TruffleBoundaryExceptionsTest.java   |  8 +-
 .../test/TruffleBoundaryInliningTest.java     | 11 +--
 .../truffle/test/TruffleCompilerImplTest.java |  6 +-
 .../test/TruffleDirectCallNodeTest.java       |  2 +-
 ...TruffleExceptionPartialEvaluationTest.java |  6 +-
 .../test/TruffleReturnBoxedParameterTest.java |  3 +-
 ...ffleToTruffleCallExceptionHandlerTest.java | 16 ++--
 .../test/UnrollLoopBlockDuplicationTest.java  |  3 +-
 .../truffle/test/inlining/InlineOnlyTest.java | 23 +++---
 .../truffle/test/inlining/InliningTest.java   | 12 ++-
 .../libgraal/JNIExceptionWrapperTest.java     |  2 +-
 59 files changed, 333 insertions(+), 383 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTestTVMCI.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTestTVMCI.java
index 2a46c58dc2ea..ae21216aa02c 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTestTVMCI.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTestTVMCI.java
@@ -109,7 +109,7 @@ protected GraalTestContext createTestContext(String testName) {
 
     @Override
     public OptimizedCallTarget createTestCallTarget(GraalTestContext testContext, RootNode testNode) {
-        OptimizedCallTarget target = (OptimizedCallTarget) truffleRuntime.createCallTarget(testNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) testNode.getCallTarget();
         testContext.init(target);
         return target;
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
index f49f7851c0eb..50f81a9eceb2 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
@@ -647,7 +647,7 @@ public static final class PartialBlocks<T extends Node> {
                 PartialBlockRootNode<T> partialRootNode = new PartialBlockRootNode<>(new FrameDescriptor(), block, startIndex, endIndex, blockIndex);
                 GraalRuntimeAccessor.NODES.applyPolyglotEngine(rootNode, partialRootNode);
 
-                targets[i] = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(partialRootNode);
+                targets[i] = (OptimizedCallTarget) partialRootNode.getCallTarget();
                 targets[i].setNonTrivialNodeCount(blockSizes[i]);
                 // we know the parameter types for block compilations. No need to check, lets cast
                 // them unsafely.
diff --git a/compiler/src/org.graalvm.compiler.truffle.test.jdk11/src/org/graalvm/compiler/truffle/test/jdk11/VarHandlePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test.jdk11/src/org/graalvm/compiler/truffle/test/jdk11/VarHandlePartialEvaluationTest.java
index b3ae1ded3fae..037c1cf474f9 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test.jdk11/src/org/graalvm/compiler/truffle/test/jdk11/VarHandlePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test.jdk11/src/org/graalvm/compiler/truffle/test/jdk11/VarHandlePartialEvaluationTest.java
@@ -38,7 +38,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -89,7 +88,7 @@ public void byteBufferHandleSet() {
     private void testCommon(AbstractTestNode testNode, String testName, Object... args) {
         FrameDescriptor fd = new FrameDescriptor();
         RootNode rootNode = new RootTestNode(fd, testName, testNode);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = rootNode.getCallTarget();
         Assert.assertEquals(42, callTarget.call(args));
         assertPartialEvalNoInvokes(callTarget, args);
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java
index fe8a66b95fff..0ece769184e5 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java
@@ -26,7 +26,6 @@
 
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
 import org.junit.Test;
@@ -115,7 +114,7 @@ private TestRootNode setup(BaseNode node, Object receiver) {
         context.initialize(ProxyLanguage.ID);
         context.enter();
         TestRootNode root = new TestRootNode(TestLanguage.getCurrentLanguage(), node, receiver);
-        GraalTruffleRuntime.getRuntime().createCallTarget(root);
+        root.getCallTarget();
         context.leave();
         return root;
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java
index 4a25d91ac58d..c12fbdb541cc 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java
@@ -134,7 +134,7 @@ protected static void reflectivelySetField(Object o, String fieldName, Object va
 
     protected static void createDummyTargetsToBoostGrowingSplitLimit() {
         for (int i = 0; i < 10; i++) {
-            runtime.createCallTarget(new DummyRootNode());
+            new DummyRootNode().getCallTarget();
         }
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java
index 5174697b39ca..7701221859c1 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java
@@ -91,13 +91,13 @@ public boolean hasNextTier() {
         return request.graph;
     }
 
-    protected final OptimizedCallTarget createDummyNode() {
-        return (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+    protected static final OptimizedCallTarget createDummyNode() {
+        return (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return null;
             }
-        });
+        }.getCallTarget();
     }
 
     protected class CallsInnerNodeTwice extends RootNode {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java
index 8fe0b00967cd..4a6cad5a3184 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java
@@ -28,13 +28,11 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.PolyglotAccess;
 import org.junit.Test;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.AllocationEvent;
@@ -52,8 +50,6 @@
  */
 public class AllocationReporterPartialEvaluationTest extends TestWithSynchronousCompiling {
 
-    private static final GraalTruffleRuntime runtime = (GraalTruffleRuntime) Truffle.getRuntime();
-
     @Test
     public void testConsistentAssertions() {
         // Test that onEnter()/onReturnValue() are not broken
@@ -64,20 +60,20 @@ public void testConsistentAssertions() {
         assertNotNull(tester);
         final AllocationReporter reporter = (AllocationReporter) context.getPolyglotBindings().getMember(AllocationReporter.class.getSimpleName()).asHostObject();
         final Long[] value = new Long[]{1L};
-        OptimizedCallTarget enterTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        OptimizedCallTarget enterTarget = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 reporter.onEnter(value[0], 4, 8);
                 return null;
             }
-        });
-        OptimizedCallTarget returnTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        }.getCallTarget();
+        OptimizedCallTarget returnTarget = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 reporter.onReturnValue(value[0], 4, 8);
                 return null;
             }
-        });
+        }.getCallTarget();
 
         // Interpret both:
         assertNotCompiled(enterTarget);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java
index 4a223433ac01..46ce97d04eff 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java
@@ -24,10 +24,6 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.utilities.AssumedValue;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
@@ -35,6 +31,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.utilities.AssumedValue;
+
 public class AssumedValuePartialEvaluationTest extends PartialEvaluationTest {
 
     public static Object constant42() {
@@ -73,7 +73,7 @@ public void testDynamic() {
         AssumedValue<Integer> value = new AssumedValue<>(42);
 
         RootTestNode root = new RootTestNode(new FrameDescriptor(), "assumedValue", new ReadDynamicAssumedValueNode());
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
+        OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
 
         StructuredGraph graph = partialEval(target, new Object[]{value});
         compile(target, graph);
@@ -87,7 +87,7 @@ public void testDynamicNoDeopt() {
         AssumedValue<Integer> value = new AssumedValue<>(42);
 
         RootTestNode root = new RootTestNode(new FrameDescriptor(), "assumedValue", new ReadDynamicAssumedValueNode());
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
+        OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
 
         StructuredGraph graph = partialEval(target, new Object[]{value});
         compile(target, graph);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
index f788de91a007..2f5a99971334 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
@@ -40,7 +40,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -257,7 +256,7 @@ public static Object constant42() {
     }
 
     private static void assertReturns42(RootNode program) {
-        Object result = Truffle.getRuntime().createCallTarget(program).call();
+        Object result = program.getCallTarget().call();
         Assert.assertEquals(Integer.valueOf(42), result);
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
index 2d58147c9534..42e79fffb343 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
@@ -24,6 +24,19 @@
  */
 package org.graalvm.compiler.truffle.test;
 
+import java.util.concurrent.TimeUnit;
+
+import org.graalvm.compiler.truffle.runtime.BytecodeOSRMetadata;
+import org.graalvm.compiler.truffle.runtime.FrameWithoutBoxing;
+import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
+import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.Timeout;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -38,22 +51,10 @@
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.BytecodeOSRNode;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
-import org.graalvm.compiler.truffle.runtime.BytecodeOSRMetadata;
-import org.graalvm.compiler.truffle.runtime.FrameWithoutBoxing;
-import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
-import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-
-import java.util.concurrent.TimeUnit;
 
 public class BytecodeOSRNodeTest extends TestWithSynchronousCompiling {
 
@@ -79,7 +80,7 @@ public void before() {
     @Test
     public void testSimpleInterpreterLoop() {
         RootNode rootNode = new Program(new InfiniteInterpreterLoop(), new FrameDescriptor());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         // Interpreter invocation should be OSR compiled and break out of the interpreter loop.
         Assert.assertEquals(42, target.call());
     }
@@ -92,7 +93,7 @@ public void testFixedIterationLoop() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         FixedIterationLoop osrNode = new FixedIterationLoop(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(osrThreshold + 1));
     }
 
@@ -104,7 +105,7 @@ public void testFixedIterationLoopBelowThreshold() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         FixedIterationLoop osrNode = new FixedIterationLoop(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(FixedIterationLoop.NORMAL_RESULT, target.call(osrThreshold));
     }
 
@@ -117,21 +118,21 @@ public void testMultipleLoops() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         TwoFixedIterationLoops osrNode = new TwoFixedIterationLoops(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(TwoFixedIterationLoops.OSR_IN_FIRST_LOOP, target.call(osrThreshold + 1));
 
         // Each loop runs for osrThreshold/2 + 1 iterations, so the second loop should trigger OSR.
         frameDescriptor = new FrameDescriptor();
         osrNode = new TwoFixedIterationLoops(frameDescriptor);
         rootNode = new Program(osrNode, frameDescriptor);
-        target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(TwoFixedIterationLoops.OSR_IN_SECOND_LOOP, target.call(osrThreshold / 2 + 1));
 
         // Each loop runs for osrThreshold/2 iterations, so OSR should not get triggered.
         frameDescriptor = new FrameDescriptor();
         osrNode = new TwoFixedIterationLoops(frameDescriptor);
         rootNode = new Program(osrNode, frameDescriptor);
-        target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(TwoFixedIterationLoops.NO_OSR, target.call(osrThreshold / 2));
     }
 
@@ -143,7 +144,7 @@ public void testFailedCompilation() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         UncompilableFixedIterationLoop osrNode = new UncompilableFixedIterationLoop(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(FixedIterationLoop.NORMAL_RESULT, target.call(osrThreshold + 1));
         // Compilation should be disabled after a compilation failure.
         Assert.assertEquals(osrNode.getGraalOSRMetadata(), BytecodeOSRMetadata.DISABLED);
@@ -157,7 +158,7 @@ public void testDeoptimizeAndRecompile() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         DeoptimizingFixedIterationLoop osrNode = new DeoptimizingFixedIterationLoop(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         // After osrThreshold+1 iterations, it should trigger OSR and deoptimize. OSR should not be
         // disabled, but the target should be invalid pending recompilation.
         Assert.assertEquals(FixedIterationLoop.NORMAL_RESULT, target.call(osrThreshold + 1));
@@ -183,7 +184,7 @@ public void testInvalidateOnNodeReplaced() {
         };
         FixedIterationLoop osrNode = new FixedIterationLoopWithChild(frameDescriptor, childToReplace);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(osrThreshold + 1));
         BytecodeOSRMetadata osrMetadata = osrNode.getGraalOSRMetadata();
         OptimizedCallTarget osrTarget = osrMetadata.getOSRCompilations().get(BytecodeOSRTestNode.DEFAULT_TARGET);
@@ -214,7 +215,7 @@ public void testOSRWithMaterializeableFrame() {
         runtime.markFrameMaterializeCalled(frameDescriptor);
         MaterializedFixedIterationLoop osrNode = new MaterializedFixedIterationLoop(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         // OSR should succeed.
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(osrThreshold + 1));
         // Since the frame could be materialized, we should reuse the parent frame instead of
@@ -235,7 +236,7 @@ public void testOSRPolling() {
         );
         InfiniteInterpreterLoop osrNode = new InfiniteInterpreterLoop();
         RootNode rootNode = new Program(osrNode, new FrameDescriptor());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
         BytecodeOSRMetadata osrMetadata = osrNode.getGraalOSRMetadata();
         int backEdgeCount = osrMetadata.getBackEdgeCount();
@@ -249,7 +250,7 @@ public void testOSRPolling() {
     @Test
     public void testInterpreterStateObject() {
         RootNode rootNode = new Program(new InterpreterStateInfiniteLoop(), new FrameDescriptor());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
     }
 
@@ -259,7 +260,7 @@ public void testInterpreterStateObject() {
     @Test
     public void testBeforeTransferCallback() {
         RootNode rootNode = new Program(new BeforeTransferInfiniteLoop(), new FrameDescriptor());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
     }
 
@@ -271,7 +272,7 @@ public void testStackTraceHidesOSRCallTarget() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         CheckStackWalkCallTarget osrNode = new CheckStackWalkCallTarget(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(2 * osrThreshold));
     }
 
@@ -283,7 +284,7 @@ public void testStackTraceUsesOSRFrame() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         CheckStackWalkFrame osrNode = new CheckStackWalkFrame(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         osrNode.callTarget = target; // set the call target so stack walking can use it
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(2 * osrThreshold));
     }
@@ -297,7 +298,7 @@ public void testStackTraceUsesNewestOSRFrame() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         CheckStackWalkFrameNested osrNode = new CheckStackWalkFrameNested(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         osrNode.callTarget = target; // set the call target so stack walking can use it
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, target.call(3 * osrThreshold));
         Assert.assertTrue(osrNode.hasDeoptimizedYet);
@@ -314,9 +315,9 @@ public void testGetCallerFrameSkipsOSR() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         CheckGetCallerFrameSkipsOSR osrNode = new CheckGetCallerFrameSkipsOSR(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         RootNode caller = new CheckGetCallerFrameSkipsOSR.Caller(target);
-        OptimizedCallTarget callerTarget = (OptimizedCallTarget) runtime.createCallTarget(caller);
+        OptimizedCallTarget callerTarget = (OptimizedCallTarget) caller.getCallTarget();
         osrNode.caller = callerTarget;
         Assert.assertEquals(FixedIterationLoop.OSR_RESULT, callerTarget.call(osrThreshold + 1));
     }
@@ -328,7 +329,7 @@ public void testGetCallerFrameSkipsOSR() {
     public void testFrameTransfer() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         RootNode rootNode = new Program(new FrameTransferringNode(frameDescriptor), frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
     }
 
@@ -340,7 +341,7 @@ public void testFrameTransfer() {
     public void testFrameTransferWithTagUpdate() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         RootNode rootNode = new Program(new FrameTransferringNodeWithTagUpdate(frameDescriptor), frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
     }
 
@@ -357,7 +358,7 @@ public void testFrameTransferWithUninitializedSlots() {
         // use a non-null default value to make sure it gets copied properly.
         FrameDescriptor frameDescriptor = new FrameDescriptor(new Object());
         RootNode rootNode = new Program(new FrameTransferringNodeWithUninitializedSlots(frameDescriptor), frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
     }
 
@@ -370,7 +371,7 @@ public void testFrameChanges() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         FrameChangingNode osrNode = new FrameChangingNode(frameDescriptor);
         RootNode rootNode = new Program(osrNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(42, target.call());
         Assert.assertEquals(2, osrNode.osrCount);
     }
@@ -411,7 +412,7 @@ public void testOSRInBytecodeLoop() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         BytecodeNode bytecodeNode = new BytecodeNode(3, frameDescriptor, tripleInput1);
         RootNode rootNode = new Program(bytecodeNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         // note: requires an extra iteration due to an awkward interaction with enterprise loop
         // peeling.
         Assert.assertEquals(3 * (osrThreshold + 2), target.call(osrThreshold + 2, 0));
@@ -428,7 +429,7 @@ public void testNoOSRInBytecodeLoop() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         BytecodeNode bytecodeNode = new BytecodeNode(3, frameDescriptor, tripleInput1);
         RootNode rootNode = new Program(bytecodeNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(3 * osrThreshold, target.call(osrThreshold, 0));
         Assert.assertFalse(bytecodeNode.compiled);
         BytecodeOSRMetadata osrMetadata = (BytecodeOSRMetadata) bytecodeNode.getOSRMetadata();
@@ -443,7 +444,7 @@ public void testOSRInBytecodeOuterLoop() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         BytecodeNode bytecodeNode = new BytecodeNode(4, frameDescriptor, multiplyInputs);
         RootNode rootNode = new Program(bytecodeNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(2 * osrThreshold, target.call(osrThreshold, 2));
         Assert.assertTrue(bytecodeNode.compiled);
         BytecodeOSRMetadata osrMetadata = (BytecodeOSRMetadata) bytecodeNode.getOSRMetadata();
@@ -461,7 +462,7 @@ public void testOSRInBytecodeInnerLoop() {
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         BytecodeNode bytecodeNode = new BytecodeNode(4, frameDescriptor, multiplyInputs);
         RootNode rootNode = new Program(bytecodeNode, frameDescriptor);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         Assert.assertEquals(2 * (osrThreshold - 1), target.call(2, osrThreshold - 1));
         Assert.assertTrue(bytecodeNode.compiled);
         BytecodeOSRMetadata osrMetadata = (BytecodeOSRMetadata) bytecodeNode.getOSRMetadata();
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java
index da874e7c0376..e73ac3aab0cd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java
@@ -38,7 +38,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -105,7 +104,7 @@ public void byteBufferAccessIndex() {
     private void testCommon(AbstractTestNode testNode, String testName) {
         FrameDescriptor fd = new FrameDescriptor();
         RootNode rootNode = new RootTestNode(fd, testName, testNode);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = rootNode.getCallTarget();
         Assert.assertEquals(42, callTarget.call(newBuffer()));
         assertPartialEvalNoInvokes(callTarget, new Object[]{newBuffer()});
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ClearFrameSlotTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ClearFrameSlotTest.java
index b14bd96d0c03..e97abe151e3e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ClearFrameSlotTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ClearFrameSlotTest.java
@@ -49,7 +49,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -283,7 +282,7 @@ private void doTest(Supplier<RootNode> rootProvider, Consumer<StructuredGraph> g
             setupContext(Context.newBuilder().option("engine.ForceFrameLivenessAnalysis", "true"));
         }
         RootNode rootNode = rootProvider.get();
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = rootNode.getCallTarget();
         StructuredGraph graph = null;
         try {
             callTarget.call(args);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java
index 5facd40e2448..e873da6858f6 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java
@@ -258,7 +258,7 @@ public void testInvalidation() throws IOException, InterruptedException {
             protected synchronized CallTarget parse(ParsingRequest request) {
                 com.oracle.truffle.api.source.Source source = request.getSource();
                 if (target == null) {
-                    target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    target = new RootNode(languageInstance) {
 
                         @Node.Child private volatile BaseNode child = testedCode;
 
@@ -272,7 +272,7 @@ public SourceSection getSourceSection() {
                             return source.createSection(1);
                         }
 
-                    });
+                    }.getCallTarget();
                 }
                 return target;
             }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java
index 2e89039c992b..ae66ac8af5fb 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java
@@ -24,17 +24,18 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.test.GCUtils;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
+
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.test.GCUtils;
+
 public class CompilationMemoryTest extends TestWithPolyglotOptions {
 
     @Before
@@ -45,7 +46,7 @@ public void setUp() {
     @Test
     public void testFieldsFreedAfterCompilation() {
         TestObject expected = new TestObject();
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(expected));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) RootNode.createConstantNode(expected).getCallTarget();
         Assert.assertEquals(expected, callTarget.call());
         Assert.assertEquals(expected, callTarget.call());
         Assert.assertTrue(callTarget.isValid());
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java
index 82af56ac3f6c..4b50d97c98e6 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java
@@ -54,7 +54,7 @@ public void testLogging() throws IOException {
             TestListener listener = new TestListener();
             try {
                 runtime.addListener(listener);
-                OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(true));
+                OptimizedCallTarget compilable = (OptimizedCallTarget) RootNode.createConstantNode(true).getCallTarget();
                 compilable.call();
                 String logContent = new String(logOut.toByteArray());
                 String expected = String.format(FORMAT_SUCCESS + "%s%s%n", compilable.getName(), MESSAGE_TO_STREAM, MESSAGE_TO_TTY);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
index 3ead4bbf2d4a..ee2f908b3d76 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
@@ -67,7 +67,7 @@ public void catchControlFlowExceptionWithLoopExplosion() {
     @Test
     public void catchControlFlowExceptionFromCall() {
         setupContext(Context.newBuilder().allowExperimentalOptions(true).option("engine.Inlining", "true").build());
-        CallTarget callTarget = Truffle.getRuntime().createCallTarget(new RootTestNode(new FrameDescriptor(), "throwControlFlowException", new ThrowControlFlowExceptionTestNode()));
+        CallTarget callTarget = new RootTestNode(new FrameDescriptor(), "throwControlFlowException", new ThrowControlFlowExceptionTestNode()).getCallTarget();
         AbstractTestNode result = new CatchControlFlowExceptionTestNode(new CallTestNode(callTarget));
         assertPartialEvalEquals(ControlFlowExceptionPartialEvaluationTest::constant42, new RootTestNode(new FrameDescriptor(), "catchControlFlowExceptionFromCall", result));
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java
index e666a0c63902..b64a65cd8dfd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java
@@ -31,7 +31,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -302,7 +301,7 @@ private RootNode createRootNode(int initialState, DFAStateNode[] states) {
     }
 
     private static void assertMatches(RootNode program, String input) {
-        Object result = Truffle.getRuntime().createCallTarget(program).call(input);
+        Object result = program.getCallTarget().call(input);
         Assert.assertEquals(Boolean.TRUE, result);
     }
 
@@ -312,7 +311,7 @@ public static boolean constantTrue() {
 
     private void assertPartialEvalEqualsAndRunsCorrect(RootNode program, String input) {
         assertMatches(program, input);
-        final OptimizedCallTarget compilable = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(program);
+        final OptimizedCallTarget compilable = (OptimizedCallTarget) program.getCallTarget();
         partialEval(compilable, new Object[]{input}, getCompilationId(compilable));
         // fail on Exceptions only for now
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java
index de58af75ee45..1a3c2d8214f4 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java
@@ -124,9 +124,8 @@ private static boolean encodedGraphCacheContains(TruffleCompilerImpl compiler, R
 
     @SuppressWarnings("try")
     private static OptimizedCallTarget compileAST(RootNode rootNode) {
-        GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
-        DebugContext debug = new DebugContext.Builder(runtime.getGraalOptions(OptionValues.class)).build();
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
+        DebugContext debug = new DebugContext.Builder(GraalTruffleRuntime.getRuntime().getGraalOptions(OptionValues.class)).build();
         try (DebugContext.Scope s = debug.scope("EncodedGraphCacheTest")) {
             CompilationIdentifier compilationId = getTruffleCompilerFromRuntime(target).createCompilationIdentifier(target);
             getTruffleCompilerFromRuntime(target).compileAST(target.getOptionValues(), debug, target, compilationId, null, null);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java
index 07d44f0ecfe0..5c46f8ca7f53 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java
@@ -63,7 +63,7 @@ private static void compileAndAssertLatency(OptimizedCallTarget target) {
     @Test
     public void testLatencyFirstTierOnly() {
         setupContext(MODE, LATENCY);
-        OptimizedCallTarget target = (OptimizedCallTarget) GraalTruffleRuntime.getRuntime().createCallTarget(new RootNode(null) {
+        OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 if (GraalCompilerDirectives.hasNextTier()) {
@@ -71,7 +71,7 @@ public Object execute(VirtualFrame frame) {
                 }
                 return null;
             }
-        });
+        }.getCallTarget();
         compileAndAssertLatency(target);
     }
 
@@ -82,7 +82,7 @@ public void testLatencyNoSplitting() {
         AbstractSplittingStrategyTest.SplitCountingListener listener = new AbstractSplittingStrategyTest.SplitCountingListener();
         try {
             runtime.addListener(listener);
-            OptimizedCallTarget inner = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+            OptimizedCallTarget inner = (OptimizedCallTarget) new RootNode(null) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     reportPolymorphicSpecialize();
@@ -93,11 +93,11 @@ public Object execute(VirtualFrame frame) {
                 public boolean isCloningAllowed() {
                     return true;
                 }
-            });
+            }.getCallTarget();
             DirectCallNode directCallNode = runtime.createDirectCallNode(inner);
             DirectCallNode directCallNode2 = runtime.createDirectCallNode(inner);
 
-            OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+            OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(null) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     directCallNode.call();
@@ -109,7 +109,7 @@ public Object execute(VirtualFrame frame) {
                 public boolean isCloningAllowed() {
                     return true;
                 }
-            });
+            }.getCallTarget();
             compileAndAssertLatency(target);
             Assert.assertEquals("Should not be splitting in latency mode", 0, listener.splitCount);
         } finally {
@@ -121,7 +121,7 @@ public boolean isCloningAllowed() {
     public void testLatencyNoInlining() {
         setupContext(MODE, LATENCY, "engine.CompileOnly", ROOT);
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget inner = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        OptimizedCallTarget inner = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 if (CompilerDirectives.inCompiledCode()) {
@@ -139,11 +139,11 @@ private void fail() {
             public boolean isCloningAllowed() {
                 return true;
             }
-        });
+        }.getCallTarget();
         DirectCallNode directCallNode = runtime.createDirectCallNode(inner);
         DirectCallNode directCallNode2 = runtime.createDirectCallNode(inner);
 
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 directCallNode.call();
@@ -155,7 +155,7 @@ public Object execute(VirtualFrame frame) {
             public String getName() {
                 return ROOT;
             }
-        });
+        }.getCallTarget();
         compileAndAssertLatency(target);
         Assert.assertNull(directCallNode.getClonedCallTarget());
         Assert.assertNull(directCallNode2.getClonedCallTarget());
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java
index 093a99157218..c871d856ad5a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java
@@ -24,12 +24,6 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.OptimizationFailedException;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -39,10 +33,11 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import java.util.regex.Pattern;
 import java.util.logging.FileHandler;
 import java.util.logging.SimpleFormatter;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import org.graalvm.compiler.core.GraalCompilerOptions;
 import org.graalvm.compiler.test.SubprocessUtil;
 import org.graalvm.compiler.truffle.common.TruffleCompilerRuntime;
@@ -50,9 +45,15 @@
 import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
 import org.graalvm.compiler.truffle.test.nodes.RootTestNode;
 import org.graalvm.polyglot.Context;
-import org.junit.Test;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.OptimizationFailedException;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.RootNode;
 
 public class ExceptionActionTest extends TestWithPolyglotOptions {
 
@@ -66,7 +67,7 @@ public class ExceptionActionTest extends TestWithPolyglotOptions {
 
     @BeforeClass
     public static void setUp() {
-        Truffle.getRuntime().createCallTarget(createPermanentBailoutNode()).call();
+        createPermanentBailoutNode().getCallTarget().call();
     }
 
     @Test
@@ -190,7 +191,7 @@ private void executeForked(Consumer<? super Path> verifier, Supplier<RootNode> r
             verifier.accept(log);
         } else {
             setupContext(contextOptions);
-            OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNodeFactory.get());
+            OptimizedCallTarget target = (OptimizedCallTarget) rootNodeFactory.get().getCallTarget();
             try {
                 target.call();
             } catch (RuntimeException e) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java
index e92ed4a54ef7..e151aff045ae 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java
@@ -29,7 +29,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.UnsupportedSpecializationException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -45,7 +44,7 @@ public class ExplodeLoopBlockDuplicationTest extends TestWithSynchronousCompilin
      */
     @Test
     public void testBlockDuplication() {
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new ObjectCacheTestRootNode());
+        OptimizedCallTarget target = (OptimizedCallTarget) new ObjectCacheTestRootNode().getCallTarget();
         AbstractType value1 = new ConcreteType1();
         AbstractType value2 = new ConcreteType2();
         target.call(value1);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java
index 7d53b3ef5e43..5e7c00cf9bec 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java
@@ -26,7 +26,6 @@
 
 import static org.junit.Assert.assertNotEquals;
 
-import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
 import org.junit.Test;
@@ -78,7 +77,7 @@ public void testTargetsDequeuedOnClose() {
     }
 
     private static OptimizedCallTarget createConstantCallTarget(int i) {
-        return (OptimizedCallTarget) GraalTruffleRuntime.getRuntime().createCallTarget(new RootNode(null) {
+        return (OptimizedCallTarget) new RootNode(null) {
 
             @Override
             public Object execute(VirtualFrame frame) {
@@ -94,7 +93,7 @@ public String getName() {
             public String toString() {
                 return getName();
             }
-        });
+        }.getCallTarget();
     }
 
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
index 72f119187fae..fb13b5d17f4a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
@@ -56,7 +56,7 @@ public final class GraalTruffleRuntimeListenerTest extends TestWithPolyglotOptio
     public void testCompilationSuccess() {
         setupContext("engine.CompileImmediately", "true", "engine.BackgroundCompilation", "false");
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(true));
+        OptimizedCallTarget compilable = (OptimizedCallTarget) RootNode.createConstantNode(true).getCallTarget();
         TestListener listener = new TestListener(compilable);
         try {
             runtime.addListener(listener);
@@ -76,7 +76,7 @@ public void testCompilationSuccess() {
     public void testCompilationFailure() {
         setupContext("engine.CompileImmediately", "true", "engine.BackgroundCompilation", "false");
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(createFailureNode());
+        OptimizedCallTarget compilable = (OptimizedCallTarget) createFailureNode().getCallTarget();
         TestListener listener = new TestListener(compilable);
         try {
             runtime.addListener(listener);
@@ -98,7 +98,7 @@ public void write(int b) throws IOException {
             }
         }).allowExperimentalOptions(true).option("engine.CompileImmediately", "true").option("engine.BackgroundCompilation", "false").option("engine.CompilationFailureAction", "Diagnose"));
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(createFailureNode());
+        OptimizedCallTarget compilable = (OptimizedCallTarget) createFailureNode().getCallTarget();
         TestListener listener = new TestListener(compilable);
         try {
             runtime.addListener(listener);
@@ -121,7 +121,7 @@ public void testBlockCompilation() {
                         "engine.BackgroundCompilation", "false",
                         "engine.PartialBlockCompilationSize", "1");
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(createBlocks());
+        OptimizedCallTarget compilable = (OptimizedCallTarget) createBlocks().getCallTarget();
         compilable.computeBlockCompilations();
         TestListener listener = new TestListener(compilable);
         try {
@@ -159,7 +159,7 @@ public void testBlockCompilationLargeBlocks() {
                         "engine.PartialBlockCompilationSize", "1",
                         "engine.PartialBlockMaximumSize", "0");
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(createBlocks());
+        OptimizedCallTarget compilable = (OptimizedCallTarget) createBlocks().getCallTarget();
         compilable.computeBlockCompilations();
         TestListener listener = new TestListener(compilable);
         try {
@@ -198,7 +198,7 @@ public void testBlockCompilationMaximumGraalNodeCount() {
             children[i] = new ExpensiveTestNode();
         }
         BlockNode<AbstractTestNode> block = BlockNode.create(children, new NodeExecutor());
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(new TestRootNode(block));
+        OptimizedCallTarget compilable = (OptimizedCallTarget) new TestRootNode(block).getCallTarget();
         TestListener listener = new TestListener(compilable);
         try {
             runtime.addListener(listener);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java
index fd96927fa482..29c5f3aab5ec 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java
@@ -55,19 +55,19 @@ public void before() {
     @Test
     public void testIndirectCallNodeDoesNotDeopOnFirstCall() {
         final Object[] noArguments = new Object[0];
-        final OptimizedCallTarget innerTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget innerTarget = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return null;
             }
-        });
-        final OptimizedCallTarget uninitializedInnerTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        }.getCallTarget();
+        final OptimizedCallTarget uninitializedInnerTarget = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return null;
             }
-        });
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        }.getCallTarget();
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) new RootNode(null) {
             @Child OptimizedIndirectCallNode indirectCallNode = (OptimizedIndirectCallNode) runtime.createIndirectCallNode();
 
             @Override
@@ -78,7 +78,7 @@ public Object execute(VirtualFrame frame) {
                     return indirectCallNode.call(uninitializedInnerTarget, noArguments);
                 }
             }
-        });
+        }.getCallTarget();
         final int compilationThreshold = outerTarget.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             outerTarget.call(noArguments);
@@ -206,11 +206,11 @@ void assertNotDeoptimized(OptimizedCallTarget target) {
      */
     @Test
     public void testIndirectCallNodeDoesNotDeoptOnTypeChangeWithInlining1() {
-        final OptimizedCallTarget toInterpreterOnString = (OptimizedCallTarget) runtime.createCallTarget(new WritesToGlobalState());
+        final OptimizedCallTarget toInterpreterOnString = (OptimizedCallTarget) new WritesToGlobalState().getCallTarget();
         final Object[] directArguments = new Object[]{1};
-        final OptimizedCallTarget directCall = (OptimizedCallTarget) runtime.createCallTarget(new DirectlyCallsTargetWithArguments(toInterpreterOnString, directArguments));
-        final OptimizedCallTarget noOp = (OptimizedCallTarget) runtime.createCallTarget(new DummyTarget());
-        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) runtime.createCallTarget(new IndirectCallTargetFromArgument());
+        final OptimizedCallTarget directCall = (OptimizedCallTarget) new DirectlyCallsTargetWithArguments(toInterpreterOnString, directArguments).getCallTarget();
+        final OptimizedCallTarget noOp = (OptimizedCallTarget) new DummyTarget().getCallTarget();
+        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) new IndirectCallTargetFromArgument().getCallTarget();
 
         final int compilationThreshold = toInterpreterOnString.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
 
@@ -248,10 +248,10 @@ public void testIndirectCallNodeDoesNotDeoptOnTypeChangeWithInlining1() {
 
     @Test
     public void testIndirectCallDoesNotDeoptInliningDirectCaller() {
-        final OptimizedCallTarget callee = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(0));
+        final OptimizedCallTarget callee = (OptimizedCallTarget) RootNode.createConstantNode(0).getCallTarget();
         final Object[] directArguments = new Object[]{"direct arg"};
-        final OptimizedCallTarget directCall = (OptimizedCallTarget) runtime.createCallTarget(new DirectlyCallsTargetWithArguments(callee, directArguments));
-        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) runtime.createCallTarget(new IndirectCallTargetFromArgument());
+        final OptimizedCallTarget directCall = (OptimizedCallTarget) new DirectlyCallsTargetWithArguments(callee, directArguments).getCallTarget();
+        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) new IndirectCallTargetFromArgument().getCallTarget();
         final int compilationThreshold = callee.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
 
         try (DeoptInvalidateListener directListener = new DeoptInvalidateListener(runtime, directCall)) {
@@ -278,10 +278,10 @@ public void testIndirectCallDoesNotDeoptInliningDirectCaller() {
     public void testIndirectCallDoesNotDeoptNotInliningDirectCaller() {
         setupContext("engine.MultiTier", "false", "engine.Inlining", "false");
 
-        final OptimizedCallTarget callee = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(0));
+        final OptimizedCallTarget callee = (OptimizedCallTarget) RootNode.createConstantNode(0).getCallTarget();
         final Object[] directArguments = new Object[]{"direct arg"};
-        final OptimizedCallTarget directCall = (OptimizedCallTarget) runtime.createCallTarget(new DirectlyCallsTargetWithArguments(callee, directArguments));
-        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) runtime.createCallTarget(new IndirectCallTargetFromArgument());
+        final OptimizedCallTarget directCall = (OptimizedCallTarget) new DirectlyCallsTargetWithArguments(callee, directArguments).getCallTarget();
+        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) new IndirectCallTargetFromArgument().getCallTarget();
         final int compilationThreshold = callee.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
 
         try (DeoptInvalidateListener directListener = new DeoptInvalidateListener(runtime, directCall)) {
@@ -305,10 +305,10 @@ public void testIndirectCallDoesNotDeoptNotInliningDirectCaller() {
 
     @Test
     public void testIndirectCallDoesNotDeoptCallee() {
-        final OptimizedCallTarget callee = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(0));
+        final OptimizedCallTarget callee = (OptimizedCallTarget) RootNode.createConstantNode(0).getCallTarget();
         final Object[] directArguments = new Object[]{"direct arg"};
-        final OptimizedCallTarget directCall = (OptimizedCallTarget) runtime.createCallTarget(new DirectlyCallsTargetWithArguments(callee, directArguments));
-        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) runtime.createCallTarget(new IndirectCallTargetFromArgument());
+        final OptimizedCallTarget directCall = (OptimizedCallTarget) new DirectlyCallsTargetWithArguments(callee, directArguments).getCallTarget();
+        final OptimizedCallTarget indirectCall = (OptimizedCallTarget) new IndirectCallTargetFromArgument().getCallTarget();
         final int compilationThreshold = callee.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
 
         try (DeoptInvalidateListener calleeListener = new DeoptInvalidateListener(runtime, callee)) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java
index 5f7f9b3c46d4..a8fb5989cf32 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java
@@ -40,11 +40,9 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.ContextLocal;
 import com.oracle.truffle.api.ContextThreadLocal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.GCUtils;
@@ -154,8 +152,7 @@ protected LanguageContext createContext(Env env) {
 
         @Override
         protected CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            TruffleRuntime runtime = Truffle.getRuntime();
-            OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(this) {
+            OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(this) {
 
                 @SuppressWarnings("unchecked")
                 @Override
@@ -163,7 +160,7 @@ public Object execute(VirtualFrame frame) {
                     getContextReference0().get(this).currentTarget = (OptimizedCallTarget) getCallTarget();
                     return true;
                 }
-            });
+            }.getCallTarget();
             getContextReference0().get(null).currentTarget = target;
 
             assertEquals(COMPILATION_THRESHOLD, (int) target.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold));
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java
index b5d77628b72b..ecb63059fb76 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java
@@ -55,7 +55,7 @@
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
-import com.oracle.truffle.api.Truffle;
+
 import com.oracle.truffle.api.nodes.RootNode;
 
 import jdk.vm.ci.runtime.JVMCICompilerFactory;
@@ -90,7 +90,7 @@ private static Class<?> forNameOrNull(String name) {
     @Test
     public void testClassLoading() throws IOException, InterruptedException {
         setupContext();
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(0));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(0).getCallTarget();
         Assume.assumeFalse(target.getOptionValue(CompileImmediately));
         List<String> vmCommandLine = getVMCommandLine();
         Assume.assumeFalse("Explicitly enables JVMCI compiler", vmCommandLine.contains("-XX:+UseJVMCINativeLibrary") || vmCommandLine.contains("-XX:+UseJVMCICompiler"));
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java
index 917c3d2f6bcf..878f5d629b08 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java
@@ -58,9 +58,9 @@ public void boostBudget() {
 
     @Test
     public void testCachedLibWithValue() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(LibrarySplittingStrategyTestFactory.CachesLibOnValueNodeGen.create(
-                                        new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        LibrarySplittingStrategyTestFactory.CachesLibOnValueNodeGen.create(
+                                        new ReturnsFirstArgumentNode())).getCallTarget();
         Object[] first = new Object[]{1};
         Object[] second = new Object[]{"2"};
         testSplitsDirectCallsHelper(callTarget, first, second);
@@ -68,10 +68,9 @@ public void testCachedLibWithValue() {
 
     @Test
     public void testCachedLibWithValueExclude() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(
-                                        LibrarySplittingStrategyTestFactory.CachesLibOnValueNodeExcludeNodeGen.create(
-                                                        new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        LibrarySplittingStrategyTestFactory.CachesLibOnValueNodeExcludeNodeGen.create(
+                                        new ReturnsFirstArgumentNode())).getCallTarget();
         Object[] first = new Object[]{1};
         Object[] second = new Object[]{"2"};
         testDoesNotSplitDirectCallHelper(callTarget, first, second);
@@ -79,10 +78,9 @@ public void testCachedLibWithValueExclude() {
 
     @Test
     public void testExportedMessage() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(
-                                        LibrarySplittingStrategyTestFactory.SplitReadPropertyNodeGen.create(
-                                                        new ReturnsFirstArgumentNode(), new ReturnsSecondArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        LibrarySplittingStrategyTestFactory.SplitReadPropertyNodeGen.create(
+                                        new ReturnsFirstArgumentNode(), new ReturnsSecondArgumentNode())).getCallTarget();
         Object[] first = new Object[]{newInstance(), "a"};
         Object[] second = new Object[]{newInstance(), "b"};
         testSplitsDirectCallsHelper(callTarget, first, second);
@@ -90,10 +88,9 @@ public void testExportedMessage() {
 
     @Test
     public void testExportedMessageWithExcludedSpecialisation() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(
-                                        LibrarySplittingStrategyTestFactory.SplitReadPropertyNodeGen.create(
-                                                        new ReturnsFirstArgumentNode(), new ReturnsSecondArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        LibrarySplittingStrategyTestFactory.SplitReadPropertyNodeGen.create(
+                                        new ReturnsFirstArgumentNode(), new ReturnsSecondArgumentNode())).getCallTarget();
         Object[] first = new Object[]{newInstance(), SplittingObjectType.ReadMember.CACHED_NAME};
         Object[] second = new Object[]{newInstance(), "b"};
         testDoesNotSplitDirectCallHelper(callTarget, first, second);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java
index 1e39f6bbdde0..f2840e095a75 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java
@@ -121,7 +121,7 @@ public void testOSRStackFrame() {
         FrameSlot iterationSlot = desc.addFrameSlot("iteration", FrameSlotKind.Int);
         CheckStackWalkBody loop = new CheckStackWalkBody(osrThreshold * 2, desc, iterationSlot);
         TestLoopRootNode rootNode = new TestLoopRootNode(loop, desc, iterationSlot);
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
 
         target.call(ARGUMENTS);
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
index 7d909a7789f4..3796130670fc 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java
@@ -30,8 +30,8 @@
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
@@ -98,7 +98,7 @@ public void testLoopConditionProfile() {
         setupContext(Context.newBuilder().allowExperimentalOptions(true).option("engine.CompileImmediately", "false").option("engine.BackgroundCompilation", "false").build());
 
         TestLoopRootNode repeatRootNode = new TestLoopRootNode(new RepeatNTimesNode(9));
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(repeatRootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) repeatRootNode.getCallTarget();
         StructuredGraph graph = partialEval(target, new Object[0]);
 
         Stream<IfNode> ifWithInjectedProfile = graph.getNodes().filter(IfNode.class).stream().filter(i -> i.getProfileData().getProfileSource() == ProfileSource.INJECTED);
@@ -120,7 +120,7 @@ public void testPrepareLoopForAOT() {
         setupContext(Context.newBuilder().allowExperimentalOptions(true).option("engine.CompileImmediately", "true").option("engine.BackgroundCompilation", "false").build());
 
         TestLoopRootNode repeatRootNode = new TestLoopRootNode(new RepeatNTimesNode(9));
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(repeatRootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) repeatRootNode.getCallTarget();
         target.prepareForAOT();
 
         StructuredGraph graph = partialEval(target, new Object[0]);
@@ -257,7 +257,7 @@ public void testPropagateInjectedProfile(boolean twoEnds, boolean trueContinue)
         setupContext(Context.newBuilder().allowExperimentalOptions(true).option("engine.CompileImmediately", "false").option("engine.BackgroundCompilation", "false").build());
 
         RootNode rootNode = new TestPropagateInjectedProfileRootNode(new TestRepeatingNode(9, twoEnds, trueContinue));
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         StructuredGraph graph = partialEval(target, new Object[0]);
 
         Stream<IfNode> ifWithInjectedProfile = graph.getNodes().filter(IfNode.class).stream().filter(i -> i.getProfileData().getProfileSource() == ProfileSource.INJECTED);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java
index caf71ddd7176..a51f3d938b8c 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java
@@ -41,7 +41,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -81,7 +80,7 @@ public Object execute(VirtualFrame frame) {
     @Test
     public void getFrameSlotKind() {
         RootNode rootNode = createRootNode();
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = rootNode.getCallTarget();
         StructuredGraph graph = partialEval((OptimizedCallTarget) callTarget, new Object[]{}, getCompilationId(callTarget));
 
         NodeIterable<MethodCallTargetNode> calls = graph.getNodes().filter(MethodCallTargetNode.class);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java
index a11e030b259e..f4eea426ef41 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java
@@ -37,7 +37,6 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.frame.FrameSlotTypeException;
@@ -211,7 +210,7 @@ public void testLoopControlVariableProxy() {
                         /* 12: */Bytecode.POP,
                         /* 13: */Bytecode.RETURN};
 
-        CallTarget callee = Truffle.getRuntime().createCallTarget(new LoopControlVariableProxy("simpleLoopProgram", bytecodes, 1, 3));
+        CallTarget callee = new LoopControlVariableProxy("simpleLoopProgram", bytecodes, 1, 3).getCallTarget();
         callee.call();
         callee.call();
         callee.call();
@@ -394,13 +393,13 @@ public void test01() {
                         /* 12: */Bytecode.POP,
                         /* 13: */Bytecode.RETURN};
 
-        CallTarget callee = Truffle.getRuntime().createCallTarget(new WrongLoopExitMerge("mergedLoopExitProgram", bytecodes, 1, 3));
+        CallTarget callee = new WrongLoopExitMerge("mergedLoopExitProgram", bytecodes, 1, 3).getCallTarget();
         callee.call();
         callee.call();
         callee.call();
         callee.call();
 
-        CallTarget caller = Truffle.getRuntime().createCallTarget(new Caller(callee));
+        CallTarget caller = new Caller(callee).getCallTarget();
         caller.call();
         caller.call();
         caller.call();
@@ -432,7 +431,7 @@ public void test01Caller() {
                         /* 12: */Bytecode.POP,
                         /* 13: */Bytecode.RETURN};
 
-        CallTarget callee = Truffle.getRuntime().createCallTarget(new WrongLoopExitMerge("mergedLoopExitProgram", bytecodes, 1, 3));
+        CallTarget callee = new WrongLoopExitMerge("mergedLoopExitProgram", bytecodes, 1, 3).getCallTarget();
         callee.call();
         callee.call();
         callee.call();
@@ -653,8 +652,7 @@ public void testSameValueProxy() {
                         /* 23: */Bytecode.POP,
                         /* 24: */Bytecode.RETURN};
 
-        CallTarget callee = Truffle.getRuntime().createCallTarget(
-                        new ProxySameValueOnce("proxyAtStateProgram", bytecodes, 0, 6));
+        CallTarget callee = new ProxySameValueOnce("proxyAtStateProgram", bytecodes, 0, 6).getCallTarget();
         ProxySameValueOnce.SideEffect = -1;
         callee.call();
         ProxySameValueOnce.SideEffect = 0;
@@ -883,8 +881,7 @@ public void testNoneLiveLoopExitProxy() {
                         /* 23: */Bytecode.POP,
                         /* 24: */Bytecode.RETURN};
 
-        CallTarget callee = Truffle.getRuntime().createCallTarget(
-                        new NoneLiveNoProxyTest("proxyAtStateProgram", bytecodes, 0, 6));
+        CallTarget callee = new NoneLiveNoProxyTest("proxyAtStateProgram", bytecodes, 0, 6).getCallTarget();
         ProxySameValueOnce.SideEffect = -1;
         callee.call();
         ProxySameValueOnce.SideEffect = 0;
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java
index fe4276adc33f..b8a3fca01e10 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java
@@ -24,14 +24,12 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import static org.graalvm.compiler.truffle.options.PolyglotCompilerOptions.LastTierCompilationThreshold;
 import static org.graalvm.compiler.truffle.options.PolyglotCompilerOptions.FirstTierCompilationThreshold;
+import static org.graalvm.compiler.truffle.options.PolyglotCompilerOptions.LastTierCompilationThreshold;
 
-import com.oracle.truffle.api.nodes.LoopNode;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.RepeatingNode;
 import org.graalvm.compiler.truffle.runtime.GraalCompilerDirectives;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
+import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -40,8 +38,10 @@
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
+import com.oracle.truffle.api.nodes.LoopNode;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RepeatingNode;
 import com.oracle.truffle.api.nodes.RootNode;
-import org.graalvm.polyglot.Context;
 
 public class MultiTierCompilationTest extends PartialEvaluationTest {
 
@@ -187,8 +187,8 @@ public void testDefault() {
                         "true").option("engine.FirstTierInliningPolicy", "None").option("engine.Splitting", "false").option("engine.FirstTierCompilationThreshold", "100").option(
                                         "engine.LastTierCompilationThreshold", "1000").build());
 
-        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierCalleeNode());
-        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierRootNode(calleeTarget));
+        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) new MultiTierCalleeNode().getCallTarget();
+        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) new MultiTierRootNode(calleeTarget).getCallTarget();
         final int firstTierCompilationThreshold = calleeTarget.getOptionValue(FirstTierCompilationThreshold);
         final int compilationThreshold = calleeTarget.getOptionValue(LastTierCompilationThreshold);
 
@@ -214,8 +214,8 @@ public void testFirstTierInlining() {
                         "true").option("engine.FirstTierInliningPolicy", "Default").option("engine.Splitting", "false").option("engine.FirstTierCompilationThreshold", "100").option(
                                         "engine.LastTierCompilationThreshold", "1000").build());
 
-        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierCalleeNode());
-        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierRootNode(calleeTarget));
+        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) new MultiTierCalleeNode().getCallTarget();
+        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) new MultiTierRootNode(calleeTarget).getCallTarget();
         final int firstTierCompilationThreshold = calleeTarget.getOptionValue(FirstTierCompilationThreshold);
         final int compilationThreshold = calleeTarget.getOptionValue(LastTierCompilationThreshold);
 
@@ -237,10 +237,10 @@ public void testWhenCalleeCompiledFirst() {
                         "true").option("engine.FirstTierInliningPolicy", "None").option("engine.Splitting", "false").option("engine.FirstTierCompilationThreshold", "100").option(
                                         "engine.LastTierCompilationThreshold", "1000").build());
 
-        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierCalleeNode());
+        OptimizedCallTarget calleeTarget = (OptimizedCallTarget) new MultiTierCalleeNode().getCallTarget();
         final int firstTierCompilationThreshold = calleeTarget.getOptionValue(FirstTierCompilationThreshold);
         final int compilationThreshold = calleeTarget.getOptionValue(LastTierCompilationThreshold);
-        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new MultiTierWithFrequentCalleeRootNode(calleeTarget, firstTierCompilationThreshold));
+        OptimizedCallTarget multiTierTarget = (OptimizedCallTarget) new MultiTierWithFrequentCalleeRootNode(calleeTarget, firstTierCompilationThreshold).getCallTarget();
 
         Assert.assertEquals("root:interpreter", multiTierTarget.call());
         for (int i = 0; i < firstTierCompilationThreshold - 2; i++) {
@@ -275,7 +275,7 @@ public void testLoop() {
 
         MultiTierLoopBodyNode body = new MultiTierLoopBodyNode(firstThreshold);
         final MultiTierWithLoopRootNode rootNode = new MultiTierWithLoopRootNode(body);
-        OptimizedCallTarget rootTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode);
+        OptimizedCallTarget rootTarget = (OptimizedCallTarget) rootNode.getCallTarget();
 
         Assert.assertEquals("break:interpreter", rootTarget.call());
         Assert.assertEquals("break:first-tier", rootTarget.call());
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java
index e335eb5b8564..2a233f943dbf 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java
@@ -39,7 +39,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -53,7 +52,7 @@ public void before() {
     }
 
     private static OptimizedCallTarget dummyTarget() {
-        return (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        return (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
     }
 
     @Test
@@ -94,7 +93,7 @@ public Integer apply(Integer integer) {
                 };
             }
         };
-        partialEval((OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode), new Object[]{}, CompilationIdentifier.INVALID_COMPILATION_ID);
+        partialEval((OptimizedCallTarget) rootNode.getCallTarget(), new Object[]{}, CompilationIdentifier.INVALID_COMPILATION_ID);
     }
 
     private static class TestRootNode extends RootNode {
@@ -141,7 +140,7 @@ private void expectAllOK(Supplier<RootNode> rootNodeFactory) {
     }
 
     private int getBaselineGraphNodeCount(RootNode rootNode) {
-        final OptimizedCallTarget baselineGraphTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootNode);
+        final OptimizedCallTarget baselineGraphTarget = (OptimizedCallTarget) rootNode.getCallTarget();
         final StructuredGraph baselineGraph = partialEval(baselineGraphTarget, new Object[]{}, getCompilationId(baselineGraphTarget));
         return baselineGraph.getNodeCount();
     }
@@ -149,7 +148,7 @@ private int getBaselineGraphNodeCount(RootNode rootNode) {
     @SuppressWarnings("try")
     private void peRootNode(int nodeLimit, Supplier<RootNode> rootNodeFactory) {
         setupContext(Context.newBuilder().allowAllAccess(true).allowExperimentalOptions(true).option("engine.MaximumGraalNodeCount", Integer.toString(nodeLimit)).build());
-        RootCallTarget target = Truffle.getRuntime().createCallTarget(rootNodeFactory.get());
+        RootCallTarget target = rootNodeFactory.get().getCallTarget();
         final Object[] arguments = {1};
         partialEval((OptimizedCallTarget) target, arguments, getCompilationId(target));
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java
index 3b7960d35118..e1a74b9f3eec 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java
@@ -24,13 +24,13 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.CallTarget;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.compiler.truffle.runtime.OptimizedDirectCallNode;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Cached;
@@ -124,7 +124,7 @@ protected static Object doIndirect(RootCallTarget target) {
 
     static class TwoDummiesAndAnotherNode extends SplittingTestNode {
         int counter;
-        RootCallTarget dummy = runtime.createCallTarget(new DummyRootNode());
+        RootCallTarget dummy = new DummyRootNode().getCallTarget();
 
         @Override
         public Object execute(VirtualFrame frame) {
@@ -132,7 +132,7 @@ public Object execute(VirtualFrame frame) {
                 counter++;
             } else {
                 counter = 0;
-                dummy = runtime.createCallTarget(new DummyRootNode());
+                dummy = new DummyRootNode().getCallTarget();
             }
             return dummy;
         }
@@ -140,26 +140,24 @@ public Object execute(VirtualFrame frame) {
 
     @Test
     public void testSplitsDirectCalls() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.HasInlineCacheNodeGen.create(new ReturnsFirstArgumentNode())));
-        Object[] first = new Object[]{runtime.createCallTarget(new DummyRootNode())};
-        Object[] second = new Object[]{runtime.createCallTarget(new DummyRootNode())};
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(NodeSplittingStrategyTestFactory.HasInlineCacheNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
+        Object[] first = new Object[]{new DummyRootNode().getCallTarget()};
+        Object[] second = new Object[]{new DummyRootNode().getCallTarget()};
         testSplitsDirectCallsHelper(callTarget, first, second);
 
-        callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())));
+        callTarget = (OptimizedCallTarget) new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         // two callers for a target are needed
         testSplitsDirectCallsHelper(callTarget, new Object[]{1}, new Object[]{0});
     }
 
     @Test
     public void testDoesNotSplitsDirectCalls() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(new SplittingTestRootNode(
-                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroButClassIsExcludedNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroButClassIsExcludedNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         testDoesNotSplitDirectCallHelper(callTarget, new Object[]{1}, new Object[]{0});
 
-        callTarget = (OptimizedCallTarget) runtime.createCallTarget(new SplittingTestRootNode(
-                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroButSpecializationIsExcludedNodeGen.create(new ReturnsFirstArgumentNode())));
+        callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroButSpecializationIsExcludedNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         testDoesNotSplitDirectCallHelper(callTarget, new Object[]{1}, new Object[]{0});
     }
 
@@ -188,19 +186,18 @@ public Object execute(VirtualFrame frame) {
 
     @Test
     public void testSplitPropagatesThrongSoleCallers() {
-        OptimizedCallTarget turnsPolymorphic = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget turnsPolymorphic = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         testPropagatesThroughSoleCallers(turnsPolymorphic, new Object[]{1}, new Object[]{0});
-        turnsPolymorphic = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.HasInlineCacheNodeGen.create(new ReturnsFirstArgumentNode())));
-        Object[] first = new Object[]{runtime.createCallTarget(new DummyRootNode())};
-        Object[] second = new Object[]{runtime.createCallTarget(new DummyRootNode())};
+        turnsPolymorphic = (OptimizedCallTarget) new SplittingTestRootNode(NodeSplittingStrategyTestFactory.HasInlineCacheNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
+        Object[] first = new Object[]{new DummyRootNode().getCallTarget()};
+        Object[] second = new Object[]{new DummyRootNode().getCallTarget()};
         testPropagatesThroughSoleCallers(turnsPolymorphic, first, second);
     }
 
     private void testPropagatesThroughSoleCallers(OptimizedCallTarget turnsPolymorphic, Object[] firstArgs, Object[] secondArgs) {
-        final OptimizedCallTarget callsInner = (OptimizedCallTarget) runtime.createCallTarget(new CallsInnerNode(turnsPolymorphic));
-        final OptimizedCallTarget callsCallsInner = (OptimizedCallTarget) runtime.createCallTarget(new CallsInnerNode(callsInner));
+        final OptimizedCallTarget callsInner = (OptimizedCallTarget) new CallsInnerNode(turnsPolymorphic).getCallTarget();
+        final OptimizedCallTarget callsCallsInner = (OptimizedCallTarget) new CallsInnerNode(callsInner).getCallTarget();
         // two callers for a target are needed
         runtime.createDirectCallNode(callsCallsInner);
         final DirectCallNode directCallNode = runtime.createDirectCallNode(callsCallsInner);
@@ -236,9 +233,9 @@ private void testPropagatesThroughSoleCallers(OptimizedCallTarget turnsPolymorph
 
     @Test
     public void testNoSplitsDirectCallsBecauseFirstExecution() {
-        final OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(new SplittableRootNode() {
-            @Child private OptimizedDirectCallNode callNode = (OptimizedDirectCallNode) runtime.createDirectCallNode(runtime.createCallTarget(
-                            new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode()))));
+        final OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittableRootNode() {
+            @Child private OptimizedDirectCallNode callNode = (OptimizedDirectCallNode) runtime.createDirectCallNode(
+                            new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget());
 
             @Override
             public Object execute(VirtualFrame frame) {
@@ -250,7 +247,7 @@ public Object execute(VirtualFrame frame) {
                 callNode.call(second);
                 return null;
             }
-        });
+        }.getCallTarget();
         // Multiple call nodes
         runtime.createDirectCallNode(callTarget);
         runtime.createDirectCallNode(callTarget);
@@ -262,9 +259,9 @@ public Object execute(VirtualFrame frame) {
 
     @Test
     public void testIncreaseInPolymorphism() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())));
-        final RootCallTarget outerTarget = runtime.createCallTarget(new CallsInnerNode(callTarget));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TurnsPolymorphicOnZeroNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
+        final RootCallTarget outerTarget = new CallsInnerNode(callTarget).getCallTarget();
         Object[] firstArgs = new Object[]{1};
         outerTarget.call(firstArgs);
         Assert.assertFalse("Target needs split before the node went polymorphic", getNeedsSplit(callTarget));
@@ -322,8 +319,7 @@ public Object execute(VirtualFrame frame) {
     @Test
     public void testSoloTarget() {
         final ExposesReportPolymorphicSpecializeRootNode rootNode = new ExposesReportPolymorphicSpecializeRootNode();
-        final RootCallTarget callTarget = runtime.createCallTarget(rootNode);
-        callTarget.call(noArguments);
+        rootNode.getCallTarget().call(noArguments);
         rootNode.report();
     }
 
@@ -349,10 +345,10 @@ public boolean isCloningAllowed() {
     @Test
     public void testSplitsCalledAfterSplit() {
         final CallableOnlyOnceRootNode rootNode = new CallableOnlyOnceRootNode();
-        final RootCallTarget reportsPolymorphism = runtime.createCallTarget(rootNode);
+        final RootCallTarget reportsPolymorphism = rootNode.getCallTarget();
         reportsPolymorphism.call(noArguments);
-        final RootCallTarget callsInner1 = runtime.createCallTarget(new CallsInnerNode(reportsPolymorphism));
-        final RootCallTarget callsInner2 = runtime.createCallTarget(new CallsInnerNode(reportsPolymorphism));
+        final RootCallTarget callsInner1 = new CallsInnerNode(reportsPolymorphism).getCallTarget();
+        final RootCallTarget callsInner2 = new CallsInnerNode(reportsPolymorphism).getCallTarget();
         // make sure the runtime has seen these calls
         callsInner1.call(noArguments);
         callsInner2.call(noArguments);
@@ -380,8 +376,7 @@ protected static Object doIndirect(int val) {
 
     @Test
     public void testMegamorpic() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.MegamorpicNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(NodeSplittingStrategyTestFactory.MegamorpicNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         int[] args = {1, 2, 3, 4, 5};
         testMegamorphicHelper(callTarget, args);
     }
@@ -434,8 +429,8 @@ protected static Object doIndirect(int val) {
 
     @Test
     public void testTwoMegamorpicSpec1() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TwoMegamorpicSpecNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TwoMegamorpicSpecNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         // activates the first spec 2 times than the second (megamorphic)
         int[] args = {1, 2, 3, 4, 5};
         testMegamorphicHelper(callTarget, args);
@@ -443,8 +438,8 @@ public void testTwoMegamorpicSpec1() {
 
     @Test
     public void testTwoMegamorpicSpec2() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.TwoMegamorpicSpecNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.TwoMegamorpicSpecNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         // activates the first spec 2 times than the last (megamorphic)
         int[] args = {1, 2, 4, 5, 6};
         testMegamorphicHelper(callTarget, args);
@@ -467,8 +462,8 @@ protected static Object doIndirect(int val) {
 
     @Test
     public void testPolymorphicInPolyAndMegamorpic() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.PolymorphicAndMegamorpicNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.PolymorphicAndMegamorpicNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         // activates the first spec 2 times than the last (megamorphic)
         int[] args = {1, 2, 3, 4};
         final DirectCallNode callNode1 = runtime.createDirectCallNode(callTarget);
@@ -492,8 +487,8 @@ public void testPolymorphicInPolyAndMegamorpic() {
 
     @Test
     public void testMegamorphicInPolyAndMegamorpic() {
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) runtime.createCallTarget(
-                        new SplittingTestRootNode(NodeSplittingStrategyTestFactory.PolymorphicAndMegamorpicNodeGen.create(new ReturnsFirstArgumentNode())));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) new SplittingTestRootNode(
+                        NodeSplittingStrategyTestFactory.PolymorphicAndMegamorpicNodeGen.create(new ReturnsFirstArgumentNode())).getCallTarget();
         // activates the first spec 2 times than the last (megamorphic)
         int[] args = {1, 0, 3, 4};
         final DirectCallNode callNode1 = runtime.createDirectCallNode(callTarget);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java
index c8928519a099..59633b1b2fcf 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java
@@ -107,7 +107,7 @@ protected Env createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
 
                 @Child TestInstrumentableNode loop = new TestLoopNode();
 
@@ -116,7 +116,7 @@ public Object execute(VirtualFrame frame) {
                     loop.execute(frame);
                     return "";
                 }
-            });
+            }.getCallTarget();
         }
 
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
index 61f2e5d846b7..f3c3ca4d4005 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
@@ -24,6 +24,8 @@
  */
 package org.graalvm.compiler.truffle.test;
 
+import java.util.Objects;
+
 import org.graalvm.compiler.truffle.test.ObjectsRequireNonNullPartialEvaluationTest.TestClass.InnerClass;
 import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
 import org.graalvm.compiler.truffle.test.nodes.RootTestNode;
@@ -31,12 +33,8 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
-
-import java.util.Objects;
 
 public class ObjectsRequireNonNullPartialEvaluationTest extends PartialEvaluationTest {
 
@@ -78,8 +76,7 @@ public void testNull() {
 
     private void testCommon(AbstractTestNode testNode, String testName, Object arg) {
         FrameDescriptor fd = new FrameDescriptor();
-        RootNode rootNode = new RootTestNode(fd, testName, testNode);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = new RootTestNode(fd, testName, testNode).getCallTarget();
         Assert.assertEquals(42, callTarget.call(arg));
         assertPartialEvalNoInvokes(callTarget, new Object[]{arg});
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
index 67fcc6961b86..d43fcc3e7886 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java
@@ -602,7 +602,7 @@ private static OptimizedBlockNode<TestElement> createBlock(int blockSize, int de
 
     private static OptimizedCallTarget createTest(BlockNode<?> block) {
         TestRootNode root = new TestRootNode(block, "Block[" + block.getElements().length + "]");
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
+        OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
         root.accept(new NodeVisitor() {
             @Override
             public boolean visit(Node node) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java
index c8dfd0165cbc..d845d3957f9b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java
@@ -107,7 +107,7 @@ public void testCompilationHeuristics() {
         testInvalidationCounterCompiled = 0;
         testInvalidationCounterInterpreted = 0;
         doInvalidate = false;
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 if (CompilerDirectives.inInterpreter()) {
@@ -121,7 +121,7 @@ public Object execute(VirtualFrame frame) {
                 }
                 return null;
             }
-        });
+        }.getCallTarget();
         final int compilationThreshold = target.getOptionValue(PolyglotCompilerOptions.LastTierCompilationThreshold);
         final int reprofileCount = target.getOptionValue(PolyglotCompilerOptions.ReplaceReprofileCount);
         assertTrue(compilationThreshold >= 2);
@@ -187,7 +187,7 @@ public void testRewriteAssumption() {
         final int compilationThreshold = 20;
 
         setupContext("engine.Inlining", "true", "engine.SingleTierCompilationThreshold", String.valueOf(compilationThreshold), "engine.MultiTier", "false");
-        OptimizedCallTarget innermostCallTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), testName + 0, new AbstractTestNode() {
+        OptimizedCallTarget innermostCallTarget = (OptimizedCallTarget) new RootTestNode(new FrameDescriptor(), testName + 0, new AbstractTestNode() {
             @Child private AbstractTestNode child = new ConstantTestNode(42);
             @Child private AbstractTestNode dummy = new ConstantTestNode(17);
 
@@ -200,12 +200,12 @@ public int execute(VirtualFrame frame) {
                 }
                 return child.execute(frame);
             }
-        }));
+        }).getCallTarget();
         assertEquals(compilationThreshold, (int) innermostCallTarget.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold));
 
         OptimizedCallTarget ct = innermostCallTarget;
-        ct = (OptimizedCallTarget) runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), testName + 1, new CallTestNode(ct)));
-        ct = (OptimizedCallTarget) runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), testName + 2, new CallTestNode(ct)));
+        ct = (OptimizedCallTarget) new RootTestNode(new FrameDescriptor(), testName + 1, new CallTestNode(ct)).getCallTarget();
+        ct = (OptimizedCallTarget) new RootTestNode(new FrameDescriptor(), testName + 2, new CallTestNode(ct)).getCallTarget();
         final OptimizedCallTarget outermostCallTarget = ct;
 
         assertNull("assumption is initially null", getRewriteAssumption(innermostCallTarget));
@@ -264,14 +264,14 @@ public void testCompileOnly1() {
         // test single include
 
         setupContext("engine.CompileOnly", "foobar", "engine.MultiTier", "false");
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar"));
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar").getCallTarget();
         final int compilationThreshold = target.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
         }
         assertCompiled(target);
-        target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("baz"));
+        target = (OptimizedCallTarget) new NamedRootNode("baz").getCallTarget();
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
@@ -283,14 +283,14 @@ public void testCompileOnly1() {
     public void testCompileOnly2() {
         // test single exclude
         setupContext("engine.CompileOnly", "~foobar", "engine.MultiTier", "false");
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar"));
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar").getCallTarget();
         final int compilationThreshold = target.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
         }
         assertNotCompiled(target);
-        target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("baz"));
+        target = (OptimizedCallTarget) new NamedRootNode("baz").getCallTarget();
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
@@ -302,14 +302,14 @@ public void testCompileOnly2() {
     public void testCompileOnly3() {
         // test two includes/excludes
         setupContext("engine.CompileOnly", "foo,baz", "engine.MultiTier", "false");
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar"));
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar").getCallTarget();
         final int compilationThreshold = target.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
         }
         assertCompiled(target);
-        target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("baz"));
+        target = (OptimizedCallTarget) new NamedRootNode("baz").getCallTarget();
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
             target.call();
@@ -336,10 +336,10 @@ public boolean executeRepeating(VirtualFrame frame) {
     public void testCompileOnly4() {
         // OSR should not trigger for compile-only includes
         setupContext("engine.CompileOnly", "foobar");
-        OptimizedCallTarget constant = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget constant = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         final OSRRepeatingNode repeating = new OSRRepeatingNode(constant.getOptionValue(PolyglotCompilerOptions.OSRCompilationThreshold));
         final LoopNode loop = runtime.createLoopNode(repeating);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar") {
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar") {
 
             @Child LoopNode loopChild = loop;
 
@@ -349,7 +349,7 @@ public Object execute(VirtualFrame frame) {
                 return super.execute(frame);
             }
 
-        });
+        }.getCallTarget();
         target.call();
         OptimizedCallTarget osrTarget = findOSRTarget(loop);
         if (osrTarget != null) {
@@ -367,7 +367,7 @@ public void testCompilation() {
     private void testCompilationImpl(Boolean compileOptionValue, boolean expectedCompiled) {
         String[] options = compileOptionValue == null ? new String[]{"engine.MultiTier", "false"} : new String[]{"engine.Compilation", compileOptionValue.toString(), "engine.MultiTier", "false"};
         setupContext(options);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar"));
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar").getCallTarget();
         final int compilationThreshold = target.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             assertNotCompiled(target);
@@ -399,10 +399,10 @@ private static OptimizedCallTarget findOSRTarget(Node loopNode) {
     public void testCompileOnly5() {
         // OSR should trigger if compile-only with excludes
         setupContext("engine.CompileOnly", "~foobar");
-        OptimizedCallTarget constant = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget constant = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         final OSRRepeatingNode repeating = new OSRRepeatingNode(constant.getOptionValue(PolyglotCompilerOptions.OSRCompilationThreshold));
         final LoopNode loop = runtime.createLoopNode(repeating);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(new NamedRootNode("foobar") {
+        OptimizedCallTarget target = (OptimizedCallTarget) new NamedRootNode("foobar") {
 
             @Child LoopNode loopChild = loop;
 
@@ -412,7 +412,7 @@ public Object execute(VirtualFrame frame) {
                 return super.execute(frame);
             }
 
-        });
+        }.getCallTarget();
         target.call();
         OptimizedCallTarget osrTarget = findOSRTarget(loop);
         assertCompiled(osrTarget);
@@ -430,7 +430,7 @@ public void testInCompilationRootDirective() {
         int[] innerMethod = {0};
         int[] innerBoundary = {0};
 
-        final OptimizedCallTarget innerTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget innerTarget = (OptimizedCallTarget) new RootNode(null) {
 
             @Override
             public String toString() {
@@ -462,8 +462,8 @@ void innerBoundary() {
                     innerBoundary[0] = 1;
                 }
             }
-        });
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        }.getCallTarget();
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) new RootNode(null) {
 
             @Override
             public String toString() {
@@ -497,7 +497,7 @@ void outerBoundary() {
                     outerBoundary[0]++;
                 }
             }
-        });
+        }.getCallTarget();
         final int compilationThreshold = outerTarget.getOptionValue(PolyglotCompilerOptions.LastTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             outerTarget.call();
@@ -520,8 +520,8 @@ void outerBoundary() {
     @Test
     public void testManyArguments() {
         setupContext("engine.CompileImmediately", Boolean.TRUE.toString());
-        CallTarget fortyTwo = runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), "42", new ConstantTestNode(42)));
-        OptimizedCallTarget ct = (OptimizedCallTarget) runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), "caller", new CallTestNode(fortyTwo)));
+        CallTarget fortyTwo = new RootTestNode(new FrameDescriptor(), "42", new ConstantTestNode(42)).getCallTarget();
+        OptimizedCallTarget ct = (OptimizedCallTarget) new RootTestNode(new FrameDescriptor(), "caller", new CallTestNode(fortyTwo)).getCallTarget();
         for (int i = 0; i < 3; i++) {
             ct.call(IntStream.range(0, 100000).mapToObj(Integer::valueOf).toArray());
         }
@@ -533,8 +533,8 @@ public void testNoArgumentTypeSpeculation() {
         setupContext("engine.CompileImmediately", Boolean.TRUE.toString(), "engine.CompilationFailureAction", "Throw",
                         "engine.BackgroundCompilation", Boolean.FALSE.toString(),
                         "engine.ArgumentTypeSpeculation", Boolean.FALSE.toString());
-        CallTarget fortyTwo = runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), "42", new ConstantTestNode(42)));
-        OptimizedCallTarget ct = (OptimizedCallTarget) runtime.createCallTarget(new RootTestNode(new FrameDescriptor(), "caller", new CallTestNode(fortyTwo)));
+        CallTarget fortyTwo = new RootTestNode(new FrameDescriptor(), "42", new ConstantTestNode(42)).getCallTarget();
+        OptimizedCallTarget ct = (OptimizedCallTarget) new RootTestNode(new FrameDescriptor(), "caller", new CallTestNode(fortyTwo)).getCallTarget();
         for (int i = 0; i < 3; i++) {
             ct.call(IntStream.range(0, 20).mapToObj(Integer::valueOf).toArray());
         }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java
index 7f34a7a5bcdf..b91c8542f042 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java
@@ -87,10 +87,10 @@ public static void doBefore() {
         // ensure that all classes are properly loaded
         int defaultThreshold = OSRCompilationThreshold.getDefaultValue();
         TestRootNode rootNode = new TestRootNode(defaultThreshold, DEFAULT, new TestRepeatingNode());
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         target.call(1);
         rootNode = new TestRootNode(defaultThreshold, CONFIGURED, new TestRepeatingNode());
-        target = runtime.createCallTarget(rootNode);
+        target = rootNode.getCallTarget();
         target.call(1);
     }
 
@@ -98,7 +98,7 @@ public static void doBefore() {
     @Override
     public void before() {
         setupContext("engine.MultiTier", "false");
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(0));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(0).getCallTarget();
         osrThreshold = target.getOptionValue(OSRCompilationThreshold);
     }
 
@@ -108,7 +108,7 @@ public void before() {
     @Theory
     public void testOSRSingleInvocation(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestRepeatingNode());
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         target.call(osrThreshold + 1);
         assertCompiled(rootNode.getOSRTarget());
         target.call(2);
@@ -120,7 +120,7 @@ public void testOSRSingleInvocation(OSRLoopFactory factory) {
     public void testNoInliningForLatency(OSRLoopFactory factory) {
         setupContext("engine.MultiTier", "false", "engine.Mode", "latency");
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new CallsTargetRepeatingNode(
-                        (OptimizedDirectCallNode) runtime.createDirectCallNode(runtime.createCallTarget(new RootNode(null) {
+                        (OptimizedDirectCallNode) runtime.createDirectCallNode(new RootNode(null) {
                             @Override
                             public Object execute(VirtualFrame frame) {
                                 if (CompilerDirectives.inCompiledCode() && !CompilerDirectives.inCompilationRoot()) {
@@ -128,8 +128,8 @@ public Object execute(VirtualFrame frame) {
                                 }
                                 return 42;
                             }
-                        }))));
-        CallTarget target = runtime.createCallTarget(rootNode);
+                        }.getCallTarget())));
+        CallTarget target = rootNode.getCallTarget();
         target.call(osrThreshold + 1);
         assertCompiled(rootNode.getOSRTarget());
     }
@@ -139,7 +139,7 @@ public Object execute(VirtualFrame frame) {
     public void testOSRAndRewriteDoesNotSuppressTargetCompilation(OSRLoopFactory factory) {
         setupContext("engine.SingleTierCompilationThreshold", "3");
         TestRootNodeWithReplacement rootNode = new TestRootNodeWithReplacement(osrThreshold, factory, new TestRepeatingNode());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         target.call(osrThreshold + 1);
         assertCompiled(rootNode.getOSRTarget());
         assertNotCompiled(target);
@@ -175,7 +175,7 @@ public boolean executeRepeating(VirtualFrame frame) {
         }
 
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TransferToInterpreterTestRepeatingNode());
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         target.call(osrThreshold + 1);
         try {
             // Invalidation is asynchronous.
@@ -192,7 +192,7 @@ public boolean executeRepeating(VirtualFrame frame) {
     @Theory
     public void testNonOSR(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestRepeatingNode());
-        runtime.createCallTarget(rootNode).call(osrThreshold);
+        rootNode.getCallTarget().call(osrThreshold);
         assertNotCompiled(rootNode.getOSRTarget());
     }
 
@@ -251,7 +251,7 @@ public Object execute(VirtualFrame frame) {
     @Theory
     public void testNoInvalidationWithoutFirstExecution(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestRepeatingNode());
-        RootCallTarget target = runtime.createCallTarget(rootNode);
+        RootCallTarget target = rootNode.getCallTarget();
         rootNode.forceOSR();
         assertCompiled(rootNode.getOSRTarget());
         target.call(1); // should not invalidate OSR
@@ -302,7 +302,7 @@ public void testExternalInvalidations(OSRLoopFactory factory) {
     public void testInternalInvalidations(OSRLoopFactory factory) {
         TestRepeatingNode repeating = new TestRepeatingNode();
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, repeating);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         target.call(osrThreshold + 1);
         target.resetCompilationProfile();
         assertCompiled(rootNode.getOSRTarget());
@@ -321,7 +321,7 @@ public void testInternalInvalidations(OSRLoopFactory factory) {
     public void testOuterInvalidationTriggersOSR(OSRLoopFactory factory) {
         TestRepeatingNode repeating = new TestRepeatingNode();
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, repeating);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
 
         // compile inner
         target.call(osrThreshold + 1);
@@ -366,7 +366,7 @@ public void testOuterInvalidationTriggersOSR(OSRLoopFactory factory) {
     @Theory
     public void testNoOSRAfterMinInvocationThreshold(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestRepeatingNode());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         int i;
         for (i = 0; i < target.getOptionValue(MinInvokeThreshold); i++) {
             target.call(0);
@@ -382,7 +382,7 @@ public void testNoOSRAfterMinInvocationThreshold(OSRLoopFactory factory) {
     @Theory
     public void testOSRMinInvocationThresholdPropagateLoopCounts(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestRepeatingNode());
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         int thresholdForOsr = this.osrThreshold;
         int truffleMinInvokes = target.getOptionValue(MinInvokeThreshold);
 
@@ -429,7 +429,7 @@ public void testThreadSafety(OSRLoopFactory factory) {
     @Theory
     public void testTwoLoopsSilblings(OSRLoopFactory factory) {
         TwoSilblingLoopNodesTest rootNode = new TwoSilblingLoopNodesTest(osrThreshold, factory, new TestRepeatingNode(), new TestRepeatingNode());
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         target.call(osrThreshold + 1, 1);
         waitForCompiled(rootNode.getOSRTarget());
         waitForCompiled(rootNode.getOSRTarget2());
@@ -474,7 +474,7 @@ public void testTwoLoopsParentChild1(OSRLoopFactory factory) {
             return null;
         });
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, childLoop);
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
 
         target.call(1, osrThreshold);
         assertCompiled(rootNode.getOSRTarget());
@@ -488,7 +488,7 @@ public void testTwoLoopsParentChild2(OSRLoopFactory factory) {
             return null;
         });
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, childLoop);
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
 
         target.call(1, osrThreshold + 1);
         assertCompiled(rootNode.getOSRTarget());
@@ -534,32 +534,32 @@ public boolean executeRepeating(VirtualFrame frame) {
     @Theory
     public void testCustomLoopContributingToOSR1(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new CustomInnerLoopRepeatingNode());
-        runtime.createCallTarget(rootNode).call(10, osrThreshold / 10 - 1); // triggers
+        rootNode.getCallTarget().call(10, osrThreshold / 10 - 1); // triggers
         assertNotCompiled(rootNode.getOSRTarget());
-        runtime.createCallTarget(rootNode).call(10, osrThreshold / 10); // triggers
+        rootNode.getCallTarget().call(10, osrThreshold / 10); // triggers
         assertCompiled(rootNode.getOSRTarget());
     }
 
     @Theory
     public void testCustomLoopContributingToOSR2(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new CustomInnerLoopRepeatingNode());
-        runtime.createCallTarget(rootNode).call(1, osrThreshold - 1);
+        rootNode.getCallTarget().call(1, osrThreshold - 1);
         assertNotCompiled(rootNode.getOSRTarget());
-        runtime.createCallTarget(rootNode).call(1, osrThreshold);
+        rootNode.getCallTarget().call(1, osrThreshold);
         assertCompiled(rootNode.getOSRTarget());
     }
 
     @Theory
     public void testCustomLoopContributingToOSR3(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new CustomInnerLoopRepeatingNode());
-        runtime.createCallTarget(rootNode).call(2, osrThreshold / 2);
+        rootNode.getCallTarget().call(2, osrThreshold / 2);
         assertCompiled(rootNode.getOSRTarget());
     }
 
     @Theory
     public void testCustomLoopContributingToOSR4(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new CustomInnerLoopRepeatingNode());
-        runtime.createCallTarget(rootNode).call(2, osrThreshold / 2 - 1);
+        rootNode.getCallTarget().call(2, osrThreshold / 2 - 1);
         assertNotCompiled(rootNode.getOSRTarget());
     }
 
@@ -592,7 +592,7 @@ public boolean executeRepeating(VirtualFrame frame) {
     @Theory
     public void testStackTraceDoesNotShowOSR(OSRLoopFactory factory) {
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, new TestOSRStackTrace());
-        CallTarget target = runtime.createCallTarget(rootNode);
+        CallTarget target = rootNode.getCallTarget();
         target.call(1);
         rootNode.forceOSR();
         assertCompiled(rootNode.getOSRTarget());
@@ -608,7 +608,7 @@ public void testStackTraceDoesNotShowOSR(OSRLoopFactory factory) {
     public void testStackFrameNodes(OSRLoopFactory factory) {
         TestOSRStackTraceFromAbove testOSRStackTrace = new TestOSRStackTraceFromAbove();
         TestRootNode rootNode = new TestRootNode(osrThreshold, factory, testOSRStackTrace);
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         rootNode.forceOSR();
         target.call(1);
     }
@@ -663,7 +663,7 @@ public Object execute(VirtualFrame frame) {
                     return null;
                 }
             };
-            callNode = runtime.createDirectCallNode(runtime.createCallTarget(root));
+            callNode = runtime.createDirectCallNode(root.getCallTarget());
             adoptChildren();
             callNode.call(new Object[]{});
         }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java
index 9aec32e8fa0c..9bbab932c46b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java
@@ -33,7 +33,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.RootNode;
 
 public class OverrideOptionsTest extends TruffleCompilerImplTest {
@@ -43,7 +42,7 @@ public class OverrideOptionsTest extends TruffleCompilerImplTest {
     public void testOverrideOptionsUsingContext() {
         setupContext(Context.newBuilder().allowAllAccess(true).allowExperimentalOptions(true).option("engine.BackgroundCompilation", Boolean.FALSE.toString()).option("engine.CompileImmediately",
                         Boolean.TRUE.toString()).build());
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         OptionValues values = TruffleCompilerImpl.getOptionsForCompiler(GraalTruffleRuntime.getOptionsForCompiler(callTarget));
         Assert.assertEquals(false, values.get(PolyglotCompilerOptions.BackgroundCompilation));
         Assert.assertEquals(true, values.get(PolyglotCompilerOptions.CompileImmediately));
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java
index 979ed8df577b..106d63a22a00 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java
@@ -54,7 +54,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -92,7 +91,7 @@ protected final CompilationIdentifier getCompilationId(final RootCallTarget comp
     }
 
     protected OptimizedCallTarget compileHelper(String methodName, RootNode root, Object[] arguments) {
-        final OptimizedCallTarget compilable = (OptimizedCallTarget) (Truffle.getRuntime()).createCallTarget(root);
+        final OptimizedCallTarget compilable = (OptimizedCallTarget) root.getCallTarget();
         CompilationIdentifier compilationId = getCompilationId(compilable);
         StructuredGraph graph = partialEval(compilable, arguments, compilationId);
         this.lastCompilationResult = getTruffleCompiler(compilable).compilePEGraph(graph, methodName, null, compilable, asCompilationRequest(compilationId), null,
@@ -120,8 +119,8 @@ protected OptimizedCallTarget assertPartialEvalEquals(RootNode expected, RootNod
     }
 
     protected OptimizedCallTarget assertPartialEvalEquals(RootNode expected, RootNode actual, Object[] arguments, boolean checkConstants) {
-        final OptimizedCallTarget expectedTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(expected);
-        final OptimizedCallTarget actualTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(actual);
+        final OptimizedCallTarget expectedTarget = (OptimizedCallTarget) expected.getCallTarget();
+        final OptimizedCallTarget actualTarget = (OptimizedCallTarget) actual.getCallTarget();
 
         BailoutException lastBailout = null;
         for (int i = 0; i < 10; i++) {
@@ -184,8 +183,7 @@ protected void assertPartialEvalNoInvokes(RootNode root) {
     }
 
     protected void assertPartialEvalNoInvokes(RootNode root, Object[] arguments) {
-        CallTarget callTarget = Truffle.getRuntime().createCallTarget(root);
-        assertPartialEvalNoInvokes(callTarget, arguments);
+        assertPartialEvalNoInvokes(root.getCallTarget(), arguments);
     }
 
     protected void assertPartialEvalNoInvokes(CallTarget callTarget, Object[] arguments) {
@@ -196,7 +194,7 @@ protected void assertPartialEvalNoInvokes(CallTarget callTarget, Object[] argume
     }
 
     protected StructuredGraph partialEval(RootNode root, Object... arguments) {
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(root);
+        OptimizedCallTarget target = (OptimizedCallTarget) root.getCallTarget();
         return partialEval(target, arguments);
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java
index 7dba5e5cac36..957582b08762 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java
@@ -130,9 +130,8 @@ private void testHelper(RootNode rootNode, boolean expectException, String... ou
         // Compile and capture output to logger's stream.
         boolean seenException = false;
         try {
-            GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-            OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
-            DebugContext debug = new Builder(runtime.getGraalOptions(OptionValues.class)).build();
+            OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
+            DebugContext debug = new Builder(GraalTruffleRuntime.getRuntime().getGraalOptions(OptionValues.class)).build();
             try (DebugCloseable d = debug.disableIntercept(); DebugContext.Scope s = debug.scope("PerformanceWarningTest")) {
                 final OptimizedCallTarget compilable = target;
                 CompilationIdentifier compilationId = getTruffleCompiler(target).createCompilationIdentifier(compilable);
@@ -444,13 +443,12 @@ protected class TrivialCallsInnerNode extends RootNode {
 
         public TrivialCallsInnerNode() {
             super(null);
-            final GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-            this.callNode = (OptimizedDirectCallNode) runtime.createDirectCallNode(runtime.createCallTarget(new RootNode(null) {
+            this.callNode = (OptimizedDirectCallNode) GraalTruffleRuntime.getRuntime().createDirectCallNode(new RootNode(null) {
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return 0;
                 }
-            }));
+            }.getCallTarget());
         }
 
         @Override
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java
index 07f9c201afcb..36beeed03a5a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java
@@ -31,7 +31,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
@@ -48,7 +47,7 @@ public void ifPhiStamp() {
         FrameDescriptor fd = new FrameDescriptor();
         AbstractTestNode result = new IfPhiStampTestNode();
         RootNode rootNode = new RootTestNode(fd, "ifPhiStamp", result);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        RootCallTarget callTarget = rootNode.getCallTarget();
         callTarget.call(new Object[]{true});
         callTarget.call(new Object[]{false});
         new D().get(); // ensure method cannot be statically bound without receiver type info
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java
index c101fb443c2f..f485882432f9 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java
@@ -33,7 +33,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.sl.runtime.SLContext;
 import com.oracle.truffle.sl.runtime.SLFunction;
@@ -54,7 +53,7 @@ public void testCompilationThreshold() {
         Assert.assertEquals(2, SLFunction.INLINE_CACHE_SIZE);
 
         // doWhile must run isolated and should not affect other compilation thresholds
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         Runnable doWhile = () -> testCompilationThreshold(50, "50", null);
         testCompilationThreshold(42, "42", doWhile); // test default value
         testCompilationThreshold(target.getOptionValue(PolyglotCompilerOptions.LastTierCompilationThreshold), null, doWhile);
@@ -69,7 +68,7 @@ public void testPolyglotCompilerOptionsAreUsed() {
                         "engine.Inlining", "false", //
                         "engine.Splitting", "false", //
                         "engine.Mode", "latency");
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         Assert.assertEquals(27, (int) target.getOptionValue(PolyglotCompilerOptions.LastTierCompilationThreshold));
         Assert.assertEquals(true, target.getOptionValue(PolyglotCompilerOptions.TraceCompilation));
         Assert.assertEquals(true, target.getOptionValue(PolyglotCompilerOptions.TraceCompilationDetails));
@@ -83,7 +82,7 @@ public void testEngineModeLatency() {
         Assert.assertEquals(OptionStability.STABLE, Engine.create().getOptions().get("engine.Mode").getStability());
 
         setupContext("engine.Mode", "latency");
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         Assert.assertEquals(PolyglotCompilerOptions.EngineModeEnum.LATENCY, target.getOptionValue(PolyglotCompilerOptions.Mode));
         Assert.assertEquals(true, target.engine.inlining);
         Assert.assertEquals(false, target.engine.splitting);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java
index 8300eef3a54d..c047c8935d72 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java
@@ -221,7 +221,7 @@ private void testCompilation(BaseNode testedCode, LoopNode loopNode, DetectInval
             protected synchronized CallTarget parse(ParsingRequest request) throws Exception {
                 com.oracle.truffle.api.source.Source source = request.getSource();
                 if (target == null) {
-                    target = Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    target = new RootNode(languageInstance) {
 
                         @Node.Child private volatile BaseNode child = testedCode;
 
@@ -235,7 +235,7 @@ public SourceSection getSourceSection() {
                             return source.createSection(1);
                         }
 
-                    });
+                    }.getCallTarget();
                 }
                 return target;
             }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java
index eedef1736e4b..c50416c0c9ee 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java
@@ -83,7 +83,7 @@ public void onEnterThread(TruffleContext c) {
         compiledEnter.set(Boolean.FALSE);
         compiledLeave.set(Boolean.FALSE);
 
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new RootNode(null) {
+        OptimizedCallTarget target = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 TruffleContext tc = (TruffleContext) frame.getArguments()[0];
@@ -104,7 +104,7 @@ public Object execute(VirtualFrame frame) {
                 }
                 return null;
             }
-        });
+        }.getCallTarget();
         TruffleContext tc = LanguageContext.get(null).getEnv().getContext();
         singleContext.invalidate();
         target.call(tc);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java
index 11073a2a1eb8..b1b700712501 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java
@@ -24,11 +24,6 @@
  */
 package org.graalvm.compiler.truffle.test;
 
-import com.oracle.truffle.api.Assumption;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.RootNode;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -47,6 +42,7 @@
 import java.util.logging.LogRecord;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import org.graalvm.compiler.test.SubprocessUtil;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode;
@@ -55,6 +51,12 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.RootNode;
+
 public class TraceCompilationTest extends TestWithPolyglotOptions {
 
     private static final String CONFIGURED_PROPERTY = ExceptionActionTest.class.getSimpleName() + ".configured";
@@ -130,7 +132,7 @@ public void testNoEngineTracingOn() throws Exception {
             PrintStream origSystemErr = System.err;
             ByteArrayOutputStream rawStdErr = new ByteArrayOutputStream();
             System.setErr(new PrintStream(rawStdErr, true, "UTF-8"));
-            OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(10));
+            OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(10).getCallTarget();
             target.call();
             System.setErr(origSystemErr);
             String strStdErr = rawStdErr.toString("UTF-8");
@@ -249,10 +251,10 @@ private void testHelper(Supplier<RootNode> rootProvider, Map<String, String> add
             }
             TestHandler handler = builder.build();
             setupContext(newContextBuilder(additionalOptions, handler));
-            OptimizedCallTarget warmUpTarget = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootProvider.get());
+            OptimizedCallTarget warmUpTarget = (OptimizedCallTarget) rootProvider.get().getCallTarget();
             warmUpTarget.call();
             handler.start();
-            OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(rootProvider.get());
+            OptimizedCallTarget target = (OptimizedCallTarget) rootProvider.get().getCallTarget();
             target.call();
             handler.assertLogs();
             return null;
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java
index 43de7e5ab98a..9901472094a1 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java
@@ -53,7 +53,7 @@ public void setup() {
     public void test() {
         RootNode rootNode = new TestRootNode();
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget target = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        OptimizedCallTarget target = (OptimizedCallTarget) rootNode.getCallTarget();
         target.call(0);
         Assert.assertFalse(target.isValid());
         final OptimizedCallTarget compilable = target;
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
index 1bc7432aa743..6307b305fdd3 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
@@ -95,7 +95,7 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier) {
 
         setupContext("engine.InvalidationReprofileCount", "0", "engine.MultiTier", "false");
         DeoptCountingExceptionOverBoundaryRootNode rootNode = new DeoptCountingExceptionOverBoundaryRootNode();
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) rootNode.getCallTarget();
 
         final int compilationThreshold = outerTarget.getOptionValue(SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
@@ -159,7 +159,7 @@ public void throwExceptionBoundary() {
         }
 
         DeoptCountingExceptionOverBoundaryRootNode rootNode = new DeoptCountingExceptionOverBoundaryRootNode();
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) rootNode.getCallTarget();
         final int compilationThreshold = outerTarget.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             outerTarget.call();
@@ -208,7 +208,7 @@ public void throwExceptionBoundary() {
         }
 
         DeoptCountingExceptionOverBoundaryRootNode rootNode = new DeoptCountingExceptionOverBoundaryRootNode();
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) rootNode.getCallTarget();
         final int compilationThreshold = outerTarget.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         final int invalidationReprofileCount = outerTarget.getOptionValue(PolyglotCompilerOptions.InvalidationReprofileCount);
 
@@ -278,7 +278,7 @@ public void throwExceptionBoundary() {
         }
 
         DeoptCountingExceptionOverBoundaryRootNode rootNode = new DeoptCountingExceptionOverBoundaryRootNode();
-        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) runtime.createCallTarget(rootNode);
+        final OptimizedCallTarget outerTarget = (OptimizedCallTarget) rootNode.getCallTarget();
         final int compilationThreshold = outerTarget.getOptionValue(PolyglotCompilerOptions.SingleTierCompilationThreshold);
         for (int i = 0; i < compilationThreshold; i++) {
             try {
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java
index bbc694251992..05b207125e46 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java
@@ -34,17 +34,10 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
 public class TruffleBoundaryInliningTest extends PartialEvaluationTest {
-    private TruffleRuntime runtime;
-
-    public TruffleBoundaryInliningTest() {
-        this.runtime = Truffle.getRuntime();
-    }
 
     private static RootNode createRootNodeAllowInline() {
         return new RootNode(null) {
@@ -78,10 +71,10 @@ void testMethod() {
 
     private void runTest() {
         RootNode n1 = createRootNodeAllowInline();
-        RootCallTarget c1 = runtime.createCallTarget(n1);
+        RootCallTarget c1 = n1.getCallTarget();
         StructuredGraph allowInline = partialEval((OptimizedCallTarget) c1, new Object[]{}, getCompilationId(c1));
         RootNode n2 = createRootNodeNoInline();
-        RootCallTarget c2 = runtime.createCallTarget(n2);
+        RootCallTarget c2 = n2.getCallTarget();
         StructuredGraph noInline = partialEval((OptimizedCallTarget) c2, new Object[]{}, getCompilationId(c2));
         checkHasTestMethod(allowInline);
         checkHasTestMethod(noInline);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java
index e4649441b876..d5e6354a9901 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java
@@ -37,7 +37,6 @@
 import org.junit.Assume;
 import org.junit.Before;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.nodes.RootNode;
 
@@ -59,8 +58,7 @@ protected TruffleCompilerImplTest() {
     @Before
     public void onlyWhiteBox() {
         if (TruffleOptions.AOT) {
-            GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-            TruffleCompiler compiler = runtime.getTruffleCompiler((OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(42)));
+            TruffleCompiler compiler = GraalTruffleRuntime.getRuntime().getTruffleCompiler((OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget());
             Assume.assumeTrue("cannot get whitebox interface to Truffle compiler", compiler instanceof TruffleCompilerImpl);
             this.truffleCompiler = (TruffleCompilerImpl) compiler;
         }
@@ -75,7 +73,7 @@ protected final TruffleCompilerImpl getTruffleCompiler(OptimizedCallTarget callT
 
     @Override
     protected CompilationIdentifier createCompilationId() {
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget target = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         return getTruffleCompiler(target).createCompilationIdentifier(target);
     }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java
index 0bde080447b0..09d82acfb3fc 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java
@@ -49,7 +49,7 @@ public boolean isCloningAllowed() {
                 return true;
             }
         };
-        final CallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
+        final CallTarget callTarget = rootNode.getCallTarget();
         final DirectCallNode callNode = Truffle.getRuntime().createDirectCallNode(callTarget);
 
         assertTrue(callNode.isCallTargetCloningAllowed());
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java
index a55b440f0ba1..e912b979dfa6 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java
@@ -78,14 +78,14 @@ static RootTestNode createCallerChain(int framesAbove, int framesBelow, NodeFact
         AbstractTestNode calleeNode = factory.createThrowNode(-1, true);
         RootTestNode calleeRoot = new RootTestNode(fd, "testTruffleException", calleeNode);
         for (int i = 0; i < framesAbove; i++) {
-            AbstractTestNode call = new CallTestNode(Truffle.getRuntime().createCallTarget(calleeRoot));
+            AbstractTestNode call = new CallTestNode(calleeRoot.getCallTarget());
             calleeRoot = new RootTestNode(fd, "testTruffleException", call);
         }
-        AbstractTestNode callerNode = new CallTestNode(Truffle.getRuntime().createCallTarget(calleeRoot));
+        AbstractTestNode callerNode = new CallTestNode(calleeRoot.getCallTarget());
         AbstractTestNode catchNode = factory.createCatchNode(callerNode);
         RootTestNode callerRoot = new RootTestNode(fd, "testTruffleException", catchNode);
         for (int i = 0; i < framesBelow; i++) {
-            AbstractTestNode call = new CallTestNode(Truffle.getRuntime().createCallTarget(callerRoot));
+            AbstractTestNode call = new CallTestNode(callerRoot.getCallTarget());
             callerRoot = new RootTestNode(fd, "testTruffleException", call);
         }
         return callerRoot;
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java
index 81e2a11d4a27..21edbeb5be44 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java
@@ -30,7 +30,6 @@
 
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.OptimizedCallTarget;
 import org.graalvm.compiler.truffle.test.TruffleReturnBoxedParameterTestFactory.IntNodeFactory;
 import org.junit.Test;
@@ -142,7 +141,7 @@ static <E extends VNode> E createNode(NodeFactory<E> factory, boolean prefixCons
     @Test
     public void testBox() throws Throwable {
         TestRootNode<IntNode> node = createRoot(IntNodeFactory.getInstance());
-        OptimizedCallTarget callTarget = (OptimizedCallTarget) GraalTruffleRuntime.getRuntime().createCallTarget(node);
+        OptimizedCallTarget callTarget = (OptimizedCallTarget) node.getCallTarget();
         StructuredGraph g = partialEval(callTarget, new Object[]{1});
         compile(callTarget, g);
         // no box foreign call to allocation snippet after box optimization
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
index 3a37bd9050cf..8b67c1b2d5c4 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
@@ -47,7 +47,7 @@ public class TruffleToTruffleCallExceptionHandlerTest extends PartialEvaluationT
 
     private static final class Compilables {
 
-        final OptimizedCallTarget calleeNoException = (OptimizedCallTarget) GraalTruffleRuntime.getRuntime().createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget calleeNoException = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 return null;
@@ -57,9 +57,9 @@ public Object execute(VirtualFrame frame) {
             public String toString() {
                 return "CALLEE_NO_EXCEPTION";
             }
-        });
+        }.getCallTarget();
 
-        final OptimizedCallTarget callerNoException = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget callerNoException = (OptimizedCallTarget) new RootNode(null) {
 
             @Child protected DirectCallNode callNode = runtime.createDirectCallNode(calleeNoException);
 
@@ -73,9 +73,9 @@ public Object execute(VirtualFrame frame) {
             public String toString() {
                 return "CALLER_NO_EXCEPTION";
             }
-        });
+        }.getCallTarget();
 
-        final OptimizedCallTarget calleeWithException = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget calleeWithException = (OptimizedCallTarget) new RootNode(null) {
             @Override
             public Object execute(VirtualFrame frame) {
                 throw new RuntimeException();
@@ -85,9 +85,9 @@ public Object execute(VirtualFrame frame) {
             public String toString() {
                 return "CALLEE_EXCEPTION";
             }
-        });
+        }.getCallTarget();
 
-        final OptimizedCallTarget callerWithException = (OptimizedCallTarget) runtime.createCallTarget(new RootNode(null) {
+        final OptimizedCallTarget callerWithException = (OptimizedCallTarget) new RootNode(null) {
 
             @Child protected DirectCallNode callNode = runtime.createDirectCallNode(calleeWithException);
 
@@ -101,7 +101,7 @@ public Object execute(VirtualFrame frame) {
             public String toString() {
                 return "CALLER_EXCEPTION";
             }
-        });
+        }.getCallTarget();
     }
 
     @Test
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java
index 2b890f7faba4..91508729a46f 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java
@@ -29,7 +29,6 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.UnsupportedSpecializationException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
@@ -45,7 +44,7 @@ public class UnrollLoopBlockDuplicationTest extends TestWithSynchronousCompiling
      */
     @Test
     public void testBlockDuplication() {
-        OptimizedCallTarget target = (OptimizedCallTarget) Truffle.getRuntime().createCallTarget(new ObjectCacheTestRootNode());
+        OptimizedCallTarget target = (OptimizedCallTarget) new ObjectCacheTestRootNode().getCallTarget();
         AbstractType value1 = new ConcreteType1();
         AbstractType value2 = new ConcreteType2();
         target.call(value1);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java
index 04e1a4042688..007d7fd36fbd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java
@@ -34,7 +34,6 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -80,8 +79,7 @@ public static class ExcludePatternTestLanguage extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            final TruffleRuntime runtime = Truffle.getRuntime();
-            final RootCallTarget rootCallTarget = runtime.createCallTarget(new RootNode(this) {
+            final RootCallTarget rootCallTarget = new RootNode(this) {
 
                 @Override
                 public String toString() {
@@ -98,10 +96,10 @@ public Object execute(VirtualFrame frame) {
                 public String getName() {
                     return METHOD_EXCLUDED_FROM_INLINING;
                 }
-            });
-            return runtime.createCallTarget(new RootNode(this) {
+            }.getCallTarget();
+            return new RootNode(this) {
 
-                @Child DirectCallNode callNode = runtime.createDirectCallNode(rootCallTarget);
+                @Child DirectCallNode callNode = Truffle.getRuntime().createDirectCallNode(rootCallTarget);
 
                 @Override
                 public String toString() {
@@ -117,7 +115,7 @@ public String getName() {
                 public Object execute(VirtualFrame frame) {
                     return callNode.call();
                 }
-            });
+            }.getCallTarget();
         }
     }
 
@@ -128,8 +126,7 @@ public static class InlineSelectedMethodsTestLanguage extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            final TruffleRuntime runtime = Truffle.getRuntime();
-            final RootCallTarget rootCallTarget = runtime.createCallTarget(new RootNode(this) {
+            final RootCallTarget rootCallTarget = new RootNode(this) {
 
                 @Override
                 public String toString() {
@@ -153,10 +150,10 @@ private void assertFalse(boolean inCompilationRoot) {
                 public String getName() {
                     return METHOD_INLINED;
                 }
-            });
-            return runtime.createCallTarget(new RootNode(this) {
+            }.getCallTarget();
+            return new RootNode(this) {
 
-                @Child DirectCallNode callNode = runtime.createDirectCallNode(rootCallTarget);
+                @Child DirectCallNode callNode = Truffle.getRuntime().createDirectCallNode(rootCallTarget);
 
                 @Override
                 public String toString() {
@@ -172,7 +169,7 @@ public String getName() {
                 public Object execute(VirtualFrame frame) {
                     return callNode.call();
                 }
-            });
+            }.getCallTarget();
         }
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java
index f8269c684480..f4cfe1d567f7 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java
@@ -32,7 +32,6 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.TruffleRuntime;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -71,8 +70,7 @@ public static class InliningTestLanguage extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            final TruffleRuntime runtime = Truffle.getRuntime();
-            final RootCallTarget mustNotInline = runtime.createCallTarget(new RootNode(this) {
+            final RootCallTarget mustNotInline = new RootNode(this) {
 
                 @Override
                 public String toString() {
@@ -84,10 +82,10 @@ public Object execute(VirtualFrame frame) {
                     CompilerDirectives.bailout("This node should not be inlined");
                     return 42;
                 }
-            });
-            return runtime.createCallTarget(new RootNode(this) {
+            }.getCallTarget();
+            return new RootNode(this) {
 
-                @Child DirectCallNode callNode = runtime.createDirectCallNode(mustNotInline);
+                @Child DirectCallNode callNode = Truffle.getRuntime().createDirectCallNode(mustNotInline);
 
                 @Override
                 public String toString() {
@@ -103,7 +101,7 @@ public String getName() {
                 public Object execute(VirtualFrame frame) {
                     return callNode.call();
                 }
-            });
+            }.getCallTarget();
         }
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
index 2a9429f5a632..3b12a9715dd7 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
@@ -90,7 +90,7 @@ private static List<String> makeSilent(List<? extends String> vmArgs) {
     private void testMergedStackTraceImpl() throws Exception {
         setupContext("engine.CompilationExceptionsAreThrown", Boolean.TRUE.toString(), "engine.CompilationExceptionsAreFatal", Boolean.FALSE.toString());
         GraalTruffleRuntime runtime = GraalTruffleRuntime.getRuntime();
-        OptimizedCallTarget compilable = (OptimizedCallTarget) runtime.createCallTarget(RootNode.createConstantNode(42));
+        OptimizedCallTarget compilable = (OptimizedCallTarget) RootNode.createConstantNode(42).getCallTarget();
         TruffleCompiler compiler = runtime.getTruffleCompiler(compilable);
         try (TruffleCompilation compilation = compiler.openCompilation(compilable)) {
             try (TruffleDebugContext debug = compiler.openDebugContext(GraalTruffleRuntime.getOptionsForCompiler(compilable), compilation)) {

From d1ecd9edf431795103e6746e54bb7173c2437235 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:55:58 +0200
Subject: [PATCH 186/681] Avoid createCallTarget() in Espresso.

---
 .../oracle/truffle/espresso/EspressoLanguage.java    |  7 +++----
 .../src/com/oracle/truffle/espresso/impl/Method.java | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
index b6f055f118d4..61166a8a1951 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
@@ -32,7 +32,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.instrumentation.ProvidedTags;
@@ -180,15 +179,15 @@ protected CallTarget parse(final ParsingRequest request) throws Exception {
         String contents = request.getSource().getCharacters().toString();
         if (DestroyVMNode.EVAL_NAME.equals(contents)) {
             RootNode node = new DestroyVMNode(this);
-            return Truffle.getRuntime().createCallTarget(node);
+            return node.getCallTarget();
         }
         if (ExitCodeNode.EVAL_NAME.equals(contents)) {
             RootNode node = new ExitCodeNode(this);
-            return Truffle.getRuntime().createCallTarget(node);
+            return node.getCallTarget();
         }
         if (GetBindingsNode.EVAL_NAME.equals(contents)) {
             RootNode node = new GetBindingsNode(this);
-            return Truffle.getRuntime().createCallTarget(node);
+            return node.getCallTarget();
         }
         throw new UnsupportedOperationException("Unsupported operation. Use the language bindings to load classes e.g. context.getBindings(\"" + ID + "\").getMember(\"java.lang.Integer\")");
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
index b6b86f7830cc..e28d1e17354b 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java
@@ -460,7 +460,7 @@ private CallTarget lookupLibJavaCallTarget() {
                 // Look in libjava
                 TruffleObject nativeMethod = lookupAndBind(getVM().getJavaLibrary(), mangledName);
                 if (nativeMethod != null) {
-                    return Truffle.getRuntime().createCallTarget(EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, getMethodVersion())));
+                    return EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, getMethodVersion())).getCallTarget();
                 }
             }
         }
@@ -473,7 +473,7 @@ private CallTarget lookupAgents() {
             String mangledName = Mangle.mangleMethod(this, withSignature);
             TruffleObject nativeMethod = getContext().bindToAgent(this, mangledName);
             if (nativeMethod != null) {
-                return Truffle.getRuntime().createCallTarget(EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, getMethodVersion())));
+                return EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, getMethodVersion())).getCallTarget();
             }
         }
         return null;
@@ -499,7 +499,7 @@ private CallTarget lookupJniCallTarget(Method findNative, boolean fullSignature)
         }
         TruffleObject symbol = getVM().getFunction(handle);
         TruffleObject nativeMethod = bind(symbol);
-        return Truffle.getRuntime().createCallTarget(EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, this.getMethodVersion())));
+        return EspressoRootNode.create(null, new NativeMethodNode(nativeMethod, this.getMethodVersion())).getCallTarget();
     }
 
     public boolean isConstructor() {
@@ -975,7 +975,7 @@ public Method forceSplit() {
         Method result = new Method(this, getCodeAttribute());
         FrameDescriptor frameDescriptor = new FrameDescriptor();
         EspressoRootNode root = EspressoRootNode.create(frameDescriptor, new BytecodeNode(result.getMethodVersion(), frameDescriptor));
-        result.getMethodVersion().callTarget = Truffle.getRuntime().createCallTarget(root);
+        result.getMethodVersion().callTarget = root.getCallTarget();
         return result;
     }
 
@@ -1362,7 +1362,7 @@ private CallTarget getCallTarget(boolean initKlass) {
                      */
                     EspressoRootNode redirectedMethod = getSubstitutions().get(getMethod());
                     if (redirectedMethod != null) {
-                        callTarget = Truffle.getRuntime().createCallTarget(redirectedMethod);
+                        callTarget = redirectedMethod.getCallTarget();
                         return callTarget;
                     }
 
@@ -1416,7 +1416,7 @@ private CallTarget findCallTarget() {
                 }
                 FrameDescriptor frameDescriptor = new FrameDescriptor();
                 EspressoRootNode rootNode = EspressoRootNode.create(frameDescriptor, new BytecodeNode(this, frameDescriptor));
-                target = Truffle.getRuntime().createCallTarget(rootNode);
+                target = rootNode.getCallTarget();
             }
             return target;
         }

From 3e85ffdc5594f30329955779943315536714e80e Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:56:05 +0200
Subject: [PATCH 187/681] Avoid createCallTarget() in Sulong.

---
 .../runtime/NFIContextExtension.java          |  4 +--
 .../oracle/truffle/llvm/nfi/SulongNFI.java    |  9 +++---
 .../factories/BasicIntrinsicsProvider.java    |  2 +-
 .../parser/factories/BasicNodeFactory.java    | 12 ++++----
 .../parser/LazyToTruffleConverterImpl.java    | 29 ++++++++++---------
 .../llvm/runtime/LLVMFunctionCode.java        |  6 ++--
 .../truffle/llvm/runtime/LLVMLanguage.java    |  8 ++---
 .../truffle/llvm/runtime/SulongLibrary.java   | 10 +++----
 .../llvm/runtime/debug/LLDBSupport.java       |  4 +--
 .../interop/LLVMTruffleDecorateFunction.java  |  3 +-
 .../com/oracle/truffle/llvm/ParserDriver.java | 12 ++++----
 .../initialization/InitializeModuleNode.java  |  2 +-
 .../llvm/tests/interop/nfi/NFIAPITest.java    |  3 +-
 13 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.nativemode/src/com/oracle/truffle/llvm/nativemode/runtime/NFIContextExtension.java b/sulong/projects/com.oracle.truffle.llvm.nativemode/src/com/oracle/truffle/llvm/nativemode/runtime/NFIContextExtension.java
index b2a89f6f8433..d1ca8bb0d266 100644
--- a/sulong/projects/com.oracle.truffle.llvm.nativemode/src/com/oracle/truffle/llvm/nativemode/runtime/NFIContextExtension.java
+++ b/sulong/projects/com.oracle.truffle.llvm.nativemode/src/com/oracle/truffle/llvm/nativemode/runtime/NFIContextExtension.java
@@ -40,7 +40,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -285,8 +284,7 @@ public CallTarget createNativeWrapperFactory(LLVMFunctionCode code) {
          */
         try {
             Source signatureSource = signatureSourceCache.getSignatureSource(code.getLLVMFunction().getType());
-            RootNode root = CreateClosureNodeGen.create(LLVMLanguage.get(null), signatureSource, new LLVMNativeWrapper(code));
-            return Truffle.getRuntime().createCallTarget(root);
+            return CreateClosureNodeGen.create(LLVMLanguage.get(null), signatureSource, new LLVMNativeWrapper(code)).getCallTarget();
         } catch (UnsupportedNativeTypeException ex) {
             // ignore, fall back to tagged id
             return null;
diff --git a/sulong/projects/com.oracle.truffle.llvm.nfi/src/com/oracle/truffle/llvm/nfi/SulongNFI.java b/sulong/projects/com.oracle.truffle.llvm.nfi/src/com/oracle/truffle/llvm/nfi/SulongNFI.java
index 30f19e63ff4d..fcb7d56569b5 100644
--- a/sulong/projects/com.oracle.truffle.llvm.nfi/src/com/oracle/truffle/llvm/nfi/SulongNFI.java
+++ b/sulong/projects/com.oracle.truffle.llvm.nfi/src/com/oracle/truffle/llvm/nfi/SulongNFI.java
@@ -34,7 +34,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.ContextPolicy;
@@ -127,7 +126,7 @@ Object createSignatureBuilder() {
     }
 
     private static CallTarget wrap(SulongNFI nfi, CallTarget target) {
-        return Truffle.getRuntime().createCallTarget(new RootNode(nfi) {
+        return new RootNode(nfi) {
 
             @Child DirectCallNode call = DirectCallNode.create(target);
 
@@ -136,18 +135,18 @@ public Object execute(VirtualFrame frame) {
                 Object ret = call.call();
                 return new SulongNFILibrary(ret);
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
     protected CallTarget parse(ParsingRequest request) {
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
 
             @Override
             public Object execute(VirtualFrame frame) {
                 throw CompilerDirectives.shouldNotReachHere("illegal access to internal language");
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
diff --git a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicIntrinsicsProvider.java b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicIntrinsicsProvider.java
index 75449d2e00be..86831cba6710 100644
--- a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicIntrinsicsProvider.java
+++ b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicIntrinsicsProvider.java
@@ -212,7 +212,7 @@ protected LLVMTypedIntrinsicFactory getFactory(String name) {
     }
 
     private RootCallTarget wrap(String functionName, LLVMExpressionNode node) {
-        return LLVMLanguage.createCallTarget(LLVMIntrinsicExpressionNodeGen.create(language, functionName, node));
+        return LLVMIntrinsicExpressionNodeGen.create(language, functionName, node).getCallTarget();
     }
 
     protected final LLVMLanguage language;
diff --git a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
index aac96d172e97..b915ecfb201e 100644
--- a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
+++ b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
@@ -100,6 +100,7 @@
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMLoopNode;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVM80BitFloatRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMAddressRetNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMArrayRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMDoubleRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMFloatRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMI16RetNodeGen;
@@ -109,7 +110,6 @@
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMI8RetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMIVarBitRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMStructRetNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMArrayRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMVectorRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMVoidReturnNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMSwitchNode;
@@ -163,14 +163,14 @@
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMArithmeticFactory.LLVMArithmeticWithOverflowNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMArithmeticFactory.LLVMSimpleArithmeticPrimitiveNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceAddNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceMulNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceAndNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceMulNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceOrNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceXorNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMaxNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceSignedMaxNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMinNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceSignedMinNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMaxNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMinNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceXorNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI16NodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI32NodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI64NodeGen;
@@ -1211,7 +1211,7 @@ public LLVMExpressionNode createInlineAssemblerExpression(String asmExpression,
         } catch (AsmParseException e) {
             assemblyRoot = getLazyUnsupportedInlineRootNode(asmExpression, e);
         }
-        LLVMIRFunction function = new LLVMIRFunction(LLVMLanguage.createCallTarget(assemblyRoot), null);
+        LLVMIRFunction function = new LLVMIRFunction(assemblyRoot.getCallTarget(), null);
         LLVMFunction functionDetail = LLVMFunction.create("<asm>", function, new FunctionType(MetaType.UNKNOWN, 0, false), IDGenerater.INVALID_ID, LLVMSymbol.INVALID_INDEX,
                         false, assemblyRoot.getName(), false);
         // The function descriptor for the inline assembly does not require a language.
diff --git a/sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LazyToTruffleConverterImpl.java b/sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LazyToTruffleConverterImpl.java
index 49c653564259..6e8467f9a43a 100644
--- a/sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LazyToTruffleConverterImpl.java
+++ b/sulong/projects/com.oracle.truffle.llvm.parser/src/com/oracle/truffle/llvm/parser/LazyToTruffleConverterImpl.java
@@ -29,6 +29,20 @@
  */
 package com.oracle.truffle.llvm.parser;
 
+import java.io.PrintWriter;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import org.graalvm.options.OptionValues;
+
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -84,19 +98,6 @@
 import com.oracle.truffle.llvm.runtime.types.StructureType;
 import com.oracle.truffle.llvm.runtime.types.Type;
 import com.oracle.truffle.llvm.runtime.types.symbols.SSAValue;
-import org.graalvm.options.OptionValues;
-
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 
 public class LazyToTruffleConverterImpl implements LazyToTruffleConverter {
 
@@ -245,7 +246,7 @@ private RootCallTarget generateCallTarget() {
             System.out.println();
         }
 
-        return LLVMLanguage.createCallTarget(rootNode);
+        return rootNode.getCallTarget();
     }
 
     private HashSet<Integer> getDebugValues() {
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMFunctionCode.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMFunctionCode.java
index bcf206e2a211..f867b16e930c 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMFunctionCode.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMFunctionCode.java
@@ -120,7 +120,7 @@ private CallTarget createNativeWrapperFactory(NativeContextExtension nativeExt)
         if (ret == null) {
             // either no native access, or signature is unsupported
             // fall back to tagged id
-            ret = Truffle.getRuntime().createCallTarget(new TagSulongFunctionPointerNode(this));
+            ret = new TagSulongFunctionPointerNode(this).getCallTarget();
         }
         return ret;
     }
@@ -451,7 +451,7 @@ private void initForeignCallTarget() {
                 foreignCall = LLVMForeignFunctionCallNode.create(language, this, interopType, sourceType);
             }
 
-            foreignFunctionCallTarget = LLVMLanguage.createCallTarget(foreignCall);
+            foreignFunctionCallTarget = foreignCall.getCallTarget();
         }
     }
 
@@ -478,7 +478,7 @@ private void initForeignConstructorCallTarget() {
                 LLVMInteropType.Structured structured = ((LLVMInteropType.Value) extractedType).baseType;
                 LLVMForeignCallNode foreignCall = LLVMForeignConstructorCallNode.create(
                                 language, this, interopType, sourceType, structured);
-                foreignConstructorCallTarget = LLVMLanguage.createCallTarget(foreignCall);
+                foreignConstructorCallTarget = foreignCall.getCallTarget();
             }
         }
     }
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java
index 3da578924125..f5932df8e4b6 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java
@@ -474,7 +474,7 @@ public LLVMFunctionCode getStartFunctionCode() {
     protected void initFreeGlobalBlocks(NodeFactory nodeFactory) {
         // lazily initialized, this is not necessary if there are no global blocks allocated
         if (freeGlobalBlocks == null) {
-            freeGlobalBlocks = LLVMLanguage.createCallTarget(new FreeGlobalsNode(this, nodeFactory));
+            freeGlobalBlocks = new FreeGlobalsNode(this, nodeFactory).getCallTarget();
         }
     }
 
@@ -612,11 +612,7 @@ protected void initializeMultipleContexts() {
         singleContextAssumption.invalidate();
     }
 
-    public static RootCallTarget createCallTarget(RootNode rootNode) {
-        return Truffle.getRuntime().createCallTarget(rootNode);
-    }
-
     public RootCallTarget createCachedCallTarget(Class<?> key, Function<LLVMLanguage, RootNode> create) {
-        return cachedCallTargets.computeIfAbsent(key, k -> createCallTarget(create.apply(LLVMLanguage.this)));
+        return cachedCallTargets.computeIfAbsent(key, k -> create.apply(LLVMLanguage.this).getCallTarget());
     }
 }
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/SulongLibrary.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/SulongLibrary.java
index 178cdcc49fb1..6a3caee411c3 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/SulongLibrary.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/SulongLibrary.java
@@ -29,6 +29,10 @@
  */
 package com.oracle.truffle.llvm.runtime;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -59,10 +63,6 @@
 import com.oracle.truffle.llvm.runtime.nodes.func.LLVMGlobalRootNode;
 import com.oracle.truffle.llvm.runtime.pointer.LLVMManagedPointer;
 
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-
 /**
  * Object that is returned when a bitcode library is parsed.
  */
@@ -107,7 +107,7 @@ private CallTarget createCallTarget() {
             RootCallTarget startCallTarget = language.getStartFunctionCode().getLLVMIRFunctionSlowPath();
             Path applicationPath = Paths.get(mainFunction.getStringPath());
             RootNode rootNode = new LLVMGlobalRootNode(language, new FrameDescriptor(), mainFunction, startCallTarget, Objects.toString(applicationPath, ""));
-            return LLVMLanguage.createCallTarget(rootNode);
+            return rootNode.getCallTarget();
         }
     }
 
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/debug/LLDBSupport.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/debug/LLDBSupport.java
index 8ef3eaa90a5f..8a87f41f76eb 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/debug/LLDBSupport.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/debug/LLDBSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -74,7 +74,7 @@ public Object execute(VirtualFrame frame) {
     public CallTarget getLoadFunction(Type loadType) {
         CallTarget ret = loadFunctionCache.get(loadType);
         if (ret == null) {
-            ret = LLVMLanguage.createCallTarget(new LoadRootNode(this, loadType));
+            ret = new LoadRootNode(this, loadType).getCallTarget();
             loadFunctionCache.put(loadType, ret);
         }
         return ret;
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMTruffleDecorateFunction.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMTruffleDecorateFunction.java
index 1b6fdb8f2011..c265369b0602 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMTruffleDecorateFunction.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMTruffleDecorateFunction.java
@@ -48,7 +48,6 @@
 import com.oracle.truffle.llvm.runtime.LLVMFunctionCode;
 import com.oracle.truffle.llvm.runtime.LLVMFunctionCode.LLVMIRFunction;
 import com.oracle.truffle.llvm.runtime.LLVMFunctionDescriptor;
-import com.oracle.truffle.llvm.runtime.LLVMLanguage;
 import com.oracle.truffle.llvm.runtime.LLVMSymbol;
 import com.oracle.truffle.llvm.runtime.except.LLVMPolyglotException;
 import com.oracle.truffle.llvm.runtime.library.internal.LLVMAsForeignLibrary;
@@ -195,7 +194,7 @@ private Object decorateForeign(Object function, LLVMFunctionDescriptor wrapperFu
     }
 
     private static Object registerRoot(String path, FunctionType newFunctionType, DecoratedRoot decoratedRoot) {
-        LLVMIRFunction function = new LLVMIRFunction(LLVMLanguage.createCallTarget(decoratedRoot), null);
+        LLVMIRFunction function = new LLVMIRFunction(decoratedRoot.getCallTarget(), null);
         LLVMFunction functionDetail = LLVMFunction.create("<wrapper>", function, newFunctionType, IDGenerater.INVALID_ID, LLVMSymbol.INVALID_INDEX, false, path, false);
         LLVMFunctionDescriptor wrappedFunction = new LLVMFunctionDescriptor(functionDetail, new LLVMFunctionCode(functionDetail));
         return LLVMManagedPointer.create(wrappedFunction);
diff --git a/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/ParserDriver.java b/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/ParserDriver.java
index 3d30685c95a6..ae6b4fc62845 100644
--- a/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/ParserDriver.java
+++ b/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/ParserDriver.java
@@ -151,7 +151,7 @@ private CallTarget parseWithDependencies(Source source, ByteSequence bytes) {
             TruffleFile file = createNativeTruffleFile(source.getName(), source.getPath());
             // An empty call target is returned for native libraries.
             if (file == null) {
-                return LLVMLanguage.createCallTarget(RootNode.createConstantNode(0));
+                return RootNode.createConstantNode(0).getCallTarget();
             }
             return createNativeLibraryCallTarget(file);
         }
@@ -543,12 +543,12 @@ private static void addExternalSymbolsToScopes(LLVMParserResult parserResult) {
      */
     private CallTarget createLibraryCallTarget(String name, LLVMParserResult parserResult, Source source) {
         if (context.getEnv().getOptions().get(SulongEngineOption.PARSE_ONLY)) {
-            return LLVMLanguage.createCallTarget(RootNode.createConstantNode(0));
+            return RootNode.createConstantNode(0).getCallTarget();
         } else {
             // check if the functions should be resolved eagerly or lazily.
             boolean lazyParsing = context.getEnv().getOptions().get(SulongEngineOption.LAZY_PARSING) && !context.getEnv().getOptions().get(SulongEngineOption.AOTCacheStore);
             LoadModulesNode loadModules = LoadModulesNode.create(name, parserResult, lazyParsing, context.isInternalLibraryFile(parserResult.getRuntime().getFile()), dependencies, source, language);
-            return LLVMLanguage.createCallTarget(loadModules);
+            return loadModules.getCallTarget();
         }
     }
 
@@ -559,11 +559,11 @@ private CallTarget createLibraryCallTarget(String name, LLVMParserResult parserR
      */
     private CallTarget createNativeLibraryCallTarget(TruffleFile file) {
         if (context.getEnv().getOptions().get(SulongEngineOption.PARSE_ONLY)) {
-            return LLVMLanguage.createCallTarget(RootNode.createConstantNode(0));
+            return RootNode.createConstantNode(0).getCallTarget();
         } else {
-            // check if the functions should be resolved eagerly or lazyly.
+            // check if the functions should be resolved eagerly or lazily.
             LoadNativeNode loadNative = LoadNativeNode.create(new FrameDescriptor(), language, file);
-            return LLVMLanguage.createCallTarget(loadNative);
+            return loadNative.getCallTarget();
         }
     }
 }
diff --git a/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/InitializeModuleNode.java b/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/InitializeModuleNode.java
index a07b04598b4a..293e017b1410 100644
--- a/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/InitializeModuleNode.java
+++ b/sulong/projects/com.oracle.truffle.llvm/src/com/oracle/truffle/llvm/initialization/InitializeModuleNode.java
@@ -112,7 +112,7 @@ public static RootCallTarget createDestructor(LLVMParserResult parserResult, Str
             FrameDescriptor frameDescriptor = new FrameDescriptor();
             LLVMStatementRootNode root = new LLVMStatementRootNode(language, StaticInitsNodeGen.create(destructors, "fini", moduleName), frameDescriptor,
                             parserResult.getRuntime().getNodeFactory().createStackAccess(frameDescriptor));
-            return LLVMLanguage.createCallTarget(root);
+            return root.getCallTarget();
         } else {
             return null;
         }
diff --git a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/nfi/NFIAPITest.java b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/nfi/NFIAPITest.java
index 03840f0bd173..3b43f7298c7b 100644
--- a/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/nfi/NFIAPITest.java
+++ b/sulong/tests/com.oracle.truffle.llvm.tests/src/com/oracle/truffle/llvm/tests/interop/nfi/NFIAPITest.java
@@ -40,7 +40,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -68,7 +67,7 @@ public static void initialize() {
     }
 
     private static CallTarget lookupAndBind() {
-        return Truffle.getRuntime().createCallTarget(new LookupAndBindNode());
+        return new LookupAndBindNode().getCallTarget();
     }
 
     private static Object loadLibrary(String lib, String filename) {

From 7936aac26958d0d3ce43fee456a6ce867d2eb622 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:56:16 +0200
Subject: [PATCH 188/681] Avoid createCallTarget() in tools.

---
 .../LazyAccessInspectDebugLegacyTest.java     |  5 ++-
 .../test/LazyAccessInspectDebugTest.java      |  5 ++-
 .../test/NotReadableValuesLegacyTest.java     |  5 ++-
 .../test/NotReadableValuesTest.java           |  5 ++-
 .../tools/coverage/test/CoverageTest.java     |  7 ++--
 .../tools/profiler/test/MemoryTracerTest.java |  5 ++-
 .../profiler/test/NoTagSamplingTest.java      |  3 +-
 .../insight/test/InsightContextTest.java      | 35 ++++++++++---------
 .../insight/test/InsightObjectFactory.java    |  5 ++-
 9 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugLegacyTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugLegacyTest.java
index 0390307f171d..89fbff5410a7 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugLegacyTest.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugLegacyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -34,7 +34,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -185,7 +184,7 @@ static class ReadWithSideEffectsLanguage extends ProxyLanguage {
 
         @Override
         protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, request.getSource()));
+            return new TestRootNode(languageInstance, request.getSource()).getCallTarget();
         }
 
         @Override
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugTest.java
index 95a8506c3cf7..4a0bfe770014 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugTest.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/LazyAccessInspectDebugTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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
@@ -33,7 +33,6 @@
 import org.graalvm.polyglot.Source;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
@@ -184,7 +183,7 @@ static class ReadWithSideEffectsLanguage extends ProxyLanguage {
 
         @Override
         protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, request.getSource()));
+            return new TestRootNode(languageInstance, request.getSource()).getCallTarget();
         }
 
         @Override
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesLegacyTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesLegacyTest.java
index bc1236cb5ccd..2e1e97cedc41 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesLegacyTest.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesLegacyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -35,7 +35,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -130,7 +129,7 @@ static class NotReadableValuesLanguage extends ProxyLanguage {
 
         @Override
         protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, request.getSource()));
+            return new TestRootNode(languageInstance, request.getSource()).getCallTarget();
         }
 
         @Override
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesTest.java
index a0cbf8097825..2a55f9661f34 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesTest.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/NotReadableValuesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -34,7 +34,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -128,7 +127,7 @@ static class NotReadableValuesLanguage extends ProxyLanguage {
 
         @Override
         protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new TestRootNode(languageInstance, request.getSource()));
+            return new TestRootNode(languageInstance, request.getSource()).getCallTarget();
         }
 
         @Override
diff --git a/tools/src/com.oracle.truffle.tools.coverage.test/src/com/oracle/truffle/tools/coverage/test/CoverageTest.java b/tools/src/com.oracle.truffle.tools.coverage.test/src/com/oracle/truffle/tools/coverage/test/CoverageTest.java
index aae847e00480..c9ca8da41167 100644
--- a/tools/src/com.oracle.truffle.tools.coverage.test/src/com/oracle/truffle/tools/coverage/test/CoverageTest.java
+++ b/tools/src/com.oracle.truffle.tools.coverage.test/src/com/oracle/truffle/tools/coverage/test/CoverageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -40,7 +40,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -245,14 +244,14 @@ public static class RootAndStatementInDifferentSources extends ProxyLanguage {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+            return new RootNode(this) {
                 @Child SuperclassNode child = new TestRootNode(new TestStatementNode());
 
                 @Override
                 public Object execute(VirtualFrame frame) {
                     return child.execute(frame);
                 }
-            });
+            }.getCallTarget();
         }
 
         @GenerateWrapper
diff --git a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java
index 83e40dc31196..09bae3becbec 100644
--- a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java
+++ b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/MemoryTracerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -33,7 +33,6 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
@@ -315,7 +314,7 @@ public Object execute(VirtualFrame frame) {
         protected CallTarget parse(ParsingRequest request) {
             final ADRARootNode rootNode = new ADRARootNode(this);
             rootNode.setSection(request.getSource().createSection(1));
-            return Truffle.getRuntime().createCallTarget(rootNode);
+            return rootNode.getCallTarget();
         }
 
         @Override
diff --git a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
index 1168305ab185..755a20734e9f 100644
--- a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
+++ b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
@@ -34,7 +34,6 @@
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -97,7 +96,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         }
 
         private RootCallTarget newTarget() {
-            return Truffle.getRuntime().createCallTarget(new LILRootNode(this));
+            return new LILRootNode(this).getCallTarget();
         }
     }
 }
diff --git a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightContextTest.java b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightContextTest.java
index f700bcb95a14..f2bdf329d9a4 100644
--- a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightContextTest.java
+++ b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -24,34 +24,37 @@
  */
 package org.graalvm.tools.insight.test;
 
-import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleContext;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.test.InstrumentationTestLanguage;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.NodeUtil;
-import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.api.test.GCUtils;
-import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import org.graalvm.tools.insight.Insight;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.TruffleContext;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.test.InstrumentationTestLanguage;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.NodeUtil;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.test.GCUtils;
+import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
+
 public class InsightContextTest {
     public static final class InsightTestLanguage extends ProxyLanguage {
         int parsingCounter;
@@ -77,7 +80,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
             int idx = request.getArgumentNames().indexOf("insight");
             assertNotEquals("insight is an argument", -1, idx);
 
-            return Truffle.getRuntime().createCallTarget(new ParsingNode(idx));
+            return new ParsingNode(idx).getCallTarget();
         }
 
         class ParsingNode extends RootNode {
diff --git a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightObjectFactory.java b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightObjectFactory.java
index 6539a3af0412..4f7f523d4e45 100644
--- a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightObjectFactory.java
+++ b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/InsightObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, 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
@@ -25,7 +25,6 @@
 package org.graalvm.tools.insight.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.GenerateWrapper;
@@ -86,7 +85,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         final Source source = request.getSource();
         String scriptName = source.getName();
         final AgentRootNode root = new AgentRootNode(ProxyLanguage.get(null), this, scriptName, source, request.getArgumentNames());
-        return Truffle.getRuntime().createCallTarget(root);
+        return root.getCallTarget();
     }
 
     public static Value readInsight(Context context, Object[] interopValue) throws Exception {

From 9dcf122e643368e727131dba60f322edd5a7977e Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:56:25 +0200
Subject: [PATCH 189/681] Avoid createCallTarget() in vm.

---
 .../src/org/graalvm/polybench/micro/Parser.java                | 3 +--
 .../src/org/graalvm/polybench/micro/nodes/SetupRootNode.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/Parser.java b/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/Parser.java
index 7f5bff1907da..993183a6811b 100644
--- a/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/Parser.java
+++ b/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/Parser.java
@@ -25,7 +25,6 @@
 package org.graalvm.polybench.micro;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.source.Source;
 import org.graalvm.polybench.micro.expr.EvalExpression;
 import org.graalvm.polybench.micro.expr.EvalExpressionNodeGen;
@@ -85,7 +84,7 @@ CallTarget parseEverything(MicrobenchLanguage language) throws IOException {
         Microbench spec = parseMicrobenchStatement();
 
         SetupRootNode setupNode = SetupRootNodeGen.create(language, spec, preparedState);
-        return Truffle.getRuntime().createCallTarget(setupNode);
+        return setupNode.getCallTarget();
     }
 
     void parseDeclarations() throws IOException {
diff --git a/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/nodes/SetupRootNode.java b/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/nodes/SetupRootNode.java
index 58cacbeab094..17ebb3877079 100644
--- a/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/nodes/SetupRootNode.java
+++ b/vm/src/org.graalvm.polybench.micro/src/org/graalvm/polybench/micro/nodes/SetupRootNode.java
@@ -26,7 +26,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -52,7 +51,7 @@ public SetupRootNode(MicrobenchLanguage language, Microbench spec, Expression[]
         super(language);
         MicrobenchRootNode workloadRoot = new MicrobenchRootNode(language, spec);
 
-        this.workload = Truffle.getRuntime().createCallTarget(workloadRoot);
+        this.workload = workloadRoot.getCallTarget();
         this.prepare = prepare;
         this.spec = spec;
     }

From 65b34cc7e53b2470eb05ae022ff9da9371ec8e82 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Mon, 27 Sep 2021 16:20:48 +0300
Subject: [PATCH 190/681] Forward more mx args for GraalVMConfig None-config

---
 substratevm/mx.substratevm/mx_substratevm.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 2e5dc90cb77f..4e92dffe8675 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -45,6 +45,7 @@
 import mx_gate
 import mx_unittest
 import mx_sdk_vm
+import mx_sdk_vm_impl
 import mx_javamodules
 import mx_subst
 import mx_substratevm_benchmark  # pylint: disable=unused-import
@@ -176,6 +177,14 @@ def _run_graalvm_cmd(cmd_args, config, nonZeroIsFatal=True, out=None, err=None,
         primary_suite_dir = config.primary_suite_dir
     else:
         config_args = []
+        if not mx_sdk_vm_impl._jlink_libraries():
+            config_args += ['--no-jlinking']
+        native_images = mx_sdk_vm_impl._parse_cmd_arg('native_images')
+        if native_images:
+            config_args += ['--native-images=' + ','.join(native_images)]
+        components = mx_sdk_vm_impl._components_include_list()
+        if components:
+            config_args += ['--components=' + ','.join(c.name for c in components)]
         dynamic_imports = [x for x, _ in mx.get_dynamic_imports()]
         if dynamic_imports:
             config_args += ['--dynamicimports', ','.join(dynamic_imports)]

From 72e63be1d9aaa0ee7205fd4cac56a6586627a276 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Tue, 28 Sep 2021 12:35:20 +0300
Subject: [PATCH 191/681] Remove duplicate _jlink_libraries from mx_compiler.py

---
 compiler/mx.compiler/mx_compiler.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 48d016eb2f30..f3fb32bb8dd1 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -1149,9 +1149,6 @@ def _zipadd(arc, filename, arcname):
     arc.close()
 
 
-def _jlink_libraries():
-    return not (mx.get_opts().no_jlinking or mx.env_var_to_bool('NO_JLINKING'))
-
 def makegraaljdk_cli(args):
     """make a JDK with Graal as the default top level JIT"""
     parser = ArgumentParser(prog='mx makegraaljdk')
@@ -1321,7 +1318,7 @@ def _copy_file(src, dst):
             vendor_info = {'vendor-version' : vm_name}
             # Setting dedup_legal_notices=False avoids due to license files conflicting
             # when switching JAVA_HOME from an OpenJDK to an OracleJDK or vice versa between executions.
-            if _jlink_libraries():
+            if mx_sdk_vm_impl._jlink_libraries():
                 jlink_new_jdk(jdk, tmp_dst_jdk_dir, module_dists, ignore_dists=[], root_module_names=root_module_names, vendor_info=vendor_info, dedup_legal_notices=False)
                 if export_truffle:
                     jmd = as_java_module(_graal_config().dists_dict['truffle:TRUFFLE_API'], jdk)

From 6c77c83334eaf11566f0e8ec625562a10d9896dc Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Tue, 28 Sep 2021 13:42:46 +0200
Subject: [PATCH 192/681] Remove empty 8 and 11 projects

---
 espresso/mx.espresso/suite.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/espresso/mx.espresso/suite.py b/espresso/mx.espresso/suite.py
index 211446bf9dbd..11d11e1368ed 100644
--- a/espresso/mx.espresso/suite.py
+++ b/espresso/mx.espresso/suite.py
@@ -121,25 +121,6 @@
             "checkPackagePrefix": False,  # java.lang.ref.PublicFinalReference
         },
 
-        "com.oracle.truffle.espresso.jdk8": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "overlayTarget": "com.oracle.truffle.espresso",
-            "checkPackagePrefix": "false",
-            "checkstyle": "com.oracle.truffle.espresso",
-            "javaCompliance": "8",
-        },
-
-        "com.oracle.truffle.espresso.jdk11": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "overlayTarget": "com.oracle.truffle.espresso",
-            "checkPackagePrefix": "false",
-            "multiReleaseJarVersion": "11",
-            "checkstyle": "com.oracle.truffle.espresso",
-            "javaCompliance": "11+",
-        },
-
         "com.oracle.truffle.espresso.jdk17": {
             "subDir": "src",
             "sourceDirs": ["src"],

From 7f43d1a2433a555c7109e0efaf761b21903e4f27 Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Tue, 28 Sep 2021 14:26:50 +0200
Subject: [PATCH 193/681] Fixing AIOOB from
 GlobalRegistry.ensureExternalGlobalCapacity().

---
 .../org.graalvm.wasm/src/org/graalvm/wasm/GlobalRegistry.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/GlobalRegistry.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/GlobalRegistry.java
index 7e18e43c1238..a657cadb60c4 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/GlobalRegistry.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/GlobalRegistry.java
@@ -88,7 +88,7 @@ private void ensureGlobalCapacity() {
     private void ensureExternalGlobalCapacity() {
         if (externalGlobalCount == externalGlobals.length) {
             final WasmGlobal[] nExternalGlobals = new WasmGlobal[externalGlobals.length * 2];
-            System.arraycopy(externalGlobals, 0, nExternalGlobals, 0, nExternalGlobals.length);
+            System.arraycopy(externalGlobals, 0, nExternalGlobals, 0, externalGlobals.length);
             externalGlobals = nExternalGlobals;
         }
     }

From ca1492fbed8d54738738910d20ef5aeecf340e20 Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Tue, 28 Sep 2021 14:27:47 +0200
Subject: [PATCH 194/681] Adding a regression test with an import of many
 globals.

---
 .../org/graalvm/wasm/test/WasmJsApiSuite.java | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
index 8402ff021c44..1e639acbae3d 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
@@ -1295,6 +1295,67 @@ private static void runValidationValid(byte[] data) throws IOException {
         });
     }
 
+    @Test
+    public void testImportManyGlobals() throws IOException, InterruptedException {
+        String importManyGlobalsWat = "(module\n" +
+                        "(global $global0 (import \"globals\" \"global0\") i32)\n" +
+                        "(global $global1 (import \"globals\" \"global1\") i32)\n" +
+                        "(global $global2 (import \"globals\" \"global2\") i32)\n" +
+                        "(global $global3 (import \"globals\" \"global3\") i32)\n" +
+                        "(global $global4 (import \"globals\" \"global4\") i32)\n" +
+                        "(global $global5 (import \"globals\" \"global5\") i32)\n" +
+                        "(global $global6 (import \"globals\" \"global6\") i32)\n" +
+                        "(global $global7 (import \"globals\" \"global7\") i32)\n" +
+                        "(global $global8 (import \"globals\" \"global8\") i32)\n" +
+                        "(func (export \"sum\") (result i32)\n" +
+                        "    get_global $global0\n" +
+                        "    get_global $global1\n" +
+                        "    i32.add\n" +
+                        "    get_global $global2\n" +
+                        "    i32.add\n" +
+                        "    get_global $global3\n" +
+                        "    i32.add\n" +
+                        "    get_global $global4\n" +
+                        "    i32.add\n" +
+                        "    get_global $global5\n" +
+                        "    i32.add\n" +
+                        "    get_global $global6\n" +
+                        "    i32.add\n" +
+                        "    get_global $global7\n" +
+                        "    i32.add\n" +
+                        "    get_global $global8\n" +
+                        "    i32.add\n" +
+                        ")\n" +
+                        ")";
+        byte[] importManyGlobalsBytes = compileWat("importManyGlobals", importManyGlobalsWat);
+        runTest(context -> {
+            WebAssembly wasm = new WebAssembly(context);
+            Dictionary importObject = Dictionary.create(new Object[]{
+                            "globals", Dictionary.create(new Object[]{
+                                            "global0", WebAssembly.globalAlloc(ValueType.i32, false, 1),
+                                            "global1", WebAssembly.globalAlloc(ValueType.i32, false, 2),
+                                            "global2", WebAssembly.globalAlloc(ValueType.i32, false, 3),
+                                            "global3", WebAssembly.globalAlloc(ValueType.i32, false, 4),
+                                            "global4", WebAssembly.globalAlloc(ValueType.i32, false, 5),
+                                            "global5", WebAssembly.globalAlloc(ValueType.i32, false, 6),
+                                            "global6", WebAssembly.globalAlloc(ValueType.i32, false, 7),
+                                            "global7", WebAssembly.globalAlloc(ValueType.i32, false, 8),
+                                            "global8", WebAssembly.globalAlloc(ValueType.i32, false, 9),
+                            }),
+            });
+            WasmInstance instance = moduleInstantiate(wasm, importManyGlobalsBytes, importObject);
+            try {
+                InteropLibrary lib = InteropLibrary.getUncached();
+                Object sum = lib.execute(WebAssembly.instanceExport(instance, "sum"));
+                int intSum = lib.asInt(sum);
+                Assert.assertEquals("Incorrect sum of imported globals", 45, intSum);
+            } catch (InteropException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+    }
+
     private static void runTest(Consumer<WasmContext> testCase) throws IOException {
         final Context.Builder contextBuilder = Context.newBuilder(WasmLanguage.ID);
         contextBuilder.option("wasm.Builtins", "testutil:testutil");

From badb93d6c498eba04c178ff9661fe190d0710fb5 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 28 Sep 2021 16:17:06 +0200
Subject: [PATCH 195/681] Do not close env output.

---
 .../coverage/impl/CoverageInstrument.java     | 29 +++++++-------
 .../tools/profiler/impl/CPUSamplerCLI.java    | 35 +++++++++--------
 .../tools/profiler/impl/CPUTracerCLI.java     | 38 +++++++++----------
 3 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java b/tools/src/com.oracle.truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java
index 7004aff88633..498e837e6323 100644
--- a/tools/src/com.oracle.truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java
+++ b/tools/src/com.oracle.truffle.tools.coverage/src/com/oracle/truffle/tools/coverage/impl/CoverageInstrument.java
@@ -174,21 +174,20 @@ protected void onDispose(Env env) {
             SourceCoverage[] coverage = tracker.getCoverage();
             final OptionValues options = env.getOptions();
             final boolean strictLines = StrictLines.getValue(options);
-            try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-                switch (OUTPUT.getValue(options)) {
-                    case HISTOGRAM:
-                        new CoverageCLI(out, coverage, strictLines).printHistogramOutput();
-                        break;
-                    case DETAILED:
-                        new CoverageCLI(out, coverage, strictLines).printLinesOutput();
-                        break;
-                    case JSON:
-                        new JSONPrinter(out, coverage).print();
-                        break;
-                    case LCOV:
-                        new LCOVPrinter(out, coverage, strictLines).print();
-                        break;
-                }
+            PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+            switch (OUTPUT.getValue(options)) {
+                case HISTOGRAM:
+                    new CoverageCLI(out, coverage, strictLines).printHistogramOutput();
+                    break;
+                case DETAILED:
+                    new CoverageCLI(out, coverage, strictLines).printLinesOutput();
+                    break;
+                case JSON:
+                    new JSONPrinter(out, coverage).print();
+                    break;
+                case LCOV:
+                    new LCOVPrinter(out, coverage, strictLines).print();
+                    break;
             }
             tracker.close();
         }
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 372083b60e12..6b023b5a30e7 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -166,24 +166,23 @@ public CPUSampler.Mode apply(String s) {
     static final OptionKey<Boolean> SAMPLE_CONTEXT_INITIALIZATION = new OptionKey<>(false);
 
     static void handleOutput(TruffleInstrument.Env env, CPUSampler sampler) {
-        try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-            Map<TruffleContext, CPUSamplerData> data = sampler.getData();
-            OptionValues options = env.getOptions();
-            switch (options.get(OUTPUT)) {
-                case HISTOGRAM:
-                    printWarnings(sampler, out);
-                    printSamplingHistogram(out, options, data);
-                    break;
-                case CALLTREE:
-                    printWarnings(sampler, out);
-                    printSamplingCallTree(out, options, data);
-                    break;
-                case JSON:
-                    printSamplingJson(out, options, data);
-                    break;
-                case FLAMEGRAPH:
-                    SVGSamplerOutput.printSamplingFlameGraph(out, data);
-            }
+        PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+        Map<TruffleContext, CPUSamplerData> data = sampler.getData();
+        OptionValues options = env.getOptions();
+        switch (options.get(OUTPUT)) {
+            case HISTOGRAM:
+                printWarnings(sampler, out);
+                printSamplingHistogram(out, options, data);
+                break;
+            case CALLTREE:
+                printWarnings(sampler, out);
+                printSamplingCallTree(out, options, data);
+                break;
+            case JSON:
+                printSamplingJson(out, options, data);
+                break;
+            case FLAMEGRAPH:
+                SVGSamplerOutput.printSamplingFlameGraph(out, data);
         }
     }
 
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java
index a99c46da250c..447004c9472c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUTracerCLI.java
@@ -24,16 +24,6 @@
  */
 package com.oracle.truffle.tools.profiler.impl;
 
-import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.instrumentation.TruffleInstrument;
-import com.oracle.truffle.tools.profiler.CPUTracer;
-import com.oracle.truffle.tools.utils.json.JSONArray;
-import com.oracle.truffle.tools.utils.json.JSONObject;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.options.OptionKey;
-import org.graalvm.options.OptionStability;
-import org.graalvm.options.OptionType;
-
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,6 +31,17 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.graalvm.options.OptionCategory;
+import org.graalvm.options.OptionKey;
+import org.graalvm.options.OptionStability;
+import org.graalvm.options.OptionType;
+
+import com.oracle.truffle.api.Option;
+import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import com.oracle.truffle.tools.profiler.CPUTracer;
+import com.oracle.truffle.tools.utils.json.JSONArray;
+import com.oracle.truffle.tools.utils.json.JSONObject;
+
 @Option.Group(CPUTracerInstrument.ID)
 class CPUTracerCLI extends ProfilerCLI {
 
@@ -95,15 +96,14 @@ public Output apply(String s) {
     static final OptionKey<String> OUTPUT_FILE = new OptionKey<>("");
 
     public static void handleOutput(TruffleInstrument.Env env, CPUTracer tracer) {
-        try (PrintStream out = chooseOutputStream(env, OUTPUT_FILE)) {
-            switch (env.getOptions().get(OUTPUT)) {
-                case HISTOGRAM:
-                    printTracerHistogram(out, tracer);
-                    break;
-                case JSON:
-                    printTracerJson(out, tracer);
-                    break;
-            }
+        PrintStream out = chooseOutputStream(env, OUTPUT_FILE);
+        switch (env.getOptions().get(OUTPUT)) {
+            case HISTOGRAM:
+                printTracerHistogram(out, tracer);
+                break;
+            case JSON:
+                printTracerJson(out, tracer);
+                break;
         }
     }
 

From a8557fcc83296d92ed4210c64371e18fbb91a12f Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 28 Sep 2021 15:28:40 +0100
Subject: [PATCH 196/681] Fix to String format for source location.

---
 .../oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index 4a26747fd3b6..3019af47072f 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -841,7 +841,7 @@ private String drawSample(double y, JSONObject sample) {
             double totalPercent = 100.0 * total / sampleCount;
             title.append(String.format("Self samples: %d (%.2f%%)\n", interpreted + compiled, percent));
             title.append(String.format("total samples:  %d (%.2f%%)\n", total, totalPercent));
-            title.append(String.format("Source location: %s\n", owner.sourceHash.get(sample.getInt("f")), sample.getInt("fl")));
+            title.append(String.format("Source location: %s:%d\n", owner.sourceNames.get(sample.getInt("f")), sample.getInt("fl")));
             groupAttrs.put("title", escape(title.toString()));
             output.append(startGroup(groupAttrs));
 

From 75f68c4c3d907ca3da6bfffd6fe4983410302ae4 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 28 Sep 2021 15:34:10 +0200
Subject: [PATCH 197/681] Simplify test for GR-32346.

---
 .../api/test/polyglot/HostAccessTest.java     | 42 ++++---------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
index 3fe80e7e8946..79337beeb3c2 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
@@ -77,8 +77,6 @@
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.TypeLiteral;
 import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.impl.AbstractPolyglotImpl;
-import org.graalvm.polyglot.impl.AbstractPolyglotImpl.APIAccess;
 import org.graalvm.polyglot.proxy.ProxyArray;
 import org.graalvm.polyglot.proxy.ProxyExecutable;
 import org.graalvm.polyglot.proxy.ProxyObject;
@@ -417,45 +415,23 @@ public void testBufferAccessDisabled() {
      */
     @Test
     public void testBuilderCannotChangeMembersAndTargetMappingsOfHostAccess() throws Exception {
-        APIAccess apiAccess = findAPIAccess();
-
         // Set up hostAccess
         Builder builder = HostAccess.newBuilder();
-        Field okField = OK.class.getField("value");
-        Field banField = Ban.class.getField("value");
-        builder.allowAccess(okField);
-        builder.targetTypeMapping(Integer.class, Integer.class, null, (v) -> 42);
+        builder.allowAccess(OK.class.getField("value"));
+        builder.targetTypeMapping(Value.class, String.class, (v) -> v.isString(), (v) -> "foo");
         HostAccess hostAccess = builder.build();
-        List<Object> targetMappings = apiAccess.getTargetMappings(hostAccess);
-
-        // Verify hostAccess
-        assertTrue(apiAccess.allowsAccess(hostAccess, okField));
-        assertFalse(apiAccess.allowsAccess(hostAccess, banField));
-        assertEquals(1, targetMappings.size());
 
         // Try to change members or targetMappings through child builder
         Builder childBuilder = HostAccess.newBuilder(hostAccess);
-        childBuilder.allowAccess(banField);
-        childBuilder.targetTypeMapping(Integer.class, Character.class, null, (v) -> (char) 42);
-        HostAccess childHostAccess = childBuilder.build();
-        List<Object> childTargetMappings = apiAccess.getTargetMappings(childHostAccess);
-
-        // Verify childHostAccess
-        assertTrue(apiAccess.allowsAccess(childHostAccess, okField));
-        assertTrue(apiAccess.allowsAccess(childHostAccess, banField));
-        assertEquals(2, childTargetMappings.size());
+        childBuilder.allowAccess(Ban.class.getField("value"));
+        childBuilder.targetTypeMapping(Value.class, Integer.class, null, (v) -> 42);
 
         // Ensure hostAccess has not been altered by child builder
-        assertTrue(apiAccess.allowsAccess(hostAccess, okField));
-        assertFalse(apiAccess.allowsAccess(hostAccess, banField));
-        assertEquals(1, targetMappings.size());
-        assertNotSame(targetMappings, childTargetMappings);
-    }
-
-    APIAccess findAPIAccess() throws ReflectiveOperationException {
-        Method getImplMethod = Engine.class.getDeclaredMethod("getImpl");
-        getImplMethod.setAccessible(true);
-        return ((AbstractPolyglotImpl) getImplMethod.invoke(null)).getAPIAccess();
+        try (Context c = Context.newBuilder().allowHostAccess(hostAccess).build()) {
+            assertAccess(c);
+            assertEquals("foo", c.asValue("a string").as(String.class));
+            assertEquals(123, (int) c.asValue(123).as(Integer.class));
+        }
     }
 
     @Test

From 8fc80490e1461714467a942a943d9402036250a5 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yudi.zheng@oracle.com>
Date: Mon, 20 Sep 2021 15:25:44 +0200
Subject: [PATCH 198/681] Transform (-a)*(-b) into a*b.

---
 .../compiler/core/test/MulNegateTest.java     | 49 +++++++++++++++++++
 .../graalvm/compiler/nodes/calc/MulNode.java  | 10 +++-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
new file mode 100644
index 000000000000..2a6af5ba25c4
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.core.test;
+
+import org.graalvm.compiler.nodes.calc.NegateNode;
+import org.junit.Test;
+
+public class MulNegateTest extends GraalCompilerTest {
+
+    public static int mulInt(int x, int y) {
+        return -x * -y;
+    }
+
+    @Test
+    public void testInt() {
+        assertTrue(getFinalGraph("mulInt").getNodes().filter(NegateNode.class).count() == 0);
+    }
+
+    public static float mulFlt(float x, float y) {
+        return -x * -y;
+    }
+
+    @Test
+    public void testFloat() {
+        assertTrue(getFinalGraph("mulFlt").getNodes().filter(NegateNode.class).count() == 0);
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java
index 46e6137b0aac..0ac7500ea8e8 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/MulNode.java
@@ -32,13 +32,13 @@
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
@@ -90,6 +90,12 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode for
             // if this fails we only swap
             return new MulNode(forY, forX);
         }
+
+        // convert "(-a)*(-b)" into "a*b"
+        if (forX instanceof NegateNode && forY instanceof NegateNode) {
+            return new MulNode(((NegateNode) forX).getValue(), ((NegateNode) forY).getValue()).maybeCommuteInputs();
+        }
+
         BinaryOp<Mul> op = getOp(forX, forY);
         NodeView view = NodeView.from(tool);
         return canonical(this, op, stamp(view), forX, forY, view);

From fd726d43a3f055a59278694a886c5e3e532f9414 Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yudi.zheng@oracle.com>
Date: Tue, 28 Sep 2021 18:48:12 +0200
Subject: [PATCH 199/681] Update MulNegateTest.

---
 .../compiler/core/test/MulNegateTest.java       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
index 2a6af5ba25c4..d6bcfeedbf02 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
@@ -29,6 +29,8 @@
 
 public class MulNegateTest extends GraalCompilerTest {
 
+    public static final int[] INT_TEST_CASES = {0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE};
+
     public static int mulInt(int x, int y) {
         return -x * -y;
     }
@@ -36,8 +38,17 @@ public static int mulInt(int x, int y) {
     @Test
     public void testInt() {
         assertTrue(getFinalGraph("mulInt").getNodes().filter(NegateNode.class).count() == 0);
+
+        for (int i : INT_TEST_CASES) {
+            for (int j : INT_TEST_CASES) {
+                test("mulInt", i, j);
+            }
+        }
     }
 
+    public static final float[] FLOAT_TEST_CASES = {0.0f, -0.0f, 1.0f, -1.0f, Float.MIN_VALUE, Float.MIN_NORMAL,
+                    Float.MAX_VALUE, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY, Float.NaN};
+
     public static float mulFlt(float x, float y) {
         return -x * -y;
     }
@@ -45,5 +56,11 @@ public static float mulFlt(float x, float y) {
     @Test
     public void testFloat() {
         assertTrue(getFinalGraph("mulFlt").getNodes().filter(NegateNode.class).count() == 0);
+
+        for (float i : FLOAT_TEST_CASES) {
+            for (float j : FLOAT_TEST_CASES) {
+                test("mulFlt", i, j);
+            }
+        }
     }
 }

From c98d9ae8ebedb174c5a74af6f1786bc095a24b44 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 21 Sep 2021 22:49:57 -0700
Subject: [PATCH 200/681] Clean-up executor.

Analysis initialization task can be run in the same thread,
---
 .../src/com/oracle/graal/pointsto/api/HostVM.java    |  5 +----
 .../com/oracle/graal/pointsto/meta/AnalysisType.java |  2 +-
 .../com/oracle/svm/hosted/HostedConfiguration.java   | 12 ++++++------
 .../com/oracle/svm/hosted/NativeImageGenerator.java  |  6 +++---
 .../src/com/oracle/svm/hosted/SVMHost.java           | 12 ++----------
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
index 018926e0f324..4b9e8f035a51 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
@@ -26,9 +26,7 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Optional;
-import java.util.concurrent.ForkJoinPool;
 
-import com.oracle.graal.pointsto.BigBang;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.java.GraphBuilderPhase;
@@ -38,6 +36,7 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.OptimisticOptimizations;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -55,8 +54,6 @@ public interface HostVM {
 
     OptionValues options();
 
-    ForkJoinPool executor();
-
     boolean isRelocatedPointer(Object originalObject);
 
     void clearInThread();
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
index b670d5248c6f..3d5b37141f7b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -462,7 +462,7 @@ private void markReachable() {
                  */
                 registerAsAllocated(null);
             }
-            universe.hostVM.executor().execute(initializationTask);
+            ensureInitialized();
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
index d4d8a5a844e9..406c6e8ca7d8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
@@ -31,16 +31,15 @@
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
-import com.oracle.graal.pointsto.BigBang;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.analysis.Inflation;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.CompressEncoding;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.MethodTypeFlow;
 import com.oracle.graal.pointsto.flow.MethodTypeFlowBuilder;
@@ -54,6 +53,8 @@
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.monitor.MultiThreadedMonitorSupport;
+import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.hosted.analysis.Inflation;
 import com.oracle.svm.hosted.analysis.flow.SVMMethodTypeFlowBuilder;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.code.CompileQueue;
@@ -67,7 +68,6 @@
 import com.oracle.svm.hosted.substitute.UnsafeAutomaticSubstitutionProcessor;
 
 import jdk.vm.ci.meta.JavaKind;
-import org.graalvm.nativeimage.Platform;
 
 public class HostedConfiguration {
 
@@ -132,9 +132,9 @@ public static ObjectLayout createObjectLayout(JavaKind referenceKind) {
         return new ObjectLayout(target, referenceSize, objectAlignment, hubOffset, firstFieldOffset, arrayLengthOffset, arrayBaseOffset, identityHashCodeOffset);
     }
 
-    public SVMHost createHostVM(OptionValues options, ForkJoinPool buildExecutor, ClassLoader classLoader, ClassInitializationSupport classInitializationSupport,
+    public SVMHost createHostVM(OptionValues options, ClassLoader classLoader, ClassInitializationSupport classInitializationSupport,
                     UnsafeAutomaticSubstitutionProcessor automaticSubstitutions, Platform platform) {
-        return new SVMHost(options, buildExecutor, classLoader, classInitializationSupport, automaticSubstitutions, platform);
+        return new SVMHost(options, classLoader, classInitializationSupport, automaticSubstitutions, platform);
     }
 
     public CompileQueue createCompileQueue(DebugContext debug, FeatureHandler featureHandler, HostedUniverse hostedUniverse,
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index ff3fea8a9152..b50974e7d045 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -841,7 +841,7 @@ private void setupNativeImage(String imageName, OptionValues options, Map<Method
                 AnnotationSubstitutionProcessor annotationSubstitutions = createDeclarativeSubstitutionProcessor(originalMetaAccess, loader, classInitializationSupport);
                 CEnumCallWrapperSubstitutionProcessor cEnumProcessor = new CEnumCallWrapperSubstitutionProcessor();
                 aUniverse = createAnalysisUniverse(options, target, loader, originalMetaAccess, originalSnippetReflection, annotationSubstitutions, cEnumProcessor,
-                                classInitializationSupport, Collections.singletonList(harnessSubstitutions), analysisExecutor);
+                                classInitializationSupport, Collections.singletonList(harnessSubstitutions));
 
                 AnalysisMetaAccess aMetaAccess = new SVMAnalysisMetaAccess(aUniverse, originalMetaAccess);
                 AnalysisConstantReflectionProvider aConstantReflection = new AnalysisConstantReflectionProvider(
@@ -891,12 +891,12 @@ private void setAndVerifyMainEntryPoint(AfterRegistrationAccessImpl access, Map<
 
     public static AnalysisUniverse createAnalysisUniverse(OptionValues options, TargetDescription target, ImageClassLoader loader, MetaAccessProvider originalMetaAccess,
                     SnippetReflectionProvider originalSnippetReflection, AnnotationSubstitutionProcessor annotationSubstitutions, SubstitutionProcessor cEnumProcessor,
-                    ClassInitializationSupport classInitializationSupport, List<SubstitutionProcessor> additionalSubstitutions, ForkJoinPool buildExecutor) {
+                    ClassInitializationSupport classInitializationSupport, List<SubstitutionProcessor> additionalSubstitutions) {
         UnsafeAutomaticSubstitutionProcessor automaticSubstitutions = createAutomaticUnsafeSubstitutions(originalSnippetReflection, annotationSubstitutions);
         SubstitutionProcessor aSubstitutions = createAnalysisSubstitutionProcessor(originalMetaAccess, originalSnippetReflection, cEnumProcessor, automaticSubstitutions,
                         annotationSubstitutions, additionalSubstitutions);
 
-        SVMHost hostVM = HostedConfiguration.instance().createHostVM(options, buildExecutor, loader.getClassLoader(), classInitializationSupport, automaticSubstitutions, loader.platform);
+        SVMHost hostVM = HostedConfiguration.instance().createHostVM(options, loader.getClassLoader(), classInitializationSupport, automaticSubstitutions, loader.platform);
 
         automaticSubstitutions.init(loader, originalMetaAccess);
         AnalysisPolicy analysisPolicy = PointstoOptions.AllocationSiteSensitiveHeap.getValue(options) ? new BytecodeSensitiveAnalysisPolicy(options)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
index 083e3b7fdf51..c7416f4be096 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
@@ -43,10 +43,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ForkJoinPool;
 import java.util.function.BiConsumer;
 
-import com.oracle.graal.pointsto.BigBang;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.debug.MethodFilter;
@@ -69,6 +67,7 @@
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.util.GuardedAnnotationAccess;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.api.PointstoOptions;
@@ -125,7 +124,6 @@ public class SVMHost implements HostVM {
     private final Map<String, EnumSet<AnalysisType.UsageKind>> forbiddenTypes;
     private final Platform platform;
     private final OptionValues options;
-    private final ForkJoinPool executor;
     private final ClassLoader classLoader;
     private final ClassInitializationSupport classInitializationSupport;
     private final HostedStringDeduplication stringTable;
@@ -149,10 +147,9 @@ public class SVMHost implements HostVM {
 
     private static final Method getNestHostMethod = JavaVersionUtil.JAVA_SPEC >= 11 ? ReflectionUtil.lookupMethod(Class.class, "getNestHost") : null;
 
-    public SVMHost(OptionValues options, ForkJoinPool executor, ClassLoader classLoader, ClassInitializationSupport classInitializationSupport,
+    public SVMHost(OptionValues options, ClassLoader classLoader, ClassInitializationSupport classInitializationSupport,
                     UnsafeAutomaticSubstitutionProcessor automaticSubstitutions, Platform platform) {
         this.options = options;
-        this.executor = executor;
         this.classLoader = classLoader;
         this.classInitializationSupport = classInitializationSupport;
         this.stringTable = HostedStringDeduplication.singleton();
@@ -211,11 +208,6 @@ public OptionValues options() {
         return options;
     }
 
-    @Override
-    public ForkJoinPool executor() {
-        return executor;
-    }
-
     @Override
     public Instance createGraphBuilderPhase(HostedProviders providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
         return new AnalysisGraphBuilderPhase(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext, providers.getWordTypes());

From 89ae8f909de4d6eb14a13fcd0ed7cb229eff3b0f Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 22 Sep 2021 21:27:56 -0700
Subject: [PATCH 201/681] Guarantee that only the main thread posts tasks
 before start.

---
 .../com/oracle/graal/pointsto/util/CompletionExecutor.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
index 01d9cda71f3a..1618213cb93a 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
@@ -70,6 +70,7 @@ private enum State {
     private BigBang bb;
     private Timing timing;
     private Object vmConfig;
+    private final Thread startingThread;
 
     public interface Timing {
         long getPrintIntervalNanos();
@@ -91,6 +92,7 @@ public CompletionExecutor(BigBang bb, ForkJoinPool forkJoin, Runnable heartbeatC
         postedOperations = new LongAdder();
         completedOperations = new LongAdder();
         postedBeforeStart = new ArrayList<>();
+        startingThread = Thread.currentThread();
     }
 
     public void init() {
@@ -142,6 +144,11 @@ public void execute(DebugContextRunnable command) {
             case UNUSED:
                 throw JVMCIError.shouldNotReachHere();
             case BEFORE_START:
+                /*
+                 * The postedBeforeStart list is not thread safe. Make sure that it is only updated
+                 * from the same thread that created the executor.
+                 */
+                assert Thread.currentThread() == startingThread;
                 postedBeforeStart.add(command);
                 break;
             case STARTED:

From 5b287ed060d7f643e91d72007839019d65eb5484 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 21 Sep 2021 23:17:23 -0700
Subject: [PATCH 202/681] Improve encapsulation.

---
 .../pointsto/util/CompletionExecutor.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
index 1618213cb93a..0f48c2eff19a 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
@@ -62,12 +62,12 @@ private enum State {
     private final LongAdder postedOperations;
     private final LongAdder completedOperations;
     private final List<DebugContextRunnable> postedBeforeStart;
-    private volatile CopyOnWriteArrayList<Throwable> exceptions = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<Throwable> exceptions = new CopyOnWriteArrayList<>();
 
-    public ExecutorService executorService;
+    private ExecutorService executorService;
     private final Runnable heartbeatCallback;
 
-    private BigBang bb;
+    private final BigBang bb;
     private Timing timing;
     private Object vmConfig;
     private final Thread startingThread;
@@ -174,14 +174,14 @@ public void execute(DebugContextRunnable command) {
         }
     }
 
-    public void executeService(DebugContextRunnable command) {
+    private void executeService(DebugContextRunnable command) {
         executorService.execute(() -> {
             executeCommand(command);
         });
     }
 
     @SuppressWarnings("try")
-    public void executeCommand(DebugContextRunnable command) {
+    private void executeCommand(DebugContextRunnable command) {
         bb.getHostVM().installInThread(vmConfig);
         long startTime = 0L;
         if (timing != null) {
@@ -289,10 +289,6 @@ public boolean isStarted() {
         return state.get() == State.STARTED;
     }
 
-    public ExecutorService getExecutorService() {
-        return executorService;
-    }
-
     public int parallelism() {
         if (executorService instanceof ForkJoinPool) {
             return ((ForkJoinPool) executorService).getParallelism();
@@ -307,6 +303,10 @@ public int poolSize() {
         return 1;
     }
 
+    public ExecutorService getExecutorService() {
+        return executorService;
+    }
+
     public void setExecutorService(ExecutorService executorService) {
         this.executorService = executorService;
     }

From 1df971d9abd3a2d5a21907cd5398aaee2af7822c Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 22 Sep 2021 12:34:22 -0700
Subject: [PATCH 203/681] Refactor NativeImagePointsToAnalysis class.

This is not a functional change, just moves code around to make it easier to integrate the new heap scanning.
---
 .../svm/graal/hosted/GraalObjectReplacer.java |  10 +-
 .../svm/hosted/NativeImageGenerator.java      |   3 +-
 .../hosted/analysis/AnnotationsProcessor.java | 109 +++++
 .../analysis/DynamicHubInitializer.java       | 383 ++++++++++++++++
 .../analysis/NativeImagePointsToAnalysis.java | 415 +-----------------
 5 files changed, 506 insertions(+), 414 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/AnnotationsProcessor.java
 create mode 100644 substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java

diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalObjectReplacer.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalObjectReplacer.java
index bc178efa1188..76dcd99d9580 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalObjectReplacer.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalObjectReplacer.java
@@ -64,7 +64,7 @@
 import com.oracle.svm.hosted.SVMHost;
 import com.oracle.svm.hosted.ameta.AnalysisConstantFieldProvider;
 import com.oracle.svm.hosted.ameta.AnalysisConstantReflectionProvider;
-import com.oracle.svm.hosted.analysis.NativeImagePointsToAnalysis;
+import com.oracle.svm.hosted.analysis.AnnotationsProcessor;
 import com.oracle.svm.hosted.meta.HostedConstantFieldProvider;
 import com.oracle.svm.hosted.meta.HostedField;
 import com.oracle.svm.hosted.meta.HostedMethod;
@@ -217,7 +217,7 @@ public synchronized SubstrateMethod createMethod(ResolvedJavaMethod original) {
              * Annotations are updated in every analysis iteration, but this is a starting point. It
              * also ensures that all types used by annotations are created eagerly.
              */
-            sMethod.setAnnotationsEncoding(NativeImagePointsToAnalysis.encodeAnnotations(aMetaAccess, aMethod.getAnnotations(), aMethod.getDeclaredAnnotations(), null));
+            sMethod.setAnnotationsEncoding(AnnotationsProcessor.encodeAnnotations(aMetaAccess, aMethod.getAnnotations(), aMethod.getDeclaredAnnotations(), null));
         }
         return sMethod;
     }
@@ -251,7 +251,7 @@ public synchronized SubstrateField createField(ResolvedJavaField original) {
              * Annotations are updated in every analysis iteration, but this is a starting point. It
              * also ensures that all types used by annotations are created eagerly.
              */
-            sField.setAnnotationsEncoding(NativeImagePointsToAnalysis.encodeAnnotations(aMetaAccess, aField.getAnnotations(), aField.getDeclaredAnnotations(), null));
+            sField.setAnnotationsEncoding(AnnotationsProcessor.encodeAnnotations(aMetaAccess, aField.getAnnotations(), aField.getDeclaredAnnotations(), null));
         }
         return sField;
     }
@@ -378,13 +378,13 @@ public boolean updateDataDuringAnalysis(AnalysisMetaAccess metaAccess) {
         }
 
         for (Map.Entry<AnalysisMethod, SubstrateMethod> entry : methods.entrySet()) {
-            if (entry.getValue().setAnnotationsEncoding(NativeImagePointsToAnalysis.encodeAnnotations(metaAccess, entry.getKey().getAnnotations(), entry.getKey().getDeclaredAnnotations(),
+            if (entry.getValue().setAnnotationsEncoding(AnnotationsProcessor.encodeAnnotations(metaAccess, entry.getKey().getAnnotations(), entry.getKey().getDeclaredAnnotations(),
                             entry.getValue().getAnnotationsEncoding()))) {
                 result = true;
             }
         }
         for (Map.Entry<AnalysisField, SubstrateField> entry : fields.entrySet()) {
-            if (entry.getValue().setAnnotationsEncoding(NativeImagePointsToAnalysis.encodeAnnotations(metaAccess, entry.getKey().getAnnotations(), entry.getKey().getDeclaredAnnotations(),
+            if (entry.getValue().setAnnotationsEncoding(AnnotationsProcessor.encodeAnnotations(metaAccess, entry.getKey().getAnnotations(), entry.getKey().getDeclaredAnnotations(),
                             entry.getValue().getAnnotationsEncoding()))) {
                 result = true;
             }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index b50974e7d045..a8e2aab61753 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -59,6 +59,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import com.oracle.svm.hosted.analysis.SubstrateUnsupportedFeatures;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -1032,7 +1033,7 @@ public static Inflation createBigBang(OptionValues options, TargetDescription ta
         aProviders = new HostedProviders(aMetaAccess, null, aConstantReflection, aConstantFieldProvider, aForeignCalls, aLoweringProvider, aReplacments, aStampProvider,
                         aSnippetReflection, aWordTypes, platformConfig, aMetaAccessExtensionProvider, originalProviders.getLoopsDataProvider());
 
-        return new NativeImagePointsToAnalysis(options, aUniverse, aProviders, annotationSubstitutionProcessor, analysisExecutor, heartbeatCallback);
+        return new NativeImagePointsToAnalysis(options, aUniverse, aProviders, annotationSubstitutionProcessor, analysisExecutor, heartbeatCallback, new SubstrateUnsupportedFeatures());
     }
 
     @SuppressWarnings("try")
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/AnnotationsProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/AnnotationsProcessor.java
new file mode 100644
index 000000000000..4358e8ca8eeb
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/AnnotationsProcessor.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.hosted.analysis;
+
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
+import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.util.AnalysisError;
+import com.oracle.svm.core.hub.AnnotationsEncoding;
+
+public class AnnotationsProcessor {
+
+    public static Object encodeAnnotations(AnalysisMetaAccess metaAccess, Annotation[] allAnnotations, Annotation[] declaredAnnotations, Object oldEncoding) {
+        Object newEncoding;
+        if (allAnnotations.length == 0 && declaredAnnotations.length == 0) {
+            newEncoding = null;
+        } else {
+            Set<Annotation> all = new HashSet<>();
+            Collections.addAll(all, allAnnotations);
+            Collections.addAll(all, declaredAnnotations);
+            final Set<Annotation> usedAnnotations = all.stream()
+                            .filter(a -> {
+                                try {
+                                    AnalysisType annotationClass = metaAccess.lookupJavaType(a.getClass());
+                                    return isAnnotationUsed(annotationClass);
+                                } catch (AnalysisError.TypeNotFoundError e) {
+                                    /*
+                                     * Silently ignore the annotation if its type was not discovered
+                                     * by the static analysis.
+                                     */
+                                    return false;
+                                }
+                            }).collect(Collectors.toSet());
+            Set<Annotation> usedDeclared = filterUsedAnnotation(usedAnnotations, declaredAnnotations);
+            newEncoding = usedAnnotations.size() == 0
+                            ? null
+                            : AnnotationsEncoding.encodeAnnotations(usedAnnotations, usedDeclared);
+        }
+
+        /*
+         * Return newEncoding only if the value is different from oldEncoding. Without this guard,
+         * for tests that do runtime compilation, the field appears as being continuously updated
+         * during BigBang.checkObjectGraph.
+         */
+        if (oldEncoding != null && oldEncoding.equals(newEncoding)) {
+            return oldEncoding;
+        } else {
+            return newEncoding;
+        }
+    }
+
+    /**
+     * We only want annotations in the native image heap that are "used" at run time. In our case,
+     * "used" means that the annotation interface is used at least in a type check. This leaves one
+     * case where Substrate VM behaves differently than a normal Java VM: When you just query the
+     * number of annotations on a class, then we might return a lower number.
+     */
+    private static boolean isAnnotationUsed(AnalysisType annotationType) {
+        if (annotationType.isReachable()) {
+            return true;
+        }
+        assert annotationType.getInterfaces().length == 1 : annotationType;
+
+        AnalysisType annotationInterfaceType = annotationType.getInterfaces()[0];
+        return annotationInterfaceType.isReachable();
+    }
+
+    private static Set<Annotation> filterUsedAnnotation(Set<Annotation> used, Annotation[] rest) {
+        if (rest == null) {
+            return null;
+        }
+
+        Set<Annotation> restUsed = new HashSet<>();
+        for (Annotation a : rest) {
+            if (used.contains(a)) {
+                restUsed.add(a);
+            }
+        }
+        return restUsed;
+    }
+
+}
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
new file mode 100644
index 000000000000..7919db92785d
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.hosted.analysis;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.MalformedParameterizedTypeException;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
+import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
+import com.oracle.graal.pointsto.meta.AnalysisField;
+import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
+import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.meta.AnalysisUniverse;
+import com.oracle.svm.core.hub.AnnotatedSuperInfo;
+import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.core.hub.GenericInfo;
+import com.oracle.svm.core.meta.SubstrateObjectConstant;
+import com.oracle.svm.hosted.SVMHost;
+
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+public class DynamicHubInitializer {
+
+    private final SVMHost hostVM;
+    private final AnalysisUniverse universe;
+    private final AnalysisMetaAccess metaAccess;
+    private final UnsupportedFeatures unsupportedFeatures;
+    private final ConstantReflectionProvider constantReflection;
+
+    private final Map<GenericInterfacesEncodingKey, Type[]> genericInterfacesMap;
+    private final Map<AnnotatedInterfacesEncodingKey, AnnotatedType[]> annotatedInterfacesMap;
+    private final Map<InterfacesEncodingKey, DynamicHub[]> interfacesEncodings;
+
+    public DynamicHubInitializer(AnalysisUniverse universe, AnalysisMetaAccess metaAccess,
+                    UnsupportedFeatures unsupportedFeatures, ConstantReflectionProvider constantReflection) {
+        this.hostVM = (SVMHost) universe.hostVM();
+        this.universe = universe;
+        this.metaAccess = metaAccess;
+        this.unsupportedFeatures = unsupportedFeatures;
+        this.constantReflection = constantReflection;
+
+        this.genericInterfacesMap = new ConcurrentHashMap<>();
+        this.annotatedInterfacesMap = new ConcurrentHashMap<>();
+        this.interfacesEncodings = new ConcurrentHashMap<>();
+    }
+
+    public void initializeMetaData(AnalysisType type) {
+        assert type.isReachable();
+        DynamicHub hub = hostVM.dynamicHub(type);
+        if (hub.getGenericInfo() == null) {
+            fillGenericInfo(type, hub);
+        }
+        if (hub.getAnnotatedSuperInfo() == null) {
+            fillAnnotatedSuperInfo(type, hub);
+        }
+
+        if (type.getJavaKind() == JavaKind.Object) {
+            if (type.isArray()) {
+                hub.getComponentHub().setArrayHub(hub);
+            }
+
+            try {
+                AnalysisType enclosingType = type.getEnclosingType();
+                if (enclosingType != null) {
+                    hub.setEnclosingClass(hostVM.dynamicHub(enclosingType));
+                }
+            } catch (UnsupportedFeatureException ex) {
+                unsupportedFeatures.addMessage(type.toJavaName(true), null, ex.getMessage(), null, ex);
+            }
+
+            if (hub.getInterfacesEncoding() == null) {
+                fillInterfaces(type, hub);
+            }
+
+            /*
+             * Support for Java annotations.
+             */
+            try {
+                /*
+                 * Get the annotations from the wrapped type since AnalysisType.getAnnotations()
+                 * defends against JDK-7183985, and we want to get the original behavior.
+                 */
+                Annotation[] annotations = type.getWrappedWithoutResolve().getAnnotations();
+                Annotation[] declared = type.getWrappedWithoutResolve().getDeclaredAnnotations();
+                hub.setAnnotationsEncoding(AnnotationsProcessor.encodeAnnotations(metaAccess, annotations, declared, hub.getAnnotationsEncoding()));
+            } catch (ArrayStoreException e) {
+                /* If we hit JDK-7183985 just encode the exception. */
+                hub.setAnnotationsEncoding(e);
+            }
+
+            /*
+             * Support for Java enumerations.
+             */
+            if (type.isEnum() && hub.shouldInitEnumConstants()) {
+                if (hostVM.getClassInitializationSupport().shouldInitializeAtRuntime(type)) {
+                    hub.initEnumConstantsAtRuntime(type.getJavaClass());
+                } else {
+                    /*
+                     * We want to retrieve the enum constant array that is maintained as a private
+                     * static field in the enumeration class. We do not want a copy because that
+                     * would mean we have the array twice in the native image: as the static field,
+                     * and in the enumConstant field of DynamicHub. The only way to get the original
+                     * value is via a reflective field access, and we even have to guess the field
+                     * name.
+                     */
+                    AnalysisField found = null;
+                    for (AnalysisField f : type.getStaticFields()) {
+                        if (f.getName().endsWith("$VALUES")) {
+                            if (found != null) {
+                                /*
+                                 * Enumeration has more than one static field with enumeration
+                                 * values. Bailout and use Class.getEnumConstants() to get the value
+                                 * instead.
+                                 */
+                                found = null;
+                                break;
+                            }
+                            found = f;
+                        }
+                    }
+                    Enum<?>[] enumConstants;
+                    if (found == null) {
+                        /*
+                         * We could not find a unique $VALUES field, so we use the value returned by
+                         * Class.getEnumConstants(). This is not ideal since
+                         * Class.getEnumConstants() returns a copy of the array, so we will have two
+                         * arrays with the same content in the image heap, but it is better than
+                         * failing image generation.
+                         */
+                        enumConstants = (Enum<?>[]) type.getJavaClass().getEnumConstants();
+                    } else {
+                        enumConstants = (Enum<?>[]) SubstrateObjectConstant.asObject(constantReflection.readFieldValue(found, null));
+                        assert enumConstants != null;
+                    }
+                    hub.initEnumConstants(enumConstants);
+                }
+            }
+        }
+    }
+
+    static class GenericInterfacesEncodingKey {
+        final Type[] interfaces;
+
+        GenericInterfacesEncodingKey(Type[] aInterfaces) {
+            this.interfaces = aInterfaces;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof GenericInterfacesEncodingKey && Arrays.equals(interfaces, ((GenericInterfacesEncodingKey) obj).interfaces);
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(interfaces);
+        }
+    }
+
+    /** Modified copy of {@link Arrays#equals(Object[], Object[])}. */
+    private static boolean shallowEquals(Object[] a, Object[] a2) {
+        if (a == a2) {
+            return true;
+        } else if (a == null || a2 == null) {
+            return false;
+        }
+        int length = a.length;
+        if (a2.length != length) {
+            return false;
+        }
+        for (int i = 0; i < length; i++) {
+            /* Modification: use reference equality. */
+            if (a[i] != a2[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /** Modified copy of {@link Arrays#hashCode(Object[])}. */
+    private static int shallowHashCode(Object[] a) {
+        if (a == null) {
+            return 0;
+        }
+        int result = 1;
+
+        for (Object element : a) {
+            /* Modification: use identity hash code. */
+            result = 31 * result + System.identityHashCode(element);
+        }
+        return result;
+    }
+
+    static class AnnotatedInterfacesEncodingKey {
+        final AnnotatedType[] interfaces;
+
+        AnnotatedInterfacesEncodingKey(AnnotatedType[] aInterfaces) {
+            this.interfaces = aInterfaces;
+        }
+
+        /*
+         * JDK 12 introduced a broken implementation of hashCode() and equals() for the
+         * implementation classes of annotated types, leading to an infinite recursion. Tracked as
+         * JDK-8224012. As a workaround, we use shallow implementations that only depend on the
+         * identity hash code and reference equality. This is the same behavior as on JDK 8 and JDK
+         * 11 anyway.
+         */
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof AnnotatedInterfacesEncodingKey && shallowEquals(interfaces, ((AnnotatedInterfacesEncodingKey) obj).interfaces);
+        }
+
+        @Override
+        public int hashCode() {
+            return shallowHashCode(interfaces);
+        }
+    }
+
+    private void fillGenericInfo(AnalysisType type, DynamicHub hub) {
+        Class<?> javaClass = type.getJavaClass();
+
+        TypeVariable<?>[] typeParameters = javaClass.getTypeParameters();
+
+        Type[] allGenericInterfaces;
+        try {
+            allGenericInterfaces = javaClass.getGenericInterfaces();
+        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
+            /*
+             * Loading generic interfaces can fail due to missing types. Ignore the exception and
+             * return an empty array.
+             */
+            allGenericInterfaces = new Type[0];
+        }
+
+        Type[] genericInterfaces = Arrays.stream(allGenericInterfaces).filter(this::isTypeAllowed).toArray(Type[]::new);
+        Type[] cachedGenericInterfaces;
+        try {
+            cachedGenericInterfaces = genericInterfacesMap.computeIfAbsent(new GenericInterfacesEncodingKey(genericInterfaces), k -> genericInterfaces);
+        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
+            /*
+             * Computing the hash code of generic interfaces can fail due to missing types. Ignore
+             * the exception and proceed without caching. De-duplication of generic interfaces is an
+             * optimization and not necessary for correctness.
+             */
+            cachedGenericInterfaces = genericInterfaces;
+        }
+
+        Type genericSuperClass;
+        try {
+            genericSuperClass = javaClass.getGenericSuperclass();
+        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
+            /*
+             * Loading the generic super class can fail due to missing types. Ignore the exception
+             * and return null.
+             */
+            genericSuperClass = null;
+        }
+        if (!isTypeAllowed(genericSuperClass)) {
+            genericSuperClass = null;
+        }
+        hub.setGenericInfo(GenericInfo.factory(typeParameters, cachedGenericInterfaces, genericSuperClass));
+    }
+
+    private void fillAnnotatedSuperInfo(AnalysisType type, DynamicHub hub) {
+        Class<?> javaClass = type.getJavaClass();
+
+        AnnotatedType annotatedSuperclass;
+        try {
+            annotatedSuperclass = javaClass.getAnnotatedSuperclass();
+        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
+            /*
+             * Loading the annotated super class can fail due to missing types. Ignore the exception
+             * and return null.
+             */
+            annotatedSuperclass = null;
+        }
+        if (annotatedSuperclass != null && !isTypeAllowed(annotatedSuperclass.getType())) {
+            annotatedSuperclass = null;
+        }
+
+        AnnotatedType[] allAnnotatedInterfaces;
+        try {
+            allAnnotatedInterfaces = javaClass.getAnnotatedInterfaces();
+        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
+            /*
+             * Loading annotated interfaces can fail due to missing types. Ignore the exception and
+             * return an empty array.
+             */
+            allAnnotatedInterfaces = new AnnotatedType[0];
+        }
+
+        AnnotatedType[] annotatedInterfaces = Arrays.stream(allAnnotatedInterfaces)
+                        .filter(ai -> isTypeAllowed(ai.getType())).toArray(AnnotatedType[]::new);
+        AnnotatedType[] cachedAnnotatedInterfaces = annotatedInterfacesMap.computeIfAbsent(
+                        new AnnotatedInterfacesEncodingKey(annotatedInterfaces), k -> annotatedInterfaces);
+        hub.setAnnotatedSuperInfo(AnnotatedSuperInfo.factory(annotatedSuperclass, cachedAnnotatedInterfaces));
+    }
+
+    private boolean isTypeAllowed(Type t) {
+        if (t instanceof Class) {
+            Optional<? extends ResolvedJavaType> resolved = metaAccess.optionalLookupJavaType((Class<?>) t);
+            return resolved.isPresent() && hostVM.platformSupported(universe, resolved.get());
+        }
+        return true;
+    }
+
+    class InterfacesEncodingKey {
+        final AnalysisType[] aInterfaces;
+
+        InterfacesEncodingKey(AnalysisType[] aInterfaces) {
+            this.aInterfaces = aInterfaces;
+        }
+
+        DynamicHub[] createHubs() {
+            DynamicHub[] hubs = new DynamicHub[aInterfaces.length];
+            for (int i = 0; i < hubs.length; i++) {
+                hubs[i] = hostVM.dynamicHub(aInterfaces[i]);
+            }
+            return hubs;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof InterfacesEncodingKey && Arrays.equals(aInterfaces, ((InterfacesEncodingKey) obj).aInterfaces);
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(aInterfaces);
+        }
+    }
+
+    /**
+     * Fill array returned by Class.getInterfaces().
+     */
+    private void fillInterfaces(AnalysisType type, DynamicHub hub) {
+        AnalysisType[] aInterfaces = type.getInterfaces();
+        if (aInterfaces.length == 0) {
+            hub.setInterfacesEncoding(null);
+        } else if (aInterfaces.length == 1) {
+            hub.setInterfacesEncoding(hostVM.dynamicHub(aInterfaces[0]));
+        } else {
+            /*
+             * Many interfaces arrays are the same, e.g., all arrays implement the same two
+             * interfaces. We want to avoid duplicate arrays with the same content in the native
+             * image heap.
+             */
+            hub.setInterfacesEncoding(interfacesEncodings.computeIfAbsent(new InterfacesEncodingKey(aInterfaces), InterfacesEncodingKey::createHubs));
+        }
+    }
+
+}
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
index 58a4f50240b4..5aa4d03db3d4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
@@ -28,56 +28,40 @@
 import static com.oracle.svm.hosted.NativeImageOptions.MaxReachableTypes;
 import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedType;
-import java.lang.reflect.MalformedParameterizedTypeException;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
-import com.oracle.svm.hosted.HostedConfiguration;
 import org.graalvm.compiler.core.common.SuppressSVMWarnings;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.word.WordBase;
 
-import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.ObjectScanner;
 import com.oracle.graal.pointsto.ObjectScanner.ScanReason;
-import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
+import com.oracle.graal.pointsto.PointsToAnalysis;
+import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
 import com.oracle.graal.pointsto.flow.MethodTypeFlow;
 import com.oracle.graal.pointsto.flow.MethodTypeFlowBuilder;
 import com.oracle.graal.pointsto.flow.TypeFlow;
 import com.oracle.graal.pointsto.meta.AnalysisField;
-import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.graal.pointsto.reports.CallTreePrinter;
-import com.oracle.graal.pointsto.util.AnalysisError.TypeNotFoundError;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.UnknownObjectField;
 import com.oracle.svm.core.annotate.UnknownPrimitiveField;
 import com.oracle.svm.core.graal.meta.SubstrateReplacements;
-import com.oracle.svm.core.hub.AnnotatedSuperInfo;
-import com.oracle.svm.core.hub.AnnotationsEncoding;
-import com.oracle.svm.core.hub.DynamicHub;
-import com.oracle.svm.core.hub.GenericInfo;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.hosted.HostedConfiguration;
 import com.oracle.svm.hosted.SVMHost;
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
@@ -88,17 +72,14 @@
 
 public class NativeImagePointsToAnalysis extends PointsToAnalysis implements Inflation {
     private Set<AnalysisField> handledUnknownValueFields;
-    private Map<GenericInterfacesEncodingKey, Type[]> genericInterfacesMap;
-    private Map<AnnotatedInterfacesEncodingKey, AnnotatedType[]> annotatedInterfacesMap;
-    private Map<InterfacesEncodingKey, DynamicHub[]> interfacesEncodings;
 
     private final Pattern illegalCalleesPattern;
     private final Pattern targetCallersPattern;
     private final AnnotationSubstitutionProcessor annotationSubstitutionProcessor;
+    private final DynamicHubInitializer dynamicHubInitializer;
 
     public NativeImagePointsToAnalysis(OptionValues options, AnalysisUniverse universe, HostedProviders providers, AnnotationSubstitutionProcessor annotationSubstitutionProcessor,
-                    ForkJoinPool executor,
-                    Runnable heartbeatCallback) {
+                    ForkJoinPool executor, Runnable heartbeatCallback, UnsupportedFeatures unsupportedFeatures) {
         super(options, universe, providers, universe.hostVM(), executor, heartbeatCallback, new SubstrateUnsupportedFeatures(), SubstrateOptions.parseOnce());
         this.annotationSubstitutionProcessor = annotationSubstitutionProcessor;
 
@@ -109,9 +90,7 @@ public NativeImagePointsToAnalysis(OptionValues options, AnalysisUniverse univer
         illegalCalleesPattern = buildPrefixMatchPattern(illegalCallees);
 
         handledUnknownValueFields = new HashSet<>();
-        genericInterfacesMap = new HashMap<>();
-        annotatedInterfacesMap = new HashMap<>();
-        interfacesEncodings = new HashMap<>();
+        dynamicHubInitializer = new DynamicHubInitializer(universe, metaAccess, unsupportedFeatures, providers.getConstantReflection());
     }
 
     @Override
@@ -122,7 +101,7 @@ public MethodTypeFlowBuilder createMethodTypeFlowBuilder(PointsToAnalysis bb, Me
     @Override
     protected void checkObjectGraph(ObjectScanner objectScanner) {
         universe.getFields().forEach(this::handleUnknownValueField);
-        universe.getTypes().stream().filter(AnalysisType::isReachable).forEach(this::checkType);
+        universe.getTypes().stream().filter(AnalysisType::isReachable).forEach(dynamicHubInitializer::initializeMetaData);
 
         /* Scan hubs of all types that end up in the native image. */
         universe.getTypes().stream().filter(AnalysisType::isReachable).forEach(type -> scanHub(objectScanner, type));
@@ -133,107 +112,10 @@ public SVMHost getHostVM() {
         return (SVMHost) hostVM;
     }
 
-    private void checkType(AnalysisType type) {
-        assert type.isReachable();
-        DynamicHub hub = getHostVM().dynamicHub(type);
-        if (hub.getGenericInfo() == null) {
-            fillGenericInfo(type, hub);
-        }
-        if (hub.getAnnotatedSuperInfo() == null) {
-            fillAnnotatedSuperInfo(type, hub);
-        }
-
-        if (type.getJavaKind() == JavaKind.Object) {
-            if (type.isArray()) {
-                hub.getComponentHub().setArrayHub(hub);
-            }
-
-            try {
-                AnalysisType enclosingType = type.getEnclosingType();
-                if (enclosingType != null) {
-                    hub.setEnclosingClass(getHostVM().dynamicHub(enclosingType));
-                }
-            } catch (UnsupportedFeatureException ex) {
-                getUnsupportedFeatures().addMessage(type.toJavaName(true), null, ex.getMessage(), null, ex);
-            }
-
-            if (hub.getInterfacesEncoding() == null) {
-                fillInterfaces(type, hub);
-            }
-
-            /*
-             * Support for Java annotations.
-             */
-            try {
-                /*
-                 * Get the annotations from the wrapped type since AnalysisType.getAnnotations()
-                 * defends against JDK-7183985 and we want to get the original behavior.
-                 */
-                Annotation[] annotations = type.getWrappedWithoutResolve().getAnnotations();
-                Annotation[] declared = type.getWrappedWithoutResolve().getDeclaredAnnotations();
-                hub.setAnnotationsEncoding(encodeAnnotations(metaAccess, annotations, declared, hub.getAnnotationsEncoding()));
-            } catch (ArrayStoreException e) {
-                /* If we hit JDK-7183985 just encode the exception. */
-                hub.setAnnotationsEncoding(e);
-            }
-
-            /*
-             * Support for Java enumerations.
-             */
-            if (type.isEnum() && hub.shouldInitEnumConstants()) {
-                if (getHostVM().getClassInitializationSupport().shouldInitializeAtRuntime(type)) {
-                    hub.initEnumConstantsAtRuntime(type.getJavaClass());
-                } else {
-                    /*
-                     * We want to retrieve the enum constant array that is maintained as a private
-                     * static field in the enumeration class. We do not want a copy because that
-                     * would mean we have the array twice in the native image: as the static field,
-                     * and in the enumConstant field of DynamicHub. The only way to get the original
-                     * value is via a reflective field access, and we even have to guess the field
-                     * name.
-                     */
-                    AnalysisField found = null;
-                    for (AnalysisField f : type.getStaticFields()) {
-                        if (f.getName().endsWith("$VALUES")) {
-                            if (found != null) {
-                                /*
-                                 * Enumeration has more than one static field with enumeration
-                                 * values. Bailout and use Class.getEnumConstants() to get the value
-                                 * instead.
-                                 */
-                                found = null;
-                                break;
-                            }
-                            found = f;
-                        }
-                    }
-                    Enum<?>[] enumConstants;
-                    if (found == null) {
-                        /*
-                         * We could not find a unique $VALUES field, so we use the value returned by
-                         * Class.getEnumConstants(). This is not ideal since
-                         * Class.getEnumConstants() returns a copy of the array, so we will have two
-                         * arrays with the same content in the image heap, but it is better than
-                         * failing image generation.
-                         */
-                        enumConstants = (Enum<?>[]) type.getJavaClass().getEnumConstants();
-                    } else {
-                        enumConstants = (Enum<?>[]) SubstrateObjectConstant.asObject(getConstantReflectionProvider().readFieldValue(found, null));
-                        assert enumConstants != null;
-                    }
-                    hub.initEnumConstants(enumConstants);
-                }
-            }
-        }
-    }
-
     @Override
     public void cleanupAfterAnalysis() {
         super.cleanupAfterAnalysis();
         handledUnknownValueFields = null;
-        genericInterfacesMap = null;
-        annotatedInterfacesMap = null;
-        interfacesEncodings = null;
     }
 
     @Override
@@ -255,220 +137,6 @@ public AnnotationSubstitutionProcessor getAnnotationSubstitutionProcessor() {
         return annotationSubstitutionProcessor;
     }
 
-    static class GenericInterfacesEncodingKey {
-        final Type[] interfaces;
-
-        GenericInterfacesEncodingKey(Type[] aInterfaces) {
-            this.interfaces = aInterfaces;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof GenericInterfacesEncodingKey && Arrays.equals(interfaces, ((GenericInterfacesEncodingKey) obj).interfaces);
-        }
-
-        @Override
-        public int hashCode() {
-            return Arrays.hashCode(interfaces);
-        }
-    }
-
-    /** Modified copy of {@link Arrays#equals(Object[], Object[])}. */
-    private static boolean shallowEquals(Object[] a, Object[] a2) {
-        if (a == a2) {
-            return true;
-        } else if (a == null || a2 == null) {
-            return false;
-        }
-        int length = a.length;
-        if (a2.length != length) {
-            return false;
-        }
-        for (int i = 0; i < length; i++) {
-            /* Modification: use reference equality. */
-            if (a[i] != a2[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /** Modified copy of {@link Arrays#hashCode(Object[])}. */
-    private static int shallowHashCode(Object[] a) {
-        if (a == null) {
-            return 0;
-        }
-        int result = 1;
-
-        for (Object element : a) {
-            /* Modification: use identity hash code. */
-            result = 31 * result + System.identityHashCode(element);
-        }
-        return result;
-    }
-
-    static class AnnotatedInterfacesEncodingKey {
-        final AnnotatedType[] interfaces;
-
-        AnnotatedInterfacesEncodingKey(AnnotatedType[] aInterfaces) {
-            this.interfaces = aInterfaces;
-        }
-
-        /*
-         * JDK 12 introduced a broken implementation of hashCode() and equals() for the
-         * implementation classes of annotated types, leading to an infinite recursion. Tracked as
-         * JDK-8224012. As a workaround, we use shallow implementations that only depend on the
-         * identity hash code and reference equality. This is the same behavior as on JDK 8 and JDK
-         * 11 anyway.
-         */
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof AnnotatedInterfacesEncodingKey && shallowEquals(interfaces, ((AnnotatedInterfacesEncodingKey) obj).interfaces);
-        }
-
-        @Override
-        public int hashCode() {
-            return shallowHashCode(interfaces);
-        }
-    }
-
-    private void fillGenericInfo(AnalysisType type, DynamicHub hub) {
-        Class<?> javaClass = type.getJavaClass();
-
-        TypeVariable<?>[] typeParameters = javaClass.getTypeParameters();
-
-        Type[] allGenericInterfaces;
-        try {
-            allGenericInterfaces = javaClass.getGenericInterfaces();
-        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
-            /*
-             * Loading generic interfaces can fail due to missing types. Ignore the exception and
-             * return an empty array.
-             */
-            allGenericInterfaces = new Type[0];
-        }
-
-        Type[] genericInterfaces = Arrays.stream(allGenericInterfaces).filter(this::isTypeAllowed).toArray(Type[]::new);
-        Type[] cachedGenericInterfaces;
-        try {
-            cachedGenericInterfaces = genericInterfacesMap.computeIfAbsent(new GenericInterfacesEncodingKey(genericInterfaces), k -> genericInterfaces);
-        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
-            /*
-             * Computing the hash code of generic interfaces can fail due to missing types. Ignore
-             * the exception and proceed without caching. De-duplication of generic interfaces is an
-             * optimization and not necessary for correctness.
-             */
-            cachedGenericInterfaces = genericInterfaces;
-        }
-
-        Type genericSuperClass;
-        try {
-            genericSuperClass = javaClass.getGenericSuperclass();
-        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
-            /*
-             * Loading the generic super class can fail due to missing types. Ignore the exception
-             * and return null.
-             */
-            genericSuperClass = null;
-        }
-        if (!isTypeAllowed(genericSuperClass)) {
-            genericSuperClass = null;
-        }
-        hub.setGenericInfo(GenericInfo.factory(typeParameters, cachedGenericInterfaces, genericSuperClass));
-    }
-
-    private void fillAnnotatedSuperInfo(AnalysisType type, DynamicHub hub) {
-        Class<?> javaClass = type.getJavaClass();
-
-        AnnotatedType annotatedSuperclass;
-        try {
-            annotatedSuperclass = javaClass.getAnnotatedSuperclass();
-        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
-            /*
-             * Loading the annotated super class can fail due to missing types. Ignore the exception
-             * and return null.
-             */
-            annotatedSuperclass = null;
-        }
-        if (annotatedSuperclass != null && !isTypeAllowed(annotatedSuperclass.getType())) {
-            annotatedSuperclass = null;
-        }
-
-        AnnotatedType[] allAnnotatedInterfaces;
-        try {
-            allAnnotatedInterfaces = javaClass.getAnnotatedInterfaces();
-        } catch (MalformedParameterizedTypeException | TypeNotPresentException | LinkageError t) {
-            /*
-             * Loading annotated interfaces can fail due to missing types. Ignore the exception and
-             * return an empty array.
-             */
-            allAnnotatedInterfaces = new AnnotatedType[0];
-        }
-
-        AnnotatedType[] annotatedInterfaces = Arrays.stream(allAnnotatedInterfaces)
-                        .filter(ai -> isTypeAllowed(ai.getType())).toArray(AnnotatedType[]::new);
-        AnnotatedType[] cachedAnnotatedInterfaces = annotatedInterfacesMap.computeIfAbsent(
-                        new AnnotatedInterfacesEncodingKey(annotatedInterfaces), k -> annotatedInterfaces);
-        hub.setAnnotatedSuperInfo(AnnotatedSuperInfo.factory(annotatedSuperclass, cachedAnnotatedInterfaces));
-    }
-
-    private boolean isTypeAllowed(Type t) {
-        if (t instanceof Class) {
-            Optional<? extends ResolvedJavaType> resolved = metaAccess.optionalLookupJavaType((Class<?>) t);
-            return resolved.isPresent() && hostVM.platformSupported(universe, resolved.get());
-        }
-        return true;
-    }
-
-    class InterfacesEncodingKey {
-        final AnalysisType[] aInterfaces;
-
-        InterfacesEncodingKey(AnalysisType[] aInterfaces) {
-            this.aInterfaces = aInterfaces;
-        }
-
-        DynamicHub[] createHubs() {
-            SVMHost svmHost = (SVMHost) hostVM;
-            DynamicHub[] hubs = new DynamicHub[aInterfaces.length];
-            for (int i = 0; i < hubs.length; i++) {
-                hubs[i] = svmHost.dynamicHub(aInterfaces[i]);
-            }
-            return hubs;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj instanceof InterfacesEncodingKey && Arrays.equals(aInterfaces, ((InterfacesEncodingKey) obj).aInterfaces);
-        }
-
-        @Override
-        public int hashCode() {
-            return Arrays.hashCode(aInterfaces);
-        }
-    }
-
-    /**
-     * Fill array returned by Class.getInterfaces().
-     */
-    private void fillInterfaces(AnalysisType type, DynamicHub hub) {
-        SVMHost svmHost = (SVMHost) hostVM;
-
-        AnalysisType[] aInterfaces = type.getInterfaces();
-        if (aInterfaces.length == 0) {
-            hub.setInterfacesEncoding(null);
-        } else if (aInterfaces.length == 1) {
-            hub.setInterfacesEncoding(svmHost.dynamicHub(aInterfaces[0]));
-        } else {
-            /*
-             * Many interfaces arrays are the same, e.g., all arrays implement the same two
-             * interfaces. We want to avoid duplicate arrays with the same content in the native
-             * image heap.
-             */
-            hub.setInterfacesEncoding(interfacesEncodings.computeIfAbsent(new InterfacesEncodingKey(aInterfaces), InterfacesEncodingKey::createHubs));
-        }
-    }
-
     private void scanHub(ObjectScanner objectScanner, AnalysisType type) {
         SVMHost svmHost = (SVMHost) hostVM;
         JavaConstant hubConstant = SubstrateObjectConstant.forObject(svmHost.dynamicHub(type));
@@ -596,75 +264,6 @@ private void handleUnknownObjectField(AnalysisField aField, AnalysisType... decl
         }
     }
 
-    private static Set<Annotation> filterUsedAnnotation(Set<Annotation> used, Annotation[] rest) {
-        if (rest == null) {
-            return null;
-        }
-
-        Set<Annotation> restUsed = new HashSet<>();
-        for (Annotation a : rest) {
-            if (used.contains(a)) {
-                restUsed.add(a);
-            }
-        }
-        return restUsed;
-    }
-
-    public static Object encodeAnnotations(AnalysisMetaAccess metaAccess, Annotation[] allAnnotations, Annotation[] declaredAnnotations, Object oldEncoding) {
-        Object newEncoding;
-        if (allAnnotations.length == 0 && declaredAnnotations.length == 0) {
-            newEncoding = null;
-        } else {
-            Set<Annotation> all = new HashSet<>();
-            Collections.addAll(all, allAnnotations);
-            Collections.addAll(all, declaredAnnotations);
-            final Set<Annotation> usedAnnotations = all.stream()
-                            .filter(a -> {
-                                try {
-                                    AnalysisType annotationClass = metaAccess.lookupJavaType(a.getClass());
-                                    return isAnnotationUsed(annotationClass);
-                                } catch (TypeNotFoundError e) {
-                                    /*
-                                     * Silently ignore the annotation if its type was not discovered
-                                     * by the static analysis.
-                                     */
-                                    return false;
-                                }
-                            }).collect(Collectors.toSet());
-            Set<Annotation> usedDeclared = filterUsedAnnotation(usedAnnotations, declaredAnnotations);
-            newEncoding = usedAnnotations.size() == 0
-                            ? null
-                            : AnnotationsEncoding.encodeAnnotations(usedAnnotations, usedDeclared);
-        }
-
-        /*
-         * Return newEncoding only if the value is different from oldEncoding. Without this guard,
-         * for tests that do runtime compilation, the field appears as being continuously updated
-         * during BigBang.checkObjectGraph.
-         */
-        if (oldEncoding != null && oldEncoding.equals(newEncoding)) {
-            return oldEncoding;
-        } else {
-            return newEncoding;
-        }
-    }
-
-    /**
-     * We only want annotations in the native image heap that are "used" at run time. In our case,
-     * "used" means that the annotation interface is used at least in a type check. This leaves one
-     * case where Substrate VM behaves differently than a normal Java VM: When you just query the
-     * number of annotations on a class, then we might return a lower number.
-     */
-    private static boolean isAnnotationUsed(AnalysisType annotationType) {
-        if (annotationType.isReachable()) {
-            return true;
-        }
-        assert annotationType.getInterfaces().length == 1 : annotationType;
-
-        AnalysisType annotationInterfaceType = annotationType.getInterfaces()[0];
-        return annotationInterfaceType.isReachable();
-    }
-
     public static ResolvedJavaType toWrappedType(ResolvedJavaType type) {
         if (type instanceof AnalysisType) {
             return ((AnalysisType) type).getWrappedWithoutResolve();

From e30a5b148d7d957a766b1ddf60e4414523da6bf4 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 20:35:45 +0200
Subject: [PATCH 204/681] First version of Class Hierarchy Oracle API

---
 .../hierarchy/ClassHierarchyOracle.java       | 59 +++++++++++++++++++
 .../hierarchy/LeafTypeAssumption.java         | 34 +++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/LeafTypeAssumption.java

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
new file mode 100644
index 000000000000..934585f00ec1
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.analysis.hierarchy;
+
+import com.oracle.truffle.espresso.impl.ObjectKlass;
+import com.oracle.truffle.espresso.runtime.EspressoContext;
+
+/**
+ * {@code ClassHierarchyOracle} provides information about class hierarchy in the guest code,
+ * evolving as new classes are loaded. The oracle is safe, i.e. its answers never cause incorrect
+ * optimizations, but not necessarily precise (e.g. may not detect an effectively leaf type).
+ * <p>
+ * The oracle is only valid within an {@link EspressoContext}.
+ */
+public interface ClassHierarchyOracle {
+    /**
+     * Must be called to initialize {@link ObjectKlass#leafTypeAssumption} of {@code newKlass}.
+     *
+     * @param newKlass -- newly created class
+     * @return the assumption, indicating whether the class is a leaf in class hierarchy.
+     */
+    LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass);
+
+    /**
+     * Must be called when {@code newKlass} is initialized. Communicates to the oracle that
+     * instances of this class might exist, which changes the class hierarchy.
+     *
+     * @param newKlass -- newly initialized class
+     */
+    void onClassInit(ObjectKlass newKlass);
+
+    /**
+     * @return the assumption, valid iff {@code klass} is a leaf in class hierarchy. Automatically
+     *         invalidated in {@link #onClassInit(ObjectKlass)} when a child of {@code klass} is
+     *         initialized.
+     */
+    LeafTypeAssumption isLeafClass(ObjectKlass klass);
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/LeafTypeAssumption.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/LeafTypeAssumption.java
new file mode 100644
index 000000000000..4b579587386d
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/LeafTypeAssumption.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.analysis.hierarchy;
+
+import com.oracle.truffle.api.Assumption;
+
+/**
+ * A wrapper around {@link Assumption}. Ensures that class hierarchy assumptions are managed
+ * exclusively by {@link ClassHierarchyOracle}.
+ */
+public interface LeafTypeAssumption {
+    Assumption getAssumption();
+}

From a6052642650e1197cbdd09d996d664fe5cacce4e Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 20:38:16 +0200
Subject: [PATCH 205/681] Create a simplistic class hierarchy oracle

This oracle marks final and only final classes as leaf.
Introduce leafTypeAssumption in ObjectKlass and use the
oracle to initialize it. Keep an instance of oracle in
the espresso context.
---
 .../hierarchy/NoOpClassHierarchyOracle.java   | 77 +++++++++++++++++++
 .../truffle/espresso/impl/ObjectKlass.java    | 16 ++++
 .../espresso/runtime/EspressoContext.java     |  8 ++
 3 files changed, 101 insertions(+)
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
new file mode 100644
index 000000000000..a355d80aab6d
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.analysis.hierarchy;
+
+import com.oracle.truffle.api.Assumption;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.espresso.impl.ObjectKlass;
+
+/**
+ * An implementation of {@link ClassHierarchyOracle} which simply checks {@code final} modifier of a
+ * class.
+ */
+public class NoOpClassHierarchyOracle implements ClassHierarchyOracle {
+    protected static class LeafTypeAssumptionImpl implements LeafTypeAssumption {
+        private final Assumption underlying;
+
+        private LeafTypeAssumptionImpl(String assumptionName) {
+            underlying = Truffle.getRuntime().createAssumption(assumptionName);
+        }
+
+        LeafTypeAssumptionImpl(ObjectKlass klass) {
+            this(klass.getNameAsString() + " is a leaf type");
+        }
+
+        protected static LeafTypeAssumptionImpl createAndInvalidate(String name) {
+            LeafTypeAssumptionImpl instance = new LeafTypeAssumptionImpl(name);
+            instance.getAssumption().invalidate();
+            return instance;
+        }
+
+        @Override
+        public Assumption getAssumption() {
+            return underlying;
+        }
+    }
+
+    protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl("final class is always a CHA leaf");
+    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.createAndInvalidate("invalid");
+
+    @Override
+    public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
+        if (newKlass.isFinalFlagSet()) {
+            return FinalIsAlwaysLeaf;
+        }
+        return NotLeaf;
+    }
+
+    @Override
+    public void onClassInit(ObjectKlass newKlass) {
+    }
+
+    @Override
+    public LeafTypeAssumption isLeafClass(ObjectKlass klass) {
+        return klass.getLeafTypeAssumption();
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
index 4fbc1d1c4d23..8cae9b3c347a 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
@@ -46,6 +46,8 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.espresso.analysis.hierarchy.LeafTypeAssumption;
+import com.oracle.truffle.espresso.analysis.hierarchy.ClassHierarchyOracle;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
 import com.oracle.truffle.espresso.classfile.RuntimeConstantPool;
 import com.oracle.truffle.espresso.classfile.attributes.ConstantValueAttribute;
@@ -141,6 +143,8 @@ public final class ObjectKlass extends Klass {
 
     private final StaticObject definingClassLoader;
 
+    private final LeafTypeAssumption leafTypeAssumption;
+
     public Attribute getAttribute(Symbol<Name> attrName) {
         return getLinkedKlass().getAttribute(attrName);
     }
@@ -229,6 +233,7 @@ public ObjectKlass(EspressoContext context, LinkedKlass linkedKlass, ObjectKlass
             initSelfReferenceInPool();
         }
 
+        this.leafTypeAssumption = getContext().getClassHierarchyOracle().createAssumptionForClass(this);
         this.initState = LOADED;
         assert verifyTables();
     }
@@ -390,6 +395,7 @@ private void actualInit() {
                 throw e;
             }
             checkErroneousInitialization();
+            getContext().getClassHierarchyOracle().onClassInit(this);
             initState = INITIALIZED;
             assert isInitialized();
         }
@@ -1399,6 +1405,16 @@ public void removeByRedefinition() {
         }
     }
 
+    /**
+     * @return the assumption, indicating if this class is a leaf in class hierarchy. This
+     *         assumption must only be used by {@link ClassHierarchyOracle}, other users must use
+     *         {@link ClassHierarchyOracle#isLeafClass(ObjectKlass)}. The assumption is stored in
+     *         ObjectKlass for easy mapping between classes and corresponding assumptions.
+     */
+    public LeafTypeAssumption getLeafTypeAssumption() {
+        return leafTypeAssumption;
+    }
+
     public final class KlassVersion {
         final Assumption assumption;
         final RuntimeConstantPool pool;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
index 70771e74d2e5..23257795d668 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
@@ -66,6 +66,8 @@
 import com.oracle.truffle.espresso.EspressoLanguage;
 import com.oracle.truffle.espresso.EspressoOptions;
 import com.oracle.truffle.espresso.FinalizationSupport;
+import com.oracle.truffle.espresso.analysis.hierarchy.ClassHierarchyOracle;
+import com.oracle.truffle.espresso.analysis.hierarchy.NoOpClassHierarchyOracle;
 import com.oracle.truffle.espresso.descriptors.Names;
 import com.oracle.truffle.espresso.descriptors.Signatures;
 import com.oracle.truffle.espresso.descriptors.Symbol;
@@ -129,6 +131,7 @@ public final class EspressoContext {
     private final ClassRegistries registries;
     private final Substitutions substitutions;
     private final MethodHandleIntrinsics methodHandleIntrinsics;
+    private final ClassHierarchyOracle classHierarchyOracle;
     // endregion Runtime
 
     // region Helpers
@@ -293,6 +296,7 @@ public EspressoContext(TruffleLanguage.Env env, EspressoLanguage language) {
 
         this.vmArguments = buildVmArguments();
         this.jdwpContext = new JDWPContextImpl(this);
+        this.classHierarchyOracle = new NoOpClassHierarchyOracle();
     }
 
     private static Set<String> knownSingleThreadedLanguages(TruffleLanguage.Env env) {
@@ -1016,4 +1020,8 @@ public void rerunclinit(ObjectKlass oldKlass) {
     public static EspressoContext get(Node node) {
         return REFERENCE.get(node);
     }
+
+    public ClassHierarchyOracle getClassHierarchyOracle() {
+        return classHierarchyOracle;
+    }
 }

From b2387e2c95c89d05a7a2f55f9335423869c7b1ed Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 20:43:32 +0200
Subject: [PATCH 206/681] Create a class hierarchy oracle which keeps track of
 currently leaf classes

---
 .../DefaultClassHierarchyOracle.java          | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
new file mode 100644
index 000000000000..152092b223cd
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.analysis.hierarchy;
+
+import com.oracle.truffle.espresso.impl.ObjectKlass;
+
+/**
+ * Computes the classes that are effectively final by keeping track of currently loaded classes. To
+ * compute currently leaf classes, it creates {@link ObjectKlass#leafTypeAssumption} in the
+ * {@link ObjectKlass} constructor and invalidates it when a descendant of this class is
+ * initialized.
+ */
+public class DefaultClassHierarchyOracle extends NoOpClassHierarchyOracle implements ClassHierarchyOracle {
+    @Override
+    public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
+        if (newKlass.isFinalFlagSet()) {
+            return FinalIsAlwaysLeaf;
+        }
+        if (newKlass.isAbstract() || newKlass.isInterface()) {
+            return NotLeaf;
+        }
+        return new LeafTypeAssumptionImpl(newKlass);
+    }
+
+    /**
+     * Marks all ancestors of {@code newClass} as non-leaf.
+     *
+     * @param newClass -- newly initialized class.
+     */
+    @Override
+    public void onClassInit(ObjectKlass newClass) {
+        ObjectKlass currentParent = newClass.getSuperKlass();
+        while (currentParent.getLeafTypeAssumption().getAssumption().isValid()) {
+            currentParent.getLeafTypeAssumption().getAssumption().invalidate();
+            currentParent = currentParent.getSuperKlass();
+        }
+    }
+}

From f75cdc2c00e0cbc286e70f5e3721434f26c12541 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 20:44:11 +0200
Subject: [PATCH 207/681] Use class hierarchy oracle to optimize instanceof
 check

---
 .../espresso/nodes/bytecodes/InstanceOf.java       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
index c618635b0c69..f6aaa7710323 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
@@ -22,6 +22,7 @@
  */
 package com.oracle.truffle.espresso.nodes.bytecodes;
 
+import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -221,12 +222,23 @@ boolean doFallback(Klass maybeSubtype) {
     abstract static class ConstantClass extends InstanceOf {
 
         private final ObjectKlass superType;
+        protected final Assumption superTypeIsLeaf;
 
         ConstantClass(ObjectKlass superType) {
             this.superType = superType;
+            this.superTypeIsLeaf = EspressoContext.get(this).getClassHierarchyOracle().isLeafClass(this.superType).getAssumption();
         }
 
-        @Specialization
+        /**
+         * If {@code superType} is a leaf type, {@code maybeSubtype} is a subtype of
+         * {@code superType} iff it is equal to {@code superType}.
+         */
+        @Specialization(assumptions = "superTypeIsLeaf")
+        public boolean doLeaf(ObjectKlass maybeSubtype) {
+            return superType == maybeSubtype;
+        }
+
+        @Specialization(guards = "!superTypeIsLeaf.isValid()")
         public boolean doObjectKlass(ObjectKlass maybeSubtype) {
             return superType == maybeSubtype || superType.checkOrdinaryClassSubclassing(maybeSubtype);
         }

From 35e00f0b5b094f8398dc5abaa131f38ae1d69f61 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 20:45:49 +0200
Subject: [PATCH 208/681] Rename isLeaf method of Klass to hasNoSubtypes to
 avoid confusion with CHA oracle's method

---
 .../src/com/oracle/truffle/espresso/impl/Klass.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
index ccb341aa9b16..7c5c3cbfa91b 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
@@ -742,7 +742,7 @@ public final boolean isPrimitive() {
      * The setting of the final bit for types is a bit confusing since arrays are marked as final.
      * This method provides a semantically equivalent test that appropriate for types.
      */
-    public boolean isLeaf() {
+    public boolean hasNoSubtypes() {
         return getElementalType().isFinalFlagSet();
     }
 

From 38ca47f6273385daf6d32800cdc5f664ca471614 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 21:02:23 +0200
Subject: [PATCH 209/681] Update docs of CHA oracles: avoid referring to
 private field of ObjectKlass

---
 .../espresso/analysis/hierarchy/ClassHierarchyOracle.java    | 2 +-
 .../analysis/hierarchy/DefaultClassHierarchyOracle.java      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
index 934585f00ec1..384aa24312d2 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
@@ -35,7 +35,7 @@
  */
 public interface ClassHierarchyOracle {
     /**
-     * Must be called to initialize {@link ObjectKlass#leafTypeAssumption} of {@code newKlass}.
+     * Must be called to initialize {@code leafTypeAssumption} of {@code newKlass}.
      *
      * @param newKlass -- newly created class
      * @return the assumption, indicating whether the class is a leaf in class hierarchy.
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
index 152092b223cd..4c56c048f3ba 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
@@ -27,9 +27,8 @@
 
 /**
  * Computes the classes that are effectively final by keeping track of currently loaded classes. To
- * compute currently leaf classes, it creates {@link ObjectKlass#leafTypeAssumption} in the
- * {@link ObjectKlass} constructor and invalidates it when a descendant of this class is
- * initialized.
+ * compute currently leaf classes, it creates {@code leafTypeAssumption} in the {@link ObjectKlass}
+ * constructor and invalidates it when a descendant of this class is initialized.
  */
 public class DefaultClassHierarchyOracle extends NoOpClassHierarchyOracle implements ClassHierarchyOracle {
     @Override

From fcd86719ce1add1705cd16dfad9607068d886d93 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 28 Sep 2021 21:33:12 +0200
Subject: [PATCH 210/681] Create a single instance of always invalid
 LeafTypeAssumption instead of providing a method

---
 .../analysis/hierarchy/NoOpClassHierarchyOracle.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
index a355d80aab6d..aad597b94058 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -34,6 +34,10 @@
 public class NoOpClassHierarchyOracle implements ClassHierarchyOracle {
     protected static class LeafTypeAssumptionImpl implements LeafTypeAssumption {
         private final Assumption underlying;
+        static final LeafTypeAssumption AlwaysInvalid = new LeafTypeAssumptionImpl("invalid");
+        static {
+            AlwaysInvalid.getAssumption().invalidate();
+        }
 
         private LeafTypeAssumptionImpl(String assumptionName) {
             underlying = Truffle.getRuntime().createAssumption(assumptionName);
@@ -43,12 +47,6 @@ private LeafTypeAssumptionImpl(String assumptionName) {
             this(klass.getNameAsString() + " is a leaf type");
         }
 
-        protected static LeafTypeAssumptionImpl createAndInvalidate(String name) {
-            LeafTypeAssumptionImpl instance = new LeafTypeAssumptionImpl(name);
-            instance.getAssumption().invalidate();
-            return instance;
-        }
-
         @Override
         public Assumption getAssumption() {
             return underlying;
@@ -56,7 +54,7 @@ public Assumption getAssumption() {
     }
 
     protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl("final class is always a CHA leaf");
-    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.createAndInvalidate("invalid");
+    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.AlwaysInvalid;
 
     @Override
     public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {

From 024dff077841db766d74efed2cad61f19a71ea7b Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 28 Sep 2021 14:22:15 -0700
Subject: [PATCH 211/681] Compute AnalysisType.subTypes continuously, as the
 universe expands.

---
 .../graal/pointsto/meta/AnalysisType.java     | 34 +++++++++--
 .../graal/pointsto/meta/AnalysisUniverse.java | 57 +++++--------------
 .../com/oracle/svm/hosted/FeatureImpl.java    |  5 +-
 .../svm/hosted/NativeImageGenerator.java      |  5 +-
 4 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
index 3d5b37141f7b..3e48a52596eb 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -103,9 +103,8 @@ public class AnalysisType implements WrappedJavaType, OriginalClassProvider, Com
      */
     private volatile ConcurrentHashMap<UnsafePartitionKind, Collection<AnalysisField>> unsafeAccessedFields;
 
-    private static final AnalysisType[] EMPTY_ARRAY = {};
-
-    AnalysisType[] subTypes;
+    /** Immediate subtypes and this type itself. */
+    private final Set<AnalysisType> subTypes;
     AnalysisType superClass;
 
     private final int id;
@@ -143,7 +142,7 @@ public class AnalysisType implements WrappedJavaType, OriginalClassProvider, Com
     private final AnalysisType[] interfaces;
 
     /* isArray is an expensive operation so we eagerly compute it */
-    private boolean isArray;
+    private final boolean isArray;
 
     private final int dimension;
 
@@ -181,10 +180,24 @@ public enum UsageKind {
              */
         }
 
-        subTypes = EMPTY_ARRAY;
         /* Ensure the super types as well as the component type (for arrays) is created too. */
         superClass = universe.lookup(wrapped.getSuperclass());
         interfaces = convertTypes(wrapped.getInterfaces());
+
+        subTypes = ConcurrentHashMap.newKeySet();
+        addSubType(this);
+
+        /* Build subtypes. */
+        if (superClass != null) {
+            superClass.addSubType(this);
+        }
+        if (isInterface() && interfaces.length == 0) {
+            objectType.addSubType(this);
+        }
+        for (AnalysisType interf : interfaces) {
+            interf.addSubType(this);
+        }
+
         if (isArray()) {
             this.componentType = universe.lookup(wrapped.getComponentType());
             int dim = 0;
@@ -787,6 +800,15 @@ public ResolvedJavaType getSingleImplementor() {
         return this;
     }
 
+    /** Get the immediate subtypes, including this type itself. */
+    public Set<AnalysisType> getSubTypes() {
+        return subTypes;
+    }
+
+    private void addSubType(AnalysisType subType) {
+        this.subTypes.add(subType);
+    }
+
     @Override
     public AnalysisType findLeastCommonAncestor(ResolvedJavaType otherType) {
         ResolvedJavaType subst = universe.substitutions.resolve(((AnalysisType) otherType).wrapped);
@@ -813,7 +835,7 @@ public ResolvedJavaType getElementalType() {
     }
 
     public boolean hasSubTypes() {
-        return subTypes != null ? subTypes.length > 0 : false;
+        return subTypes.size() > 0;
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
index 3131af28bfa6..49637e572588 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
@@ -28,7 +28,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -161,7 +160,6 @@ public boolean sealed() {
 
     public void setAnalysisDataValid(boolean dataIsValid) {
         if (dataIsValid) {
-            buildSubTypes();
             collectMethodImplementations();
         }
         analysisDataValid = dataIsValid;
@@ -574,35 +572,6 @@ public Object replaceObject(Object source) {
         return destination;
     }
 
-    public void buildSubTypes() {
-        Map<AnalysisType, Set<AnalysisType>> allSubTypes = new HashMap<>();
-        AnalysisType objectType = null;
-        for (AnalysisType type : getTypes()) {
-            allSubTypes.put(type, new HashSet<>());
-            if (type.isInstanceClass() && type.getSuperclass() == null) {
-                objectType = type;
-            }
-        }
-        assert objectType != null;
-
-        for (AnalysisType type : getTypes()) {
-            if (type.getSuperclass() != null) {
-                allSubTypes.get(type.getSuperclass()).add(type);
-            }
-            if (type.isInterface() && type.getInterfaces().length == 0) {
-                allSubTypes.get(objectType).add(type);
-            }
-            for (AnalysisType interf : type.getInterfaces()) {
-                allSubTypes.get(interf).add(type);
-            }
-        }
-
-        for (AnalysisType type : getTypes()) {
-            Set<AnalysisType> subTypesSet = allSubTypes.get(type);
-            type.subTypes = subTypesSet.toArray(new AnalysisType[subTypesSet.size()]);
-        }
-    }
-
     private void collectMethodImplementations() {
         for (AnalysisMethod method : methods.values()) {
 
@@ -629,9 +598,12 @@ public static Set<AnalysisMethod> getMethodImplementations(BigBang bb, AnalysisM
     }
 
     private static boolean collectMethodImplementations(AnalysisMethod method, AnalysisType holder, Set<AnalysisMethod> implementations, boolean includeInlinedMethods) {
-        assert holder.subTypes != null : holder;
         boolean holderOrSubtypeInstantiated = holder.isInstantiated();
-        for (AnalysisType subClass : holder.subTypes) {
+        for (AnalysisType subClass : holder.getSubTypes()) {
+            if (subClass.equals(holder)) {
+                /* Subtypes include the holder type itself. The holder is processed below. */
+                continue;
+            }
             holderOrSubtypeInstantiated |= collectMethodImplementations(method, subClass, implementations, includeInlinedMethods);
         }
 
@@ -654,21 +626,22 @@ private static boolean collectMethodImplementations(AnalysisMethod method, Analy
         return holderOrSubtypeInstantiated;
     }
 
-    public static Set<AnalysisType> getSubtypes(AnalysisType baseType) {
-        LinkedHashSet<AnalysisType> result = new LinkedHashSet<>();
-        result.add(baseType);
+    /**
+     * Collect and returns *all* subtypes of this type, not only the immediate subtypes. The
+     * immediate sub-types are updated continuously as the universe is expanded and can be accessed
+     * using {@link AnalysisType#getSubTypes()}.
+     */
+    public static Set<AnalysisType> getAllSubtypes(AnalysisType baseType) {
+        HashSet<AnalysisType> result = new HashSet<>();
         collectSubtypes(baseType, result);
         return result;
     }
 
     private static void collectSubtypes(AnalysisType baseType, Set<AnalysisType> result) {
-        assert baseType.subTypes != null : baseType;
-        for (AnalysisType subType : baseType.subTypes) {
-            if (result.contains(subType)) {
-                continue;
+        for (AnalysisType subType : baseType.getSubTypes()) {
+            if (result.add(subType)) {
+                collectSubtypes(subType, result);
             }
-            result.add(subType);
-            collectSubtypes(subType, result);
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
index f1bf9e8e0ad8..f2ca7753b5c2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
@@ -35,6 +35,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -227,11 +228,11 @@ public boolean isReachable(AnalysisMethod method) {
 
         public Set<Class<?>> reachableSubtypes(Class<?> baseClass) {
             return reachableSubtypes(getMetaAccess().lookupJavaType(baseClass)).stream()
-                            .map(AnalysisType::getJavaClass).collect(Collectors.toCollection(LinkedHashSet::new));
+                            .map(AnalysisType::getJavaClass).collect(Collectors.toCollection(HashSet::new));
         }
 
         Set<AnalysisType> reachableSubtypes(AnalysisType baseType) {
-            Set<AnalysisType> result = AnalysisUniverse.getSubtypes(baseType);
+            Set<AnalysisType> result = AnalysisUniverse.getAllSubtypes(baseType);
             result.removeIf(t -> !isReachable(t));
             return result;
         }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index a8e2aab61753..5ef607941bab 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -59,7 +59,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import com.oracle.svm.hosted.analysis.SubstrateUnsupportedFeatures;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -226,6 +225,7 @@
 import com.oracle.svm.hosted.analysis.Inflation;
 import com.oracle.svm.hosted.analysis.NativeImagePointsToAnalysis;
 import com.oracle.svm.hosted.analysis.SVMAnalysisMetaAccess;
+import com.oracle.svm.hosted.analysis.SubstrateUnsupportedFeatures;
 import com.oracle.svm.hosted.annotation.AnnotationSupport;
 import com.oracle.svm.hosted.c.CAnnotationProcessorCache;
 import com.oracle.svm.hosted.c.CConstantValueSupportImpl;
@@ -845,6 +845,9 @@ private void setupNativeImage(String imageName, OptionValues options, Map<Method
                                 classInitializationSupport, Collections.singletonList(harnessSubstitutions));
 
                 AnalysisMetaAccess aMetaAccess = new SVMAnalysisMetaAccess(aUniverse, originalMetaAccess);
+                /* Make sure that Object type is added to the universe before any other types. */
+                aMetaAccess.lookupJavaType(Object.class);
+
                 AnalysisConstantReflectionProvider aConstantReflection = new AnalysisConstantReflectionProvider(
                                 aUniverse, aMetaAccess, originalProviders.getConstantReflection(), classInitializationSupport);
                 WordTypes aWordTypes = new SubstrateWordTypes(aMetaAccess, FrameAccess.getWordKind());

From 4a1ad4fac26740d9a3aec737e79be946d2ae4a81 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 22 Sep 2021 15:39:02 -0700
Subject: [PATCH 212/681] Extract ObjectScanningObserver interface.

---
 .../graal/pointsto/AnalysisObjectScanner.java | 102 +------------
 .../AnalysisObjectScanningObserver.java       | 139 ++++++++++++++++++
 .../oracle/graal/pointsto/ObjectScanner.java  |  55 ++-----
 .../pointsto/ObjectScanningObserver.java      |  75 ++++++++++
 .../reports/AnalysisHeapHistogramPrinter.java |  65 ++++----
 .../pointsto/reports/ObjectTreePrinter.java   | 132 +++++++++--------
 6 files changed, 333 insertions(+), 235 deletions(-)
 create mode 100644 substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
 create mode 100644 substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanningObserver.java

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanner.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanner.java
index f7ab722b8ca1..2f1d0f066323 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanner.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanner.java
@@ -24,111 +24,11 @@
  */
 package com.oracle.graal.pointsto;
 
-import com.oracle.graal.pointsto.flow.ArrayElementsTypeFlow;
-import com.oracle.graal.pointsto.flow.FieldTypeFlow;
-import com.oracle.graal.pointsto.flow.context.object.AnalysisObject;
-import com.oracle.graal.pointsto.meta.AnalysisField;
-import com.oracle.graal.pointsto.meta.AnalysisType;
-import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
 
-import jdk.vm.ci.meta.JavaConstant;
-
 public class AnalysisObjectScanner extends ObjectScanner {
 
     public AnalysisObjectScanner(BigBang bb, CompletionExecutor executor, ReusableSet scannedObjects) {
-        super(bb, executor, scannedObjects);
-    }
-
-    @Override
-    public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
-        if (!field.isWritten()) {
-            field.registerAsWritten(null);
-        }
-    }
-
-    @Override
-    public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
-        FieldTypeFlow fieldTypeFlow = getFieldTypeFlow(field, receiver);
-        if (!fieldTypeFlow.getState().canBeNull()) {
-            /* Signal that the field can contain null. */
-            fieldTypeFlow.addState(getAnalysis(), TypeState.forNull());
-        }
-    }
-
-    @Override
-    public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
-        PointsToAnalysis analysis = getAnalysis();
-        AnalysisType fieldType = analysis.getMetaAccess().lookupJavaType(analysis.getSnippetReflectionProvider().asObject(Object.class, fieldValue).getClass());
-        assert fieldType.isInstantiated() : fieldType;
-
-        /* Add the constant value object to the field's type flow. */
-        FieldTypeFlow fieldTypeFlow = getFieldTypeFlow(field, receiver);
-        AnalysisObject constantObject = bb.analysisPolicy().createConstantObject(analysis, fieldValue, fieldType);
-        if (!fieldTypeFlow.getState().containsObject(constantObject)) {
-            /* Add the new constant to the field's flow state. */
-            TypeState constantTypeState = TypeState.forNonNullObject(analysis, constantObject);
-            fieldTypeFlow.addState(analysis, constantTypeState);
-        }
-    }
-
-    /** Get the field type flow give a receiver. */
-    private FieldTypeFlow getFieldTypeFlow(AnalysisField field, JavaConstant receiver) {
-        /* The field type flow is used to track the constant field value. */
-        if (field.isStatic()) {
-            /* If the field is static it comes from the originalRoots. */
-            return field.getStaticFieldFlow();
-        } else {
-            /*
-             * The field comes from a constant scan, thus it's type flow is mapped to the unique
-             * constant object.
-             */
-            PointsToAnalysis analysis = getAnalysis();
-            AnalysisType receiverType = analysis.getMetaAccess().lookupJavaType(analysis.getSnippetReflectionProvider().asObject(Object.class, receiver).getClass());
-            AnalysisObject constantReceiverObj = analysis.analysisPolicy().createConstantObject(analysis, receiver, receiverType);
-            return constantReceiverObj.getInstanceFieldFlow(analysis, field, true);
-        }
-    }
-
-    @Override
-    public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex) {
-        ArrayElementsTypeFlow arrayObjElementsFlow = getArrayElementsFlow(array, arrayType);
-        if (!arrayObjElementsFlow.getState().canBeNull()) {
-            /* Signal that the constant array can contain null. */
-            arrayObjElementsFlow.addState(getAnalysis(), TypeState.forNull());
-        }
-    }
-
-    @Override
-    public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex) {
-        assert elementType.isInstantiated() : elementType;
-        ArrayElementsTypeFlow arrayObjElementsFlow = getArrayElementsFlow(array, arrayType);
-        PointsToAnalysis analysis = getAnalysis();
-        AnalysisObject constantObject = bb.analysisPolicy().createConstantObject(analysis, elementConstant, elementType);
-        if (!arrayObjElementsFlow.getState().containsObject(constantObject)) {
-            /* Add the constant element to the constant's array type flow. */
-            TypeState elementTypeState = TypeState.forNonNullObject(analysis, constantObject);
-            arrayObjElementsFlow.addState(analysis, elementTypeState);
-        }
-    }
-
-    /** Get the array elements flow given its type and the array constant. */
-    private ArrayElementsTypeFlow getArrayElementsFlow(JavaConstant array, AnalysisType arrayType) {
-        PointsToAnalysis analysis = getAnalysis();
-        AnalysisObject arrayObjConstant = analysis.analysisPolicy().createConstantObject(analysis, array, arrayType);
-        return arrayObjConstant.getArrayElementsFlow(analysis, true);
-    }
-
-    @Override
-    protected void forScannedConstant(JavaConstant value, ScanReason reason) {
-        PointsToAnalysis analysis = getAnalysis();
-        Object valueObj = analysis.getSnippetReflectionProvider().asObject(Object.class, value);
-        AnalysisType type = bb.getMetaAccess().lookupJavaType(valueObj.getClass());
-
-        type.registerAsInHeap();
-    }
-
-    private PointsToAnalysis getAnalysis() {
-        return ((PointsToAnalysis) bb);
+        super(bb, executor, scannedObjects, new AnalysisObjectScanningObserver(bb));
     }
 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
new file mode 100644
index 000000000000..f07d0707c0f4
--- /dev/null
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.pointsto;
+
+import com.oracle.graal.pointsto.flow.ArrayElementsTypeFlow;
+import com.oracle.graal.pointsto.flow.FieldTypeFlow;
+import com.oracle.graal.pointsto.flow.context.object.AnalysisObject;
+import com.oracle.graal.pointsto.meta.AnalysisField;
+import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.typestate.TypeState;
+
+import jdk.vm.ci.meta.JavaConstant;
+
+class AnalysisObjectScanningObserver implements ObjectScanningObserver {
+
+    private final BigBang bb;
+
+    AnalysisObjectScanningObserver(BigBang bb) {
+        this.bb = bb;
+    }
+
+    @Override
+    public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        if (!field.isWritten()) {
+            field.registerAsWritten(null);
+        }
+    }
+
+    @Override
+    public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
+        FieldTypeFlow fieldTypeFlow = getFieldTypeFlow(field, receiver);
+        if (!fieldTypeFlow.getState().canBeNull()) {
+            /* Signal that the field can contain null. */
+            fieldTypeFlow.addState(getAnalysis(), TypeState.forNull());
+        }
+    }
+
+    @Override
+    public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        PointsToAnalysis analysis = getAnalysis();
+        AnalysisType fieldType = analysis.getMetaAccess().lookupJavaType(analysis.getSnippetReflectionProvider().asObject(Object.class, fieldValue).getClass());
+        assert fieldType.isInstantiated() : fieldType;
+
+        /* Add the constant value object to the field's type flow. */
+        FieldTypeFlow fieldTypeFlow = getFieldTypeFlow(field, receiver);
+        AnalysisObject constantObject = bb.analysisPolicy().createConstantObject(analysis, fieldValue, fieldType);
+        if (!fieldTypeFlow.getState().containsObject(constantObject)) {
+            /* Add the new constant to the field's flow state. */
+            TypeState constantTypeState = TypeState.forNonNullObject(analysis, constantObject);
+            fieldTypeFlow.addState(analysis, constantTypeState);
+        }
+    }
+
+    /**
+     * Get the field type flow give a receiver.
+     */
+    private FieldTypeFlow getFieldTypeFlow(AnalysisField field, JavaConstant receiver) {
+        /* The field type flow is used to track the constant field value. */
+        if (field.isStatic()) {
+            /* If the field is static it comes from the originalRoots. */
+            return field.getStaticFieldFlow();
+        } else {
+            /*
+             * The field comes from a constant scan, thus it's type flow is mapped to the unique
+             * constant object.
+             */
+            PointsToAnalysis analysis = getAnalysis();
+            AnalysisType receiverType = analysis.getMetaAccess().lookupJavaType(analysis.getSnippetReflectionProvider().asObject(Object.class, receiver).getClass());
+            AnalysisObject constantReceiverObj = analysis.analysisPolicy().createConstantObject(analysis, receiver, receiverType);
+            return constantReceiverObj.getInstanceFieldFlow(analysis, field, true);
+        }
+    }
+
+    @Override
+    public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex) {
+        ArrayElementsTypeFlow arrayObjElementsFlow = getArrayElementsFlow(array, arrayType);
+        if (!arrayObjElementsFlow.getState().canBeNull()) {
+            /* Signal that the constant array can contain null. */
+            arrayObjElementsFlow.addState(getAnalysis(), TypeState.forNull());
+        }
+    }
+
+    @Override
+    public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex) {
+        assert elementType.isInstantiated() : elementType;
+        ArrayElementsTypeFlow arrayObjElementsFlow = getArrayElementsFlow(array, arrayType);
+        PointsToAnalysis analysis = getAnalysis();
+        AnalysisObject constantObject = bb.analysisPolicy().createConstantObject(analysis, elementConstant, elementType);
+        if (!arrayObjElementsFlow.getState().containsObject(constantObject)) {
+            /* Add the constant element to the constant's array type flow. */
+            TypeState elementTypeState = TypeState.forNonNullObject(analysis, constantObject);
+            arrayObjElementsFlow.addState(analysis, elementTypeState);
+        }
+    }
+
+    /**
+     * Get the array elements flow given its type and the array constant.
+     */
+    private ArrayElementsTypeFlow getArrayElementsFlow(JavaConstant array, AnalysisType arrayType) {
+        PointsToAnalysis analysis = getAnalysis();
+        AnalysisObject arrayObjConstant = analysis.analysisPolicy().createConstantObject(analysis, array, arrayType);
+        return arrayObjConstant.getArrayElementsFlow(analysis, true);
+    }
+
+    @Override
+    public void forScannedConstant(JavaConstant value, ObjectScanner.ScanReason reason) {
+        PointsToAnalysis analysis = getAnalysis();
+        Object valueObj = analysis.getSnippetReflectionProvider().asObject(Object.class, value);
+        AnalysisType type = bb.getMetaAccess().lookupJavaType(valueObj.getClass());
+
+        type.registerAsInHeap();
+    }
+
+    private PointsToAnalysis getAnalysis() {
+        return ((PointsToAnalysis) bb);
+    }
+}
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
index b633afcb2b81..ffd701706cde 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanner.java
@@ -60,9 +60,11 @@ public abstract class ObjectScanner {
     private final ReusableSet scannedObjects;
     private final CompletionExecutor executor;
     private final Deque<WorklistEntry> worklist;
+    private final ObjectScanningObserver scanningObserver;
 
-    public ObjectScanner(BigBang bb, CompletionExecutor executor, ReusableSet scannedObjects) {
+    public ObjectScanner(BigBang bb, CompletionExecutor executor, ReusableSet scannedObjects, ObjectScanningObserver scanningObserver) {
         this.bb = bb;
+        this.scanningObserver = scanningObserver;
         if (executor != null) {
             this.executor = executor;
             this.worklist = null;
@@ -117,27 +119,6 @@ private void scanEmbeddedRoot(JavaConstant root, BytecodePosition position) {
         }
     }
 
-    /*
-     * When scanning a field there are three possible cases: the field value is a relocated pointer,
-     * the field value is null or the field value is non-null. The method {@link
-     * ObjectScanner#scanField(AnalysisField, JavaConstant, Object)} will call the appropriated
-     * method during scanning.
-     */
-
-    /**
-     * Hook for relocated pointer scanned field value.
-     *
-     * For relocated pointers the value is only known at runtime after methods are relocated, which
-     * is pretty much the same as a field written at runtime: we do not have a constant value.
-     */
-    public abstract void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue);
-
-    /** Hook for scanned null field value. */
-    public abstract void forNullFieldValue(JavaConstant receiver, AnalysisField field);
-
-    /** Hook for scanned non-null field value. */
-    public abstract void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue);
-
     /**
      * Scans the value of a root field.
      *
@@ -168,14 +149,14 @@ protected final void scanField(AnalysisField field, JavaConstant receiver, Workl
             }
 
             if (fieldValue.getJavaKind() == JavaKind.Object && bb.getHostVM().isRelocatedPointer(constantAsObject(bb, fieldValue))) {
-                forRelocatedPointerFieldValue(receiver, field, fieldValue);
+                scanningObserver.forRelocatedPointerFieldValue(receiver, field, fieldValue);
             } else if (fieldValue.isNull()) {
-                forNullFieldValue(receiver, field);
+                scanningObserver.forNullFieldValue(receiver, field);
             } else if (fieldValue.getJavaKind() == JavaKind.Object) {
                 /* Scan the field value. */
                 scanConstant(fieldValue, reason, previous);
                 /* Process the field value. */
-                forNonNullFieldValue(receiver, field, fieldValue);
+                scanningObserver.forNonNullFieldValue(receiver, field, fieldValue);
             }
 
         } catch (UnsupportedFeatureException ex) {
@@ -183,18 +164,6 @@ protected final void scanField(AnalysisField field, JavaConstant receiver, Workl
         }
     }
 
-    /*
-     * When scanning array elements there are two possible cases: the element value is either null
-     * or the field value is non-null. The method {@link ObjectScanner#scanArray(JavaConstant,
-     * Object)} will call the appropriated method during scanning.
-     */
-
-    /** Hook for scanned null element value. */
-    public abstract void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex);
-
-    /** Hook for scanned non-null element value. */
-    public abstract void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex);
-
     /**
      * Scans constant arrays, one element at the time.
      *
@@ -213,7 +182,7 @@ protected final void scanArray(JavaConstant array, WorklistEntry previous) {
             Object e = arrayObject[idx];
             try {
                 if (e == null) {
-                    forNullArrayElement(array, arrayType, idx);
+                    scanningObserver.forNullArrayElement(array, arrayType, idx);
                 } else {
                     Object element = bb.getUniverse().replaceObject(e);
                     JavaConstant elementConstant = bb.getSnippetReflectionProvider().forObject(element);
@@ -222,7 +191,7 @@ protected final void scanArray(JavaConstant array, WorklistEntry previous) {
                     /* Scan the array element. */
                     scanConstant(elementConstant, reason, previous);
                     /* Process the array element. */
-                    forNonNullArrayElement(array, arrayType, elementConstant, elementType, idx);
+                    scanningObserver.forNonNullArrayElement(array, arrayType, elementConstant, elementType, idx);
                 }
             } catch (UnsupportedFeatureException ex) {
                 unsupportedFeature(arrayType.toJavaName(true), ex.getMessage(), reason, previous);
@@ -230,12 +199,6 @@ protected final void scanArray(JavaConstant array, WorklistEntry previous) {
         }
     }
 
-    /**
-     * Hook for scanned constant. The subclasses can provide additional processing for the scanned
-     * constants.
-     */
-    protected abstract void forScannedConstant(JavaConstant scannedValue, ScanReason reason);
-
     public final void scanConstant(JavaConstant value, ScanReason reason) {
         scanConstant(value, reason, null);
     }
@@ -251,7 +214,7 @@ public final void scanConstant(JavaConstant value, ScanReason reason, WorklistEn
         }
         if (scannedObjects.putAndAcquire(valueObj) == null) {
             try {
-                forScannedConstant(value, reason);
+                scanningObserver.forScannedConstant(value, reason);
             } finally {
                 scannedObjects.release(valueObj);
                 WorklistEntry worklistEntry = new WorklistEntry(previous, value, reason);
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanningObserver.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanningObserver.java
new file mode 100644
index 000000000000..9101fa4ab148
--- /dev/null
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/ObjectScanningObserver.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.pointsto;
+
+import com.oracle.graal.pointsto.ObjectScanner.ScanReason;
+import com.oracle.graal.pointsto.meta.AnalysisField;
+import com.oracle.graal.pointsto.meta.AnalysisType;
+
+import jdk.vm.ci.meta.JavaConstant;
+
+/**
+ * This interface contains hooks for constant scanning events.
+ *
+ * When scanning a field there are three possible cases: the field value is a relocated pointer, the
+ * field value is null or the field value is non-null. When scanning array elements there are two
+ * possible cases: the element value is either null or the field value is non-null. The implementers
+ * of this API will call the appropriate method during scanning.
+ */
+public interface ObjectScanningObserver {
+
+    /**
+     * Hook for relocated pointer scanned field value.
+     * <p>
+     * For relocated pointers the value is only known at runtime after methods are relocated, which
+     * is pretty much the same as a field written at runtime: we do not have a constant value.
+     */
+    void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue);
+
+    /**
+     * Hook for scanned null field value.
+     */
+    void forNullFieldValue(JavaConstant receiver, AnalysisField field);
+
+    /**
+     * Hook for scanned non-null field value.
+     */
+    void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue);
+
+    /**
+     * Hook for scanned null element value.
+     */
+    void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int elementIndex);
+
+    /**
+     * Hook for scanned non-null element value.
+     */
+    void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int elementIndex);
+
+    /**
+     * Hook for scanned constant.
+     */
+    void forScannedConstant(JavaConstant scannedValue, ScanReason reason);
+}
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisHeapHistogramPrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisHeapHistogramPrinter.java
index 56a28c6cba81..c9b855de77cf 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisHeapHistogramPrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisHeapHistogramPrinter.java
@@ -35,6 +35,7 @@
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanner;
+import com.oracle.graal.pointsto.ObjectScanningObserver;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -54,12 +55,13 @@ private static void doPrint(PrintWriter out, BigBang bb) {
             System.out.println("Exhaustive heap scanning is disabled. The analysis heap histogram will not contain all instances of types: " + types);
             System.out.println("Exhaustive heap scanning can be turned on using -H:+ExhaustiveHeapScan.");
         }
-        AnalysisHeapHistogramPrinter printer = new AnalysisHeapHistogramPrinter(bb);
+        Map<AnalysisType, Integer> histogram = new HashMap<>();
+        AnalysisHeapHistogramPrinter printer = new AnalysisHeapHistogramPrinter(bb, histogram);
         printer.scanBootImageHeapRoots(fieldComparator, positionComparator);
-        printer.printHistogram(out);
+        printHistogram(out, histogram);
     }
 
-    private void printHistogram(PrintWriter out) {
+    private static void printHistogram(PrintWriter out, Map<AnalysisType, Integer> histogram) {
         out.println("Heap histogram");
         out.format("%8s %s %n", "Count", "Class");
 
@@ -67,36 +69,45 @@ private void printHistogram(PrintWriter out) {
                         .forEach(entry -> out.format("%8d %8s %n", entry.getValue(), entry.getKey().toJavaName()));
     }
 
-    private final Map<AnalysisType, Integer> histogram = new HashMap<>();
-
-    private AnalysisHeapHistogramPrinter(BigBang bb) {
-        super(bb, null, new ReusableSet());
+    private AnalysisHeapHistogramPrinter(BigBang bb, Map<AnalysisType, Integer> histogram) {
+        super(bb, null, new ReusableSet(), new ScanningObserver(bb, histogram));
     }
 
-    @Override
-    protected void forScannedConstant(JavaConstant scannedValue, ScanReason reason) {
-        AnalysisType type = constantType(bb, scannedValue);
-        int count = histogram.getOrDefault(type, 0);
-        histogram.put(type, count + 1);
-    }
+    private static final class ScanningObserver implements ObjectScanningObserver {
 
-    @Override
-    public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
-    }
+        private final BigBang bb;
+        private final Map<AnalysisType, Integer> histogram;
 
-    @Override
-    public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
-    }
+        private ScanningObserver(BigBang bb, Map<AnalysisType, Integer> histogram) {
+            this.bb = bb;
+            this.histogram = histogram;
+        }
 
-    @Override
-    public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
-    }
+        @Override
+        public void forScannedConstant(JavaConstant scannedValue, ScanReason reason) {
+            AnalysisType type = constantType(bb, scannedValue);
+            int count = histogram.getOrDefault(type, 0);
+            histogram.put(type, count + 1);
+        }
 
-    @Override
-    public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int index) {
-    }
+        @Override
+        public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        }
+
+        @Override
+        public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
+        }
+
+        @Override
+        public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        }
+
+        @Override
+        public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int index) {
+        }
 
-    @Override
-    public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int index) {
+        @Override
+        public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int index) {
+        }
     }
 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
index 08257afbc071..fafe5d3364ec 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
@@ -47,6 +47,7 @@
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanner;
+import com.oracle.graal.pointsto.ObjectScanningObserver;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -70,9 +71,11 @@ private static void doPrint(PrintWriter out, BigBang bb) {
             System.out.println("Exhaustive heap scanning is disabled. The object tree will not contain all instances of types: " + types);
             System.out.println("Exhaustive heap scanning can be turned on using -H:+ExhaustiveHeapScan.");
         }
-        ObjectTreePrinter printer = new ObjectTreePrinter(bb);
+        /* Use linked hash map for predictable iteration order. */
+        Map<JavaConstant, ObjectNodeBase> constantToNode = new LinkedHashMap<>();
+        ObjectTreePrinter printer = new ObjectTreePrinter(bb, constantToNode);
         printer.scanBootImageHeapRoots(fieldComparator, positionComparator);
-        printer.printTypeHierarchy(out);
+        printer.printTypeHierarchy(out, constantToNode);
     }
 
     static class RootSource {
@@ -285,7 +288,6 @@ public boolean matches(String input) {
                     "com.ibm.icu.util.ULocale.nameCache*",
                     "com.oracle.svm.core.option.RuntimeOptionsSupportImpl.set(String, Object)"};
 
-    private final Map<JavaConstant, ObjectNodeBase> constantToNode;
     private final SimpleMatcher suppressTypeMatcher;
     private final SimpleMatcher expandTypeMatcher;
     private final SimpleMatcher defaultSuppressTypeMatcher;
@@ -293,11 +295,8 @@ public boolean matches(String input) {
     private final SimpleMatcher expandRootMatcher;
     private final SimpleMatcher defaultSuppressRootMatcher;
 
-    private ObjectTreePrinter(BigBang bb) {
-        super(bb, null, new ReusableSet());
-
-        /* Use linked hash map for predictable iteration order. */
-        this.constantToNode = new LinkedHashMap<>();
+    private ObjectTreePrinter(BigBang bb, Map<JavaConstant, ObjectNodeBase> constantToNode) {
+        super(bb, null, new ReusableSet(), new ScanningObserver(bb, constantToNode));
 
         OptionValues options = bb.getOptions();
 
@@ -310,76 +309,87 @@ private ObjectTreePrinter(BigBang bb) {
         this.defaultSuppressRootMatcher = new SimpleMatcher(suppressRootsDefault);
     }
 
-    @Override
-    public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
-    }
+    private static final class ScanningObserver implements ObjectScanningObserver {
 
-    @Override
-    public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
-        if (receiver == null) {
-            // static field
-            return;
-        }
+        private final BigBang bb;
+        private final Map<JavaConstant, ObjectNodeBase> constantToNode;
 
-        assert constantToNode.containsKey(receiver);
+        private ScanningObserver(BigBang bb, Map<JavaConstant, ObjectNodeBase> constantToNode) {
+            this.bb = bb;
+            this.constantToNode = constantToNode;
+        }
 
-        ObjectNode receiverNode = (ObjectNode) constantToNode.get(receiver);
-        receiverNode.addField(field, ObjectNodeBase.forNull());
-    }
+        @Override
+        public void forRelocatedPointerFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        }
 
-    @Override
-    public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
+        @Override
+        public void forNullFieldValue(JavaConstant receiver, AnalysisField field) {
+            if (receiver == null) {
+                // static field
+                return;
+            }
 
-        if (receiver == null) {
-            // static field
-            return;
-        }
+            assert constantToNode.containsKey(receiver);
 
-        if (constantToNode.containsKey(receiver) && constantToNode.containsKey(fieldValue)) {
             ObjectNode receiverNode = (ObjectNode) constantToNode.get(receiver);
-            ObjectNodeBase valueNode = constantToNode.get(fieldValue);
-            receiverNode.addField(field, valueNode);
+            receiverNode.addField(field, ObjectNodeBase.forNull());
         }
-    }
 
-    @Override
-    public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int index) {
-        assert constantToNode.containsKey(array);
+        @Override
+        public void forNonNullFieldValue(JavaConstant receiver, AnalysisField field, JavaConstant fieldValue) {
 
-        ArrayObjectNode arrayNode = (ArrayObjectNode) constantToNode.get(array);
-        arrayNode.addElement(index, ObjectNodeBase.forNull());
-    }
+            if (receiver == null) {
+                // static field
+                return;
+            }
+
+            if (constantToNode.containsKey(receiver) && constantToNode.containsKey(fieldValue)) {
+                ObjectNode receiverNode = (ObjectNode) constantToNode.get(receiver);
+                ObjectNodeBase valueNode = constantToNode.get(fieldValue);
+                receiverNode.addField(field, valueNode);
+            }
+        }
+
+        @Override
+        public void forNullArrayElement(JavaConstant array, AnalysisType arrayType, int index) {
+            assert constantToNode.containsKey(array);
 
-    @Override
-    public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int index) {
-        if (constantToNode.containsKey(array) && constantToNode.containsKey(elementConstant)) {
             ArrayObjectNode arrayNode = (ArrayObjectNode) constantToNode.get(array);
-            ObjectNodeBase valueNode = constantToNode.get(elementConstant);
-            arrayNode.addElement(index, valueNode);
+            arrayNode.addElement(index, ObjectNodeBase.forNull());
         }
-    }
 
-    @Override
-    protected void forScannedConstant(JavaConstant scannedValue, ScanReason reason) {
-        JVMCIError.guarantee(scannedValue != null, "scannedValue is null");
-        constantToNode.computeIfAbsent(scannedValue, c -> {
-            ObjectNodeBase node;
-            if (reason instanceof FieldScan) {
-                ResolvedJavaField field = ((FieldScan) reason).getField();
-                if (field.isStatic()) {
-                    node = ObjectNodeBase.fromConstant(bb, scannedValue, new RootSource(field));
+        @Override
+        public void forNonNullArrayElement(JavaConstant array, AnalysisType arrayType, JavaConstant elementConstant, AnalysisType elementType, int index) {
+            if (constantToNode.containsKey(array) && constantToNode.containsKey(elementConstant)) {
+                ArrayObjectNode arrayNode = (ArrayObjectNode) constantToNode.get(array);
+                ObjectNodeBase valueNode = constantToNode.get(elementConstant);
+                arrayNode.addElement(index, valueNode);
+            }
+        }
+
+        @Override
+        public void forScannedConstant(JavaConstant scannedValue, ScanReason reason) {
+            JVMCIError.guarantee(scannedValue != null, "scannedValue is null");
+            constantToNode.computeIfAbsent(scannedValue, c -> {
+                ObjectNodeBase node;
+                if (reason instanceof FieldScan) {
+                    ResolvedJavaField field = ((FieldScan) reason).getField();
+                    if (field.isStatic()) {
+                        node = ObjectNodeBase.fromConstant(bb, scannedValue, new RootSource(field));
+                    } else {
+                        node = ObjectNodeBase.fromConstant(bb, scannedValue);
+                    }
+                } else if (reason instanceof MethodScan) {
+                    ResolvedJavaMethod method = ((MethodScan) reason).getMethod();
+                    node = ObjectNodeBase.fromConstant(bb, scannedValue, new RootSource(method));
                 } else {
                     node = ObjectNodeBase.fromConstant(bb, scannedValue);
                 }
-            } else if (reason instanceof MethodScan) {
-                ResolvedJavaMethod method = ((MethodScan) reason).getMethod();
-                node = ObjectNodeBase.fromConstant(bb, scannedValue, new RootSource(method));
-            } else {
-                node = ObjectNodeBase.fromConstant(bb, scannedValue);
-            }
 
-            return node;
-        });
+                return node;
+            });
+        }
     }
 
     static String constantAsString(BigBang bb, JavaConstant constant) {
@@ -453,7 +463,7 @@ private boolean suppressRoot(RootSource source) {
         return false;
     }
 
-    private void printTypeHierarchy(PrintWriter out) {
+    private void printTypeHierarchy(PrintWriter out, Map<JavaConstant, ObjectNodeBase> constantToNode) {
         out.println("Heap roots");
         Iterator<ObjectNodeBase> iterator = constantToNode.values().stream().filter(n -> n.isRoot()).iterator();
         while (iterator.hasNext()) {

From 895687d0d2b3d5ae1f9316879355553b17eabcad Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Wed, 29 Sep 2021 09:15:29 +0200
Subject: [PATCH 213/681] move sending class prepare events to when classes are
 actually prepared according to spec

---
 .../oracle/truffle/espresso/impl/ObjectKlass.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
index 4fbc1d1c4d23..482fe9c8ad6d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
@@ -343,12 +343,6 @@ private void actualInit() {
             }
             initState = INITIALIZING;
             try {
-                if (getContext().isMainThreadCreated()) {
-                    if (getContext().shouldReportVMEvents()) {
-                        prepareThread = getContext().getGuestThreadFromHost(Thread.currentThread());
-                        getContext().reportClassPrepared(this, prepareThread);
-                    }
-                }
                 if (!isInterface()) {
                     /*
                      * Next, if C is a class rather than an interface, then let SC be its superclass
@@ -460,6 +454,12 @@ private void prepare() {
                     }
                 }
                 initState = PREPARED;
+                if (getContext().isMainThreadCreated()) {
+                    if (getContext().shouldReportVMEvents()) {
+                        prepareThread = getContext().getGuestThreadFromHost(Thread.currentThread());
+                        getContext().reportClassPrepared(this, prepareThread);
+                    }
+                }
             }
         }
     }

From 19cc06b2e34a67ded925e95a630a052b08e7762c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Tue, 28 Sep 2021 12:28:21 +0200
Subject: [PATCH 214/681] Remove obsolete JLineFeature

---
 .../svm/thirdparty/jline/JLineFeature.java    | 143 ------------------
 1 file changed, 143 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.thirdparty/src/com/oracle/svm/thirdparty/jline/JLineFeature.java

diff --git a/substratevm/src/com.oracle.svm.thirdparty/src/com/oracle/svm/thirdparty/jline/JLineFeature.java b/substratevm/src/com.oracle.svm.thirdparty/src/com/oracle/svm/thirdparty/jline/JLineFeature.java
deleted file mode 100644
index 85894c981ced..000000000000
--- a/substratevm/src/com.oracle.svm.thirdparty/src/com/oracle/svm/thirdparty/jline/JLineFeature.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2019, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.thirdparty.jline;
-
-// Checkstyle: allow reflection
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
-
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
-import org.graalvm.nativeimage.hosted.RuntimeReflection;
-
-import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.jdk.Resources;
-import com.oracle.svm.core.jni.JNIRuntimeAccess;
-import com.oracle.svm.util.ReflectionUtil;
-
-@AutomaticFeature
-final class JLineFeature implements Feature {
-
-    /** List of the classes that access the JNI library. */
-    private static final List<String> JNI_CLASS_NAMES = Arrays.asList(
-                    "org.fusesource.jansi.internal.CLibrary",
-                    "org.fusesource.jansi.internal.CLibrary$WinSize",
-                    "org.fusesource.jansi.internal.CLibrary$Termios",
-                    "org.fusesource.jansi.internal.Kernel32",
-                    "org.fusesource.jansi.internal.Kernel32$SMALL_RECT",
-                    "org.fusesource.jansi.internal.Kernel32$COORD",
-                    "org.fusesource.jansi.internal.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
-                    "org.fusesource.jansi.internal.Kernel32$CHAR_INFO",
-                    "org.fusesource.jansi.internal.Kernel32$KEY_EVENT_RECORD",
-                    "org.fusesource.jansi.internal.Kernel32$MOUSE_EVENT_RECORD",
-                    "org.fusesource.jansi.internal.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
-                    "org.fusesource.jansi.internal.Kernel32$FOCUS_EVENT_RECORD",
-                    "org.fusesource.jansi.internal.Kernel32$MENU_EVENT_RECORD",
-                    "org.fusesource.jansi.internal.Kernel32$INPUT_RECORD");
-
-    /**
-     * Other classes that need to be initialized at run time because they reference the JNI classes
-     * and/or have static state that depends on run time state.
-     */
-    private static final List<String> RUNTIME_INIT_CLASS_NAMES = Arrays.asList(
-                    "org.fusesource.jansi.AnsiConsole",
-                    "org.fusesource.jansi.WindowsAnsiOutputStream",
-                    "org.fusesource.jansi.WindowsAnsiProcessor");
-
-    Class<?> terminalFactoryClass;
-
-    @Override
-    public boolean isInConfiguration(IsInConfigurationAccess access) {
-        terminalFactoryClass = access.findClassByName("jline.TerminalFactory");
-        /* Feature is only active when JLine is on the classpath. */
-        return terminalFactoryClass != null;
-    }
-
-    @Override
-    public void duringSetup(DuringSetupAccess access) {
-        if (Platform.includedIn(Platform.WINDOWS.class)) {
-            Stream.concat(JNI_CLASS_NAMES.stream(), RUNTIME_INIT_CLASS_NAMES.stream())
-                            .map(access::findClassByName)
-                            .filter(Objects::nonNull)
-                            .forEach(RuntimeClassInitialization::initializeAtRunTime);
-        }
-    }
-
-    @Override
-    public void beforeAnalysis(BeforeAnalysisAccess access) {
-        Object[] createMethods = Arrays.stream(terminalFactoryClass.getDeclaredMethods())
-                        .filter(m -> Modifier.isStatic(m.getModifiers()) && m.getName().equals("create"))
-                        .toArray();
-        access.registerReachabilityHandler(JLineFeature::registerTerminalConstructor, createMethods);
-
-        if (Platform.includedIn(Platform.WINDOWS.class)) {
-            /*
-             * Each listed class has a native method named "init" that initializes all declared
-             * fields of the class using JNI. So when the "init" method gets reachable (which means
-             * the class initializer got reachable), we need to register all fields for JNI access.
-             */
-            JNI_CLASS_NAMES.stream()
-                            .map(access::findClassByName)
-                            .filter(Objects::nonNull)
-                            .map(jniClass -> ReflectionUtil.lookupMethod(jniClass, "init"))
-                            .forEach(initMethod -> access.registerReachabilityHandler(a -> registerJNIFields(initMethod), initMethod));
-        }
-    }
-
-    private static void registerTerminalConstructor(DuringAnalysisAccess access) {
-        /*
-         * TerminalFactory.create methods instantiate the actual Terminal implementation class via
-         * reflection. We cannot automatically constant fold which class is going to be used, so we
-         * register the default for each platform. If the user manually overrides the default
-         * implementation class, they also need to provide a reflection configuration for that
-         * class.
-         */
-        Class<?> terminalClass = access.findClassByName(Platform.includedIn(Platform.WINDOWS.class) ? "jline.AnsiWindowsTerminal" : "jline.UnixTerminal");
-        if (terminalClass != null) {
-            RuntimeReflection.register(terminalClass);
-            RuntimeReflection.register(terminalClass.getDeclaredConstructors());
-        }
-    }
-
-    private AtomicBoolean resourceRegistered = new AtomicBoolean();
-
-    private void registerJNIFields(Method initMethod) {
-        Class<?> jniClass = initMethod.getDeclaringClass();
-        JNIRuntimeAccess.register(jniClass.getDeclaredFields());
-
-        if (!resourceRegistered.getAndSet(true)) {
-            /* The native library that is included as a resource in the .jar file. */
-            String resource = "META-INF/native/windows64/jansi.dll";
-            Resources.registerResource(resource, jniClass.getClassLoader().getResourceAsStream(resource));
-        }
-    }
-}

From 3d16b0bf6827a321bd7723b5195252e0bc924fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Wed, 29 Sep 2021 09:31:31 +0200
Subject: [PATCH 215/681] Add to changelog

---
 substratevm/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md
index 5a799f92a3d2..5823faf69b22 100644
--- a/substratevm/CHANGELOG.md
+++ b/substratevm/CHANGELOG.md
@@ -5,5 +5,6 @@ This changelog summarizes major changes to Native Image, developed under the cod
 ## Version 22.0.0
 * (GR-33930) Decouple HostedOptionParser setup from classpath/modulepath scanning (use ServiceLoader for collecting options).
 * (GR-33504) Implement --add-reads for native-image and fix --add-opens error handling.
+* (GR-33983) Remove obsolete com.oracle.svm.thirdparty.jline.JLineFeature from substratevm:LIBRARY_SUPPORT.
 
 ## Version 21.3.0


From 36a68415d6243438df93764f1fff51bee60c7b76 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Wed, 29 Sep 2021 11:02:55 +0200
Subject: [PATCH 216/681] add member checks to invoke method commands in jdwp

---
 .../truffle/espresso/jdwp/impl/JDWP.java      | 26 +++++++++++++++++++
 .../espresso/runtime/JDWPContextImpl.java     | 10 +++++++
 2 files changed, 36 insertions(+)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index 818fc245701c..ba6a26c0d1c6 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -1075,6 +1075,22 @@ static CommandResult createReply(Packet packet, DebuggerController controller, D
                     return new CommandResult(reply);
                 }
 
+                // check that method is member of the class type or a super class
+                KlassRef declaringKlass = method.getDeclaringKlass();
+                KlassRef checkedKlass = klass;
+                boolean isMember = false;
+                while (checkedKlass != null) {
+                    if (checkedKlass == declaringKlass) {
+                        isMember = true;
+                        break;
+                    }
+                    checkedKlass = checkedKlass.getSuperClass();
+                }
+                if (!isMember) {
+                    reply.errorCode(ErrorCodes.INVALID_METHODID);
+                    return new CommandResult(reply);
+                }
+
                 LOGGER.fine(() -> "trying to invoke static method: " + method.getNameAsString());
 
                 int arguments = input.readInt();
@@ -1257,6 +1273,11 @@ static CommandResult createReply(Packet packet, DebuggerController controller, D
                     return new CommandResult(reply);
                 }
 
+                if (method.getDeclaringKlass() != itf) {
+                    reply.errorCode(ErrorCodes.INVALID_METHODID);
+                    return new CommandResult(reply);
+                }
+
                 LOGGER.fine(() -> "trying to invoke interface method: " + method.getNameAsString());
 
                 int arguments = input.readInt();
@@ -1764,6 +1785,11 @@ static CommandResult createReply(Packet packet, DebuggerController controller, D
                     return new CommandResult(reply);
                 }
 
+                if (!context.isMemberOf(callee, method.getDeclaringKlass())) {
+                    reply.errorCode(ErrorCodes.INVALID_METHODID);
+                    return new CommandResult(reply);
+                }
+
                 LOGGER.fine("trying to invoke method: " + method.getNameAsString());
 
                 int invocationOptions = input.readInt();
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
index 63721330524f..5d9ad20ae91c 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
@@ -711,6 +711,16 @@ public Node getInstrumentableNode(RootNode rootNode) {
         return rootNode;
     }
 
+    @Override
+    public boolean isMemberOf(Object guestObject, KlassRef klass) {
+        if (guestObject instanceof StaticObject) {
+            StaticObject staticObject = (StaticObject) guestObject;
+            return klass.isAssignable(staticObject.getKlass());
+        } else {
+            return false;
+        }
+    }
+
     public void rerunclinit(ObjectKlass oldKlass) {
         classInitializerActions.add(new ReloadingAction(oldKlass));
     }

From 28422d89bc5bb5d76d697450fefc4711af6a1dec Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Wed, 29 Sep 2021 11:03:30 +0200
Subject: [PATCH 217/681] missing file from previous commit

---
 .../com/oracle/truffle/espresso/jdwp/api/JDWPContext.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
index bf50a832b036..e5f3aa2f2cb5 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
@@ -497,4 +497,12 @@ public interface JDWPContext {
      * @return the instrumentable delegate node
      */
     Node getInstrumentableNode(RootNode rootNode);
+
+    /**
+     * Tests if the guest object is a member of the klass.
+     * @param guestObject the guest object
+     * @param klass the class
+     * @return true is guest object is a member of the klass
+     */
+    boolean isMemberOf(Object guestObject, KlassRef klass);
 }

From b39703608a60c484f15b0853b577c745fad3a58a Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Wed, 29 Sep 2021 11:57:31 +0200
Subject: [PATCH 218/681] Handle recursion correctly for total samples and call
 tree depth.

---
 .../tools/profiler/impl/CPUSamplerCLI.java    | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 372083b60e12..72219bb7706a 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -383,12 +383,12 @@ private static final class SamplingHistogram {
             this.showTiers = options.get(ShowTiers);
             this.samplePeriod = options.get(SAMPLE_PERIOD);
             this.samplesTaken = data.getSamples();
-            Map<Thread, SourceLocationPayloads> perThreadSourceLocationPayloads = new HashMap<>();
+            Map<Thread, SourceLocationNodes> perThreadSourceLocationPayloads = new HashMap<>();
             for (Thread thread : data.getThreadData().keySet()) {
                 perThreadSourceLocationPayloads.put(thread, computeSourceLocationPayloads(data.getThreadData().get(thread)));
             }
             maybeSummarizeThreads(perThreadSourceLocationPayloads);
-            for (Map.Entry<Thread, SourceLocationPayloads> threadEntry : perThreadSourceLocationPayloads.entrySet()) {
+            for (Map.Entry<Thread, SourceLocationNodes> threadEntry : perThreadSourceLocationPayloads.entrySet()) {
                 histogram.put(threadEntry.getKey(), histogramEntries(threadEntry));
             }
             sortedTiers = sortedArray(tiers);
@@ -397,19 +397,21 @@ private static final class SamplingHistogram {
             this.format = titleAndFormat[1];
         }
 
-        private ArrayList<OutputEntry> histogramEntries(Map.Entry<Thread, SourceLocationPayloads> threadEntry) {
+        private ArrayList<OutputEntry> histogramEntries(Map.Entry<Thread, SourceLocationNodes> threadEntry) {
             ArrayList<OutputEntry> histogramEntries = new ArrayList<>();
-            for (Map.Entry<SourceLocation, List<CPUSampler.Payload>> sourceLocationEntry : threadEntry.getValue().locations.entrySet()) {
+            for (Map.Entry<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> sourceLocationEntry : threadEntry.getValue().locations.entrySet()) {
                 histogramEntries.add(histogramEntry(sourceLocationEntry));
             }
             histogramEntries.sort((o1, o2) -> Integer.compare(o2.totalSelfSamples, o1.totalSelfSamples));
             return histogramEntries;
         }
 
-        private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<CPUSampler.Payload>> sourceLocationEntry) {
-            OutputEntry outputEntry = new OutputEntry(sourceLocationEntry.getKey());
-            maxNameLength = Math.max(maxNameLength, sourceLocationEntry.getKey().getRootName().length());
-            for (CPUSampler.Payload payload : sourceLocationEntry.getValue()) {
+        private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> sourceLocationEntry) {
+            SourceLocation location = sourceLocationEntry.getKey();
+            OutputEntry outputEntry = new OutputEntry(location);
+            maxNameLength = Math.max(maxNameLength, location.getRootName().length());
+            for (ProfilerNode<CPUSampler.Payload> node : sourceLocationEntry.getValue()) {
+                CPUSampler.Payload payload = node.getPayload();
                 for (int i = 0; i < payload.getNumberOfTiers(); i++) {
                     int selfHitCountsValue = payload.getTierSelfCount(i);
                     outputEntry.totalSelfSamples += selfHitCountsValue;
@@ -420,7 +422,11 @@ private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<CPUSampler.Pay
                     tiers.add(i);
                 }
             }
-            for (CPUSampler.Payload payload : sourceLocationEntry.getValue()) {
+            for (ProfilerNode<CPUSampler.Payload> node : sourceLocationEntry.getValue()) {
+                if (node.isRecursive()) {
+                    continue;
+                }
+                CPUSampler.Payload payload = node.getPayload();
                 for (int i = 0; i < payload.getNumberOfTiers(); i++) {
                     int hitCountsValue = payload.getTierTotalCount(i);
                     outputEntry.totalSamples += hitCountsValue;
@@ -434,11 +440,11 @@ private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<CPUSampler.Pay
             return outputEntry;
         }
 
-        private void maybeSummarizeThreads(Map<Thread, SourceLocationPayloads> perThreadSourceLocationPayloads) {
+        private void maybeSummarizeThreads(Map<Thread, SourceLocationNodes> perThreadSourceLocationPayloads) {
             if (summariseThreads) {
-                SourceLocationPayloads summary = new SourceLocationPayloads(new HashMap<>());
-                for (SourceLocationPayloads sourceLocationPayloads : perThreadSourceLocationPayloads.values()) {
-                    for (Map.Entry<SourceLocation, List<CPUSampler.Payload>> entry : sourceLocationPayloads.locations.entrySet()) {
+                SourceLocationNodes summary = new SourceLocationNodes(new HashMap<>());
+                for (SourceLocationNodes sourceLocationNodes : perThreadSourceLocationPayloads.values()) {
+                    for (Map.Entry<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> entry : sourceLocationNodes.locations.entrySet()) {
                         summary.locations.computeIfAbsent(entry.getKey(), s -> new ArrayList<>()).addAll(entry.getValue());
                     }
                 }
@@ -447,22 +453,16 @@ private void maybeSummarizeThreads(Map<Thread, SourceLocationPayloads> perThread
             }
         }
 
-        private static SourceLocationPayloads computeSourceLocationPayloads(Collection<ProfilerNode<CPUSampler.Payload>> profilerNodes) {
-            Map<SourceLocation, List<CPUSampler.Payload>> histogram = new HashMap<>();
+        private static SourceLocationNodes computeSourceLocationPayloads(Collection<ProfilerNode<CPUSampler.Payload>> profilerNodes) {
+            Map<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> histogram = new HashMap<>();
             computeSourceLocationPayloadsImpl(profilerNodes, histogram);
-            return new SourceLocationPayloads(histogram);
+            return new SourceLocationNodes(histogram);
         }
 
-        private static void computeSourceLocationPayloadsImpl(Collection<ProfilerNode<CPUSampler.Payload>> children, Map<SourceLocation, List<CPUSampler.Payload>> histogram) {
+        private static void computeSourceLocationPayloadsImpl(Collection<ProfilerNode<CPUSampler.Payload>> children, Map<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> histogram) {
             for (ProfilerNode<CPUSampler.Payload> treeNode : children) {
-                List<CPUSampler.Payload> nodes = histogram.computeIfAbsent(new SourceLocation(treeNode.getSourceSection(), treeNode.getRootName()),
-                                new Function<SourceLocation, List<CPUSampler.Payload>>() {
-                                    @Override
-                                    public List<CPUSampler.Payload> apply(SourceLocation s) {
-                                        return new ArrayList<>();
-                                    }
-                                });
-                nodes.add(treeNode.getPayload());
+                List<ProfilerNode<CPUSampler.Payload>> nodes = histogram.computeIfAbsent(new SourceLocation(treeNode.getSourceSection(), treeNode.getRootName()), s -> new ArrayList<>());
+                nodes.add(treeNode);
                 computeSourceLocationPayloadsImpl(treeNode.getChildren(), histogram);
             }
         }
@@ -486,10 +486,10 @@ void print(PrintStream out) {
             }
         }
 
-        private static final class SourceLocationPayloads {
-            final Map<SourceLocation, List<CPUSampler.Payload>> locations;
+        private static final class SourceLocationNodes {
+            final Map<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> locations;
 
-            SourceLocationPayloads(Map<SourceLocation, List<CPUSampler.Payload>> locations) {
+            SourceLocationNodes(Map<SourceLocation, List<ProfilerNode<CPUSampler.Payload>>> locations) {
                 this.locations = locations;
             }
         }
@@ -601,7 +601,9 @@ private void calculateMaxValuesRec(ProfilerNode<CPUSampler.Payload> node, int de
             maxNameLength = Math.max(maxNameLength, node.getRootName().length() + depth);
             tiers.add(node.getPayload().getNumberOfTiers() - 1);
             for (ProfilerNode<CPUSampler.Payload> child : node.getChildren()) {
-                calculateMaxValuesRec(child, depth + 1);
+                if (!child.isRecursive()) {
+                    calculateMaxValuesRec(child, depth + 1);
+                }
             }
         }
 

From 7fbb7fa3fca884a36b46ea68c0f41a4a0c60ab30 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Wed, 29 Sep 2021 12:10:42 +0200
Subject: [PATCH 219/681] In CHA oracle, stop walking the parent hierarchy on
 null (parent of jlObject)

---
 .../analysis/hierarchy/DefaultClassHierarchyOracle.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
index 4c56c048f3ba..09cf21c0ab2c 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
@@ -50,7 +50,7 @@ public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
     @Override
     public void onClassInit(ObjectKlass newClass) {
         ObjectKlass currentParent = newClass.getSuperKlass();
-        while (currentParent.getLeafTypeAssumption().getAssumption().isValid()) {
+        while (currentParent != null && currentParent.getLeafTypeAssumption().getAssumption().isValid()) {
             currentParent.getLeafTypeAssumption().getAssumption().invalidate();
             currentParent = currentParent.getSuperKlass();
         }

From ad460e2804264f2def82164dba8d44e0950e5196 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 27 Sep 2021 13:56:32 +0200
Subject: [PATCH 220/681] Avoid createCallTarget() in GraalWasm.

---
 .../src/org/graalvm/wasm/test/WasmJsApiSuite.java   | 13 ++++++-------
 .../src/org/graalvm/wasm/WasmInstantiator.java      |  6 ++----
 .../src/org/graalvm/wasm/WasmLanguage.java          |  5 ++---
 .../org/graalvm/wasm/predefined/BuiltinModule.java  |  5 +----
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
index 8402ff021c44..80f2abe8dfdb 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmJsApiSuite.java
@@ -78,7 +78,6 @@
 import org.graalvm.wasm.utils.Assert;
 import org.junit.Test;
 
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ArityException;
@@ -203,12 +202,12 @@ public void testInstantiateWithImportTable() throws IOException {
                             }),
             });
             WebAssembly.tableWrite(table, 0, new WasmFunctionInstance(context, null,
-                            Truffle.getRuntime().createCallTarget(new RootNode(context.language()) {
+                            new RootNode(context.language()) {
                                 @Override
                                 public Object execute(VirtualFrame frame) {
                                     return 210;
                                 }
-                            })));
+                            }.getCallTarget()));
             final WasmInstance instance = moduleInstantiate(wasm, binaryWithTableImport, importObject);
             try {
                 final Object callFirst = WebAssembly.instanceExport(instance, "callFirst");
@@ -355,12 +354,12 @@ public void testExportTableTwice() throws IOException, InterruptedException {
             final InteropLibrary lib = InteropLibrary.getUncached();
             try {
                 final Object f = new WasmFunctionInstance(context, null,
-                                Truffle.getRuntime().createCallTarget(new RootNode(context.language()) {
+                                new RootNode(context.language()) {
                                     @Override
                                     public Object execute(VirtualFrame frame) {
                                         return 42;
                                     }
-                                }));
+                                }.getCallTarget());
                 final Object writeTable = wasm.readMember("table_write");
                 final Object readTable = wasm.readMember("table_read");
                 final Object a = WebAssembly.instanceExport(instance, "a");
@@ -641,12 +640,12 @@ public void testTableInstanceOutOfBoundsSet() throws IOException {
             final WasmFunctionInstance functionInstance = new WasmFunctionInstance(
                             null,
                             null,
-                            Truffle.getRuntime().createCallTarget(new RootNode(WasmContext.get(null).language()) {
+                            new RootNode(WasmContext.get(null).language()) {
                                 @Override
                                 public Object execute(VirtualFrame frame) {
                                     return 42;
                                 }
-                            }));
+                            }.getCallTarget());
 
             // We should be able to set element 1.
             try {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java
index 2c171ba0d913..0a0897b7a1f0 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmInstantiator.java
@@ -42,7 +42,6 @@
 package org.graalvm.wasm;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.Node;
 import org.graalvm.wasm.exception.Failure;
@@ -61,7 +60,7 @@
 import java.util.List;
 
 /**
- * Creates wasm instances by converting parser nodes into truffle nodes.
+ * Creates wasm instances by converting parser nodes into Truffle nodes.
  */
 public class WasmInstantiator {
     private static final int MIN_DEFAULT_STACK_SIZE = 1_000_000;
@@ -145,8 +144,7 @@ private void instantiateCodeEntry(WasmInstance instance, CodeEntry codeEntry) {
          * nodes {@see TruffleRuntime#createDirectCallNode} during translation.
          */
         WasmRootNode rootNode = new WasmRootNode(language, instance, wasmCodeEntry);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
-        instance.setTarget(codeEntry.getFunctionIndex(), callTarget);
+        instance.setTarget(codeEntry.getFunctionIndex(), rootNode.getCallTarget());
         /*
          * Set the code entry local variables (which contain the parameters and the locals).
          */
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
index d3c4d7c6e947..e6c7b103dfa8 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
@@ -48,7 +48,6 @@
 import org.graalvm.wasm.memory.WasmMemory;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
@@ -83,12 +82,12 @@ protected CallTarget parse(ParsingRequest request) {
         final byte[] data = source.getBytes().toByteArray();
         final WasmModule module = WasmContext.readModule(moduleName, data, null, source);
         final WasmInstance instance = context.readInstance(module);
-        return Truffle.getRuntime().createCallTarget(new RootNode(this) {
+        return new RootNode(this) {
             @Override
             public WasmInstance execute(VirtualFrame frame) {
                 return instance;
             }
-        });
+        }.getCallTarget();
     }
 
     @Override
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/BuiltinModule.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/BuiltinModule.java
index e20a5ecfcb60..ceaec515c2f5 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/BuiltinModule.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/BuiltinModule.java
@@ -41,8 +41,6 @@
 package org.graalvm.wasm.predefined;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.RootNode;
 import org.graalvm.wasm.Assert;
 import org.graalvm.wasm.ReferenceTypes;
@@ -99,8 +97,7 @@ protected void defineFunction(WasmInstance instance, String name, byte[] paramTy
         // since predefined modules have a relatively small size.
         final int typeIdx = instance.symbolTable().allocateFunctionType(paramTypes, retTypes);
         final WasmFunction function = instance.symbolTable().declareExportedFunction(typeIdx, name);
-        RootCallTarget callTarget = Truffle.getRuntime().createCallTarget(rootNode);
-        instance.setTarget(function.index(), callTarget);
+        instance.setTarget(function.index(), rootNode.getCallTarget());
     }
 
     protected int defineExternalGlobal(WasmInstance instance, String globalName, WasmGlobal global) {

From 3d62974abf247ca95d331e4ee27d7ee885a9daef Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 29 Sep 2021 15:58:22 +0200
Subject: [PATCH 221/681] Docuement why we are using unsafeCast

---
 .../staticobject/ArrayBasedStaticShape.java   | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
index 3c6cde4010af..a240bf156881 100644
--- a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
+++ b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
@@ -94,11 +94,33 @@ Object getStorage(Object obj, boolean primitive) {
         } else {
             assert checkShape(receiverObject);
         }
+        /*
+         * The safety of the unsafeCasts below is based on the fact that those 2 fields are final,
+         * initialized in the constructor:
+         *
+         * * the object array is exactly an Object[] (see
+         * ArrayBasedShapeGenerator.addStorageConstructors)
+         *
+         * * the byte[] is exact because there are no byte[] subclasses
+         *
+         * * the fields are final (see ArrayBasedShapeGenerator.generateStorage)
+         *
+         * * Any access of these fields after the constructor must remain after the final fields are
+         * stored (because of the barrier at the end of the constructor for final fields) and thus
+         * must see the initialized, non-null array of the correct type.
+         *
+         * * This getStorage access is not reachable inside the constructor (see the code of the
+         * constructor).
+         */
         if (primitive) {
             Object storage = UNSAFE.getObject(receiverObject, (long) propertyLayout.generator.getByteArrayOffset());
+            assert storage != null;
+            assert storage.getClass() == byte[].class;
             return SomAccessor.RUNTIME.unsafeCast(storage, byte[].class, true, true, true);
         } else {
             Object storage = UNSAFE.getObject(receiverObject, (long) propertyLayout.generator.getObjectArrayOffset());
+            assert storage != null;
+            assert storage.getClass() == Object[].class;
             return SomAccessor.RUNTIME.unsafeCast(storage, Object[].class, true, true, true);
         }
     }

From d3a4fefc1e90f0fcc78128f59b73b503a493fc2d Mon Sep 17 00:00:00 2001
From: Florian Huemer <florian.huemer@oracle.com>
Date: Fri, 13 Aug 2021 10:17:05 +0200
Subject: [PATCH 222/681] Implemented Non-trapping Float-to-Int Conversion.

---
 wasm/ci_common/common.jsonnet                 |   2 +-
 .../org/graalvm/wasm/test/WasmFileSuite.java  |   7 ++
 .../graalvm/wasm/test/WasmTestProperties.java |  54 ++++++++
 .../suites/arithmetic/Integer32Suite.java     |  58 ++++++++-
 .../suites/arithmetic/Integer64Suite.java     |  54 +++++++-
 .../src/org/graalvm/wasm/BinaryParser.java    |  45 ++++++-
 .../src/org/graalvm/wasm/WasmContext.java     |  12 +-
 .../org/graalvm/wasm/WasmContextOptions.java  |  97 +++++++++++++++
 .../src/org/graalvm/wasm/WasmLanguage.java    |   2 +-
 .../src/org/graalvm/wasm/WasmOptions.java     |   5 +
 .../graalvm/wasm/constants/Instructions.java  |  11 ++
 .../org/graalvm/wasm/nodes/WasmBlockNode.java | 115 ++++++++++++++++++
 12 files changed, 454 insertions(+), 8 deletions(-)
 create mode 100644 wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmTestProperties.java
 create mode 100644 wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContextOptions.java

diff --git a/wasm/ci_common/common.jsonnet b/wasm/ci_common/common.jsonnet
index 6a6123217c50..6204bb4cb8da 100644
--- a/wasm/ci_common/common.jsonnet
+++ b/wasm/ci_common/common.jsonnet
@@ -93,7 +93,7 @@ local graal_suite_root = root_ci.graal_suite_root;
 
   wabt: {
     downloads+: {
-      WABT_DIR: {name: 'wabt', version: '1.0.12', platformspecific: true},
+      WABT_DIR: {name: 'wabt', version: '1.0.23', platformspecific: true},
     },
   },
 
diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
index eb25c99a8ffa..67d19d5f0739 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
@@ -51,6 +51,7 @@
 import org.graalvm.wasm.WasmContext;
 import org.graalvm.wasm.WasmFunctionInstance;
 import org.graalvm.wasm.WasmInstance;
+import org.graalvm.wasm.WasmOptions;
 import org.graalvm.wasm.WasmLanguage;
 import org.graalvm.wasm.memory.WasmMemory;
 import org.graalvm.wasm.test.options.WasmTestOptions;
@@ -296,6 +297,12 @@ private WasmTestStatus runTestCase(WasmCase testCase) {
                 contextBuilder.arguments(WasmLanguage.ID, prepend(commandLineArgs.split(" "), ""));
             }
 
+            final String saturatingFloatToIntProperty = "wasm." + WasmOptions.SATURATING_FLOAT_TO_INT_NAME;
+            final String saturatingFloatToIntValue = testCase.options().getProperty(saturatingFloatToIntProperty);
+            if (saturatingFloatToIntValue != null) {
+                contextBuilder.option(saturatingFloatToIntProperty, saturatingFloatToIntValue);
+            }
+
             final String envString = testCase.options().getProperty("env");
             if (envString != null) {
                 for (String var : envString.split(" ")) {
diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmTestProperties.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmTestProperties.java
new file mode 100644
index 000000000000..f715f6ebd55b
--- /dev/null
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmTestProperties.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.graalvm.wasm.test;
+
+import java.util.Properties;
+
+public class WasmTestProperties {
+    public static Properties create(String... properties) {
+        Properties p = new Properties();
+        for (String property : properties) {
+            p.setProperty(property, "true");
+        }
+        return p;
+    }
+}
diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer32Suite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer32Suite.java
index 0659a782e89d..b0e81a2acea0 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer32Suite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer32Suite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,9 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Properties;
 
+import org.graalvm.wasm.test.WasmTestProperties;
 import org.graalvm.wasm.utils.cases.WasmCase;
 import org.graalvm.wasm.utils.cases.WasmStringCase;
 import org.junit.Test;
@@ -51,6 +53,8 @@
 import org.graalvm.wasm.test.WasmFileSuite;
 
 public class Integer32Suite extends WasmFileSuite {
+    private final Properties saturatingFloatToIntProperties = WasmTestProperties.create("wasm.saturating-float-to-int");
+
     private WasmStringCase[] testCases = {
                     WasmCase.create("CONST_SMALL", WasmCase.expected(42),
                                     "(module (func (export \"_main\") (result i32) i32.const 42))"),
@@ -176,6 +180,58 @@ public class Integer32Suite extends WasmFileSuite {
                                     "(module (func (export \"_main\") (result i32) i32.const -3 i32.const 1 i32.rotr))"),
                     WasmCase.create("WRAP_I64", WasmCase.expected(-1794634296),
                                     "(module (func (export \"_main\") (result i32) i64.const 2500333000 i32.wrap_i64))"),
+                    WasmCase.create("TRUNC_SAT_F32_S_NAN", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f32.const nan i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_INF", WasmCase.expected(Integer.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f32.const inf i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_NEG_INF", WasmCase.expected(Integer.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f32.const inf f32.neg i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_OVERFLOW", WasmCase.expected(Integer.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f32.const 3.4028235E38 i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_UNDERFLOW", WasmCase.expected(Integer.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f32.const -3.4028235E38 i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_VALID", WasmCase.expected(1),
+                                    "(module (func (export \"_main\") (result i32) f32.const 1.532 i32.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NAN", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f32.const nan i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_INF", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f32.const inf i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NEG_INF", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f32.const inf f32.neg i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_OVERFLOW", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f32.const 3.4028235E38 i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_INT_OVERFLOW", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f32.const 4.294967296E9 i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NEG", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f32.const -1.235 i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_VALID", WasmCase.expected(1),
+                                    "(module (func (export \"_main\") (result i32) f32.const 1.532 i32.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_NAN", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f64.const nan i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_INF", WasmCase.expected(Integer.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f64.const inf i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_NEG_INF", WasmCase.expected(Integer.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f64.const inf f64.neg i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_OVERFLOW", WasmCase.expected(Integer.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f64.const 1.79769E308 i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_UNDERFLOW", WasmCase.expected(Integer.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i32) f64.const -1.79769E308 i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_VALID", WasmCase.expected(1),
+                                    "(module (func (export \"_main\") (result i32) f64.const 1.532 i32.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NAN", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f64.const nan i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_INF", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f64.const inf i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NEG_INF", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f64.const inf f64.neg i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_OVERFLOW", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f64.const 1.7976931348623157E308 i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_INT_OVERFLOW", WasmCase.expected(0xffff_ffff),
+                                    "(module (func (export \"_main\") (result i32) f64.const 4.294967296E9 i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NEG", WasmCase.expected(0),
+                                    "(module (func (export \"_main\") (result i32) f64.const -1.235 i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_VALID", WasmCase.expected(1),
+                                    "(module (func (export \"_main\") (result i32) f64.const 1.532 i32.trunc_sat_f64_u))", saturatingFloatToIntProperties),
     };
 
     @Override
diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer64Suite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer64Suite.java
index fa039070bea0..0dca848cce5b 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer64Suite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/arithmetic/Integer64Suite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,9 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Properties;
 
+import org.graalvm.wasm.test.WasmTestProperties;
 import org.graalvm.wasm.utils.cases.WasmCase;
 import org.graalvm.wasm.utils.cases.WasmStringCase;
 import org.junit.Test;
@@ -51,6 +53,8 @@
 import org.graalvm.wasm.test.WasmFileSuite;
 
 public class Integer64Suite extends WasmFileSuite {
+    private final Properties saturatingFloatToIntProperties = WasmTestProperties.create("wasm.saturating-float-to-int");
+
     private WasmStringCase[] testCases = {
                     WasmCase.create("CONST_SMALL", WasmCase.expected(42L),
                                     "(module (func (export \"_main\") (result i64) i64.const 42))"),
@@ -176,6 +180,54 @@ public class Integer64Suite extends WasmFileSuite {
                                     "(module (func (export \"_main\") (result i64) i64.const -2 i64.const 1 i64.rotl))"),
                     WasmCase.create("ROTATE_RIGHT", WasmCase.expected(-2L),
                                     "(module (func (export \"_main\") (result i64) i64.const -3 i64.const 1 i64.rotr))"),
+                    WasmCase.create("TRUNC_SAT_F32_S_NAN", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f32.const nan i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_INF", WasmCase.expected(Long.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f32.const inf i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_NEG_INF", WasmCase.expected(Long.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f32.const inf f32.neg i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_OVERFLOW", WasmCase.expected(Long.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f32.const 3.4028235E38 i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_UNDERFLOW", WasmCase.expected(Long.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f32.const -3.4028235E38 i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_S_VALID", WasmCase.expected(1L),
+                                    "(module (func (export \"_main\") (result i64) f32.const 1.532 i64.trunc_sat_f32_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NAN", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f32.const nan i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_INF", WasmCase.expected(0xffff_ffff_ffff_ffffL),
+                                    "(module (func (export \"_main\") (result i64) f32.const inf i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NEG_INF", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f32.const inf f32.neg i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_OVERFLOW", WasmCase.expected(0xffff_ffff_ffff_ffffL),
+                                    "(module (func (export \"_main\") (result i64) f32.const 3.4028235E38 i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_NEG", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f32.const -1.235 i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F32_U_VALID", WasmCase.expected(1L),
+                                    "(module (func (export \"_main\") (result i64) f32.const 1.532 i64.trunc_sat_f32_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_NAN", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f64.const nan i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_INF", WasmCase.expected(Long.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f64.const inf i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_NEG_INF", WasmCase.expected(Long.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f64.const inf f64.neg i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_OVERFLOW", WasmCase.expected(Long.MAX_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f64.const 1.79769E308 i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_UNDERFLOW", WasmCase.expected(Long.MIN_VALUE),
+                                    "(module (func (export \"_main\") (result i64) f64.const -1.79769E308 i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_S_VALID", WasmCase.expected(1L),
+                                    "(module (func (export \"_main\") (result i64) f64.const 1.532 i64.trunc_sat_f64_s))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NAN", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f64.const nan i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_INF", WasmCase.expected(0xffff_ffff_ffff_ffffL),
+                                    "(module (func (export \"_main\") (result i64) f64.const inf i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NEG_INF", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f64.const inf f64.neg i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_OVERFLOW", WasmCase.expected(0xffff_ffff_ffff_ffffL),
+                                    "(module (func (export \"_main\") (result i64) f64.const 1.7976931348623157E308 i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_NEG", WasmCase.expected(0L),
+                                    "(module (func (export \"_main\") (result i64) f64.const -1.235 i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
+                    WasmCase.create("TRUNC_SAT_F64_U_VALID", WasmCase.expected(1L),
+                                    "(module (func (export \"_main\") (result i64) f64.const 1.532 i64.trunc_sat_f64_u))", saturatingFloatToIntProperties),
     };
 
     @Override
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java
index b4fc18b94951..a07bd9d1711c 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java
@@ -95,12 +95,14 @@ public class BinaryParser extends BinaryStreamParser {
     private static final int VERSION = 0x00000001;
 
     private final WasmModule module;
+    private final WasmContext wasmContext;
     private final int[] limitsResult;
 
     @CompilerDirectives.TruffleBoundary
-    public BinaryParser(WasmModule module) {
+    public BinaryParser(WasmModule module, WasmContext context) {
         super(module.data());
         this.module = module;
+        this.wasmContext = context;
         this.limitsResult = new int[2];
     }
 
@@ -961,12 +963,53 @@ private void readNumericInstructions(ValidationState state, int opcode) {
                 state.popChecked(I64_TYPE);
                 state.push(F64_TYPE);
                 break;
+            case Instructions.MISC:
+                int miscOpcode = read1() & 0xFF;
+                switch (miscOpcode) {
+                    case Instructions.I32_TRUNC_SAT_F32_S:
+                    case Instructions.I32_TRUNC_SAT_F32_U:
+                        checkSaturatingFloatToIntSupport(miscOpcode);
+                        state.popChecked(F32_TYPE);
+                        state.push(I32_TYPE);
+                        break;
+                    case Instructions.I32_TRUNC_SAT_F64_S:
+                    case Instructions.I32_TRUNC_SAT_F64_U:
+                        checkSaturatingFloatToIntSupport(miscOpcode);
+                        state.popChecked(F64_TYPE);
+                        state.push(I32_TYPE);
+                        break;
+                    case Instructions.I64_TRUNC_SAT_F32_S:
+                    case Instructions.I64_TRUNC_SAT_F32_U:
+                        checkSaturatingFloatToIntSupport(miscOpcode);
+                        state.popChecked(F32_TYPE);
+                        state.push(I64_TYPE);
+                        break;
+                    case Instructions.I64_TRUNC_SAT_F64_S:
+                    case Instructions.I64_TRUNC_SAT_F64_U:
+                        checkSaturatingFloatToIntSupport(miscOpcode);
+                        state.popChecked(F64_TYPE);
+                        state.push(I64_TYPE);
+                        break;
+                    default:
+                        fail(Failure.UNSPECIFIED_MALFORMED, "Unknown opcode: 0xFC 0x%02x", miscOpcode);
+                }
+                break;
             default:
                 fail(Failure.UNSPECIFIED_MALFORMED, "Unknown opcode: 0x%02x", opcode);
                 break;
         }
     }
 
+    private static void checkContextOption(boolean option, String message, Object... args) {
+        if (!option) {
+            fail(Failure.UNSPECIFIED_MALFORMED, message, args);
+        }
+    }
+
+    private void checkSaturatingFloatToIntSupport(int opcode) {
+        checkContextOption(wasmContext.getContextOptions().isSaturatingFloatToInt(), "Saturating float-to-int conversion is not enabled (opcode: 0xFC 0x%02x)", opcode);
+    }
+
     private void store(ValidationState state, byte type, int n) {
         assertTrue(module.symbolTable().memoryExists(), Failure.UNKNOWN_MEMORY);
 
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContext.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContext.java
index b47d3c16cc58..1c8d61e777bc 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContext.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContext.java
@@ -67,6 +67,7 @@ public final class WasmContext {
     private final Map<String, WasmInstance> moduleInstances;
     private int moduleNameCount;
     private final FdManager filesManager;
+    private final WasmContextOptions contextOptions;
 
     public WasmContext(Env env, WasmLanguage language) {
         this.env = env;
@@ -80,6 +81,7 @@ public WasmContext(Env env, WasmLanguage language) {
         this.linker = new Linker();
         this.moduleNameCount = 0;
         this.filesManager = new FdManager(env);
+        this.contextOptions = WasmContextOptions.fromOptionValues(env.getOptions());
         instantiateBuiltinInstances();
     }
 
@@ -167,9 +169,9 @@ public WasmModule readModule(byte[] data, ModuleLimits moduleLimits) {
         return readModule(moduleName, data, moduleLimits, source);
     }
 
-    public static WasmModule readModule(String moduleName, byte[] data, ModuleLimits moduleLimits, Source source) {
+    public WasmModule readModule(String moduleName, byte[] data, ModuleLimits moduleLimits, Source source) {
         final WasmModule module = WasmModule.create(moduleName, data, moduleLimits, source);
-        final BinaryParser reader = new BinaryParser(module);
+        final BinaryParser reader = new BinaryParser(module, this);
         reader.readModule();
         return module;
     }
@@ -188,7 +190,7 @@ public void reinitInstance(WasmInstance instance, boolean reinitMemory) {
         // Note: this is not a complete and correct instantiation as defined in
         // https://webassembly.github.io/spec/core/exec/modules.html#instantiation
         // For testing only.
-        final BinaryParser reader = new BinaryParser(instance.module());
+        final BinaryParser reader = new BinaryParser(instance.module(), this);
         reader.resetGlobalState(this, instance);
         if (reinitMemory) {
             reader.resetMemoryState(this, instance);
@@ -200,6 +202,10 @@ public void reinitInstance(WasmInstance instance, boolean reinitMemory) {
         }
     }
 
+    public WasmContextOptions getContextOptions() {
+        return this.contextOptions;
+    }
+
     private static final ContextReference<WasmContext> REFERENCE = ContextReference.create(WasmLanguage.class);
 
     public static WasmContext get(Node node) {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContextOptions.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContextOptions.java
new file mode 100644
index 000000000000..73aeb506e864
--- /dev/null
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmContextOptions.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.graalvm.wasm;
+
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import org.graalvm.options.OptionKey;
+import org.graalvm.options.OptionValues;
+
+public class WasmContextOptions {
+    @CompilationFinal private boolean saturatingFloatToInt;
+    @CompilationFinal private OptionValues optionValues;
+
+    WasmContextOptions(OptionValues optionValues) {
+        this.optionValues = optionValues;
+        setOptionValues();
+    }
+
+    public static WasmContextOptions fromOptionValues(OptionValues optionValues) {
+        return new WasmContextOptions(optionValues);
+    }
+
+    private void setOptionValues() {
+        this.saturatingFloatToInt = readBooleanOption(WasmOptions.SATURATING_FLOAT_TO_INT);
+    }
+
+    private boolean readBooleanOption(OptionKey<Boolean> key) {
+        return key.getValue(optionValues);
+    }
+
+    public boolean isSaturatingFloatToInt() {
+        return saturatingFloatToInt;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 53 * hash + (this.saturatingFloatToInt ? 1 : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final WasmContextOptions other = (WasmContextOptions) obj;
+        if (this.saturatingFloatToInt != other.saturatingFloatToInt) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
index d3c4d7c6e947..2f3aebf820cc 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
@@ -81,7 +81,7 @@ protected CallTarget parse(ParsingRequest request) {
         isFirst = false;
         final Source source = request.getSource();
         final byte[] data = source.getBytes().toByteArray();
-        final WasmModule module = WasmContext.readModule(moduleName, data, null, source);
+        final WasmModule module = context.readModule(moduleName, data, null, source);
         final WasmInstance instance = context.readInstance(module);
         return Truffle.getRuntime().createCallTarget(new RootNode(this) {
             @Override
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
index 3b04481485b5..3dd29f28f6c1 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmOptions.java
@@ -73,4 +73,9 @@ public enum ConstantsStorePolicy {
 
     @Option(help = "Use sun.misc.Unsafe-based memory.", category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL)//
     public static final OptionKey<Boolean> UseUnsafeMemory = new OptionKey<>(false);
+
+    // WASM Context Options
+    public static final String SATURATING_FLOAT_TO_INT_NAME = "saturating-float-to-int";
+    @Option(name = SATURATING_FLOAT_TO_INT_NAME, help = "Use saturating-float-to-int conversion", category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL) //
+    public static final OptionKey<Boolean> SATURATING_FLOAT_TO_INT = new OptionKey<>(false);
 }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/constants/Instructions.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/constants/Instructions.java
index d8ef39e6e350..8883f0e582de 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/constants/Instructions.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/constants/Instructions.java
@@ -235,6 +235,17 @@ public final class Instructions {
     public static final int F32_REINTERPRET_I32 = 0xBE;
     public static final int F64_REINTERPRET_I64 = 0xBF;
 
+    public static final int MISC = 0xFC;
+
+    public static final int I32_TRUNC_SAT_F32_S = 0x00;
+    public static final int I32_TRUNC_SAT_F32_U = 0x01;
+    public static final int I32_TRUNC_SAT_F64_S = 0x02;
+    public static final int I32_TRUNC_SAT_F64_U = 0x03;
+    public static final int I64_TRUNC_SAT_F32_S = 0x04;
+    public static final int I64_TRUNC_SAT_F32_U = 0x05;
+    public static final int I64_TRUNC_SAT_F64_S = 0x06;
+    public static final int I64_TRUNC_SAT_F64_U = 0x07;
+
     private static String[] decodingTable = new String[256];
 
     private Instructions() {
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmBlockNode.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmBlockNode.java
index 8f140d01b5e4..f71ef9484848 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmBlockNode.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmBlockNode.java
@@ -153,6 +153,10 @@
 import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_F32_U;
 import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_F64_S;
 import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_F64_U;
+import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_SAT_F32_S;
+import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_SAT_F32_U;
+import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_SAT_F64_S;
+import static org.graalvm.wasm.constants.Instructions.I32_TRUNC_SAT_F64_U;
 import static org.graalvm.wasm.constants.Instructions.I32_WRAP_I64;
 import static org.graalvm.wasm.constants.Instructions.I32_XOR;
 import static org.graalvm.wasm.constants.Instructions.I64_ADD;
@@ -202,6 +206,10 @@
 import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_F32_U;
 import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_F64_S;
 import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_F64_U;
+import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_SAT_F32_S;
+import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_SAT_F32_U;
+import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_SAT_F64_S;
+import static org.graalvm.wasm.constants.Instructions.I64_TRUNC_SAT_F64_U;
 import static org.graalvm.wasm.constants.Instructions.I64_XOR;
 import static org.graalvm.wasm.constants.Instructions.IF;
 import static org.graalvm.wasm.constants.Instructions.LOCAL_GET;
@@ -210,6 +218,7 @@
 import static org.graalvm.wasm.constants.Instructions.LOOP;
 import static org.graalvm.wasm.constants.Instructions.MEMORY_GROW;
 import static org.graalvm.wasm.constants.Instructions.MEMORY_SIZE;
+import static org.graalvm.wasm.constants.Instructions.MISC;
 import static org.graalvm.wasm.constants.Instructions.NOP;
 import static org.graalvm.wasm.constants.Instructions.RETURN;
 import static org.graalvm.wasm.constants.Instructions.SELECT;
@@ -1398,6 +1407,40 @@ public int execute(WasmContext context, VirtualFrame frame, long[] stacklocals)
                     // and interpreted appropriately upon access), we don't need to do anything
                     // for these instructions.
                     break;
+                case MISC:
+                    byte miscByteOpcode = BinaryStreamParser.rawPeek1(data, offset);
+                    int miscOpcode = miscByteOpcode & 0xFF;
+                    offset++;
+                    CompilerAsserts.partialEvaluationConstant(offset);
+                    switch (miscOpcode) {
+                        case I32_TRUNC_SAT_F32_S:
+                            i32_trunc_sat_f32_s(stacklocals, stackPointer);
+                            break;
+                        case I32_TRUNC_SAT_F32_U:
+                            i32_trunc_sat_f32_u(stacklocals, stackPointer);
+                            break;
+                        case I32_TRUNC_SAT_F64_S:
+                            i32_trunc_sat_f64_s(stacklocals, stackPointer);
+                            break;
+                        case I32_TRUNC_SAT_F64_U:
+                            i32_trunc_sat_f64_u(stacklocals, stackPointer);
+                            break;
+                        case I64_TRUNC_SAT_F32_S:
+                            i64_trunc_sat_f32_s(stacklocals, stackPointer);
+                            break;
+                        case I64_TRUNC_SAT_F32_U:
+                            i64_trunc_sat_f32_u(stacklocals, stackPointer);
+                            break;
+                        case I64_TRUNC_SAT_F64_S:
+                            i64_trunc_sat_f64_s(stacklocals, stackPointer);
+                            break;
+                        case I64_TRUNC_SAT_F64_U:
+                            i64_trunc_sat_f64_u(stacklocals, stackPointer);
+                            break;
+                        default:
+                            throw CompilerDirectives.shouldNotReachHere();
+                    }
+                    break;
                 default:
                     throw CompilerDirectives.shouldNotReachHere();
             }
@@ -2772,6 +2815,44 @@ private void i32_trunc_f64_u(long[] stack, int stackPointer) {
         pushInt(stack, stackPointer - 1, result);
     }
 
+    private void i32_trunc_sat_f32_s(long[] stack, int stackPointer) {
+        final float x = popAsFloat(stack, stackPointer - 1);
+        final int result = (int) ExactMath.truncate(x);
+        pushInt(stack, stackPointer - 1, result);
+    }
+
+    private void i32_trunc_sat_f32_u(long[] stack, int stackPointer) {
+        final float x = popAsFloat(stack, stackPointer - 1);
+        final int result;
+        if (Float.isNaN(x) || x < MIN_FLOAT_TRUNCATABLE_TO_U_INT) {
+            result = 0;
+        } else if (x > MAX_FLOAT_TRUNCATABLE_TO_U_INT) {
+            result = 0xffff_ffff;
+        } else {
+            result = (int) WasmMath.truncFloatToUnsignedLong(x);
+        }
+        pushInt(stack, stackPointer - 1, result);
+    }
+
+    private void i32_trunc_sat_f64_s(long[] stack, int stackPointer) {
+        final double x = popAsDouble(stack, stackPointer - 1);
+        final int result = (int) ExactMath.truncate(x);
+        pushInt(stack, stackPointer - 1, result);
+    }
+
+    private void i32_trunc_sat_f64_u(long[] stack, int stackPointer) {
+        final double x = popAsDouble(stack, stackPointer - 1);
+        final int result;
+        if (Double.isNaN(x) || x < MIN_DOUBLE_TRUNCATABLE_TO_U_INT) {
+            result = 0;
+        } else if (x > MAX_DOUBLE_TRUNCATABLE_TO_U_INT) {
+            result = 0xffff_ffff;
+        } else {
+            result = (int) WasmMath.truncDoubleToUnsignedLong(x);
+        }
+        pushInt(stack, stackPointer - 1, result);
+    }
+
     private void i64_extend_i32_s(long[] stack, int stackPointer) {
         int x = popInt(stack, stackPointer - 1);
         long result = x;
@@ -2836,6 +2917,40 @@ private void i64_trunc_f64_u(long[] stack, int stackPointer) {
         push(stack, stackPointer - 1, result);
     }
 
+    private void i64_trunc_sat_f32_s(long[] stack, int stackPointer) {
+        final float x = popAsFloat(stack, stackPointer - 1);
+        final long result = (long) ExactMath.truncate(x);
+        push(stack, stackPointer - 1, result);
+    }
+
+    private void i64_trunc_sat_f32_u(long[] stack, int stackPointer) {
+        final float x = popAsFloat(stack, stackPointer - 1);
+        final long result;
+        if (Float.isNaN(x) || x < MIN_FLOAT_TRUNCATABLE_TO_U_LONG) {
+            result = 0;
+        } else {
+            result = WasmMath.truncFloatToUnsignedLong(x);
+        }
+        push(stack, stackPointer - 1, result);
+    }
+
+    private void i64_trunc_sat_f64_s(long[] stack, int stackPointer) {
+        final double x = popAsDouble(stack, stackPointer - 1);
+        final long result = (long) ExactMath.truncate(x);
+        push(stack, stackPointer - 1, result);
+    }
+
+    private void i64_trunc_sat_f64_u(long[] stack, int stackPointer) {
+        final double x = popAsDouble(stack, stackPointer - 1);
+        final long result;
+        if (Double.isNaN(x) || x < MIN_DOUBLE_TRUNCATABLE_TO_U_LONG) {
+            result = 0;
+        } else {
+            result = WasmMath.truncDoubleToUnsignedLong(x);
+        }
+        push(stack, stackPointer - 1, result);
+    }
+
     private void f32_convert_i32_s(long[] stack, int stackPointer) {
         final int x = popInt(stack, stackPointer - 1);
         final float result = x;

From 77886d9c3b893de8002bd1137e29de2080343ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Wed, 29 Sep 2021 18:45:14 +0200
Subject: [PATCH 223/681] Build native-image with -H:+UseReferenceHandlerThread

to ensure synchronized (files) blocks in ZipFile.Source#release and ZipFile.Source#get are indeed mutually exclusive.
---
 .../com.oracle.substratevm/svm-driver/native-image.properties   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.driver/resources/META-INF/native-image/com.oracle.substratevm/svm-driver/native-image.properties b/substratevm/src/com.oracle.svm.driver/resources/META-INF/native-image/com.oracle.substratevm/svm-driver/native-image.properties
index a3883325fe9c..f9acfcc2f4c8 100644
--- a/substratevm/src/com.oracle.svm.driver/resources/META-INF/native-image/com.oracle.substratevm/svm-driver/native-image.properties
+++ b/substratevm/src/com.oracle.svm.driver/resources/META-INF/native-image/com.oracle.substratevm/svm-driver/native-image.properties
@@ -1,2 +1,2 @@
 ImageName = native-image
-Args = -H:-ParseRuntimeOptions --initialize-at-build-time=com.oracle.svm.driver
+Args = -H:+UseReferenceHandlerThread -H:-ParseRuntimeOptions --initialize-at-build-time=com.oracle.svm.driver

From 94966712ee286f5a799edb2463a8e62483a2bbe3 Mon Sep 17 00:00:00 2001
From: Jirka Marsik <jiri.marsik@oracle.com>
Date: Tue, 31 Aug 2021 15:01:30 +0200
Subject: [PATCH 224/681] Update TRegex's Unicode data to current draft of
 version 14

---
 .../charset/UnicodeGeneralCategories.java     |  432 +--
 .../regex/charset/UnicodePropertyData.java    | 2444 +++++++++--------
 .../regex/tregex/parser/CaseFoldTable.java    |   51 +-
 .../parser/flavors/RubyCaseFoldingData.java   |   40 +
 .../tools/run_scripts.sh                      |    2 +-
 5 files changed, 1583 insertions(+), 1386 deletions(-)

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodeGeneralCategories.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodeGeneralCategories.java
index 07e0ecfedea2..543aba39e64a 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodeGeneralCategories.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodeGeneralCategories.java
@@ -62,52 +62,53 @@ static CodePointSet getGeneralCategory(String name) {
                         0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc,
                         0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115,
                         0x002115, 0x002119, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002134, 0x002139, 0x002139, 0x00213c, 0x00213f,
-                        0x002145, 0x002149, 0x00214e, 0x00214e, 0x002183, 0x002184, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002c7b, 0x002c7e, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2,
-                        0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x00a640, 0x00a66d, 0x00a680, 0x00a69b, 0x00a722, 0x00a76f, 0x00a771, 0x00a787, 0x00a78b, 0x00a78e,
-                        0x00a790, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a7f6, 0x00a7fa, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab60, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13,
-                        0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df,
-                        0x016e40, 0x016e7f, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb,
-                        0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544,
-                        0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736,
-                        0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e900, 0x01e943));
+                        0x002145, 0x002149, 0x00214e, 0x00214e, 0x002183, 0x002184, 0x002c00, 0x002c7b, 0x002c7e, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27,
+                        0x002d27, 0x002d2d, 0x002d2d, 0x00a640, 0x00a66d, 0x00a680, 0x00a69b, 0x00a722, 0x00a76f, 0x00a771, 0x00a787, 0x00a78b, 0x00a78e, 0x00a790, 0x00a7ca, 0x00a7d0, 0x00a7d1,
+                        0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f5, 0x00a7f6, 0x00a7fa, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab60, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13,
+                        0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592,
+                        0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40,
+                        0x016e7f, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb,
+                        0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546,
+                        0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e,
+                        0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e900, 0x01e943));
         GENERAL_CATEGORIES.put("gc=L", CodePointSet.createNoDedup(0x000041, 0x00005a, 0x000061, 0x00007a, 0x0000aa, 0x0000aa, 0x0000b5, 0x0000b5, 0x0000ba, 0x0000ba, 0x0000c0, 0x0000d6, 0x0000d8,
                         0x0000f6, 0x0000f8, 0x0002c1, 0x0002c6, 0x0002d1, 0x0002e0, 0x0002e4, 0x0002ec, 0x0002ec, 0x0002ee, 0x0002ee, 0x000370, 0x000374, 0x000376, 0x000377, 0x00037a, 0x00037d,
                         0x00037f, 0x00037f, 0x000386, 0x000386, 0x000388, 0x00038a, 0x00038c, 0x00038c, 0x00038e, 0x0003a1, 0x0003a3, 0x0003f5, 0x0003f7, 0x000481, 0x00048a, 0x00052f, 0x000531,
                         0x000556, 0x000559, 0x000559, 0x000560, 0x000588, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000620, 0x00064a, 0x00066e, 0x00066f, 0x000671, 0x0006d3, 0x0006d5, 0x0006d5,
                         0x0006e5, 0x0006e6, 0x0006ee, 0x0006ef, 0x0006fa, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1, 0x0007ca,
                         0x0007ea, 0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000840, 0x000858, 0x000860, 0x00086a,
-                        0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985, 0x00098c, 0x00098f,
-                        0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e1,
-                        0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38,
-                        0x000a39, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3,
-                        0x000ab5, 0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a,
-                        0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85, 0x000b8a,
-                        0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bd0,
-                        0x000bd0, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c60, 0x000c61, 0x000c80, 0x000c80,
-                        0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cde, 0x000cde, 0x000ce0, 0x000ce1, 0x000cf1,
-                        0x000cf2, 0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f, 0x000d61, 0x000d7a, 0x000d7f,
-                        0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e33, 0x000e40, 0x000e46, 0x000e81,
-                        0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4,
-                        0x000ec6, 0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a, 0x00103f, 0x00103f, 0x001050,
-                        0x001055, 0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7,
-                        0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a,
-                        0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315,
-                        0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016f1,
-                        0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001711, 0x001720, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017d7, 0x0017d7,
-                        0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x001884, 0x001887, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950, 0x00196d, 0x001970,
-                        0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4b, 0x001b83, 0x001ba0,
-                        0x001bae, 0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9,
-                        0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d,
-                        0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2,
-                        0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f,
-                        0x002090, 0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002119, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128,
-                        0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002183, 0x002184, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e,
-                        0x002c60, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80,
-                        0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde,
-                        0x002e2f, 0x002e2f, 0x003005, 0x003006, 0x003031, 0x003035, 0x00303b, 0x00303c, 0x003041, 0x003096, 0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105,
-                        0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a000, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c,
-                        0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640, 0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0, 0x00a6e5, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7bf, 0x00a7c2,
-                        0x00a7ca, 0x00a7f5, 0x00a801, 0x00a803, 0x00a805, 0x00a807, 0x00a80a, 0x00a80c, 0x00a822, 0x00a840, 0x00a873, 0x00a882, 0x00a8b3, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb,
+                        0x000870, 0x000887, 0x000889, 0x00088e, 0x0008a0, 0x0008c9, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985,
+                        0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd,
+                        0x0009df, 0x0009e1, 0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35,
+                        0x000a36, 0x000a38, 0x000a39, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0,
+                        0x000ab2, 0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13,
+                        0x000b28, 0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83,
+                        0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae,
+                        0x000bb9, 0x000bd0, 0x000bd0, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d,
+                        0x000c60, 0x000c61, 0x000c80, 0x000c80, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cdd,
+                        0x000cde, 0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2, 0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56,
+                        0x000d5f, 0x000d61, 0x000d7a, 0x000d7f, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32,
+                        0x000e33, 0x000e40, 0x000e46, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3,
+                        0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000,
+                        0x00102a, 0x00103f, 0x00103f, 0x001050, 0x001055, 0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e,
+                        0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a,
+                        0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6,
+                        0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681,
+                        0x00169a, 0x0016a0, 0x0016ea, 0x0016f1, 0x0016f8, 0x001700, 0x001711, 0x00171f, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3,
+                        0x0017d7, 0x0017d7, 0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x001884, 0x001887, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950,
+                        0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4c,
+                        0x001b83, 0x001ba0, 0x001bae, 0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd,
+                        0x001cbf, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45,
+                        0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe,
+                        0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071,
+                        0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002119, 0x00211d, 0x002124, 0x002124, 0x002126,
+                        0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002183, 0x002184, 0x002c00, 0x002ce4,
+                        0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0,
+                        0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x002e2f, 0x002e2f,
+                        0x003005, 0x003006, 0x003031, 0x003035, 0x00303b, 0x00303c, 0x003041, 0x003096, 0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131,
+                        0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b,
+                        0x00a640, 0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0, 0x00a6e5, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5,
+                        0x00a7d9, 0x00a7f2, 0x00a801, 0x00a803, 0x00a805, 0x00a807, 0x00a80a, 0x00a80c, 0x00a822, 0x00a840, 0x00a873, 0x00a882, 0x00a8b3, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb,
                         0x00a8fd, 0x00a8fe, 0x00a90a, 0x00a925, 0x00a930, 0x00a946, 0x00a960, 0x00a97c, 0x00a984, 0x00a9b2, 0x00a9cf, 0x00a9cf, 0x00a9e0, 0x00a9e4, 0x00a9e6, 0x00a9ef, 0x00a9fa,
                         0x00a9fe, 0x00aa00, 0x00aa28, 0x00aa40, 0x00aa42, 0x00aa44, 0x00aa4b, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aa7a, 0x00aa7e, 0x00aaaf, 0x00aab1, 0x00aab1, 0x00aab5, 0x00aab6,
                         0x00aab9, 0x00aabd, 0x00aac0, 0x00aac0, 0x00aac2, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaea, 0x00aaf2, 0x00aaf4, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11,
@@ -117,68 +118,72 @@ static CodePointSet getGeneralCategory(String name) {
                         0x00fe76, 0x00fefc, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000,
                         0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010280, 0x01029c, 0x0102a0, 0x0102d0,
                         0x010300, 0x01031f, 0x01032d, 0x010340, 0x010342, 0x010349, 0x010350, 0x010375, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x010400, 0x01049d, 0x0104b0,
-                        0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808,
-                        0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900,
-                        0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c,
-                        0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80,
-                        0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010fb0, 0x010fc4,
-                        0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176,
-                        0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288,
-                        0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332,
-                        0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af,
-                        0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700,
-                        0x01171a, 0x011800, 0x01182b, 0x0118a0, 0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f,
-                        0x011941, 0x011941, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50,
-                        0x011a50, 0x011a5c, 0x011a89, 0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06,
-                        0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0,
-                        0x011fb0, 0x012000, 0x012399, 0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f,
+                        0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1,
+                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2,
+                        0x0107ba, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e,
+                        0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15,
+                        0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72,
+                        0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27,
+                        0x010f27, 0x010f30, 0x010f45, 0x010f70, 0x010f81, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011071, 0x011072, 0x011075, 0x011075, 0x011083, 0x0110af,
+                        0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da,
+                        0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8,
+                        0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350,
+                        0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae,
+                        0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011740, 0x011746, 0x011800, 0x01182b, 0x0118a0,
+                        0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0, 0x0119a7,
+                        0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89, 0x011a9d,
+                        0x011a9d, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30,
+                        0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012480,
+                        0x012543, 0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a70, 0x016abe, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f,
                         0x016b40, 0x016b43, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f50, 0x016f50, 0x016f93, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3,
-                        0x016fe3, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a,
-                        0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9,
-                        0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539,
-                        0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc,
-                        0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e100, 0x01e12c,
-                        0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2eb, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21,
-                        0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47,
-                        0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d,
-                        0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e,
-                        0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820,
-                        0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                        0x016fe3, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152,
+                        0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e,
+                        0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a,
+                        0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8,
+                        0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8,
+                        0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df1e, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e290, 0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e7e0,
+                        0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f,
+                        0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47,
+                        0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b,
+                        0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e,
+                        0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d,
+                        0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
         GENERAL_CATEGORIES.put("gc=M", CodePointSet.createNoDedup(0x000300, 0x00036f, 0x000483, 0x000489, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c5, 0x0005c7,
                         0x0005c7, 0x000610, 0x00061a, 0x00064b, 0x00065f, 0x000670, 0x000670, 0x0006d6, 0x0006dc, 0x0006df, 0x0006e4, 0x0006e7, 0x0006e8, 0x0006ea, 0x0006ed, 0x000711, 0x000711,
                         0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f3, 0x0007fd, 0x0007fd, 0x000816, 0x000819, 0x00081b, 0x000823, 0x000825, 0x000827, 0x000829, 0x00082d, 0x000859,
-                        0x00085b, 0x0008d3, 0x0008e1, 0x0008e3, 0x000903, 0x00093a, 0x00093c, 0x00093e, 0x00094f, 0x000951, 0x000957, 0x000962, 0x000963, 0x000981, 0x000983, 0x0009bc, 0x0009bc,
-                        0x0009be, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009cd, 0x0009d7, 0x0009d7, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01, 0x000a03, 0x000a3c, 0x000a3c, 0x000a3e,
-                        0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a83, 0x000abc, 0x000abc, 0x000abe, 0x000ac5,
-                        0x000ac7, 0x000ac9, 0x000acb, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b03, 0x000b3c, 0x000b3c, 0x000b3e, 0x000b44, 0x000b47, 0x000b48, 0x000b4b,
-                        0x000b4d, 0x000b55, 0x000b57, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd7, 0x000bd7, 0x000c00, 0x000c04,
-                        0x000c3e, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c83, 0x000cbc, 0x000cbc, 0x000cbe, 0x000cc4, 0x000cc6,
-                        0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000ce2, 0x000ce3, 0x000d00, 0x000d03, 0x000d3b, 0x000d3c, 0x000d3e, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4d,
-                        0x000d57, 0x000d57, 0x000d62, 0x000d63, 0x000d81, 0x000d83, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8, 0x000ddf, 0x000df2, 0x000df3, 0x000e31,
-                        0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37,
-                        0x000f39, 0x000f39, 0x000f3e, 0x000f3f, 0x000f71, 0x000f84, 0x000f86, 0x000f87, 0x000f8d, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102b, 0x00103e, 0x001056,
-                        0x001059, 0x00105e, 0x001060, 0x001062, 0x001064, 0x001067, 0x00106d, 0x001071, 0x001074, 0x001082, 0x00108d, 0x00108f, 0x00108f, 0x00109a, 0x00109d, 0x00135d, 0x00135f,
-                        0x001712, 0x001714, 0x001732, 0x001734, 0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017d3, 0x0017dd, 0x0017dd, 0x00180b, 0x00180d, 0x001885, 0x001886, 0x0018a9,
-                        0x0018a9, 0x001920, 0x00192b, 0x001930, 0x00193b, 0x001a17, 0x001a1b, 0x001a55, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a7f, 0x001ab0, 0x001ac0, 0x001b00, 0x001b04,
-                        0x001b34, 0x001b44, 0x001b6b, 0x001b73, 0x001b80, 0x001b82, 0x001ba1, 0x001bad, 0x001be6, 0x001bf3, 0x001c24, 0x001c37, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce8, 0x001ced,
-                        0x001ced, 0x001cf4, 0x001cf4, 0x001cf7, 0x001cf9, 0x001dc0, 0x001df9, 0x001dfb, 0x001dff, 0x0020d0, 0x0020f0, 0x002cef, 0x002cf1, 0x002d7f, 0x002d7f, 0x002de0, 0x002dff,
-                        0x00302a, 0x00302f, 0x003099, 0x00309a, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a69e, 0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a802, 0x00a802, 0x00a806, 0x00a806, 0x00a80b,
-                        0x00a80b, 0x00a823, 0x00a827, 0x00a82c, 0x00a82c, 0x00a880, 0x00a881, 0x00a8b4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d, 0x00a947, 0x00a953,
-                        0x00a980, 0x00a983, 0x00a9b3, 0x00a9c0, 0x00a9e5, 0x00a9e5, 0x00aa29, 0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4d, 0x00aa7b, 0x00aa7d, 0x00aab0, 0x00aab0, 0x00aab2,
-                        0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1, 0x00aaeb, 0x00aaef, 0x00aaf5, 0x00aaf6, 0x00abe3, 0x00abea, 0x00abec, 0x00abed, 0x00fb1e, 0x00fb1e,
-                        0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38,
-                        0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x011000, 0x011002, 0x011038, 0x011046, 0x01107f, 0x011082,
-                        0x0110b0, 0x0110ba, 0x011100, 0x011102, 0x011127, 0x011134, 0x011145, 0x011146, 0x011173, 0x011173, 0x011180, 0x011182, 0x0111b3, 0x0111c0, 0x0111c9, 0x0111cc, 0x0111ce,
-                        0x0111cf, 0x01122c, 0x011237, 0x01123e, 0x01123e, 0x0112df, 0x0112ea, 0x011300, 0x011303, 0x01133b, 0x01133c, 0x01133e, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d,
-                        0x011357, 0x011357, 0x011362, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011435, 0x011446, 0x01145e, 0x01145e, 0x0114b0, 0x0114c3, 0x0115af, 0x0115b5, 0x0115b8,
-                        0x0115c0, 0x0115dc, 0x0115dd, 0x011630, 0x011640, 0x0116ab, 0x0116b7, 0x01171d, 0x01172b, 0x01182c, 0x01183a, 0x011930, 0x011935, 0x011937, 0x011938, 0x01193b, 0x01193e,
-                        0x011940, 0x011940, 0x011942, 0x011943, 0x0119d1, 0x0119d7, 0x0119da, 0x0119e0, 0x0119e4, 0x0119e4, 0x011a01, 0x011a0a, 0x011a33, 0x011a39, 0x011a3b, 0x011a3e, 0x011a47,
-                        0x011a47, 0x011a51, 0x011a5b, 0x011a8a, 0x011a99, 0x011c2f, 0x011c36, 0x011c38, 0x011c3f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a,
-                        0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d8a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d97, 0x011ef3, 0x011ef6, 0x016af0, 0x016af4, 0x016b30,
-                        0x016b36, 0x016f4f, 0x016f4f, 0x016f51, 0x016f87, 0x016f8f, 0x016f92, 0x016fe4, 0x016fe4, 0x016ff0, 0x016ff1, 0x01bc9d, 0x01bc9e, 0x01d165, 0x01d169, 0x01d16d, 0x01d172,
-                        0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b,
-                        0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e130, 0x01e136, 0x01e2ec, 0x01e2ef,
-                        0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0100, 0x0e01ef));
+                        0x00085b, 0x000898, 0x00089f, 0x0008ca, 0x0008e1, 0x0008e3, 0x000903, 0x00093a, 0x00093c, 0x00093e, 0x00094f, 0x000951, 0x000957, 0x000962, 0x000963, 0x000981, 0x000983,
+                        0x0009bc, 0x0009bc, 0x0009be, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009cd, 0x0009d7, 0x0009d7, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01, 0x000a03, 0x000a3c,
+                        0x000a3c, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a83, 0x000abc, 0x000abc,
+                        0x000abe, 0x000ac5, 0x000ac7, 0x000ac9, 0x000acb, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b03, 0x000b3c, 0x000b3c, 0x000b3e, 0x000b44, 0x000b47,
+                        0x000b48, 0x000b4b, 0x000b4d, 0x000b55, 0x000b57, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd7, 0x000bd7,
+                        0x000c00, 0x000c04, 0x000c3c, 0x000c3c, 0x000c3e, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c83, 0x000cbc,
+                        0x000cbc, 0x000cbe, 0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000ce2, 0x000ce3, 0x000d00, 0x000d03, 0x000d3b, 0x000d3c, 0x000d3e, 0x000d44,
+                        0x000d46, 0x000d48, 0x000d4a, 0x000d4d, 0x000d57, 0x000d57, 0x000d62, 0x000d63, 0x000d81, 0x000d83, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8,
+                        0x000ddf, 0x000df2, 0x000df3, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec8, 0x000ecd, 0x000f18, 0x000f19,
+                        0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f3f, 0x000f71, 0x000f84, 0x000f86, 0x000f87, 0x000f8d, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6,
+                        0x000fc6, 0x00102b, 0x00103e, 0x001056, 0x001059, 0x00105e, 0x001060, 0x001062, 0x001064, 0x001067, 0x00106d, 0x001071, 0x001074, 0x001082, 0x00108d, 0x00108f, 0x00108f,
+                        0x00109a, 0x00109d, 0x00135d, 0x00135f, 0x001712, 0x001715, 0x001732, 0x001734, 0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017d3, 0x0017dd, 0x0017dd, 0x00180b,
+                        0x00180d, 0x00180f, 0x00180f, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920, 0x00192b, 0x001930, 0x00193b, 0x001a17, 0x001a1b, 0x001a55, 0x001a5e, 0x001a60, 0x001a7c,
+                        0x001a7f, 0x001a7f, 0x001ab0, 0x001ace, 0x001b00, 0x001b04, 0x001b34, 0x001b44, 0x001b6b, 0x001b73, 0x001b80, 0x001b82, 0x001ba1, 0x001bad, 0x001be6, 0x001bf3, 0x001c24,
+                        0x001c37, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf7, 0x001cf9, 0x001dc0, 0x001dff, 0x0020d0, 0x0020f0, 0x002cef, 0x002cf1,
+                        0x002d7f, 0x002d7f, 0x002de0, 0x002dff, 0x00302a, 0x00302f, 0x003099, 0x00309a, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a69e, 0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a802,
+                        0x00a802, 0x00a806, 0x00a806, 0x00a80b, 0x00a80b, 0x00a823, 0x00a827, 0x00a82c, 0x00a82c, 0x00a880, 0x00a881, 0x00a8b4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff,
+                        0x00a926, 0x00a92d, 0x00a947, 0x00a953, 0x00a980, 0x00a983, 0x00a9b3, 0x00a9c0, 0x00a9e5, 0x00a9e5, 0x00aa29, 0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4d, 0x00aa7b,
+                        0x00aa7d, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1, 0x00aaeb, 0x00aaef, 0x00aaf5, 0x00aaf6, 0x00abe3, 0x00abea,
+                        0x00abec, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05,
+                        0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x010f82, 0x010f85,
+                        0x011000, 0x011002, 0x011038, 0x011046, 0x011070, 0x011070, 0x011073, 0x011074, 0x01107f, 0x011082, 0x0110b0, 0x0110ba, 0x0110c2, 0x0110c2, 0x011100, 0x011102, 0x011127,
+                        0x011134, 0x011145, 0x011146, 0x011173, 0x011173, 0x011180, 0x011182, 0x0111b3, 0x0111c0, 0x0111c9, 0x0111cc, 0x0111ce, 0x0111cf, 0x01122c, 0x011237, 0x01123e, 0x01123e,
+                        0x0112df, 0x0112ea, 0x011300, 0x011303, 0x01133b, 0x01133c, 0x01133e, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011357, 0x011357, 0x011362, 0x011363, 0x011366,
+                        0x01136c, 0x011370, 0x011374, 0x011435, 0x011446, 0x01145e, 0x01145e, 0x0114b0, 0x0114c3, 0x0115af, 0x0115b5, 0x0115b8, 0x0115c0, 0x0115dc, 0x0115dd, 0x011630, 0x011640,
+                        0x0116ab, 0x0116b7, 0x01171d, 0x01172b, 0x01182c, 0x01183a, 0x011930, 0x011935, 0x011937, 0x011938, 0x01193b, 0x01193e, 0x011940, 0x011940, 0x011942, 0x011943, 0x0119d1,
+                        0x0119d7, 0x0119da, 0x0119e0, 0x0119e4, 0x0119e4, 0x011a01, 0x011a0a, 0x011a33, 0x011a39, 0x011a3b, 0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a5b, 0x011a8a, 0x011a99,
+                        0x011c2f, 0x011c36, 0x011c38, 0x011c3f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47,
+                        0x011d47, 0x011d8a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d97, 0x011ef3, 0x011ef6, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f4f, 0x016f4f, 0x016f51, 0x016f87,
+                        0x016f8f, 0x016f92, 0x016fe4, 0x016fe4, 0x016ff0, 0x016ff1, 0x01bc9d, 0x01bc9e, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d165, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b,
+                        0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f,
+                        0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e130, 0x01e136, 0x01e2ae, 0x01e2ae, 0x01e2ec,
+                        0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0100, 0x0e01ef));
         GENERAL_CATEGORIES.put("gc=N", CodePointSet.createNoDedup(0x000030, 0x000039, 0x0000b2, 0x0000b3, 0x0000b9, 0x0000b9, 0x0000bc, 0x0000be, 0x000660, 0x000669, 0x0006f0, 0x0006f9, 0x0007c0,
                         0x0007c9, 0x000966, 0x00096f, 0x0009e6, 0x0009ef, 0x0009f4, 0x0009f9, 0x000a66, 0x000a6f, 0x000ae6, 0x000aef, 0x000b66, 0x000b6f, 0x000b72, 0x000b77, 0x000be6, 0x000bf2,
                         0x000c66, 0x000c6f, 0x000c78, 0x000c7e, 0x000ce6, 0x000cef, 0x000d58, 0x000d5e, 0x000d66, 0x000d78, 0x000de6, 0x000def, 0x000e50, 0x000e59, 0x000ed0, 0x000ed9, 0x000f20,
@@ -192,76 +197,77 @@ static CodePointSet getGeneralCategory(String name) {
                         0x0109d2, 0x0109ff, 0x010a40, 0x010a48, 0x010a7d, 0x010a7e, 0x010a9d, 0x010a9f, 0x010aeb, 0x010aef, 0x010b58, 0x010b5f, 0x010b78, 0x010b7f, 0x010ba9, 0x010baf, 0x010cfa,
                         0x010cff, 0x010d30, 0x010d39, 0x010e60, 0x010e7e, 0x010f1d, 0x010f26, 0x010f51, 0x010f54, 0x010fc5, 0x010fcb, 0x011052, 0x01106f, 0x0110f0, 0x0110f9, 0x011136, 0x01113f,
                         0x0111d0, 0x0111d9, 0x0111e1, 0x0111f4, 0x0112f0, 0x0112f9, 0x011450, 0x011459, 0x0114d0, 0x0114d9, 0x011650, 0x011659, 0x0116c0, 0x0116c9, 0x011730, 0x01173b, 0x0118e0,
-                        0x0118f2, 0x011950, 0x011959, 0x011c50, 0x011c6c, 0x011d50, 0x011d59, 0x011da0, 0x011da9, 0x011fc0, 0x011fd4, 0x012400, 0x01246e, 0x016a60, 0x016a69, 0x016b50, 0x016b59,
-                        0x016b5b, 0x016b61, 0x016e80, 0x016e96, 0x01d2e0, 0x01d2f3, 0x01d360, 0x01d378, 0x01d7ce, 0x01d7ff, 0x01e140, 0x01e149, 0x01e2f0, 0x01e2f9, 0x01e8c7, 0x01e8cf, 0x01e950,
-                        0x01e959, 0x01ec71, 0x01ecab, 0x01ecad, 0x01ecaf, 0x01ecb1, 0x01ecb4, 0x01ed01, 0x01ed2d, 0x01ed2f, 0x01ed3d, 0x01f100, 0x01f10c, 0x01fbf0, 0x01fbf9));
+                        0x0118f2, 0x011950, 0x011959, 0x011c50, 0x011c6c, 0x011d50, 0x011d59, 0x011da0, 0x011da9, 0x011fc0, 0x011fd4, 0x012400, 0x01246e, 0x016a60, 0x016a69, 0x016ac0, 0x016ac9,
+                        0x016b50, 0x016b59, 0x016b5b, 0x016b61, 0x016e80, 0x016e96, 0x01d2e0, 0x01d2f3, 0x01d360, 0x01d378, 0x01d7ce, 0x01d7ff, 0x01e140, 0x01e149, 0x01e2f0, 0x01e2f9, 0x01e8c7,
+                        0x01e8cf, 0x01e950, 0x01e959, 0x01ec71, 0x01ecab, 0x01ecad, 0x01ecaf, 0x01ecb1, 0x01ecb4, 0x01ed01, 0x01ed2d, 0x01ed2f, 0x01ed3d, 0x01f100, 0x01f10c, 0x01fbf0, 0x01fbf9));
         GENERAL_CATEGORIES.put("gc=P", CodePointSet.createNoDedup(0x000021, 0x000023, 0x000025, 0x00002a, 0x00002c, 0x00002f, 0x00003a, 0x00003b, 0x00003f, 0x000040, 0x00005b, 0x00005d, 0x00005f,
                         0x00005f, 0x00007b, 0x00007b, 0x00007d, 0x00007d, 0x0000a1, 0x0000a1, 0x0000a7, 0x0000a7, 0x0000ab, 0x0000ab, 0x0000b6, 0x0000b7, 0x0000bb, 0x0000bb, 0x0000bf, 0x0000bf,
                         0x00037e, 0x00037e, 0x000387, 0x000387, 0x00055a, 0x00055f, 0x000589, 0x00058a, 0x0005be, 0x0005be, 0x0005c0, 0x0005c0, 0x0005c3, 0x0005c3, 0x0005c6, 0x0005c6, 0x0005f3,
-                        0x0005f4, 0x000609, 0x00060a, 0x00060c, 0x00060d, 0x00061b, 0x00061b, 0x00061e, 0x00061f, 0x00066a, 0x00066d, 0x0006d4, 0x0006d4, 0x000700, 0x00070d, 0x0007f7, 0x0007f9,
+                        0x0005f4, 0x000609, 0x00060a, 0x00060c, 0x00060d, 0x00061b, 0x00061b, 0x00061d, 0x00061f, 0x00066a, 0x00066d, 0x0006d4, 0x0006d4, 0x000700, 0x00070d, 0x0007f7, 0x0007f9,
                         0x000830, 0x00083e, 0x00085e, 0x00085e, 0x000964, 0x000965, 0x000970, 0x000970, 0x0009fd, 0x0009fd, 0x000a76, 0x000a76, 0x000af0, 0x000af0, 0x000c77, 0x000c77, 0x000c84,
                         0x000c84, 0x000df4, 0x000df4, 0x000e4f, 0x000e4f, 0x000e5a, 0x000e5b, 0x000f04, 0x000f12, 0x000f14, 0x000f14, 0x000f3a, 0x000f3d, 0x000f85, 0x000f85, 0x000fd0, 0x000fd4,
                         0x000fd9, 0x000fda, 0x00104a, 0x00104f, 0x0010fb, 0x0010fb, 0x001360, 0x001368, 0x001400, 0x001400, 0x00166e, 0x00166e, 0x00169b, 0x00169c, 0x0016eb, 0x0016ed, 0x001735,
                         0x001736, 0x0017d4, 0x0017d6, 0x0017d8, 0x0017da, 0x001800, 0x00180a, 0x001944, 0x001945, 0x001a1e, 0x001a1f, 0x001aa0, 0x001aa6, 0x001aa8, 0x001aad, 0x001b5a, 0x001b60,
-                        0x001bfc, 0x001bff, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x001cc0, 0x001cc7, 0x001cd3, 0x001cd3, 0x002010, 0x002027, 0x002030, 0x002043, 0x002045, 0x002051, 0x002053,
-                        0x00205e, 0x00207d, 0x00207e, 0x00208d, 0x00208e, 0x002308, 0x00230b, 0x002329, 0x00232a, 0x002768, 0x002775, 0x0027c5, 0x0027c6, 0x0027e6, 0x0027ef, 0x002983, 0x002998,
-                        0x0029d8, 0x0029db, 0x0029fc, 0x0029fd, 0x002cf9, 0x002cfc, 0x002cfe, 0x002cff, 0x002d70, 0x002d70, 0x002e00, 0x002e2e, 0x002e30, 0x002e4f, 0x002e52, 0x002e52, 0x003001,
-                        0x003003, 0x003008, 0x003011, 0x003014, 0x00301f, 0x003030, 0x003030, 0x00303d, 0x00303d, 0x0030a0, 0x0030a0, 0x0030fb, 0x0030fb, 0x00a4fe, 0x00a4ff, 0x00a60d, 0x00a60f,
-                        0x00a673, 0x00a673, 0x00a67e, 0x00a67e, 0x00a6f2, 0x00a6f7, 0x00a874, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a8f8, 0x00a8fa, 0x00a8fc, 0x00a8fc, 0x00a92e, 0x00a92f, 0x00a95f,
-                        0x00a95f, 0x00a9c1, 0x00a9cd, 0x00a9de, 0x00a9df, 0x00aa5c, 0x00aa5f, 0x00aade, 0x00aadf, 0x00aaf0, 0x00aaf1, 0x00abeb, 0x00abeb, 0x00fd3e, 0x00fd3f, 0x00fe10, 0x00fe19,
-                        0x00fe30, 0x00fe52, 0x00fe54, 0x00fe61, 0x00fe63, 0x00fe63, 0x00fe68, 0x00fe68, 0x00fe6a, 0x00fe6b, 0x00ff01, 0x00ff03, 0x00ff05, 0x00ff0a, 0x00ff0c, 0x00ff0f, 0x00ff1a,
-                        0x00ff1b, 0x00ff1f, 0x00ff20, 0x00ff3b, 0x00ff3d, 0x00ff3f, 0x00ff3f, 0x00ff5b, 0x00ff5b, 0x00ff5d, 0x00ff5d, 0x00ff5f, 0x00ff65, 0x010100, 0x010102, 0x01039f, 0x01039f,
-                        0x0103d0, 0x0103d0, 0x01056f, 0x01056f, 0x010857, 0x010857, 0x01091f, 0x01091f, 0x01093f, 0x01093f, 0x010a50, 0x010a58, 0x010a7f, 0x010a7f, 0x010af0, 0x010af6, 0x010b39,
-                        0x010b3f, 0x010b99, 0x010b9c, 0x010ead, 0x010ead, 0x010f55, 0x010f59, 0x011047, 0x01104d, 0x0110bb, 0x0110bc, 0x0110be, 0x0110c1, 0x011140, 0x011143, 0x011174, 0x011175,
-                        0x0111c5, 0x0111c8, 0x0111cd, 0x0111cd, 0x0111db, 0x0111db, 0x0111dd, 0x0111df, 0x011238, 0x01123d, 0x0112a9, 0x0112a9, 0x01144b, 0x01144f, 0x01145a, 0x01145b, 0x01145d,
-                        0x01145d, 0x0114c6, 0x0114c6, 0x0115c1, 0x0115d7, 0x011641, 0x011643, 0x011660, 0x01166c, 0x01173c, 0x01173e, 0x01183b, 0x01183b, 0x011944, 0x011946, 0x0119e2, 0x0119e2,
-                        0x011a3f, 0x011a46, 0x011a9a, 0x011a9c, 0x011a9e, 0x011aa2, 0x011c41, 0x011c45, 0x011c70, 0x011c71, 0x011ef7, 0x011ef8, 0x011fff, 0x011fff, 0x012470, 0x012474, 0x016a6e,
-                        0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b3b, 0x016b44, 0x016b44, 0x016e97, 0x016e9a, 0x016fe2, 0x016fe2, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8b, 0x01e95e, 0x01e95f));
+                        0x001b7d, 0x001b7e, 0x001bfc, 0x001bff, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x001cc0, 0x001cc7, 0x001cd3, 0x001cd3, 0x002010, 0x002027, 0x002030, 0x002043, 0x002045,
+                        0x002051, 0x002053, 0x00205e, 0x00207d, 0x00207e, 0x00208d, 0x00208e, 0x002308, 0x00230b, 0x002329, 0x00232a, 0x002768, 0x002775, 0x0027c5, 0x0027c6, 0x0027e6, 0x0027ef,
+                        0x002983, 0x002998, 0x0029d8, 0x0029db, 0x0029fc, 0x0029fd, 0x002cf9, 0x002cfc, 0x002cfe, 0x002cff, 0x002d70, 0x002d70, 0x002e00, 0x002e2e, 0x002e30, 0x002e4f, 0x002e52,
+                        0x002e5d, 0x003001, 0x003003, 0x003008, 0x003011, 0x003014, 0x00301f, 0x003030, 0x003030, 0x00303d, 0x00303d, 0x0030a0, 0x0030a0, 0x0030fb, 0x0030fb, 0x00a4fe, 0x00a4ff,
+                        0x00a60d, 0x00a60f, 0x00a673, 0x00a673, 0x00a67e, 0x00a67e, 0x00a6f2, 0x00a6f7, 0x00a874, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a8f8, 0x00a8fa, 0x00a8fc, 0x00a8fc, 0x00a92e,
+                        0x00a92f, 0x00a95f, 0x00a95f, 0x00a9c1, 0x00a9cd, 0x00a9de, 0x00a9df, 0x00aa5c, 0x00aa5f, 0x00aade, 0x00aadf, 0x00aaf0, 0x00aaf1, 0x00abeb, 0x00abeb, 0x00fd3e, 0x00fd3f,
+                        0x00fe10, 0x00fe19, 0x00fe30, 0x00fe52, 0x00fe54, 0x00fe61, 0x00fe63, 0x00fe63, 0x00fe68, 0x00fe68, 0x00fe6a, 0x00fe6b, 0x00ff01, 0x00ff03, 0x00ff05, 0x00ff0a, 0x00ff0c,
+                        0x00ff0f, 0x00ff1a, 0x00ff1b, 0x00ff1f, 0x00ff20, 0x00ff3b, 0x00ff3d, 0x00ff3f, 0x00ff3f, 0x00ff5b, 0x00ff5b, 0x00ff5d, 0x00ff5d, 0x00ff5f, 0x00ff65, 0x010100, 0x010102,
+                        0x01039f, 0x01039f, 0x0103d0, 0x0103d0, 0x01056f, 0x01056f, 0x010857, 0x010857, 0x01091f, 0x01091f, 0x01093f, 0x01093f, 0x010a50, 0x010a58, 0x010a7f, 0x010a7f, 0x010af0,
+                        0x010af6, 0x010b39, 0x010b3f, 0x010b99, 0x010b9c, 0x010ead, 0x010ead, 0x010f55, 0x010f59, 0x010f86, 0x010f89, 0x011047, 0x01104d, 0x0110bb, 0x0110bc, 0x0110be, 0x0110c1,
+                        0x011140, 0x011143, 0x011174, 0x011175, 0x0111c5, 0x0111c8, 0x0111cd, 0x0111cd, 0x0111db, 0x0111db, 0x0111dd, 0x0111df, 0x011238, 0x01123d, 0x0112a9, 0x0112a9, 0x01144b,
+                        0x01144f, 0x01145a, 0x01145b, 0x01145d, 0x01145d, 0x0114c6, 0x0114c6, 0x0115c1, 0x0115d7, 0x011641, 0x011643, 0x011660, 0x01166c, 0x0116b9, 0x0116b9, 0x01173c, 0x01173e,
+                        0x01183b, 0x01183b, 0x011944, 0x011946, 0x0119e2, 0x0119e2, 0x011a3f, 0x011a46, 0x011a9a, 0x011a9c, 0x011a9e, 0x011aa2, 0x011c41, 0x011c45, 0x011c70, 0x011c71, 0x011ef7,
+                        0x011ef8, 0x011fff, 0x011fff, 0x012470, 0x012474, 0x012ff1, 0x012ff2, 0x016a6e, 0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b3b, 0x016b44, 0x016b44, 0x016e97, 0x016e9a,
+                        0x016fe2, 0x016fe2, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8b, 0x01e95e, 0x01e95f));
         GENERAL_CATEGORIES.put("gc=S", CodePointSet.createNoDedup(0x000024, 0x000024, 0x00002b, 0x00002b, 0x00003c, 0x00003e, 0x00005e, 0x00005e, 0x000060, 0x000060, 0x00007c, 0x00007c, 0x00007e,
                         0x00007e, 0x0000a2, 0x0000a6, 0x0000a8, 0x0000a9, 0x0000ac, 0x0000ac, 0x0000ae, 0x0000b1, 0x0000b4, 0x0000b4, 0x0000b8, 0x0000b8, 0x0000d7, 0x0000d7, 0x0000f7, 0x0000f7,
                         0x0002c2, 0x0002c5, 0x0002d2, 0x0002df, 0x0002e5, 0x0002eb, 0x0002ed, 0x0002ed, 0x0002ef, 0x0002ff, 0x000375, 0x000375, 0x000384, 0x000385, 0x0003f6, 0x0003f6, 0x000482,
                         0x000482, 0x00058d, 0x00058f, 0x000606, 0x000608, 0x00060b, 0x00060b, 0x00060e, 0x00060f, 0x0006de, 0x0006de, 0x0006e9, 0x0006e9, 0x0006fd, 0x0006fe, 0x0007f6, 0x0007f6,
-                        0x0007fe, 0x0007ff, 0x0009f2, 0x0009f3, 0x0009fa, 0x0009fb, 0x000af1, 0x000af1, 0x000b70, 0x000b70, 0x000bf3, 0x000bfa, 0x000c7f, 0x000c7f, 0x000d4f, 0x000d4f, 0x000d79,
-                        0x000d79, 0x000e3f, 0x000e3f, 0x000f01, 0x000f03, 0x000f13, 0x000f13, 0x000f15, 0x000f17, 0x000f1a, 0x000f1f, 0x000f34, 0x000f34, 0x000f36, 0x000f36, 0x000f38, 0x000f38,
-                        0x000fbe, 0x000fc5, 0x000fc7, 0x000fcc, 0x000fce, 0x000fcf, 0x000fd5, 0x000fd8, 0x00109e, 0x00109f, 0x001390, 0x001399, 0x00166d, 0x00166d, 0x0017db, 0x0017db, 0x001940,
-                        0x001940, 0x0019de, 0x0019ff, 0x001b61, 0x001b6a, 0x001b74, 0x001b7c, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1, 0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef,
-                        0x001ffd, 0x001ffe, 0x002044, 0x002044, 0x002052, 0x002052, 0x00207a, 0x00207c, 0x00208a, 0x00208c, 0x0020a0, 0x0020bf, 0x002100, 0x002101, 0x002103, 0x002106, 0x002108,
-                        0x002109, 0x002114, 0x002114, 0x002116, 0x002118, 0x00211e, 0x002123, 0x002125, 0x002125, 0x002127, 0x002127, 0x002129, 0x002129, 0x00212e, 0x00212e, 0x00213a, 0x00213b,
-                        0x002140, 0x002144, 0x00214a, 0x00214d, 0x00214f, 0x00214f, 0x00218a, 0x00218b, 0x002190, 0x002307, 0x00230c, 0x002328, 0x00232b, 0x002426, 0x002440, 0x00244a, 0x00249c,
-                        0x0024e9, 0x002500, 0x002767, 0x002794, 0x0027c4, 0x0027c7, 0x0027e5, 0x0027f0, 0x002982, 0x002999, 0x0029d7, 0x0029dc, 0x0029fb, 0x0029fe, 0x002b73, 0x002b76, 0x002b95,
-                        0x002b97, 0x002bff, 0x002ce5, 0x002cea, 0x002e50, 0x002e51, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003004, 0x003004, 0x003012,
-                        0x003013, 0x003020, 0x003020, 0x003036, 0x003037, 0x00303e, 0x00303f, 0x00309b, 0x00309c, 0x003190, 0x003191, 0x003196, 0x00319f, 0x0031c0, 0x0031e3, 0x003200, 0x00321e,
-                        0x00322a, 0x003247, 0x003250, 0x003250, 0x003260, 0x00327f, 0x00328a, 0x0032b0, 0x0032c0, 0x0033ff, 0x004dc0, 0x004dff, 0x00a490, 0x00a4c6, 0x00a700, 0x00a716, 0x00a720,
-                        0x00a721, 0x00a789, 0x00a78a, 0x00a828, 0x00a82b, 0x00a836, 0x00a839, 0x00aa77, 0x00aa79, 0x00ab5b, 0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fb29, 0x00fb29, 0x00fbb2, 0x00fbc1,
-                        0x00fdfc, 0x00fdfd, 0x00fe62, 0x00fe62, 0x00fe64, 0x00fe66, 0x00fe69, 0x00fe69, 0x00ff04, 0x00ff04, 0x00ff0b, 0x00ff0b, 0x00ff1c, 0x00ff1e, 0x00ff3e, 0x00ff3e, 0x00ff40,
-                        0x00ff40, 0x00ff5c, 0x00ff5c, 0x00ff5e, 0x00ff5e, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fffc, 0x00fffd, 0x010137, 0x01013f, 0x010179, 0x010189, 0x01018c, 0x01018e,
-                        0x010190, 0x01019c, 0x0101a0, 0x0101a0, 0x0101d0, 0x0101fc, 0x010877, 0x010878, 0x010ac8, 0x010ac8, 0x01173f, 0x01173f, 0x011fd5, 0x011ff1, 0x016b3c, 0x016b3f, 0x016b45,
-                        0x016b45, 0x01bc9c, 0x01bc9c, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d164, 0x01d16a, 0x01d16c, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1e8,
-                        0x01d200, 0x01d241, 0x01d245, 0x01d245, 0x01d300, 0x01d356, 0x01d6c1, 0x01d6c1, 0x01d6db, 0x01d6db, 0x01d6fb, 0x01d6fb, 0x01d715, 0x01d715, 0x01d735, 0x01d735, 0x01d74f,
-                        0x01d74f, 0x01d76f, 0x01d76f, 0x01d789, 0x01d789, 0x01d7a9, 0x01d7a9, 0x01d7c3, 0x01d7c3, 0x01d800, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d, 0x01da74, 0x01da76, 0x01da83,
-                        0x01da85, 0x01da86, 0x01e14f, 0x01e14f, 0x01e2ff, 0x01e2ff, 0x01ecac, 0x01ecac, 0x01ecb0, 0x01ecb0, 0x01ed2e, 0x01ed2e, 0x01eef0, 0x01eef1, 0x01f000, 0x01f02b, 0x01f030,
-                        0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f10d, 0x01f1ad, 0x01f1e6, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248,
-                        0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f800,
-                        0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978, 0x01f97a, 0x01f9cb, 0x01f9cd, 0x01fa53,
-                        0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2, 0x01fad0, 0x01fad6, 0x01fb00,
-                        0x01fb92, 0x01fb94, 0x01fbca));
+                        0x0007fe, 0x0007ff, 0x000888, 0x000888, 0x0009f2, 0x0009f3, 0x0009fa, 0x0009fb, 0x000af1, 0x000af1, 0x000b70, 0x000b70, 0x000bf3, 0x000bfa, 0x000c7f, 0x000c7f, 0x000d4f,
+                        0x000d4f, 0x000d79, 0x000d79, 0x000e3f, 0x000e3f, 0x000f01, 0x000f03, 0x000f13, 0x000f13, 0x000f15, 0x000f17, 0x000f1a, 0x000f1f, 0x000f34, 0x000f34, 0x000f36, 0x000f36,
+                        0x000f38, 0x000f38, 0x000fbe, 0x000fc5, 0x000fc7, 0x000fcc, 0x000fce, 0x000fcf, 0x000fd5, 0x000fd8, 0x00109e, 0x00109f, 0x001390, 0x001399, 0x00166d, 0x00166d, 0x0017db,
+                        0x0017db, 0x001940, 0x001940, 0x0019de, 0x0019ff, 0x001b61, 0x001b6a, 0x001b74, 0x001b7c, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1, 0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf,
+                        0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x002044, 0x002044, 0x002052, 0x002052, 0x00207a, 0x00207c, 0x00208a, 0x00208c, 0x0020a0, 0x0020c0, 0x002100, 0x002101, 0x002103,
+                        0x002106, 0x002108, 0x002109, 0x002114, 0x002114, 0x002116, 0x002118, 0x00211e, 0x002123, 0x002125, 0x002125, 0x002127, 0x002127, 0x002129, 0x002129, 0x00212e, 0x00212e,
+                        0x00213a, 0x00213b, 0x002140, 0x002144, 0x00214a, 0x00214d, 0x00214f, 0x00214f, 0x00218a, 0x00218b, 0x002190, 0x002307, 0x00230c, 0x002328, 0x00232b, 0x002426, 0x002440,
+                        0x00244a, 0x00249c, 0x0024e9, 0x002500, 0x002767, 0x002794, 0x0027c4, 0x0027c7, 0x0027e5, 0x0027f0, 0x002982, 0x002999, 0x0029d7, 0x0029dc, 0x0029fb, 0x0029fe, 0x002b73,
+                        0x002b76, 0x002b95, 0x002b97, 0x002bff, 0x002ce5, 0x002cea, 0x002e50, 0x002e51, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003004,
+                        0x003004, 0x003012, 0x003013, 0x003020, 0x003020, 0x003036, 0x003037, 0x00303e, 0x00303f, 0x00309b, 0x00309c, 0x003190, 0x003191, 0x003196, 0x00319f, 0x0031c0, 0x0031e3,
+                        0x003200, 0x00321e, 0x00322a, 0x003247, 0x003250, 0x003250, 0x003260, 0x00327f, 0x00328a, 0x0032b0, 0x0032c0, 0x0033ff, 0x004dc0, 0x004dff, 0x00a490, 0x00a4c6, 0x00a700,
+                        0x00a716, 0x00a720, 0x00a721, 0x00a789, 0x00a78a, 0x00a828, 0x00a82b, 0x00a836, 0x00a839, 0x00aa77, 0x00aa79, 0x00ab5b, 0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fb29, 0x00fb29,
+                        0x00fbb2, 0x00fbc2, 0x00fd40, 0x00fd4f, 0x00fdcf, 0x00fdcf, 0x00fdfc, 0x00fdff, 0x00fe62, 0x00fe62, 0x00fe64, 0x00fe66, 0x00fe69, 0x00fe69, 0x00ff04, 0x00ff04, 0x00ff0b,
+                        0x00ff0b, 0x00ff1c, 0x00ff1e, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40, 0x00ff5c, 0x00ff5c, 0x00ff5e, 0x00ff5e, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fffc, 0x00fffd,
+                        0x010137, 0x01013f, 0x010179, 0x010189, 0x01018c, 0x01018e, 0x010190, 0x01019c, 0x0101a0, 0x0101a0, 0x0101d0, 0x0101fc, 0x010877, 0x010878, 0x010ac8, 0x010ac8, 0x01173f,
+                        0x01173f, 0x011fd5, 0x011ff1, 0x016b3c, 0x016b3f, 0x016b45, 0x016b45, 0x01bc9c, 0x01bc9c, 0x01cf50, 0x01cfc3, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d164,
+                        0x01d16a, 0x01d16c, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1ea, 0x01d200, 0x01d241, 0x01d245, 0x01d245, 0x01d300, 0x01d356, 0x01d6c1, 0x01d6c1, 0x01d6db,
+                        0x01d6db, 0x01d6fb, 0x01d6fb, 0x01d715, 0x01d715, 0x01d735, 0x01d735, 0x01d74f, 0x01d74f, 0x01d76f, 0x01d76f, 0x01d789, 0x01d789, 0x01d7a9, 0x01d7a9, 0x01d7c3, 0x01d7c3,
+                        0x01d800, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d, 0x01da74, 0x01da76, 0x01da83, 0x01da85, 0x01da86, 0x01e14f, 0x01e14f, 0x01e2ff, 0x01e2ff, 0x01ecac, 0x01ecac, 0x01ecb0,
+                        0x01ecb0, 0x01ed2e, 0x01ed2e, 0x01eef0, 0x01eef1, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5,
+                        0x01f10d, 0x01f1ad, 0x01f1e6, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6dd, 0x01f6ec, 0x01f6f0,
+                        0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887,
+                        0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0,
+                        0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca));
         GENERAL_CATEGORIES.put("gc=Z", CodePointSet.createNoDedup(0x000020, 0x000020, 0x0000a0, 0x0000a0, 0x001680, 0x001680, 0x002000, 0x00200a, 0x002028, 0x002029, 0x00202f, 0x00202f, 0x00205f,
                         0x00205f, 0x003000, 0x003000));
         GENERAL_CATEGORIES.put("gc=C", CodePointSet.createNoDedup(0x000000, 0x00001f, 0x00007f, 0x00009f, 0x0000ad, 0x0000ad, 0x000378, 0x000379, 0x000380, 0x000383, 0x00038b, 0x00038b, 0x00038d,
                         0x00038d, 0x0003a2, 0x0003a2, 0x000530, 0x000530, 0x000557, 0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x000605,
-                        0x00061c, 0x00061d, 0x0006dd, 0x0006dd, 0x00070e, 0x00070f, 0x00074b, 0x00074c, 0x0007b2, 0x0007bf, 0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c,
-                        0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00089f, 0x0008b5, 0x0008b5, 0x0008c8, 0x0008d2, 0x0008e2, 0x0008e2, 0x000984, 0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992,
-                        0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6, 0x0009c9, 0x0009ca, 0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de,
-                        0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11, 0x000a12, 0x000a29, 0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34,
-                        0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a, 0x000a4e, 0x000a50, 0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f,
-                        0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9, 0x000aa9, 0x000ab1, 0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb,
-                        0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5, 0x000af2, 0x000af8, 0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d,
-                        0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a, 0x000b3b, 0x000b45, 0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54,
-                        0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84, 0x000b8b, 0x000b8d, 0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b,
-                        0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba, 0x000bbd, 0x000bc3, 0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf,
-                        0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11, 0x000c29, 0x000c29, 0x000c3a, 0x000c3c, 0x000c45, 0x000c45, 0x000c49,
-                        0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5f, 0x000c64, 0x000c65, 0x000c70, 0x000c76, 0x000c8d, 0x000c8d, 0x000c91, 0x000c91, 0x000ca9, 0x000ca9,
-                        0x000cb4, 0x000cb4, 0x000cba, 0x000cbb, 0x000cc5, 0x000cc5, 0x000cc9, 0x000cc9, 0x000cce, 0x000cd4, 0x000cd7, 0x000cdd, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0,
+                        0x00061c, 0x00061c, 0x0006dd, 0x0006dd, 0x00070e, 0x00070f, 0x00074b, 0x00074c, 0x0007b2, 0x0007bf, 0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c,
+                        0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00086f, 0x00088f, 0x000897, 0x0008e2, 0x0008e2, 0x000984, 0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9,
+                        0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6, 0x0009c9, 0x0009ca, 0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4,
+                        0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11, 0x000a12, 0x000a29, 0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37,
+                        0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a, 0x000a4e, 0x000a50, 0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77,
+                        0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9, 0x000aa9, 0x000ab1, 0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6,
+                        0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5, 0x000af2, 0x000af8, 0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11,
+                        0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a, 0x000b3b, 0x000b45, 0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b,
+                        0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84, 0x000b8b, 0x000b8d, 0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d,
+                        0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba, 0x000bbd, 0x000bc3, 0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6,
+                        0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11, 0x000c29, 0x000c29, 0x000c3a, 0x000c3b, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e,
+                        0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5c, 0x000c5e, 0x000c5f, 0x000c64, 0x000c65, 0x000c70, 0x000c76, 0x000c8d, 0x000c8d, 0x000c91, 0x000c91, 0x000ca9, 0x000ca9,
+                        0x000cb4, 0x000cb4, 0x000cba, 0x000cbb, 0x000cc5, 0x000cc5, 0x000cc9, 0x000cc9, 0x000cce, 0x000cd4, 0x000cd7, 0x000cdc, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0,
                         0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49, 0x000d49, 0x000d50, 0x000d53, 0x000d64, 0x000d65, 0x000d80, 0x000d80,
                         0x000d84, 0x000d84, 0x000d97, 0x000d99, 0x000db2, 0x000db2, 0x000dbc, 0x000dbc, 0x000dbe, 0x000dbf, 0x000dc7, 0x000dc9, 0x000dcb, 0x000dce, 0x000dd5, 0x000dd5, 0x000dd7,
                         0x000dd7, 0x000de0, 0x000de5, 0x000df0, 0x000df1, 0x000df5, 0x000e00, 0x000e3b, 0x000e3e, 0x000e5c, 0x000e80, 0x000e83, 0x000e83, 0x000e85, 0x000e85, 0x000e8b, 0x000e8b,
@@ -269,64 +275,66 @@ static CodePointSet getGeneralCategory(String name) {
                         0x000f48, 0x000f6d, 0x000f70, 0x000f98, 0x000f98, 0x000fbd, 0x000fbd, 0x000fcd, 0x000fcd, 0x000fdb, 0x000fff, 0x0010c6, 0x0010c6, 0x0010c8, 0x0010cc, 0x0010ce, 0x0010cf,
                         0x001249, 0x001249, 0x00124e, 0x00124f, 0x001257, 0x001257, 0x001259, 0x001259, 0x00125e, 0x00125f, 0x001289, 0x001289, 0x00128e, 0x00128f, 0x0012b1, 0x0012b1, 0x0012b6,
                         0x0012b7, 0x0012bf, 0x0012bf, 0x0012c1, 0x0012c1, 0x0012c6, 0x0012c7, 0x0012d7, 0x0012d7, 0x001311, 0x001311, 0x001316, 0x001317, 0x00135b, 0x00135c, 0x00137d, 0x00137f,
-                        0x00139a, 0x00139f, 0x0013f6, 0x0013f7, 0x0013fe, 0x0013ff, 0x00169d, 0x00169f, 0x0016f9, 0x0016ff, 0x00170d, 0x00170d, 0x001715, 0x00171f, 0x001737, 0x00173f, 0x001754,
-                        0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea, 0x0017ef, 0x0017fa, 0x0017ff, 0x00180e, 0x00180f, 0x00181a, 0x00181f,
-                        0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f, 0x00193c, 0x00193f, 0x001941, 0x001943, 0x00196e, 0x00196f, 0x001975,
-                        0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f, 0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a, 0x001a8f, 0x001a9a, 0x001a9f,
-                        0x001aae, 0x001aaf, 0x001ac1, 0x001aff, 0x001b4c, 0x001b4f, 0x001b7d, 0x001b7f, 0x001bf4, 0x001bfb, 0x001c38, 0x001c3a, 0x001c4a, 0x001c4c, 0x001c89, 0x001c8f, 0x001cbb,
-                        0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001dfa, 0x001dfa, 0x001f16, 0x001f17, 0x001f1e, 0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58, 0x001f58,
-                        0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5, 0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc, 0x001ff0,
-                        0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x00200b, 0x00200f, 0x00202a, 0x00202e, 0x002060, 0x00206f, 0x002072, 0x002073, 0x00208f, 0x00208f, 0x00209d, 0x00209f,
-                        0x0020c0, 0x0020cf, 0x0020f1, 0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96, 0x002c2f, 0x002c2f, 0x002c5f,
-                        0x002c5f, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c, 0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97, 0x002d9f, 0x002da7, 0x002da7,
-                        0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7, 0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf, 0x002e53, 0x002e7f, 0x002e9a,
-                        0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff, 0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130, 0x003130, 0x00318f, 0x00318f,
-                        0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x009ffd, 0x009fff, 0x00a48d, 0x00a48f, 0x00a4c7, 0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff, 0x00a7c0, 0x00a7c1, 0x00a7cb,
-                        0x00a7f4, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f, 0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d, 0x00a97f, 0x00a9ce, 0x00a9ce,
-                        0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37, 0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00, 0x00ab07, 0x00ab08, 0x00ab0f,
-                        0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27, 0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4, 0x00d7af, 0x00d7c7, 0x00d7ca,
-                        0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada, 0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d, 0x00fb3f, 0x00fb3f, 0x00fb42,
-                        0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc2, 0x00fbd2, 0x00fd40, 0x00fd4f, 0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdef, 0x00fdfe, 0x00fdff, 0x00fe1a, 0x00fe1f, 0x00fe53, 0x00fe53,
-                        0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9, 0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd,
-                        0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fffb, 0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b, 0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f,
-                        0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103, 0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f, 0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d,
-                        0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff, 0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e, 0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff,
-                        0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4, 0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e, 0x010570, 0x0105ff, 0x010737, 0x01073f, 0x010756,
-                        0x01075f, 0x010768, 0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d, 0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6,
-                        0x0108b0, 0x0108df, 0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f, 0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04,
-                        0x010a04, 0x010a07, 0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49, 0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf,
-                        0x010ae7, 0x010aea, 0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98, 0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49,
-                        0x010c7f, 0x010cb3, 0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa, 0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff,
-                        0x010f28, 0x010f2f, 0x010f5a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011070, 0x01107e, 0x0110bd, 0x0110bd, 0x0110c2, 0x0110cf, 0x0110e9,
-                        0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5, 0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f,
-                        0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef, 0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d,
-                        0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345, 0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f,
-                        0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c, 0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da,
-                        0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116b9, 0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c,
-                        0x01172c, 0x01172f, 0x011740, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b, 0x011914, 0x011914, 0x011917, 0x011917, 0x011936,
-                        0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5, 0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011abf,
-                        0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91, 0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07,
-                        0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a, 0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69,
-                        0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf, 0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f,
-                        0x01246f, 0x012475, 0x01247f, 0x012544, 0x012fff, 0x01342f, 0x0143ff, 0x014647, 0x0167ff, 0x016a39, 0x016a3f, 0x016a5f, 0x016a5f, 0x016a6a, 0x016a6d, 0x016a70, 0x016acf,
-                        0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62, 0x016b78, 0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b,
-                        0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8, 0x0187ff, 0x018cd6, 0x018cff, 0x018d09, 0x01afff, 0x01b11f, 0x01b14f,
-                        0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc, 0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f, 0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca0, 0x01cfff, 0x01d0f6,
-                        0x01d0ff, 0x01d127, 0x01d128, 0x01d173, 0x01d17a, 0x01d1e9, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357, 0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455,
-                        0x01d49d, 0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba, 0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506,
-                        0x01d506, 0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545, 0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551,
-                        0x01d6a6, 0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01dfff, 0x01e007, 0x01e007, 0x01e019, 0x01e01a, 0x01e022, 0x01e022, 0x01e025,
-                        0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e2bf, 0x01e2fa, 0x01e2fe, 0x01e300, 0x01e7ff, 0x01e8c5, 0x01e8c6,
-                        0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d, 0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff, 0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23,
-                        0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33, 0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c, 0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48,
-                        0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50, 0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58, 0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e,
-                        0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65, 0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78, 0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f,
-                        0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4, 0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff, 0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af,
-                        0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6, 0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c, 0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f,
-                        0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6df, 0x01f6ed, 0x01f6ef, 0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df, 0x01f7ec, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848,
-                        0x01f84f, 0x01f85a, 0x01f85f, 0x01f888, 0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01f979, 0x01f979, 0x01f9cc, 0x01f9cc, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f,
-                        0x01fa75, 0x01fa77, 0x01fa7b, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faa9, 0x01faaf, 0x01fab7, 0x01fabf, 0x01fac3, 0x01facf, 0x01fad7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb,
-                        0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6de, 0x02a6ff, 0x02b735, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1, 0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e00ff,
-                        0x0e01f0, 0x10ffff));
+                        0x00139a, 0x00139f, 0x0013f6, 0x0013f7, 0x0013fe, 0x0013ff, 0x00169d, 0x00169f, 0x0016f9, 0x0016ff, 0x001716, 0x00171e, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d,
+                        0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea, 0x0017ef, 0x0017fa, 0x0017ff, 0x00180e, 0x00180e, 0x00181a, 0x00181f, 0x001879, 0x00187f,
+                        0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f, 0x00193c, 0x00193f, 0x001941, 0x001943, 0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac,
+                        0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f, 0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a, 0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf,
+                        0x001acf, 0x001aff, 0x001b4d, 0x001b4f, 0x001b7f, 0x001b7f, 0x001bf4, 0x001bfb, 0x001c38, 0x001c3a, 0x001c4a, 0x001c4c, 0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8,
+                        0x001ccf, 0x001cfb, 0x001cff, 0x001f16, 0x001f17, 0x001f1e, 0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58, 0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c,
+                        0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5, 0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc, 0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff,
+                        0x001fff, 0x00200b, 0x00200f, 0x00202a, 0x00202e, 0x002060, 0x00206f, 0x002072, 0x002073, 0x00208f, 0x00208f, 0x00209d, 0x00209f, 0x0020c1, 0x0020cf, 0x0020f1, 0x0020ff,
+                        0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c, 0x002d2e,
+                        0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97, 0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7, 0x002dc7,
+                        0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf, 0x002e5e, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff, 0x003040,
+                        0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130, 0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x00a48d, 0x00a48f, 0x00a4c7, 0x00a4cf,
+                        0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff, 0x00a7cb, 0x00a7cf, 0x00a7d2, 0x00a7d2, 0x00a7d4, 0x00a7d4, 0x00a7da, 0x00a7f1, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f, 0x00a878,
+                        0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d, 0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37, 0x00aa3f,
+                        0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00, 0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27, 0x00ab2f,
+                        0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4, 0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada, 0x00faff,
+                        0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d, 0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc3, 0x00fbd2, 0x00fd90,
+                        0x00fd91, 0x00fdc8, 0x00fdce, 0x00fdd0, 0x00fdef, 0x00fe1a, 0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd, 0x00ff00,
+                        0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9, 0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fffb, 0x00fffe, 0x00ffff, 0x01000c,
+                        0x01000c, 0x010027, 0x010027, 0x01003b, 0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103, 0x010106, 0x010134, 0x010136,
+                        0x01018f, 0x01018f, 0x01019d, 0x01019f, 0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff, 0x010324, 0x01032c, 0x01034b,
+                        0x01034f, 0x01037b, 0x01037f, 0x01039e, 0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4, 0x0104d7, 0x0104fc, 0x0104ff,
+                        0x010528, 0x01052f, 0x010564, 0x01056e, 0x01057b, 0x01057b, 0x01058b, 0x01058b, 0x010593, 0x010593, 0x010596, 0x010596, 0x0105a2, 0x0105a2, 0x0105b2, 0x0105b2, 0x0105ba,
+                        0x0105ba, 0x0105bd, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x01077f, 0x010786, 0x010786, 0x0107b1, 0x0107b1, 0x0107bb, 0x0107ff, 0x010806, 0x010807,
+                        0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d, 0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df, 0x0108f3, 0x0108f3, 0x0108f6,
+                        0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f, 0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07, 0x010a0b, 0x010a14, 0x010a14,
+                        0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49, 0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea, 0x010af7, 0x010aff, 0x010b36,
+                        0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98, 0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3, 0x010cbf, 0x010cf3, 0x010cf9,
+                        0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa, 0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f, 0x010f5a, 0x010f6f, 0x010f8a,
+                        0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011076, 0x01107e, 0x0110bd, 0x0110bd, 0x0110c3, 0x0110cf, 0x0110e9, 0x0110ef, 0x0110fa, 0x0110ff,
+                        0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5, 0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f, 0x011287, 0x011287, 0x011289,
+                        0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef, 0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d, 0x01130e, 0x011311, 0x011312,
+                        0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345, 0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f, 0x011351, 0x011356, 0x011358,
+                        0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c, 0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da, 0x01157f, 0x0115b6, 0x0115b7,
+                        0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116ba, 0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c, 0x01172c, 0x01172f, 0x011747,
+                        0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b, 0x011914, 0x011914, 0x011917, 0x011917, 0x011936, 0x011936, 0x011939, 0x01193a,
+                        0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5, 0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011aaf, 0x011af9, 0x011bff, 0x011c09,
+                        0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91, 0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07, 0x011d07, 0x011d0a, 0x011d0a,
+                        0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a, 0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69, 0x011d8f, 0x011d8f, 0x011d92,
+                        0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf, 0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f, 0x01246f, 0x012475, 0x01247f,
+                        0x012544, 0x012f8f, 0x012ff3, 0x012fff, 0x01342f, 0x0143ff, 0x014647, 0x0167ff, 0x016a39, 0x016a3f, 0x016a5f, 0x016a5f, 0x016a6a, 0x016a6d, 0x016abf, 0x016abf, 0x016aca,
+                        0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62, 0x016b78, 0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff,
+                        0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8, 0x0187ff, 0x018cd6, 0x018cff, 0x018d09, 0x01afef, 0x01aff4,
+                        0x01aff4, 0x01affc, 0x01affc, 0x01afff, 0x01afff, 0x01b123, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc, 0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f,
+                        0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca0, 0x01ceff, 0x01cf2e, 0x01cf2f, 0x01cf47, 0x01cf4f, 0x01cfc4, 0x01cfff, 0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d173,
+                        0x01d17a, 0x01d1eb, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357, 0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d, 0x01d49d, 0x01d4a0, 0x01d4a1,
+                        0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba, 0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506, 0x01d50b, 0x01d50c, 0x01d515,
+                        0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545, 0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6, 0x01d6a7, 0x01d7cc, 0x01d7cd,
+                        0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01deff, 0x01df1f, 0x01dfff, 0x01e007, 0x01e007, 0x01e019, 0x01e01a, 0x01e022, 0x01e022, 0x01e025, 0x01e025, 0x01e02b,
+                        0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e28f, 0x01e2af, 0x01e2bf, 0x01e2fa, 0x01e2fe, 0x01e300, 0x01e7df, 0x01e7e7, 0x01e7e7,
+                        0x01e7ec, 0x01e7ec, 0x01e7ef, 0x01e7ef, 0x01e7ff, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d, 0x01e960, 0x01ec70, 0x01ecb5,
+                        0x01ed00, 0x01ed3e, 0x01edff, 0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33, 0x01ee33, 0x01ee38, 0x01ee38,
+                        0x01ee3a, 0x01ee3a, 0x01ee3c, 0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50, 0x01ee53, 0x01ee53, 0x01ee55,
+                        0x01ee56, 0x01ee58, 0x01ee58, 0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65, 0x01ee66, 0x01ee6b, 0x01ee6b,
+                        0x01ee73, 0x01ee73, 0x01ee78, 0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4, 0x01eeaa, 0x01eeaa, 0x01eebc,
+                        0x01eeef, 0x01eef2, 0x01efff, 0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6, 0x01f0ff, 0x01f1ae, 0x01f1e5,
+                        0x01f203, 0x01f20f, 0x01f23c, 0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6dc, 0x01f6ed, 0x01f6ef, 0x01f6fd, 0x01f6ff, 0x01f774,
+                        0x01f77f, 0x01f7d9, 0x01f7df, 0x01f7ec, 0x01f7ef, 0x01f7f1, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888, 0x01f88f, 0x01f8ae, 0x01f8af,
+                        0x01f8b2, 0x01f8ff, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7d, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faad, 0x01faaf, 0x01fabb, 0x01fabf, 0x01fac6,
+                        0x01facf, 0x01fada, 0x01fadf, 0x01fae8, 0x01faef, 0x01faf7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6e0, 0x02a6ff, 0x02b739, 0x02b73f,
+                        0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1, 0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e00ff, 0x0e01f0, 0x10ffff));
     }
 }
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
index 79af63ece906..d86acfc89730 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
@@ -47,18 +47,15 @@
 
 import org.graalvm.collections.EconomicMap;
 
-import com.oracle.truffle.api.CompilerDirectives;
-
 class UnicodePropertyData {
 
     static final EconomicMap<String, String> PROPERTY_ALIASES = EconomicMap.create(105);
     static final EconomicMap<String, String> GENERAL_CATEGORY_ALIASES = EconomicMap.create(80);
-    static final EconomicMap<String, String> SCRIPT_ALIASES = EconomicMap.create(312);
-    private static final EconomicMap<String, CodePointSet> SET_ENCODINGS = EconomicMap.create(397);
+    static final EconomicMap<String, String> SCRIPT_ALIASES = EconomicMap.create(321);
+    private static final EconomicMap<String, CodePointSet> SET_ENCODINGS = EconomicMap.create(407);
 
     public static CodePointSet retrieveProperty(String propertySpec) {
         if (!SET_ENCODINGS.containsKey(propertySpec)) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
             throw new IllegalArgumentException("Unsupported Unicode character property escape");
         }
         return SET_ENCODINGS.get(propertySpec);
@@ -301,9 +298,11 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         SCRIPT_ALIASES.put("Common", "Zyyy");
         SCRIPT_ALIASES.put("Copt", "Copt");
         SCRIPT_ALIASES.put("Coptic", "Copt");
+        SCRIPT_ALIASES.put("Cpmn", "Cpmn");
         SCRIPT_ALIASES.put("Cprt", "Cprt");
         SCRIPT_ALIASES.put("Cuneiform", "Xsux");
         SCRIPT_ALIASES.put("Cypriot", "Cprt");
+        SCRIPT_ALIASES.put("Cypro_Minoan", "Cpmn");
         SCRIPT_ALIASES.put("Cyrillic", "Cyrl");
         SCRIPT_ALIASES.put("Cyrl", "Cyrl");
         SCRIPT_ALIASES.put("Deseret", "Dsrt");
@@ -459,6 +458,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         SCRIPT_ALIASES.put("Old_Sogdian", "Sogo");
         SCRIPT_ALIASES.put("Old_South_Arabian", "Sarb");
         SCRIPT_ALIASES.put("Old_Turkic", "Orkh");
+        SCRIPT_ALIASES.put("Old_Uyghur", "Ougr");
         SCRIPT_ALIASES.put("Oriya", "Orya");
         SCRIPT_ALIASES.put("Orkh", "Orkh");
         SCRIPT_ALIASES.put("Orya", "Orya");
@@ -466,6 +466,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         SCRIPT_ALIASES.put("Osge", "Osge");
         SCRIPT_ALIASES.put("Osma", "Osma");
         SCRIPT_ALIASES.put("Osmanya", "Osma");
+        SCRIPT_ALIASES.put("Ougr", "Ougr");
         SCRIPT_ALIASES.put("Pahawh_Hmong", "Hmng");
         SCRIPT_ALIASES.put("Palm", "Palm");
         SCRIPT_ALIASES.put("Palmyrene", "Palm");
@@ -530,6 +531,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         SCRIPT_ALIASES.put("Tamil", "Taml");
         SCRIPT_ALIASES.put("Taml", "Taml");
         SCRIPT_ALIASES.put("Tang", "Tang");
+        SCRIPT_ALIASES.put("Tangsa", "Tnsa");
         SCRIPT_ALIASES.put("Tangut", "Tang");
         SCRIPT_ALIASES.put("Tavt", "Tavt");
         SCRIPT_ALIASES.put("Telu", "Telu");
@@ -544,11 +546,15 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         SCRIPT_ALIASES.put("Tifinagh", "Tfng");
         SCRIPT_ALIASES.put("Tirh", "Tirh");
         SCRIPT_ALIASES.put("Tirhuta", "Tirh");
+        SCRIPT_ALIASES.put("Tnsa", "Tnsa");
+        SCRIPT_ALIASES.put("Toto", "Toto");
         SCRIPT_ALIASES.put("Ugar", "Ugar");
         SCRIPT_ALIASES.put("Ugaritic", "Ugar");
         SCRIPT_ALIASES.put("Unknown", "Zzzz");
         SCRIPT_ALIASES.put("Vai", "Vaii");
         SCRIPT_ALIASES.put("Vaii", "Vaii");
+        SCRIPT_ALIASES.put("Vith", "Vith");
+        SCRIPT_ALIASES.put("Vithkuqi", "Vith");
         SCRIPT_ALIASES.put("Wancho", "Wcho");
         SCRIPT_ALIASES.put("Wara", "Wara");
         SCRIPT_ALIASES.put("Warang_Citi", "Wara");
@@ -673,6 +679,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSC_CHER();
         populateSC_CHRS();
         populateSC_COPT();
+        populateSC_CPMN();
         populateSC_CPRT();
         populateSC_CYRL();
         populateSC_DEVA();
@@ -751,6 +758,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSC_ORYA();
         populateSC_OSGE();
         populateSC_OSMA();
+        populateSC_OUGR();
         populateSC_PALM();
         populateSC_PAUC();
         populateSC_PERM();
@@ -793,8 +801,11 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSC_THAI();
         populateSC_TIBT();
         populateSC_TIRH();
+        populateSC_TNSA();
+        populateSC_TOTO();
         populateSC_UGAR();
         populateSC_VAII();
+        populateSC_VITH();
         populateSC_WARA();
         populateSC_WCHO();
         populateSC_XPEO();
@@ -830,6 +841,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSCX_CHER();
         populateSCX_CHRS();
         populateSCX_COPT();
+        populateSCX_CPMN();
         populateSCX_CPRT();
         populateSCX_CYRL();
         populateSCX_DEVA();
@@ -908,6 +920,7 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSCX_ORYA();
         populateSCX_OSGE();
         populateSCX_OSMA();
+        populateSCX_OUGR();
         populateSCX_PALM();
         populateSCX_PAUC();
         populateSCX_PERM();
@@ -950,8 +963,11 @@ public static CodePointSet retrieveProperty(String propertySpec) {
         populateSCX_THAI();
         populateSCX_TIBT();
         populateSCX_TIRH();
+        populateSCX_TNSA();
+        populateSCX_TOTO();
         populateSCX_UGAR();
         populateSCX_VAII();
+        populateSCX_VITH();
         populateSCX_WARA();
         populateSCX_WCHO();
         populateSCX_XPEO();
@@ -979,82 +995,86 @@ private static void populateALPHA() {
                         0x00052f, 0x000531, 0x000556, 0x000559, 0x000559, 0x000560, 0x000588, 0x0005b0, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c5, 0x0005c7, 0x0005c7,
                         0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000610, 0x00061a, 0x000620, 0x000657, 0x000659, 0x00065f, 0x00066e, 0x0006d3, 0x0006d5, 0x0006dc, 0x0006e1, 0x0006e8, 0x0006ed,
                         0x0006ef, 0x0006fa, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x00073f, 0x00074d, 0x0007b1, 0x0007ca, 0x0007ea, 0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000817,
-                        0x00081a, 0x00082c, 0x000840, 0x000858, 0x000860, 0x00086a, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x0008d4, 0x0008df, 0x0008e3, 0x0008e9, 0x0008f0, 0x00093b, 0x00093d,
-                        0x00094c, 0x00094e, 0x000950, 0x000955, 0x000963, 0x000971, 0x000983, 0x000985, 0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2,
-                        0x0009b6, 0x0009b9, 0x0009bd, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009cc, 0x0009ce, 0x0009ce, 0x0009d7, 0x0009d7, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e3, 0x0009f0,
-                        0x0009f1, 0x0009fc, 0x0009fc, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36,
-                        0x000a38, 0x000a39, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4c, 0x000a51, 0x000a51, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a70, 0x000a75, 0x000a81,
-                        0x000a83, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000ac5, 0x000ac7, 0x000ac9,
-                        0x000acb, 0x000acc, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae3, 0x000af9, 0x000afc, 0x000b01, 0x000b03, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a,
-                        0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4c, 0x000b56, 0x000b57, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b63,
-                        0x000b71, 0x000b71, 0x000b82, 0x000b83, 0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3,
-                        0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcc, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7, 0x000c00, 0x000c03,
-                        0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4c, 0x000c55, 0x000c56, 0x000c58,
-                        0x000c5a, 0x000c60, 0x000c63, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cc4,
-                        0x000cc6, 0x000cc8, 0x000cca, 0x000ccc, 0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12,
-                        0x000d3a, 0x000d3d, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4c, 0x000d4e, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63, 0x000d7a, 0x000d7f, 0x000d81, 0x000d83,
-                        0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8, 0x000ddf, 0x000df2,
-                        0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e46, 0x000e4d, 0x000e4d, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5,
-                        0x000ea7, 0x000eb9, 0x000ebb, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ecd, 0x000ecd, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49,
-                        0x000f6c, 0x000f71, 0x000f81, 0x000f88, 0x000f97, 0x000f99, 0x000fbc, 0x001000, 0x001036, 0x001038, 0x001038, 0x00103b, 0x00103f, 0x001050, 0x00108f, 0x00109a, 0x00109d,
-                        0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a,
-                        0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6,
-                        0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681,
-                        0x00169a, 0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001713, 0x001720, 0x001733, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770,
-                        0x001772, 0x001773, 0x001780, 0x0017b3, 0x0017b6, 0x0017c8, 0x0017d7, 0x0017d7, 0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
-                        0x00191e, 0x001920, 0x00192b, 0x001930, 0x001938, 0x001950, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a1b, 0x001a20, 0x001a5e,
-                        0x001a61, 0x001a74, 0x001aa7, 0x001aa7, 0x001abf, 0x001ac0, 0x001b00, 0x001b33, 0x001b35, 0x001b43, 0x001b45, 0x001b4b, 0x001b80, 0x001ba9, 0x001bac, 0x001baf, 0x001bba,
-                        0x001be5, 0x001be7, 0x001bf1, 0x001c00, 0x001c36, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9, 0x001cec,
-                        0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001de7, 0x001df4, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48,
-                        0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe,
-                        0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f,
-                        0x00207f, 0x002090, 0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002119, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126,
-                        0x002128, 0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x0024b6, 0x0024e9, 0x002c00,
-                        0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67,
+                        0x00081a, 0x00082c, 0x000840, 0x000858, 0x000860, 0x00086a, 0x000870, 0x000887, 0x000889, 0x00088e, 0x0008a0, 0x0008c9, 0x0008d4, 0x0008df, 0x0008e3, 0x0008e9, 0x0008f0,
+                        0x00093b, 0x00093d, 0x00094c, 0x00094e, 0x000950, 0x000955, 0x000963, 0x000971, 0x000983, 0x000985, 0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0,
+                        0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009cc, 0x0009ce, 0x0009ce, 0x0009d7, 0x0009d7, 0x0009dc, 0x0009dd, 0x0009df,
+                        0x0009e3, 0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33,
+                        0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4c, 0x000a51, 0x000a51, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a70,
+                        0x000a75, 0x000a81, 0x000a83, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000ac5,
+                        0x000ac7, 0x000ac9, 0x000acb, 0x000acc, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae3, 0x000af9, 0x000afc, 0x000b01, 0x000b03, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13,
+                        0x000b28, 0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4c, 0x000b56, 0x000b57, 0x000b5c, 0x000b5d,
+                        0x000b5f, 0x000b63, 0x000b71, 0x000b71, 0x000b82, 0x000b83, 0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e,
+                        0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcc, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7,
+                        0x000c00, 0x000c03, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4c, 0x000c55,
+                        0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60, 0x000c63, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3,
+                        0x000cb5, 0x000cb9, 0x000cbd, 0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccc, 0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000cf1, 0x000cf2, 0x000d00,
+                        0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4c, 0x000d4e, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63,
+                        0x000d7a, 0x000d7f, 0x000d81, 0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dcf, 0x000dd4, 0x000dd6,
+                        0x000dd6, 0x000dd8, 0x000ddf, 0x000df2, 0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e46, 0x000e4d, 0x000e4d, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a,
+                        0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb9, 0x000ebb, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ecd, 0x000ecd, 0x000edc, 0x000edf, 0x000f00,
+                        0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f71, 0x000f81, 0x000f88, 0x000f97, 0x000f99, 0x000fbc, 0x001000, 0x001036, 0x001038, 0x001038, 0x00103b, 0x00103f,
+                        0x001050, 0x00108f, 0x00109a, 0x00109d, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250,
+                        0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0,
+                        0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401,
+                        0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x001713, 0x00171f, 0x001733, 0x001740, 0x001753, 0x001760, 0x00176c,
+                        0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017b3, 0x0017b6, 0x0017c8, 0x0017d7, 0x0017d7, 0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0,
+                        0x0018f5, 0x001900, 0x00191e, 0x001920, 0x00192b, 0x001930, 0x001938, 0x001950, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a1b,
+                        0x001a20, 0x001a5e, 0x001a61, 0x001a74, 0x001aa7, 0x001aa7, 0x001abf, 0x001ac0, 0x001acc, 0x001ace, 0x001b00, 0x001b33, 0x001b35, 0x001b43, 0x001b45, 0x001b4c, 0x001b80,
+                        0x001ba9, 0x001bac, 0x001baf, 0x001bba, 0x001be5, 0x001be7, 0x001bf1, 0x001c00, 0x001c36, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba,
+                        0x001cbd, 0x001cbf, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001de7, 0x001df4, 0x001e00, 0x001f15, 0x001f18,
+                        0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4,
+                        0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6,
+                        0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002119, 0x00211d,
+                        0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160,
+                        0x002188, 0x0024b6, 0x0024e9, 0x002c00, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67,
                         0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0,
                         0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002dff, 0x002e2f, 0x002e2f, 0x003005, 0x003007, 0x003021, 0x003029, 0x003031, 0x003035, 0x003038, 0x00303c, 0x003041, 0x003096,
                         0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00,
-                        0x009ffc, 0x00a000, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640, 0x00a66e, 0x00a674, 0x00a67b, 0x00a67f, 0x00a6ef,
-                        0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a805, 0x00a807, 0x00a827, 0x00a840, 0x00a873, 0x00a880, 0x00a8c3, 0x00a8c5,
-                        0x00a8c5, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a8ff, 0x00a90a, 0x00a92a, 0x00a930, 0x00a952, 0x00a960, 0x00a97c, 0x00a980, 0x00a9b2, 0x00a9b4, 0x00a9bf,
-                        0x00a9cf, 0x00a9cf, 0x00a9e0, 0x00a9ef, 0x00a9fa, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aabe, 0x00aac0, 0x00aac0, 0x00aac2,
-                        0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf5, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e,
-                        0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00,
-                        0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1,
-                        0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfb, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x00ff66,
-                        0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d,
-                        0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x010300, 0x01031f, 0x01032d, 0x01034a, 0x010350,
-                        0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527,
-                        0x010530, 0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c,
-                        0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7,
-                        0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0,
-                        0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2,
-                        0x010d00, 0x010d27, 0x010e80, 0x010ea9, 0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010fb0, 0x010fc4, 0x010fe0,
-                        0x010ff6, 0x011000, 0x011045, 0x011082, 0x0110b8, 0x0110d0, 0x0110e8, 0x011100, 0x011132, 0x011144, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011180, 0x0111bf,
-                        0x0111c1, 0x0111c4, 0x0111ce, 0x0111cf, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x011234, 0x011237, 0x011237, 0x01123e, 0x01123e, 0x011280,
-                        0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112e8, 0x011300, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310,
-                        0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134c, 0x011350, 0x011350, 0x011357,
-                        0x011357, 0x01135d, 0x011363, 0x011400, 0x011441, 0x011443, 0x011445, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114c1, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7,
-                        0x011580, 0x0115b5, 0x0115b8, 0x0115be, 0x0115d8, 0x0115dd, 0x011600, 0x01163e, 0x011640, 0x011640, 0x011644, 0x011644, 0x011680, 0x0116b5, 0x0116b8, 0x0116b8, 0x011700,
-                        0x01171a, 0x01171d, 0x01172a, 0x011800, 0x011838, 0x0118a0, 0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935,
-                        0x011937, 0x011938, 0x01193b, 0x01193c, 0x01193f, 0x011942, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119df, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e4, 0x011a00,
-                        0x011a32, 0x011a35, 0x011a3e, 0x011a50, 0x011a97, 0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c3e, 0x011c40, 0x011c40,
-                        0x011c72, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f,
-                        0x011d41, 0x011d43, 0x011d43, 0x011d46, 0x011d47, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d96, 0x011d98, 0x011d98,
-                        0x011ee0, 0x011ef6, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40,
-                        0x016a5e, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40, 0x016b43, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87,
-                        0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150,
-                        0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9e, 0x01bc9e, 0x01d400, 0x01d454,
-                        0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5,
-                        0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550,
-                        0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770,
-                        0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a,
-                        0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2eb, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e947, 0x01e947, 0x01e94b, 0x01e94b, 0x01ee00,
-                        0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b,
-                        0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59,
-                        0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77,
-                        0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01f130, 0x01f149, 0x01f150,
-                        0x01f169, 0x01f170, 0x01f189, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                        0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640, 0x00a66e, 0x00a674, 0x00a67b, 0x00a67f, 0x00a6ef, 0x00a717, 0x00a71f,
+                        0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a805, 0x00a807, 0x00a827, 0x00a840, 0x00a873, 0x00a880,
+                        0x00a8c3, 0x00a8c5, 0x00a8c5, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a8ff, 0x00a90a, 0x00a92a, 0x00a930, 0x00a952, 0x00a960, 0x00a97c, 0x00a980, 0x00a9b2,
+                        0x00a9b4, 0x00a9bf, 0x00a9cf, 0x00a9cf, 0x00a9e0, 0x00a9ef, 0x00a9fa, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aabe, 0x00aac0,
+                        0x00aac0, 0x00aac2, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf5, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26,
+                        0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00f900, 0x00fa6d, 0x00fa70,
+                        0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44,
+                        0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfb, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00ff21, 0x00ff3a, 0x00ff41,
+                        0x00ff5a, 0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a,
+                        0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x010300, 0x01031f, 0x01032d,
+                        0x01034a, 0x010350, 0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb,
+                        0x010500, 0x010527, 0x010530, 0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3,
+                        0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010800, 0x010805,
+                        0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4,
+                        0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a13, 0x010a15, 0x010a17,
+                        0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80,
+                        0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d27, 0x010e80, 0x010ea9, 0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c,
+                        0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010f70, 0x010f81, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011000, 0x011045, 0x011071, 0x011075, 0x011082, 0x0110b8, 0x0110c2,
+                        0x0110c2, 0x0110d0, 0x0110e8, 0x011100, 0x011132, 0x011144, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011180, 0x0111bf, 0x0111c1, 0x0111c4, 0x0111ce, 0x0111cf,
+                        0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x011234, 0x011237, 0x011237, 0x01123e, 0x01123e, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a,
+                        0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112e8, 0x011300, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330,
+                        0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134c, 0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011400,
+                        0x011441, 0x011443, 0x011445, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114c1, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115b5, 0x0115b8, 0x0115be,
+                        0x0115d8, 0x0115dd, 0x011600, 0x01163e, 0x011640, 0x011640, 0x011644, 0x011644, 0x011680, 0x0116b5, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x01171d, 0x01172a, 0x011740,
+                        0x011746, 0x011800, 0x011838, 0x0118a0, 0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938,
+                        0x01193b, 0x01193c, 0x01193f, 0x011942, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119df, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e4, 0x011a00, 0x011a32, 0x011a35,
+                        0x011a3e, 0x011a50, 0x011a97, 0x011a9d, 0x011a9d, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c3e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f,
+                        0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d41, 0x011d43,
+                        0x011d43, 0x011d46, 0x011d47, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d96, 0x011d98, 0x011d98, 0x011ee0, 0x011ef6,
+                        0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543, 0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40,
+                        0x016a5e, 0x016a70, 0x016abe, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40, 0x016b43, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a,
+                        0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0,
+                        0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c,
+                        0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9e, 0x01bc9e, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9,
+                        0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539,
+                        0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc,
+                        0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df1e,
+                        0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e290,
+                        0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e947, 0x01e947,
+                        0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39,
+                        0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54,
+                        0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c,
+                        0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb,
+                        0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800,
+                        0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateANY() {
@@ -1063,20 +1083,20 @@ private static void populateANY() {
 
     private static void populateASSIGNED() {
         SET_ENCODINGS.put("Assigned", CodePointSet.createNoDedup(0x000000, 0x000377, 0x00037a, 0x00037f, 0x000384, 0x00038a, 0x00038c, 0x00038c, 0x00038e, 0x0003a1, 0x0003a3, 0x00052f, 0x000531,
-                        0x000556, 0x000559, 0x00058a, 0x00058d, 0x00058f, 0x000591, 0x0005c7, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f4, 0x000600, 0x00061c, 0x00061e, 0x00070d, 0x00070f, 0x00074a,
-                        0x00074d, 0x0007b1, 0x0007c0, 0x0007fa, 0x0007fd, 0x00082d, 0x000830, 0x00083e, 0x000840, 0x00085b, 0x00085e, 0x00085e, 0x000860, 0x00086a, 0x0008a0, 0x0008b4, 0x0008b6,
-                        0x0008c7, 0x0008d3, 0x000983, 0x000985, 0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bc, 0x0009c4,
-                        0x0009c7, 0x0009c8, 0x0009cb, 0x0009ce, 0x0009d7, 0x0009d7, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e3, 0x0009e6, 0x0009fe, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f,
-                        0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3c, 0x000a3c, 0x000a3e, 0x000a42, 0x000a47, 0x000a48,
-                        0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a66, 0x000a76, 0x000a81, 0x000a83, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93,
-                        0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5, 0x000ab9, 0x000abc, 0x000ac5, 0x000ac7, 0x000ac9, 0x000acb, 0x000acd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae3,
-                        0x000ae6, 0x000af1, 0x000af9, 0x000aff, 0x000b01, 0x000b03, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35,
-                        0x000b39, 0x000b3c, 0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4d, 0x000b55, 0x000b57, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b63, 0x000b66, 0x000b77, 0x000b82, 0x000b83,
-                        0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae,
-                        0x000bb9, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7, 0x000be6, 0x000bfa, 0x000c00, 0x000c0c, 0x000c0e, 0x000c10,
-                        0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c60, 0x000c63, 0x000c66,
+                        0x000556, 0x000559, 0x00058a, 0x00058d, 0x00058f, 0x000591, 0x0005c7, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f4, 0x000600, 0x00070d, 0x00070f, 0x00074a, 0x00074d, 0x0007b1,
+                        0x0007c0, 0x0007fa, 0x0007fd, 0x00082d, 0x000830, 0x00083e, 0x000840, 0x00085b, 0x00085e, 0x00085e, 0x000860, 0x00086a, 0x000870, 0x00088e, 0x000890, 0x000891, 0x000898,
+                        0x000983, 0x000985, 0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bc, 0x0009c4, 0x0009c7, 0x0009c8,
+                        0x0009cb, 0x0009ce, 0x0009d7, 0x0009d7, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e3, 0x0009e6, 0x0009fe, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13,
+                        0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3c, 0x000a3c, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d,
+                        0x000a51, 0x000a51, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a66, 0x000a76, 0x000a81, 0x000a83, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa,
+                        0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5, 0x000ab9, 0x000abc, 0x000ac5, 0x000ac7, 0x000ac9, 0x000acb, 0x000acd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae3, 0x000ae6, 0x000af1,
+                        0x000af9, 0x000aff, 0x000b01, 0x000b03, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3c,
+                        0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4d, 0x000b55, 0x000b57, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b63, 0x000b66, 0x000b77, 0x000b82, 0x000b83, 0x000b85, 0x000b8a,
+                        0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bbe,
+                        0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7, 0x000be6, 0x000bfa, 0x000c00, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28,
+                        0x000c2a, 0x000c39, 0x000c3c, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60, 0x000c63, 0x000c66,
                         0x000c6f, 0x000c77, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc, 0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd,
-                        0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d44, 0x000d46,
+                        0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d44, 0x000d46,
                         0x000d48, 0x000d4a, 0x000d4f, 0x000d54, 0x000d63, 0x000d66, 0x000d7f, 0x000d81, 0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd,
                         0x000dc0, 0x000dc6, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8, 0x000ddf, 0x000de6, 0x000def, 0x000df2, 0x000df4, 0x000e01, 0x000e3a, 0x000e3f,
                         0x000e5b, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6,
@@ -1084,64 +1104,67 @@ private static void populateASSIGNED() {
                         0x000fda, 0x001000, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d,
                         0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8,
                         0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x00135d, 0x00137c, 0x001380, 0x001399, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001400, 0x00169c, 0x0016a0, 0x0016f8,
-                        0x001700, 0x00170c, 0x00170e, 0x001714, 0x001720, 0x001736, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017dd, 0x0017e0,
-                        0x0017e9, 0x0017f0, 0x0017f9, 0x001800, 0x00180e, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001920, 0x00192b,
-                        0x001930, 0x00193b, 0x001940, 0x001940, 0x001944, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x0019de, 0x001a1b, 0x001a1e,
-                        0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a89, 0x001a90, 0x001a99, 0x001aa0, 0x001aad, 0x001ab0, 0x001ac0, 0x001b00, 0x001b4b, 0x001b50, 0x001b7c, 0x001b80, 0x001bf3,
-                        0x001bfc, 0x001c37, 0x001c3b, 0x001c49, 0x001c4d, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cc7, 0x001cd0, 0x001cfa, 0x001d00, 0x001df9, 0x001dfb, 0x001f15, 0x001f18,
-                        0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4,
-                        0x001fb6, 0x001fc4, 0x001fc6, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fdd, 0x001fef, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffe, 0x002000, 0x002064, 0x002066, 0x002071, 0x002074,
-                        0x00208e, 0x002090, 0x00209c, 0x0020a0, 0x0020bf, 0x0020d0, 0x0020f0, 0x002100, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a, 0x002460, 0x002b73, 0x002b76, 0x002b95,
-                        0x002b97, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002cf3, 0x002cf9, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d70, 0x002d7f,
-                        0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde,
-                        0x002de0, 0x002e52, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003000, 0x00303f, 0x003041, 0x003096, 0x003099, 0x0030ff, 0x003105,
-                        0x00312f, 0x003131, 0x00318e, 0x003190, 0x0031e3, 0x0031f0, 0x00321e, 0x003220, 0x009ffc, 0x00a000, 0x00a48c, 0x00a490, 0x00a4c6, 0x00a4d0, 0x00a62b, 0x00a640, 0x00a6f7,
-                        0x00a700, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a82c, 0x00a830, 0x00a839, 0x00a840, 0x00a877, 0x00a880, 0x00a8c5, 0x00a8ce, 0x00a8d9, 0x00a8e0, 0x00a953, 0x00a95f,
-                        0x00a97c, 0x00a980, 0x00a9cd, 0x00a9cf, 0x00a9d9, 0x00a9de, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa50, 0x00aa59, 0x00aa5c, 0x00aac2, 0x00aadb, 0x00aaf6,
-                        0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab6b, 0x00ab70, 0x00abed, 0x00abf0, 0x00abf9, 0x00ac00,
-                        0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00d800, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb36, 0x00fb38, 0x00fb3c,
-                        0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbc1, 0x00fbd3, 0x00fd3f, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfd, 0x00fe00,
-                        0x00fe19, 0x00fe20, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00feff, 0x00feff, 0x00ff01, 0x00ffbe, 0x00ffc2, 0x00ffc7,
-                        0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff9, 0x00fffd, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028,
-                        0x01003a, 0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010100, 0x010102, 0x010107, 0x010133, 0x010137, 0x01018e, 0x010190, 0x01019c,
-                        0x0101a0, 0x0101a0, 0x0101d0, 0x0101fd, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e0, 0x0102fb, 0x010300, 0x010323, 0x01032d, 0x01034a, 0x010350, 0x01037a, 0x010380,
-                        0x01039d, 0x01039f, 0x0103c3, 0x0103c8, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563,
-                        0x01056f, 0x01056f, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c,
-                        0x01083c, 0x01083f, 0x010855, 0x010857, 0x01089e, 0x0108a7, 0x0108af, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x0108fb, 0x01091b, 0x01091f, 0x010939, 0x01093f, 0x01093f,
-                        0x010980, 0x0109b7, 0x0109bc, 0x0109cf, 0x0109d2, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f,
-                        0x010a48, 0x010a50, 0x010a58, 0x010a60, 0x010a9f, 0x010ac0, 0x010ae6, 0x010aeb, 0x010af6, 0x010b00, 0x010b35, 0x010b39, 0x010b55, 0x010b58, 0x010b72, 0x010b78, 0x010b91,
-                        0x010b99, 0x010b9c, 0x010ba9, 0x010baf, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010cfa, 0x010d27, 0x010d30, 0x010d39, 0x010e60, 0x010e7e, 0x010e80,
-                        0x010ea9, 0x010eab, 0x010ead, 0x010eb0, 0x010eb1, 0x010f00, 0x010f27, 0x010f30, 0x010f59, 0x010fb0, 0x010fcb, 0x010fe0, 0x010ff6, 0x011000, 0x01104d, 0x011052, 0x01106f,
-                        0x01107f, 0x0110c1, 0x0110cd, 0x0110cd, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134, 0x011136, 0x011147, 0x011150, 0x011176, 0x011180, 0x0111df, 0x0111e1,
-                        0x0111f4, 0x011200, 0x011211, 0x011213, 0x01123e, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a9, 0x0112b0, 0x0112ea,
-                        0x0112f0, 0x0112f9, 0x011300, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b,
-                        0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01145b,
-                        0x01145d, 0x011461, 0x011480, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115dd, 0x011600, 0x011644, 0x011650, 0x011659, 0x011660, 0x01166c, 0x011680,
-                        0x0116b8, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x01173f, 0x011800, 0x01183b, 0x0118a0, 0x0118f2, 0x0118ff, 0x011906, 0x011909, 0x011909,
-                        0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938, 0x01193b, 0x011946, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da,
-                        0x0119e4, 0x011a00, 0x011a47, 0x011a50, 0x011aa2, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c45, 0x011c50, 0x011c6c, 0x011c70, 0x011c8f,
-                        0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d47, 0x011d50,
-                        0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef8, 0x011fb0, 0x011fb0,
-                        0x011fc0, 0x011ff1, 0x011fff, 0x012399, 0x012400, 0x01246e, 0x012470, 0x012474, 0x012480, 0x012543, 0x013000, 0x01342e, 0x013430, 0x013438, 0x014400, 0x014646, 0x016800,
-                        0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016a6e, 0x016a6f, 0x016ad0, 0x016aed, 0x016af0, 0x016af5, 0x016b00, 0x016b45, 0x016b50, 0x016b59, 0x016b5b, 0x016b61,
-                        0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e9a, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe4, 0x016ff0, 0x016ff1, 0x017000,
-                        0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c,
-                        0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9c, 0x01bca3, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d1e8, 0x01d200, 0x01d245, 0x01d2e0, 0x01d2f3, 0x01d300,
-                        0x01d356, 0x01d360, 0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9,
-                        0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540,
-                        0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01da8b, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006,
-                        0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c, 0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14f, 0x01e2c0,
-                        0x01e2f9, 0x01e2ff, 0x01e2ff, 0x01e800, 0x01e8c4, 0x01e8c7, 0x01e8d6, 0x01e900, 0x01e94b, 0x01e950, 0x01e959, 0x01e95e, 0x01e95f, 0x01ec71, 0x01ecb4, 0x01ed01, 0x01ed3d,
-                        0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b,
-                        0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57,
-                        0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74,
-                        0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01eef0, 0x01eef1,
-                        0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f202, 0x01f210,
-                        0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8,
-                        0x01f7e0, 0x01f7eb, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978, 0x01f97a,
-                        0x01f9cb, 0x01f9cd, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2,
-                        0x01fad0, 0x01fad6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0,
-                        0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f, 0x0e0100, 0x0e01ef, 0x0f0000, 0x0ffffd, 0x100000, 0x10fffd));
+                        0x001700, 0x001715, 0x00171f, 0x001736, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017dd, 0x0017e0, 0x0017e9, 0x0017f0,
+                        0x0017f9, 0x001800, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001920, 0x00192b, 0x001930, 0x00193b, 0x001940, 0x001940,
+                        0x001944, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x0019de, 0x001a1b, 0x001a1e, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f,
+                        0x001a89, 0x001a90, 0x001a99, 0x001aa0, 0x001aad, 0x001ab0, 0x001ace, 0x001b00, 0x001b4c, 0x001b50, 0x001b7e, 0x001b80, 0x001bf3, 0x001bfc, 0x001c37, 0x001c3b, 0x001c49,
+                        0x001c4d, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cc7, 0x001cd0, 0x001cfa, 0x001d00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50,
+                        0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fc4, 0x001fc6, 0x001fd3, 0x001fd6, 0x001fdb,
+                        0x001fdd, 0x001fef, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffe, 0x002000, 0x002064, 0x002066, 0x002071, 0x002074, 0x00208e, 0x002090, 0x00209c, 0x0020a0, 0x0020c0, 0x0020d0,
+                        0x0020f0, 0x002100, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a, 0x002460, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002cf3, 0x002cf9, 0x002d25, 0x002d27, 0x002d27,
+                        0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d70, 0x002d7f, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0,
+                        0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002e5d, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb,
+                        0x003000, 0x00303f, 0x003041, 0x003096, 0x003099, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x003190, 0x0031e3, 0x0031f0, 0x00321e, 0x003220, 0x00a48c, 0x00a490,
+                        0x00a4c6, 0x00a4d0, 0x00a62b, 0x00a640, 0x00a6f7, 0x00a700, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a82c, 0x00a830, 0x00a839,
+                        0x00a840, 0x00a877, 0x00a880, 0x00a8c5, 0x00a8ce, 0x00a8d9, 0x00a8e0, 0x00a953, 0x00a95f, 0x00a97c, 0x00a980, 0x00a9cd, 0x00a9cf, 0x00a9d9, 0x00a9de, 0x00a9fe, 0x00aa00,
+                        0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa50, 0x00aa59, 0x00aa5c, 0x00aac2, 0x00aadb, 0x00aaf6, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26,
+                        0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab6b, 0x00ab70, 0x00abed, 0x00abf0, 0x00abf9, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00d800, 0x00fa6d, 0x00fa70,
+                        0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbc2,
+                        0x00fbd3, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdcf, 0x00fdcf, 0x00fdf0, 0x00fe19, 0x00fe20, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00fe70, 0x00fe74, 0x00fe76,
+                        0x00fefc, 0x00feff, 0x00feff, 0x00ff01, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee,
+                        0x00fff9, 0x00fffd, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010100,
+                        0x010102, 0x010107, 0x010133, 0x010137, 0x01018e, 0x010190, 0x01019c, 0x0101a0, 0x0101a0, 0x0101d0, 0x0101fd, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e0, 0x0102fb,
+                        0x010300, 0x010323, 0x01032d, 0x01034a, 0x010350, 0x01037a, 0x010380, 0x01039d, 0x01039f, 0x0103c3, 0x0103c8, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0,
+                        0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x01056f, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1,
+                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2,
+                        0x0107ba, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010857, 0x01089e, 0x0108a7, 0x0108af,
+                        0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x0108fb, 0x01091b, 0x01091f, 0x010939, 0x01093f, 0x01093f, 0x010980, 0x0109b7, 0x0109bc, 0x0109cf, 0x0109d2, 0x010a03, 0x010a05,
+                        0x010a06, 0x010a0c, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f, 0x010a48, 0x010a50, 0x010a58, 0x010a60, 0x010a9f, 0x010ac0, 0x010ae6,
+                        0x010aeb, 0x010af6, 0x010b00, 0x010b35, 0x010b39, 0x010b55, 0x010b58, 0x010b72, 0x010b78, 0x010b91, 0x010b99, 0x010b9c, 0x010ba9, 0x010baf, 0x010c00, 0x010c48, 0x010c80,
+                        0x010cb2, 0x010cc0, 0x010cf2, 0x010cfa, 0x010d27, 0x010d30, 0x010d39, 0x010e60, 0x010e7e, 0x010e80, 0x010ea9, 0x010eab, 0x010ead, 0x010eb0, 0x010eb1, 0x010f00, 0x010f27,
+                        0x010f30, 0x010f59, 0x010f70, 0x010f89, 0x010fb0, 0x010fcb, 0x010fe0, 0x010ff6, 0x011000, 0x01104d, 0x011052, 0x011075, 0x01107f, 0x0110c2, 0x0110cd, 0x0110cd, 0x0110d0,
+                        0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134, 0x011136, 0x011147, 0x011150, 0x011176, 0x011180, 0x0111df, 0x0111e1, 0x0111f4, 0x011200, 0x011211, 0x011213, 0x01123e,
+                        0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a9, 0x0112b0, 0x0112ea, 0x0112f0, 0x0112f9, 0x011300, 0x011303, 0x011305,
+                        0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d,
+                        0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01145b, 0x01145d, 0x011461, 0x011480, 0x0114c7, 0x0114d0,
+                        0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115dd, 0x011600, 0x011644, 0x011650, 0x011659, 0x011660, 0x01166c, 0x011680, 0x0116b9, 0x0116c0, 0x0116c9, 0x011700, 0x01171a,
+                        0x01171d, 0x01172b, 0x011730, 0x011746, 0x011800, 0x01183b, 0x0118a0, 0x0118f2, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918,
+                        0x011935, 0x011937, 0x011938, 0x01193b, 0x011946, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119e4, 0x011a00, 0x011a47, 0x011a50, 0x011aa2,
+                        0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c45, 0x011c50, 0x011c6c, 0x011c70, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00,
+                        0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d47, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68,
+                        0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef8, 0x011fb0, 0x011fb0, 0x011fc0, 0x011ff1, 0x011fff, 0x012399, 0x012400,
+                        0x01246e, 0x012470, 0x012474, 0x012480, 0x012543, 0x012f90, 0x012ff2, 0x013000, 0x01342e, 0x013430, 0x013438, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e,
+                        0x016a60, 0x016a69, 0x016a6e, 0x016abe, 0x016ac0, 0x016ac9, 0x016ad0, 0x016aed, 0x016af0, 0x016af5, 0x016b00, 0x016b45, 0x016b50, 0x016b59, 0x016b5b, 0x016b61, 0x016b63,
+                        0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e9a, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe4, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7,
+                        0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170,
+                        0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9c, 0x01bca3, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01cf50, 0x01cfc3,
+                        0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d1ea, 0x01d200, 0x01d245, 0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356, 0x01d360, 0x01d378, 0x01d400, 0x01d454, 0x01d456,
+                        0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505,
+                        0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552,
+                        0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01da8b, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01df00, 0x01df1e, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021,
+                        0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c, 0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14f, 0x01e290, 0x01e2ae, 0x01e2c0, 0x01e2f9, 0x01e2ff,
+                        0x01e2ff, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e8c7, 0x01e8d6, 0x01e900, 0x01e94b, 0x01e950, 0x01e959,
+                        0x01e95e, 0x01e95f, 0x01ec71, 0x01ecb4, 0x01ed01, 0x01ed3d, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29,
+                        0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f,
+                        0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64,
+                        0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3,
+                        0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01eef0, 0x01eef1, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1,
+                        0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6dd, 0x01f6ec,
+                        0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860,
+                        0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac,
+                        0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x020000,
+                        0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f,
+                        0x0e0100, 0x0e01ef, 0x0f0000, 0x0ffffd, 0x100000, 0x10fffd));
     }
 
     private static void populateBIDI_C() {
@@ -1160,9 +1183,9 @@ private static void populateBIDI_M() {
                         0x002a0a, 0x002a1c, 0x002a1e, 0x002a21, 0x002a24, 0x002a24, 0x002a26, 0x002a26, 0x002a29, 0x002a29, 0x002a2b, 0x002a2e, 0x002a34, 0x002a35, 0x002a3c, 0x002a3e, 0x002a57,
                         0x002a58, 0x002a64, 0x002a65, 0x002a6a, 0x002a6d, 0x002a6f, 0x002a70, 0x002a73, 0x002a74, 0x002a79, 0x002aa3, 0x002aa6, 0x002aad, 0x002aaf, 0x002ad6, 0x002adc, 0x002adc,
                         0x002ade, 0x002ade, 0x002ae2, 0x002ae6, 0x002aec, 0x002aee, 0x002af3, 0x002af3, 0x002af7, 0x002afb, 0x002afd, 0x002afd, 0x002bfe, 0x002bfe, 0x002e02, 0x002e05, 0x002e09,
-                        0x002e0a, 0x002e0c, 0x002e0d, 0x002e1c, 0x002e1d, 0x002e20, 0x002e29, 0x003008, 0x003011, 0x003014, 0x00301b, 0x00fe59, 0x00fe5e, 0x00fe64, 0x00fe65, 0x00ff08, 0x00ff09,
-                        0x00ff1c, 0x00ff1c, 0x00ff1e, 0x00ff1e, 0x00ff3b, 0x00ff3b, 0x00ff3d, 0x00ff3d, 0x00ff5b, 0x00ff5b, 0x00ff5d, 0x00ff5d, 0x00ff5f, 0x00ff60, 0x00ff62, 0x00ff63, 0x01d6db,
-                        0x01d6db, 0x01d715, 0x01d715, 0x01d74f, 0x01d74f, 0x01d789, 0x01d789, 0x01d7c3, 0x01d7c3));
+                        0x002e0a, 0x002e0c, 0x002e0d, 0x002e1c, 0x002e1d, 0x002e20, 0x002e29, 0x002e55, 0x002e5c, 0x003008, 0x003011, 0x003014, 0x00301b, 0x00fe59, 0x00fe5e, 0x00fe64, 0x00fe65,
+                        0x00ff08, 0x00ff09, 0x00ff1c, 0x00ff1c, 0x00ff1e, 0x00ff1e, 0x00ff3b, 0x00ff3b, 0x00ff3d, 0x00ff3d, 0x00ff5b, 0x00ff5b, 0x00ff5d, 0x00ff5d, 0x00ff5f, 0x00ff60, 0x00ff62,
+                        0x00ff63, 0x01d6db, 0x01d6db, 0x01d715, 0x01d715, 0x01d74f, 0x01d74f, 0x01d789, 0x01d789, 0x01d7c3, 0x01d7c3));
     }
 
     private static void populateCI() {
@@ -1171,49 +1194,51 @@ private static void populateCI() {
                         0x000489, 0x000559, 0x000559, 0x00055f, 0x00055f, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c5, 0x0005c7, 0x0005c7, 0x0005f4, 0x0005f4,
                         0x000600, 0x000605, 0x000610, 0x00061a, 0x00061c, 0x00061c, 0x000640, 0x000640, 0x00064b, 0x00065f, 0x000670, 0x000670, 0x0006d6, 0x0006dd, 0x0006df, 0x0006e8, 0x0006ea,
                         0x0006ed, 0x00070f, 0x00070f, 0x000711, 0x000711, 0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f5, 0x0007fa, 0x0007fa, 0x0007fd, 0x0007fd, 0x000816, 0x00082d,
-                        0x000859, 0x00085b, 0x0008d3, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d, 0x00094d, 0x000951, 0x000957, 0x000962, 0x000963, 0x000971,
-                        0x000971, 0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01, 0x000a02, 0x000a3c, 0x000a3c,
-                        0x000a41, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a82, 0x000abc, 0x000abc, 0x000ac1,
-                        0x000ac5, 0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01, 0x000b3c, 0x000b3c, 0x000b3f, 0x000b3f, 0x000b41, 0x000b44,
-                        0x000b4d, 0x000b4d, 0x000b55, 0x000b56, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bc0, 0x000bc0, 0x000bcd, 0x000bcd, 0x000c00, 0x000c00, 0x000c04, 0x000c04, 0x000c3e,
-                        0x000c40, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c81, 0x000cbc, 0x000cbc, 0x000cbf, 0x000cbf, 0x000cc6, 0x000cc6,
-                        0x000ccc, 0x000ccd, 0x000ce2, 0x000ce3, 0x000d00, 0x000d01, 0x000d3b, 0x000d3c, 0x000d41, 0x000d44, 0x000d4d, 0x000d4d, 0x000d62, 0x000d63, 0x000d81, 0x000d81, 0x000dca,
-                        0x000dca, 0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e46, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec6, 0x000ec6,
-                        0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f71, 0x000f7e, 0x000f80, 0x000f84, 0x000f86, 0x000f87, 0x000f8d,
-                        0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037, 0x001039, 0x00103a, 0x00103d, 0x00103e, 0x001058, 0x001059, 0x00105e, 0x001060,
-                        0x001071, 0x001074, 0x001082, 0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d, 0x00109d, 0x0010fc, 0x0010fc, 0x00135d, 0x00135f, 0x001712, 0x001714, 0x001732,
-                        0x001734, 0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd, 0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017d7, 0x0017d7, 0x0017dd, 0x0017dd,
-                        0x00180b, 0x00180e, 0x001843, 0x001843, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920, 0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17,
-                        0x001a18, 0x001a1b, 0x001a1b, 0x001a56, 0x001a56, 0x001a58, 0x001a5e, 0x001a60, 0x001a60, 0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f,
-                        0x001aa7, 0x001aa7, 0x001ab0, 0x001ac0, 0x001b00, 0x001b03, 0x001b34, 0x001b34, 0x001b36, 0x001b3a, 0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80,
-                        0x001b81, 0x001ba2, 0x001ba5, 0x001ba8, 0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6, 0x001be8, 0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33,
-                        0x001c36, 0x001c37, 0x001c78, 0x001c7d, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001d2c,
-                        0x001d6a, 0x001d78, 0x001d78, 0x001d9b, 0x001df9, 0x001dfb, 0x001dff, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1, 0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef,
-                        0x001ffd, 0x001ffe, 0x00200b, 0x00200f, 0x002018, 0x002019, 0x002024, 0x002024, 0x002027, 0x002027, 0x00202a, 0x00202e, 0x002060, 0x002064, 0x002066, 0x00206f, 0x002071,
-                        0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x0020d0, 0x0020f0, 0x002c7c, 0x002c7d, 0x002cef, 0x002cf1, 0x002d6f, 0x002d6f, 0x002d7f, 0x002d7f, 0x002de0, 0x002dff,
-                        0x002e2f, 0x002e2f, 0x003005, 0x003005, 0x00302a, 0x00302d, 0x003031, 0x003035, 0x00303b, 0x00303b, 0x003099, 0x00309e, 0x0030fc, 0x0030fe, 0x00a015, 0x00a015, 0x00a4f8,
-                        0x00a4fd, 0x00a60c, 0x00a60c, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a700, 0x00a721, 0x00a770, 0x00a770,
-                        0x00a788, 0x00a78a, 0x00a7f8, 0x00a7f9, 0x00a802, 0x00a802, 0x00a806, 0x00a806, 0x00a80b, 0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0,
-                        0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d, 0x00a947, 0x00a951, 0x00a980, 0x00a982, 0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9cf, 0x00a9cf,
-                        0x00a9e5, 0x00a9e6, 0x00aa29, 0x00aa2e, 0x00aa31, 0x00aa32, 0x00aa35, 0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4c, 0x00aa70, 0x00aa70, 0x00aa7c, 0x00aa7c, 0x00aab0,
-                        0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1, 0x00aadd, 0x00aadd, 0x00aaec, 0x00aaed, 0x00aaf3, 0x00aaf4, 0x00aaf6, 0x00aaf6,
-                        0x00ab5b, 0x00ab5f, 0x00ab69, 0x00ab6b, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fbb2, 0x00fbc1, 0x00fe00, 0x00fe0f, 0x00fe13,
-                        0x00fe13, 0x00fe20, 0x00fe2f, 0x00fe52, 0x00fe52, 0x00fe55, 0x00fe55, 0x00feff, 0x00feff, 0x00ff07, 0x00ff07, 0x00ff0e, 0x00ff0e, 0x00ff1a, 0x00ff1a, 0x00ff3e, 0x00ff3e,
-                        0x00ff40, 0x00ff40, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x00ffe3, 0x00ffe3, 0x00fff9, 0x00fffb, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01,
-                        0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50,
-                        0x011001, 0x011001, 0x011038, 0x011046, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x0110bd, 0x0110bd, 0x0110cd, 0x0110cd, 0x011100, 0x011102, 0x011127,
-                        0x01112b, 0x01112d, 0x011134, 0x011173, 0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf, 0x0111cf, 0x01122f, 0x011231, 0x011234, 0x011234,
-                        0x011236, 0x011237, 0x01123e, 0x01123e, 0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c, 0x011340, 0x011340, 0x011366, 0x01136c, 0x011370,
-                        0x011374, 0x011438, 0x01143f, 0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b3, 0x0114b8, 0x0114ba, 0x0114ba, 0x0114bf, 0x0114c0, 0x0114c2, 0x0114c3,
-                        0x0115b2, 0x0115b5, 0x0115bc, 0x0115bd, 0x0115bf, 0x0115c0, 0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d, 0x01163d, 0x01163f, 0x011640, 0x0116ab, 0x0116ab, 0x0116ad,
-                        0x0116ad, 0x0116b0, 0x0116b5, 0x0116b7, 0x0116b7, 0x01171d, 0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b, 0x01182f, 0x011837, 0x011839, 0x01183a, 0x01193b, 0x01193c,
-                        0x01193e, 0x01193e, 0x011943, 0x011943, 0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0, 0x0119e0, 0x011a01, 0x011a0a, 0x011a33, 0x011a38, 0x011a3b, 0x011a3e, 0x011a47,
-                        0x011a47, 0x011a51, 0x011a56, 0x011a59, 0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99, 0x011c30, 0x011c36, 0x011c38, 0x011c3d, 0x011c3f, 0x011c3f, 0x011c92, 0x011ca7,
-                        0x011caa, 0x011cb0, 0x011cb2, 0x011cb3, 0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d90,
-                        0x011d91, 0x011d95, 0x011d95, 0x011d97, 0x011d97, 0x011ef3, 0x011ef4, 0x013430, 0x013438, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016b40, 0x016b43, 0x016f4f, 0x016f4f,
-                        0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x01bc9d, 0x01bc9e, 0x01bca0, 0x01bca3, 0x01d167, 0x01d169, 0x01d173, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa,
-                        0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006,
-                        0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e130, 0x01e13d, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94b, 0x01f3fb,
+                        0x000859, 0x00085b, 0x000888, 0x000888, 0x000890, 0x000891, 0x000898, 0x00089f, 0x0008c9, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d,
+                        0x00094d, 0x000951, 0x000957, 0x000962, 0x000963, 0x000971, 0x000971, 0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009e2, 0x0009e3,
+                        0x0009fe, 0x0009fe, 0x000a01, 0x000a02, 0x000a3c, 0x000a3c, 0x000a41, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75,
+                        0x000a75, 0x000a81, 0x000a82, 0x000abc, 0x000abc, 0x000ac1, 0x000ac5, 0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01,
+                        0x000b3c, 0x000b3c, 0x000b3f, 0x000b3f, 0x000b41, 0x000b44, 0x000b4d, 0x000b4d, 0x000b55, 0x000b56, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bc0, 0x000bc0, 0x000bcd,
+                        0x000bcd, 0x000c00, 0x000c00, 0x000c04, 0x000c04, 0x000c3c, 0x000c3c, 0x000c3e, 0x000c40, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63,
+                        0x000c81, 0x000c81, 0x000cbc, 0x000cbc, 0x000cbf, 0x000cbf, 0x000cc6, 0x000cc6, 0x000ccc, 0x000ccd, 0x000ce2, 0x000ce3, 0x000d00, 0x000d01, 0x000d3b, 0x000d3c, 0x000d41,
+                        0x000d44, 0x000d4d, 0x000d4d, 0x000d62, 0x000d63, 0x000d81, 0x000d81, 0x000dca, 0x000dca, 0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000e31, 0x000e31, 0x000e34, 0x000e3a,
+                        0x000e46, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec6, 0x000ec6, 0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39,
+                        0x000f39, 0x000f71, 0x000f7e, 0x000f80, 0x000f84, 0x000f86, 0x000f87, 0x000f8d, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037,
+                        0x001039, 0x00103a, 0x00103d, 0x00103e, 0x001058, 0x001059, 0x00105e, 0x001060, 0x001071, 0x001074, 0x001082, 0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d,
+                        0x00109d, 0x0010fc, 0x0010fc, 0x00135d, 0x00135f, 0x001712, 0x001714, 0x001732, 0x001733, 0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd,
+                        0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017d7, 0x0017d7, 0x0017dd, 0x0017dd, 0x00180b, 0x00180f, 0x001843, 0x001843, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920,
+                        0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17, 0x001a18, 0x001a1b, 0x001a1b, 0x001a56, 0x001a56, 0x001a58, 0x001a5e, 0x001a60, 0x001a60,
+                        0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f, 0x001aa7, 0x001aa7, 0x001ab0, 0x001ace, 0x001b00, 0x001b03, 0x001b34, 0x001b34, 0x001b36,
+                        0x001b3a, 0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80, 0x001b81, 0x001ba2, 0x001ba5, 0x001ba8, 0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6,
+                        0x001be8, 0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33, 0x001c36, 0x001c37, 0x001c78, 0x001c7d, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce0, 0x001ce2,
+                        0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001d2c, 0x001d6a, 0x001d78, 0x001d78, 0x001d9b, 0x001dff, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1,
+                        0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x00200b, 0x00200f, 0x002018, 0x002019, 0x002024, 0x002024, 0x002027, 0x002027, 0x00202a,
+                        0x00202e, 0x002060, 0x002064, 0x002066, 0x00206f, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x0020d0, 0x0020f0, 0x002c7c, 0x002c7d, 0x002cef, 0x002cf1,
+                        0x002d6f, 0x002d6f, 0x002d7f, 0x002d7f, 0x002de0, 0x002dff, 0x002e2f, 0x002e2f, 0x003005, 0x003005, 0x00302a, 0x00302d, 0x003031, 0x003035, 0x00303b, 0x00303b, 0x003099,
+                        0x00309e, 0x0030fc, 0x0030fe, 0x00a015, 0x00a015, 0x00a4f8, 0x00a4fd, 0x00a60c, 0x00a60c, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69f,
+                        0x00a6f0, 0x00a6f1, 0x00a700, 0x00a721, 0x00a770, 0x00a770, 0x00a788, 0x00a78a, 0x00a7f2, 0x00a7f4, 0x00a7f8, 0x00a7f9, 0x00a802, 0x00a802, 0x00a806, 0x00a806, 0x00a80b,
+                        0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d, 0x00a947, 0x00a951, 0x00a980, 0x00a982,
+                        0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9cf, 0x00a9cf, 0x00a9e5, 0x00a9e6, 0x00aa29, 0x00aa2e, 0x00aa31, 0x00aa32, 0x00aa35, 0x00aa36, 0x00aa43,
+                        0x00aa43, 0x00aa4c, 0x00aa4c, 0x00aa70, 0x00aa70, 0x00aa7c, 0x00aa7c, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1,
+                        0x00aadd, 0x00aadd, 0x00aaec, 0x00aaed, 0x00aaf3, 0x00aaf4, 0x00aaf6, 0x00aaf6, 0x00ab5b, 0x00ab5f, 0x00ab69, 0x00ab6b, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed,
+                        0x00abed, 0x00fb1e, 0x00fb1e, 0x00fbb2, 0x00fbc2, 0x00fe00, 0x00fe0f, 0x00fe13, 0x00fe13, 0x00fe20, 0x00fe2f, 0x00fe52, 0x00fe52, 0x00fe55, 0x00fe55, 0x00feff, 0x00feff,
+                        0x00ff07, 0x00ff07, 0x00ff0e, 0x00ff0e, 0x00ff1a, 0x00ff1a, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x00ffe3, 0x00ffe3, 0x00fff9,
+                        0x00fffb, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010a01, 0x010a03, 0x010a05, 0x010a06,
+                        0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x010f82, 0x010f85, 0x011001,
+                        0x011001, 0x011038, 0x011046, 0x011070, 0x011070, 0x011073, 0x011074, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x0110bd, 0x0110bd, 0x0110c2, 0x0110c2,
+                        0x0110cd, 0x0110cd, 0x011100, 0x011102, 0x011127, 0x01112b, 0x01112d, 0x011134, 0x011173, 0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf,
+                        0x0111cf, 0x01122f, 0x011231, 0x011234, 0x011234, 0x011236, 0x011237, 0x01123e, 0x01123e, 0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c,
+                        0x011340, 0x011340, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011438, 0x01143f, 0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b3, 0x0114b8, 0x0114ba,
+                        0x0114ba, 0x0114bf, 0x0114c0, 0x0114c2, 0x0114c3, 0x0115b2, 0x0115b5, 0x0115bc, 0x0115bd, 0x0115bf, 0x0115c0, 0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d, 0x01163d,
+                        0x01163f, 0x011640, 0x0116ab, 0x0116ab, 0x0116ad, 0x0116ad, 0x0116b0, 0x0116b5, 0x0116b7, 0x0116b7, 0x01171d, 0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b, 0x01182f,
+                        0x011837, 0x011839, 0x01183a, 0x01193b, 0x01193c, 0x01193e, 0x01193e, 0x011943, 0x011943, 0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0, 0x0119e0, 0x011a01, 0x011a0a,
+                        0x011a33, 0x011a38, 0x011a3b, 0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a56, 0x011a59, 0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99, 0x011c30, 0x011c36, 0x011c38,
+                        0x011c3d, 0x011c3f, 0x011c3f, 0x011c92, 0x011ca7, 0x011caa, 0x011cb0, 0x011cb2, 0x011cb3, 0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d,
+                        0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d90, 0x011d91, 0x011d95, 0x011d95, 0x011d97, 0x011d97, 0x011ef3, 0x011ef4, 0x013430, 0x013438, 0x016af0, 0x016af4, 0x016b30,
+                        0x016b36, 0x016b40, 0x016b43, 0x016f4f, 0x016f4f, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe,
+                        0x01bc9d, 0x01bc9e, 0x01bca0, 0x01bca3, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d167, 0x01d169, 0x01d173, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242,
+                        0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018,
+                        0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e130, 0x01e13d, 0x01e2ae, 0x01e2ae, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94b, 0x01f3fb,
                         0x01f3ff, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f, 0x0e0100, 0x0e01ef));
     }
 
@@ -1269,7 +1294,7 @@ private static void populateCWCF() {
                         0x001ef8, 0x001efa, 0x001efa, 0x001efc, 0x001efc, 0x001efe, 0x001efe, 0x001f08, 0x001f0f, 0x001f18, 0x001f1d, 0x001f28, 0x001f2f, 0x001f38, 0x001f3f, 0x001f48, 0x001f4d,
                         0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f5f, 0x001f68, 0x001f6f, 0x001f80, 0x001faf, 0x001fb2, 0x001fb4, 0x001fb7, 0x001fbc, 0x001fc2,
                         0x001fc4, 0x001fc7, 0x001fcc, 0x001fd8, 0x001fdb, 0x001fe8, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff7, 0x001ffc, 0x002126, 0x002126, 0x00212a, 0x00212b, 0x002132, 0x002132,
-                        0x002160, 0x00216f, 0x002183, 0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2e, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b,
+                        0x002160, 0x00216f, 0x002183, 0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2f, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b,
                         0x002c6b, 0x002c6d, 0x002c70, 0x002c72, 0x002c72, 0x002c75, 0x002c75, 0x002c7e, 0x002c80, 0x002c82, 0x002c82, 0x002c84, 0x002c84, 0x002c86, 0x002c86, 0x002c88, 0x002c88,
                         0x002c8a, 0x002c8a, 0x002c8c, 0x002c8c, 0x002c8e, 0x002c8e, 0x002c90, 0x002c90, 0x002c92, 0x002c92, 0x002c94, 0x002c94, 0x002c96, 0x002c96, 0x002c98, 0x002c98, 0x002c9a,
                         0x002c9a, 0x002c9c, 0x002c9c, 0x002c9e, 0x002c9e, 0x002ca0, 0x002ca0, 0x002ca2, 0x002ca2, 0x002ca4, 0x002ca4, 0x002ca6, 0x002ca6, 0x002ca8, 0x002ca8, 0x002caa, 0x002caa,
@@ -1288,9 +1313,10 @@ private static void populateCWCF() {
                         0x00a768, 0x00a768, 0x00a76a, 0x00a76a, 0x00a76c, 0x00a76c, 0x00a76e, 0x00a76e, 0x00a779, 0x00a779, 0x00a77b, 0x00a77b, 0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782,
                         0x00a782, 0x00a784, 0x00a784, 0x00a786, 0x00a786, 0x00a78b, 0x00a78b, 0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792, 0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798,
                         0x00a79a, 0x00a79a, 0x00a79c, 0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0, 0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4, 0x00a7a6, 0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa,
-                        0x00a7ae, 0x00a7b0, 0x00a7b4, 0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7,
-                        0x00a7c9, 0x00a7c9, 0x00a7f5, 0x00a7f5, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010c80,
-                        0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921));
+                        0x00a7ae, 0x00a7b0, 0x00a7b4, 0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c0, 0x00a7c0, 0x00a7c2, 0x00a7c2,
+                        0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f5, 0x00a7f5, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13,
+                        0x00fb17, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010c80, 0x010cb2,
+                        0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921));
     }
 
     private static void populateCWCM() {
@@ -1304,11 +1330,12 @@ private static void populateCWCM() {
                         0x001d7d, 0x001d7d, 0x001d8e, 0x001d8e, 0x001e00, 0x001e9b, 0x001e9e, 0x001e9e, 0x001ea0, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50,
                         0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4,
                         0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002126, 0x002126, 0x00212a, 0x00212b, 0x002132,
-                        0x002132, 0x00214e, 0x00214e, 0x002160, 0x00217f, 0x002183, 0x002184, 0x0024b6, 0x0024e9, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002c70, 0x002c72, 0x002c73,
-                        0x002c75, 0x002c76, 0x002c7e, 0x002ce3, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x00a640, 0x00a66d, 0x00a680,
-                        0x00a69b, 0x00a722, 0x00a72f, 0x00a732, 0x00a76f, 0x00a779, 0x00a787, 0x00a78b, 0x00a78d, 0x00a790, 0x00a794, 0x00a796, 0x00a7ae, 0x00a7b0, 0x00a7bf, 0x00a7c2, 0x00a7ca,
-                        0x00a7f5, 0x00a7f6, 0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010400, 0x01044f, 0x0104b0,
-                        0x0104d3, 0x0104d8, 0x0104fb, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01e900, 0x01e943));
+                        0x002132, 0x00214e, 0x00214e, 0x002160, 0x00217f, 0x002183, 0x002184, 0x0024b6, 0x0024e9, 0x002c00, 0x002c70, 0x002c72, 0x002c73, 0x002c75, 0x002c76, 0x002c7e, 0x002ce3,
+                        0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x00a640, 0x00a66d, 0x00a680, 0x00a69b, 0x00a722, 0x00a72f, 0x00a732,
+                        0x00a76f, 0x00a779, 0x00a787, 0x00a78b, 0x00a78d, 0x00a790, 0x00a794, 0x00a796, 0x00a7ae, 0x00a7b0, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d6, 0x00a7d9, 0x00a7f5, 0x00a7f6,
+                        0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8,
+                        0x0104fb, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc,
+                        0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01e900, 0x01e943));
     }
 
     private static void populateCWKCF() {
@@ -1349,7 +1376,7 @@ private static void populateCWKCF() {
                         0x0009dc, 0x0009dd, 0x0009df, 0x0009df, 0x000a33, 0x000a33, 0x000a36, 0x000a36, 0x000a59, 0x000a5b, 0x000a5e, 0x000a5e, 0x000b5c, 0x000b5d, 0x000e33, 0x000e33, 0x000eb3,
                         0x000eb3, 0x000edc, 0x000edd, 0x000f0c, 0x000f0c, 0x000f43, 0x000f43, 0x000f4d, 0x000f4d, 0x000f52, 0x000f52, 0x000f57, 0x000f57, 0x000f5c, 0x000f5c, 0x000f69, 0x000f69,
                         0x000f73, 0x000f73, 0x000f75, 0x000f79, 0x000f81, 0x000f81, 0x000f93, 0x000f93, 0x000f9d, 0x000f9d, 0x000fa2, 0x000fa2, 0x000fa7, 0x000fa7, 0x000fac, 0x000fac, 0x000fb9,
-                        0x000fb9, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010fc, 0x0010fc, 0x00115f, 0x001160, 0x0013f8, 0x0013fd, 0x0017b4, 0x0017b5, 0x00180b, 0x00180e,
+                        0x000fb9, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010fc, 0x0010fc, 0x00115f, 0x001160, 0x0013f8, 0x0013fd, 0x0017b4, 0x0017b5, 0x00180b, 0x00180f,
                         0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001d2c, 0x001d2e, 0x001d30, 0x001d3a, 0x001d3c, 0x001d4d, 0x001d4f, 0x001d6a, 0x001d78, 0x001d78, 0x001d9b,
                         0x001dbf, 0x001e00, 0x001e00, 0x001e02, 0x001e02, 0x001e04, 0x001e04, 0x001e06, 0x001e06, 0x001e08, 0x001e08, 0x001e0a, 0x001e0a, 0x001e0c, 0x001e0c, 0x001e0e, 0x001e0e,
                         0x001e10, 0x001e10, 0x001e12, 0x001e12, 0x001e14, 0x001e14, 0x001e16, 0x001e16, 0x001e18, 0x001e18, 0x001e1a, 0x001e1a, 0x001e1c, 0x001e1c, 0x001e1e, 0x001e1e, 0x001e20,
@@ -1373,7 +1400,7 @@ private static void populateCWKCF() {
                         0x00203e, 0x00203e, 0x002047, 0x002049, 0x002057, 0x002057, 0x00205f, 0x002071, 0x002074, 0x00208e, 0x002090, 0x00209c, 0x0020a8, 0x0020a8, 0x002100, 0x002103, 0x002105,
                         0x002107, 0x002109, 0x002113, 0x002115, 0x002116, 0x002119, 0x00211d, 0x002120, 0x002122, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d,
                         0x00212f, 0x002139, 0x00213b, 0x002140, 0x002145, 0x002149, 0x002150, 0x00217f, 0x002183, 0x002183, 0x002189, 0x002189, 0x00222c, 0x00222d, 0x00222f, 0x002230, 0x002329,
-                        0x00232a, 0x002460, 0x0024ea, 0x002a0c, 0x002a0c, 0x002a74, 0x002a76, 0x002adc, 0x002adc, 0x002c00, 0x002c2e, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67,
+                        0x00232a, 0x002460, 0x0024ea, 0x002a0c, 0x002a0c, 0x002a74, 0x002a76, 0x002adc, 0x002adc, 0x002c00, 0x002c2f, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67,
                         0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70, 0x002c72, 0x002c72, 0x002c75, 0x002c75, 0x002c7c, 0x002c80, 0x002c82, 0x002c82, 0x002c84, 0x002c84, 0x002c86,
                         0x002c86, 0x002c88, 0x002c88, 0x002c8a, 0x002c8a, 0x002c8c, 0x002c8c, 0x002c8e, 0x002c8e, 0x002c90, 0x002c90, 0x002c92, 0x002c92, 0x002c94, 0x002c94, 0x002c96, 0x002c96,
                         0x002c98, 0x002c98, 0x002c9a, 0x002c9a, 0x002c9c, 0x002c9c, 0x002c9e, 0x002c9e, 0x002ca0, 0x002ca0, 0x002ca2, 0x002ca2, 0x002ca4, 0x002ca4, 0x002ca6, 0x002ca6, 0x002ca8,
@@ -1395,21 +1422,22 @@ private static void populateCWKCF() {
                         0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782, 0x00a782, 0x00a784, 0x00a784, 0x00a786, 0x00a786, 0x00a78b, 0x00a78b, 0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792,
                         0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798, 0x00a79a, 0x00a79a, 0x00a79c, 0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0, 0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4,
                         0x00a7a6, 0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa, 0x00a7ae, 0x00a7b0, 0x00a7b4, 0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be,
-                        0x00a7be, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7f5, 0x00a7f5, 0x00a7f8, 0x00a7f9, 0x00ab5c, 0x00ab5f, 0x00ab69, 0x00ab69, 0x00ab70, 0x00abbf,
-                        0x00f900, 0x00fa0d, 0x00fa10, 0x00fa10, 0x00fa12, 0x00fa12, 0x00fa15, 0x00fa1e, 0x00fa20, 0x00fa20, 0x00fa22, 0x00fa22, 0x00fa25, 0x00fa26, 0x00fa2a, 0x00fa6d, 0x00fa70,
-                        0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb1d, 0x00fb1f, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44,
-                        0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfc, 0x00fe00, 0x00fe19, 0x00fe30, 0x00fe44, 0x00fe47, 0x00fe52, 0x00fe54,
-                        0x00fe66, 0x00fe68, 0x00fe6b, 0x00fe70, 0x00fe72, 0x00fe74, 0x00fe74, 0x00fe76, 0x00fefc, 0x00feff, 0x00feff, 0x00ff01, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf,
-                        0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff0, 0x00fff8, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010c80, 0x010cb2, 0x0118a0,
-                        0x0118bf, 0x016e40, 0x016e5f, 0x01bca0, 0x01bca3, 0x01d15e, 0x01d164, 0x01d173, 0x01d17a, 0x01d1bb, 0x01d1c0, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f,
-                        0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d,
-                        0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb,
-                        0x01d7ce, 0x01d7ff, 0x01e900, 0x01e921, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34,
-                        0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52,
-                        0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67,
-                        0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9,
-                        0x01eeab, 0x01eebb, 0x01f100, 0x01f10a, 0x01f110, 0x01f12e, 0x01f130, 0x01f14f, 0x01f16a, 0x01f16c, 0x01f190, 0x01f190, 0x01f200, 0x01f202, 0x01f210, 0x01f23b, 0x01f240,
-                        0x01f248, 0x01f250, 0x01f251, 0x01fbf0, 0x01fbf9, 0x02f800, 0x02fa1d, 0x0e0000, 0x0e0fff));
+                        0x00a7be, 0x00a7c0, 0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f2, 0x00a7f5,
+                        0x00a7f8, 0x00a7f9, 0x00ab5c, 0x00ab5f, 0x00ab69, 0x00ab69, 0x00ab70, 0x00abbf, 0x00f900, 0x00fa0d, 0x00fa10, 0x00fa10, 0x00fa12, 0x00fa12, 0x00fa15, 0x00fa1e, 0x00fa20,
+                        0x00fa20, 0x00fa22, 0x00fa22, 0x00fa25, 0x00fa26, 0x00fa2a, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb1d, 0x00fb1f, 0x00fb36,
+                        0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0,
+                        0x00fdfc, 0x00fe00, 0x00fe19, 0x00fe30, 0x00fe44, 0x00fe47, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00fe70, 0x00fe72, 0x00fe74, 0x00fe74, 0x00fe76, 0x00fefc,
+                        0x00feff, 0x00feff, 0x00ff01, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff0,
+                        0x00fff8, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010781, 0x010785, 0x010787, 0x0107b0,
+                        0x0107b2, 0x0107ba, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01bca0, 0x01bca3, 0x01d15e, 0x01d164, 0x01d173, 0x01d17a, 0x01d1bb, 0x01d1c0, 0x01d400,
+                        0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3,
+                        0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a,
+                        0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01e900, 0x01e921, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24,
+                        0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b,
+                        0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f,
+                        0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b,
+                        0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01f100, 0x01f10a, 0x01f110, 0x01f12e, 0x01f130, 0x01f14f, 0x01f16a, 0x01f16c, 0x01f190, 0x01f190,
+                        0x01f200, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01fbf0, 0x01fbf9, 0x02f800, 0x02fa1d, 0x0e0000, 0x0e0fff));
     }
 
     private static void populateCWL() {
@@ -1463,7 +1491,7 @@ private static void populateCWL() {
                         0x001efa, 0x001efa, 0x001efc, 0x001efc, 0x001efe, 0x001efe, 0x001f08, 0x001f0f, 0x001f18, 0x001f1d, 0x001f28, 0x001f2f, 0x001f38, 0x001f3f, 0x001f48, 0x001f4d, 0x001f59,
                         0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f5f, 0x001f68, 0x001f6f, 0x001f88, 0x001f8f, 0x001f98, 0x001f9f, 0x001fa8, 0x001faf, 0x001fb8, 0x001fbc,
                         0x001fc8, 0x001fcc, 0x001fd8, 0x001fdb, 0x001fe8, 0x001fec, 0x001ff8, 0x001ffc, 0x002126, 0x002126, 0x00212a, 0x00212b, 0x002132, 0x002132, 0x002160, 0x00216f, 0x002183,
-                        0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2e, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70,
+                        0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2f, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70,
                         0x002c72, 0x002c72, 0x002c75, 0x002c75, 0x002c7e, 0x002c80, 0x002c82, 0x002c82, 0x002c84, 0x002c84, 0x002c86, 0x002c86, 0x002c88, 0x002c88, 0x002c8a, 0x002c8a, 0x002c8c,
                         0x002c8c, 0x002c8e, 0x002c8e, 0x002c90, 0x002c90, 0x002c92, 0x002c92, 0x002c94, 0x002c94, 0x002c96, 0x002c96, 0x002c98, 0x002c98, 0x002c9a, 0x002c9a, 0x002c9c, 0x002c9c,
                         0x002c9e, 0x002c9e, 0x002ca0, 0x002ca0, 0x002ca2, 0x002ca2, 0x002ca4, 0x002ca4, 0x002ca6, 0x002ca6, 0x002ca8, 0x002ca8, 0x002caa, 0x002caa, 0x002cac, 0x002cac, 0x002cae,
@@ -1482,8 +1510,9 @@ private static void populateCWL() {
                         0x00a76a, 0x00a76c, 0x00a76c, 0x00a76e, 0x00a76e, 0x00a779, 0x00a779, 0x00a77b, 0x00a77b, 0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782, 0x00a782, 0x00a784, 0x00a784,
                         0x00a786, 0x00a786, 0x00a78b, 0x00a78b, 0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792, 0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798, 0x00a79a, 0x00a79a, 0x00a79c,
                         0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0, 0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4, 0x00a7a6, 0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa, 0x00a7ae, 0x00a7b0, 0x00a7b4,
-                        0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7f5,
-                        0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921));
+                        0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c0, 0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9,
+                        0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f5, 0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a,
+                        0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01e900, 0x01e921));
     }
 
     private static void populateCWT() {
@@ -1538,7 +1567,7 @@ private static void populateCWT() {
                         0x001ef1, 0x001ef3, 0x001ef3, 0x001ef5, 0x001ef5, 0x001ef7, 0x001ef7, 0x001ef9, 0x001ef9, 0x001efb, 0x001efb, 0x001efd, 0x001efd, 0x001eff, 0x001f07, 0x001f10, 0x001f15,
                         0x001f20, 0x001f27, 0x001f30, 0x001f37, 0x001f40, 0x001f45, 0x001f50, 0x001f57, 0x001f60, 0x001f67, 0x001f70, 0x001f7d, 0x001f80, 0x001f87, 0x001f90, 0x001f97, 0x001fa0,
                         0x001fa7, 0x001fb0, 0x001fb4, 0x001fb6, 0x001fb7, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fc7, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fd7, 0x001fe0, 0x001fe7,
-                        0x001ff2, 0x001ff4, 0x001ff6, 0x001ff7, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5e, 0x002c61, 0x002c61, 0x002c65,
+                        0x001ff2, 0x001ff4, 0x001ff6, 0x001ff7, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5f, 0x002c61, 0x002c61, 0x002c65,
                         0x002c66, 0x002c68, 0x002c68, 0x002c6a, 0x002c6a, 0x002c6c, 0x002c6c, 0x002c73, 0x002c73, 0x002c76, 0x002c76, 0x002c81, 0x002c81, 0x002c83, 0x002c83, 0x002c85, 0x002c85,
                         0x002c87, 0x002c87, 0x002c89, 0x002c89, 0x002c8b, 0x002c8b, 0x002c8d, 0x002c8d, 0x002c8f, 0x002c8f, 0x002c91, 0x002c91, 0x002c93, 0x002c93, 0x002c95, 0x002c95, 0x002c97,
                         0x002c97, 0x002c99, 0x002c99, 0x002c9b, 0x002c9b, 0x002c9d, 0x002c9d, 0x002c9f, 0x002c9f, 0x002ca1, 0x002ca1, 0x002ca3, 0x002ca3, 0x002ca5, 0x002ca5, 0x002ca7, 0x002ca7,
@@ -1558,8 +1587,9 @@ private static void populateCWT() {
                         0x00a76f, 0x00a77a, 0x00a77a, 0x00a77c, 0x00a77c, 0x00a77f, 0x00a77f, 0x00a781, 0x00a781, 0x00a783, 0x00a783, 0x00a785, 0x00a785, 0x00a787, 0x00a787, 0x00a78c, 0x00a78c,
                         0x00a791, 0x00a791, 0x00a793, 0x00a794, 0x00a797, 0x00a797, 0x00a799, 0x00a799, 0x00a79b, 0x00a79b, 0x00a79d, 0x00a79d, 0x00a79f, 0x00a79f, 0x00a7a1, 0x00a7a1, 0x00a7a3,
                         0x00a7a3, 0x00a7a5, 0x00a7a5, 0x00a7a7, 0x00a7a7, 0x00a7a9, 0x00a7a9, 0x00a7b5, 0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd,
-                        0x00a7bf, 0x00a7bf, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7f6, 0x00a7f6, 0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13,
-                        0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01e922, 0x01e943));
+                        0x00a7bf, 0x00a7bf, 0x00a7c1, 0x00a7c1, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7d1, 0x00a7d1, 0x00a7d7, 0x00a7d7, 0x00a7d9, 0x00a7d9, 0x00a7f6,
+                        0x00a7f6, 0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010597, 0x0105a1,
+                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01e922, 0x01e943));
     }
 
     private static void populateCWU() {
@@ -1614,7 +1644,7 @@ private static void populateCWU() {
                         0x001eef, 0x001ef1, 0x001ef1, 0x001ef3, 0x001ef3, 0x001ef5, 0x001ef5, 0x001ef7, 0x001ef7, 0x001ef9, 0x001ef9, 0x001efb, 0x001efb, 0x001efd, 0x001efd, 0x001eff, 0x001f07,
                         0x001f10, 0x001f15, 0x001f20, 0x001f27, 0x001f30, 0x001f37, 0x001f40, 0x001f45, 0x001f50, 0x001f57, 0x001f60, 0x001f67, 0x001f70, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6,
                         0x001fb7, 0x001fbc, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fc7, 0x001fcc, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fd7, 0x001fe0, 0x001fe7,
-                        0x001ff2, 0x001ff4, 0x001ff6, 0x001ff7, 0x001ffc, 0x001ffc, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5e, 0x002c61,
+                        0x001ff2, 0x001ff4, 0x001ff6, 0x001ff7, 0x001ffc, 0x001ffc, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5f, 0x002c61,
                         0x002c61, 0x002c65, 0x002c66, 0x002c68, 0x002c68, 0x002c6a, 0x002c6a, 0x002c6c, 0x002c6c, 0x002c73, 0x002c73, 0x002c76, 0x002c76, 0x002c81, 0x002c81, 0x002c83, 0x002c83,
                         0x002c85, 0x002c85, 0x002c87, 0x002c87, 0x002c89, 0x002c89, 0x002c8b, 0x002c8b, 0x002c8d, 0x002c8d, 0x002c8f, 0x002c8f, 0x002c91, 0x002c91, 0x002c93, 0x002c93, 0x002c95,
                         0x002c95, 0x002c97, 0x002c97, 0x002c99, 0x002c99, 0x002c9b, 0x002c9b, 0x002c9d, 0x002c9d, 0x002c9f, 0x002c9f, 0x002ca1, 0x002ca1, 0x002ca3, 0x002ca3, 0x002ca5, 0x002ca5,
@@ -1634,8 +1664,9 @@ private static void populateCWU() {
                         0x00a76d, 0x00a76f, 0x00a76f, 0x00a77a, 0x00a77a, 0x00a77c, 0x00a77c, 0x00a77f, 0x00a77f, 0x00a781, 0x00a781, 0x00a783, 0x00a783, 0x00a785, 0x00a785, 0x00a787, 0x00a787,
                         0x00a78c, 0x00a78c, 0x00a791, 0x00a791, 0x00a793, 0x00a794, 0x00a797, 0x00a797, 0x00a799, 0x00a799, 0x00a79b, 0x00a79b, 0x00a79d, 0x00a79d, 0x00a79f, 0x00a79f, 0x00a7a1,
                         0x00a7a1, 0x00a7a3, 0x00a7a3, 0x00a7a5, 0x00a7a5, 0x00a7a7, 0x00a7a7, 0x00a7a9, 0x00a7a9, 0x00a7b5, 0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb,
-                        0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7f6, 0x00a7f6, 0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00,
-                        0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01e922, 0x01e943));
+                        0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c1, 0x00a7c1, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7d1, 0x00a7d1, 0x00a7d7, 0x00a7d7, 0x00a7d9,
+                        0x00a7d9, 0x00a7f6, 0x00a7f6, 0x00ab53, 0x00ab53, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb,
+                        0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01e922, 0x01e943));
     }
 
     private static void populateCASED() {
@@ -1648,19 +1679,20 @@ private static void populateCASED() {
                         0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071,
                         0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002119, 0x00211d, 0x002124, 0x002124,
                         0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x00212f, 0x002134, 0x002139, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160,
-                        0x00217f, 0x002183, 0x002184, 0x0024b6, 0x0024e9, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25,
-                        0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x00a640, 0x00a66d, 0x00a680, 0x00a69d, 0x00a722, 0x00a787, 0x00a78b, 0x00a78e, 0x00a790, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5,
+                        0x00217f, 0x002183, 0x002184, 0x0024b6, 0x0024e9, 0x002c00, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d,
+                        0x00a640, 0x00a66d, 0x00a680, 0x00a69d, 0x00a722, 0x00a787, 0x00a78b, 0x00a78e, 0x00a790, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f5,
                         0x00a7f6, 0x00a7f8, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a,
-                        0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01d400, 0x01d454, 0x01d456,
-                        0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505,
-                        0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552,
-                        0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788,
-                        0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e900, 0x01e943, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
+                        0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3,
+                        0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01d400, 0x01d454, 0x01d456, 0x01d49c,
+                        0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507,
+                        0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5,
+                        0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a,
+                        0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e900, 0x01e943, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
     }
 
     private static void populateDI() {
         SET_ENCODINGS.put("DI",
-                        CodePointSet.createNoDedup(0x0000ad, 0x0000ad, 0x00034f, 0x00034f, 0x00061c, 0x00061c, 0x00115f, 0x001160, 0x0017b4, 0x0017b5, 0x00180b, 0x00180e, 0x00200b, 0x00200f, 0x00202a,
+                        CodePointSet.createNoDedup(0x0000ad, 0x0000ad, 0x00034f, 0x00034f, 0x00061c, 0x00061c, 0x00115f, 0x001160, 0x0017b4, 0x0017b5, 0x00180b, 0x00180f, 0x00200b, 0x00200f, 0x00202a,
                                         0x00202e, 0x002060, 0x00206f, 0x003164, 0x003164, 0x00fe00, 0x00fe0f, 0x00feff, 0x00feff, 0x00ffa0, 0x00ffa0, 0x00fff0, 0x00fff8, 0x01bca0, 0x01bca3, 0x01d173,
                                         0x01d17a, 0x0e0000, 0x0e0fff));
     }
@@ -1668,8 +1700,8 @@ private static void populateDI() {
     private static void populateDASH() {
         SET_ENCODINGS.put("Dash",
                         CodePointSet.createNoDedup(0x00002d, 0x00002d, 0x00058a, 0x00058a, 0x0005be, 0x0005be, 0x001400, 0x001400, 0x001806, 0x001806, 0x002010, 0x002015, 0x002053, 0x002053, 0x00207b,
-                                        0x00207b, 0x00208b, 0x00208b, 0x002212, 0x002212, 0x002e17, 0x002e17, 0x002e1a, 0x002e1a, 0x002e3a, 0x002e3b, 0x002e40, 0x002e40, 0x00301c, 0x00301c, 0x003030,
-                                        0x003030, 0x0030a0, 0x0030a0, 0x00fe31, 0x00fe32, 0x00fe58, 0x00fe58, 0x00fe63, 0x00fe63, 0x00ff0d, 0x00ff0d, 0x010ead, 0x010ead));
+                                        0x00207b, 0x00208b, 0x00208b, 0x002212, 0x002212, 0x002e17, 0x002e17, 0x002e1a, 0x002e1a, 0x002e3a, 0x002e3b, 0x002e40, 0x002e40, 0x002e5d, 0x002e5d, 0x00301c,
+                                        0x00301c, 0x003030, 0x003030, 0x0030a0, 0x0030a0, 0x00fe31, 0x00fe32, 0x00fe58, 0x00fe58, 0x00fe63, 0x00fe63, 0x00ff0d, 0x00ff0d, 0x010ead, 0x010ead));
     }
 
     private static void populateDEP() {
@@ -1681,33 +1713,34 @@ private static void populateDIA() {
         SET_ENCODINGS.put("Dia", CodePointSet.createNoDedup(0x00005e, 0x00005e, 0x000060, 0x000060, 0x0000a8, 0x0000a8, 0x0000af, 0x0000af, 0x0000b4, 0x0000b4, 0x0000b7, 0x0000b8, 0x0002b0, 0x00034e,
                         0x000350, 0x000357, 0x00035d, 0x000362, 0x000374, 0x000375, 0x00037a, 0x00037a, 0x000384, 0x000385, 0x000483, 0x000487, 0x000559, 0x000559, 0x000591, 0x0005a1, 0x0005a3,
                         0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c4, 0x00064b, 0x000652, 0x000657, 0x000658, 0x0006df, 0x0006e0, 0x0006e5, 0x0006e6, 0x0006ea, 0x0006ec,
-                        0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f5, 0x000818, 0x000819, 0x0008e3, 0x0008fe, 0x00093c, 0x00093c, 0x00094d, 0x00094d, 0x000951, 0x000954, 0x000971,
-                        0x000971, 0x0009bc, 0x0009bc, 0x0009cd, 0x0009cd, 0x000a3c, 0x000a3c, 0x000a4d, 0x000a4d, 0x000abc, 0x000abc, 0x000acd, 0x000acd, 0x000afd, 0x000aff, 0x000b3c, 0x000b3c,
-                        0x000b4d, 0x000b4d, 0x000b55, 0x000b55, 0x000bcd, 0x000bcd, 0x000c4d, 0x000c4d, 0x000cbc, 0x000cbc, 0x000ccd, 0x000ccd, 0x000d3b, 0x000d3c, 0x000d4d, 0x000d4d, 0x000dca,
-                        0x000dca, 0x000e47, 0x000e4c, 0x000e4e, 0x000e4e, 0x000eba, 0x000eba, 0x000ec8, 0x000ecc, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39,
-                        0x000f3e, 0x000f3f, 0x000f82, 0x000f84, 0x000f86, 0x000f87, 0x000fc6, 0x000fc6, 0x001037, 0x001037, 0x001039, 0x00103a, 0x001063, 0x001064, 0x001069, 0x00106d, 0x001087,
-                        0x00108d, 0x00108f, 0x00108f, 0x00109a, 0x00109b, 0x00135d, 0x00135f, 0x0017c9, 0x0017d3, 0x0017dd, 0x0017dd, 0x001939, 0x00193b, 0x001a75, 0x001a7c, 0x001a7f, 0x001a7f,
-                        0x001ab0, 0x001abd, 0x001b34, 0x001b34, 0x001b44, 0x001b44, 0x001b6b, 0x001b73, 0x001baa, 0x001bab, 0x001c36, 0x001c37, 0x001c78, 0x001c7d, 0x001cd0, 0x001ce8, 0x001ced,
-                        0x001ced, 0x001cf4, 0x001cf4, 0x001cf7, 0x001cf9, 0x001d2c, 0x001d6a, 0x001dc4, 0x001dcf, 0x001df5, 0x001df9, 0x001dfd, 0x001dff, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1,
-                        0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x002cef, 0x002cf1, 0x002e2f, 0x002e2f, 0x00302a, 0x00302f, 0x003099, 0x00309c, 0x0030fc,
-                        0x0030fc, 0x00a66f, 0x00a66f, 0x00a67c, 0x00a67d, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69d, 0x00a6f0, 0x00a6f1, 0x00a700, 0x00a721, 0x00a788, 0x00a78a, 0x00a7f8, 0x00a7f9,
-                        0x00a8c4, 0x00a8c4, 0x00a8e0, 0x00a8f1, 0x00a92b, 0x00a92e, 0x00a953, 0x00a953, 0x00a9b3, 0x00a9b3, 0x00a9c0, 0x00a9c0, 0x00a9e5, 0x00a9e5, 0x00aa7b, 0x00aa7d, 0x00aabf,
-                        0x00aac2, 0x00aaf6, 0x00aaf6, 0x00ab5b, 0x00ab5f, 0x00ab69, 0x00ab6b, 0x00abec, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe20, 0x00fe2f, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40,
-                        0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x00ffe3, 0x00ffe3, 0x0102e0, 0x0102e0, 0x010ae5, 0x010ae6, 0x010d22, 0x010d27, 0x010f46, 0x010f50, 0x0110b9, 0x0110ba, 0x011133,
-                        0x011134, 0x011173, 0x011173, 0x0111c0, 0x0111c0, 0x0111ca, 0x0111cc, 0x011235, 0x011236, 0x0112e9, 0x0112ea, 0x01133c, 0x01133c, 0x01134d, 0x01134d, 0x011366, 0x01136c,
-                        0x011370, 0x011374, 0x011442, 0x011442, 0x011446, 0x011446, 0x0114c2, 0x0114c3, 0x0115bf, 0x0115c0, 0x01163f, 0x01163f, 0x0116b6, 0x0116b7, 0x01172b, 0x01172b, 0x011839,
-                        0x01183a, 0x01193d, 0x01193e, 0x011943, 0x011943, 0x0119e0, 0x0119e0, 0x011a34, 0x011a34, 0x011a47, 0x011a47, 0x011a99, 0x011a99, 0x011c3f, 0x011c3f, 0x011d42, 0x011d42,
-                        0x011d44, 0x011d45, 0x011d97, 0x011d97, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f8f, 0x016f9f, 0x016ff0, 0x016ff1, 0x01d167, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b,
-                        0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01e130, 0x01e136, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e946, 0x01e948, 0x01e94a));
+                        0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f5, 0x000818, 0x000819, 0x000898, 0x00089f, 0x0008c9, 0x0008d2, 0x0008e3, 0x0008fe, 0x00093c, 0x00093c, 0x00094d,
+                        0x00094d, 0x000951, 0x000954, 0x000971, 0x000971, 0x0009bc, 0x0009bc, 0x0009cd, 0x0009cd, 0x000a3c, 0x000a3c, 0x000a4d, 0x000a4d, 0x000abc, 0x000abc, 0x000acd, 0x000acd,
+                        0x000afd, 0x000aff, 0x000b3c, 0x000b3c, 0x000b4d, 0x000b4d, 0x000b55, 0x000b55, 0x000bcd, 0x000bcd, 0x000c3c, 0x000c3c, 0x000c4d, 0x000c4d, 0x000cbc, 0x000cbc, 0x000ccd,
+                        0x000ccd, 0x000d3b, 0x000d3c, 0x000d4d, 0x000d4d, 0x000dca, 0x000dca, 0x000e47, 0x000e4c, 0x000e4e, 0x000e4e, 0x000eba, 0x000eba, 0x000ec8, 0x000ecc, 0x000f18, 0x000f19,
+                        0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f3f, 0x000f82, 0x000f84, 0x000f86, 0x000f87, 0x000fc6, 0x000fc6, 0x001037, 0x001037, 0x001039,
+                        0x00103a, 0x001063, 0x001064, 0x001069, 0x00106d, 0x001087, 0x00108d, 0x00108f, 0x00108f, 0x00109a, 0x00109b, 0x00135d, 0x00135f, 0x001714, 0x001715, 0x0017c9, 0x0017d3,
+                        0x0017dd, 0x0017dd, 0x001939, 0x00193b, 0x001a75, 0x001a7c, 0x001a7f, 0x001a7f, 0x001ab0, 0x001abe, 0x001ac1, 0x001acb, 0x001b34, 0x001b34, 0x001b44, 0x001b44, 0x001b6b,
+                        0x001b73, 0x001baa, 0x001bab, 0x001c36, 0x001c37, 0x001c78, 0x001c7d, 0x001cd0, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf7, 0x001cf9, 0x001d2c, 0x001d6a,
+                        0x001dc4, 0x001dcf, 0x001df5, 0x001dff, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1, 0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x002cef,
+                        0x002cf1, 0x002e2f, 0x002e2f, 0x00302a, 0x00302f, 0x003099, 0x00309c, 0x0030fc, 0x0030fc, 0x00a66f, 0x00a66f, 0x00a67c, 0x00a67d, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69d,
+                        0x00a6f0, 0x00a6f1, 0x00a700, 0x00a721, 0x00a788, 0x00a78a, 0x00a7f8, 0x00a7f9, 0x00a8c4, 0x00a8c4, 0x00a8e0, 0x00a8f1, 0x00a92b, 0x00a92e, 0x00a953, 0x00a953, 0x00a9b3,
+                        0x00a9b3, 0x00a9c0, 0x00a9c0, 0x00a9e5, 0x00a9e5, 0x00aa7b, 0x00aa7d, 0x00aabf, 0x00aac2, 0x00aaf6, 0x00aaf6, 0x00ab5b, 0x00ab5f, 0x00ab69, 0x00ab6b, 0x00abec, 0x00abed,
+                        0x00fb1e, 0x00fb1e, 0x00fe20, 0x00fe2f, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x00ffe3, 0x00ffe3, 0x0102e0, 0x0102e0, 0x010780,
+                        0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010ae5, 0x010ae6, 0x010d22, 0x010d27, 0x010f46, 0x010f50, 0x010f82, 0x010f85, 0x011046, 0x011046, 0x011070, 0x011070,
+                        0x0110b9, 0x0110ba, 0x011133, 0x011134, 0x011173, 0x011173, 0x0111c0, 0x0111c0, 0x0111ca, 0x0111cc, 0x011235, 0x011236, 0x0112e9, 0x0112ea, 0x01133c, 0x01133c, 0x01134d,
+                        0x01134d, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011442, 0x011442, 0x011446, 0x011446, 0x0114c2, 0x0114c3, 0x0115bf, 0x0115c0, 0x01163f, 0x01163f, 0x0116b6, 0x0116b7,
+                        0x01172b, 0x01172b, 0x011839, 0x01183a, 0x01193d, 0x01193e, 0x011943, 0x011943, 0x0119e0, 0x0119e0, 0x011a34, 0x011a34, 0x011a47, 0x011a47, 0x011a99, 0x011a99, 0x011c3f,
+                        0x011c3f, 0x011d42, 0x011d42, 0x011d44, 0x011d45, 0x011d97, 0x011d97, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f8f, 0x016f9f, 0x016ff0, 0x016ff1, 0x01aff0, 0x01aff3,
+                        0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d167, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa,
+                        0x01d1ad, 0x01e130, 0x01e136, 0x01e2ae, 0x01e2ae, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e946, 0x01e948, 0x01e94a));
     }
 
     private static void populateEBASE() {
-        SET_ENCODINGS.put("EBase",
-                        CodePointSet.createNoDedup(0x00261d, 0x00261d, 0x0026f9, 0x0026f9, 0x00270a, 0x00270d, 0x01f385, 0x01f385, 0x01f3c2, 0x01f3c4, 0x01f3c7, 0x01f3c7, 0x01f3ca, 0x01f3cc, 0x01f442,
-                                        0x01f443, 0x01f446, 0x01f450, 0x01f466, 0x01f478, 0x01f47c, 0x01f47c, 0x01f481, 0x01f483, 0x01f485, 0x01f487, 0x01f48f, 0x01f48f, 0x01f491, 0x01f491, 0x01f4aa,
-                                        0x01f4aa, 0x01f574, 0x01f575, 0x01f57a, 0x01f57a, 0x01f590, 0x01f590, 0x01f595, 0x01f596, 0x01f645, 0x01f647, 0x01f64b, 0x01f64f, 0x01f6a3, 0x01f6a3, 0x01f6b4,
-                                        0x01f6b6, 0x01f6c0, 0x01f6c0, 0x01f6cc, 0x01f6cc, 0x01f90c, 0x01f90c, 0x01f90f, 0x01f90f, 0x01f918, 0x01f91f, 0x01f926, 0x01f926, 0x01f930, 0x01f939, 0x01f93c,
-                                        0x01f93e, 0x01f977, 0x01f977, 0x01f9b5, 0x01f9b6, 0x01f9b8, 0x01f9b9, 0x01f9bb, 0x01f9bb, 0x01f9cd, 0x01f9cf, 0x01f9d1, 0x01f9dd));
+        SET_ENCODINGS.put("EBase", CodePointSet.createNoDedup(0x00261d, 0x00261d, 0x0026f9, 0x0026f9, 0x00270a, 0x00270d, 0x01f385, 0x01f385, 0x01f3c2, 0x01f3c4, 0x01f3c7, 0x01f3c7, 0x01f3ca,
+                        0x01f3cc, 0x01f442, 0x01f443, 0x01f446, 0x01f450, 0x01f466, 0x01f478, 0x01f47c, 0x01f47c, 0x01f481, 0x01f483, 0x01f485, 0x01f487, 0x01f48f, 0x01f48f, 0x01f491, 0x01f491,
+                        0x01f4aa, 0x01f4aa, 0x01f574, 0x01f575, 0x01f57a, 0x01f57a, 0x01f590, 0x01f590, 0x01f595, 0x01f596, 0x01f645, 0x01f647, 0x01f64b, 0x01f64f, 0x01f6a3, 0x01f6a3, 0x01f6b4,
+                        0x01f6b6, 0x01f6c0, 0x01f6c0, 0x01f6cc, 0x01f6cc, 0x01f90c, 0x01f90c, 0x01f90f, 0x01f90f, 0x01f918, 0x01f91f, 0x01f926, 0x01f926, 0x01f930, 0x01f939, 0x01f93c, 0x01f93e,
+                        0x01f977, 0x01f977, 0x01f9b5, 0x01f9b6, 0x01f9b8, 0x01f9b9, 0x01f9bb, 0x01f9bb, 0x01f9cd, 0x01f9cf, 0x01f9d1, 0x01f9dd, 0x01fac3, 0x01fac5, 0x01faf0, 0x01faf6));
     }
 
     private static void populateECOMP() {
@@ -1728,8 +1761,8 @@ private static void populateEPRES() {
                         0x01f22f, 0x01f232, 0x01f236, 0x01f238, 0x01f23a, 0x01f250, 0x01f251, 0x01f300, 0x01f320, 0x01f32d, 0x01f335, 0x01f337, 0x01f37c, 0x01f37e, 0x01f393, 0x01f3a0, 0x01f3ca,
                         0x01f3cf, 0x01f3d3, 0x01f3e0, 0x01f3f0, 0x01f3f4, 0x01f3f4, 0x01f3f8, 0x01f43e, 0x01f440, 0x01f440, 0x01f442, 0x01f4fc, 0x01f4ff, 0x01f53d, 0x01f54b, 0x01f54e, 0x01f550,
                         0x01f567, 0x01f57a, 0x01f57a, 0x01f595, 0x01f596, 0x01f5a4, 0x01f5a4, 0x01f5fb, 0x01f64f, 0x01f680, 0x01f6c5, 0x01f6cc, 0x01f6cc, 0x01f6d0, 0x01f6d2, 0x01f6d5, 0x01f6d7,
-                        0x01f6eb, 0x01f6ec, 0x01f6f4, 0x01f6fc, 0x01f7e0, 0x01f7eb, 0x01f90c, 0x01f93a, 0x01f93c, 0x01f945, 0x01f947, 0x01f978, 0x01f97a, 0x01f9cb, 0x01f9cd, 0x01f9ff, 0x01fa70,
-                        0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2, 0x01fad0, 0x01fad6));
+                        0x01f6dd, 0x01f6df, 0x01f6eb, 0x01f6ec, 0x01f6f4, 0x01f6fc, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f90c, 0x01f93a, 0x01f93c, 0x01f945, 0x01f947, 0x01f9ff, 0x01fa70,
+                        0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6));
     }
 
     private static void populateEMOJI() {
@@ -1749,16 +1782,18 @@ private static void populateEMOJI() {
                         0x01f4fd, 0x01f4ff, 0x01f53d, 0x01f549, 0x01f54e, 0x01f550, 0x01f567, 0x01f56f, 0x01f570, 0x01f573, 0x01f57a, 0x01f587, 0x01f587, 0x01f58a, 0x01f58d, 0x01f590, 0x01f590,
                         0x01f595, 0x01f596, 0x01f5a4, 0x01f5a5, 0x01f5a8, 0x01f5a8, 0x01f5b1, 0x01f5b2, 0x01f5bc, 0x01f5bc, 0x01f5c2, 0x01f5c4, 0x01f5d1, 0x01f5d3, 0x01f5dc, 0x01f5de, 0x01f5e1,
                         0x01f5e1, 0x01f5e3, 0x01f5e3, 0x01f5e8, 0x01f5e8, 0x01f5ef, 0x01f5ef, 0x01f5f3, 0x01f5f3, 0x01f5fa, 0x01f64f, 0x01f680, 0x01f6c5, 0x01f6cb, 0x01f6d2, 0x01f6d5, 0x01f6d7,
-                        0x01f6e0, 0x01f6e5, 0x01f6e9, 0x01f6e9, 0x01f6eb, 0x01f6ec, 0x01f6f0, 0x01f6f0, 0x01f6f3, 0x01f6fc, 0x01f7e0, 0x01f7eb, 0x01f90c, 0x01f93a, 0x01f93c, 0x01f945, 0x01f947,
-                        0x01f978, 0x01f97a, 0x01f9cb, 0x01f9cd, 0x01f9ff, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2,
-                        0x01fad0, 0x01fad6));
+                        0x01f6dd, 0x01f6e5, 0x01f6e9, 0x01f6e9, 0x01f6eb, 0x01f6ec, 0x01f6f0, 0x01f6f0, 0x01f6f3, 0x01f6fc, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f90c, 0x01f93a, 0x01f93c,
+                        0x01f945, 0x01f947, 0x01f9ff, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9,
+                        0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6));
     }
 
     private static void populateEXT() {
-        SET_ENCODINGS.put("Ext", CodePointSet.createNoDedup(0x0000b7, 0x0000b7, 0x0002d0, 0x0002d1, 0x000640, 0x000640, 0x0007fa, 0x0007fa, 0x000b55, 0x000b55, 0x000e46, 0x000e46, 0x000ec6, 0x000ec6,
-                        0x00180a, 0x00180a, 0x001843, 0x001843, 0x001aa7, 0x001aa7, 0x001c36, 0x001c36, 0x001c7b, 0x001c7b, 0x003005, 0x003005, 0x003031, 0x003035, 0x00309d, 0x00309e, 0x0030fc,
-                        0x0030fe, 0x00a015, 0x00a015, 0x00a60c, 0x00a60c, 0x00a9cf, 0x00a9cf, 0x00a9e6, 0x00a9e6, 0x00aa70, 0x00aa70, 0x00aadd, 0x00aadd, 0x00aaf3, 0x00aaf4, 0x00ff70, 0x00ff70,
-                        0x01135d, 0x01135d, 0x0115c6, 0x0115c8, 0x011a98, 0x011a98, 0x016b42, 0x016b43, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x01e13c, 0x01e13d, 0x01e944, 0x01e946));
+        SET_ENCODINGS.put("Ext",
+                        CodePointSet.createNoDedup(0x0000b7, 0x0000b7, 0x0002d0, 0x0002d1, 0x000640, 0x000640, 0x0007fa, 0x0007fa, 0x000b55, 0x000b55, 0x000e46, 0x000e46, 0x000ec6, 0x000ec6, 0x00180a,
+                                        0x00180a, 0x001843, 0x001843, 0x001aa7, 0x001aa7, 0x001c36, 0x001c36, 0x001c7b, 0x001c7b, 0x003005, 0x003005, 0x003031, 0x003035, 0x00309d, 0x00309e, 0x0030fc,
+                                        0x0030fe, 0x00a015, 0x00a015, 0x00a60c, 0x00a60c, 0x00a9cf, 0x00a9cf, 0x00a9e6, 0x00a9e6, 0x00aa70, 0x00aa70, 0x00aadd, 0x00aadd, 0x00aaf3, 0x00aaf4, 0x00ff70,
+                                        0x00ff70, 0x010781, 0x010782, 0x01135d, 0x01135d, 0x0115c6, 0x0115c8, 0x011a98, 0x011a98, 0x016b42, 0x016b43, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x01e13c,
+                                        0x01e13d, 0x01e944, 0x01e946));
     }
 
     private static void populateEXTPICT() {
@@ -1778,10 +1813,10 @@ private static void populateEXTPICT() {
     private static void populateGR_BASE() {
         SET_ENCODINGS.put("Gr_Base", CodePointSet.createNoDedup(0x000020, 0x00007e, 0x0000a0, 0x0000ac, 0x0000ae, 0x0002ff, 0x000370, 0x000377, 0x00037a, 0x00037f, 0x000384, 0x00038a, 0x00038c,
                         0x00038c, 0x00038e, 0x0003a1, 0x0003a3, 0x000482, 0x00048a, 0x00052f, 0x000531, 0x000556, 0x000559, 0x00058a, 0x00058d, 0x00058f, 0x0005be, 0x0005be, 0x0005c0, 0x0005c0,
-                        0x0005c3, 0x0005c3, 0x0005c6, 0x0005c6, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f4, 0x000606, 0x00060f, 0x00061b, 0x00061b, 0x00061e, 0x00064a, 0x000660, 0x00066f, 0x000671,
+                        0x0005c3, 0x0005c3, 0x0005c6, 0x0005c6, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f4, 0x000606, 0x00060f, 0x00061b, 0x00061b, 0x00061d, 0x00064a, 0x000660, 0x00066f, 0x000671,
                         0x0006d5, 0x0006de, 0x0006de, 0x0006e5, 0x0006e6, 0x0006e9, 0x0006e9, 0x0006ee, 0x00070d, 0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1,
                         0x0007c0, 0x0007ea, 0x0007f4, 0x0007fa, 0x0007fe, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000830, 0x00083e, 0x000840, 0x000858, 0x00085e,
-                        0x00085e, 0x000860, 0x00086a, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x000903, 0x000939, 0x00093b, 0x00093b, 0x00093d, 0x000940, 0x000949, 0x00094c, 0x00094e, 0x000950,
+                        0x00085e, 0x000860, 0x00086a, 0x000870, 0x00088e, 0x0008a0, 0x0008c9, 0x000903, 0x000939, 0x00093b, 0x00093b, 0x00093d, 0x000940, 0x000949, 0x00094c, 0x00094e, 0x000950,
                         0x000958, 0x000961, 0x000964, 0x000980, 0x000982, 0x000983, 0x000985, 0x00098c, 0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6,
                         0x0009b9, 0x0009bd, 0x0009bd, 0x0009bf, 0x0009c0, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009cc, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e1, 0x0009e6, 0x0009fd,
                         0x000a03, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3e,
@@ -1791,134 +1826,138 @@ private static void populateGR_BASE() {
                         0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b40, 0x000b40, 0x000b47, 0x000b48, 0x000b4b, 0x000b4c, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b66, 0x000b77, 0x000b83,
                         0x000b83, 0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa,
                         0x000bae, 0x000bb9, 0x000bbf, 0x000bbf, 0x000bc1, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcc, 0x000bd0, 0x000bd0, 0x000be6, 0x000bfa, 0x000c01, 0x000c03, 0x000c05,
-                        0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c41, 0x000c44, 0x000c58, 0x000c5a, 0x000c60, 0x000c61, 0x000c66, 0x000c6f,
-                        0x000c77, 0x000c80, 0x000c82, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbe, 0x000cc0, 0x000cc1, 0x000cc3,
-                        0x000cc4, 0x000cc7, 0x000cc8, 0x000cca, 0x000ccb, 0x000cde, 0x000cde, 0x000ce0, 0x000ce1, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d02, 0x000d0c, 0x000d0e, 0x000d10,
-                        0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d3f, 0x000d40, 0x000d46, 0x000d48, 0x000d4a, 0x000d4c, 0x000d4e, 0x000d4f, 0x000d54, 0x000d56, 0x000d58, 0x000d61, 0x000d66,
-                        0x000d7f, 0x000d82, 0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dd0, 0x000dd1, 0x000dd8, 0x000dde,
-                        0x000de6, 0x000def, 0x000df2, 0x000df4, 0x000e01, 0x000e30, 0x000e32, 0x000e33, 0x000e3f, 0x000e46, 0x000e4f, 0x000e5b, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86,
-                        0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ed0, 0x000ed9,
-                        0x000edc, 0x000edf, 0x000f00, 0x000f17, 0x000f1a, 0x000f34, 0x000f36, 0x000f36, 0x000f38, 0x000f38, 0x000f3a, 0x000f47, 0x000f49, 0x000f6c, 0x000f7f, 0x000f7f, 0x000f85,
-                        0x000f85, 0x000f88, 0x000f8c, 0x000fbe, 0x000fc5, 0x000fc7, 0x000fcc, 0x000fce, 0x000fda, 0x001000, 0x00102c, 0x001031, 0x001031, 0x001038, 0x001038, 0x00103b, 0x00103c,
-                        0x00103f, 0x001057, 0x00105a, 0x00105d, 0x001061, 0x001070, 0x001075, 0x001081, 0x001083, 0x001084, 0x001087, 0x00108c, 0x00108e, 0x00109c, 0x00109e, 0x0010c5, 0x0010c7,
-                        0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d,
-                        0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318,
-                        0x00135a, 0x001360, 0x00137c, 0x001380, 0x001399, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001400, 0x00169c, 0x0016a0, 0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001711,
-                        0x001720, 0x001731, 0x001735, 0x001736, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017b6, 0x0017b6, 0x0017be, 0x0017c5, 0x0017c7,
-                        0x0017c8, 0x0017d4, 0x0017dc, 0x0017e0, 0x0017e9, 0x0017f0, 0x0017f9, 0x001800, 0x00180a, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x001884, 0x001887, 0x0018a8,
-                        0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001923, 0x001926, 0x001929, 0x00192b, 0x001930, 0x001931, 0x001933, 0x001938, 0x001940, 0x001940, 0x001944,
-                        0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x0019de, 0x001a16, 0x001a19, 0x001a1a, 0x001a1e, 0x001a55, 0x001a57, 0x001a57,
-                        0x001a61, 0x001a61, 0x001a63, 0x001a64, 0x001a6d, 0x001a72, 0x001a80, 0x001a89, 0x001a90, 0x001a99, 0x001aa0, 0x001aad, 0x001b04, 0x001b33, 0x001b3b, 0x001b3b, 0x001b3d,
-                        0x001b41, 0x001b43, 0x001b4b, 0x001b50, 0x001b6a, 0x001b74, 0x001b7c, 0x001b82, 0x001ba1, 0x001ba6, 0x001ba7, 0x001baa, 0x001baa, 0x001bae, 0x001be5, 0x001be7, 0x001be7,
-                        0x001bea, 0x001bec, 0x001bee, 0x001bee, 0x001bf2, 0x001bf3, 0x001bfc, 0x001c2b, 0x001c34, 0x001c35, 0x001c3b, 0x001c49, 0x001c4d, 0x001c88, 0x001c90, 0x001cba, 0x001cbd,
-                        0x001cc7, 0x001cd3, 0x001cd3, 0x001ce1, 0x001ce1, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf7, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15,
-                        0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80,
-                        0x001fb4, 0x001fb6, 0x001fc4, 0x001fc6, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fdd, 0x001fef, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffe, 0x002000, 0x00200a, 0x002010, 0x002027,
-                        0x00202f, 0x00205f, 0x002070, 0x002071, 0x002074, 0x00208e, 0x002090, 0x00209c, 0x0020a0, 0x0020bf, 0x002100, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a, 0x002460,
-                        0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002cee, 0x002cf2, 0x002cf3, 0x002cf9, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d,
-                        0x002d30, 0x002d67, 0x002d6f, 0x002d70, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8,
-                        0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x002e00, 0x002e52, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003000, 0x003029,
-                        0x003030, 0x00303f, 0x003041, 0x003096, 0x00309b, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x003190, 0x0031e3, 0x0031f0, 0x00321e, 0x003220, 0x009ffc, 0x00a000,
-                        0x00a48c, 0x00a490, 0x00a4c6, 0x00a4d0, 0x00a62b, 0x00a640, 0x00a66e, 0x00a673, 0x00a673, 0x00a67e, 0x00a69d, 0x00a6a0, 0x00a6ef, 0x00a6f2, 0x00a6f7, 0x00a700, 0x00a7bf,
-                        0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a801, 0x00a803, 0x00a805, 0x00a807, 0x00a80a, 0x00a80c, 0x00a824, 0x00a827, 0x00a82b, 0x00a830, 0x00a839, 0x00a840, 0x00a877, 0x00a880,
+                        0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c41, 0x000c44, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60, 0x000c61,
+                        0x000c66, 0x000c6f, 0x000c77, 0x000c80, 0x000c82, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbe, 0x000cc0,
+                        0x000cc1, 0x000cc3, 0x000cc4, 0x000cc7, 0x000cc8, 0x000cca, 0x000ccb, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce1, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d02, 0x000d0c,
+                        0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d3f, 0x000d40, 0x000d46, 0x000d48, 0x000d4a, 0x000d4c, 0x000d4e, 0x000d4f, 0x000d54, 0x000d56, 0x000d58,
+                        0x000d61, 0x000d66, 0x000d7f, 0x000d82, 0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dd0, 0x000dd1,
+                        0x000dd8, 0x000dde, 0x000de6, 0x000def, 0x000df2, 0x000df4, 0x000e01, 0x000e30, 0x000e32, 0x000e33, 0x000e3f, 0x000e46, 0x000e4f, 0x000e5b, 0x000e81, 0x000e82, 0x000e84,
+                        0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6,
+                        0x000ed0, 0x000ed9, 0x000edc, 0x000edf, 0x000f00, 0x000f17, 0x000f1a, 0x000f34, 0x000f36, 0x000f36, 0x000f38, 0x000f38, 0x000f3a, 0x000f47, 0x000f49, 0x000f6c, 0x000f7f,
+                        0x000f7f, 0x000f85, 0x000f85, 0x000f88, 0x000f8c, 0x000fbe, 0x000fc5, 0x000fc7, 0x000fcc, 0x000fce, 0x000fda, 0x001000, 0x00102c, 0x001031, 0x001031, 0x001038, 0x001038,
+                        0x00103b, 0x00103c, 0x00103f, 0x001057, 0x00105a, 0x00105d, 0x001061, 0x001070, 0x001075, 0x001081, 0x001083, 0x001084, 0x001087, 0x00108c, 0x00108e, 0x00109c, 0x00109e,
+                        0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288,
+                        0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312,
+                        0x001315, 0x001318, 0x00135a, 0x001360, 0x00137c, 0x001380, 0x001399, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001400, 0x00169c, 0x0016a0, 0x0016f8, 0x001700, 0x001711,
+                        0x001715, 0x001715, 0x00171f, 0x001731, 0x001734, 0x001736, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017b6, 0x0017b6, 0x0017be,
+                        0x0017c5, 0x0017c7, 0x0017c8, 0x0017d4, 0x0017dc, 0x0017e0, 0x0017e9, 0x0017f0, 0x0017f9, 0x001800, 0x00180a, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x001884,
+                        0x001887, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001923, 0x001926, 0x001929, 0x00192b, 0x001930, 0x001931, 0x001933, 0x001938, 0x001940,
+                        0x001940, 0x001944, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x0019de, 0x001a16, 0x001a19, 0x001a1a, 0x001a1e, 0x001a55,
+                        0x001a57, 0x001a57, 0x001a61, 0x001a61, 0x001a63, 0x001a64, 0x001a6d, 0x001a72, 0x001a80, 0x001a89, 0x001a90, 0x001a99, 0x001aa0, 0x001aad, 0x001b04, 0x001b33, 0x001b3b,
+                        0x001b3b, 0x001b3d, 0x001b41, 0x001b43, 0x001b4c, 0x001b50, 0x001b6a, 0x001b74, 0x001b7e, 0x001b82, 0x001ba1, 0x001ba6, 0x001ba7, 0x001baa, 0x001baa, 0x001bae, 0x001be5,
+                        0x001be7, 0x001be7, 0x001bea, 0x001bec, 0x001bee, 0x001bee, 0x001bf2, 0x001bf3, 0x001bfc, 0x001c2b, 0x001c34, 0x001c35, 0x001c3b, 0x001c49, 0x001c4d, 0x001c88, 0x001c90,
+                        0x001cba, 0x001cbd, 0x001cc7, 0x001cd3, 0x001cd3, 0x001ce1, 0x001ce1, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf7, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf,
+                        0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f,
+                        0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fc4, 0x001fc6, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fdd, 0x001fef, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffe, 0x002000, 0x00200a,
+                        0x002010, 0x002027, 0x00202f, 0x00205f, 0x002070, 0x002071, 0x002074, 0x00208e, 0x002090, 0x00209c, 0x0020a0, 0x0020c0, 0x002100, 0x00218b, 0x002190, 0x002426, 0x002440,
+                        0x00244a, 0x002460, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002cee, 0x002cf2, 0x002cf3, 0x002cf9, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67,
+                        0x002d6f, 0x002d70, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0,
+                        0x002dd6, 0x002dd8, 0x002dde, 0x002e00, 0x002e5d, 0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003000, 0x003029, 0x003030, 0x00303f,
+                        0x003041, 0x003096, 0x00309b, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x003190, 0x0031e3, 0x0031f0, 0x00321e, 0x003220, 0x00a48c, 0x00a490, 0x00a4c6, 0x00a4d0,
+                        0x00a62b, 0x00a640, 0x00a66e, 0x00a673, 0x00a673, 0x00a67e, 0x00a69d, 0x00a6a0, 0x00a6ef, 0x00a6f2, 0x00a6f7, 0x00a700, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3,
+                        0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a801, 0x00a803, 0x00a805, 0x00a807, 0x00a80a, 0x00a80c, 0x00a824, 0x00a827, 0x00a82b, 0x00a830, 0x00a839, 0x00a840, 0x00a877, 0x00a880,
                         0x00a8c3, 0x00a8ce, 0x00a8d9, 0x00a8f2, 0x00a8fe, 0x00a900, 0x00a925, 0x00a92e, 0x00a946, 0x00a952, 0x00a953, 0x00a95f, 0x00a97c, 0x00a983, 0x00a9b2, 0x00a9b4, 0x00a9b5,
                         0x00a9ba, 0x00a9bb, 0x00a9be, 0x00a9cd, 0x00a9cf, 0x00a9d9, 0x00a9de, 0x00a9e4, 0x00a9e6, 0x00a9fe, 0x00aa00, 0x00aa28, 0x00aa2f, 0x00aa30, 0x00aa33, 0x00aa34, 0x00aa40,
                         0x00aa42, 0x00aa44, 0x00aa4b, 0x00aa4d, 0x00aa4d, 0x00aa50, 0x00aa59, 0x00aa5c, 0x00aa7b, 0x00aa7d, 0x00aaaf, 0x00aab1, 0x00aab1, 0x00aab5, 0x00aab6, 0x00aab9, 0x00aabd,
                         0x00aac0, 0x00aac0, 0x00aac2, 0x00aac2, 0x00aadb, 0x00aaeb, 0x00aaee, 0x00aaf5, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28,
                         0x00ab2e, 0x00ab30, 0x00ab6b, 0x00ab70, 0x00abe4, 0x00abe6, 0x00abe7, 0x00abe9, 0x00abec, 0x00abf0, 0x00abf9, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb,
                         0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb1d, 0x00fb1f, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40,
-                        0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbc1, 0x00fbd3, 0x00fd3f, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfd, 0x00fe10, 0x00fe19, 0x00fe30, 0x00fe52,
+                        0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbc2, 0x00fbd3, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdcf, 0x00fdcf, 0x00fdf0, 0x00fdff, 0x00fe10, 0x00fe19, 0x00fe30, 0x00fe52,
                         0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00ff01, 0x00ff9d, 0x00ffa0, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2,
                         0x00ffd7, 0x00ffda, 0x00ffdc, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fffc, 0x00fffd, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d,
                         0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010100, 0x010102, 0x010107, 0x010133, 0x010137, 0x01018e, 0x010190, 0x01019c, 0x0101a0, 0x0101a0, 0x0101d0,
                         0x0101fc, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e1, 0x0102fb, 0x010300, 0x010323, 0x01032d, 0x01034a, 0x010350, 0x010375, 0x010380, 0x01039d, 0x01039f, 0x0103c3,
-                        0x0103c8, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x01056f, 0x01056f, 0x010600,
-                        0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855,
-                        0x010857, 0x01089e, 0x0108a7, 0x0108af, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x0108fb, 0x01091b, 0x01091f, 0x010939, 0x01093f, 0x01093f, 0x010980, 0x0109b7, 0x0109bc,
-                        0x0109cf, 0x0109d2, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a40, 0x010a48, 0x010a50, 0x010a58, 0x010a60, 0x010a9f, 0x010ac0, 0x010ae4,
-                        0x010aeb, 0x010af6, 0x010b00, 0x010b35, 0x010b39, 0x010b55, 0x010b58, 0x010b72, 0x010b78, 0x010b91, 0x010b99, 0x010b9c, 0x010ba9, 0x010baf, 0x010c00, 0x010c48, 0x010c80,
-                        0x010cb2, 0x010cc0, 0x010cf2, 0x010cfa, 0x010d23, 0x010d30, 0x010d39, 0x010e60, 0x010e7e, 0x010e80, 0x010ea9, 0x010ead, 0x010ead, 0x010eb0, 0x010eb1, 0x010f00, 0x010f27,
-                        0x010f30, 0x010f45, 0x010f51, 0x010f59, 0x010fb0, 0x010fcb, 0x010fe0, 0x010ff6, 0x011000, 0x011000, 0x011002, 0x011037, 0x011047, 0x01104d, 0x011052, 0x01106f, 0x011082,
-                        0x0110b2, 0x0110b7, 0x0110b8, 0x0110bb, 0x0110bc, 0x0110be, 0x0110c1, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011103, 0x011126, 0x01112c, 0x01112c, 0x011136, 0x011147,
-                        0x011150, 0x011172, 0x011174, 0x011176, 0x011182, 0x0111b5, 0x0111bf, 0x0111c8, 0x0111cd, 0x0111ce, 0x0111d0, 0x0111df, 0x0111e1, 0x0111f4, 0x011200, 0x011211, 0x011213,
-                        0x01122e, 0x011232, 0x011233, 0x011235, 0x011235, 0x011238, 0x01123d, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a9,
-                        0x0112b0, 0x0112de, 0x0112e0, 0x0112e2, 0x0112f0, 0x0112f9, 0x011302, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332,
-                        0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x01133f, 0x01133f, 0x011341, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011350, 0x011350, 0x01135d, 0x011363,
-                        0x011400, 0x011437, 0x011440, 0x011441, 0x011445, 0x011445, 0x011447, 0x01145b, 0x01145d, 0x01145d, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114b1, 0x0114b2, 0x0114b9,
-                        0x0114b9, 0x0114bb, 0x0114bc, 0x0114be, 0x0114be, 0x0114c1, 0x0114c1, 0x0114c4, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115ae, 0x0115b0, 0x0115b1, 0x0115b8, 0x0115bb,
-                        0x0115be, 0x0115be, 0x0115c1, 0x0115db, 0x011600, 0x011632, 0x01163b, 0x01163c, 0x01163e, 0x01163e, 0x011641, 0x011644, 0x011650, 0x011659, 0x011660, 0x01166c, 0x011680,
-                        0x0116aa, 0x0116ac, 0x0116ac, 0x0116ae, 0x0116af, 0x0116b6, 0x0116b6, 0x0116b8, 0x0116b8, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x011720, 0x011721, 0x011726, 0x011726,
-                        0x011730, 0x01173f, 0x011800, 0x01182e, 0x011838, 0x011838, 0x01183b, 0x01183b, 0x0118a0, 0x0118f2, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915,
-                        0x011916, 0x011918, 0x01192f, 0x011931, 0x011935, 0x011937, 0x011938, 0x01193d, 0x01193d, 0x01193f, 0x011942, 0x011944, 0x011946, 0x011950, 0x011959, 0x0119a0, 0x0119a7,
-                        0x0119aa, 0x0119d3, 0x0119dc, 0x0119df, 0x0119e1, 0x0119e4, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a39, 0x011a3a, 0x011a3f, 0x011a46, 0x011a50, 0x011a50, 0x011a57,
-                        0x011a58, 0x011a5c, 0x011a89, 0x011a97, 0x011a97, 0x011a9a, 0x011aa2, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2f, 0x011c3e, 0x011c3e, 0x011c40, 0x011c45,
-                        0x011c50, 0x011c6c, 0x011c70, 0x011c8f, 0x011ca9, 0x011ca9, 0x011cb1, 0x011cb1, 0x011cb4, 0x011cb4, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46,
-                        0x011d46, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d93, 0x011d94, 0x011d96, 0x011d96, 0x011d98, 0x011d98, 0x011da0, 0x011da9,
-                        0x011ee0, 0x011ef2, 0x011ef5, 0x011ef8, 0x011fb0, 0x011fb0, 0x011fc0, 0x011ff1, 0x011fff, 0x012399, 0x012400, 0x01246e, 0x012470, 0x012474, 0x012480, 0x012543, 0x013000,
-                        0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016a6e, 0x016a6f, 0x016ad0, 0x016aed, 0x016af5, 0x016af5, 0x016b00, 0x016b2f,
-                        0x016b37, 0x016b45, 0x016b50, 0x016b59, 0x016b5b, 0x016b61, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e9a, 0x016f00, 0x016f4a, 0x016f50, 0x016f87, 0x016f93,
-                        0x016f9f, 0x016fe0, 0x016fe3, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167,
-                        0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9c, 0x01bc9c, 0x01bc9f, 0x01bc9f, 0x01d000, 0x01d0f5, 0x01d100,
-                        0x01d126, 0x01d129, 0x01d164, 0x01d166, 0x01d166, 0x01d16a, 0x01d16d, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1e8, 0x01d200, 0x01d241, 0x01d245, 0x01d245,
-                        0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356, 0x01d360, 0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9,
-                        0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539,
-                        0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d,
-                        0x01da74, 0x01da76, 0x01da83, 0x01da85, 0x01da8b, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14f, 0x01e2c0, 0x01e2eb, 0x01e2f0, 0x01e2f9,
-                        0x01e2ff, 0x01e2ff, 0x01e800, 0x01e8c4, 0x01e8c7, 0x01e8cf, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01e950, 0x01e959, 0x01e95e, 0x01e95f, 0x01ec71, 0x01ecb4, 0x01ed01,
-                        0x01ed3d, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39,
-                        0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57,
-                        0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72,
-                        0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01eef0,
-                        0x01eef1, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f202,
-                        0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780,
-                        0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978,
-                        0x01f97a, 0x01f9cb, 0x01f9cd, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0,
-                        0x01fac2, 0x01fad0, 0x01fad6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1,
-                        0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                        0x0103c8, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x01056f, 0x01057a, 0x01057c,
+                        0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755,
+                        0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c,
+                        0x01083c, 0x01083f, 0x010855, 0x010857, 0x01089e, 0x0108a7, 0x0108af, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x0108fb, 0x01091b, 0x01091f, 0x010939, 0x01093f, 0x01093f,
+                        0x010980, 0x0109b7, 0x0109bc, 0x0109cf, 0x0109d2, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a40, 0x010a48, 0x010a50, 0x010a58, 0x010a60,
+                        0x010a9f, 0x010ac0, 0x010ae4, 0x010aeb, 0x010af6, 0x010b00, 0x010b35, 0x010b39, 0x010b55, 0x010b58, 0x010b72, 0x010b78, 0x010b91, 0x010b99, 0x010b9c, 0x010ba9, 0x010baf,
+                        0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010cfa, 0x010d23, 0x010d30, 0x010d39, 0x010e60, 0x010e7e, 0x010e80, 0x010ea9, 0x010ead, 0x010ead, 0x010eb0,
+                        0x010eb1, 0x010f00, 0x010f27, 0x010f30, 0x010f45, 0x010f51, 0x010f59, 0x010f70, 0x010f81, 0x010f86, 0x010f89, 0x010fb0, 0x010fcb, 0x010fe0, 0x010ff6, 0x011000, 0x011000,
+                        0x011002, 0x011037, 0x011047, 0x01104d, 0x011052, 0x01106f, 0x011071, 0x011072, 0x011075, 0x011075, 0x011082, 0x0110b2, 0x0110b7, 0x0110b8, 0x0110bb, 0x0110bc, 0x0110be,
+                        0x0110c1, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011103, 0x011126, 0x01112c, 0x01112c, 0x011136, 0x011147, 0x011150, 0x011172, 0x011174, 0x011176, 0x011182, 0x0111b5,
+                        0x0111bf, 0x0111c8, 0x0111cd, 0x0111ce, 0x0111d0, 0x0111df, 0x0111e1, 0x0111f4, 0x011200, 0x011211, 0x011213, 0x01122e, 0x011232, 0x011233, 0x011235, 0x011235, 0x011238,
+                        0x01123d, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a9, 0x0112b0, 0x0112de, 0x0112e0, 0x0112e2, 0x0112f0, 0x0112f9,
+                        0x011302, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x01133f,
+                        0x01133f, 0x011341, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011350, 0x011350, 0x01135d, 0x011363, 0x011400, 0x011437, 0x011440, 0x011441, 0x011445, 0x011445,
+                        0x011447, 0x01145b, 0x01145d, 0x01145d, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114b1, 0x0114b2, 0x0114b9, 0x0114b9, 0x0114bb, 0x0114bc, 0x0114be, 0x0114be, 0x0114c1,
+                        0x0114c1, 0x0114c4, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115ae, 0x0115b0, 0x0115b1, 0x0115b8, 0x0115bb, 0x0115be, 0x0115be, 0x0115c1, 0x0115db, 0x011600, 0x011632,
+                        0x01163b, 0x01163c, 0x01163e, 0x01163e, 0x011641, 0x011644, 0x011650, 0x011659, 0x011660, 0x01166c, 0x011680, 0x0116aa, 0x0116ac, 0x0116ac, 0x0116ae, 0x0116af, 0x0116b6,
+                        0x0116b6, 0x0116b8, 0x0116b9, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x011720, 0x011721, 0x011726, 0x011726, 0x011730, 0x011746, 0x011800, 0x01182e, 0x011838, 0x011838,
+                        0x01183b, 0x01183b, 0x0118a0, 0x0118f2, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x011931, 0x011935, 0x011937,
+                        0x011938, 0x01193d, 0x01193d, 0x01193f, 0x011942, 0x011944, 0x011946, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d3, 0x0119dc, 0x0119df, 0x0119e1, 0x0119e4,
+                        0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a39, 0x011a3a, 0x011a3f, 0x011a46, 0x011a50, 0x011a50, 0x011a57, 0x011a58, 0x011a5c, 0x011a89, 0x011a97, 0x011a97, 0x011a9a,
+                        0x011aa2, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2f, 0x011c3e, 0x011c3e, 0x011c40, 0x011c45, 0x011c50, 0x011c6c, 0x011c70, 0x011c8f, 0x011ca9, 0x011ca9,
+                        0x011cb1, 0x011cb1, 0x011cb4, 0x011cb4, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67,
+                        0x011d68, 0x011d6a, 0x011d8e, 0x011d93, 0x011d94, 0x011d96, 0x011d96, 0x011d98, 0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef2, 0x011ef5, 0x011ef8, 0x011fb0, 0x011fb0,
+                        0x011fc0, 0x011ff1, 0x011fff, 0x012399, 0x012400, 0x01246e, 0x012470, 0x012474, 0x012480, 0x012543, 0x012f90, 0x012ff2, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800,
+                        0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016a6e, 0x016abe, 0x016ac0, 0x016ac9, 0x016ad0, 0x016aed, 0x016af5, 0x016af5, 0x016b00, 0x016b2f, 0x016b37, 0x016b45,
+                        0x016b50, 0x016b59, 0x016b5b, 0x016b61, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e9a, 0x016f00, 0x016f4a, 0x016f50, 0x016f87, 0x016f93, 0x016f9f, 0x016fe0,
+                        0x016fe3, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122,
+                        0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9c, 0x01bc9c, 0x01bc9f,
+                        0x01bc9f, 0x01cf50, 0x01cfc3, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d164, 0x01d166, 0x01d166, 0x01d16a, 0x01d16d, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9,
+                        0x01d1ae, 0x01d1ea, 0x01d200, 0x01d241, 0x01d245, 0x01d245, 0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356, 0x01d360, 0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e,
+                        0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a,
+                        0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8,
+                        0x01d7cb, 0x01d7ce, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d, 0x01da74, 0x01da76, 0x01da83, 0x01da85, 0x01da8b, 0x01df00, 0x01df1e, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d,
+                        0x01e140, 0x01e149, 0x01e14e, 0x01e14f, 0x01e290, 0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e2f0, 0x01e2f9, 0x01e2ff, 0x01e2ff, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed,
+                        0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e8c7, 0x01e8cf, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01e950, 0x01e959, 0x01e95e, 0x01e95f, 0x01ec71, 0x01ecb4,
+                        0x01ed01, 0x01ed3d, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39,
+                        0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54,
+                        0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c,
+                        0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb,
+                        0x01eef0, 0x01eef1, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6,
+                        0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6dd, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773,
+                        0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0,
+                        0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5,
+                        0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740,
+                        0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateGR_EXT() {
         SET_ENCODINGS.put("Gr_Ext", CodePointSet.createNoDedup(0x000300, 0x00036f, 0x000483, 0x000489, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c5, 0x0005c7,
                         0x0005c7, 0x000610, 0x00061a, 0x00064b, 0x00065f, 0x000670, 0x000670, 0x0006d6, 0x0006dc, 0x0006df, 0x0006e4, 0x0006e7, 0x0006e8, 0x0006ea, 0x0006ed, 0x000711, 0x000711,
                         0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f3, 0x0007fd, 0x0007fd, 0x000816, 0x000819, 0x00081b, 0x000823, 0x000825, 0x000827, 0x000829, 0x00082d, 0x000859,
-                        0x00085b, 0x0008d3, 0x0008e1, 0x0008e3, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d, 0x00094d, 0x000951, 0x000957, 0x000962, 0x000963,
-                        0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009be, 0x0009be, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009d7, 0x0009d7, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01,
-                        0x000a02, 0x000a3c, 0x000a3c, 0x000a41, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a82,
-                        0x000abc, 0x000abc, 0x000ac1, 0x000ac5, 0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01, 0x000b3c, 0x000b3c, 0x000b3e,
-                        0x000b3f, 0x000b41, 0x000b44, 0x000b4d, 0x000b4d, 0x000b55, 0x000b57, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bbe, 0x000bbe, 0x000bc0, 0x000bc0, 0x000bcd, 0x000bcd,
-                        0x000bd7, 0x000bd7, 0x000c00, 0x000c00, 0x000c04, 0x000c04, 0x000c3e, 0x000c40, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81,
-                        0x000c81, 0x000cbc, 0x000cbc, 0x000cbf, 0x000cbf, 0x000cc2, 0x000cc2, 0x000cc6, 0x000cc6, 0x000ccc, 0x000ccd, 0x000cd5, 0x000cd6, 0x000ce2, 0x000ce3, 0x000d00, 0x000d01,
-                        0x000d3b, 0x000d3c, 0x000d3e, 0x000d3e, 0x000d41, 0x000d44, 0x000d4d, 0x000d4d, 0x000d57, 0x000d57, 0x000d62, 0x000d63, 0x000d81, 0x000d81, 0x000dca, 0x000dca, 0x000dcf,
-                        0x000dcf, 0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000ddf, 0x000ddf, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc,
-                        0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f71, 0x000f7e, 0x000f80, 0x000f84, 0x000f86, 0x000f87, 0x000f8d,
-                        0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037, 0x001039, 0x00103a, 0x00103d, 0x00103e, 0x001058, 0x001059, 0x00105e, 0x001060,
-                        0x001071, 0x001074, 0x001082, 0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d, 0x00109d, 0x00135d, 0x00135f, 0x001712, 0x001714, 0x001732, 0x001734, 0x001752,
-                        0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd, 0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017dd, 0x0017dd, 0x00180b, 0x00180d, 0x001885, 0x001886,
-                        0x0018a9, 0x0018a9, 0x001920, 0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17, 0x001a18, 0x001a1b, 0x001a1b, 0x001a56, 0x001a56, 0x001a58,
-                        0x001a5e, 0x001a60, 0x001a60, 0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f, 0x001ab0, 0x001ac0, 0x001b00, 0x001b03, 0x001b34, 0x001b3a,
-                        0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80, 0x001b81, 0x001ba2, 0x001ba5, 0x001ba8, 0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6, 0x001be8,
-                        0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33, 0x001c36, 0x001c37, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced,
-                        0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001df9, 0x001dfb, 0x001dff, 0x00200c, 0x00200c, 0x0020d0, 0x0020f0, 0x002cef, 0x002cf1, 0x002d7f, 0x002d7f, 0x002de0,
-                        0x002dff, 0x00302a, 0x00302f, 0x003099, 0x00309a, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a69e, 0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a802, 0x00a802, 0x00a806, 0x00a806,
-                        0x00a80b, 0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d, 0x00a947, 0x00a951, 0x00a980,
-                        0x00a982, 0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9e5, 0x00a9e5, 0x00aa29, 0x00aa2e, 0x00aa31, 0x00aa32, 0x00aa35, 0x00aa36, 0x00aa43, 0x00aa43,
-                        0x00aa4c, 0x00aa4c, 0x00aa7c, 0x00aa7c, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1, 0x00aaec, 0x00aaed, 0x00aaf6,
-                        0x00aaf6, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x00ff9e, 0x00ff9f, 0x0101fd, 0x0101fd,
-                        0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24,
-                        0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x011001, 0x011001, 0x011038, 0x011046, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x011100, 0x011102,
-                        0x011127, 0x01112b, 0x01112d, 0x011134, 0x011173, 0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf, 0x0111cf, 0x01122f, 0x011231, 0x011234,
-                        0x011234, 0x011236, 0x011237, 0x01123e, 0x01123e, 0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c, 0x01133e, 0x01133e, 0x011340, 0x011340,
-                        0x011357, 0x011357, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011438, 0x01143f, 0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b0, 0x0114b0, 0x0114b3,
-                        0x0114b8, 0x0114ba, 0x0114ba, 0x0114bd, 0x0114bd, 0x0114bf, 0x0114c0, 0x0114c2, 0x0114c3, 0x0115af, 0x0115af, 0x0115b2, 0x0115b5, 0x0115bc, 0x0115bd, 0x0115bf, 0x0115c0,
-                        0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d, 0x01163d, 0x01163f, 0x011640, 0x0116ab, 0x0116ab, 0x0116ad, 0x0116ad, 0x0116b0, 0x0116b5, 0x0116b7, 0x0116b7, 0x01171d,
-                        0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b, 0x01182f, 0x011837, 0x011839, 0x01183a, 0x011930, 0x011930, 0x01193b, 0x01193c, 0x01193e, 0x01193e, 0x011943, 0x011943,
-                        0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0, 0x0119e0, 0x011a01, 0x011a0a, 0x011a33, 0x011a38, 0x011a3b, 0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a56, 0x011a59,
-                        0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99, 0x011c30, 0x011c36, 0x011c38, 0x011c3d, 0x011c3f, 0x011c3f, 0x011c92, 0x011ca7, 0x011caa, 0x011cb0, 0x011cb2, 0x011cb3,
-                        0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d90, 0x011d91, 0x011d95, 0x011d95, 0x011d97,
-                        0x011d97, 0x011ef3, 0x011ef4, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f4f, 0x016f4f, 0x016f8f, 0x016f92, 0x016fe4, 0x016fe4, 0x01bc9d, 0x01bc9e, 0x01d165, 0x01d165,
-                        0x01d167, 0x01d169, 0x01d16e, 0x01d172, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75,
-                        0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a,
-                        0x01e130, 0x01e136, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0020, 0x0e007f, 0x0e0100, 0x0e01ef));
+                        0x00085b, 0x000898, 0x00089f, 0x0008ca, 0x0008e1, 0x0008e3, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d, 0x00094d, 0x000951, 0x000957,
+                        0x000962, 0x000963, 0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009be, 0x0009be, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009d7, 0x0009d7, 0x0009e2, 0x0009e3, 0x0009fe,
+                        0x0009fe, 0x000a01, 0x000a02, 0x000a3c, 0x000a3c, 0x000a41, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75,
+                        0x000a81, 0x000a82, 0x000abc, 0x000abc, 0x000ac1, 0x000ac5, 0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01, 0x000b3c,
+                        0x000b3c, 0x000b3e, 0x000b3f, 0x000b41, 0x000b44, 0x000b4d, 0x000b4d, 0x000b55, 0x000b57, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bbe, 0x000bbe, 0x000bc0, 0x000bc0,
+                        0x000bcd, 0x000bcd, 0x000bd7, 0x000bd7, 0x000c00, 0x000c00, 0x000c04, 0x000c04, 0x000c3c, 0x000c3c, 0x000c3e, 0x000c40, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55,
+                        0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c81, 0x000cbc, 0x000cbc, 0x000cbf, 0x000cbf, 0x000cc2, 0x000cc2, 0x000cc6, 0x000cc6, 0x000ccc, 0x000ccd, 0x000cd5, 0x000cd6,
+                        0x000ce2, 0x000ce3, 0x000d00, 0x000d01, 0x000d3b, 0x000d3c, 0x000d3e, 0x000d3e, 0x000d41, 0x000d44, 0x000d4d, 0x000d4d, 0x000d57, 0x000d57, 0x000d62, 0x000d63, 0x000d81,
+                        0x000d81, 0x000dca, 0x000dca, 0x000dcf, 0x000dcf, 0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000ddf, 0x000ddf, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e,
+                        0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f71, 0x000f7e, 0x000f80,
+                        0x000f84, 0x000f86, 0x000f87, 0x000f8d, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037, 0x001039, 0x00103a, 0x00103d, 0x00103e,
+                        0x001058, 0x001059, 0x00105e, 0x001060, 0x001071, 0x001074, 0x001082, 0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d, 0x00109d, 0x00135d, 0x00135f, 0x001712,
+                        0x001714, 0x001732, 0x001733, 0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd, 0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017dd, 0x0017dd,
+                        0x00180b, 0x00180d, 0x00180f, 0x00180f, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920, 0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17,
+                        0x001a18, 0x001a1b, 0x001a1b, 0x001a56, 0x001a56, 0x001a58, 0x001a5e, 0x001a60, 0x001a60, 0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f,
+                        0x001ab0, 0x001ace, 0x001b00, 0x001b03, 0x001b34, 0x001b3a, 0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80, 0x001b81, 0x001ba2, 0x001ba5, 0x001ba8,
+                        0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6, 0x001be8, 0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33, 0x001c36, 0x001c37, 0x001cd0, 0x001cd2,
+                        0x001cd4, 0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001dff, 0x00200c, 0x00200c, 0x0020d0, 0x0020f0, 0x002cef,
+                        0x002cf1, 0x002d7f, 0x002d7f, 0x002de0, 0x002dff, 0x00302a, 0x00302f, 0x003099, 0x00309a, 0x00a66f, 0x00a672, 0x00a674, 0x00a67d, 0x00a69e, 0x00a69f, 0x00a6f0, 0x00a6f1,
+                        0x00a802, 0x00a802, 0x00a806, 0x00a806, 0x00a80b, 0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926,
+                        0x00a92d, 0x00a947, 0x00a951, 0x00a980, 0x00a982, 0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9e5, 0x00a9e5, 0x00aa29, 0x00aa2e, 0x00aa31, 0x00aa32,
+                        0x00aa35, 0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4c, 0x00aa7c, 0x00aa7c, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1,
+                        0x00aac1, 0x00aaec, 0x00aaed, 0x00aaf6, 0x00aaf6, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f,
+                        0x00ff9e, 0x00ff9f, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f,
+                        0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x010f82, 0x010f85, 0x011001, 0x011001, 0x011038, 0x011046, 0x011070, 0x011070,
+                        0x011073, 0x011074, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x0110c2, 0x0110c2, 0x011100, 0x011102, 0x011127, 0x01112b, 0x01112d, 0x011134, 0x011173,
+                        0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf, 0x0111cf, 0x01122f, 0x011231, 0x011234, 0x011234, 0x011236, 0x011237, 0x01123e, 0x01123e,
+                        0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c, 0x01133e, 0x01133e, 0x011340, 0x011340, 0x011357, 0x011357, 0x011366, 0x01136c, 0x011370,
+                        0x011374, 0x011438, 0x01143f, 0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b0, 0x0114b0, 0x0114b3, 0x0114b8, 0x0114ba, 0x0114ba, 0x0114bd, 0x0114bd,
+                        0x0114bf, 0x0114c0, 0x0114c2, 0x0114c3, 0x0115af, 0x0115af, 0x0115b2, 0x0115b5, 0x0115bc, 0x0115bd, 0x0115bf, 0x0115c0, 0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d,
+                        0x01163d, 0x01163f, 0x011640, 0x0116ab, 0x0116ab, 0x0116ad, 0x0116ad, 0x0116b0, 0x0116b5, 0x0116b7, 0x0116b7, 0x01171d, 0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b,
+                        0x01182f, 0x011837, 0x011839, 0x01183a, 0x011930, 0x011930, 0x01193b, 0x01193c, 0x01193e, 0x01193e, 0x011943, 0x011943, 0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0,
+                        0x0119e0, 0x011a01, 0x011a0a, 0x011a33, 0x011a38, 0x011a3b, 0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a56, 0x011a59, 0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99,
+                        0x011c30, 0x011c36, 0x011c38, 0x011c3d, 0x011c3f, 0x011c3f, 0x011c92, 0x011ca7, 0x011caa, 0x011cb0, 0x011cb2, 0x011cb3, 0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a,
+                        0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d90, 0x011d91, 0x011d95, 0x011d95, 0x011d97, 0x011d97, 0x011ef3, 0x011ef4, 0x016af0, 0x016af4,
+                        0x016b30, 0x016b36, 0x016f4f, 0x016f4f, 0x016f8f, 0x016f92, 0x016fe4, 0x016fe4, 0x01bc9d, 0x01bc9e, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d165, 0x01d165, 0x01d167,
+                        0x01d169, 0x01d16e, 0x01d172, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75,
+                        0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e130,
+                        0x01e136, 0x01e2ae, 0x01e2ae, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0020, 0x0e007f, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateHEX() {
@@ -1932,7 +1971,7 @@ private static void populateIDC() {
                         0x000483, 0x000487, 0x00048a, 0x00052f, 0x000531, 0x000556, 0x000559, 0x000559, 0x000560, 0x000588, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4,
                         0x0005c5, 0x0005c7, 0x0005c7, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000610, 0x00061a, 0x000620, 0x000669, 0x00066e, 0x0006d3, 0x0006d5, 0x0006dc, 0x0006df, 0x0006e8,
                         0x0006ea, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x00074a, 0x00074d, 0x0007b1, 0x0007c0, 0x0007f5, 0x0007fa, 0x0007fa, 0x0007fd, 0x0007fd, 0x000800, 0x00082d, 0x000840,
-                        0x00085b, 0x000860, 0x00086a, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x0008d3, 0x0008e1, 0x0008e3, 0x000963, 0x000966, 0x00096f, 0x000971, 0x000983, 0x000985, 0x00098c,
+                        0x00085b, 0x000860, 0x00086a, 0x000870, 0x000887, 0x000889, 0x00088e, 0x000898, 0x0008e1, 0x0008e3, 0x000963, 0x000966, 0x00096f, 0x000971, 0x000983, 0x000985, 0x00098c,
                         0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bc, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009ce, 0x0009d7,
                         0x0009d7, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e3, 0x0009e6, 0x0009f1, 0x0009fc, 0x0009fc, 0x0009fe, 0x0009fe, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10,
                         0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3c, 0x000a3c, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b,
@@ -1942,77 +1981,80 @@ private static void populateIDC() {
                         0x000b3c, 0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4d, 0x000b55, 0x000b57, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b63, 0x000b66, 0x000b6f, 0x000b71, 0x000b71, 0x000b82,
                         0x000b83, 0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa,
                         0x000bae, 0x000bb9, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7, 0x000be6, 0x000bef, 0x000c00, 0x000c0c, 0x000c0e,
-                        0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c60, 0x000c63,
-                        0x000c66, 0x000c6f, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc, 0x000cc4, 0x000cc6,
-                        0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c, 0x000d0e, 0x000d10,
-                        0x000d12, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63, 0x000d66, 0x000d6f, 0x000d7a, 0x000d7f, 0x000d81, 0x000d83, 0x000d85,
-                        0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8, 0x000ddf,
-                        0x000de6, 0x000def, 0x000df2, 0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e4e, 0x000e50, 0x000e59, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c,
-                        0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ec8, 0x000ecd, 0x000ed0, 0x000ed9, 0x000edc, 0x000edf, 0x000f00, 0x000f00,
-                        0x000f18, 0x000f19, 0x000f20, 0x000f29, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f47, 0x000f49, 0x000f6c, 0x000f71, 0x000f84, 0x000f86,
-                        0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x001000, 0x001049, 0x001050, 0x00109d, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa,
-                        0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2,
-                        0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x00135d, 0x00135f,
-                        0x001369, 0x001371, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016ee,
-                        0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001714, 0x001720, 0x001734, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017d3,
-                        0x0017d7, 0x0017d7, 0x0017dc, 0x0017dd, 0x0017e0, 0x0017e9, 0x00180b, 0x00180d, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
+                        0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3c, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d,
+                        0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc,
+                        0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c,
+                        0x000d0e, 0x000d10, 0x000d12, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63, 0x000d66, 0x000d6f, 0x000d7a, 0x000d7f, 0x000d81,
+                        0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6,
+                        0x000dd8, 0x000ddf, 0x000de6, 0x000def, 0x000df2, 0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e4e, 0x000e50, 0x000e59, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86,
+                        0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ec8, 0x000ecd, 0x000ed0, 0x000ed9, 0x000edc, 0x000edf,
+                        0x000f00, 0x000f00, 0x000f18, 0x000f19, 0x000f20, 0x000f29, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f47, 0x000f49, 0x000f6c, 0x000f71,
+                        0x000f84, 0x000f86, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x001000, 0x001049, 0x001050, 0x00109d, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd,
+                        0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290,
+                        0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a,
+                        0x00135d, 0x00135f, 0x001369, 0x001371, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0,
+                        0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x001715, 0x00171f, 0x001734, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017d3,
+                        0x0017d7, 0x0017d7, 0x0017dc, 0x0017dd, 0x0017e0, 0x0017e9, 0x00180b, 0x00180d, 0x00180f, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
                         0x00191e, 0x001920, 0x00192b, 0x001930, 0x00193b, 0x001946, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x001a00, 0x001a1b,
-                        0x001a20, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a89, 0x001a90, 0x001a99, 0x001aa7, 0x001aa7, 0x001ab0, 0x001abd, 0x001abf, 0x001ac0, 0x001b00, 0x001b4b, 0x001b50,
+                        0x001a20, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a89, 0x001a90, 0x001a99, 0x001aa7, 0x001aa7, 0x001ab0, 0x001abd, 0x001abf, 0x001ace, 0x001b00, 0x001b4c, 0x001b50,
                         0x001b59, 0x001b6b, 0x001b73, 0x001b80, 0x001bf3, 0x001c00, 0x001c37, 0x001c40, 0x001c49, 0x001c4d, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf,
-                        0x001cd0, 0x001cd2, 0x001cd4, 0x001cfa, 0x001d00, 0x001df9, 0x001dfb, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59,
-                        0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc,
-                        0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x00203f, 0x002040, 0x002054, 0x002054, 0x002071, 0x002071, 0x00207f,
-                        0x00207f, 0x002090, 0x00209c, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1, 0x0020e5, 0x0020f0, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115,
-                        0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160,
-                        0x002188, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67,
-                        0x002d6f, 0x002d6f, 0x002d7f, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0,
-                        0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002dff, 0x003005, 0x003007, 0x003021, 0x00302f, 0x003031, 0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x003099, 0x00309f,
-                        0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a000,
-                        0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a62b, 0x00a640, 0x00a66f, 0x00a674, 0x00a67d, 0x00a67f, 0x00a6f1, 0x00a717, 0x00a71f, 0x00a722, 0x00a788,
-                        0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a827, 0x00a82c, 0x00a82c, 0x00a840, 0x00a873, 0x00a880, 0x00a8c5, 0x00a8d0, 0x00a8d9, 0x00a8e0, 0x00a8f7, 0x00a8fb,
-                        0x00a8fb, 0x00a8fd, 0x00a92d, 0x00a930, 0x00a953, 0x00a960, 0x00a97c, 0x00a980, 0x00a9c0, 0x00a9cf, 0x00a9d9, 0x00a9e0, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d,
-                        0x00aa50, 0x00aa59, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf6, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11,
-                        0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00abec, 0x00abed, 0x00abf0, 0x00abf9, 0x00ac00, 0x00d7a3,
-                        0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a, 0x00fb36, 0x00fb38,
-                        0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfb,
-                        0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x00fe33, 0x00fe34, 0x00fe4d, 0x00fe4f, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00ff10, 0x00ff19, 0x00ff21, 0x00ff3a, 0x00ff3f,
-                        0x00ff3f, 0x00ff41, 0x00ff5a, 0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026,
-                        0x010028, 0x01003a, 0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x0101fd, 0x0101fd, 0x010280, 0x01029c, 0x0102a0,
-                        0x0102d0, 0x0102e0, 0x0102e0, 0x010300, 0x01031f, 0x01032d, 0x01034a, 0x010350, 0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5,
-                        0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760,
-                        0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e,
-                        0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06, 0x010a0c,
-                        0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae6,
-                        0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d27, 0x010d30,
-                        0x010d39, 0x010e80, 0x010ea9, 0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f50, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6,
-                        0x011000, 0x011046, 0x011066, 0x01106f, 0x01107f, 0x0110ba, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134, 0x011136, 0x01113f, 0x011144, 0x011147, 0x011150,
-                        0x011173, 0x011176, 0x011176, 0x011180, 0x0111c4, 0x0111c9, 0x0111cc, 0x0111ce, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x011237, 0x01123e, 0x01123e,
-                        0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112ea, 0x0112f0, 0x0112f9, 0x011300, 0x011303, 0x011305,
-                        0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d,
-                        0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01144a, 0x011450, 0x011459, 0x01145e, 0x011461, 0x011480,
-                        0x0114c5, 0x0114c7, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115c0, 0x0115d8, 0x0115dd, 0x011600, 0x011640, 0x011644, 0x011644, 0x011650, 0x011659,
-                        0x011680, 0x0116b8, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011739, 0x011800, 0x01183a, 0x0118a0, 0x0118e9, 0x0118ff, 0x011906, 0x011909,
-                        0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938, 0x01193b, 0x011943, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7,
-                        0x0119da, 0x0119e1, 0x0119e3, 0x0119e4, 0x011a00, 0x011a3e, 0x011a47, 0x011a47, 0x011a50, 0x011a99, 0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a,
-                        0x011c36, 0x011c38, 0x011c40, 0x011c50, 0x011c59, 0x011c72, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36,
-                        0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d47, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93,
-                        0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef6, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646,
-                        0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016ad0, 0x016aed, 0x016af0, 0x016af4, 0x016b00, 0x016b36, 0x016b40, 0x016b43, 0x016b50, 0x016b59, 0x016b63,
-                        0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x016ff0, 0x016ff1,
-                        0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70,
-                        0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9d, 0x01bc9e, 0x01d165, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad,
-                        0x01d242, 0x01d244, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb,
-                        0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544,
-                        0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736,
-                        0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c,
-                        0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026,
-                        0x01e02a, 0x01e100, 0x01e12c, 0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2f9, 0x01e800, 0x01e8c4, 0x01e8d0, 0x01e8d6, 0x01e900, 0x01e94b,
-                        0x01e950, 0x01e959, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39,
-                        0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54,
-                        0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c,
-                        0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb,
-                        0x01fbf0, 0x01fbf9, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a, 0x0e0100,
-                        0x0e01ef));
+                        0x001cd0, 0x001cd2, 0x001cd4, 0x001cfa, 0x001d00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b,
+                        0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3,
+                        0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x00203f, 0x002040, 0x002054, 0x002054, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090,
+                        0x00209c, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1, 0x0020e5, 0x0020f0, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d,
+                        0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00,
+                        0x002ce4, 0x002ceb, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d7f, 0x002d96, 0x002da0, 0x002da6,
+                        0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002dff, 0x003005,
+                        0x003007, 0x003021, 0x00302f, 0x003031, 0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x003099, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f,
+                        0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a62b, 0x00a640,
+                        0x00a66f, 0x00a674, 0x00a67d, 0x00a67f, 0x00a6f1, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9,
+                        0x00a7f2, 0x00a827, 0x00a82c, 0x00a82c, 0x00a840, 0x00a873, 0x00a880, 0x00a8c5, 0x00a8d0, 0x00a8d9, 0x00a8e0, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a92d, 0x00a930,
+                        0x00a953, 0x00a960, 0x00a97c, 0x00a980, 0x00a9c0, 0x00a9cf, 0x00a9d9, 0x00a9e0, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa50, 0x00aa59, 0x00aa60, 0x00aa76,
+                        0x00aa7a, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf6, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28,
+                        0x00ab2e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00abec, 0x00abed, 0x00abf0, 0x00abf9, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb,
+                        0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40,
+                        0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfb, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f,
+                        0x00fe33, 0x00fe34, 0x00fe4d, 0x00fe4f, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x00ff10, 0x00ff19, 0x00ff21, 0x00ff3a, 0x00ff3f, 0x00ff3f, 0x00ff41, 0x00ff5a, 0x00ff66,
+                        0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d,
+                        0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x0101fd, 0x0101fd, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e0, 0x0102e0, 0x010300,
+                        0x01031f, 0x01032d, 0x01034a, 0x010350, 0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9,
+                        0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597,
+                        0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0,
+                        0x0107b2, 0x0107ba, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880,
+                        0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06,
+                        0x010a0c, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9,
+                        0x010ae6, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d27,
+                        0x010d30, 0x010d39, 0x010e80, 0x010ea9, 0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f50, 0x010f70, 0x010f85, 0x010fb0,
+                        0x010fc4, 0x010fe0, 0x010ff6, 0x011000, 0x011046, 0x011066, 0x011075, 0x01107f, 0x0110ba, 0x0110c2, 0x0110c2, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134,
+                        0x011136, 0x01113f, 0x011144, 0x011147, 0x011150, 0x011173, 0x011176, 0x011176, 0x011180, 0x0111c4, 0x0111c9, 0x0111cc, 0x0111ce, 0x0111da, 0x0111dc, 0x0111dc, 0x011200,
+                        0x011211, 0x011213, 0x011237, 0x01123e, 0x01123e, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112ea,
+                        0x0112f0, 0x0112f9, 0x011300, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b,
+                        0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01144a,
+                        0x011450, 0x011459, 0x01145e, 0x011461, 0x011480, 0x0114c5, 0x0114c7, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115c0, 0x0115d8, 0x0115dd, 0x011600,
+                        0x011640, 0x011644, 0x011644, 0x011650, 0x011659, 0x011680, 0x0116b8, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011739, 0x011740, 0x011746,
+                        0x011800, 0x01183a, 0x0118a0, 0x0118e9, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938, 0x01193b,
+                        0x011943, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119e1, 0x0119e3, 0x0119e4, 0x011a00, 0x011a3e, 0x011a47, 0x011a47, 0x011a50, 0x011a99,
+                        0x011a9d, 0x011a9d, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c40, 0x011c50, 0x011c59, 0x011c72, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9,
+                        0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d47, 0x011d50, 0x011d59, 0x011d60, 0x011d65,
+                        0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef6, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400,
+                        0x01246e, 0x012480, 0x012543, 0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016a70, 0x016abe,
+                        0x016ac0, 0x016ac9, 0x016ad0, 0x016aed, 0x016af0, 0x016af4, 0x016b00, 0x016b36, 0x016b40, 0x016b43, 0x016b50, 0x016b59, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40,
+                        0x016e7f, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5,
+                        0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00,
+                        0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9d, 0x01bc9e, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d165, 0x01d169, 0x01d16d, 0x01d172,
+                        0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5,
+                        0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c,
+                        0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc,
+                        0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb,
+                        0x01d7ce, 0x01d7ff, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01df00, 0x01df1e, 0x01e000,
+                        0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c, 0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14e,
+                        0x01e290, 0x01e2ae, 0x01e2c0, 0x01e2f9, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e8d0, 0x01e8d6, 0x01e900,
+                        0x01e94b, 0x01e950, 0x01e959, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37,
+                        0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54,
+                        0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a,
+                        0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab,
+                        0x01eebb, 0x01fbf0, 0x01fbf9, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a,
+                        0x0e0100, 0x0e01ef));
     }
 
     private static void populateIDS() {
@@ -2021,38 +2063,38 @@ private static void populateIDS() {
                         0x00037f, 0x000386, 0x000386, 0x000388, 0x00038a, 0x00038c, 0x00038c, 0x00038e, 0x0003a1, 0x0003a3, 0x0003f5, 0x0003f7, 0x000481, 0x00048a, 0x00052f, 0x000531, 0x000556,
                         0x000559, 0x000559, 0x000560, 0x000588, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000620, 0x00064a, 0x00066e, 0x00066f, 0x000671, 0x0006d3, 0x0006d5, 0x0006d5, 0x0006e5,
                         0x0006e6, 0x0006ee, 0x0006ef, 0x0006fa, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1, 0x0007ca, 0x0007ea,
-                        0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000840, 0x000858, 0x000860, 0x00086a, 0x0008a0,
-                        0x0008b4, 0x0008b6, 0x0008c7, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985, 0x00098c, 0x00098f, 0x000990,
-                        0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e1, 0x0009f0,
-                        0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39,
-                        0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5,
-                        0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a, 0x000b30,
-                        0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85, 0x000b8a, 0x000b8e,
-                        0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bd0, 0x000bd0,
-                        0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c60, 0x000c61, 0x000c80, 0x000c80, 0x000c85,
-                        0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cde, 0x000cde, 0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2,
-                        0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f, 0x000d61, 0x000d7a, 0x000d7f, 0x000d85,
-                        0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e33, 0x000e40, 0x000e46, 0x000e81, 0x000e82,
-                        0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6,
-                        0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a, 0x00103f, 0x00103f, 0x001050, 0x001055,
-                        0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd,
-                        0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d,
-                        0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318,
-                        0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8,
-                        0x001700, 0x00170c, 0x00170e, 0x001711, 0x001720, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017d7, 0x0017d7, 0x0017dc,
-                        0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab,
-                        0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4b, 0x001b83, 0x001ba0, 0x001bae, 0x001baf, 0x001bba,
-                        0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3,
-                        0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59,
-                        0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc,
-                        0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002102,
-                        0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139,
-                        0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2,
-                        0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae,
-                        0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003005, 0x003007, 0x003021, 0x003029, 0x003031,
-                        0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x00309b, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf,
-                        0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a000, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640,
-                        0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0, 0x00a6ef, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a801, 0x00a803, 0x00a805,
+                        0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000840, 0x000858, 0x000860, 0x00086a, 0x000870,
+                        0x000887, 0x000889, 0x00088e, 0x0008a0, 0x0008c9, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985, 0x00098c,
+                        0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df,
+                        0x0009e1, 0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36,
+                        0x000a38, 0x000a39, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2,
+                        0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28,
+                        0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85,
+                        0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9,
+                        0x000bd0, 0x000bd0, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60,
+                        0x000c61, 0x000c80, 0x000c80, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cdd, 0x000cde,
+                        0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2, 0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f,
+                        0x000d61, 0x000d7a, 0x000d7f, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e33,
+                        0x000e40, 0x000e46, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd,
+                        0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a,
+                        0x00103f, 0x00103f, 0x001050, 0x001055, 0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x0010a0,
+                        0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d,
+                        0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8,
+                        0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a,
+                        0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x001711, 0x00171f, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017d7,
+                        0x0017d7, 0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950, 0x00196d, 0x001970, 0x001974,
+                        0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4c, 0x001b83, 0x001ba0, 0x001bae,
+                        0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9, 0x001cec,
+                        0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50,
+                        0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4,
+                        0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090,
+                        0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128,
+                        0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00,
+                        0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6,
+                        0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003005, 0x003007, 0x003021, 0x003029, 0x003031, 0x003035, 0x003038,
+                        0x00303c, 0x003041, 0x003096, 0x00309b, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff,
+                        0x003400, 0x004dbf, 0x004e00, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640, 0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0,
+                        0x00a6ef, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a801, 0x00a803, 0x00a805,
                         0x00a807, 0x00a80a, 0x00a80c, 0x00a822, 0x00a840, 0x00a873, 0x00a882, 0x00a8b3, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a8fe, 0x00a90a, 0x00a925, 0x00a930,
                         0x00a946, 0x00a960, 0x00a97c, 0x00a984, 0x00a9b2, 0x00a9cf, 0x00a9cf, 0x00a9e0, 0x00a9e4, 0x00a9e6, 0x00a9ef, 0x00a9fa, 0x00a9fe, 0x00aa00, 0x00aa28, 0x00aa40, 0x00aa42,
                         0x00aa44, 0x00aa4b, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aa7a, 0x00aa7e, 0x00aaaf, 0x00aab1, 0x00aab1, 0x00aab5, 0x00aab6, 0x00aab9, 0x00aabd, 0x00aac0, 0x00aac0, 0x00aac2,
@@ -2063,33 +2105,36 @@ private static void populateIDS() {
                         0x00ff5a, 0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a,
                         0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x010300, 0x01031f, 0x01032d,
                         0x01034a, 0x010350, 0x010375, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb,
-                        0x010500, 0x010527, 0x010530, 0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837,
-                        0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939,
-                        0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0,
-                        0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2,
-                        0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011003,
-                        0x011037, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2,
-                        0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f,
-                        0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339,
-                        0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7,
-                        0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011800, 0x01182b,
-                        0x0118a0, 0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0,
-                        0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89,
-                        0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b,
-                        0x011d30, 0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399,
-                        0x012400, 0x01246e, 0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40,
+                        0x010500, 0x010527, 0x010530, 0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3,
+                        0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010800, 0x010805,
+                        0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4,
+                        0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35,
+                        0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00,
+                        0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45,
+                        0x010f70, 0x010f81, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011071, 0x011072, 0x011075, 0x011075, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103,
+                        0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc,
+                        0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305,
+                        0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361,
+                        0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600,
+                        0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011740, 0x011746, 0x011800, 0x01182b, 0x0118a0, 0x0118df, 0x0118ff, 0x011906,
+                        0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1,
+                        0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89, 0x011a9d, 0x011a9d, 0x011ab0, 0x011af8,
+                        0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46, 0x011d60,
+                        0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543,
+                        0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a70, 0x016abe, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40,
                         0x016b43, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f50, 0x016f50, 0x016f93, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3,
-                        0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70,
-                        0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac,
-                        0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b,
-                        0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714,
-                        0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e100, 0x01e12c, 0x01e137,
-                        0x01e13d, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2eb, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22,
-                        0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49,
-                        0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d,
-                        0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80,
-                        0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1,
-                        0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                        0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164,
+                        0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f,
+                        0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d,
+                        0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0,
+                        0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa,
+                        0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df1e, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e290, 0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e7e0, 0x01e7e6,
+                        0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21,
+                        0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47,
+                        0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d,
+                        0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e,
+                        0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820,
+                        0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateIDSB() {
@@ -2102,8 +2147,8 @@ private static void populateIDST() {
 
     private static void populateIDEO() {
         SET_ENCODINGS.put("Ideo",
-                        CodePointSet.createNoDedup(0x003006, 0x003007, 0x003021, 0x003029, 0x003038, 0x00303a, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x016fe4,
-                                        0x016fe4, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b170, 0x01b2fb, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820,
+                        CodePointSet.createNoDedup(0x003006, 0x003007, 0x003021, 0x003029, 0x003038, 0x00303a, 0x003400, 0x004dbf, 0x004e00, 0x009fff, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x016fe4,
+                                        0x016fe4, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b170, 0x01b2fb, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820,
                                         0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
@@ -2168,7 +2213,7 @@ private static void populateLOWER() {
                         0x001f30, 0x001f37, 0x001f40, 0x001f45, 0x001f50, 0x001f57, 0x001f60, 0x001f67, 0x001f70, 0x001f7d, 0x001f80, 0x001f87, 0x001f90, 0x001f97, 0x001fa0, 0x001fa7, 0x001fb0,
                         0x001fb4, 0x001fb6, 0x001fb7, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fc7, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fd7, 0x001fe0, 0x001fe7, 0x001ff2, 0x001ff4,
                         0x001ff6, 0x001ff7, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x00210a, 0x00210a, 0x00210e, 0x00210f, 0x002113, 0x002113, 0x00212f, 0x00212f, 0x002134,
-                        0x002134, 0x002139, 0x002139, 0x00213c, 0x00213d, 0x002146, 0x002149, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5e,
+                        0x002134, 0x002139, 0x002139, 0x00213c, 0x00213d, 0x002146, 0x002149, 0x00214e, 0x00214e, 0x002170, 0x00217f, 0x002184, 0x002184, 0x0024d0, 0x0024e9, 0x002c30, 0x002c5f,
                         0x002c61, 0x002c61, 0x002c65, 0x002c66, 0x002c68, 0x002c68, 0x002c6a, 0x002c6a, 0x002c6c, 0x002c6c, 0x002c71, 0x002c71, 0x002c73, 0x002c74, 0x002c76, 0x002c7d, 0x002c81,
                         0x002c81, 0x002c83, 0x002c83, 0x002c85, 0x002c85, 0x002c87, 0x002c87, 0x002c89, 0x002c89, 0x002c8b, 0x002c8b, 0x002c8d, 0x002c8d, 0x002c8f, 0x002c8f, 0x002c91, 0x002c91,
                         0x002c93, 0x002c93, 0x002c95, 0x002c95, 0x002c97, 0x002c97, 0x002c99, 0x002c99, 0x002c9b, 0x002c9b, 0x002c9d, 0x002c9d, 0x002c9f, 0x002c9f, 0x002ca1, 0x002ca1, 0x002ca3,
@@ -2188,12 +2233,14 @@ private static void populateLOWER() {
                         0x00a76b, 0x00a76b, 0x00a76d, 0x00a76d, 0x00a76f, 0x00a778, 0x00a77a, 0x00a77a, 0x00a77c, 0x00a77c, 0x00a77f, 0x00a77f, 0x00a781, 0x00a781, 0x00a783, 0x00a783, 0x00a785,
                         0x00a785, 0x00a787, 0x00a787, 0x00a78c, 0x00a78c, 0x00a78e, 0x00a78e, 0x00a791, 0x00a791, 0x00a793, 0x00a795, 0x00a797, 0x00a797, 0x00a799, 0x00a799, 0x00a79b, 0x00a79b,
                         0x00a79d, 0x00a79d, 0x00a79f, 0x00a79f, 0x00a7a1, 0x00a7a1, 0x00a7a3, 0x00a7a3, 0x00a7a5, 0x00a7a5, 0x00a7a7, 0x00a7a7, 0x00a7a9, 0x00a7a9, 0x00a7af, 0x00a7af, 0x00a7b5,
-                        0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca,
-                        0x00a7f6, 0x00a7f6, 0x00a7f8, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428,
-                        0x01044f, 0x0104d8, 0x0104fb, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433, 0x01d44e, 0x01d454, 0x01d456, 0x01d467, 0x01d482, 0x01d49b,
-                        0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e, 0x01d537, 0x01d552, 0x01d56b, 0x01d586, 0x01d59f, 0x01d5ba,
-                        0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656, 0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6e1, 0x01d6fc, 0x01d714, 0x01d716, 0x01d71b,
-                        0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788, 0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7c9, 0x01d7cb, 0x01d7cb, 0x01e922, 0x01e943));
+                        0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c1, 0x00a7c1, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8,
+                        0x00a7ca, 0x00a7ca, 0x00a7d1, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d5, 0x00a7d7, 0x00a7d7, 0x00a7d9, 0x00a7d9, 0x00a7f6, 0x00a7f6, 0x00a7f8, 0x00a7fa, 0x00ab30,
+                        0x00ab5a, 0x00ab5c, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010597, 0x0105a1,
+                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433, 0x01d44e, 0x01d454, 0x01d456,
+                        0x01d467, 0x01d482, 0x01d49b, 0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e, 0x01d537, 0x01d552, 0x01d56b,
+                        0x01d586, 0x01d59f, 0x01d5ba, 0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656, 0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6e1, 0x01d6fc,
+                        0x01d714, 0x01d716, 0x01d71b, 0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788, 0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7c9, 0x01d7cb, 0x01d7cb,
+                        0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e922, 0x01e943));
     }
 
     private static void populateMATH() {
@@ -2249,46 +2296,45 @@ private static void populateRADICAL() {
     }
 
     private static void populateSD() {
-        SET_ENCODINGS.put("SD",
-                        CodePointSet.createNoDedup(0x000069, 0x00006a, 0x00012f, 0x00012f, 0x000249, 0x000249, 0x000268, 0x000268, 0x00029d, 0x00029d, 0x0002b2, 0x0002b2, 0x0003f3, 0x0003f3, 0x000456,
-                                        0x000456, 0x000458, 0x000458, 0x001d62, 0x001d62, 0x001d96, 0x001d96, 0x001da4, 0x001da4, 0x001da8, 0x001da8, 0x001e2d, 0x001e2d, 0x001ecb, 0x001ecb, 0x002071,
-                                        0x002071, 0x002148, 0x002149, 0x002c7c, 0x002c7c, 0x01d422, 0x01d423, 0x01d456, 0x01d457, 0x01d48a, 0x01d48b, 0x01d4be, 0x01d4bf, 0x01d4f2, 0x01d4f3, 0x01d526,
-                                        0x01d527, 0x01d55a, 0x01d55b, 0x01d58e, 0x01d58f, 0x01d5c2, 0x01d5c3, 0x01d5f6, 0x01d5f7, 0x01d62a, 0x01d62b, 0x01d65e, 0x01d65f, 0x01d692, 0x01d693));
+        SET_ENCODINGS.put("SD", CodePointSet.createNoDedup(0x000069, 0x00006a, 0x00012f, 0x00012f, 0x000249, 0x000249, 0x000268, 0x000268, 0x00029d, 0x00029d, 0x0002b2, 0x0002b2, 0x0003f3, 0x0003f3,
+                        0x000456, 0x000456, 0x000458, 0x000458, 0x001d62, 0x001d62, 0x001d96, 0x001d96, 0x001da4, 0x001da4, 0x001da8, 0x001da8, 0x001e2d, 0x001e2d, 0x001ecb, 0x001ecb, 0x002071,
+                        0x002071, 0x002148, 0x002149, 0x002c7c, 0x002c7c, 0x01d422, 0x01d423, 0x01d456, 0x01d457, 0x01d48a, 0x01d48b, 0x01d4be, 0x01d4bf, 0x01d4f2, 0x01d4f3, 0x01d526, 0x01d527,
+                        0x01d55a, 0x01d55b, 0x01d58e, 0x01d58f, 0x01d5c2, 0x01d5c3, 0x01d5f6, 0x01d5f7, 0x01d62a, 0x01d62b, 0x01d65e, 0x01d65f, 0x01d692, 0x01d693, 0x01df1a, 0x01df1a));
     }
 
     private static void populateSTERM() {
         SET_ENCODINGS.put("STerm",
-                        CodePointSet.createNoDedup(0x000021, 0x000021, 0x00002e, 0x00002e, 0x00003f, 0x00003f, 0x000589, 0x000589, 0x00061e, 0x00061f, 0x0006d4, 0x0006d4, 0x000700, 0x000702, 0x0007f9,
+                        CodePointSet.createNoDedup(0x000021, 0x000021, 0x00002e, 0x00002e, 0x00003f, 0x00003f, 0x000589, 0x000589, 0x00061d, 0x00061f, 0x0006d4, 0x0006d4, 0x000700, 0x000702, 0x0007f9,
                                         0x0007f9, 0x000837, 0x000837, 0x000839, 0x000839, 0x00083d, 0x00083e, 0x000964, 0x000965, 0x00104a, 0x00104b, 0x001362, 0x001362, 0x001367, 0x001368, 0x00166e,
-                                        0x00166e, 0x001735, 0x001736, 0x001803, 0x001803, 0x001809, 0x001809, 0x001944, 0x001945, 0x001aa8, 0x001aab, 0x001b5a, 0x001b5b, 0x001b5e, 0x001b5f, 0x001c3b,
-                                        0x001c3c, 0x001c7e, 0x001c7f, 0x00203c, 0x00203d, 0x002047, 0x002049, 0x002e2e, 0x002e2e, 0x002e3c, 0x002e3c, 0x003002, 0x003002, 0x00a4ff, 0x00a4ff, 0x00a60e,
-                                        0x00a60f, 0x00a6f3, 0x00a6f3, 0x00a6f7, 0x00a6f7, 0x00a876, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a92f, 0x00a92f, 0x00a9c8, 0x00a9c9, 0x00aa5d, 0x00aa5f, 0x00aaf0,
-                                        0x00aaf1, 0x00abeb, 0x00abeb, 0x00fe52, 0x00fe52, 0x00fe56, 0x00fe57, 0x00ff01, 0x00ff01, 0x00ff0e, 0x00ff0e, 0x00ff1f, 0x00ff1f, 0x00ff61, 0x00ff61, 0x010a56,
-                                        0x010a57, 0x010f55, 0x010f59, 0x011047, 0x011048, 0x0110be, 0x0110c1, 0x011141, 0x011143, 0x0111c5, 0x0111c6, 0x0111cd, 0x0111cd, 0x0111de, 0x0111df, 0x011238,
-                                        0x011239, 0x01123b, 0x01123c, 0x0112a9, 0x0112a9, 0x01144b, 0x01144c, 0x0115c2, 0x0115c3, 0x0115c9, 0x0115d7, 0x011641, 0x011642, 0x01173c, 0x01173e, 0x011944,
-                                        0x011944, 0x011946, 0x011946, 0x011a42, 0x011a43, 0x011a9b, 0x011a9c, 0x011c41, 0x011c42, 0x011ef7, 0x011ef8, 0x016a6e, 0x016a6f, 0x016af5, 0x016af5, 0x016b37,
-                                        0x016b38, 0x016b44, 0x016b44, 0x016e98, 0x016e98, 0x01bc9f, 0x01bc9f, 0x01da88, 0x01da88));
+                                        0x00166e, 0x001735, 0x001736, 0x001803, 0x001803, 0x001809, 0x001809, 0x001944, 0x001945, 0x001aa8, 0x001aab, 0x001b5a, 0x001b5b, 0x001b5e, 0x001b5f, 0x001b7d,
+                                        0x001b7e, 0x001c3b, 0x001c3c, 0x001c7e, 0x001c7f, 0x00203c, 0x00203d, 0x002047, 0x002049, 0x002e2e, 0x002e2e, 0x002e3c, 0x002e3c, 0x002e53, 0x002e54, 0x003002,
+                                        0x003002, 0x00a4ff, 0x00a4ff, 0x00a60e, 0x00a60f, 0x00a6f3, 0x00a6f3, 0x00a6f7, 0x00a6f7, 0x00a876, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a92f, 0x00a92f, 0x00a9c8,
+                                        0x00a9c9, 0x00aa5d, 0x00aa5f, 0x00aaf0, 0x00aaf1, 0x00abeb, 0x00abeb, 0x00fe52, 0x00fe52, 0x00fe56, 0x00fe57, 0x00ff01, 0x00ff01, 0x00ff0e, 0x00ff0e, 0x00ff1f,
+                                        0x00ff1f, 0x00ff61, 0x00ff61, 0x010a56, 0x010a57, 0x010f55, 0x010f59, 0x010f86, 0x010f89, 0x011047, 0x011048, 0x0110be, 0x0110c1, 0x011141, 0x011143, 0x0111c5,
+                                        0x0111c6, 0x0111cd, 0x0111cd, 0x0111de, 0x0111df, 0x011238, 0x011239, 0x01123b, 0x01123c, 0x0112a9, 0x0112a9, 0x01144b, 0x01144c, 0x0115c2, 0x0115c3, 0x0115c9,
+                                        0x0115d7, 0x011641, 0x011642, 0x01173c, 0x01173e, 0x011944, 0x011944, 0x011946, 0x011946, 0x011a42, 0x011a43, 0x011a9b, 0x011a9c, 0x011c41, 0x011c42, 0x011ef7,
+                                        0x011ef8, 0x016a6e, 0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b38, 0x016b44, 0x016b44, 0x016e98, 0x016e98, 0x01bc9f, 0x01bc9f, 0x01da88, 0x01da88));
     }
 
     private static void populateTERM() {
         SET_ENCODINGS.put("Term", CodePointSet.createNoDedup(0x000021, 0x000021, 0x00002c, 0x00002c, 0x00002e, 0x00002e, 0x00003a, 0x00003b, 0x00003f, 0x00003f, 0x00037e, 0x00037e, 0x000387, 0x000387,
-                        0x000589, 0x000589, 0x0005c3, 0x0005c3, 0x00060c, 0x00060c, 0x00061b, 0x00061b, 0x00061e, 0x00061f, 0x0006d4, 0x0006d4, 0x000700, 0x00070a, 0x00070c, 0x00070c, 0x0007f8,
+                        0x000589, 0x000589, 0x0005c3, 0x0005c3, 0x00060c, 0x00060c, 0x00061b, 0x00061b, 0x00061d, 0x00061f, 0x0006d4, 0x0006d4, 0x000700, 0x00070a, 0x00070c, 0x00070c, 0x0007f8,
                         0x0007f9, 0x000830, 0x00083e, 0x00085e, 0x00085e, 0x000964, 0x000965, 0x000e5a, 0x000e5b, 0x000f08, 0x000f08, 0x000f0d, 0x000f12, 0x00104a, 0x00104b, 0x001361, 0x001368,
                         0x00166e, 0x00166e, 0x0016eb, 0x0016ed, 0x001735, 0x001736, 0x0017d4, 0x0017d6, 0x0017da, 0x0017da, 0x001802, 0x001805, 0x001808, 0x001809, 0x001944, 0x001945, 0x001aa8,
-                        0x001aab, 0x001b5a, 0x001b5b, 0x001b5d, 0x001b5f, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x00203c, 0x00203d, 0x002047, 0x002049, 0x002e2e, 0x002e2e, 0x002e3c, 0x002e3c,
-                        0x002e41, 0x002e41, 0x002e4c, 0x002e4c, 0x002e4e, 0x002e4f, 0x003001, 0x003002, 0x00a4fe, 0x00a4ff, 0x00a60d, 0x00a60f, 0x00a6f3, 0x00a6f7, 0x00a876, 0x00a877, 0x00a8ce,
-                        0x00a8cf, 0x00a92f, 0x00a92f, 0x00a9c7, 0x00a9c9, 0x00aa5d, 0x00aa5f, 0x00aadf, 0x00aadf, 0x00aaf0, 0x00aaf1, 0x00abeb, 0x00abeb, 0x00fe50, 0x00fe52, 0x00fe54, 0x00fe57,
-                        0x00ff01, 0x00ff01, 0x00ff0c, 0x00ff0c, 0x00ff0e, 0x00ff0e, 0x00ff1a, 0x00ff1b, 0x00ff1f, 0x00ff1f, 0x00ff61, 0x00ff61, 0x00ff64, 0x00ff64, 0x01039f, 0x01039f, 0x0103d0,
-                        0x0103d0, 0x010857, 0x010857, 0x01091f, 0x01091f, 0x010a56, 0x010a57, 0x010af0, 0x010af5, 0x010b3a, 0x010b3f, 0x010b99, 0x010b9c, 0x010f55, 0x010f59, 0x011047, 0x01104d,
-                        0x0110be, 0x0110c1, 0x011141, 0x011143, 0x0111c5, 0x0111c6, 0x0111cd, 0x0111cd, 0x0111de, 0x0111df, 0x011238, 0x01123c, 0x0112a9, 0x0112a9, 0x01144b, 0x01144d, 0x01145a,
-                        0x01145b, 0x0115c2, 0x0115c5, 0x0115c9, 0x0115d7, 0x011641, 0x011642, 0x01173c, 0x01173e, 0x011944, 0x011944, 0x011946, 0x011946, 0x011a42, 0x011a43, 0x011a9b, 0x011a9c,
-                        0x011aa1, 0x011aa2, 0x011c41, 0x011c43, 0x011c71, 0x011c71, 0x011ef7, 0x011ef8, 0x012470, 0x012474, 0x016a6e, 0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b39, 0x016b44,
-                        0x016b44, 0x016e97, 0x016e98, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8a));
+                        0x001aab, 0x001b5a, 0x001b5b, 0x001b5d, 0x001b5f, 0x001b7d, 0x001b7e, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x00203c, 0x00203d, 0x002047, 0x002049, 0x002e2e, 0x002e2e,
+                        0x002e3c, 0x002e3c, 0x002e41, 0x002e41, 0x002e4c, 0x002e4c, 0x002e4e, 0x002e4f, 0x002e53, 0x002e54, 0x003001, 0x003002, 0x00a4fe, 0x00a4ff, 0x00a60d, 0x00a60f, 0x00a6f3,
+                        0x00a6f7, 0x00a876, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a92f, 0x00a92f, 0x00a9c7, 0x00a9c9, 0x00aa5d, 0x00aa5f, 0x00aadf, 0x00aadf, 0x00aaf0, 0x00aaf1, 0x00abeb, 0x00abeb,
+                        0x00fe50, 0x00fe52, 0x00fe54, 0x00fe57, 0x00ff01, 0x00ff01, 0x00ff0c, 0x00ff0c, 0x00ff0e, 0x00ff0e, 0x00ff1a, 0x00ff1b, 0x00ff1f, 0x00ff1f, 0x00ff61, 0x00ff61, 0x00ff64,
+                        0x00ff64, 0x01039f, 0x01039f, 0x0103d0, 0x0103d0, 0x010857, 0x010857, 0x01091f, 0x01091f, 0x010a56, 0x010a57, 0x010af0, 0x010af5, 0x010b3a, 0x010b3f, 0x010b99, 0x010b9c,
+                        0x010f55, 0x010f59, 0x010f86, 0x010f89, 0x011047, 0x01104d, 0x0110be, 0x0110c1, 0x011141, 0x011143, 0x0111c5, 0x0111c6, 0x0111cd, 0x0111cd, 0x0111de, 0x0111df, 0x011238,
+                        0x01123c, 0x0112a9, 0x0112a9, 0x01144b, 0x01144d, 0x01145a, 0x01145b, 0x0115c2, 0x0115c5, 0x0115c9, 0x0115d7, 0x011641, 0x011642, 0x01173c, 0x01173e, 0x011944, 0x011944,
+                        0x011946, 0x011946, 0x011a42, 0x011a43, 0x011a9b, 0x011a9c, 0x011aa1, 0x011aa2, 0x011c41, 0x011c43, 0x011c71, 0x011c71, 0x011ef7, 0x011ef8, 0x012470, 0x012474, 0x016a6e,
+                        0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b39, 0x016b44, 0x016b44, 0x016e97, 0x016e98, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8a));
     }
 
     private static void populateUIDEO() {
-        SET_ENCODINGS.put("UIdeo", CodePointSet.createNoDedup(0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00fa0e, 0x00fa0f, 0x00fa11, 0x00fa11, 0x00fa13, 0x00fa14, 0x00fa1f, 0x00fa1f, 0x00fa21,
-                        0x00fa21, 0x00fa23, 0x00fa24, 0x00fa27, 0x00fa29, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x030000, 0x03134a));
+        SET_ENCODINGS.put("UIdeo", CodePointSet.createNoDedup(0x003400, 0x004dbf, 0x004e00, 0x009fff, 0x00fa0e, 0x00fa0f, 0x00fa11, 0x00fa11, 0x00fa13, 0x00fa14, 0x00fa1f, 0x00fa1f, 0x00fa21,
+                        0x00fa21, 0x00fa23, 0x00fa24, 0x00fa27, 0x00fa29, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x030000, 0x03134a));
     }
 
     private static void populateUPPER() {
@@ -2343,7 +2389,7 @@ private static void populateUPPER() {
                         0x001f48, 0x001f4d, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f5f, 0x001f68, 0x001f6f, 0x001fb8, 0x001fbb, 0x001fc8, 0x001fcb, 0x001fd8,
                         0x001fdb, 0x001fe8, 0x001fec, 0x001ff8, 0x001ffb, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210b, 0x00210d, 0x002110, 0x002112, 0x002115, 0x002115, 0x002119, 0x00211d,
                         0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x002130, 0x002133, 0x00213e, 0x00213f, 0x002145, 0x002145, 0x002160, 0x00216f, 0x002183,
-                        0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2e, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70,
+                        0x002183, 0x0024b6, 0x0024cf, 0x002c00, 0x002c2f, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70,
                         0x002c72, 0x002c72, 0x002c75, 0x002c75, 0x002c7e, 0x002c80, 0x002c82, 0x002c82, 0x002c84, 0x002c84, 0x002c86, 0x002c86, 0x002c88, 0x002c88, 0x002c8a, 0x002c8a, 0x002c8c,
                         0x002c8c, 0x002c8e, 0x002c8e, 0x002c90, 0x002c90, 0x002c92, 0x002c92, 0x002c94, 0x002c94, 0x002c96, 0x002c96, 0x002c98, 0x002c98, 0x002c9a, 0x002c9a, 0x002c9c, 0x002c9c,
                         0x002c9e, 0x002c9e, 0x002ca0, 0x002ca0, 0x002ca2, 0x002ca2, 0x002ca4, 0x002ca4, 0x002ca6, 0x002ca6, 0x002ca8, 0x002ca8, 0x002caa, 0x002caa, 0x002cac, 0x002cac, 0x002cae,
@@ -2362,16 +2408,17 @@ private static void populateUPPER() {
                         0x00a76a, 0x00a76c, 0x00a76c, 0x00a76e, 0x00a76e, 0x00a779, 0x00a779, 0x00a77b, 0x00a77b, 0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782, 0x00a782, 0x00a784, 0x00a784,
                         0x00a786, 0x00a786, 0x00a78b, 0x00a78b, 0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792, 0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798, 0x00a79a, 0x00a79a, 0x00a79c,
                         0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0, 0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4, 0x00a7a6, 0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa, 0x00a7ae, 0x00a7b0, 0x00a7b4,
-                        0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7f5,
-                        0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01d400, 0x01d419, 0x01d434, 0x01d44d,
-                        0x01d468, 0x01d481, 0x01d49c, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b5, 0x01d4d0, 0x01d4e9, 0x01d504,
-                        0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d538, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550,
-                        0x01d56c, 0x01d585, 0x01d5a0, 0x01d5b9, 0x01d5d4, 0x01d5ed, 0x01d608, 0x01d621, 0x01d63c, 0x01d655, 0x01d670, 0x01d689, 0x01d6a8, 0x01d6c0, 0x01d6e2, 0x01d6fa, 0x01d71c,
-                        0x01d734, 0x01d756, 0x01d76e, 0x01d790, 0x01d7a8, 0x01d7ca, 0x01d7ca, 0x01e900, 0x01e921, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
+                        0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8, 0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c0, 0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9,
+                        0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6, 0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f5, 0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a,
+                        0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01d400, 0x01d419, 0x01d434, 0x01d44d, 0x01d468,
+                        0x01d481, 0x01d49c, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b5, 0x01d4d0, 0x01d4e9, 0x01d504, 0x01d505,
+                        0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d538, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d56c,
+                        0x01d585, 0x01d5a0, 0x01d5b9, 0x01d5d4, 0x01d5ed, 0x01d608, 0x01d621, 0x01d63c, 0x01d655, 0x01d670, 0x01d689, 0x01d6a8, 0x01d6c0, 0x01d6e2, 0x01d6fa, 0x01d71c, 0x01d734,
+                        0x01d756, 0x01d76e, 0x01d790, 0x01d7a8, 0x01d7ca, 0x01d7ca, 0x01e900, 0x01e921, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
     }
 
     private static void populateVS() {
-        SET_ENCODINGS.put("VS", CodePointSet.createNoDedup(0x00180b, 0x00180d, 0x00fe00, 0x00fe0f, 0x0e0100, 0x0e01ef));
+        SET_ENCODINGS.put("VS", CodePointSet.createNoDedup(0x00180b, 0x00180d, 0x00180f, 0x00180f, 0x00fe00, 0x00fe0f, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateWSPACE() {
@@ -2386,7 +2433,7 @@ private static void populateXIDC() {
                         0x000483, 0x000487, 0x00048a, 0x00052f, 0x000531, 0x000556, 0x000559, 0x000559, 0x000560, 0x000588, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4,
                         0x0005c5, 0x0005c7, 0x0005c7, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000610, 0x00061a, 0x000620, 0x000669, 0x00066e, 0x0006d3, 0x0006d5, 0x0006dc, 0x0006df, 0x0006e8,
                         0x0006ea, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x00074a, 0x00074d, 0x0007b1, 0x0007c0, 0x0007f5, 0x0007fa, 0x0007fa, 0x0007fd, 0x0007fd, 0x000800, 0x00082d, 0x000840,
-                        0x00085b, 0x000860, 0x00086a, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x0008d3, 0x0008e1, 0x0008e3, 0x000963, 0x000966, 0x00096f, 0x000971, 0x000983, 0x000985, 0x00098c,
+                        0x00085b, 0x000860, 0x00086a, 0x000870, 0x000887, 0x000889, 0x00088e, 0x000898, 0x0008e1, 0x0008e3, 0x000963, 0x000966, 0x00096f, 0x000971, 0x000983, 0x000985, 0x00098c,
                         0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bc, 0x0009c4, 0x0009c7, 0x0009c8, 0x0009cb, 0x0009ce, 0x0009d7,
                         0x0009d7, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e3, 0x0009e6, 0x0009f1, 0x0009fc, 0x0009fc, 0x0009fe, 0x0009fe, 0x000a01, 0x000a03, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10,
                         0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39, 0x000a3c, 0x000a3c, 0x000a3e, 0x000a42, 0x000a47, 0x000a48, 0x000a4b,
@@ -2396,77 +2443,80 @@ private static void populateXIDC() {
                         0x000b3c, 0x000b44, 0x000b47, 0x000b48, 0x000b4b, 0x000b4d, 0x000b55, 0x000b57, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b63, 0x000b66, 0x000b6f, 0x000b71, 0x000b71, 0x000b82,
                         0x000b83, 0x000b85, 0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa,
                         0x000bae, 0x000bb9, 0x000bbe, 0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcd, 0x000bd0, 0x000bd0, 0x000bd7, 0x000bd7, 0x000be6, 0x000bef, 0x000c00, 0x000c0c, 0x000c0e,
-                        0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c60, 0x000c63,
-                        0x000c66, 0x000c6f, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc, 0x000cc4, 0x000cc6,
-                        0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c, 0x000d0e, 0x000d10,
-                        0x000d12, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63, 0x000d66, 0x000d6f, 0x000d7a, 0x000d7f, 0x000d81, 0x000d83, 0x000d85,
-                        0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6, 0x000dd8, 0x000ddf,
-                        0x000de6, 0x000def, 0x000df2, 0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e4e, 0x000e50, 0x000e59, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c,
-                        0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ec8, 0x000ecd, 0x000ed0, 0x000ed9, 0x000edc, 0x000edf, 0x000f00, 0x000f00,
-                        0x000f18, 0x000f19, 0x000f20, 0x000f29, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f47, 0x000f49, 0x000f6c, 0x000f71, 0x000f84, 0x000f86,
-                        0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x001000, 0x001049, 0x001050, 0x00109d, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa,
-                        0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2,
-                        0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x00135d, 0x00135f,
-                        0x001369, 0x001371, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016ee,
-                        0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001714, 0x001720, 0x001734, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017d3,
-                        0x0017d7, 0x0017d7, 0x0017dc, 0x0017dd, 0x0017e0, 0x0017e9, 0x00180b, 0x00180d, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
+                        0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3c, 0x000c44, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d,
+                        0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c80, 0x000c83, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc,
+                        0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x000d00, 0x000d0c,
+                        0x000d0e, 0x000d10, 0x000d12, 0x000d44, 0x000d46, 0x000d48, 0x000d4a, 0x000d4e, 0x000d54, 0x000d57, 0x000d5f, 0x000d63, 0x000d66, 0x000d6f, 0x000d7a, 0x000d7f, 0x000d81,
+                        0x000d83, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000dca, 0x000dca, 0x000dcf, 0x000dd4, 0x000dd6, 0x000dd6,
+                        0x000dd8, 0x000ddf, 0x000de6, 0x000def, 0x000df2, 0x000df3, 0x000e01, 0x000e3a, 0x000e40, 0x000e4e, 0x000e50, 0x000e59, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86,
+                        0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000ec8, 0x000ecd, 0x000ed0, 0x000ed9, 0x000edc, 0x000edf,
+                        0x000f00, 0x000f00, 0x000f18, 0x000f19, 0x000f20, 0x000f29, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f3e, 0x000f47, 0x000f49, 0x000f6c, 0x000f71,
+                        0x000f84, 0x000f86, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x001000, 0x001049, 0x001050, 0x00109d, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd,
+                        0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290,
+                        0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a,
+                        0x00135d, 0x00135f, 0x001369, 0x001371, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0,
+                        0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x001715, 0x00171f, 0x001734, 0x001740, 0x001753, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001772, 0x001773, 0x001780, 0x0017d3,
+                        0x0017d7, 0x0017d7, 0x0017dc, 0x0017dd, 0x0017e0, 0x0017e9, 0x00180b, 0x00180d, 0x00180f, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
                         0x00191e, 0x001920, 0x00192b, 0x001930, 0x00193b, 0x001946, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x0019d0, 0x0019da, 0x001a00, 0x001a1b,
-                        0x001a20, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a89, 0x001a90, 0x001a99, 0x001aa7, 0x001aa7, 0x001ab0, 0x001abd, 0x001abf, 0x001ac0, 0x001b00, 0x001b4b, 0x001b50,
+                        0x001a20, 0x001a5e, 0x001a60, 0x001a7c, 0x001a7f, 0x001a89, 0x001a90, 0x001a99, 0x001aa7, 0x001aa7, 0x001ab0, 0x001abd, 0x001abf, 0x001ace, 0x001b00, 0x001b4c, 0x001b50,
                         0x001b59, 0x001b6b, 0x001b73, 0x001b80, 0x001bf3, 0x001c00, 0x001c37, 0x001c40, 0x001c49, 0x001c4d, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf,
-                        0x001cd0, 0x001cd2, 0x001cd4, 0x001cfa, 0x001d00, 0x001df9, 0x001dfb, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59,
-                        0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc,
-                        0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x00203f, 0x002040, 0x002054, 0x002054, 0x002071, 0x002071, 0x00207f,
-                        0x00207f, 0x002090, 0x00209c, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1, 0x0020e5, 0x0020f0, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115,
-                        0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160,
-                        0x002188, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67,
-                        0x002d6f, 0x002d6f, 0x002d7f, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0,
-                        0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002dff, 0x003005, 0x003007, 0x003021, 0x00302f, 0x003031, 0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x003099, 0x00309a,
-                        0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00,
-                        0x009ffc, 0x00a000, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a62b, 0x00a640, 0x00a66f, 0x00a674, 0x00a67d, 0x00a67f, 0x00a6f1, 0x00a717, 0x00a71f,
-                        0x00a722, 0x00a788, 0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a827, 0x00a82c, 0x00a82c, 0x00a840, 0x00a873, 0x00a880, 0x00a8c5, 0x00a8d0, 0x00a8d9, 0x00a8e0,
-                        0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a92d, 0x00a930, 0x00a953, 0x00a960, 0x00a97c, 0x00a980, 0x00a9c0, 0x00a9cf, 0x00a9d9, 0x00a9e0, 0x00a9fe, 0x00aa00, 0x00aa36,
-                        0x00aa40, 0x00aa4d, 0x00aa50, 0x00aa59, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf6, 0x00ab01, 0x00ab06, 0x00ab09,
-                        0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00abec, 0x00abed, 0x00abf0, 0x00abf9,
-                        0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6, 0x00d7cb, 0x00d7fb, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a,
-                        0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e, 0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fc5d, 0x00fc64, 0x00fd3d, 0x00fd50, 0x00fd8f,
-                        0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdf9, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x00fe33, 0x00fe34, 0x00fe4d, 0x00fe4f, 0x00fe71, 0x00fe71, 0x00fe73, 0x00fe73, 0x00fe77,
-                        0x00fe77, 0x00fe79, 0x00fe79, 0x00fe7b, 0x00fe7b, 0x00fe7d, 0x00fe7d, 0x00fe7f, 0x00fefc, 0x00ff10, 0x00ff19, 0x00ff21, 0x00ff3a, 0x00ff3f, 0x00ff3f, 0x00ff41, 0x00ff5a,
-                        0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c,
-                        0x01003d, 0x01003f, 0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x0101fd, 0x0101fd, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e0, 0x0102e0,
-                        0x010300, 0x01031f, 0x01032d, 0x01034a, 0x010350, 0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104a0,
-                        0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805,
-                        0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4,
-                        0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a13, 0x010a15, 0x010a17,
-                        0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae6, 0x010b00, 0x010b35, 0x010b40,
-                        0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d27, 0x010d30, 0x010d39, 0x010e80, 0x010ea9,
-                        0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f50, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011000, 0x011046, 0x011066,
-                        0x01106f, 0x01107f, 0x0110ba, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134, 0x011136, 0x01113f, 0x011144, 0x011147, 0x011150, 0x011173, 0x011176, 0x011176,
-                        0x011180, 0x0111c4, 0x0111c9, 0x0111cc, 0x0111ce, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x011237, 0x01123e, 0x01123e, 0x011280, 0x011286, 0x011288,
-                        0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112ea, 0x0112f0, 0x0112f9, 0x011300, 0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310,
-                        0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011350, 0x011350, 0x011357,
-                        0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01144a, 0x011450, 0x011459, 0x01145e, 0x011461, 0x011480, 0x0114c5, 0x0114c7, 0x0114c7,
-                        0x0114d0, 0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115c0, 0x0115d8, 0x0115dd, 0x011600, 0x011640, 0x011644, 0x011644, 0x011650, 0x011659, 0x011680, 0x0116b8, 0x0116c0,
-                        0x0116c9, 0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011739, 0x011800, 0x01183a, 0x0118a0, 0x0118e9, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913,
-                        0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938, 0x01193b, 0x011943, 0x011950, 0x011959, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119e1, 0x0119e3,
-                        0x0119e4, 0x011a00, 0x011a3e, 0x011a47, 0x011a47, 0x011a50, 0x011a99, 0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c40,
-                        0x011c50, 0x011c59, 0x011c72, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c,
-                        0x011d3d, 0x011d3f, 0x011d47, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d98, 0x011da0, 0x011da9,
-                        0x011ee0, 0x011ef6, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40,
-                        0x016a5e, 0x016a60, 0x016a69, 0x016ad0, 0x016aed, 0x016af0, 0x016af4, 0x016b00, 0x016b36, 0x016b40, 0x016b43, 0x016b50, 0x016b59, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f,
-                        0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800,
-                        0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88,
-                        0x01bc90, 0x01bc99, 0x01bc9d, 0x01bc9e, 0x01d165, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01d400,
-                        0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3,
-                        0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a,
-                        0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e,
-                        0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84,
-                        0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c,
-                        0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2f9, 0x01e800, 0x01e8c4, 0x01e8d0, 0x01e8d6, 0x01e900, 0x01e94b, 0x01e950, 0x01e959, 0x01ee00,
-                        0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b,
-                        0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59,
-                        0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77,
-                        0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01fbf0, 0x01fbf9, 0x020000,
-                        0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a, 0x0e0100, 0x0e01ef));
+                        0x001cd0, 0x001cd2, 0x001cd4, 0x001cfa, 0x001d00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59, 0x001f59, 0x001f5b,
+                        0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3,
+                        0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x00203f, 0x002040, 0x002054, 0x002054, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090,
+                        0x00209c, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1, 0x0020e5, 0x0020f0, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d,
+                        0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00,
+                        0x002ce4, 0x002ceb, 0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d7f, 0x002d96, 0x002da0, 0x002da6,
+                        0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x002de0, 0x002dff, 0x003005,
+                        0x003007, 0x003021, 0x00302f, 0x003031, 0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x003099, 0x00309a, 0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff,
+                        0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610,
+                        0x00a62b, 0x00a640, 0x00a66f, 0x00a674, 0x00a67d, 0x00a67f, 0x00a6f1, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3,
+                        0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a827, 0x00a82c, 0x00a82c, 0x00a840, 0x00a873, 0x00a880, 0x00a8c5, 0x00a8d0, 0x00a8d9, 0x00a8e0, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd,
+                        0x00a92d, 0x00a930, 0x00a953, 0x00a960, 0x00a97c, 0x00a980, 0x00a9c0, 0x00a9cf, 0x00a9d9, 0x00a9e0, 0x00a9fe, 0x00aa00, 0x00aa36, 0x00aa40, 0x00aa4d, 0x00aa50, 0x00aa59,
+                        0x00aa60, 0x00aa76, 0x00aa7a, 0x00aac2, 0x00aadb, 0x00aadd, 0x00aae0, 0x00aaef, 0x00aaf2, 0x00aaf6, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20,
+                        0x00ab26, 0x00ab28, 0x00ab2e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab69, 0x00ab70, 0x00abea, 0x00abec, 0x00abed, 0x00abf0, 0x00abf9, 0x00ac00, 0x00d7a3, 0x00d7b0, 0x00d7c6,
+                        0x00d7cb, 0x00d7fb, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00fb1d, 0x00fb28, 0x00fb2a, 0x00fb36, 0x00fb38, 0x00fb3c, 0x00fb3e,
+                        0x00fb3e, 0x00fb40, 0x00fb41, 0x00fb43, 0x00fb44, 0x00fb46, 0x00fbb1, 0x00fbd3, 0x00fc5d, 0x00fc64, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdf9,
+                        0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x00fe33, 0x00fe34, 0x00fe4d, 0x00fe4f, 0x00fe71, 0x00fe71, 0x00fe73, 0x00fe73, 0x00fe77, 0x00fe77, 0x00fe79, 0x00fe79, 0x00fe7b,
+                        0x00fe7b, 0x00fe7d, 0x00fe7d, 0x00fe7f, 0x00fefc, 0x00ff10, 0x00ff19, 0x00ff21, 0x00ff3a, 0x00ff3f, 0x00ff3f, 0x00ff41, 0x00ff5a, 0x00ff66, 0x00ffbe, 0x00ffc2, 0x00ffc7,
+                        0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d, 0x01003f, 0x01004d, 0x010050,
+                        0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x0101fd, 0x0101fd, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x0102e0, 0x0102e0, 0x010300, 0x01031f, 0x01032d, 0x01034a,
+                        0x010350, 0x01037a, 0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104a0, 0x0104a9, 0x0104b0, 0x0104d3, 0x0104d8,
+                        0x0104fb, 0x010500, 0x010527, 0x010530, 0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1,
+                        0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010800,
+                        0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2,
+                        0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a13, 0x010a15,
+                        0x010a17, 0x010a19, 0x010a35, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae6, 0x010b00, 0x010b35,
+                        0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d27, 0x010d30, 0x010d39, 0x010e80,
+                        0x010ea9, 0x010eab, 0x010eac, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f50, 0x010f70, 0x010f85, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6,
+                        0x011000, 0x011046, 0x011066, 0x011075, 0x01107f, 0x0110ba, 0x0110c2, 0x0110c2, 0x0110d0, 0x0110e8, 0x0110f0, 0x0110f9, 0x011100, 0x011134, 0x011136, 0x01113f, 0x011144,
+                        0x011147, 0x011150, 0x011173, 0x011176, 0x011176, 0x011180, 0x0111c4, 0x0111c9, 0x0111cc, 0x0111ce, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x011237,
+                        0x01123e, 0x01123e, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112ea, 0x0112f0, 0x0112f9, 0x011300,
+                        0x011303, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133b, 0x011344, 0x011347, 0x011348,
+                        0x01134b, 0x01134d, 0x011350, 0x011350, 0x011357, 0x011357, 0x01135d, 0x011363, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011400, 0x01144a, 0x011450, 0x011459, 0x01145e,
+                        0x011461, 0x011480, 0x0114c5, 0x0114c7, 0x0114c7, 0x0114d0, 0x0114d9, 0x011580, 0x0115b5, 0x0115b8, 0x0115c0, 0x0115d8, 0x0115dd, 0x011600, 0x011640, 0x011644, 0x011644,
+                        0x011650, 0x011659, 0x011680, 0x0116b8, 0x0116c0, 0x0116c9, 0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011739, 0x011740, 0x011746, 0x011800, 0x01183a, 0x0118a0,
+                        0x0118e9, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x011935, 0x011937, 0x011938, 0x01193b, 0x011943, 0x011950, 0x011959,
+                        0x0119a0, 0x0119a7, 0x0119aa, 0x0119d7, 0x0119da, 0x0119e1, 0x0119e3, 0x0119e4, 0x011a00, 0x011a3e, 0x011a47, 0x011a47, 0x011a50, 0x011a99, 0x011a9d, 0x011a9d, 0x011ab0,
+                        0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c36, 0x011c38, 0x011c40, 0x011c50, 0x011c59, 0x011c72, 0x011c8f, 0x011c92, 0x011ca7, 0x011ca9, 0x011cb6, 0x011d00, 0x011d06,
+                        0x011d08, 0x011d09, 0x011d0b, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d47, 0x011d50, 0x011d59, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a,
+                        0x011d8e, 0x011d90, 0x011d91, 0x011d93, 0x011d98, 0x011da0, 0x011da9, 0x011ee0, 0x011ef6, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543,
+                        0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a60, 0x016a69, 0x016a70, 0x016abe, 0x016ac0, 0x016ac9, 0x016ad0,
+                        0x016aed, 0x016af0, 0x016af4, 0x016b00, 0x016b36, 0x016b40, 0x016b43, 0x016b50, 0x016b59, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a,
+                        0x016f4f, 0x016f87, 0x016f8f, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe4, 0x016ff0, 0x016ff1, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01aff0,
+                        0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c,
+                        0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01bc9d, 0x01bc9e, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d165, 0x01d169, 0x01d16d, 0x01d172, 0x01d17b, 0x01d182, 0x01d185,
+                        0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac,
+                        0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b,
+                        0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714,
+                        0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01da00,
+                        0x01da36, 0x01da3b, 0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01df00, 0x01df1e, 0x01e000, 0x01e006, 0x01e008, 0x01e018,
+                        0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a, 0x01e100, 0x01e12c, 0x01e130, 0x01e13d, 0x01e140, 0x01e149, 0x01e14e, 0x01e14e, 0x01e290, 0x01e2ae, 0x01e2c0,
+                        0x01e2f9, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e8d0, 0x01e8d6, 0x01e900, 0x01e94b, 0x01e950, 0x01e959,
+                        0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b,
+                        0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57,
+                        0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74,
+                        0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01fbf0, 0x01fbf9,
+                        0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateXIDS() {
@@ -2475,38 +2525,38 @@ private static void populateXIDS() {
                         0x00037f, 0x000386, 0x000386, 0x000388, 0x00038a, 0x00038c, 0x00038c, 0x00038e, 0x0003a1, 0x0003a3, 0x0003f5, 0x0003f7, 0x000481, 0x00048a, 0x00052f, 0x000531, 0x000556,
                         0x000559, 0x000559, 0x000560, 0x000588, 0x0005d0, 0x0005ea, 0x0005ef, 0x0005f2, 0x000620, 0x00064a, 0x00066e, 0x00066f, 0x000671, 0x0006d3, 0x0006d5, 0x0006d5, 0x0006e5,
                         0x0006e6, 0x0006ee, 0x0006ef, 0x0006fa, 0x0006fc, 0x0006ff, 0x0006ff, 0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1, 0x0007ca, 0x0007ea,
-                        0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000840, 0x000858, 0x000860, 0x00086a, 0x0008a0,
-                        0x0008b4, 0x0008b6, 0x0008c7, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985, 0x00098c, 0x00098f, 0x000990,
-                        0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e1, 0x0009f0,
-                        0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39,
-                        0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5,
-                        0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a, 0x000b30,
-                        0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85, 0x000b8a, 0x000b8e,
-                        0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bd0, 0x000bd0,
-                        0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c60, 0x000c61, 0x000c80, 0x000c80, 0x000c85,
-                        0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cde, 0x000cde, 0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2,
-                        0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f, 0x000d61, 0x000d7a, 0x000d7f, 0x000d85,
-                        0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e32, 0x000e40, 0x000e46, 0x000e81, 0x000e82,
-                        0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb2, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6,
-                        0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a, 0x00103f, 0x00103f, 0x001050, 0x001055,
-                        0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x0010a0, 0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd,
-                        0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d,
-                        0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318,
-                        0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8,
-                        0x001700, 0x00170c, 0x00170e, 0x001711, 0x001720, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017d7, 0x0017d7, 0x0017dc,
-                        0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab,
-                        0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4b, 0x001b83, 0x001ba0, 0x001bae, 0x001baf, 0x001bba,
-                        0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3,
-                        0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50, 0x001f57, 0x001f59,
-                        0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4, 0x001fc6, 0x001fcc,
-                        0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002102,
-                        0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x002139,
-                        0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002c60, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2,
-                        0x002cf3, 0x002d00, 0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae,
-                        0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003005, 0x003007, 0x003021, 0x003029, 0x003031,
-                        0x003035, 0x003038, 0x00303c, 0x003041, 0x003096, 0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf,
-                        0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a000, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640,
-                        0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0, 0x00a6ef, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a801, 0x00a803, 0x00a805,
+                        0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x000800, 0x000815, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000840, 0x000858, 0x000860, 0x00086a, 0x000870,
+                        0x000887, 0x000889, 0x00088e, 0x0008a0, 0x0008c9, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000971, 0x000980, 0x000985, 0x00098c,
+                        0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df,
+                        0x0009e1, 0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36,
+                        0x000a38, 0x000a39, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2,
+                        0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28,
+                        0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85,
+                        0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9,
+                        0x000bd0, 0x000bd0, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60,
+                        0x000c61, 0x000c80, 0x000c80, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cdd, 0x000cde,
+                        0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2, 0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f,
+                        0x000d61, 0x000d7a, 0x000d7f, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e32,
+                        0x000e40, 0x000e46, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb2, 0x000ebd,
+                        0x000ebd, 0x000ec0, 0x000ec4, 0x000ec6, 0x000ec6, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a,
+                        0x00103f, 0x00103f, 0x001050, 0x001055, 0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x0010a0,
+                        0x0010c5, 0x0010c7, 0x0010c7, 0x0010cd, 0x0010cd, 0x0010d0, 0x0010fa, 0x0010fc, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d,
+                        0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8,
+                        0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x0013a0, 0x0013f5, 0x0013f8, 0x0013fd, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a,
+                        0x0016a0, 0x0016ea, 0x0016ee, 0x0016f8, 0x001700, 0x001711, 0x00171f, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3, 0x0017d7,
+                        0x0017d7, 0x0017dc, 0x0017dc, 0x001820, 0x001878, 0x001880, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950, 0x00196d, 0x001970, 0x001974,
+                        0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001aa7, 0x001aa7, 0x001b05, 0x001b33, 0x001b45, 0x001b4c, 0x001b83, 0x001ba0, 0x001bae,
+                        0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c7d, 0x001c80, 0x001c88, 0x001c90, 0x001cba, 0x001cbd, 0x001cbf, 0x001ce9, 0x001cec,
+                        0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa, 0x001cfa, 0x001d00, 0x001dbf, 0x001e00, 0x001f15, 0x001f18, 0x001f1d, 0x001f20, 0x001f45, 0x001f48, 0x001f4d, 0x001f50,
+                        0x001f57, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f7d, 0x001f80, 0x001fb4, 0x001fb6, 0x001fbc, 0x001fbe, 0x001fbe, 0x001fc2, 0x001fc4,
+                        0x001fc6, 0x001fcc, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fdb, 0x001fe0, 0x001fec, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ffc, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090,
+                        0x00209c, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210a, 0x002113, 0x002115, 0x002115, 0x002118, 0x00211d, 0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128,
+                        0x00212a, 0x002139, 0x00213c, 0x00213f, 0x002145, 0x002149, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c00, 0x002ce4, 0x002ceb, 0x002cee, 0x002cf2, 0x002cf3, 0x002d00,
+                        0x002d25, 0x002d27, 0x002d27, 0x002d2d, 0x002d2d, 0x002d30, 0x002d67, 0x002d6f, 0x002d6f, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6,
+                        0x002db8, 0x002dbe, 0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003005, 0x003007, 0x003021, 0x003029, 0x003031, 0x003035, 0x003038,
+                        0x00303c, 0x003041, 0x003096, 0x00309d, 0x00309f, 0x0030a1, 0x0030fa, 0x0030fc, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff,
+                        0x003400, 0x004dbf, 0x004e00, 0x00a48c, 0x00a4d0, 0x00a4fd, 0x00a500, 0x00a60c, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a640, 0x00a66e, 0x00a67f, 0x00a69d, 0x00a6a0,
+                        0x00a6ef, 0x00a717, 0x00a71f, 0x00a722, 0x00a788, 0x00a78b, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a801, 0x00a803, 0x00a805,
                         0x00a807, 0x00a80a, 0x00a80c, 0x00a822, 0x00a840, 0x00a873, 0x00a882, 0x00a8b3, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a8fe, 0x00a90a, 0x00a925, 0x00a930,
                         0x00a946, 0x00a960, 0x00a97c, 0x00a984, 0x00a9b2, 0x00a9cf, 0x00a9cf, 0x00a9e0, 0x00a9e4, 0x00a9e6, 0x00a9ef, 0x00a9fa, 0x00a9fe, 0x00aa00, 0x00aa28, 0x00aa40, 0x00aa42,
                         0x00aa44, 0x00aa4b, 0x00aa60, 0x00aa76, 0x00aa7a, 0x00aa7a, 0x00aa7e, 0x00aaaf, 0x00aab1, 0x00aab1, 0x00aab5, 0x00aab6, 0x00aab9, 0x00aabd, 0x00aac0, 0x00aac0, 0x00aac2,
@@ -2518,33 +2568,36 @@ private static void populateXIDS() {
                         0x00ffc2, 0x00ffc7, 0x00ffca, 0x00ffcf, 0x00ffd2, 0x00ffd7, 0x00ffda, 0x00ffdc, 0x010000, 0x01000b, 0x01000d, 0x010026, 0x010028, 0x01003a, 0x01003c, 0x01003d, 0x01003f,
                         0x01004d, 0x010050, 0x01005d, 0x010080, 0x0100fa, 0x010140, 0x010174, 0x010280, 0x01029c, 0x0102a0, 0x0102d0, 0x010300, 0x01031f, 0x01032d, 0x01034a, 0x010350, 0x010375,
                         0x010380, 0x01039d, 0x0103a0, 0x0103c3, 0x0103c8, 0x0103cf, 0x0103d1, 0x0103d5, 0x010400, 0x01049d, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010500, 0x010527, 0x010530,
-                        0x010563, 0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c,
-                        0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be,
-                        0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4,
-                        0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x010d00, 0x010d23, 0x010e80,
-                        0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010fb0, 0x010fc4, 0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011083, 0x0110af,
-                        0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da,
-                        0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8,
-                        0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350,
-                        0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae,
-                        0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011800, 0x01182b, 0x0118a0, 0x0118df, 0x0118ff,
-                        0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d0,
-                        0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89, 0x011a9d, 0x011a9d, 0x011ac0,
-                        0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46,
-                        0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480,
-                        0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40, 0x016b43, 0x016b63, 0x016b77,
+                        0x010563, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc,
+                        0x010600, 0x010736, 0x010740, 0x010755, 0x010760, 0x010767, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a,
+                        0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2, 0x0108f4, 0x0108f5, 0x010900, 0x010915,
+                        0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19, 0x010a35, 0x010a60, 0x010a7c, 0x010a80,
+                        0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91, 0x010c00, 0x010c48, 0x010c80, 0x010cb2,
+                        0x010cc0, 0x010cf2, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010f70, 0x010f81, 0x010fb0,
+                        0x010fc4, 0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011071, 0x011072, 0x011075, 0x011075, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144,
+                        0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213,
+                        0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310,
+                        0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447,
+                        0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644,
+                        0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011740, 0x011746, 0x011800, 0x01182b, 0x0118a0, 0x0118df, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c,
+                        0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3,
+                        0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89, 0x011a9d, 0x011a9d, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a,
+                        0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68,
+                        0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012400, 0x01246e, 0x012480, 0x012543, 0x012f90, 0x012ff0, 0x013000,
+                        0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016a70, 0x016abe, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b40, 0x016b43, 0x016b63, 0x016b77,
                         0x016b7d, 0x016b8f, 0x016e40, 0x016e7f, 0x016f00, 0x016f4a, 0x016f50, 0x016f50, 0x016f93, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x017000, 0x0187f7, 0x018800,
-                        0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88,
-                        0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb,
-                        0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544,
-                        0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736,
-                        0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e,
-                        0x01e2c0, 0x01e2eb, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27,
-                        0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b,
-                        0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61,
-                        0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b,
-                        0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800,
-                        0x02fa1d, 0x030000, 0x03134a));
+                        0x018cd5, 0x018d00, 0x018d08, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb,
+                        0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5,
+                        0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c,
+                        0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc,
+                        0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb,
+                        0x01df00, 0x01df1e, 0x01e100, 0x01e12c, 0x01e137, 0x01e13d, 0x01e14e, 0x01e14e, 0x01e290, 0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed,
+                        0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01e900, 0x01e943, 0x01e94b, 0x01e94b, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24,
+                        0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b,
+                        0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f,
+                        0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b,
+                        0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0,
+                        0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateGC_CC() {
@@ -2553,27 +2606,27 @@ private static void populateGC_CC() {
 
     private static void populateGC_CF() {
         SET_ENCODINGS.put("gc=Cf",
-                        CodePointSet.createNoDedup(0x0000ad, 0x0000ad, 0x000600, 0x000605, 0x00061c, 0x00061c, 0x0006dd, 0x0006dd, 0x00070f, 0x00070f, 0x0008e2, 0x0008e2, 0x00180e, 0x00180e, 0x00200b,
-                                        0x00200f, 0x00202a, 0x00202e, 0x002060, 0x002064, 0x002066, 0x00206f, 0x00feff, 0x00feff, 0x00fff9, 0x00fffb, 0x0110bd, 0x0110bd, 0x0110cd, 0x0110cd, 0x013430,
-                                        0x013438, 0x01bca0, 0x01bca3, 0x01d173, 0x01d17a, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
+                        CodePointSet.createNoDedup(0x0000ad, 0x0000ad, 0x000600, 0x000605, 0x00061c, 0x00061c, 0x0006dd, 0x0006dd, 0x00070f, 0x00070f, 0x000890, 0x000891, 0x0008e2, 0x0008e2, 0x00180e,
+                                        0x00180e, 0x00200b, 0x00200f, 0x00202a, 0x00202e, 0x002060, 0x002064, 0x002066, 0x00206f, 0x00feff, 0x00feff, 0x00fff9, 0x00fffb, 0x0110bd, 0x0110bd, 0x0110cd,
+                                        0x0110cd, 0x013430, 0x013438, 0x01bca0, 0x01bca3, 0x01d173, 0x01d17a, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
     }
 
     private static void populateGC_CN() {
         SET_ENCODINGS.put("gc=Cn", CodePointSet.createNoDedup(0x000378, 0x000379, 0x000380, 0x000383, 0x00038b, 0x00038b, 0x00038d, 0x00038d, 0x0003a2, 0x0003a2, 0x000530, 0x000530, 0x000557,
-                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00061d, 0x00061d, 0x00070e, 0x00070e, 0x00074b, 0x00074c,
-                        0x0007b2, 0x0007bf, 0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00089f, 0x0008b5, 0x0008b5, 0x0008c8,
-                        0x0008d2, 0x000984, 0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6,
-                        0x0009c9, 0x0009ca, 0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11,
-                        0x000a12, 0x000a29, 0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a,
-                        0x000a4e, 0x000a50, 0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9,
-                        0x000aa9, 0x000ab1, 0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5,
-                        0x000af2, 0x000af8, 0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a,
-                        0x000b3b, 0x000b45, 0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84,
-                        0x000b8b, 0x000b8d, 0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba,
-                        0x000bbd, 0x000bc3, 0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11,
-                        0x000c29, 0x000c29, 0x000c3a, 0x000c3c, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
+                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00070e, 0x00070e, 0x00074b, 0x00074c, 0x0007b2, 0x0007bf,
+                        0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00086f, 0x00088f, 0x00088f, 0x000892, 0x000897, 0x000984,
+                        0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6, 0x0009c9, 0x0009ca,
+                        0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11, 0x000a12, 0x000a29,
+                        0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a, 0x000a4e, 0x000a50,
+                        0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9, 0x000aa9, 0x000ab1,
+                        0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5, 0x000af2, 0x000af8,
+                        0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a, 0x000b3b, 0x000b45,
+                        0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84, 0x000b8b, 0x000b8d,
+                        0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba, 0x000bbd, 0x000bc3,
+                        0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11, 0x000c29, 0x000c29,
+                        0x000c3a, 0x000c3b, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5c, 0x000c5e, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
                         0x000c76, 0x000c8d, 0x000c8d, 0x000c91, 0x000c91, 0x000ca9, 0x000ca9, 0x000cb4, 0x000cb4, 0x000cba, 0x000cbb, 0x000cc5, 0x000cc5, 0x000cc9, 0x000cc9, 0x000cce, 0x000cd4,
-                        0x000cd7, 0x000cdd, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
+                        0x000cd7, 0x000cdc, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
                         0x000d49, 0x000d50, 0x000d53, 0x000d64, 0x000d65, 0x000d80, 0x000d80, 0x000d84, 0x000d84, 0x000d97, 0x000d99, 0x000db2, 0x000db2, 0x000dbc, 0x000dbc, 0x000dbe, 0x000dbf,
                         0x000dc7, 0x000dc9, 0x000dcb, 0x000dce, 0x000dd5, 0x000dd5, 0x000dd7, 0x000dd7, 0x000de0, 0x000de5, 0x000df0, 0x000df1, 0x000df5, 0x000e00, 0x000e3b, 0x000e3e, 0x000e5c,
                         0x000e80, 0x000e83, 0x000e83, 0x000e85, 0x000e85, 0x000e8b, 0x000e8b, 0x000ea4, 0x000ea4, 0x000ea6, 0x000ea6, 0x000ebe, 0x000ebf, 0x000ec5, 0x000ec5, 0x000ec7, 0x000ec7,
@@ -2581,64 +2634,67 @@ private static void populateGC_CN() {
                         0x000fff, 0x0010c6, 0x0010c6, 0x0010c8, 0x0010cc, 0x0010ce, 0x0010cf, 0x001249, 0x001249, 0x00124e, 0x00124f, 0x001257, 0x001257, 0x001259, 0x001259, 0x00125e, 0x00125f,
                         0x001289, 0x001289, 0x00128e, 0x00128f, 0x0012b1, 0x0012b1, 0x0012b6, 0x0012b7, 0x0012bf, 0x0012bf, 0x0012c1, 0x0012c1, 0x0012c6, 0x0012c7, 0x0012d7, 0x0012d7, 0x001311,
                         0x001311, 0x001316, 0x001317, 0x00135b, 0x00135c, 0x00137d, 0x00137f, 0x00139a, 0x00139f, 0x0013f6, 0x0013f7, 0x0013fe, 0x0013ff, 0x00169d, 0x00169f, 0x0016f9, 0x0016ff,
-                        0x00170d, 0x00170d, 0x001715, 0x00171f, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea,
-                        0x0017ef, 0x0017fa, 0x0017ff, 0x00180f, 0x00180f, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f,
-                        0x00193c, 0x00193f, 0x001941, 0x001943, 0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f,
-                        0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a, 0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001ac1, 0x001aff, 0x001b4c, 0x001b4f, 0x001b7d, 0x001b7f, 0x001bf4, 0x001bfb,
-                        0x001c38, 0x001c3a, 0x001c4a, 0x001c4c, 0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001dfa, 0x001dfa, 0x001f16, 0x001f17, 0x001f1e,
-                        0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58, 0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5,
-                        0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc, 0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f,
-                        0x00208f, 0x00209d, 0x00209f, 0x0020c0, 0x0020cf, 0x0020f1, 0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96,
-                        0x002c2f, 0x002c2f, 0x002c5f, 0x002c5f, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c, 0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97,
-                        0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7, 0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf,
-                        0x002e53, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff, 0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130,
-                        0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x009ffd, 0x009fff, 0x00a48d, 0x00a48f, 0x00a4c7, 0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff,
-                        0x00a7c0, 0x00a7c1, 0x00a7cb, 0x00a7f4, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f, 0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d,
-                        0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37, 0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00,
-                        0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27, 0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4,
-                        0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00d7ff, 0x00fa6e, 0x00fa6f, 0x00fada, 0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d,
-                        0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc2, 0x00fbd2, 0x00fd40, 0x00fd4f, 0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdef, 0x00fdfe, 0x00fdff, 0x00fe1a,
-                        0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd, 0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9,
-                        0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8, 0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b,
-                        0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103, 0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f,
-                        0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff, 0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e,
-                        0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4, 0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e,
-                        0x010570, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d,
-                        0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df, 0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f,
-                        0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07, 0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49,
-                        0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea, 0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98,
-                        0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3, 0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa,
-                        0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f, 0x010f5a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011070, 0x01107e,
-                        0x0110c2, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9, 0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5,
-                        0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f, 0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef,
-                        0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d, 0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345,
-                        0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f, 0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c,
-                        0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da, 0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116b9,
-                        0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c, 0x01172c, 0x01172f, 0x011740, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b,
-                        0x011914, 0x011914, 0x011917, 0x011917, 0x011936, 0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5,
-                        0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011abf, 0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91,
-                        0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07, 0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a,
-                        0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69, 0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf,
-                        0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f, 0x01246f, 0x012475, 0x01247f, 0x012544, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39,
-                        0x016a3f, 0x016a5f, 0x016a5f, 0x016a6a, 0x016a6d, 0x016a70, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62,
-                        0x016b78, 0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8,
-                        0x0187ff, 0x018cd6, 0x018cff, 0x018d09, 0x01afff, 0x01b11f, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc, 0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f,
-                        0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01cfff, 0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1e9, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357,
-                        0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d, 0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba,
-                        0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506, 0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545,
-                        0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6, 0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01dfff, 0x01e007, 0x01e007,
-                        0x01e019, 0x01e01a, 0x01e022, 0x01e022, 0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e2bf, 0x01e2fa,
-                        0x01e2fe, 0x01e300, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d, 0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff,
-                        0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33, 0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c,
-                        0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50, 0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58,
-                        0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65, 0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78,
-                        0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4, 0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff,
-                        0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6, 0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c,
-                        0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6df, 0x01f6ed, 0x01f6ef, 0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df,
-                        0x01f7ec, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888, 0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01f979, 0x01f979, 0x01f9cc,
-                        0x01f9cc, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7b, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faa9, 0x01faaf, 0x01fab7, 0x01fabf, 0x01fac3, 0x01facf,
-                        0x01fad7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6de, 0x02a6ff, 0x02b735, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1,
-                        0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff, 0x0e01f0, 0x0effff, 0x0ffffe, 0x0fffff, 0x10fffe, 0x10ffff));
+                        0x001716, 0x00171e, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea, 0x0017ef, 0x0017fa,
+                        0x0017ff, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f, 0x00193c, 0x00193f, 0x001941, 0x001943,
+                        0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f, 0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a,
+                        0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001acf, 0x001aff, 0x001b4d, 0x001b4f, 0x001b7f, 0x001b7f, 0x001bf4, 0x001bfb, 0x001c38, 0x001c3a, 0x001c4a, 0x001c4c,
+                        0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001f16, 0x001f17, 0x001f1e, 0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58,
+                        0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5, 0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc,
+                        0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f, 0x00208f, 0x00209d, 0x00209f, 0x0020c1, 0x0020cf, 0x0020f1,
+                        0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c,
+                        0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97, 0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7,
+                        0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf, 0x002e5e, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff,
+                        0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130, 0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x00a48d, 0x00a48f, 0x00a4c7,
+                        0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff, 0x00a7cb, 0x00a7cf, 0x00a7d2, 0x00a7d2, 0x00a7d4, 0x00a7d4, 0x00a7da, 0x00a7f1, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f,
+                        0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d, 0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37,
+                        0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00, 0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27,
+                        0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4, 0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00d7ff, 0x00fa6e, 0x00fa6f, 0x00fada,
+                        0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d, 0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc3, 0x00fbd2,
+                        0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdce, 0x00fdd0, 0x00fdef, 0x00fe1a, 0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd,
+                        0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9, 0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8,
+                        0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b, 0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103,
+                        0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f, 0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff,
+                        0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e, 0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4,
+                        0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e, 0x01057b, 0x01057b, 0x01058b, 0x01058b, 0x010593, 0x010593, 0x010596, 0x010596, 0x0105a2, 0x0105a2,
+                        0x0105b2, 0x0105b2, 0x0105ba, 0x0105ba, 0x0105bd, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x01077f, 0x010786, 0x010786, 0x0107b1, 0x0107b1, 0x0107bb,
+                        0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d, 0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df,
+                        0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f, 0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07,
+                        0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49, 0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea,
+                        0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98, 0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3,
+                        0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa, 0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f,
+                        0x010f5a, 0x010f6f, 0x010f8a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011076, 0x01107e, 0x0110c3, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9,
+                        0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5, 0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f,
+                        0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef, 0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d,
+                        0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345, 0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f,
+                        0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c, 0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da,
+                        0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116ba, 0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c,
+                        0x01172c, 0x01172f, 0x011747, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b, 0x011914, 0x011914, 0x011917, 0x011917, 0x011936,
+                        0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5, 0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011aaf,
+                        0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91, 0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07,
+                        0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a, 0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69,
+                        0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf, 0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f,
+                        0x01246f, 0x012475, 0x01247f, 0x012544, 0x012f8f, 0x012ff3, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39, 0x016a3f, 0x016a5f, 0x016a5f,
+                        0x016a6a, 0x016a6d, 0x016abf, 0x016abf, 0x016aca, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62, 0x016b78,
+                        0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8, 0x0187ff,
+                        0x018cd6, 0x018cff, 0x018d09, 0x01afef, 0x01aff4, 0x01aff4, 0x01affc, 0x01affc, 0x01afff, 0x01afff, 0x01b123, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc,
+                        0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f, 0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01ceff, 0x01cf2e, 0x01cf2f, 0x01cf47, 0x01cf4f, 0x01cfc4, 0x01cfff,
+                        0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1eb, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357, 0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d,
+                        0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba, 0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506,
+                        0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545, 0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6,
+                        0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01deff, 0x01df1f, 0x01dfff, 0x01e007, 0x01e007, 0x01e019, 0x01e01a, 0x01e022, 0x01e022,
+                        0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e28f, 0x01e2af, 0x01e2bf, 0x01e2fa, 0x01e2fe, 0x01e300,
+                        0x01e7df, 0x01e7e7, 0x01e7e7, 0x01e7ec, 0x01e7ec, 0x01e7ef, 0x01e7ef, 0x01e7ff, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d,
+                        0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff, 0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33,
+                        0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c, 0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50,
+                        0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58, 0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65,
+                        0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78, 0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4,
+                        0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff, 0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6,
+                        0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c, 0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6dc, 0x01f6ed, 0x01f6ef,
+                        0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df, 0x01f7ec, 0x01f7ef, 0x01f7f1, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888,
+                        0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7d, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faad, 0x01faaf,
+                        0x01fabb, 0x01fabf, 0x01fac6, 0x01facf, 0x01fada, 0x01fadf, 0x01fae8, 0x01faef, 0x01faf7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6e0,
+                        0x02a6ff, 0x02b739, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1, 0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff,
+                        0x0e01f0, 0x0effff, 0x0ffffe, 0x0fffff, 0x10fffe, 0x10ffff));
     }
 
     private static void populateGC_CO() {
@@ -2701,7 +2757,7 @@ private static void populateGC_LL() {
                         0x001f60, 0x001f67, 0x001f70, 0x001f7d, 0x001f80, 0x001f87, 0x001f90, 0x001f97, 0x001fa0, 0x001fa7, 0x001fb0, 0x001fb4, 0x001fb6, 0x001fb7, 0x001fbe, 0x001fbe, 0x001fc2,
                         0x001fc4, 0x001fc6, 0x001fc7, 0x001fd0, 0x001fd3, 0x001fd6, 0x001fd7, 0x001fe0, 0x001fe7, 0x001ff2, 0x001ff4, 0x001ff6, 0x001ff7, 0x00210a, 0x00210a, 0x00210e, 0x00210f,
                         0x002113, 0x002113, 0x00212f, 0x00212f, 0x002134, 0x002134, 0x002139, 0x002139, 0x00213c, 0x00213d, 0x002146, 0x002149, 0x00214e, 0x00214e, 0x002184, 0x002184, 0x002c30,
-                        0x002c5e, 0x002c61, 0x002c61, 0x002c65, 0x002c66, 0x002c68, 0x002c68, 0x002c6a, 0x002c6a, 0x002c6c, 0x002c6c, 0x002c71, 0x002c71, 0x002c73, 0x002c74, 0x002c76, 0x002c7b,
+                        0x002c5f, 0x002c61, 0x002c61, 0x002c65, 0x002c66, 0x002c68, 0x002c68, 0x002c6a, 0x002c6a, 0x002c6c, 0x002c6c, 0x002c71, 0x002c71, 0x002c73, 0x002c74, 0x002c76, 0x002c7b,
                         0x002c81, 0x002c81, 0x002c83, 0x002c83, 0x002c85, 0x002c85, 0x002c87, 0x002c87, 0x002c89, 0x002c89, 0x002c8b, 0x002c8b, 0x002c8d, 0x002c8d, 0x002c8f, 0x002c8f, 0x002c91,
                         0x002c91, 0x002c93, 0x002c93, 0x002c95, 0x002c95, 0x002c97, 0x002c97, 0x002c99, 0x002c99, 0x002c9b, 0x002c9b, 0x002c9d, 0x002c9d, 0x002c9f, 0x002c9f, 0x002ca1, 0x002ca1,
                         0x002ca3, 0x002ca3, 0x002ca5, 0x002ca5, 0x002ca7, 0x002ca7, 0x002ca9, 0x002ca9, 0x002cab, 0x002cab, 0x002cad, 0x002cad, 0x002caf, 0x002caf, 0x002cb1, 0x002cb1, 0x002cb3,
@@ -2720,54 +2776,56 @@ private static void populateGC_LL() {
                         0x00a769, 0x00a76b, 0x00a76b, 0x00a76d, 0x00a76d, 0x00a76f, 0x00a76f, 0x00a771, 0x00a778, 0x00a77a, 0x00a77a, 0x00a77c, 0x00a77c, 0x00a77f, 0x00a77f, 0x00a781, 0x00a781,
                         0x00a783, 0x00a783, 0x00a785, 0x00a785, 0x00a787, 0x00a787, 0x00a78c, 0x00a78c, 0x00a78e, 0x00a78e, 0x00a791, 0x00a791, 0x00a793, 0x00a795, 0x00a797, 0x00a797, 0x00a799,
                         0x00a799, 0x00a79b, 0x00a79b, 0x00a79d, 0x00a79d, 0x00a79f, 0x00a79f, 0x00a7a1, 0x00a7a1, 0x00a7a3, 0x00a7a3, 0x00a7a5, 0x00a7a5, 0x00a7a7, 0x00a7a7, 0x00a7a9, 0x00a7a9,
-                        0x00a7af, 0x00a7af, 0x00a7b5, 0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c3, 0x00a7c3, 0x00a7c8,
-                        0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7f6, 0x00a7f6, 0x00a7fa, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab60, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17,
-                        0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433, 0x01d44e, 0x01d454, 0x01d456,
-                        0x01d467, 0x01d482, 0x01d49b, 0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e, 0x01d537, 0x01d552, 0x01d56b,
-                        0x01d586, 0x01d59f, 0x01d5ba, 0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656, 0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6e1, 0x01d6fc,
-                        0x01d714, 0x01d716, 0x01d71b, 0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788, 0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7c9, 0x01d7cb, 0x01d7cb,
-                        0x01e922, 0x01e943));
+                        0x00a7af, 0x00a7af, 0x00a7b5, 0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c1, 0x00a7c1, 0x00a7c3,
+                        0x00a7c3, 0x00a7c8, 0x00a7c8, 0x00a7ca, 0x00a7ca, 0x00a7d1, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d5, 0x00a7d7, 0x00a7d7, 0x00a7d9, 0x00a7d9, 0x00a7f6, 0x00a7f6,
+                        0x00a7fa, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab60, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8,
+                        0x0104fb, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433,
+                        0x01d44e, 0x01d454, 0x01d456, 0x01d467, 0x01d482, 0x01d49b, 0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e,
+                        0x01d537, 0x01d552, 0x01d56b, 0x01d586, 0x01d59f, 0x01d5ba, 0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656, 0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da,
+                        0x01d6dc, 0x01d6e1, 0x01d6fc, 0x01d714, 0x01d716, 0x01d71b, 0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788, 0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4,
+                        0x01d7c9, 0x01d7cb, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e922, 0x01e943));
     }
 
     private static void populateGC_LM() {
         SET_ENCODINGS.put("gc=Lm",
                         CodePointSet.createNoDedup(0x0002b0, 0x0002c1, 0x0002c6, 0x0002d1, 0x0002e0, 0x0002e4, 0x0002ec, 0x0002ec, 0x0002ee, 0x0002ee, 0x000374, 0x000374, 0x00037a, 0x00037a, 0x000559,
-                                        0x000559, 0x000640, 0x000640, 0x0006e5, 0x0006e6, 0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x000971,
-                                        0x000971, 0x000e46, 0x000e46, 0x000ec6, 0x000ec6, 0x0010fc, 0x0010fc, 0x0017d7, 0x0017d7, 0x001843, 0x001843, 0x001aa7, 0x001aa7, 0x001c78, 0x001c7d, 0x001d2c,
-                                        0x001d6a, 0x001d78, 0x001d78, 0x001d9b, 0x001dbf, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002c7c, 0x002c7d, 0x002d6f, 0x002d6f, 0x002e2f,
-                                        0x002e2f, 0x003005, 0x003005, 0x003031, 0x003035, 0x00303b, 0x00303b, 0x00309d, 0x00309e, 0x0030fc, 0x0030fe, 0x00a015, 0x00a015, 0x00a4f8, 0x00a4fd, 0x00a60c,
-                                        0x00a60c, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69d, 0x00a717, 0x00a71f, 0x00a770, 0x00a770, 0x00a788, 0x00a788, 0x00a7f8, 0x00a7f9, 0x00a9cf, 0x00a9cf, 0x00a9e6,
-                                        0x00a9e6, 0x00aa70, 0x00aa70, 0x00aadd, 0x00aadd, 0x00aaf3, 0x00aaf4, 0x00ab5c, 0x00ab5f, 0x00ab69, 0x00ab69, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x016b40,
-                                        0x016b43, 0x016f93, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3, 0x016fe3, 0x01e137, 0x01e13d, 0x01e94b, 0x01e94b));
+                                        0x000559, 0x000640, 0x000640, 0x0006e5, 0x0006e6, 0x0007f4, 0x0007f5, 0x0007fa, 0x0007fa, 0x00081a, 0x00081a, 0x000824, 0x000824, 0x000828, 0x000828, 0x0008c9,
+                                        0x0008c9, 0x000971, 0x000971, 0x000e46, 0x000e46, 0x000ec6, 0x000ec6, 0x0010fc, 0x0010fc, 0x0017d7, 0x0017d7, 0x001843, 0x001843, 0x001aa7, 0x001aa7, 0x001c78,
+                                        0x001c7d, 0x001d2c, 0x001d6a, 0x001d78, 0x001d78, 0x001d9b, 0x001dbf, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x002c7c, 0x002c7d, 0x002d6f,
+                                        0x002d6f, 0x002e2f, 0x002e2f, 0x003005, 0x003005, 0x003031, 0x003035, 0x00303b, 0x00303b, 0x00309d, 0x00309e, 0x0030fc, 0x0030fe, 0x00a015, 0x00a015, 0x00a4f8,
+                                        0x00a4fd, 0x00a60c, 0x00a60c, 0x00a67f, 0x00a67f, 0x00a69c, 0x00a69d, 0x00a717, 0x00a71f, 0x00a770, 0x00a770, 0x00a788, 0x00a788, 0x00a7f2, 0x00a7f4, 0x00a7f8,
+                                        0x00a7f9, 0x00a9cf, 0x00a9cf, 0x00a9e6, 0x00a9e6, 0x00aa70, 0x00aa70, 0x00aadd, 0x00aadd, 0x00aaf3, 0x00aaf4, 0x00ab5c, 0x00ab5f, 0x00ab69, 0x00ab69, 0x00ff70,
+                                        0x00ff70, 0x00ff9e, 0x00ff9f, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x016b40, 0x016b43, 0x016f93, 0x016f9f, 0x016fe0, 0x016fe1, 0x016fe3,
+                                        0x016fe3, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01e137, 0x01e13d, 0x01e94b, 0x01e94b));
     }
 
     private static void populateGC_LO() {
         SET_ENCODINGS.put("gc=Lo", CodePointSet.createNoDedup(0x0000aa, 0x0000aa, 0x0000ba, 0x0000ba, 0x0001bb, 0x0001bb, 0x0001c0, 0x0001c3, 0x000294, 0x000294, 0x0005d0, 0x0005ea, 0x0005ef,
                         0x0005f2, 0x000620, 0x00063f, 0x000641, 0x00064a, 0x00066e, 0x00066f, 0x000671, 0x0006d3, 0x0006d5, 0x0006d5, 0x0006ee, 0x0006ef, 0x0006fa, 0x0006fc, 0x0006ff, 0x0006ff,
-                        0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1, 0x0007ca, 0x0007ea, 0x000800, 0x000815, 0x000840, 0x000858, 0x000860, 0x00086a, 0x0008a0,
-                        0x0008b4, 0x0008b6, 0x0008c7, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000972, 0x000980, 0x000985, 0x00098c, 0x00098f, 0x000990,
-                        0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df, 0x0009e1, 0x0009f0,
-                        0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36, 0x000a38, 0x000a39,
-                        0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2, 0x000ab3, 0x000ab5,
-                        0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28, 0x000b2a, 0x000b30,
-                        0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85, 0x000b8a, 0x000b8e,
-                        0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9, 0x000bd0, 0x000bd0,
-                        0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c60, 0x000c61, 0x000c80, 0x000c80, 0x000c85,
-                        0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cde, 0x000cde, 0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2,
-                        0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f, 0x000d61, 0x000d7a, 0x000d7f, 0x000d85,
-                        0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e33, 0x000e40, 0x000e45, 0x000e81, 0x000e82,
-                        0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd, 0x000ebd, 0x000ec0, 0x000ec4, 0x000edc,
-                        0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a, 0x00103f, 0x00103f, 0x001050, 0x001055, 0x00105a, 0x00105d,
-                        0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x001100, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258,
-                        0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5,
-                        0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x001401, 0x00166c, 0x00166f, 0x00167f, 0x001681, 0x00169a, 0x0016a0,
-                        0x0016ea, 0x0016f1, 0x0016f8, 0x001700, 0x00170c, 0x00170e, 0x001711, 0x001720, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770, 0x001780, 0x0017b3,
-                        0x0017dc, 0x0017dc, 0x001820, 0x001842, 0x001844, 0x001878, 0x001880, 0x001884, 0x001887, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900, 0x00191e, 0x001950,
-                        0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001b05, 0x001b33, 0x001b45, 0x001b4b, 0x001b83, 0x001ba0,
-                        0x001bae, 0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c77, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5, 0x001cf6, 0x001cfa,
-                        0x001cfa, 0x002135, 0x002138, 0x002d30, 0x002d67, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0, 0x002dc6,
-                        0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003006, 0x003006, 0x00303c, 0x00303c, 0x003041, 0x003096, 0x00309f, 0x00309f, 0x0030a1, 0x0030fa, 0x0030ff,
-                        0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a000, 0x00a014, 0x00a016, 0x00a48c,
+                        0x000710, 0x000710, 0x000712, 0x00072f, 0x00074d, 0x0007a5, 0x0007b1, 0x0007b1, 0x0007ca, 0x0007ea, 0x000800, 0x000815, 0x000840, 0x000858, 0x000860, 0x00086a, 0x000870,
+                        0x000887, 0x000889, 0x00088e, 0x0008a0, 0x0008c8, 0x000904, 0x000939, 0x00093d, 0x00093d, 0x000950, 0x000950, 0x000958, 0x000961, 0x000972, 0x000980, 0x000985, 0x00098c,
+                        0x00098f, 0x000990, 0x000993, 0x0009a8, 0x0009aa, 0x0009b0, 0x0009b2, 0x0009b2, 0x0009b6, 0x0009b9, 0x0009bd, 0x0009bd, 0x0009ce, 0x0009ce, 0x0009dc, 0x0009dd, 0x0009df,
+                        0x0009e1, 0x0009f0, 0x0009f1, 0x0009fc, 0x0009fc, 0x000a05, 0x000a0a, 0x000a0f, 0x000a10, 0x000a13, 0x000a28, 0x000a2a, 0x000a30, 0x000a32, 0x000a33, 0x000a35, 0x000a36,
+                        0x000a38, 0x000a39, 0x000a59, 0x000a5c, 0x000a5e, 0x000a5e, 0x000a72, 0x000a74, 0x000a85, 0x000a8d, 0x000a8f, 0x000a91, 0x000a93, 0x000aa8, 0x000aaa, 0x000ab0, 0x000ab2,
+                        0x000ab3, 0x000ab5, 0x000ab9, 0x000abd, 0x000abd, 0x000ad0, 0x000ad0, 0x000ae0, 0x000ae1, 0x000af9, 0x000af9, 0x000b05, 0x000b0c, 0x000b0f, 0x000b10, 0x000b13, 0x000b28,
+                        0x000b2a, 0x000b30, 0x000b32, 0x000b33, 0x000b35, 0x000b39, 0x000b3d, 0x000b3d, 0x000b5c, 0x000b5d, 0x000b5f, 0x000b61, 0x000b71, 0x000b71, 0x000b83, 0x000b83, 0x000b85,
+                        0x000b8a, 0x000b8e, 0x000b90, 0x000b92, 0x000b95, 0x000b99, 0x000b9a, 0x000b9c, 0x000b9c, 0x000b9e, 0x000b9f, 0x000ba3, 0x000ba4, 0x000ba8, 0x000baa, 0x000bae, 0x000bb9,
+                        0x000bd0, 0x000bd0, 0x000c05, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c3d, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60,
+                        0x000c61, 0x000c80, 0x000c80, 0x000c85, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbd, 0x000cbd, 0x000cdd, 0x000cde,
+                        0x000ce0, 0x000ce1, 0x000cf1, 0x000cf2, 0x000d04, 0x000d0c, 0x000d0e, 0x000d10, 0x000d12, 0x000d3a, 0x000d3d, 0x000d3d, 0x000d4e, 0x000d4e, 0x000d54, 0x000d56, 0x000d5f,
+                        0x000d61, 0x000d7a, 0x000d7f, 0x000d85, 0x000d96, 0x000d9a, 0x000db1, 0x000db3, 0x000dbb, 0x000dbd, 0x000dbd, 0x000dc0, 0x000dc6, 0x000e01, 0x000e30, 0x000e32, 0x000e33,
+                        0x000e40, 0x000e45, 0x000e81, 0x000e82, 0x000e84, 0x000e84, 0x000e86, 0x000e8a, 0x000e8c, 0x000ea3, 0x000ea5, 0x000ea5, 0x000ea7, 0x000eb0, 0x000eb2, 0x000eb3, 0x000ebd,
+                        0x000ebd, 0x000ec0, 0x000ec4, 0x000edc, 0x000edf, 0x000f00, 0x000f00, 0x000f40, 0x000f47, 0x000f49, 0x000f6c, 0x000f88, 0x000f8c, 0x001000, 0x00102a, 0x00103f, 0x00103f,
+                        0x001050, 0x001055, 0x00105a, 0x00105d, 0x001061, 0x001061, 0x001065, 0x001066, 0x00106e, 0x001070, 0x001075, 0x001081, 0x00108e, 0x00108e, 0x001100, 0x001248, 0x00124a,
+                        0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be,
+                        0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318, 0x00135a, 0x001380, 0x00138f, 0x001401, 0x00166c, 0x00166f,
+                        0x00167f, 0x001681, 0x00169a, 0x0016a0, 0x0016ea, 0x0016f1, 0x0016f8, 0x001700, 0x001711, 0x00171f, 0x001731, 0x001740, 0x001751, 0x001760, 0x00176c, 0x00176e, 0x001770,
+                        0x001780, 0x0017b3, 0x0017dc, 0x0017dc, 0x001820, 0x001842, 0x001844, 0x001878, 0x001880, 0x001884, 0x001887, 0x0018a8, 0x0018aa, 0x0018aa, 0x0018b0, 0x0018f5, 0x001900,
+                        0x00191e, 0x001950, 0x00196d, 0x001970, 0x001974, 0x001980, 0x0019ab, 0x0019b0, 0x0019c9, 0x001a00, 0x001a16, 0x001a20, 0x001a54, 0x001b05, 0x001b33, 0x001b45, 0x001b4c,
+                        0x001b83, 0x001ba0, 0x001bae, 0x001baf, 0x001bba, 0x001be5, 0x001c00, 0x001c23, 0x001c4d, 0x001c4f, 0x001c5a, 0x001c77, 0x001ce9, 0x001cec, 0x001cee, 0x001cf3, 0x001cf5,
+                        0x001cf6, 0x001cfa, 0x001cfa, 0x002135, 0x002138, 0x002d30, 0x002d67, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe,
+                        0x002dc0, 0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x003006, 0x003006, 0x00303c, 0x00303c, 0x003041, 0x003096, 0x00309f, 0x00309f, 0x0030a1,
+                        0x0030fa, 0x0030ff, 0x0030ff, 0x003105, 0x00312f, 0x003131, 0x00318e, 0x0031a0, 0x0031bf, 0x0031f0, 0x0031ff, 0x003400, 0x004dbf, 0x004e00, 0x00a014, 0x00a016, 0x00a48c,
                         0x00a4d0, 0x00a4f7, 0x00a500, 0x00a60b, 0x00a610, 0x00a61f, 0x00a62a, 0x00a62b, 0x00a66e, 0x00a66e, 0x00a6a0, 0x00a6e5, 0x00a78f, 0x00a78f, 0x00a7f7, 0x00a7f7, 0x00a7fb,
                         0x00a801, 0x00a803, 0x00a805, 0x00a807, 0x00a80a, 0x00a80c, 0x00a822, 0x00a840, 0x00a873, 0x00a882, 0x00a8b3, 0x00a8f2, 0x00a8f7, 0x00a8fb, 0x00a8fb, 0x00a8fd, 0x00a8fe,
                         0x00a90a, 0x00a925, 0x00a930, 0x00a946, 0x00a960, 0x00a97c, 0x00a984, 0x00a9b2, 0x00a9e0, 0x00a9e4, 0x00a9e7, 0x00a9ef, 0x00a9fa, 0x00a9fe, 0x00aa00, 0x00aa28, 0x00aa40,
@@ -2782,24 +2840,26 @@ private static void populateGC_LO() {
                         0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x010855, 0x010860, 0x010876, 0x010880, 0x01089e, 0x0108e0, 0x0108f2,
                         0x0108f4, 0x0108f5, 0x010900, 0x010915, 0x010920, 0x010939, 0x010980, 0x0109b7, 0x0109be, 0x0109bf, 0x010a00, 0x010a00, 0x010a10, 0x010a13, 0x010a15, 0x010a17, 0x010a19,
                         0x010a35, 0x010a60, 0x010a7c, 0x010a80, 0x010a9c, 0x010ac0, 0x010ac7, 0x010ac9, 0x010ae4, 0x010b00, 0x010b35, 0x010b40, 0x010b55, 0x010b60, 0x010b72, 0x010b80, 0x010b91,
-                        0x010c00, 0x010c48, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010fb0, 0x010fc4, 0x010fe0,
-                        0x010ff6, 0x011003, 0x011037, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144, 0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176,
-                        0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213, 0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a,
-                        0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310, 0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333,
-                        0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447, 0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4,
-                        0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644, 0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a,
-                        0x011800, 0x01182b, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915, 0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0,
-                        0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00, 0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89,
-                        0x011a9d, 0x011a9d, 0x011ac0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40, 0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b,
-                        0x011d30, 0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89, 0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399,
-                        0x012480, 0x012543, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800, 0x016a38, 0x016a40, 0x016a5e, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b63, 0x016b77, 0x016b7d,
-                        0x016b8f, 0x016f00, 0x016f4a, 0x016f50, 0x016f50, 0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b11e, 0x01b150, 0x01b152, 0x01b164, 0x01b167,
-                        0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70, 0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01e100, 0x01e12c, 0x01e14e, 0x01e14e, 0x01e2c0, 0x01e2eb, 0x01e800,
-                        0x01e8c4, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39,
-                        0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57,
-                        0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72,
-                        0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000,
-                        0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                        0x010c00, 0x010c48, 0x010d00, 0x010d23, 0x010e80, 0x010ea9, 0x010eb0, 0x010eb1, 0x010f00, 0x010f1c, 0x010f27, 0x010f27, 0x010f30, 0x010f45, 0x010f70, 0x010f81, 0x010fb0,
+                        0x010fc4, 0x010fe0, 0x010ff6, 0x011003, 0x011037, 0x011071, 0x011072, 0x011075, 0x011075, 0x011083, 0x0110af, 0x0110d0, 0x0110e8, 0x011103, 0x011126, 0x011144, 0x011144,
+                        0x011147, 0x011147, 0x011150, 0x011172, 0x011176, 0x011176, 0x011183, 0x0111b2, 0x0111c1, 0x0111c4, 0x0111da, 0x0111da, 0x0111dc, 0x0111dc, 0x011200, 0x011211, 0x011213,
+                        0x01122b, 0x011280, 0x011286, 0x011288, 0x011288, 0x01128a, 0x01128d, 0x01128f, 0x01129d, 0x01129f, 0x0112a8, 0x0112b0, 0x0112de, 0x011305, 0x01130c, 0x01130f, 0x011310,
+                        0x011313, 0x011328, 0x01132a, 0x011330, 0x011332, 0x011333, 0x011335, 0x011339, 0x01133d, 0x01133d, 0x011350, 0x011350, 0x01135d, 0x011361, 0x011400, 0x011434, 0x011447,
+                        0x01144a, 0x01145f, 0x011461, 0x011480, 0x0114af, 0x0114c4, 0x0114c5, 0x0114c7, 0x0114c7, 0x011580, 0x0115ae, 0x0115d8, 0x0115db, 0x011600, 0x01162f, 0x011644, 0x011644,
+                        0x011680, 0x0116aa, 0x0116b8, 0x0116b8, 0x011700, 0x01171a, 0x011740, 0x011746, 0x011800, 0x01182b, 0x0118ff, 0x011906, 0x011909, 0x011909, 0x01190c, 0x011913, 0x011915,
+                        0x011916, 0x011918, 0x01192f, 0x01193f, 0x01193f, 0x011941, 0x011941, 0x0119a0, 0x0119a7, 0x0119aa, 0x0119d0, 0x0119e1, 0x0119e1, 0x0119e3, 0x0119e3, 0x011a00, 0x011a00,
+                        0x011a0b, 0x011a32, 0x011a3a, 0x011a3a, 0x011a50, 0x011a50, 0x011a5c, 0x011a89, 0x011a9d, 0x011a9d, 0x011ab0, 0x011af8, 0x011c00, 0x011c08, 0x011c0a, 0x011c2e, 0x011c40,
+                        0x011c40, 0x011c72, 0x011c8f, 0x011d00, 0x011d06, 0x011d08, 0x011d09, 0x011d0b, 0x011d30, 0x011d46, 0x011d46, 0x011d60, 0x011d65, 0x011d67, 0x011d68, 0x011d6a, 0x011d89,
+                        0x011d98, 0x011d98, 0x011ee0, 0x011ef2, 0x011fb0, 0x011fb0, 0x012000, 0x012399, 0x012480, 0x012543, 0x012f90, 0x012ff0, 0x013000, 0x01342e, 0x014400, 0x014646, 0x016800,
+                        0x016a38, 0x016a40, 0x016a5e, 0x016a70, 0x016abe, 0x016ad0, 0x016aed, 0x016b00, 0x016b2f, 0x016b63, 0x016b77, 0x016b7d, 0x016b8f, 0x016f00, 0x016f4a, 0x016f50, 0x016f50,
+                        0x017000, 0x0187f7, 0x018800, 0x018cd5, 0x018d00, 0x018d08, 0x01b000, 0x01b122, 0x01b150, 0x01b152, 0x01b164, 0x01b167, 0x01b170, 0x01b2fb, 0x01bc00, 0x01bc6a, 0x01bc70,
+                        0x01bc7c, 0x01bc80, 0x01bc88, 0x01bc90, 0x01bc99, 0x01df0a, 0x01df0a, 0x01e100, 0x01e12c, 0x01e14e, 0x01e14e, 0x01e290, 0x01e2ad, 0x01e2c0, 0x01e2eb, 0x01e7e0, 0x01e7e6,
+                        0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe, 0x01e800, 0x01e8c4, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27,
+                        0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b,
+                        0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61,
+                        0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b,
+                        0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800,
+                        0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateGC_LT() {
@@ -2859,7 +2919,7 @@ private static void populateGC_LU() {
                         0x001f48, 0x001f4d, 0x001f59, 0x001f59, 0x001f5b, 0x001f5b, 0x001f5d, 0x001f5d, 0x001f5f, 0x001f5f, 0x001f68, 0x001f6f, 0x001fb8, 0x001fbb, 0x001fc8, 0x001fcb, 0x001fd8,
                         0x001fdb, 0x001fe8, 0x001fec, 0x001ff8, 0x001ffb, 0x002102, 0x002102, 0x002107, 0x002107, 0x00210b, 0x00210d, 0x002110, 0x002112, 0x002115, 0x002115, 0x002119, 0x00211d,
                         0x002124, 0x002124, 0x002126, 0x002126, 0x002128, 0x002128, 0x00212a, 0x00212d, 0x002130, 0x002133, 0x00213e, 0x00213f, 0x002145, 0x002145, 0x002183, 0x002183, 0x002c00,
-                        0x002c2e, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70, 0x002c72, 0x002c72, 0x002c75, 0x002c75,
+                        0x002c2f, 0x002c60, 0x002c60, 0x002c62, 0x002c64, 0x002c67, 0x002c67, 0x002c69, 0x002c69, 0x002c6b, 0x002c6b, 0x002c6d, 0x002c70, 0x002c72, 0x002c72, 0x002c75, 0x002c75,
                         0x002c7e, 0x002c80, 0x002c82, 0x002c82, 0x002c84, 0x002c84, 0x002c86, 0x002c86, 0x002c88, 0x002c88, 0x002c8a, 0x002c8a, 0x002c8c, 0x002c8c, 0x002c8e, 0x002c8e, 0x002c90,
                         0x002c90, 0x002c92, 0x002c92, 0x002c94, 0x002c94, 0x002c96, 0x002c96, 0x002c98, 0x002c98, 0x002c9a, 0x002c9a, 0x002c9c, 0x002c9c, 0x002c9e, 0x002c9e, 0x002ca0, 0x002ca0,
                         0x002ca2, 0x002ca2, 0x002ca4, 0x002ca4, 0x002ca6, 0x002ca6, 0x002ca8, 0x002ca8, 0x002caa, 0x002caa, 0x002cac, 0x002cac, 0x002cae, 0x002cae, 0x002cb0, 0x002cb0, 0x002cb2,
@@ -2878,12 +2938,13 @@ private static void populateGC_LU() {
                         0x00a76e, 0x00a779, 0x00a779, 0x00a77b, 0x00a77b, 0x00a77d, 0x00a77e, 0x00a780, 0x00a780, 0x00a782, 0x00a782, 0x00a784, 0x00a784, 0x00a786, 0x00a786, 0x00a78b, 0x00a78b,
                         0x00a78d, 0x00a78d, 0x00a790, 0x00a790, 0x00a792, 0x00a792, 0x00a796, 0x00a796, 0x00a798, 0x00a798, 0x00a79a, 0x00a79a, 0x00a79c, 0x00a79c, 0x00a79e, 0x00a79e, 0x00a7a0,
                         0x00a7a0, 0x00a7a2, 0x00a7a2, 0x00a7a4, 0x00a7a4, 0x00a7a6, 0x00a7a6, 0x00a7a8, 0x00a7a8, 0x00a7aa, 0x00a7ae, 0x00a7b0, 0x00a7b4, 0x00a7b6, 0x00a7b6, 0x00a7b8, 0x00a7b8,
-                        0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7f5, 0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400,
-                        0x010427, 0x0104b0, 0x0104d3, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01d400, 0x01d419, 0x01d434, 0x01d44d, 0x01d468, 0x01d481, 0x01d49c, 0x01d49c,
-                        0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b5, 0x01d4d0, 0x01d4e9, 0x01d504, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d,
-                        0x01d514, 0x01d516, 0x01d51c, 0x01d538, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d56c, 0x01d585, 0x01d5a0, 0x01d5b9,
-                        0x01d5d4, 0x01d5ed, 0x01d608, 0x01d621, 0x01d63c, 0x01d655, 0x01d670, 0x01d689, 0x01d6a8, 0x01d6c0, 0x01d6e2, 0x01d6fa, 0x01d71c, 0x01d734, 0x01d756, 0x01d76e, 0x01d790,
-                        0x01d7a8, 0x01d7ca, 0x01d7ca, 0x01e900, 0x01e921));
+                        0x00a7ba, 0x00a7ba, 0x00a7bc, 0x00a7bc, 0x00a7be, 0x00a7be, 0x00a7c0, 0x00a7c0, 0x00a7c2, 0x00a7c2, 0x00a7c4, 0x00a7c7, 0x00a7c9, 0x00a7c9, 0x00a7d0, 0x00a7d0, 0x00a7d6,
+                        0x00a7d6, 0x00a7d8, 0x00a7d8, 0x00a7f5, 0x00a7f5, 0x00ff21, 0x00ff3a, 0x010400, 0x010427, 0x0104b0, 0x0104d3, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592,
+                        0x010594, 0x010595, 0x010c80, 0x010cb2, 0x0118a0, 0x0118bf, 0x016e40, 0x016e5f, 0x01d400, 0x01d419, 0x01d434, 0x01d44d, 0x01d468, 0x01d481, 0x01d49c, 0x01d49c, 0x01d49e,
+                        0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b5, 0x01d4d0, 0x01d4e9, 0x01d504, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514,
+                        0x01d516, 0x01d51c, 0x01d538, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d56c, 0x01d585, 0x01d5a0, 0x01d5b9, 0x01d5d4,
+                        0x01d5ed, 0x01d608, 0x01d621, 0x01d63c, 0x01d655, 0x01d670, 0x01d689, 0x01d6a8, 0x01d6c0, 0x01d6e2, 0x01d6fa, 0x01d71c, 0x01d734, 0x01d756, 0x01d76e, 0x01d790, 0x01d7a8,
+                        0x01d7ca, 0x01d7ca, 0x01e900, 0x01e921));
     }
 
     private static void populateGC_MC() {
@@ -2893,21 +2954,22 @@ private static void populateGC_MC() {
                         0x000bc2, 0x000bc6, 0x000bc8, 0x000bca, 0x000bcc, 0x000bd7, 0x000bd7, 0x000c01, 0x000c03, 0x000c41, 0x000c44, 0x000c82, 0x000c83, 0x000cbe, 0x000cbe, 0x000cc0, 0x000cc4,
                         0x000cc7, 0x000cc8, 0x000cca, 0x000ccb, 0x000cd5, 0x000cd6, 0x000d02, 0x000d03, 0x000d3e, 0x000d40, 0x000d46, 0x000d48, 0x000d4a, 0x000d4c, 0x000d57, 0x000d57, 0x000d82,
                         0x000d83, 0x000dcf, 0x000dd1, 0x000dd8, 0x000ddf, 0x000df2, 0x000df3, 0x000f3e, 0x000f3f, 0x000f7f, 0x000f7f, 0x00102b, 0x00102c, 0x001031, 0x001031, 0x001038, 0x001038,
-                        0x00103b, 0x00103c, 0x001056, 0x001057, 0x001062, 0x001064, 0x001067, 0x00106d, 0x001083, 0x001084, 0x001087, 0x00108c, 0x00108f, 0x00108f, 0x00109a, 0x00109c, 0x0017b6,
-                        0x0017b6, 0x0017be, 0x0017c5, 0x0017c7, 0x0017c8, 0x001923, 0x001926, 0x001929, 0x00192b, 0x001930, 0x001931, 0x001933, 0x001938, 0x001a19, 0x001a1a, 0x001a55, 0x001a55,
-                        0x001a57, 0x001a57, 0x001a61, 0x001a61, 0x001a63, 0x001a64, 0x001a6d, 0x001a72, 0x001b04, 0x001b04, 0x001b35, 0x001b35, 0x001b3b, 0x001b3b, 0x001b3d, 0x001b41, 0x001b43,
-                        0x001b44, 0x001b82, 0x001b82, 0x001ba1, 0x001ba1, 0x001ba6, 0x001ba7, 0x001baa, 0x001baa, 0x001be7, 0x001be7, 0x001bea, 0x001bec, 0x001bee, 0x001bee, 0x001bf2, 0x001bf3,
-                        0x001c24, 0x001c2b, 0x001c34, 0x001c35, 0x001ce1, 0x001ce1, 0x001cf7, 0x001cf7, 0x00302e, 0x00302f, 0x00a823, 0x00a824, 0x00a827, 0x00a827, 0x00a880, 0x00a881, 0x00a8b4,
-                        0x00a8c3, 0x00a952, 0x00a953, 0x00a983, 0x00a983, 0x00a9b4, 0x00a9b5, 0x00a9ba, 0x00a9bb, 0x00a9be, 0x00a9c0, 0x00aa2f, 0x00aa30, 0x00aa33, 0x00aa34, 0x00aa4d, 0x00aa4d,
-                        0x00aa7b, 0x00aa7b, 0x00aa7d, 0x00aa7d, 0x00aaeb, 0x00aaeb, 0x00aaee, 0x00aaef, 0x00aaf5, 0x00aaf5, 0x00abe3, 0x00abe4, 0x00abe6, 0x00abe7, 0x00abe9, 0x00abea, 0x00abec,
-                        0x00abec, 0x011000, 0x011000, 0x011002, 0x011002, 0x011082, 0x011082, 0x0110b0, 0x0110b2, 0x0110b7, 0x0110b8, 0x01112c, 0x01112c, 0x011145, 0x011146, 0x011182, 0x011182,
-                        0x0111b3, 0x0111b5, 0x0111bf, 0x0111c0, 0x0111ce, 0x0111ce, 0x01122c, 0x01122e, 0x011232, 0x011233, 0x011235, 0x011235, 0x0112e0, 0x0112e2, 0x011302, 0x011303, 0x01133e,
-                        0x01133f, 0x011341, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011357, 0x011357, 0x011362, 0x011363, 0x011435, 0x011437, 0x011440, 0x011441, 0x011445, 0x011445,
-                        0x0114b0, 0x0114b2, 0x0114b9, 0x0114b9, 0x0114bb, 0x0114be, 0x0114c1, 0x0114c1, 0x0115af, 0x0115b1, 0x0115b8, 0x0115bb, 0x0115be, 0x0115be, 0x011630, 0x011632, 0x01163b,
-                        0x01163c, 0x01163e, 0x01163e, 0x0116ac, 0x0116ac, 0x0116ae, 0x0116af, 0x0116b6, 0x0116b6, 0x011720, 0x011721, 0x011726, 0x011726, 0x01182c, 0x01182e, 0x011838, 0x011838,
-                        0x011930, 0x011935, 0x011937, 0x011938, 0x01193d, 0x01193d, 0x011940, 0x011940, 0x011942, 0x011942, 0x0119d1, 0x0119d3, 0x0119dc, 0x0119df, 0x0119e4, 0x0119e4, 0x011a39,
-                        0x011a39, 0x011a57, 0x011a58, 0x011a97, 0x011a97, 0x011c2f, 0x011c2f, 0x011c3e, 0x011c3e, 0x011ca9, 0x011ca9, 0x011cb1, 0x011cb1, 0x011cb4, 0x011cb4, 0x011d8a, 0x011d8e,
-                        0x011d93, 0x011d94, 0x011d96, 0x011d96, 0x011ef5, 0x011ef6, 0x016f51, 0x016f87, 0x016ff0, 0x016ff1, 0x01d165, 0x01d166, 0x01d16d, 0x01d172));
+                        0x00103b, 0x00103c, 0x001056, 0x001057, 0x001062, 0x001064, 0x001067, 0x00106d, 0x001083, 0x001084, 0x001087, 0x00108c, 0x00108f, 0x00108f, 0x00109a, 0x00109c, 0x001715,
+                        0x001715, 0x001734, 0x001734, 0x0017b6, 0x0017b6, 0x0017be, 0x0017c5, 0x0017c7, 0x0017c8, 0x001923, 0x001926, 0x001929, 0x00192b, 0x001930, 0x001931, 0x001933, 0x001938,
+                        0x001a19, 0x001a1a, 0x001a55, 0x001a55, 0x001a57, 0x001a57, 0x001a61, 0x001a61, 0x001a63, 0x001a64, 0x001a6d, 0x001a72, 0x001b04, 0x001b04, 0x001b35, 0x001b35, 0x001b3b,
+                        0x001b3b, 0x001b3d, 0x001b41, 0x001b43, 0x001b44, 0x001b82, 0x001b82, 0x001ba1, 0x001ba1, 0x001ba6, 0x001ba7, 0x001baa, 0x001baa, 0x001be7, 0x001be7, 0x001bea, 0x001bec,
+                        0x001bee, 0x001bee, 0x001bf2, 0x001bf3, 0x001c24, 0x001c2b, 0x001c34, 0x001c35, 0x001ce1, 0x001ce1, 0x001cf7, 0x001cf7, 0x00302e, 0x00302f, 0x00a823, 0x00a824, 0x00a827,
+                        0x00a827, 0x00a880, 0x00a881, 0x00a8b4, 0x00a8c3, 0x00a952, 0x00a953, 0x00a983, 0x00a983, 0x00a9b4, 0x00a9b5, 0x00a9ba, 0x00a9bb, 0x00a9be, 0x00a9c0, 0x00aa2f, 0x00aa30,
+                        0x00aa33, 0x00aa34, 0x00aa4d, 0x00aa4d, 0x00aa7b, 0x00aa7b, 0x00aa7d, 0x00aa7d, 0x00aaeb, 0x00aaeb, 0x00aaee, 0x00aaef, 0x00aaf5, 0x00aaf5, 0x00abe3, 0x00abe4, 0x00abe6,
+                        0x00abe7, 0x00abe9, 0x00abea, 0x00abec, 0x00abec, 0x011000, 0x011000, 0x011002, 0x011002, 0x011082, 0x011082, 0x0110b0, 0x0110b2, 0x0110b7, 0x0110b8, 0x01112c, 0x01112c,
+                        0x011145, 0x011146, 0x011182, 0x011182, 0x0111b3, 0x0111b5, 0x0111bf, 0x0111c0, 0x0111ce, 0x0111ce, 0x01122c, 0x01122e, 0x011232, 0x011233, 0x011235, 0x011235, 0x0112e0,
+                        0x0112e2, 0x011302, 0x011303, 0x01133e, 0x01133f, 0x011341, 0x011344, 0x011347, 0x011348, 0x01134b, 0x01134d, 0x011357, 0x011357, 0x011362, 0x011363, 0x011435, 0x011437,
+                        0x011440, 0x011441, 0x011445, 0x011445, 0x0114b0, 0x0114b2, 0x0114b9, 0x0114b9, 0x0114bb, 0x0114be, 0x0114c1, 0x0114c1, 0x0115af, 0x0115b1, 0x0115b8, 0x0115bb, 0x0115be,
+                        0x0115be, 0x011630, 0x011632, 0x01163b, 0x01163c, 0x01163e, 0x01163e, 0x0116ac, 0x0116ac, 0x0116ae, 0x0116af, 0x0116b6, 0x0116b6, 0x011720, 0x011721, 0x011726, 0x011726,
+                        0x01182c, 0x01182e, 0x011838, 0x011838, 0x011930, 0x011935, 0x011937, 0x011938, 0x01193d, 0x01193d, 0x011940, 0x011940, 0x011942, 0x011942, 0x0119d1, 0x0119d3, 0x0119dc,
+                        0x0119df, 0x0119e4, 0x0119e4, 0x011a39, 0x011a39, 0x011a57, 0x011a58, 0x011a97, 0x011a97, 0x011c2f, 0x011c2f, 0x011c3e, 0x011c3e, 0x011ca9, 0x011ca9, 0x011cb1, 0x011cb1,
+                        0x011cb4, 0x011cb4, 0x011d8a, 0x011d8e, 0x011d93, 0x011d94, 0x011d96, 0x011d96, 0x011ef5, 0x011ef6, 0x016f51, 0x016f87, 0x016ff0, 0x016ff1, 0x01d165, 0x01d166, 0x01d16d,
+                        0x01d172));
     }
 
     private static void populateGC_ME() {
@@ -2918,42 +2980,43 @@ private static void populateGC_MN() {
         SET_ENCODINGS.put("gc=Mn", CodePointSet.createNoDedup(0x000300, 0x00036f, 0x000483, 0x000487, 0x000591, 0x0005bd, 0x0005bf, 0x0005bf, 0x0005c1, 0x0005c2, 0x0005c4, 0x0005c5, 0x0005c7,
                         0x0005c7, 0x000610, 0x00061a, 0x00064b, 0x00065f, 0x000670, 0x000670, 0x0006d6, 0x0006dc, 0x0006df, 0x0006e4, 0x0006e7, 0x0006e8, 0x0006ea, 0x0006ed, 0x000711, 0x000711,
                         0x000730, 0x00074a, 0x0007a6, 0x0007b0, 0x0007eb, 0x0007f3, 0x0007fd, 0x0007fd, 0x000816, 0x000819, 0x00081b, 0x000823, 0x000825, 0x000827, 0x000829, 0x00082d, 0x000859,
-                        0x00085b, 0x0008d3, 0x0008e1, 0x0008e3, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d, 0x00094d, 0x000951, 0x000957, 0x000962, 0x000963,
-                        0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01, 0x000a02, 0x000a3c, 0x000a3c, 0x000a41,
-                        0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a82, 0x000abc, 0x000abc, 0x000ac1, 0x000ac5,
-                        0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01, 0x000b3c, 0x000b3c, 0x000b3f, 0x000b3f, 0x000b41, 0x000b44, 0x000b4d,
-                        0x000b4d, 0x000b55, 0x000b56, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bc0, 0x000bc0, 0x000bcd, 0x000bcd, 0x000c00, 0x000c00, 0x000c04, 0x000c04, 0x000c3e, 0x000c40,
-                        0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c81, 0x000cbc, 0x000cbc, 0x000cbf, 0x000cbf, 0x000cc6, 0x000cc6, 0x000ccc,
-                        0x000ccd, 0x000ce2, 0x000ce3, 0x000d00, 0x000d01, 0x000d3b, 0x000d3c, 0x000d41, 0x000d44, 0x000d4d, 0x000d4d, 0x000d62, 0x000d63, 0x000d81, 0x000d81, 0x000dca, 0x000dca,
-                        0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4, 0x000ebc, 0x000ec8, 0x000ecd, 0x000f18,
-                        0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f71, 0x000f7e, 0x000f80, 0x000f84, 0x000f86, 0x000f87, 0x000f8d, 0x000f97, 0x000f99, 0x000fbc,
-                        0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037, 0x001039, 0x00103a, 0x00103d, 0x00103e, 0x001058, 0x001059, 0x00105e, 0x001060, 0x001071, 0x001074, 0x001082,
-                        0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d, 0x00109d, 0x00135d, 0x00135f, 0x001712, 0x001714, 0x001732, 0x001734, 0x001752, 0x001753, 0x001772, 0x001773,
-                        0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd, 0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017dd, 0x0017dd, 0x00180b, 0x00180d, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920,
-                        0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17, 0x001a18, 0x001a1b, 0x001a1b, 0x001a56, 0x001a56, 0x001a58, 0x001a5e, 0x001a60, 0x001a60,
-                        0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f, 0x001ab0, 0x001abd, 0x001abf, 0x001ac0, 0x001b00, 0x001b03, 0x001b34, 0x001b34, 0x001b36,
-                        0x001b3a, 0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80, 0x001b81, 0x001ba2, 0x001ba5, 0x001ba8, 0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6,
-                        0x001be8, 0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33, 0x001c36, 0x001c37, 0x001cd0, 0x001cd2, 0x001cd4, 0x001ce0, 0x001ce2, 0x001ce8, 0x001ced,
-                        0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001df9, 0x001dfb, 0x001dff, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1, 0x0020e5, 0x0020f0, 0x002cef, 0x002cf1,
-                        0x002d7f, 0x002d7f, 0x002de0, 0x002dff, 0x00302a, 0x00302d, 0x003099, 0x00309a, 0x00a66f, 0x00a66f, 0x00a674, 0x00a67d, 0x00a69e, 0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a802,
-                        0x00a802, 0x00a806, 0x00a806, 0x00a80b, 0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0, 0x00a8f1, 0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d,
-                        0x00a947, 0x00a951, 0x00a980, 0x00a982, 0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9e5, 0x00a9e5, 0x00aa29, 0x00aa2e, 0x00aa31, 0x00aa32, 0x00aa35,
-                        0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4c, 0x00aa7c, 0x00aa7c, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8, 0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1,
-                        0x00aaec, 0x00aaed, 0x00aaf6, 0x00aaf6, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2f, 0x0101fd,
-                        0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a, 0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6,
-                        0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x011001, 0x011001, 0x011038, 0x011046, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x011100,
-                        0x011102, 0x011127, 0x01112b, 0x01112d, 0x011134, 0x011173, 0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf, 0x0111cf, 0x01122f, 0x011231,
-                        0x011234, 0x011234, 0x011236, 0x011237, 0x01123e, 0x01123e, 0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c, 0x011340, 0x011340, 0x011366,
-                        0x01136c, 0x011370, 0x011374, 0x011438, 0x01143f, 0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b3, 0x0114b8, 0x0114ba, 0x0114ba, 0x0114bf, 0x0114c0,
-                        0x0114c2, 0x0114c3, 0x0115b2, 0x0115b5, 0x0115bc, 0x0115bd, 0x0115bf, 0x0115c0, 0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d, 0x01163d, 0x01163f, 0x011640, 0x0116ab,
-                        0x0116ab, 0x0116ad, 0x0116ad, 0x0116b0, 0x0116b5, 0x0116b7, 0x0116b7, 0x01171d, 0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b, 0x01182f, 0x011837, 0x011839, 0x01183a,
-                        0x01193b, 0x01193c, 0x01193e, 0x01193e, 0x011943, 0x011943, 0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0, 0x0119e0, 0x011a01, 0x011a0a, 0x011a33, 0x011a38, 0x011a3b,
-                        0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a56, 0x011a59, 0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99, 0x011c30, 0x011c36, 0x011c38, 0x011c3d, 0x011c3f, 0x011c3f,
-                        0x011c92, 0x011ca7, 0x011caa, 0x011cb0, 0x011cb2, 0x011cb3, 0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47,
-                        0x011d47, 0x011d90, 0x011d91, 0x011d95, 0x011d95, 0x011d97, 0x011d97, 0x011ef3, 0x011ef4, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f4f, 0x016f4f, 0x016f8f, 0x016f92,
-                        0x016fe4, 0x016fe4, 0x01bc9d, 0x01bc9e, 0x01d167, 0x01d169, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b,
-                        0x01da6c, 0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024,
-                        0x01e026, 0x01e02a, 0x01e130, 0x01e136, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0100, 0x0e01ef));
+                        0x00085b, 0x000898, 0x00089f, 0x0008ca, 0x0008e1, 0x0008e3, 0x000902, 0x00093a, 0x00093a, 0x00093c, 0x00093c, 0x000941, 0x000948, 0x00094d, 0x00094d, 0x000951, 0x000957,
+                        0x000962, 0x000963, 0x000981, 0x000981, 0x0009bc, 0x0009bc, 0x0009c1, 0x0009c4, 0x0009cd, 0x0009cd, 0x0009e2, 0x0009e3, 0x0009fe, 0x0009fe, 0x000a01, 0x000a02, 0x000a3c,
+                        0x000a3c, 0x000a41, 0x000a42, 0x000a47, 0x000a48, 0x000a4b, 0x000a4d, 0x000a51, 0x000a51, 0x000a70, 0x000a71, 0x000a75, 0x000a75, 0x000a81, 0x000a82, 0x000abc, 0x000abc,
+                        0x000ac1, 0x000ac5, 0x000ac7, 0x000ac8, 0x000acd, 0x000acd, 0x000ae2, 0x000ae3, 0x000afa, 0x000aff, 0x000b01, 0x000b01, 0x000b3c, 0x000b3c, 0x000b3f, 0x000b3f, 0x000b41,
+                        0x000b44, 0x000b4d, 0x000b4d, 0x000b55, 0x000b56, 0x000b62, 0x000b63, 0x000b82, 0x000b82, 0x000bc0, 0x000bc0, 0x000bcd, 0x000bcd, 0x000c00, 0x000c00, 0x000c04, 0x000c04,
+                        0x000c3c, 0x000c3c, 0x000c3e, 0x000c40, 0x000c46, 0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c62, 0x000c63, 0x000c81, 0x000c81, 0x000cbc, 0x000cbc, 0x000cbf,
+                        0x000cbf, 0x000cc6, 0x000cc6, 0x000ccc, 0x000ccd, 0x000ce2, 0x000ce3, 0x000d00, 0x000d01, 0x000d3b, 0x000d3c, 0x000d41, 0x000d44, 0x000d4d, 0x000d4d, 0x000d62, 0x000d63,
+                        0x000d81, 0x000d81, 0x000dca, 0x000dca, 0x000dd2, 0x000dd4, 0x000dd6, 0x000dd6, 0x000e31, 0x000e31, 0x000e34, 0x000e3a, 0x000e47, 0x000e4e, 0x000eb1, 0x000eb1, 0x000eb4,
+                        0x000ebc, 0x000ec8, 0x000ecd, 0x000f18, 0x000f19, 0x000f35, 0x000f35, 0x000f37, 0x000f37, 0x000f39, 0x000f39, 0x000f71, 0x000f7e, 0x000f80, 0x000f84, 0x000f86, 0x000f87,
+                        0x000f8d, 0x000f97, 0x000f99, 0x000fbc, 0x000fc6, 0x000fc6, 0x00102d, 0x001030, 0x001032, 0x001037, 0x001039, 0x00103a, 0x00103d, 0x00103e, 0x001058, 0x001059, 0x00105e,
+                        0x001060, 0x001071, 0x001074, 0x001082, 0x001082, 0x001085, 0x001086, 0x00108d, 0x00108d, 0x00109d, 0x00109d, 0x00135d, 0x00135f, 0x001712, 0x001714, 0x001732, 0x001733,
+                        0x001752, 0x001753, 0x001772, 0x001773, 0x0017b4, 0x0017b5, 0x0017b7, 0x0017bd, 0x0017c6, 0x0017c6, 0x0017c9, 0x0017d3, 0x0017dd, 0x0017dd, 0x00180b, 0x00180d, 0x00180f,
+                        0x00180f, 0x001885, 0x001886, 0x0018a9, 0x0018a9, 0x001920, 0x001922, 0x001927, 0x001928, 0x001932, 0x001932, 0x001939, 0x00193b, 0x001a17, 0x001a18, 0x001a1b, 0x001a1b,
+                        0x001a56, 0x001a56, 0x001a58, 0x001a5e, 0x001a60, 0x001a60, 0x001a62, 0x001a62, 0x001a65, 0x001a6c, 0x001a73, 0x001a7c, 0x001a7f, 0x001a7f, 0x001ab0, 0x001abd, 0x001abf,
+                        0x001ace, 0x001b00, 0x001b03, 0x001b34, 0x001b34, 0x001b36, 0x001b3a, 0x001b3c, 0x001b3c, 0x001b42, 0x001b42, 0x001b6b, 0x001b73, 0x001b80, 0x001b81, 0x001ba2, 0x001ba5,
+                        0x001ba8, 0x001ba9, 0x001bab, 0x001bad, 0x001be6, 0x001be6, 0x001be8, 0x001be9, 0x001bed, 0x001bed, 0x001bef, 0x001bf1, 0x001c2c, 0x001c33, 0x001c36, 0x001c37, 0x001cd0,
+                        0x001cd2, 0x001cd4, 0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001dff, 0x0020d0, 0x0020dc, 0x0020e1, 0x0020e1,
+                        0x0020e5, 0x0020f0, 0x002cef, 0x002cf1, 0x002d7f, 0x002d7f, 0x002de0, 0x002dff, 0x00302a, 0x00302d, 0x003099, 0x00309a, 0x00a66f, 0x00a66f, 0x00a674, 0x00a67d, 0x00a69e,
+                        0x00a69f, 0x00a6f0, 0x00a6f1, 0x00a802, 0x00a802, 0x00a806, 0x00a806, 0x00a80b, 0x00a80b, 0x00a825, 0x00a826, 0x00a82c, 0x00a82c, 0x00a8c4, 0x00a8c5, 0x00a8e0, 0x00a8f1,
+                        0x00a8ff, 0x00a8ff, 0x00a926, 0x00a92d, 0x00a947, 0x00a951, 0x00a980, 0x00a982, 0x00a9b3, 0x00a9b3, 0x00a9b6, 0x00a9b9, 0x00a9bc, 0x00a9bd, 0x00a9e5, 0x00a9e5, 0x00aa29,
+                        0x00aa2e, 0x00aa31, 0x00aa32, 0x00aa35, 0x00aa36, 0x00aa43, 0x00aa43, 0x00aa4c, 0x00aa4c, 0x00aa7c, 0x00aa7c, 0x00aab0, 0x00aab0, 0x00aab2, 0x00aab4, 0x00aab7, 0x00aab8,
+                        0x00aabe, 0x00aabf, 0x00aac1, 0x00aac1, 0x00aaec, 0x00aaed, 0x00aaf6, 0x00aaf6, 0x00abe5, 0x00abe5, 0x00abe8, 0x00abe8, 0x00abed, 0x00abed, 0x00fb1e, 0x00fb1e, 0x00fe00,
+                        0x00fe0f, 0x00fe20, 0x00fe2f, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x010376, 0x01037a, 0x010a01, 0x010a03, 0x010a05, 0x010a06, 0x010a0c, 0x010a0f, 0x010a38, 0x010a3a,
+                        0x010a3f, 0x010a3f, 0x010ae5, 0x010ae6, 0x010d24, 0x010d27, 0x010eab, 0x010eac, 0x010f46, 0x010f50, 0x010f82, 0x010f85, 0x011001, 0x011001, 0x011038, 0x011046, 0x011070,
+                        0x011070, 0x011073, 0x011074, 0x01107f, 0x011081, 0x0110b3, 0x0110b6, 0x0110b9, 0x0110ba, 0x0110c2, 0x0110c2, 0x011100, 0x011102, 0x011127, 0x01112b, 0x01112d, 0x011134,
+                        0x011173, 0x011173, 0x011180, 0x011181, 0x0111b6, 0x0111be, 0x0111c9, 0x0111cc, 0x0111cf, 0x0111cf, 0x01122f, 0x011231, 0x011234, 0x011234, 0x011236, 0x011237, 0x01123e,
+                        0x01123e, 0x0112df, 0x0112df, 0x0112e3, 0x0112ea, 0x011300, 0x011301, 0x01133b, 0x01133c, 0x011340, 0x011340, 0x011366, 0x01136c, 0x011370, 0x011374, 0x011438, 0x01143f,
+                        0x011442, 0x011444, 0x011446, 0x011446, 0x01145e, 0x01145e, 0x0114b3, 0x0114b8, 0x0114ba, 0x0114ba, 0x0114bf, 0x0114c0, 0x0114c2, 0x0114c3, 0x0115b2, 0x0115b5, 0x0115bc,
+                        0x0115bd, 0x0115bf, 0x0115c0, 0x0115dc, 0x0115dd, 0x011633, 0x01163a, 0x01163d, 0x01163d, 0x01163f, 0x011640, 0x0116ab, 0x0116ab, 0x0116ad, 0x0116ad, 0x0116b0, 0x0116b5,
+                        0x0116b7, 0x0116b7, 0x01171d, 0x01171f, 0x011722, 0x011725, 0x011727, 0x01172b, 0x01182f, 0x011837, 0x011839, 0x01183a, 0x01193b, 0x01193c, 0x01193e, 0x01193e, 0x011943,
+                        0x011943, 0x0119d4, 0x0119d7, 0x0119da, 0x0119db, 0x0119e0, 0x0119e0, 0x011a01, 0x011a0a, 0x011a33, 0x011a38, 0x011a3b, 0x011a3e, 0x011a47, 0x011a47, 0x011a51, 0x011a56,
+                        0x011a59, 0x011a5b, 0x011a8a, 0x011a96, 0x011a98, 0x011a99, 0x011c30, 0x011c36, 0x011c38, 0x011c3d, 0x011c3f, 0x011c3f, 0x011c92, 0x011ca7, 0x011caa, 0x011cb0, 0x011cb2,
+                        0x011cb3, 0x011cb5, 0x011cb6, 0x011d31, 0x011d36, 0x011d3a, 0x011d3a, 0x011d3c, 0x011d3d, 0x011d3f, 0x011d45, 0x011d47, 0x011d47, 0x011d90, 0x011d91, 0x011d95, 0x011d95,
+                        0x011d97, 0x011d97, 0x011ef3, 0x011ef4, 0x016af0, 0x016af4, 0x016b30, 0x016b36, 0x016f4f, 0x016f4f, 0x016f8f, 0x016f92, 0x016fe4, 0x016fe4, 0x01bc9d, 0x01bc9e, 0x01cf00,
+                        0x01cf2d, 0x01cf30, 0x01cf46, 0x01d167, 0x01d169, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x01d242, 0x01d244, 0x01da00, 0x01da36, 0x01da3b, 0x01da6c,
+                        0x01da75, 0x01da75, 0x01da84, 0x01da84, 0x01da9b, 0x01da9f, 0x01daa1, 0x01daaf, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026,
+                        0x01e02a, 0x01e130, 0x01e136, 0x01e2ae, 0x01e2ae, 0x01e2ec, 0x01e2ef, 0x01e8d0, 0x01e8d6, 0x01e944, 0x01e94a, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateGC_ND() {
@@ -2964,8 +3027,8 @@ private static void populateGC_ND() {
                                         0x001a89, 0x001a90, 0x001a99, 0x001b50, 0x001b59, 0x001bb0, 0x001bb9, 0x001c40, 0x001c49, 0x001c50, 0x001c59, 0x00a620, 0x00a629, 0x00a8d0, 0x00a8d9, 0x00a900,
                                         0x00a909, 0x00a9d0, 0x00a9d9, 0x00a9f0, 0x00a9f9, 0x00aa50, 0x00aa59, 0x00abf0, 0x00abf9, 0x00ff10, 0x00ff19, 0x0104a0, 0x0104a9, 0x010d30, 0x010d39, 0x011066,
                                         0x01106f, 0x0110f0, 0x0110f9, 0x011136, 0x01113f, 0x0111d0, 0x0111d9, 0x0112f0, 0x0112f9, 0x011450, 0x011459, 0x0114d0, 0x0114d9, 0x011650, 0x011659, 0x0116c0,
-                                        0x0116c9, 0x011730, 0x011739, 0x0118e0, 0x0118e9, 0x011950, 0x011959, 0x011c50, 0x011c59, 0x011d50, 0x011d59, 0x011da0, 0x011da9, 0x016a60, 0x016a69, 0x016b50,
-                                        0x016b59, 0x01d7ce, 0x01d7ff, 0x01e140, 0x01e149, 0x01e2f0, 0x01e2f9, 0x01e950, 0x01e959, 0x01fbf0, 0x01fbf9));
+                                        0x0116c9, 0x011730, 0x011739, 0x0118e0, 0x0118e9, 0x011950, 0x011959, 0x011c50, 0x011c59, 0x011d50, 0x011d59, 0x011da0, 0x011da9, 0x016a60, 0x016a69, 0x016ac0,
+                                        0x016ac9, 0x016b50, 0x016b59, 0x01d7ce, 0x01d7ff, 0x01e140, 0x01e149, 0x01e2f0, 0x01e2f9, 0x01e950, 0x01e959, 0x01fbf0, 0x01fbf9));
     }
 
     private static void populateGC_NL() {
@@ -2993,20 +3056,22 @@ private static void populateGC_PC() {
     private static void populateGC_PD() {
         SET_ENCODINGS.put("gc=Pd",
                         CodePointSet.createNoDedup(0x00002d, 0x00002d, 0x00058a, 0x00058a, 0x0005be, 0x0005be, 0x001400, 0x001400, 0x001806, 0x001806, 0x002010, 0x002015, 0x002e17, 0x002e17, 0x002e1a,
-                                        0x002e1a, 0x002e3a, 0x002e3b, 0x002e40, 0x002e40, 0x00301c, 0x00301c, 0x003030, 0x003030, 0x0030a0, 0x0030a0, 0x00fe31, 0x00fe32, 0x00fe58, 0x00fe58, 0x00fe63,
-                                        0x00fe63, 0x00ff0d, 0x00ff0d, 0x010ead, 0x010ead));
+                                        0x002e1a, 0x002e3a, 0x002e3b, 0x002e40, 0x002e40, 0x002e5d, 0x002e5d, 0x00301c, 0x00301c, 0x003030, 0x003030, 0x0030a0, 0x0030a0, 0x00fe31, 0x00fe32, 0x00fe58,
+                                        0x00fe58, 0x00fe63, 0x00fe63, 0x00ff0d, 0x00ff0d, 0x010ead, 0x010ead));
     }
 
     private static void populateGC_PE() {
-        SET_ENCODINGS.put("gc=Pe", CodePointSet.createNoDedup(0x000029, 0x000029, 0x00005d, 0x00005d, 0x00007d, 0x00007d, 0x000f3b, 0x000f3b, 0x000f3d, 0x000f3d, 0x00169c, 0x00169c, 0x002046,
-                        0x002046, 0x00207e, 0x00207e, 0x00208e, 0x00208e, 0x002309, 0x002309, 0x00230b, 0x00230b, 0x00232a, 0x00232a, 0x002769, 0x002769, 0x00276b, 0x00276b, 0x00276d, 0x00276d,
-                        0x00276f, 0x00276f, 0x002771, 0x002771, 0x002773, 0x002773, 0x002775, 0x002775, 0x0027c6, 0x0027c6, 0x0027e7, 0x0027e7, 0x0027e9, 0x0027e9, 0x0027eb, 0x0027eb, 0x0027ed,
-                        0x0027ed, 0x0027ef, 0x0027ef, 0x002984, 0x002984, 0x002986, 0x002986, 0x002988, 0x002988, 0x00298a, 0x00298a, 0x00298c, 0x00298c, 0x00298e, 0x00298e, 0x002990, 0x002990,
-                        0x002992, 0x002992, 0x002994, 0x002994, 0x002996, 0x002996, 0x002998, 0x002998, 0x0029d9, 0x0029d9, 0x0029db, 0x0029db, 0x0029fd, 0x0029fd, 0x002e23, 0x002e23, 0x002e25,
-                        0x002e25, 0x002e27, 0x002e27, 0x002e29, 0x002e29, 0x003009, 0x003009, 0x00300b, 0x00300b, 0x00300d, 0x00300d, 0x00300f, 0x00300f, 0x003011, 0x003011, 0x003015, 0x003015,
-                        0x003017, 0x003017, 0x003019, 0x003019, 0x00301b, 0x00301b, 0x00301e, 0x00301f, 0x00fd3e, 0x00fd3e, 0x00fe18, 0x00fe18, 0x00fe36, 0x00fe36, 0x00fe38, 0x00fe38, 0x00fe3a,
-                        0x00fe3a, 0x00fe3c, 0x00fe3c, 0x00fe3e, 0x00fe3e, 0x00fe40, 0x00fe40, 0x00fe42, 0x00fe42, 0x00fe44, 0x00fe44, 0x00fe48, 0x00fe48, 0x00fe5a, 0x00fe5a, 0x00fe5c, 0x00fe5c,
-                        0x00fe5e, 0x00fe5e, 0x00ff09, 0x00ff09, 0x00ff3d, 0x00ff3d, 0x00ff5d, 0x00ff5d, 0x00ff60, 0x00ff60, 0x00ff63, 0x00ff63));
+        SET_ENCODINGS.put("gc=Pe",
+                        CodePointSet.createNoDedup(0x000029, 0x000029, 0x00005d, 0x00005d, 0x00007d, 0x00007d, 0x000f3b, 0x000f3b, 0x000f3d, 0x000f3d, 0x00169c, 0x00169c, 0x002046, 0x002046, 0x00207e,
+                                        0x00207e, 0x00208e, 0x00208e, 0x002309, 0x002309, 0x00230b, 0x00230b, 0x00232a, 0x00232a, 0x002769, 0x002769, 0x00276b, 0x00276b, 0x00276d, 0x00276d, 0x00276f,
+                                        0x00276f, 0x002771, 0x002771, 0x002773, 0x002773, 0x002775, 0x002775, 0x0027c6, 0x0027c6, 0x0027e7, 0x0027e7, 0x0027e9, 0x0027e9, 0x0027eb, 0x0027eb, 0x0027ed,
+                                        0x0027ed, 0x0027ef, 0x0027ef, 0x002984, 0x002984, 0x002986, 0x002986, 0x002988, 0x002988, 0x00298a, 0x00298a, 0x00298c, 0x00298c, 0x00298e, 0x00298e, 0x002990,
+                                        0x002990, 0x002992, 0x002992, 0x002994, 0x002994, 0x002996, 0x002996, 0x002998, 0x002998, 0x0029d9, 0x0029d9, 0x0029db, 0x0029db, 0x0029fd, 0x0029fd, 0x002e23,
+                                        0x002e23, 0x002e25, 0x002e25, 0x002e27, 0x002e27, 0x002e29, 0x002e29, 0x002e56, 0x002e56, 0x002e58, 0x002e58, 0x002e5a, 0x002e5a, 0x002e5c, 0x002e5c, 0x003009,
+                                        0x003009, 0x00300b, 0x00300b, 0x00300d, 0x00300d, 0x00300f, 0x00300f, 0x003011, 0x003011, 0x003015, 0x003015, 0x003017, 0x003017, 0x003019, 0x003019, 0x00301b,
+                                        0x00301b, 0x00301e, 0x00301f, 0x00fd3e, 0x00fd3e, 0x00fe18, 0x00fe18, 0x00fe36, 0x00fe36, 0x00fe38, 0x00fe38, 0x00fe3a, 0x00fe3a, 0x00fe3c, 0x00fe3c, 0x00fe3e,
+                                        0x00fe3e, 0x00fe40, 0x00fe40, 0x00fe42, 0x00fe42, 0x00fe44, 0x00fe44, 0x00fe48, 0x00fe48, 0x00fe5a, 0x00fe5a, 0x00fe5c, 0x00fe5c, 0x00fe5e, 0x00fe5e, 0x00ff09,
+                                        0x00ff09, 0x00ff3d, 0x00ff3d, 0x00ff5d, 0x00ff5d, 0x00ff60, 0x00ff60, 0x00ff63, 0x00ff63));
     }
 
     private static void populateGC_PF() {
@@ -3022,26 +3087,26 @@ private static void populateGC_PI() {
     private static void populateGC_PO() {
         SET_ENCODINGS.put("gc=Po", CodePointSet.createNoDedup(0x000021, 0x000023, 0x000025, 0x000027, 0x00002a, 0x00002a, 0x00002c, 0x00002c, 0x00002e, 0x00002f, 0x00003a, 0x00003b, 0x00003f,
                         0x000040, 0x00005c, 0x00005c, 0x0000a1, 0x0000a1, 0x0000a7, 0x0000a7, 0x0000b6, 0x0000b7, 0x0000bf, 0x0000bf, 0x00037e, 0x00037e, 0x000387, 0x000387, 0x00055a, 0x00055f,
-                        0x000589, 0x000589, 0x0005c0, 0x0005c0, 0x0005c3, 0x0005c3, 0x0005c6, 0x0005c6, 0x0005f3, 0x0005f4, 0x000609, 0x00060a, 0x00060c, 0x00060d, 0x00061b, 0x00061b, 0x00061e,
+                        0x000589, 0x000589, 0x0005c0, 0x0005c0, 0x0005c3, 0x0005c3, 0x0005c6, 0x0005c6, 0x0005f3, 0x0005f4, 0x000609, 0x00060a, 0x00060c, 0x00060d, 0x00061b, 0x00061b, 0x00061d,
                         0x00061f, 0x00066a, 0x00066d, 0x0006d4, 0x0006d4, 0x000700, 0x00070d, 0x0007f7, 0x0007f9, 0x000830, 0x00083e, 0x00085e, 0x00085e, 0x000964, 0x000965, 0x000970, 0x000970,
                         0x0009fd, 0x0009fd, 0x000a76, 0x000a76, 0x000af0, 0x000af0, 0x000c77, 0x000c77, 0x000c84, 0x000c84, 0x000df4, 0x000df4, 0x000e4f, 0x000e4f, 0x000e5a, 0x000e5b, 0x000f04,
                         0x000f12, 0x000f14, 0x000f14, 0x000f85, 0x000f85, 0x000fd0, 0x000fd4, 0x000fd9, 0x000fda, 0x00104a, 0x00104f, 0x0010fb, 0x0010fb, 0x001360, 0x001368, 0x00166e, 0x00166e,
                         0x0016eb, 0x0016ed, 0x001735, 0x001736, 0x0017d4, 0x0017d6, 0x0017d8, 0x0017da, 0x001800, 0x001805, 0x001807, 0x00180a, 0x001944, 0x001945, 0x001a1e, 0x001a1f, 0x001aa0,
-                        0x001aa6, 0x001aa8, 0x001aad, 0x001b5a, 0x001b60, 0x001bfc, 0x001bff, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x001cc0, 0x001cc7, 0x001cd3, 0x001cd3, 0x002016, 0x002017,
-                        0x002020, 0x002027, 0x002030, 0x002038, 0x00203b, 0x00203e, 0x002041, 0x002043, 0x002047, 0x002051, 0x002053, 0x002053, 0x002055, 0x00205e, 0x002cf9, 0x002cfc, 0x002cfe,
-                        0x002cff, 0x002d70, 0x002d70, 0x002e00, 0x002e01, 0x002e06, 0x002e08, 0x002e0b, 0x002e0b, 0x002e0e, 0x002e16, 0x002e18, 0x002e19, 0x002e1b, 0x002e1b, 0x002e1e, 0x002e1f,
-                        0x002e2a, 0x002e2e, 0x002e30, 0x002e39, 0x002e3c, 0x002e3f, 0x002e41, 0x002e41, 0x002e43, 0x002e4f, 0x002e52, 0x002e52, 0x003001, 0x003003, 0x00303d, 0x00303d, 0x0030fb,
-                        0x0030fb, 0x00a4fe, 0x00a4ff, 0x00a60d, 0x00a60f, 0x00a673, 0x00a673, 0x00a67e, 0x00a67e, 0x00a6f2, 0x00a6f7, 0x00a874, 0x00a877, 0x00a8ce, 0x00a8cf, 0x00a8f8, 0x00a8fa,
-                        0x00a8fc, 0x00a8fc, 0x00a92e, 0x00a92f, 0x00a95f, 0x00a95f, 0x00a9c1, 0x00a9cd, 0x00a9de, 0x00a9df, 0x00aa5c, 0x00aa5f, 0x00aade, 0x00aadf, 0x00aaf0, 0x00aaf1, 0x00abeb,
-                        0x00abeb, 0x00fe10, 0x00fe16, 0x00fe19, 0x00fe19, 0x00fe30, 0x00fe30, 0x00fe45, 0x00fe46, 0x00fe49, 0x00fe4c, 0x00fe50, 0x00fe52, 0x00fe54, 0x00fe57, 0x00fe5f, 0x00fe61,
-                        0x00fe68, 0x00fe68, 0x00fe6a, 0x00fe6b, 0x00ff01, 0x00ff03, 0x00ff05, 0x00ff07, 0x00ff0a, 0x00ff0a, 0x00ff0c, 0x00ff0c, 0x00ff0e, 0x00ff0f, 0x00ff1a, 0x00ff1b, 0x00ff1f,
-                        0x00ff20, 0x00ff3c, 0x00ff3c, 0x00ff61, 0x00ff61, 0x00ff64, 0x00ff65, 0x010100, 0x010102, 0x01039f, 0x01039f, 0x0103d0, 0x0103d0, 0x01056f, 0x01056f, 0x010857, 0x010857,
-                        0x01091f, 0x01091f, 0x01093f, 0x01093f, 0x010a50, 0x010a58, 0x010a7f, 0x010a7f, 0x010af0, 0x010af6, 0x010b39, 0x010b3f, 0x010b99, 0x010b9c, 0x010f55, 0x010f59, 0x011047,
-                        0x01104d, 0x0110bb, 0x0110bc, 0x0110be, 0x0110c1, 0x011140, 0x011143, 0x011174, 0x011175, 0x0111c5, 0x0111c8, 0x0111cd, 0x0111cd, 0x0111db, 0x0111db, 0x0111dd, 0x0111df,
-                        0x011238, 0x01123d, 0x0112a9, 0x0112a9, 0x01144b, 0x01144f, 0x01145a, 0x01145b, 0x01145d, 0x01145d, 0x0114c6, 0x0114c6, 0x0115c1, 0x0115d7, 0x011641, 0x011643, 0x011660,
-                        0x01166c, 0x01173c, 0x01173e, 0x01183b, 0x01183b, 0x011944, 0x011946, 0x0119e2, 0x0119e2, 0x011a3f, 0x011a46, 0x011a9a, 0x011a9c, 0x011a9e, 0x011aa2, 0x011c41, 0x011c45,
-                        0x011c70, 0x011c71, 0x011ef7, 0x011ef8, 0x011fff, 0x011fff, 0x012470, 0x012474, 0x016a6e, 0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b3b, 0x016b44, 0x016b44, 0x016e97,
-                        0x016e9a, 0x016fe2, 0x016fe2, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8b, 0x01e95e, 0x01e95f));
+                        0x001aa6, 0x001aa8, 0x001aad, 0x001b5a, 0x001b60, 0x001b7d, 0x001b7e, 0x001bfc, 0x001bff, 0x001c3b, 0x001c3f, 0x001c7e, 0x001c7f, 0x001cc0, 0x001cc7, 0x001cd3, 0x001cd3,
+                        0x002016, 0x002017, 0x002020, 0x002027, 0x002030, 0x002038, 0x00203b, 0x00203e, 0x002041, 0x002043, 0x002047, 0x002051, 0x002053, 0x002053, 0x002055, 0x00205e, 0x002cf9,
+                        0x002cfc, 0x002cfe, 0x002cff, 0x002d70, 0x002d70, 0x002e00, 0x002e01, 0x002e06, 0x002e08, 0x002e0b, 0x002e0b, 0x002e0e, 0x002e16, 0x002e18, 0x002e19, 0x002e1b, 0x002e1b,
+                        0x002e1e, 0x002e1f, 0x002e2a, 0x002e2e, 0x002e30, 0x002e39, 0x002e3c, 0x002e3f, 0x002e41, 0x002e41, 0x002e43, 0x002e4f, 0x002e52, 0x002e54, 0x003001, 0x003003, 0x00303d,
+                        0x00303d, 0x0030fb, 0x0030fb, 0x00a4fe, 0x00a4ff, 0x00a60d, 0x00a60f, 0x00a673, 0x00a673, 0x00a67e, 0x00a67e, 0x00a6f2, 0x00a6f7, 0x00a874, 0x00a877, 0x00a8ce, 0x00a8cf,
+                        0x00a8f8, 0x00a8fa, 0x00a8fc, 0x00a8fc, 0x00a92e, 0x00a92f, 0x00a95f, 0x00a95f, 0x00a9c1, 0x00a9cd, 0x00a9de, 0x00a9df, 0x00aa5c, 0x00aa5f, 0x00aade, 0x00aadf, 0x00aaf0,
+                        0x00aaf1, 0x00abeb, 0x00abeb, 0x00fe10, 0x00fe16, 0x00fe19, 0x00fe19, 0x00fe30, 0x00fe30, 0x00fe45, 0x00fe46, 0x00fe49, 0x00fe4c, 0x00fe50, 0x00fe52, 0x00fe54, 0x00fe57,
+                        0x00fe5f, 0x00fe61, 0x00fe68, 0x00fe68, 0x00fe6a, 0x00fe6b, 0x00ff01, 0x00ff03, 0x00ff05, 0x00ff07, 0x00ff0a, 0x00ff0a, 0x00ff0c, 0x00ff0c, 0x00ff0e, 0x00ff0f, 0x00ff1a,
+                        0x00ff1b, 0x00ff1f, 0x00ff20, 0x00ff3c, 0x00ff3c, 0x00ff61, 0x00ff61, 0x00ff64, 0x00ff65, 0x010100, 0x010102, 0x01039f, 0x01039f, 0x0103d0, 0x0103d0, 0x01056f, 0x01056f,
+                        0x010857, 0x010857, 0x01091f, 0x01091f, 0x01093f, 0x01093f, 0x010a50, 0x010a58, 0x010a7f, 0x010a7f, 0x010af0, 0x010af6, 0x010b39, 0x010b3f, 0x010b99, 0x010b9c, 0x010f55,
+                        0x010f59, 0x010f86, 0x010f89, 0x011047, 0x01104d, 0x0110bb, 0x0110bc, 0x0110be, 0x0110c1, 0x011140, 0x011143, 0x011174, 0x011175, 0x0111c5, 0x0111c8, 0x0111cd, 0x0111cd,
+                        0x0111db, 0x0111db, 0x0111dd, 0x0111df, 0x011238, 0x01123d, 0x0112a9, 0x0112a9, 0x01144b, 0x01144f, 0x01145a, 0x01145b, 0x01145d, 0x01145d, 0x0114c6, 0x0114c6, 0x0115c1,
+                        0x0115d7, 0x011641, 0x011643, 0x011660, 0x01166c, 0x0116b9, 0x0116b9, 0x01173c, 0x01173e, 0x01183b, 0x01183b, 0x011944, 0x011946, 0x0119e2, 0x0119e2, 0x011a3f, 0x011a46,
+                        0x011a9a, 0x011a9c, 0x011a9e, 0x011aa2, 0x011c41, 0x011c45, 0x011c70, 0x011c71, 0x011ef7, 0x011ef8, 0x011fff, 0x011fff, 0x012470, 0x012474, 0x012ff1, 0x012ff2, 0x016a6e,
+                        0x016a6f, 0x016af5, 0x016af5, 0x016b37, 0x016b3b, 0x016b44, 0x016b44, 0x016e97, 0x016e9a, 0x016fe2, 0x016fe2, 0x01bc9f, 0x01bc9f, 0x01da87, 0x01da8b, 0x01e95e, 0x01e95f));
     }
 
     private static void populateGC_PS() {
@@ -3051,26 +3116,26 @@ private static void populateGC_PS() {
                                         0x00276a, 0x00276c, 0x00276c, 0x00276e, 0x00276e, 0x002770, 0x002770, 0x002772, 0x002772, 0x002774, 0x002774, 0x0027c5, 0x0027c5, 0x0027e6, 0x0027e6, 0x0027e8,
                                         0x0027e8, 0x0027ea, 0x0027ea, 0x0027ec, 0x0027ec, 0x0027ee, 0x0027ee, 0x002983, 0x002983, 0x002985, 0x002985, 0x002987, 0x002987, 0x002989, 0x002989, 0x00298b,
                                         0x00298b, 0x00298d, 0x00298d, 0x00298f, 0x00298f, 0x002991, 0x002991, 0x002993, 0x002993, 0x002995, 0x002995, 0x002997, 0x002997, 0x0029d8, 0x0029d8, 0x0029da,
-                                        0x0029da, 0x0029fc, 0x0029fc, 0x002e22, 0x002e22, 0x002e24, 0x002e24, 0x002e26, 0x002e26, 0x002e28, 0x002e28, 0x002e42, 0x002e42, 0x003008, 0x003008, 0x00300a,
-                                        0x00300a, 0x00300c, 0x00300c, 0x00300e, 0x00300e, 0x003010, 0x003010, 0x003014, 0x003014, 0x003016, 0x003016, 0x003018, 0x003018, 0x00301a, 0x00301a, 0x00301d,
-                                        0x00301d, 0x00fd3f, 0x00fd3f, 0x00fe17, 0x00fe17, 0x00fe35, 0x00fe35, 0x00fe37, 0x00fe37, 0x00fe39, 0x00fe39, 0x00fe3b, 0x00fe3b, 0x00fe3d, 0x00fe3d, 0x00fe3f,
-                                        0x00fe3f, 0x00fe41, 0x00fe41, 0x00fe43, 0x00fe43, 0x00fe47, 0x00fe47, 0x00fe59, 0x00fe59, 0x00fe5b, 0x00fe5b, 0x00fe5d, 0x00fe5d, 0x00ff08, 0x00ff08, 0x00ff3b,
-                                        0x00ff3b, 0x00ff5b, 0x00ff5b, 0x00ff5f, 0x00ff5f, 0x00ff62, 0x00ff62));
+                                        0x0029da, 0x0029fc, 0x0029fc, 0x002e22, 0x002e22, 0x002e24, 0x002e24, 0x002e26, 0x002e26, 0x002e28, 0x002e28, 0x002e42, 0x002e42, 0x002e55, 0x002e55, 0x002e57,
+                                        0x002e57, 0x002e59, 0x002e59, 0x002e5b, 0x002e5b, 0x003008, 0x003008, 0x00300a, 0x00300a, 0x00300c, 0x00300c, 0x00300e, 0x00300e, 0x003010, 0x003010, 0x003014,
+                                        0x003014, 0x003016, 0x003016, 0x003018, 0x003018, 0x00301a, 0x00301a, 0x00301d, 0x00301d, 0x00fd3f, 0x00fd3f, 0x00fe17, 0x00fe17, 0x00fe35, 0x00fe35, 0x00fe37,
+                                        0x00fe37, 0x00fe39, 0x00fe39, 0x00fe3b, 0x00fe3b, 0x00fe3d, 0x00fe3d, 0x00fe3f, 0x00fe3f, 0x00fe41, 0x00fe41, 0x00fe43, 0x00fe43, 0x00fe47, 0x00fe47, 0x00fe59,
+                                        0x00fe59, 0x00fe5b, 0x00fe5b, 0x00fe5d, 0x00fe5d, 0x00ff08, 0x00ff08, 0x00ff3b, 0x00ff3b, 0x00ff5b, 0x00ff5b, 0x00ff5f, 0x00ff5f, 0x00ff62, 0x00ff62));
     }
 
     private static void populateGC_SC() {
         SET_ENCODINGS.put("gc=Sc",
                         CodePointSet.createNoDedup(0x000024, 0x000024, 0x0000a2, 0x0000a5, 0x00058f, 0x00058f, 0x00060b, 0x00060b, 0x0007fe, 0x0007ff, 0x0009f2, 0x0009f3, 0x0009fb, 0x0009fb, 0x000af1,
-                                        0x000af1, 0x000bf9, 0x000bf9, 0x000e3f, 0x000e3f, 0x0017db, 0x0017db, 0x0020a0, 0x0020bf, 0x00a838, 0x00a838, 0x00fdfc, 0x00fdfc, 0x00fe69, 0x00fe69, 0x00ff04,
+                                        0x000af1, 0x000bf9, 0x000bf9, 0x000e3f, 0x000e3f, 0x0017db, 0x0017db, 0x0020a0, 0x0020c0, 0x00a838, 0x00a838, 0x00fdfc, 0x00fdfc, 0x00fe69, 0x00fe69, 0x00ff04,
                                         0x00ff04, 0x00ffe0, 0x00ffe1, 0x00ffe5, 0x00ffe6, 0x011fdd, 0x011fe0, 0x01e2ff, 0x01e2ff, 0x01ecb0, 0x01ecb0));
     }
 
     private static void populateGC_SK() {
         SET_ENCODINGS.put("gc=Sk",
                         CodePointSet.createNoDedup(0x00005e, 0x00005e, 0x000060, 0x000060, 0x0000a8, 0x0000a8, 0x0000af, 0x0000af, 0x0000b4, 0x0000b4, 0x0000b8, 0x0000b8, 0x0002c2, 0x0002c5, 0x0002d2,
-                                        0x0002df, 0x0002e5, 0x0002eb, 0x0002ed, 0x0002ed, 0x0002ef, 0x0002ff, 0x000375, 0x000375, 0x000384, 0x000385, 0x001fbd, 0x001fbd, 0x001fbf, 0x001fc1, 0x001fcd,
-                                        0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x00309b, 0x00309c, 0x00a700, 0x00a716, 0x00a720, 0x00a721, 0x00a789, 0x00a78a, 0x00ab5b,
-                                        0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fbb2, 0x00fbc1, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40, 0x00ffe3, 0x00ffe3, 0x01f3fb, 0x01f3ff));
+                                        0x0002df, 0x0002e5, 0x0002eb, 0x0002ed, 0x0002ed, 0x0002ef, 0x0002ff, 0x000375, 0x000375, 0x000384, 0x000385, 0x000888, 0x000888, 0x001fbd, 0x001fbd, 0x001fbf,
+                                        0x001fc1, 0x001fcd, 0x001fcf, 0x001fdd, 0x001fdf, 0x001fed, 0x001fef, 0x001ffd, 0x001ffe, 0x00309b, 0x00309c, 0x00a700, 0x00a716, 0x00a720, 0x00a721, 0x00a789,
+                                        0x00a78a, 0x00ab5b, 0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fbb2, 0x00fbc2, 0x00ff3e, 0x00ff3e, 0x00ff40, 0x00ff40, 0x00ffe3, 0x00ffe3, 0x01f3fb, 0x01f3ff));
     }
 
     private static void populateGC_SM() {
@@ -3097,16 +3162,17 @@ private static void populateGC_SO() {
                         0x0027bf, 0x002800, 0x0028ff, 0x002b00, 0x002b2f, 0x002b45, 0x002b46, 0x002b4d, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002bff, 0x002ce5, 0x002cea, 0x002e50, 0x002e51,
                         0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x002ff0, 0x002ffb, 0x003004, 0x003004, 0x003012, 0x003013, 0x003020, 0x003020, 0x003036, 0x003037, 0x00303e,
                         0x00303f, 0x003190, 0x003191, 0x003196, 0x00319f, 0x0031c0, 0x0031e3, 0x003200, 0x00321e, 0x00322a, 0x003247, 0x003250, 0x003250, 0x003260, 0x00327f, 0x00328a, 0x0032b0,
-                        0x0032c0, 0x0033ff, 0x004dc0, 0x004dff, 0x00a490, 0x00a4c6, 0x00a828, 0x00a82b, 0x00a836, 0x00a837, 0x00a839, 0x00a839, 0x00aa77, 0x00aa79, 0x00fdfd, 0x00fdfd, 0x00ffe4,
-                        0x00ffe4, 0x00ffe8, 0x00ffe8, 0x00ffed, 0x00ffee, 0x00fffc, 0x00fffd, 0x010137, 0x01013f, 0x010179, 0x010189, 0x01018c, 0x01018e, 0x010190, 0x01019c, 0x0101a0, 0x0101a0,
-                        0x0101d0, 0x0101fc, 0x010877, 0x010878, 0x010ac8, 0x010ac8, 0x01173f, 0x01173f, 0x011fd5, 0x011fdc, 0x011fe1, 0x011ff1, 0x016b3c, 0x016b3f, 0x016b45, 0x016b45, 0x01bc9c,
-                        0x01bc9c, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d164, 0x01d16a, 0x01d16c, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1e8, 0x01d200, 0x01d241,
-                        0x01d245, 0x01d245, 0x01d300, 0x01d356, 0x01d800, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d, 0x01da74, 0x01da76, 0x01da83, 0x01da85, 0x01da86, 0x01e14f, 0x01e14f, 0x01ecac,
-                        0x01ecac, 0x01ed2e, 0x01ed2e, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f10d, 0x01f1ad,
-                        0x01f1e6, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f3fa, 0x01f400, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0,
-                        0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad,
-                        0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978, 0x01f97a, 0x01f9cb, 0x01f9cd, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90,
-                        0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2, 0x01fad0, 0x01fad6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca));
+                        0x0032c0, 0x0033ff, 0x004dc0, 0x004dff, 0x00a490, 0x00a4c6, 0x00a828, 0x00a82b, 0x00a836, 0x00a837, 0x00a839, 0x00a839, 0x00aa77, 0x00aa79, 0x00fd40, 0x00fd4f, 0x00fdcf,
+                        0x00fdcf, 0x00fdfd, 0x00fdff, 0x00ffe4, 0x00ffe4, 0x00ffe8, 0x00ffe8, 0x00ffed, 0x00ffee, 0x00fffc, 0x00fffd, 0x010137, 0x01013f, 0x010179, 0x010189, 0x01018c, 0x01018e,
+                        0x010190, 0x01019c, 0x0101a0, 0x0101a0, 0x0101d0, 0x0101fc, 0x010877, 0x010878, 0x010ac8, 0x010ac8, 0x01173f, 0x01173f, 0x011fd5, 0x011fdc, 0x011fe1, 0x011ff1, 0x016b3c,
+                        0x016b3f, 0x016b45, 0x016b45, 0x01bc9c, 0x01bc9c, 0x01cf50, 0x01cfc3, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d164, 0x01d16a, 0x01d16c, 0x01d183, 0x01d184,
+                        0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1ea, 0x01d200, 0x01d241, 0x01d245, 0x01d245, 0x01d300, 0x01d356, 0x01d800, 0x01d9ff, 0x01da37, 0x01da3a, 0x01da6d, 0x01da74, 0x01da76,
+                        0x01da83, 0x01da85, 0x01da86, 0x01e14f, 0x01e14f, 0x01ecac, 0x01ecac, 0x01ed2e, 0x01ed2e, 0x01f000, 0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf,
+                        0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f10d, 0x01f1ad, 0x01f1e6, 0x01f202, 0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300,
+                        0x01f3fa, 0x01f400, 0x01f6d7, 0x01f6dd, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f7f0, 0x01f7f0, 0x01f800, 0x01f80b,
+                        0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78,
+                        0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0, 0x01faf6, 0x01fb00, 0x01fb92,
+                        0x01fb94, 0x01fbca));
     }
 
     private static void populateGC_ZL() {
@@ -3131,13 +3197,13 @@ private static void populateSC_AGHB() {
     }
 
     private static void populateSC_AHOM() {
-        SET_ENCODINGS.put("sc=Ahom", CodePointSet.createNoDedup(0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x01173f));
+        SET_ENCODINGS.put("sc=Ahom", CodePointSet.createNoDedup(0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011746));
     }
 
     private static void populateSC_ARAB() {
-        SET_ENCODINGS.put("sc=Arab", CodePointSet.createNoDedup(0x000600, 0x000604, 0x000606, 0x00060b, 0x00060d, 0x00061a, 0x00061c, 0x00061c, 0x00061e, 0x00061e, 0x000620, 0x00063f, 0x000641,
-                        0x00064a, 0x000656, 0x00066f, 0x000671, 0x0006dc, 0x0006de, 0x0006ff, 0x000750, 0x00077f, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x0008d3, 0x0008e1, 0x0008e3, 0x0008ff,
-                        0x00fb50, 0x00fbc1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfd, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x010e60, 0x010e7e, 0x01ee00,
+        SET_ENCODINGS.put("sc=Arab", CodePointSet.createNoDedup(0x000600, 0x000604, 0x000606, 0x00060b, 0x00060d, 0x00061a, 0x00061c, 0x00061e, 0x000620, 0x00063f, 0x000641, 0x00064a, 0x000656,
+                        0x00066f, 0x000671, 0x0006dc, 0x0006de, 0x0006ff, 0x000750, 0x00077f, 0x000870, 0x00088e, 0x000890, 0x000891, 0x000898, 0x0008e1, 0x0008e3, 0x0008ff, 0x00fb50, 0x00fbc2,
+                        0x00fbd3, 0x00fd3d, 0x00fd40, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdcf, 0x00fdcf, 0x00fdf0, 0x00fdff, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x010e60, 0x010e7e, 0x01ee00,
                         0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b,
                         0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59,
                         0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77,
@@ -3157,7 +3223,7 @@ private static void populateSC_AVST() {
     }
 
     private static void populateSC_BALI() {
-        SET_ENCODINGS.put("sc=Bali", CodePointSet.createNoDedup(0x001b00, 0x001b4b, 0x001b50, 0x001b7c));
+        SET_ENCODINGS.put("sc=Bali", CodePointSet.createNoDedup(0x001b00, 0x001b4c, 0x001b50, 0x001b7e));
     }
 
     private static void populateSC_BAMU() {
@@ -3186,7 +3252,7 @@ private static void populateSC_BOPO() {
     }
 
     private static void populateSC_BRAH() {
-        SET_ENCODINGS.put("sc=Brah", CodePointSet.createNoDedup(0x011000, 0x01104d, 0x011052, 0x01106f, 0x01107f, 0x01107f));
+        SET_ENCODINGS.put("sc=Brah", CodePointSet.createNoDedup(0x011000, 0x01104d, 0x011052, 0x011075, 0x01107f, 0x01107f));
     }
 
     private static void populateSC_BRAI() {
@@ -3206,7 +3272,7 @@ private static void populateSC_CAKM() {
     }
 
     private static void populateSC_CANS() {
-        SET_ENCODINGS.put("sc=Cans", CodePointSet.createNoDedup(0x001400, 0x00167f, 0x0018b0, 0x0018f5));
+        SET_ENCODINGS.put("sc=Cans", CodePointSet.createNoDedup(0x001400, 0x00167f, 0x0018b0, 0x0018f5, 0x011ab0, 0x011abf));
     }
 
     private static void populateSC_CARI() {
@@ -3229,6 +3295,10 @@ private static void populateSC_COPT() {
         SET_ENCODINGS.put("sc=Copt", CodePointSet.createNoDedup(0x0003e2, 0x0003ef, 0x002c80, 0x002cf3, 0x002cf9, 0x002cff));
     }
 
+    private static void populateSC_CPMN() {
+        SET_ENCODINGS.put("sc=Cpmn", CodePointSet.createNoDedup(0x012f90, 0x012ff2));
+    }
+
     private static void populateSC_CPRT() {
         SET_ENCODINGS.put("sc=Cprt", CodePointSet.createNoDedup(0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837, 0x010838, 0x01083c, 0x01083c, 0x01083f, 0x01083f));
     }
@@ -3272,10 +3342,12 @@ private static void populateSC_ELYM() {
     }
 
     private static void populateSC_ETHI() {
-        SET_ENCODINGS.put("sc=Ethi", CodePointSet.createNoDedup(0x001200, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a,
-                        0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315,
-                        0x001318, 0x00135a, 0x00135d, 0x00137c, 0x001380, 0x001399, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0,
-                        0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e));
+        SET_ENCODINGS.put("sc=Ethi",
+                        CodePointSet.createNoDedup(0x001200, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290,
+                                        0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318,
+                                        0x00135a, 0x00135d, 0x00137c, 0x001380, 0x001399, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0,
+                                        0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28,
+                                        0x00ab2e, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe));
     }
 
     private static void populateSC_GEOR() {
@@ -3284,8 +3356,7 @@ private static void populateSC_GEOR() {
     }
 
     private static void populateSC_GLAG() {
-        SET_ENCODINGS.put("sc=Glag",
-                        CodePointSet.createNoDedup(0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a));
+        SET_ENCODINGS.put("sc=Glag", CodePointSet.createNoDedup(0x002c00, 0x002c5f, 0x01e000, 0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a));
     }
 
     private static void populateSC_GONG() {
@@ -3335,8 +3406,8 @@ private static void populateSC_HANG() {
     private static void populateSC_HANI() {
         SET_ENCODINGS.put("sc=Hani",
                         CodePointSet.createNoDedup(0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x003005, 0x003005, 0x003007, 0x003007, 0x003021, 0x003029, 0x003038, 0x00303b, 0x003400,
-                                        0x004dbf, 0x004e00, 0x009ffc, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x016ff0, 0x016ff1, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740, 0x02b81d, 0x02b820,
-                                        0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                                        0x004dbf, 0x004e00, 0x009fff, 0x00f900, 0x00fa6d, 0x00fa70, 0x00fad9, 0x016fe2, 0x016fe3, 0x016ff0, 0x016ff1, 0x020000, 0x02a6df, 0x02a700, 0x02b738, 0x02b740,
+                                        0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateSC_HANO() {
@@ -3353,7 +3424,7 @@ private static void populateSC_HEBR() {
     }
 
     private static void populateSC_HIRA() {
-        SET_ENCODINGS.put("sc=Hira", CodePointSet.createNoDedup(0x003041, 0x003096, 0x00309d, 0x00309f, 0x01b001, 0x01b11e, 0x01b150, 0x01b152, 0x01f200, 0x01f200));
+        SET_ENCODINGS.put("sc=Hira", CodePointSet.createNoDedup(0x003041, 0x003096, 0x00309d, 0x00309f, 0x01b001, 0x01b11f, 0x01b150, 0x01b152, 0x01f200, 0x01f200));
     }
 
     private static void populateSC_HLUW() {
@@ -3386,7 +3457,7 @@ private static void populateSC_KALI() {
 
     private static void populateSC_KANA() {
         SET_ENCODINGS.put("sc=Kana", CodePointSet.createNoDedup(0x0030a1, 0x0030fa, 0x0030fd, 0x0030ff, 0x0031f0, 0x0031ff, 0x0032d0, 0x0032fe, 0x003300, 0x003357, 0x00ff66, 0x00ff6f, 0x00ff71,
-                        0x00ff9d, 0x01b000, 0x01b000, 0x01b164, 0x01b167));
+                        0x00ff9d, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd, 0x01affe, 0x01b000, 0x01b000, 0x01b120, 0x01b122, 0x01b164, 0x01b167));
     }
 
     private static void populateSC_KHAR() {
@@ -3408,11 +3479,11 @@ private static void populateSC_KITS() {
 
     private static void populateSC_KNDA() {
         SET_ENCODINGS.put("sc=Knda", CodePointSet.createNoDedup(0x000c80, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc, 0x000cc4, 0x000cc6,
-                        0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2));
+                        0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2));
     }
 
     private static void populateSC_KTHI() {
-        SET_ENCODINGS.put("sc=Kthi", CodePointSet.createNoDedup(0x011080, 0x0110c1, 0x0110cd, 0x0110cd));
+        SET_ENCODINGS.put("sc=Kthi", CodePointSet.createNoDedup(0x011080, 0x0110c2, 0x0110cd, 0x0110cd));
     }
 
     private static void populateSC_LANA() {
@@ -3425,10 +3496,12 @@ private static void populateSC_LAOO() {
     }
 
     private static void populateSC_LATN() {
-        SET_ENCODINGS.put("sc=Latn", CodePointSet.createNoDedup(0x000041, 0x00005a, 0x000061, 0x00007a, 0x0000aa, 0x0000aa, 0x0000ba, 0x0000ba, 0x0000c0, 0x0000d6, 0x0000d8, 0x0000f6, 0x0000f8,
-                        0x0002b8, 0x0002e0, 0x0002e4, 0x001d00, 0x001d25, 0x001d2c, 0x001d5c, 0x001d62, 0x001d65, 0x001d6b, 0x001d77, 0x001d79, 0x001dbe, 0x001e00, 0x001eff, 0x002071, 0x002071,
-                        0x00207f, 0x00207f, 0x002090, 0x00209c, 0x00212a, 0x00212b, 0x002132, 0x002132, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c60, 0x002c7f, 0x00a722, 0x00a787, 0x00a78b,
-                        0x00a7bf, 0x00a7c2, 0x00a7ca, 0x00a7f5, 0x00a7ff, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab64, 0x00ab66, 0x00ab69, 0x00fb00, 0x00fb06, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a));
+        SET_ENCODINGS.put("sc=Latn",
+                        CodePointSet.createNoDedup(0x000041, 0x00005a, 0x000061, 0x00007a, 0x0000aa, 0x0000aa, 0x0000ba, 0x0000ba, 0x0000c0, 0x0000d6, 0x0000d8, 0x0000f6, 0x0000f8, 0x0002b8, 0x0002e0,
+                                        0x0002e4, 0x001d00, 0x001d25, 0x001d2c, 0x001d5c, 0x001d62, 0x001d65, 0x001d6b, 0x001d77, 0x001d79, 0x001dbe, 0x001e00, 0x001eff, 0x002071, 0x002071, 0x00207f,
+                                        0x00207f, 0x002090, 0x00209c, 0x00212a, 0x00212b, 0x002132, 0x002132, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c60, 0x002c7f, 0x00a722, 0x00a787, 0x00a78b,
+                                        0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a7ff, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab64, 0x00ab66, 0x00ab69, 0x00fb00,
+                                        0x00fb06, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x01df00, 0x01df1e));
     }
 
     private static void populateSC_LEPC() {
@@ -3506,8 +3579,7 @@ private static void populateSC_MODI() {
     }
 
     private static void populateSC_MONG() {
-        SET_ENCODINGS.put("sc=Mong",
-                        CodePointSet.createNoDedup(0x001800, 0x001801, 0x001804, 0x001804, 0x001806, 0x00180e, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x011660, 0x01166c));
+        SET_ENCODINGS.put("sc=Mong", CodePointSet.createNoDedup(0x001800, 0x001801, 0x001804, 0x001804, 0x001806, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x011660, 0x01166c));
     }
 
     private static void populateSC_MROO() {
@@ -3575,6 +3647,10 @@ private static void populateSC_OSMA() {
         SET_ENCODINGS.put("sc=Osma", CodePointSet.createNoDedup(0x010480, 0x01049d, 0x0104a0, 0x0104a9));
     }
 
+    private static void populateSC_OUGR() {
+        SET_ENCODINGS.put("sc=Ougr", CodePointSet.createNoDedup(0x010f70, 0x010f89));
+    }
+
     private static void populateSC_PALM() {
         SET_ENCODINGS.put("sc=Palm", CodePointSet.createNoDedup(0x010860, 0x01087f));
     }
@@ -3693,7 +3769,7 @@ private static void populateSC_TAGB() {
     }
 
     private static void populateSC_TAKR() {
-        SET_ENCODINGS.put("sc=Takr", CodePointSet.createNoDedup(0x011680, 0x0116b8, 0x0116c0, 0x0116c9));
+        SET_ENCODINGS.put("sc=Takr", CodePointSet.createNoDedup(0x011680, 0x0116b9, 0x0116c0, 0x0116c9));
     }
 
     private static void populateSC_TALE() {
@@ -3720,8 +3796,8 @@ private static void populateSC_TAVT() {
     }
 
     private static void populateSC_TELU() {
-        SET_ENCODINGS.put("sc=Telu", CodePointSet.createNoDedup(0x000c00, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46, 0x000c48, 0x000c4a,
-                        0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c77, 0x000c7f));
+        SET_ENCODINGS.put("sc=Telu", CodePointSet.createNoDedup(0x000c00, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3c, 0x000c44, 0x000c46, 0x000c48, 0x000c4a,
+                        0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c77, 0x000c7f));
     }
 
     private static void populateSC_TFNG() {
@@ -3729,7 +3805,7 @@ private static void populateSC_TFNG() {
     }
 
     private static void populateSC_TGLG() {
-        SET_ENCODINGS.put("sc=Tglg", CodePointSet.createNoDedup(0x001700, 0x00170c, 0x00170e, 0x001714));
+        SET_ENCODINGS.put("sc=Tglg", CodePointSet.createNoDedup(0x001700, 0x001715, 0x00171f, 0x00171f));
     }
 
     private static void populateSC_THAA() {
@@ -3749,6 +3825,14 @@ private static void populateSC_TIRH() {
         SET_ENCODINGS.put("sc=Tirh", CodePointSet.createNoDedup(0x011480, 0x0114c7, 0x0114d0, 0x0114d9));
     }
 
+    private static void populateSC_TNSA() {
+        SET_ENCODINGS.put("sc=Tnsa", CodePointSet.createNoDedup(0x016a70, 0x016abe, 0x016ac0, 0x016ac9));
+    }
+
+    private static void populateSC_TOTO() {
+        SET_ENCODINGS.put("sc=Toto", CodePointSet.createNoDedup(0x01e290, 0x01e2ae));
+    }
+
     private static void populateSC_UGAR() {
         SET_ENCODINGS.put("sc=Ugar", CodePointSet.createNoDedup(0x010380, 0x01039d, 0x01039f, 0x01039f));
     }
@@ -3757,6 +3841,11 @@ private static void populateSC_VAII() {
         SET_ENCODINGS.put("sc=Vaii", CodePointSet.createNoDedup(0x00a500, 0x00a62b));
     }
 
+    private static void populateSC_VITH() {
+        SET_ENCODINGS.put("sc=Vith", CodePointSet.createNoDedup(0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3,
+                        0x0105b9, 0x0105bb, 0x0105bc));
+    }
+
     private static void populateSC_WARA() {
         SET_ENCODINGS.put("sc=Wara", CodePointSet.createNoDedup(0x0118a0, 0x0118f2, 0x0118ff, 0x0118ff));
     }
@@ -3787,10 +3876,10 @@ private static void populateSC_ZANB() {
 
     private static void populateSC_ZINH() {
         SET_ENCODINGS.put("sc=Zinh",
-                        CodePointSet.createNoDedup(0x000300, 0x00036f, 0x000485, 0x000486, 0x00064b, 0x000655, 0x000670, 0x000670, 0x000951, 0x000954, 0x001ab0, 0x001ac0, 0x001cd0, 0x001cd2, 0x001cd4,
-                                        0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001df9, 0x001dfb, 0x001dff, 0x00200c, 0x00200d, 0x0020d0,
-                                        0x0020f0, 0x00302a, 0x00302d, 0x003099, 0x00309a, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2d, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x01133b, 0x01133b, 0x01d167,
-                                        0x01d169, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x0e0100, 0x0e01ef));
+                        CodePointSet.createNoDedup(0x000300, 0x00036f, 0x000485, 0x000486, 0x00064b, 0x000655, 0x000670, 0x000670, 0x000951, 0x000954, 0x001ab0, 0x001ace, 0x001cd0, 0x001cd2, 0x001cd4,
+                                        0x001ce0, 0x001ce2, 0x001ce8, 0x001ced, 0x001ced, 0x001cf4, 0x001cf4, 0x001cf8, 0x001cf9, 0x001dc0, 0x001dff, 0x00200c, 0x00200d, 0x0020d0, 0x0020f0, 0x00302a,
+                                        0x00302d, 0x003099, 0x00309a, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2d, 0x0101fd, 0x0101fd, 0x0102e0, 0x0102e0, 0x01133b, 0x01133b, 0x01cf00, 0x01cf2d, 0x01cf30,
+                                        0x01cf46, 0x01d167, 0x01d169, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateSC_ZYYY() {
@@ -3799,40 +3888,40 @@ private static void populateSC_ZYYY() {
                         0x00060c, 0x00060c, 0x00061b, 0x00061b, 0x00061f, 0x00061f, 0x000640, 0x000640, 0x0006dd, 0x0006dd, 0x0008e2, 0x0008e2, 0x000964, 0x000965, 0x000e3f, 0x000e3f, 0x000fd5,
                         0x000fd8, 0x0010fb, 0x0010fb, 0x0016eb, 0x0016ed, 0x001735, 0x001736, 0x001802, 0x001803, 0x001805, 0x001805, 0x001cd3, 0x001cd3, 0x001ce1, 0x001ce1, 0x001ce9, 0x001cec,
                         0x001cee, 0x001cf3, 0x001cf5, 0x001cf7, 0x001cfa, 0x001cfa, 0x002000, 0x00200b, 0x00200e, 0x002064, 0x002066, 0x002070, 0x002074, 0x00207e, 0x002080, 0x00208e, 0x0020a0,
-                        0x0020bf, 0x002100, 0x002125, 0x002127, 0x002129, 0x00212c, 0x002131, 0x002133, 0x00214d, 0x00214f, 0x00215f, 0x002189, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a,
-                        0x002460, 0x0027ff, 0x002900, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002bff, 0x002e00, 0x002e52, 0x002ff0, 0x002ffb, 0x003000, 0x003004, 0x003006, 0x003006, 0x003008,
+                        0x0020c0, 0x002100, 0x002125, 0x002127, 0x002129, 0x00212c, 0x002131, 0x002133, 0x00214d, 0x00214f, 0x00215f, 0x002189, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a,
+                        0x002460, 0x0027ff, 0x002900, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002bff, 0x002e00, 0x002e5d, 0x002ff0, 0x002ffb, 0x003000, 0x003004, 0x003006, 0x003006, 0x003008,
                         0x003020, 0x003030, 0x003037, 0x00303c, 0x00303f, 0x00309b, 0x00309c, 0x0030a0, 0x0030a0, 0x0030fb, 0x0030fc, 0x003190, 0x00319f, 0x0031c0, 0x0031e3, 0x003220, 0x00325f,
                         0x00327f, 0x0032cf, 0x0032ff, 0x0032ff, 0x003358, 0x0033ff, 0x004dc0, 0x004dff, 0x00a700, 0x00a721, 0x00a788, 0x00a78a, 0x00a830, 0x00a839, 0x00a92e, 0x00a92e, 0x00a9cf,
                         0x00a9cf, 0x00ab5b, 0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fd3e, 0x00fd3f, 0x00fe10, 0x00fe19, 0x00fe30, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00feff, 0x00feff,
                         0x00ff01, 0x00ff20, 0x00ff3b, 0x00ff40, 0x00ff5b, 0x00ff65, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff9, 0x00fffd, 0x010100,
-                        0x010102, 0x010107, 0x010133, 0x010137, 0x01013f, 0x010190, 0x01019c, 0x0101d0, 0x0101fc, 0x0102e1, 0x0102fb, 0x016fe2, 0x016fe3, 0x01bca0, 0x01bca3, 0x01d000, 0x01d0f5,
-                        0x01d100, 0x01d126, 0x01d129, 0x01d166, 0x01d16a, 0x01d17a, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1e8, 0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356, 0x01d360,
+                        0x010102, 0x010107, 0x010133, 0x010137, 0x01013f, 0x010190, 0x01019c, 0x0101d0, 0x0101fc, 0x0102e1, 0x0102fb, 0x01bca0, 0x01bca3, 0x01cf50, 0x01cfc3, 0x01d000, 0x01d0f5,
+                        0x01d100, 0x01d126, 0x01d129, 0x01d166, 0x01d16a, 0x01d17a, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1ea, 0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356, 0x01d360,
                         0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb,
                         0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546,
                         0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01ec71, 0x01ecb4, 0x01ed01, 0x01ed3d, 0x01f000, 0x01f02b, 0x01f030, 0x01f093,
                         0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f1ff, 0x01f201, 0x01f202, 0x01f210, 0x01f23b, 0x01f240,
-                        0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb,
-                        0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978, 0x01f97a, 0x01f9cb, 0x01f9cd,
-                        0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2, 0x01fad0, 0x01fad6,
-                        0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
+                        0x01f248, 0x01f250, 0x01f251, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6dd, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb,
+                        0x01f7f0, 0x01f7f0, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60,
+                        0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7,
+                        0x01faf0, 0x01faf6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
     }
 
     private static void populateSC_ZZZZ() {
         SET_ENCODINGS.put("sc=Zzzz", CodePointSet.createNoDedup(0x000378, 0x000379, 0x000380, 0x000383, 0x00038b, 0x00038b, 0x00038d, 0x00038d, 0x0003a2, 0x0003a2, 0x000530, 0x000530, 0x000557,
-                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00061d, 0x00061d, 0x00070e, 0x00070e, 0x00074b, 0x00074c,
-                        0x0007b2, 0x0007bf, 0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00089f, 0x0008b5, 0x0008b5, 0x0008c8,
-                        0x0008d2, 0x000984, 0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6,
-                        0x0009c9, 0x0009ca, 0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11,
-                        0x000a12, 0x000a29, 0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a,
-                        0x000a4e, 0x000a50, 0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9,
-                        0x000aa9, 0x000ab1, 0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5,
-                        0x000af2, 0x000af8, 0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a,
-                        0x000b3b, 0x000b45, 0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84,
-                        0x000b8b, 0x000b8d, 0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba,
-                        0x000bbd, 0x000bc3, 0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11,
-                        0x000c29, 0x000c29, 0x000c3a, 0x000c3c, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
+                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00070e, 0x00070e, 0x00074b, 0x00074c, 0x0007b2, 0x0007bf,
+                        0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00086f, 0x00088f, 0x00088f, 0x000892, 0x000897, 0x000984,
+                        0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6, 0x0009c9, 0x0009ca,
+                        0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11, 0x000a12, 0x000a29,
+                        0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a, 0x000a4e, 0x000a50,
+                        0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9, 0x000aa9, 0x000ab1,
+                        0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5, 0x000af2, 0x000af8,
+                        0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a, 0x000b3b, 0x000b45,
+                        0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84, 0x000b8b, 0x000b8d,
+                        0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba, 0x000bbd, 0x000bc3,
+                        0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11, 0x000c29, 0x000c29,
+                        0x000c3a, 0x000c3b, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5c, 0x000c5e, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
                         0x000c76, 0x000c8d, 0x000c8d, 0x000c91, 0x000c91, 0x000ca9, 0x000ca9, 0x000cb4, 0x000cb4, 0x000cba, 0x000cbb, 0x000cc5, 0x000cc5, 0x000cc9, 0x000cc9, 0x000cce, 0x000cd4,
-                        0x000cd7, 0x000cdd, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
+                        0x000cd7, 0x000cdc, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
                         0x000d49, 0x000d50, 0x000d53, 0x000d64, 0x000d65, 0x000d80, 0x000d80, 0x000d84, 0x000d84, 0x000d97, 0x000d99, 0x000db2, 0x000db2, 0x000dbc, 0x000dbc, 0x000dbe, 0x000dbf,
                         0x000dc7, 0x000dc9, 0x000dcb, 0x000dce, 0x000dd5, 0x000dd5, 0x000dd7, 0x000dd7, 0x000de0, 0x000de5, 0x000df0, 0x000df1, 0x000df5, 0x000e00, 0x000e3b, 0x000e3e, 0x000e5c,
                         0x000e80, 0x000e83, 0x000e83, 0x000e85, 0x000e85, 0x000e8b, 0x000e8b, 0x000ea4, 0x000ea4, 0x000ea6, 0x000ea6, 0x000ebe, 0x000ebf, 0x000ec5, 0x000ec5, 0x000ec7, 0x000ec7,
@@ -3840,68 +3929,71 @@ private static void populateSC_ZZZZ() {
                         0x000fff, 0x0010c6, 0x0010c6, 0x0010c8, 0x0010cc, 0x0010ce, 0x0010cf, 0x001249, 0x001249, 0x00124e, 0x00124f, 0x001257, 0x001257, 0x001259, 0x001259, 0x00125e, 0x00125f,
                         0x001289, 0x001289, 0x00128e, 0x00128f, 0x0012b1, 0x0012b1, 0x0012b6, 0x0012b7, 0x0012bf, 0x0012bf, 0x0012c1, 0x0012c1, 0x0012c6, 0x0012c7, 0x0012d7, 0x0012d7, 0x001311,
                         0x001311, 0x001316, 0x001317, 0x00135b, 0x00135c, 0x00137d, 0x00137f, 0x00139a, 0x00139f, 0x0013f6, 0x0013f7, 0x0013fe, 0x0013ff, 0x00169d, 0x00169f, 0x0016f9, 0x0016ff,
-                        0x00170d, 0x00170d, 0x001715, 0x00171f, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea,
-                        0x0017ef, 0x0017fa, 0x0017ff, 0x00180f, 0x00180f, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f,
-                        0x00193c, 0x00193f, 0x001941, 0x001943, 0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f,
-                        0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a, 0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001ac1, 0x001aff, 0x001b4c, 0x001b4f, 0x001b7d, 0x001b7f, 0x001bf4, 0x001bfb,
-                        0x001c38, 0x001c3a, 0x001c4a, 0x001c4c, 0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001dfa, 0x001dfa, 0x001f16, 0x001f17, 0x001f1e,
-                        0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58, 0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5,
-                        0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc, 0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f,
-                        0x00208f, 0x00209d, 0x00209f, 0x0020c0, 0x0020cf, 0x0020f1, 0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96,
-                        0x002c2f, 0x002c2f, 0x002c5f, 0x002c5f, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c, 0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97,
-                        0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7, 0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf,
-                        0x002e53, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff, 0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130,
-                        0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x009ffd, 0x009fff, 0x00a48d, 0x00a48f, 0x00a4c7, 0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff,
-                        0x00a7c0, 0x00a7c1, 0x00a7cb, 0x00a7f4, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f, 0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d,
-                        0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37, 0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00,
-                        0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27, 0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4,
-                        0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada, 0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d,
-                        0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc2, 0x00fbd2, 0x00fd40, 0x00fd4f, 0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdef, 0x00fdfe, 0x00fdff, 0x00fe1a,
-                        0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd, 0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9,
-                        0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8, 0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b,
-                        0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103, 0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f,
-                        0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff, 0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e,
-                        0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4, 0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e,
-                        0x010570, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d,
-                        0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df, 0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f,
-                        0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07, 0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49,
-                        0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea, 0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98,
-                        0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3, 0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa,
-                        0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f, 0x010f5a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011070, 0x01107e,
-                        0x0110c2, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9, 0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5,
-                        0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f, 0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef,
-                        0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d, 0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345,
-                        0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f, 0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c,
-                        0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da, 0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116b9,
-                        0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c, 0x01172c, 0x01172f, 0x011740, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b,
-                        0x011914, 0x011914, 0x011917, 0x011917, 0x011936, 0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5,
-                        0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011abf, 0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91,
-                        0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07, 0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a,
-                        0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69, 0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf,
-                        0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f, 0x01246f, 0x012475, 0x01247f, 0x012544, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39,
-                        0x016a3f, 0x016a5f, 0x016a5f, 0x016a6a, 0x016a6d, 0x016a70, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62,
-                        0x016b78, 0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8,
-                        0x0187ff, 0x018cd6, 0x018cff, 0x018d09, 0x01afff, 0x01b11f, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc, 0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f,
-                        0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01cfff, 0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1e9, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357,
-                        0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d, 0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba,
-                        0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506, 0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545,
-                        0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6, 0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01dfff, 0x01e007, 0x01e007,
-                        0x01e019, 0x01e01a, 0x01e022, 0x01e022, 0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e2bf, 0x01e2fa,
-                        0x01e2fe, 0x01e300, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d, 0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff,
-                        0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33, 0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c,
-                        0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50, 0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58,
-                        0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65, 0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78,
-                        0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4, 0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff,
-                        0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6, 0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c,
-                        0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6df, 0x01f6ed, 0x01f6ef, 0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df,
-                        0x01f7ec, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888, 0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01f979, 0x01f979, 0x01f9cc,
-                        0x01f9cc, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7b, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faa9, 0x01faaf, 0x01fab7, 0x01fabf, 0x01fac3, 0x01facf,
-                        0x01fad7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6de, 0x02a6ff, 0x02b735, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1,
-                        0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff, 0x0e01f0, 0x10ffff));
+                        0x001716, 0x00171e, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea, 0x0017ef, 0x0017fa,
+                        0x0017ff, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f, 0x00193c, 0x00193f, 0x001941, 0x001943,
+                        0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f, 0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a,
+                        0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001acf, 0x001aff, 0x001b4d, 0x001b4f, 0x001b7f, 0x001b7f, 0x001bf4, 0x001bfb, 0x001c38, 0x001c3a, 0x001c4a, 0x001c4c,
+                        0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001f16, 0x001f17, 0x001f1e, 0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58,
+                        0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5, 0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc,
+                        0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f, 0x00208f, 0x00209d, 0x00209f, 0x0020c1, 0x0020cf, 0x0020f1,
+                        0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c,
+                        0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97, 0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7,
+                        0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf, 0x002e5e, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff,
+                        0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130, 0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x00a48d, 0x00a48f, 0x00a4c7,
+                        0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff, 0x00a7cb, 0x00a7cf, 0x00a7d2, 0x00a7d2, 0x00a7d4, 0x00a7d4, 0x00a7da, 0x00a7f1, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f,
+                        0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d, 0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37,
+                        0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00, 0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27,
+                        0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4, 0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada,
+                        0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d, 0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc3, 0x00fbd2,
+                        0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdce, 0x00fdd0, 0x00fdef, 0x00fe1a, 0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd,
+                        0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9, 0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8,
+                        0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b, 0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103,
+                        0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f, 0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff,
+                        0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e, 0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4,
+                        0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e, 0x01057b, 0x01057b, 0x01058b, 0x01058b, 0x010593, 0x010593, 0x010596, 0x010596, 0x0105a2, 0x0105a2,
+                        0x0105b2, 0x0105b2, 0x0105ba, 0x0105ba, 0x0105bd, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x01077f, 0x010786, 0x010786, 0x0107b1, 0x0107b1, 0x0107bb,
+                        0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d, 0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df,
+                        0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f, 0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07,
+                        0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49, 0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea,
+                        0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98, 0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3,
+                        0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa, 0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f,
+                        0x010f5a, 0x010f6f, 0x010f8a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011076, 0x01107e, 0x0110c3, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9,
+                        0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5, 0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f,
+                        0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef, 0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d,
+                        0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345, 0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f,
+                        0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c, 0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da,
+                        0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116ba, 0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c,
+                        0x01172c, 0x01172f, 0x011747, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b, 0x011914, 0x011914, 0x011917, 0x011917, 0x011936,
+                        0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5, 0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011aaf,
+                        0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91, 0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07,
+                        0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a, 0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69,
+                        0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf, 0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f,
+                        0x01246f, 0x012475, 0x01247f, 0x012544, 0x012f8f, 0x012ff3, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39, 0x016a3f, 0x016a5f, 0x016a5f,
+                        0x016a6a, 0x016a6d, 0x016abf, 0x016abf, 0x016aca, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62, 0x016b78,
+                        0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8, 0x0187ff,
+                        0x018cd6, 0x018cff, 0x018d09, 0x01afef, 0x01aff4, 0x01aff4, 0x01affc, 0x01affc, 0x01afff, 0x01afff, 0x01b123, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc,
+                        0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f, 0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01ceff, 0x01cf2e, 0x01cf2f, 0x01cf47, 0x01cf4f, 0x01cfc4, 0x01cfff,
+                        0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1eb, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357, 0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d,
+                        0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba, 0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506,
+                        0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545, 0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6,
+                        0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01deff, 0x01df1f, 0x01dfff, 0x01e007, 0x01e007, 0x01e019, 0x01e01a, 0x01e022, 0x01e022,
+                        0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e28f, 0x01e2af, 0x01e2bf, 0x01e2fa, 0x01e2fe, 0x01e300,
+                        0x01e7df, 0x01e7e7, 0x01e7e7, 0x01e7ec, 0x01e7ec, 0x01e7ef, 0x01e7ef, 0x01e7ff, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d,
+                        0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff, 0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33,
+                        0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c, 0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50,
+                        0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58, 0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65,
+                        0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78, 0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4,
+                        0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff, 0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6,
+                        0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c, 0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6dc, 0x01f6ed, 0x01f6ef,
+                        0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df, 0x01f7ec, 0x01f7ef, 0x01f7f1, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888,
+                        0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7d, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faad, 0x01faaf,
+                        0x01fabb, 0x01fabf, 0x01fac6, 0x01facf, 0x01fada, 0x01fadf, 0x01fae8, 0x01faef, 0x01faf7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6e0,
+                        0x02a6ff, 0x02b739, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1, 0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff,
+                        0x0e01f0, 0x10ffff));
     }
 
     private static void populateSCX_ADLM() {
-        SET_ENCODINGS.put("scx=Adlm", CodePointSet.createNoDedup(0x000640, 0x000640, 0x01e900, 0x01e94b, 0x01e950, 0x01e959, 0x01e95e, 0x01e95f));
+        SET_ENCODINGS.put("scx=Adlm", CodePointSet.createNoDedup(0x00061f, 0x00061f, 0x000640, 0x000640, 0x01e900, 0x01e94b, 0x01e950, 0x01e959, 0x01e95e, 0x01e95f));
     }
 
     private static void populateSCX_AGHB() {
@@ -3909,18 +4001,18 @@ private static void populateSCX_AGHB() {
     }
 
     private static void populateSCX_AHOM() {
-        SET_ENCODINGS.put("scx=Ahom", CodePointSet.createNoDedup(0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x01173f));
+        SET_ENCODINGS.put("scx=Ahom", CodePointSet.createNoDedup(0x011700, 0x01171a, 0x01171d, 0x01172b, 0x011730, 0x011746));
     }
 
     private static void populateSCX_ARAB() {
         SET_ENCODINGS.put("scx=Arab",
-                        CodePointSet.createNoDedup(0x000600, 0x000604, 0x000606, 0x00061c, 0x00061e, 0x0006dc, 0x0006de, 0x0006ff, 0x000750, 0x00077f, 0x0008a0, 0x0008b4, 0x0008b6, 0x0008c7, 0x0008d3,
-                                        0x0008e1, 0x0008e3, 0x0008ff, 0x00fb50, 0x00fbc1, 0x00fbd3, 0x00fd3d, 0x00fd50, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdf0, 0x00fdfd, 0x00fe70, 0x00fe74, 0x00fe76,
-                                        0x00fefc, 0x0102e0, 0x0102fb, 0x010e60, 0x010e7e, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29,
-                                        0x01ee32, 0x01ee34, 0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d,
-                                        0x01ee4f, 0x01ee51, 0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61,
-                                        0x01ee62, 0x01ee64, 0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b,
-                                        0x01ee9b, 0x01eea1, 0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01eef0, 0x01eef1));
+                        CodePointSet.createNoDedup(0x000600, 0x000604, 0x000606, 0x0006dc, 0x0006de, 0x0006ff, 0x000750, 0x00077f, 0x000870, 0x00088e, 0x000890, 0x000891, 0x000898, 0x0008e1, 0x0008e3,
+                                        0x0008ff, 0x00fb50, 0x00fbc2, 0x00fbd3, 0x00fd8f, 0x00fd92, 0x00fdc7, 0x00fdcf, 0x00fdcf, 0x00fdf0, 0x00fdff, 0x00fe70, 0x00fe74, 0x00fe76, 0x00fefc, 0x0102e0,
+                                        0x0102fb, 0x010e60, 0x010e7e, 0x01ee00, 0x01ee03, 0x01ee05, 0x01ee1f, 0x01ee21, 0x01ee22, 0x01ee24, 0x01ee24, 0x01ee27, 0x01ee27, 0x01ee29, 0x01ee32, 0x01ee34,
+                                        0x01ee37, 0x01ee39, 0x01ee39, 0x01ee3b, 0x01ee3b, 0x01ee42, 0x01ee42, 0x01ee47, 0x01ee47, 0x01ee49, 0x01ee49, 0x01ee4b, 0x01ee4b, 0x01ee4d, 0x01ee4f, 0x01ee51,
+                                        0x01ee52, 0x01ee54, 0x01ee54, 0x01ee57, 0x01ee57, 0x01ee59, 0x01ee59, 0x01ee5b, 0x01ee5b, 0x01ee5d, 0x01ee5d, 0x01ee5f, 0x01ee5f, 0x01ee61, 0x01ee62, 0x01ee64,
+                                        0x01ee64, 0x01ee67, 0x01ee6a, 0x01ee6c, 0x01ee72, 0x01ee74, 0x01ee77, 0x01ee79, 0x01ee7c, 0x01ee7e, 0x01ee7e, 0x01ee80, 0x01ee89, 0x01ee8b, 0x01ee9b, 0x01eea1,
+                                        0x01eea3, 0x01eea5, 0x01eea9, 0x01eeab, 0x01eebb, 0x01eef0, 0x01eef1));
     }
 
     private static void populateSCX_ARMI() {
@@ -3936,7 +4028,7 @@ private static void populateSCX_AVST() {
     }
 
     private static void populateSCX_BALI() {
-        SET_ENCODINGS.put("scx=Bali", CodePointSet.createNoDedup(0x001b00, 0x001b4b, 0x001b50, 0x001b7c));
+        SET_ENCODINGS.put("scx=Bali", CodePointSet.createNoDedup(0x001b00, 0x001b4c, 0x001b50, 0x001b7e));
     }
 
     private static void populateSCX_BAMU() {
@@ -3969,7 +4061,7 @@ private static void populateSCX_BOPO() {
     }
 
     private static void populateSCX_BRAH() {
-        SET_ENCODINGS.put("scx=Brah", CodePointSet.createNoDedup(0x011000, 0x01104d, 0x011052, 0x01106f, 0x01107f, 0x01107f));
+        SET_ENCODINGS.put("scx=Brah", CodePointSet.createNoDedup(0x011000, 0x01104d, 0x011052, 0x011075, 0x01107f, 0x01107f));
     }
 
     private static void populateSCX_BRAI() {
@@ -3989,7 +4081,7 @@ private static void populateSCX_CAKM() {
     }
 
     private static void populateSCX_CANS() {
-        SET_ENCODINGS.put("scx=Cans", CodePointSet.createNoDedup(0x001400, 0x00167f, 0x0018b0, 0x0018f5));
+        SET_ENCODINGS.put("scx=Cans", CodePointSet.createNoDedup(0x001400, 0x00167f, 0x0018b0, 0x0018f5, 0x011ab0, 0x011abf));
     }
 
     private static void populateSCX_CARI() {
@@ -4012,6 +4104,10 @@ private static void populateSCX_COPT() {
         SET_ENCODINGS.put("scx=Copt", CodePointSet.createNoDedup(0x0003e2, 0x0003ef, 0x002c80, 0x002cf3, 0x002cf9, 0x002cff, 0x0102e0, 0x0102fb));
     }
 
+    private static void populateSCX_CPMN() {
+        SET_ENCODINGS.put("scx=Cpmn", CodePointSet.createNoDedup(0x010100, 0x010101, 0x012f90, 0x012ff2));
+    }
+
     private static void populateSCX_CPRT() {
         SET_ENCODINGS.put("scx=Cprt", CodePointSet.createNoDedup(0x010100, 0x010102, 0x010107, 0x010133, 0x010137, 0x01013f, 0x010800, 0x010805, 0x010808, 0x010808, 0x01080a, 0x010835, 0x010837,
                         0x010838, 0x01083c, 0x01083c, 0x01083f, 0x01083f));
@@ -4057,10 +4153,12 @@ private static void populateSCX_ELYM() {
     }
 
     private static void populateSCX_ETHI() {
-        SET_ENCODINGS.put("scx=Ethi", CodePointSet.createNoDedup(0x001200, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a,
-                        0x00128d, 0x001290, 0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315,
-                        0x001318, 0x00135a, 0x00135d, 0x00137c, 0x001380, 0x001399, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0,
-                        0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28, 0x00ab2e));
+        SET_ENCODINGS.put("scx=Ethi",
+                        CodePointSet.createNoDedup(0x001200, 0x001248, 0x00124a, 0x00124d, 0x001250, 0x001256, 0x001258, 0x001258, 0x00125a, 0x00125d, 0x001260, 0x001288, 0x00128a, 0x00128d, 0x001290,
+                                        0x0012b0, 0x0012b2, 0x0012b5, 0x0012b8, 0x0012be, 0x0012c0, 0x0012c0, 0x0012c2, 0x0012c5, 0x0012c8, 0x0012d6, 0x0012d8, 0x001310, 0x001312, 0x001315, 0x001318,
+                                        0x00135a, 0x00135d, 0x00137c, 0x001380, 0x001399, 0x002d80, 0x002d96, 0x002da0, 0x002da6, 0x002da8, 0x002dae, 0x002db0, 0x002db6, 0x002db8, 0x002dbe, 0x002dc0,
+                                        0x002dc6, 0x002dc8, 0x002dce, 0x002dd0, 0x002dd6, 0x002dd8, 0x002dde, 0x00ab01, 0x00ab06, 0x00ab09, 0x00ab0e, 0x00ab11, 0x00ab16, 0x00ab20, 0x00ab26, 0x00ab28,
+                                        0x00ab2e, 0x01e7e0, 0x01e7e6, 0x01e7e8, 0x01e7eb, 0x01e7ed, 0x01e7ee, 0x01e7f0, 0x01e7fe));
     }
 
     private static void populateSCX_GEOR() {
@@ -4069,8 +4167,8 @@ private static void populateSCX_GEOR() {
     }
 
     private static void populateSCX_GLAG() {
-        SET_ENCODINGS.put("scx=Glag", CodePointSet.createNoDedup(0x000484, 0x000484, 0x000487, 0x000487, 0x002c00, 0x002c2e, 0x002c30, 0x002c5e, 0x002e43, 0x002e43, 0x00a66f, 0x00a66f, 0x01e000,
-                        0x01e006, 0x01e008, 0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a));
+        SET_ENCODINGS.put("scx=Glag", CodePointSet.createNoDedup(0x000484, 0x000484, 0x000487, 0x000487, 0x002c00, 0x002c5f, 0x002e43, 0x002e43, 0x00a66f, 0x00a66f, 0x01e000, 0x01e006, 0x01e008,
+                        0x01e018, 0x01e01b, 0x01e021, 0x01e023, 0x01e024, 0x01e026, 0x01e02a));
     }
 
     private static void populateSCX_GONG() {
@@ -4129,9 +4227,9 @@ private static void populateSCX_HANI() {
         SET_ENCODINGS.put("scx=Hani",
                         CodePointSet.createNoDedup(0x002e80, 0x002e99, 0x002e9b, 0x002ef3, 0x002f00, 0x002fd5, 0x003001, 0x003003, 0x003005, 0x003011, 0x003013, 0x00301f, 0x003021, 0x00302d, 0x003030,
                                         0x003030, 0x003037, 0x00303f, 0x0030fb, 0x0030fb, 0x003190, 0x00319f, 0x0031c0, 0x0031e3, 0x003220, 0x003247, 0x003280, 0x0032b0, 0x0032c0, 0x0032cb, 0x0032ff,
-                                        0x0032ff, 0x003358, 0x003370, 0x00337b, 0x00337f, 0x0033e0, 0x0033fe, 0x003400, 0x004dbf, 0x004e00, 0x009ffc, 0x00a700, 0x00a707, 0x00f900, 0x00fa6d, 0x00fa70,
-                                        0x00fad9, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff65, 0x016ff0, 0x016ff1, 0x01d360, 0x01d371, 0x01f250, 0x01f251, 0x020000, 0x02a6dd, 0x02a700, 0x02b734, 0x02b740,
-                                        0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
+                                        0x0032ff, 0x003358, 0x003370, 0x00337b, 0x00337f, 0x0033e0, 0x0033fe, 0x003400, 0x004dbf, 0x004e00, 0x009fff, 0x00a700, 0x00a707, 0x00f900, 0x00fa6d, 0x00fa70,
+                                        0x00fad9, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff65, 0x016fe2, 0x016fe3, 0x016ff0, 0x016ff1, 0x01d360, 0x01d371, 0x01f250, 0x01f251, 0x020000, 0x02a6df, 0x02a700,
+                                        0x02b738, 0x02b740, 0x02b81d, 0x02b820, 0x02cea1, 0x02ceb0, 0x02ebe0, 0x02f800, 0x02fa1d, 0x030000, 0x03134a));
     }
 
     private static void populateSCX_HANO() {
@@ -4150,7 +4248,7 @@ private static void populateSCX_HEBR() {
     private static void populateSCX_HIRA() {
         SET_ENCODINGS.put("scx=Hira",
                         CodePointSet.createNoDedup(0x003001, 0x003003, 0x003008, 0x003011, 0x003013, 0x00301f, 0x003030, 0x003035, 0x003037, 0x003037, 0x00303c, 0x00303d, 0x003041, 0x003096, 0x003099,
-                                        0x0030a0, 0x0030fb, 0x0030fc, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff65, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x01b001, 0x01b11e, 0x01b150, 0x01b152, 0x01f200,
+                                        0x0030a0, 0x0030fb, 0x0030fc, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff65, 0x00ff70, 0x00ff70, 0x00ff9e, 0x00ff9f, 0x01b001, 0x01b11f, 0x01b150, 0x01b152, 0x01f200,
                                         0x01f200));
     }
 
@@ -4183,8 +4281,10 @@ private static void populateSCX_KALI() {
     }
 
     private static void populateSCX_KANA() {
-        SET_ENCODINGS.put("scx=Kana", CodePointSet.createNoDedup(0x003001, 0x003003, 0x003008, 0x003011, 0x003013, 0x00301f, 0x003030, 0x003035, 0x003037, 0x003037, 0x00303c, 0x00303d, 0x003099,
-                        0x00309c, 0x0030a0, 0x0030ff, 0x0031f0, 0x0031ff, 0x0032d0, 0x0032fe, 0x003300, 0x003357, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff9f, 0x01b000, 0x01b000, 0x01b164, 0x01b167));
+        SET_ENCODINGS.put("scx=Kana",
+                        CodePointSet.createNoDedup(0x003001, 0x003003, 0x003008, 0x003011, 0x003013, 0x00301f, 0x003030, 0x003035, 0x003037, 0x003037, 0x00303c, 0x00303d, 0x003099, 0x00309c, 0x0030a0,
+                                        0x0030ff, 0x0031f0, 0x0031ff, 0x0032d0, 0x0032fe, 0x003300, 0x003357, 0x00fe45, 0x00fe46, 0x00ff61, 0x00ff9f, 0x01aff0, 0x01aff3, 0x01aff5, 0x01affb, 0x01affd,
+                                        0x01affe, 0x01b000, 0x01b000, 0x01b120, 0x01b122, 0x01b164, 0x01b167));
     }
 
     private static void populateSCX_KHAR() {
@@ -4207,12 +4307,12 @@ private static void populateSCX_KITS() {
     private static void populateSCX_KNDA() {
         SET_ENCODINGS.put("scx=Knda",
                         CodePointSet.createNoDedup(0x000951, 0x000952, 0x000964, 0x000965, 0x000c80, 0x000c8c, 0x000c8e, 0x000c90, 0x000c92, 0x000ca8, 0x000caa, 0x000cb3, 0x000cb5, 0x000cb9, 0x000cbc,
-                                        0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cde, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x001cd0,
+                                        0x000cc4, 0x000cc6, 0x000cc8, 0x000cca, 0x000ccd, 0x000cd5, 0x000cd6, 0x000cdd, 0x000cde, 0x000ce0, 0x000ce3, 0x000ce6, 0x000cef, 0x000cf1, 0x000cf2, 0x001cd0,
                                         0x001cd0, 0x001cd2, 0x001cd2, 0x001cda, 0x001cda, 0x001cf2, 0x001cf2, 0x001cf4, 0x001cf4, 0x00a830, 0x00a835));
     }
 
     private static void populateSCX_KTHI() {
-        SET_ENCODINGS.put("scx=Kthi", CodePointSet.createNoDedup(0x000966, 0x00096f, 0x00a830, 0x00a839, 0x011080, 0x0110c1, 0x0110cd, 0x0110cd));
+        SET_ENCODINGS.put("scx=Kthi", CodePointSet.createNoDedup(0x000966, 0x00096f, 0x00a830, 0x00a839, 0x011080, 0x0110c2, 0x0110cd, 0x0110cd));
     }
 
     private static void populateSCX_LANA() {
@@ -4225,11 +4325,13 @@ private static void populateSCX_LAOO() {
     }
 
     private static void populateSCX_LATN() {
-        SET_ENCODINGS.put("scx=Latn", CodePointSet.createNoDedup(0x000041, 0x00005a, 0x000061, 0x00007a, 0x0000aa, 0x0000aa, 0x0000ba, 0x0000ba, 0x0000c0, 0x0000d6, 0x0000d8, 0x0000f6, 0x0000f8,
-                        0x0002b8, 0x0002e0, 0x0002e4, 0x000363, 0x00036f, 0x000485, 0x000486, 0x000951, 0x000952, 0x0010fb, 0x0010fb, 0x001d00, 0x001d25, 0x001d2c, 0x001d5c, 0x001d62, 0x001d65,
-                        0x001d6b, 0x001d77, 0x001d79, 0x001dbe, 0x001e00, 0x001eff, 0x00202f, 0x00202f, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x0020f0, 0x0020f0, 0x00212a,
-                        0x00212b, 0x002132, 0x002132, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c60, 0x002c7f, 0x00a700, 0x00a707, 0x00a722, 0x00a787, 0x00a78b, 0x00a7bf, 0x00a7c2, 0x00a7ca,
-                        0x00a7f5, 0x00a7ff, 0x00a92e, 0x00a92e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab64, 0x00ab66, 0x00ab69, 0x00fb00, 0x00fb06, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a));
+        SET_ENCODINGS.put("scx=Latn",
+                        CodePointSet.createNoDedup(0x000041, 0x00005a, 0x000061, 0x00007a, 0x0000aa, 0x0000aa, 0x0000ba, 0x0000ba, 0x0000c0, 0x0000d6, 0x0000d8, 0x0000f6, 0x0000f8, 0x0002b8, 0x0002e0,
+                                        0x0002e4, 0x000363, 0x00036f, 0x000485, 0x000486, 0x000951, 0x000952, 0x0010fb, 0x0010fb, 0x001d00, 0x001d25, 0x001d2c, 0x001d5c, 0x001d62, 0x001d65, 0x001d6b,
+                                        0x001d77, 0x001d79, 0x001dbe, 0x001e00, 0x001eff, 0x00202f, 0x00202f, 0x002071, 0x002071, 0x00207f, 0x00207f, 0x002090, 0x00209c, 0x0020f0, 0x0020f0, 0x00212a,
+                                        0x00212b, 0x002132, 0x002132, 0x00214e, 0x00214e, 0x002160, 0x002188, 0x002c60, 0x002c7f, 0x00a700, 0x00a707, 0x00a722, 0x00a787, 0x00a78b, 0x00a7ca, 0x00a7d0,
+                                        0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f2, 0x00a7ff, 0x00a92e, 0x00a92e, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab64, 0x00ab66, 0x00ab69, 0x00fb00,
+                                        0x00fb06, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a, 0x010780, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x01df00, 0x01df1e));
     }
 
     private static void populateSCX_LEPC() {
@@ -4307,7 +4409,7 @@ private static void populateSCX_MODI() {
     }
 
     private static void populateSCX_MONG() {
-        SET_ENCODINGS.put("scx=Mong", CodePointSet.createNoDedup(0x001800, 0x00180e, 0x001810, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x00202f, 0x00202f, 0x011660, 0x01166c));
+        SET_ENCODINGS.put("scx=Mong", CodePointSet.createNoDedup(0x001800, 0x001819, 0x001820, 0x001878, 0x001880, 0x0018aa, 0x00202f, 0x00202f, 0x011660, 0x01166c));
     }
 
     private static void populateSCX_MROO() {
@@ -4344,7 +4446,7 @@ private static void populateSCX_NEWA() {
     }
 
     private static void populateSCX_NKOO() {
-        SET_ENCODINGS.put("scx=Nkoo", CodePointSet.createNoDedup(0x0007c0, 0x0007fa, 0x0007fd, 0x0007ff));
+        SET_ENCODINGS.put("scx=Nkoo", CodePointSet.createNoDedup(0x00060c, 0x00060c, 0x00061b, 0x00061b, 0x00061f, 0x00061f, 0x0007c0, 0x0007fa, 0x0007fd, 0x0007ff, 0x00fd3e, 0x00fd3f));
     }
 
     private static void populateSCX_NSHU() {
@@ -4378,6 +4480,10 @@ private static void populateSCX_OSMA() {
         SET_ENCODINGS.put("scx=Osma", CodePointSet.createNoDedup(0x010480, 0x01049d, 0x0104a0, 0x0104a9));
     }
 
+    private static void populateSCX_OUGR() {
+        SET_ENCODINGS.put("scx=Ougr", CodePointSet.createNoDedup(0x000640, 0x000640, 0x010af2, 0x010af2, 0x010f70, 0x010f89));
+    }
+
     private static void populateSCX_PALM() {
         SET_ENCODINGS.put("scx=Palm", CodePointSet.createNoDedup(0x010860, 0x01087f));
     }
@@ -4490,7 +4596,7 @@ private static void populateSCX_SYLO() {
 
     private static void populateSCX_SYRC() {
         SET_ENCODINGS.put("scx=Syrc", CodePointSet.createNoDedup(0x00060c, 0x00060c, 0x00061b, 0x00061c, 0x00061f, 0x00061f, 0x000640, 0x000640, 0x00064b, 0x000655, 0x000670, 0x000670, 0x000700,
-                        0x00070d, 0x00070f, 0x00074a, 0x00074d, 0x00074f, 0x000860, 0x00086a, 0x001df8, 0x001df8));
+                        0x00070d, 0x00070f, 0x00074a, 0x00074d, 0x00074f, 0x000860, 0x00086a, 0x001df8, 0x001df8, 0x001dfa, 0x001dfa));
     }
 
     private static void populateSCX_TAGB() {
@@ -4498,7 +4604,7 @@ private static void populateSCX_TAGB() {
     }
 
     private static void populateSCX_TAKR() {
-        SET_ENCODINGS.put("scx=Takr", CodePointSet.createNoDedup(0x000964, 0x000965, 0x00a830, 0x00a839, 0x011680, 0x0116b8, 0x0116c0, 0x0116c9));
+        SET_ENCODINGS.put("scx=Takr", CodePointSet.createNoDedup(0x000964, 0x000965, 0x00a830, 0x00a839, 0x011680, 0x0116b9, 0x0116c0, 0x0116c9));
     }
 
     private static void populateSCX_TALE() {
@@ -4527,9 +4633,9 @@ private static void populateSCX_TAVT() {
 
     private static void populateSCX_TELU() {
         SET_ENCODINGS.put("scx=Telu",
-                        CodePointSet.createNoDedup(0x000951, 0x000952, 0x000964, 0x000965, 0x000c00, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3d, 0x000c44, 0x000c46,
-                                        0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c77, 0x000c7f, 0x001cda, 0x001cda, 0x001cf2,
-                                        0x001cf2));
+                        CodePointSet.createNoDedup(0x000951, 0x000952, 0x000964, 0x000965, 0x000c00, 0x000c0c, 0x000c0e, 0x000c10, 0x000c12, 0x000c28, 0x000c2a, 0x000c39, 0x000c3c, 0x000c44, 0x000c46,
+                                        0x000c48, 0x000c4a, 0x000c4d, 0x000c55, 0x000c56, 0x000c58, 0x000c5a, 0x000c5d, 0x000c5d, 0x000c60, 0x000c63, 0x000c66, 0x000c6f, 0x000c77, 0x000c7f, 0x001cda,
+                                        0x001cda, 0x001cf2, 0x001cf2));
     }
 
     private static void populateSCX_TFNG() {
@@ -4537,7 +4643,7 @@ private static void populateSCX_TFNG() {
     }
 
     private static void populateSCX_TGLG() {
-        SET_ENCODINGS.put("scx=Tglg", CodePointSet.createNoDedup(0x001700, 0x00170c, 0x00170e, 0x001714, 0x001735, 0x001736));
+        SET_ENCODINGS.put("scx=Tglg", CodePointSet.createNoDedup(0x001700, 0x001715, 0x00171f, 0x00171f, 0x001735, 0x001736));
     }
 
     private static void populateSCX_THAA() {
@@ -4558,6 +4664,14 @@ private static void populateSCX_TIRH() {
         SET_ENCODINGS.put("scx=Tirh", CodePointSet.createNoDedup(0x000951, 0x000952, 0x000964, 0x000965, 0x001cf2, 0x001cf2, 0x00a830, 0x00a839, 0x011480, 0x0114c7, 0x0114d0, 0x0114d9));
     }
 
+    private static void populateSCX_TNSA() {
+        SET_ENCODINGS.put("scx=Tnsa", CodePointSet.createNoDedup(0x016a70, 0x016abe, 0x016ac0, 0x016ac9));
+    }
+
+    private static void populateSCX_TOTO() {
+        SET_ENCODINGS.put("scx=Toto", CodePointSet.createNoDedup(0x01e290, 0x01e2ae));
+    }
+
     private static void populateSCX_UGAR() {
         SET_ENCODINGS.put("scx=Ugar", CodePointSet.createNoDedup(0x010380, 0x01039d, 0x01039f, 0x01039f));
     }
@@ -4566,6 +4680,11 @@ private static void populateSCX_VAII() {
         SET_ENCODINGS.put("scx=Vaii", CodePointSet.createNoDedup(0x00a500, 0x00a62b));
     }
 
+    private static void populateSCX_VITH() {
+        SET_ENCODINGS.put("scx=Vith", CodePointSet.createNoDedup(0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3, 0x0105b1, 0x0105b3,
+                        0x0105b9, 0x0105bb, 0x0105bc));
+    }
+
     private static void populateSCX_WARA() {
         SET_ENCODINGS.put("scx=Wara", CodePointSet.createNoDedup(0x0118a0, 0x0118f2, 0x0118ff, 0x0118ff));
     }
@@ -4598,48 +4717,48 @@ private static void populateSCX_ZANB() {
 
     private static void populateSCX_ZINH() {
         SET_ENCODINGS.put("scx=Zinh",
-                        CodePointSet.createNoDedup(0x000300, 0x000341, 0x000343, 0x000344, 0x000346, 0x000362, 0x000953, 0x000954, 0x001ab0, 0x001ac0, 0x001dc2, 0x001df7, 0x001df9, 0x001df9, 0x001dfb,
-                                        0x001dff, 0x00200c, 0x00200d, 0x0020d0, 0x0020ef, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2d, 0x0101fd, 0x0101fd, 0x01d167, 0x01d169, 0x01d17b, 0x01d182, 0x01d185,
-                                        0x01d18b, 0x01d1aa, 0x01d1ad, 0x0e0100, 0x0e01ef));
+                        CodePointSet.createNoDedup(0x000300, 0x000341, 0x000343, 0x000344, 0x000346, 0x000362, 0x000953, 0x000954, 0x001ab0, 0x001ace, 0x001dc2, 0x001df7, 0x001df9, 0x001df9, 0x001dfb,
+                                        0x001dff, 0x00200c, 0x00200d, 0x0020d0, 0x0020ef, 0x00fe00, 0x00fe0f, 0x00fe20, 0x00fe2d, 0x0101fd, 0x0101fd, 0x01cf00, 0x01cf2d, 0x01cf30, 0x01cf46, 0x01d167,
+                                        0x01d169, 0x01d17b, 0x01d182, 0x01d185, 0x01d18b, 0x01d1aa, 0x01d1ad, 0x0e0100, 0x0e01ef));
     }
 
     private static void populateSCX_ZYYY() {
         SET_ENCODINGS.put("scx=Zyyy", CodePointSet.createNoDedup(0x000000, 0x000040, 0x00005b, 0x000060, 0x00007b, 0x0000a9, 0x0000ab, 0x0000b9, 0x0000bb, 0x0000bf, 0x0000d7, 0x0000d7, 0x0000f7,
                         0x0000f7, 0x0002b9, 0x0002df, 0x0002e5, 0x0002e9, 0x0002ec, 0x0002ff, 0x000374, 0x000374, 0x00037e, 0x00037e, 0x000385, 0x000385, 0x000387, 0x000387, 0x000605, 0x000605,
                         0x0006dd, 0x0006dd, 0x0008e2, 0x0008e2, 0x000e3f, 0x000e3f, 0x000fd5, 0x000fd8, 0x0016eb, 0x0016ed, 0x002000, 0x00200b, 0x00200e, 0x00202e, 0x002030, 0x002064, 0x002066,
-                        0x002070, 0x002074, 0x00207e, 0x002080, 0x00208e, 0x0020a0, 0x0020bf, 0x002100, 0x002125, 0x002127, 0x002129, 0x00212c, 0x002131, 0x002133, 0x00214d, 0x00214f, 0x00215f,
+                        0x002070, 0x002074, 0x00207e, 0x002080, 0x00208e, 0x0020a0, 0x0020c0, 0x002100, 0x002125, 0x002127, 0x002129, 0x00212c, 0x002131, 0x002133, 0x00214d, 0x00214f, 0x00215f,
                         0x002189, 0x00218b, 0x002190, 0x002426, 0x002440, 0x00244a, 0x002460, 0x0027ff, 0x002900, 0x002b73, 0x002b76, 0x002b95, 0x002b97, 0x002bff, 0x002e00, 0x002e42, 0x002e44,
-                        0x002e52, 0x002ff0, 0x002ffb, 0x003000, 0x003000, 0x003004, 0x003004, 0x003012, 0x003012, 0x003020, 0x003020, 0x003036, 0x003036, 0x003248, 0x00325f, 0x00327f, 0x00327f,
+                        0x002e5d, 0x002ff0, 0x002ffb, 0x003000, 0x003000, 0x003004, 0x003004, 0x003012, 0x003012, 0x003020, 0x003020, 0x003036, 0x003036, 0x003248, 0x00325f, 0x00327f, 0x00327f,
                         0x0032b1, 0x0032bf, 0x0032cc, 0x0032cf, 0x003371, 0x00337a, 0x003380, 0x0033df, 0x0033ff, 0x0033ff, 0x004dc0, 0x004dff, 0x00a708, 0x00a721, 0x00a788, 0x00a78a, 0x00ab5b,
-                        0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fd3e, 0x00fd3f, 0x00fe10, 0x00fe19, 0x00fe30, 0x00fe44, 0x00fe47, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00feff, 0x00feff,
-                        0x00ff01, 0x00ff20, 0x00ff3b, 0x00ff40, 0x00ff5b, 0x00ff60, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff9, 0x00fffd, 0x010190, 0x01019c, 0x0101d0, 0x0101fc, 0x016fe2,
-                        0x016fe3, 0x01d000, 0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d166, 0x01d16a, 0x01d17a, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1e8, 0x01d2e0, 0x01d2f3,
-                        0x01d300, 0x01d356, 0x01d372, 0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae,
-                        0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e,
-                        0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01ec71, 0x01ecb4, 0x01ed01, 0x01ed3d, 0x01f000,
-                        0x01f02b, 0x01f030, 0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f1ff, 0x01f201, 0x01f202,
-                        0x01f210, 0x01f23b, 0x01f240, 0x01f248, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6e0, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0,
-                        0x01f7eb, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01f978, 0x01f97a, 0x01f9cb,
-                        0x01f9cd, 0x01fa53, 0x01fa60, 0x01fa6d, 0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7a, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faa8, 0x01fab0, 0x01fab6, 0x01fac0, 0x01fac2, 0x01fad0,
-                        0x01fad6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
+                        0x00ab5b, 0x00ab6a, 0x00ab6b, 0x00fe10, 0x00fe19, 0x00fe30, 0x00fe44, 0x00fe47, 0x00fe52, 0x00fe54, 0x00fe66, 0x00fe68, 0x00fe6b, 0x00feff, 0x00feff, 0x00ff01, 0x00ff20,
+                        0x00ff3b, 0x00ff40, 0x00ff5b, 0x00ff60, 0x00ffe0, 0x00ffe6, 0x00ffe8, 0x00ffee, 0x00fff9, 0x00fffd, 0x010190, 0x01019c, 0x0101d0, 0x0101fc, 0x01cf50, 0x01cfc3, 0x01d000,
+                        0x01d0f5, 0x01d100, 0x01d126, 0x01d129, 0x01d166, 0x01d16a, 0x01d17a, 0x01d183, 0x01d184, 0x01d18c, 0x01d1a9, 0x01d1ae, 0x01d1ea, 0x01d2e0, 0x01d2f3, 0x01d300, 0x01d356,
+                        0x01d372, 0x01d378, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb,
+                        0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544,
+                        0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d7cb, 0x01d7ce, 0x01d7ff, 0x01ec71, 0x01ecb4, 0x01ed01, 0x01ed3d, 0x01f000, 0x01f02b, 0x01f030,
+                        0x01f093, 0x01f0a0, 0x01f0ae, 0x01f0b1, 0x01f0bf, 0x01f0c1, 0x01f0cf, 0x01f0d1, 0x01f0f5, 0x01f100, 0x01f1ad, 0x01f1e6, 0x01f1ff, 0x01f201, 0x01f202, 0x01f210, 0x01f23b,
+                        0x01f240, 0x01f248, 0x01f260, 0x01f265, 0x01f300, 0x01f6d7, 0x01f6dd, 0x01f6ec, 0x01f6f0, 0x01f6fc, 0x01f700, 0x01f773, 0x01f780, 0x01f7d8, 0x01f7e0, 0x01f7eb, 0x01f7f0,
+                        0x01f7f0, 0x01f800, 0x01f80b, 0x01f810, 0x01f847, 0x01f850, 0x01f859, 0x01f860, 0x01f887, 0x01f890, 0x01f8ad, 0x01f8b0, 0x01f8b1, 0x01f900, 0x01fa53, 0x01fa60, 0x01fa6d,
+                        0x01fa70, 0x01fa74, 0x01fa78, 0x01fa7c, 0x01fa80, 0x01fa86, 0x01fa90, 0x01faac, 0x01fab0, 0x01faba, 0x01fac0, 0x01fac5, 0x01fad0, 0x01fad9, 0x01fae0, 0x01fae7, 0x01faf0,
+                        0x01faf6, 0x01fb00, 0x01fb92, 0x01fb94, 0x01fbca, 0x01fbf0, 0x01fbf9, 0x0e0001, 0x0e0001, 0x0e0020, 0x0e007f));
     }
 
     private static void populateSCX_ZZZZ() {
         SET_ENCODINGS.put("scx=Zzzz", CodePointSet.createNoDedup(0x000378, 0x000379, 0x000380, 0x000383, 0x00038b, 0x00038b, 0x00038d, 0x00038d, 0x0003a2, 0x0003a2, 0x000530, 0x000530, 0x000557,
-                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00061d, 0x00061d, 0x00070e, 0x00070e, 0x00074b, 0x00074c,
-                        0x0007b2, 0x0007bf, 0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00089f, 0x0008b5, 0x0008b5, 0x0008c8,
-                        0x0008d2, 0x000984, 0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6,
-                        0x0009c9, 0x0009ca, 0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11,
-                        0x000a12, 0x000a29, 0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a,
-                        0x000a4e, 0x000a50, 0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9,
-                        0x000aa9, 0x000ab1, 0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5,
-                        0x000af2, 0x000af8, 0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a,
-                        0x000b3b, 0x000b45, 0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84,
-                        0x000b8b, 0x000b8d, 0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba,
-                        0x000bbd, 0x000bc3, 0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11,
-                        0x000c29, 0x000c29, 0x000c3a, 0x000c3c, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
+                        0x000558, 0x00058b, 0x00058c, 0x000590, 0x000590, 0x0005c8, 0x0005cf, 0x0005eb, 0x0005ee, 0x0005f5, 0x0005ff, 0x00070e, 0x00070e, 0x00074b, 0x00074c, 0x0007b2, 0x0007bf,
+                        0x0007fb, 0x0007fc, 0x00082e, 0x00082f, 0x00083f, 0x00083f, 0x00085c, 0x00085d, 0x00085f, 0x00085f, 0x00086b, 0x00086f, 0x00088f, 0x00088f, 0x000892, 0x000897, 0x000984,
+                        0x000984, 0x00098d, 0x00098e, 0x000991, 0x000992, 0x0009a9, 0x0009a9, 0x0009b1, 0x0009b1, 0x0009b3, 0x0009b5, 0x0009ba, 0x0009bb, 0x0009c5, 0x0009c6, 0x0009c9, 0x0009ca,
+                        0x0009cf, 0x0009d6, 0x0009d8, 0x0009db, 0x0009de, 0x0009de, 0x0009e4, 0x0009e5, 0x0009ff, 0x000a00, 0x000a04, 0x000a04, 0x000a0b, 0x000a0e, 0x000a11, 0x000a12, 0x000a29,
+                        0x000a29, 0x000a31, 0x000a31, 0x000a34, 0x000a34, 0x000a37, 0x000a37, 0x000a3a, 0x000a3b, 0x000a3d, 0x000a3d, 0x000a43, 0x000a46, 0x000a49, 0x000a4a, 0x000a4e, 0x000a50,
+                        0x000a52, 0x000a58, 0x000a5d, 0x000a5d, 0x000a5f, 0x000a65, 0x000a77, 0x000a80, 0x000a84, 0x000a84, 0x000a8e, 0x000a8e, 0x000a92, 0x000a92, 0x000aa9, 0x000aa9, 0x000ab1,
+                        0x000ab1, 0x000ab4, 0x000ab4, 0x000aba, 0x000abb, 0x000ac6, 0x000ac6, 0x000aca, 0x000aca, 0x000ace, 0x000acf, 0x000ad1, 0x000adf, 0x000ae4, 0x000ae5, 0x000af2, 0x000af8,
+                        0x000b00, 0x000b00, 0x000b04, 0x000b04, 0x000b0d, 0x000b0e, 0x000b11, 0x000b12, 0x000b29, 0x000b29, 0x000b31, 0x000b31, 0x000b34, 0x000b34, 0x000b3a, 0x000b3b, 0x000b45,
+                        0x000b46, 0x000b49, 0x000b4a, 0x000b4e, 0x000b54, 0x000b58, 0x000b5b, 0x000b5e, 0x000b5e, 0x000b64, 0x000b65, 0x000b78, 0x000b81, 0x000b84, 0x000b84, 0x000b8b, 0x000b8d,
+                        0x000b91, 0x000b91, 0x000b96, 0x000b98, 0x000b9b, 0x000b9b, 0x000b9d, 0x000b9d, 0x000ba0, 0x000ba2, 0x000ba5, 0x000ba7, 0x000bab, 0x000bad, 0x000bba, 0x000bbd, 0x000bc3,
+                        0x000bc5, 0x000bc9, 0x000bc9, 0x000bce, 0x000bcf, 0x000bd1, 0x000bd6, 0x000bd8, 0x000be5, 0x000bfb, 0x000bff, 0x000c0d, 0x000c0d, 0x000c11, 0x000c11, 0x000c29, 0x000c29,
+                        0x000c3a, 0x000c3b, 0x000c45, 0x000c45, 0x000c49, 0x000c49, 0x000c4e, 0x000c54, 0x000c57, 0x000c57, 0x000c5b, 0x000c5c, 0x000c5e, 0x000c5f, 0x000c64, 0x000c65, 0x000c70,
                         0x000c76, 0x000c8d, 0x000c8d, 0x000c91, 0x000c91, 0x000ca9, 0x000ca9, 0x000cb4, 0x000cb4, 0x000cba, 0x000cbb, 0x000cc5, 0x000cc5, 0x000cc9, 0x000cc9, 0x000cce, 0x000cd4,
-                        0x000cd7, 0x000cdd, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
+                        0x000cd7, 0x000cdc, 0x000cdf, 0x000cdf, 0x000ce4, 0x000ce5, 0x000cf0, 0x000cf0, 0x000cf3, 0x000cff, 0x000d0d, 0x000d0d, 0x000d11, 0x000d11, 0x000d45, 0x000d45, 0x000d49,
                         0x000d49, 0x000d50, 0x000d53, 0x000d64, 0x000d65, 0x000d80, 0x000d80, 0x000d84, 0x000d84, 0x000d97, 0x000d99, 0x000db2, 0x000db2, 0x000dbc, 0x000dbc, 0x000dbe, 0x000dbf,
                         0x000dc7, 0x000dc9, 0x000dcb, 0x000dce, 0x000dd5, 0x000dd5, 0x000dd7, 0x000dd7, 0x000de0, 0x000de5, 0x000df0, 0x000df1, 0x000df5, 0x000e00, 0x000e3b, 0x000e3e, 0x000e5c,
                         0x000e80, 0x000e83, 0x000e83, 0x000e85, 0x000e85, 0x000e8b, 0x000e8b, 0x000ea4, 0x000ea4, 0x000ea6, 0x000ea6, 0x000ebe, 0x000ebf, 0x000ec5, 0x000ec5, 0x000ec7, 0x000ec7,
@@ -4647,63 +4766,66 @@ private static void populateSCX_ZZZZ() {
                         0x000fff, 0x0010c6, 0x0010c6, 0x0010c8, 0x0010cc, 0x0010ce, 0x0010cf, 0x001249, 0x001249, 0x00124e, 0x00124f, 0x001257, 0x001257, 0x001259, 0x001259, 0x00125e, 0x00125f,
                         0x001289, 0x001289, 0x00128e, 0x00128f, 0x0012b1, 0x0012b1, 0x0012b6, 0x0012b7, 0x0012bf, 0x0012bf, 0x0012c1, 0x0012c1, 0x0012c6, 0x0012c7, 0x0012d7, 0x0012d7, 0x001311,
                         0x001311, 0x001316, 0x001317, 0x00135b, 0x00135c, 0x00137d, 0x00137f, 0x00139a, 0x00139f, 0x0013f6, 0x0013f7, 0x0013fe, 0x0013ff, 0x00169d, 0x00169f, 0x0016f9, 0x0016ff,
-                        0x00170d, 0x00170d, 0x001715, 0x00171f, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea,
-                        0x0017ef, 0x0017fa, 0x0017ff, 0x00180f, 0x00180f, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f,
-                        0x00193c, 0x00193f, 0x001941, 0x001943, 0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f,
-                        0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a, 0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001ac1, 0x001aff, 0x001b4c, 0x001b4f, 0x001b7d, 0x001b7f, 0x001bf4, 0x001bfb,
-                        0x001c38, 0x001c3a, 0x001c4a, 0x001c4c, 0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001dfa, 0x001dfa, 0x001f16, 0x001f17, 0x001f1e,
-                        0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58, 0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5,
-                        0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc, 0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f,
-                        0x00208f, 0x00209d, 0x00209f, 0x0020c0, 0x0020cf, 0x0020f1, 0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96,
-                        0x002c2f, 0x002c2f, 0x002c5f, 0x002c5f, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c, 0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97,
-                        0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7, 0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf,
-                        0x002e53, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff, 0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130,
-                        0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x009ffd, 0x009fff, 0x00a48d, 0x00a48f, 0x00a4c7, 0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff,
-                        0x00a7c0, 0x00a7c1, 0x00a7cb, 0x00a7f4, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f, 0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d,
-                        0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37, 0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00,
-                        0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27, 0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4,
-                        0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada, 0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d,
-                        0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc2, 0x00fbd2, 0x00fd40, 0x00fd4f, 0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdef, 0x00fdfe, 0x00fdff, 0x00fe1a,
-                        0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd, 0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9,
-                        0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8, 0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b,
-                        0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103, 0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f,
-                        0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff, 0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e,
-                        0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4, 0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e,
-                        0x010570, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d,
-                        0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df, 0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f,
-                        0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07, 0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49,
-                        0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea, 0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98,
-                        0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3, 0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa,
-                        0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f, 0x010f5a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011070, 0x01107e,
-                        0x0110c2, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9, 0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5,
-                        0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f, 0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef,
-                        0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d, 0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345,
-                        0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f, 0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c,
-                        0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da, 0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116b9,
-                        0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c, 0x01172c, 0x01172f, 0x011740, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b,
-                        0x011914, 0x011914, 0x011917, 0x011917, 0x011936, 0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5,
-                        0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011abf, 0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91,
-                        0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07, 0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a,
-                        0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69, 0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf,
-                        0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f, 0x01246f, 0x012475, 0x01247f, 0x012544, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39,
-                        0x016a3f, 0x016a5f, 0x016a5f, 0x016a6a, 0x016a6d, 0x016a70, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62,
-                        0x016b78, 0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8,
-                        0x0187ff, 0x018cd6, 0x018cff, 0x018d09, 0x01afff, 0x01b11f, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc, 0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f,
-                        0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01cfff, 0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1e9, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357,
-                        0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d, 0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba,
-                        0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506, 0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545,
-                        0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6, 0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01dfff, 0x01e007, 0x01e007,
-                        0x01e019, 0x01e01a, 0x01e022, 0x01e022, 0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e2bf, 0x01e2fa,
-                        0x01e2fe, 0x01e300, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d, 0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff,
-                        0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33, 0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c,
-                        0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50, 0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58,
-                        0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65, 0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78,
-                        0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4, 0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff,
-                        0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6, 0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c,
-                        0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6df, 0x01f6ed, 0x01f6ef, 0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df,
-                        0x01f7ec, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888, 0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01f979, 0x01f979, 0x01f9cc,
-                        0x01f9cc, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7b, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faa9, 0x01faaf, 0x01fab7, 0x01fabf, 0x01fac3, 0x01facf,
-                        0x01fad7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6de, 0x02a6ff, 0x02b735, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1,
-                        0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff, 0x0e01f0, 0x10ffff));
+                        0x001716, 0x00171e, 0x001737, 0x00173f, 0x001754, 0x00175f, 0x00176d, 0x00176d, 0x001771, 0x001771, 0x001774, 0x00177f, 0x0017de, 0x0017df, 0x0017ea, 0x0017ef, 0x0017fa,
+                        0x0017ff, 0x00181a, 0x00181f, 0x001879, 0x00187f, 0x0018ab, 0x0018af, 0x0018f6, 0x0018ff, 0x00191f, 0x00191f, 0x00192c, 0x00192f, 0x00193c, 0x00193f, 0x001941, 0x001943,
+                        0x00196e, 0x00196f, 0x001975, 0x00197f, 0x0019ac, 0x0019af, 0x0019ca, 0x0019cf, 0x0019db, 0x0019dd, 0x001a1c, 0x001a1d, 0x001a5f, 0x001a5f, 0x001a7d, 0x001a7e, 0x001a8a,
+                        0x001a8f, 0x001a9a, 0x001a9f, 0x001aae, 0x001aaf, 0x001acf, 0x001aff, 0x001b4d, 0x001b4f, 0x001b7f, 0x001b7f, 0x001bf4, 0x001bfb, 0x001c38, 0x001c3a, 0x001c4a, 0x001c4c,
+                        0x001c89, 0x001c8f, 0x001cbb, 0x001cbc, 0x001cc8, 0x001ccf, 0x001cfb, 0x001cff, 0x001f16, 0x001f17, 0x001f1e, 0x001f1f, 0x001f46, 0x001f47, 0x001f4e, 0x001f4f, 0x001f58,
+                        0x001f58, 0x001f5a, 0x001f5a, 0x001f5c, 0x001f5c, 0x001f5e, 0x001f5e, 0x001f7e, 0x001f7f, 0x001fb5, 0x001fb5, 0x001fc5, 0x001fc5, 0x001fd4, 0x001fd5, 0x001fdc, 0x001fdc,
+                        0x001ff0, 0x001ff1, 0x001ff5, 0x001ff5, 0x001fff, 0x001fff, 0x002065, 0x002065, 0x002072, 0x002073, 0x00208f, 0x00208f, 0x00209d, 0x00209f, 0x0020c1, 0x0020cf, 0x0020f1,
+                        0x0020ff, 0x00218c, 0x00218f, 0x002427, 0x00243f, 0x00244b, 0x00245f, 0x002b74, 0x002b75, 0x002b96, 0x002b96, 0x002cf4, 0x002cf8, 0x002d26, 0x002d26, 0x002d28, 0x002d2c,
+                        0x002d2e, 0x002d2f, 0x002d68, 0x002d6e, 0x002d71, 0x002d7e, 0x002d97, 0x002d9f, 0x002da7, 0x002da7, 0x002daf, 0x002daf, 0x002db7, 0x002db7, 0x002dbf, 0x002dbf, 0x002dc7,
+                        0x002dc7, 0x002dcf, 0x002dcf, 0x002dd7, 0x002dd7, 0x002ddf, 0x002ddf, 0x002e5e, 0x002e7f, 0x002e9a, 0x002e9a, 0x002ef4, 0x002eff, 0x002fd6, 0x002fef, 0x002ffc, 0x002fff,
+                        0x003040, 0x003040, 0x003097, 0x003098, 0x003100, 0x003104, 0x003130, 0x003130, 0x00318f, 0x00318f, 0x0031e4, 0x0031ef, 0x00321f, 0x00321f, 0x00a48d, 0x00a48f, 0x00a4c7,
+                        0x00a4cf, 0x00a62c, 0x00a63f, 0x00a6f8, 0x00a6ff, 0x00a7cb, 0x00a7cf, 0x00a7d2, 0x00a7d2, 0x00a7d4, 0x00a7d4, 0x00a7da, 0x00a7f1, 0x00a82d, 0x00a82f, 0x00a83a, 0x00a83f,
+                        0x00a878, 0x00a87f, 0x00a8c6, 0x00a8cd, 0x00a8da, 0x00a8df, 0x00a954, 0x00a95e, 0x00a97d, 0x00a97f, 0x00a9ce, 0x00a9ce, 0x00a9da, 0x00a9dd, 0x00a9ff, 0x00a9ff, 0x00aa37,
+                        0x00aa3f, 0x00aa4e, 0x00aa4f, 0x00aa5a, 0x00aa5b, 0x00aac3, 0x00aada, 0x00aaf7, 0x00ab00, 0x00ab07, 0x00ab08, 0x00ab0f, 0x00ab10, 0x00ab17, 0x00ab1f, 0x00ab27, 0x00ab27,
+                        0x00ab2f, 0x00ab2f, 0x00ab6c, 0x00ab6f, 0x00abee, 0x00abef, 0x00abfa, 0x00abff, 0x00d7a4, 0x00d7af, 0x00d7c7, 0x00d7ca, 0x00d7fc, 0x00f8ff, 0x00fa6e, 0x00fa6f, 0x00fada,
+                        0x00faff, 0x00fb07, 0x00fb12, 0x00fb18, 0x00fb1c, 0x00fb37, 0x00fb37, 0x00fb3d, 0x00fb3d, 0x00fb3f, 0x00fb3f, 0x00fb42, 0x00fb42, 0x00fb45, 0x00fb45, 0x00fbc3, 0x00fbd2,
+                        0x00fd90, 0x00fd91, 0x00fdc8, 0x00fdce, 0x00fdd0, 0x00fdef, 0x00fe1a, 0x00fe1f, 0x00fe53, 0x00fe53, 0x00fe67, 0x00fe67, 0x00fe6c, 0x00fe6f, 0x00fe75, 0x00fe75, 0x00fefd,
+                        0x00fefe, 0x00ff00, 0x00ff00, 0x00ffbf, 0x00ffc1, 0x00ffc8, 0x00ffc9, 0x00ffd0, 0x00ffd1, 0x00ffd8, 0x00ffd9, 0x00ffdd, 0x00ffdf, 0x00ffe7, 0x00ffe7, 0x00ffef, 0x00fff8,
+                        0x00fffe, 0x00ffff, 0x01000c, 0x01000c, 0x010027, 0x010027, 0x01003b, 0x01003b, 0x01003e, 0x01003e, 0x01004e, 0x01004f, 0x01005e, 0x01007f, 0x0100fb, 0x0100ff, 0x010103,
+                        0x010106, 0x010134, 0x010136, 0x01018f, 0x01018f, 0x01019d, 0x01019f, 0x0101a1, 0x0101cf, 0x0101fe, 0x01027f, 0x01029d, 0x01029f, 0x0102d1, 0x0102df, 0x0102fc, 0x0102ff,
+                        0x010324, 0x01032c, 0x01034b, 0x01034f, 0x01037b, 0x01037f, 0x01039e, 0x01039e, 0x0103c4, 0x0103c7, 0x0103d6, 0x0103ff, 0x01049e, 0x01049f, 0x0104aa, 0x0104af, 0x0104d4,
+                        0x0104d7, 0x0104fc, 0x0104ff, 0x010528, 0x01052f, 0x010564, 0x01056e, 0x01057b, 0x01057b, 0x01058b, 0x01058b, 0x010593, 0x010593, 0x010596, 0x010596, 0x0105a2, 0x0105a2,
+                        0x0105b2, 0x0105b2, 0x0105ba, 0x0105ba, 0x0105bd, 0x0105ff, 0x010737, 0x01073f, 0x010756, 0x01075f, 0x010768, 0x01077f, 0x010786, 0x010786, 0x0107b1, 0x0107b1, 0x0107bb,
+                        0x0107ff, 0x010806, 0x010807, 0x010809, 0x010809, 0x010836, 0x010836, 0x010839, 0x01083b, 0x01083d, 0x01083e, 0x010856, 0x010856, 0x01089f, 0x0108a6, 0x0108b0, 0x0108df,
+                        0x0108f3, 0x0108f3, 0x0108f6, 0x0108fa, 0x01091c, 0x01091e, 0x01093a, 0x01093e, 0x010940, 0x01097f, 0x0109b8, 0x0109bb, 0x0109d0, 0x0109d1, 0x010a04, 0x010a04, 0x010a07,
+                        0x010a0b, 0x010a14, 0x010a14, 0x010a18, 0x010a18, 0x010a36, 0x010a37, 0x010a3b, 0x010a3e, 0x010a49, 0x010a4f, 0x010a59, 0x010a5f, 0x010aa0, 0x010abf, 0x010ae7, 0x010aea,
+                        0x010af7, 0x010aff, 0x010b36, 0x010b38, 0x010b56, 0x010b57, 0x010b73, 0x010b77, 0x010b92, 0x010b98, 0x010b9d, 0x010ba8, 0x010bb0, 0x010bff, 0x010c49, 0x010c7f, 0x010cb3,
+                        0x010cbf, 0x010cf3, 0x010cf9, 0x010d28, 0x010d2f, 0x010d3a, 0x010e5f, 0x010e7f, 0x010e7f, 0x010eaa, 0x010eaa, 0x010eae, 0x010eaf, 0x010eb2, 0x010eff, 0x010f28, 0x010f2f,
+                        0x010f5a, 0x010f6f, 0x010f8a, 0x010faf, 0x010fcc, 0x010fdf, 0x010ff7, 0x010fff, 0x01104e, 0x011051, 0x011076, 0x01107e, 0x0110c3, 0x0110cc, 0x0110ce, 0x0110cf, 0x0110e9,
+                        0x0110ef, 0x0110fa, 0x0110ff, 0x011135, 0x011135, 0x011148, 0x01114f, 0x011177, 0x01117f, 0x0111e0, 0x0111e0, 0x0111f5, 0x0111ff, 0x011212, 0x011212, 0x01123f, 0x01127f,
+                        0x011287, 0x011287, 0x011289, 0x011289, 0x01128e, 0x01128e, 0x01129e, 0x01129e, 0x0112aa, 0x0112af, 0x0112eb, 0x0112ef, 0x0112fa, 0x0112ff, 0x011304, 0x011304, 0x01130d,
+                        0x01130e, 0x011311, 0x011312, 0x011329, 0x011329, 0x011331, 0x011331, 0x011334, 0x011334, 0x01133a, 0x01133a, 0x011345, 0x011346, 0x011349, 0x01134a, 0x01134e, 0x01134f,
+                        0x011351, 0x011356, 0x011358, 0x01135c, 0x011364, 0x011365, 0x01136d, 0x01136f, 0x011375, 0x0113ff, 0x01145c, 0x01145c, 0x011462, 0x01147f, 0x0114c8, 0x0114cf, 0x0114da,
+                        0x01157f, 0x0115b6, 0x0115b7, 0x0115de, 0x0115ff, 0x011645, 0x01164f, 0x01165a, 0x01165f, 0x01166d, 0x01167f, 0x0116ba, 0x0116bf, 0x0116ca, 0x0116ff, 0x01171b, 0x01171c,
+                        0x01172c, 0x01172f, 0x011747, 0x0117ff, 0x01183c, 0x01189f, 0x0118f3, 0x0118fe, 0x011907, 0x011908, 0x01190a, 0x01190b, 0x011914, 0x011914, 0x011917, 0x011917, 0x011936,
+                        0x011936, 0x011939, 0x01193a, 0x011947, 0x01194f, 0x01195a, 0x01199f, 0x0119a8, 0x0119a9, 0x0119d8, 0x0119d9, 0x0119e5, 0x0119ff, 0x011a48, 0x011a4f, 0x011aa3, 0x011aaf,
+                        0x011af9, 0x011bff, 0x011c09, 0x011c09, 0x011c37, 0x011c37, 0x011c46, 0x011c4f, 0x011c6d, 0x011c6f, 0x011c90, 0x011c91, 0x011ca8, 0x011ca8, 0x011cb7, 0x011cff, 0x011d07,
+                        0x011d07, 0x011d0a, 0x011d0a, 0x011d37, 0x011d39, 0x011d3b, 0x011d3b, 0x011d3e, 0x011d3e, 0x011d48, 0x011d4f, 0x011d5a, 0x011d5f, 0x011d66, 0x011d66, 0x011d69, 0x011d69,
+                        0x011d8f, 0x011d8f, 0x011d92, 0x011d92, 0x011d99, 0x011d9f, 0x011daa, 0x011edf, 0x011ef9, 0x011faf, 0x011fb1, 0x011fbf, 0x011ff2, 0x011ffe, 0x01239a, 0x0123ff, 0x01246f,
+                        0x01246f, 0x012475, 0x01247f, 0x012544, 0x012f8f, 0x012ff3, 0x012fff, 0x01342f, 0x01342f, 0x013439, 0x0143ff, 0x014647, 0x0167ff, 0x016a39, 0x016a3f, 0x016a5f, 0x016a5f,
+                        0x016a6a, 0x016a6d, 0x016abf, 0x016abf, 0x016aca, 0x016acf, 0x016aee, 0x016aef, 0x016af6, 0x016aff, 0x016b46, 0x016b4f, 0x016b5a, 0x016b5a, 0x016b62, 0x016b62, 0x016b78,
+                        0x016b7c, 0x016b90, 0x016e3f, 0x016e9b, 0x016eff, 0x016f4b, 0x016f4e, 0x016f88, 0x016f8e, 0x016fa0, 0x016fdf, 0x016fe5, 0x016fef, 0x016ff2, 0x016fff, 0x0187f8, 0x0187ff,
+                        0x018cd6, 0x018cff, 0x018d09, 0x01afef, 0x01aff4, 0x01aff4, 0x01affc, 0x01affc, 0x01afff, 0x01afff, 0x01b123, 0x01b14f, 0x01b153, 0x01b163, 0x01b168, 0x01b16f, 0x01b2fc,
+                        0x01bbff, 0x01bc6b, 0x01bc6f, 0x01bc7d, 0x01bc7f, 0x01bc89, 0x01bc8f, 0x01bc9a, 0x01bc9b, 0x01bca4, 0x01ceff, 0x01cf2e, 0x01cf2f, 0x01cf47, 0x01cf4f, 0x01cfc4, 0x01cfff,
+                        0x01d0f6, 0x01d0ff, 0x01d127, 0x01d128, 0x01d1eb, 0x01d1ff, 0x01d246, 0x01d2df, 0x01d2f4, 0x01d2ff, 0x01d357, 0x01d35f, 0x01d379, 0x01d3ff, 0x01d455, 0x01d455, 0x01d49d,
+                        0x01d49d, 0x01d4a0, 0x01d4a1, 0x01d4a3, 0x01d4a4, 0x01d4a7, 0x01d4a8, 0x01d4ad, 0x01d4ad, 0x01d4ba, 0x01d4ba, 0x01d4bc, 0x01d4bc, 0x01d4c4, 0x01d4c4, 0x01d506, 0x01d506,
+                        0x01d50b, 0x01d50c, 0x01d515, 0x01d515, 0x01d51d, 0x01d51d, 0x01d53a, 0x01d53a, 0x01d53f, 0x01d53f, 0x01d545, 0x01d545, 0x01d547, 0x01d549, 0x01d551, 0x01d551, 0x01d6a6,
+                        0x01d6a7, 0x01d7cc, 0x01d7cd, 0x01da8c, 0x01da9a, 0x01daa0, 0x01daa0, 0x01dab0, 0x01deff, 0x01df1f, 0x01dfff, 0x01e007, 0x01e007, 0x01e019, 0x01e01a, 0x01e022, 0x01e022,
+                        0x01e025, 0x01e025, 0x01e02b, 0x01e0ff, 0x01e12d, 0x01e12f, 0x01e13e, 0x01e13f, 0x01e14a, 0x01e14d, 0x01e150, 0x01e28f, 0x01e2af, 0x01e2bf, 0x01e2fa, 0x01e2fe, 0x01e300,
+                        0x01e7df, 0x01e7e7, 0x01e7e7, 0x01e7ec, 0x01e7ec, 0x01e7ef, 0x01e7ef, 0x01e7ff, 0x01e7ff, 0x01e8c5, 0x01e8c6, 0x01e8d7, 0x01e8ff, 0x01e94c, 0x01e94f, 0x01e95a, 0x01e95d,
+                        0x01e960, 0x01ec70, 0x01ecb5, 0x01ed00, 0x01ed3e, 0x01edff, 0x01ee04, 0x01ee04, 0x01ee20, 0x01ee20, 0x01ee23, 0x01ee23, 0x01ee25, 0x01ee26, 0x01ee28, 0x01ee28, 0x01ee33,
+                        0x01ee33, 0x01ee38, 0x01ee38, 0x01ee3a, 0x01ee3a, 0x01ee3c, 0x01ee41, 0x01ee43, 0x01ee46, 0x01ee48, 0x01ee48, 0x01ee4a, 0x01ee4a, 0x01ee4c, 0x01ee4c, 0x01ee50, 0x01ee50,
+                        0x01ee53, 0x01ee53, 0x01ee55, 0x01ee56, 0x01ee58, 0x01ee58, 0x01ee5a, 0x01ee5a, 0x01ee5c, 0x01ee5c, 0x01ee5e, 0x01ee5e, 0x01ee60, 0x01ee60, 0x01ee63, 0x01ee63, 0x01ee65,
+                        0x01ee66, 0x01ee6b, 0x01ee6b, 0x01ee73, 0x01ee73, 0x01ee78, 0x01ee78, 0x01ee7d, 0x01ee7d, 0x01ee7f, 0x01ee7f, 0x01ee8a, 0x01ee8a, 0x01ee9c, 0x01eea0, 0x01eea4, 0x01eea4,
+                        0x01eeaa, 0x01eeaa, 0x01eebc, 0x01eeef, 0x01eef2, 0x01efff, 0x01f02c, 0x01f02f, 0x01f094, 0x01f09f, 0x01f0af, 0x01f0b0, 0x01f0c0, 0x01f0c0, 0x01f0d0, 0x01f0d0, 0x01f0f6,
+                        0x01f0ff, 0x01f1ae, 0x01f1e5, 0x01f203, 0x01f20f, 0x01f23c, 0x01f23f, 0x01f249, 0x01f24f, 0x01f252, 0x01f25f, 0x01f266, 0x01f2ff, 0x01f6d8, 0x01f6dc, 0x01f6ed, 0x01f6ef,
+                        0x01f6fd, 0x01f6ff, 0x01f774, 0x01f77f, 0x01f7d9, 0x01f7df, 0x01f7ec, 0x01f7ef, 0x01f7f1, 0x01f7ff, 0x01f80c, 0x01f80f, 0x01f848, 0x01f84f, 0x01f85a, 0x01f85f, 0x01f888,
+                        0x01f88f, 0x01f8ae, 0x01f8af, 0x01f8b2, 0x01f8ff, 0x01fa54, 0x01fa5f, 0x01fa6e, 0x01fa6f, 0x01fa75, 0x01fa77, 0x01fa7d, 0x01fa7f, 0x01fa87, 0x01fa8f, 0x01faad, 0x01faaf,
+                        0x01fabb, 0x01fabf, 0x01fac6, 0x01facf, 0x01fada, 0x01fadf, 0x01fae8, 0x01faef, 0x01faf7, 0x01faff, 0x01fb93, 0x01fb93, 0x01fbcb, 0x01fbef, 0x01fbfa, 0x01ffff, 0x02a6e0,
+                        0x02a6ff, 0x02b739, 0x02b73f, 0x02b81e, 0x02b81f, 0x02cea2, 0x02ceaf, 0x02ebe1, 0x02f7ff, 0x02fa1e, 0x02ffff, 0x03134b, 0x0e0000, 0x0e0002, 0x0e001f, 0x0e0080, 0x0e00ff,
+                        0x0e01f0, 0x10ffff));
     }
 }
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java
index 73131fc51010..2589cef46975 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/CaseFoldTable.java
@@ -579,8 +579,8 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x002183, 0x002184, ALTERNATING_UL, 0,
                     0x0024b6, 0x0024cf, INTEGER_OFFSET, 26,
                     0x0024d0, 0x0024e9, INTEGER_OFFSET, -26,
-                    0x002c00, 0x002c2e, INTEGER_OFFSET, 48,
-                    0x002c30, 0x002c5e, INTEGER_OFFSET, -48,
+                    0x002c00, 0x002c2f, INTEGER_OFFSET, 48,
+                    0x002c30, 0x002c5f, INTEGER_OFFSET, -48,
                     0x002c60, 0x002c61, ALTERNATING_AL, 0,
                     0x002c62, 0x002c62, INTEGER_OFFSET, -10743,
                     0x002c63, 0x002c63, INTEGER_OFFSET, -3814,
@@ -624,12 +624,13 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x00a7b1, 0x00a7b1, INTEGER_OFFSET, -42282,
                     0x00a7b2, 0x00a7b2, INTEGER_OFFSET, -42261,
                     0x00a7b3, 0x00a7b3, INTEGER_OFFSET, 928,
-                    0x00a7b4, 0x00a7bf, ALTERNATING_AL, 0,
-                    0x00a7c2, 0x00a7c3, ALTERNATING_AL, 0,
+                    0x00a7b4, 0x00a7c3, ALTERNATING_AL, 0,
                     0x00a7c4, 0x00a7c4, INTEGER_OFFSET, -48,
                     0x00a7c5, 0x00a7c5, INTEGER_OFFSET, -42307,
                     0x00a7c6, 0x00a7c6, INTEGER_OFFSET, -35384,
                     0x00a7c7, 0x00a7ca, ALTERNATING_UL, 0,
+                    0x00a7d0, 0x00a7d1, ALTERNATING_AL, 0,
+                    0x00a7d6, 0x00a7d9, ALTERNATING_AL, 0,
                     0x00a7f5, 0x00a7f6, ALTERNATING_UL, 0,
                     0x00ab53, 0x00ab53, INTEGER_OFFSET, -928,
                     0x00ab70, 0x00abbf, INTEGER_OFFSET, -38864,
@@ -639,6 +640,14 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x010428, 0x01044f, INTEGER_OFFSET, -40,
                     0x0104b0, 0x0104d3, INTEGER_OFFSET, 40,
                     0x0104d8, 0x0104fb, INTEGER_OFFSET, -40,
+                    0x010570, 0x01057a, INTEGER_OFFSET, 39,
+                    0x01057c, 0x01058a, INTEGER_OFFSET, 39,
+                    0x01058c, 0x010592, INTEGER_OFFSET, 39,
+                    0x010594, 0x010595, INTEGER_OFFSET, 39,
+                    0x010597, 0x0105a1, INTEGER_OFFSET, -39,
+                    0x0105a3, 0x0105b1, INTEGER_OFFSET, -39,
+                    0x0105b3, 0x0105b9, INTEGER_OFFSET, -39,
+                    0x0105bb, 0x0105bc, INTEGER_OFFSET, -39,
                     0x010c80, 0x010cb2, INTEGER_OFFSET, 64,
                     0x010cc0, 0x010cf2, INTEGER_OFFSET, -64,
                     0x0118a0, 0x0118bf, INTEGER_OFFSET, 32,
@@ -965,8 +974,8 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x002183, 0x002184, ALTERNATING_UL, 0,
                     0x0024b6, 0x0024cf, INTEGER_OFFSET, 26,
                     0x0024d0, 0x0024e9, INTEGER_OFFSET, -26,
-                    0x002c00, 0x002c2e, INTEGER_OFFSET, 48,
-                    0x002c30, 0x002c5e, INTEGER_OFFSET, -48,
+                    0x002c00, 0x002c2f, INTEGER_OFFSET, 48,
+                    0x002c30, 0x002c5f, INTEGER_OFFSET, -48,
                     0x002c60, 0x002c61, ALTERNATING_AL, 0,
                     0x002c62, 0x002c62, INTEGER_OFFSET, -10743,
                     0x002c63, 0x002c63, INTEGER_OFFSET, -3814,
@@ -1010,12 +1019,13 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x00a7b1, 0x00a7b1, INTEGER_OFFSET, -42282,
                     0x00a7b2, 0x00a7b2, INTEGER_OFFSET, -42261,
                     0x00a7b3, 0x00a7b3, INTEGER_OFFSET, 928,
-                    0x00a7b4, 0x00a7bf, ALTERNATING_AL, 0,
-                    0x00a7c2, 0x00a7c3, ALTERNATING_AL, 0,
+                    0x00a7b4, 0x00a7c3, ALTERNATING_AL, 0,
                     0x00a7c4, 0x00a7c4, INTEGER_OFFSET, -48,
                     0x00a7c5, 0x00a7c5, INTEGER_OFFSET, -42307,
                     0x00a7c6, 0x00a7c6, INTEGER_OFFSET, -35384,
                     0x00a7c7, 0x00a7ca, ALTERNATING_UL, 0,
+                    0x00a7d0, 0x00a7d1, ALTERNATING_AL, 0,
+                    0x00a7d6, 0x00a7d9, ALTERNATING_AL, 0,
                     0x00a7f5, 0x00a7f6, ALTERNATING_UL, 0,
                     0x00ab53, 0x00ab53, INTEGER_OFFSET, -928,
                     0x00ab70, 0x00abbf, INTEGER_OFFSET, -38864,
@@ -1025,6 +1035,14 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x010428, 0x01044f, INTEGER_OFFSET, -40,
                     0x0104b0, 0x0104d3, INTEGER_OFFSET, 40,
                     0x0104d8, 0x0104fb, INTEGER_OFFSET, -40,
+                    0x010570, 0x01057a, INTEGER_OFFSET, 39,
+                    0x01057c, 0x01058a, INTEGER_OFFSET, 39,
+                    0x01058c, 0x010592, INTEGER_OFFSET, 39,
+                    0x010594, 0x010595, INTEGER_OFFSET, 39,
+                    0x010597, 0x0105a1, INTEGER_OFFSET, -39,
+                    0x0105a3, 0x0105b1, INTEGER_OFFSET, -39,
+                    0x0105b3, 0x0105b9, INTEGER_OFFSET, -39,
+                    0x0105bb, 0x0105bc, INTEGER_OFFSET, -39,
                     0x010c80, 0x010cb2, INTEGER_OFFSET, 64,
                     0x010cc0, 0x010cf2, INTEGER_OFFSET, -64,
                     0x0118a0, 0x0118bf, INTEGER_OFFSET, 32,
@@ -1528,8 +1546,8 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x002183, 0x002184, ALTERNATING_UL, 0,
                     0x0024b6, 0x0024cf, INTEGER_OFFSET, 26,
                     0x0024d0, 0x0024e9, INTEGER_OFFSET, -26,
-                    0x002c00, 0x002c2e, INTEGER_OFFSET, 48,
-                    0x002c30, 0x002c5e, INTEGER_OFFSET, -48,
+                    0x002c00, 0x002c2f, INTEGER_OFFSET, 48,
+                    0x002c30, 0x002c5f, INTEGER_OFFSET, -48,
                     0x002c60, 0x002c61, ALTERNATING_AL, 0,
                     0x002c62, 0x002c62, INTEGER_OFFSET, -10743,
                     0x002c63, 0x002c63, INTEGER_OFFSET, -3814,
@@ -1573,12 +1591,13 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x00a7b1, 0x00a7b1, INTEGER_OFFSET, -42282,
                     0x00a7b2, 0x00a7b2, INTEGER_OFFSET, -42261,
                     0x00a7b3, 0x00a7b3, INTEGER_OFFSET, 928,
-                    0x00a7b4, 0x00a7bf, ALTERNATING_AL, 0,
-                    0x00a7c2, 0x00a7c3, ALTERNATING_AL, 0,
+                    0x00a7b4, 0x00a7c3, ALTERNATING_AL, 0,
                     0x00a7c4, 0x00a7c4, INTEGER_OFFSET, -48,
                     0x00a7c5, 0x00a7c5, INTEGER_OFFSET, -42307,
                     0x00a7c6, 0x00a7c6, INTEGER_OFFSET, -35384,
                     0x00a7c7, 0x00a7ca, ALTERNATING_UL, 0,
+                    0x00a7d0, 0x00a7d1, ALTERNATING_AL, 0,
+                    0x00a7d6, 0x00a7d9, ALTERNATING_AL, 0,
                     0x00a7f5, 0x00a7f6, ALTERNATING_UL, 0,
                     0x00ab53, 0x00ab53, INTEGER_OFFSET, -928,
                     0x00ab70, 0x00abbf, INTEGER_OFFSET, -38864,
@@ -1593,6 +1612,14 @@ public void appendRangesTo(RangesBuffer buffer, int startIndex, int endIndex) {
                     0x010428, 0x01044f, INTEGER_OFFSET, -40,
                     0x0104b0, 0x0104d3, INTEGER_OFFSET, 40,
                     0x0104d8, 0x0104fb, INTEGER_OFFSET, -40,
+                    0x010570, 0x01057a, INTEGER_OFFSET, 39,
+                    0x01057c, 0x01058a, INTEGER_OFFSET, 39,
+                    0x01058c, 0x010592, INTEGER_OFFSET, 39,
+                    0x010594, 0x010595, INTEGER_OFFSET, 39,
+                    0x010597, 0x0105a1, INTEGER_OFFSET, -39,
+                    0x0105a3, 0x0105b1, INTEGER_OFFSET, -39,
+                    0x0105b3, 0x0105b9, INTEGER_OFFSET, -39,
+                    0x0105bb, 0x0105bc, INTEGER_OFFSET, -39,
                     0x010c80, 0x010cb2, INTEGER_OFFSET, 64,
                     0x010cc0, 0x010cf2, INTEGER_OFFSET, -64,
                     0x0118a0, 0x0118bf, INTEGER_OFFSET, 32,
diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyCaseFoldingData.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyCaseFoldingData.java
index 5ff5eca0e68b..4efcb62e609d 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyCaseFoldingData.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/tregex/parser/flavors/RubyCaseFoldingData.java
@@ -1010,6 +1010,7 @@ public class RubyCaseFoldingData {
         CASE_FOLD.put(0x2C2C, new int[]{0x2C5C});
         CASE_FOLD.put(0x2C2D, new int[]{0x2C5D});
         CASE_FOLD.put(0x2C2E, new int[]{0x2C5E});
+        CASE_FOLD.put(0x2C2F, new int[]{0x2C5F});
         CASE_FOLD.put(0x2C60, new int[]{0x2C61});
         CASE_FOLD.put(0x2C62, new int[]{0x026B});
         CASE_FOLD.put(0x2C63, new int[]{0x1D7D});
@@ -1190,12 +1191,16 @@ public class RubyCaseFoldingData {
         CASE_FOLD.put(0xA7BA, new int[]{0xA7BB});
         CASE_FOLD.put(0xA7BC, new int[]{0xA7BD});
         CASE_FOLD.put(0xA7BE, new int[]{0xA7BF});
+        CASE_FOLD.put(0xA7C0, new int[]{0xA7C1});
         CASE_FOLD.put(0xA7C2, new int[]{0xA7C3});
         CASE_FOLD.put(0xA7C4, new int[]{0xA794});
         CASE_FOLD.put(0xA7C5, new int[]{0x0282});
         CASE_FOLD.put(0xA7C6, new int[]{0x1D8E});
         CASE_FOLD.put(0xA7C7, new int[]{0xA7C8});
         CASE_FOLD.put(0xA7C9, new int[]{0xA7CA});
+        CASE_FOLD.put(0xA7D0, new int[]{0xA7D1});
+        CASE_FOLD.put(0xA7D6, new int[]{0xA7D7});
+        CASE_FOLD.put(0xA7D8, new int[]{0xA7D9});
         CASE_FOLD.put(0xA7F5, new int[]{0xA7F6});
         CASE_FOLD.put(0xAB70, new int[]{0x13A0});
         CASE_FOLD.put(0xAB71, new int[]{0x13A1});
@@ -1391,6 +1396,41 @@ public class RubyCaseFoldingData {
         CASE_FOLD.put(0x104D1, new int[]{0x104F9});
         CASE_FOLD.put(0x104D2, new int[]{0x104FA});
         CASE_FOLD.put(0x104D3, new int[]{0x104FB});
+        CASE_FOLD.put(0x10570, new int[]{0x10597});
+        CASE_FOLD.put(0x10571, new int[]{0x10598});
+        CASE_FOLD.put(0x10572, new int[]{0x10599});
+        CASE_FOLD.put(0x10573, new int[]{0x1059A});
+        CASE_FOLD.put(0x10574, new int[]{0x1059B});
+        CASE_FOLD.put(0x10575, new int[]{0x1059C});
+        CASE_FOLD.put(0x10576, new int[]{0x1059D});
+        CASE_FOLD.put(0x10577, new int[]{0x1059E});
+        CASE_FOLD.put(0x10578, new int[]{0x1059F});
+        CASE_FOLD.put(0x10579, new int[]{0x105A0});
+        CASE_FOLD.put(0x1057A, new int[]{0x105A1});
+        CASE_FOLD.put(0x1057C, new int[]{0x105A3});
+        CASE_FOLD.put(0x1057D, new int[]{0x105A4});
+        CASE_FOLD.put(0x1057E, new int[]{0x105A5});
+        CASE_FOLD.put(0x1057F, new int[]{0x105A6});
+        CASE_FOLD.put(0x10580, new int[]{0x105A7});
+        CASE_FOLD.put(0x10581, new int[]{0x105A8});
+        CASE_FOLD.put(0x10582, new int[]{0x105A9});
+        CASE_FOLD.put(0x10583, new int[]{0x105AA});
+        CASE_FOLD.put(0x10584, new int[]{0x105AB});
+        CASE_FOLD.put(0x10585, new int[]{0x105AC});
+        CASE_FOLD.put(0x10586, new int[]{0x105AD});
+        CASE_FOLD.put(0x10587, new int[]{0x105AE});
+        CASE_FOLD.put(0x10588, new int[]{0x105AF});
+        CASE_FOLD.put(0x10589, new int[]{0x105B0});
+        CASE_FOLD.put(0x1058A, new int[]{0x105B1});
+        CASE_FOLD.put(0x1058C, new int[]{0x105B3});
+        CASE_FOLD.put(0x1058D, new int[]{0x105B4});
+        CASE_FOLD.put(0x1058E, new int[]{0x105B5});
+        CASE_FOLD.put(0x1058F, new int[]{0x105B6});
+        CASE_FOLD.put(0x10590, new int[]{0x105B7});
+        CASE_FOLD.put(0x10591, new int[]{0x105B8});
+        CASE_FOLD.put(0x10592, new int[]{0x105B9});
+        CASE_FOLD.put(0x10594, new int[]{0x105BB});
+        CASE_FOLD.put(0x10595, new int[]{0x105BC});
         CASE_FOLD.put(0x10C80, new int[]{0x10CC0});
         CASE_FOLD.put(0x10C81, new int[]{0x10CC1});
         CASE_FOLD.put(0x10C82, new int[]{0x10CC2});
diff --git a/regex/src/com.oracle.truffle.regex/tools/run_scripts.sh b/regex/src/com.oracle.truffle.regex/tools/run_scripts.sh
index df4d0ec92b75..54ee2383d991 100755
--- a/regex/src/com.oracle.truffle.regex/tools/run_scripts.sh
+++ b/regex/src/com.oracle.truffle.regex/tools/run_scripts.sh
@@ -47,7 +47,7 @@ then
     exit 1
 fi
 
-UNICODE_VERSION=13.0.0
+UNICODE_VERSION=14.0.0
 
 mkdir -p ./dat
 

From b5455be456ea265d6aaf7c4075e5ef642baa7634 Mon Sep 17 00:00:00 2001
From: Jirka Marsik <jiri.marsik@oracle.com>
Date: Wed, 29 Sep 2021 19:08:36 +0200
Subject: [PATCH 225/681] Update to the released version of Unicode 14

---
 .../regex/charset/UnicodePropertyData.java    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
index d86acfc89730..25c8a8c4fffd 100644
--- a/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
+++ b/regex/src/com.oracle.truffle.regex/src/com/oracle/truffle/regex/charset/UnicodePropertyData.java
@@ -1683,11 +1683,12 @@ private static void populateCASED() {
                         0x00a640, 0x00a66d, 0x00a680, 0x00a69d, 0x00a722, 0x00a787, 0x00a78b, 0x00a78e, 0x00a790, 0x00a7ca, 0x00a7d0, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d9, 0x00a7f5,
                         0x00a7f6, 0x00a7f8, 0x00a7fa, 0x00ab30, 0x00ab5a, 0x00ab5c, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff21, 0x00ff3a, 0x00ff41, 0x00ff5a,
                         0x010400, 0x01044f, 0x0104b0, 0x0104d3, 0x0104d8, 0x0104fb, 0x010570, 0x01057a, 0x01057c, 0x01058a, 0x01058c, 0x010592, 0x010594, 0x010595, 0x010597, 0x0105a1, 0x0105a3,
-                        0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2, 0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01d400, 0x01d454, 0x01d456, 0x01d49c,
-                        0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507,
-                        0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e, 0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5,
-                        0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716, 0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a,
-                        0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e900, 0x01e943, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
+                        0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010780, 0x010780, 0x010783, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010c80, 0x010cb2, 0x010cc0, 0x010cf2,
+                        0x0118a0, 0x0118df, 0x016e40, 0x016e7f, 0x01d400, 0x01d454, 0x01d456, 0x01d49c, 0x01d49e, 0x01d49f, 0x01d4a2, 0x01d4a2, 0x01d4a5, 0x01d4a6, 0x01d4a9, 0x01d4ac, 0x01d4ae,
+                        0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d505, 0x01d507, 0x01d50a, 0x01d50d, 0x01d514, 0x01d516, 0x01d51c, 0x01d51e, 0x01d539, 0x01d53b, 0x01d53e,
+                        0x01d540, 0x01d544, 0x01d546, 0x01d546, 0x01d54a, 0x01d550, 0x01d552, 0x01d6a5, 0x01d6a8, 0x01d6c0, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6fa, 0x01d6fc, 0x01d714, 0x01d716,
+                        0x01d734, 0x01d736, 0x01d74e, 0x01d750, 0x01d76e, 0x01d770, 0x01d788, 0x01d78a, 0x01d7a8, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e,
+                        0x01e900, 0x01e943, 0x01f130, 0x01f149, 0x01f150, 0x01f169, 0x01f170, 0x01f189));
     }
 
     private static void populateDI() {
@@ -2236,11 +2237,11 @@ private static void populateLOWER() {
                         0x00a7b5, 0x00a7b7, 0x00a7b7, 0x00a7b9, 0x00a7b9, 0x00a7bb, 0x00a7bb, 0x00a7bd, 0x00a7bd, 0x00a7bf, 0x00a7bf, 0x00a7c1, 0x00a7c1, 0x00a7c3, 0x00a7c3, 0x00a7c8, 0x00a7c8,
                         0x00a7ca, 0x00a7ca, 0x00a7d1, 0x00a7d1, 0x00a7d3, 0x00a7d3, 0x00a7d5, 0x00a7d5, 0x00a7d7, 0x00a7d7, 0x00a7d9, 0x00a7d9, 0x00a7f6, 0x00a7f6, 0x00a7f8, 0x00a7fa, 0x00ab30,
                         0x00ab5a, 0x00ab5c, 0x00ab68, 0x00ab70, 0x00abbf, 0x00fb00, 0x00fb06, 0x00fb13, 0x00fb17, 0x00ff41, 0x00ff5a, 0x010428, 0x01044f, 0x0104d8, 0x0104fb, 0x010597, 0x0105a1,
-                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010cc0, 0x010cf2, 0x0118c0, 0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433, 0x01d44e, 0x01d454, 0x01d456,
-                        0x01d467, 0x01d482, 0x01d49b, 0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3, 0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e, 0x01d537, 0x01d552, 0x01d56b,
-                        0x01d586, 0x01d59f, 0x01d5ba, 0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656, 0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6e1, 0x01d6fc,
-                        0x01d714, 0x01d716, 0x01d71b, 0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788, 0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7c9, 0x01d7cb, 0x01d7cb,
-                        0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e922, 0x01e943));
+                        0x0105a3, 0x0105b1, 0x0105b3, 0x0105b9, 0x0105bb, 0x0105bc, 0x010780, 0x010780, 0x010783, 0x010785, 0x010787, 0x0107b0, 0x0107b2, 0x0107ba, 0x010cc0, 0x010cf2, 0x0118c0,
+                        0x0118df, 0x016e60, 0x016e7f, 0x01d41a, 0x01d433, 0x01d44e, 0x01d454, 0x01d456, 0x01d467, 0x01d482, 0x01d49b, 0x01d4b6, 0x01d4b9, 0x01d4bb, 0x01d4bb, 0x01d4bd, 0x01d4c3,
+                        0x01d4c5, 0x01d4cf, 0x01d4ea, 0x01d503, 0x01d51e, 0x01d537, 0x01d552, 0x01d56b, 0x01d586, 0x01d59f, 0x01d5ba, 0x01d5d3, 0x01d5ee, 0x01d607, 0x01d622, 0x01d63b, 0x01d656,
+                        0x01d66f, 0x01d68a, 0x01d6a5, 0x01d6c2, 0x01d6da, 0x01d6dc, 0x01d6e1, 0x01d6fc, 0x01d714, 0x01d716, 0x01d71b, 0x01d736, 0x01d74e, 0x01d750, 0x01d755, 0x01d770, 0x01d788,
+                        0x01d78a, 0x01d78f, 0x01d7aa, 0x01d7c2, 0x01d7c4, 0x01d7c9, 0x01d7cb, 0x01d7cb, 0x01df00, 0x01df09, 0x01df0b, 0x01df1e, 0x01e922, 0x01e943));
     }
 
     private static void populateMATH() {

From b73a890a00cb784896ce63c1afe4ff85ce43c70e Mon Sep 17 00:00:00 2001
From: Jirka Marsik <jiri.marsik@oracle.com>
Date: Wed, 29 Sep 2021 19:09:59 +0200
Subject: [PATCH 226/681] Update changelog for Unicode 14

---
 regex/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/regex/CHANGELOG.md b/regex/CHANGELOG.md
index 49f8154f8996..9a59d3b48c43 100644
--- a/regex/CHANGELOG.md
+++ b/regex/CHANGELOG.md
@@ -5,6 +5,7 @@ This changelog summarizes major changes between TRegex versions relevant to lang
 ## Version 22.0.0
 
 * Added new `ASCII` encoding that callers can use when compiling a regex to limit the range of code point matches to [0x00, 0x7f].
+* Updated Unicode data (case-folding, character properties) to version 14 of the Unicode standard.
 
 ## Version 21.3.0
 

From 4b37ff269e155fe3187f3bb443153ef2fd1976eb Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 28 Sep 2021 17:47:41 -0700
Subject: [PATCH 227/681] Remove MultiTypeState.bb field.

---
 .../graal/pointsto/DefaultAnalysisPolicy.java |  2 +-
 .../graal/pointsto/PointsToAnalysis.java      |  4 +--
 .../graal/pointsto/flow/CloneTypeFlow.java    |  4 +--
 .../flow/DynamicNewInstanceTypeFlow.java      |  2 +-
 .../oracle/graal/pointsto/flow/TypeFlow.java  |  4 +--
 .../pointsto/reports/AnalysisReporter.java    |  5 +--
 .../AbstractAnalysisResultsBuilder.java       |  2 +-
 .../results/StaticAnalysisResultsBuilder.java |  2 +-
 .../pointsto/results/StrengthenGraphs.java    |  3 +-
 .../pointsto/typestate/MultiTypeState.java    | 18 ++++------
 .../pointsto/typestate/PointsToStats.java     |  6 ++--
 .../pointsto/typestate/SingleTypeState.java   |  2 +-
 .../graal/pointsto/typestate/TypeState.java   | 32 ++++++++---------
 .../svm/hosted/HostedConfiguration.java       |  2 +-
 .../svm/hosted/NativeImageGenerator.java      | 12 +++----
 .../hosted/dashboard/PointsToJsonObject.java  | 34 +++++++++----------
 16 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/DefaultAnalysisPolicy.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/DefaultAnalysisPolicy.java
index 7b791018a845..7104dbb620e7 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/DefaultAnalysisPolicy.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/DefaultAnalysisPolicy.java
@@ -189,7 +189,7 @@ public void onObservedUpdate(PointsToAnalysis bb) {
                 receiverState = filterReceiverState(bb, receiverState);
             }
 
-            for (AnalysisType type : receiverState.types()) {
+            for (AnalysisType type : receiverState.types(bb)) {
                 if (isSaturated()) {
                     /*-
                      * The receiver can become saturated during the callees linking, which saturates
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
index b7eca5883197..d73228a53fc1 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
@@ -44,8 +44,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicLongArray;
 
-import com.oracle.graal.pointsto.flow.FieldTypeFlow;
-import com.oracle.graal.pointsto.reports.StatisticsPrinter;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
@@ -63,6 +61,7 @@
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
 import com.oracle.graal.pointsto.flow.AllSynchronizedTypeFlow;
+import com.oracle.graal.pointsto.flow.FieldTypeFlow;
 import com.oracle.graal.pointsto.flow.MethodTypeFlow;
 import com.oracle.graal.pointsto.flow.MethodTypeFlowBuilder;
 import com.oracle.graal.pointsto.flow.OffsetLoadTypeFlow.AbstractUnsafeLoadTypeFlow;
@@ -76,6 +75,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
+import com.oracle.graal.pointsto.reports.StatisticsPrinter;
 import com.oracle.graal.pointsto.typestate.PointsToStats;
 import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CloneTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CloneTypeFlow.java
index 305ddef2ec71..a2eeea1dd95d 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CloneTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CloneTypeFlow.java
@@ -95,7 +95,7 @@ public void onObservedUpdate(PointsToAnalysis bb) {
             /* Nothing to be cloned if the input state is not a concrete type state. */
             resultState = inputState.forNonNull(bb);
         } else {
-            resultState = inputState.typesStream()
+            resultState = inputState.typesStream(bb)
                             .filter(t -> !currentState.containsType(t))
                             .map(type -> TypeState.forClone(bb, cloneSite, type, allocationContext))
                             .reduce(TypeState.forEmpty(), (s1, s2) -> TypeState.forUnion(bb, s1, s2));
@@ -115,7 +115,7 @@ public void update(PointsToAnalysis bb) {
         TypeState inputState = input.getState();
         TypeState cloneState = this.getState();
 
-        for (AnalysisType type : inputState.types()) {
+        for (AnalysisType type : inputState.types(bb)) {
             if (type.isArray()) {
                 if (bb.analysisPolicy().aliasArrayTypeFlows()) {
                     /* All arrays are aliased, no need to model the array clone operation. */
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/DynamicNewInstanceTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/DynamicNewInstanceTypeFlow.java
index 94684e7bfc2c..a3363ca105b5 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/DynamicNewInstanceTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/DynamicNewInstanceTypeFlow.java
@@ -92,7 +92,7 @@ public void onObservedUpdate(PointsToAnalysis bb) {
         TypeState currentTypeState = getState();
 
         /* Generate a heap object for every new incoming type. */
-        TypeState resultState = newTypeState.typesStream()
+        TypeState resultState = newTypeState.typesStream(bb)
                         .filter(t -> !currentTypeState.containsType(t))
                         .map(type -> TypeState.forAllocation(bb, allocationSite, type, allocationContext))
                         .reduce(TypeState.forEmpty(), (s1, s2) -> TypeState.forUnion(bb, s1, s2));
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
index c39d8e98809c..164b1e9c59ce 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
@@ -245,7 +245,7 @@ public boolean isCloseToAllInstantiated(PointsToAnalysis bb) {
 
     public void setState(PointsToAnalysis bb, TypeState state) {
         assert !bb.extendedAsserts() || this instanceof InstanceOfTypeFlow ||
-                        state.verifyDeclaredType(declaredType) : "declaredType: " + declaredType.toJavaName(true) + " state: " + state;
+                        state.verifyDeclaredType(bb, declaredType) : "declaredType: " + declaredType.toJavaName(true) + " state: " + state;
         this.state = state;
     }
 
@@ -335,7 +335,7 @@ private boolean checkTypeState(PointsToAnalysis bb, TypeState before, TypeState
              */
             return true;
         }
-        assert after.verifyDeclaredType(declaredType) : String.format("The type state of %s contains types that are not assignable from its declared type %s. " +
+        assert after.verifyDeclaredType(bb, declaredType) : String.format("The type state of %s contains types that are not assignable from its declared type %s. " +
                         "%nState before: %s. %nState after: %s", format(false, true), declaredType.toJavaName(true), formatState(bb, before), formatState(bb, after));
         return true;
     }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
index 934bc68b935c..c4439de06b6f 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
@@ -31,6 +31,7 @@
 import org.graalvm.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.BigBang;
+import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.typestate.PointsToStats;
@@ -58,8 +59,8 @@ public static void printAnalysisReports(String imageName, OptionValues options,
 
             if (PointstoOptions.PrintSynchronizedAnalysis.getValue(options)) {
                 TypeState allSynchronizedTypeState = bb.getAllSynchronizedTypeState();
-                String typesString = allSynchronizedTypeState.closeToAllInstantiated(bb) ? "close to all instantiated" : //
-                                StreamSupport.stream(allSynchronizedTypeState.types().spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
+                String typesString = allSynchronizedTypeState.closeToAllInstantiated((PointsToAnalysis) bb) ? "close to all instantiated" : //
+                                StreamSupport.stream(allSynchronizedTypeState.types(bb).spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
                 System.out.println();
                 System.out.println("AllSynchronizedTypes");
                 System.out.println("Synchronized types #: " + allSynchronizedTypeState.typesCount());
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/AbstractAnalysisResultsBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/AbstractAnalysisResultsBuilder.java
index d7f26876dc6c..6664431a1d04 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/AbstractAnalysisResultsBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/AbstractAnalysisResultsBuilder.java
@@ -127,7 +127,7 @@ private JavaTypeProfile cachedTypeProfile(JavaTypeProfile[] cache, int cacheIdx,
 
     private JavaTypeProfile createTypeProfile(TypeState typeState) {
         double probability = 1d / typeState.typesCount();
-        JavaTypeProfile.ProfiledType[] pitems = typeState.typesStream()
+        JavaTypeProfile.ProfiledType[] pitems = typeState.typesStream(bb)
                         .map(analysisType -> converter == null ? analysisType : converter.lookup(analysisType))
                         .sorted()
                         .map(type -> new JavaTypeProfile.ProfiledType(type, probability))
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
index 46ac547d7f32..de37df8331fb 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
@@ -163,7 +163,7 @@ public StaticAnalysisResults makeOrApplyResults(AnalysisMethod method) {
                             .forEach(monitorEnter -> {
                                 TypeState monitorEntryState = monitorEnter.getState();
                                 String typesString = monitorEntryState.closeToAllInstantiated(bb) ? "close to all instantiated"
-                                                : StreamSupport.stream(monitorEntryState.types().spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
+                                                : StreamSupport.stream(monitorEntryState.types(bb).spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
                                 StringBuilder strb = new StringBuilder();
                                 strb.append("Location: ");
                                 String methodName = method.format("%h.%n(%p)");
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
index 9bf0bedcdb59..eed030e88e94 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
@@ -82,7 +82,6 @@
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.typestate.TypeState;
-
 import com.oracle.svm.util.ImageBuildStatistics;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -496,7 +495,7 @@ private Stamp strengthenStampFromTypeFlow(ValueNode node, TypeFlow<?> nodeFlow,
              * stamp is already more precise than the static analysis results.
              */
             List<AnalysisType> typeStateTypes = new ArrayList<>(nodeTypeState.typesCount());
-            for (AnalysisType typeStateType : nodeTypeState.types()) {
+            for (AnalysisType typeStateType : nodeTypeState.types(bb)) {
                 if (oldType == null || (oldStamp.isExactType() ? oldType.equals(typeStateType) : oldType.isAssignableFrom(typeStateType))) {
                     typeStateTypes.add(typeStateType);
                 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
index a684cfefe6fc..ed9025dce0f5 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
@@ -29,7 +29,6 @@
 import java.util.Iterator;
 
 import com.oracle.graal.pointsto.BigBang;
-
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.context.object.AnalysisObject;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -37,7 +36,6 @@
 
 public class MultiTypeState extends TypeState {
 
-    protected final PointsToAnalysis bb;
     /** The objects of this type state. */
     protected final AnalysisObject[] objects;
     /** See {@link #getObjectTypeIds()}. */
@@ -58,7 +56,6 @@ public class MultiTypeState extends TypeState {
     /** Creates a new type state using the provided types bit set and objects. */
     MultiTypeState(PointsToAnalysis bb, boolean canBeNull, int properties, BitSet typesBitSet, AnalysisObject... objects) {
         super(properties);
-        this.bb = bb;
         this.objects = objects;
         /*
          * Trim the typesBitSet to size eagerly. The typesBitSet is effectively immutable, i.e., no
@@ -81,14 +78,13 @@ public class MultiTypeState extends TypeState {
         this.merged = false;
         assert typesCount > 1 : "Multi type state with single type.";
         assert objects.length > 1 : "Multi type state with single object.";
-        assert !bb.extendedAsserts() || checkObjects();
+        assert !bb.extendedAsserts() || checkObjects(bb);
         PointsToStats.registerTypeState(bb, this);
     }
 
     /** Create a type state with the same content and a reversed canBeNull value. */
     private MultiTypeState(PointsToAnalysis bb, boolean canBeNull, MultiTypeState other) {
         super(other.properties);
-        this.bb = bb;
         this.objects = other.objects;
         this.typesBitSet = other.typesBitSet;
         this.typesCount = other.typesCount;
@@ -115,7 +111,7 @@ public int[] getObjectTypeIds() {
         return objectTypeIds;
     }
 
-    private boolean checkObjects() {
+    private boolean checkObjects(PointsToAnalysis bb) {
         assert bb.extendedAsserts();
 
         for (int idx = 0; idx < objects.length - 1; idx++) {
@@ -178,7 +174,7 @@ AnalysisType lastType() {
      * by way of bit set iteration.
      */
     @Override
-    public Iterator<AnalysisType> typesIterator() {
+    public Iterator<AnalysisType> typesIterator(BigBang bb) {
         return new Iterator<AnalysisType>() {
 
             /** Initialize to the index of the first set bit. */
@@ -204,7 +200,7 @@ public boolean containsType(AnalysisType exactType) {
     }
 
     @Override
-    public TypeState exactTypeState(PointsToAnalysis unused, AnalysisType exactType) {
+    public TypeState exactTypeState(PointsToAnalysis bb, AnalysisType exactType) {
         if (containsType(exactType)) {
             AnalysisObject[] resultObjects = objectsArray(exactType);
             return new SingleTypeState(bb, canBeNull, bb.analysisPolicy().makeProperties(bb, resultObjects), resultObjects);
@@ -214,7 +210,7 @@ public TypeState exactTypeState(PointsToAnalysis unused, AnalysisType exactType)
     }
 
     @Override
-    public TypeState forCanBeNull(PointsToAnalysis unused, boolean resultCanBeNull) {
+    public TypeState forCanBeNull(PointsToAnalysis bb, boolean resultCanBeNull) {
         if (resultCanBeNull == this.canBeNull()) {
             return this;
         } else {
@@ -318,7 +314,7 @@ public final boolean canBeNull() {
 
     /** Note that the objects of this type state have been merged. */
     @Override
-    public void noteMerge(PointsToAnalysis unused) {
+    public void noteMerge(PointsToAnalysis bb) {
         assert bb.analysisPolicy().isMergingEnabled();
 
         if (!merged) {
@@ -330,7 +326,7 @@ public void noteMerge(PointsToAnalysis unused) {
     }
 
     @Override
-    public boolean closeToAllInstantiated(BigBang unused) {
+    public boolean closeToAllInstantiated(PointsToAnalysis bb) {
         if (typesCount > 200) {
             MultiTypeState allInstState = (MultiTypeState) bb.getAllInstantiatedTypes();
             return typesCount * 100L / allInstState.typesCount > 75;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
index 896ff2873c10..35abaad83559 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
@@ -43,10 +43,10 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.oracle.graal.pointsto.BigBang;
 import org.graalvm.compiler.graph.NodeSourcePosition;
 import org.graalvm.compiler.nodes.ValueNode;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.ActualReturnTypeFlow;
 import com.oracle.graal.pointsto.flow.AllInstantiatedTypeFlow;
@@ -628,7 +628,7 @@ private static String formatType(AnalysisType type, boolean qualified) {
     }
 
     @SuppressWarnings("unused")
-    private static String asDetailedString(TypeState s) {
+    private static String asDetailedString(BigBang bb, TypeState s) {
         if (s.isEmpty()) {
             return "<Empty>";
         }
@@ -637,7 +637,7 @@ private static String asDetailedString(TypeState s) {
         }
 
         String canBeNull = s.canBeNull() ? "null" : "!null";
-        String types = s.typesStream().map(JavaType::getUnqualifiedName).sorted().collect(Collectors.joining(", "));
+        String types = s.typesStream(bb).map(JavaType::getUnqualifiedName).sorted().collect(Collectors.joining(", "));
 
         return canBeNull + ", " + types;
     }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/SingleTypeState.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/SingleTypeState.java
index 1ab6c96127eb..7dd0cc8b1e84 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/SingleTypeState.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/SingleTypeState.java
@@ -106,7 +106,7 @@ public AnalysisType exactType() {
     }
 
     @Override
-    protected Iterator<AnalysisType> typesIterator() {
+    protected Iterator<AnalysisType> typesIterator(BigBang bb) {
         return new Iterator<AnalysisType>() {
 
             boolean hasNext = true;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
index 9aa59deafd57..40864e26be70 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
@@ -33,8 +33,8 @@
 import java.util.stream.StreamSupport;
 
 import com.oracle.graal.pointsto.AnalysisPolicy;
-import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.BigBang;
+import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.flow.context.AnalysisContext;
 import com.oracle.graal.pointsto.flow.context.BytecodeLocation;
@@ -77,16 +77,16 @@ public int getProperties() {
     public abstract AnalysisType exactType();
 
     /** Provides an iterator over the types. */
-    protected abstract Iterator<AnalysisType> typesIterator();
+    protected abstract Iterator<AnalysisType> typesIterator(BigBang bb);
 
     /** Provides an iterable for the types for easy "for-each loop" iteration. */
-    public Iterable<AnalysisType> types() {
-        return this::typesIterator;
+    public Iterable<AnalysisType> types(BigBang bb) {
+        return () -> typesIterator(bb);
     }
 
     /** Provides a stream for the types. */
-    public Stream<AnalysisType> typesStream() {
-        return StreamSupport.stream(types().spliterator(), false);
+    public Stream<AnalysisType> typesStream(BigBang bb) {
+        return StreamSupport.stream(types(bb).spliterator(), false);
     }
 
     /** Returns true if this type state contains the type, otherwise it returns false. */
@@ -240,9 +240,9 @@ public void noteMerge(@SuppressWarnings("unused") PointsToAnalysis bb) {
      */
     public abstract TypeState exactTypeState(PointsToAnalysis bb, AnalysisType exactType);
 
-    public boolean verifyDeclaredType(AnalysisType declaredType) {
+    public boolean verifyDeclaredType(BigBang bb, AnalysisType declaredType) {
         if (declaredType != null) {
-            for (AnalysisType e : types()) {
+            for (AnalysisType e : types(bb)) {
                 if (!declaredType.isAssignableFrom(e)) {
                     return false;
                 }
@@ -255,7 +255,7 @@ public boolean verifyDeclaredType(AnalysisType declaredType) {
      * The {@link MultiTypeState} overrides this method and provides the proper test. All the other
      * type states have only 0 or 1 types.
      */
-    public boolean closeToAllInstantiated(@SuppressWarnings("unused") BigBang bb) {
+    public boolean closeToAllInstantiated(@SuppressWarnings("unused") PointsToAnalysis bb) {
         return false;
     }
 
@@ -386,7 +386,7 @@ public static TypeState forContextInsensitiveTypeState(PointsToAnalysis bb, Type
                 AnalysisObject[] objectsArray = new AnalysisObject[multiState.typesCount()];
 
                 int i = 0;
-                for (AnalysisType type : multiState.types()) {
+                for (AnalysisType type : multiState.types(bb)) {
                     objectsArray[i++] = type.getContextInsensitiveAnalysisObject();
                 }
                 /*
@@ -437,7 +437,7 @@ public static TypeState forIntersection(PointsToAnalysis bb, TypeState s1, TypeS
          * All filtered types (s1) must be marked as instantiated to ensures that the filter state
          * (s2) has been updated before a type appears in the input, otherwise types can be missed.
          */
-        assert !bb.extendedAsserts() || checkTypes(s1);
+        assert !bb.extendedAsserts() || checkTypes(bb, s1);
         if (s1.isEmpty()) {
             return s1;
         } else if (s1.isNull()) {
@@ -463,7 +463,7 @@ public static TypeState forSubtraction(PointsToAnalysis bb, TypeState s1, TypeSt
          * All filtered types (s1) must be marked as instantiated to ensures that the filter state
          * (s2) has been updated before a type appears in the input, otherwise types can be missed.
          */
-        assert !bb.extendedAsserts() || checkTypes(s1);
+        assert !bb.extendedAsserts() || checkTypes(bb, s1);
         if (s1.isEmpty()) {
             return s1;
         } else if (s1.isNull()) {
@@ -484,8 +484,8 @@ public static TypeState forSubtraction(PointsToAnalysis bb, TypeState s1, TypeSt
         }
     }
 
-    private static boolean checkTypes(TypeState state) {
-        for (AnalysisType type : state.types()) {
+    private static boolean checkTypes(BigBang bb, TypeState state) {
+        for (AnalysisType type : state.types(bb)) {
             if (!type.isInstantiated()) {
                 System.out.println("Processing a type not yet marked as instantiated: " + type.getName());
                 return false;
@@ -1416,7 +1416,7 @@ public int typesCount() {
     }
 
     @Override
-    public Iterator<AnalysisType> typesIterator() {
+    public Iterator<AnalysisType> typesIterator(BigBang bb) {
         return Collections.emptyIterator();
     }
 
@@ -1507,7 +1507,7 @@ public int typesCount() {
     }
 
     @Override
-    public Iterator<AnalysisType> typesIterator() {
+    public Iterator<AnalysisType> typesIterator(BigBang bb) {
         return Collections.emptyIterator();
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
index 406c6e8ca7d8..4e7930ba7365 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
@@ -207,7 +207,7 @@ private static Set<AnalysisType> getForceMonitorSlotTypes(BigBang bb) {
     /** Process the types that the analysis found as needing synchronization. */
     protected void processedSynchronizedTypes(BigBang bb, HostedUniverse hUniverse, Set<AnalysisType> immutableTypes) {
         TypeState allSynchronizedTypeState = bb.getAllSynchronizedTypeState();
-        for (AnalysisType type : allSynchronizedTypeState.types()) {
+        for (AnalysisType type : allSynchronizedTypeState.types(bb)) {
             maybeSetMonitorField(hUniverse, immutableTypes, type);
         }
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 5ef607941bab..b01843f59fa6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -1419,8 +1419,8 @@ private static boolean addAssertionLIRPhases(LIRSuites lirSuites, boolean hosted
         return true;
     }
 
-    private static String format(TypeState state) {
-        return state.typesStream().map(t -> t.toJavaName(true)).collect(Collectors.joining(","));
+    private static String format(BigBang bb, TypeState state) {
+        return state.typesStream(bb).map(t -> t.toJavaName(true)).collect(Collectors.joining(","));
     }
 
     private void checkUniverse() {
@@ -1446,8 +1446,8 @@ private void checkUniverse() {
                                 String methodKey = method.format("%H.%n(%p)");
                                 bigbang.getUnsupportedFeatures().addMessage(methodKey, method,
                                                 "Parameter " + i + " of " + methodKey + " has declared type " + declaredType.toJavaName(true) +
-                                                                ", with assignable types: " + format(declaredTypeState) +
-                                                                ", which is incompatible with analysis inferred types: " + format(parameterState) + ".");
+                                                                ", with assignable types: " + format(bb, declaredTypeState) +
+                                                                ", which is incompatible with analysis inferred types: " + format(bb, parameterState) + ".");
                             }
                         }
                     }
@@ -1464,8 +1464,8 @@ private void checkUniverse() {
                             String fieldKey = field.format("%H.%n");
                             bigbang.getUnsupportedFeatures().addMessage(fieldKey, null,
                                             "Field " + fieldKey + " has declared type " + declaredType.toJavaName(true) +
-                                                            ", with assignable types: " + format(declaredTypeState) +
-                                                            ", which is incompatible with analysis inferred types: " + format(state) + ".");
+                                                            ", with assignable types: " + format(bb, declaredTypeState) +
+                                                            ", which is incompatible with analysis inferred types: " + format(bb, state) + ".");
                         }
                     }
                 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
index d843b675b506..60de2504feb7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
@@ -36,11 +36,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.oracle.graal.pointsto.BigBang;
 import org.graalvm.graphio.GraphOutput;
 import org.graalvm.graphio.GraphStructure;
 import org.graalvm.nativeimage.hosted.Feature.OnAnalysisExitAccess;
 
+import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.ActualParameterTypeFlow;
 import com.oracle.graal.pointsto.flow.ActualReturnTypeFlow;
@@ -596,7 +596,7 @@ private WrapperClazz(Class<?> wrappedClass, int inputs, int uses, String name) {
      */
     private void serializeMethods(BigBang bb) {
         for (AnalysisMethod method : bb.getUniverse().getMethods()) {
-            serializeMethod(new AnalysisWrapper(method.getClass(), method));
+            serializeMethod(bb, new AnalysisWrapper(method.getClass(), method));
         }
     }
 
@@ -605,7 +605,7 @@ private void serializeMethods(BigBang bb) {
      *
      * @param methodWrapper wrapped AnalysisMethod whose type flows to serialize
      */
-    private void serializeMethod(AnalysisWrapper methodWrapper) {
+    private void serializeMethod(BigBang bb, AnalysisWrapper methodWrapper) {
         assert !known.get(methodWrapper.id);
         known.set(methodWrapper.id);
         flows.set(methodWrapper.id, methodWrapper);
@@ -622,7 +622,7 @@ private void serializeMethod(AnalysisWrapper methodWrapper) {
             }
 
             // Serialize this type flow to a JSON object, add it to the node index.
-            serializeTypeFlow(flow);
+            serializeTypeFlow(bb, flow);
         }
     }
 
@@ -638,7 +638,7 @@ private void serializeMethod(AnalysisWrapper methodWrapper) {
      *
      * @param flow TypeFlow to serialize
      */
-    private void serializeTypeFlow(TypeFlow<?> flow) {
+    private void serializeTypeFlow(BigBang bb, TypeFlow<?> flow) {
         int flowId = flow.id();
 
         if (known.get(flowId)) {
@@ -661,13 +661,13 @@ private void serializeTypeFlow(TypeFlow<?> flow) {
                 flowWrapper.calleeNames.add(callee.getQualifiedName());
             }
         } else if (flow instanceof NewInstanceTypeFlow || flow instanceof DynamicNewInstanceTypeFlow) {
-            flowWrapper.types = serializeTypeState(flow.getState());
+            flowWrapper.types = serializeTypeState(bb, flow.getState());
         } else if (flow instanceof LoadFieldTypeFlow.LoadInstanceFieldTypeFlow || flow instanceof LoadFieldTypeFlow.LoadStaticFieldTypeFlow) {
             LoadFieldTypeFlow loadFlow = (LoadFieldTypeFlow) flow;
             flowWrapper.qualifiedName = fieldName(loadFlow.field());
         } else if (flow instanceof StoreFieldTypeFlow.StoreInstanceFieldTypeFlow || flow instanceof StoreFieldTypeFlow.StoreStaticFieldTypeFlow) {
             TypeState typeState = flow.getState();
-            flowWrapper.types = serializeTypeState(typeState);
+            flowWrapper.types = serializeTypeState(bb, typeState);
             StoreFieldTypeFlow storeFlow = (StoreFieldTypeFlow) flow;
             flowWrapper.qualifiedName = fieldName(storeFlow.field());
         } else if (flow instanceof FieldTypeFlow) {
@@ -678,8 +678,8 @@ private void serializeTypeFlow(TypeFlow<?> flow) {
         }
 
         // Set inputs and uses for this node.
-        collectInputs(flow, flowWrapper.inputs);
-        collectUses(flow, flowWrapper.uses);
+        collectInputs(bb, flow, flowWrapper.inputs);
+        collectUses(bb, flow, flowWrapper.uses);
     }
 
     /**
@@ -775,20 +775,20 @@ private static String getCodeLocation(TypeFlow<?> flow) {
      * @param flow TypeFlow who's inputs and observees to collect
      * @param targetList target array for input use and observee IDs to
      */
-    private void collectInputs(TypeFlow<?> flow, Map<Integer, Integer> targetList) {
+    private void collectInputs(BigBang bb, TypeFlow<?> flow, Map<Integer, Integer> targetList) {
         for (Object input : flow.getInputs()) {
             TypeFlow<?> inputFlow = (TypeFlow<?>) input;
             addUnique(targetList, inputFlow.id());
             // Indirect recursive call. Call with methodId = -1 to indicate that, at this point,
             // we don't know the method ID of the parent methods of the input flows.
-            serializeTypeFlow(inputFlow);
+            serializeTypeFlow(bb, inputFlow);
         }
         for (Object observee : flow.getObservees()) {
             TypeFlow<?> observeeFlow = (TypeFlow<?>) observee;
             addUnique(targetList, observeeFlow.id());
             // Indirect recursive call. Call with methodId = -1 to indicate that, at this point,
             // we don't know the method ID of the parent methods of the observee flows.
-            serializeTypeFlow(observeeFlow);
+            serializeTypeFlow(bb, observeeFlow);
         }
     }
 
@@ -800,20 +800,20 @@ private void collectInputs(TypeFlow<?> flow, Map<Integer, Integer> targetList) {
      * @param flow TypeFlow who's uses and observers to collect
      * @param targetList target list for adding use and observer IDs to
      */
-    private void collectUses(TypeFlow<?> flow, Map<Integer, Integer> targetList) {
+    private void collectUses(BigBang bb, TypeFlow<?> flow, Map<Integer, Integer> targetList) {
         for (Object use : flow.getUses()) {
             TypeFlow<?> useFlow = (TypeFlow<?>) use;
             addUnique(targetList, useFlow.id());
             // Indirect recursive call. Call with methodId = -1 to indicate that, at this point,
             // we don't know the method ID of the parent methods of the use flows.
-            serializeTypeFlow(useFlow);
+            serializeTypeFlow(bb, useFlow);
         }
         for (Object observer : flow.getObservers()) {
             TypeFlow<?> observerFlow = (TypeFlow<?>) observer;
             addUnique(targetList, observerFlow.id());
             // Indirect recursive call. Call with methodId = -1 to indicate that, at this point,
             // we don't know the method ID of the parent methods of the observer flows.
-            serializeTypeFlow(observerFlow);
+            serializeTypeFlow(bb, observerFlow);
         }
     }
 
@@ -834,9 +834,9 @@ private static <T> void addUnique(Map<Integer, T> list, T element) {
      * @param typeState the TypeState to be serialized.
      * @return a list of the formatted class names of the classes included in the given TypeState.
      */
-    private static ArrayList<String> serializeTypeState(TypeState typeState) {
+    private static ArrayList<String> serializeTypeState(BigBang bb, TypeState typeState) {
         ArrayList<String> types = new ArrayList<>();
-        for (AnalysisType type : typeState.types()) {
+        for (AnalysisType type : typeState.types(bb)) {
             types.add(type.toJavaName());
         }
         return types;

From a067cad36009b265cddd94847de5d9287918caee Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 29 Sep 2021 18:50:14 -0700
Subject: [PATCH 228/681] Refactor closeToAllInstantiated.

---
 .../graal/pointsto/flow/MethodTypeFlowBuilder.java     |  5 +----
 .../src/com/oracle/graal/pointsto/flow/TypeFlow.java   |  7 ++-----
 .../graal/pointsto/reports/AnalysisReporter.java       |  3 ++-
 .../pointsto/results/StaticAnalysisResultsBuilder.java |  3 ++-
 .../graal/pointsto/typestate/MultiTypeState.java       | 10 ----------
 .../com/oracle/graal/pointsto/typestate/TypeState.java |  8 --------
 .../graal/pointsto/typestate/TypeStateUtils.java       |  8 ++++++++
 7 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index 58e5bc85844e..1f2c7ec381ce 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -779,10 +779,7 @@ protected void node(FixedNode n) {
                 } else {
                     /*
                      * Without precise type information the dynamic new instance node has to
-                     * generate a heap object for each instantiated type. This means that the source
-                     * flow for dynamic new instance is 'close to all instantiated' and will be
-                     * reduced to abstract objects, unless
-                     * BootImageAnalysisOptions.ReduceCloseToAllInstantiatedFlows is disabled.
+                     * generate a heap object for each instantiated type.
                      */
                     instanceType = bb.getObjectType();
                     instanceTypeBuilder = TypeFlowBuilder.create(bb, instanceType, AllInstantiatedTypeFlow.class, () -> {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
index 164b1e9c59ce..74800ec5f649 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
@@ -39,6 +39,7 @@
 import com.oracle.graal.pointsto.results.StaticAnalysisResultsBuilder;
 import com.oracle.graal.pointsto.typestate.PointsToStats;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.typestate.TypeStateUtils;
 import com.oracle.graal.pointsto.util.CompletionExecutor.DebugContextRunnable;
 import com.oracle.graal.pointsto.util.ConcurrentLightHashSet;
 import com.oracle.svm.util.ClassUtil;
@@ -239,10 +240,6 @@ public boolean isAllInstantiated() {
         return this instanceof AllInstantiatedTypeFlow;
     }
 
-    public boolean isCloseToAllInstantiated(PointsToAnalysis bb) {
-        return this.getState().closeToAllInstantiated(bb);
-    }
-
     public void setState(PointsToAnalysis bb, TypeState state) {
         assert !bb.extendedAsserts() || this instanceof InstanceOfTypeFlow ||
                         state.verifyDeclaredType(bb, declaredType) : "declaredType: " + declaredType.toJavaName(true) + " state: " + state;
@@ -341,7 +338,7 @@ private boolean checkTypeState(PointsToAnalysis bb, TypeState before, TypeState
     }
 
     private static String formatState(PointsToAnalysis bb, TypeState typeState) {
-        if (typeState.closeToAllInstantiated(bb)) {
+        if (TypeStateUtils.closeToAllInstantiated(bb, typeState)) {
             return "close to AllInstantiated";
         }
         return typeState.toString();
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
index c4439de06b6f..c1bd31aa2efe 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
@@ -36,6 +36,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.typestate.PointsToStats;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.typestate.TypeStateUtils;
 
 public class AnalysisReporter {
     public static void printAnalysisReports(String imageName, OptionValues options, String reportsPath, BigBang bb) {
@@ -59,7 +60,7 @@ public static void printAnalysisReports(String imageName, OptionValues options,
 
             if (PointstoOptions.PrintSynchronizedAnalysis.getValue(options)) {
                 TypeState allSynchronizedTypeState = bb.getAllSynchronizedTypeState();
-                String typesString = allSynchronizedTypeState.closeToAllInstantiated((PointsToAnalysis) bb) ? "close to all instantiated" : //
+                String typesString = TypeStateUtils.closeToAllInstantiated((PointsToAnalysis) bb, allSynchronizedTypeState) ? "close to all instantiated" : //
                                 StreamSupport.stream(allSynchronizedTypeState.types(bb).spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
                 System.out.println();
                 System.out.println("AllSynchronizedTypes");
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
index de37df8331fb..32ed909ecabf 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
@@ -47,6 +47,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.results.StaticAnalysisResults.BytecodeEntry;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.typestate.TypeStateUtils;
 
 import jdk.vm.ci.meta.JavaMethodProfile;
 import jdk.vm.ci.meta.JavaTypeProfile;
@@ -162,7 +163,7 @@ public StaticAnalysisResults makeOrApplyResults(AnalysisMethod method) {
                             .sorted(Comparator.comparingInt(m2 -> m2.getState().typesCount()))
                             .forEach(monitorEnter -> {
                                 TypeState monitorEntryState = monitorEnter.getState();
-                                String typesString = monitorEntryState.closeToAllInstantiated(bb) ? "close to all instantiated"
+                                String typesString = TypeStateUtils.closeToAllInstantiated(bb, monitorEntryState) ? "close to all instantiated"
                                                 : StreamSupport.stream(monitorEntryState.types(bb).spliterator(), false).map(AnalysisType::getName).collect(Collectors.joining(", "));
                                 StringBuilder strb = new StringBuilder();
                                 strb.append("Location: ");
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
index ed9025dce0f5..722f844d2ea4 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/MultiTypeState.java
@@ -325,16 +325,6 @@ public void noteMerge(PointsToAnalysis bb) {
         }
     }
 
-    @Override
-    public boolean closeToAllInstantiated(PointsToAnalysis bb) {
-        if (typesCount > 200) {
-            MultiTypeState allInstState = (MultiTypeState) bb.getAllInstantiatedTypes();
-            return typesCount * 100L / allInstState.typesCount > 75;
-        }
-
-        return false;
-    }
-
     @Override
     public int hashCode() {
         int result = 1;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
index 40864e26be70..43dde5bf1f3e 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java
@@ -251,14 +251,6 @@ public boolean verifyDeclaredType(BigBang bb, AnalysisType declaredType) {
         return true;
     }
 
-    /**
-     * The {@link MultiTypeState} overrides this method and provides the proper test. All the other
-     * type states have only 0 or 1 types.
-     */
-    public boolean closeToAllInstantiated(@SuppressWarnings("unused") PointsToAnalysis bb) {
-        return false;
-    }
-
     @Override
     public int hashCode() {
         return super.hashCode();
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeStateUtils.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeStateUtils.java
index 84070f087493..32555ed4b2cc 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeStateUtils.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeStateUtils.java
@@ -384,4 +384,12 @@ protected static BitSet set(BitSet bs1, int bitIndex) {
         return bsr;
     }
 
+    public static boolean closeToAllInstantiated(PointsToAnalysis bb, TypeState state) {
+        if (state.typesCount() > 200) {
+            MultiTypeState allInstState = (MultiTypeState) bb.getAllInstantiatedTypes();
+            return state.typesCount() * 100L / allInstState.typesCount() > 75;
+        }
+        return false;
+    }
+
 }

From d1c80bfdb6d4d742b3f88496ed9515ee39a4a8d1 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 07:43:27 +0200
Subject: [PATCH 229/681] improve handling of VM_DEATH event and make sure we
 include a specific reply and apply suspend policy if the event was requested

---
 .../espresso/jdwp/api/VMEventListener.java    |  4 +--
 .../jdwp/api/VMEventListenerImpl.java         | 28 +++++++++++++------
 .../jdwp/impl/DebuggerController.java         |  5 +++-
 .../espresso/jdwp/impl/JDWPInstrument.java    | 10 +++----
 .../jdwp/impl/RequestedJDWPEvents.java        |  4 +--
 .../espresso/jdwp/impl/SocketConnection.java  | 15 ++++++++++
 6 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListener.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListener.java
index bfd654e7dda2..0dad3f93ef25 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListener.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListener.java
@@ -37,7 +37,7 @@ public interface VMEventListener extends VMListener {
 
     void breakpointHit(BreakpointInfo info, CallFrame frame, Object currentThread);
 
-    void vmDied();
+    boolean vmDied();
 
     void addClassUnloadRequestId(int id);
 
@@ -47,7 +47,7 @@ public interface VMEventListener extends VMListener {
 
     void addVMStartRequest(int id);
 
-    void addVMDeathRequest(int id);
+    void addVMDeathRequest(int id, byte suspendPolicy);
 
     void addClassPrepareRequest(ClassPrepareRequest request);
 
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java
index 78a4963c1088..75b298918783 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/VMEventListenerImpl.java
@@ -78,6 +78,7 @@ public final class VMEventListenerImpl implements VMEventListener {
     private byte threadStartSuspendPolicy;
     private byte threadDeathSuspendPolicy;
     private int vmDeathRequestId;
+    private byte vmDeathSuspendPolicy = SuspendStrategy.NONE;
     private int vmStartRequestId;
     private final List<PacketStream> heldEvents = new ArrayList<>();
     private final Map<Object, Object> currentContendedMonitor = new HashMap<>();
@@ -891,17 +892,27 @@ public void vmStarted(boolean suspend) {
     }
 
     @Override
-    public void vmDied() {
+    public boolean vmDied() {
         if (connection == null) {
-            return;
+            return false;
         }
         PacketStream stream = new PacketStream().commandPacket().commandSet(64).command(100);
-        stream.writeByte(SuspendStrategy.NONE);
-        stream.writeInt(1);
+        stream.writeByte(vmDeathSuspendPolicy);
+        if (vmDeathRequestId != 0) {
+            stream.writeInt(2);
+            // requested event
+            stream.writeByte(RequestedJDWPEvents.VM_DEATH);
+            stream.writeInt(vmDeathRequestId);
+            // automatic event
+        } else {
+            // only automatic event to send
+            stream.writeInt(1);
+        }
         stream.writeByte(RequestedJDWPEvents.VM_DEATH);
-        stream.writeInt(vmDeathRequestId != -1 ? vmDeathRequestId : 0);
+        stream.writeInt(0);
         // don't queue this packet, send immediately
         connection.sendVMDied(stream);
+        return vmDeathSuspendPolicy != SuspendStrategy.NONE;
     }
 
     @Override
@@ -937,13 +948,14 @@ public void removeThreadDiedRequestId() {
     }
 
     @Override
-    public void addVMDeathRequest(int id) {
-        this.vmStartRequestId = id;
+    public void addVMDeathRequest(int id, byte suspendPolicy) {
+        this.vmDeathRequestId = id;
+        this.vmDeathSuspendPolicy = suspendPolicy;
     }
 
     @Override
     public void addVMStartRequest(int id) {
-        this.vmDeathRequestId = id;
+        this.vmStartRequestId = id;
     }
 
     @Override
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
index eb4e8c8ffa6b..f65ab0b5eaa0 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
@@ -467,7 +467,10 @@ public void disposeDebugger(boolean prepareReconnect) {
         if (!prepareReconnect) {
             // OK, we're closing down the context which is equivalent
             // to a dead VM from a JDWP client point of view
-            eventListener.vmDied();
+            if(eventListener.vmDied()) {
+                // we're asked to suspend
+                suspend(null, context.asGuestThread(Thread.currentThread()), SuspendStrategy.EVENT_THREAD, Collections.emptyList(), null, false);
+            }
         }
         // Creating a new thread, because the reset method
         // will interrupt all active jdwp threads, which might
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWPInstrument.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWPInstrument.java
index b74b1bf46b9a..149b6d000823 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWPInstrument.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWPInstrument.java
@@ -58,11 +58,6 @@ protected void onCreate(TruffleInstrument.Env instrumentEnv) {
     }
 
     public void reset(boolean prepareForReconnect) {
-        // close the connection to the debugger
-        if (connection != null) {
-            connection.close();
-        }
-
         // stop all running jdwp threads in an orderly fashion
         for (Thread activeThread : activeThreads) {
             activeThread.interrupt();
@@ -93,6 +88,11 @@ public void reset(boolean prepareForReconnect) {
         // resume all threads
         controller.resumeAll(true);
 
+        // close the connection to the debugger
+        if (connection != null) {
+            connection.close();
+        }
+
         if (prepareForReconnect) {
             // replace the controller instance
             controller.reInitialize();
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java
index 324fb472edfc..c77e71fb4a62 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java
@@ -168,8 +168,8 @@ public CommandResult registerEvent(Packet packet, Commands callback) {
             case VM_START: // no debuggers should ask for this event
                 eventListener.addVMStartRequest(packet.id);
                 break;
-            case VM_DEATH: // no debuggers should request this event
-                eventListener.addVMDeathRequest(packet.id);
+            case VM_DEATH:
+                eventListener.addVMDeathRequest(packet.id, suspendPolicy);
                 break;
             case MONITOR_CONTENDED_ENTER:
                 eventListener.addMonitorContendedEnterRequest(packet.id, filter);
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/SocketConnection.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/SocketConnection.java
index 68a266fcd276..e89797f29ead 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/SocketConnection.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/SocketConnection.java
@@ -51,10 +51,25 @@ public final class SocketConnection implements Runnable {
     }
 
     public void close() throws IOException {
+        // send outstanding packets before closing
+        while (!queue.isEmpty()) {
+            for (PacketStream packetStream : queue) {
+                byte[] shipment = packetStream.prepareForShipment();
+                try {
+                    writePacket(shipment);
+                } catch (ConnectionClosedException e) {
+                    JDWP.LOGGER.finest("connection was closed when trying to flush queue");
+                }
+            }
+        }
+        socketOutput.flush();
+
         synchronized (closeLock) {
             if (closed) {
                 return;
             }
+            JDWP.LOGGER.fine("closing socket now");
+
             if (serverSocket != null) {
                 serverSocket.close();
             }

From 9b84745e209190546d2ee3d2242ede006f9f8e6f Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 10:30:54 +0200
Subject: [PATCH 230/681] implement jdwp commands relating to Java 9+ modules

---
 .../truffle/espresso/jdwp/api/ErrorCodes.java |   1 +
 .../espresso/jdwp/api/JDWPContext.java        |   7 ++
 .../truffle/espresso/jdwp/api/KlassRef.java   |   7 ++
 .../truffle/espresso/jdwp/api/ModuleRef.java  |  45 ++++++++
 .../jdwp/impl/DebuggerConnection.java         |  19 ++++
 .../truffle/espresso/jdwp/impl/JDWP.java      | 105 ++++++++++++++++++
 .../espresso/impl/ClassRegistries.java        |  15 +++
 .../truffle/espresso/impl/EntryTable.java     |   6 +
 .../oracle/truffle/espresso/impl/Klass.java   |   6 +
 .../truffle/espresso/impl/ModuleTable.java    |  17 ++-
 .../espresso/runtime/JDWPContextImpl.java     |   6 +
 11 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java
index 7f1c44d8eea9..4b1e417b2650 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java
@@ -35,6 +35,7 @@ public final class ErrorCodes {
     public static final int INVALID_FRAMEID = 30;
     public static final int OPAQUE_FRAME = 32;
     public static final int INVALID_SLOT = 35;
+    public static final int INVALID_MODULE = 42;
     public static final int INVALID_CLASS_FORMAT = 60;
     public static final int FAILS_VERIFICATION = 62;
     public static final int ADD_METHOD_NOT_IMPLEMENTED = 63;
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
index e5f3aa2f2cb5..7c2ff2dba891 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
@@ -505,4 +505,11 @@ public interface JDWPContext {
      * @return true is guest object is a member of the klass
      */
     boolean isMemberOf(Object guestObject, KlassRef klass);
+
+    /**
+     * Returns all defined modules.
+     * @return all modules
+     */
+    ModuleRef[] getAllModulesRefs();
+
 }
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/KlassRef.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/KlassRef.java
index c78f0c8ce3ad..4af2cd86c195 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/KlassRef.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/KlassRef.java
@@ -181,4 +181,11 @@ public interface KlassRef {
      * @return the extension
      */
     String getSourceDebugExtension();
+
+    /**
+     * Returns the Module reference of the class.
+     *
+     * @return the module reference
+     */
+    ModuleRef getModule();
 }
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java
new file mode 100644
index 000000000000..4e55f6636592
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.espresso.jdwp.api;
+
+/**
+ * Interface representing a module reference in the VM.
+ */
+public interface ModuleRef {
+
+    ModuleRef[] EMPTY_ARRAY = new ModuleRef[0];
+
+    /**
+     * Returns the name of the module.
+     *
+     * @return module name
+     */
+    String name();
+
+    /**
+     * Returns the guest object representing the defining classloader of the module.
+     *
+     * @return the defining classloader
+     */
+    Object classLoader();
+}
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
index 68f1a7f4294f..62f975da6cdf 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerConnection.java
@@ -286,6 +286,9 @@ private void processPacket(Packet packet) {
                                 case JDWP.VirtualMachine.INSTANCE_COUNTS.ID:
                                     result = JDWP.VirtualMachine.INSTANCE_COUNTS.createReply(packet);
                                     break;
+                                case JDWP.VirtualMachine.ALL_MODULES.ID:
+                                    result = JDWP.VirtualMachine.ALL_MODULES.createReply(packet, context);
+                                    break;
                                 default:
                                     break;
                             }
@@ -347,6 +350,9 @@ private void processPacket(Packet packet) {
                                 case JDWP.ReferenceType.CONSTANT_POOL.ID:
                                     result = JDWP.ReferenceType.CONSTANT_POOL.createReply(packet, context);
                                     break;
+                                case JDWP.ReferenceType.MODULE.ID:
+                                    result = JDWP.ReferenceType.MODULE.createReply(packet, context);
+                                    break;
                             }
                             break;
                         }
@@ -571,6 +577,19 @@ private void processPacket(Packet packet) {
                             }
                             break;
                         }
+                        case JDWP.ModuleReference.ID: {
+                            switch (packet.cmd) {
+                                case JDWP.ModuleReference.NAME.ID:
+                                    result = JDWP.ModuleReference.NAME.createReply(packet, context);
+                                    break;
+                                case JDWP.ModuleReference.CLASSLOADER.ID:
+                                    result = JDWP.ModuleReference.CLASSLOADER.createReply(packet, context);
+                                    break;
+                                default:
+                                    break;
+                            }
+                            break;
+                        }
                         case JDWP.Event.ID: {
                             switch (packet.cmd) {
                                 case JDWP.Event.COMPOSITE.ID:
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index ba6a26c0d1c6..c48448e67950 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -43,6 +43,7 @@
 import com.oracle.truffle.espresso.jdwp.api.LineNumberTableRef;
 import com.oracle.truffle.espresso.jdwp.api.LocalRef;
 import com.oracle.truffle.espresso.jdwp.api.MethodRef;
+import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import com.oracle.truffle.espresso.jdwp.api.MonitorStackInfo;
 import com.oracle.truffle.espresso.jdwp.api.RedefineInfo;
 import com.oracle.truffle.espresso.jdwp.api.TagConstants;
@@ -465,6 +466,21 @@ static CommandResult createReply(Packet packet) {
                 return new CommandResult(reply);
             }
         }
+
+        static class ALL_MODULES {
+            public static final int ID = 22;
+
+            static CommandResult createReply(Packet packet, JDWPContext context) {
+                PacketStream reply = new PacketStream().replyPacket().id(packet.id);
+
+                ModuleRef[] moduleRefs = context.getAllModulesRefs();
+                reply.writeInt(moduleRefs.length);
+                for (ModuleRef moduleRef : moduleRefs) {
+                    reply.writeLong(context.getIds().getIdAsLong(moduleRef));
+                }
+                return new CommandResult(reply);
+            }
+        }
     }
 
     static class ReferenceType {
@@ -976,6 +992,35 @@ static CommandResult createReply(Packet packet, JDWPContext context) {
                 return new CommandResult(reply);
             }
         }
+
+        static class MODULE {
+
+            public static final int ID = 19;
+
+            static CommandResult createReply(Packet packet, JDWPContext context) {
+                PacketStream input = new PacketStream(packet);
+                PacketStream reply = new PacketStream().replyPacket().id(packet.id);
+
+                long typeId = input.readLong();
+                KlassRef klass = verifyRefType(typeId, reply, context);
+
+                if (klass == null) {
+                    // input could be a classObjectId
+                    Object object = context.getIds().fromId((int) typeId);
+                    klass = context.getReflectedType(object);
+                }
+
+                if (klass == null) {
+                    return new CommandResult(reply);
+                }
+
+                ModuleRef module = klass.getModule();
+                long moduleID = context.getIds().getIdAsLong(module);
+                reply.writeLong(moduleID);
+
+                return new CommandResult(reply);
+            }
+        }
     }
 
     static class ClassType {
@@ -2866,6 +2911,55 @@ static CommandResult createReply(Packet packet, JDWPContext context) {
         }
     }
 
+    static class ModuleReference {
+        public static final int ID = 18;
+
+        static class NAME {
+
+            public static final int ID = 1;
+
+            public static CommandResult createReply(Packet packet, JDWPContext context) {
+                PacketStream input = new PacketStream(packet);
+                PacketStream reply = new PacketStream().replyPacket().id(packet.id);
+
+                long moduleId = input.readLong();
+                ModuleRef module = verifyModule(moduleId, reply, context);
+
+                if (module == null) {
+                    return new CommandResult(reply);
+                }
+
+                reply.writeString(module.name());
+                return new CommandResult(reply);
+            }
+        }
+
+        static class CLASSLOADER {
+
+            public static final int ID = 2;
+
+            public static CommandResult createReply(Packet packet, JDWPContext context) {
+                PacketStream input = new PacketStream(packet);
+                PacketStream reply = new PacketStream().replyPacket().id(packet.id);
+
+                long moduleId = input.readLong();
+                ModuleRef module = verifyModule(moduleId, reply, context);
+
+                if (module == null) {
+                    return new CommandResult(reply);
+                }
+
+                Object loader = module.classLoader();
+                if (loader == null || loader == context.getNullObject()) { // system class loader
+                    reply.writeLong(0);
+                } else {
+                    reply.writeLong(context.getIds().getIdAsLong(loader));
+                }
+                return new CommandResult(reply);
+            }
+        }
+    }
+
     static class Event {
         public static final int ID = 64;
 
@@ -3100,6 +3194,17 @@ private static KlassRef verifyRefType(long refTypeId, PacketStream reply, JDWPCo
         return klass;
     }
 
+    private static ModuleRef verifyModule(long moduleId, PacketStream reply, JDWPContext context) {
+        ModuleRef module;
+        try {
+            module = (ModuleRef) context.getIds().fromId((int) moduleId);
+        } catch (ClassCastException ex) {
+            reply.errorCode(ErrorCodes.INVALID_MODULE);
+            return null;
+        }
+        return module;
+    }
+
     private static FieldRef verifyFieldRef(long fieldId, PacketStream reply, JDWPContext context) {
         FieldRef field;
         try {
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
index 8ccc73a41e62..3b935e71735b 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
@@ -38,6 +38,7 @@
 import com.oracle.truffle.espresso.descriptors.Symbol;
 import com.oracle.truffle.espresso.descriptors.Symbol.Type;
 import com.oracle.truffle.espresso.descriptors.Types;
+import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.redefinition.DefineKlassListener;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
@@ -194,6 +195,20 @@ public Klass[] getAllLoadedClasses() {
         return list.toArray(Klass.EMPTY_ARRAY);
     }
 
+    public ModuleRef[] getAllModuleRefs() {
+        ArrayList<ModuleRef> list = new ArrayList<>();
+        // add modules from boot registry
+        list.addAll(bootClassRegistry.modules().entries());
+
+        // add modules from all other registries
+        synchronized (weakClassLoaderSet) {
+            for (StaticObject classLoader : weakClassLoaderSet) {
+                list.addAll(getClassRegistry(classLoader).modules().entries());
+            }
+        }
+        return list.toArray(ModuleRef.EMPTY_ARRAY);
+    }
+
     /**
      * Do not call directly. Use
      * {@link com.oracle.truffle.espresso.meta.Meta#loadKlassOrFail(Symbol, StaticObject, StaticObject)}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
index b644d99f0c98..a8b4a135c3d1 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
@@ -23,6 +23,8 @@
 
 package com.oracle.truffle.espresso.impl;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.concurrent.locks.Lock;
@@ -42,6 +44,10 @@ protected EntryTable(ReadWriteLock lock) {
         this.writeBlock = new BlockLock(lock.writeLock());
     }
 
+    public Collection<T> entries() {
+        return Collections.unmodifiableCollection(entries.values());
+    }
+
     public static final class BlockLock implements AutoCloseable {
 
         private final Lock lock;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
index ccb341aa9b16..1306ac952d91 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
@@ -30,6 +30,7 @@
 import java.util.function.IntFunction;
 
 import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import org.graalvm.collections.EconomicSet;
 
 import com.oracle.truffle.api.CompilerDirectives;
@@ -1564,5 +1565,10 @@ public String getSourceDebugExtension() {
         return null;
     }
 
+    @Override
+    public final ModuleRef getModule() {
+        return module();
+    }
+
     // endregion jdwp-specific
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
index eb92346df63d..9999ae9a5fa9 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
@@ -28,6 +28,7 @@
 
 import com.oracle.truffle.espresso.descriptors.Symbol;
 import com.oracle.truffle.espresso.descriptors.Symbol.Name;
+import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 
@@ -52,7 +53,7 @@ public ModuleEntry createAndAddEntry(Symbol<Name> name, ClassRegistry registry,
         return moduleEntry;
     }
 
-    public static class ModuleEntry extends EntryTable.NamedEntry {
+    public static class ModuleEntry extends EntryTable.NamedEntry implements ModuleRef {
 
         // TODO: module versions.
         ModuleEntry(Symbol<Name> name, ClassRegistry data) {
@@ -60,6 +61,20 @@ public static class ModuleEntry extends EntryTable.NamedEntry {
             this.registry = data;
         }
 
+        public String name() {
+            Symbol<Name> name = getName();
+            if (name == null) {
+                // JDWP expects the unnamed module to return empty string
+                return "";
+            } else {
+                return name.toString();
+            }
+        }
+
+        public Object classLoader() {
+            return registry.getClassLoader();
+        }
+
         public static ModuleEntry createUnnamedModuleEntry(StaticObject module, ClassRegistry registry) {
             ModuleEntry result = new ModuleEntry(null, registry);
             result.setCanReadAllUnnamed();
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
index 5d9ad20ae91c..8a9adc3a2b3d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
@@ -54,6 +54,7 @@
 import com.oracle.truffle.espresso.jdwp.api.JDWPSetup;
 import com.oracle.truffle.espresso.jdwp.api.KlassRef;
 import com.oracle.truffle.espresso.jdwp.api.MethodRef;
+import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import com.oracle.truffle.espresso.jdwp.api.MonitorStackInfo;
 import com.oracle.truffle.espresso.jdwp.api.RedefineInfo;
 import com.oracle.truffle.espresso.jdwp.api.TagConstants;
@@ -721,6 +722,11 @@ public boolean isMemberOf(Object guestObject, KlassRef klass) {
         }
     }
 
+    @Override
+    public ModuleRef[] getAllModulesRefs() {
+        return context.getRegistries().getAllModuleRefs();
+    }
+
     public void rerunclinit(ObjectKlass oldKlass) {
         classInitializerActions.add(new ReloadingAction(oldKlass));
     }

From b5de1833a44ec69ef545243bb2a5c522bdb1885c Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Thu, 30 Sep 2021 10:59:47 +0200
Subject: [PATCH 231/681] refactor new match rule.

---
 .../aarch64/test/AArch64NegateShiftTest.java  |  2 +-
 .../core/aarch64/AArch64NodeMatchRules.java   | 14 ++++++----
 .../lir/aarch64/AArch64ArithmeticOp.java      | 28 -------------------
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java
index 0f74f5096bc7..6917c7f868cd 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java
@@ -32,7 +32,7 @@
 import java.util.function.Predicate;
 
 public class AArch64NegateShiftTest extends AArch64MatchRuleTest {
-    private static final Predicate<LIRInstruction> predicate = op -> (op instanceof AArch64ArithmeticOp.NegShiftOp);
+    private static final Predicate<LIRInstruction> predicate = op -> (op instanceof AArch64ArithmeticOp.BinaryShiftOp);
 
     /**
      * negateShift match rule tests for shift operations with int type.
diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
index 103d8f5cb21b..c061468d0eff 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
@@ -73,6 +73,7 @@
 import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
 import org.graalvm.compiler.nodes.memory.MemoryAccess;
 
+import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -668,18 +669,21 @@ public ComplexMatchResult logicShift(BinaryNode binary, ValueNode a, BinaryNode
         return emitBinaryShift(op, a, (ShiftNode<?>) shift);
     }
 
+    /**
+     * Goal: fold shift into negate operation using AArch64's sub (shifted register) instruction.
+     */
     @MatchRule("(Negate (UnsignedRightShift=shift a Constant=b))")
     @MatchRule("(Negate (RightShift=shift a Constant=b))")
     @MatchRule("(Negate (LeftShift=shift a Constant=b))")
     public ComplexMatchResult negShift(BinaryNode shift, ValueNode a, ConstantNode b) {
-        assert b.getStackKind().isNumericInteger();
-        assert a.getStackKind().isNumericInteger();
-        int shiftAmt = b.asJavaConstant().asInt();
+        assert isNumericInteger(a, b);
+        int shiftAmt = getClampedShiftAmt((ShiftNode<?>) shift);
         AArch64Assembler.ShiftType shiftType = shiftTypeMap.get(shift.getClass());
         return builder -> {
             AllocatableValue src = moveSp(gen.asAllocatable(operand(a)));
-            Variable result = gen.newVariable(LIRKind.combine(operand(a)));
-            gen.append(new AArch64ArithmeticOp.NegShiftOp(result, src, shiftType, shiftAmt));
+            LIRKind kind = LIRKind.combine(operand(a));
+            Variable result = gen.newVariable(kind);
+            gen.append(new AArch64ArithmeticOp.BinaryShiftOp(AArch64ArithmeticOp.SUB, result, AArch64.zr.asValue(kind), src, shiftType, shiftAmt));
             return result;
         };
     }
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
index 8f44d473baa3..d3b60cf23865 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java
@@ -679,34 +679,6 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         }
     }
 
-    public static class NegShiftOp extends AArch64LIRInstruction {
-        private static final LIRInstructionClass<NegShiftOp> TYPE = LIRInstructionClass.create(NegShiftOp.class);
-        @Def(REG) protected AllocatableValue result;
-        @Use(REG) protected AllocatableValue src;
-        private final AArch64Assembler.ShiftType shiftType;
-        private final int shiftAmt;
-
-        /**
-         * Computes <code>result = - shiftType(src, shiftAmt)</code>.
-         *
-         * @param shiftType defines left shift, right shift, arithmetic, logical.
-         * @param shiftAmt must be in range 0 to 31 for ints (63 for longs).
-         */
-        public NegShiftOp(AllocatableValue result, AllocatableValue src, AArch64Assembler.ShiftType shiftType, int shiftAmt) {
-            super(TYPE);
-            this.result = result;
-            this.src = src;
-            this.shiftType = shiftType;
-            this.shiftAmt = shiftAmt;
-        }
-
-        @Override
-        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            int size = result.getPlatformKind().getSizeInBytes() * Byte.SIZE;
-            masm.neg(size, asRegister(result), asRegister(src), shiftType, shiftAmt);
-        }
-    }
-
     public static class MultiplyAddSubOp extends AArch64LIRInstruction {
         private static final LIRInstructionClass<MultiplyAddSubOp> TYPE = LIRInstructionClass.create(MultiplyAddSubOp.class);
 

From 935e1a4cff7f59c6671ca7458e2de98b0bda24e2 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 11:30:37 +0200
Subject: [PATCH 232/681] avoid hiding name field and rename method to explicit
 jdwpName()

---
 .../src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java   | 2 +-
 .../src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java       | 2 +-
 .../src/com/oracle/truffle/espresso/impl/ModuleTable.java     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java
index 4e55f6636592..1bde578b8058 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ModuleRef.java
@@ -34,7 +34,7 @@ public interface ModuleRef {
      *
      * @return module name
      */
-    String name();
+    String jdwpName();
 
     /**
      * Returns the guest object representing the defining classloader of the module.
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index c48448e67950..c51f0ee87f58 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -2929,7 +2929,7 @@ public static CommandResult createReply(Packet packet, JDWPContext context) {
                     return new CommandResult(reply);
                 }
 
-                reply.writeString(module.name());
+                reply.writeString(module.jdwpName());
                 return new CommandResult(reply);
             }
         }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
index 9999ae9a5fa9..fc264bbeb2ed 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
@@ -61,8 +61,7 @@ public static class ModuleEntry extends EntryTable.NamedEntry implements ModuleR
             this.registry = data;
         }
 
-        public String name() {
-            Symbol<Name> name = getName();
+        public String jdwpName() {
             if (name == null) {
                 // JDWP expects the unnamed module to return empty string
                 return "";
@@ -72,6 +71,7 @@ public String name() {
         }
 
         public Object classLoader() {
+            getNameAsString()
             return registry.getClassLoader();
         }
 

From 1b485ee9e245843222fb1b2420e996e602221327 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 11:46:58 +0200
Subject: [PATCH 233/681] minor

---
 .../src/com/oracle/truffle/espresso/impl/ModuleTable.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
index fc264bbeb2ed..6afb0e33dbf2 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ModuleTable.java
@@ -71,7 +71,6 @@ public String jdwpName() {
         }
 
         public Object classLoader() {
-            getNameAsString()
             return registry.getClassLoader();
         }
 

From 8dd794e1947d33908da9d00f5bff3889ed88dd89 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Wed, 29 Sep 2021 17:47:06 +0200
Subject: [PATCH 234/681] Implement intrinsics llvm.(umax/umin).*

---
 .../parser/factories/BasicNodeFactory.java    |  52 ++++-
 .../intrinsics/c/LLVMCMathsIntrinsics.java    | 194 ++++++++++++++++++
 2 files changed, 236 insertions(+), 10 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
index aac96d172e97..84e227bb12b5 100644
--- a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
+++ b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
@@ -100,6 +100,7 @@
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMLoopNode;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVM80BitFloatRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMAddressRetNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMArrayRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMDoubleRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMFloatRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMI16RetNodeGen;
@@ -109,7 +110,6 @@
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMI8RetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMIVarBitRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMStructRetNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMArrayRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMVectorRetNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMRetNodeFactory.LLVMVoidReturnNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.control.LLVMSwitchNode;
@@ -128,6 +128,8 @@
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMFAbsNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMFAbsVectorNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMPowNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMUmaxVectorNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMUminVectorNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.interop.LLVMTruffleGetArgCountNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.interop.LLVMTruffleGetArgNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.LLVMAssumeNodeGen;
@@ -163,14 +165,14 @@
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMArithmeticFactory.LLVMArithmeticWithOverflowNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMArithmeticFactory.LLVMSimpleArithmeticPrimitiveNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceAddNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceMulNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceAndNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceMulNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceOrNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceXorNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMaxNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceSignedMaxNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMinNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceSignedMinNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMaxNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceUnsignedMinNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.arith.LLVMVectorReduceFactory.LLVMVectorReduceXorNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI16NodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI32NodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.bit.CountLeadingZeroesNodeFactory.CountLeadingZeroesI64NodeGen;
@@ -1374,14 +1376,24 @@ private LLVMExpressionNode createMemmoveIntrinsic(LLVMExpressionNode[] args) {
         }
     }
 
+    static final class TypeSuffix {
+        final String suffix;
+        final String length;
+
+        TypeSuffix(String suffix, String length) {
+            this.suffix = suffix;
+            this.length = length;
+        }
+    }
+
     // matches the type suffix of an LLVM intrinsic function, including the dot
-    private static final Pattern INTRINSIC_TYPE_SUFFIX_PATTERN = Pattern.compile("\\S+(?<suffix>\\.(?:[vp]\\d+)?[if]\\d+)$");
+    private static final Pattern INTRINSIC_TYPE_SUFFIX_PATTERN = Pattern.compile("\\S+(?<suffix>\\.(?:[vp](?<length>\\d+))?[if]\\d+)$");
 
-    private static String getTypeSuffix(String intrinsicName) {
+    private static TypeSuffix getTypeSuffix(String intrinsicName) {
         assert intrinsicName != null;
         final Matcher typeSuffixMatcher = INTRINSIC_TYPE_SUFFIX_PATTERN.matcher(intrinsicName);
         if (typeSuffixMatcher.matches()) {
-            return typeSuffixMatcher.group("suffix");
+            return new TypeSuffix(typeSuffixMatcher.group("suffix"), typeSuffixMatcher.group("length"));
         }
         return null;
     }
@@ -1719,9 +1731,9 @@ protected LLVMExpressionNode getLLVMBuiltin(FunctionDeclaration declaration, LLV
         // strip the type suffix for intrinsics that are supported for more than one data type. If
         // we do not implement the corresponding data type the node will just report a missing
         // specialization at run-time
-        String typeSuffix = getTypeSuffix(intrinsicName);
+        TypeSuffix typeSuffix = getTypeSuffix(intrinsicName);
         if (typeSuffix != null) {
-            intrinsicName = intrinsicName.substring(0, intrinsicName.length() - typeSuffix.length());
+            intrinsicName = intrinsicName.substring(0, intrinsicName.length() - typeSuffix.suffix.length());
         }
 
         if ("llvm.prefetch".equals(intrinsicName)) {
@@ -1732,6 +1744,26 @@ protected LLVMExpressionNode getLLVMBuiltin(FunctionDeclaration declaration, LLV
             return LLVMIsConstantNodeGen.create(args[1]);
         }
 
+        if ("llvm.umax".equals(intrinsicName) && typeSuffix != null && typeSuffix.length != null) {
+            // format '.([vp]\d+)?[if]\d+)'
+            try {
+                int vectorLength = Integer.parseInt(typeSuffix.length);
+                return LLVMUmaxVectorNodeGen.create(args[1], args[2], vectorLength);
+            } catch (NumberFormatException e) {
+                // fall through
+            }
+        }
+
+        if ("llvm.umin".equals(intrinsicName) && typeSuffix != null && typeSuffix.length != null) {
+            // format '.([vp]\d+)?[if]\d+)'
+            try {
+                int vectorLength = Integer.parseInt(typeSuffix.length);
+                return LLVMUminVectorNodeGen.create(args[1], args[2], vectorLength);
+            } catch (NumberFormatException e) {
+                // fall through
+            }
+        }
+
         return LLVMX86_MissingBuiltin.create(declaration.getName());
     }
 
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
index c1ca6b30cac7..bcc98ffa8d3e 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
@@ -29,6 +29,7 @@
  */
 package com.oracle.truffle.llvm.runtime.nodes.intrinsics.c;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeField;
@@ -48,6 +49,11 @@
 import com.oracle.truffle.llvm.runtime.pointer.LLVMPointer;
 import com.oracle.truffle.llvm.runtime.vector.LLVMDoubleVector;
 import com.oracle.truffle.llvm.runtime.vector.LLVMFloatVector;
+import com.oracle.truffle.llvm.runtime.vector.LLVMI16Vector;
+import com.oracle.truffle.llvm.runtime.vector.LLVMI1Vector;
+import com.oracle.truffle.llvm.runtime.vector.LLVMI32Vector;
+import com.oracle.truffle.llvm.runtime.vector.LLVMI64Vector;
+import com.oracle.truffle.llvm.runtime.vector.LLVMI8Vector;
 
 /**
  * Implements the C functions from math.h.
@@ -803,4 +809,192 @@ protected LLVM80BitFloat doLLVM80BitFloat(LLVM80BitFloat magnitude, LLVM80BitFlo
             }
         }
     }
+
+    @NodeChild(type = LLVMExpressionNode.class)
+    @NodeChild(type = LLVMExpressionNode.class)
+    @NodeField(name = "vectorLength", type = int.class)
+    abstract static class LLVMUnsignedVectorMinMaxNode extends LLVMBuiltin {
+        protected abstract int getVectorLength();
+
+        @SuppressWarnings("unused")
+        protected boolean compare(boolean a, boolean b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        private byte compare(byte a, byte b) {
+            return (byte) compare((int) a, (int) b);
+        }
+
+        private short compare(short a, short b) {
+            return (short) compare((int) a, (int) b);
+        }
+
+        @SuppressWarnings("unused")
+        protected int compare(int a, int b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        @SuppressWarnings("unused")
+        protected long compare(long a, long b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        @SuppressWarnings("unused")
+        protected float compare(float a, float b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        @SuppressWarnings("unused")
+        protected double compare(double a, double b) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMI1Vector doI1Vector(LLVMI1Vector a, LLVMI1Vector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            boolean[] result = new boolean[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                result[i] = compare(a.getValue(i), b.getValue(i));
+            }
+            return LLVMI1Vector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMI8Vector doI8Vector(LLVMI8Vector a, LLVMI8Vector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            byte[] result = new byte[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                byte aValue = a.getValue(i);
+                byte bValue = b.getValue(i);
+                result[i] = compare(aValue, bValue);
+            }
+            return LLVMI8Vector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMI16Vector doI16Vector(LLVMI16Vector a, LLVMI16Vector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            short[] result = new short[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                short aValue = a.getValue(i);
+                short bValue = b.getValue(i);
+                result[i] = compare(aValue, bValue);
+            }
+            return LLVMI16Vector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMI32Vector doI32Vector(LLVMI32Vector a, LLVMI32Vector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            int[] result = new int[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                int aValue = a.getValue(i);
+                int bValue = b.getValue(i);
+                result[i] = compare(aValue, bValue);
+            }
+            return LLVMI32Vector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMI64Vector doI64Vector(LLVMI64Vector a, LLVMI64Vector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            long[] result = new long[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                long aValue = a.getValue(i);
+                long bValue = b.getValue(i);
+                result[i] = Long.compareUnsigned(aValue, bValue) >= 0 ? aValue : bValue;
+            }
+            return LLVMI64Vector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMFloatVector doFloatVector(LLVMFloatVector a, LLVMFloatVector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            float[] result = new float[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                result[i] = compare(a.getValue(i), b.getValue(i));
+            }
+            return LLVMFloatVector.create(result);
+        }
+
+        @Specialization
+        @ExplodeLoop
+        protected LLVMDoubleVector doDoubleVector(LLVMDoubleVector a, LLVMDoubleVector b) {
+            assert a.getLength() == getVectorLength();
+            assert b.getLength() == getVectorLength();
+            double[] result = new double[getVectorLength()];
+            for (int i = 0; i < getVectorLength(); i++) {
+                result[i] = compare(a.getValue(i), b.getValue(i));
+            }
+            return LLVMDoubleVector.create(result);
+        }
+    }
+
+    public abstract static class LLVMUmaxVectorNode extends LLVMUnsignedVectorMinMaxNode {
+
+        @Override
+        protected final boolean compare(boolean a, boolean b) {
+            return a || b;
+        }
+
+        @Override
+        protected final int compare(int a, int b) {
+            return Integer.compareUnsigned(a, b) >= 0 ? a : b;
+        }
+
+        @Override
+        protected final long compare(long a, long b) {
+            return Long.compareUnsigned(a, b) >= 0 ? a : b;
+        }
+
+        @Override
+        protected final float compare(float a, float b) {
+            return Math.max(a, b);
+        }
+
+        @Override
+        protected final double compare(double a, double b) {
+            return Math.max(a, b);
+        }
+    }
+
+    public abstract static class LLVMUminVectorNode extends LLVMUnsignedVectorMinMaxNode {
+
+        @Override
+        protected final boolean compare(boolean a, boolean b) {
+            return a && b;
+        }
+
+        @Override
+        protected final int compare(int a, int b) {
+            return Integer.compareUnsigned(a, b) <= 0 ? a : b;
+        }
+
+        @Override
+        protected final long compare(long a, long b) {
+            return Long.compareUnsigned(a, b) <= 0 ? a : b;
+        }
+
+        @Override
+        protected final float compare(float a, float b) {
+            return Math.min(a, b);
+        }
+
+        @Override
+        protected final double compare(double a, double b) {
+            return Math.min(a, b);
+        }
+    }
 }

From defb7a9cc2a0e8451531544c478b40defd58834f Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 12:00:15 +0200
Subject: [PATCH 235/681] rename method and take the read lock

---
 .../com/oracle/truffle/espresso/impl/ClassRegistries.java  | 4 ++--
 .../src/com/oracle/truffle/espresso/impl/EntryTable.java   | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
index 3b935e71735b..85b70512fd78 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistries.java
@@ -198,12 +198,12 @@ public Klass[] getAllLoadedClasses() {
     public ModuleRef[] getAllModuleRefs() {
         ArrayList<ModuleRef> list = new ArrayList<>();
         // add modules from boot registry
-        list.addAll(bootClassRegistry.modules().entries());
+        list.addAll(bootClassRegistry.modules().values());
 
         // add modules from all other registries
         synchronized (weakClassLoaderSet) {
             for (StaticObject classLoader : weakClassLoaderSet) {
-                list.addAll(getClassRegistry(classLoader).modules().entries());
+                list.addAll(getClassRegistry(classLoader).modules().values());
             }
         }
         return list.toArray(ModuleRef.EMPTY_ARRAY);
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
index a8b4a135c3d1..33c58d17fe3f 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/EntryTable.java
@@ -44,8 +44,11 @@ protected EntryTable(ReadWriteLock lock) {
         this.writeBlock = new BlockLock(lock.writeLock());
     }
 
-    public Collection<T> entries() {
-        return Collections.unmodifiableCollection(entries.values());
+    @SuppressWarnings("try")
+    public Collection<T> values() {
+        try (BlockLock block = read()) {
+            return Collections.unmodifiableCollection(entries.values());
+        }
     }
 
     public static final class BlockLock implements AutoCloseable {

From 5bfeedce57fab2f520424c9e952b8fa84dc0938b Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 30 Sep 2021 12:00:58 +0200
Subject: [PATCH 236/681] Fix style

---
 .../runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
index bcc98ffa8d3e..96af96fb6182 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
@@ -816,7 +816,6 @@ protected LLVM80BitFloat doLLVM80BitFloat(LLVM80BitFloat magnitude, LLVM80BitFlo
     abstract static class LLVMUnsignedVectorMinMaxNode extends LLVMBuiltin {
         protected abstract int getVectorLength();
 
-        @SuppressWarnings("unused")
         protected boolean compare(boolean a, boolean b) {
             throw CompilerDirectives.shouldNotReachHere();
         }
@@ -829,22 +828,18 @@ private short compare(short a, short b) {
             return (short) compare((int) a, (int) b);
         }
 
-        @SuppressWarnings("unused")
         protected int compare(int a, int b) {
             throw CompilerDirectives.shouldNotReachHere();
         }
 
-        @SuppressWarnings("unused")
         protected long compare(long a, long b) {
             throw CompilerDirectives.shouldNotReachHere();
         }
 
-        @SuppressWarnings("unused")
         protected float compare(float a, float b) {
             throw CompilerDirectives.shouldNotReachHere();
         }
 
-        @SuppressWarnings("unused")
         protected double compare(double a, double b) {
             throw CompilerDirectives.shouldNotReachHere();
         }

From d7938b149b5c819163dba1c7be2a9a0edb9fe262 Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.m.marek@oracle.com>
Date: Thu, 30 Sep 2021 14:23:23 +0200
Subject: [PATCH 237/681] Use pre-build GNU-R for fastr linux jobs.

---
 vm/ci_common/common.hocon | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index 32202174f47f..42cfe66a25ff 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -121,13 +121,14 @@ fastr_linux: ${fastr} {
     pcre2: "==10.37",
     zlib: ">=1.2.11",
     curl: ">=7.50.1",
-    gnur: "==4.0.3-gcc4.8.5-pcre8.42"
+    gnur: "==4.0.3-gcc4.8.5-pcre2"
   }
   environment: {
     TZDIR: "/usr/share/zoneinfo"
     PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/zlib/1.2.11/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre2/10.37/include -I/cm/shared/apps/curl/7.50.1/include"
     PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64"
     FASTR_FC: "/cm/shared/apps/gcc/4.8.5/bin/gfortran"
+    GNUR_HOME_BINARY: "/cm/shared/apps/gnur/4.0.3-gcc4.8.5-pcre2/lib64/R"
   }
   downloads: {
     BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "4.8.5", platformspecific: true },

From 59693d32185f307422a8a770883afd51f9aa4846 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 14:27:55 +0200
Subject: [PATCH 238/681] checkstyle fixes

---
 .../src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java   | 1 +
 .../oracle/truffle/espresso/jdwp/impl/DebuggerController.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
index 7c2ff2dba891..56dc2c3c41db 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
@@ -508,6 +508,7 @@ public interface JDWPContext {
 
     /**
      * Returns all defined modules.
+     *
      * @return all modules
      */
     ModuleRef[] getAllModulesRefs();
diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
index f65ab0b5eaa0..746f20f27ec6 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/DebuggerController.java
@@ -467,7 +467,7 @@ public void disposeDebugger(boolean prepareReconnect) {
         if (!prepareReconnect) {
             // OK, we're closing down the context which is equivalent
             // to a dead VM from a JDWP client point of view
-            if(eventListener.vmDied()) {
+            if (eventListener.vmDied()) {
                 // we're asked to suspend
                 suspend(null, context.asGuestThread(Thread.currentThread()), SuspendStrategy.EVENT_THREAD, Collections.emptyList(), null, false);
             }

From afc79f3a58aaae9d72c866c44b15ba39ce7b8824 Mon Sep 17 00:00:00 2001
From: Jakub Chaloupka <jakub.chaloupka@oracle.com>
Date: Tue, 2 Mar 2021 15:44:35 +0100
Subject: [PATCH 239/681] Truffle Exit Events.

---
 .../test/ContextLookupCompilationTest.java    |   1 +
 .../test/TruffleContextCompilationTest.java   |  42 +-
 ...cle_truffle_espresso_polyglot_Interop.java |  10 +-
 sdk/src/org.graalvm.polyglot/snapshot.sigtest |   3 +-
 .../src/org/graalvm/polyglot/Context.java     |  35 +-
 .../graalvm/polyglot/PolyglotException.java   |  11 +-
 .../polyglot/impl/AbstractPolyglotImpl.java   |   2 +-
 truffle/CHANGELOG.md                          |   4 +
 truffle/docs/Exit.md                          | 107 +++
 truffle/docs/exitschema.png                   | Bin 0 -> 29782 bytes
 truffle/docs/hardexitschema.png               | Bin 0 -> 86566 bytes
 .../instrumentation/test/ContextExitTest.java | 653 ++++++++++++++++++
 ...ContextInterruptCloseCancelOrExitTest.java | 583 ++++++++++++++++
 .../ContextInterruptCloseOrCancelTest.java    | 259 -------
 .../test/InstrumentationTestLanguage.java     |  55 +-
 .../test/ThreadsActivationListenerTest.java   |   3 +
 .../test/TruffleContextTest.java              |  88 ++-
 .../truffle/api/interop/ExceptionType.java    |  15 +-
 .../truffle/api/interop/InteropLibrary.java   |  53 +-
 .../api/test/TruffleSafepointTest.java        |  21 +
 .../api/test/polyglot/ChildContextTest.java   |   4 +-
 .../api/test/polyglot/ContextPolicyTest.java  |  63 +-
 .../LanguageFinalizationFailureTest.java      |   3 +-
 .../api/test/polyglot/ProxyLanguage.java      |   9 +
 .../api/test/wrapper/HostEngineDispatch.java  |   4 +-
 .../api/test/wrapper/HostEntryPoint.java      |   2 +-
 .../com.oracle.truffle.api/snapshot.sigtest   |  12 +
 .../oracle/truffle/api/LanguageAccessor.java  |   5 +
 .../oracle/truffle/api/TruffleContext.java    |  94 ++-
 .../oracle/truffle/api/TruffleLanguage.java   | 114 ++-
 .../com/oracle/truffle/api/impl/Accessor.java |   6 +
 .../truffle/polyglot/EngineAccessor.java      |  21 +-
 .../polyglot/PauseThreadLocalAction.java      |   2 +-
 .../polyglot/PolyglotContextConfig.java       |   4 +-
 .../truffle/polyglot/PolyglotContextImpl.java | 463 +++++++++++--
 .../polyglot/PolyglotEngineDispatch.java      |   4 +-
 .../truffle/polyglot/PolyglotEngineImpl.java  |  10 +-
 .../polyglot/PolyglotExceptionImpl.java       |  40 +-
 .../oracle/truffle/polyglot/PolyglotImpl.java |   8 +-
 .../polyglot/PolyglotLanguageContext.java     |  48 +-
 .../truffle/polyglot/PolyglotThread.java      |  16 +
 .../polyglot/PolyglotThreadLocalActions.java  |   3 +-
 .../oracle/truffle/sl/test/SLExitTest.java    | 129 ++++
 .../src/com/oracle/truffle/sl/SLLanguage.java |   8 +
 .../truffle/sl/builtins/SLExitBuiltin.java    |  59 ++
 .../SLRegisterShutdownHookBuiltin.java        |  61 ++
 .../oracle/truffle/sl/runtime/SLContext.java  |  34 +
 .../com.oracle.truffle.tck/snapshot.sigtest   |   2 +
 48 files changed, 2691 insertions(+), 482 deletions(-)
 create mode 100644 truffle/docs/Exit.md
 create mode 100644 truffle/docs/exitschema.png
 create mode 100644 truffle/docs/hardexitschema.png
 create mode 100644 truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextExitTest.java
 create mode 100644 truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
 delete mode 100644 truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseOrCancelTest.java
 create mode 100644 truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLExitTest.java
 create mode 100644 truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLExitBuiltin.java
 create mode 100644 truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java

diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
index e4149a45b545..74585745bed1 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java
@@ -280,6 +280,7 @@ public void testInnerContexts() {
             assertLookupsInnerContext();
         } finally {
             innerContext.leave(null, prev);
+            innerContext.close();
         }
         assertLookupsInnerContext();
         context.leave();
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java
index 97d4b07f8974..35f9ccdf4d1b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java
@@ -56,27 +56,31 @@ public void testInnerContextsDeoptimize() {
         Env env = Language.REFERENCE.get(null);
 
         TruffleContext context = env.newContextBuilder().build();
-        OptimizedCallTarget target = assertCompiling(new RootNode(null) {
-            @Override
-            public Object execute(VirtualFrame frame) {
-                Object prev = context.enter(this);
-                try {
-                    // barrier ensures that the deopt does not move up or downwards
-                    barrier();
-                    Object arg = frame.getArguments()[0];
-                    if (arg != FIRST_RUN) {
-                        CompilerDirectives.transferToInterpreterAndInvalidate();
+        try {
+            OptimizedCallTarget target = assertCompiling(new RootNode(null) {
+                @Override
+                public Object execute(VirtualFrame frame) {
+                    Object prev = context.enter(this);
+                    try {
+                        // barrier ensures that the deopt does not move up or downwards
+                        barrier();
+                        Object arg = frame.getArguments()[0];
+                        if (arg != FIRST_RUN) {
+                            CompilerDirectives.transferToInterpreterAndInvalidate();
+                        }
+                        barrier();
+                    } finally {
+                        context.leave(this, prev);
                     }
-                    barrier();
-                } finally {
-                    context.leave(this, prev);
+                    return null;
                 }
-                return null;
-            }
-        });
-        assertTrue(target.isValid());
-        target.call(new Object());
-        assertFalse(target.isValid());
+            });
+            assertTrue(target.isValid());
+            target.call(new Object());
+            assertFalse(target.isValid());
+        } finally {
+            context.close();
+        }
     }
 
     private OptimizedCallTarget assertCompiling(RootNode node) {
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java
index d289fa3968d9..351bdfc34962 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -695,9 +695,11 @@ boolean doCached(
     /**
      * Returns exception exit status of the receiver. Throws {@code UnsupportedMessageException}
      * when the receiver is not an {@link InteropLibrary#isException(Object) exception} of the
-     * {@link ExceptionType#EXIT exit type}. A return value zero indicates that the execution of the
-     * application was successful, a non-zero value that it failed. The individual interpretation of
-     * non-zero values depends on the application.
+     * {@link ExceptionType#EXIT exit type}. See
+     * <a href= "https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md">Context Exit</a>
+     * for further information. A return value zero indicates that the execution of the application
+     * was successful, a non-zero value that it failed. The individual interpretation of non-zero
+     * values depends on the application.
      *
      * @see InteropLibrary#getExceptionExitStatus(Object)
      * @since 20.3
diff --git a/sdk/src/org.graalvm.polyglot/snapshot.sigtest b/sdk/src/org.graalvm.polyglot/snapshot.sigtest
index 632579394e7b..f49816641c7b 100644
--- a/sdk/src/org.graalvm.polyglot/snapshot.sigtest
+++ b/sdk/src/org.graalvm.polyglot/snapshot.sigtest
@@ -178,8 +178,9 @@ meth public org.graalvm.polyglot.Context$Builder processHandler(org.graalvm.poly
 meth public org.graalvm.polyglot.Context$Builder resourceLimits(org.graalvm.polyglot.ResourceLimits)
 meth public org.graalvm.polyglot.Context$Builder serverTransport(org.graalvm.polyglot.io.MessageTransport)
 meth public org.graalvm.polyglot.Context$Builder timeZone(java.time.ZoneId)
+meth public org.graalvm.polyglot.Context$Builder useSystemExit(boolean)
 supr java.lang.Object
-hfds allowAllAccess,allowCreateProcess,allowCreateThread,allowExperimentalOptions,allowHostAccess,allowHostClassLoading,allowIO,allowNativeAccess,allowValueSharing,arguments,currentWorkingDirectory,customFileSystem,customLogHandler,environment,environmentAccess,err,hostAccess,hostClassFilter,hostClassLoader,in,messageTransport,onlyLanguages,options,out,polyglotAccess,processHandler,resourceLimits,sharedEngine,zone
+hfds allowAllAccess,allowCreateProcess,allowCreateThread,allowExperimentalOptions,allowHostAccess,allowHostClassLoading,allowIO,allowNativeAccess,allowValueSharing,arguments,currentWorkingDirectory,customFileSystem,customLogHandler,environment,environmentAccess,err,hostAccess,hostClassFilter,hostClassLoader,in,messageTransport,onlyLanguages,options,out,polyglotAccess,processHandler,resourceLimits,sharedEngine,useSystemExit,zone
 
 CLSS public final org.graalvm.polyglot.Engine
 innr public final Builder
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
index 55953f2dcfec..584e5011e8c0 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
@@ -293,6 +293,26 @@
  * currently executing code. If the context is currently executing some code, a different thread may
  * kill the running execution and close the context using {@link #close(boolean)}.
  *
+ * <h3>Context Exit</h3>
+ *
+ * A context is exited naturally by calling the {@link #close} method. A context may also be exited
+ * at the guest application request. There are two ways a guest language may exit.
+ * <ul>
+ * <li>Soft exit. A guest language throws a special exception that causes the embedder thread to
+ * eventually throw a {@link PolyglotException} with {@link PolyglotException#isExit()} returning
+ * <code>true</code> and {@link PolyglotException#getExitStatus()} returning the exit status code
+ * specified by the guest application. The special exception does not influence other threads and
+ * does not trigger context close on its own. Closing the context is up to the embedder.
+ * <li>Hard exit. A guest language uses a builtin command that unwinds all context threads and
+ * closes the context by force. Embedder threads also throw a {@link PolyglotException} with
+ * {@link PolyglotException#isExit()} returning <code>true</code> and
+ * {@link PolyglotException#getExitStatus()} returning the exit status code specified by the guest
+ * application. However, the context is closed automatically. The hard exit can be customized using
+ * {@link Builder#useSystemExit(boolean)}. If <code>true</code>, the context threads are unwound by
+ * calling {@link System#exit(int)} with the exit status parameter specified by the guest
+ * application. This operation terminates the whole host application.
+ * </ul>
+ *
  * <h3>Pre-Initialization</h3>
  *
  * The context pre-initialization can be used to perform expensive builtin creation in the time of
@@ -1024,6 +1044,7 @@ public final class Builder {
         private ZoneId zone;
         private Path currentWorkingDirectory;
         private ClassLoader hostClassLoader;
+        private boolean useSystemExit;
 
         Builder(String... onlyLanguages) {
             Objects.requireNonNull(onlyLanguages);
@@ -1684,6 +1705,18 @@ public Builder hostClassLoader(ClassLoader classLoader) {
             return this;
         }
 
+        /**
+         * Specifies whether {@link System#exit(int)} may be used to improve efficiency of stack
+         * unwinding for context exit requested by the guest application.
+         *
+         * @since 22.0
+         * @see Context
+         */
+        public Builder useSystemExit(boolean enabled) {
+            this.useSystemExit = enabled;
+            return this;
+        }
+
         /**
          * Creates a new context instance from the configuration provided in the builder. The same
          * context builder can be used to create multiple context instances.
@@ -1796,7 +1829,7 @@ public Context build() {
                             io, hostClassLoading, experimentalOptions,
                             localHostLookupFilter, contextOptions, arguments == null ? Collections.emptyMap() : arguments,
                             onlyLanguages, customFileSystem, customLogHandler, createProcess, processHandler, environmentAccess, environment, zone, limits,
-                            localCurrentWorkingDirectory, hostClassLoader, allowValueSharing);
+                            localCurrentWorkingDirectory, hostClassLoader, allowValueSharing, useSystemExit);
             return ctx;
         }
 
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/PolyglotException.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/PolyglotException.java
index 06161bb2c7c3..e4e8b88fc6dd 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/PolyglotException.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/PolyglotException.java
@@ -328,10 +328,11 @@ public boolean isInterrupted() {
 
     /**
      * Returns <code>true</code> if this exception is caused by an attempt of a guest language
-     * program to exit the application using a builtin command. The provided exit code can be
-     * accessed using {@link #getExitStatus()}.
+     * program to exit the application. The provided exit code can be accessed using
+     * {@link #getExitStatus()}. This can be the result of either the soft or the hard exit.
      *
      * @since 19.0
+     * @see Context
      */
     public boolean isExit() {
         return dispatch.isExit(impl);
@@ -378,9 +379,11 @@ public Value getGuestObject() {
 
     /**
      * Returns the exit status if this exception indicates that the application was {@link #isExit()
-     * exited}. The exit status is intended to be passed to {@link System#exit(int)}.
+     * exited}. The exit status is intended to be passed to {@link System#exit(int)}. In case of
+     * hard exit the application can be configured to call {@link System#exit(int)} directly using
+     * {@link Context.Builder#useSystemExit(boolean)}.
      *
-     * @see #isExit()
+     * @see Context
      * @since 19.0
      */
     public int getExitStatus() {
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
index 3dd202ce7013..4fcab9a61840 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
@@ -507,7 +507,7 @@ public abstract Context createContext(Object receiver, OutputStream out, OutputS
                         Map<String, String> options,
                         Map<String, String[]> arguments, String[] onlyLanguages, FileSystem fileSystem, Object logHandlerOrStream, boolean allowCreateProcess, ProcessHandler processHandler,
                         EnvironmentAccess environmentAccess, Map<String, String> environment, ZoneId zone, Object limitsImpl, String currentWorkingDirectory, ClassLoader hostClassLoader,
-                        boolean allowValueSharing);
+                        boolean allowValueSharing, boolean useSystemExit);
 
         public abstract String getImplementationName(Object receiver);
 
diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index 9271dad7a637..d20fc98755c6 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -6,6 +6,10 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 * Truffle DSL generated code now inherits all annotations on constructor parameters to the static create factory method.
 
 *  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` is deprecated and so will be `TruffleRuntime#createCallTarget()` soon. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
+* In `TruffleLanguage.finalizeContext(Object)`, there is a new requirement for leaving all remaining unclosed inner contexts created by the language on all threads where the contexts are still active.
+No active inner context is allowed after `TruffleLanguage.finalizeContext(Object)` returns. Not complying with this requirement will result in an internal error. Please note that inactive inner contexts are still closed implicitly by the parent context.
+* Added `TruffleContext.closeExited(Node, int)` to hard exit an entered truffle context. See [the documentation](https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md).
+* Added `TruffleLanguage.exitContext(Object, ExitMode, int)` to allow languages perform actions before natural/hard context exit. Languages are encouraged to run all their shutdown hooks in exitContext instead of finalizeContext.
 
 ## Version 21.3.0
 * Added a `@GenerateWrapper.Ignore` annotation to prevent methods from being instrumented in wrapper classes.
diff --git a/truffle/docs/Exit.md b/truffle/docs/Exit.md
new file mode 100644
index 000000000000..e20630417ae2
--- /dev/null
+++ b/truffle/docs/Exit.md
@@ -0,0 +1,107 @@
+# Context Exit
+
+Different Truffle (guest) languages may use different mechanisms for exiting. This is not optimal as a Truffle language has no way to detect and handle an exit triggered by a different language.
+
+As of 22.0 Truffle has support for polyglot context hard explicit exit triggered by guest languages using [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-). 
+It provides a unified way for languages to trigger the exit of the underlying polyglot context. When triggered, all initialized
+guest languages are first notified using [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), then all context threads are stopped, and finally, the context is closed.
+The hard explicit exit is simply referred to as "hard exit". 
+
+The hard exit is only one of the three types of exit in Truffle. There are the following types of exit. 
+
+* The new hard exit introduced above
+  * Hard exit notifications are executed with `ExitMode.HARD` as the second parameter of `TruffleLanguage.exitContext(C,ExitMode,int)`.
+* Implicit "natural exit"
+  * Occurs during normal context close.
+  * The newly introduced exit notifications are executed for the natural exit as well, but threads are not forced to stop after the natural exit notifications, and so context threads that are still running can block the natural exit.
+  * Natural exit notifications are executed with `ExitMode.NATURAL` as the second parameter of `TruffleLanguage.exitContext(C,ExitMode,int)`.
+* "Soft exit"
+  * Explicit exit triggered by throwing a Truffle exception of the exception type `ExceptionType.EXIT`.
+  * The exception is not automatically thrown in other threads by Truffle and it does not trigger exit notifications or context close on its own.
+  * The context is still fully usable after a soft exit and the soft exit can be followed by either the natural or the hard exit.
+  
+For completeness, a polyglot context can be also closed by cancelling it using `Context.close(true)`, `TruffleContext.closeCancelled(Node,String)`, or `TruffleContext.closeResourceExhausted(Node,String)`.
+The cancel operation leads to immediate stopping of all context threads and closing the context without any exit notifications. 
+
+## Soft exit
+
+The soft exit is triggered by throwing a Truffle exception of the exception type `ExceptionType.EXIT` - soft exit exception. The exception is not automatically thrown in other threads by Truffle and it does not trigger exit notifications or context close on its own.
+If not caught by languages, the soft exit exception eventually causes the embedder thread to throw a `PolyglotException` to the host with `PolyglotException.isExit() == true` and `PolyglotException.getExitStatus()` equal to the value specified by the soft exit exception.
+
+The context is still fully usable after a soft exit, but the embedder should close the context when it sees the `PolyglotException` with `PolyglotException.isExit() == true`, in which case the soft exit is followed by the natural exit.
+
+## Natural Exit
+
+![Natural exit schema](./exitschema.png "Natural exit schema")
+
+The natural exit occurs during a normal context close triggered by `Context.close()` or `TruffleContext.close()`. The natural exit illustrated in the figure above consists of the following steps:
+
+1. The natural exit is triggered by `Context.close()` or `TruffleContext.close()`.
+
+2. Exit notifications for all initialized languages are executed - `TruffleLanguage.exitContext(C,ExitMode,int)`, where `ExitMode.NATURAL` is used as the `ExitMode` parameter.
+   * Guest code runs normally during exit notifications.
+
+3. All initialized languages are finalized.
+   * `TruffleLanguage.finalizeContext(C)` is called for all initalized languages.
+   * Guest code runs normally during finalization.
+   
+4. All languages are disposed.
+   * `TruffleLanguage.disposeContext(C)` is called for all languages.
+
+## Hard Exit
+
+![Hard exit schema](./hardexitschema.png "Hard exit schema")
+
+This section describes the hard exit process in detail. The hard exit for a polyglot context can be customized by `Context.Builder.useSystemExit(boolean)`. Therefore,
+the following description is divided into two subsections. One for the case when
+system exit is not enabled (`Context.Builder.useSystemExit(false)` - the default) and one for the case when system exit
+is enabled (`Context.Builder#useSystemExit(true)`). The illustration of the exit process is depicted in the figure above. The figure also relates the exit process to the context cancelling process.
+The red color of some of the boxes indicates that the context is invalid at that point and no guest code can be run. More precisely, the first Truffle safepoint will throw either a special `ThreadDeath` exit exception or
+a special `ThreadDeath` cancel exception depending on whether the hard exit or the cancel operation is in progress.
+
+### Behavior if useSystemExit is disabled (default)
+
+1. The exit is triggered by [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-).
+
+2. Exit notifications for all initialized languages are executed - [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), where `ExitMode.HARD` is used as the `ExitMode` parameter.
+   * Guest code runs normally during exit notifications.
+   * If the context is not cancelled during exit notifications (during step 2a) and reaches step 2b, the exit process proceeds with the next step. Otherwise, the exit notifications are interrupted and the context is immediately cancelled.
+  
+3. All context threads are forced to stop by throwing a special `ThreadDeath` exit exception from Truffle safepoints.
+   * To exit threads reliably, languages need to ensure that `ThreadDeath` is always immediately rethrown and guest language exception handlers and finally blocks are not run.
+   * The embedder threads eventually throw a `PolyglotException` to the host with `PolyglotException.isExit() == true` and `PolyglotException.getExitStatus()`
+     being equal to the exit code originally specified as the second parameter to the first call to`TruffleContext.closeExited(Node,int)`.
+   * Note that from step 3 the exit process is similar to the cancelling process as indicated by the figure, but the cancelling process uses a special `ThreadDeath` cancel exception
+     and the `PolyglotException` thrown to the host has `PolyglotException.isCancelled() == true` instead of `PolyglotException.isExit() == true`. 
+
+4. All initialized languages are finalized.
+   * `TruffleLanguage.finalizeContext(C)` is called for all initalized languages.
+   * Running any guest code in `TruffleLanguage.finalizeContext(C)` will throw the special `ThreadDeath` exit exception from the first Truffle safepoint.
+   * Languages should skip any finalization that would require running guest code. A language can find out if it can run guest code in `TruffleLanguage.finalizeContext(C)` by checking if `TruffleLanguage.exitContext(C,ExitMode,int)` was previously called with ExitMode.NATURAL,
+   or by checking that `TruffleContext.isClosed()` returns `false`.
+
+   
+5. All languages are disposed.
+   * `TruffleLanguage.disposeContext(C)` is called for all languages.
+   
+6. The context is closed.
+
+### Behavior if useSystemExit is enabled
+
+1. The exit is triggered by [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-).
+   * Same as with system exit disabled.
+   
+2. Exit notifications for all initialized languages are executed - [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), where `ExitMode.HARD` is used as the `ExitMode` parameter.
+   * Same as with system exit disabled.
+   
+3. `System.exit(int)` is called to terminate the whole host application providing the fastest exit possible.
+   * The exit code passed to `System.exit(int)`
+     is the one originally specified as the second parameter to the first call to`TruffleContext.closeExited(Node,int)`. 
+
+## Example Usage
+
+The [SimpleLanguage](https://github.com/graalvm/simplelanguage) demonstrates the usage of the hard context exit. The following aspects are demonstrated.
+
+* [SLExitBuiltin](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/builtins/SLExitBuiltin.java) demonstrates triggering the context exit.
+* [SLRegisterShutdownHookBuiltin](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java) demonstrates registration of shutdown hooks that are executed during the exit notification defined in [SLLanguage](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/SLLanguage.java).
+* [SLExitTest](https://github.com/graalvm/simplelanguage/blob/master/language/src/test/java/com/oracle/truffle/sl/test/SLExitTest.java) demonstrates the usage of the builtins defined above.
\ No newline at end of file
diff --git a/truffle/docs/exitschema.png b/truffle/docs/exitschema.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0d11beba1847a19263f815ac1ca4cf4a0191c3d
GIT binary patch
literal 29782
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
LDgY|Q4Fmrdiu>h+

literal 0
HcmV?d00001

diff --git a/truffle/docs/hardexitschema.png b/truffle/docs/hardexitschema.png
new file mode 100644
index 0000000000000000000000000000000000000000..09abaa44647b8842bd63c140dba244fa1e8a9abc
GIT binary patch
literal 86566
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%0DhGS_CLE5M@8?Ej}EeU
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
UTGN9>e*Z>V{L}kNQGNga2NcxNp8x;=

literal 0
HcmV?d00001

diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextExitTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextExitTest.java
new file mode 100644
index 000000000000..3f6f974fc247
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextExitTest.java
@@ -0,0 +1,653 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.instrumentation.test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.TruffleContext;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.EventContext;
+import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
+import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import com.oracle.truffle.api.nodes.Node;
+
+public class ContextExitTest {
+    @Rule public TestName testNameRule = new TestName();
+
+    @After
+    public void checkInterrupted() {
+        Assert.assertFalse("Interrupted flag was left set by test: " + testNameRule.getMethodName(), Thread.interrupted());
+    }
+
+    @Test
+    public void testInnerContext() throws Exception {
+        try (Context context = Context.create()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "CONTEXT(CONTEXT(STATEMENT))", "TestInnerContext").build();
+            context.eval(source);
+        }
+    }
+
+    @Test
+    public void testExitFromMainThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,EXIT(1)),CALL(foo))", "ExitFromMainThread").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleMainThreads() throws Exception {
+        int nThreads = 10;
+        ExecutorService executorService = Executors.newFixedThreadPool(nThreads);
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < nThreads; i++) {
+                int j = i;
+                futures.add(executorService.submit(() -> {
+                    try {
+                        String code;
+                        if (j % 2 == 0) {
+                            code = "ROOT(SLEEP(100),EXIT(1))";
+                        } else {
+                            code = "LOOP(infinity,STATEMENT)";
+                        }
+                        Source source = Source.newBuilder(InstrumentationTestLanguage.ID, code, "ExitFromMainThread" + j).build();
+                        context.eval(source);
+                        Assert.fail();
+                    } catch (IOException ioe) {
+                        throw new RuntimeException(ioe);
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                }));
+            }
+            for (Future<?> future : futures) {
+                future.get();
+            }
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithOnePolyglotThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),SPAWN(foo),EXIT(1))", "ExitFromMainThread1PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithOnePolyglotThreadExplicitEnter() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            context.enter();
+            try {
+                Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),SPAWN(foo),SLEEP(100),EXIT(1))", "ExitFromMainThread1PT").build();
+                context.eval(source);
+                Assert.fail();
+            } finally {
+                context.leave();
+            }
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithTwoPolyglotThreads() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),SPAWN(foo),SPAWN(foo),EXIT(1))", "ExitFromMainThread2PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithTenPolyglotThreads() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),LOOP(10,SPAWN(foo)),EXIT(1))", "ExitFromMainThread10PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithOnePolyglotThreadSleepBeforeExit() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),SPAWN(foo),SLEEP(100),EXIT(1))", "ExitFromMainThread1PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithTwoPolyglotThreadsSleepBeforeExit() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),SPAWN(foo),SPAWN(foo),SLEEP(100),EXIT(1))", "ExitFromMainThread2PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMainThreadWithTenPolyglotThreadsSleepBeforeExit() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,LOOP(infinity,STATEMENT)),LOOP(10,SPAWN(foo)),SLEEP(100),EXIT(1))", "ExitFromMainThread10PT").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleThreads() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,EXIT(1)),LOOP(10,SPAWN(foo)),EXIT(1))", "ExitFromMultipleThreads").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleThreadsWithSleepInMainThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,EXIT(1)),LOOP(10,SPAWN(foo)),SLEEP(100),EXIT(1))", "ExitFromMultipleThreadsSleepInMain").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleInnerContextThreadsWithNoExitInMainThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(CONTEXT(DEFINE(foo,EXIT(1)),LOOP(10,SPAWN(foo)),JOIN()))",
+                            "ExitFromMultipleInnerContextThreadsSleepAndNoExitInMain").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit() && !pe.isInterrupted()) {
+                /*
+                 * Inner context is the one being exited, hence the exiting prroperty of the outer
+                 * context is not set, and so if the exit happens during JOIN() the final polyglot
+                 * exception has only the interrupted property.
+                 */
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleInnerContextThreadsWithNoExitInMainThread2() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID,
+                            "ROOT(DEFINE(foo,CONTEXT(DEFINE(foo,EXIT(1)),LOOP(10,SPAWN(foo)),LOOP(infinity,STATEMENT))),SPAWN(foo),JOIN())",
+                            "ExitFromMultipleInnerContextThreadsSleepAndNoExitInMain").build();
+            context.eval(source);
+            /*
+             * Here the exit happens completely outside of the main thread of the outer context, and
+             * so the outer context finishes normally.
+             */
+        }
+    }
+
+    @Test
+    public void testExitFromMultipleThreadsWithSleepInPolyglotThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,SLEEP(100),EXIT(1)),LOOP(10,SPAWN(foo)),EXIT(1))", "ExitFromMultipleThreadsSleepInPolyglot").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromSpawnedThread() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,EXIT(1)),SPAWN(foo),JOIN())", "ExitFromSpawnedThread").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testExitFromSpawnedThread2() throws Exception {
+        try (Context context = Context.newBuilder().allowCreateThread(true).build()) {
+            context.initialize(InstrumentationTestLanguage.ID);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,EXIT(1)),SPAWN(foo),LOOP(infinity,STATEMENT))", "ExitFromSpawnedThread2").build();
+            context.eval(source);
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testMultipleContextDeadlockOnExit() throws InterruptedException, ExecutionException {
+        /*
+         * Parallel exit of two context where in one thread context2 enters and exits when also
+         * context1 is entered and in a second thread context1 enters and exits when also context2
+         * is entered.
+         */
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        try (Engine engine = Engine.newBuilder().build()) {
+            try (Context context1 = Context.newBuilder().engine(engine).allowCreateThread(true).build(); Context context2 = Context.newBuilder().engine(engine).allowCreateThread(true).build()) {
+                TruffleInstrument.Env instrumentEnv = engine.getInstruments().get("InstrumentationUpdateInstrument").lookup(TruffleInstrument.Env.class);
+                TruffleContext truffleContext1;
+                TruffleContext truffleContext2;
+                context1.enter();
+                truffleContext1 = instrumentEnv.getEnteredContext();
+                context1.leave();
+                context2.enter();
+                truffleContext2 = instrumentEnv.getEnteredContext();
+                context2.leave();
+                instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(InstrumentationTestLanguage.ConstantTag.class).build(),
+                                new ExecutionEventListener() {
+                                    @Override
+                                    public void onEnter(EventContext ctx, VirtualFrame frame) {
+                                    }
+
+                                    @Override
+                                    public void onReturnValue(EventContext ctx, VirtualFrame frame, Object result) {
+                                        if (result instanceof Integer) {
+                                            if ((Integer) result == 1) {
+                                                callExit(truffleContext2, ctx.getInstrumentedNode());
+                                            }
+                                            if ((Integer) result == 2) {
+                                                callExit(truffleContext1, ctx.getInstrumentedNode());
+                                            }
+                                        }
+                                    }
+
+                                    @CompilerDirectives.TruffleBoundary
+                                    private void callExit(TruffleContext ctx, Node node) {
+                                        Object prev = ctx.enter(node);
+                                        try {
+                                            CallTarget callTarget = instrumentEnv.parse(
+                                                            com.oracle.truffle.api.source.Source.newBuilder(InstrumentationTestLanguage.ID, "EXIT(1)", "ExitDirectly").build());
+                                            callTarget.call();
+                                        } catch (IOException io) {
+                                            throw new RuntimeException(io);
+                                        } finally {
+                                            ctx.leave(node, prev);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onReturnExceptional(EventContext ctx, VirtualFrame frame, Throwable exception) {
+
+                                    }
+                                });
+                Future<?> future1 = executorService.submit(() -> {
+                    try {
+                        context1.eval(InstrumentationTestLanguage.ID, "CONSTANT(1)");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                });
+                Future<?> future2 = executorService.submit(() -> {
+                    try {
+                        context2.eval(InstrumentationTestLanguage.ID, "CONSTANT(2)");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                });
+                future1.get();
+                future2.get();
+            } finally {
+                executorService.shutdownNow();
+                executorService.awaitTermination(100, TimeUnit.SECONDS);
+            }
+        }
+    }
+
+    @Test
+    public void testMultipleContextDeadlockOnExit2() throws InterruptedException, ExecutionException {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        try (Engine engine = Engine.create()) {
+            try (Context context1 = Context.newBuilder().engine(engine).allowCreateThread(true).build(); Context context2 = Context.newBuilder().engine(engine).allowCreateThread(true).build()) {
+                TruffleInstrument.Env instrumentEnv = engine.getInstruments().get("InstrumentationUpdateInstrument").lookup(TruffleInstrument.Env.class);
+                TruffleContext truffleContext1;
+                TruffleContext truffleContext2;
+                context1.enter();
+                truffleContext1 = instrumentEnv.getEnteredContext();
+                context1.leave();
+                context2.enter();
+                truffleContext2 = instrumentEnv.getEnteredContext();
+                context2.leave();
+                instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(InstrumentationTestLanguage.ConstantTag.class).build(),
+                                new ExecutionEventListener() {
+                                    @Override
+                                    public void onEnter(EventContext ctx, VirtualFrame frame) {
+                                    }
+
+                                    @Override
+                                    public void onReturnValue(EventContext ctx, VirtualFrame frame, Object result) {
+                                        if (result instanceof Integer) {
+                                            if ((Integer) result == 1) {
+                                                callExit(truffleContext2, ctx.getInstrumentedNode());
+                                            }
+                                            if ((Integer) result == 2) {
+                                                callExit(truffleContext1, ctx.getInstrumentedNode());
+                                            }
+                                        }
+                                    }
+
+                                    @CompilerDirectives.TruffleBoundary
+                                    private void callExit(TruffleContext ctx, Node node) {
+                                        Object prev = ctx.enter(node);
+                                        try {
+                                            CallTarget callTarget = instrumentEnv.parse(com.oracle.truffle.api.source.Source.newBuilder(InstrumentationTestLanguage.ID,
+                                                            "ROOT(DEFINE(foo,EXIT(1)),SPAWN(foo),JOIN())", "ExitFromSpawnedThread").build());
+                                            callTarget.call();
+                                        } catch (IOException io) {
+                                            throw new RuntimeException(io);
+                                        } finally {
+                                            ctx.leave(node, prev);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onReturnExceptional(EventContext ctx, VirtualFrame frame, Throwable exception) {
+
+                                    }
+                                });
+                Future<?> future1 = executorService.submit(() -> {
+                    try {
+                        context1.eval(InstrumentationTestLanguage.ID, "CONSTANT(1)");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit() && !pe.isInterrupted()) {
+                            /*
+                             * context1 can interrupt context2 while it is not exiting yet, because
+                             * it shares one thread with it, and vice versa.
+                             */
+                            throw pe;
+                        }
+                    }
+                });
+                Future<?> future2 = executorService.submit(() -> {
+                    try {
+                        context2.eval(InstrumentationTestLanguage.ID, "CONSTANT(2)");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit() && !pe.isInterrupted()) {
+                            /*
+                             * context1 can interrupt context2 while it is not exiting yet, because
+                             * it shares one thread with it, and vice versa.
+                             */
+                            throw pe;
+                        }
+                    }
+                });
+                future1.get();
+                future2.get();
+            } finally {
+                executorService.shutdownNow();
+                executorService.awaitTermination(100, TimeUnit.SECONDS);
+            }
+        }
+    }
+
+    @Test
+    public void testMultipleContextDeadlockOnExit3() throws InterruptedException, ExecutionException {
+        ExecutorService executorService = Executors.newFixedThreadPool(2);
+        try (Engine engine = Engine.newBuilder().build()) {
+            try (Context context1 = Context.newBuilder().engine(engine).allowCreateThread(true).build(); Context context2 = Context.newBuilder().engine(engine).allowCreateThread(true).build()) {
+                TruffleInstrument.Env instrumentEnv = engine.getInstruments().get("InstrumentationUpdateInstrument").lookup(TruffleInstrument.Env.class);
+                TruffleContext truffleContext1;
+                TruffleContext truffleContext2;
+                context1.enter();
+                truffleContext1 = instrumentEnv.getEnteredContext();
+                context1.leave();
+                context2.enter();
+                truffleContext2 = instrumentEnv.getEnteredContext();
+                context2.leave();
+                AtomicBoolean callExit = new AtomicBoolean(true);
+                AtomicBoolean callExitToBeCalledForContext1 = new AtomicBoolean();
+                AtomicBoolean callExitToBeCalledForContext2 = new AtomicBoolean();
+                CountDownLatch callExitForContext1Latch = new CountDownLatch(1);
+                CountDownLatch callExitForContext2Latch = new CountDownLatch(1);
+                instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(InstrumentationTestLanguage.ConstantTag.class).build(),
+                                new ExecutionEventListener() {
+                                    @Override
+                                    public void onEnter(EventContext ctx, VirtualFrame frame) {
+                                    }
+
+                                    @Override
+                                    public void onReturnValue(EventContext ctx, VirtualFrame frame, Object result) {
+                                        if (result instanceof Integer) {
+                                            if ((Integer) result == 1) {
+                                                callExitForContext2(ctx.getInstrumentedNode());
+                                            }
+                                            if ((Integer) result == 2) {
+                                                callExitForContext1(ctx.getInstrumentedNode());
+                                            }
+                                        }
+                                    }
+
+                                    @CompilerDirectives.TruffleBoundary
+                                    private void callExitForContext1(Node node) {
+                                        callExitToBeCalledForContext1.set(true);
+                                        try {
+                                            callExit(truffleContext1, node);
+                                        } finally {
+                                            callExitForContext1Latch.countDown();
+                                        }
+
+                                    }
+
+                                    @CompilerDirectives.TruffleBoundary
+                                    private void callExitForContext2(Node node) {
+                                        callExitToBeCalledForContext2.set(true);
+                                        try {
+                                            callExit(truffleContext2, node);
+                                        } finally {
+                                            callExitForContext2Latch.countDown();
+                                        }
+
+                                    }
+
+                                    @CompilerDirectives.TruffleBoundary
+                                    private void callExit(TruffleContext ctx, Node node) {
+                                        Object prev = ctx.enter(node);
+                                        try {
+                                            CallTarget callTarget = instrumentEnv.parse(
+                                                            com.oracle.truffle.api.source.Source.newBuilder(InstrumentationTestLanguage.ID, "EXIT(1)", "ExitDirectly").build());
+                                            callTarget.call();
+                                        } catch (IOException io) {
+                                            throw new RuntimeException(io);
+                                        } finally {
+                                            ctx.leave(node, prev);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onReturnExceptional(EventContext ctx, VirtualFrame frame, Throwable exception) {
+
+                                    }
+                                });
+                Future<?> future1 = executorService.submit(() -> {
+                    try {
+                        context1.eval(InstrumentationTestLanguage.ID, "CONTEXT(DEFINE(foo,CONSTANT(1)),SPAWN(foo),JOIN())");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                });
+                Future<?> future2 = executorService.submit(() -> {
+                    try {
+                        context2.eval(InstrumentationTestLanguage.ID, "CONTEXT(DEFINE(foo,CONSTANT(2)),SPAWN(foo),JOIN())");
+                    } catch (PolyglotException pe) {
+                        if (!pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                });
+                future1.get();
+                future2.get();
+                /*
+                 * Each exit is executed by a separate call to Context#eval in a polyglot thread of
+                 * the other context, so waiting for the futures to finish is not sufficient as it
+                 * does not wait for the polyglot threads. InstrumentationTestLanguage waits for
+                 * polyglot threads in finalizeContext executed by close, but in order for this to
+                 * work, we would have to execute the closes in a particular order which is not
+                 * deterministic as it depends on interleaving of the two threads. So a close could
+                 * fail because a polyglot thread of one context might initiate a main thread of the
+                 * other context (it is the same thread but from one context's view it is a polyglot
+                 * thread and from the other context's view it is a main thread) which makes
+                 * standard close throw IllegalStateException saying the context is still active in
+                 * other threads.
+                 */
+                callExit.set(false);
+                if (callExitToBeCalledForContext1.get()) {
+                    /*
+                     * callExitToBeCalledForContext1 might be set after this check evaluates to
+                     * false, but then the exit is not actually executed because callExit is false.
+                     */
+                    callExitForContext1Latch.await();
+                }
+                if (callExitToBeCalledForContext2.get()) {
+                    /*
+                     * callExitToBeCalledForContext2 might be set after this check evaluates to
+                     * false, but then the exit is not actually executed because callExit is false.
+                     */
+                    callExitForContext2Latch.await();
+                }
+            } finally {
+                executorService.shutdownNow();
+                executorService.awaitTermination(100, TimeUnit.SECONDS);
+            }
+        }
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
new file mode 100644
index 000000000000..0d71c92d1461
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
@@ -0,0 +1,583 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.instrumentation.test;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.HostAccess;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.EventContext;
+import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
+import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import com.oracle.truffle.api.interop.ArityException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.UnsupportedTypeException;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest;
+import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
+
+public class ContextInterruptCloseCancelOrExitTest extends AbstractPolyglotTest {
+
+    @Rule public TestName testNameRule = new TestName();
+
+    @After
+    public void checkInterrupted() {
+        Assert.assertFalse("Interrupted flag was left set by test: " + testNameRule.getMethodName(), Thread.interrupted());
+    }
+
+    @Test
+    public void testInterruptPolyglotThreadWhileClosing() throws ExecutionException, InterruptedException, IOException {
+        enterContext = false;
+        AtomicReference<Runnable> runOnNaturalContextExit = new AtomicReference<>();
+        ProxyLanguage proxyLanguage = new ProxyLanguage() {
+
+            @Override
+            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                return true;
+            }
+
+            @Override
+            protected void exitContext(LanguageContext ctx, ExitMode exitMode, int exitCode) {
+                if (exitMode == ExitMode.NATURAL && runOnNaturalContextExit.get() != null) {
+                    runOnNaturalContextExit.get().run();
+                }
+            }
+        };
+        setupEnv(Context.newBuilder().allowCreateThread(true), proxyLanguage);
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        try {
+            CountDownLatch interruptLatch = new CountDownLatch(1);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,CONSTANT(42),LOOP(infinity,STATEMENT)),SPAWN(foo))", "InfiniteLoop").build();
+            attachListener(interruptLatch::countDown, instrumentEnv);
+            Future<?> future = executorService.submit(() -> {
+                context.eval(source);
+            });
+            interruptLatch.await();
+            future.get();
+            AtomicReference<Future<?>> interruptFutureReference = new AtomicReference<>();
+            runOnNaturalContextExit.set(() -> {
+                /*
+                 * When inner context is closed we know that the parent context is being closed.
+                 * Parent context is entered in the current thread, so we must interrupt in a
+                 * different thread.
+                 */
+                Future<?> interruptFuture = executorService.submit(() -> {
+                    try {
+                        context.interrupt(Duration.ofSeconds(5));
+                    } catch (TimeoutException te) {
+                        throw new AssertionError(te);
+                    }
+                });
+                interruptFutureReference.set(interruptFuture);
+                boolean interruptedExceptionSwallowed = false;
+                try {
+                    /*
+                     * The parent context is entered in the current thread, so the interrupt will
+                     * try to interrupt it. Therefore, we have to ignore the InterruptedException in
+                     * order for the close operation to be able to successfully continue. We cannot
+                     * wait for the interrupt future here though, because it waits also for the
+                     * current entered thread.
+                     */
+                    interruptFuture.get();
+                } catch (ExecutionException e) {
+                    throw new AssertionError(e);
+                } catch (InterruptedException ie) {
+                    interruptedExceptionSwallowed = true;
+                }
+                Assert.assertTrue(interruptedExceptionSwallowed);
+                Assert.assertFalse(interruptFuture.isDone());
+            });
+            context.close();
+            assertContextState("CLOSED");
+            Assert.assertNotNull(interruptFutureReference.get());
+            interruptFutureReference.get().get();
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    @Test
+    public void testCancelPolyglotThreadWhileClosing() throws ExecutionException, InterruptedException, IOException {
+        enterContext = false;
+        AtomicReference<Runnable> runOnNaturalContextExit = new AtomicReference<>();
+        ProxyLanguage proxyLanguage = new ProxyLanguage() {
+
+            @Override
+            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                return true;
+            }
+
+            @Override
+            protected void exitContext(LanguageContext ctx, ExitMode exitMode, int exitCode) {
+                if (exitMode == ExitMode.NATURAL && runOnNaturalContextExit.get() != null) {
+                    runOnNaturalContextExit.get().run();
+                }
+            }
+        };
+        setupEnv(Context.newBuilder().allowCreateThread(true), proxyLanguage);
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        try {
+            CountDownLatch cancelLatch = new CountDownLatch(1);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,CONSTANT(42),LOOP(infinity,STATEMENT)),SPAWN(foo))", "InfiniteLoop").build();
+            attachListener(cancelLatch::countDown, instrumentEnv);
+            Future<?> future = executorService.submit(() -> {
+                context.eval(source);
+            });
+            cancelLatch.await();
+            future.get();
+            runOnNaturalContextExit.set(() -> {
+                /*
+                 * Cancel must work even when entered.
+                 */
+                context.close(true);
+            });
+            context.close();
+            assertContextState("CLOSED_CANCELLED");
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    private void assertContextState(String expectedState) {
+        Object contextState;
+        try {
+            Field implField = context.getClass().getDeclaredField("receiver");
+            implField.setAccessible(true);
+            Object contextImpl = implField.get(context);
+            Field stateField = contextImpl.getClass().getDeclaredField("state");
+            stateField.setAccessible(true);
+            contextState = stateField.get(contextImpl);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        Assert.assertEquals(expectedState, ((Enum<?>) contextState).name());
+    }
+
+    private static void attachListener(Runnable runnable, TruffleInstrument.Env instrumentEnv) {
+        instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(InstrumentationTestLanguage.ConstantTag.class).build(), new ExecutionEventListener() {
+            @Override
+            public void onEnter(EventContext c, VirtualFrame frame) {
+                executeSideEffect();
+            }
+
+            @CompilerDirectives.TruffleBoundary
+            void executeSideEffect() {
+                runnable.run();
+            }
+
+            @Override
+            public void onReturnValue(EventContext c, VirtualFrame frame, Object result) {
+
+            }
+
+            @Override
+            public void onReturnExceptional(EventContext c, VirtualFrame frame, Throwable exception) {
+
+            }
+        });
+    }
+
+    static TruffleInstrument.Env getInstrumentEnv(Engine engine) {
+        return engine.getInstruments().get("InstrumentationUpdateInstrument").lookup(TruffleInstrument.Env.class);
+    }
+
+    static Context staticCtx;
+
+    public static void callExit() {
+        try {
+            staticCtx.eval(InstrumentationTestLanguage.ID, "EXIT(1)");
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+    }
+
+    @Test
+    public void testNestedExitOnHost() {
+        setupEnv(Context.newBuilder(ProxyLanguage.ID, InstrumentationTestLanguage.ID).allowHostClassLoading(true).allowHostClassLookup((s) -> true).allowHostAccess(HostAccess.ALL),
+                        new ProxyLanguage() {
+                            @Override
+                            protected CallTarget parse(ParsingRequest request) {
+                                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                                    @Override
+                                    public Object execute(VirtualFrame frame) {
+                                        LanguageContext languageContext = LanguageContext.get(this);
+                                        Object javaClass = languageContext.getEnv().lookupHostSymbol(ContextInterruptCloseCancelOrExitTest.class.getName());
+                                        try {
+                                            InteropLibrary.getUncached().invokeMember(javaClass, "callExit");
+                                        } catch (UnsupportedMessageException | ArityException | UnknownIdentifierException | UnsupportedTypeException e) {
+                                            throw new RuntimeException(e);
+                                        }
+                                        return 0;
+                                    }
+                                });
+                            }
+
+                            @Override
+                            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                                return true;
+                            }
+
+                        });
+        staticCtx = context;
+        try {
+            context.eval(ProxyLanguage.ID, "");
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            if (!pe.isExit()) {
+                throw pe;
+            }
+        }
+        context.close();
+    }
+
+    @Test
+    public void testCancelDuringExitNotification() throws ExecutionException, InterruptedException {
+        CountDownLatch cancelLatch = new CountDownLatch(1);
+        enterContext = false;
+        Object waitObject = new Object();
+        setupEnv(Context.newBuilder(ProxyLanguage.ID).allowHostClassLoading(true).allowHostClassLookup((s) -> true).allowHostAccess(HostAccess.ALL),
+                        getWaitOnExitLanguage(cancelLatch, waitObject));
+
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        try {
+            Future<?> future = executorService.submit(() -> {
+                try {
+                    context.eval(ProxyLanguage.ID, "");
+                    Assert.fail();
+                } catch (PolyglotException pe) {
+                    if (!pe.isCancelled()) {
+                        throw pe;
+                    }
+                }
+            });
+            cancelLatch.await();
+            context.close(true);
+            future.get();
+            assertContextState("CLOSED_CANCELLED");
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
+    @Test
+    public void testInterruptDuringExitNotification() throws ExecutionException, InterruptedException {
+        CountDownLatch interruptLatch = new CountDownLatch(1);
+        Object waitObject = new Object();
+        enterContext = false;
+        setupEnv(Context.newBuilder(ProxyLanguage.ID).allowHostClassLoading(true).allowHostClassLookup((s) -> true).allowHostAccess(HostAccess.ALL),
+                        getWaitOnExitLanguage(interruptLatch, waitObject));
+
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        try {
+            Future<?> future = executorService.submit(() -> {
+                try {
+                    context.eval(ProxyLanguage.ID, "");
+                    Assert.fail();
+                } catch (PolyglotException pe) {
+                    if (!pe.isExit()) {
+                        throw pe;
+                    }
+                }
+            });
+            interruptLatch.await();
+            try {
+                context.interrupt(Duration.ofSeconds(1));
+                Assert.fail();
+            } catch (TimeoutException e) {
+            }
+            synchronized (waitObject) {
+                waitObject.notifyAll();
+            }
+            future.get();
+            context.close();
+            assertContextState("CLOSED_EXITED");
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    private static ProxyLanguage getWaitOnExitLanguage(CountDownLatch signalWaitingStarted, Object waitObject) {
+        return new ProxyLanguage() {
+            @Override
+            protected CallTarget parse(ParsingRequest request) {
+                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    @Override
+                    public Object execute(VirtualFrame frame) {
+                        LanguageContext languageContext = LanguageContext.get(this);
+                        languageContext.getEnv().getContext().closeExited(this, 1);
+                        return 0;
+                    }
+                });
+            }
+
+            @Override
+            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                return true;
+            }
+
+            @Override
+            protected void exitContext(LanguageContext ctx, ExitMode exitMode, int exitCode) {
+                waitIndefinitely();
+            }
+
+            @CompilerDirectives.TruffleBoundary
+            private void waitIndefinitely() {
+                try {
+                    synchronized (waitObject) {
+                        signalWaitingStarted.countDown();
+                        waitObject.wait();
+                    }
+                } catch (InterruptedException ie) {
+                    throw new AssertionError(ie);
+                }
+            }
+        };
+    }
+
+    @Test
+    public void testExitWhileClosing() throws ExecutionException, InterruptedException, IOException {
+        enterContext = false;
+        AtomicReference<Runnable> runOnNaturalContextExit = new AtomicReference<>();
+        ProxyLanguage proxyLanguage = new ProxyLanguage() {
+
+            @Override
+            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                return true;
+            }
+
+            @Override
+            protected void exitContext(LanguageContext ctx, ExitMode exitMode, int exitCode) {
+                if (exitMode == ExitMode.NATURAL && runOnNaturalContextExit.get() != null) {
+                    runOnNaturalContextExit.get().run();
+                }
+            }
+        };
+        setupEnv(Context.newBuilder().allowCreateThread(true), proxyLanguage);
+        ExecutorService executorService = Executors.newSingleThreadExecutor();
+        try {
+            CountDownLatch exitLatch = new CountDownLatch(1);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,CONSTANT(42),LOOP(infinity,STATEMENT)),SPAWN(foo))", "InfiniteLoop").build();
+            attachListener(exitLatch::countDown, instrumentEnv);
+            Future<?> future = executorService.submit(() -> {
+                context.eval(source);
+            });
+            exitLatch.await();
+            future.get();
+            runOnNaturalContextExit.set(() -> {
+                // No effect calling context exit during closing
+                context.eval(InstrumentationTestLanguage.ID, "EXIT(1)");
+                context.close(true);
+            });
+            context.close();
+            assertContextState("CLOSED_CANCELLED");
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
+    @Test
+    public void testParallelCloseCancelExitAndInterrupt() throws InterruptedException, IOException, ExecutionException {
+        ExecutorService executorService = Executors.newFixedThreadPool(31);
+        Context ctx = Context.newBuilder().build();
+        try {
+            ctx.initialize(InstrumentationTestLanguage.ID);
+            CountDownLatch passLatch = new CountDownLatch(10);
+            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "BLOCK(CONSTANT(42),LOOP(infinity, STATEMENT))", "InfiniteLoop").build();
+            TruffleInstrument.Env instrEnv = getInstrumentEnv(ctx.getEngine());
+            attachListener(passLatch::countDown, instrEnv);
+            List<Future<?>> futures = new ArrayList<>();
+            for (int i = 0; i < 10; i++) {
+                futures.add(executorService.submit(() -> {
+                    try {
+                        ctx.eval(source);
+                        Assert.fail();
+                    } catch (PolyglotException pe) {
+                        if (!pe.isInterrupted() && !pe.isCancelled() && !pe.isExit()) {
+                            throw pe;
+                        }
+                    }
+                }));
+            }
+            passLatch.await();
+            Random rnd = new Random();
+            AtomicBoolean exitOrCancel = new AtomicBoolean();
+            CountDownLatch safetyGuardLatch = new CountDownLatch(20);
+            for (int i = 0; i < 20; i++) {
+                futures.add(executorService.submit(() -> {
+                    int randInt = rnd.nextInt(4);
+                    switch (randInt) {
+                        case 0:
+                            exitOrCancel.set(true);
+                            safetyGuardLatch.countDown();
+                            ctx.close(true);
+                            break;
+                        case 1:
+                            safetyGuardLatch.countDown();
+                            try {
+                                ctx.interrupt(Duration.ofSeconds(50));
+                            } catch (TimeoutException te) {
+                                throw new AssertionError(te);
+                            }
+                            break;
+                        case 2:
+                            safetyGuardLatch.countDown();
+                            try {
+                                ctx.close();
+                            } catch (IllegalStateException ise) {
+                                if (!"The context is currently executing on another thread. Set cancelIfExecuting to true to stop the execution on this thread.".equals(ise.getMessage()) &&
+                                                !"Another main thread was started while closing a polyglot context!".equals(ise.getMessage())) {
+                                    throw ise;
+                                }
+                            }
+                            break;
+                        case 3:
+                            exitOrCancel.set(true);
+                            safetyGuardLatch.countDown();
+                            try {
+                                ctx.eval(InstrumentationTestLanguage.ID, "EXIT(1)");
+                            } catch (PolyglotException pe) {
+                                if (!pe.isCancelled() && !pe.isExit() && !pe.isInterrupted()) {
+                                    throw pe;
+                                }
+                            } catch (IllegalStateException ise) {
+                                if (!"The Context is already closed.".equals(ise.getMessage())) {
+                                    throw ise;
+                                }
+                            }
+                            break;
+                    }
+                }));
+            }
+            futures.add(executorService.submit(() -> {
+                try {
+                    safetyGuardLatch.await();
+                } catch (InterruptedException ie) {
+                }
+                if (!exitOrCancel.get()) {
+                    ctx.close(true);
+                }
+            }));
+            for (Future<?> future : futures) {
+                future.get();
+            }
+        } finally {
+            try {
+                ctx.close();
+            } finally {
+                executorService.shutdownNow();
+                executorService.awaitTermination(100, TimeUnit.SECONDS);
+            }
+        }
+    }
+
+    private static final Node DUMMY_NODE = new Node() {
+    };
+
+    @Test
+    public void testExitFromExitNotification() {
+        setupEnv(Context.newBuilder(), new ProxyLanguage() {
+            @Override
+            protected CallTarget parse(ParsingRequest request) {
+                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                    @Override
+                    public Object execute(VirtualFrame frame) {
+                        LanguageContext languageContext = LanguageContext.get(this);
+                        languageContext.getEnv().getContext().closeExited(this, 1);
+                        return 0;
+                    }
+                });
+            }
+
+            @Override
+            protected void exitContext(LanguageContext ctx, ExitMode exitMode, int exitCode) {
+                ctx.getEnv().getContext().closeExited(DUMMY_NODE, 5);
+            }
+
+        });
+        try {
+            context.eval(ProxyLanguage.ID, "");
+        } catch (PolyglotException pe) {
+            if (!pe.isExit() || pe.getExitStatus() != 1) {
+                throw pe;
+            }
+        }
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseOrCancelTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseOrCancelTest.java
deleted file mode 100644
index cd90fa70e562..000000000000
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseOrCancelTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * The Universal Permissive License (UPL), Version 1.0
- *
- * Subject to the condition set forth below, permission is hereby granted to any
- * person obtaining a copy of this software, associated documentation and/or
- * data (collectively the "Software"), free of charge and under any and all
- * copyright rights in the Software, and any and all patent rights owned or
- * freely licensable by each licensor hereunder covering either (i) the
- * unmodified Software as contributed to or provided by such licensor, or (ii)
- * the Larger Works (as defined below), to deal in both
- *
- * (a) the Software, and
- *
- * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
- * one is included with the Software each a "Larger Work" to which the Software
- * is contributed by such licensors),
- *
- * without restriction, including without limitation the rights to copy, create
- * derivative works of, display, perform, and distribute the Software and make,
- * use, sell, offer for sale, import, export, have made, and have sold the
- * Software and the Larger Work(s), and to sublicense the foregoing rights on
- * either these or other terms.
- *
- * This license is subject to the following condition:
- *
- * The above copyright notice and either this complete permission notice or at a
- * minimum a reference to the UPL must be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.oracle.truffle.api.instrumentation.test;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.time.Duration;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Engine;
-import org.graalvm.polyglot.Source;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.TruffleContext;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.ContextsListener;
-import com.oracle.truffle.api.instrumentation.EventContext;
-import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
-import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
-import com.oracle.truffle.api.instrumentation.TruffleInstrument;
-import com.oracle.truffle.api.nodes.LanguageInfo;
-import com.oracle.truffle.api.test.polyglot.AbstractPolyglotTest;
-import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
-
-public class ContextInterruptCloseOrCancelTest extends AbstractPolyglotTest {
-    private void runOnContextClose(TruffleContext triggerCtx, Runnable r) {
-        instrumentEnv.getInstrumenter().attachContextsListener(new ContextsListener() {
-            @Override
-            public void onContextCreated(TruffleContext ctx) {
-
-            }
-
-            @Override
-            public void onLanguageContextCreated(TruffleContext ctx, LanguageInfo lang) {
-
-            }
-
-            @Override
-            public void onLanguageContextInitialized(TruffleContext ctx, LanguageInfo lang) {
-
-            }
-
-            @Override
-            public void onLanguageContextFinalized(TruffleContext ctx, LanguageInfo lang) {
-
-            }
-
-            @Override
-            public void onLanguageContextDisposed(TruffleContext ctx, LanguageInfo lang) {
-
-            }
-
-            @Override
-            public void onContextClosed(TruffleContext ctx) {
-                if (ctx == triggerCtx) {
-                    r.run();
-                }
-            }
-        }, false);
-    }
-
-    @Rule public TestName testNameRule = new TestName();
-
-    @After
-    public void checkInterrupted() {
-        Assert.assertFalse("Interrupted flag was left set by test: " + testNameRule.getMethodName(), Thread.interrupted());
-    }
-
-    @Test
-    public void testInterruptPolyglotThreadWhileClosing() throws ExecutionException, InterruptedException, IOException {
-        enterContext = false;
-        setupEnv(Context.newBuilder().allowCreateThread(true), new ProxyLanguage() {
-            @Override
-            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
-                return true;
-            }
-        });
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-        try {
-            CountDownLatch interruptLatch = new CountDownLatch(1);
-            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,CONSTANT(42),LOOP(infinity,STATEMENT)),SPAWN(foo))", "InfiniteLoop").build();
-            attachListener(interruptLatch::countDown, instrumentEnv);
-            Future<?> future = executorService.submit(() -> {
-                context.eval(source);
-            });
-            interruptLatch.await();
-            future.get();
-            TruffleContext innerContext = languageEnv.newContextBuilder().build();
-            AtomicReference<Future<?>> interruptFutureReference = new AtomicReference<>();
-            runOnContextClose(innerContext, () -> {
-                /*
-                 * When inner context is closed we know that the parent context is being closed.
-                 * Parent context is entered in the current thread, so we must interrupt in a
-                 * different thread.
-                 */
-                Future<?> interruptFuture = executorService.submit(() -> {
-                    try {
-                        context.interrupt(Duration.ofSeconds(5));
-                    } catch (TimeoutException te) {
-                        throw new AssertionError(te);
-                    }
-                });
-                interruptFutureReference.set(interruptFuture);
-                boolean interruptedExceptionSwallowed = false;
-                try {
-                    /*
-                     * The parent context is entered in the current thread, so the interrupt will
-                     * try to interrupt it. Therefore, we have to ignore the InterruptedException in
-                     * order for the close operation to be able to successfully continue. We cannot
-                     * wait for the interrupt future here though, because it waits also for the
-                     * current entered thread.
-                     */
-                    interruptFuture.get();
-                } catch (ExecutionException e) {
-                    throw new AssertionError(e);
-                } catch (InterruptedException ie) {
-                    interruptedExceptionSwallowed = true;
-                }
-                Assert.assertTrue(interruptedExceptionSwallowed);
-                Assert.assertFalse(interruptFuture.isDone());
-            });
-            context.close();
-            assertContextState("CLOSED");
-            Assert.assertNotNull(interruptFutureReference.get());
-            interruptFutureReference.get().get();
-        } finally {
-            executorService.shutdownNow();
-            executorService.awaitTermination(100, TimeUnit.SECONDS);
-        }
-    }
-
-    @Test
-    public void testCancelPolyglotThreadWhileClosing() throws ExecutionException, InterruptedException, IOException {
-        enterContext = false;
-        setupEnv(Context.newBuilder().allowCreateThread(true), new ProxyLanguage() {
-            @Override
-            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
-                return true;
-            }
-        });
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-        try {
-            CountDownLatch cancelLatch = new CountDownLatch(1);
-            Source source = Source.newBuilder(InstrumentationTestLanguage.ID, "ROOT(DEFINE(foo,CONSTANT(42),LOOP(infinity,STATEMENT)),SPAWN(foo))", "InfiniteLoop").build();
-            attachListener(cancelLatch::countDown, instrumentEnv);
-            Future<?> future = executorService.submit(() -> {
-                context.eval(source);
-            });
-            cancelLatch.await();
-            future.get();
-            TruffleContext innerContext = languageEnv.newContextBuilder().build();
-            runOnContextClose(innerContext, () -> {
-                /*
-                 * Cancel must work even when entered.
-                 */
-                context.close(true);
-            });
-            context.close();
-            assertContextState("CLOSED_CANCELLED");
-        } finally {
-            executorService.shutdownNow();
-            executorService.awaitTermination(100, TimeUnit.SECONDS);
-        }
-    }
-
-    private void assertContextState(String expectedState) {
-        Object contextState;
-        try {
-            Field implField = context.getClass().getDeclaredField("receiver");
-            implField.setAccessible(true);
-            Object contextImpl = implField.get(context);
-            Field stateField = contextImpl.getClass().getDeclaredField("state");
-            stateField.setAccessible(true);
-            contextState = stateField.get(contextImpl);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        Assert.assertEquals(expectedState, ((Enum<?>) contextState).name());
-    }
-
-    private static void attachListener(Runnable runnable, TruffleInstrument.Env instrumentEnv) {
-        instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(InstrumentationTestLanguage.ConstantTag.class).build(), new ExecutionEventListener() {
-            @Override
-            public void onEnter(EventContext c, VirtualFrame frame) {
-                executeSideEffect();
-            }
-
-            @CompilerDirectives.TruffleBoundary
-            void executeSideEffect() {
-                runnable.run();
-            }
-
-            @Override
-            public void onReturnValue(EventContext c, VirtualFrame frame, Object result) {
-
-            }
-
-            @Override
-            public void onReturnExceptional(EventContext c, VirtualFrame frame, Throwable exception) {
-
-            }
-        });
-    }
-
-    static TruffleInstrument.Env getInstrumentEnv(Engine engine) {
-        return engine.getInstruments().get("InstrumentationUpdateInstrument").lookup(TruffleInstrument.Env.class);
-    }
-}
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
index a337f9457c59..80340aea7578 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/InstrumentationTestLanguage.java
@@ -61,6 +61,8 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.junit.Assert;
+
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -72,6 +74,7 @@
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
+import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.TruffleStackTraceElement;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.exception.AbstractTruffleException;
@@ -215,7 +218,7 @@ static class ConstantTag extends Tag {
     public static final String[] TAG_NAMES = new String[]{"EXPRESSION", "DEFINE", "CONTEXT", "LOOP", "STATEMENT", "CALL", "RECURSIVE_CALL", "CALL_WITH", "BLOCK", "ROOT_BODY", "ROOT", "CONSTANT",
                     "VARIABLE", "ARGUMENT", "READ_VAR", "PRINT", "ALLOCATION", "SLEEP", "SPAWN", "JOIN", "INVALIDATE", "INTERNAL", "INNER_FRAME", "MATERIALIZE_CHILD_EXPRESSION",
                     "MATERIALIZE_CHILD_STMT_AND_EXPR", "MATERIALIZE_CHILD_STMT_AND_EXPR_NC", "MATERIALIZE_CHILD_STMT_AND_EXPR_SEPARATELY", "MATERIALIZE_CHILD_STATEMENT", "BLOCK_NO_SOURCE_SECTION",
-                    "TRY", "CATCH", "THROW", "UNEXPECTED_RESULT", "MULTIPLE"};
+                    "TRY", "CATCH", "THROW", "UNEXPECTED_RESULT", "MULTIPLE", "EXIT"};
 
     public InstrumentationTestLanguage() {
     }
@@ -381,7 +384,7 @@ private BaseNode statement() {
 
             int numberOfIdents = 0;
             if (tag.equals("DEFINE") || tag.equals("ARGUMENT") || tag.equals("READ_VAR") || tag.equals("CALL") || tag.equals("LOOP") || tag.equals("CONSTANT") || tag.equals("UNEXPECTED_RESULT") ||
-                            tag.equals("SLEEP") || tag.equals("SPAWN") | tag.equals("CATCH")) {
+                            tag.equals("SLEEP") || tag.equals("SPAWN") || tag.equals("CATCH") || tag.equals("EXIT")) {
                 numberOfIdents = 1;
             } else if (tag.equals("VARIABLE") || tag.equals("RECURSIVE_CALL") || tag.equals("CALL_WITH") || tag.equals("PRINT") || tag.equals("THROW")) {
                 numberOfIdents = 2;
@@ -550,6 +553,8 @@ private BaseNode createNode(String tag, String[] idents, SourceSection sourceSec
                     return new UnexpectedResultNode(idents[0]);
                 case "MULTIPLE":
                     return new MultipleNode(childArray, multipleTags);
+                case "EXIT":
+                    return new ExitNode(idents[0]);
                 default:
                     throw new AssertionError();
             }
@@ -1513,6 +1518,12 @@ public Object execute(VirtualFrame frame) {
                         returnValue = child.execute(frame);
                     }
                 }
+                /*
+                 * Normally we would go through call target here which guarantees poll at the end.
+                 * This language doesn't use call target here, for simplicity, so we need to poll
+                 * manually.
+                 */
+                TruffleSafepoint.pollHere(this);
             } finally {
                 inner.leave(this, prev);
                 inner.close();
@@ -1561,6 +1572,31 @@ protected BaseNode copyUninitialized(Set<Class<? extends Tag>> materializedTags)
         }
     }
 
+    static class ExitNode extends InstrumentedNode {
+        private final int exitCode;
+
+        ExitNode(String exitCodeStr) {
+            this.exitCode = Integer.parseInt(exitCodeStr);
+        }
+
+        @Override
+        public Object execute(VirtualFrame frame) {
+            throwExitException();
+            return null;
+        }
+
+        @TruffleBoundary
+        private void throwExitException() {
+            InstrumentContext context = InstrumentContext.get(this);
+            context.env.getContext().closeExited(this, exitCode);
+        }
+
+        @Override
+        protected BaseNode copyUninitialized(Set<Class<? extends Tag>> materializedTags) {
+            return new ExitNode(String.valueOf(exitCode));
+        }
+    }
+
     private static class SpawnNode extends InstrumentedNode {
 
         @Child private DirectCallNode callNode;
@@ -1639,7 +1675,7 @@ private static Thread.UncaughtExceptionHandler getPolyglotThreadUncaughtExceptio
         return (t, e) -> {
             InteropLibrary interop = InteropLibrary.getUncached();
             boolean interrupted;
-            boolean cancelled = false;
+            boolean cancelledOrExited = false;
             if (interop.isException(e)) {
                 try {
                     ExceptionType exceptionType = interop.getExceptionType(e);
@@ -1649,9 +1685,9 @@ private static Thread.UncaughtExceptionHandler getPolyglotThreadUncaughtExceptio
                 }
             } else {
                 interrupted = e != null && e.getCause() instanceof InterruptedException;
-                cancelled = e instanceof ThreadDeath;
+                cancelledOrExited = e instanceof ThreadDeath;
             }
-            if (e != null && !interrupted && !cancelled) {
+            if (e != null && !interrupted && !cancelledOrExited) {
                 Env currentEnv = context.env;
                 try {
                     e.printStackTrace(new PrintStream(currentEnv.err()));
@@ -3219,6 +3255,15 @@ public String fileExtension() {
     protected void finalizeContext(InstrumentContext context) {
         joinSpawnedThreads(context, true);
     }
+
+    @Override
+    protected void exitContext(InstrumentContext context, ExitMode exitMode, int exitCode) {
+        if (exitMode == ExitMode.HARD) {
+            CallTarget callTarget = context.env.parseInternal(Source.newBuilder(ID, "CONSTANT(42)", "ConstandFortyTwo").build());
+            Object result = callTarget.call();
+            Assert.assertEquals(42, result);
+        }
+    }
 }
 
 class InstrumentContext {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
index ccf3a6c7b7a8..2a67173d4f10 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ThreadsActivationListenerTest.java
@@ -85,6 +85,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
 
         c0.enter();
         TruffleContext ic0 = this.languageEnv.newContextBuilder().build();
+        TruffleContext ic0CreatorHandle = ic0;
         Object prev = ic0.enter(null);
         // look language handle on the context it is not the same as
         // the creator handle. The creator handle can be closed.
@@ -148,6 +149,8 @@ public void onLeaveThread(TruffleContext c) {
 
         assertList(entered, ic0, tc0, ic0);
         assertList(left, ic0, ic0, tc0);
+
+        ic0CreatorHandle.close();
     }
 
     @Test
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
index d7c3ba496aa7..cf6307482db5 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/TruffleContextTest.java
@@ -120,6 +120,7 @@ public void testCreate() {
         assertFalse(tc.isEntered());
         assertFalse(tc.isClosed());
         assertFalse(tc.isCancelling());
+        assertFalse(tc.isExiting());
         assertNotNull(tc.toString());
         assertEquals(tc.getParent(), languageEnv.getContext());
 
@@ -130,6 +131,7 @@ public void testCreate() {
 
         assertFalse(tc.isEntered());
         assertFalse(tc.isClosed());
+        tc.close();
     }
 
     @Test
@@ -337,6 +339,78 @@ public void onReturnExceptional(EventContext ctx, VirtualFrame frame, Throwable
         }
     }
 
+    @Test
+    public void testExiting() throws ExecutionException, InterruptedException {
+        setupEnv(Context.newBuilder(), new ProxyLanguage() {
+            @Override
+            protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
+                return true;
+            }
+        });
+
+        ExecutorService executorService = Executors.newFixedThreadPool(1);
+        try {
+            AtomicReference<TruffleContext> entered = new AtomicReference<>();
+            CountDownLatch waitUntilExited = new CountDownLatch(1);
+            instrumentEnv.getInstrumenter().attachExecutionEventListener(SourceSectionFilter.newBuilder().tagIs(StandardTags.StatementTag.class).build(), new ExecutionEventListener() {
+                @TruffleBoundary
+                @Override
+                public void onEnter(EventContext ctx, VirtualFrame frame) {
+                    entered.set(instrumentEnv.getEnteredContext());
+                }
+
+                @Override
+                public void onReturnValue(EventContext ctx, VirtualFrame frame, Object result) {
+
+                }
+
+                @Override
+                public void onReturnExceptional(EventContext ctx, VirtualFrame frame, Throwable exception) {
+
+                }
+            });
+            Future<?> future = executorService.submit(() -> {
+                context.enter();
+                try {
+                    context.eval(InstrumentationTestLanguage.ID, "ROOT(STATEMENT,EXIT(1))");
+                    fail();
+                } catch (PolyglotException pe) {
+                    if (!pe.isExit()) {
+                        throw pe;
+                    }
+                    assertEquals(1, pe.getExitStatus());
+                    assertTrue(entered.get().isExiting());
+                } finally {
+                    context.leave();
+                }
+                waitUntilExited.countDown();
+            });
+
+            boolean othrerThreadExited = false;
+            while (!othrerThreadExited) {
+                try {
+                    waitUntilExited.await();
+                    othrerThreadExited = true;
+                } catch (InterruptedException ie) {
+                }
+            }
+            /*
+             * Multi-threading is necessary, otherwise the context is closed while entered and we
+             * cannot check isExiting().
+             */
+            context.leave();
+            TruffleContext tc = entered.get();
+            tc.close();
+
+            future.get();
+            assertFalse(tc.isExiting());
+            assertTrue(tc.isClosed());
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(100, TimeUnit.SECONDS);
+        }
+    }
+
     @Test
     public void testCancellingUncaughtExceptionHandler() {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -420,6 +494,8 @@ public void testContextHierarchy() {
         tc2.leave(null, prev2);
         tc1.leave(null, prev1);
 
+        tc2.close();
+        tc1.close();
     }
 
     @Test
@@ -450,6 +526,7 @@ public void testInitializeCreatorContext() {
         } finally {
             innerContext.leave(null, prev);
         }
+        innerContext.close();
 
         innerContext = languageEnv.newContextBuilder().initializeCreatorContext(true).build();
         prev = innerContext.enter(null);
@@ -458,6 +535,7 @@ public void testInitializeCreatorContext() {
         } finally {
             innerContext.leave(null, prev);
         }
+        innerContext.close();
     }
 
     @Test
@@ -484,6 +562,7 @@ public void testEvalInnerContextEvalErrors() {
         assertFails(() -> innerContext.evalInternal(null, com.oracle.truffle.api.source.Source.newBuilder("foobarbazz$_", "", "").build()), IllegalArgumentException.class, (e) -> {
             assertTrue(e.getMessage(), e.getMessage().startsWith("A language with id 'foobarbazz$_' is not installed. Installed languages are:"));
         });
+        innerContext.close();
     }
 
     @Test
@@ -518,6 +597,7 @@ public void testEvalInnerContextError() throws InteropException {
         }
         assertEquals(3, innerException.executeCount);
         assertEquals(3, outerObject.executeCount);
+        innerContext.close();
     }
 
     @SuppressWarnings("serial")
@@ -574,6 +654,7 @@ public void testPublicEvalInnerContext() {
 
         com.oracle.truffle.api.source.Source internal = com.oracle.truffle.api.source.Source.newBuilder(LanguageSPIOrderTest.INTERNAL, "", "test").build();
         assertFails(() -> innerContext.evalPublic(null, internal), IllegalArgumentException.class);
+        innerContext.close();
     }
 
     @Test
@@ -587,6 +668,7 @@ public void testEvalInnerContext() throws InteropException {
         // test that objects that cross the boundary are entered in the inner context
         EvalContextTestObject innerObject = new EvalContextTestObject();
         EvalContextTestObject outerObject = new EvalContextTestObject();
+        innerContext.close();
         setupLanguageThatReturns(() -> innerObject);
         innerContext = languageEnv.newContextBuilder().build();
         innerObject.expectedContext = innerContext;
@@ -603,6 +685,7 @@ public void testEvalInnerContext() throws InteropException {
 
         assertEquals(2, innerObject.executeCount);
         assertEquals(2, outerObject.executeCount);
+        innerContext.close();
     }
 
     @ExportLibrary(InteropLibrary.class)
@@ -659,6 +742,7 @@ protected boolean areOptionsCompatible(OptionValues firstOptions, OptionValues n
         assertFalse(multiContextInitialized.get());
         internalContext.evalInternal(null, com.oracle.truffle.api.source.Source.newBuilder(ProxyLanguage.ID, "", "").build());
         assertTrue(multiContextInitialized.get());
+        internalContext.close();
     }
 
     @Test
@@ -681,8 +765,9 @@ protected boolean areOptionsCompatible(OptionValues firstOptions, OptionValues n
                 return true;
             }
         });
-        languageEnv.newContextBuilder().initializeCreatorContext(true).build();
+        TruffleContext ic = languageEnv.newContextBuilder().initializeCreatorContext(true).build();
         assertTrue(multiContextInitialized.get());
+        ic.close();
     }
 
     private void setupLanguageThatReturns(Supplier<Object> supplier) {
@@ -743,6 +828,7 @@ public void testLeaveAndEnterInnerContext() {
         } finally {
             tc.leave(null, prev);
         }
+        tc.close();
     }
 
     private static Class<? extends Throwable> getCancelExecutionClass() {
diff --git a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ExceptionType.java b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ExceptionType.java
index 09540c91cb5b..6148d37c8fa1 100644
--- a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ExceptionType.java
+++ b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/ExceptionType.java
@@ -53,9 +53,18 @@
  */
 public enum ExceptionType {
     /**
-     * Indicates that the application was exited within the guest language program. To obtain the
-     * exit status use {@link InteropLibrary#getExceptionExitStatus(Object) getExceptionExitStatus}.
-     *
+     * Indicates that the application was soft-exited within the guest language program. To obtain
+     * the exit status use {@link InteropLibrary#getExceptionExitStatus(Object)
+     * getExceptionExitStatus}. See
+     * <a href= "https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md">Context Exit</a>
+     * for further information.
+     * <p>
+     * If a language uses hard exits, it should not use soft exits, i.e. throw exceptions of this
+     * type on its own.
+     * <p>
+     * If a language that does not use soft exits sees an exception of this type, it should re-throw
+     * it like other foreign exceptions, triggering finally blocks.
+     * 
      * @see InteropLibrary#getExceptionExitStatus(Object)
      * @since 20.3
      */
diff --git a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
index 3eb3726b9421..784de11a146b 100644
--- a/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
+++ b/truffle/src/com.oracle.truffle.api.interop/src/com/oracle/truffle/api/interop/InteropLibrary.java
@@ -40,6 +40,28 @@
  */
 package com.oracle.truffle.api.interop;
 
+import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
+import static com.oracle.truffle.api.interop.AssertUtils.assertString;
+import static com.oracle.truffle.api.interop.AssertUtils.preCondition;
+import static com.oracle.truffle.api.interop.AssertUtils.validArguments;
+import static com.oracle.truffle.api.interop.AssertUtils.validInteropArgument;
+import static com.oracle.truffle.api.interop.AssertUtils.validInteropReturn;
+import static com.oracle.truffle.api.interop.AssertUtils.validNonInteropArgument;
+import static com.oracle.truffle.api.interop.AssertUtils.validProtocolArgument;
+import static com.oracle.truffle.api.interop.AssertUtils.validProtocolReturn;
+import static com.oracle.truffle.api.interop.AssertUtils.validScope;
+import static com.oracle.truffle.api.interop.AssertUtils.violationInvariant;
+import static com.oracle.truffle.api.interop.AssertUtils.violationPost;
+
+import java.nio.ByteOrder;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.zone.ZoneRules;
+
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
@@ -65,28 +87,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.TriState;
 
-import java.nio.ByteOrder;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.zone.ZoneRules;
-
-import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
-import static com.oracle.truffle.api.interop.AssertUtils.assertString;
-import static com.oracle.truffle.api.interop.AssertUtils.preCondition;
-import static com.oracle.truffle.api.interop.AssertUtils.validInteropArgument;
-import static com.oracle.truffle.api.interop.AssertUtils.validProtocolArgument;
-import static com.oracle.truffle.api.interop.AssertUtils.validArguments;
-import static com.oracle.truffle.api.interop.AssertUtils.validNonInteropArgument;
-import static com.oracle.truffle.api.interop.AssertUtils.validInteropReturn;
-import static com.oracle.truffle.api.interop.AssertUtils.validProtocolReturn;
-import static com.oracle.truffle.api.interop.AssertUtils.validScope;
-import static com.oracle.truffle.api.interop.AssertUtils.violationInvariant;
-import static com.oracle.truffle.api.interop.AssertUtils.violationPost;
-
 /**
  * Represents the library that specifies the interoperability message protocol between Truffle
  * languages, tools and embedders. Every method represents one message specified by the protocol. In
@@ -1852,7 +1852,6 @@ public Duration asDuration(Object receiver) throws UnsupportedMessageException {
      * @since 19.3
      */
     @Abstract(ifExported = {"throwException"})
-    @SuppressWarnings("deprecation")
     public boolean isException(Object receiver) {
         // A workaround for missing inheritance feature for default exports.
         return InteropAccessor.EXCEPTION.isException(receiver) ||
@@ -1936,9 +1935,11 @@ public boolean isExceptionIncompleteSource(Object receiver) throws UnsupportedMe
     /**
      * Returns exception exit status of the receiver. Throws {@code UnsupportedMessageException}
      * when the receiver is not an {@link #isException(Object) exception} of the
-     * {@link ExceptionType#EXIT exit type}. A return value zero indicates that the execution of the
-     * application was successful, a non-zero value that it failed. The individual interpretation of
-     * non-zero values depends on the application.
+     * {@link ExceptionType#EXIT exit type}. See
+     * <a href= "https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md">Context Exit</a>
+     * for further information. A return value zero indicates that the execution of the application
+     * was successful, a non-zero value that it failed. The individual interpretation of non-zero
+     * values depends on the application.
      *
      * @see #isException(Object)
      * @see #getExceptionType(Object)
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
index d61359d39964..dec719e438de 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleSafepointTest.java
@@ -284,6 +284,7 @@ protected void perform(Access access) {
     @Test
     public void testNullArgs() {
         try (TestSetup setup = setupSafepointLoop(1, (s, node) -> {
+            sleepNanosBoundary(50000);
             TruffleSafepoint.poll(node);
             return false;
         })) {
@@ -299,6 +300,7 @@ protected void perform(Access access) {
     @Test
     public void testSynchronousRecursiveError() throws InterruptedException, AssertionError, ExecutionException {
         try (TestSetup setup = setupSafepointLoop(1, (s, node) -> {
+            sleepNanosBoundary(50000);
             TruffleSafepoint.poll(node);
             return false;
         })) {
@@ -335,6 +337,7 @@ protected void perform(Access inner) {
     public void testSynchronous() {
         forEachConfig((threads, events) -> {
             TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             });
@@ -383,6 +386,7 @@ public void testSynchronous() {
     public void testAsynchronous() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -526,6 +530,7 @@ private static boolean isStopped(AtomicBoolean stopped) {
     public void testStackTrace() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -563,6 +568,14 @@ protected void perform(Access access) {
         });
     }
 
+    @TruffleBoundary
+    private static void sleepNanosBoundary(int nanos) {
+        try {
+            Thread.sleep(0, nanos);
+        } catch (InterruptedException ie) {
+        }
+    }
+
     @Test
     public void testException() {
         forEachConfig((threads, events) -> {
@@ -570,6 +583,7 @@ public void testException() {
             AtomicReference<CountDownLatch> latchRef = new AtomicReference<>(null);
             List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<>());
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             }, (e) -> {
@@ -1018,6 +1032,7 @@ public void testContextCancellation() {
         forEachConfig((threads, events) -> {
             List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<>());
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             }, new Consumer<Throwable>() {
@@ -1070,6 +1085,7 @@ protected void perform(Access innerAccess) {
     public void testEventCancellation() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -1139,6 +1155,7 @@ public void testSafepointALot() {
     @Test
     public void testNonSideEffectInvalidErrorThrown() throws InterruptedException {
         try (TestSetup setup = setupSafepointLoop(1, (s, node) -> {
+            sleepNanosBoundary(50000);
             TruffleSafepoint.poll(node);
             return false;
         })) {
@@ -1319,6 +1336,7 @@ static class GuestException extends AbstractTruffleException {
     public void testSubmitAsInstrument() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -1337,6 +1355,7 @@ public void testSubmitAsInstrument() {
     public void testSubmitRecurringWaitWithCancel() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -1361,6 +1380,7 @@ public void testSubmitRecurringWaitWithCancel() {
     public void testSubmitRecurringWait() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
@@ -1385,6 +1405,7 @@ public void testSubmitRecurringWait() {
     public void testSubmitRecurringCancel() {
         forEachConfig((threads, events) -> {
             try (TestSetup setup = setupSafepointLoop(threads, (s, node) -> {
+                sleepNanosBoundary(50000);
                 TruffleSafepoint.poll(node);
                 return false;
             })) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
index 9c8edaca978b..3c76a71e1bd6 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ChildContextTest.java
@@ -44,6 +44,7 @@
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
@@ -95,7 +96,8 @@ protected LanguageContext createContext(Env env) {
 
         @Override
         protected CallTarget parse(ParsingRequest request) throws Exception {
-            REFERENCE.get(null).env.newContextBuilder().build();
+            TruffleContext tc = REFERENCE.get(null).env.newContextBuilder().build();
+            tc.close();
             return RootNode.createConstantNode("foo").getCallTarget();
         }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
index 755085e63133..13e74f225b5a 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPolicyTest.java
@@ -705,7 +705,7 @@ Object execute(Object[] args,
         @TruffleBoundary
         private void doAssertions() {
             assertSame(expectedLanguage, expectedLanguage.getLanguageReference().get(null));
-            assertSame(expectedEnvironment, expectedLanguage.getContextReference0().get(null));
+            assertSame(expectedEnvironment, expectedLanguage.getContextReference0().get(null).env);
         }
 
         @TruffleBoundary
@@ -742,10 +742,15 @@ protected LanguageRootNode(BaseLanguage language, boolean innerContext) {
 
         @Override
         public Object execute(VirtualFrame frame) {
-            Env env = language.getContextReference0().get(this);
+            LangContext langContext = language.getContextReference0().get(this);
             TruffleContext context = null;
             if (innerContext) {
-                context = env.newContextBuilder().build();
+                if (langContext.innerContext == null) {
+                    context = langContext.env.newContextBuilder().build();
+                    langContext.innerContext = context;
+                } else {
+                    context = langContext.innerContext;
+                }
             }
             Object prev = null;
             if (context != null) {
@@ -755,7 +760,7 @@ public Object execute(VirtualFrame frame) {
                 SharedObject obj = new SharedObject(
                                 context,
                                 language.getLanguageReference().get(null),
-                                language.getContextReference0().get(null));
+                                language.getContextReference0().get(null).env);
                 return obj;
             } finally {
                 if (context != null) {
@@ -766,11 +771,20 @@ public Object execute(VirtualFrame frame) {
         }
     }
 
-    abstract static class BaseLanguage extends TruffleLanguage<Env> {
+    static class LangContext {
+        final Env env;
+        TruffleContext innerContext;
+
+        LangContext(Env env) {
+            this.env = env;
+        }
+    }
+
+    abstract static class BaseLanguage extends TruffleLanguage<LangContext> {
 
         abstract LanguageReference<? extends BaseLanguage> getLanguageReference();
 
-        abstract ContextReference<Env> getContextReference0();
+        abstract ContextReference<LangContext> getContextReference0();
     }
 
     @Registration(id = EXCLUSIVE0, name = EXCLUSIVE0, contextPolicy = ContextPolicy.EXCLUSIVE)
@@ -796,18 +810,25 @@ protected CallTarget parse(ParsingRequest request) throws Exception {
         }
 
         @Override
-        protected Env createContext(Env env) {
+        protected LangContext createContext(Env env) {
             contextCreate.add(this);
-            return env;
+            return new LangContext(env);
+        }
+
+        @Override
+        protected void finalizeContext(LangContext context) {
+            if (context.innerContext != null) {
+                context.innerContext.close();
+            }
         }
 
         @Override
-        protected void disposeContext(Env context) {
+        protected void disposeContext(LangContext context) {
             contextDispose.add(this);
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -816,7 +837,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ExclusiveLanguage0.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(ExclusiveLanguage0.class);
         static final LanguageReference<ExclusiveLanguage0> REFERENCE = LanguageReference.create(ExclusiveLanguage0.class);
 
     }
@@ -837,7 +858,7 @@ protected OptionDescriptors getOptionDescriptors() {
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -846,7 +867,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ExclusiveLanguage1.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(ExclusiveLanguage1.class);
         static final LanguageReference<ExclusiveLanguage1> REFERENCE = LanguageReference.create(ExclusiveLanguage1.class);
     }
 
@@ -866,7 +887,7 @@ protected OptionDescriptors getOptionDescriptors() {
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -875,7 +896,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ReuseLanguage0.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(ReuseLanguage0.class);
         static final LanguageReference<ReuseLanguage0> REFERENCE = LanguageReference.create(ReuseLanguage0.class);
     }
 
@@ -895,7 +916,7 @@ protected OptionDescriptors getOptionDescriptors() {
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -904,7 +925,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ReuseLanguage1.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(ReuseLanguage1.class);
         static final LanguageReference<ReuseLanguage1> REFERENCE = LanguageReference.create(ReuseLanguage1.class);
     }
 
@@ -924,7 +945,7 @@ protected OptionDescriptors getOptionDescriptors() {
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -933,7 +954,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(SharedLanguage0.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(SharedLanguage0.class);
         static final LanguageReference<SharedLanguage0> REFERENCE = LanguageReference.create(SharedLanguage0.class);
     }
 
@@ -953,7 +974,7 @@ protected OptionDescriptors getOptionDescriptors() {
         }
 
         @Override
-        ContextReference<Env> getContextReference0() {
+        ContextReference<LangContext> getContextReference0() {
             return CONTEXT_REF;
         }
 
@@ -962,7 +983,7 @@ LanguageReference<? extends BaseLanguage> getLanguageReference() {
             return REFERENCE;
         }
 
-        static final ContextReference<Env> CONTEXT_REF = ContextReference.create(SharedLanguage1.class);
+        static final ContextReference<LangContext> CONTEXT_REF = ContextReference.create(SharedLanguage1.class);
         static final LanguageReference<SharedLanguage1> REFERENCE = LanguageReference.create(SharedLanguage1.class);
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageFinalizationFailureTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageFinalizationFailureTest.java
index 63519bfe3fe0..f4cb97ff8c90 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageFinalizationFailureTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LanguageFinalizationFailureTest.java
@@ -122,7 +122,8 @@ protected void disposeContext(LanguageContext languageContext) {
         });
         context.close(true);
         Assert.assertTrue(disposeCalled.get());
-        Assert.assertTrue(outStream.toString().contains("Exception was thrown while finalizing a polyglot context that is being cancelled. Such exceptions are expected during cancelling."));
+        Assert.assertTrue(outStream.toString().contains(
+                        "Exception was thrown while finalizing a polyglot context that is being cancelled or exited. Such exceptions are expected during cancelling or exiting."));
     }
 
     @Test
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxyLanguage.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxyLanguage.java
index e9c0ec48363e..808515e9dd08 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxyLanguage.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxyLanguage.java
@@ -179,6 +179,15 @@ protected void finalizeContext(LanguageContext context) {
         }
     }
 
+    @Override
+    protected void exitContext(LanguageContext context, ExitMode exitMode, int exitCode) {
+        if (wrapper) {
+            delegate.exitContext(context, exitMode, exitCode);
+        } else {
+            super.exitContext(context, exitMode, exitCode);
+        }
+    }
+
     @Override
     protected void disposeContext(LanguageContext context) {
         if (wrapper) {
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
index f69d045ab454..5b8c4855e1d4 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
@@ -81,14 +81,14 @@ public Context createContext(Object receiver, OutputStream out, OutputStream err
                     boolean allowNativeAccess, boolean allowCreateThread, boolean allowHostIO, boolean allowHostClassLoading, boolean allowExperimentalOptions, Predicate<String> classFilter,
                     Map<String, String> options, Map<String, String[]> arguments, String[] onlyLanguages, FileSystem fileSystem, Object logHandlerOrStream, boolean allowCreateProcess,
                     ProcessHandler processHandler, EnvironmentAccess environmentAccess, Map<String, String> environment, ZoneId zone, Object limitsImpl, String currentWorkingDirectory,
-                    ClassLoader hostClassLoader, boolean allowValueSharing) {
+                    ClassLoader hostClassLoader, boolean allowValueSharing, boolean useSystemExit) {
         HostEngine engine = (HostEngine) receiver;
         Engine localEngine = engine.localEngine;
         AbstractEngineDispatch dispatch = api.getDispatch(localEngine);
         Object engineReceiver = api.getReceiver(localEngine);
         Context localContext = dispatch.createContext(engineReceiver, out, err, in, allowHostAccess, hostAccess, polyglotAccess, allowNativeAccess, allowCreateThread, allowHostIO,
                         allowHostClassLoading, allowExperimentalOptions, classFilter, options, arguments, onlyLanguages, fileSystem, logHandlerOrStream, allowCreateProcess, processHandler,
-                        environmentAccess, environment, zone, limitsImpl, currentWorkingDirectory, hostClassLoader, true);
+                        environmentAccess, environment, zone, limitsImpl, currentWorkingDirectory, hostClassLoader, true, useSystemExit);
         long guestContextId = hostToGuest.remoteCreateContext(engine.remoteEngine);
         HostContext context = new HostContext(engine, guestContextId, localContext);
         hostToGuest.registerHostContext(guestContextId, context);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEntryPoint.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEntryPoint.java
index d1c203af96d1..04ba211fbc15 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEntryPoint.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEntryPoint.java
@@ -123,7 +123,7 @@ public long remoteCreateContext(long engineId) {
                         false, false, false, false, false, null, new HashMap<>(), new HashMap<>(),
                         new String[0], null, null,
                         false, null, EnvironmentAccess.NONE,
-                        null, null, null, null, null, true);
+                        null, null, null, null, null, true, false);
         return guestToHost(remoteContext);
     }
 
diff --git a/truffle/src/com.oracle.truffle.api/snapshot.sigtest b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
index 624aa717e19d..239c38dffb90 100644
--- a/truffle/src/com.oracle.truffle.api/snapshot.sigtest
+++ b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
@@ -236,6 +236,7 @@ meth public boolean isActive()
 meth public boolean isCancelling()
 meth public boolean isClosed()
 meth public boolean isEntered()
+meth public boolean isExiting()
 meth public com.oracle.truffle.api.TruffleContext getParent()
 meth public int hashCode()
 meth public java.lang.Object enter()
@@ -246,6 +247,7 @@ meth public java.lang.Object evalPublic(com.oracle.truffle.api.nodes.Node,com.or
 meth public java.util.concurrent.Future<java.lang.Void> pause()
 meth public void close()
 meth public void closeCancelled(com.oracle.truffle.api.nodes.Node,java.lang.String)
+meth public void closeExited(com.oracle.truffle.api.nodes.Node,int)
 meth public void closeResourceExhausted(com.oracle.truffle.api.nodes.Node,java.lang.String)
 meth public void leave(com.oracle.truffle.api.nodes.Node,java.lang.Object)
 meth public void leave(java.lang.Object)
@@ -402,6 +404,7 @@ innr public abstract interface static Provider
 innr public abstract static ContextReference
 innr public abstract static LanguageReference
 innr public final static !enum ContextPolicy
+innr public final static !enum ExitMode
 innr public final static Env
 innr public final static InlineParsingRequest
 innr public final static ParsingRequest
@@ -445,6 +448,7 @@ meth protected static <%0 extends java.lang.Object, %1 extends com.oracle.truffl
  anno 0 java.lang.Deprecated()
 meth protected void disposeContext({com.oracle.truffle.api.TruffleLanguage%0})
 meth protected void disposeThread({com.oracle.truffle.api.TruffleLanguage%0},java.lang.Thread)
+meth protected void exitContext({com.oracle.truffle.api.TruffleLanguage%0},com.oracle.truffle.api.TruffleLanguage$ExitMode,int)
 meth protected void finalizeContext({com.oracle.truffle.api.TruffleLanguage%0})
 meth protected void initializeContext({com.oracle.truffle.api.TruffleLanguage%0}) throws java.lang.Exception
 meth protected void initializeMultiThreading({com.oracle.truffle.api.TruffleLanguage%0})
@@ -559,6 +563,14 @@ supr java.lang.Object
 hfds UNSET_CONTEXT,applicationArguments,config,context,contextUnchangedAssumption,err,in,initialized,initializedUnchangedAssumption,languageServicesCollector,options,out,polyglotLanguageContext,services,spi,valid
 hcls TruffleFileFactory
 
+CLSS public final static !enum com.oracle.truffle.api.TruffleLanguage$ExitMode
+ outer com.oracle.truffle.api.TruffleLanguage
+fld public final static com.oracle.truffle.api.TruffleLanguage$ExitMode HARD
+fld public final static com.oracle.truffle.api.TruffleLanguage$ExitMode NATURAL
+meth public static com.oracle.truffle.api.TruffleLanguage$ExitMode valueOf(java.lang.String)
+meth public static com.oracle.truffle.api.TruffleLanguage$ExitMode[] values()
+supr java.lang.Enum<com.oracle.truffle.api.TruffleLanguage$ExitMode>
+
 CLSS public final static com.oracle.truffle.api.TruffleLanguage$InlineParsingRequest
  outer com.oracle.truffle.api.TruffleLanguage
 meth public com.oracle.truffle.api.frame.MaterializedFrame getFrame()
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/LanguageAccessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/LanguageAccessor.java
index ec39ae736bb5..1f482a54b138 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/LanguageAccessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/LanguageAccessor.java
@@ -347,6 +347,11 @@ public void finalizeContext(TruffleLanguage.Env env) {
             env.getSpi().finalizeContext(env.context);
         }
 
+        @Override
+        public void exitContext(Env env, TruffleLanguage.ExitMode exitMode, int exitCode) {
+            env.getSpi().exitContext(env.context, exitMode, exitCode);
+        }
+
         @Override
         public void disposeThread(TruffleLanguage.Env env, Thread current) {
             env.getSpi().disposeThread(env.context, current);
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleContext.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleContext.java
index 2866797340f2..5141aa978475 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleContext.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleContext.java
@@ -297,7 +297,8 @@ public boolean isActive() {
 
     /**
      * Returns <code>true</code> if the context was closed else <code>false</code>. A context may be
-     * closed if {@link #close()} or {@link #closeCancelled(Node, String)} was called previously.
+     * closed if {@link #close()}, {@link #closeCancelled(Node, String)}, or
+     * {@link #closeExited(Node, int)} was called previously.
      *
      * @since 20.3
      */
@@ -326,6 +327,22 @@ public boolean isCancelling() {
         }
     }
 
+    /**
+     * Returns <code>true</code> if the context is being hard-exited else <code>false</code>. A
+     * context may be in the process of exit if {@link #closeExited(Node, int)} was called
+     * previously.
+     *
+     * @since 22.0
+     */
+    @TruffleBoundary
+    public boolean isExiting() {
+        try {
+            return LanguageAccessor.engineAccess().isContextExiting(polyglotContext);
+        } catch (Throwable t) {
+            throw Env.engineToLanguageException(t);
+        }
+    }
+
     /**
      * Pause execution on all threads for this context. This call does not wait for the threads to
      * be actually paused. Instead, a future is returned that can be used to wait for the execution
@@ -494,18 +511,25 @@ public void close() {
 
     /**
      * Force closes the context as cancelled and stops all the execution on all active threads using
-     * a {@link ThreadDeath} exception. If this context is not currently {@link #isEntered()
-     * entered} on the current thread then this method waits until the close operation is complete
-     * and {@link #isClosed()} returns <code>true</code>, else it throws the cancelled exception
-     * upon its completion of this method. If an attempt to close a context was successful then
-     * consecutive calls to close have no effect.
+     * a special {@link ThreadDeath} cancel exception. If this context is not currently
+     * {@link #isEntered() entered} on the current thread then this method waits until the close
+     * operation is complete and {@link #isClosed()} returns <code>true</code>, else it throws the
+     * cancelled exception upon its completion of this method. If an attempt to close a context was
+     * successful then consecutive calls to close have no effect.
+     * <p>
+     * The throwing of the special {@link ThreadDeath} cancel exception also applies to any guest
+     * code run during {@link TruffleLanguage#finalizeContext(Object)} which means that
+     * {@link TruffleLanguage#finalizeContext(Object)} cannot run guest code during the cancel
+     * operation.
      * <p>
      * If forced and this context currently {@link #isEntered() entered} on the current thread and
      * no other context is entered on the current thread then this method directly throws a
      * {@link ThreadDeath} error instead of completing to indicate that the current thread should be
      * stopped. The thrown {@link ThreadDeath} must not be caught by the guest language and freely
-     * propagated to the guest application to cancel the execution on the current thread. If a
-     * context is {@link #isActive() active} on the current thread, but not {@link #isEntered()
+     * propagated to the guest application to cancel the execution on the current thread. Please
+     * note that this means that the guest language's finally blocks must not be executed.
+     * <p>
+     * If a context is {@link #isActive() active} on the current thread, but not {@link #isEntered()
      * entered}, then an {@link IllegalStateException} is thrown, as parent contexts that are active
      * on the current thread cannot be cancelled.
      *
@@ -534,6 +558,60 @@ public void closeCancelled(Node closeLocation, String message) {
         }
     }
 
+    /**
+     * Initiates force close of the context as exited -
+     * {@link com.oracle.truffle.api.TruffleLanguage.ExitMode#HARD hard exit}. Requires the context
+     * to be entered on the current thread. Languages are first notified by calling
+     * {@link TruffleLanguage#exitContext(Object, TruffleLanguage.ExitMode, int)} and then the
+     * closing of the context is initiated. Execution on all active threads including the current
+     * thread is stopped by throwing a special {@link ThreadDeath} exit exception. This method does
+     * not wait for the execution on other threads to be stopped, it throws the {@link ThreadDeath}
+     * exception as soon as possible. To exit threads reliably, guest languages need to ensure that
+     * the {@link ThreadDeath} is always immediately rethrown and guest language exception handlers
+     * and finally blocks are not run.
+     * <p>
+     * The throwing of the special {@link ThreadDeath} exit exception also applies to any guest code
+     * run during {@link TruffleLanguage#finalizeContext(Object)} which means that
+     * {@link TruffleLanguage#finalizeContext(Object)} cannot run guest code during hard exit.
+     * <p>
+     * The exit code can be specified only once and the first call to this method also executes the
+     * {@link TruffleLanguage#exitContext(Object, TruffleLanguage.ExitMode, int) exit notifications}
+     * on the same thread. Further calls to this method will ensure that the following guest code on
+     * the calling thread is not executed by throwing the {@link ThreadDeath} exit exception, and
+     * the exit location is used as the stopping point of the thread, but the passed exit code is
+     * ignored and exit notifications are not run.
+     * <p>
+     * In case the context is in one of the following states
+     * <ul>
+     * <li>the context is being closed
+     * <li>the context is already closed
+     * <li>the context threads are being unwound as a part of the cancelling process
+     * <li>the context threads are being unwound as a part of the hard exit process that comes after
+     * exit notifications
+     * </ul>
+     * then calling this method has no effect.
+     *
+     * @param exitLocation the node where the exit occurred.
+     * @param exitCode exitCode provided to the embedder and tools that observe the exit.
+     * @throws IllegalStateException if the context is not {@link #isEntered() entered} on the
+     *             current thread.
+     * @see <a href= "https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md">Context
+     *      Exit</a>
+     *
+     * @since 22.0
+     */
+    @TruffleBoundary
+    public void closeExited(Node exitLocation, int exitCode) {
+        if (!isEntered()) {
+            throw new IllegalStateException("Exit cannot be initiated for this context because it is not currently entered.");
+        }
+        try {
+            LanguageAccessor.engineAccess().exitContext(polyglotContext, exitLocation, exitCode);
+        } catch (Throwable t) {
+            throw Env.engineToLanguageException(t);
+        }
+    }
+
     /**
      * Force closes the context due to resource exhaustion. This method is equivalent to calling
      * {@link #closeCancelled(Node, String) closeCancelled(location, message)} except in addition
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
index 5413cbe096c1..15926e8b9db0 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLanguage.java
@@ -590,24 +590,43 @@ protected void initializeContext(C context) throws Exception {
     /**
      * Performs language context finalization actions that are necessary before language contexts
      * are {@link #disposeContext(Object) disposed}. However, in case the underlying polyglot
-     * context is being cancelled, {@link #disposeContext(Object)} is called even if
+     * context is being cancelled or hard-exited, {@link #disposeContext(Object)} is called even if
      * {@link #finalizeContext(Object)} throws a {@link TruffleException} or a {@link ThreadDeath}
-     * exception. All installed languages must remain usable after finalization. The finalization
-     * order can be influenced by specifying {@link Registration#dependentLanguages() language
-     * dependencies}. By default internal languages are finalized last, otherwise the default order
-     * is unspecified but deterministic.
+     * cancel or exit exception.
      * <p>
-     * While finalization code is run, other language contexts may become initialized. In such a
+     * For the hard exit a language is supposed to run its finalization actions that require running
+     * guest code in {@link #exitContext(Object, ExitMode, int)}, but please note that after
+     * {@link #exitContext(Object, ExitMode, int)} runs for a language, the language can still be
+     * invoked from {@link #exitContext(Object, ExitMode, int)} for a different language. Therefore,
+     * for instance, finalization for standard streams should both flush and set them to unbuffered
+     * mode at the end of exitContext, so that running guest code is not required to dispose the
+     * streams after that point.
+     * <p>
+     * All installed languages must remain usable after finalization. The finalization order can be
+     * influenced by specifying {@link Registration#dependentLanguages() language dependencies}. By
+     * default internal languages are finalized last, otherwise, the default order is unspecified
+     * but deterministic.
+     * <p>
+     * While the finalization code is run, other language contexts may become initialized. In such a
      * case, the finalization order may be non-deterministic and/or not respect the order specified
      * by language dependencies.
      * <p>
-     * All threads {@link Env#createThread(Runnable) created} by a language must be stopped and
+     * All threads {@link Env#createThread(Runnable) created} by the language must be stopped and
      * joined during finalizeContext. The languages are responsible for fulfilling that contract,
-     * otherwise an {@link AssertionError} is thrown. It's not safe to use the
+     * otherwise, an {@link AssertionError} is thrown. It's not safe to use the
      * {@link ExecutorService#awaitTermination(long, java.util.concurrent.TimeUnit)} to detect
      * Thread termination as the polyglot thread may be cancelled before executing the executor
      * worker.
      * <p>
+     * During finalizeContext, all unclosed inner contexts {@link Env#newContextBuilder() created}
+     * by the language must be left on all threads where the contexts are still active. No active
+     * inner context is allowed after {@link #finalizeContext(Object)} returns, otherwise it is an
+     * internal error.
+     * <p>
+     * Non-active inner contexts {@link Env#newContextBuilder() created} by the language that are
+     * still unclosed after {@link #finalizeContext(Object)} returns are automatically closed by
+     * Truffle.
+     * <p>
      * Typical implementation looks like:
      *
      * {@link TruffleLanguageSnippets.AsyncThreadLanguage#finalizeContext}
@@ -620,6 +639,60 @@ protected void initializeContext(C context) throws Exception {
     protected void finalizeContext(C context) {
     }
 
+    /**
+     * Performs language exit event actions that are necessary before language contexts are
+     * {@link #finalizeContext(Object) finalized}. However, in case the underlying polyglot context
+     * is being cancelled, {@link #exitContext(Object, ExitMode, int) exit notifications} are not
+     * executed. Also, for {@link ExitMode#HARD hard exit}, {@link #finalizeContext(Object)} is
+     * called even if {@link #exitContext(Object, ExitMode, int)} throws a {@link TruffleException}
+     * or a {@link ThreadDeath} cancel or exit exception. All initialized language contexts must
+     * remain usable after exit notifications. In case a {@link TruffleException} or the
+     * {@link ThreadDeath} exit exception is thrown during a {@link ExitMode#HARD hard exit
+     * notification}, it is just logged and otherwise ignored and the notification process continues
+     * with the next language in order. In case the {@link ThreadDeath} cancel exception is thrown,
+     * it means the context is being cancelled in which case the exit notification process
+     * immediately stops. The exit notification order can be influenced by specifying
+     * {@link Registration#dependentLanguages() language dependencies} - The exit notification for
+     * language A that depends on language B is executed before the exit notification for language
+     * B. By default, notifications for internal languages are executed last, otherwise, the default
+     * order is unspecified but deterministic.
+     * <p>
+     * During {@link ExitMode#HARD hard exit} notification, a language is supposed to run its
+     * finalization actions that require running guest code instead of running them in
+     * {@link #finalizeContext(Object)}.
+     * <p>
+     * While the exit notification code is run, all languages remain fully functional. Also, other
+     * language contexts may become initialized. In such a case, the notification order may be
+     * non-deterministic and/or not respect the order specified by language dependencies.
+     * <p>
+     * In case {@link TruffleContext#closeExited(Node, int)} is called during a
+     * {@link ExitMode#NATURAL natural exit notification}, it is ignored. In case it is called
+     * during a {@link ExitMode#HARD hard exit notification}, it just throws the special
+     * {@link ThreadDeath} exit exception, which is then just logged as described above.
+     * <p>
+     * In case the underlying polyglot context is cancelled by e.g.
+     * {@link TruffleContext#closeCancelled(Node, String)} during exit notifications, guest code
+     * executed during exit notification is regularly cancelled, i.e., throws the
+     * {@link ThreadDeath} cancel exception, and the notification process does not continue as
+     * described above.
+     * <p>
+     * In the case of {@link ExitMode#HARD hard exit}, if the current context has inner contexts
+     * that are still active, the execution for them will be stopped as well after all language exit
+     * notifications are executed for the outer context, but the exit notifications for the inner
+     * contexts are not automatically executed. The language needs to take appropriate action to
+     * make sure inner contexts are exited properly.
+     *
+     * @param context language context.
+     * @param exitMode mode of exit.
+     * @param exitCode exit code that was specified for exit.
+     * @see <a href= "https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md">Context
+     *      Exit</a>
+     *
+     * @since 22.0
+     */
+    protected void exitContext(C context, ExitMode exitMode, int exitCode) {
+    }
+
     /**
      * @since 19.0
      * @deprecated in 1.0. Got renamed to {@link #initializeMultipleContexts()} instead. Instead of
@@ -3381,8 +3454,8 @@ public Object createHostAdapterClassWithStaticOverrides(Class<?>[] types, Object
          * logger must not be stored in a TruffleLanguage subclass. It is recommended to create all
          * language loggers in {@link TruffleLanguage#createContext(Env)}.
          *
-         * @param loggerName the the name of a {@link TruffleLogger}, if a {@code loggerName} is
-         *            null or empty a root logger for language or instrument is returned
+         * @param loggerName the name of a {@link TruffleLogger}, if a {@code loggerName} is null or
+         *            empty a root logger for language or instrument is returned
          * @return a {@link TruffleLogger}
          * @since 21.1
          *
@@ -3968,6 +4041,27 @@ public enum ContextPolicy {
 
     }
 
+    /**
+     * Mode of exit operation.
+     *
+     * @since 22.0
+     * @see #exitContext(Object, ExitMode, int)
+     */
+    public enum ExitMode {
+        /**
+         * Natural exit that occurs during normal context close.
+         *
+         * @since 22.0
+         *
+         */
+        NATURAL,
+        /**
+         * Hard exit triggered by {@link TruffleContext#closeExited(Node, int)}.
+         *
+         * @since 22.0
+         */
+        HARD
+    }
 }
 
 class TruffleLanguageSnippets {
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
index a71a3669320c..1f7bb14dfd15 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
@@ -376,6 +376,8 @@ public final void detachOutputConsumer(DispatchOutputStream dos, OutputStream ou
 
         public abstract void closeContext(Object polyglotContext, boolean force, Node closeLocation, boolean resourceExhaused, String resourceExhausedReason);
 
+        public abstract void exitContext(Object polyglotContext, Node exitLocation, int exitCode);
+
         public abstract boolean isContextEntered(Object polyglotContext);
 
         public abstract boolean isContextActive(Object polyglotContext);
@@ -569,6 +571,8 @@ public abstract Process createSubProcess(Object polyglotLanguageContext, List<St
 
         public abstract boolean isContextCancelling(Object polyglotContext);
 
+        public abstract boolean isContextExiting(Object polyglotContext);
+
         public abstract Future<Void> pause(Object polyglotContext);
 
         public abstract void resume(Object polyglotContext, Future<Void> pauseFuture);
@@ -701,6 +705,8 @@ public abstract Env createEnv(Object polyglotLanguageContext, TruffleLanguage<?>
 
         public abstract void finalizeContext(Env localEnv);
 
+        public abstract void exitContext(Env localEnv, TruffleLanguage.ExitMode exitMode, int exitCode);
+
         public abstract Iterable<com.oracle.truffle.api.Scope> findLegacyLocalScopes(Env env, Node node, Frame frame);
 
         public abstract Iterable<com.oracle.truffle.api.Scope> findTopScopes(Env env);
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
index ae3e4fe8bbb8..156a05f6ae48 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
@@ -1371,6 +1371,13 @@ public boolean isContextCancelling(Object polyglotContext) {
             return localContextState.isCancelling();
         }
 
+        @Override
+        public boolean isContextExiting(Object polyglotContext) {
+            PolyglotContextImpl context = ((PolyglotContextImpl) polyglotContext);
+            PolyglotContextImpl.State contextState = context.state;
+            return contextState.isExiting();
+        }
+
         @Override
         public Future<Void> pause(Object polyglotContext) {
             PolyglotContextImpl context = ((PolyglotContextImpl) polyglotContext);
@@ -1408,12 +1415,12 @@ public void closeContext(Object impl, boolean force, Node closeLocation, boolean
             } else {
                 synchronized (context) {
                     /*
-                     * Closing the context on another thread done as a part of cancelling enters the
-                     * context which could lead to the following IllegalStateException if the
-                     * cancelling flag was not checked.
+                     * Closing the context on another thread done as a part of cancelling or exiting
+                     * enters the context which could lead to the following IllegalStateException if
+                     * the cancelling flag was not checked.
                      */
                     PolyglotContextImpl.State localContextState = context.state;
-                    if (context.isActiveNotCancelled(false) && !localContextState.isCancelling()) {
+                    if (context.isActiveNotCancelled(false) && !localContextState.isCancelling() && !localContextState.isExiting()) {
                         /*
                          * Polyglot threads are still allowed to run at this point. They are
                          * required to be finished after finalizeContext.
@@ -1512,6 +1519,12 @@ public boolean areStaticObjectSafetyChecksRelaxed(Object polyglotLanguageInstanc
         public String getStaticObjectStorageStrategy(Object polyglotLanguageInstance) {
             return ((PolyglotLanguageInstance) polyglotLanguageInstance).getEngine().getEngineOptionValues().get(PolyglotEngineOptions.StaticObjectStorageStrategy).name();
         }
+
+        @Override
+        public void exitContext(Object impl, Node exitLocation, int exitCode) {
+            PolyglotContextImpl context = ((PolyglotContextImpl) impl);
+            context.closeExited(exitLocation, exitCode);
+        }
     }
 
     abstract static class AbstractClassLoaderSupplier implements Supplier<ClassLoader> {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PauseThreadLocalAction.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PauseThreadLocalAction.java
index d4e21876e0d8..2b809d562231 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PauseThreadLocalAction.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PauseThreadLocalAction.java
@@ -72,7 +72,7 @@ protected void perform(ThreadLocalAction.Access access) {
                 public void apply(Object waitObject) throws InterruptedException {
                     synchronized (waitObject) {
                         PolyglotContextImpl.State localContextState = context.state;
-                        while (pause && !localContextState.isClosed() && !localContextState.isCancelling()) {
+                        while (pause && !localContextState.isClosed() && !localContextState.isCancelling() && !localContextState.isExiting()) {
                             waitObject.wait();
                         }
                     }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextConfig.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextConfig.java
index e8a2e5477c39..e3fa665fe9dd 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextConfig.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextConfig.java
@@ -94,6 +94,7 @@ final class PolyglotContextConfig {
     private final List<PolyglotInstrument> configuredInstruments;
     final HostAccess hostAccess;
     final boolean allowValueSharing;
+    final boolean useSystemExit;
 
     PolyglotContextConfig(PolyglotEngineImpl engine, OutputStream out, OutputStream err, InputStream in,
                     boolean hostLookupAllowed, PolyglotAccess polyglotAccess, boolean nativeAccessAllowed, boolean createThreadAllowed,
@@ -101,7 +102,7 @@ final class PolyglotContextConfig {
                     Predicate<String> classFilter, Map<String, String[]> applicationArguments,
                     EconomicSet<String> allowedPublicLanguages, Map<String, String> options, FileSystem publicFileSystem, FileSystem internalFileSystem, Handler logHandler,
                     boolean createProcessAllowed, ProcessHandler processHandler, EnvironmentAccess environmentAccess, Map<String, String> environment,
-                    ZoneId timeZone, PolyglotLimits limits, ClassLoader hostClassLoader, HostAccess hostAccess, boolean allowValueSharing) {
+                    ZoneId timeZone, PolyglotLimits limits, ClassLoader hostClassLoader, HostAccess hostAccess, boolean allowValueSharing, boolean useSystemExit) {
         assert out != null;
         assert err != null;
         assert in != null;
@@ -165,6 +166,7 @@ final class PolyglotContextConfig {
         this.environment = environment == null ? Collections.emptyMap() : environment;
         this.hostAccess = hostAccess;
         this.hostClassLoader = hostClassLoader;
+        this.useSystemExit = useSystemExit;
     }
 
     public ZoneId getTimeZone() {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
index fbdde245fb52..f39903316827 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -78,7 +78,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 
-import com.oracle.truffle.api.TruffleOptions;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.options.OptionValues;
 import org.graalvm.polyglot.Context;
@@ -98,6 +97,7 @@
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.interop.InteropLibrary;
@@ -107,6 +107,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
+import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.polyglot.PolyglotEngineImpl.CancelExecution;
 import com.oracle.truffle.polyglot.PolyglotEngineImpl.StableLocalLocations;
 import com.oracle.truffle.polyglot.PolyglotLanguageContext.ValueMigrationException;
@@ -137,18 +138,27 @@ final class PolyglotContextImpl implements com.oracle.truffle.polyglot.PolyglotI
         VALID_TRANSITIONS.put(State.DEFAULT, new State[]{
                         State.CLOSING,
                         State.INTERRUPTING,
-                        State.CANCELLING
+                        State.PENDING_EXIT,
+                        State.CANCELLING,
+                        State.EXITING, // only for child contexts
         });
         VALID_TRANSITIONS.put(State.CLOSING, new State[]{
                         State.CLOSED,
                         State.CLOSING_INTERRUPTING,
                         State.CLOSING_CANCELLING,
+                        State.CLOSING_EXITING,  // only for child contexts
                         State.DEFAULT
         });
         VALID_TRANSITIONS.put(State.INTERRUPTING, new State[]{
                         State.DEFAULT,
                         State.CLOSING_INTERRUPTING,
                         State.CANCELLING,
+                        State.PENDING_EXIT,
+                        State.EXITING,  // only for child contexts
+        });
+        VALID_TRANSITIONS.put(State.PENDING_EXIT, new State[]{
+                        State.EXITING,
+                        State.CANCELLING
         });
         VALID_TRANSITIONS.put(State.CANCELLING, new State[]{
                         State.CLOSING_CANCELLING
@@ -157,16 +167,26 @@ final class PolyglotContextImpl implements com.oracle.truffle.polyglot.PolyglotI
                         State.CLOSED,
                         State.CLOSING,
                         State.CLOSING_CANCELLING,
+                        State.CLOSING_EXITING,  // only for child contexts
                         State.INTERRUPTING
         });
         VALID_TRANSITIONS.put(State.CLOSING_CANCELLING, new State[]{
                         State.CLOSED_CANCELLED,
                         State.CANCELLING
         });
+        VALID_TRANSITIONS.put(State.CLOSING_EXITING, new State[]{
+                        State.CLOSED_EXITED,
+                        State.EXITING
+        });
+        VALID_TRANSITIONS.put(State.EXITING, new State[]{
+                        State.CLOSING_EXITING
+        });
         VALID_TRANSITIONS.put(State.CLOSED,
                         new State[0]);
         VALID_TRANSITIONS.put(State.CLOSED_CANCELLED,
                         new State[0]);
+        VALID_TRANSITIONS.put(State.CLOSED_EXITED,
+                        new State[0]);
     }
 
     enum State {
@@ -178,9 +198,20 @@ enum State {
          * Interrupt operation has been started. Threads are being interrupted.
          */
         INTERRUPTING,
+        /*
+         * Explicit exit was called in the DEFAULT or the INTERRUPTING state and exit notifications
+         * (see TruffleLanguage#exitContext) are about to be executed or are already executing. the
+         * PENDING_EXIT state overrides the INTERRUPTING state.
+         */
+        PENDING_EXIT,
+        /*
+         * Exit operation has been initiated after exit notifications were executed in the
+         * PENDING_EXIT state. Threads are being stopped.
+         */
+        EXITING,
         /*
          * Cancel operation has been initiated. Threads are being stopped. The CANCELLING state
-         * overrides the INTERRUPTING state.
+         * overrides the INTERRUPTING and the PENDING_EXIT state.
          */
         CANCELLING,
         /*
@@ -214,6 +245,12 @@ enum State {
          * case the state goes back to CANCELLING.
          */
         CLOSING_CANCELLING,
+        /*
+         * Close operation has been initiated and at the same time exit operation is in progress.
+         * Transition to this state can be only from the EXITING state. Close operation that started
+         * in the CLOSING_EXITING state must finish successfully, otherwise it is an internal error.
+         */
+        CLOSING_EXITING,
         /*
          * Closing operation in the CLOSING or the CLOSING_INTERRUPTING state has finished
          * successfully.
@@ -222,7 +259,11 @@ enum State {
         /*
          * Closing operation in the CLOSING_CANCELLING state has finished successfully.
          */
-        CLOSED_CANCELLED;
+        CLOSED_CANCELLED,
+        /*
+         * Closing operation in the CLOSING_EXITING state has finished successfully.
+         */
+        CLOSED_EXITED;
 
         /*
          * The context is not usable and may be in an inconsistent state.
@@ -230,9 +271,12 @@ enum State {
         boolean isInvalidOrClosed() {
             switch (this) {
                 case CANCELLING:
+                case EXITING:
                 case CLOSING_CANCELLING:
+                case CLOSING_EXITING:
                 case CLOSED:
                 case CLOSED_CANCELLED:
+                case CLOSED_EXITED:
                     return true;
                 default:
                     return false;
@@ -259,11 +303,22 @@ boolean isCancelling() {
             }
         }
 
+        boolean isExiting() {
+            switch (this) {
+                case EXITING:
+                case CLOSING_EXITING:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
         boolean isClosing() {
             switch (this) {
                 case CLOSING:
                 case CLOSING_INTERRUPTING:
                 case CLOSING_CANCELLING:
+                case CLOSING_EXITING:
                     return true;
                 default:
                     return false;
@@ -274,6 +329,7 @@ boolean isClosed() {
             switch (this) {
                 case CLOSED:
                 case CLOSED_CANCELLED:
+                case CLOSED_EXITED:
                     return true;
                 default:
                     return false;
@@ -283,6 +339,7 @@ boolean isClosed() {
         private boolean shouldCacheThreadInfo() {
             switch (this) {
                 case DEFAULT:
+                case PENDING_EXIT:
                     return true;
                 default:
                     return false;
@@ -308,14 +365,24 @@ private boolean isTransitionAllowed(State fromState, State toState) {
 
     private boolean isAdditionalTransitionConditionSatisfied(State fromState, State toState) {
         assert Thread.holdsLock(this);
-        if (fromState.isClosing() && !toState.isClosing()) {
-            return closingThread == Thread.currentThread();
+        if (fromState.isClosing() != toState.isClosing()) {
+            if (closingThread != Thread.currentThread()) {
+                return false;
+            }
+        }
+        if (!fromState.isExiting() && toState.isExiting() && fromState != State.PENDING_EXIT) {
+            if (parent == null) {
+                return false;
+            }
         }
         return true;
     }
 
     private ExecutorService cleanupExecutorService;
     private Future<?> cleanupFuture;
+    volatile int exitCode;
+    private volatile String exitMessage;
+    volatile Thread closeExitedTriggerThread;
     private volatile String invalidMessage;
     volatile boolean invalidResourceLimit;
     volatile Thread closingThread;
@@ -434,8 +501,12 @@ private PolyglotContextImpl() {
             this.state = State.INTERRUPTING;
         } else if (parent.state.isCancelling()) {
             this.state = State.CANCELLING;
+        } else if (parent.state.isExiting()) {
+            this.state = State.EXITING;
         }
         this.invalidMessage = this.parent.invalidMessage;
+        this.exitCode = this.parent.exitCode;
+        this.exitMessage = this.parent.exitMessage;
         this.contextBoundLoggers = this.parent.contextBoundLoggers;
         this.threadLocalActions = new PolyglotThreadLocalActions(this);
         if (!parent.config.logLevels.isEmpty()) {
@@ -594,7 +665,7 @@ Object[] enterThreadChanged(boolean notifyEnter, boolean enterReverted, boolean
                 PolyglotThreadInfo threadInfo = getCurrentThreadInfo();
                 if (enterReverted && threadInfo.getEnteredCount() == 0) {
                     threadLocalActions.notifyThreadActivation(threadInfo, false);
-                    if ((state.isCancelling() || state == State.CLOSED_CANCELLED) && !threadInfo.isActive()) {
+                    if ((state.isCancelling() || state.isExiting() || state == State.CLOSED_CANCELLED || state == State.CLOSED_EXITED) && !threadInfo.isActive()) {
                         notifyThreadClosed(threadInfo);
                     }
                     if (state.isInterrupting() && !threadInfo.isActive()) {
@@ -829,7 +900,7 @@ PolyglotThreadInfo leaveThreadChanged(Object[] prev, boolean notifyLeft, boolean
                 threadLocalActions.notifyThreadActivation(threadInfo, false);
             }
 
-            if ((state.isCancelling() || state == State.CLOSED_CANCELLED) && !info.isActive()) {
+            if ((state.isCancelling() || state.isExiting() || state == State.CLOSED_CANCELLED || state == State.CLOSED_EXITED) && !info.isActive()) {
                 notifyThreadClosed(info);
             }
 
@@ -1019,7 +1090,11 @@ void checkClosed() {
             /*
              * If invalidMessage == null, then invalid flag was set by close.
              */
-            throw createCancelException(null);
+            if (exitMessage == null) {
+                throw createCancelException(null);
+            } else {
+                throw createExitException(null);
+            }
         }
         if (state.isClosed()) {
             throw PolyglotEngineException.illegalState("The Context is already closed.");
@@ -1316,7 +1391,7 @@ void cancel(boolean resourceLimit, String message) {
 
     private void closeAndMaybeWait(boolean force, List<Future<Void>> futures) {
         if (force) {
-            PolyglotEngineImpl.cancel(this, futures);
+            PolyglotEngineImpl.cancelOrExit(this, futures);
         } else {
             boolean closeCompleted = closeImpl(true);
             if (!closeCompleted) {
@@ -1333,7 +1408,7 @@ private void closeAndMaybeWait(boolean force, List<Future<Void>> futures) {
 
     private void setState(State targetState) {
         assert Thread.holdsLock(this);
-        assert isTransitionAllowed(state, targetState);
+        assert isTransitionAllowed(state, targetState) : "Transition from " + state.name() + " to " + targetState.name() + " not allowed!";
         state = targetState;
         notifyAll();
     }
@@ -1342,7 +1417,7 @@ private List<Future<Void>> setInterrupting() {
         assert Thread.holdsLock(this);
         State targetState;
         List<Future<Void>> futures = new ArrayList<>();
-        if (!state.isInterrupting() && !state.isInvalidOrClosed()) {
+        if (!state.isInterrupting() && !state.isInvalidOrClosed() && state != State.PENDING_EXIT) {
             switch (state) {
                 case CLOSING:
                     targetState = State.CLOSING_INTERRUPTING;
@@ -1385,7 +1460,7 @@ private void finishInterruptForChildContexts() {
         }
     }
 
-    List<Future<Void>> interruptChildContexts() {
+    private List<Future<Void>> interruptChildContexts() {
         PolyglotContextImpl[] childContextsToInterrupt = null;
         List<Future<Void>> futures;
         synchronized (this) {
@@ -1449,7 +1524,7 @@ public boolean interrupt(Duration timeout) {
                  * threads being stopped. If that happens before the timeout, the interrupt is
                  * successful.
                  */
-                return PolyglotEngineImpl.cancelOrInterrupt(this, futures, startMillis, timeout);
+                return PolyglotEngineImpl.cancelOrExitOrInterrupt(this, futures, startMillis, timeout);
             } finally {
                 try {
                     if (childContextsToInterrupt != null) {
@@ -1707,14 +1782,9 @@ private List<Future<Void>> setCancelling(boolean resourceLimit, String message)
                 }
                 invalidResourceLimit = resourceLimit;
                 invalidMessage = message;
+                exitMessage = null;
                 setState(targetState);
-                PolyglotThreadInfo info = getCurrentThreadInfo();
-                futures.add(threadLocalActions.submit(null, PolyglotEngineImpl.ENGINE_ID, new CancellationThreadLocalAction(), true));
-                if (info != PolyglotThreadInfo.NULL) {
-                    info.cancelled = true;
-                    Thread.interrupted();
-                }
-                setCachedThreadInfo(PolyglotThreadInfo.NULL);
+                submitCancellationThreadLocalAction(futures);
                 childContextsToCancel = childContexts.toArray(new PolyglotContextImpl[childContexts.size()]);
             }
         }
@@ -1726,8 +1796,57 @@ private List<Future<Void>> setCancelling(boolean resourceLimit, String message)
         return futures;
     }
 
+    private void submitCancellationThreadLocalAction(List<Future<Void>> futures) {
+        PolyglotThreadInfo info = getCurrentThreadInfo();
+        futures.add(threadLocalActions.submit(null, PolyglotEngineImpl.ENGINE_ID, new CancellationThreadLocalAction(), true));
+        if (info != PolyglotThreadInfo.NULL) {
+            info.cancelled = true;
+            Thread.interrupted();
+        }
+        setCachedThreadInfo(PolyglotThreadInfo.NULL);
+    }
+
+    private List<Future<Void>> setExiting(PolyglotContextImpl triggeringParent, String message) {
+        PolyglotContextImpl[] childContextsToCancel = null;
+        List<Future<Void>> futures = new ArrayList<>();
+        synchronized (this) {
+            if (!state.isInvalidOrClosed()) {
+                assert message != null;
+                State targetState;
+                if (state.isClosing()) {
+                    targetState = State.CLOSING_EXITING;
+                } else {
+                    targetState = State.EXITING;
+                }
+                invalidMessage = message;
+                if (triggeringParent != null) {
+                    /*
+                     * triggeringParent is not null (and equal to parent) if the exit was initiated
+                     * by some ancestor of this context (not necessarily the parent) and not this
+                     * context directly. This means that the triggeringParent can be null even if
+                     * parent is not null.
+                     */
+                    exitMessage = triggeringParent.exitMessage;
+                    exitCode = triggeringParent.exitCode;
+                }
+                setState(targetState);
+                if (!config.useSystemExit) {
+                    submitCancellationThreadLocalAction(futures);
+                }
+                childContextsToCancel = childContexts.toArray(new PolyglotContextImpl[childContexts.size()]);
+            }
+        }
+        if (childContextsToCancel != null) {
+            for (PolyglotContextImpl childCtx : childContextsToCancel) {
+                futures.addAll(childCtx.setExiting(this, message));
+            }
+        }
+        return futures;
+    }
+
     private void setClosingState() {
         assert Thread.holdsLock(this);
+        setCachedThreadInfo(PolyglotThreadInfo.NULL);
         closingThread = Thread.currentThread();
         closingLock.lock();
         State targetState;
@@ -1738,6 +1857,9 @@ private void setClosingState() {
             case INTERRUPTING:
                 targetState = State.CLOSING_INTERRUPTING;
                 break;
+            case EXITING:
+                targetState = State.CLOSING_EXITING;
+                break;
             default:
                 targetState = State.CLOSING;
                 break;
@@ -1753,6 +1875,9 @@ private void setClosedState() {
             case CLOSING_CANCELLING:
                 targetState = State.CLOSED_CANCELLED;
                 break;
+            case CLOSING_EXITING:
+                targetState = State.CLOSED_EXITED;
+                break;
             case CLOSING_INTERRUPTING:
             case CLOSING:
                 targetState = State.CLOSED;
@@ -1776,6 +1901,9 @@ private void restoreFromClosingState(boolean cancelOperation) {
             case CLOSING_CANCELLING:
                 targetState = State.CANCELLING;
                 break;
+            case CLOSING_EXITING:
+                targetState = State.EXITING;
+                break;
             default:
                 targetState = State.DEFAULT;
                 break;
@@ -1789,12 +1917,12 @@ boolean closeImpl(boolean notifyInstruments) {
 
         /*
          * Close operation initiated in the DEFAULT or INTERRUPTING state can fail in which case the
-         * context will go back to the corresponsing non-closing e.g. DEFAULT -> CLOSING -> DEFAULT.
-         * Please note that while the default close is in progress, i.e. the context state is in
-         * CLOSING or CLOSING_INTERRUPTING state, the state can be overriden by CLOSING_CANCELLING.
-         * Even in this case the default close can still fail and if that is the case the context
-         * state goes back to CANCELLING. The close operation is then guaranteed to be completed by
-         * the process that initiated cancel.
+         * context will go back to the corresponsing non-closing state e.g. DEFAULT -> CLOSING ->
+         * DEFAULT. Please note that while the default close is in progress, i.e. the context state
+         * is in CLOSING or CLOSING_INTERRUPTING state, the state can be overriden by
+         * CLOSING_CANCELLING state. Even in this case the default close can still fail and if that
+         * is the case the context state goes back to the CANCELLING state. The close operation is
+         * then guaranteed to be completed by the process that initiated cancel or exit.
          *
          * This block performs the following checks:
          *
@@ -1805,18 +1933,22 @@ boolean closeImpl(boolean notifyInstruments) {
          * 3) The close is currently being performed on another thread -> wait for the other thread
          * to finish closing and start checking again from check 1).
          *
-         * 4) The close was not yet performed, cancelling or executing is not in progress, but other
-         * threads are still executing -> return false
+         * 4) The close was not yet performed, cancelling or exiting is not in progress, the context
+         * is not in the PENDING_EXIT state, but other threads are still executing -> return false
          *
-         * 5) The close was not yet performed and cancelling is in progress -> wait for other
-         * threads to complete and start checking again from check 1) skipping check 5) (this check)
-         * as no other threads can be executing anymore.
+         * 5) The close was not yet performed and the context is in the PENDING_EXIT state -> wait
+         * for the context to go to an invalid state (cancelling, exititng, or their closing or
+         * closed variants) and start checking from check 1).
+         * 
+         * 6) The close was not yet performed and cancelling or exiting is in progress -> wait for
+         * other threads to complete and start checking again from check 1) skipping check 6) (this
+         * check) as no other threads can be executing anymore.
          *
-         * 6) The close was not yet performed and no thread is executing -> perform close
+         * 7) The close was not yet performed and no thread is executing -> perform close
          */
         boolean waitForClose = false;
-        boolean finishCancel = false;
-        boolean cancelOperation;
+        boolean finishCancelOrExit = false;
+        boolean cancelOrExitOperation;
         acquireClosingLock: while (true) {
             if (waitForClose) {
                 closingLock.lock();
@@ -1827,10 +1959,12 @@ boolean closeImpl(boolean notifyInstruments) {
                 switch (state) {
                     case CLOSED:
                     case CLOSED_CANCELLED:
+                    case CLOSED_EXITED:
                         return true;
                     case CLOSING:
                     case CLOSING_INTERRUPTING:
                     case CLOSING_CANCELLING:
+                    case CLOSING_EXITING:
                         assert closingThread != null;
                         if (closingThread == Thread.currentThread()) {
                             // currently closing recursively -> just complete
@@ -1841,21 +1975,30 @@ boolean closeImpl(boolean notifyInstruments) {
                             waitForClose = true;
                             continue acquireClosingLock;
                         }
+                    case PENDING_EXIT:
+                        while (!state.isInvalidOrClosed()) {
+                            try {
+                                wait();
+                            } catch (InterruptedException ie) {
+                            }
+                        }
+                        continue acquireClosingLock;
                     case CANCELLING:
+                    case EXITING:
                         assert cachedThreadInfo == PolyglotThreadInfo.NULL;
                         /*
-                         * When cancelling, we have to wait for all other threads to complete - even
-                         * for the the default close, otherwise the default close executed
-                         * prematurely as the result of leaving the context on the main thread due
-                         * to cancel exception could fail because of other threads still being
-                         * active. The correct behavior is that the normal close finishes
+                         * When cancelling or exiting, we have to wait for all other threads to
+                         * complete - even for the the default close, otherwise the default close
+                         * executed prematurely as the result of leaving the context on the main
+                         * thread due to cancel exception could fail because of other threads still
+                         * being active. The correct behavior is that the normal close finishes
                          * successfully and the cancel exception spreads further (if not caught
                          * before close is executed).
                          */
-                        if (!finishCancel) {
+                        if (!finishCancelOrExit) {
                             waitForThreads(0, 0);
                             waitForClose = true;
-                            finishCancel = true;
+                            finishCancelOrExit = true;
                             /*
                              * During wait this thread didn't hold the polyglot context lock, so
                              * some other thread might have acquired closingLock in the meantime. In
@@ -1870,14 +2013,14 @@ boolean closeImpl(boolean notifyInstruments) {
                         /*
                          * Just continue with the close if we have already waited for threads in the
                          * previous iteration of the main loop. We cannot wait for the close to be
-                         * completed by the thread that executes cancelling, because it might be
-                         * waiting for this thread which would lead to a deadlock. Default close is
-                         * allowed to be executed when entered. Also, this might be an inner
-                         * context, which, even if not entered, might block a parent's thread which
-                         * could be entered on the current thread.
+                         * completed by the thread that executes cancelling or exiting, because it
+                         * might be waiting for this thread which would lead to a deadlock. Default
+                         * close is allowed to be executed when entered. Also, this might be an
+                         * inner context, which, even if not entered, might block a parent's thread
+                         * which could be entered on the current thread.
                          */
                         setClosingState();
-                        cancelOperation = true;
+                        cancelOrExitOperation = true;
                         break acquireClosingLock;
                     case INTERRUPTING:
                     case DEFAULT:
@@ -1890,15 +2033,15 @@ boolean closeImpl(boolean notifyInstruments) {
                             return false;
                         }
                         setClosingState();
-                        cancelOperation = false;
+                        cancelOrExitOperation = false;
                         break acquireClosingLock;
                     default:
-                        assert false;
+                        assert false : state.name();
                 }
             }
         }
 
-        return finishClose(cancelOperation, notifyInstruments);
+        return finishClose(cancelOrExitOperation, notifyInstruments);
     }
 
     synchronized void clearExplicitContextStack() {
@@ -1917,7 +2060,7 @@ synchronized void clearExplicitContextStack() {
         }
     }
 
-    private boolean finishClose(boolean cancelOperation, boolean notifyInstruments) {
+    private boolean finishClose(boolean cancelOrExitOperation, boolean notifyInstruments) {
         /*
          * If we reach here then we can continue with the close. This means that no other concurrent
          * close is running and no other thread is currently executing. Note that only the context
@@ -1932,14 +2075,14 @@ private boolean finishClose(boolean cancelOperation, boolean notifyInstruments)
             assert !state.isClosed();
             Object[] prev;
             try {
-                prev = this.enterThreadChanged(false, false, !cancelOperation, cancelOperation);
+                prev = this.enterThreadChanged(false, false, !cancelOrExitOperation, cancelOrExitOperation);
             } catch (Throwable t) {
                 synchronized (this) {
-                    restoreFromClosingState(cancelOperation);
+                    restoreFromClosingState(cancelOrExitOperation);
                 }
                 throw t;
             }
-            if (cancelOperation) {
+            if (cancelOrExitOperation) {
                 synchronized (this) {
                     /*
                      * Cancellation thread local action needs to be submitted here in case
@@ -1949,9 +2092,26 @@ private boolean finishClose(boolean cancelOperation, boolean notifyInstruments)
                 }
             }
             try {
-                closeChildContexts(notifyInstruments);
+                if (cancelOrExitOperation) {
+                    closeChildContexts(notifyInstruments);
+                } else {
+                    exitContextNotification(TruffleLanguage.ExitMode.NATURAL, 0);
+                }
+
+                finalizeContext(notifyInstruments, cancelOrExitOperation);
 
-                finalizeContext(notifyInstruments, cancelOperation);
+                List<PolyglotContextImpl> unclosedChildContexts;
+                synchronized (this) {
+                    unclosedChildContexts = getUnclosedChildContexts();
+                }
+                for (PolyglotContextImpl childCtx : unclosedChildContexts) {
+                    if (childCtx.isActive()) {
+                        throw new IllegalStateException("There is an active child contexts after finalizeContext!");
+                    }
+                }
+                if (!unclosedChildContexts.isEmpty()) {
+                    closeChildContexts(notifyInstruments);
+                }
 
                 // finalization performed commit close -> no reinitialization allowed
 
@@ -1962,9 +2122,11 @@ private boolean finishClose(boolean cancelOperation, boolean notifyInstruments)
                 synchronized (this) {
                     /*
                      * The assert is synchronized because all accesses to childContexts must be
-                     * synchronized.
+                     * synchronized. We cannot simply assert that childContexts are empty, because
+                     * removing the child context from its parent childContexts list can be done in
+                     * another thread after the assertion.
                      */
-                    assert !success || childContextsClosed() : "Polyglot context close marked as successful, but there are unclosed child contexts.";
+                    assert !success || getUnclosedChildContexts().isEmpty() : "Polyglot context close marked as successful, but there are unclosed child contexts.";
                     this.leaveThreadChanged(prev, false, true);
                     if (success) {
                         remainingThreads = threads.keySet().toArray(new Thread[0]);
@@ -1972,7 +2134,7 @@ private boolean finishClose(boolean cancelOperation, boolean notifyInstruments)
                     if (success) {
                         setClosedState();
                     } else {
-                        restoreFromClosingState(cancelOperation);
+                        restoreFromClosingState(cancelOrExitOperation);
                     }
                     disposing = false;
                     // triggers a thread changed event which requires slow path enter
@@ -2057,19 +2219,15 @@ private boolean finishClose(boolean cancelOperation, boolean notifyInstruments)
         return true;
     }
 
-    /**
-     * Used in assertion only. We cannot simply assert that childContexts are empty, because
-     * removing the child context from its parent childContexts list can be done in another thread
-     * after the assertion.
-     */
-    private boolean childContextsClosed() {
+    private List<PolyglotContextImpl> getUnclosedChildContexts() {
         assert Thread.holdsLock(this);
+        List<PolyglotContextImpl> unclosedChildContexts = new ArrayList<>();
         for (PolyglotContextImpl childCtx : childContexts) {
             if (!childCtx.state.isClosed()) {
-                return false;
+                unclosedChildContexts.add(childCtx);
             }
         }
-        return true;
+        return unclosedChildContexts;
     }
 
     private void closeChildContexts(boolean notifyInstruments) {
@@ -2082,6 +2240,123 @@ private void closeChildContexts(boolean notifyInstruments) {
         }
     }
 
+    static final class ExitException extends ThreadDeath {
+        private static final long serialVersionUID = -4838571769179260137L;
+
+        private final Node location;
+        private final String exitMessage;
+        private final int exitCode;
+
+        ExitException(Node location, int exitCode, String exitMessage) {
+            this.location = location;
+            this.exitCode = exitCode;
+            this.exitMessage = exitMessage;
+        }
+
+        Node getLocation() {
+            return location;
+        }
+
+        SourceSection getSourceLocation() {
+            return location == null ? null : location.getEncapsulatingSourceSection();
+        }
+
+        @Override
+        public String getMessage() {
+            return exitMessage;
+        }
+
+        int getExitCode() {
+            return exitCode;
+        }
+    }
+
+    private boolean setPendingExit(int code) {
+        synchronized (this) {
+            State targetState;
+            if (state == State.DEFAULT || state == State.INTERRUPTING) {
+                targetState = State.PENDING_EXIT;
+                exitCode = code;
+                exitMessage = "Exit was called with exit code " + code + ".";
+                closeExitedTriggerThread = Thread.currentThread();
+                setState(targetState);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void closeExited(Node exitLocation, int code) {
+        if (setPendingExit(code)) {
+            /*
+             * If this thread set PENDING_EXIT state and ran exit notifications, it will also be the
+             * one to execute the transition to EXITING state, unless the exit notifications were
+             * cancelled by cancelling the whole context.
+             */
+            exitContextNotification(TruffleLanguage.ExitMode.HARD, code);
+            List<Future<Void>> futures = setExiting(null, exitMessage);
+            if (!futures.isEmpty()) {
+                closeHereOrCancelInCleanupThread(futures);
+            }
+        } else {
+            synchronized (this) {
+                if (!state.isInvalidOrClosed()) {
+                    /*
+                     * Normally, if closeExited is called more than once, the subsequent calls wait
+                     * until the context is invalid, which means that either the first call to
+                     * closeExited finished running the exit notifications and set the context state
+                     * to the (invalid) state EXITING, or the context was cancelled during the exit
+                     * notifications and it is in the (invalid) state CANCELLING. However, we cannot
+                     * wait for the invalid state when closeExited is called from an exit
+                     * notification because the invalid state is only set when exit notifications
+                     * are finished or cancelled, and so in these cases, we throw the exit exception
+                     * immediately.
+                     */
+                    PolyglotThreadInfo info = getCurrentThreadInfo();
+                    if (closeExitedTriggerThread == info.getThread() || (info.isPolyglotThread(this) && ((PolyglotThread) info.getThread()).hardExitNotificationThread)) {
+                        throw createExitException(exitLocation);
+                    }
+                }
+            }
+        }
+
+        /*
+         * It is possible that the context is not invalid, but the exit operation was not allowed,
+         * because the context is being closed in which case the state is neither invalid nor
+         * PENDING_EXIT. In this case the closeExited operation is a no-op.
+         */
+        State localState = state;
+        if (localState == State.PENDING_EXIT || localState.isInvalidOrClosed()) {
+            /*
+             * Wait for the context to become invalid. If this is the first call to closeExited that
+             * ran the exit notifications and set the exiting state, then the context is already
+             * invalid, otherwise we wait here until the first call to closeExited has done its job.
+             */
+            TruffleSafepoint.setBlockedThreadInterruptible(exitLocation, new TruffleSafepoint.Interruptible<PolyglotContextImpl>() {
+                @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
+                @Override
+                public void apply(PolyglotContextImpl ctx) throws InterruptedException {
+                    synchronized (ctx) {
+                        while (!ctx.state.isInvalidOrClosed()) {
+                            ctx.wait();
+                        }
+                    }
+                }
+            }, this);
+
+            localState = state;
+            if (config.useSystemExit && (localState.isExiting() || localState == State.CLOSED_EXITED)) {
+                System.exit(exitCode);
+            }
+            /*
+             * Poll will throw the correct exception. Either the ThreadDeath exit or the ThreadDeath
+             * cancel exception based on whether the exit notifications were finished and the hard
+             * exit can be completed, or the context was cancelled during exit notifications.
+             */
+            TruffleSafepoint.pollHere(exitLocation);
+        }
+    }
+
     private void closeHereOrCancelInCleanupThread(List<Future<Void>> futures) {
         boolean cancelInSeparateThread = false;
         synchronized (this) {
@@ -2106,7 +2381,7 @@ private void closeHereOrCancelInCleanupThread(List<Future<Void>> futures) {
                 registerCleanupTask(new Runnable() {
                     @Override
                     public void run() {
-                        PolyglotEngineImpl.cancel(PolyglotContextImpl.this, futures);
+                        PolyglotEngineImpl.cancelOrExit(PolyglotContextImpl.this, futures);
                     }
                 });
             }
@@ -2202,9 +2477,37 @@ private List<PolyglotLanguageContext> disposeContext() {
         return disposedContexts;
     }
 
-    private void finalizeContext(boolean notifyInstruments, boolean cancelOperation) {
+    private void exitContextNotification(TruffleLanguage.ExitMode exitMode, int code) {
+        // we need to run exit notifications at least twice in case an exit notification run has
+        // initialized new contexts
+        boolean exitNotificationPerformed;
+        try {
+            do {
+                exitNotificationPerformed = false;
+                for (int i = contexts.length - 1; i >= 0; i--) {
+                    PolyglotLanguageContext context = contexts[i];
+                    if (context.isInitialized()) {
+                        exitNotificationPerformed |= context.exitContext(exitMode, code);
+                    }
+                }
+            } while (exitNotificationPerformed);
+        } catch (Throwable t) {
+            if (exitMode == TruffleLanguage.ExitMode.HARD) {
+                if (t instanceof PolyglotEngineImpl.CancelExecution) {
+                    engine.getEngineLogger().log(Level.FINE, "Execution was cancelled during exit notifications!", t);
+                } else {
+                    throw t;
+                }
+            } else {
+                throw t;
+            }
+        }
+
+    }
+
+    private void finalizeContext(boolean notifyInstruments, boolean cancelOrExitOperation) {
         // we need to run finalization at least twice in case a finalization run has
-        // initialized a new contexts
+        // initialized new contexts
         boolean finalizationPerformed;
         do {
             finalizationPerformed = false;
@@ -2213,14 +2516,14 @@ private void finalizeContext(boolean notifyInstruments, boolean cancelOperation)
             for (int i = contexts.length - 1; i >= 0; i--) {
                 PolyglotLanguageContext context = contexts[i];
                 if (context.isInitialized()) {
-                    finalizationPerformed |= context.finalizeContext(cancelOperation, notifyInstruments);
+                    finalizationPerformed |= context.finalizeContext(cancelOrExitOperation, notifyInstruments);
                 }
             }
         } while (finalizationPerformed);
     }
 
     synchronized void sendInterrupt() {
-        if (!state.isInterrupting() && !state.isCancelling()) {
+        if (!state.isInterrupting() && !state.isCancelling() && !state.isExiting()) {
             return;
         }
         for (PolyglotThreadInfo threadInfo : threads.values()) {
@@ -2501,7 +2804,7 @@ static PolyglotContextImpl preInitialize(final PolyglotEngineImpl engine) {
                         allowedLanguages,
                         Collections.emptyMap(),
                         fs, internalFs, engine.logHandler, false, null,
-                        EnvironmentAccess.INHERIT, null, null, null, null, null, true);
+                        EnvironmentAccess.INHERIT, null, null, null, null, null, true, false);
 
         final PolyglotContextImpl context = new PolyglotContextImpl(engine, config);
         synchronized (engine.lock) {
@@ -2661,6 +2964,10 @@ private CancelExecution createCancelException(Node location) {
         return new CancelExecution(location, invalidMessage, invalidResourceLimit);
     }
 
+    private ExitException createExitException(Node location) {
+        return new ExitException(location, exitCode, exitMessage);
+    }
+
     private static boolean overridesPatchContext(String languageId) {
         if (TruffleOptions.AOT) {
             return LanguageCache.overridesPathContext(languageId);
@@ -2725,8 +3032,12 @@ protected void perform(Access access) {
             PolyglotContextImpl.this.threadLocalActions.submit(new Thread[]{access.getThread()}, PolyglotEngineImpl.ENGINE_ID, this, new HandshakeConfig(true, false, false, true));
 
             State localState = PolyglotContextImpl.this.state;
-            if (localState.isInvalidOrClosed() || localState.isCancelling()) {
-                throw createCancelException(access.getLocation());
+            if (localState.isCancelling() || localState.isExiting() || localState == State.CLOSED_CANCELLED || localState == State.CLOSED_EXITED) {
+                if (localState.isExiting() || localState == State.CLOSED_EXITED) {
+                    throw createExitException(access.getLocation());
+                } else {
+                    throw createCancelException(access.getLocation());
+                }
             }
         }
     }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
index 665b008f881c..2e13ea7120e8 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
@@ -141,12 +141,12 @@ public Context createContext(Object oreceiver, OutputStream out, OutputStream er
                     boolean allowNativeAccess, boolean allowCreateThread, boolean allowHostIO, boolean allowHostClassLoading, boolean allowExperimentalOptions, Predicate<String> classFilter,
                     Map<String, String> options, Map<String, String[]> arguments, String[] onlyLanguages, FileSystem fileSystem, Object logHandlerOrStream, boolean allowCreateProcess,
                     ProcessHandler processHandler, EnvironmentAccess environmentAccess, Map<String, String> environment, ZoneId zone, Object limitsImpl, String currentWorkingDirectory,
-                    ClassLoader hostClassLoader, boolean allowValueSharing) {
+                    ClassLoader hostClassLoader, boolean allowValueSharing, boolean useSystemExit) {
         PolyglotEngineImpl receiver = (PolyglotEngineImpl) oreceiver;
         PolyglotContextImpl context = receiver.createContext(out, err, in, allowHostAccess, hostAccess, polyglotAccess, allowNativeAccess, allowCreateThread, allowHostIO, allowHostClassLoading,
                         allowExperimentalOptions,
                         classFilter, options, arguments, onlyLanguages, fileSystem, logHandlerOrStream, allowCreateProcess, processHandler, environmentAccess, environment, zone, limitsImpl,
-                        currentWorkingDirectory, hostClassLoader, allowValueSharing);
+                        currentWorkingDirectory, hostClassLoader, allowValueSharing, useSystemExit);
         return polyglot.getAPIAccess().newContext(polyglot.contextDispatch, context, context.engine.api);
     }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
index 7445dfed8b22..7936693f072c 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
@@ -1393,12 +1393,12 @@ public void run() {
         }
     }
 
-    static void cancel(PolyglotContextImpl context, List<Future<Void>> cancelationFutures) {
-        cancelOrInterrupt(context, cancelationFutures, 0, null);
+    static void cancelOrExit(PolyglotContextImpl context, List<Future<Void>> cancelationFutures) {
+        cancelOrExitOrInterrupt(context, cancelationFutures, 0, null);
     }
 
     @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
-    static boolean cancelOrInterrupt(PolyglotContextImpl context, List<Future<Void>> futures, long startMillis, Duration timeout) {
+    static boolean cancelOrExitOrInterrupt(PolyglotContextImpl context, List<Future<Void>> futures, long startMillis, Duration timeout) {
         try {
             synchronized (context) {
                 assert context.singleThreaded || !context.isActive(Thread.currentThread()) : "Cancel while entered is only allowed for single-threaded contexts!";
@@ -1541,7 +1541,7 @@ public PolyglotContextImpl createContext(OutputStream configOut, OutputStream co
                     boolean allowHostClassLoading, boolean allowExperimentalOptions, Predicate<String> classFilter, Map<String, String> options,
                     Map<String, String[]> arguments, String[] onlyLanguages, FileSystem fileSystem, Object logHandlerOrStream, boolean allowCreateProcess, ProcessHandler processHandler,
                     EnvironmentAccess environmentAccess, Map<String, String> environment, ZoneId zone, Object limitsImpl, String currentWorkingDirectory, ClassLoader hostClassLoader,
-                    boolean allowValueSharing) {
+                    boolean allowValueSharing, boolean useSystemExit) {
         PolyglotContextImpl context;
         boolean replayEvents;
         boolean contextAddedToEngine;
@@ -1616,7 +1616,7 @@ public PolyglotContextImpl createContext(OutputStream configOut, OutputStream co
             PolyglotContextConfig config = new PolyglotContextConfig(this, useOut, useErr, useIn,
                             allowHostLookup, polyglotAccess, allowNativeAccess, allowCreateThread, allowHostClassLoading,
                             allowExperimentalOptions, classFilter, arguments, allowedLanguages, options, fs, internalFs, useHandler, allowCreateProcess, useProcessHandler,
-                            environmentAccess, environment, zone, polyglotLimits, hostClassLoader, hostAccess, allowValueSharing);
+                            environmentAccess, environment, zone, polyglotLimits, hostClassLoader, hostAccess, allowValueSharing, useSystemExit);
             context = loadPreinitializedContext(config);
             replayEvents = false;
             contextAddedToEngine = false;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
index 99ccb20ea127..472d364ebcfa 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
@@ -40,6 +40,8 @@
  */
 package com.oracle.truffle.polyglot;
 
+import static com.oracle.truffle.polyglot.PolyglotContextImpl.State.CLOSED_EXITED;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -101,17 +103,17 @@ final class PolyglotExceptionImpl {
     private final Value guestObject;
     private final String message;
 
-    PolyglotExceptionImpl(PolyglotEngineImpl engine, PolyglotContextImpl.State polyglotContextState, boolean polyglotContextResourceExhausted, Throwable original) {
-        this(engine.impl, engine, polyglotContextState, polyglotContextResourceExhausted, null, original, false, false);
+    PolyglotExceptionImpl(PolyglotEngineImpl engine, PolyglotContextImpl.State polyglotContextState, boolean polyglotContextResourceExhausted, int exitCode, Throwable original) {
+        this(engine.impl, engine, polyglotContextState, polyglotContextResourceExhausted, exitCode, null, original, false, false);
     }
 
     // Exception coming from an instrument
     PolyglotExceptionImpl(PolyglotImpl polyglot, Throwable original) {
-        this(polyglot, null, null, false, null, original, true, false);
+        this(polyglot, null, null, false, 0, null, original, true, false);
     }
 
     @SuppressWarnings("deprecation")
-    PolyglotExceptionImpl(PolyglotImpl polyglot, PolyglotEngineImpl engine, PolyglotContextImpl.State polyglotContextState, boolean polyglotContextResourceExhausted,
+    PolyglotExceptionImpl(PolyglotImpl polyglot, PolyglotEngineImpl engine, PolyglotContextImpl.State polyglotContextState, boolean polyglotContextResourceExhausted, int exitCode,
                     PolyglotLanguageContext languageContext,
                     Throwable original,
                     boolean allowInterop,
@@ -185,25 +187,33 @@ final class PolyglotExceptionImpl {
             this.cancelled = cancelInducedTruffleOrInterruptException || (exception instanceof CancelExecution) || isLegacyTruffleExceptionCancelled(exception);
             this.resourceExhausted = resourceLimitError != null || (cancelInducedTruffleOrInterruptException && polyglotContextResourceExhausted);
             this.interrupted = interruptException && !this.cancelled;
-            this.internal = !interrupted && !cancelled && !resourceExhausted;
             this.syntaxError = false;
             this.incompleteSource = false;
-            if (allowInterop) {
-                this.exit = isLegacyTruffleExceptionExit(exception);
-                this.exitStatus = exit ? getLegacyTruffleExceptionExitStatus(exception) : 0;
-                this.guestObject = getLegacyTruffleExceptionGuestObject(languageContext, exception);
-            } else {
-                this.exit = false;
-                this.exitStatus = 0;
+            com.oracle.truffle.api.source.SourceSection location = null;
+            boolean exitInducedTruffleOrInterruptException = (polyglotContextState != null &&
+                            (polyglotContextState.isExiting() || polyglotContextState == CLOSED_EXITED) &&
+                            (interruptException || truffleException));
+            if (exitInducedTruffleOrInterruptException || exception instanceof PolyglotContextImpl.ExitException) {
+                this.exit = true;
+                this.exitStatus = exception instanceof PolyglotContextImpl.ExitException ? ((PolyglotContextImpl.ExitException) exception).getExitCode() : exitCode;
                 this.guestObject = null;
+                location = exception instanceof PolyglotContextImpl.ExitException ? ((PolyglotContextImpl.ExitException) exception).getSourceLocation() : null;
+            } else {
+                if (allowInterop) {
+                    this.exit = isLegacyTruffleExceptionExit(exception);
+                    this.exitStatus = exit ? getLegacyTruffleExceptionExitStatus(exception) : 0;
+                    this.guestObject = getLegacyTruffleExceptionGuestObject(languageContext, exception);
+                } else {
+                    this.exit = false;
+                    this.exitStatus = 0;
+                    this.guestObject = null;
+                }
             }
-            com.oracle.truffle.api.source.SourceSection location;
+            this.internal = !interrupted && !cancelled && !resourceExhausted && !exit;
             if (exception instanceof CancelExecution) {
                 location = ((CancelExecution) exception).getSourceLocation();
             } else if (allowInterop) {
                 location = getLegacyTruffleExceptionSourceLocation(exception);
-            } else {
-                location = null;
             }
             this.sourceLocation = location != null ? newSourceSection(location) : null;
         }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
index 73327ca6c2b1..1d9e9bdf7903 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
@@ -494,10 +494,10 @@ static <T extends Throwable> PolyglotException guestToHostException(PolyglotLang
         PolyglotExceptionImpl exceptionImpl;
         PolyglotContextImpl.State localContextState = context.state;
         if (localContextState.isInvalidOrClosed()) {
-            exceptionImpl = new PolyglotExceptionImpl(context.engine, localContextState, context.invalidResourceLimit, e);
+            exceptionImpl = new PolyglotExceptionImpl(context.engine, localContextState, context.invalidResourceLimit, context.exitCode, e);
         } else {
             try {
-                exceptionImpl = new PolyglotExceptionImpl(languageContext.getImpl(), languageContext.context.engine, localContextState, false,
+                exceptionImpl = new PolyglotExceptionImpl(languageContext.getImpl(), languageContext.context.engine, localContextState, false, 0,
                                 languageContext, e, true, entered);
             } catch (Throwable t) {
                 /*
@@ -505,7 +505,7 @@ static <T extends Throwable> PolyglotException guestToHostException(PolyglotLang
                  * Report the exception as an internal error.
                  */
                 e.addSuppressed(t);
-                exceptionImpl = new PolyglotExceptionImpl(context.engine, localContextState, false, e);
+                exceptionImpl = new PolyglotExceptionImpl(context.engine, localContextState, false, 0, e);
             }
         }
         APIAccess access = getInstance().getAPIAccess();
@@ -517,7 +517,7 @@ static <T extends Throwable> PolyglotException guestToHostException(PolyglotEngi
         PolyglotEngineException.rethrow(e);
 
         APIAccess access = engine.getAPIAccess();
-        PolyglotExceptionImpl exceptionImpl = new PolyglotExceptionImpl(engine, null, false, e);
+        PolyglotExceptionImpl exceptionImpl = new PolyglotExceptionImpl(engine, null, false, 0, e);
         return access.newLanguageException(exceptionImpl.getMessage(), getInstance().exceptionDispatch, exceptionImpl);
     }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
index 7e8e8a3d707e..63a2f2b0aeb1 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
@@ -70,6 +70,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Cached;
@@ -218,6 +219,7 @@ private void addDependentLanguages(PolyglotEngineImpl engine, Map<String, Langua
     private volatile Thread creatingThread;
     private volatile boolean initialized;
     volatile boolean finalized;
+    volatile boolean exited;
     @CompilationFinal private volatile Value hostBindings;
     @CompilationFinal private volatile Lazy lazy;
     @CompilationFinal volatile Env env; // effectively final
@@ -375,7 +377,7 @@ Env requireEnv() {
     }
 
     @SuppressWarnings("deprecation")
-    boolean finalizeContext(boolean cancelOperation, boolean notifyInstruments) {
+    boolean finalizeContext(boolean cancelOrExitOperation, boolean notifyInstruments) {
         ReentrantLock lock = lazy.operationLock;
         lock.lock();
         try {
@@ -387,7 +389,7 @@ boolean finalizeContext(boolean cancelOperation, boolean notifyInstruments) {
                 try {
                     LANGUAGE.finalizeContext(env);
                 } catch (Throwable t) {
-                    if (cancelOperation) {
+                    if (cancelOrExitOperation) {
                         /*
                          * finalizeContext can run guest code, and so truffle and cancel exceptions
                          * are expected. However, they must not fail the cancel operation, and so we
@@ -395,9 +397,10 @@ boolean finalizeContext(boolean cancelOperation, boolean notifyInstruments) {
                          */
                         assert context.state.isClosing();
                         assert context.state.isInvalidOrClosed();
-                        if (t instanceof com.oracle.truffle.api.TruffleException || t instanceof PolyglotEngineImpl.CancelExecution) {
+                        if (t instanceof com.oracle.truffle.api.TruffleException || t instanceof PolyglotEngineImpl.CancelExecution || t instanceof PolyglotContextImpl.ExitException) {
                             context.engine.getEngineLogger().log(Level.FINE,
-                                            "Exception was thrown while finalizing a polyglot context that is being cancelled. Such exceptions are expected during cancelling.", t);
+                                            "Exception was thrown while finalizing a polyglot context that is being cancelled or exited. Such exceptions are expected during cancelling or exiting.",
+                                            t);
                         } else {
                             throw t;
                         }
@@ -416,6 +419,41 @@ boolean finalizeContext(boolean cancelOperation, boolean notifyInstruments) {
         return false;
     }
 
+    @SuppressWarnings("deprecation")
+    boolean exitContext(TruffleLanguage.ExitMode exitMode, int exitCode) {
+        ReentrantLock lock = lazy.operationLock;
+        lock.lock();
+        try {
+            if (!initialized) {
+                return false;
+            }
+            if (!exited) {
+                exited = true;
+                try {
+                    LANGUAGE.exitContext(env, exitMode, exitCode);
+                } catch (Throwable t) {
+                    if (exitMode == TruffleLanguage.ExitMode.HARD) {
+                        if (t instanceof com.oracle.truffle.api.TruffleException || t instanceof PolyglotContextImpl.ExitException) {
+                            if (t instanceof com.oracle.truffle.api.TruffleException && !context.state.isCancelling()) {
+                                context.engine.getEngineLogger().log(Level.WARNING, "TruffleException thrown during exit notification! Languages are supposed to handle this kind of exceptions.", t);
+                            } else {
+                                context.engine.getEngineLogger().log(Level.FINE, "Exception thrown during exit notification!", t);
+                            }
+                        } else {
+                            throw t;
+                        }
+                    } else {
+                        throw t;
+                    }
+                }
+                return true;
+            }
+        } finally {
+            lock.unlock();
+        }
+        return false;
+    }
+
     @SuppressWarnings("deprecation")
     boolean dispose() {
         assert Thread.holdsLock(context);
@@ -455,7 +493,7 @@ boolean dispose() {
                 }
                 LANGUAGE.dispose(localEnv);
             } catch (Throwable t) {
-                if (t instanceof com.oracle.truffle.api.TruffleException || t instanceof PolyglotEngineImpl.CancelExecution) {
+                if (t instanceof com.oracle.truffle.api.TruffleException || t instanceof PolyglotEngineImpl.CancelExecution || t instanceof PolyglotContextImpl.ExitException) {
                     throw new IllegalStateException("Guest language code was run during language disposal!", t);
                 }
                 throw t;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThread.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThread.java
index 9db20082e01b..1bdefd28263c 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThread.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThread.java
@@ -54,6 +54,8 @@ final class PolyglotThread extends Thread {
 
     private final CallTarget callTarget;
 
+    volatile boolean hardExitNotificationThread;
+
     PolyglotThread(PolyglotLanguageContext languageContext, Runnable runnable, ThreadGroup group, long stackSize) {
         super(group, runnable, createDefaultName(languageContext), stackSize);
         this.languageContext = languageContext;
@@ -77,6 +79,20 @@ boolean isOwner(PolyglotContextImpl testContext) {
         return languageContext.context == testContext;
     }
 
+    @Override
+    public synchronized void start() {
+        PolyglotContextImpl polyglotContext = languageContext.context;
+        Thread hardExitTriggeringThread = polyglotContext.closeExitedTriggerThread;
+        if (hardExitTriggeringThread != null) {
+            Thread currentThread = currentThread();
+            if (hardExitTriggeringThread == currentThread ||
+                            (currentThread instanceof PolyglotThread && ((PolyglotThread) currentThread).isOwner(polyglotContext) && ((PolyglotThread) currentThread).hardExitNotificationThread)) {
+                hardExitNotificationThread = true;
+            }
+        }
+        super.start();
+    }
+
     @Override
     public void run() {
         // always call through a HostToGuestRootNode so that stack/frame
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThreadLocalActions.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThreadLocalActions.java
index 65f5b72653c3..bb148cd8a1e5 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThreadLocalActions.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotThreadLocalActions.java
@@ -158,7 +158,8 @@ void notifyEnterCreatedThread() {
 
     void notifyContextClosed() {
         assert Thread.holdsLock(context);
-        assert !context.isActive() || context.state == PolyglotContextImpl.State.CLOSED_CANCELLED : "context is still active, cannot flush safepoints";
+        assert !context.isActive() || context.state == PolyglotContextImpl.State.CLOSED_CANCELLED ||
+                        context.state == PolyglotContextImpl.State.CLOSED_EXITED : "context is still active, cannot flush safepoints";
         if (intervalTimer != null) {
             intervalTimer.cancel();
         }
diff --git a/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLExitTest.java b/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLExitTest.java
new file mode 100644
index 000000000000..043f761a9430
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLExitTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.sl.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SLExitTest {
+    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+    @Test
+    public void testExit() {
+        try (Context context = Context.create()) {
+            context.eval("sl", "function main() {\n" +
+                            "  exit(5);\n" +
+                            "}\n");
+            Assert.fail();
+        } catch (PolyglotException pe) {
+            Assert.assertTrue(pe.isExit());
+            Assert.assertEquals(5, pe.getExitStatus());
+        }
+    }
+
+    @Test
+    public void testExitWithShutdownHook() throws IOException {
+        String message = "Hello world!";
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            try (Context context = Context.newBuilder().out(out).build()) {
+                context.eval("sl", "function onShutdown() {\n" +
+                                "  println(\"" + message + "\");\n" +
+                                "}\n" +
+                                "\n" +
+                                "function main() {\n" +
+                                "  registerShutdownHook(onShutdown);\n" +
+                                "  exit(5);\n" +
+                                "}\n");
+                Assert.fail();
+            } catch (PolyglotException pe) {
+                Assert.assertTrue(pe.isExit());
+                Assert.assertEquals(5, pe.getExitStatus());
+            }
+            Assert.assertEquals(message + LINE_SEPARATOR, out.toString());
+        }
+    }
+
+    @Test
+    public void testShutdownHookWithoutExit() throws IOException {
+        String message = "Hello world!";
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            try (Context context = Context.newBuilder().out(out).build()) {
+                context.eval("sl", "function onShutdown() {\n" +
+                                "  println(\"" + message + "\");\n" +
+                                "}\n" +
+                                "\n" +
+                                "function main() {\n" +
+                                "  registerShutdownHook(onShutdown);\n" +
+                                "}\n");
+            }
+            Assert.assertEquals(message + LINE_SEPARATOR, out.toString());
+        }
+    }
+
+    @Test
+    public void testMultipleShutdownHooks() throws IOException {
+        String message1 = "Hello";
+        String message2 = "world!";
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            try (Context context = Context.newBuilder().out(out).build()) {
+                context.eval("sl", "function onShutdown1() {\n" +
+                                "  println(\"" + message1 + "\");\n" +
+                                "}\n" +
+                                "\n" +
+                                "function onShutdown2() {\n" +
+                                "  println(\"" + message2 + "\");\n" +
+                                "}\n" +
+                                "\n" +
+                                "function main() {\n" +
+                                "  registerShutdownHook(onShutdown1);\n" +
+                                "  registerShutdownHook(onShutdown2);\n" +
+                                "}\n");
+            }
+            Assert.assertEquals(message1 + LINE_SEPARATOR + message2 + LINE_SEPARATOR, out.toString());
+        }
+    }
+
+}
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
index 2c74950dec77..0a1a24a3e067 100644
--- a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java
@@ -421,4 +421,12 @@ public static void installBuiltin(NodeFactory<? extends SLBuiltinNode> builtin)
         EXTERNAL_BUILTINS.add(builtin);
     }
 
+    @Override
+    protected void exitContext(SLContext context, ExitMode exitMode, int exitCode) {
+        /*
+         * Runs shutdown hooks during explicit exit triggered by TruffleContext#closeExit(Node, int)
+         * or natural exit triggered during natural context close.
+         */
+        context.runShutdownHooks();
+    }
 }
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLExitBuiltin.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLExitBuiltin.java
new file mode 100644
index 000000000000..6ad5f108aa9d
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLExitBuiltin.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.sl.builtins;
+
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.nodes.NodeInfo;
+import com.oracle.truffle.sl.runtime.SLContext;
+import com.oracle.truffle.sl.runtime.SLNull;
+
+/**
+ * Builtin function that performs context exit.
+ */
+@NodeInfo(shortName = "exit")
+public abstract class SLExitBuiltin extends SLBuiltinNode {
+
+    @Specialization
+    protected Object execute(long exitCode) {
+        SLContext.get(this).getEnv().getContext().closeExited(this, (int) exitCode);
+        return SLNull.SINGLETON;
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java
new file mode 100644
index 000000000000..06e012f5ab92
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.sl.builtins;
+
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.nodes.NodeInfo;
+import com.oracle.truffle.sl.runtime.SLContext;
+import com.oracle.truffle.sl.runtime.SLFunction;
+import com.oracle.truffle.sl.runtime.SLNull;
+
+/**
+ * Builtin function that registers a function as a shutdown hook. Only no-parameter functions are
+ * supported.
+ */
+@NodeInfo(shortName = "registerShutdownHook")
+public abstract class SLRegisterShutdownHookBuiltin extends SLBuiltinNode {
+
+    @Specialization
+    protected Object execute(SLFunction shutdownHook) {
+        SLContext.get(this).registerShutdownHook(shutdownHook);
+        return SLNull.SINGLETON;
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java
index 7d3c92969a7a..e645cdf173e8 100644
--- a/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java
+++ b/truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java
@@ -45,6 +45,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.List;
 
 import com.oracle.truffle.api.CallTarget;
@@ -56,13 +57,18 @@
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
+import com.oracle.truffle.api.interop.ArityException;
+import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.sl.SLLanguage;
 import com.oracle.truffle.sl.builtins.SLBuiltinNode;
 import com.oracle.truffle.sl.builtins.SLDefineFunctionBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLEvalBuiltinFactory;
+import com.oracle.truffle.sl.builtins.SLExitBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLGetSizeBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLHasSizeBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLHelloEqualsWorldBuiltinFactory;
@@ -77,6 +83,7 @@
 import com.oracle.truffle.sl.builtins.SLPrintlnBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLReadlnBuiltin;
 import com.oracle.truffle.sl.builtins.SLReadlnBuiltinFactory;
+import com.oracle.truffle.sl.builtins.SLRegisterShutdownHookBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLStackTraceBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLTypeOfBuiltinFactory;
 import com.oracle.truffle.sl.builtins.SLWrapPrimitiveBuiltinFactory;
@@ -98,6 +105,7 @@ public final class SLContext {
     private final PrintWriter output;
     private final SLFunctionRegistry functionRegistry;
     private final AllocationReporter allocationReporter;
+    private final List<SLFunction> shutdownHooks = new ArrayList<>();
 
     public SLContext(SLLanguage language, TruffleLanguage.Env env, List<NodeFactory<? extends SLBuiltinNode>> externalBuiltins) {
         this.env = env;
@@ -175,6 +183,8 @@ private void installBuiltins() {
         installBuiltin(SLTypeOfBuiltinFactory.getInstance());
         installBuiltin(SLIsInstanceBuiltinFactory.getInstance());
         installBuiltin(SLJavaTypeBuiltinFactory.getInstance());
+        installBuiltin(SLExitBuiltinFactory.getInstance());
+        installBuiltin(SLRegisterShutdownHookBuiltinFactory.getInstance());
     }
 
     public void installBuiltin(NodeFactory<? extends SLBuiltinNode> factory) {
@@ -237,4 +247,28 @@ public static SLContext get(Node node) {
         return REFERENCE.get(node);
     }
 
+    /**
+     * Register a function as a shutdown hook. Only no-parameter functions are supported.
+     *
+     * @param func no-parameter function to be registered as a shutdown hook
+     */
+    @TruffleBoundary
+    public void registerShutdownHook(SLFunction func) {
+        shutdownHooks.add(func);
+    }
+
+    /**
+     * Run registered shutdown hooks. This method is designed to be executed in
+     * {@link TruffleLanguage#exitContext(Object, TruffleLanguage.ExitMode, int)}.
+     */
+    public void runShutdownHooks() {
+        InteropLibrary interopLibrary = InteropLibrary.getUncached();
+        for (SLFunction shutdownHook : shutdownHooks) {
+            try {
+                interopLibrary.execute(shutdownHook);
+            } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+                throw shouldNotReachHere("Shutdown hook is not executable!", e);
+            }
+        }
+    }
 }
diff --git a/truffle/src/com.oracle.truffle.tck/snapshot.sigtest b/truffle/src/com.oracle.truffle.tck/snapshot.sigtest
index 02179fd02eca..52484e1295ec 100644
--- a/truffle/src/com.oracle.truffle.tck/snapshot.sigtest
+++ b/truffle/src/com.oracle.truffle.tck/snapshot.sigtest
@@ -10,6 +10,7 @@ innr public abstract interface static Provider
 innr public abstract static ContextReference
 innr public abstract static LanguageReference
 innr public final static !enum ContextPolicy
+innr public final static !enum ExitMode
 innr public final static Env
 innr public final static InlineParsingRequest
 innr public final static ParsingRequest
@@ -53,6 +54,7 @@ meth protected static <%0 extends java.lang.Object, %1 extends com.oracle.truffl
  anno 0 java.lang.Deprecated()
 meth protected void disposeContext({com.oracle.truffle.api.TruffleLanguage%0})
 meth protected void disposeThread({com.oracle.truffle.api.TruffleLanguage%0},java.lang.Thread)
+meth protected void exitContext({com.oracle.truffle.api.TruffleLanguage%0},com.oracle.truffle.api.TruffleLanguage$ExitMode,int)
 meth protected void finalizeContext({com.oracle.truffle.api.TruffleLanguage%0})
 meth protected void initializeContext({com.oracle.truffle.api.TruffleLanguage%0}) throws java.lang.Exception
 meth protected void initializeMultiThreading({com.oracle.truffle.api.TruffleLanguage%0})

From 3d971bf3919c4a5783f9dfd018457ec7b54e29da Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 30 Sep 2021 14:48:06 +0200
Subject: [PATCH 240/681] add empty line to javadoc

---
 .../src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
index 56dc2c3c41db..beb6293c1b81 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/JDWPContext.java
@@ -500,6 +500,7 @@ public interface JDWPContext {
 
     /**
      * Tests if the guest object is a member of the klass.
+     *
      * @param guestObject the guest object
      * @param klass the class
      * @return true is guest object is a member of the klass

From 80693c29b949828aa16f8dac2f6bcb7549f11b5f Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 30 Sep 2021 13:45:17 +0200
Subject: [PATCH 241/681] Extract llvm.umin/umax operators into singletons

---
 .../parser/factories/BasicNodeFactory.java    |  11 +-
 .../intrinsics/c/LLVMCMathsIntrinsics.java    | 148 +++++++++---------
 2 files changed, 77 insertions(+), 82 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
index 84e227bb12b5..9f8b8db3bbeb 100644
--- a/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
+++ b/sulong/projects/com.oracle.truffle.llvm.parser.factories/src/com/oracle/truffle/llvm/parser/factories/BasicNodeFactory.java
@@ -123,13 +123,14 @@
 import com.oracle.truffle.llvm.runtime.nodes.func.LLVMLandingpadNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.func.LLVMResumeNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.func.LLVMTypeIdForExceptionNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsics.LLVMUmaxOperator;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsics.LLVMUminOperator;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMAbsNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMFAbsNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMFAbsVectorNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMPowNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMUmaxVectorNodeGen;
-import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMUminVectorNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.intrinsics.c.LLVMCMathsIntrinsicsFactory.LLVMUnsignedVectorMinMaxNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.interop.LLVMTruffleGetArgCountNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.interop.LLVMTruffleGetArgNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.intrinsics.llvm.LLVMAssumeNodeGen;
@@ -1745,20 +1746,18 @@ protected LLVMExpressionNode getLLVMBuiltin(FunctionDeclaration declaration, LLV
         }
 
         if ("llvm.umax".equals(intrinsicName) && typeSuffix != null && typeSuffix.length != null) {
-            // format '.([vp]\d+)?[if]\d+)'
             try {
                 int vectorLength = Integer.parseInt(typeSuffix.length);
-                return LLVMUmaxVectorNodeGen.create(args[1], args[2], vectorLength);
+                return LLVMUnsignedVectorMinMaxNodeGen.create(args[1], args[2], vectorLength, LLVMUmaxOperator.INSTANCE);
             } catch (NumberFormatException e) {
                 // fall through
             }
         }
 
         if ("llvm.umin".equals(intrinsicName) && typeSuffix != null && typeSuffix.length != null) {
-            // format '.([vp]\d+)?[if]\d+)'
             try {
                 int vectorLength = Integer.parseInt(typeSuffix.length);
-                return LLVMUminVectorNodeGen.create(args[1], args[2], vectorLength);
+                return LLVMUnsignedVectorMinMaxNodeGen.create(args[1], args[2], vectorLength, LLVMUminOperator.INSTANCE);
             } catch (NumberFormatException e) {
                 // fall through
             }
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
index 96af96fb6182..b31bd519c973 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMCMathsIntrinsics.java
@@ -29,7 +29,6 @@
  */
 package com.oracle.truffle.llvm.runtime.nodes.intrinsics.c;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeField;
@@ -810,38 +809,91 @@ protected LLVM80BitFloat doLLVM80BitFloat(LLVM80BitFloat magnitude, LLVM80BitFlo
         }
     }
 
-    @NodeChild(type = LLVMExpressionNode.class)
-    @NodeChild(type = LLVMExpressionNode.class)
-    @NodeField(name = "vectorLength", type = int.class)
-    abstract static class LLVMUnsignedVectorMinMaxNode extends LLVMBuiltin {
-        protected abstract int getVectorLength();
+    abstract static class LLVMUMinMaxOperator {
+        protected abstract boolean compare(boolean a, boolean b);
+
+        protected abstract int compare(int a, int b);
+
+        protected abstract long compare(long a, long b);
+
+        protected abstract float compare(float a, float b);
 
+        protected abstract double compare(double a, double b);
+    }
+
+    public static final class LLVMUmaxOperator extends LLVMUMinMaxOperator {
+        public static final LLVMUmaxOperator INSTANCE = new LLVMUmaxOperator();
+
+        @Override
         protected boolean compare(boolean a, boolean b) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return a || b;
         }
 
-        private byte compare(byte a, byte b) {
-            return (byte) compare((int) a, (int) b);
+        @Override
+        protected int compare(int a, int b) {
+            return Integer.compareUnsigned(a, b) >= 0 ? a : b;
         }
 
-        private short compare(short a, short b) {
-            return (short) compare((int) a, (int) b);
+        @Override
+        protected long compare(long a, long b) {
+            return Long.compareUnsigned(a, b) >= 0 ? a : b;
+        }
+
+        @Override
+        protected float compare(float a, float b) {
+            return Math.max(a, b);
+        }
+
+        @Override
+        protected double compare(double a, double b) {
+            return Math.max(a, b);
         }
+    }
+
+    public static final class LLVMUminOperator extends LLVMUMinMaxOperator {
+        public static final LLVMUminOperator INSTANCE = new LLVMUminOperator();
 
+        @Override
+        protected boolean compare(boolean a, boolean b) {
+            return a && b;
+        }
+
+        @Override
         protected int compare(int a, int b) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return Integer.compareUnsigned(a, b) <= 0 ? a : b;
         }
 
+        @Override
         protected long compare(long a, long b) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return Long.compareUnsigned(a, b) <= 0 ? a : b;
         }
 
+        @Override
         protected float compare(float a, float b) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return Math.min(a, b);
         }
 
+        @Override
         protected double compare(double a, double b) {
-            throw CompilerDirectives.shouldNotReachHere();
+            return Math.min(a, b);
+        }
+    }
+
+    @NodeChild(type = LLVMExpressionNode.class)
+    @NodeChild(type = LLVMExpressionNode.class)
+    @NodeField(name = "vectorLength", type = int.class)
+    @NodeField(name = "operator", type = LLVMUMinMaxOperator.class)
+    public abstract static class LLVMUnsignedVectorMinMaxNode extends LLVMBuiltin {
+        protected abstract int getVectorLength();
+
+        protected abstract LLVMUMinMaxOperator getOperator();
+
+        private byte compare(byte a, byte b) {
+            return (byte) getOperator().compare(a, b);
+        }
+
+        private short compare(short a, short b) {
+            return (short) getOperator().compare(a, b);
         }
 
         @Specialization
@@ -851,7 +903,7 @@ protected LLVMI1Vector doI1Vector(LLVMI1Vector a, LLVMI1Vector b) {
             assert b.getLength() == getVectorLength();
             boolean[] result = new boolean[getVectorLength()];
             for (int i = 0; i < getVectorLength(); i++) {
-                result[i] = compare(a.getValue(i), b.getValue(i));
+                result[i] = getOperator().compare(a.getValue(i), b.getValue(i));
             }
             return LLVMI1Vector.create(result);
         }
@@ -893,7 +945,7 @@ protected LLVMI32Vector doI32Vector(LLVMI32Vector a, LLVMI32Vector b) {
             for (int i = 0; i < getVectorLength(); i++) {
                 int aValue = a.getValue(i);
                 int bValue = b.getValue(i);
-                result[i] = compare(aValue, bValue);
+                result[i] = getOperator().compare(aValue, bValue);
             }
             return LLVMI32Vector.create(result);
         }
@@ -907,7 +959,7 @@ protected LLVMI64Vector doI64Vector(LLVMI64Vector a, LLVMI64Vector b) {
             for (int i = 0; i < getVectorLength(); i++) {
                 long aValue = a.getValue(i);
                 long bValue = b.getValue(i);
-                result[i] = Long.compareUnsigned(aValue, bValue) >= 0 ? aValue : bValue;
+                result[i] = getOperator().compare(aValue, bValue) >= 0 ? aValue : bValue;
             }
             return LLVMI64Vector.create(result);
         }
@@ -919,7 +971,7 @@ protected LLVMFloatVector doFloatVector(LLVMFloatVector a, LLVMFloatVector b) {
             assert b.getLength() == getVectorLength();
             float[] result = new float[getVectorLength()];
             for (int i = 0; i < getVectorLength(); i++) {
-                result[i] = compare(a.getValue(i), b.getValue(i));
+                result[i] = getOperator().compare(a.getValue(i), b.getValue(i));
             }
             return LLVMFloatVector.create(result);
         }
@@ -931,65 +983,9 @@ protected LLVMDoubleVector doDoubleVector(LLVMDoubleVector a, LLVMDoubleVector b
             assert b.getLength() == getVectorLength();
             double[] result = new double[getVectorLength()];
             for (int i = 0; i < getVectorLength(); i++) {
-                result[i] = compare(a.getValue(i), b.getValue(i));
+                result[i] = getOperator().compare(a.getValue(i), b.getValue(i));
             }
             return LLVMDoubleVector.create(result);
         }
     }
-
-    public abstract static class LLVMUmaxVectorNode extends LLVMUnsignedVectorMinMaxNode {
-
-        @Override
-        protected final boolean compare(boolean a, boolean b) {
-            return a || b;
-        }
-
-        @Override
-        protected final int compare(int a, int b) {
-            return Integer.compareUnsigned(a, b) >= 0 ? a : b;
-        }
-
-        @Override
-        protected final long compare(long a, long b) {
-            return Long.compareUnsigned(a, b) >= 0 ? a : b;
-        }
-
-        @Override
-        protected final float compare(float a, float b) {
-            return Math.max(a, b);
-        }
-
-        @Override
-        protected final double compare(double a, double b) {
-            return Math.max(a, b);
-        }
-    }
-
-    public abstract static class LLVMUminVectorNode extends LLVMUnsignedVectorMinMaxNode {
-
-        @Override
-        protected final boolean compare(boolean a, boolean b) {
-            return a && b;
-        }
-
-        @Override
-        protected final int compare(int a, int b) {
-            return Integer.compareUnsigned(a, b) <= 0 ? a : b;
-        }
-
-        @Override
-        protected final long compare(long a, long b) {
-            return Long.compareUnsigned(a, b) <= 0 ? a : b;
-        }
-
-        @Override
-        protected final float compare(float a, float b) {
-            return Math.min(a, b);
-        }
-
-        @Override
-        protected final double compare(double a, double b) {
-            return Math.min(a, b);
-        }
-    }
 }

From 02c961af4de1fa9852f732b03e71243067c5ce9a Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 21 Sep 2021 15:00:40 +0100
Subject: [PATCH 242/681] Generate graph data with collapsed recursive frames.

---
 .../tools/profiler/impl/SVGSamplerOutput.java | 380 +++++++++++++-----
 .../profiler/impl/resources/flamegraph.js     |  16 +-
 .../profiler/impl/resources/graphowner.js     |  70 ++--
 .../profiler/impl/resources/histogram.js      |   6 +-
 4 files changed, 324 insertions(+), 148 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index 3019af47072f..f1b297e4e730 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -223,7 +224,7 @@ private static class GraphOwner implements SVGComponent {
         public int sourceCounter = 0;
         public final JSONArray sampleNames = new JSONArray();
         public final JSONArray sourceNames = new JSONArray();
-        public final JSONObject sampleData = new JSONObject();
+        public final JSONArray sampleData = new JSONArray();
 
         GraphOwner(StringBuilder output, Map<TruffleContext, CPUSamplerData> data) {
             svg = new SVGSamplerOutput(output);
@@ -295,19 +296,36 @@ public String script() {
             return result.toString();
         }
 
+        private static final class Task {
+            final ProfilerNode<CPUSampler.Payload> sample;
+            final JSONArray siblings;
+            final long x;
+            final int parent;
+
+            Task(ProfilerNode<CPUSampler.Payload> sample, JSONArray siblings, long x, int parent) {
+                this.sample = sample;
+                this.siblings = siblings;
+                this.x = x;
+                this.parent = parent;
+            }
+        }
+
         private void buildSampleData() {
-            sampleData.put("n", nameCounter);
-            sampleData.put("f", sourceCounter);
-            sampleData.put("fl", 0);
+            ArrayDeque<Task> tasks = new ArrayDeque<>();
+            JSONObject root = new JSONObject();
+            sampleData.put(root);
+            root.put("n", nameCounter);
+            root.put("f", sourceCounter);
+            root.put("fl", 0);
             nameHash.put("<top>", nameCounter++);
             sampleNames.put("<top>");
             sourceHash.put("<none>", sourceCounter++);
             sourceNames.put("<none>");
-            sampleData.put("id", sampleId++);
-            sampleData.put("i", 0);
-            sampleData.put("c", 0);
-            sampleData.put("x", 0);
-            sampleData.put("l", GraphColorMap.GRAY.ordinal());
+            root.put("id", sampleId++);
+            root.put("i", 0);
+            root.put("c", 0);
+            root.put("x", 0);
+            root.put("l", GraphColorMap.GRAY.ordinal());
             long totalSamples = 0;
             JSONArray children = new JSONArray();
             for (CPUSamplerData value : data.values()) {
@@ -315,48 +333,200 @@ private void buildSampleData() {
                     Thread thread = node.getKey();
                     // Output the thread node itself...
                     // Optput the samples under that node...
-                    List<ProfilerNode<CPUSampler.Payload>> samples = new ArrayList<>(node.getValue());
-                    children.put(threadSampelData(thread, samples, totalSamples));
-                    for (ProfilerNode<CPUSampler.Payload> sample : samples) {
-                        totalSamples += sample.getPayload().getHitCount();
+                    totalSamples = threadSampleData(thread, node.getValue(), tasks, children, totalSamples);
+                }
+            }
+            root.put("h", totalSamples);
+            root.put("s", children);
+
+            Task task = tasks.poll();
+            while (task != null) {
+                processSample(task, tasks);
+                task = tasks.poll();
+            }
+            buildColorData();
+            buildRecursiveData();
+        }
+
+        private static final class SampleKey {
+            int nameId;
+            int sourceId;
+            int sourceLine;
+
+            SampleKey(int nameId, int sourceId, int sourceLine) {
+                this.nameId = nameId;
+                this.sourceId = sourceId;
+                this.sourceLine = sourceLine;
+            }
+
+            @Override
+            public int hashCode() {
+                final int prime = 31;
+                int result = 1;
+                result = prime * result + nameId;
+                result = prime * result + sourceId;
+                result = prime * result + sourceLine;
+                return result;
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                if (this == obj)
+                    return true;
+                if (obj == null)
+                    return false;
+                if (getClass() != obj.getClass())
+                    return false;
+                SampleKey other = (SampleKey) obj;
+                if (nameId != other.nameId)
+                    return false;
+                if (sourceId != other.sourceId)
+                    return false;
+                if (sourceLine != other.sourceLine)
+                    return false;
+                return true;
+            }
+        }
+
+        private HashMap<Integer, HashMap<SampleKey, JSONObject>> recursiveChildMap = new HashMap<>();
+
+        private HashMap<SampleKey, JSONObject> childrenByKeyForSample(JSONObject sample) {
+            return recursiveChildMap.computeIfAbsent(sample.getInt("id"), k -> {
+                    HashMap<SampleKey, JSONObject> childMap = new HashMap<>();
+                    return childMap;
+                });
+        }
+
+        private static final class RecursivePositionTask {
+            JSONObject sample;
+            long x;
+
+            public RecursivePositionTask(JSONObject sample, long x) {
+                this.sample = sample;
+                this.x = x;
+            }
+        }
+
+        private void buildRecursiveData() {
+            // Merge all the collapsed recursive relationships and hit counts
+            for (Object sample : sampleData) {
+                calculateRecursiveData((JSONObject) sample);
+            }
+            // Work out the collapsed recursive x positions.
+            ArrayDeque<RecursivePositionTask> tasks = new ArrayDeque<>();
+            RecursivePositionTask task = new RecursivePositionTask(sampleDataForId(0), 0);
+            while (task != null) {
+                task.sample.put("rx", task.x);
+                if (task.sample.has("rs")) {
+                    long offset = task.x + task.sample.getInt("ri") + task.sample.getInt("rc");
+                    for (Object childId : task.sample.getJSONArray("rs")) {
+                        JSONObject child = sampleDataForId((Integer) childId);
+                        tasks.add(new RecursivePositionTask(child, offset));
+                        offset += child.getInt("rh");
                     }
                 }
+                task = tasks.poll();
             }
-            sampleData.put("h", totalSamples);
-            sampleData.put("s", children);
-            buildColorData(sampleData);
         }
 
-        private JSONObject threadSampelData(Thread thread, List<ProfilerNode<CPUSampler.Payload>> samples, long x) {
-            JSONObject result = new JSONObject();
-            result.put("n", nameHash.computeIfAbsent(thread.getName(), k -> {
+        private void calculateRecursiveData(JSONObject sample) {
+            if (sample.has("p")) {
+                JSONObject parent = sampleDataForId(sample.getInt("p"));
+                final JSONObject owner;
+                if (parent.has("ro")) {
+                    owner = sampleDataForId(parent.getInt("ro"));
+                } else {
+                    owner = parent;
+                }
+                if (parent.getInt("n") == sample.getInt("n")) {
+                    mergeCounts(owner, sample, true);
+                } else {
+                    HashMap<SampleKey, JSONObject> siblings = childrenByKeyForSample(owner);
+                    SampleKey key = new SampleKey(sample.getInt("n"), sample.getInt("f"), sample.getInt("fl"));
+                    if (siblings.containsKey(key)) {
+                        JSONObject sibling = siblings.get(key);
+                        mergeCounts(sibling, sample, false);
+                    } else {
+                        siblings.put(key, sample);
+                        addRecursiveChild(owner, sample);
+                    }
+                    sample.put("rp", owner.getInt("id"));
+                }
+            } else {
+                // The root sample needs rc, ri, and rh set.
+                sample.put("rc", sample.getInt("c"));
+                sample.put("ri", sample.getInt("i"));
+                sample.put("rh", sample.getInt("h"));
+            }
+        }
+
+        private void addRecursiveChild(JSONObject sample, JSONObject child) {
+            final JSONArray children;
+            if (!sample.has("rs")) {
+                children = new JSONArray();
+                sample.put("rs", children);
+            } else {
+                children = sample.getJSONArray("rs");
+            }
+            children.put(child.getInt("id"));
+            child.put("rc", child.getInt("c"));
+            child.put("ri", child.getInt("i"));
+            child.put("rh", child.getInt("h"));
+        }
+        
+        private void mergeCounts(JSONObject a, JSONObject b, boolean child) {
+            int aRI = a.has("ri") ? a.getInt("ri") : a.getInt("i");
+            int aRC = a.has("rc") ? a.getInt("rc") : a.getInt("c");
+            int aRH = a.has("rh") ? a.getInt("rh") : a.getInt("h");
+            aRI += b.getInt("i");
+            aRC += b.getInt("c");
+            // Siblings should have their hit counts combined, but
+            // children should not increase their parent's hit count.
+            if (!child) {
+                aRH += b.getInt("h");
+            }
+            a.put("ri", aRI);
+            a.put("rc", aRC);
+            a.put("rh", aRH);
+            b.put("ro", a.getInt("id"));
+        }
+
+        private long threadSampleData(Thread thread, Collection<ProfilerNode<CPUSampler.Payload>> samples, ArrayDeque<Task> tasks, JSONArray siblings, long x) {
+            JSONObject threadSample = new JSONObject();
+            long totalSamples = x;
+            int id = sampleId++;
+            threadSample.put("n", nameHash.computeIfAbsent(thread.getName(), k -> {
                 sampleNames.put(thread.getName());
                 return nameCounter++;
             }));
-            result.put("f", sourceHash.computeIfAbsent("<none>", k -> {
+            threadSample.put("f", sourceHash.computeIfAbsent("<none>", k -> {
                 sourceNames.put("<none>");
                 return sourceCounter++;
             }));
-            result.put("fl", 0);
-            result.put("id", sampleId++);
-            result.put("i", 0);
-            result.put("c", 0);
-            result.put("l", GraphColorMap.GRAY.ordinal());
-            result.put("x", x);
-            long totalSamples = 0;
+            threadSample.put("fl", 0);
+            threadSample.put("id", id);
+            threadSample.put("p", 0);
+            sampleData.put(threadSample);
+            threadSample.put("i", 0);
+            threadSample.put("c", 0);
+            threadSample.put("l", GraphColorMap.GRAY.ordinal());
+            threadSample.put("x", x);
             JSONArray children = new JSONArray();
+            long childCount = 0;
             for (ProfilerNode<CPUSampler.Payload> sample : samples) {
-                children.put(sampleData(sample, totalSamples + x));
+                tasks.addLast(new Task(sample, children, totalSamples, id));
                 totalSamples += sample.getPayload().getHitCount();
+                childCount++;
             }
-            result.put("h", totalSamples);
-            if (children.length() > 0) {
-                result.put("s", children);
+            threadSample.put("h", totalSamples);
+            if (childCount > 0) {
+                threadSample.put("s", children);
             }
-            return result;
+            siblings.put(threadSample.getInt("id"));
+            return totalSamples;
         }
 
-        public String samples() {
+        private String samples() {
             StringBuilder result = new StringBuilder();
 
             result.append("var profileNames = ");
@@ -400,16 +570,16 @@ public String samples() {
             return result.toString();
         }
 
-        public JSONObject sampleData(ProfilerNode<CPUSampler.Payload> sample, long x) {
+        private void processSample(Task task, ArrayDeque<Task> tasks) {
             JSONObject result = new JSONObject();
-            final int nameId = nameHash.computeIfAbsent(sample.getRootName(), k -> {
-                sampleNames.put(sample.getRootName());
+            final int nameId = nameHash.computeIfAbsent(task.sample.getRootName(), k -> {
+                sampleNames.put(task.sample.getRootName());
                 return nameCounter++;
             });
             result.put("n", nameId);
             final String sourceName;
             int sourceLine = 0;
-            SourceSection section = sample.getSourceSection();
+            SourceSection section = task.sample.getSourceSection();
             if (section != null && section.isAvailable()) {
                 sourceLine = section.getStartLine();
                 Source source = section.getSource();
@@ -431,62 +601,46 @@ public JSONObject sampleData(ProfilerNode<CPUSampler.Payload> sample, long x) {
                 return sourceCounter++;
             }));
             result.put("fl", sourceLine);
-            result.put("id", sampleId++);
-            result.put("i", sample.getPayload().getTierSelfCount(0));
+            int id = sampleId++;
+            result.put("id", id);
+            result.put("p", task.parent);
+            sampleData.put(result);
+            result.put("i", task.sample.getPayload().getTierSelfCount(0));
             int compiledSelfHits = 0;
-            for (int i = 1; i < sample.getPayload().getNumberOfTiers(); i++) {
-                compiledSelfHits += sample.getPayload().getTierSelfCount(i);
+            for (int i = 1; i < task.sample.getPayload().getNumberOfTiers(); i++) {
+                compiledSelfHits += task.sample.getPayload().getTierSelfCount(i);
             }
             result.put("c", compiledSelfHits);
-            result.put("h", sample.getPayload().getHitCount());
-            result.put("l", colorMapForLanguage(sample).ordinal());
-            result.put("x", x);
+            result.put("h", task.sample.getPayload().getHitCount());
+            result.put("l", colorMapForLanguage(task.sample).ordinal());
+            result.put("x", task.x);
             JSONArray children = new JSONArray();
-            long offset = sample.getPayload().getSelfHitCount();
-            for (ProfilerNode<CPUSampler.Payload> child : sample.getChildren()) {
-                children.put(sampleData(child, x + offset));
+            int childCount = 0;
+            long offset = task.sample.getPayload().getSelfHitCount();
+            for (ProfilerNode<CPUSampler.Payload> child : task.sample.getChildren()) {
+                tasks.addLast(new Task(child, children, task.x + offset, id));
                 offset += child.getPayload().getHitCount();
+                childCount++;
             }
-            if (children.length() > 0) {
+            if (childCount > 0) {
                 result.put("s", children);
             }
-            return result;
-        }
-
-        private JSONObject findSampleInTree(JSONObject tree, int id) {
-            if (tree.getInt("id") == id) {
-                return tree;
-            } else if (tree.has("s")) {
-                JSONArray children = tree.getJSONArray("s");
-                JSONObject lastChild = null;
-                for (Object c : children) {
-                    JSONObject child = (JSONObject) c;
-                    if (child.getInt("id") == id) {
-                        return child;
-                    } else if (child.getInt("id") > id) {
-                        return findSampleInTree(lastChild, id);
-                    } else {
-                        lastChild = child;
-                    }
-                }
-                return findSampleInTree(lastChild, id);
-            }
-            return null;
+            task.siblings.put(result.getInt("id"));
         }
 
         protected JSONObject sampleDataForId(int id) {
-            return findSampleInTree(sampleData, id);
+            return (JSONObject) sampleData.get(id);
         }
 
-        private void buildColorData(JSONObject sample) {
-            colorForName(sample.getInt("n"), GraphColorMap.FLAME);
-            colorForName(sample.getInt("n"), GraphColorMap.values()[sample.getInt("l")]);
-            if (sample.has("s")) {
-                for (Object child : sample.getJSONArray("s")) {
-                    buildColorData((JSONObject) child);
-                }
+        private void buildColorData() {
+            for (Object sample : sampleData) {
+                buildColorDataForSample((JSONObject) sample);
             }
+        }
 
+        private void buildColorDataForSample(JSONObject sample) {
+            colorForName(sample.getInt("n"), GraphColorMap.FLAME);
+            colorForName(sample.getInt("n"), GraphColorMap.values()[sample.getInt("l")]);
         }
 
         public String initFunction(String argName) {
@@ -728,9 +882,9 @@ private static class SVGFlameGraph implements SVGComponent {
             this.owner = owner;
             this.bottomPadding = 2 * owner.fontSize() + 10;
             this.topPadding = 3 * owner.fontSize();
-            this.sampleCount = owner.sampleData.getInt("h");
+            this.sampleCount = owner.sampleDataForId(0).getInt("h");
             widthPerTime = (width() - 2 * XPAD) / sampleCount;
-            maxDepth = maxDepth(owner.sampleData);
+            maxDepth = maxDepth(owner.sampleDataForId(0));
         }
 
         private int maxDepth(JSONObject samples) {
@@ -739,9 +893,9 @@ private int maxDepth(JSONObject samples) {
                 return 0;
             } else {
                 int childDepth = 0;
-                if (samples.has("s")) {
-                    for (Object child : samples.getJSONArray("s")) {
-                        childDepth = Integer.max(childDepth, maxDepth((JSONObject) child));
+                if (samples.has("rs")) {
+                    for (Object child : samples.getJSONArray("rs")) {
+                        childDepth = Integer.max(childDepth, maxDepth(owner.sampleDataForId((Integer) child)));
                     }
                 }
                 return childDepth + 1;
@@ -801,22 +955,48 @@ public String drawCanvas(double x, double y) {
         private String drawTree() {
             StringBuilder output = new StringBuilder();
             double baseY = -FRAMEHEIGHT - bottomPadding;
-            output.append(drawSample(baseY, owner.sampleData));
+            output.append(drawSamples(baseY, owner.sampleDataForId(0)));
             return output.toString();
         }
 
         private double sampleWidth(JSONObject sample) {
-            long hitCount = sample.getInt("h");
+            long hitCount = sample.getInt("rh");
             return widthPerTime * hitCount;
         }
 
         private double sampleX(JSONObject sample) {
-            long x = sample.getInt("x");
+            long x = sample.getInt("rx");
             return widthPerTime * x + XPAD;
         }
 
-        private String drawSample(double y, JSONObject sample) {
+        private static final class DrawTask {
+            final JSONObject sample;
+            final int depth;
+
+            DrawTask(JSONObject sample, int depth) {
+                this.sample = sample;
+                this.depth = depth;
+            }
+        }
+
+        private String drawSamples(double y, JSONObject root) {
+            ArrayDeque<DrawTask> tasks = new ArrayDeque<>();
+
             StringBuilder output = new StringBuilder();
+            DrawTask task = new DrawTask(root, 0);
+            while (task != null) {
+                output.append(drawSample(y, task, tasks));
+                task = tasks.poll();
+            }
+            return output.toString();
+        }
+
+        private String drawSample(double baseY, DrawTask task, ArrayDeque<DrawTask> tasks) {
+            // Redesign this to use a task deque.
+            StringBuilder output = new StringBuilder();
+            JSONObject sample = task.sample;
+            int depth = task.depth;
+            double y = baseY - depth * FRAMEHEIGHT;
             double width = sampleWidth(sample);
             double x = sampleX(sample);
             if (width < MINWIDTH) {
@@ -851,10 +1031,11 @@ private String drawSample(double y, JSONObject sample) {
 
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), x + 3, y - 5 + FRAMEHEIGHT, owner.abbreviate(fullText, width), null, ""));
             output.append(endGroup(groupAttrs));
-            if (sample.has("s")) {
-                JSONArray children = sample.getJSONArray("s");
-                for (Object child : children) {
-                    output.append(drawSample(y - FRAMEHEIGHT, (JSONObject) child));
+            if (sample.has("rs")) {
+                JSONArray children = sample.getJSONArray("rs");
+                for (Object childId : children) {
+                    JSONObject child = owner.sampleDataForId((Integer) childId);
+                    tasks.add(new DrawTask(child, depth + 1));
                 }
             }
             return output.toString();
@@ -903,7 +1084,7 @@ private static class SVGHistogram implements SVGComponent {
 
             this.titlePadding = owner.fontSize() * 3.0;
             this.bottomPadding = owner.fontSize() * 2 + 10.0;
-            histogram = buildHistogram(owner.sampleData);
+            histogram = buildHistogram(owner.sampleDataForId(0));
             timeMax = histogram.get(0).getInt("i") + histogram.get(0).getInt("c");
             widthPerTime = (width() - 2 * XPAD) / timeMax;
             double minTime = MINWIDTH / widthPerTime;
@@ -917,13 +1098,20 @@ private static class SVGHistogram implements SVGComponent {
 
         private List<JSONObject> buildHistogram(JSONObject sample) {
             Map<String, JSONObject> bars = new HashMap<>();
-            buildHistogram(sample, bars);
+            ArrayDeque<JSONObject> samples = new ArrayDeque<>();
+
+            JSONObject next = sample;
+            while (next != null) {
+                buildHistogram(next, samples, bars);
+                next = samples.poll();
+            }
+
             ArrayList<JSONObject> lines = new ArrayList<>(bars.values());
             Collections.sort(lines, (a, b) -> Integer.compare(b.getInt("i") + b.getInt("c"), a.getInt("i") + a.getInt("c")));
             return lines;
         }
 
-        private void buildHistogram(JSONObject sample, Map<String, JSONObject> bars) {
+        private void buildHistogram(JSONObject sample, ArrayDeque<JSONObject> samples, Map<String, JSONObject> bars) {
             JSONObject bar = bars.computeIfAbsent(owner.sampleNames.getString(sample.getInt("n")),
                             k -> {
                                 JSONObject entry = new JSONObject();
@@ -938,8 +1126,8 @@ private void buildHistogram(JSONObject sample, Map<String, JSONObject> bars) {
             bar.put("c", bar.getInt("c") + sample.getInt("c"));
             if (sample.has("s")) {
                 JSONArray children = sample.getJSONArray("s");
-                for (Object child : children) {
-                    buildHistogram((JSONObject) child, bars);
+                for (Object childId : children) {
+                    samples.add(owner.sampleDataForId((Integer)childId));
                 }
             }
         }
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 183deb9358c4..147741f9184b 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -31,8 +31,8 @@ function fg_init(evt) {
     flamegraph = document.getElementById("flamegraph");
     search_matches = [];
     fg_xmin = 0;
-    fg_xmax = profileData.h;
-    fg_zoomed_sample = profileData;
+    fg_xmax = profileData[0].h;
+    fg_zoomed_sample = profileData[0];
     var el = flamegraph.getElementsByTagName("g");
     for(let i=0;i<el.length;i++)
         update_text(el[i]);
@@ -220,11 +220,11 @@ function unzoom() {
     unzoombtn.style["opacity"] = "0.1";
 
     fg_xmin = 0;
-    fg_xmax = profileData.h
+    fg_xmax = profileData[0].h
     fg_max_depth = 0;
-    fg_zoomed_sample = profileData;
+    fg_zoomed_sample = profileData[0];
 
-    zoom_internal(profileData, [], []);
+    zoom_internal(profileData[0], [], []);
 }
 
 // search
@@ -233,7 +233,7 @@ function fg_search(term) {
 
     search_matches = []
 
-    let iter = sample_and_children_depth_first(profileData);
+    let iter = sample_and_children_depth_first(profileData[0]);
     let c = iter.next();
     while (!c.done) {
         let sample = c.value;
@@ -332,7 +332,7 @@ function fg_reset_search() {
 }
 
 function fg_update_color(color_type) {
-    let iter = sample_and_children_depth_first(profileData);
+    let iter = sample_and_children_depth_first(profileData[0]);
     let c = iter.next();
     while (!c.done) {
         let sample = c.value;
@@ -367,7 +367,7 @@ function fg_resize(new_width) {
     viewbox.width = new_width
     let fg_canvas = document.getElementById("fg_canvas");
     fg_canvas.width.baseVal.value = new_width;
-    if (fg_zoomed_sample == profileData) {
+    if (fg_zoomed_sample == profileData[0]) {
         unzoom();
     } else {
         zoom(fg_element_for_sample(fg_zoomed_sample));
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 5d43edab3e37..553e8bc00d4c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -70,37 +70,21 @@ function restore_attr(e, attr) {
     e.removeAttribute("_orig_"+attr);
 }
 
-function find_sample_in_tree(tree, id, parents, unrelated) {
-    if (tree.id == id) {
-        return tree;
-    } else if (tree.hasOwnProperty('s')) {
-        parents.push(tree)
-        let children = tree.s;
-        for (let i = 0; i < children.length; i++) {
-            if (children[i].id == id) {
-                for (let j = 0; j < i; j++) {
-                    unrelated.push(children[j]);
-                }
-                for (let j = i + 1; j < children.length; j++) {
-                    unrelated.push(children[j]);
-                }
-                return children[i];
-            } else if(children[i].id > id) {
-                for (let j = 0; j < i - 1; j++) {
-                    unrelated.push(children[j]);
-                }
-                for (let j = i; j < children.length; j++) {
-                    unrelated.push(children[j]);
-                }
-                return find_sample_in_tree(children[i - 1], id, parents, unrelated);
+function find_sample_in_tree(id, parents, unrelated) {
+    let result = profileData[id];
+    let sample = result;
+    let parent = sample.p
+    while (parent != null) {
+        parents.push(profileData[parent]);
+        for (const sibling of profileData[parent].s) {
+            if (sibling != sample.id) {
+                unrelated.push(profileData[sibling]);
             }
         }
-        for (let j = 0; j < children.length - 1; j++) {
-            unrelated.push(children[j]);
-        }
-        return find_sample_in_tree(children[children.length - 1], id, parents, unrelated);
+        sample = profileData[parent];
+        parent = sample.p;
     }
-    return null;
+    return result;
 }
 
 function validate_no_overlap(sample, parents, unrelated) {
@@ -149,12 +133,12 @@ function validate_no_overlap(sample, parents, unrelated) {
 function sample_parents_and_unrelated_for_id(id) {
     let parents = [];
     let unrelated = [];
-    let result =  [find_sample_in_tree(profileData, id, parents, unrelated), parents, unrelated];
+    let result =  [find_sample_in_tree(id, parents, unrelated), parents, unrelated];
     return result
 }
 
 function sample_for_id(id) {
-    return find_sample_in_tree(profileData, id, [], []);
+    return profileData[id];
 }
 
 function depth_for_id_in_tree(tree, id) {
@@ -176,7 +160,7 @@ function depth_for_id_in_tree(tree, id) {
 
 function depth_for_sample(sample) {
     if (!sample.hasOwnProperty("depth")) {
-        sample.depth = depth_for_id_in_tree(profileData, sample.id);
+        sample.depth = depth_for_id_in_tree(profileData[0], sample.id);
     }
     return sample.depth;
 }
@@ -191,16 +175,11 @@ function sample_and_children_depth_first(sample) {
                 let result = stack.pop();
 
                 let rdepth = depth_for_sample(result);
-                if (result.hasOwnProperty("s")) {
-                    let children = result.s.slice();
-                    children.reverse();
-
-                    for(const child of children) {
-                        if (!child.hasOwnProperty("depth")) {
-                            child.depth = rdepth + 1;
-                        }
-                        stack.push(child);
+                for(const child of direct_children(result).reverse()) {
+                    if (!child.hasOwnProperty("depth")) {
+                        child.depth = rdepth + 1;
                     }
+                    stack.push(child);
                 }
                 return {value: result, done: false}
             }
@@ -208,6 +187,17 @@ function sample_and_children_depth_first(sample) {
     }
 }
 
+function direct_children(sample) {
+    let result = [];
+    if (sample.hasOwnProperty("s")) {
+        for (const childId of sample["s"]) {
+            let child = sample_for_id(childId);
+            result.push(child);
+        }
+    }
+    return result;
+}
+
 function title(e) {
     if (e.getAttribute("class") == "func_g") {
         return name_for_sample(sample_for_id(e.getAttribute("id").substring(2)));
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index c667fc396646..fcd2a3a8a1f5 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -251,10 +251,8 @@ function calculate_histogram_bars(bars, sample) {
     }
     bar["i"] = bar["i"] + sample["i"];
     bar["c"] = bar["c"] + sample["c"];
-    if (sample.hasOwnProperty("s")) {
-        for (const child of sample["s"]) {
-            calculate_histogram_bars(bars, child);
-        }
+    for (const child of direct_children(sample)) {
+        calculate_histogram_bars(bars, child);
     }
 }
 

From 632fcaaa5e0b3ed88ccea78a714d440fe1d22218 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 28 Sep 2021 18:16:48 +0100
Subject: [PATCH 243/681] Implement zooming of graph with collapsed recursive
 calls.!

---
 .../profiler/impl/resources/flamegraph.js     | 71 ++++++++++++++++---
 .../profiler/impl/resources/graphowner.js     | 66 ++++++++++++++++-
 .../profiler/impl/resources/histogram.js      | 16 +++--
 3 files changed, 137 insertions(+), 16 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 147741f9184b..acb84429a389 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -23,13 +23,14 @@
  * questions.
  */
 
-var flamegraph, flamegraph_details, search_matches, fg_xmin, fg_xmax, fg_zoomed_sample, fg_max_depth, fg_svg;
+var flamegraph, flamegraph_details, search_matches, fg_xmin, fg_xmax, fg_zoomed_sample, fg_max_depth, fg_svg, fg_collapsed;
 function fg_init(evt) {
     flamegraph_details = document.getElementById("details").firstChild;
     searchbtn = document.getElementById("search");
     matchedtxt = document.getElementById("matched");
     flamegraph = document.getElementById("flamegraph");
     search_matches = [];
+    fg_collapsed = true;
     fg_xmin = 0;
     fg_xmax = profileData[0].h;
     fg_zoomed_sample = profileData[0];
@@ -49,7 +50,7 @@ function fg_element_for_sample(sample) {
 }
 
 function fg_create_element_for_sample(sample, width, x) {
-    let y = (depth_for_sample(sample) + 1) * -fg_frameheight - fg_bottom_padding;
+    let y = fg_y_for_sample(sample);
     let e = document.createElementNS("http://www.w3.org/2000/svg", "g");
     e.className.baseVal = "func_g";
     e.onmouseover = function(e) {s(this)};
@@ -89,10 +90,42 @@ function fg_create_element_for_sample(sample, width, x) {
     return e;
 }
 
+function fg_x_for_sample(sample) {
+    if (fg_collapsed) {
+        return (sample.rx - fg_xmin) / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad) + xpad;
+    } else {
+        return (sample.x - fg_xmin) / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad) + xpad;
+    }
+}
+
+function fg_y_for_sample(sample) {
+    if (fg_collapsed) {
+        return (collapsed_depth_for_sample(sample) + 1) * -fg_frameheight - fg_bottom_padding;
+    } else {
+        return (depth_for_sample(sample) + 1) * -fg_frameheight - fg_bottom_padding;
+    }
+}
+
+function fg_sample_and_children_depth_first(sample) {
+    if (fg_collapsed) {
+        return collapsed_sample_and_children_depth_first(sample);
+    } else {
+        return sample_and_children_depth_first(sample);
+    }
+}
+
+function fg_width_for_sample(sample) {
+    if (fg_collapsed) {
+        return sample.rh / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad);
+    } else {
+        return sample.h / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad);
+    }
+}
+
 // zoom
 function zoom_child(sample) {
-    let width =  sample.h / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad);
-    let x = (sample.x - fg_xmin) / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad) + xpad;
+    let width = fg_width_for_sample(sample);
+    let x = fg_x_for_sample(sample);
     let e = fg_element_for_sample(sample);
 
     if (width < fg_min_width) {
@@ -119,9 +152,22 @@ function zoom_child(sample) {
     let name = name_for_sample(sample);
     let source = source_for_sample(sample);
 
+    let compiled = 0;
+    let interpreted = 0;
+    let hits = 0;
+    if (fg_collapsed) {
+        compiled = sample.rc;
+        interpreted = sample.ri;
+        hits = sample.rh;
+    } else {
+        compiled = sample.c;
+        interpreted = sample.i;
+        hits = sample.h;
+    }
+
     title.textContent = name + " (" + languageNames[sample.l] + ")\n" +
-        "Self samples: " + (sample.i + sample.c) + " (" + (100 * (sample.c + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
-        "Total samples: " + (sample.h) + " (" + (100 * (sample.h + sample.i) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
+        "Self samples: " + (interpreted + compiled) + " (" + (100 * (compiled + interpreted) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
+        "Total samples: " + (hits) + " (" + (100 * (hits) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
         "Source location: " + source + ":" + sample.fl + "\n";
 
     r.x.baseVal.value = x;
@@ -162,8 +208,13 @@ function zoom(node) {
     let parents = data[1];
     let unrelated = data[2];
     fg_zoomed_sample = sample;
-    fg_xmin = sample.x;
-    fg_xmax = sample.x + sample.h;
+    if (fg_collapsed) {
+        fg_xmin = sample.rx;
+        fg_xmax = sample.rx + sample.rh;
+    } else {
+        fg_xmin = sample.x;
+        fg_xmax = sample.x + sample.h;
+    }
     fg_max_depth = 0;
 
     var unzoombtn = document.getElementById("unzoom");
@@ -191,7 +242,7 @@ function fg_canvas_resize() {
 
 function zoom_internal(sample, parents, unrelated) {
     for (const u of unrelated) {
-        let iter = sample_and_children_depth_first(u);
+        let iter = fg_sample_and_children_depth_first(u);
         let c = iter.next();
         while (!c.done) {
             let e = fg_element_for_sample(c.value);
@@ -204,7 +255,7 @@ function zoom_internal(sample, parents, unrelated) {
     for (const p of parents) {
         zoom_parent(p);
     }
-    let iter = sample_and_children_depth_first(sample);
+    let iter = fg_sample_and_children_depth_first(sample);
     let c = iter.next();
     while (!c.done) {
         zoom_child(c.value);
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 553e8bc00d4c..39a0bc08ed9d 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -35,8 +35,13 @@ function s(node) {        // show
     let name = name_for_sample(sample)
     let details = name + " (" + languageNames[sample.l] + ") - ";
     if (sample.hasOwnProperty("h")) {
-        details = details + "(Self:" + (sample.i + sample.c) + " samples " +
-            "Total: " + (sample.h) + " samples)";
+        if (fg_collapsed) {
+            details = details + "(Self:" + (sample.ri + sample.rc) + " samples " +
+                "Total: " + (sample.rh) + " samples)";
+        } else {
+            details = details + "(Self:" + (sample.i + sample.c) + " samples " +
+                "Total: " + (sample.h) + " samples)";
+        }
     } else {
         details = details + "(" + (sample.i + sample.c) + " samples)";
     }
@@ -158,6 +163,23 @@ function depth_for_id_in_tree(tree, id) {
     return -1;
 }
 
+function collapsed_depth_for_id_in_tree(tree, id) {
+    if (tree.id == id) {
+        return 0;
+    } else if (tree.hasOwnProperty('ss')) {
+        let children = tree.rs;
+        for (let i = 0; i < children.length; i++) {
+            if (children[i].id == id) {
+                return 1;
+            } else if(children[i].id > id) {
+                return 1 + depth_for_id_in_tree(children[i - 1], id);
+            }
+        }
+        return 1 + depth_for_id_in_tree(children[children.length - 1], id);
+    }
+    return -1;
+}
+
 function depth_for_sample(sample) {
     if (!sample.hasOwnProperty("depth")) {
         sample.depth = depth_for_id_in_tree(profileData[0], sample.id);
@@ -165,6 +187,13 @@ function depth_for_sample(sample) {
     return sample.depth;
 }
 
+function collapsed_depth_for_sample(sample) {
+    if (!sample.hasOwnProperty("rdepth")) {
+        sample.depth = collapsed_depth_for_id_in_tree(profileData[0], sample.id);
+    }
+    return sample.depth;
+}
+
 function sample_and_children_depth_first(sample) {
     let stack = [sample];
     return {
@@ -187,6 +216,28 @@ function sample_and_children_depth_first(sample) {
     }
 }
 
+function collapsed_sample_and_children_depth_first(sample) {
+    let stack = [sample];
+    return {
+        next: function() {
+            if (stack.length == 0) {
+                return {value: null, done: true}
+            } else {
+                let result = stack.pop();
+
+                let rdepth = depth_for_sample(result);
+                for(const child of collapsed_children(result).reverse()) {
+                    if (!child.hasOwnProperty("depth")) {
+                        child.depth = rdepth + 1;
+                    }
+                    stack.push(child);
+                }
+                return {value: result, done: false}
+            }
+        }
+    }
+}
+
 function direct_children(sample) {
     let result = [];
     if (sample.hasOwnProperty("s")) {
@@ -198,6 +249,17 @@ function direct_children(sample) {
     return result;
 }
 
+function collapsed_children(sample) {
+    let result = [];
+    if (sample.hasOwnProperty("rs")) {
+        for (const childId of sample["rs"]) {
+            let child = sample_for_id(childId);
+            result.push(child);
+        }
+    }
+    return result;
+}
+
 function title(e) {
     if (e.getAttribute("class") == "func_g") {
         return name_for_sample(sample_for_id(e.getAttribute("id").substring(2)));
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index fcd2a3a8a1f5..206d980a3285 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -249,10 +249,18 @@ function calculate_histogram_bars(bars, sample) {
     } else {
         bar = bars[sample["n"]];
     }
-    bar["i"] = bar["i"] + sample["i"];
-    bar["c"] = bar["c"] + sample["c"];
-    for (const child of direct_children(sample)) {
-        calculate_histogram_bars(bars, child);
+    if (fg_collapsed) {
+        bar["i"] = bar["i"] + sample["ri"];
+        bar["c"] = bar["c"] + sample["rc"];
+        for (const child of collapsed_children(sample)) {
+            calculate_histogram_bars(bars, child);
+        }
+    } else {
+        bar["i"] = bar["i"] + sample["i"];
+        bar["c"] = bar["c"] + sample["c"];
+        for (const child of direct_children(sample)) {
+            calculate_histogram_bars(bars, child);
+        }
     }
 }
 

From a04cb30c6c1cb810738109d64064f29c8535c5fc Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Wed, 29 Sep 2021 12:19:11 +0100
Subject: [PATCH 244/681] Add ability to toggle collapse of recursive calls.

---
 .../profiler/impl/resources/flamegraph.js     | 36 +++++++++++
 .../profiler/impl/resources/graphowner.js     | 62 ++++++++-----------
 2 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index acb84429a389..948ca1d98831 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -90,6 +90,34 @@ function fg_create_element_for_sample(sample, width, x) {
     return e;
 }
 
+function fg_toggle_collapse() {
+    // Hide all the existing elements
+    let iter = fg_sample_and_children_depth_first(profileData[0]);
+    let c = iter.next();
+    while (!c.done) {
+        let e = fg_element_for_sample(c.value);
+        if (e != null) {
+            e.style["display"] = "none";
+        }
+        c = iter.next();
+    }
+    // Find the correct element to zoom to
+    let sample_to_zoom_to = fg_zoomed_sample;
+    if (!fg_collapsed && fg_zoomed_sample.hasOwnProperty("ro")) {
+        sample_to_zoom_to = profileData[fg_zoomed_sample.ro];
+    }
+
+    // Toggle fg_collapsed
+    fg_collapsed = !fg_collapsed;
+
+    // Zoom to the correct element
+    if (sample_to_zoom_to == profileData[0]) {
+        unzoom();
+    } else {
+        zoom(fg_element_for_sample(sample_to_zoom_to));
+    }
+}
+
 function fg_x_for_sample(sample) {
     if (fg_collapsed) {
         return (sample.rx - fg_xmin) / (fg_xmax - fg_xmin) * (fg_width - 2 * xpad) + xpad;
@@ -126,6 +154,7 @@ function fg_width_for_sample(sample) {
 function zoom_child(sample) {
     let width = fg_width_for_sample(sample);
     let x = fg_x_for_sample(sample);
+    let y = fg_y_for_sample(sample);
     let e = fg_element_for_sample(sample);
 
     if (width < fg_min_width) {
@@ -171,7 +200,9 @@ function zoom_child(sample) {
         "Source location: " + source + ":" + sample.fl + "\n";
 
     r.x.baseVal.value = x;
+    r.y.baseVal.value = y;
     t.x.baseVal[0].value = x + 3;
+    t.y.baseVal[0].value = y - 5 + fg_frameheight;
 
     r.width.baseVal.value = width;
     update_text_parts(e, r, t, width - 3, name);
@@ -180,6 +211,7 @@ function zoom_child(sample) {
 function zoom_parent(sample) {
     let width =  fg_width - 2 * xpad;
     let x = xpad;
+    let y = fg_y_for_sample(sample);
     let e = fg_element_for_sample(sample);
     if (e != null) {
         e.style["display"] = "block";
@@ -194,7 +226,9 @@ function zoom_parent(sample) {
             " Parent of displayed sample range.\n";
 
         r.x.baseVal.value = x;
+        r.y.baseVal.value = y;
         t.x.baseVal[0].value = x + 3;
+        t.y.baseVal[0].value = y - 5 + fg_frameheight;
 
         r.width.baseVal.value = width;
 
@@ -428,3 +462,5 @@ function fg_resize(new_width) {
     document.getElementById("search").setAttribute("x", new_width - xpad);
 
 }
+
+graph_register_handler("r", "Toggle collapse of recursive calls", fg_toggle_collapse);
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 39a0bc08ed9d..9b7535609933 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -146,52 +146,40 @@ function sample_for_id(id) {
     return profileData[id];
 }
 
-function depth_for_id_in_tree(tree, id) {
-    if (tree.id == id) {
-        return 0;
-    } else if (tree.hasOwnProperty('s')) {
-        let children = tree.s;
-        for (let i = 0; i < children.length; i++) {
-            if (children[i].id == id) {
-                return 1;
-            } else if(children[i].id > id) {
-                return 1 + depth_for_id_in_tree(children[i - 1], id);
-            }
-        }
-        return 1 + depth_for_id_in_tree(children[children.length - 1], id);
-    }
-    return -1;
-}
-
-function collapsed_depth_for_id_in_tree(tree, id) {
-    if (tree.id == id) {
-        return 0;
-    } else if (tree.hasOwnProperty('ss')) {
-        let children = tree.rs;
-        for (let i = 0; i < children.length; i++) {
-            if (children[i].id == id) {
-                return 1;
-            } else if(children[i].id > id) {
-                return 1 + depth_for_id_in_tree(children[i - 1], id);
-            }
-        }
-        return 1 + depth_for_id_in_tree(children[children.length - 1], id);
-    }
-    return -1;
-}
-
 function depth_for_sample(sample) {
     if (!sample.hasOwnProperty("depth")) {
-        sample.depth = depth_for_id_in_tree(profileData[0], sample.id);
+        let parent = profileData[sample.p];
+        let depth = 0;
+        while (parent != null) {
+            if (parent.hasOwnProperty("depth")) {
+                depth += parent.depth + 1;
+                break;
+            } else {
+                depth += 1;
+            }
+            parent = profileData[sample.p];
+        }
+        sample.depth = depth;
     }
     return sample.depth;
 }
 
 function collapsed_depth_for_sample(sample) {
     if (!sample.hasOwnProperty("rdepth")) {
-        sample.depth = collapsed_depth_for_id_in_tree(profileData[0], sample.id);
+        let parent = profileData[sample.rp];
+        let depth = 0;
+        while (parent != null) {
+            if (parent.hasOwnProperty("rdepth")) {
+                depth += parent.rdepth + 1;
+                break;
+            } else {
+                depth += 1;
+            }
+            parent = profileData[sample.rp];
+        }
+        sample.rdepth = depth;
     }
-    return sample.depth;
+    return sample.rdepth;
 }
 
 function sample_and_children_depth_first(sample) {

From 1c86e4dd466618b336f6febf361b96d23ee6a949 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Thu, 30 Sep 2021 17:36:28 +0200
Subject: [PATCH 245/681] Fix bug in AArch64NodeMatchRules.

---
 .../core/aarch64/AArch64NodeMatchRules.java   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
index 4b5aab8615c5..dfcdd241c4b8 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java
@@ -55,6 +55,7 @@
 import org.graalvm.compiler.nodes.calc.AndNode;
 import org.graalvm.compiler.nodes.calc.BinaryNode;
 import org.graalvm.compiler.nodes.calc.FloatConvertNode;
+import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
 import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
 import org.graalvm.compiler.nodes.calc.LeftShiftNode;
 import org.graalvm.compiler.nodes.calc.MulNode;
@@ -152,6 +153,20 @@ protected AArch64Kind getMemoryKind(MemoryAccess access) {
         return (AArch64Kind) gen.getLIRKind(((ValueNode) access).stamp(NodeView.DEFAULT)).getPlatformKind();
     }
 
+    private static boolean isSupportedExtendedAddSubShift(IntegerConvertNode<?, ?> node, int clampedShiftAmt) {
+        assert clampedShiftAmt >= 0;
+        if (clampedShiftAmt <= 4) {
+            switch (node.getInputBits()) {
+                case Byte.SIZE:
+                case Short.SIZE:
+                case Integer.SIZE:
+                case Long.SIZE:
+                    return true;
+            }
+        }
+        return false;
+    }
+
     private static ExtendType getZeroExtendType(int fromBits) {
         switch (fromBits) {
             case Byte.SIZE:
@@ -300,7 +315,7 @@ private ComplexMatchResult emitExtendedAddSubShift(BinaryNode op, ValueNode x, V
     public ComplexMatchResult mergeSignExtendByShiftIntoAddSub(BinaryNode op, LeftShiftNode lshift, ValueNode ext, ValueNode x, ValueNode y) {
         assert isNumericInteger(lshift);
         int shiftAmt = getClampedShiftAmt(lshift);
-        if (shiftAmt > 4) {
+        if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?, ?>) ext, shiftAmt)) {
             return null;
         }
         ExtendType extType;
@@ -390,7 +405,7 @@ public ComplexMatchResult extendedPointerAddShift(AArch64PointerAddNode addP) {
             zeroExtend = (ZeroExtendNode) shift.getX();
             shiftAmt = getClampedShiftAmt(shift);
         }
-        if (shiftAmt > 4) {
+        if (!isSupportedExtendedAddSubShift(zeroExtend, shiftAmt)) {
             return null;
         }
 
@@ -849,6 +864,10 @@ public ComplexMatchResult mergeDowncastIntoAddSub(BinaryNode op, ValueNode x, Va
     @MatchRule("(Add=op x (ZeroExtend=ext y))")
     @MatchRule("(Sub=op x (ZeroExtend=ext y))")
     public ComplexMatchResult mergeSignExtendIntoAddSub(BinaryNode op, UnaryNode ext, ValueNode x, ValueNode y) {
+        if (!isSupportedExtendedAddSubShift((IntegerConvertNode<?, ?>) ext, 0)) {
+            return null;
+        }
+
         ExtendType extType;
         if (ext instanceof SignExtendNode) {
             extType = getSignExtendType(((SignExtendNode) ext).getInputBits());

From 0597be9e2c78ff999008aee3151e0ec5fb962a31 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Thu, 30 Sep 2021 15:56:25 +0200
Subject: [PATCH 246/681] [GR-34118] Add a unique id into Message.

---
 truffle/CHANGELOG.md                          |  2 +
 .../truffle/api/dsl/test/MessageIdTest.java   | 80 +++++++++++++++++++
 .../snapshot.sigtest                          |  6 +-
 .../truffle/api/library/LibraryFactory.java   |  8 +-
 .../oracle/truffle/api/library/Message.java   | 29 ++++++-
 .../processor/library/LibraryGenerator.java   |  9 ++-
 6 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MessageIdTest.java

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index 9271dad7a637..bdaab814aead 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -4,6 +4,8 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 
 ## Version 22.0.0
 * Truffle DSL generated code now inherits all annotations on constructor parameters to the static create factory method.
+* Added a [Message#getId()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/library/Message.html#getId--) method returning a unique message id within a library.
+* Added a [LibraryFactory#getMessages()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/library/LibraryFactory.html#getMessages--) method returning a list of messages that the library provides.
 
 *  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` is deprecated and so will be `TruffleRuntime#createCallTarget()` soon. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
 
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MessageIdTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MessageIdTest.java
new file mode 100644
index 000000000000..6357cb9fa5f2
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/MessageIdTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.api.dsl.test;
+
+import com.oracle.truffle.api.library.GenerateLibrary;
+import com.oracle.truffle.api.library.Library;
+import com.oracle.truffle.api.library.LibraryFactory;
+import com.oracle.truffle.api.library.Message;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class MessageIdTest {
+
+    @Test
+    public void testMessageIds() {
+        List<Message> messages = MessageIdTestLibrary.FACTORY.getMessages();
+        assertEquals(5, messages.size());
+        int id = 0;
+        for (Message message : messages) {
+            assertEquals(id++, message.getId());
+        }
+    }
+
+    @GenerateLibrary
+    public abstract static class MessageIdTestLibrary extends Library {
+
+        static final LibraryFactory<MessageIdTestLibrary> FACTORY = LibraryFactory.resolve(MessageIdTestLibrary.class);
+
+        public abstract void m0(Object receiver);
+
+        public abstract void m1(Object receiver);
+
+        public abstract void m2(Object receiver);
+
+        public abstract void m3(Object receiver);
+
+        public abstract void m4(Object receiver);
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest b/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest
index 16c766e56f72..1e596bba3c92 100644
--- a/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest
+++ b/truffle/src/com.oracle.truffle.api.library/snapshot.sigtest
@@ -146,6 +146,7 @@ meth protected static boolean isDelegated(com.oracle.truffle.api.library.Library
 meth protected static java.lang.Object readDelegate(com.oracle.truffle.api.library.Library,java.lang.Object)
 meth protected {com.oracle.truffle.api.library.LibraryFactory%0} createAssertions({com.oracle.truffle.api.library.LibraryFactory%0})
 meth protected {com.oracle.truffle.api.library.LibraryFactory%0} createDelegate({com.oracle.truffle.api.library.LibraryFactory%0})
+meth public final java.util.List<com.oracle.truffle.api.library.Message> getMessages()
 meth public final {com.oracle.truffle.api.library.LibraryFactory%0} create(java.lang.Object)
 meth public final {com.oracle.truffle.api.library.LibraryFactory%0} createDispatched(int)
 meth public final {com.oracle.truffle.api.library.LibraryFactory%0} getUncached()
@@ -157,10 +158,13 @@ hfds EMPTY_DEFAULT_EXPORT_ARRAY,LIBRARIES,UNSAFE,afterBuiltinDefaultExports,aot,
 hcls CachedAOTExports,ProxyExports,ResolvedDispatch
 
 CLSS public abstract com.oracle.truffle.api.library.Message
+cons protected !varargs init(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,int,java.lang.Class<?>,java.lang.Class<?>[])
 cons protected !varargs init(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,java.lang.Class<?>,java.lang.Class<?>[])
+ anno 0 java.lang.Deprecated()
 meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
 meth public final boolean equals(java.lang.Object)
 meth public final com.oracle.truffle.api.library.LibraryFactory<?> getFactory()
+meth public final int getId()
 meth public final int getParameterCount()
 meth public final int hashCode()
 meth public final java.lang.Class<? extends com.oracle.truffle.api.library.Library> getLibraryClass()
@@ -175,7 +179,7 @@ meth public final java.util.List<java.lang.Class<?>> getParameterTypes()
 meth public static com.oracle.truffle.api.library.Message resolve(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String)
 meth public static com.oracle.truffle.api.library.Message resolve(java.lang.Class<? extends com.oracle.truffle.api.library.Library>,java.lang.String,boolean)
 supr java.lang.Object
-hfds hash,library,libraryClass,parameterCount,parameterTypes,parameterTypesArray,qualifiedName,returnType,simpleName
+hfds hash,id,library,libraryClass,parameterCount,parameterTypes,parameterTypesArray,qualifiedName,returnType,simpleName
 
 CLSS public abstract com.oracle.truffle.api.library.ReflectionLibrary
 cons protected init()
diff --git a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/LibraryFactory.java b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/LibraryFactory.java
index 25bb275a75bf..3808e816f022 100644
--- a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/LibraryFactory.java
+++ b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/LibraryFactory.java
@@ -488,7 +488,13 @@ final Class<T> getLibraryClass() {
         return libraryClass;
     }
 
-    final List<Message> getMessages() {
+    /**
+     * Returns an unmodifiable list of messages that this library provides. The returned list is
+     * ordered by {@link Message#getId() message ids}.
+     *
+     * @since 22.0
+     */
+    public final List<Message> getMessages() {
         return messages;
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/Message.java b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/Message.java
index 550b90236016..6b4ecc97e575 100644
--- a/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/Message.java
+++ b/truffle/src/com.oracle.truffle.api.library/src/com/oracle/truffle/api/library/Message.java
@@ -72,6 +72,7 @@ public abstract class Message {
 
     private final String simpleName;
     private final String qualifiedName;
+    private final int id;
     private final int hash;
     private final Class<?> returnType;
     private final Class<? extends Library> libraryClass;
@@ -82,9 +83,24 @@ public abstract class Message {
 
     /**
      * @since 19.0
+     * @deprecated Use {@link #Message(Class, String, int, Class, Class[])}.
      */
-    @SuppressWarnings("unchecked")
+    @Deprecated
     protected Message(Class<? extends Library> libraryClass, String messageName, Class<?> returnType, Class<?>... parameterTypes) {
+        this(libraryClass, -1, messageName, returnType, parameterTypes);
+    }
+
+    /**
+     * @since 22.0
+     */
+    protected Message(Class<? extends Library> libraryClass, String messageName, int id, Class<?> returnType, Class<?>... parameterTypes) {
+        this(libraryClass, id, messageName, returnType, parameterTypes);
+        if (id < 0) {
+            throw new IllegalArgumentException("Id must be non-negative.");
+        }
+    }
+
+    private Message(Class<? extends Library> libraryClass, int id, String messageName, Class<?> returnType, Class<?>... parameterTypes) {
         Objects.requireNonNull(libraryClass);
         Objects.requireNonNull(messageName);
         Objects.requireNonNull(returnType);
@@ -94,10 +110,21 @@ protected Message(Class<? extends Library> libraryClass, String messageName, Cla
         this.parameterTypesArray = parameterTypes;
         this.parameterTypes = Collections.unmodifiableList(Arrays.asList(parameterTypes));
         this.qualifiedName = (getLibraryName() + "." + simpleName).intern();
+        this.id = id;
         this.parameterCount = parameterTypes.length;
         this.hash = qualifiedName.hashCode();
     }
 
+    /**
+     * Returns a unique message id within a library.
+     *
+     * @return a non-negative message id or {@code -1} if the message is not assigned a unique id.
+     * @since 22.0
+     */
+    public final int getId() {
+        return id;
+    }
+
     /**
      * Returns a qualified and unique name of this message. The qualified name is specified as
      * <code>getLibraryName() + "." + getSimpleName()</code>. The returned name is
diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
index 1b9fe1d02076..9bb8b16f04d2 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
@@ -148,12 +148,13 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
         CodeTreeBuilder statics = staticsMethod.createBuilder();
 
         List<MessageObjects> methods = new ArrayList<>();
-        for (int messageIndex = 0; messageIndex < model.getMethods().size(); messageIndex++) {
-            LibraryMessage message = model.getMethods().get(messageIndex);
+        int messageIndex = 0;
+        for (LibraryMessage message : model.getMethods()) {
             if (message.hasErrors()) {
                 continue;
             }
-            MessageObjects objects = new MessageObjects(message, messageIndex);
+            int useIndex = message.getName().equals(ACCEPTS) ? -1 : messageIndex++;
+            MessageObjects objects = new MessageObjects(message, useIndex);
             methods.add(objects);
         }
 
@@ -208,7 +209,7 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
         messageConstructor.addParameter(new CodeVariableElement(context.getType(Class[].class), "parameters"));
         messageConstructor.setVarArgs(true);
         builder = messageConstructor.createBuilder();
-        builder.startStatement().startSuperCall().staticReference(libraryClassLiteral).string("name").string("returnType").string("parameters").end().end();
+        builder.startStatement().startSuperCall().staticReference(libraryClassLiteral).string("name").string("index").string("returnType").string("parameters").end().end();
         builder.statement("this.index = index");
         messageClass.add(messageConstructor);
         genClass.add(messageClass);

From be876d6f8aa511fa16a2bb51bc5d2e2806a64605 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Thu, 30 Sep 2021 18:10:35 +0200
Subject: [PATCH 247/681] Replaced index by Message#getId().

---
 .../dsl/processor/library/LibraryGenerator.java     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
index 9bb8b16f04d2..f028fa0d27e0 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/library/LibraryGenerator.java
@@ -201,7 +201,6 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
 
         // class MessageImpl
         final CodeTypeElement messageClass = createClass(model, null, modifiers(PRIVATE, STATIC), "MessageImpl", types.Message);
-        messageClass.add(new CodeVariableElement(modifiers(FINAL), context.getType(int.class), "index"));
         CodeExecutableElement messageConstructor = new CodeExecutableElement(modifiers(), null, messageClass.getSimpleName().toString());
         messageConstructor.addParameter(new CodeVariableElement(context.getType(String.class), "name"));
         messageConstructor.addParameter(new CodeVariableElement(context.getType(int.class), "index"));
@@ -210,7 +209,6 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
         messageConstructor.setVarArgs(true);
         builder = messageConstructor.createBuilder();
         builder.startStatement().startSuperCall().staticReference(libraryClassLiteral).string("name").string("index").string("returnType").string("parameters").end().end();
-        builder.statement("this.index = index");
         messageClass.add(messageConstructor);
         genClass.add(messageClass);
 
@@ -353,7 +351,7 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
 
         builder.end().startBlock();
         builder.startStatement();
-        builder.string("bitSet.set(((").type(messageClass.asType()).string(") message).index)");
+        builder.string("bitSet.set(message.getId())");
         builder.end();
         builder.end(); // for
 
@@ -453,7 +451,7 @@ public List<CodeTypeElement> create(ProcessorContext context1, AnnotationProcess
         delegateIsAdoptable.createBuilder().startReturn().string("this.delegateLibrary.isAdoptable()").end();
         delegateClass.add(delegateIsAdoptable);
 
-        genClass.add(createGenericDispatch(methods, messageClass));
+        genClass.add(createGenericDispatch(methods));
 
         // CachedToUncachedDispatchNode
         final CodeTypeElement cachedToUncached = createClass(model, null, modifiers(PRIVATE, STATIC, FINAL), "CachedToUncachedDispatch", libraryTypeMirror);
@@ -872,7 +870,7 @@ private CodeAnnotationMirror createExplodeLoop() {
         return new CodeAnnotationMirror(types.ExplodeLoop);
     }
 
-    private CodeExecutableElement createGenericDispatch(List<MessageObjects> methods, CodeTypeElement messageClass) {
+    private CodeExecutableElement createGenericDispatch(List<MessageObjects> methods) {
         CodeTreeBuilder builder;
         CodeExecutableElement reflectionGenericDispatch = GeneratorUtils.override(types.LibraryFactory, "genericDispatch");
         reflectionGenericDispatch.getParameters().set(0, new CodeVariableElement(types.Library, "library"));
@@ -880,13 +878,12 @@ private CodeExecutableElement createGenericDispatch(List<MessageObjects> methods
         reflectionGenericDispatch.getModifiers().remove(ABSTRACT);
         builder = reflectionGenericDispatch.createBuilder();
         builder.declaration(model.getTemplateType().asType(), "lib", builder.create().cast(model.getTemplateType().asType()).string("originalLib"));
-        builder.declaration(messageClass.asType(), "messageImpl", builder.create().cast(messageClass.asType()).string("message").build());
-        builder.startIf().string("messageImpl.getParameterCount() - 1 != args.length - offset").end().startBlock();
+        builder.startIf().string("message.getParameterCount() - 1 != args.length - offset").end().startBlock();
         builder.startStatement().startStaticCall(types.CompilerDirectives, "transferToInterpreterAndInvalidate").end().end();
         builder.startThrow().startNew(context.getType(IllegalArgumentException.class)).doubleQuote("Invalid number of arguments.").end().end();
         builder.end();
         boolean uncheckedCast = false;
-        builder.startSwitch().string("messageImpl.index").end().startBlock();
+        builder.startSwitch().string("message.getId()").end().startBlock();
         for (MessageObjects message : methods) {
             if (message.model.getName().equals(ACCEPTS)) {
                 continue;

From 0bd2ac06f2c80779fe917e0d081e83601d561b1f Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Thu, 30 Sep 2021 18:14:01 +0200
Subject: [PATCH 248/681] Enforce that only CHA oracle can retrieve the
 leafTypeAssumption from ObjectKlass

---
 .../analysis/hierarchy/ClassHierarchyOracle.java  |  5 +++++
 .../hierarchy/DefaultClassHierarchyOracle.java    |  4 ++--
 .../hierarchy/NoOpClassHierarchyOracle.java       |  4 +++-
 .../oracle/truffle/espresso/impl/ObjectKlass.java | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
index 384aa24312d2..08024f645908 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
@@ -34,6 +34,11 @@
  * The oracle is only valid within an {@link EspressoContext}.
  */
 public interface ClassHierarchyOracle {
+    final class LeafTypeAssumptionAccessor {
+        protected LeafTypeAssumptionAccessor() {
+        }
+    }
+
     /**
      * Must be called to initialize {@code leafTypeAssumption} of {@code newKlass}.
      *
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
index 09cf21c0ab2c..b4a5a210d7c6 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
@@ -50,8 +50,8 @@ public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
     @Override
     public void onClassInit(ObjectKlass newClass) {
         ObjectKlass currentParent = newClass.getSuperKlass();
-        while (currentParent != null && currentParent.getLeafTypeAssumption().getAssumption().isValid()) {
-            currentParent.getLeafTypeAssumption().getAssumption().invalidate();
+        while (currentParent != null && currentParent.getLeafTypeAssumption(assumptionAccessor).getAssumption().isValid()) {
+            currentParent.getLeafTypeAssumption(assumptionAccessor).getAssumption().invalidate();
             currentParent = currentParent.getSuperKlass();
         }
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
index aad597b94058..2ce82a93b037 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -53,6 +53,8 @@ public Assumption getAssumption() {
         }
     }
 
+    protected static final LeafTypeAssumptionAccessor assumptionAccessor = new LeafTypeAssumptionAccessor();
+
     protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl("final class is always a CHA leaf");
     protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.AlwaysInvalid;
 
@@ -70,6 +72,6 @@ public void onClassInit(ObjectKlass newKlass) {
 
     @Override
     public LeafTypeAssumption isLeafClass(ObjectKlass klass) {
-        return klass.getLeafTypeAssumption();
+        return klass.getLeafTypeAssumption(assumptionAccessor);
     }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
index 8cae9b3c347a..c109eec11332 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
@@ -36,6 +36,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 
@@ -46,6 +47,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.espresso.analysis.hierarchy.ClassHierarchyOracle.LeafTypeAssumptionAccessor;
 import com.oracle.truffle.espresso.analysis.hierarchy.LeafTypeAssumption;
 import com.oracle.truffle.espresso.analysis.hierarchy.ClassHierarchyOracle;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
@@ -1406,12 +1408,15 @@ public void removeByRedefinition() {
     }
 
     /**
-     * @return the assumption, indicating if this class is a leaf in class hierarchy. This
-     *         assumption must only be used by {@link ClassHierarchyOracle}, other users must use
-     *         {@link ClassHierarchyOracle#isLeafClass(ObjectKlass)}. The assumption is stored in
-     *         ObjectKlass for easy mapping between classes and corresponding assumptions.
+     * This getter must only be used by {@link ClassHierarchyOracle}, which is ensured by
+     * {@code assumptionAccessor}. The assumption is stored in ObjectKlass for easy mapping between
+     * classes and corresponding assumptions.
+     *
+     * @see ClassHierarchyOracle#isLeafClass(ObjectKlass)
+     * @return the assumption, indicating if this class is a leaf in class hierarchy.
      */
-    public LeafTypeAssumption getLeafTypeAssumption() {
+    public LeafTypeAssumption getLeafTypeAssumption(LeafTypeAssumptionAccessor assumptionAccessor) {
+        Objects.requireNonNull(assumptionAccessor);
         return leafTypeAssumption;
     }
 

From 7c810c82f05efe198b9fd3143b2aeedc5831e3cf Mon Sep 17 00:00:00 2001
From: jovanstevanovic <jovan.stevanovic1@outlook.com>
Date: Fri, 16 Jul 2021 13:38:38 +0200
Subject: [PATCH 249/681] Added support to register/access resource with
 trailing slash.

---
 .../com/oracle/svm/core/jdk/Resources.java    | 29 +++++++++++++++----
 .../resources/NativeImageResourcePath.java    |  4 +--
 .../jdk/resources/ResourceURLConnection.java  |  2 +-
 .../oracle/svm/hosted/ResourcesFeature.java   | 13 ++++++---
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
index 82c9f433d685..7a365e2666c0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
@@ -31,13 +31,12 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
-import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;
-import com.oracle.svm.core.jdk.resources.ResourceURLConnection;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -45,6 +44,9 @@
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.jdk.resources.NativeImageResourcePath;
+import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;
+import com.oracle.svm.core.jdk.resources.ResourceURLConnection;
 import com.oracle.svm.core.util.ImageHeapMap;
 import com.oracle.svm.core.util.VMError;
 
@@ -57,6 +59,8 @@
  */
 public final class Resources {
 
+    public static final char RESOURCES_INTERNAL_PATH_SEPARATOR = '/';
+
     public static Resources singleton() {
         return ImageSingletons.lookup(Resources.class);
     }
@@ -121,6 +125,15 @@ public static void registerDirectoryResource(String resourceDirName, String cont
         addEntry(resourceDirName, true, content.getBytes());
     }
 
+    /**
+     * Avoid pulling native file system by using {@link NativeImageResourcePath} implementation to
+     * convert <code>resourceName</code> to canonical variant.
+     */
+    public static String toCanonicalForm(String resourceName) {
+        NativeImageResourcePath path = new NativeImageResourcePath(null, resourceName.getBytes(StandardCharsets.UTF_8), true);
+        return new String(NativeImageResourcePath.getResolved(path));
+    }
+
     public static ResourceStorageEntry get(String name) {
         return singleton().resources.get(name);
     }
@@ -144,7 +157,8 @@ public static URL createURL(String resourceName) {
         if (resourceName == null) {
             return null;
         }
-        Enumeration<URL> urls = createURLs(resourceName);
+
+        Enumeration<URL> urls = createURLs(toCanonicalForm(resourceName));
         return urls.hasMoreElements() ? urls.nextElement() : null;
     }
 
@@ -153,7 +167,8 @@ public static InputStream createInputStream(String resourceName) {
         if (resourceName == null) {
             return null;
         }
-        ResourceStorageEntry entry = Resources.get(resourceName);
+
+        ResourceStorageEntry entry = Resources.get(toCanonicalForm(resourceName));
         if (entry == null) {
             return null;
         }
@@ -165,14 +180,16 @@ public static Enumeration<URL> createURLs(String resourceName) {
         if (resourceName == null) {
             return null;
         }
-        ResourceStorageEntry entry = Resources.get(resourceName);
+
+        String canonicalResourceName = toCanonicalForm(resourceName);
+        ResourceStorageEntry entry = Resources.get(canonicalResourceName);
         if (entry == null) {
             return Collections.emptyEnumeration();
         }
         int numberOfResources = entry.getData().size();
         List<URL> resourcesURLs = new ArrayList<>(numberOfResources);
         for (int index = 0; index < numberOfResources; index++) {
-            resourcesURLs.add(createURL(resourceName, index));
+            resourcesURLs.add(createURL(canonicalResourceName, index));
         }
         return Collections.enumeration(resourcesURLs);
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourcePath.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourcePath.java
index 3c7bccdd5bac..f3a3b4b4a0de 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourcePath.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourcePath.java
@@ -603,13 +603,13 @@ private byte[] getResolved() {
         }
         for (byte c : path) {
             if (c == '.') {
-                return doGetResolved(this);
+                return getResolved(this);
             }
         }
         return path;
     }
 
-    private static byte[] doGetResolved(NativeImageResourcePath p) {
+    public static byte[] getResolved(NativeImageResourcePath p) {
         int nc = p.getNameCount();
         byte[] path = p.path;
         int[] offsets = p.offsets;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java
index 3aa271c5f30d..8733cd70f25c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java
@@ -63,7 +63,7 @@ public void connect() {
         connected = true;
 
         String resourceName = resolveName(url.getPath());
-        ResourceStorageEntry entry = Resources.get(resourceName);
+        ResourceStorageEntry entry = Resources.get(Resources.toCanonicalForm(resourceName));
         if (entry != null) {
             List<byte[]> bytes = entry.getData();
             if (index < bytes.size()) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
index 606dbf6322a4..fbdaa447b084 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -25,6 +25,8 @@
 
 package com.oracle.svm.hosted;
 
+import static com.oracle.svm.core.jdk.Resources.RESOURCES_INTERNAL_PATH_SEPARATOR;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,6 +50,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.oracle.svm.core.util.VMError;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionType;
@@ -268,7 +271,7 @@ private static void scanDirectory(DebugContext debugContext, Path root, Pattern[
             /* Resources always use / as the separator, as do our resource inclusion patterns */
             String relativeFilePath;
             if (entry != root) {
-                relativeFilePath = root.relativize(entry).toString().replace(File.separatorChar, '/');
+                relativeFilePath = root.relativize(entry).toString().replace(File.separatorChar, RESOURCES_INTERNAL_PATH_SEPARATOR);
                 allEntries.add(relativeFilePath);
             } else {
                 relativeFilePath = "";
@@ -291,7 +294,7 @@ private static void scanDirectory(DebugContext debugContext, Path root, Pattern[
         }
 
         for (String entry : allEntries) {
-            int last = entry.lastIndexOf('/');
+            int last = entry.lastIndexOf(RESOURCES_INTERNAL_PATH_SEPARATOR);
             String key = last == -1 ? "" : entry.substring(0, last);
             List<String> dirContent = matchedDirectoryResources.get(key);
             if (dirContent != null && !dirContent.contains(entry)) {
@@ -328,14 +331,16 @@ private static void scanJar(DebugContext debugContext, Path jarPath, Pattern[] i
     }
 
     private static boolean matches(Pattern[] includePatterns, Pattern[] excludePatterns, String relativePath) {
+        VMError.guarantee(!relativePath.contains("\\"), "Resource path contains backslash!");
+        String relativePathWithTrailingSlash = relativePath + RESOURCES_INTERNAL_PATH_SEPARATOR;
         for (Pattern p : excludePatterns) {
-            if (p.matcher(relativePath).matches()) {
+            if (p.matcher(relativePath).matches() || p.matcher(relativePathWithTrailingSlash).matches()) {
                 return false;
             }
         }
 
         for (Pattern p : includePatterns) {
-            if (p.matcher(relativePath).matches()) {
+            if (p.matcher(relativePath).matches() || p.matcher(relativePathWithTrailingSlash).matches()) {
                 return true;
             }
         }

From 684008e7ba9c0aac12fb719918cbbe4070ed0b2a Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Fri, 1 Oct 2021 10:33:03 +0200
Subject: [PATCH 250/681] Control CHA with a commandline flag. Disabled by
 default.

---
 .../com/oracle/truffle/espresso/EspressoOptions.java  |  4 ++++
 .../truffle/espresso/runtime/EspressoContext.java     | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
index cf2631d04a72..65b72e205d82 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
@@ -236,6 +236,10 @@ public VerifyMode apply(String s) {
                     category = OptionCategory.EXPERT, stability = OptionStability.STABLE) //
     public static final OptionKey<Boolean> LivenessAnalysis = new OptionKey<>(false);
 
+    @Option(help = "Enable Class Hierarchy Analysis, which optimizes instanceof checks and virtual method calls by keeping track of descendants of a given class or interface.", //
+                    category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL) //
+    public static final OptionKey<Boolean> EnableCHA = new OptionKey<>(false);
+
     private static final OptionType<com.oracle.truffle.espresso.jdwp.api.JDWPOptions> JDWP_OPTIONS_OPTION_TYPE = new OptionType<>("JDWPOptions",
                     new Function<String, JDWPOptions>() {
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
index 23257795d668..8de0949cdec3 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
@@ -44,6 +44,8 @@
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import com.oracle.truffle.espresso.analysis.hierarchy.DefaultClassHierarchyOracle;
+import com.oracle.truffle.espresso.analysis.hierarchy.NoOpClassHierarchyOracle;
 import org.graalvm.options.OptionMap;
 import org.graalvm.polyglot.Engine;
 
@@ -67,7 +69,6 @@
 import com.oracle.truffle.espresso.EspressoOptions;
 import com.oracle.truffle.espresso.FinalizationSupport;
 import com.oracle.truffle.espresso.analysis.hierarchy.ClassHierarchyOracle;
-import com.oracle.truffle.espresso.analysis.hierarchy.NoOpClassHierarchyOracle;
 import com.oracle.truffle.espresso.descriptors.Names;
 import com.oracle.truffle.espresso.descriptors.Signatures;
 import com.oracle.truffle.espresso.descriptors.Symbol;
@@ -171,6 +172,7 @@ public final class EspressoContext {
     public final boolean InlineMethodHandle;
     public final boolean SplitMethodHandles;
     public final boolean livenessAnalysis;
+    public final boolean EnableClassHierarchyAnalysis;
 
     // Behavior control
     public final boolean EnableManagement;
@@ -272,6 +274,7 @@ public EspressoContext(TruffleLanguage.Env env, EspressoLanguage language) {
         this.EnableSignals = env.getOptions().get(EspressoOptions.EnableSignals);
         this.SpecCompliancyMode = env.getOptions().get(EspressoOptions.SpecCompliancy);
         this.livenessAnalysis = env.getOptions().get(EspressoOptions.LivenessAnalysis);
+        this.EnableClassHierarchyAnalysis = env.getOptions().get(EspressoOptions.EnableCHA);
         this.EnableManagement = env.getOptions().get(EspressoOptions.EnableManagement);
         this.EnableAgents = getEnv().getOptions().get(EspressoOptions.EnableAgents);
         this.TrivialMethodSize = getEnv().getOptions().get(EspressoOptions.TrivialMethodSize);
@@ -296,7 +299,11 @@ public EspressoContext(TruffleLanguage.Env env, EspressoLanguage language) {
 
         this.vmArguments = buildVmArguments();
         this.jdwpContext = new JDWPContextImpl(this);
-        this.classHierarchyOracle = new NoOpClassHierarchyOracle();
+        if (this.EnableClassHierarchyAnalysis) {
+            this.classHierarchyOracle = new DefaultClassHierarchyOracle();
+        } else {
+            this.classHierarchyOracle = new NoOpClassHierarchyOracle();
+        }
     }
 
     private static Set<String> knownSingleThreadedLanguages(TruffleLanguage.Env env) {

From efb986f45f1205f82afafb4d568cc573829f0e38 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Fri, 1 Oct 2021 10:40:22 +0200
Subject: [PATCH 251/681] [GR-34130] Log handler should not try to lock special
 files.

---
 .../src/org/graalvm/launcher/Launcher.java    | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
index 1b02e4cce29c..1cd0b502973a 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
@@ -1623,41 +1623,47 @@ protected static OutputStream newLogStream(Path path) throws IOException {
         Path usedPath = path;
         Path fileNamePath = path.getFileName();
         String fileName = fileNamePath == null ? "" : fileNamePath.toString();
-        Path lockFile = null;
-        FileChannel lockFileChannel = null;
-        for (int unique = 0;; unique++) {
-            StringBuilder lockFileNameBuilder = new StringBuilder(fileName);
-            if (unique > 0) {
-                lockFileNameBuilder.append(unique);
-                usedPath = path.resolveSibling(lockFileNameBuilder.toString());
-            }
-            lockFileNameBuilder.append(".lck");
-            lockFile = path.resolveSibling(lockFileNameBuilder.toString());
-            Pair<FileChannel, Boolean> openResult = openChannel(lockFile);
-            if (openResult != null) {
-                lockFileChannel = openResult.getLeft();
-                if (lock(lockFileChannel, openResult.getRight())) {
-                    break;
-                } else {
-                    // Close and try next name
-                    lockFileChannel.close();
+        OutputStream outputStream;
+        if (Files.exists(path) && !Files.isRegularFile(path)) {
+            // Don't try to lock device or named pipe.
+            outputStream = new BufferedOutputStream(Files.newOutputStream(usedPath, WRITE, CREATE, APPEND));
+        } else {
+            Path lockFile = null;
+            FileChannel lockFileChannel = null;
+            for (int unique = 0;; unique++) {
+                StringBuilder lockFileNameBuilder = new StringBuilder(fileName);
+                if (unique > 0) {
+                    lockFileNameBuilder.append(unique);
+                    usedPath = path.resolveSibling(lockFileNameBuilder.toString());
+                }
+                lockFileNameBuilder.append(".lck");
+                lockFile = path.resolveSibling(lockFileNameBuilder.toString());
+                Pair<FileChannel, Boolean> openResult = openChannel(lockFile);
+                if (openResult != null) {
+                    lockFileChannel = openResult.getLeft();
+                    if (lock(lockFileChannel, openResult.getRight())) {
+                        break;
+                    } else {
+                        // Close and try next name
+                        lockFileChannel.close();
+                    }
                 }
             }
-        }
-        assert lockFile != null && lockFileChannel != null;
-        boolean success = false;
-        try {
-            OutputStream stream = new LockableOutputStream(
-                            new BufferedOutputStream(Files.newOutputStream(usedPath, WRITE, CREATE, APPEND)),
-                            lockFile,
-                            lockFileChannel);
-            success = true;
-            return stream;
-        } finally {
-            if (!success) {
-                LockableOutputStream.unlock(lockFile, lockFileChannel);
+            assert lockFile != null && lockFileChannel != null;
+            boolean success = false;
+            try {
+                outputStream = new LockableOutputStream(
+                                new BufferedOutputStream(Files.newOutputStream(usedPath, WRITE, CREATE, APPEND)),
+                                lockFile,
+                                lockFileChannel);
+                success = true;
+            } finally {
+                if (!success) {
+                    LockableOutputStream.unlock(lockFile, lockFileChannel);
+                }
             }
         }
+        return outputStream;
     }
 
     private static Pair<FileChannel, Boolean> openChannel(Path path) throws IOException {

From d73b454f731bf0cd7dede04b9668a0c5d8a2c46c Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Thu, 30 Sep 2021 14:40:03 +0300
Subject: [PATCH 252/681] Test modifiers in ptype for substituted methods and
 fields

---
 substratevm/mx.substratevm/testhello.py       | 171 ++++++++++--------
 .../com.oracle.svm.test/src/hello/Hello.java  |   6 +
 .../Target_hello_Hello_DefaultGreeter.java    |  11 +-
 3 files changed, 107 insertions(+), 81 deletions(-)

diff --git a/substratevm/mx.substratevm/testhello.py b/substratevm/mx.substratevm/testhello.py
index 32346d942bd3..5f7361a816b7 100644
--- a/substratevm/mx.substratevm/testhello.py
+++ b/substratevm/mx.substratevm/testhello.py
@@ -170,10 +170,21 @@ def test():
     execute("set pagination off")
     # enable pretty printing of structures
     execute("set print pretty on")
+
+    # Print DefaultGreeter and check the modifiers of its methods and fields
+    exec_string = execute("ptype 'hello.Hello$DefaultGreeter'")
+    rexp = [r"type = class hello\.Hello\$DefaultGreeter : public hello\.Hello\$Greeter {",
+            r"%spublic:"%spaces_pattern,
+            r"%svoid greet\(\);"%spaces_pattern,
+            r"%sint hashCode\(\);"%spaces_pattern,
+            r"}"]
+    checker = Checker("ptype 'hello.Hello$DefaultGreeter'", rexp)
+    checker.check(exec_string)
+
     # set a break point at hello.Hello::main
-    # expect "Breakpoint 1 at 0x[0-9a-f]+: file hello.Hello.java, line 70."
+    # expect "Breakpoint 1 at 0x[0-9a-f]+: file hello.Hello.java, line 76."
     exec_string = execute("break hello.Hello::main")
-    rexp = r"Breakpoint 1 at %s: file hello/Hello\.java, line 70\."%address_pattern
+    rexp = r"Breakpoint 1 at %s: file hello/Hello\.java, line 76\."%address_pattern
     checker = Checker('break main', rexp)
     checker.check(exec_string)
 
@@ -182,17 +193,17 @@ def test():
     execute("delete breakpoints")
 
     # list the line at the breakpoint
-    # expect "70	        Greeter greeter = Greeter.greeter(args);"
+    # expect "76	        Greeter greeter = Greeter.greeter(args);"
     exec_string = execute("list")
-    checker = Checker(r"list bp 1", "70%sGreeter greeter = Greeter\.greeter\(args\);"%spaces_pattern)
+    checker = Checker(r"list bp 1", "76%sGreeter greeter = Greeter\.greeter\(args\);"%spaces_pattern)
     checker.check(exec_string, skip_fails=False)
 
     # run a backtrace
-    # expect "#0  hello.Hello.main(java.lang.String[] *).* at hello.Hello.java:70"
+    # expect "#0  hello.Hello.main(java.lang.String[] *).* at hello.Hello.java:76"
     # expect "#1  0x[0-9a-f]+ in com.oracle.svm.core.code.IsolateEnterStub.JavaMainWrapper_run_.* at [a-z/]+/JavaMainWrapper.java:[0-9]+"
     exec_string = execute("backtrace")
     checker = Checker("backtrace hello.Hello::main",
-                      [r"#0%shello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:70"%(spaces_pattern, wildcard_pattern),
+                      [r"#0%shello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:76"%(spaces_pattern, wildcard_pattern),
                        r"#1%s%s in com\.oracle\.svm\.core\.JavaMainWrapper::runCore%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, address_pattern, wildcard_pattern, package_pattern),
                        r"#2%s com\.oracle\.svm\.core\.JavaMainWrapper::run%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern),
                        r"#3%s%s in com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s%s"%(spaces_pattern, address_pattern, hex_digits_pattern, wildcard_pattern)
@@ -386,7 +397,7 @@ def test():
     exec_string = execute("backtrace")
     checker = Checker("backtrace hello.Hello.Greeter::greeter",
                       [r"#0%shello\.Hello\$Greeter::greeter\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:37"%(spaces_pattern, wildcard_pattern),
-                       r"#1%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:70"%(spaces_pattern, address_pattern, wildcard_pattern),
+                       r"#1%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\)%s at hello/Hello\.java:76"%(spaces_pattern, address_pattern, wildcard_pattern),
                        r"#2%s%s in com\.oracle\.svm\.core\.JavaMainWrapper::runCore%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, address_pattern, wildcard_pattern, package_pattern),
                        r"#3%scom\.oracle\.svm\.core\.JavaMainWrapper::run%s at %sJavaMainWrapper\.java:[0-9]+"%(spaces_pattern, wildcard_pattern, package_pattern),
                        r"#4%s%s in com\.oracle\.svm\.core\.code\.IsolateEnterStub::JavaMainWrapper_run_%s%s"%(spaces_pattern, address_pattern, hex_digits_pattern, wildcard_pattern)
@@ -430,11 +441,11 @@ def test():
     # expect "#0  java.io.PrintStream::println(java.lang.String).* at java.base/java/io/PrintStream.java:[0-9]+"
     exec_string = execute("backtrace 6")
     rexp = [r"#0%sjava\.io\.PrintStream::println\(java\.lang\.String \*\)%s at %sjava/io/PrintStream.java:%s"%(spaces_pattern, wildcard_pattern, wildcard_pattern, digits_pattern),
-            r"#1%s%s in hello\.SubstituteHelperClass::nestedGreet\(void\) \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:59"%(spaces_pattern, address_pattern),
-            r"#2%s%s in hello\.SubstituteHelperClass::staticInlineGreet \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:53"%(spaces_pattern, address_pattern),
-            r"#3%s hello\.SubstituteHelperClass::inlineGreet \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:48"%(spaces_pattern),
-            r"#4%s hello\.Hello\$DefaultGreeter::greet\(void\) \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:40"%(spaces_pattern),
-            r"#5%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:71"%(spaces_pattern, address_pattern)]
+            r"#1%s%s in hello\.SubstituteHelperClass::nestedGreet\(void\) \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:68"%(spaces_pattern, address_pattern),
+            r"#2%s%s in hello\.SubstituteHelperClass::staticInlineGreet \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:62"%(spaces_pattern, address_pattern),
+            r"#3%s hello\.SubstituteHelperClass::inlineGreet \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:57"%(spaces_pattern),
+            r"#4%s hello\.Hello\$DefaultGreeter::greet\(void\) \(\) at hello/Target_hello_Hello_DefaultGreeter\.java:49"%(spaces_pattern),
+            r"#5%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:77"%(spaces_pattern, address_pattern)]
     checker = Checker("backtrace PrintStream::println", rexp)
     checker.check(exec_string)
 
@@ -535,7 +546,7 @@ def test():
 
     # list inlineMee and inlineMoo and check that the listing maps to the inlined code instead of the actual code,
     # although not ideal this is how GDB treats inlined code in C/C++ as well
-    rexp = [r"109%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
+    rexp = [r"115%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
     checker = Checker('list inlineMee', rexp)
     checker.check(execute("list inlineMee"))
     checker = Checker('list inlineMoo', rexp)
@@ -551,134 +562,134 @@ def test():
     exec_string = execute("info break 4")
     # The breakpoint will be set to the inlined code instead of the actual code,
     # although not ideal this is how GDB treats inlined code in C/C++ as well
-    rexp = [r"4.1%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:109"%(spaces_pattern, spaces_pattern, address_pattern),
-            r"4.2%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:109"%(spaces_pattern, spaces_pattern, address_pattern),
-            r"4.3%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:109"%(spaces_pattern, spaces_pattern, address_pattern)]
+    rexp = [r"4.1%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:115"%(spaces_pattern, spaces_pattern, address_pattern),
+            r"4.2%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:115"%(spaces_pattern, spaces_pattern, address_pattern),
+            r"4.3%sy%s%s in hello\.Hello::inlineMee at hello/Hello\.java:115"%(spaces_pattern, spaces_pattern, address_pattern)]
     checker = Checker('info break inlineMee', rexp)
     checker.check(exec_string)
 
     execute("continue")
     exec_string = execute("list")
-    rexp = [r"104%sinlineMoo\(\);"%spaces_pattern]
+    rexp = [r"110%sinlineMoo\(\);"%spaces_pattern]
     checker = Checker('hit break at inlineMee', rexp)
     checker.check(exec_string, skip_fails=False)
     execute("step")
     exec_string = execute("list")
-    rexp = [r"109%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
+    rexp = [r"115%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
     checker = Checker('step in inlineMee', rexp)
     checker.check(exec_string, skip_fails=False)
     exec_string = execute("backtrace 4")
-    rexp = [r"#0%shello\.Hello::inlineMoo \(\) at hello/Hello\.java:109"%spaces_pattern,
-            r"#1%shello\.Hello::inlineMee \(\) at hello/Hello\.java:104"%spaces_pattern,
-            r"#2%shello\.Hello::noInlineFoo\(void\) \(\) at hello/Hello\.java:94"%spaces_pattern,
-            r"#3%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:85"%(spaces_pattern, address_pattern)]
+    rexp = [r"#0%shello\.Hello::inlineMoo \(\) at hello/Hello\.java:115"%spaces_pattern,
+            r"#1%shello\.Hello::inlineMee \(\) at hello/Hello\.java:110"%spaces_pattern,
+            r"#2%shello\.Hello::noInlineFoo\(void\) \(\) at hello/Hello\.java:100"%spaces_pattern,
+            r"#3%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:91"%(spaces_pattern, address_pattern)]
     checker = Checker('backtrace inlineMee', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("continue")
     exec_string = execute("list")
-    rexp = [r"104%sinlineMoo\(\);"%spaces_pattern]
+    rexp = [r"110%sinlineMoo\(\);"%spaces_pattern]
     checker = Checker('hit break at inlineMee', rexp)
     checker.check(exec_string, skip_fails=False)
     execute("step")
     exec_string = execute("list")
-    rexp = [r"109%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
+    rexp = [r"115%sSystem\.out\.println\(\"This is a cow\"\);"%spaces_pattern]
     checker = Checker('step in inlineMee', rexp)
     checker.check(exec_string, skip_fails=False)
     exec_string = execute("backtrace 4")
-    rexp = [r"#0%shello\.Hello::inlineMoo \(\) at hello/Hello\.java:109"%spaces_pattern,
-            r"#1%shello\.Hello::inlineMee \(\) at hello/Hello\.java:104"%spaces_pattern,
-            r"#2%shello\.Hello::inlineCallChain \(\) at hello/Hello\.java:99"%spaces_pattern,
-            r"#3%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:86"%spaces_pattern]
+    rexp = [r"#0%shello\.Hello::inlineMoo \(\) at hello/Hello\.java:115"%spaces_pattern,
+            r"#1%shello\.Hello::inlineMee \(\) at hello/Hello\.java:110"%spaces_pattern,
+            r"#2%shello\.Hello::inlineCallChain \(\) at hello/Hello\.java:105"%spaces_pattern,
+            r"#3%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:92"%spaces_pattern]
     checker = Checker('backtrace inlineMee 2', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("delete breakpoints")
     exec_string = execute("break hello.Hello::noInlineTest")
-    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 129\."%(digits_pattern, address_pattern)
+    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 135\."%(digits_pattern, address_pattern)
     checker = Checker('break noInlineTest', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("continue")
     exec_string = execute("list")
-    rexp = r"129%sSystem.out.println\(\"This is a test\"\);"%spaces_pattern
+    rexp = r"135%sSystem.out.println\(\"This is a test\"\);"%spaces_pattern
     checker = Checker('hit breakpoint in noInlineTest', rexp)
     checker.check(exec_string, skip_fails=False)
     exec_string = execute("backtrace 5")
-    rexp = [r"#0%shello\.Hello::noInlineTest\(void\) \(\) at hello/Hello\.java:129"%(spaces_pattern),
-            r"#1%s%s in hello\.Hello::inlineA \(\) at hello/Hello\.java:124"%(spaces_pattern, address_pattern),
-            r"#2%shello\.Hello::inlineIs \(\) at hello/Hello\.java:119"%(spaces_pattern),
-            r"#3%shello\.Hello::noInlineThis\(void\) \(\) at hello/Hello\.java:114"%(spaces_pattern),
-            r"#4%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:87"%(spaces_pattern, address_pattern)]
+    rexp = [r"#0%shello\.Hello::noInlineTest\(void\) \(\) at hello/Hello\.java:135"%(spaces_pattern),
+            r"#1%s%s in hello\.Hello::inlineA \(\) at hello/Hello\.java:130"%(spaces_pattern, address_pattern),
+            r"#2%shello\.Hello::inlineIs \(\) at hello/Hello\.java:125"%(spaces_pattern),
+            r"#3%shello\.Hello::noInlineThis\(void\) \(\) at hello/Hello\.java:120"%(spaces_pattern),
+            r"#4%s%s in hello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:93"%(spaces_pattern, address_pattern)]
     checker = Checker('backtrace in inlineMethod', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("delete breakpoints")
-    exec_string = execute("break Hello.java:149")
-    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 149\."%(digits_pattern, address_pattern)
-    checker = Checker('break Hello.java:149', rexp)
+    exec_string = execute("break Hello.java:155")
+    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 155\."%(digits_pattern, address_pattern)
+    checker = Checker('break Hello.java:155', rexp)
     checker.check(exec_string)
 
     execute("continue 5")
     exec_string = execute("backtrace 14")
-    rexp = [r"#0%shello\.Hello::inlineMixTo \(\) at hello/Hello\.java:149"%(spaces_pattern),
-            r"#1%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#2%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:147"%(spaces_pattern, address_pattern),
-            r"#3%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#4%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:147"%(spaces_pattern, address_pattern),
-            r"#5%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#6%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:147"%(spaces_pattern, address_pattern),
-            r"#7%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#8%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:147"%(spaces_pattern, address_pattern),
-            r"#9%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#10%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:147"%(spaces_pattern, address_pattern),
-            r"#11%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:141"%(spaces_pattern),
-            r"#12%s%s in hello\.Hello::inlineFrom \(\) at hello/Hello\.java:134"%(spaces_pattern, address_pattern),
-            r"#13%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:88"%(spaces_pattern)]
+    rexp = [r"#0%shello\.Hello::inlineMixTo \(\) at hello/Hello\.java:155"%(spaces_pattern),
+            r"#1%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#2%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:153"%(spaces_pattern, address_pattern),
+            r"#3%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#4%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:153"%(spaces_pattern, address_pattern),
+            r"#5%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#6%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:153"%(spaces_pattern, address_pattern),
+            r"#7%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#8%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:153"%(spaces_pattern, address_pattern),
+            r"#9%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#10%s%s in hello\.Hello::inlineMixTo \(\) at hello/Hello\.java:153"%(spaces_pattern, address_pattern),
+            r"#11%shello\.Hello::noInlineHere\(int\) \(\) at hello/Hello\.java:147"%(spaces_pattern),
+            r"#12%s%s in hello\.Hello::inlineFrom \(\) at hello/Hello\.java:140"%(spaces_pattern, address_pattern),
+            r"#13%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:94"%(spaces_pattern)]
     checker = Checker('backtrace in recursive inlineMixTo', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("delete breakpoints")
-    exec_string = execute("break Hello.java:162")
-    rexp = r"Breakpoint %s at %s: Hello\.java:162\. \(2 locations\)"%(digits_pattern, address_pattern)
-    checker = Checker('break Hello.java:162', rexp)
+    exec_string = execute("break Hello.java:168")
+    rexp = r"Breakpoint %s at %s: Hello\.java:168\. \(2 locations\)"%(digits_pattern, address_pattern)
+    checker = Checker('break Hello.java:168', rexp)
     checker.check(exec_string)
 
     execute("continue 5")
     exec_string = execute("backtrace 14")
-    rexp = [r"#0%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:162"%(spaces_pattern),
-            r"#1%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern, address_pattern),
-            r"#2%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:160"%(spaces_pattern),
-            r"#3%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern, address_pattern),
-            r"#4%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:160"%(spaces_pattern),
-            r"#5%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern, address_pattern),
-            r"#6%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:160"%(spaces_pattern),
-            r"#7%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern, address_pattern),
-            r"#8%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:160"%(spaces_pattern),
-            r"#9%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern, address_pattern),
-            r"#10%shello\.Hello::inlineTo \(\) at hello/Hello\.java:160"%(spaces_pattern),
-            r"#11%shello\.Hello::inlineHere \(\) at hello/Hello\.java:154"%(spaces_pattern),
-            r"#12%shello\.Hello::inlineFrom \(\) at hello/Hello\.java:135"%(spaces_pattern),
-            r"#13%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:88"%(spaces_pattern)]
+    rexp = [r"#0%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:168"%(spaces_pattern),
+            r"#1%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern, address_pattern),
+            r"#2%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:166"%(spaces_pattern),
+            r"#3%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern, address_pattern),
+            r"#4%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:166"%(spaces_pattern),
+            r"#5%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern, address_pattern),
+            r"#6%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:166"%(spaces_pattern),
+            r"#7%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern, address_pattern),
+            r"#8%shello\.Hello::inlineTo\(int\) \(\) at hello/Hello\.java:166"%(spaces_pattern),
+            r"#9%s%s in hello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern, address_pattern),
+            r"#10%shello\.Hello::inlineTo \(\) at hello/Hello\.java:166"%(spaces_pattern),
+            r"#11%shello\.Hello::inlineHere \(\) at hello/Hello\.java:160"%(spaces_pattern),
+            r"#12%shello\.Hello::inlineFrom \(\) at hello/Hello\.java:141"%(spaces_pattern),
+            r"#13%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:94"%(spaces_pattern)]
     checker = Checker('backtrace in recursive inlineTo', rexp)
     checker.check(exec_string, skip_fails=False)
 
     execute("delete breakpoints")
-    exec_string = execute("break Hello.java:168")
-    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 168\."%(digits_pattern, address_pattern)
-    checker = Checker('break Hello.java:168', rexp)
+    exec_string = execute("break Hello.java:174")
+    rexp = r"Breakpoint %s at %s: file hello/Hello\.java, line 174\."%(digits_pattern, address_pattern)
+    checker = Checker('break Hello.java:174', rexp)
     checker.check(exec_string)
 
     execute("continue 5")
     exec_string = execute("backtrace 8")
-    rexp = [r"#0%shello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:168"%(spaces_pattern),
-            r"#1%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:171"%(spaces_pattern, address_pattern),
-            r"#2%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:171"%(spaces_pattern, address_pattern),
-            r"#3%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:171"%(spaces_pattern, address_pattern),
-            r"#4%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:171"%(spaces_pattern, address_pattern),
-            r"#5%s%s in hello\.Hello::inlineTailRecursion \(\) at hello/Hello\.java:171"%(spaces_pattern, address_pattern),
-            r"#6%shello\.Hello::inlineFrom \(\) at hello/Hello\.java:136"%(spaces_pattern),
-            r"#7%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:88"%(spaces_pattern)]
+    rexp = [r"#0%shello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:174"%(spaces_pattern),
+            r"#1%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:177"%(spaces_pattern, address_pattern),
+            r"#2%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:177"%(spaces_pattern, address_pattern),
+            r"#3%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:177"%(spaces_pattern, address_pattern),
+            r"#4%s%s in hello\.Hello::inlineTailRecursion\(int\) \(\) at hello/Hello\.java:177"%(spaces_pattern, address_pattern),
+            r"#5%s%s in hello\.Hello::inlineTailRecursion \(\) at hello/Hello\.java:177"%(spaces_pattern, address_pattern),
+            r"#6%shello\.Hello::inlineFrom \(\) at hello/Hello\.java:142"%(spaces_pattern),
+            r"#7%shello\.Hello::main\(java\.lang\.String\[\] \*\) \(\) at hello/Hello\.java:94"%(spaces_pattern)]
     checker = Checker('backtrace in recursive inlineTo', rexp)
     checker.check(exec_string, skip_fails=False)
 
diff --git a/substratevm/src/com.oracle.svm.test/src/hello/Hello.java b/substratevm/src/com.oracle.svm.test/src/hello/Hello.java
index e70d133ee8ea..be7f6ab8c567 100644
--- a/substratevm/src/com.oracle.svm.test/src/hello/Hello.java
+++ b/substratevm/src/com.oracle.svm.test/src/hello/Hello.java
@@ -47,6 +47,12 @@ static Greeter greeter(String[] args) {
     }
 
     public static class DefaultGreeter extends Greeter {
+
+        @Override
+        public int hashCode() {
+            return 42;
+        }
+
         @Override
         public void greet() {
             System.out.println("Hello, world!");
diff --git a/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java b/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java
index 1fee4b7e22ca..3ae0d2cc9dd5 100644
--- a/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java
+++ b/substratevm/src/com.oracle.svm.test/src/hello/Target_hello_Hello_DefaultGreeter.java
@@ -30,12 +30,21 @@
 import com.oracle.svm.core.annotate.NeverInline;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.annotate.TargetElement;
 
 @TargetClass(value = Hello.DefaultGreeter.class)
 final class Target_hello_Hello_DefaultGreeter {
+
+    @SuppressWarnings("static-method")
+    @Substitute()
+    @TargetElement(name = "hashCode")
+    private int hashCodeSubst() {
+        return 24;
+    }
+
     @SuppressWarnings("static-method")
     @Substitute
-    public void greet() {
+    private void greet() {
         SubstituteHelperClass substituteHelperClass = new SubstituteHelperClass();
         substituteHelperClass.inlineGreet();
     }

From 1722528eace0abb5659cc46f46d0b2e1baf4872b Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Thu, 30 Sep 2021 16:49:18 +0300
Subject: [PATCH 253/681] Debug info: Get modifiers of original method/field
 for DW_AT_ACCESSIBILITY

---
 substratevm/mx.substratevm/testhello.py       |  9 +++++++-
 .../image/NativeImageDebugInfoProvider.java   | 21 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/substratevm/mx.substratevm/testhello.py b/substratevm/mx.substratevm/testhello.py
index 5f7361a816b7..59a33639eb62 100644
--- a/substratevm/mx.substratevm/testhello.py
+++ b/substratevm/mx.substratevm/testhello.py
@@ -354,10 +354,17 @@ def test():
     rexp = [r"type = class java\.lang\.Object : public _objhdr {",
             r"%spublic:"%(spaces_pattern),
             r"%svoid Object\(void\);"%(spaces_pattern),
+            r"%sprotected:"%(spaces_pattern),
+            r"%sjava\.lang\.Object \* clone\(void\);"%(spaces_pattern),
+            r"%spublic:"%(spaces_pattern),
             r"%sboolean equals\(java\.lang\.Object \*\);"%(spaces_pattern),
-            r"%sprivate:"%(spaces_pattern),
             r"%sint hashCode\(void\);"%(spaces_pattern),
+            r"%svoid notify\(void\);"%(spaces_pattern),
+            r"%svoid notifyAll\(void\);"%(spaces_pattern),
             r"%sjava\.lang\.String \* toString\(void\);"%(spaces_pattern),
+            r"%svoid wait\(void\);"%(spaces_pattern),
+            r"%svoid wait\(long\);"%(spaces_pattern),
+            r"%svoid wait\(long, int\);"%(spaces_pattern),
             r"}"]
     
     checker = Checker('ptype Object', rexp)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
index 4997385e88af..ccd75a00f104 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -70,6 +70,7 @@
 import com.oracle.svm.hosted.meta.HostedPrimitiveType;
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.substitute.InjectedFieldsType;
+import com.oracle.svm.hosted.substitute.SubstitutionField;
 import com.oracle.svm.hosted.substitute.SubstitutionMethod;
 import com.oracle.svm.hosted.substitute.SubstitutionType;
 
@@ -229,6 +230,16 @@ private static ResolvedJavaType getOriginal(HostedType hostedType) {
         return javaType;
     }
 
+    private static int getOriginalModifiers(HostedMethod hostedMethod) {
+        ResolvedJavaMethod targetMethod = hostedMethod.getWrapped().getWrapped();
+        if (targetMethod instanceof SubstitutionMethod) {
+            targetMethod = ((SubstitutionMethod) targetMethod).getOriginal();
+        } else if (targetMethod instanceof CustomSubstitutionMethod) {
+            targetMethod = ((CustomSubstitutionMethod) targetMethod).getOriginal();
+        }
+        return targetMethod.getModifiers();
+    }
+
     private static String toJavaName(JavaType javaType) {
         if (javaType instanceof HostedType) {
             return getDeclaringClass((HostedType) javaType, true).toJavaName();
@@ -608,7 +619,11 @@ public int size() {
 
             @Override
             public int modifiers() {
-                return field.getModifiers();
+                ResolvedJavaField targetField = field.wrapped.wrapped;
+                if (targetField instanceof SubstitutionField) {
+                    targetField = ((SubstitutionField) targetField).getOriginal();
+                }
+                return targetField.getModifiers();
             }
 
             private boolean isStatic() {
@@ -683,7 +698,7 @@ public boolean isDeoptTarget() {
 
             @Override
             public int modifiers() {
-                return hostedMethod.getModifiers();
+                return getOriginalModifiers(hostedMethod);
             }
         }
     }
@@ -963,7 +978,7 @@ public List<String> paramNames() {
 
         @Override
         public int modifiers() {
-            return hostedMethod.getModifiers();
+            return getOriginalModifiers(hostedMethod);
         }
     }
 

From 551bb52747f1cb2eeb919668e30172a581010bf8 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Fri, 1 Oct 2021 11:21:33 +0200
Subject: [PATCH 254/681] Invalidate leafTypeAssumption on child load rather
 than init

---
 .../hierarchy/ClassHierarchyOracle.java        | 18 ++++++------------
 .../hierarchy/DefaultClassHierarchyOracle.java | 12 ++++--------
 .../hierarchy/NoOpClassHierarchyOracle.java    |  6 +-----
 .../truffle/espresso/impl/ObjectKlass.java     |  3 +--
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
index 08024f645908..95cbb49fbc7c 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/ClassHierarchyOracle.java
@@ -40,25 +40,19 @@ protected LeafTypeAssumptionAccessor() {
     }
 
     /**
-     * Must be called to initialize {@code leafTypeAssumption} of {@code newKlass}.
+     * Must be called to initialize {@code leafTypeAssumption} of {@code newKlass}. In addition, it
+     * communicates to the oracle that a new klass has been created and its ancestors are no longer
+     * leaves.
      *
      * @param newKlass -- newly created class
      * @return the assumption, indicating whether the class is a leaf in class hierarchy.
      */
-    LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass);
-
-    /**
-     * Must be called when {@code newKlass} is initialized. Communicates to the oracle that
-     * instances of this class might exist, which changes the class hierarchy.
-     *
-     * @param newKlass -- newly initialized class
-     */
-    void onClassInit(ObjectKlass newKlass);
+    LeafTypeAssumption createAssumptionForNewKlass(ObjectKlass newKlass);
 
     /**
      * @return the assumption, valid iff {@code klass} is a leaf in class hierarchy. Automatically
-     *         invalidated in {@link #onClassInit(ObjectKlass)} when a child of {@code klass} is
-     *         initialized.
+     *         invalidated in {@link #createAssumptionForNewKlass(ObjectKlass)} when a child of
+     *         {@code klass} is created.
      */
     LeafTypeAssumption isLeafClass(ObjectKlass klass);
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
index b4a5a210d7c6..948c5222cac1 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/DefaultClassHierarchyOracle.java
@@ -32,7 +32,9 @@
  */
 public class DefaultClassHierarchyOracle extends NoOpClassHierarchyOracle implements ClassHierarchyOracle {
     @Override
-    public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
+    public LeafTypeAssumption createAssumptionForNewKlass(ObjectKlass newKlass) {
+        markAncestorsAsNonLeaf(newKlass);
+
         if (newKlass.isFinalFlagSet()) {
             return FinalIsAlwaysLeaf;
         }
@@ -42,13 +44,7 @@ public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
         return new LeafTypeAssumptionImpl(newKlass);
     }
 
-    /**
-     * Marks all ancestors of {@code newClass} as non-leaf.
-     *
-     * @param newClass -- newly initialized class.
-     */
-    @Override
-    public void onClassInit(ObjectKlass newClass) {
+    private static void markAncestorsAsNonLeaf(ObjectKlass newClass) {
         ObjectKlass currentParent = newClass.getSuperKlass();
         while (currentParent != null && currentParent.getLeafTypeAssumption(assumptionAccessor).getAssumption().isValid()) {
             currentParent.getLeafTypeAssumption(assumptionAccessor).getAssumption().invalidate();
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
index 2ce82a93b037..bb6efadf2d26 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -59,17 +59,13 @@ public Assumption getAssumption() {
     protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.AlwaysInvalid;
 
     @Override
-    public LeafTypeAssumption createAssumptionForClass(ObjectKlass newKlass) {
+    public LeafTypeAssumption createAssumptionForNewKlass(ObjectKlass newKlass) {
         if (newKlass.isFinalFlagSet()) {
             return FinalIsAlwaysLeaf;
         }
         return NotLeaf;
     }
 
-    @Override
-    public void onClassInit(ObjectKlass newKlass) {
-    }
-
     @Override
     public LeafTypeAssumption isLeafClass(ObjectKlass klass) {
         return klass.getLeafTypeAssumption(assumptionAccessor);
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
index c109eec11332..02d022cd91e5 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ObjectKlass.java
@@ -235,7 +235,7 @@ public ObjectKlass(EspressoContext context, LinkedKlass linkedKlass, ObjectKlass
             initSelfReferenceInPool();
         }
 
-        this.leafTypeAssumption = getContext().getClassHierarchyOracle().createAssumptionForClass(this);
+        this.leafTypeAssumption = getContext().getClassHierarchyOracle().createAssumptionForNewKlass(this);
         this.initState = LOADED;
         assert verifyTables();
     }
@@ -397,7 +397,6 @@ private void actualInit() {
                 throw e;
             }
             checkErroneousInitialization();
-            getContext().getClassHierarchyOracle().onClassInit(this);
             initState = INITIALIZED;
             assert isInitialized();
         }

From 38c25e7be1215cec7a0a4b8563b746e1b2a2b83a Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Thu, 30 Sep 2021 21:57:31 +0200
Subject: [PATCH 255/681] Print missed samples in CPUSampler.

---
 .../truffle/tools/profiler/test/ProfilerCLITest.java |  2 +-
 .../truffle/tools/profiler/impl/CPUSamplerCLI.java   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/ProfilerCLITest.java b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/ProfilerCLITest.java
index 1f727c39fc57..9c4ef5ce1ea6 100644
--- a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/ProfilerCLITest.java
+++ b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/ProfilerCLITest.java
@@ -48,7 +48,7 @@
 
 public class ProfilerCLITest {
 
-    public static final String SAMPLING_HISTOGRAM_REGEX = "Sampling Histogram. Recorded [0-9]* samples with period [0-9]*ms.";
+    public static final String SAMPLING_HISTOGRAM_REGEX = "Sampling Histogram. Recorded [0-9]* samples with period [0-9]*ms. Missed [0-9]* samples.";
     public static final int EXEC_COUNT = 10;
     public static final String NAME_REGEX = " [a-z]* +";
     public static final String SEPARATOR_REGEX = "\\|";
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 641a168be774..6c429f8058ca 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -284,8 +284,8 @@ private static JSONArray getSamplesRec(Collection<ProfilerNode<CPUSampler.Payloa
         return samples;
     }
 
-    private static void printLegend(PrintStream out, String type, long samples, long period, int[] showTiers, Integer[] tiers) {
-        out.printf("Sampling %s. Recorded %s samples with period %dms.%n", type, samples, period);
+    private static void printLegend(PrintStream out, String type, long samples, long period, long missed, int[] showTiers, Integer[] tiers) {
+        out.printf("Sampling %s. Recorded %s samples with period %dms. Missed %s samples.%n", type, samples, period, missed);
         out.println("  Self Time: Time spent on the top of the stack.");
         out.println("  Total Time: Time spent somewhere on the stack.");
         if (showTiers == null) {
@@ -370,6 +370,7 @@ private static final class SamplingHistogram {
         private final int[] showTiers;
         private final long samplePeriod;
         private final long samplesTaken;
+        private final long samplesMissed;
         private Set<Integer> tiers = new HashSet<>();
         private Integer[] sortedTiers;
         private int maxNameLength = 10;
@@ -383,6 +384,7 @@ private static final class SamplingHistogram {
             this.samplePeriod = options.get(SAMPLE_PERIOD);
             this.samplesTaken = data.getSamples();
             Map<Thread, SourceLocationNodes> perThreadSourceLocationPayloads = new HashMap<>();
+            this.samplesMissed = data.missedSamples();
             for (Thread thread : data.getThreadData().keySet()) {
                 perThreadSourceLocationPayloads.put(thread, computeSourceLocationPayloads(data.getThreadData().get(thread)));
             }
@@ -469,7 +471,7 @@ private static void computeSourceLocationPayloadsImpl(Collection<ProfilerNode<CP
         void print(PrintStream out) {
             String sep = repeat("-", title.length());
             out.println(sep);
-            printLegend(out, "Histogram", samplesTaken, samplePeriod, showTiers, sortedTiers);
+            printLegend(out, "Histogram", samplesTaken, samplePeriod, samplesMissed, showTiers, sortedTiers);
             out.println(sep);
             for (Map.Entry<Thread, List<OutputEntry>> threadListEntry : histogram.entrySet()) {
                 out.println(threadListEntry.getKey());
@@ -565,6 +567,7 @@ private static class SamplingCallTree {
         private final int[] showTiers;
         private final long samplePeriod;
         private final long samplesTaken;
+        private final long samplesMissed;
         private final String title;
         private final String format;
         private final Map<Thread, Collection<CallTreeOutputEntry>> entries = new HashMap<>();
@@ -578,6 +581,7 @@ private static class SamplingCallTree {
             this.showTiers = options.get(ShowTiers);
             this.samplePeriod = options.get(SAMPLE_PERIOD);
             this.samplesTaken = data.getSamples();
+            this.samplesMissed = data.missedSamples();
             Map<Thread, Collection<ProfilerNode<CPUSampler.Payload>>> threadData = data.getThreadData();
             makeEntries(threadData);
             calculateMaxValues(threadData);
@@ -656,7 +660,7 @@ private CallTreeOutputEntry makeEntry(ProfilerNode<CPUSampler.Payload> node, int
         void print(PrintStream out) {
             String sep = repeat("-", title.length());
             out.println(sep);
-            printLegend(out, "Call Tree", samplesTaken, samplePeriod, showTiers, sortedTiers);
+            printLegend(out, "Call Tree", samplesTaken, samplePeriod, samplesMissed, showTiers, sortedTiers);
             out.println(sep);
             out.println(title);
             out.println(sep);

From 46c36c492edd3c16c7f188219e887cc96fc8208e Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Thu, 30 Sep 2021 19:07:46 +0200
Subject: [PATCH 256/681] Use fixed rate for cpu sampling.

---
 .../src/com/oracle/truffle/tools/profiler/CPUSampler.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
index 71f16f20a3f0..f81afa05b38b 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
@@ -536,7 +536,7 @@ private void resetSampling() {
         }
         this.safepointStackSampler = new SafepointStackSampler(stackLimit, filter, period);
         this.samplerTask = new SamplingTimerTask();
-        this.samplerThread.schedule(samplerTask, delay, period);
+        this.samplerThread.scheduleAtFixedRate(samplerTask, delay, period);
     }
 
     private void cleanup() {

From 80b8185861c7a09a5b6589ee2567024d975fad83 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Thu, 30 Sep 2021 23:03:51 +0200
Subject: [PATCH 257/681] Improve accuracy of CPUSampler by processing in a
 separate thread.

---
 .../truffle/tools/profiler/CPUSampler.java    | 114 ++++++++++++++----
 1 file changed, 90 insertions(+), 24 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
index f81afa05b38b..7dea7637d9ed 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
@@ -36,6 +36,7 @@
 import java.util.Map.Entry;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -133,9 +134,21 @@ public CPUSampler create(Env env) {
     private SourceSectionFilter filter = DEFAULT_FILTER;
     private Timer samplerThread;
     private SamplingTimerTask samplerTask;
+    private Thread processingThread;
+    private ResultProcessingRunnable processingThreadRunnable;
+
     private volatile SafepointStackSampler safepointStackSampler = new SafepointStackSampler(stackLimit, filter, period);
     private boolean gatherSelfHitTimes = false;
 
+    /*
+     * The results queue will block if it exceeds the capacity. This is intentional as we do not
+     * want the sampling results to grow infinitely in the worst case. It is better if the sampling
+     * thread blocks at some point as well. However, it is very unlikely that processing takes such
+     * a long time that this actually happens, but situations like this might be more frequent when
+     * debugging.
+     */
+    private final ArrayBlockingQueue<SamplingResult> resultsToProcess = new ArrayBlockingQueue<>(256);
+
     CPUSampler(Env env) {
         this.env = env;
 
@@ -531,12 +544,19 @@ private void resetSampling() {
         if (!collecting || closed) {
             return;
         }
+        if (processingThread == null) {
+            processingThreadRunnable = new ResultProcessingRunnable();
+            processingThread = new Thread(processingThreadRunnable, "Sampling Processing Thread");
+            processingThread.setDaemon(true);
+        }
+        this.processingThread.start();
         if (samplerThread == null) {
             samplerThread = new Timer("Sampling thread", true);
         }
         this.safepointStackSampler = new SafepointStackSampler(stackLimit, filter, period);
         this.samplerTask = new SamplingTimerTask();
         this.samplerThread.scheduleAtFixedRate(samplerTask, delay, period);
+
     }
 
     private void cleanup() {
@@ -549,6 +569,11 @@ private void cleanup() {
             samplerThread.cancel();
             samplerThread = null;
         }
+        if (processingThread != null) {
+            processingThreadRunnable.cancelled = true;
+            processingThread.interrupt();
+            processingThread = null;
+        }
     }
 
     private void enterChangeConfig() {
@@ -742,34 +767,45 @@ void addSelfHitTime(Long time) {
         }
     }
 
-    private class SamplingTimerTask extends TimerTask {
+    /*
+     * Process samples in a separate thread to avoid further delays during sampling and increase
+     * accuracy.
+     */
+    private class ResultProcessingRunnable implements Runnable {
+
+        private volatile boolean cancelled;
 
-        @Override
         public void run() {
-            long taskStartTime = System.currentTimeMillis();
-            for (TruffleContext context : contexts()) {
-                if (context.isClosed()) {
-                    continue;
+            while (true) {
+                if (cancelled) {
+                    return;
                 }
-                List<StackSample> samples = safepointStackSampler.sample(env, context, activeContexts.get(context), !sampleContextInitialization);
-                synchronized (CPUSampler.this) {
-                    if (!collecting) {
-                        return;
-                    }
-                    if (context.isClosed()) {
+                SamplingResult result = null;
+                try {
+                    result = resultsToProcess.take();
+                } catch (InterruptedException e) {
+                    // check for cancelled
+                }
+                if (cancelled) {
+                    return;
+                }
+                if (result != null) {
+                    if (result.context.isClosed()) {
                         continue;
                     }
-                    final MutableSamplerData mutableSamplerData = activeContexts.get(context);
-                    for (StackSample sample : samples) {
-                        mutableSamplerData.biasStatistic.accept(sample.biasNs);
-                        mutableSamplerData.durationStatistic.accept(sample.durationNs);
-                        ProfilerNode<Payload> threadNode = mutableSamplerData.threadData.computeIfAbsent(sample.thread, new Function<Thread, ProfilerNode<Payload>>() {
-                            @Override
-                            public ProfilerNode<Payload> apply(Thread thread) {
-                                return new ProfilerNode<>();
-                            }
-                        });
-                        record(sample, threadNode, taskStartTime, mutableSamplerData);
+                    synchronized (CPUSampler.this) {
+                        final MutableSamplerData mutableSamplerData = activeContexts.get(result.context);
+                        for (StackSample sample : result.samples) {
+                            mutableSamplerData.biasStatistic.accept(sample.biasNs);
+                            mutableSamplerData.durationStatistic.accept(sample.durationNs);
+                            ProfilerNode<Payload> threadNode = mutableSamplerData.threadData.computeIfAbsent(sample.thread, new Function<Thread, ProfilerNode<Payload>>() {
+                                @Override
+                                public ProfilerNode<Payload> apply(Thread thread) {
+                                    return new ProfilerNode<>();
+                                }
+                            });
+                            record(sample, threadNode, result.startTime, mutableSamplerData);
+                        }
                     }
                 }
             }
@@ -779,7 +815,6 @@ private void record(StackSample sample, ProfilerNode<Payload> threadNode, long t
             if (sample.stack.size() == 0) {
                 return;
             }
-            // now traverse the stack and insert the path into the tree
             ProfilerNode<Payload> treeNode = threadNode;
             for (int i = sample.stack.size() - 1; i >= 0; i--) {
                 StackTraceEntry location = sample.stack.get(i);
@@ -817,6 +852,37 @@ private ProfilerNode<Payload> addOrUpdateChild(ProfilerNode<Payload> treeNode, S
             }
             return child;
         }
+
+    }
+
+    static class SamplingResult {
+
+        final List<StackSample> samples;
+        final TruffleContext context;
+        final long startTime;
+
+        SamplingResult(List<StackSample> samples, TruffleContext context, long startTime) {
+            this.samples = samples;
+            this.context = context;
+            this.startTime = startTime;
+        }
+
+    }
+
+    private class SamplingTimerTask extends TimerTask {
+
+        @Override
+        public void run() {
+            long taskStartTime = System.currentTimeMillis();
+            for (TruffleContext context : contexts()) {
+                if (context.isClosed()) {
+                    continue;
+                }
+                List<StackSample> samples = safepointStackSampler.sample(env, context, activeContexts.get(context), !sampleContextInitialization);
+                resultsToProcess.add(new SamplingResult(samples, context, taskStartTime));
+            }
+        }
+
     }
 
     static class MutableSamplerData {

From 8397aa5caf56de4766f1931d4da6d3ee450b2a67 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Thu, 30 Sep 2021 21:59:42 +0200
Subject: [PATCH 258/681] Move isActive check to takeSample API.

---
 .../src/com/oracle/truffle/tools/profiler/CPUSampler.java    | 3 +++
 .../oracle/truffle/tools/profiler/SafepointStackSampler.java | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
index 7dea7637d9ed..a69bbe8742bf 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
@@ -528,6 +528,9 @@ public Map<Thread, List<StackTraceEntry>> takeSample() {
                 return Collections.emptyMap();
             }
             TruffleContext context = activeContexts.keySet().iterator().next();
+            if (context.isActive()) {
+                throw new IllegalArgumentException("Cannot sample a context that is currently active on the current thread.");
+            }
             Map<Thread, List<StackTraceEntry>> stacks = new HashMap<>();
             List<StackSample> sample = safepointStackSampler.sample(env, context, activeContexts.get(context), !sampleContextInitialization);
             for (StackSample stackSample : sample) {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
index 6b8d29c53ac4..30dc8d15c16c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
@@ -80,9 +80,6 @@ private StackVisitor fetchStackVisitor() {
     }
 
     List<StackSample> sample(Env env, TruffleContext context, CPUSampler.MutableSamplerData mutableSamplerData, boolean useSyntheticFrames) {
-        if (context.isActive()) {
-            throw new IllegalArgumentException("Cannot sample a context that is currently active on the current thread.");
-        }
         if (context.isClosed()) {
             return Collections.emptyList();
         }
@@ -101,7 +98,7 @@ List<StackSample> sample(Env env, TruffleContext context, CPUSampler.MutableSamp
             return Collections.emptyList();
         }
         try {
-            future.get(10 * period, TimeUnit.MILLISECONDS);
+            future.get(period * 10, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException e) {
             env.getLogger(getClass()).log(Level.SEVERE, "Sampling failed", e);
             return null;

From 926b8eafe161cce51b1afca3350ec7812bd614d5 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Fri, 1 Oct 2021 16:05:51 +0200
Subject: [PATCH 259/681] Fix broken recursive merging and replace it with a
 depth break.

---
 .../truffle/tools/profiler/ProfilerNode.java  |  8 ++---
 .../tools/profiler/impl/CPUSamplerCLI.java    | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
index 781bd7efb669..2ee2d1e8f9fe 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
@@ -91,17 +91,13 @@ public ProfilerNode<T> getParent() {
      * @since 0.30
      */
     public boolean isRecursive() {
-        return isRecursiveImpl(this);
-    }
-
-    private boolean isRecursiveImpl(ProfilerNode<T> source) {
         if (parent.sourceLocation == null) {
             return false;
         }
-        if (parent.sourceLocation.equals(source.sourceLocation)) {
+        if (parent.sourceLocation.equals(this.sourceLocation)) {
             return true;
         }
-        return parent.isRecursiveImpl(source);
+        return false;
     }
 
     /**
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 6c429f8058ca..29b2833c8292 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -497,6 +497,8 @@ private static final class SourceLocationNodes {
     }
 
     private static class OutputEntry {
+        // break after 128 depth spaces to handle deep recursions
+        private static final int DEPTH_BREAK = 128;
         final SourceLocation location;
         int[] tierToSamples = new int[0];
         int[] tierToSelfSamples = new int[0];
@@ -522,9 +524,26 @@ private static class OutputEntry {
             }
         }
 
-        String format(String format, int[] showTiers, long samplePeriod, int indent, long globalTotalSamples, Integer[] tiers) {
+        static int computeIndentSize(int depth) {
+            int indent = depth % DEPTH_BREAK;
+            if (indent != depth) {
+                indent += formatIndentBreakLabel(depth - indent).length();
+            }
+            return indent;
+        }
+
+        private static String formatIndentBreakLabel(int skippedDepth) {
+            return String.format("(\u21B3%s) ", skippedDepth);
+        }
+
+        String format(String format, int[] showTiers, long samplePeriod, int depth, long globalTotalSamples, Integer[] tiers) {
             List<Object> args = new ArrayList<>();
-            args.add(repeat(" ", indent) + location.getRootName());
+            int indent = depth % DEPTH_BREAK;
+            if (indent != depth) {
+                args.add(formatIndentBreakLabel(depth - indent) + repeat(" ", indent) + location.getRootName());
+            } else {
+                args.add(repeat(" ", indent) + location.getRootName());
+            }
             args.add(totalSamples * samplePeriod);
             args.add(percent(totalSamples, globalTotalSamples));
             maybeAddTiers(args, tierToSamples, totalSamples, showTiers, tiers);
@@ -601,7 +620,7 @@ private void calculateMaxValues(Map<Thread, Collection<ProfilerNode<CPUSampler.P
         }
 
         private void calculateMaxValuesRec(ProfilerNode<CPUSampler.Payload> node, int depth) {
-            maxNameLength = Math.max(maxNameLength, node.getRootName().length() + depth);
+            maxNameLength = Math.max(maxNameLength, node.getRootName().length() + OutputEntry.computeIndentSize(depth));
             tiers.add(node.getPayload().getNumberOfTiers() - 1);
             for (ProfilerNode<CPUSampler.Payload> child : node.getChildren()) {
                 if (!child.isRecursive()) {
@@ -644,15 +663,11 @@ private void mergeEntry(List<CallTreeOutputEntry> callTreeEntries, ProfilerNode<
         }
 
         private CallTreeOutputEntry makeEntry(ProfilerNode<CPUSampler.Payload> node, int depth) {
-            maxNameLength = Math.max(maxNameLength, node.getRootName().length() + depth);
+            maxNameLength = Math.max(maxNameLength, node.getRootName().length() + OutputEntry.computeIndentSize(depth));
             tiers.add(node.getPayload().getNumberOfTiers() - 1);
             CallTreeOutputEntry entry = new CallTreeOutputEntry(node);
             for (ProfilerNode<CPUSampler.Payload> child : node.getChildren()) {
-                if (child.isRecursive()) {
-                    entry.merge(child.getPayload());
-                } else {
-                    entry.children.add(makeEntry(child, depth + 1));
-                }
+                entry.children.add(makeEntry(child, depth + 1));
             }
             return entry;
         }

From bd5d644fdbaf7d80e9587e78e0249e76f5e831d0 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Fri, 1 Oct 2021 14:09:34 +0200
Subject: [PATCH 260/681] Cancel safepoints when they exceed the period.

---
 .../oracle/truffle/tools/profiler/SafepointStackSampler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
index 30dc8d15c16c..f71e7e2c5dd6 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/SafepointStackSampler.java
@@ -98,7 +98,7 @@ List<StackSample> sample(Env env, TruffleContext context, CPUSampler.MutableSamp
             return Collections.emptyList();
         }
         try {
-            future.get(period * 10, TimeUnit.MILLISECONDS);
+            future.get(period, TimeUnit.MILLISECONDS);
         } catch (InterruptedException | ExecutionException e) {
             env.getLogger(getClass()).log(Level.SEVERE, "Sampling failed", e);
             return null;

From 49f3817457d3cbfdc33188cbb6fef4f236cc4a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 1 Oct 2021 15:49:58 +0200
Subject: [PATCH 261/681] Disable tautological-compare warnings in query code
 compilation on darwin

---
 .../com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
index b13d562b0b80..f2ddc74f7c7d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
@@ -308,6 +308,12 @@ protected void verify() {
             }
         }
 
+        @Override
+        protected List<String> compileStrictOptions() {
+            List<String> strictOptions = new ArrayList<>(super.compileStrictOptions());
+            strictOptions.add("-Wno-tautological-compare");
+            return strictOptions;
+        }
     }
 
     protected InputStream getCompilerErrorStream(Process compilingProcess) {

From 36051ccd1e0eef81a1912c426d7b0e806dc8bffc Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Fri, 1 Oct 2021 17:22:12 +0200
Subject: [PATCH 262/681] Cleanup histogram output entry computation.

---
 .../tools/profiler/impl/CPUSamplerCLI.java    | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 29b2833c8292..384cd16f6040 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -411,30 +411,27 @@ private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<ProfilerNode<C
             SourceLocation location = sourceLocationEntry.getKey();
             OutputEntry outputEntry = new OutputEntry(location);
             maxNameLength = Math.max(maxNameLength, location.getRootName().length());
+
             for (ProfilerNode<CPUSampler.Payload> node : sourceLocationEntry.getValue()) {
                 CPUSampler.Payload payload = node.getPayload();
-                for (int i = 0; i < payload.getNumberOfTiers(); i++) {
+
+                int numberOfTiers = payload.getNumberOfTiers();
+                if (outputEntry.tierToSelfSamples.length < numberOfTiers) {
+                    outputEntry.tierToSelfSamples = Arrays.copyOf(outputEntry.tierToSelfSamples, numberOfTiers);
+                }
+                if (outputEntry.tierToSamples.length < numberOfTiers) {
+                    outputEntry.tierToSamples = Arrays.copyOf(outputEntry.tierToSamples, numberOfTiers);
+                }
+
+                for (int i = 0; i < numberOfTiers; i++) {
                     int selfHitCountsValue = payload.getTierSelfCount(i);
                     outputEntry.totalSelfSamples += selfHitCountsValue;
-                    if (outputEntry.tierToSelfSamples.length < i + 1) {
-                        outputEntry.tierToSelfSamples = Arrays.copyOf(outputEntry.tierToSelfSamples, outputEntry.tierToSelfSamples.length + 1);
-                    }
                     outputEntry.tierToSelfSamples[i] += selfHitCountsValue;
-                    tiers.add(i);
-                }
-            }
-            for (ProfilerNode<CPUSampler.Payload> node : sourceLocationEntry.getValue()) {
-                if (node.isRecursive()) {
-                    continue;
-                }
-                CPUSampler.Payload payload = node.getPayload();
-                for (int i = 0; i < payload.getNumberOfTiers(); i++) {
+
                     int hitCountsValue = payload.getTierTotalCount(i);
                     outputEntry.totalSamples += hitCountsValue;
-                    if (outputEntry.tierToSamples.length < i + 1) {
-                        outputEntry.tierToSamples = Arrays.copyOf(outputEntry.tierToSamples, outputEntry.tierToSamples.length + 1);
-                    }
                     outputEntry.tierToSamples[i] += hitCountsValue;
+
                     tiers.add(i);
                 }
             }
@@ -623,9 +620,7 @@ private void calculateMaxValuesRec(ProfilerNode<CPUSampler.Payload> node, int de
             maxNameLength = Math.max(maxNameLength, node.getRootName().length() + OutputEntry.computeIndentSize(depth));
             tiers.add(node.getPayload().getNumberOfTiers() - 1);
             for (ProfilerNode<CPUSampler.Payload> child : node.getChildren()) {
-                if (!child.isRecursive()) {
-                    calculateMaxValuesRec(child, depth + 1);
-                }
+                calculateMaxValuesRec(child, depth + 1);
             }
         }
 

From 827a987a630a787593b6ef6db6bca98a2715acb1 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Fri, 1 Oct 2021 16:17:01 +0200
Subject: [PATCH 263/681] Prevent SafeNodes from being canonicalized into
 IntegerDivRemNodes.

---
 .../AArch64HotSpotLoweringProvider.java       |  5 ++++-
 .../compiler/nodes/calc/SignedDivNode.java    | 20 +++++++++++++++----
 .../compiler/nodes/calc/SignedRemNode.java    | 13 +++++++++++-
 .../AArch64IntegerArithmeticSnippets.java     | 17 +++++++++++++++-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
index b874472bdea4..a383b2e9eb02 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
@@ -67,7 +67,10 @@ public void initialize(OptionValues options, Iterable<DebugHandlersFactory> fact
     @Override
     public void lower(Node n, LoweringTool tool) {
         if (n instanceof IntegerDivRemNode) {
-            integerArithmeticSnippets.lower((IntegerDivRemNode) n, tool);
+            if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.LOW_TIER) {
+                // wait more precise stamp information
+                integerArithmeticSnippets.lower((IntegerDivRemNode) n, tool);
+            }
         } else if (n instanceof FloatConvertNode) {
             // AMD64 has custom lowerings for ConvertNodes, HotSpotLoweringProvider does not expect
             // to see a ConvertNode and throws an error, just do nothing here.
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
index 633a25f7dadb..e9b43c216697 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
@@ -28,12 +28,13 @@
 import org.graalvm.compiler.core.common.type.PrimitiveStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -67,6 +68,16 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode for
         return canonical(this, forX, forY, getZeroCheck(), view);
     }
 
+    /**
+     * This is used as a hook to allow AArch64IntegerArithmeticSnippets's SafeSignedDivNode to be
+     * created during canonicalization.
+     */
+    protected SignedDivNode createWithInputs(ValueNode forX, ValueNode forY, GuardingNode forZeroCheck, FrameState forStateBefore) {
+        SignedDivNode sd = new SignedDivNode(forX, forY, forZeroCheck);
+        sd.stateBefore = forStateBefore;
+        return sd;
+    }
+
     public static ValueNode canonical(SignedDivNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, NodeView view) {
         Stamp predictedStamp = IntegerStamp.OPS.getDiv().foldStamp(forX.stamp(NodeView.DEFAULT), forY.stamp(NodeView.DEFAULT));
         Stamp stamp = self != null ? self.stamp(view) : predictedStamp;
@@ -92,9 +103,10 @@ public static ValueNode canonical(SignedDivNode self, ValueNode forX, ValueNode
                 SignedRemNode integerRemNode = (SignedRemNode) integerSubNode.getY();
                 if (integerSubNode.stamp(view).isCompatible(stamp) && integerRemNode.stamp(view).isCompatible(stamp) && integerSubNode.getX() == integerRemNode.getX() &&
                                 forY == integerRemNode.getY()) {
-                    SignedDivNode sd = new SignedDivNode(integerSubNode.getX(), forY, zeroCheck);
-                    sd.stateBefore = self != null ? self.stateBefore : null;
-                    return sd;
+                    if (self != null) {
+                        return self.createWithInputs(integerSubNode.getX(), forY, zeroCheck, self.stateBefore);
+                    }
+                    return new SignedDivNode(integerSubNode.getX(), forY, zeroCheck);
                 }
             }
         }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
index 38c462072b57..2f23d2dc93e0 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
@@ -28,12 +28,12 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
@@ -70,6 +70,14 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode for
         return canonical(this, forX, forY, getZeroCheck(), stamp(view), view, tool);
     }
 
+    /**
+     * This is used as a hook to allow AArch64IntegerArithmeticSnippets's SafeSignedRemNode to be
+     * created during canonicalization.
+     */
+    protected SignedRemNode createWithInputs(ValueNode forX, ValueNode forY, GuardingNode forZeroCheck) {
+        return new SignedRemNode(forX, forY, forZeroCheck);
+    }
+
     private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode forY, GuardingNode zeroCheck, Stamp stamp, NodeView view, CanonicalizerTool tool) {
         if (forX.isConstant() && forY.isConstant()) {
             long y = forY.asJavaConstant().asLong();
@@ -114,6 +122,9 @@ private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode
         if (self != null && self.x == forX && self.y == forY) {
             return self;
         } else {
+            if (self != null) {
+                return self.createWithInputs(forX, forY, zeroCheck);
+            }
             return new SignedRemNode(forX, forY, zeroCheck);
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
index c8b115a9abf0..2a395da9119c 100644
--- a/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
@@ -36,6 +36,7 @@
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -45,6 +46,7 @@
 import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
 import org.graalvm.compiler.nodes.calc.UnsignedRemNode;
 import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.options.OptionValues;
@@ -61,7 +63,7 @@
 
 /**
  * Division in AArch64 ISA does not generate a trap when dividing by zero, but instead sets the
- * result to 0. These snippets throw an ArithmethicException if the denominator is 0 and otherwise
+ * result to 0. These snippets throw an ArithmeticException if the denominator is 0 and otherwise
  * forward to the LIRGenerator.
  */
 public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implements Snippets {
@@ -236,6 +238,13 @@ protected SafeSignedDivNode(ValueNode x, ValueNode y) {
             super(TYPE, x, y, null);
         }
 
+        @Override
+        protected SignedDivNode createWithInputs(ValueNode forX, ValueNode forY, GuardingNode forZeroCheck, FrameState forStateBefore) {
+            assert forZeroCheck == null;
+            // note that stateBefore is irrelevant, as this "safe" variant will not deoptimize
+            return new SafeSignedDivNode(forX, forY);
+        }
+
         @Override
         public void generate(NodeLIRBuilderTool gen) {
             // override to ensure we always pass a null frame state
@@ -252,6 +261,12 @@ protected SafeSignedRemNode(ValueNode x, ValueNode y) {
             super(TYPE, x, y, null);
         }
 
+        @Override
+        protected SignedRemNode createWithInputs(ValueNode forX, ValueNode forY, GuardingNode forZeroCheck) {
+            assert forZeroCheck == null;
+            return new SafeSignedRemNode(forX, forY);
+        }
+
         @Override
         public void generate(NodeLIRBuilderTool gen) {
             // override to ensure we always pass a null frame state

From 686b4e9bb3b0873a4de0198c6a091edc62f33c06 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Fri, 1 Oct 2021 17:17:48 +0200
Subject: [PATCH 264/681] [GR-34140] Add dispatch object into ExecutionListener
 and ExecutionEvent.

---
 .../src/org/graalvm/polyglot/Engine.java      |  60 ---------
 .../polyglot/impl/AbstractPolyglotImpl.java   |  28 +++--
 .../polyglot/management/ExecutionEvent.java   |  29 +++--
 .../management/ExecutionListener.java         |  20 +--
 .../polyglot/management/Management.java       |  34 ++++-
 .../api/test/wrapper/HostEngineDispatch.java  |   8 ++
 .../test/wrapper/HostPolyglotDispatch.java    |   5 -
 .../polyglot/PolyglotEngineDispatch.java      | 113 +++++++++++++++++
 .../oracle/truffle/polyglot/PolyglotImpl.java |   3 +-
 .../polyglot/PolyglotManagementDispatch.java  | 116 +-----------------
 10 files changed, 203 insertions(+), 213 deletions(-)

diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
index 1f2171764020..f2eda02ec391 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
@@ -90,7 +90,6 @@
 import org.graalvm.polyglot.io.ByteSequence;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.MessageTransport;
-import org.graalvm.polyglot.management.ExecutionEvent;
 
 /**
  * An execution engine for Graal {@linkplain Language guest languages} that allows to inspect the
@@ -909,65 +908,6 @@ public AbstractHostAccess createHostAccess() {
             throw noPolyglotImplementationFound();
         }
 
-        @Override
-        public AbstractManagementDispatch getManagementDispatch() {
-            return new AbstractManagementDispatch(this) {
-
-                @Override
-                public boolean isExecutionEventStatement(Object impl) {
-                    return false;
-                }
-
-                @Override
-                public boolean isExecutionEventRoot(Object impl) {
-                    return false;
-                }
-
-                @Override
-                public boolean isExecutionEventExpression(Object impl) {
-                    return false;
-                }
-
-                @Override
-                public String getExecutionEventRootName(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public PolyglotException getExecutionEventException(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public Value getExecutionEventReturnValue(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public SourceSection getExecutionEventLocation(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public List<Value> getExecutionEventInputValues(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public void closeExecutionListener(Object impl) {
-                    throw noPolyglotImplementationFound();
-                }
-
-                @Override
-                public Object attachExecutionListener(Object engine, Consumer<ExecutionEvent> onEnter, Consumer<ExecutionEvent> onReturn, boolean expressions, boolean statements,
-                                boolean roots,
-                                Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectErrors) {
-                    throw noPolyglotImplementationFound();
-                }
-
-            };
-        }
-
         private static RuntimeException noPolyglotImplementationFound() {
             String suggestion;
             if (AOT) {
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
index 3dd202ce7013..840214089ea1 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
@@ -93,6 +93,7 @@
 import org.graalvm.polyglot.io.MessageTransport;
 import org.graalvm.polyglot.io.ProcessHandler;
 import org.graalvm.polyglot.management.ExecutionEvent;
+import org.graalvm.polyglot.management.ExecutionListener;
 
 /**
  * This class is intended to be used by polyglot implementations. Methods in this class are not
@@ -114,8 +115,17 @@ protected ManagementAccess() {
             }
         }
 
-        public abstract ExecutionEvent newExecutionEvent(Object event);
+        public abstract ExecutionListener newExecutionListener(AbstractManagementDispatch dispatch, Object receiver);
 
+        public abstract ExecutionEvent newExecutionEvent(AbstractManagementDispatch dispatch, Object event);
+
+        public abstract Object getReceiver(ExecutionListener executionListener);
+
+        public abstract AbstractManagementDispatch getDispatch(ExecutionListener executionListener);
+
+        public abstract Object getReceiver(ExecutionEvent executionEvent);
+
+        public abstract AbstractManagementDispatch getDispatch(ExecutionEvent executionEvent);
     }
 
     public abstract static class IOAccess {
@@ -288,8 +298,6 @@ public abstract Engine buildEngine(OutputStream out, OutputStream err, InputStre
 
     public abstract AbstractSourceSectionDispatch getSourceSectionDispatch();
 
-    public abstract AbstractManagementDispatch getManagementDispatch();
-
     /**
      * Returns the default host dispatch of this polyglot abstraction.
      */
@@ -324,13 +332,6 @@ public final AbstractPolyglotImpl getPolyglotImpl() {
 
         public abstract void closeExecutionListener(Object impl);
 
-        public abstract Object attachExecutionListener(Object engine, Consumer<ExecutionEvent> onEnter,
-                        Consumer<ExecutionEvent> onReturn,
-                        boolean expressions,
-                        boolean statements,
-                        boolean roots,
-                        Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectExceptions);
-
         public abstract PolyglotException getExecutionEventException(Object impl);
 
     }
@@ -515,6 +516,13 @@ public abstract Context createContext(Object receiver, OutputStream out, OutputS
 
         public abstract String getVersion(Object receiver);
 
+        public abstract ExecutionListener attachExecutionListener(Object engine, Consumer<ExecutionEvent> onEnter,
+                        Consumer<ExecutionEvent> onReturn,
+                        boolean expressions,
+                        boolean statements,
+                        boolean roots,
+                        Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectExceptions);
+
     }
 
     public abstract static class AbstractExceptionDispatch {
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionEvent.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionEvent.java
index aae49f709069..29ba91416d65 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionEvent.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,7 +45,8 @@
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.SourceSection;
 import org.graalvm.polyglot.Value;
-import static org.graalvm.polyglot.management.Management.IMPL;
+
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractManagementDispatch;
 
 /**
  * An execution event object passed to an execution listener consumer. Execution event instances
@@ -57,10 +58,12 @@
  */
 public final class ExecutionEvent {
 
-    private final Object impl;
+    final AbstractManagementDispatch dispatch;
+    final Object receiver;
 
-    ExecutionEvent(Object impl) {
-        this.impl = impl;
+    ExecutionEvent(AbstractManagementDispatch dispatch, Object receiver) {
+        this.dispatch = dispatch;
+        this.receiver = receiver;
     }
 
     /**
@@ -70,7 +73,7 @@ public final class ExecutionEvent {
      * @since 19.0
      */
     public SourceSection getLocation() {
-        return IMPL.getExecutionEventLocation(impl);
+        return dispatch.getExecutionEventLocation(receiver);
     }
 
     /**
@@ -81,7 +84,7 @@ public SourceSection getLocation() {
      * @since 19.0
      */
     public String getRootName() {
-        return IMPL.getExecutionEventRootName(impl);
+        return dispatch.getExecutionEventRootName(receiver);
     }
 
     /**
@@ -97,7 +100,7 @@ public String getRootName() {
      * @since 19.0
      */
     public List<Value> getInputValues() {
-        return IMPL.getExecutionEventInputValues(impl);
+        return dispatch.getExecutionEventInputValues(receiver);
     }
 
     /**
@@ -111,7 +114,7 @@ public List<Value> getInputValues() {
      * @since 19.0
      */
     public Value getReturnValue() {
-        return IMPL.getExecutionEventReturnValue(impl);
+        return dispatch.getExecutionEventReturnValue(receiver);
     }
 
     /**
@@ -125,7 +128,7 @@ public Value getReturnValue() {
      * @since 19.0
      */
     public PolyglotException getException() {
-        return IMPL.getExecutionEventException(impl);
+        return dispatch.getExecutionEventException(receiver);
     }
 
     /**
@@ -136,7 +139,7 @@ public PolyglotException getException() {
      * @since 19.0
      */
     public boolean isExpression() {
-        return IMPL.isExecutionEventExpression(impl);
+        return dispatch.isExecutionEventExpression(receiver);
     }
 
     /**
@@ -147,7 +150,7 @@ public boolean isExpression() {
      * @since 19.0
      */
     public boolean isStatement() {
-        return IMPL.isExecutionEventStatement(impl);
+        return dispatch.isExecutionEventStatement(receiver);
     }
 
     /**
@@ -158,7 +161,7 @@ public boolean isStatement() {
      * @since 19.0
      */
     public boolean isRoot() {
-        return IMPL.isExecutionEventRoot(impl);
+        return dispatch.isExecutionEventRoot(receiver);
     }
 
     /**
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionListener.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionListener.java
index 03f479474f85..5020eae9a4bf 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionListener.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/ExecutionListener.java
@@ -47,6 +47,8 @@
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractManagementDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.APIAccess;
 
 /**
  * Execution listeners allow to instrument the execution of guest languages. For example, it is
@@ -190,11 +192,13 @@
  */
 public final class ExecutionListener implements AutoCloseable {
 
-    private static final ExecutionListener EMPTY = new ExecutionListener(null);
-    private final Object impl;
+    private static final ExecutionListener EMPTY = new ExecutionListener(null, null);
+    final AbstractManagementDispatch dispatch;
+    final Object receiver;
 
-    private ExecutionListener(Object impl) {
-        this.impl = impl;
+    ExecutionListener(AbstractManagementDispatch dispatch, Object receiver) {
+        this.dispatch = dispatch;
+        this.receiver = receiver;
     }
 
     /**
@@ -211,7 +215,7 @@ private ExecutionListener(Object impl) {
      * @since 19.0
      */
     public void close() {
-        Management.IMPL.closeExecutionListener(impl);
+        dispatch.closeExecutionListener(receiver);
     }
 
     /**
@@ -422,9 +426,9 @@ public Builder collectExceptions(boolean enabled) {
          * @since 19.0
          */
         public ExecutionListener attach(Engine engine) {
-            return new ExecutionListener(
-                            Management.IMPL.attachExecutionListener(Management.IMPL.getPolyglotImpl().getAPIAccess().getReceiver(engine), onEnter, onReturn, expressions, statements, roots,
-                                            sourceFilter, rootNameFilter, collectInputValues, collectReturnValues, collectExceptions));
+            APIAccess apiAccess = Management.IMPL.getAPIAccess();
+            return apiAccess.getDispatch(engine).attachExecutionListener(apiAccess.getReceiver(engine), onEnter, onReturn, expressions, statements, roots,
+                            sourceFilter, rootNameFilter, collectInputValues, collectReturnValues, collectExceptions);
         }
     }
 
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/Management.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/Management.java
index 957ec9ddb2c4..7770320f9cbe 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/Management.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/management/Management.java
@@ -55,15 +55,15 @@ final class Management {
     private Management() {
     }
 
-    static final AbstractManagementDispatch IMPL = initImpl();
+    static final AbstractPolyglotImpl IMPL = initImpl();
 
-    private static AbstractManagementDispatch initImpl() {
+    private static AbstractPolyglotImpl initImpl() {
         try {
             Method method = Engine.class.getDeclaredMethod("getImpl");
             method.setAccessible(true);
             AbstractPolyglotImpl impl = (AbstractPolyglotImpl) method.invoke(null);
             impl.setMonitoring(new ManagementAccessImpl());
-            return impl.getManagementDispatch();
+            return impl;
         } catch (Exception e) {
             throw new IllegalStateException("Failed to initialize execution listener class.", e);
         }
@@ -72,10 +72,34 @@ private static AbstractManagementDispatch initImpl() {
     private static final class ManagementAccessImpl extends ManagementAccess {
 
         @Override
-        public ExecutionEvent newExecutionEvent(Object event) {
-            return new ExecutionEvent(event);
+        public ExecutionListener newExecutionListener(AbstractManagementDispatch dispatch, Object receiver) {
+            return new ExecutionListener(dispatch, receiver);
         }
 
+        @Override
+        public ExecutionEvent newExecutionEvent(AbstractManagementDispatch dispatch, Object event) {
+            return new ExecutionEvent(dispatch, event);
+        }
+
+        @Override
+        public Object getReceiver(ExecutionListener executionListener) {
+            return executionListener.receiver;
+        }
+
+        @Override
+        public AbstractManagementDispatch getDispatch(ExecutionListener executionListener) {
+            return executionListener.dispatch;
+        }
+
+        @Override
+        public Object getReceiver(ExecutionEvent executionEvent) {
+            return executionEvent.receiver;
+        }
+
+        @Override
+        public AbstractManagementDispatch getDispatch(ExecutionEvent executionEvent) {
+            return executionEvent.dispatch;
+        }
     }
 
 }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
index f69d045ab454..44c3756960b9 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostEngineDispatch.java
@@ -45,6 +45,7 @@
 import java.time.ZoneId;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.graalvm.options.OptionDescriptors;
@@ -60,6 +61,8 @@
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractEngineDispatch;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.ProcessHandler;
+import org.graalvm.polyglot.management.ExecutionEvent;
+import org.graalvm.polyglot.management.ExecutionListener;
 
 public class HostEngineDispatch extends AbstractEngineDispatch {
 
@@ -145,4 +148,9 @@ public String getVersion(Object receiver) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public ExecutionListener attachExecutionListener(Object engine, Consumer<ExecutionEvent> onEnter, Consumer<ExecutionEvent> onReturn, boolean expressions, boolean statements, boolean roots,
+                    Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectExceptions) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
index ad433bbcb4f9..d915d23dd136 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
@@ -119,11 +119,6 @@ public AbstractSourceSectionDispatch getSourceSectionDispatch() {
         return getNext().getSourceSectionDispatch();
     }
 
-    @Override
-    public AbstractManagementDispatch getManagementDispatch() {
-        return getNext().getManagementDispatch();
-    }
-
     @Override
     public Class<?> loadLanguageClass(String className) {
         return getNext().loadLanguageClass(className);
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
index 665b008f881c..f82733796fc3 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineDispatch.java
@@ -43,10 +43,21 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import com.oracle.truffle.api.instrumentation.EventBinding;
+import com.oracle.truffle.api.instrumentation.EventContext;
+import com.oracle.truffle.api.instrumentation.ExecutionEventNode;
+import com.oracle.truffle.api.instrumentation.ExecutionEventNodeFactory;
+import com.oracle.truffle.api.instrumentation.Instrumenter;
+import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
+import com.oracle.truffle.api.instrumentation.StandardTags;
+import com.oracle.truffle.api.instrumentation.Tag;
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
@@ -57,10 +68,13 @@
 import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractEngineDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractManagementDispatch;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.ProcessHandler;
 
 import com.oracle.truffle.api.Truffle;
+import org.graalvm.polyglot.management.ExecutionEvent;
+import org.graalvm.polyglot.management.ExecutionListener;
 
 final class PolyglotEngineDispatch extends AbstractEngineDispatch {
 
@@ -180,4 +194,103 @@ public String getVersion(Object oreceiver) {
         }
     }
 
+    @Override
+    public ExecutionListener attachExecutionListener(Object engineReceiver, Consumer<ExecutionEvent> onEnter, Consumer<ExecutionEvent> onReturn, boolean expressions, boolean statements,
+                    boolean roots,
+                    Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectExceptions) {
+        PolyglotEngineImpl engine = (PolyglotEngineImpl) engineReceiver;
+        Instrumenter instrumenter = (Instrumenter) EngineAccessor.INSTRUMENT.getEngineInstrumenter(engine.instrumentationHandler);
+
+        List<Class<? extends Tag>> tags = new ArrayList<>();
+        if (expressions) {
+            tags.add(StandardTags.ExpressionTag.class);
+        }
+        if (statements) {
+            tags.add(StandardTags.StatementTag.class);
+        }
+        if (roots) {
+            tags.add(StandardTags.RootTag.class);
+        }
+
+        if (tags.isEmpty()) {
+            throw new IllegalArgumentException("No elements specified to listen to for execution listener. Need to specify at least one element kind: expressions, statements or roots.");
+        }
+        if (onReturn == null && onEnter == null) {
+            throw new IllegalArgumentException("At least one event consumer must be provided for onEnter or onReturn.");
+        }
+
+        SourceSectionFilter.Builder filterBuilder = SourceSectionFilter.newBuilder().tagIs(tags.toArray(new Class<?>[0]));
+        filterBuilder.includeInternal(false);
+
+        AbstractManagementDispatch managementDispatch = polyglot.getManagementDispatch();
+        PolyglotManagementDispatch.ListenerImpl config = new PolyglotManagementDispatch.ListenerImpl(managementDispatch, engine, onEnter, onReturn, collectInputValues, collectReturnValues,
+                        collectExceptions);
+
+        filterBuilder.sourceIs(new SourceSectionFilter.SourcePredicate() {
+            public boolean test(com.oracle.truffle.api.source.Source s) {
+                String language = s.getLanguage();
+                if (language == null) {
+                    return false;
+                } else if (!engine.idToLanguage.containsKey(language)) {
+                    return false;
+                } else if (sourceFilter != null) {
+                    try {
+                        return sourceFilter.test(PolyglotImpl.getOrCreatePolyglotSource(polyglot, s));
+                    } catch (Throwable e) {
+                        if (config.closing) {
+                            // configuration is closing ignore errors.
+                            return false;
+                        }
+                        throw engine.host.toHostException(null, e);
+                    }
+                } else {
+                    return true;
+                }
+            }
+        });
+
+        if (rootFilter != null) {
+            filterBuilder.rootNameIs(new Predicate<String>() {
+                public boolean test(String s) {
+                    try {
+                        return rootFilter.test(s);
+                    } catch (Throwable e) {
+                        if (config.closing) {
+                            // configuration is closing ignore errors.
+                            return false;
+                        }
+                        throw engine.host.toHostException(null, e);
+                    }
+                }
+            });
+        }
+
+        SourceSectionFilter filter = filterBuilder.build();
+        EventBinding<?> binding;
+        try {
+            boolean mayNeedInputValues = config.collectInputValues && config.onReturn != null;
+            boolean mayNeedReturnValue = config.collectReturnValues && config.onReturn != null;
+            boolean mayNeedExceptions = config.collectExceptions;
+
+            if (mayNeedInputValues || mayNeedReturnValue || mayNeedExceptions) {
+                binding = instrumenter.attachExecutionEventFactory(filter, mayNeedInputValues ? filter : null, new ExecutionEventNodeFactory() {
+                    public ExecutionEventNode create(EventContext context) {
+                        return new PolyglotManagementDispatch.ProfilingNode(config, context);
+                    }
+                });
+            } else {
+                // fast path no collection of additional profiles
+                binding = instrumenter.attachExecutionEventFactory(filter, null, new ExecutionEventNodeFactory() {
+                    public ExecutionEventNode create(EventContext context) {
+                        return new PolyglotManagementDispatch.DefaultNode(config, context);
+                    }
+                });
+            }
+        } catch (Throwable t) {
+            throw PolyglotImpl.guestToHostException(engine, t);
+        }
+        config.binding = binding;
+        return polyglot.getManagement().newExecutionListener(managementDispatch, config);
+    }
+
 }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
index 73327ca6c2b1..2cbefca6daf5 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
@@ -178,8 +178,7 @@ public AbstractSourceSectionDispatch getSourceSectionDispatch() {
     /**
      * Internal method do not use.
      */
-    @Override
-    public AbstractManagementDispatch getManagementDispatch() {
+    AbstractManagementDispatch getManagementDispatch() {
         return executionListenerDispatch;
     }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotManagementDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotManagementDispatch.java
index 47981ec2a223..9d29aa01c0a5 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotManagementDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotManagementDispatch.java
@@ -41,13 +41,10 @@
 package com.oracle.truffle.polyglot;
 
 import java.util.AbstractList;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-import java.util.function.Predicate;
 
 import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.SourceSection;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractManagementDispatch;
@@ -61,10 +58,6 @@
 import com.oracle.truffle.api.instrumentation.EventBinding;
 import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventNode;
-import com.oracle.truffle.api.instrumentation.ExecutionEventNodeFactory;
-import com.oracle.truffle.api.instrumentation.Instrumenter;
-import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
-import com.oracle.truffle.api.instrumentation.SourceSectionFilter.SourcePredicate;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -72,112 +65,13 @@
 final class PolyglotManagementDispatch extends AbstractManagementDispatch {
 
     static final Object[] EMPTY_ARRAY = new Object[0];
-    private final PolyglotImpl engineImpl;
 
     PolyglotManagementDispatch(PolyglotImpl engineImpl) {
         super(engineImpl);
-        this.engineImpl = engineImpl;
     }
 
     // implementation for org.graalvm.polyglot.management.ExecutionListener
 
-    @Override
-    public Object attachExecutionListener(Object engineReceiver, Consumer<ExecutionEvent> onEnter, Consumer<ExecutionEvent> onReturn, boolean expressions, boolean statements,
-                    boolean roots,
-                    Predicate<Source> sourceFilter, Predicate<String> rootFilter, boolean collectInputValues, boolean collectReturnValues, boolean collectExceptions) {
-        PolyglotEngineImpl engine = (PolyglotEngineImpl) engineReceiver;
-        Instrumenter instrumenter = (Instrumenter) EngineAccessor.INSTRUMENT.getEngineInstrumenter(engine.instrumentationHandler);
-
-        List<Class<? extends Tag>> tags = new ArrayList<>();
-        if (expressions) {
-            tags.add(StandardTags.ExpressionTag.class);
-        }
-        if (statements) {
-            tags.add(StandardTags.StatementTag.class);
-        }
-        if (roots) {
-            tags.add(StandardTags.RootTag.class);
-        }
-
-        if (tags.isEmpty()) {
-            throw new IllegalArgumentException("No elements specified to listen to for execution listener. Need to specify at least one element kind: expressions, statements or roots.");
-        }
-        if (onReturn == null && onEnter == null) {
-            throw new IllegalArgumentException("At least one event consumer must be provided for onEnter or onReturn.");
-        }
-
-        SourceSectionFilter.Builder filterBuilder = SourceSectionFilter.newBuilder().tagIs(tags.toArray(new Class<?>[0]));
-        filterBuilder.includeInternal(false);
-
-        ListenerImpl config = new ListenerImpl(engine, onEnter, onReturn, collectInputValues, collectReturnValues, collectExceptions);
-
-        filterBuilder.sourceIs(new SourcePredicate() {
-            public boolean test(com.oracle.truffle.api.source.Source s) {
-                String language = s.getLanguage();
-                if (language == null) {
-                    return false;
-                } else if (!engine.idToLanguage.containsKey(language)) {
-                    return false;
-                } else if (sourceFilter != null) {
-                    try {
-                        return sourceFilter.test(PolyglotImpl.getOrCreatePolyglotSource(engineImpl, s));
-                    } catch (Throwable e) {
-                        if (config.closing) {
-                            // configuration is closing ignore errors.
-                            return false;
-                        }
-                        throw engine.host.toHostException(null, e);
-                    }
-                } else {
-                    return true;
-                }
-            }
-        });
-
-        if (rootFilter != null) {
-            filterBuilder.rootNameIs(new Predicate<String>() {
-                public boolean test(String s) {
-                    try {
-                        return rootFilter.test(s);
-                    } catch (Throwable e) {
-                        if (config.closing) {
-                            // configuration is closing ignore errors.
-                            return false;
-                        }
-                        throw engine.host.toHostException(null, e);
-                    }
-                }
-            });
-        }
-
-        SourceSectionFilter filter = filterBuilder.build();
-        EventBinding<?> binding;
-        try {
-            boolean mayNeedInputValues = config.collectInputValues && config.onReturn != null;
-            boolean mayNeedReturnValue = config.collectReturnValues && config.onReturn != null;
-            boolean mayNeedExceptions = config.collectExceptions;
-
-            if (mayNeedInputValues || mayNeedReturnValue || mayNeedExceptions) {
-                binding = instrumenter.attachExecutionEventFactory(filter, mayNeedInputValues ? filter : null, new ExecutionEventNodeFactory() {
-                    public ExecutionEventNode create(EventContext context) {
-                        return new ProfilingNode(config, context);
-                    }
-                });
-            } else {
-                // fast path no collection of additional profiles
-                binding = instrumenter.attachExecutionEventFactory(filter, null, new ExecutionEventNodeFactory() {
-                    public ExecutionEventNode create(EventContext context) {
-                        return new DefaultNode(config, context);
-                    }
-                });
-            }
-        } catch (Throwable t) {
-            throw wrapException(engine, t);
-        }
-        config.binding = binding;
-        return config;
-    }
-
     @Override
     public void closeExecutionListener(Object impl) {
         try {
@@ -258,6 +152,7 @@ private static RuntimeException wrapException(Object impl, Throwable t) {
 
     static class ListenerImpl {
 
+        final AbstractManagementDispatch managementDispatch;
         final PolyglotEngineImpl engine;
         final Consumer<ExecutionEvent> onEnter;
         final Consumer<ExecutionEvent> onReturn;
@@ -269,11 +164,12 @@ static class ListenerImpl {
         volatile EventBinding<?> binding;
         volatile boolean closing;
 
-        ListenerImpl(PolyglotEngineImpl engine, Consumer<ExecutionEvent> onEnter,
+        ListenerImpl(AbstractManagementDispatch managementDispatch, PolyglotEngineImpl engine, Consumer<ExecutionEvent> onEnter,
                         Consumer<ExecutionEvent> onReturn,
                         boolean collectInputValues,
                         boolean collectReturnValues,
                         boolean collectExceptions) {
+            this.managementDispatch = managementDispatch;
             this.engine = engine;
             this.onEnter = onEnter;
             this.onReturn = onReturn;
@@ -479,7 +375,7 @@ private void invokeReturnAllocate(Object[] inputValues, Object result) {
         @TruffleBoundary(allowInlining = true)
         protected final void invokeExceptionAllocate(List<Value> inputValues, Throwable e) {
             PolyglotException ex = e != null ? PolyglotImpl.guestToHostException(language.getCurrentLanguageContext(), e, true) : null;
-            config.onReturn.accept(config.management.newExecutionEvent(new DynamicEvent(this, inputValues, null, ex)));
+            config.onReturn.accept(config.management.newExecutionEvent(config.managementDispatch, new DynamicEvent(this, inputValues, null, ex)));
         }
 
     }
@@ -525,7 +421,7 @@ abstract static class AbstractNode extends ExecutionEventNode implements Event {
             this.config = config;
             this.context = context;
             this.location = PolyglotImpl.getPolyglotSourceSection(config.engine.impl, context.getInstrumentedSourceSection());
-            this.cachedEvent = config.engine.impl.getManagement().newExecutionEvent(this);
+            this.cachedEvent = config.management.newExecutionEvent(config.managementDispatch, this);
         }
 
         public String getRootName() {
@@ -574,7 +470,7 @@ protected final void invokeException() {
 
         @TruffleBoundary(allowInlining = true)
         protected final void invokeReturnAllocate(List<Value> inputValues, Value returnValue) {
-            config.onReturn.accept(config.management.newExecutionEvent(new DynamicEvent(this, inputValues, returnValue, null)));
+            config.onReturn.accept(config.management.newExecutionEvent(config.managementDispatch, new DynamicEvent(this, inputValues, returnValue, null)));
         }
 
         public final SourceSection getLocation() {

From 2b3e1e4a4bf7e1fbc5f44d870f90b539065dc829 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Fri, 1 Oct 2021 17:48:15 +0200
Subject: [PATCH 265/681] Restore recursion detection for total sum.

---
 .../com/oracle/truffle/tools/profiler/ProfilerNode.java   | 8 ++++++--
 .../oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java | 8 +++++++-
 .../oracle/truffle/tools/profiler/impl/ProfilerCLI.java   | 6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
index 2ee2d1e8f9fe..781bd7efb669 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/ProfilerNode.java
@@ -91,13 +91,17 @@ public ProfilerNode<T> getParent() {
      * @since 0.30
      */
     public boolean isRecursive() {
+        return isRecursiveImpl(this);
+    }
+
+    private boolean isRecursiveImpl(ProfilerNode<T> source) {
         if (parent.sourceLocation == null) {
             return false;
         }
-        if (parent.sourceLocation.equals(this.sourceLocation)) {
+        if (parent.sourceLocation.equals(source.sourceLocation)) {
             return true;
         }
-        return false;
+        return parent.isRecursiveImpl(source);
     }
 
     /**
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
index 384cd16f6040..6c987ea27115 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/CPUSamplerCLI.java
@@ -427,12 +427,18 @@ private OutputEntry histogramEntry(Map.Entry<SourceLocation, List<ProfilerNode<C
                     int selfHitCountsValue = payload.getTierSelfCount(i);
                     outputEntry.totalSelfSamples += selfHitCountsValue;
                     outputEntry.tierToSelfSamples[i] += selfHitCountsValue;
+                    tiers.add(i);
+
+                    // if there is a recursive parent summed up for total time we must not sum up
+                    // again
+                    if (node.isRecursive()) {
+                        continue;
+                    }
 
                     int hitCountsValue = payload.getTierTotalCount(i);
                     outputEntry.totalSamples += hitCountsValue;
                     outputEntry.tierToSamples[i] += hitCountsValue;
 
-                    tiers.add(i);
                 }
             }
             return outputEntry;
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
index 879333a6a402..d7ee1ac7cd44 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/ProfilerCLI.java
@@ -32,6 +32,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -292,11 +293,10 @@ public boolean equals(Object o) {
             }
 
             SourceLocation that = (SourceLocation) o;
-
-            if (sourceSection != null ? !sourceSection.equals(that.sourceSection) : that.sourceSection != null) {
+            if (!Objects.equals(sourceSection, that.sourceSection)) {
                 return false;
             }
-            return rootName != null ? rootName.equals(that.rootName) : that.rootName == null;
+            return Objects.equals(rootName, that.rootName);
         }
 
         @Override

From 769ea25cb994bee42ccc7d3868773d946a6a8a8c Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Fri, 1 Oct 2021 18:33:40 +0200
Subject: [PATCH 266/681] Remove link to non-existing image

---
 docs/tools/vscode/micronaut/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/tools/vscode/micronaut/README.md b/docs/tools/vscode/micronaut/README.md
index d5e98099cd1b..8e8935c68048 100644
--- a/docs/tools/vscode/micronaut/README.md
+++ b/docs/tools/vscode/micronaut/README.md
@@ -112,8 +112,6 @@ For more details, continue reading to the [Micronaut documentation](https://guid
 The Micronaut support in VSCode also allows to build and deploy Docker image to a Docker Registry.
 Use action View > Command Palette > Micronaut: Deploy... and select **dockerPush** to deploy dockerized Micronaut application or **dockerPushNative** to build and push docker with a native executable of Micronaut application.
 
-![Micronaut Deploy Commands](images/micronaut-deploy-commands.png)
-
 Besides that, you can also push a Micronaut application or a native executable to a Docker Registry from the VS Code terminal window. A particular Docker Registry can be configured in the build, see the [Micronaut Deploying Application](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/examples/deploy.html) documentation.
 
 ### Feedback

From 30414c264e0bbd69439d3e201c36c227847bb580 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Fri, 1 Oct 2021 18:21:46 +0200
Subject: [PATCH 267/681] Fix links

---
 docs/examples/examples.md            | 2 +-
 docs/reference-manual/java/README.md | 4 ++--
 docs/reference-manual/languages.md   | 8 ++++----
 docs/tools/graalvm-insight.md        | 2 +-
 truffle/README.md                    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/examples/examples.md b/docs/examples/examples.md
index 56add0222ed7..dc996a9ca382 100644
--- a/docs/examples/examples.md
+++ b/docs/examples/examples.md
@@ -20,5 +20,5 @@ Here you can also find an even more sophisticated example of polyglot native exe
 
 The [Java/Kotlin Native Image Example](java-kotlin-aot.md) demonstrates how to compile a Java and Kotlin application ahead-of-time, and illustrates the performance gain.
 
-The [Oracle Database Example](examples/mle-oracle.md) contains instructions on how to run the Oracle Database Multilingual Engine (MLE) which is the integration of GraalVM in the Oracle
+The [Oracle Database Example](mle-oracle.md) contains instructions on how to run the Oracle Database Multilingual Engine (MLE) which is the integration of GraalVM in the Oracle
 Database 21c.
diff --git a/docs/reference-manual/java/README.md b/docs/reference-manual/java/README.md
index 6dac35785069..a710012e773a 100644
--- a/docs/reference-manual/java/README.md
+++ b/docs/reference-manual/java/README.md
@@ -33,5 +33,5 @@ This mode allows you to [debug the GraalVM compiler with a Java debugger](Operat
 
 ## Interoperability
 
-In addition to running JVM-based languages on GraalVM, you can also call any other language implemented with the [Truffle language implementation framework](../truffle-framework/README.md) directly from Java.
-See the [Polyglot Programming](../polyglot-programming.md) and [Embedding Languages](../embed-languages.md) guides for more information about interoperability with other programming languages.
+In addition to running JVM-based languages on GraalVM, you can also call any other language implemented with the [Truffle language implementation framework](../../../truffle/docs/README.md) directly from Java.
+See the [Polyglot Programming](../polyglot-programming.md) and [Embedding Languages](../embedding/embed-languages.md) guides for more information about interoperability with other programming languages.
diff --git a/docs/reference-manual/languages.md b/docs/reference-manual/languages.md
index 061c9f85a505..9354047ae4b3 100644
--- a/docs/reference-manual/languages.md
+++ b/docs/reference-manual/languages.md
@@ -13,9 +13,9 @@ GraalVM's polyglot capabilities make it possible to mix multiple programming lan
 If you are mostly interested in GraalVM's support for a specific language, here you can find the most extensive documentation:
 * [Java](java/README.md)
 * [Java on Truffle](java-on-truffle/README.md)
-* [JavaScript and Node.js](js/README.md)
+* [JavaScript and Node.js](https://github.com/oracle/graaljs/blob/master/docs/user/README.md)
 * [LLVM Languages](llvm/README.md)
-* [Python](python/README.md)
-* [R](r/README.md)
-* [Ruby](ruby/README.md)
+* [Python](https://github.com/oracle/graalpython/blob/master/docs/user/README.md)
+* [R](https://github.com/oracle/fastr/blob/master/documentation/user/README.md)
+* [Ruby](https://github.com/oracle/truffleruby/blob/master/doc/user/README.md)
 * [WebAssembly](wasm/README.md)
diff --git a/docs/tools/graalvm-insight.md b/docs/tools/graalvm-insight.md
index daafa72079c7..752869b2375c 100644
--- a/docs/tools/graalvm-insight.md
+++ b/docs/tools/graalvm-insight.md
@@ -146,7 +146,7 @@ Hello from GraalVM Ruby!
 It is necessary to start the Ruby launcher with the `--polyglot` parameter, as the _source-tracing.js_ script remains written in JavaScript.
 
 A user can instrument any language on top of GraalVM, but also the Insight scripts can be
-written in any of the GraalVM supported languages (implemented with the [Truffle language implementation framework](../graalvm-as-a-platform/truffle-framework/README.md)).
+written in any of the GraalVM supported languages (implemented with the [Truffle language implementation framework](../../truffle/docs/README.md)).
 
 1. Create the _source-tracing.rb_ Ruby file:
 ```ruby
diff --git a/truffle/README.md b/truffle/README.md
index cc3377380cfb..beb91687474d 100644
--- a/truffle/README.md
+++ b/truffle/README.md
@@ -17,7 +17,7 @@ Software of the Johannes Kepler University Linz.
 
 ## Using Truffle
 
-If you are looking for documentation on how to use Truffle, please consult the documentation [here](../docs/truffle-framework/README.md) or [on the website](https://www.graalvm.org/graalvm-as-a-platform/language-implementation-framework/).
+If you are looking for documentation on how to use Truffle, please consult the documentation [here](docs/README.md) or [on the website](https://www.graalvm.org/graalvm-as-a-platform/language-implementation-framework/).
 
 ## Hacking Truffle
 

From 550296a4313d984bf053402e2070dd49c85ec98b Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Tue, 28 Sep 2021 16:09:52 -0700
Subject: [PATCH 268/681] Covariant return types in NodeInterface.asNode
 overrides are bad for code shape

---
 .../core/test/VerifyUpdateUsages.java         |  7 ++--
 .../src/org/graalvm/compiler/graph/Node.java  | 11 +-----
 .../graalvm/compiler/graph/NodeInputList.java |  6 ----
 .../org/graalvm/compiler/graph/NodeList.java  | 21 -----------
 .../meta/DefaultHotSpotLoweringProvider.java  |  4 +--
 .../hotspot/replacements/FastNotifyNode.java  |  2 +-
 .../org/graalvm/compiler/nodes/FixedNode.java |  3 +-
 .../compiler/nodes/FixedNodeInterface.java    |  6 ++--
 .../compiler/nodes/FixedWithNextNode.java     |  5 +--
 .../nodes/FixedWithNextNodeInterface.java}    | 11 +++---
 .../graalvm/compiler/nodes/InliningLog.java   | 30 +++++++---------
 .../org/graalvm/compiler/nodes/Invokable.java | 19 +++++-----
 .../org/graalvm/compiler/nodes/Invoke.java    |  4 +++
 .../graalvm/compiler/nodes/InvokeNode.java    |  5 ---
 .../nodes/InvokeWithExceptionNode.java        |  5 ---
 .../org/graalvm/compiler/nodes/ValueNode.java |  7 +++-
 .../compiler/nodes/ValueNodeInterface.java    | 24 ++++++++++---
 .../compiler/nodes/calc/FloatingNode.java     |  5 ---
 .../nodes/extended/ArrayRangeWrite.java       |  8 ++---
 .../nodes/gc/CardTableBarrierSet.java         |  3 +-
 .../nodes/java/AbstractNewArrayNode.java      | 10 ++++--
 .../nodes/java/MethodCallTargetNode.java      |  2 +-
 .../nodes/java/NewArrayInterface.java         | 35 +++++++++++++++++++
 .../compiler/nodes/memory/MemoryAccess.java   |  4 +--
 .../org/graalvm/compiler/nodes/spi/Proxy.java |  4 +--
 .../compiler/phases/common/LoweringPhase.java |  5 ---
 .../common/ProfileCompiledMethodsPhase.java   |  2 +-
 .../phases/common/inlining/InliningUtil.java  | 10 +++---
 .../info/MultiTypeGuardInlineInfo.java        |  6 ++--
 .../inlining/info/TypeGuardInlineInfo.java    |  2 +-
 .../inlining/info/elem/InlineableGraph.java   |  2 +-
 .../walker/CallsiteHolderExplorable.java      |  2 +-
 .../walker/ComputeInliningRelevance.java      |  4 +--
 .../phases/graph/PostOrderNodeIterator.java   |  2 +-
 .../phases/graph/SinglePassNodeIterator.java  |  2 +-
 .../compiler/replacements/PEGraphDecoder.java | 10 +++---
 .../replacements/nodes/MacroNode.java         |  6 ----
 .../nodes/MacroWithExceptionNode.java         |  6 ----
 .../pointsto/flow/MethodTypeFlowBuilder.java  |  2 +-
 .../pointsto/phases/InlineBeforeAnalysis.java |  2 +-
 .../pointsto/results/StrengthenGraphs.java    |  4 +--
 .../oracle/svm/graal/hosted/GraalFeature.java |  2 +-
 .../hosted/phases/DevirtualizeCallsPhase.java |  4 +--
 .../phases/HostedGraphBuilderPhase.java       |  4 +--
 .../phases/ImplicitAssertionsPhase.java       |  4 +--
 45 files changed, 163 insertions(+), 159 deletions(-)
 rename compiler/src/{org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java => org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java} (78%)
 create mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java
index e4fd9fc76940..de774d7e718d 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java
@@ -31,6 +31,7 @@
 import org.graalvm.compiler.graph.Node.OptionalInput;
 import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
@@ -43,7 +44,7 @@
 
 /**
  * Try to ensure that methods which update {@link Input} or {@link OptionalInput} fields also
- * include a call to {@link Node#updateUsages} or {@link Node#updateUsagesInterface}.
+ * include a call to {@link Node#updateUsages} or {@link ValueNode#updateUsagesInterface}.
  */
 public class VerifyUpdateUsages extends VerifyPhase<CoreProviders> {
 
@@ -92,9 +93,11 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
             // Single input field update so just check for updateUsages
             // or updateUsagesInterface call
             ResolvedJavaType nodeType = context.getMetaAccess().lookupJavaType(Node.class);
+            ResolvedJavaType valueNodeType = context.getMetaAccess().lookupJavaType(ValueNode.class);
             for (MethodCallTargetNode call : graph.getNodes().filter(MethodCallTargetNode.class)) {
                 ResolvedJavaMethod callee = call.targetMethod();
-                if (callee.getDeclaringClass().equals(nodeType) && (callee.getName().equals("updateUsages") || callee.getName().equals("updateUsagesInterface"))) {
+                if ((callee.getDeclaringClass().equals(nodeType) && (callee.getName().equals("updateUsages"))) ||
+                                (callee.getDeclaringClass().equals(valueNodeType) && callee.getName().equals("updateUsagesInterface"))) {
                     return;
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index b1e358b7a060..d2bbcf3cbf9c 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -82,7 +82,7 @@
  * only performed if assertions are enabled.
  */
 @NodeInfo
-public abstract class Node implements Cloneable, Formattable, NodeInterface {
+public abstract class Node implements Cloneable, Formattable {
 
     private static final Unsafe UNSAFE = getUnsafe();
 
@@ -304,11 +304,6 @@ final int id() {
         return id;
     }
 
-    @Override
-    public Node asNode() {
-        return this;
-    }
-
     /**
      * Gets the graph context of this node.
      */
@@ -620,10 +615,6 @@ protected void updateUsages(Node oldInput, Node newInput) {
         }
     }
 
-    protected void updateUsagesInterface(NodeInterface oldInput, NodeInterface newInput) {
-        updateUsages(oldInput == null ? null : oldInput.asNode(), newInput == null ? null : newInput.asNode());
-    }
-
     /**
      * Updates the predecessor of the given nodes after a successor slot is changed from
      * oldSuccessor to newSuccessor: removes this node from oldSuccessor's predecessors and adds
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java
index bcad5f13e615..55ec72e6e3a3 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInputList.java
@@ -26,7 +26,6 @@
 
 import static org.graalvm.compiler.graph.Edges.Type.Inputs;
 
-import java.util.Collection;
 import java.util.List;
 
 import org.graalvm.compiler.graph.Edges.Type;
@@ -51,11 +50,6 @@ public NodeInputList(Node self, List<? extends T> elements) {
         assert self.hasNoUsages();
     }
 
-    public NodeInputList(Node self, Collection<? extends NodeInterface> elements) {
-        super(self, elements);
-        assert self.hasNoUsages();
-    }
-
     @Override
     protected void update(T oldNode, T newNode) {
         self.updateUsages(oldNode, newNode);
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java
index 05911e41673b..01d7fab4ee2c 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeList.java
@@ -110,27 +110,6 @@ private static void checkMaxSize(int value) {
         }
     }
 
-    protected NodeList(Node self, Collection<? extends NodeInterface> elements) {
-        this.self = self;
-        if (elements == null || elements.isEmpty()) {
-            this.size = 0;
-            this.nodes = EMPTY_NODE_ARRAY;
-            this.initialSize = 0;
-        } else {
-            int newSize = elements.size();
-            checkMaxSize(newSize);
-            this.size = newSize;
-            this.initialSize = newSize;
-            this.nodes = new Node[elements.size()];
-            int i = 0;
-            for (NodeInterface n : elements) {
-                this.nodes[i] = n.asNode();
-                assert this.nodes[i] == null || !this.nodes[i].isDeleted();
-                i++;
-            }
-        }
-    }
-
     /**
      * Removes {@code null} values from the list.
      */
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
index 60da73af6d40..9beeae736586 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
@@ -615,7 +615,7 @@ private void lowerInvoke(Invoke invoke, LoweringTool tool, StructuredGraph graph
             if (!callTarget.isStatic()) {
                 assert receiver != null : "non-static call must have a receiver";
                 if (receiver.stamp(NodeView.DEFAULT) instanceof ObjectStamp && !StampTool.isPointerNonNull(receiver)) {
-                    ValueNode nonNullReceiver = createNullCheckedValue(receiver, invoke.asNode(), tool);
+                    ValueNode nonNullReceiver = createNullCheckedValue(receiver, invoke.asFixedNode(), tool);
                     parameters.set(0, nonNullReceiver);
                     receiver = nonNullReceiver;
                 }
@@ -643,7 +643,7 @@ private void lowerInvoke(Invoke invoke, LoweringTool tool, StructuredGraph graph
                                     signature, callTarget.targetMethod(),
                                     HotSpotCallingConventionType.JavaCall, callTarget.invokeKind()));
 
-                    graph.addBeforeFixed(invoke.asNode(), metaspaceMethod);
+                    graph.addBeforeFixed(invoke.asFixedNode(), metaspaceMethod);
                     graph.addAfterFixed(metaspaceMethod, compiledEntry);
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java
index ac223e1a0fe1..f3d899f231b7 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java
@@ -81,7 +81,7 @@ public void setStateDuring(FrameState stateDuring) {
 
     @Override
     public void computeStateDuring(FrameState currentStateAfter) {
-        FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(bci, asNode().getStackKind());
+        FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(bci, getStackKind());
         setStateDuring(newStateDuring);
     }
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java
index 7bedd4f25f00..f9da728707db 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNode.java
@@ -42,8 +42,9 @@ public boolean verify() {
         return super.verify();
     }
 
+    /* This method is final to ensure that it can be de-virtualized and inlined. */
     @Override
-    public FixedNode asNode() {
+    public final FixedNode asFixedNode() {
         return this;
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java
index b89d4497ac26..0fc06896f530 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedNodeInterface.java
@@ -24,7 +24,9 @@
  */
 package org.graalvm.compiler.nodes;
 
+/**
+ * See {@link ValueNodeInterface} for details about these node interfaces.
+ */
 public interface FixedNodeInterface extends ValueNodeInterface {
-    @Override
-    FixedNode asNode();
+    FixedNode asFixedNode();
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java
index a47b6ba926b2..7c4803771fdc 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNode.java
@@ -33,7 +33,7 @@
  * successor.
  */
 @NodeInfo
-public abstract class FixedWithNextNode extends FixedNode {
+public abstract class FixedWithNextNode extends FixedNode implements FixedWithNextNodeInterface {
     public static final NodeClass<FixedWithNextNode> TYPE = NodeClass.create(FixedWithNextNode.class);
 
     @Successor protected FixedNode next;
@@ -51,8 +51,9 @@ public FixedWithNextNode(NodeClass<? extends FixedWithNextNode> c, Stamp stamp)
         super(c, stamp);
     }
 
+    /* This method is final to ensure that it can be de-virtualized and inlined. */
     @Override
-    public FixedWithNextNode asNode() {
+    public final FixedWithNextNode asFixedWithNextNode() {
         return this;
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java
similarity index 78%
rename from compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java
rename to compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java
index 6ed0030589d4..184265475c42 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeInterface.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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,8 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.graph;
+package org.graalvm.compiler.nodes;
 
-public interface NodeInterface {
-    Node asNode();
+/**
+ * See {@link ValueNodeInterface} for details about these node interfaces.
+ */
+public interface FixedWithNextNodeInterface extends FixedNodeInterface {
+    FixedWithNextNode asFixedWithNextNode();
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
index 0cb5688c0282..de002c0ce596 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InliningLog.java
@@ -190,13 +190,13 @@ public void addDecision(Invokable invoke, boolean positive, String phase, Econom
             }
             MapCursor<Invokable, Callsite> entries = calleeLog.leaves.getEntries();
             while (entries.advance()) {
-                Invokable invokeFromCallee = entries.getKey();
+                FixedNode invokeFromCallee = entries.getKey().asFixedNodeOrNull();
                 Callsite callsiteFromCallee = entries.getValue();
-                if (invokeFromCallee.asFixedNode().isDeleted()) {
+                if (invokeFromCallee == null || invokeFromCallee.isDeleted()) {
                     // Some invoke nodes could have been removed by optimizations.
                     continue;
                 }
-                Invokable inlinedInvokeFromCallee = (Invokable) replacements.get(invokeFromCallee.asFixedNode());
+                Invokable inlinedInvokeFromCallee = (Invokable) replacements.get(invokeFromCallee);
                 Callsite descendant = mapping.get(callsiteFromCallee);
                 leaves.put(inlinedInvokeFromCallee, descendant);
             }
@@ -219,13 +219,13 @@ public void addLog(UnmodifiableEconomicMap<Node, Node> replacements, InliningLog
         }
         MapCursor<Invokable, Callsite> entries = replacementLog.leaves.getEntries();
         while (entries.advance()) {
-            Invokable replacementInvoke = entries.getKey();
+            FixedNode replacementInvoke = entries.getKey().asFixedNodeOrNull();
             Callsite replacementCallsite = entries.getValue();
-            if (replacementInvoke.asFixedNode().isDeleted()) {
+            if (replacementInvoke == null || replacementInvoke.isDeleted()) {
                 // Some invoke nodes could have been removed by optimizations.
                 continue;
             }
-            Invokable invoke = (Invokable) replacements.get(replacementInvoke.asFixedNode());
+            Invokable invoke = (Invokable) replacements.get(replacementInvoke);
             Callsite callsite = mapping.get(replacementCallsite);
             leaves.put(invoke, callsite);
         }
@@ -247,10 +247,10 @@ public void replaceLog(UnmodifiableEconomicMap<Node, Node> replacements, Inlinin
         copyTree(root, replacementLog.root, replacements, mapping);
         MapCursor<Invokable, Callsite> replacementEntries = replacementLog.leaves.getEntries();
         while (replacementEntries.advance()) {
-            Invokable replacementInvoke = replacementEntries.getKey();
+            FixedNode replacementInvoke = replacementEntries.getKey().asFixedNodeOrNull();
             Callsite replacementSite = replacementEntries.getValue();
-            if (replacementInvoke.isAlive()) {
-                Invokable invoke = (Invokable) replacements.get((Node) replacementInvoke);
+            if (replacementInvoke != null && replacementInvoke.isAlive()) {
+                Invokable invoke = (Invokable) replacements.get(replacementInvoke);
                 Callsite site = mapping.get(replacementSite);
                 leaves.put(invoke, site);
             }
@@ -261,7 +261,8 @@ private void copyTree(Callsite site, Callsite replacementSite, UnmodifiableEcono
         mapping.put(replacementSite, site);
         site.target = replacementSite.target;
         site.decisions.addAll(replacementSite.decisions);
-        site.invoke = replacementSite.invoke != null && replacementSite.invoke.isAlive() ? (Invokable) replacements.get(replacementSite.invoke.asFixedNode()) : null;
+        FixedNode replacementSiteInvoke = replacementSite.invoke != null ? replacementSite.invoke.asFixedNodeOrNull() : null;
+        site.invoke = replacementSiteInvoke != null && replacementSiteInvoke.isAlive() ? (Invokable) replacements.get(replacementSiteInvoke) : null;
         for (Callsite replacementChild : replacementSite.children) {
             Callsite child = new Callsite(site, null);
             site.children.add(child);
@@ -435,13 +436,8 @@ public void setBci(int bci) {
         }
 
         @Override
-        public boolean isAlive() {
-            return false;
-        }
-
-        @Override
-        public FixedNode asFixedNode() {
-            throw new UnsupportedOperationException("Parsed invokable is a placeholder, not a concrete node.");
+        public FixedNode asFixedNodeOrNull() {
+            return null;
         }
 
         @Override
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java
index 556fb494366e..97f0190f3700 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invokable.java
@@ -24,11 +24,12 @@
  */
 package org.graalvm.compiler.nodes;
 
-import jdk.vm.ci.meta.ResolvedJavaMethod;
 import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
 /**
  * A marker interface for nodes that represent calls to other methods.
  */
@@ -42,12 +43,13 @@ public interface Invokable extends DeoptBciSupplier {
      */
     ResolvedJavaMethod getContextMethod();
 
-    default boolean isAlive() {
-        return asFixedNode().isAlive();
+    /**
+     * Returns the receiver cast to {@link FixedNode}, or null if this invokable is a placeholder.
+     */
+    default FixedNode asFixedNodeOrNull() {
+        return this instanceof FixedNode ? (FixedNode) this : null;
     }
 
-    FixedNode asFixedNode();
-
     /**
      * Called on a {@link Invokable} node after it is registered with a graph.
      *
@@ -73,15 +75,16 @@ default void updateInliningLogAfterRegister(StructuredGraph newGraph) {
      * updating logic by calling {@link InliningLog#openUpdateScope}.
      */
     default void updateInliningLogAfterClone(Node other) {
-        if (GraalOptions.TraceInlining.getValue(asFixedNode().getOptions())) {
+        StructuredGraph graph = asFixedNodeOrNull().graph();
+        if (GraalOptions.TraceInlining.getValue(graph.getOptions())) {
             // At this point, the invokable node was already added to the inlining log
             // in the call to updateInliningLogAfterRegister, so we need to remove it.
-            InliningLog log = asFixedNode().graph().getInliningLog();
+            InliningLog log = graph.getInliningLog();
             assert other instanceof Invokable;
             if (log.getUpdateScope() != null) {
                 // InliningLog.UpdateScope determines how to update the log.
                 log.getUpdateScope().accept((Invokable) other, this);
-            } else if (other.graph() == this.asFixedNode().graph()) {
+            } else if (other.graph() == graph) {
                 // This node was cloned as part of duplication.
                 // We need to add it as a sibling of the node other.
                 assert log.containsLeafCallsite(this) : "Node " + this + " not contained in the log.";
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java
index 2fb76cfbc840..054e1f9978d0 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/Invoke.java
@@ -65,6 +65,10 @@ public boolean allowSubstitution() {
 
     void setNext(FixedNode x);
 
+    default boolean isAlive() {
+        return asFixedNode().isAlive();
+    }
+
     CallTargetNode callTarget();
 
     Node predecessor();
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
index d6b6dd778bc9..b45bee778cee 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeNode.java
@@ -115,11 +115,6 @@ protected void afterClone(Node other) {
         updateInliningLogAfterClone(other);
     }
 
-    @Override
-    public FixedNode asFixedNode() {
-        return this;
-    }
-
     @Override
     public CallTargetNode callTarget() {
         return callTarget;
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
index 642d5fd15c40..141f756bfac4 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
@@ -84,11 +84,6 @@ protected void afterClone(Node other) {
         updateInliningLogAfterClone(other);
     }
 
-    @Override
-    public FixedNode asFixedNode() {
-        return this;
-    }
-
     @Override
     public CallTargetNode callTarget() {
         return callTarget;
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
index adc74bf7db95..d94329f04f6d 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
@@ -189,11 +189,16 @@ public final SerializableConstant asSerializableConstant() {
         }
     }
 
+    /* This method is final to ensure that it can be de-virtualized and inlined. */
     @Override
-    public ValueNode asNode() {
+    public final ValueNode asNode() {
         return this;
     }
 
+    protected void updateUsagesInterface(ValueNodeInterface oldInput, ValueNodeInterface newInput) {
+        updateUsages(oldInput == null ? null : oldInput.asNode(), newInput == null ? null : newInput.asNode());
+    }
+
     @Override
     public boolean isAllowedUsageType(InputType type) {
         if (getStackKind() != JavaKind.Void && type == InputType.Value) {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java
index 2452e2d43449..5cf79f509cf7 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNodeInterface.java
@@ -24,9 +24,25 @@
  */
 package org.graalvm.compiler.nodes;
 
-import org.graalvm.compiler.graph.NodeInterface;
-
-public interface ValueNodeInterface extends NodeInterface {
-    @Override
+/**
+ * When Graal {@link ValueNode} classes implement interfaces, it is frequently necessary to convert
+ * from an interface type back to a Node. This could be easily done using a cast, but casts come
+ * with a run time cost. Using a conversion method, which is implemented once on
+ * {@link ValueNode#asNode()}, avoids a cast. But it is faster only as long as the implementation
+ * method can be inlined. Therefore, it is important that only one implementation of the interface
+ * method exists, so that either single-implementor speculation (for JIT compilation) or static
+ * analysis results (for AOT compilation) allow the one implementation to be inlined.
+ *
+ * Subinterfaces like {@link FixedNodeInterface} provide a conversion method that has a more precise
+ * return type. Note that these sub-interfaces use a different method name like
+ * {@link FixedNodeInterface#asFixedNode()}, which then have another single implementation without a
+ * cast in {@link FixedNode#asFixedNode()}.
+ */
+public interface ValueNodeInterface {
+    /*
+     * This method is called `asNode` and not `asValueNode` partly for historic reasons, because
+     * originally the interface was called just `NodeInterface`. But since there are so many
+     * callers, we also want to keep the call sites as short as possible.
+     */
     ValueNode asNode();
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java
index 8d348bd20fc9..13ca1b0bf764 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/FloatingNode.java
@@ -37,9 +37,4 @@ public abstract class FloatingNode extends ValueNode implements ValueNumberable
     public FloatingNode(NodeClass<? extends FloatingNode> c, Stamp stamp) {
         super(c, stamp);
     }
-
-    @Override
-    public FloatingNode asNode() {
-        return this;
-    }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java
index 317277c80ac2..8f99a52dd0a3 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java
@@ -24,14 +24,13 @@
  */
 package org.graalvm.compiler.nodes.extended;
 
-import org.graalvm.compiler.graph.NodeInterface;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.FixedWithNextNodeInterface;
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 
-public interface ArrayRangeWrite extends NodeInterface {
+public interface ArrayRangeWrite extends FixedWithNextNodeInterface {
     AddressNode getAddress();
 
     /**
@@ -53,9 +52,6 @@ public interface ArrayRangeWrite extends NodeInterface {
 
     int getElementStride();
 
-    @Override
-    FixedAccessNode asNode();
-
     /**
      * Returns the place where a pre-write barrier should be inserted if one is necessary for this
      * node. The barrier should be added before the node returned by this method.
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
index f29782ba2981..e6d3f28975b8 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
@@ -27,6 +27,7 @@
 
 import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
 import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -211,7 +212,7 @@ private static boolean hasWriteBarrier(FixedAccessNode node) {
     }
 
     private static boolean hasWriteBarrier(ArrayRangeWrite write) {
-        FixedAccessNode node = write.asNode();
+        FixedWithNextNode node = write.asFixedWithNextNode();
         return node.next() instanceof SerialArrayRangeWriteBarrier && matches(write, (SerialArrayRangeWriteBarrier) node.next());
     }
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
index 1c2359e9bb5d..f0f351abc4a9 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.nodes.java;
 
-import jdk.vm.ci.meta.ConstantReflectionProvider;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -32,11 +31,13 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
 
+import jdk.vm.ci.meta.ConstantReflectionProvider;
+
 /**
  * The {@code AbstractNewArrayNode} is used for all 1-dimensional array allocations.
  */
 @NodeInfo
-public abstract class AbstractNewArrayNode extends AbstractNewObjectNode implements ArrayLengthProvider {
+public abstract class AbstractNewArrayNode extends AbstractNewObjectNode implements ArrayLengthProvider, NewArrayInterface {
 
     public static final NodeClass<AbstractNewArrayNode> TYPE = NodeClass.create(AbstractNewArrayNode.class);
     @Input protected ValueNode length;
@@ -55,6 +56,11 @@ protected AbstractNewArrayNode(NodeClass<? extends AbstractNewArrayNode> c, Stam
         this.length = length;
     }
 
+    @Override
+    public final AbstractNewArrayNode asNewArrayNode() {
+        return this;
+    }
+
     /**
      * The list of node which produce input for this instruction.
      */
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java
index 9c2268ab4e11..463ba585988b 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java
@@ -179,7 +179,7 @@ public void simplify(SimplifierTool tool) {
         }
 
         if (invokeKind.isInterface()) {
-            MethodCallTargetNode result = tryDevirtualizeInterfaceCall(receiver(), targetMethod, profile, graph().getAssumptions(), contextType, this, invoke().asNode());
+            MethodCallTargetNode result = tryDevirtualizeInterfaceCall(receiver(), targetMethod, profile, graph().getAssumptions(), contextType, this, invoke().asFixedNode());
             assert result == this;
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java
new file mode 100644
index 000000000000..6bdb1d064a42
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.nodes.java;
+
+import org.graalvm.compiler.nodes.FixedWithNextNodeInterface;
+import org.graalvm.compiler.nodes.ValueNodeInterface;
+
+/**
+ * See {@link ValueNodeInterface} for details about these node interfaces.
+ */
+public interface NewArrayInterface extends FixedWithNextNodeInterface {
+    AbstractNewArrayNode asNewArrayNode();
+}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java
index c8e100d7e33a..24c5ad71cf97 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java
@@ -24,14 +24,14 @@
  */
 package org.graalvm.compiler.nodes.memory;
 
-import org.graalvm.compiler.graph.NodeInterface;
+import org.graalvm.compiler.nodes.ValueNodeInterface;
 import org.graalvm.word.LocationIdentity;
 
 /**
  * This interface marks nodes that access some memory location, and that have an edge to the last
  * node that kills this location.
  */
-public interface MemoryAccess extends NodeInterface {
+public interface MemoryAccess extends ValueNodeInterface {
 
     LocationIdentity getLocationIdentity();
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java
index 05f7a196f050..d40518789adc 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/spi/Proxy.java
@@ -25,7 +25,7 @@
 package org.graalvm.compiler.nodes.spi;
 
 import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInterface;
+import org.graalvm.compiler.nodes.ValueNodeInterface;
 
 /**
  * This interface marks nodes whose result is the same as one of their inputs. Such nodes are used
@@ -33,7 +33,7 @@
  *
  * For some algorithms it is necessary or advantageous to see through these proxies.
  */
-public interface Proxy extends NodeInterface {
+public interface Proxy extends ValueNodeInterface {
 
     Node getOriginalNode();
 
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
index c71b8c737046..416bc1cc15ab 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/LoweringPhase.java
@@ -111,11 +111,6 @@ public void setGuard(GuardingNode guard) {
             updateUsagesInterface(this.guard, guard);
             this.guard = guard;
         }
-
-        @Override
-        public ValueNode asNode() {
-            return this;
-        }
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
index 95450a4bb237..ca34491f7699 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
@@ -122,7 +122,7 @@ protected void run(StructuredGraph graph) {
             for (Node node : graph.getNodes()) {
                 if (node instanceof Invoke) {
                     Invoke invoke = (Invoke) node;
-                    DynamicCounterNode.addCounterBefore(GROUP_NAME_INVOKES, invoke.callTarget().targetName(), 1, true, invoke.asNode());
+                    DynamicCounterNode.addCounterBefore(GROUP_NAME_INVOKES, invoke.callTarget().targetName(), 1, true, invoke.asFixedNode());
 
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
index d5e3e746eb09..0da6acbe0091 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
@@ -372,7 +372,7 @@ public static UnmodifiableEconomicMap<Node, Node> inline(Invoke invoke, Structur
     @SuppressWarnings("try")
     public static UnmodifiableEconomicMap<Node, Node> inline(Invoke invoke, StructuredGraph inlineGraph, boolean receiverNullCheck, ResolvedJavaMethod inlineeMethod, String reason, String phase,
                     InlineeReturnAction returnAction) {
-        FixedNode invokeNode = invoke.asNode();
+        FixedNode invokeNode = invoke.asFixedNode();
         StructuredGraph graph = invokeNode.graph();
         final NodeInputList<ValueNode> parameters = invoke.callTarget().arguments();
 
@@ -553,7 +553,7 @@ private static ValueNode finishInlining(Invoke invoke, StructuredGraph graph, Fi
 
         List<ReturnNode> processedReturns = inlineeReturnAction.processInlineeReturns(returnNodes);
 
-        FixedNode invokeNode = invoke.asNode();
+        FixedNode invokeNode = invoke.asFixedNode();
         FrameState stateAfter = invoke.stateAfter();
         invokeNode.replaceAtPredecessor(firstNode);
 
@@ -691,7 +691,7 @@ private static void fixFrameStates(StructuredGraph graph, MergeNode originalMerg
 
     @SuppressWarnings("try")
     private static void updateSourcePositions(Invoke invoke, StructuredGraph inlineGraph, UnmodifiableEconomicMap<Node, Node> duplicates, boolean isSub, Mark mark) {
-        FixedNode invokeNode = invoke.asNode();
+        FixedNode invokeNode = invoke.asFixedNode();
         StructuredGraph invokeGraph = invokeNode.graph();
         if (invokeGraph.trackNodeSourcePosition() && invoke.stateAfter() != null) {
             boolean isSubstitution = isSub || inlineGraph.isSubstitution();
@@ -926,7 +926,7 @@ public static FrameState handleMissingAfterExceptionFrameState(FrameState nonRep
                     workList.add(usage);
                 } else {
                     StateSplit stateSplit = (StateSplit) usage;
-                    FixedNode fixedStateSplit = stateSplit.asNode();
+                    FixedNode fixedStateSplit = stateSplit.asFixedNode();
                     if (fixedStateSplit instanceof AbstractMergeNode) {
                         AbstractMergeNode merge = (AbstractMergeNode) fixedStateSplit;
                         while (merge.isAlive()) {
@@ -1030,7 +1030,7 @@ public static ValueNode nonNullReceiver(Invoke invoke) {
                     LogicNode condition = graph.unique(IsNullNode.create(newReceiver));
                     FixedGuardNode fixedGuard = graph.add(new FixedGuardNode(condition, NullCheckException, InvalidateReprofile, true));
                     PiNode nonNullReceiver = graph.unique(new PiNode(newReceiver, StampFactory.objectNonNull(), fixedGuard));
-                    graph.addBeforeFixed(invoke.asNode(), fixedGuard);
+                    graph.addBeforeFixed(invoke.asFixedNode(), fixedGuard);
                     newReceiver = nonNullReceiver;
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
index 20b28966641f..eb33785bd66b 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
@@ -343,7 +343,7 @@ private EconomicSet<Node> inlineSingleMethod(StructuredGraph graph, StampProvide
         AbstractBeginNode[] successors = new AbstractBeginNode[]{calleeEntryNode, unknownTypeSux};
         createDispatchOnTypeBeforeInvoke(graph, successors, false, stampProvider, constantReflection);
 
-        calleeEntryNode.setNext(invoke.asNode());
+        calleeEntryNode.setNext(invoke.asFixedNode());
 
         return inline(invoke, methodAt(0), inlineableElementAt(0), false, reason);
     }
@@ -385,7 +385,7 @@ private static AbstractBeginNode createInvocationBlock(StructuredGraph graph, In
                     PhiNode exceptionObjectPhi, boolean useForInlining) {
         Invoke duplicatedInvoke = duplicateInvokeForInlining(graph, invoke, exceptionMerge, exceptionObjectPhi, useForInlining);
         AbstractBeginNode calleeEntryNode = graph.add(new BeginNode());
-        calleeEntryNode.setNext(duplicatedInvoke.asNode());
+        calleeEntryNode.setNext(duplicatedInvoke.asFixedNode());
 
         EndNode endNode = graph.add(new EndNode());
         duplicatedInvoke.setNext(endNode);
@@ -465,7 +465,7 @@ private void devirtualizeWithTypeSwitch(StructuredGraph graph, InvokeKind kind,
         AbstractBeginNode[] successors = new AbstractBeginNode[]{invocationEntry, unknownTypeSux};
         createDispatchOnTypeBeforeInvoke(graph, successors, true, stampProvider, constantReflection);
 
-        invocationEntry.setNext(invoke.asNode());
+        invocationEntry.setNext(invoke.asFixedNode());
         ValueNode receiver = ((MethodCallTargetNode) invoke.callTarget()).receiver();
         PiNode anchoredReceiver = InliningUtil.createAnchoredReceiver(graph, invocationEntry, target.getDeclaringClass(), receiver, false);
         invoke.callTarget().replaceFirstInput(receiver, anchoredReceiver);
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
index c8090b0b5803..fe2c4dbdf5da 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
@@ -130,7 +130,7 @@ private void createGuard(StructuredGraph graph, CoreProviders providers) {
             ValueNode anchoredReceiver = InliningUtil.createAnchoredReceiver(graph, guard, type, nonNullReceiver, true);
             invoke.callTarget().replaceFirstInput(nonNullReceiver, anchoredReceiver);
 
-            graph.addBeforeFixed(invoke.asNode(), guard);
+            graph.addBeforeFixed(invoke.asFixedNode(), guard);
         }
     }
 
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
index fc9bbf75c2f4..b98095956d63 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
@@ -224,7 +224,7 @@ public Iterable<Invoke> getInvokes() {
 
     @Override
     public double getProbability(Invoke invoke) {
-        return probabilites.applyAsDouble(invoke.asNode());
+        return probabilites.applyAsDouble(invoke.asFixedNode());
     }
 
     public StructuredGraph getGraph() {
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
index 7d8d482db5a8..01adf2d30fb9 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
@@ -207,7 +207,7 @@ public void computeProbabilities() {
     }
 
     public double invokeProbability(Invoke invoke) {
-        return probability * probabilities.applyAsDouble(invoke.asNode());
+        return probability * probabilities.applyAsDouble(invoke.asFixedNode());
     }
 
     public double invokeRelevance(Invoke invoke) {
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
index 0bbc31a1409e..5ab1b0f3479b 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
@@ -109,7 +109,7 @@ public double getRelevance(Invoke invoke) {
             return rootScope.computeInvokeRelevance(invoke);
         }
         assert nodeRelevances != null : "uninitialized relevance";
-        return nodeRelevances.get(invoke.asNode());
+        return nodeRelevances.get(invoke.asFixedNode());
     }
 
     /**
@@ -243,7 +243,7 @@ public void process(NodeWorkList workList) {
          * scope's fastPathMinProbability, adjusted by scopeRelevanceWithinParent.
          */
         public double computeInvokeRelevance(Invoke invoke) {
-            double invokeProbability = nodeProbabilities.applyAsDouble(invoke.asNode());
+            double invokeProbability = nodeProbabilities.applyAsDouble(invoke.asFixedNode());
             assert !Double.isNaN(invokeProbability);
 
             double relevance = (invokeProbability / getFastPathMinProbability()) * Math.min(1.0, getScopeRelevanceWithinParent());
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java
index 43c857446256..7268ce52b7a7 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java
@@ -237,7 +237,7 @@ protected Set<Node> controlSplit(ControlSplitNode controlSplit) {
     }
 
     protected void invoke(Invoke invoke) {
-        node(invoke.asNode());
+        node(invoke.asFixedNode());
     }
 
     protected void finished() {
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java
index b70402ca65a4..9eb4df19d1d8 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/SinglePassNodeIterator.java
@@ -367,7 +367,7 @@ protected void controlSplit(ControlSplitNode controlSplit) {
     }
 
     protected void invoke(Invoke invoke) {
-        node(invoke.asNode());
+        node(invoke.asFixedNode());
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 697faafb0032..1a83d8f51e9e 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -600,7 +600,7 @@ public void handleReplacedInvoke(CallTargetNode callTarget, JavaKind resultType)
 
             appendInvoke(methodScope.caller, methodScope.callerLoopScope, methodScope.invokeData, callTarget);
 
-            lastInstr.setNext(invoke.asNode());
+            lastInstr.setNext(invoke.asFixedNode());
             if (invoke instanceof InvokeWithExceptionNode) {
                 lastInstr = ((InvokeWithExceptionNode) invoke).next();
             } else {
@@ -944,7 +944,7 @@ protected MethodCallTargetNode trySimplifyCallTarget(PEMethodScope methodScope,
             if (callTarget.invokeKind().isInterface()) {
                 Invoke invoke = invokeData.invoke;
                 ResolvedJavaType contextType = methodScope.method.getDeclaringClass();
-                return MethodCallTargetNode.tryDevirtualizeInterfaceCall(callTarget.receiver(), callTarget.targetMethod(), null, graph.getAssumptions(), contextType, callTarget, invoke.asNode());
+                return MethodCallTargetNode.tryDevirtualizeInterfaceCall(callTarget.receiver(), callTarget.targetMethod(), null, graph.getAssumptions(), contextType, callTarget, invoke.asFixedNode());
             }
             return callTarget;
         }
@@ -1063,7 +1063,7 @@ protected boolean tryInvocationPlugin(PEMethodScope methodScope, LoopScope loopS
 
             } else {
                 /* Intrinsification failed, restore original state: invoke is in Graph. */
-                invokePredecessor.setNext(invoke.asNode());
+                invokePredecessor.setNext(invoke.asFixedNode());
                 return false;
             }
         }
@@ -1132,7 +1132,7 @@ protected LoopScope doInline(PEMethodScope methodScope, LoopScope loopScope, Inv
         }
 
         Invoke invoke = invokeData.invoke;
-        FixedNode invokeNode = invoke.asNode();
+        FixedNode invokeNode = invoke.asFixedNode();
         FixedWithNextNode predecessor = (FixedWithNextNode) invokeNode.predecessor();
         invokeData.invokePredecessor = predecessor;
         invokeNode.replaceAtPredecessor(null);
@@ -1188,7 +1188,7 @@ protected void finishInlining(MethodScope is) {
         LoopScope loopScope = inlineScope.callerLoopScope;
         InvokeData invokeData = inlineScope.invokeData;
         Invoke invoke = invokeData.invoke;
-        FixedNode invokeNode = invoke.asNode();
+        FixedNode invokeNode = invoke.asFixedNode();
 
         ValueNode exceptionValue = null;
         int returnNodeCount = 0;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
index 3f057960e741..84b884782a90 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
@@ -36,7 +36,6 @@
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.Invoke;
@@ -189,11 +188,6 @@ protected void afterClone(Node other) {
         updateInliningLogAfterClone(other);
     }
 
-    @Override
-    public FixedNode asFixedNode() {
-        return this;
-    }
-
     @Override
     @SuppressWarnings("try")
     public Invoke replaceWithInvoke() {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
index 2b0b9dccb2ac..6a5dce46af54 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -36,7 +36,6 @@
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
@@ -117,11 +116,6 @@ protected void afterClone(Node other) {
         updateInliningLogAfterClone(other);
     }
 
-    @Override
-    public FixedNode asFixedNode() {
-        return this;
-    }
-
     @Override
     @SuppressWarnings("try")
     public Invoke replaceWithInvoke() {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index 1f2c7ec381ce..6513291c0751 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -1189,7 +1189,7 @@ protected void node(FixedNode n) {
                     return cloneFlow;
                 });
                 cloneBuilder.addObserverDependency(inputBuilder);
-                state.add(node.asNode(), cloneBuilder);
+                state.add(node.asFixedNode(), cloneBuilder);
             } else if (n instanceof MonitorEnterNode) {
                 MonitorEnterNode node = (MonitorEnterNode) n;
                 BytecodeLocation monitorLocation = BytecodeLocation.create(uniqueKey(node), methodFlow.getMethod());
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
index 26a174339c99..5e6874405637 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
@@ -258,7 +258,7 @@ protected void finishInlining(MethodScope is) {
             }
             killControlFlowNodes(inlineScope, invokeData.invokePredecessor.next());
             assert invokeData.invokePredecessor.next() == null : "Successor must have been a fixed node created in the aborted scope, which is deleted now";
-            invokeData.invokePredecessor.setNext(invokeData.invoke.asNode());
+            invokeData.invokePredecessor.setNext(invokeData.invoke.asFixedNode());
 
             if (inlineScope.exceptionPlaceholderNode != null) {
                 assert invokeData.invoke instanceof InvokeWithExceptionNode;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
index eed030e88e94..20ffe19ea353 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
@@ -283,7 +283,7 @@ public void simplify(Node n, SimplifierTool tool) {
         }
 
         private void handleInvoke(Invoke invoke, SimplifierTool tool) {
-            FixedNode node = invoke.asNode();
+            FixedNode node = invoke.asFixedNode();
             MethodCallTargetNode callTarget = (MethodCallTargetNode) invoke.callTarget();
 
             InvokeTypeFlow invokeFlow = originalFlows.getInvokeFlow(invoke);
@@ -390,7 +390,7 @@ private void unreachableInvoke(Invoke invoke, SimplifierTool tool) {
                 InliningUtil.nonNullReceiver(invoke);
             }
 
-            makeUnreachable(invoke.asNode(), tool, () -> "method " + graph.method().format("%H.%n(%p)") + ", node " + invoke +
+            makeUnreachable(invoke.asFixedNode(), tool, () -> "method " + graph.method().format("%H.%n(%p)") + ", node " + invoke +
                             ": empty list of callees for call to " + invoke.callTarget().targetMethod().format("%H.%n(%P)"));
         }
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
index 07ae77437477..31f4833af6b5 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
@@ -735,7 +735,7 @@ private static void removeUnreachableInvokes(CallTreeNode node) {
                 InliningUtil.nonNullReceiver(invoke);
             }
             FixedGuardNode guard = new FixedGuardNode(LogicConstantNode.forBoolean(true, node.graph), DeoptimizationReason.UnreachedCode, DeoptimizationAction.None, true);
-            node.graph.addBeforeFixed(invoke.asNode(), node.graph.add(guard));
+            node.graph.addBeforeFixed(invoke.asFixedNode(), node.graph.add(guard));
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
index c93bc3c9bc13..275e8d6219ef 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
@@ -111,7 +111,7 @@ private void unreachableInvoke(StructuredGraph graph, Invoke invoke, SubstrateMe
         String message = String.format("The call to %s is not reachable when called from %s.%n", targetMethod.format("%H.%n(%P)"), graph.method().format("%H.%n(%P)"));
         AnalysisSpeculation speculation = new AnalysisSpeculation(new AnalysisSpeculationReason(message));
         FixedGuardNode node = new FixedGuardNode(LogicConstantNode.forBoolean(true, graph), DeoptimizationReason.UnreachedCode, DeoptimizationAction.None, speculation, true);
-        graph.addBeforeFixed(invoke.asNode(), graph.add(node));
+        graph.addBeforeFixed(invoke.asFixedNode(), graph.add(node));
         graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "After dead invoke %s", invoke);
     }
 
@@ -136,7 +136,7 @@ private void singleCallee(HostedMethod singleCallee, StructuredGraph graph, Invo
          * anchor the receiver to the place of the original invoke.
          */
         ValueAnchorNode anchor = graph.add(new ValueAnchorNode(null));
-        graph.addBeforeFixed(invoke.asNode(), anchor);
+        graph.addBeforeFixed(invoke.asFixedNode(), anchor);
         Stamp anchoredReceiverStamp = StampFactory.object(TypeReference.createWithoutAssumptions(singleCallee.getDeclaringClass()));
         ValueNode anchoredReceiver = graph.unique(new PiNode(invoke.getReceiver(), anchoredReceiverStamp, anchor));
         invoke.callTarget().replaceFirstInput(invoke.getReceiver(), anchoredReceiver);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
index 71dc12af52ee..bb44db0e02fd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
@@ -212,7 +212,7 @@ private void insertDeoptNode(HostedBciBlockMapping.DeoptEntryInsertionPoint deop
         FrameState stateAfter = frameState.create(deopt.frameStateBci(), deoptNode);
         deoptNode.setStateAfter(stateAfter);
         if (lastInstr != null) {
-            lastInstr.setNext(deoptNode.asNode());
+            lastInstr.setNext(deoptNode.asFixedNode());
         }
 
         if (deopt.isProxy()) {
@@ -261,7 +261,7 @@ private void insertDeoptNode(HostedBciBlockMapping.DeoptEntryInsertionPoint deop
             lastInstr = deoptEntryNode.next();
         }
 
-        insertProxies(deoptNode.asNode(), frameState);
+        insertProxies(deoptNode.asFixedNode(), frameState);
     }
 
     private void insertProxies(FixedNode deoptTarget, FrameStateBuilder state) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
index dae23c897b7c..14169e0e815f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
@@ -130,14 +130,14 @@ private static void tryOptimize(StructuredGraph graph, Invoke constructorInvoke,
             } else if (usagesToDelete.contains(exceptionUsage)) {
                 /* Frame state between constructor and allocation. */
             } else if (exceptionUsage instanceof UnwindNode) {
-                if (!hasSimpleControlFlow(exceptionUsage, constructorInvoke.asNode(), null)) {
+                if (!hasSimpleControlFlow(exceptionUsage, constructorInvoke.asFixedNode(), null)) {
                     /* No simple control flow path found to the UnwindNode. */
                     return;
                 }
             } else if (exceptionUsage instanceof PhiNode) {
                 PhiNode phi = (PhiNode) exceptionUsage;
                 for (int i = 0; i < phi.valueCount(); i++) {
-                    if (phi.valueAt(i) == exceptionAllocation && !hasSimpleControlFlow(phi.merge().phiPredecessorAt(i), constructorInvoke.asNode(), null)) {
+                    if (phi.valueAt(i) == exceptionAllocation && !hasSimpleControlFlow(phi.merge().phiPredecessorAt(i), constructorInvoke.asFixedNode(), null)) {
                         /* No simple control flow path found to the PhiNode. */
                         return;
                     }

From 0b9e43a676335a43091d6b5882284a467c4f43be Mon Sep 17 00:00:00 2001
From: Koutheir Attouchi <koutheir.attouchi@microdoc.com>
Date: Fri, 1 Oct 2021 16:22:40 -0400
Subject: [PATCH 269/681] Truncation in JVM_GetNanoTimeAdjustment() on 32-bits
 archs

The C `long` type is only 64-bits-wide on LP64 systems and the like. In 32-bits systems, `long` is usually 32-bits-wide. On such systems:
- The constant `0x0100000000L` cannot be represented, and should be `0x0100000000LL` instead, in order to explicitly mark its type as a `long long`.
- The Java `jlong` cannot be represented in a `long` and it can cause unintentional data loss (truncation). `jlong` always corresponds to `int64_t`.
---
 .../com.oracle.svm.native.jvm.posix/src/JvmFuncs.c   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c b/substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
index b9968f5286f2..33982e90dc09 100644
--- a/substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
+++ b/substratevm/src/com.oracle.svm.native.jvm.posix/src/JvmFuncs.c
@@ -257,19 +257,19 @@ JNIEXPORT jlong JNICALL JVM_NanoTime(void *env, void * ignored) {
 }
 
 JNIEXPORT jlong JNICALL JVM_GetNanoTimeAdjustment(void *env, void * ignored, jlong offset_secs) {
-    long maxDiffSecs = 0x0100000000L;
-    long minDiffSecs = -maxDiffSecs;
+    int64_t maxDiffSecs = 0x0100000000LL;
+    int64_t minDiffSecs = -maxDiffSecs;
     struct timeval time;
     int status = gettimeofday(&time, NULL);
 
-    long seconds = time.tv_sec;
-    long nanos = time.tv_usec * 1000;
+    int64_t seconds = time.tv_sec;
+    int64_t nanos = time.tv_usec * 1000;
 
-    long diff = seconds - offset_secs;
+    int64_t diff = seconds - offset_secs;
     if (diff >= maxDiffSecs || diff <= minDiffSecs) {
         return -1;
     }
-    return diff * 1000000000 + nanos;
+    return diff * 1000000000LL + nanos;
 }
 
 JNIEXPORT jlong JNICALL Java_jdk_internal_misc_VM_getNanoTimeAdjustment(void *env, void * ignored, jlong offset_secs) {

From 36b3c958551d769dbb824195722849ec95b8f006 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Fri, 1 Oct 2021 15:01:40 -0700
Subject: [PATCH 270/681] Generalize FunctionPointerHolder.

---
 .../svm/core/FunctionPointerHolder.java       | 41 +++++++++++++++++++
 .../ClassInitializationInfo.java              | 22 ++--------
 .../svm/hosted/meta/UniverseBuilder.java      |  4 +-
 3 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FunctionPointerHolder.java

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FunctionPointerHolder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FunctionPointerHolder.java
new file mode 100644
index 000000000000..365cd0c2df15
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FunctionPointerHolder.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core;
+
+import org.graalvm.nativeimage.c.function.CFunctionPointer;
+
+/**
+ * Isolates require that all function pointers to image methods are in immutable classes. This class
+ * can be used as an immutable indirection for mutable classes that need to store a function
+ * pointer.
+ */
+public class FunctionPointerHolder {
+
+    public final CFunctionPointer functionPointer;
+
+    public FunctionPointerHolder(CFunctionPointer functionPointer) {
+        this.functionPointer = functionPointer;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java
index 02ca5909cc50..a69c0c4f9bb3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java
@@ -34,6 +34,7 @@
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 
+import com.oracle.svm.core.FunctionPointerHolder;
 import com.oracle.svm.core.annotate.InvokeJavaFunctionPointer;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.jdk.InternalVMMethod;
@@ -91,28 +92,11 @@ interface ClassInitializerFunctionPointer extends CFunctionPointer {
         void invoke();
     }
 
-    /**
-     * Isolates require that all function pointers to image methods are in immutable classes.
-     * {@link ClassInitializationInfo} is mutable, so we use this class as an immutable indirection.
-     */
-    public static class ClassInitializerFunctionPointerHolder {
-        /**
-         * We cannot declare the field to have type {@link ClassInitializerFunctionPointer} because
-         * during image building the field refers to a wrapper object that cannot implement custom
-         * interfaces.
-         */
-        final CFunctionPointer functionPointer;
-
-        ClassInitializerFunctionPointerHolder(CFunctionPointer functionPointer) {
-            this.functionPointer = functionPointer;
-        }
-    }
-
     /**
      * Function pointer to the class initializer, or null if the class does not have a class
      * initializer.
      */
-    private final ClassInitializerFunctionPointerHolder classInitializer;
+    private final FunctionPointerHolder classInitializer;
 
     /**
      * The current initialization state.
@@ -156,7 +140,7 @@ private ClassInitializationInfo(InitState initState) {
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public ClassInitializationInfo(CFunctionPointer classInitializer) {
-        this.classInitializer = classInitializer == null || classInitializer.isNull() ? null : new ClassInitializerFunctionPointerHolder(classInitializer);
+        this.classInitializer = classInitializer == null || classInitializer.isNull() ? null : new FunctionPointerHolder(classInitializer);
         this.initState = InitState.Linked;
         this.initLock = new ReentrantLock();
         this.hasInitializer = classInitializer != null;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
index 4430e2cf2e0a..b4e1414aa82c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
@@ -62,6 +62,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.results.AbstractAnalysisResultsBuilder;
+import com.oracle.svm.core.FunctionPointerHolder;
 import com.oracle.svm.core.InvalidVTableEntryHandler;
 import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.SubstrateOptions;
@@ -70,7 +71,6 @@
 import com.oracle.svm.core.annotate.ExcludeFromReferenceMap;
 import com.oracle.svm.core.c.BoxedRelocatedPointer;
 import com.oracle.svm.core.c.function.CFunctionOptions;
-import com.oracle.svm.core.classinitialization.ClassInitializationInfo.ClassInitializerFunctionPointerHolder;
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.deopt.DeoptimizedFrame;
@@ -367,7 +367,7 @@ private void buildProfilingInformation() {
                     DynamicHub.class,
                     CEntryPointLiteral.class,
                     BoxedRelocatedPointer.class,
-                    ClassInitializerFunctionPointerHolder.class,
+                    FunctionPointerHolder.class,
                     FillerObject.class));
 
     static {

From ae3ac2d9fb8384e62f3b23297c0778f460daabf9 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Sat, 2 Oct 2021 00:22:00 -0700
Subject: [PATCH 271/681] Fix AnalysisType.hasSubTypes().

---
 .../src/com/oracle/graal/pointsto/meta/AnalysisType.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
index 3e48a52596eb..ca169a1ccfe7 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -835,7 +835,8 @@ public ResolvedJavaType getElementalType() {
     }
 
     public boolean hasSubTypes() {
-        return subTypes.size() > 0;
+        /* subTypes always includes this type itself. */
+        return subTypes.size() > 1;
     }
 
     @Override

From 6ec46b0181a5c74ead65388c5f105874190f54eb Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Sun, 3 Oct 2021 18:34:00 +0200
Subject: [PATCH 272/681] Default renaissance to 0.11.0 until Native Image is
 compatible with 0.13.0

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 3 ++-
 substratevm/mx.substratevm/mx_substratevm_benchmark.py   | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index fcdf2b39f391..a481655ebdb5 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1870,7 +1870,8 @@ def version(self):
         return super(RenaissanceBenchmarkSuite, self).version()
 
     def defaultSuiteVersion(self):
-        return self.availableSuiteVersions()[-1]
+        #  return self.availableSuiteVersions()[-1]
+        return "0.11.0"  # stick to 0.11.0 for both JIT and AOT until Native Image is compatible with 0.13.0 (GR-34147)
 
     def availableSuiteVersions(self):
         return ["0.9.0", "0.10.0", "0.11.0", "0.12.0", "0.13.0"]
diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
index eb8a0e702f17..9c82d6cdf0ab 100644
--- a/substratevm/mx.substratevm/mx_substratevm_benchmark.py
+++ b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
@@ -61,6 +61,12 @@ def list_jars(path):
 
 
 _RENAISSANCE_EXTRA_IMAGE_BUILD_ARGS = {
+    'als'               : [
+                           '--allow-incomplete-classpath',
+                           '--report-unsupported-elements-at-runtime',
+                           '--initialize-at-build-time=org.slf4j,org.apache.log4j,scala.runtime.LambdaDeserialize,scala.Symbol$',
+                           '--initialize-at-run-time=io.netty.channel.unix.IovArray,io.netty.channel.epoll.EpollEventLoop,io.netty.channel.unix.Errors,io.netty.channel.unix.Socket,io.netty.channel.unix.Limits'
+                          ],
     'chi-square'        : [
                            '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',

From 62ea8b3b90e13d5f1830797946aefc698820ebf8 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Sun, 3 Oct 2021 19:02:24 +0200
Subject: [PATCH 273/681] Renaissance 0.13.0

---
 compiler/ci_common/benchmark-builders.jsonnet |  8 ++++++--
 compiler/ci_common/benchmark-suites.libsonnet | 13 +++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/compiler/ci_common/benchmark-builders.jsonnet b/compiler/ci_common/benchmark-builders.jsonnet
index a7d2919aede3..8b6f657708bf 100644
--- a/compiler/ci_common/benchmark-builders.jsonnet
+++ b/compiler/ci_common/benchmark-builders.jsonnet
@@ -37,6 +37,8 @@
     c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.specjbb2015_full_machine,
     c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_0_10,
     c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.renaissance_0_10,
+    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_0_13,
+    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.renaissance_0_13,
     c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.awfy,
     c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.awfy,
     c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_legacy,
@@ -74,6 +76,8 @@
     c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015_full_machine,
     c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_10,
     c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.renaissance_0_10,
+    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_13,
+    c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.renaissance_0_13,
     c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.awfy,
     c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.awfy,
     c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_legacy,
@@ -99,8 +103,8 @@
     c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_size_variants,
     c.weekly     + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_timing,
     c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_timing,
-    #c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance,
-    #c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.renaissance,
+    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.renaissance_0_13,
+    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.renaissance_0_13,
     c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.specjvm2008,
     c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.specjvm2008,
     c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2005,
diff --git a/compiler/ci_common/benchmark-suites.libsonnet b/compiler/ci_common/benchmark-suites.libsonnet
index aeb2e0c41fe0..b86d71213c52 100644
--- a/compiler/ci_common/benchmark-suites.libsonnet
+++ b/compiler/ci_common/benchmark-suites.libsonnet
@@ -11,13 +11,13 @@
     legacy_and_secondary_suites:: std.set([$.renaissance_legacy, $.dacapo_size_variants, $.scala_dacapo_size_variants], keyF=uniq_key),
     jmh_micros_suites:: std.set([$.micros_graal_dist, $.micros_misc_graal_dist , $.micros_shootout_graal_dist], keyF=uniq_key),
     graal_internals_suites:: std.set([$.micros_graal_whitebox], keyF=uniq_key),
-    special_suites:: std.set([$.renaissance_0_10, $.specjbb2015_full_machine], keyF=uniq_key),
+    special_suites:: std.set([$.renaissance_0_10, $.renaissance_0_13, $.specjbb2015_full_machine], keyF=uniq_key),
     microservice_suites:: std.set([$.microservice_benchmarks], keyF=uniq_key),
 
     main_suites:: std.set(self.open_suites + self.spec_suites + self.legacy_and_secondary_suites, keyF=uniq_key),
     all_suites:: std.set(self.main_suites + self.jmh_micros_suites + self.special_suites + self.microservice_suites, keyF=uniq_key),
 
-    weekly_forks_suites:: self.main_suites,
+    weekly_forks_suites:: std.set([$.renaissance_0_13] + self.main_suites, keyF=uniq_key),
     profiled_suites::     std.setDiff(self.main_suites, [$.specjbb2015], keyF=uniq_key),
   },
 
@@ -142,6 +142,15 @@
     max_jdk_version:: 11
   },
 
+  renaissance_0_13: self.renaissance + {
+    suite:: "renaissance-0-13",
+    environment+: {
+      "RENAISSANCE_VERSION": "0.13.0"
+    },
+    min_jdk_version:: 8,
+    max_jdk_version:: null
+  },
+
   renaissance_legacy: cc.compiler_benchmark + c.heap.default + {
     suite:: "renaissance-legacy",
     downloads+: {

From 7ac2c4d7f0734f0248239f06401a424b7e7c75da Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Sun, 3 Oct 2021 20:06:52 +0200
Subject: [PATCH 274/681] Reference renaissance issue numbers

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index a481655ebdb5..15772f9af0ed 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1843,7 +1843,7 @@ def renaissanceIterations(self):
 
         if mx.get_jdk().javaCompliance >= '17' and self.version() in ["0.9.0", "0.10.0", "0.11.0", "0.12.0"]:
             # JDK17 support for Spark benchmarks was added in 0.13.0
-            # See: https://github.com/renaissance-benchmarks/renaissance/issues/295
+            # See: renaissance-benchmarks/renaissance #295
             del benchmarks["als"]
             del benchmarks["chi-square"]
             del benchmarks["dec-tree"]
@@ -1855,7 +1855,7 @@ def renaissanceIterations(self):
 
         if mx.get_arch() != "amd64" or mx.get_jdk().javaCompliance >= '11':
             # GR-33879
-            # JNA libraries needed are currently limited to amd64: https://github.com/renaissance-benchmarks/renaissance/issues/153
+            # JNA libraries needed are currently limited to amd64: renaissance-benchmarks/renaissance #153
             del benchmarks["db-shootout"]
 
         if self.version() in ["0.9.0", "0.10.0", "0.11.0"]:

From a41ddd94972ebcf2fb42c17219e42119f91a8b81 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Tue, 21 Sep 2021 18:03:28 +0200
Subject: [PATCH 275/681] Use correct array types in
 JVM_AssertionStatusDirectives

---
 .../src/com/oracle/truffle/espresso/impl/Klass.java        | 2 +-
 .../com/oracle/truffle/espresso/impl/PrimitiveKlass.java   | 7 +++++++
 .../src/com/oracle/truffle/espresso/vm/VM.java             | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
index 1306ac952d91..2ce90c2eb6fb 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java
@@ -29,10 +29,10 @@
 import java.util.Comparator;
 import java.util.function.IntFunction;
 
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.espresso.jdwp.api.ModuleRef;
 import org.graalvm.collections.EconomicSet;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PrimitiveKlass.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PrimitiveKlass.java
index d9f129e43f3e..0760ccf94b86 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PrimitiveKlass.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/PrimitiveKlass.java
@@ -25,6 +25,7 @@
 
 import java.lang.reflect.Modifier;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
 import com.oracle.truffle.espresso.descriptors.Symbol;
 import com.oracle.truffle.espresso.descriptors.Symbol.Name;
@@ -36,6 +37,7 @@
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 import com.oracle.truffle.espresso.substitutions.JavaType;
+import com.oracle.truffle.espresso.vm.InterpreterToVM;
 
 /**
  * Implementation of {@link Klass} for primitive types. Primitive classes don't have a .class
@@ -147,4 +149,9 @@ public String toString() {
     public int getClassModifiers() {
         return getModifiers();
     }
+
+    @CompilerDirectives.TruffleBoundary
+    public StaticObject allocatePrimitiveArray(int length) {
+        return InterpreterToVM.allocatePrimitiveArray((byte) getPrimitiveJavaKind().getBasicType(), length, getMeta());
+    }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
index 0611052872ce..c6e342da3a22 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
@@ -2326,9 +2326,9 @@ public int JVM_GetArrayLength(@JavaType(Object.class) StaticObject array, @Injec
         StaticObject instance = meta.java_lang_AssertionStatusDirectives.allocateInstance();
         meta.java_lang_AssertionStatusDirectives.lookupMethod(Name._init_, Signature._void).invokeDirect(instance);
         meta.java_lang_AssertionStatusDirectives_classes.set(instance, meta.java_lang_String.allocateReferenceArray(0));
-        meta.java_lang_AssertionStatusDirectives_classEnabled.set(instance, meta._boolean.allocateReferenceArray(0));
+        meta.java_lang_AssertionStatusDirectives_classEnabled.set(instance, meta._boolean.allocatePrimitiveArray(0));
         meta.java_lang_AssertionStatusDirectives_packages.set(instance, meta.java_lang_String.allocateReferenceArray(0));
-        meta.java_lang_AssertionStatusDirectives_packageEnabled.set(instance, meta._boolean.allocateReferenceArray(0));
+        meta.java_lang_AssertionStatusDirectives_packageEnabled.set(instance, meta._boolean.allocatePrimitiveArray(0));
         boolean ea = getContext().getEnv().getOptions().get(EspressoOptions.EnableAssertions);
         meta.java_lang_AssertionStatusDirectives_deflt.set(instance, ea);
         return instance;

From 10e24ec9d1726adeabb33fda1df4b903a8923c76 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 22 Sep 2021 15:27:24 +0200
Subject: [PATCH 276/681] Initialize SVM in LibEspresso

This ensure startup hooks are run and in particular it installs some
critical signal handlers such as the one for SIGPIPE
---
 .../com/oracle/truffle/espresso/libespresso/LibEspresso.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/espresso/src/com.oracle.truffle.espresso.libespresso/src/com/oracle/truffle/espresso/libespresso/LibEspresso.java b/espresso/src/com.oracle.truffle.espresso.libespresso/src/com/oracle/truffle/espresso/libespresso/LibEspresso.java
index 1be98ce24511..8818f8520fac 100644
--- a/espresso/src/com.oracle.truffle.espresso.libespresso/src/com/oracle/truffle/espresso/libespresso/LibEspresso.java
+++ b/espresso/src/com.oracle.truffle.espresso.libespresso/src/com/oracle/truffle/espresso/libespresso/LibEspresso.java
@@ -27,6 +27,7 @@
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.ObjectHandle;
 import org.graalvm.nativeimage.ObjectHandles;
+import org.graalvm.nativeimage.VMRuntime;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
@@ -61,6 +62,7 @@ static int createJavaVM(@SuppressWarnings("unused") IsolateThread thread, JNIJav
         if (result != JNIErrors.JNI_OK()) {
             return result;
         }
+        VMRuntime.initialize();
         // Use the nuclear option for System.exit
         builder.option("java.ExitHost", "true");
         builder.option("java.EnableSignals", "true");

From 93f084c4908d1ccd07a776a23d715f0396bd3555 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 22 Sep 2021 15:28:17 +0200
Subject: [PATCH 277/681] Fix JVM_FindClassFromCaller: don't use a protection
 domain for the BCL

---
 .../src/com/oracle/truffle/espresso/vm/VM.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
index c6e342da3a22..789f9a246ce8 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
@@ -1972,7 +1972,18 @@ private Symbol<Type> namePtrToInternal(TruffleObject namePtr) {
         if (Types.isPrimitive(type)) {
             result = null;
         } else {
-            result = meta.resolveSymbolOrNull(type, loader, JVM_GetProtectionDomain(caller));
+            StaticObject protectionDomain;
+            // If loader is null, shouldn't call ClassLoader.checkPackageAccess; otherwise get
+            // NPE. Put it in another way, the bootstrap class loader has all permission and
+            // thus no checkPackageAccess equivalence in the VM class loader.
+            // The caller is also passed as NULL by the java code if there is no security
+            // manager to avoid the performance cost of getting the calling class.
+            if (!StaticObject.isNull(caller) && !StaticObject.isNull(loader)) {
+                protectionDomain = JVM_GetProtectionDomain(caller);
+            } else {
+                protectionDomain = StaticObject.NULL;
+            }
+            result = meta.resolveSymbolOrNull(type, loader, protectionDomain);
         }
         if (result == null) {
             throw meta.throwExceptionWithMessage(meta.java_lang_ClassNotFoundException, NativeUtils.interopPointerToString(namePtr));

From 3b2dd8f9ea93d5ee11686a4e98475d449ceb1b31 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Mon, 4 Oct 2021 16:44:08 +0300
Subject: [PATCH 278/681] Include yaml header for truffle/docs/exit.md doc

---
 truffle/docs/Exit.md | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/truffle/docs/Exit.md b/truffle/docs/Exit.md
index e20630417ae2..db0023867bab 100644
--- a/truffle/docs/Exit.md
+++ b/truffle/docs/Exit.md
@@ -1,13 +1,20 @@
+---
+layout: docs
+toc_group: truffle
+link_title: Context Exit
+permalink: /graalvm-as-a-platform/language-implementation-framework/Exit/
+---
+
 # Context Exit
 
 Different Truffle (guest) languages may use different mechanisms for exiting. This is not optimal as a Truffle language has no way to detect and handle an exit triggered by a different language.
 
-As of 22.0 Truffle has support for polyglot context hard explicit exit triggered by guest languages using [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-). 
+As of 22.0 Truffle has support for polyglot context hard explicit exit triggered by guest languages using [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-).
 It provides a unified way for languages to trigger the exit of the underlying polyglot context. When triggered, all initialized
 guest languages are first notified using [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), then all context threads are stopped, and finally, the context is closed.
-The hard explicit exit is simply referred to as "hard exit". 
+The hard explicit exit is simply referred to as "hard exit".
 
-The hard exit is only one of the three types of exit in Truffle. There are the following types of exit. 
+The hard exit is only one of the three types of exit in Truffle. There are the following types of exit.
 
 * The new hard exit introduced above
   * Hard exit notifications are executed with `ExitMode.HARD` as the second parameter of `TruffleLanguage.exitContext(C,ExitMode,int)`.
@@ -19,9 +26,9 @@ The hard exit is only one of the three types of exit in Truffle. There are the f
   * Explicit exit triggered by throwing a Truffle exception of the exception type `ExceptionType.EXIT`.
   * The exception is not automatically thrown in other threads by Truffle and it does not trigger exit notifications or context close on its own.
   * The context is still fully usable after a soft exit and the soft exit can be followed by either the natural or the hard exit.
-  
+
 For completeness, a polyglot context can be also closed by cancelling it using `Context.close(true)`, `TruffleContext.closeCancelled(Node,String)`, or `TruffleContext.closeResourceExhausted(Node,String)`.
-The cancel operation leads to immediate stopping of all context threads and closing the context without any exit notifications. 
+The cancel operation leads to immediate stopping of all context threads and closing the context without any exit notifications.
 
 ## Soft exit
 
@@ -44,7 +51,7 @@ The natural exit occurs during a normal context close triggered by `Context.clos
 3. All initialized languages are finalized.
    * `TruffleLanguage.finalizeContext(C)` is called for all initalized languages.
    * Guest code runs normally during finalization.
-   
+
 4. All languages are disposed.
    * `TruffleLanguage.disposeContext(C)` is called for all languages.
 
@@ -66,13 +73,13 @@ a special `ThreadDeath` cancel exception depending on whether the hard exit or t
 2. Exit notifications for all initialized languages are executed - [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), where `ExitMode.HARD` is used as the `ExitMode` parameter.
    * Guest code runs normally during exit notifications.
    * If the context is not cancelled during exit notifications (during step 2a) and reaches step 2b, the exit process proceeds with the next step. Otherwise, the exit notifications are interrupted and the context is immediately cancelled.
-  
+
 3. All context threads are forced to stop by throwing a special `ThreadDeath` exit exception from Truffle safepoints.
    * To exit threads reliably, languages need to ensure that `ThreadDeath` is always immediately rethrown and guest language exception handlers and finally blocks are not run.
    * The embedder threads eventually throw a `PolyglotException` to the host with `PolyglotException.isExit() == true` and `PolyglotException.getExitStatus()`
      being equal to the exit code originally specified as the second parameter to the first call to`TruffleContext.closeExited(Node,int)`.
    * Note that from step 3 the exit process is similar to the cancelling process as indicated by the figure, but the cancelling process uses a special `ThreadDeath` cancel exception
-     and the `PolyglotException` thrown to the host has `PolyglotException.isCancelled() == true` instead of `PolyglotException.isExit() == true`. 
+     and the `PolyglotException` thrown to the host has `PolyglotException.isCancelled() == true` instead of `PolyglotException.isExit() == true`.
 
 4. All initialized languages are finalized.
    * `TruffleLanguage.finalizeContext(C)` is called for all initalized languages.
@@ -80,23 +87,23 @@ a special `ThreadDeath` cancel exception depending on whether the hard exit or t
    * Languages should skip any finalization that would require running guest code. A language can find out if it can run guest code in `TruffleLanguage.finalizeContext(C)` by checking if `TruffleLanguage.exitContext(C,ExitMode,int)` was previously called with ExitMode.NATURAL,
    or by checking that `TruffleContext.isClosed()` returns `false`.
 
-   
+
 5. All languages are disposed.
    * `TruffleLanguage.disposeContext(C)` is called for all languages.
-   
+
 6. The context is closed.
 
 ### Behavior if useSystemExit is enabled
 
 1. The exit is triggered by [TruffleContext.closeExited(Node,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleContext.html#closeExited-com.oracle.truffle.api.nodes.Node-int-).
    * Same as with system exit disabled.
-   
+
 2. Exit notifications for all initialized languages are executed - [TruffleLanguage.exitContext(C,ExitMode,int)](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html#exitContext-C-com.oracle.truffle.api.TruffleLanguage.ExitMode-int), where `ExitMode.HARD` is used as the `ExitMode` parameter.
    * Same as with system exit disabled.
-   
+
 3. `System.exit(int)` is called to terminate the whole host application providing the fastest exit possible.
    * The exit code passed to `System.exit(int)`
-     is the one originally specified as the second parameter to the first call to`TruffleContext.closeExited(Node,int)`. 
+     is the one originally specified as the second parameter to the first call to`TruffleContext.closeExited(Node,int)`.
 
 ## Example Usage
 
@@ -104,4 +111,4 @@ The [SimpleLanguage](https://github.com/graalvm/simplelanguage) demonstrates the
 
 * [SLExitBuiltin](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/builtins/SLExitBuiltin.java) demonstrates triggering the context exit.
 * [SLRegisterShutdownHookBuiltin](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/builtins/SLRegisterShutdownHookBuiltin.java) demonstrates registration of shutdown hooks that are executed during the exit notification defined in [SLLanguage](https://github.com/graalvm/simplelanguage/blob/master/language/src/main/java/com/oracle/truffle/sl/SLLanguage.java).
-* [SLExitTest](https://github.com/graalvm/simplelanguage/blob/master/language/src/test/java/com/oracle/truffle/sl/test/SLExitTest.java) demonstrates the usage of the builtins defined above.
\ No newline at end of file
+* [SLExitTest](https://github.com/graalvm/simplelanguage/blob/master/language/src/test/java/com/oracle/truffle/sl/test/SLExitTest.java) demonstrates the usage of the builtins defined above.

From bcd289e89b2ef8b99cdb087bdc5e820ba65c8925 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <tim.felgentreff@oracle.com>
Date: Mon, 4 Oct 2021 13:52:28 +0000
Subject: [PATCH 279/681] [GR-21590] Update Python imports

PullRequest: graalpython/1976
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 0a15ae2d85d1..9bad7fbb8705 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "4130a1090c486309114e8f773c39ed31a21c887b",
+                "version": "c6fc7c03df46b19bebe808bc67fc42a484473232",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From d186790e4ef4eb806be38e653118f85136bd407a Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Mon, 27 Sep 2021 16:44:11 -0700
Subject: [PATCH 280/681] AbstractCompareAndSwapNode should kill any() by
 default

---
 .../compiler/nodes/java/AbstractCompareAndSwapNode.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
index 37ba1e32ad0d..4c1b321aa450 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
@@ -26,6 +26,7 @@
 
 import static org.graalvm.compiler.nodeinfo.InputType.Memory;
 import static org.graalvm.compiler.nodeinfo.InputType.State;
+import static org.graalvm.word.LocationIdentity.any;
 
 import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
 import org.graalvm.compiler.core.common.type.Stamp;
@@ -105,6 +106,6 @@ public Stamp getAccessStamp(NodeView view) {
 
     @Override
     public LocationIdentity getKilledLocationIdentity() {
-        return getLocationIdentity();
+        return any();
     }
 }

From 6fed128a9b8494c99698d4e03bcf60de2d9102d3 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Mon, 4 Oct 2021 20:25:43 +0000
Subject: [PATCH 281/681] [GR-23997] Periodic update of the graal import
 (2021-10-01).

PullRequest: js/2175
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 37c5ef5653c4..bf268b3be435 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "cfd51cdf034ed67678574ad99b957cb7cb752c31",
+                "version": "082c333db671f03aba82d15e6d572e196b3878ea",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "cfd51cdf034ed67678574ad99b957cb7cb752c31",
+                "version": "082c333db671f03aba82d15e6d572e196b3878ea",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From a870dbded033fb4b9c324bd22678acf10327e331 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Fri, 24 Sep 2021 19:37:12 +0200
Subject: [PATCH 282/681] Refactor and fix AArch64 patching logic.

---
 .../asm/aarch64/AArch64Assembler.java         | 15 +++++---
 .../asm/aarch64/AArch64MacroAssembler.java    | 34 +++++++++----------
 .../aarch64/AArch64NativeImagePatcher.java    | 20 ++++++-----
 .../graal/amd64/AMD64NativeImagePatcher.java  |  2 +-
 .../core/graal/code/NativeImagePatcher.java   |  6 +++-
 .../svm/graal/meta/RuntimeCodeInstaller.java  |  2 +-
 .../oracle/svm/hosted/code/HostedPatcher.java | 10 +++++-
 .../code/aarch64/AArch64HostedPatcher.java    | 20 ++++++-----
 .../hosted/code/amd64/AMD64HostedPatcher.java |  2 +-
 .../hosted/image/LIRNativeImageCodeCache.java |  2 +-
 .../oracle/svm/hosted/image/NativeImage.java  |  7 +++-
 11 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
index 479122cbc938..1fdb94cb7808 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
@@ -3121,7 +3121,14 @@ public abstract static class PatchableCodeAnnotation extends CodeAnnotation {
             this.instructionPosition = instructionPosition;
         }
 
-        abstract void patch(int codePos, int relative, byte[] code);
+        /**
+         * Patch the code buffer.
+         *
+         * @param startAddress starting address for instruction sequence to patch
+         * @param relative pc-relative value
+         * @param code machine code generated for this method
+         */
+        abstract void patch(long startAddress, int relative, byte[] code);
     }
 
     /**
@@ -3275,9 +3282,9 @@ public String toString() {
         }
 
         @Override
-        public void patch(int codePos, int relative, byte[] code) {
-            // currently only BL instructions are being patched here
-            assert instruction == Instruction.BL : "trying to patch an unexpected instruction";
+        public void patch(long startAddress, int relative, byte[] code) {
+            // currently, only BL instructions are being patched here
+            GraalError.guarantee(instruction == Instruction.BL, "trying to patch an unexpected instruction");
 
             int curValue = relative; // BL is PC-relative
             assert (curValue & ((1 << shift) - 1)) == 0 : "relative offset has incorrect alignment";
diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
index 82e56e994a80..2f1544a40777 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -2057,16 +2057,15 @@ public String toString() {
         }
 
         @Override
-        public void patch(int codePos, int relative, byte[] code) {
-            int pos = instructionPosition;
-            long targetAddress = ((long) pos) + relative;
-            int relativePageDifference = PatcherUtil.computeRelativePageDifference(targetAddress, pos, 1 << 12);
-            int originalInst = PatcherUtil.readInstruction(code, pos);
+        public void patch(long startAddress, int relative, byte[] code) {
+            long targetAddress = startAddress + relative;
+            int relativePageDifference = PatcherUtil.computeRelativePageDifference(targetAddress, startAddress, 1 << 12);
+            int originalInst = PatcherUtil.readInstruction(code, instructionPosition);
             int newInst = PatcherUtil.patchAdrpHi21(originalInst, relativePageDifference & 0x1FFFFF);
-            PatcherUtil.writeInstruction(code, pos, newInst);
-            originalInst = PatcherUtil.readInstruction(code, pos + 4);
+            PatcherUtil.writeInstruction(code, instructionPosition, newInst);
+            originalInst = PatcherUtil.readInstruction(code, instructionPosition + 4);
             newInst = PatcherUtil.patchLdrLo12(originalInst, (int) targetAddress & 0xFFF, srcSize);
-            PatcherUtil.writeInstruction(code, pos + 4, newInst);
+            PatcherUtil.writeInstruction(code, instructionPosition + 4, newInst);
         }
     }
 
@@ -2081,16 +2080,15 @@ public String toString() {
         }
 
         @Override
-        public void patch(int codePos, int relative, byte[] code) {
-            int pos = instructionPosition;
-            long targetAddress = ((long) pos) + relative;
-            int relativePageDifference = PatcherUtil.computeRelativePageDifference(targetAddress, pos, 1 << 12);
-            int originalInst = PatcherUtil.readInstruction(code, pos);
+        public void patch(long startAddress, int relative, byte[] code) {
+            long targetAddress = startAddress + relative;
+            int relativePageDifference = PatcherUtil.computeRelativePageDifference(targetAddress, startAddress, 1 << 12);
+            int originalInst = PatcherUtil.readInstruction(code, instructionPosition);
             int newInst = PatcherUtil.patchAdrpHi21(originalInst, relativePageDifference & 0x1FFFFF);
-            PatcherUtil.writeInstruction(code, pos, newInst);
-            originalInst = PatcherUtil.readInstruction(code, pos + 4);
+            PatcherUtil.writeInstruction(code, instructionPosition, newInst);
+            originalInst = PatcherUtil.readInstruction(code, instructionPosition + 4);
             newInst = PatcherUtil.patchAddLo12(originalInst, (int) targetAddress & 0xFFF);
-            PatcherUtil.writeInstruction(code, pos + 4, newInst);
+            PatcherUtil.writeInstruction(code, instructionPosition + 4, newInst);
         }
     }
 
@@ -2128,13 +2126,13 @@ public String toString() {
         }
 
         @Override
-        public void patch(int codePos, int relative, byte[] code) {
+        public void patch(long startAddress, int relative, byte[] code) {
             /*
              * Each move has a 16 bit immediate operand. We use a series of shifted moves to
              * represent immediate values larger than 16 bits.
              */
             // first retrieving the target address
-            long curValue = ((long) instructionPosition) + relative;
+            long curValue = startAddress + relative;
             int siteOffset = 0;
             boolean containsNegatedMov = false;
             for (MovAction include : includeSet) {
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativeImagePatcher.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativeImagePatcher.java
index 6066e976f68b..cb07b0eadce8 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativeImagePatcher.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativeImagePatcher.java
@@ -96,8 +96,9 @@ public int getLength() {
     }
 
     @Override
-    public void patchCode(int relative, byte[] code) {
-        annotation.patch(annotation.instructionPosition, relative, code);
+    public void patchCode(long methodStartAddress, int relative, byte[] code) {
+        long startAddress = methodStartAddress + annotation.instructionPosition;
+        annotation.patch(startAddress, relative, code);
     }
 
     @Override
@@ -115,8 +116,9 @@ class AdrpLdrMacroInstructionNativeImagePatcher extends CompilationResult.CodeAn
     }
 
     @Override
-    public void patchCode(int relative, byte[] code) {
-        macroInstruction.patch(macroInstruction.instructionPosition, relative, code);
+    public void patchCode(long methodStartAddress, int relative, byte[] code) {
+        long startAddress = methodStartAddress + macroInstruction.instructionPosition;
+        macroInstruction.patch(startAddress, relative, code);
     }
 
     @Override
@@ -151,8 +153,9 @@ class AdrpAddMacroInstructionNativeImagePatcher extends CompilationResult.CodeAn
     }
 
     @Override
-    public void patchCode(int relative, byte[] code) {
-        macroInstruction.patch(macroInstruction.instructionPosition, relative, code);
+    public void patchCode(long methodStartAddress, int relative, byte[] code) {
+        long startAddress = methodStartAddress + macroInstruction.instructionPosition;
+        macroInstruction.patch(startAddress, relative, code);
     }
 
     @Override
@@ -187,8 +190,9 @@ class MovSequenceNativeImagePatcher extends CompilationResult.CodeAnnotation imp
     }
 
     @Override
-    public void patchCode(int relative, byte[] code) {
-        annotation.patch(annotation.instructionPosition, relative, code);
+    public void patchCode(long methodStartAddress, int relative, byte[] code) {
+        long startAddress = methodStartAddress + annotation.instructionPosition;
+        annotation.patch(startAddress, relative, code);
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
index 180be26992a8..50fce34fdb47 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
@@ -75,7 +75,7 @@ public AMD64NativeImagePatcher(OperandDataAnnotation annotation) {
     }
 
     @Override
-    public void patchCode(int relative, byte[] code) {
+    public void patchCode(long methodStartAddress, int relative, byte[] code) {
         int curValue = relative - (annotation.nextInstructionPosition - annotation.instructionPosition);
 
         for (int i = 0; i < annotation.operandSize; i++) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/NativeImagePatcher.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/NativeImagePatcher.java
index 1bbd5db4ad3c..884bd33930cb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/NativeImagePatcher.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/NativeImagePatcher.java
@@ -30,8 +30,12 @@
 public interface NativeImagePatcher {
     /**
      * Patch directly in the code buffer with an offset relative to the start of this instruction.
+     *
+     * @param methodStartAddress address of method start within runtime installed code
+     * @param relative pc-relative offset
+     * @param code machine code generated for this method
      */
-    void patchCode(int relative, byte[] code);
+    void patchCode(long methodStartAddress, int relative, byte[] code);
 
     /**
      * The position from the beginning of the method where the patch is applied. This offset is used
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
index d643c805100d..d1d104b8e68d 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
@@ -258,7 +258,7 @@ private void patchData(Map<Integer, NativeImagePatcher> patcher, @SuppressWarnin
             if (dataPatch.reference instanceof DataSectionReference) {
                 DataSectionReference ref = (DataSectionReference) dataPatch.reference;
                 int pcDisplacement = dataOffset + ref.getOffset() - dataPatch.pcOffset;
-                patch.patchCode(pcDisplacement, compiledBytes);
+                patch.patchCode(code.rawValue(), pcDisplacement, compiledBytes);
             } else if (dataPatch.reference instanceof ConstantReference) {
                 ConstantReference ref = (ConstantReference) dataPatch.reference;
                 SubstrateObjectConstant refConst = (SubstrateObjectConstant) ref.getConstant();
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedPatcher.java
index 2dc76df0eaef..862f2e12c3e1 100755
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedPatcher.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedPatcher.java
@@ -34,11 +34,19 @@
 public interface HostedPatcher {
     /**
      * Create relocation for the binary file.
+     *
+     * @param ref value instruction sequence should refer to
+     * @param relocs buffer of added relocation site information
+     * @param compStart codecache-relative starting position this method's machine code
      */
     void relocate(Reference ref, RelocatableBuffer relocs, int compStart);
 
     /**
      * Patch the code buffer.
+     *
+     * @param compStart codecache-relative starting position this method's machine code
+     * @param relative pc-relative offset
+     * @param code machine code generated for this method
      */
-    void patch(int codePos, int relative, byte[] code);
+    void patch(int compStart, int relative, byte[] code);
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
index fc2e551e4725..305bf88f262b 100755
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
@@ -96,8 +96,9 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
 
     @Uninterruptible(reason = ".")
     @Override
-    public void patch(int codePos, int relative, byte[] code) {
-        annotation.patch(codePos, relative, code);
+    public void patch(int compStart, int relative, byte[] code) {
+        long startAddress = ((long) compStart) + annotation.instructionPosition;
+        annotation.patch(startAddress, relative, code);
     }
 
     @Override
@@ -145,8 +146,9 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
 
     @Uninterruptible(reason = ".")
     @Override
-    public void patch(int codePos, int relative, byte[] code) {
-        macroInstruction.patch(codePos, relative, code);
+    public void patch(int compStart, int relative, byte[] code) {
+        long startAddress = ((long) compStart) + macroInstruction.instructionPosition;
+        macroInstruction.patch(startAddress, relative, code);
     }
 
     @Override
@@ -175,8 +177,9 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
 
     @Uninterruptible(reason = ".")
     @Override
-    public void patch(int codePos, int relative, byte[] code) {
-        macroInstruction.patch(codePos, relative, code);
+    public void patch(int compStart, int relative, byte[] code) {
+        long startAddress = ((long) compStart) + macroInstruction.instructionPosition;
+        macroInstruction.patch(startAddress, relative, code);
     }
 
     @Override
@@ -241,8 +244,9 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
 
     @Uninterruptible(reason = ".")
     @Override
-    public void patch(int codePos, int relative, byte[] code) {
-        annotation.patch(codePos, relative, code);
+    public void patch(int compStart, int relative, byte[] code) {
+        /* Patching a move sequence would hardcode an absolute value, not a pc-relative value. */
+        throw VMError.shouldNotReachHere();
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java
index 270ac190569b..6d069ba7859d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcher.java
@@ -86,7 +86,7 @@ public AMD64HostedPatcher(OperandDataAnnotation annotation) {
 
     @Uninterruptible(reason = ".")
     @Override
-    public void patch(int codePos, int relative, byte[] code) {
+    public void patch(int compStart, int relative, byte[] code) {
         int curValue = relative - (annotation.nextInstructionPosition - annotation.instructionPosition);
 
         for (int i = 0; i < annotation.operandSize; i++) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
index 27d4aebbb735..a1ae28bde450 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
@@ -188,7 +188,7 @@ public void patchMethods(DebugContext debug, RelocatableBuffer relocs, ObjectFil
                     // Patch a PC-relative call.
                     // This code handles the case of section-local calls only.
                     int pcDisplacement = callTargetStart - (compStart + call.pcOffset);
-                    patches.get(call.pcOffset).patch(call.pcOffset, pcDisplacement, compilation.getTargetCode());
+                    patches.get(call.pcOffset).patch(compStart, pcDisplacement, compilation.getTargetCode());
                 }
             }
             for (DataPatch dataPatch : compilation.getDataPatches()) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index 18d4f292a131..ef1f7597e74b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -675,9 +675,14 @@ private void markDataRelocationSiteFromText(RelocatableBuffer buffer, final Prog
                 // validating patched value does not overflow operand
                 switch (info.getRelocationKind()) {
                     case AARCH64_R_MOVW_UABS_G0:
+                        assert (targetValue & 0xFFFF_FFFF_FFFF_0000L) == 0 : "value to patch does not fit";
+                        break;
                     case AARCH64_R_MOVW_UABS_G1:
+                        assert (targetValue & 0xFFFF_FFFF_0000_0000L) == 0 : "value to patch does not fit";
+                        break;
                     case AARCH64_R_MOVW_UABS_G2:
-                        assert (patchValue & 0xFFFF) == patchValue : "value to patch does not fit";
+                        assert (targetValue & 0xFFFF_0000_0000_0000L) == 0 : "value to patch does not fit";
+                        break;
                 }
                 int originalInst = bufferBytes.getInt(offset);
                 int newInst = AArch64Assembler.PatcherUtil.patchMov(originalInst, patchValue);

From ec2ae057eb315aea7ab186020a5f6a15cb515c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gergo.barany@oracle.com>
Date: Mon, 4 Oct 2021 17:33:25 +0200
Subject: [PATCH 283/681] Move time of canonicalization when removing obsolete
 proxies

---
 .../phases/common/util/LoopUtility.java       | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/LoopUtility.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/LoopUtility.java
index 92c2942525ce..48d9637b74ba 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/LoopUtility.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/LoopUtility.java
@@ -41,27 +41,34 @@ public class LoopUtility {
     /**
      * Remove loop proxies that became obsolete over time, i.e., they proxy a value that already
      * flowed out of a loop and dominates the loop now.
+     *
+     * @param canonicalizer must not be {@code null}, will be applied incrementally to nodes whose
+     *            inputs changed
      */
+    @SuppressWarnings("try")
     public static void removeObsoleteProxies(StructuredGraph graph, CoreProviders context, CanonicalizerPhase canonicalizer) {
         LoopsData loopsData = context.getLoopsDataProvider().getLoopsData(graph);
-        for (LoopEx loop : loopsData.loops()) {
-            removeObsoleteProxiesForLoop(loop, context, canonicalizer);
+        final EconomicSetNodeEventListener inputChanges = new EconomicSetNodeEventListener(EnumSet.of(NodeEvent.INPUT_CHANGED));
+        try (NodeEventScope s = graph.trackNodeEvents(inputChanges)) {
+            for (LoopEx loop : loopsData.loops()) {
+                removeObsoleteProxiesForLoop(loop);
+            }
         }
+        canonicalizer.applyIncremental(graph, context, inputChanges.getNodes());
     }
 
-    @SuppressWarnings("try")
-    public static void removeObsoleteProxiesForLoop(LoopEx loop, CoreProviders context, CanonicalizerPhase canonicalizer) {
-        StructuredGraph graph = loop.loopBegin().graph();
-        final EconomicSetNodeEventListener inputChanges = new EconomicSetNodeEventListener(EnumSet.of(NodeEvent.INPUT_CHANGED));
-        try (NodeEventScope s = graph.trackNodeEvents(inputChanges)) {
-            for (LoopExitNode lex : loop.loopBegin().loopExits()) {
-                for (ProxyNode proxy : lex.proxies().snapshot()) {
-                    if (loop.isOutsideLoop(proxy.value())) {
-                        proxy.replaceAtUsagesAndDelete(proxy.getOriginalNode());
-                    }
+    /**
+     * Remove obsolete proxies from one loop only. Unlike
+     * {@link #removeObsoleteProxies(StructuredGraph, CoreProviders, CanonicalizerPhase)}, this does
+     * not apply canonicalization.
+     */
+    public static void removeObsoleteProxiesForLoop(LoopEx loop) {
+        for (LoopExitNode lex : loop.loopBegin().loopExits()) {
+            for (ProxyNode proxy : lex.proxies().snapshot()) {
+                if (loop.isOutsideLoop(proxy.value())) {
+                    proxy.replaceAtUsagesAndDelete(proxy.getOriginalNode());
                 }
             }
         }
-        canonicalizer.applyIncremental(graph, context, inputChanges.getNodes());
     }
 }

From 9ece91589e41429f1c690e9d37fd429ad0a6980a Mon Sep 17 00:00:00 2001
From: Cosmin Basca <cosmin.basca@oracle.com>
Date: Tue, 5 Oct 2021 10:33:19 +0200
Subject: [PATCH 284/681] mx_vm_benchmark.py: hardcode vm field when measuring
 binary file sizes

---
 vm/mx.vm/mx_vm_benchmark.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/vm/mx.vm/mx_vm_benchmark.py b/vm/mx.vm/mx_vm_benchmark.py
index 9101e681b099..5482415a82d4 100644
--- a/vm/mx.vm/mx_vm_benchmark.py
+++ b/vm/mx.vm/mx_vm_benchmark.py
@@ -1072,12 +1072,13 @@ def runAndReturnStdOut(self, benchmarks, bmSuiteArgs):
         if isinstance(vm, mx_benchmark.GuestVm):
             host_vm = vm.host_vm()
             assert host_vm
+        name = 'graalvm-ee' if has_component('svmee') else 'graalvm-ce'
         dims = {
-            "vm": vm.name(),
-            # the host-vm is hardcoded to one of the accepted names of the field
-            "host-vm": 'graalvm-ee' if has_component('svmee') else 'graalvm-ce',
+            # the vm and host-vm fields are hardcoded to one of the accepted names of the field
+            "vm": name,
+            "host-vm": name,
             "host-vm-config": self.host_vm_config_name(host_vm, vm),
-            "guest-vm": vm.name() if host_vm else "none",
+            "guest-vm": name if host_vm else "none",
             "guest-vm-config": self.guest_vm_config_name(host_vm, vm),
         }
 

From d3fceb5c3f5949d986779c863fc61a82c9b0910f Mon Sep 17 00:00:00 2001
From: Cosmin Basca <cosmin.basca@oracle.com>
Date: Tue, 5 Oct 2021 10:55:25 +0200
Subject: [PATCH 285/681] ci: record file sizes for installables (naming issue
 fixed)

---
 vm/ci_common/common.hocon | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index 42cfe66a25ff..a6a41487be31 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -355,6 +355,8 @@ deploy_graalvm_linux_amd64: {
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, graalvm-show]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
+    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${upload_file_sizes}
   ] ${collect_profiles} [
     ${mx_vm_common} ${vm_profiles} [graalvm-show]
     ${mx_vm_common} ${vm_profiles} [build]
@@ -374,6 +376,8 @@ deploy_graalvm_linux_aarch64: {
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, graalvm-show]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
+    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${upload_file_sizes}
   ] ${collect_profiles} [
     ${mx_vm_common} ${vm_profiles} [graalvm-show]
     ${mx_vm_common} ${vm_profiles} [build]
@@ -404,6 +408,8 @@ deploy_graalvm_installables_darwin_amd64: {
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
     ${notify-nexus-deploy}
+    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${upload_file_sizes}
     ${notify-releaser}
   ]
   timelimit: "3:00:00"
@@ -429,6 +435,8 @@ deploy_graalvm_installables_windows_amd64: {
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}, build]
     ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}] ${maven_deploy_sdk_components}
     ${notify-nexus-deploy}
+    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}] ${record_file_sizes}
+    ${upload_file_sizes}
   ]
   timelimit: "1:30:00"
 }
@@ -438,8 +446,6 @@ deploy_graalvm_plus_ruby: {
     [set-export, VM_ENV, "${VM_ENV}-ruby"]
     ${mx_vm_common} ${vm_profiles} [graalvm-show]
     ${mx_vm_common} ${vm_profiles} [build]
-    ${mx_vm_common} ${vm_profiles} ${record_file_sizes}
-    ${upload_file_sizes}
     ${mx_vm_common} ${vm_profiles} ${maven_deploy_sdk_base}
     ${notify-nexus-deploy}
     [set-export, GRAALVM_HOME, ${mx_vm_common} [--quiet, --no-warning, graalvm-home]]

From 7992567acbd463e4fd80b9134833b74e94a3b4ca Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Mon, 27 Sep 2021 18:02:03 +0200
Subject: [PATCH 286/681] Fix build issue with OpenJDK 17.0.2-dev

JDK-8271862 got backported to OpenJDK 17.0.2 (current jdk17u
development tree). This patch accounts for those changes which
introduce a new method: Reference.refersToImpl(T obj). Update
Reference substitutions accordingly.

Closes #3837
---
 .../heap/Target_java_lang_ref_Reference.java  |  5 +++
 .../oracle/svm/core/jdk/JDK17_0_2OrLater.java | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_2OrLater.java

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
index 75ad1fed197e..79281b6269b3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
@@ -51,6 +51,7 @@
 import com.oracle.svm.core.annotate.UnknownClass;
 import com.oracle.svm.core.jdk.JDK11OrLater;
 import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
@@ -138,6 +139,10 @@ private void clear0() {
         clear();
     }
 
+    @KeepOriginal
+    @TargetElement(onlyWith = JDK17_0_2OrLater.class)
+    native boolean refersToImpl(T obj);
+
     @KeepOriginal
     @TargetElement(onlyWith = JDK16OrLater.class)
     public native boolean refersTo(T obj);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_2OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_2OrLater.java
new file mode 100644
index 000000000000..05a7fe4f401b
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17_0_2OrLater.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.jdk;
+
+import java.util.function.BooleanSupplier;
+
+import org.graalvm.compiler.serviceprovider.GraalServices;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+
+public class JDK17_0_2OrLater implements BooleanSupplier {
+
+    @Override
+    public boolean getAsBoolean() {
+        return JavaVersionUtil.JAVA_SPEC > 17 ||
+                        (JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() > 1);
+    }
+
+}

From 7af0e63f5a6a9a3d3b61ffd497d65e5bbd7e976d Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Mon, 13 Sep 2021 14:38:52 +0200
Subject: [PATCH 287/681] Default to adaptive GC policy.

---
 .../src/com/oracle/svm/core/genscavenge/CollectionPolicy.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/CollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/CollectionPolicy.java
index feb0b4680fdd..581ea291de19 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/CollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/CollectionPolicy.java
@@ -38,8 +38,8 @@
 /** The interface for a garbage collection policy. All sizes are in bytes. */
 public interface CollectionPolicy {
     final class Options {
-        @Option(help = "The garbage collection policy, either Adaptive or BySpaceAndTime (default).")//
-        public static final HostedOptionKey<String> InitialCollectionPolicy = new HostedOptionKey<>("BySpaceAndTime");
+        @Option(help = "The garbage collection policy, either Adaptive (default) or BySpaceAndTime.")//
+        public static final HostedOptionKey<String> InitialCollectionPolicy = new HostedOptionKey<>("Adaptive");
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)

From 31749933fb50b725881a4b2f702cb5c7f9a1a33f Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Tue, 5 Oct 2021 13:51:35 +0200
Subject: [PATCH 288/681] [GR-34181] Add dispatch object into Source and
 SourceSection.

---
 .../src/org/graalvm/polyglot/Context.java     |   4 +-
 .../src/org/graalvm/polyglot/Engine.java      | 170 +++-------------
 .../src/org/graalvm/polyglot/Source.java      |  82 ++++----
 .../org/graalvm/polyglot/SourceSection.java   |  38 ++--
 .../polyglot/impl/AbstractPolyglotImpl.java   |  55 ++++--
 .../api/test/polyglot/SourceAPITest.java      |  58 +++++-
 .../api/test/wrapper/HostContextDispatch.java |  14 +-
 .../test/wrapper/HostPolyglotDispatch.java    |   9 +-
 .../truffle/polyglot/EngineAccessor.java      |   2 +-
 .../oracle/truffle/polyglot/FileSystems.java  |   2 +-
 .../polyglot/PolyglotContextDispatch.java     |   9 +-
 .../truffle/polyglot/PolyglotContextImpl.java |  16 +-
 .../polyglot/PolyglotExceptionFrame.java      |   4 +-
 .../polyglot/PolyglotExceptionImpl.java       |   4 +-
 .../oracle/truffle/polyglot/PolyglotImpl.java |  21 +-
 .../polyglot/PolyglotSourceDispatch.java      | 133 +------------
 .../polyglot/PolyglotSourceFactory.java       | 184 ++++++++++++++++++
 .../polyglot/PolyglotValueDispatch.java       |   6 +-
 18 files changed, 417 insertions(+), 394 deletions(-)
 create mode 100644 truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java

diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
index 584e5011e8c0..1379b19e3a0b 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Context.java
@@ -396,7 +396,7 @@ public Engine getEngine() {
      * @since 19.0
      */
     public Value eval(Source source) {
-        return dispatch.eval(receiver, source.getLanguage(), source.receiver);
+        return dispatch.eval(receiver, source.getLanguage(), source);
     }
 
     /**
@@ -477,7 +477,7 @@ public Value eval(String languageId, CharSequence source) {
      * @since 20.2
      */
     public Value parse(Source source) throws PolyglotException {
-        return dispatch.parse(receiver, source.getLanguage(), source.receiver);
+        return dispatch.parse(receiver, source.getLanguage(), source);
     }
 
     /**
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
index f2eda02ec391..e9d2ec661849 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
@@ -44,7 +44,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Reader;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
@@ -85,9 +84,10 @@
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractExceptionDispatch;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractInstrumentDispatch;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractLanguageDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceSectionDispatch;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractStackFrameImpl;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractValueDispatch;
-import org.graalvm.polyglot.io.ByteSequence;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.MessageTransport;
 
@@ -624,13 +624,13 @@ public Value newValue(AbstractValueDispatch dispatch, Object context, Object rec
         }
 
         @Override
-        public Source newSource(Object receiver) {
-            return new Source(receiver);
+        public Source newSource(AbstractSourceDispatch dispatch, Object receiver) {
+            return new Source(dispatch, receiver);
         }
 
         @Override
-        public SourceSection newSourceSection(Source source, Object receiver) {
-            return new SourceSection(source, receiver);
+        public SourceSection newSourceSection(Source source, AbstractSourceSectionDispatch dispatch, Object receiver) {
+            return new SourceSection(source, dispatch, receiver);
         }
 
         @Override
@@ -653,6 +653,16 @@ public AbstractEngineDispatch getDispatch(Engine engine) {
             return engine.dispatch;
         }
 
+        @Override
+        public AbstractSourceDispatch getDispatch(Source source) {
+            return source.dispatch;
+        }
+
+        @Override
+        public AbstractSourceSectionDispatch getDispatch(SourceSection sourceSection) {
+            return sourceSection.dispatch;
+        }
+
         @Override
         public ResourceLimitEvent newResourceLimitsEvent(Context context) {
             return new ResourceLimitEvent(context);
@@ -668,6 +678,16 @@ public Object getReceiver(ResourceLimits value) {
             return value.receiver;
         }
 
+        @Override
+        public Object getReceiver(Source source) {
+            return source.receiver;
+        }
+
+        @Override
+        public Object getReceiver(SourceSection sourceSection) {
+            return sourceSection.receiver;
+        }
+
         @Override
         public PolyglotException newLanguageException(String message, AbstractExceptionDispatch dispatch, Object receiver) {
             return new PolyglotException(message, dispatch, receiver);
@@ -859,7 +879,7 @@ static Iterator<? extends AbstractPolyglotImpl> createInvalidPolyglotImpl() {
 
     private static class PolyglotInvalid extends AbstractPolyglotImpl {
 
-        private final EmptySource source = new EmptySource(this);
+        private final EmptySourceFactory sourceFactory = new EmptySourceFactory(this);
 
         /**
          * Forces ahead-of-time initialization.
@@ -919,13 +939,8 @@ private static RuntimeException noPolyglotImplementationFound() {
         }
 
         @Override
-        public AbstractSourceDispatch getSourceDispatch() {
-            return source;
-        }
-
-        @Override
-        public AbstractSourceSectionDispatch getSourceSectionDispatch() {
-            throw new UnsupportedOperationException();
+        public AbstractSourceFactory getSourceFactory() {
+            return sourceFactory;
         }
 
         @Override
@@ -956,10 +971,10 @@ public FileSystem newDefaultFileSystem() {
             throw noPolyglotImplementationFound();
         }
 
-        static class EmptySource extends AbstractSourceDispatch {
+        static class EmptySourceFactory extends AbstractSourceFactory {
 
-            protected EmptySource(AbstractPolyglotImpl engineImpl) {
-                super(engineImpl);
+            EmptySourceFactory(AbstractPolyglotImpl polyglot) {
+                super(polyglot);
             }
 
             @Override
@@ -968,11 +983,6 @@ public Source build(String language, Object origin, URI uri, String name, String
                 throw noPolyglotImplementationFound();
             }
 
-            @Override
-            public String getLanguage(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
             @Override
             public String findLanguage(File file) throws IOException {
                 return null;
@@ -993,126 +1003,10 @@ public String findMimeType(URL url) throws IOException {
                 return null;
             }
 
-            @Override
-            public String getMimeType(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
             @Override
             public String findLanguage(String mimeType) {
                 return null;
             }
-
-            @Override
-            public String getName(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public String getPath(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public boolean isInteractive(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public URL getURL(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public URI getURI(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public Reader getReader(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public InputStream getInputStream(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getLength(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public CharSequence getCharacters(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public CharSequence getCharacters(Object impl, int lineNumber) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getLineCount(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getLineNumber(Object impl, int offset) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getColumnNumber(Object impl, int offset) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getLineStartOffset(Object impl, int lineNumber) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int getLineLength(Object impl, int lineNumber) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public String toString(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public int hashCode(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public boolean equals(Object impl, Object otherImpl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public boolean isInternal(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public ByteSequence getBytes(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public boolean hasCharacters(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public boolean hasBytes(Object impl) {
-                throw new UnsupportedOperationException();
-            }
-
         }
 
         @Override
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
index 6479250dd04b..190e9783c3d8 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
@@ -52,6 +52,7 @@
 import java.util.Objects;
 
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceFactory;
 import org.graalvm.polyglot.io.ByteSequence;
 
 /**
@@ -130,24 +131,25 @@
  */
 public final class Source {
 
-    private static volatile AbstractSourceDispatch DISPATCH;
+    private static volatile AbstractSourceFactory FACTORY;
 
-    static AbstractSourceDispatch getReceiver() {
-        if (DISPATCH == null) {
+    static AbstractSourceFactory getFactory() {
+        if (FACTORY == null) {
             synchronized (Engine.class) {
-                if (DISPATCH == null) {
-                    DISPATCH = Engine.getImpl().getSourceDispatch();
-                    SourceSection.DISPATCH = Engine.getImpl().getSourceSectionDispatch();
+                if (FACTORY == null) {
+                    FACTORY = Engine.getImpl().getSourceFactory();
                 }
             }
         }
-        return DISPATCH;
+        return FACTORY;
     }
 
+    final AbstractSourceDispatch dispatch;
     final Object receiver;
 
-    Source(Object impl) {
-        this.receiver = impl;
+    Source(AbstractSourceDispatch dispatch, Object receiver) {
+        this.dispatch = dispatch;
+        this.receiver = receiver;
     }
 
     /**
@@ -157,7 +159,7 @@ static AbstractSourceDispatch getReceiver() {
      * @since 19.0
      */
     public String getLanguage() {
-        return getReceiver().getLanguage(receiver);
+        return dispatch.getLanguage(receiver);
     }
 
     /**
@@ -170,7 +172,7 @@ public String getLanguage() {
      * @since 19.0
      */
     public String getName() {
-        return getReceiver().getName(receiver);
+        return dispatch.getName(receiver);
     }
 
     /**
@@ -182,7 +184,7 @@ public String getName() {
      * @since 19.0
      */
     public String getPath() {
-        return getReceiver().getPath(receiver);
+        return dispatch.getPath(receiver);
     }
 
     /**
@@ -192,7 +194,7 @@ public String getPath() {
      * @since 19.0
      */
     public URL getURL() {
-        return getReceiver().getURL(receiver);
+        return dispatch.getURL(receiver);
     }
 
     /**
@@ -206,7 +208,7 @@ public URL getURL() {
      * @since 19.0
      */
     public URI getURI() {
-        return getReceiver().getURI(receiver);
+        return dispatch.getURI(receiver);
     }
 
     /**
@@ -221,7 +223,7 @@ public URI getURI() {
      * @since 19.0
      */
     public boolean isInteractive() {
-        return getReceiver().isInteractive(receiver);
+        return dispatch.isInteractive(receiver);
     }
 
     /**
@@ -240,7 +242,7 @@ public boolean isInteractive() {
      * @since 19.0
      */
     public boolean isInternal() {
-        return getReceiver().isInternal(receiver);
+        return dispatch.isInternal(receiver);
     }
 
     /**
@@ -252,7 +254,7 @@ public boolean isInternal() {
      * @since 19.0
      */
     public Reader getReader() {
-        return getReceiver().getReader(receiver);
+        return dispatch.getReader(receiver);
     }
 
     /**
@@ -263,7 +265,7 @@ public Reader getReader() {
      */
     @Deprecated
     public InputStream getInputStream() {
-        return getReceiver().getInputStream(receiver);
+        return dispatch.getInputStream(receiver);
     }
 
     /**
@@ -272,7 +274,7 @@ public InputStream getInputStream() {
      * @since 19.0
      */
     public int getLength() {
-        return getReceiver().getLength(receiver);
+        return dispatch.getLength(receiver);
     }
 
     /**
@@ -283,7 +285,7 @@ public int getLength() {
      * @since 19.0
      */
     public CharSequence getCharacters() {
-        return getReceiver().getCharacters(receiver);
+        return dispatch.getCharacters(receiver);
     }
 
     /**
@@ -307,7 +309,7 @@ public CharSequence getCharacters() {
      * @since 19.0
      */
     public String getMimeType() {
-        return getReceiver().getMimeType(receiver);
+        return dispatch.getMimeType(receiver);
     }
 
     /**
@@ -320,7 +322,7 @@ public String getMimeType() {
      * @since 19.0
      */
     public CharSequence getCharacters(int lineNumber) {
-        return getReceiver().getCharacters(receiver, lineNumber);
+        return dispatch.getCharacters(receiver, lineNumber);
     }
 
     /**
@@ -332,7 +334,7 @@ public CharSequence getCharacters(int lineNumber) {
      * @since 19.0
      */
     public ByteSequence getBytes() {
-        return getReceiver().getBytes(receiver);
+        return dispatch.getBytes(receiver);
     }
 
     /**
@@ -355,7 +357,7 @@ public ByteSequence getBytes() {
      * @since 19.0
      */
     public boolean hasCharacters() {
-        return getReceiver().hasCharacters(receiver);
+        return dispatch.hasCharacters(receiver);
     }
 
     /**
@@ -369,7 +371,7 @@ public boolean hasCharacters() {
      * @since 19.0
      */
     public boolean hasBytes() {
-        return getReceiver().hasBytes(receiver);
+        return dispatch.hasBytes(receiver);
     }
 
     /**
@@ -382,7 +384,7 @@ public boolean hasBytes() {
      * @since 19.0
      */
     public int getLineCount() {
-        return getReceiver().getLineCount(receiver);
+        return dispatch.getLineCount(receiver);
     }
 
     /**
@@ -395,7 +397,7 @@ public int getLineCount() {
      * @since 19.0
      */
     public int getLineNumber(int offset) throws IllegalArgumentException {
-        return getReceiver().getLineNumber(receiver, offset);
+        return dispatch.getLineNumber(receiver, offset);
     }
 
     /**
@@ -408,7 +410,7 @@ public int getLineNumber(int offset) throws IllegalArgumentException {
      * @since 19.0
      */
     public int getColumnNumber(int offset) throws IllegalArgumentException {
-        return getReceiver().getColumnNumber(receiver, offset);
+        return dispatch.getColumnNumber(receiver, offset);
     }
 
     /**
@@ -420,7 +422,7 @@ public int getColumnNumber(int offset) throws IllegalArgumentException {
      * @since 19.0
      */
     public int getLineStartOffset(int lineNumber) throws IllegalArgumentException {
-        return getReceiver().getLineStartOffset(receiver, lineNumber);
+        return dispatch.getLineStartOffset(receiver, lineNumber);
     }
 
     /**
@@ -433,7 +435,7 @@ public int getLineStartOffset(int lineNumber) throws IllegalArgumentException {
      * @since 19.0
      */
     public int getLineLength(int lineNumber) throws IllegalArgumentException {
-        return getReceiver().getLineLength(receiver, lineNumber);
+        return dispatch.getLineLength(receiver, lineNumber);
     }
 
     /**
@@ -443,7 +445,7 @@ public int getLineLength(int lineNumber) throws IllegalArgumentException {
      */
     @Override
     public String toString() {
-        return getReceiver().toString(receiver);
+        return dispatch.toString(receiver);
     }
 
     /**
@@ -453,7 +455,7 @@ public String toString() {
      */
     @Override
     public int hashCode() {
-        return getReceiver().hashCode(receiver);
+        return dispatch.hashCode(receiver);
     }
 
     /**
@@ -469,7 +471,7 @@ public boolean equals(Object obj) {
         } else {
             return false;
         }
-        return getReceiver().equals(receiver, otherImpl);
+        return dispatch.equals(receiver, otherImpl);
     }
 
     /**
@@ -591,7 +593,7 @@ public static Source create(String language, CharSequence source) {
      * @since 19.0
      */
     public static String findLanguage(File file) throws IOException {
-        return getReceiver().findLanguage(file);
+        return getFactory().findLanguage(file);
     }
 
     /**
@@ -612,7 +614,7 @@ public static String findLanguage(File file) throws IOException {
      * @since 19.0
      */
     public static String findLanguage(URL url) throws IOException {
-        return getReceiver().findLanguage(url);
+        return getFactory().findLanguage(url);
     }
 
     /**
@@ -625,7 +627,7 @@ public static String findLanguage(URL url) throws IOException {
      * @since 19.0
      */
     public static String findMimeType(File file) throws IOException {
-        return getReceiver().findMimeType(file);
+        return getFactory().findMimeType(file);
     }
 
     /**
@@ -640,7 +642,7 @@ public static String findMimeType(File file) throws IOException {
      * @since 19.0
      */
     public static String findMimeType(URL url) throws IOException {
-        return getReceiver().findMimeType(url);
+        return getFactory().findMimeType(url);
     }
 
     /**
@@ -652,7 +654,7 @@ public static String findMimeType(URL url) throws IOException {
      * @since 19.0
      */
     public static String findLanguage(String mimeType) {
-        return getReceiver().findLanguage(mimeType);
+        return getFactory().findLanguage(mimeType);
     }
 
     @SuppressWarnings({"unchecked", "unused"})
@@ -677,7 +679,7 @@ private static IllegalArgumentException invalidMimeType(String mimeType) {
         return new IllegalArgumentException(String.format("Invalid MIME type '%s' provided. A MIME type consists of a type and a subtype separated by '/'.", mimeType));
     }
 
-    private static final Source EMPTY = new Source(null);
+    private static final Source EMPTY = new Source(null, null);
 
     /**
      * Represents a builder to build {@link Source} objects.
@@ -915,7 +917,7 @@ public Builder encoding(Charset encoding) {
          * @since 19.0
          */
         public Source build() throws IOException {
-            Source source = getReceiver().build(language, origin, uri, name, mimeType, content, interactive, internal, cached, fileEncoding);
+            Source source = getFactory().build(language, origin, uri, name, mimeType, content, interactive, internal, cached, fileEncoding);
 
             // make sure origin is not consumed again if builder is used twice
             if (source.hasBytes()) {
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/SourceSection.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/SourceSection.java
index 8e6a3b19f17b..3e4c0a357460 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/SourceSection.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/SourceSection.java
@@ -54,13 +54,13 @@
  */
 public final class SourceSection {
 
-    static volatile AbstractSourceSectionDispatch DISPATCH;
-
     final Source source;
+    final AbstractSourceSectionDispatch dispatch;
     final Object receiver;
 
-    SourceSection(Source source, Object receiver) {
+    SourceSection(Source source, AbstractSourceSectionDispatch dispatch, Object receiver) {
         this.source = source;
+        this.dispatch = dispatch;
         this.receiver = receiver;
     }
 
@@ -73,7 +73,7 @@ public final class SourceSection {
      * @since 19.0
      */
     public boolean isAvailable() {
-        return DISPATCH.isAvailable(receiver);
+        return dispatch.isAvailable(receiver);
     }
 
     /**
@@ -85,7 +85,7 @@ public boolean isAvailable() {
      * @since 19.0
      */
     public boolean hasLines() {
-        return DISPATCH.hasLines(receiver);
+        return dispatch.hasLines(receiver);
     }
 
     /**
@@ -98,7 +98,7 @@ public boolean hasLines() {
      * @since 19.0
      */
     public boolean hasColumns() {
-        return DISPATCH.hasColumns(receiver);
+        return dispatch.hasColumns(receiver);
     }
 
     /**
@@ -111,7 +111,7 @@ public boolean hasColumns() {
      * @since 19.0
      */
     public boolean hasCharIndex() {
-        return DISPATCH.hasCharIndex(receiver);
+        return dispatch.hasCharIndex(receiver);
     }
 
     /**
@@ -134,7 +134,7 @@ public Source getSource() {
      * @since 19.0
      */
     public int getStartLine() {
-        return DISPATCH.getStartLine(receiver);
+        return dispatch.getStartLine(receiver);
     }
 
     /**
@@ -147,7 +147,7 @@ public int getStartLine() {
      * @since 19.0
      */
     public int getStartColumn() {
-        return DISPATCH.getStartColumn(receiver);
+        return dispatch.getStartColumn(receiver);
     }
 
     /**
@@ -160,7 +160,7 @@ public int getStartColumn() {
      * @since 19.0
      */
     public int getEndLine() {
-        return DISPATCH.getEndLine(receiver);
+        return dispatch.getEndLine(receiver);
     }
 
     /**
@@ -173,7 +173,7 @@ public int getEndLine() {
      * @since 19.0
      */
     public int getEndColumn() {
-        return DISPATCH.getEndColumn(receiver);
+        return dispatch.getEndColumn(receiver);
     }
 
     /**
@@ -187,7 +187,7 @@ public int getEndColumn() {
      * @since 19.0
      */
     public int getCharIndex() {
-        return DISPATCH.getCharIndex(receiver);
+        return dispatch.getCharIndex(receiver);
     }
 
     /**
@@ -201,7 +201,7 @@ public int getCharIndex() {
      * @since 19.0
      */
     public int getCharLength() {
-        return DISPATCH.getCharLength(receiver);
+        return dispatch.getCharLength(receiver);
     }
 
     /**
@@ -215,7 +215,7 @@ public int getCharLength() {
      * @since 19.0
      */
     public int getCharEndIndex() {
-        return DISPATCH.getCharEndIndex(receiver);
+        return dispatch.getCharEndIndex(receiver);
     }
 
     /**
@@ -224,7 +224,7 @@ public int getCharEndIndex() {
      */
     @Deprecated
     public CharSequence getCode() {
-        return DISPATCH.getCode(receiver);
+        return dispatch.getCode(receiver);
     }
 
     /**
@@ -235,7 +235,7 @@ public CharSequence getCode() {
      * @since 19.0
      */
     public CharSequence getCharacters() {
-        return DISPATCH.getCode(receiver);
+        return dispatch.getCode(receiver);
     }
 
     /**
@@ -247,13 +247,13 @@ public CharSequence getCharacters() {
      */
     @Override
     public String toString() {
-        return DISPATCH.toString(receiver);
+        return dispatch.toString(receiver);
     }
 
     /** @since 19.0 or earlier */
     @Override
     public int hashCode() {
-        return DISPATCH.hashCode(receiver);
+        return dispatch.hashCode(receiver);
     }
 
     /** @since 19.0 or earlier */
@@ -267,7 +267,7 @@ public boolean equals(Object obj) {
         if (otherImpl instanceof SourceSection) {
             otherImpl = ((SourceSection) obj).receiver;
         }
-        return DISPATCH.equals(receiver, otherImpl);
+        return dispatch.equals(receiver, otherImpl);
     }
 
 }
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
index c622d019e26c..e6c1adc78a0c 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
@@ -161,9 +161,9 @@ protected APIAccess() {
 
         public abstract Value newValue(AbstractValueDispatch dispatch, Object context, Object receiver);
 
-        public abstract Source newSource(Object receiver);
+        public abstract Source newSource(AbstractSourceDispatch dispatch, Object receiver);
 
-        public abstract SourceSection newSourceSection(Source source, Object receiver);
+        public abstract SourceSection newSourceSection(Source source, AbstractSourceSectionDispatch dispatch, Object receiver);
 
         public abstract PolyglotException newLanguageException(String message, AbstractExceptionDispatch dispatch, Object receiver);
 
@@ -179,6 +179,10 @@ protected APIAccess() {
 
         public abstract Object getReceiver(ResourceLimits value);
 
+        public abstract Object getReceiver(Source source);
+
+        public abstract Object getReceiver(SourceSection sourceSection);
+
         public abstract AbstractValueDispatch getDispatch(Value value);
 
         public abstract Object getContext(Value value);
@@ -193,6 +197,10 @@ protected APIAccess() {
 
         public abstract AbstractContextDispatch getDispatch(Context context);
 
+        public abstract AbstractSourceDispatch getDispatch(Source source);
+
+        public abstract AbstractSourceSectionDispatch getDispatch(SourceSection sourceSection);
+
         public abstract ResourceLimitEvent newResourceLimitsEvent(Context context);
 
         public abstract StackFrame newPolyglotStackTraceElement(AbstractStackFrameImpl dispatch, Object receiver);
@@ -294,9 +302,7 @@ public abstract Engine buildEngine(OutputStream out, OutputStream err, InputStre
 
     public abstract void resetPreInitializedEngine();
 
-    public abstract AbstractSourceDispatch getSourceDispatch();
-
-    public abstract AbstractSourceSectionDispatch getSourceSectionDispatch();
+    public abstract AbstractSourceFactory getSourceFactory();
 
     /**
      * Returns the default host dispatch of this polyglot abstraction.
@@ -336,11 +342,11 @@ public final AbstractPolyglotImpl getPolyglotImpl() {
 
     }
 
-    public abstract static class AbstractSourceDispatch {
+    public abstract static class AbstractSourceFactory {
 
         protected final AbstractPolyglotImpl engineImpl;
 
-        protected AbstractSourceDispatch(AbstractPolyglotImpl engineImpl) {
+        protected AbstractSourceFactory(AbstractPolyglotImpl engineImpl) {
             Objects.requireNonNull(engineImpl);
             this.engineImpl = engineImpl;
         }
@@ -348,6 +354,27 @@ protected AbstractSourceDispatch(AbstractPolyglotImpl engineImpl) {
         public abstract Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
                         throws IOException;
 
+        public abstract String findLanguage(File file) throws IOException;
+
+        public abstract String findLanguage(URL url) throws IOException;
+
+        public abstract String findLanguage(String mimeType);
+
+        public abstract String findMimeType(File file) throws IOException;
+
+        public abstract String findMimeType(URL url) throws IOException;
+
+    }
+
+    public abstract static class AbstractSourceDispatch {
+
+        protected final AbstractPolyglotImpl engineImpl;
+
+        protected AbstractSourceDispatch(AbstractPolyglotImpl engineImpl) {
+            Objects.requireNonNull(engineImpl);
+            this.engineImpl = engineImpl;
+        }
+
         public abstract String getName(Object impl);
 
         public abstract String getPath(Object impl);
@@ -386,16 +413,6 @@ public abstract Source build(String language, Object origin, URI uri, String nam
 
         public abstract boolean isInternal(Object impl);
 
-        public abstract String findLanguage(File file) throws IOException;
-
-        public abstract String findLanguage(URL url) throws IOException;
-
-        public abstract String findLanguage(String mimeType);
-
-        public abstract String findMimeType(File file) throws IOException;
-
-        public abstract String findMimeType(URL url) throws IOException;
-
         public abstract ByteSequence getBytes(Object impl);
 
         public abstract boolean hasCharacters(Object impl);
@@ -454,9 +471,9 @@ protected AbstractContextDispatch(AbstractPolyglotImpl impl) {
 
         public abstract boolean initializeLanguage(Object receiver, String languageId);
 
-        public abstract Value eval(Object receiver, String language, Object sourceImpl);
+        public abstract Value eval(Object receiver, String language, Source source);
 
-        public abstract Value parse(Object receiver, String language, Object sourceImpl);
+        public abstract Value parse(Object receiver, String language, Source source);
 
         public abstract void close(Object receiver, boolean cancelIfExecuting);
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
index 6ac3f2d5e479..1ea0419d2589 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
@@ -40,6 +40,13 @@
  */
 package com.oracle.truffle.api.test.polyglot;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.OSUtils;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -69,9 +76,14 @@
 import java.util.zip.ZipOutputStream;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Source.Builder;
 import org.graalvm.polyglot.SourceSection;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceSectionDispatch;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
 import org.graalvm.polyglot.io.ByteSequence;
 import org.junit.Assert;
 import org.junit.Test;
@@ -660,10 +672,12 @@ public void throwsErrorIfLangIsNull3() throws MalformedURLException {
     @Test
     @SuppressWarnings("rawtypes")
     public void testNoContentSource() {
+        AbstractPolyglotImpl polyglot = (AbstractPolyglotImpl) ReflectionUtils.invokeStatic(Engine.class, "getImpl");
         com.oracle.truffle.api.source.Source truffleSource = com.oracle.truffle.api.source.Source.newBuilder(ProxyLanguage.ID, "x", "name").content(
                         com.oracle.truffle.api.source.Source.CONTENT_NONE).build();
-        Class<?>[] sourceConstructorTypes = new Class[]{Object.class};
-        Source source = ReflectionUtils.newInstance(Source.class, sourceConstructorTypes, truffleSource);
+        Class<?>[] sourceConstructorTypes = new Class[]{AbstractSourceDispatch.class, Object.class};
+        Source source = ReflectionUtils.newInstance(Source.class, sourceConstructorTypes,
+                        polyglot.getAPIAccess().getDispatch(Source.create(ProxyLanguage.ID, "")), truffleSource);
         assertFalse(source.hasCharacters());
         assertFalse(source.hasBytes());
         try {
@@ -679,8 +693,9 @@ public void testNoContentSource() {
             // O.K.
         }
         com.oracle.truffle.api.source.SourceSection truffleSection = truffleSource.createSection(1, 2, 3, 4);
-        Class<?>[] sectionConstructorTypes = new Class[]{Source.class, Object.class};
-        SourceSection section = ReflectionUtils.newInstance(SourceSection.class, sectionConstructorTypes, source, truffleSection);
+        Class<?>[] sectionConstructorTypes = new Class[]{Source.class, AbstractSourceSectionDispatch.class, Object.class};
+        SourceSection section = ReflectionUtils.newInstance(SourceSection.class, sectionConstructorTypes, source,
+                        getSourceSectionDispatch(polyglot), truffleSection);
         assertFalse(section.hasCharIndex());
         assertTrue(section.hasLines());
         assertTrue(section.hasColumns());
@@ -688,6 +703,41 @@ public void testNoContentSource() {
         assertTrue(truffleSource.getURI().toString().contains("name"));
     }
 
+    private static AbstractSourceSectionDispatch getSourceSectionDispatch(AbstractPolyglotImpl polyglot) {
+        ProxyLanguage.setDelegate(new ProxyLanguage() {
+            @Override
+            protected CallTarget parse(ParsingRequest request) {
+                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new SourceSectionProvider(request.getSource())));
+            }
+        });
+        try (Context context = Context.create(ProxyLanguage.ID)) {
+            Value res = context.eval(Source.create(ProxyLanguage.ID, ""));
+            SourceSection sourceSection = res.getSourceLocation();
+            return polyglot.getAPIAccess().getDispatch(sourceSection);
+        }
+    }
+
+    @ExportLibrary(InteropLibrary.class)
+    static final class SourceSectionProvider implements TruffleObject {
+
+        private final com.oracle.truffle.api.source.Source source;
+
+        SourceSectionProvider(com.oracle.truffle.api.source.Source source) {
+            this.source = source;
+        }
+
+        @ExportMessage
+        @SuppressWarnings("static-method")
+        public boolean hasSourceLocation() {
+            return true;
+        }
+
+        @ExportMessage
+        public com.oracle.truffle.api.source.SourceSection getSourceLocation() {
+            return source.createSection(0, 0);
+        }
+    }
+
     @Test
     public void testNonResolvableURL() throws IOException {
         Assume.assumeFalse("Query parameters are not supported by file URLConnection on Windows", OSUtils.isWindows());
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostContextDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostContextDispatch.java
index 5b2533441e6f..a61a4a99e6e7 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostContextDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostContextDispatch.java
@@ -43,7 +43,9 @@
 import java.time.Duration;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.APIAccess;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractContextDispatch;
 
@@ -77,11 +79,13 @@ public boolean initializeLanguage(Object receiver, String languageId) {
     }
 
     @Override
-    public Value eval(Object receiver, String language, Object sourceImpl) {
+    public Value eval(Object receiver, String language, Source source) {
         HostContext context = (HostContext) receiver;
-
-        String languageId = polyglot.getSourceDispatch().getLanguage(sourceImpl);
-        String characters = polyglot.getSourceDispatch().getCharacters(sourceImpl).toString();
+        APIAccess apiAccess = polyglot.getAPIAccess();
+        AbstractSourceDispatch sourceDispatch = apiAccess.getDispatch(source);
+        Object sourceImpl = apiAccess.getReceiver(source);
+        String languageId = sourceDispatch.getLanguage(sourceImpl);
+        String characters = sourceDispatch.getCharacters(sourceImpl).toString();
 
         long remoteValue = hostToGuest.remoteEval(context.remoteContext, languageId, characters);
         return context.localContext.asValue(new HostGuestValue(hostToGuest, context.remoteContext, remoteValue));
@@ -105,7 +109,7 @@ public Value getBindings(Object receiver, String language) {
     }
 
     @Override
-    public Value parse(Object receiver, String language, Object sourceImpl) {
+    public Value parse(Object receiver, String language, Source source) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
index d915d23dd136..e60efa30cc1e 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
@@ -110,13 +110,8 @@ public void resetPreInitializedEngine() {
     }
 
     @Override
-    public AbstractSourceDispatch getSourceDispatch() {
-        return getNext().getSourceDispatch();
-    }
-
-    @Override
-    public AbstractSourceSectionDispatch getSourceSectionDispatch() {
-        return getNext().getSourceSectionDispatch();
+    public AbstractSourceFactory getSourceFactory() {
+        return getNext().getSourceFactory();
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
index 156a05f6ae48..19a8c0fd24d7 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
@@ -120,7 +120,7 @@
 import com.oracle.truffle.polyglot.PolyglotLocals.InstrumentContextThreadLocal;
 import com.oracle.truffle.polyglot.PolyglotLocals.LanguageContextLocal;
 import com.oracle.truffle.polyglot.PolyglotLocals.LanguageContextThreadLocal;
-import com.oracle.truffle.polyglot.PolyglotSourceDispatch.EmbedderFileSystemContext;
+import com.oracle.truffle.polyglot.PolyglotSourceFactory.EmbedderFileSystemContext;
 import com.oracle.truffle.polyglot.PolyglotThread.ThreadSpawnRootNode;
 
 final class EngineAccessor extends Accessor {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
index 637c5122ad4c..6b6165e384ce 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
@@ -74,7 +74,7 @@
 
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.nodes.LanguageInfo;
-import com.oracle.truffle.polyglot.PolyglotSourceDispatch.EmbedderFileSystemContext;
+import com.oracle.truffle.polyglot.PolyglotSourceFactory.EmbedderFileSystemContext;
 
 import java.nio.charset.Charset;
 import org.graalvm.nativeimage.ImageInfo;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextDispatch.java
index ea3f7e9508e3..60c13c37c77a 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextDispatch.java
@@ -43,6 +43,7 @@
 import java.time.Duration;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractContextDispatch;
 
@@ -58,13 +59,13 @@ public boolean initializeLanguage(Object receiver, String languageId) {
     }
 
     @Override
-    public Value eval(Object receiver, String language, Object sourceImpl) {
-        return ((PolyglotContextImpl) receiver).eval(language, sourceImpl);
+    public Value eval(Object receiver, String language, Source source) {
+        return ((PolyglotContextImpl) receiver).eval(language, source);
     }
 
     @Override
-    public Value parse(Object receiver, String language, Object sourceImpl) {
-        return ((PolyglotContextImpl) receiver).parse(language, sourceImpl);
+    public Value parse(Object receiver, String language, Source source) {
+        return ((PolyglotContextImpl) receiver).parse(language, source);
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
index f39903316827..8f412af30d23 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -1253,16 +1253,16 @@ public boolean initializeLanguage(String languageId) {
         }
     }
 
-    public Value parse(String languageId, Object sourceImpl) {
+    public Value parse(String languageId, org.graalvm.polyglot.Source source) {
         PolyglotLanguageContext languageContext = lookupLanguageContext(languageId);
         assert languageContext != null;
         Object prev = hostEnter(languageContext);
         try {
-            Source source = (Source) sourceImpl;
+            Source truffleSource = (Source) getAPIAccess().getReceiver(source);
             languageContext.checkAccess(null);
             languageContext.ensureInitialized(null);
-            CallTarget target = languageContext.parseCached(null, source, null);
-            return languageContext.asValue(new PolyglotParsedEval(languageContext, source, target));
+            CallTarget target = languageContext.parseCached(null, truffleSource, null);
+            return languageContext.asValue(new PolyglotParsedEval(languageContext, truffleSource, target));
         } catch (Throwable e) {
             throw PolyglotImpl.guestToHostException(languageContext, e, true);
         } finally {
@@ -1281,15 +1281,15 @@ private PolyglotLanguageContext lookupLanguageContext(String languageId) {
         return languageContext;
     }
 
-    public Value eval(String languageId, Object sourceImpl) {
+    public Value eval(String languageId, org.graalvm.polyglot.Source source) {
         PolyglotLanguageContext languageContext = lookupLanguageContext(languageId);
         assert languageContext != null;
         Object prev = hostEnter(languageContext);
         try {
-            Source source = (Source) sourceImpl;
+            Source truffleSource = (Source) getAPIAccess().getReceiver(source);
             languageContext.checkAccess(null);
             languageContext.ensureInitialized(null);
-            CallTarget target = languageContext.parseCached(null, source, null);
+            CallTarget target = languageContext.parseCached(null, truffleSource, null);
             Object result = target.call(PolyglotImpl.EMPTY_ARGS);
             Value hostValue;
             try {
@@ -1297,7 +1297,7 @@ public Value eval(String languageId, Object sourceImpl) {
             } catch (NullPointerException | ClassCastException e) {
                 throw new AssertionError(String.format("Language %s returned an invalid return value %s. Must be an interop value.", languageId, result), e);
             }
-            if (source.isInteractive()) {
+            if (truffleSource.isInteractive()) {
                 printResult(languageContext, result);
             }
             return hostValue;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionFrame.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionFrame.java
index f7770a234426..d0a707749d69 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionFrame.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionFrame.java
@@ -159,8 +159,8 @@ static PolyglotExceptionFrame createGuest(PolyglotExceptionImpl exception, Truff
             if (callNode != null) {
                 com.oracle.truffle.api.source.SourceSection section = callNode.getEncapsulatingSourceSection();
                 if (section != null) {
-                    Source source = engine.getAPIAccess().newSource(section.getSource());
-                    location = engine.getAPIAccess().newSourceSection(source, section);
+                    Source source = engine.getAPIAccess().newSource(exception.polyglot.getSourceDispatch(), section.getSource());
+                    location = engine.getAPIAccess().newSourceSection(source, exception.polyglot.getSourceSectionDispatch(), section);
                 } else {
                     location = null;
                 }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
index 472d364ebcfa..4068d212312c 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotExceptionImpl.java
@@ -306,8 +306,8 @@ private static Value getLegacyTruffleExceptionGuestObject(PolyglotLanguageContex
 
     private SourceSection newSourceSection(com.oracle.truffle.api.source.SourceSection section) {
         com.oracle.truffle.api.source.Source truffleSource = section.getSource();
-        Source source = polyglot.getAPIAccess().newSource(truffleSource);
-        return polyglot.getAPIAccess().newSourceSection(source, section);
+        Source source = polyglot.getAPIAccess().newSource(polyglot.getSourceDispatch(), truffleSource);
+        return polyglot.getAPIAccess().newSourceSection(source, polyglot.getSourceSectionDispatch(), section);
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
index 510c8d0555a9..b127e39e8e5e 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
@@ -88,6 +88,7 @@ public final class PolyglotImpl extends AbstractPolyglotImpl {
     static final String OPTION_GROUP_ENGINE = "engine";
     static final String PROP_ALLOW_EXPERIMENTAL_OPTIONS = OptionValuesImpl.SYSTEM_PROPERTY_PREFIX + OPTION_GROUP_ENGINE + ".AllowExperimentalOptions";
 
+    private final PolyglotSourceFactory sourceFactory = new PolyglotSourceFactory(this);
     private final PolyglotSourceDispatch sourceDispatch = new PolyglotSourceDispatch(this);
     private final PolyglotSourceSectionDispatch sourceSectionDispatch = new PolyglotSourceSectionDispatch(this);
     private final PolyglotManagementDispatch executionListenerDispatch = new PolyglotManagementDispatch(this);
@@ -163,15 +164,21 @@ public Object buildLimits(long statementLimit, Predicate<org.graalvm.polyglot.So
      * Internal method do not use.
      */
     @Override
-    public AbstractSourceDispatch getSourceDispatch() {
+    public AbstractSourceFactory getSourceFactory() {
+        return sourceFactory;
+    }
+
+    /**
+     * Internal method do not use.
+     */
+    AbstractSourceDispatch getSourceDispatch() {
         return sourceDispatch;
     }
 
     /**
      * Internal method do not use.
      */
-    @Override
-    public AbstractSourceSectionDispatch getSourceSectionDispatch() {
+    AbstractSourceSectionDispatch getSourceSectionDispatch() {
         return sourceSectionDispatch;
     }
 
@@ -437,16 +444,16 @@ public AbstractHostAccess createHostAccess() {
         return new PolyglotHostAccess(this);
     }
 
-    static org.graalvm.polyglot.Source getOrCreatePolyglotSource(AbstractPolyglotImpl polyglot, Source source) {
-        return EngineAccessor.SOURCE.getOrCreatePolyglotSource(source, (t) -> polyglot.getAPIAccess().newSource(t));
+    static org.graalvm.polyglot.Source getOrCreatePolyglotSource(PolyglotImpl polyglot, Source source) {
+        return EngineAccessor.SOURCE.getOrCreatePolyglotSource(source, (t) -> polyglot.getAPIAccess().newSource(polyglot.sourceDispatch, t));
     }
 
-    static org.graalvm.polyglot.SourceSection getPolyglotSourceSection(AbstractPolyglotImpl polyglot, com.oracle.truffle.api.source.SourceSection sourceSection) {
+    static org.graalvm.polyglot.SourceSection getPolyglotSourceSection(PolyglotImpl polyglot, com.oracle.truffle.api.source.SourceSection sourceSection) {
         if (sourceSection == null) {
             return null;
         }
         org.graalvm.polyglot.Source polyglotSource = getOrCreatePolyglotSource(polyglot, sourceSection.getSource());
-        return polyglot.getAPIAccess().newSourceSection(polyglotSource, sourceSection);
+        return polyglot.getAPIAccess().newSourceSection(polyglotSource, polyglot.sourceSectionDispatch, sourceSection);
     }
 
     /**
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceDispatch.java
index 39b9166d6f3d..67dfec744670 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceDispatch.java
@@ -40,33 +40,17 @@
  */
 package com.oracle.truffle.polyglot;
 
-import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
-
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.net.URI;
 import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Supplier;
 
-import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
 import org.graalvm.polyglot.io.ByteSequence;
-import org.graalvm.polyglot.io.FileSystem;
-
-import com.oracle.truffle.api.TruffleFile;
-import com.oracle.truffle.api.source.Source.SourceBuilder;
 
-class PolyglotSourceDispatch extends AbstractSourceDispatch {
-
-    private volatile Object defaultFileSystemContext;
+final class PolyglotSourceDispatch extends AbstractSourceDispatch {
 
     protected PolyglotSourceDispatch(AbstractPolyglotImpl engineImpl) {
         super(engineImpl);
@@ -195,50 +179,6 @@ public String getLanguage(Object impl) {
         return source.getLanguage();
     }
 
-    @Override
-    public String findLanguage(File file) throws IOException {
-        Objects.requireNonNull(file);
-        String mimeType = findMimeType(file);
-        if (mimeType != null) {
-            return findLanguage(mimeType);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String findLanguage(URL url) throws IOException {
-        String mimeType = findMimeType(url);
-        if (mimeType != null) {
-            return findLanguage(mimeType);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String findMimeType(File file) throws IOException {
-        Objects.requireNonNull(file);
-        TruffleFile truffleFile = EngineAccessor.LANGUAGE.getTruffleFile(file.toPath().toString(), getDefaultFileSystemContext());
-        return truffleFile.detectMimeType();
-    }
-
-    @Override
-    public String findMimeType(URL url) throws IOException {
-        Objects.requireNonNull(url);
-        return EngineAccessor.SOURCE.findMimeType(url, getDefaultFileSystemContext());
-    }
-
-    @Override
-    public String findLanguage(String mimeType) {
-        Objects.requireNonNull(mimeType);
-        LanguageCache cache = LanguageCache.languageMimes().get(mimeType);
-        if (cache != null) {
-            return cache.getId();
-        }
-        return null;
-    }
-
     @Override
     public int hashCode(Object impl) {
         return impl.hashCode();
@@ -267,75 +207,4 @@ public boolean hasCharacters(Object impl) {
         return source.hasCharacters();
     }
 
-    @Override
-    public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
-                    throws IOException {
-        assert language != null;
-        SourceBuilder builder;
-        if (origin instanceof File) {
-            builder = EngineAccessor.SOURCE.newBuilder(language, (File) origin);
-        } else if (origin instanceof CharSequence) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((CharSequence) origin), name);
-        } else if (origin instanceof ByteSequence) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((ByteSequence) origin), name);
-        } else if (origin instanceof Reader) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (Reader) origin, name);
-        } else if (origin instanceof URL) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (URL) origin);
-        } else {
-            throw shouldNotReachHere();
-        }
-
-        if (origin instanceof File || origin instanceof URL) {
-            EngineAccessor.SOURCE.setFileSystemContext(builder, getDefaultFileSystemContext());
-        }
-
-        if (content instanceof CharSequence) {
-            builder.content((CharSequence) content);
-        } else if (content instanceof ByteSequence) {
-            builder.content((ByteSequence) content);
-        }
-
-        builder.uri(uri);
-        builder.name(name);
-        builder.internal(internal);
-        builder.interactive(interactive);
-        builder.mimeType(mimeType);
-        builder.cached(cached);
-        builder.encoding(encoding);
-
-        try {
-            return PolyglotImpl.getOrCreatePolyglotSource(engineImpl, builder.build());
-        } catch (IOException e) {
-            throw e;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw shouldNotReachHere(e);
-        }
-    }
-
-    private Object getDefaultFileSystemContext() {
-        Object res = defaultFileSystemContext;
-        if (res == null) {
-            synchronized (this) {
-                res = defaultFileSystemContext;
-                if (res == null) {
-                    EmbedderFileSystemContext context = new EmbedderFileSystemContext();
-                    res = EngineAccessor.LANGUAGE.createFileSystemContext(context, context.fileSystem);
-                    defaultFileSystemContext = res;
-                }
-            }
-        }
-        return res;
-    }
-
-    static final class EmbedderFileSystemContext {
-
-        final FileSystem fileSystem = FileSystems.newDefaultFileSystem();
-        final Map<String, LanguageCache> cachedLanguages = LanguageCache.languages();
-        final Supplier<Map<String, Collection<? extends TruffleFile.FileTypeDetector>>> fileTypeDetectors = FileSystems.newFileTypeDetectorsSupplier(cachedLanguages.values());
-
-    }
-
 }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java
new file mode 100644
index 000000000000..7b82b19d760e
--- /dev/null
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.polyglot;
+
+import com.oracle.truffle.api.TruffleFile;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceFactory;
+import org.graalvm.polyglot.io.ByteSequence;
+import org.graalvm.polyglot.io.FileSystem;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
+
+final class PolyglotSourceFactory extends AbstractSourceFactory {
+
+    private volatile Object defaultFileSystemContext;
+
+    PolyglotSourceFactory(PolyglotImpl polyglot) {
+        super(polyglot);
+    }
+
+    @Override
+    public String findLanguage(File file) throws IOException {
+        Objects.requireNonNull(file);
+        String mimeType = findMimeType(file);
+        if (mimeType != null) {
+            return findLanguage(mimeType);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String findLanguage(URL url) throws IOException {
+        String mimeType = findMimeType(url);
+        if (mimeType != null) {
+            return findLanguage(mimeType);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String findMimeType(File file) throws IOException {
+        Objects.requireNonNull(file);
+        TruffleFile truffleFile = EngineAccessor.LANGUAGE.getTruffleFile(file.toPath().toString(), getDefaultFileSystemContext());
+        return truffleFile.detectMimeType();
+    }
+
+    @Override
+    public String findMimeType(URL url) throws IOException {
+        Objects.requireNonNull(url);
+        return EngineAccessor.SOURCE.findMimeType(url, getDefaultFileSystemContext());
+    }
+
+    @Override
+    public String findLanguage(String mimeType) {
+        Objects.requireNonNull(mimeType);
+        LanguageCache cache = LanguageCache.languageMimes().get(mimeType);
+        if (cache != null) {
+            return cache.getId();
+        }
+        return null;
+    }
+
+    @Override
+    public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
+                    throws IOException {
+        assert language != null;
+        com.oracle.truffle.api.source.Source.SourceBuilder builder;
+        if (origin instanceof File) {
+            builder = EngineAccessor.SOURCE.newBuilder(language, (File) origin);
+        } else if (origin instanceof CharSequence) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((CharSequence) origin), name);
+        } else if (origin instanceof ByteSequence) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((ByteSequence) origin), name);
+        } else if (origin instanceof Reader) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (Reader) origin, name);
+        } else if (origin instanceof URL) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (URL) origin);
+        } else {
+            throw shouldNotReachHere();
+        }
+
+        if (origin instanceof File || origin instanceof URL) {
+            EngineAccessor.SOURCE.setFileSystemContext(builder, getDefaultFileSystemContext());
+        }
+
+        if (content instanceof CharSequence) {
+            builder.content((CharSequence) content);
+        } else if (content instanceof ByteSequence) {
+            builder.content((ByteSequence) content);
+        }
+
+        builder.uri(uri);
+        builder.name(name);
+        builder.internal(internal);
+        builder.interactive(interactive);
+        builder.mimeType(mimeType);
+        builder.cached(cached);
+        builder.encoding(encoding);
+
+        try {
+            return PolyglotImpl.getOrCreatePolyglotSource((PolyglotImpl) engineImpl, builder.build());
+        } catch (IOException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw shouldNotReachHere(e);
+        }
+    }
+
+    private Object getDefaultFileSystemContext() {
+        Object res = defaultFileSystemContext;
+        if (res == null) {
+            synchronized (this) {
+                res = defaultFileSystemContext;
+                if (res == null) {
+                    EmbedderFileSystemContext context = new EmbedderFileSystemContext();
+                    res = EngineAccessor.LANGUAGE.createFileSystemContext(context, context.fileSystem);
+                    defaultFileSystemContext = res;
+                }
+            }
+        }
+        return res;
+    }
+
+    static final class EmbedderFileSystemContext {
+
+        final FileSystem fileSystem = FileSystems.newDefaultFileSystem();
+        final Map<String, LanguageCache> cachedLanguages = LanguageCache.languages();
+        final Supplier<Map<String, Collection<? extends TruffleFile.FileTypeDetector>>> fileTypeDetectors = FileSystems.newFileTypeDetectorsSupplier(cachedLanguages.values());
+
+    }
+}
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
index d91475da8fd3..bc388963e56b 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotValueDispatch.java
@@ -154,10 +154,10 @@ abstract class PolyglotValueDispatch extends AbstractValueDispatch {
 
     static final InteropLibrary UNCACHED_INTEROP = InteropLibrary.getFactory().getUncached();
 
-    final AbstractPolyglotImpl impl;
+    final PolyglotImpl impl;
     final PolyglotEngineImpl engine;
 
-    PolyglotValueDispatch(AbstractPolyglotImpl impl, PolyglotEngineImpl engine) {
+    PolyglotValueDispatch(PolyglotImpl impl, PolyglotEngineImpl engine) {
         super(impl);
         this.impl = impl;
         this.engine = engine;
@@ -2016,7 +2016,7 @@ static final class InteropValue extends PolyglotValueDispatch {
         final CallTarget asTypeLiteral;
         final Class<?> receiverType;
 
-        InteropValue(AbstractPolyglotImpl polyglot, PolyglotLanguageInstance languageInstance, Object receiverObject, Class<?> receiverType) {
+        InteropValue(PolyglotImpl polyglot, PolyglotLanguageInstance languageInstance, Object receiverObject, Class<?> receiverType) {
             super(polyglot, languageInstance.getEngine());
             this.receiverType = receiverType;
             this.asClassLiteral = createTarget(new AsClassLiteralNode(this));

From 24be5fefb46f3f711d25fe6b7908f4284bc4de92 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 5 Oct 2021 14:22:13 +0200
Subject: [PATCH 289/681] Avoid createCallTarget() in
 ContextInterruptCloseCancelOrExitTest.

---
 .../test/ContextInterruptCloseCancelOrExitTest.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
index 0d71c92d1461..e51066ccbfdf 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation.test/src/com/oracle/truffle/api/instrumentation/test/ContextInterruptCloseCancelOrExitTest.java
@@ -69,7 +69,6 @@
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
@@ -271,7 +270,7 @@ public void testNestedExitOnHost() {
                         new ProxyLanguage() {
                             @Override
                             protected CallTarget parse(ParsingRequest request) {
-                                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                                return new RootNode(languageInstance) {
                                     @Override
                                     public Object execute(VirtualFrame frame) {
                                         LanguageContext languageContext = LanguageContext.get(this);
@@ -283,7 +282,7 @@ public Object execute(VirtualFrame frame) {
                                         }
                                         return 0;
                                     }
-                                });
+                                }.getCallTarget();
                             }
 
                             @Override
@@ -377,14 +376,14 @@ private static ProxyLanguage getWaitOnExitLanguage(CountDownLatch signalWaitingS
         return new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         LanguageContext languageContext = LanguageContext.get(this);
                         languageContext.getEnv().getContext().closeExited(this, 1);
                         return 0;
                     }
-                });
+                }.getCallTarget();
             }
 
             @Override
@@ -556,14 +555,14 @@ public void testExitFromExitNotification() {
         setupEnv(Context.newBuilder(), new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) {
-                return Truffle.getRuntime().createCallTarget(new RootNode(languageInstance) {
+                return new RootNode(languageInstance) {
                     @Override
                     public Object execute(VirtualFrame frame) {
                         LanguageContext languageContext = LanguageContext.get(this);
                         languageContext.getEnv().getContext().closeExited(this, 1);
                         return 0;
                     }
-                });
+                }.getCallTarget();
             }
 
             @Override

From bb02cec547fe00095959b9577182f6f6f9d4b7fb Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Fri, 1 Oct 2021 10:07:26 +0200
Subject: [PATCH 290/681] Deprecate TruffleRuntime#createCallTarget(RootNode).

---
 .../compiler/truffle/runtime/GraalTruffleRuntime.java        | 2 ++
 truffle/CHANGELOG.md                                         | 1 +
 .../src/com/oracle/truffle/api/test/TruffleRuntimeTest.java  | 1 +
 truffle/src/com.oracle.truffle.api/snapshot.sigtest          | 1 +
 .../src/com/oracle/truffle/api/TruffleRuntime.java           | 5 +++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index 5adb60c3040a..16ed9eb4e42f 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -695,6 +695,8 @@ public <T> T getCapability(Class<T> capability) {
     public abstract SpeculationLog createSpeculationLog();
 
     @Override
+    @Deprecated
+    @SuppressWarnings("deprecation")
     public final RootCallTarget createCallTarget(RootNode rootNode) {
         return rootNode.getCallTarget();
     }
diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index b1ee61b1389c..52e95d5e5dfc 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -8,6 +8,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 * Added a [LibraryFactory#getMessages()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/library/LibraryFactory.html#getMessages--) method returning a list of messages that the library provides.
 
 *  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` is deprecated and so will be `TruffleRuntime#createCallTarget()` soon. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
+*  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` and `TruffleRuntime#createCallTarget()` are deprecated now. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
 * In `TruffleLanguage.finalizeContext(Object)`, there is a new requirement for leaving all remaining unclosed inner contexts created by the language on all threads where the contexts are still active.
 No active inner context is allowed after `TruffleLanguage.finalizeContext(Object)` returns. Not complying with this requirement will result in an internal error. Please note that inactive inner contexts are still closed implicitly by the parent context.
 * Added `TruffleContext.closeExited(Node, int)` to hard exit an entered truffle context. See [the documentation](https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md).
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
index 2da778bf60d4..43a082e483db 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
@@ -109,6 +109,7 @@ public void test() {
         assertNotNull(runtime.getName());
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testCreateCallTarget() {
         RootNode rootNode = createTestRootNode(null);
diff --git a/truffle/src/com.oracle.truffle.api/snapshot.sigtest b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
index 239c38dffb90..b3ff7b35106a 100644
--- a/truffle/src/com.oracle.truffle.api/snapshot.sigtest
+++ b/truffle/src/com.oracle.truffle.api/snapshot.sigtest
@@ -681,6 +681,7 @@ meth public abstract com.oracle.truffle.api.Assumption createAssumption()
 meth public abstract com.oracle.truffle.api.Assumption createAssumption(java.lang.String)
 meth public abstract com.oracle.truffle.api.CompilerOptions createCompilerOptions()
 meth public abstract com.oracle.truffle.api.RootCallTarget createCallTarget(com.oracle.truffle.api.nodes.RootNode)
+ anno 0 java.lang.Deprecated()
 meth public abstract com.oracle.truffle.api.frame.FrameInstance getCallerFrame()
 meth public abstract com.oracle.truffle.api.frame.FrameInstance getCurrentFrame()
 meth public abstract com.oracle.truffle.api.frame.MaterializedFrame createMaterializedFrame(java.lang.Object[])
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
index 526e7f2ac618..4cdfe83c2409 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java
@@ -71,15 +71,16 @@ public interface TruffleRuntime {
 
     /**
      * Creates a new call target for a given root node if none exists. Otherwise, the existing call
-     * target is returned. Note that this method is only kept for backward compatibility and will
-     * soon be deprecated. Please use {@link RootNode#getCallTarget()} instead.
+     * target is returned.
      *
      * @param rootNode the root node whose
      *            {@link RootNode#execute(com.oracle.truffle.api.frame.VirtualFrame)} method
      *            represents the entry point
      * @return the new call target object
      * @since 0.8 or earlier
+     * @deprecated Use {@link RootNode#getCallTarget()}.
      */
+    @Deprecated
     RootCallTarget createCallTarget(RootNode rootNode);
 
     /**

From 97c741ff571dfd9eb922ea0a0bdc64f93d9ea735 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Tue, 5 Oct 2021 15:26:15 +0200
Subject: [PATCH 291/681] Fix problems and warnings found by the ECJ compiler
 with JDK 11 and 17; Add gate build runs with JDT for 11 and 17.

---
 common.json                                   |  8 +--
 .../core/test/ea/EscapeAnalysisTest.java      | 16 +++---
 .../hotspot/jdk16/test/ReferenceTest.java     |  8 +--
 .../replacements/test/MonitorTest.java        |  3 +-
 .../serviceprovider/GraalUnsafeAccess.java    |  1 +
 regex/ci.hocon                                |  2 +-
 .../src/org/graalvm/polyglot/Engine.java      |  3 +-
 .../svm/core/containers/CgroupUtil.java       |  2 +
 ...et_java_lang_ClassLoader_JDK11OrLater.java |  8 +--
 .../Target_java_util_ResourceBundle.java      |  4 +-
 .../oracle/svm/core/jdk/RandomAccessors.java  |  1 +
 .../svm/core/jdk/SecuritySubstitutions.java   | 16 ++++--
 .../oracle/svm/hosted/ModuleLayerFeature.java | 51 +++++++++----------
 .../ClassLoaderSupportImplJDK11OrLater.java   |  4 +-
 ...veImageClassLoaderSupportJDK11OrLater.java |  4 +-
 .../oracle/svm/jfr/JfrSymbolRepository.java   |  4 +-
 .../src/com/oracle/svm/jfr/SubstrateJVM.java  |  1 -
 .../svm/jfr/Target_jdk_jfr_internal_JVM.java  | 11 ++--
 .../test/jdk11/AbstractServiceLoaderTest.java |  5 +-
 ...oProviderConstructorServiceLoaderTest.java |  8 +--
 .../com/oracle/svm/test/StackTraceTests.java  |  1 +
 tools/ci.hocon                                |  4 +-
 .../chromeinspector/InspectorDebugger.java    |  1 +
 truffle/ci.hocon                              |  4 +-
 .../staticobject/ArrayBasedStaticShape.java   |  2 +
 .../api/staticobject/StaticProperty.java      |  3 +-
 .../oracle/truffle/host/HostClassLoader.java  |  1 +
 27 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/common.json b/common.json
index 62e6ed004261..e2d8d4b23743 100644
--- a/common.json
+++ b/common.json
@@ -78,12 +78,8 @@
       }
     },
     "jdt": {
-      "downloads": {
-        "JDT": {
-          "name": "ecj",
-          "version": "4.14.0",
-          "platformspecific": false
-        }
+      "environment": {
+        "JDT": "builtin"
       }
     }
   },
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
index 6e9d60e35cd7..b3d40e2393fd 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java
@@ -89,10 +89,10 @@ public void testMonitor() {
         testEscapeAnalysis("testMonitorSnippet", JavaConstant.forInt(0), false);
     }
 
-    @SuppressWarnings({"deprecation", "synchronization"})
+    @SuppressWarnings({"synchronized", "deprecation"})
     public static int testMonitorSnippet() {
-        Integer x = new Integer(0);
-        Double y = new Double(0);
+        Object x = new Integer(0);
+        Object y = new Double(0);
         Object z = new Object();
         synchronized (x) {
             synchronized (y) {
@@ -101,7 +101,7 @@ public static int testMonitorSnippet() {
                 }
             }
         }
-        return x.intValue();
+        return ((Integer) x).intValue();
     }
 
     @Test
@@ -113,16 +113,16 @@ public void testMonitor2() {
      * This test case differs from the last one in that it requires inlining within a synchronized
      * region.
      */
-    @SuppressWarnings({"deprecation", "synchronization"})
+    @SuppressWarnings({"synchronized", "deprecation"})
     public static int testMonitor2Snippet() {
-        Integer x = new Integer(0);
-        Double y = new Double(0);
+        Object x = new Integer(0);
+        Object y = new Double(0);
         Object z = new Object();
         synchronized (x) {
             synchronized (y) {
                 synchronized (z) {
                     notInlineable();
-                    return x.intValue();
+                    return ((Integer) x).intValue();
                 }
             }
         }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.jdk16.test/src/org/graalvm/compiler/hotspot/jdk16/test/ReferenceTest.java b/compiler/src/org.graalvm.compiler.hotspot.jdk16.test/src/org/graalvm/compiler/hotspot/jdk16/test/ReferenceTest.java
index 185dfd0b8309..c3600aa4d001 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.jdk16.test/src/org/graalvm/compiler/hotspot/jdk16/test/ReferenceTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.jdk16.test/src/org/graalvm/compiler/hotspot/jdk16/test/ReferenceTest.java
@@ -62,10 +62,10 @@ static boolean snippet2(PhantomReference<Object> ref, Object o) {
     @Test
     public void testPhantomReference() {
         Object referent = new Object();
-        test("snippet2", new PhantomReference<Object>(referent, new ReferenceQueue<>()), referent);
-        test("snippet2", new PhantomReference<Object>(referent, new ReferenceQueue<>()), null);
-        test("snippet2", new PhantomReference<Object>(null, new ReferenceQueue<>()), referent);
-        test("snippet2", new PhantomReference<Object>(null, new ReferenceQueue<>()), null);
+        test("snippet2", new PhantomReference<>(referent, new ReferenceQueue<>()), referent);
+        test("snippet2", new PhantomReference<>(referent, new ReferenceQueue<>()), null);
+        test("snippet2", new PhantomReference<>(null, new ReferenceQueue<>()), referent);
+        test("snippet2", new PhantomReference<>(null, new ReferenceQueue<>()), null);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java
index 0c44fa8bc3fd..8f6d0f9b28e1 100644
--- a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java
+++ b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java
@@ -212,9 +212,8 @@ public static String copyArr(char[] src, char[] dst, int n) {
         return new String(dst);
     }
 
-    @SuppressWarnings("synchronization")
     public static String lockBoxedLong(long value) {
-        Long lock = value;
+        Object lock = value;
         synchronized (lock) {
             return lock.toString();
         }
diff --git a/compiler/src/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java b/compiler/src/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java
index 349913065235..2903f78d8d32 100644
--- a/compiler/src/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java
+++ b/compiler/src/org.graalvm.compiler.serviceprovider/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java
@@ -59,6 +59,7 @@ private static Unsafe initUnsafe() {
      * @throws SecurityException if a security manager is present and it denies
      *             {@link RuntimePermission}("accessUnsafe")
      */
+    @SuppressWarnings("deprecation") // checkPermission deprecated starting with JDK 17
     public static Unsafe getUnsafe() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
diff --git a/regex/ci.hocon b/regex/ci.hocon
index c6c9cb80c6d0..447db3f7e593 100644
--- a/regex/ci.hocon
+++ b/regex/ci.hocon
@@ -18,7 +18,7 @@ regexWeekly: ${regex-weekly-notifications} {
 
 builds += [
   ${linux-amd64} ${oraclejdk8}   ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-8"},
-  ${linux-amd64} ${oraclejdk11}  ${regexCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-oraclejdk-11"},
+  ${linux-amd64} ${oraclejdk11}  ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-oraclejdk-11"},
   ${darwin-amd64} ${oraclejdk8} ${gateLite} ${regexWeekly} {
     name: "gate-regex-mac-lite-8"
   }
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
index 1f2171764020..7bab5eb0b55a 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
@@ -787,7 +787,7 @@ public String validatePolyglotAccess(PolyglotAccess access, UnmodifiableEconomic
 
     private static final boolean JDK8_OR_EARLIER = System.getProperty("java.specification.version").compareTo("1.9") < 0;
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "deprecation"})
     private static AbstractPolyglotImpl initEngineImpl() {
         return AccessController.doPrivileged(new PrivilegedAction<AbstractPolyglotImpl>() {
             public AbstractPolyglotImpl run() {
@@ -870,6 +870,7 @@ private static class PolyglotInvalid extends AbstractPolyglotImpl {
         static boolean AOT;
 
         static {
+            @SuppressWarnings("deprecation")
             Boolean aot = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
                 public Boolean run() {
                     return Boolean.getBoolean("com.oracle.graalvm.isaot");
diff --git a/substratevm/src/com.oracle.svm.core.containers/src/com/oracle/svm/core/containers/CgroupUtil.java b/substratevm/src/com.oracle.svm.core.containers/src/com/oracle/svm/core/containers/CgroupUtil.java
index 52edc2745138..30cfe6cceefe 100644
--- a/substratevm/src/com.oracle.svm.core.containers/src/com/oracle/svm/core/containers/CgroupUtil.java
+++ b/substratevm/src/com.oracle.svm.core.containers/src/com/oracle/svm/core/containers/CgroupUtil.java
@@ -51,6 +51,7 @@ static void unwrapIOExceptionAndRethrow(PrivilegedActionException pae) throws IO
             throw (Error) x;
     }
 
+    @SuppressWarnings({"deprecation"}) // doPrivileged is deprecated on JDK 17
     static String readStringValue(CgroupSubsystemController controller, String param) throws IOException {
         PrivilegedExceptionAction<BufferedReader> pea = () ->
                 new BufferedReader(new InputStreamReader(new FileInputStream(Paths.get(controller.path(), param).toString()), StandardCharsets.UTF_8));
@@ -63,6 +64,7 @@ static String readStringValue(CgroupSubsystemController controller, String param
         }
     }
 
+    @SuppressWarnings({"deprecation"}) // doPrivileged is deprecated on JDK 17
     public static List<String> readAllLinesPrivileged(Path path) throws IOException {
         PrivilegedExceptionAction<BufferedReader> pea = () ->
                 new BufferedReader(new InputStreamReader(new FileInputStream(path.toString()), StandardCharsets.UTF_8));
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_ClassLoader_JDK11OrLater.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_ClassLoader_JDK11OrLater.java
index 335d7feedad6..33b5b3c8cfd1 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_ClassLoader_JDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_ClassLoader_JDK11OrLater.java
@@ -41,11 +41,10 @@ public final class Target_java_lang_ClassLoader_JDK11OrLater {
 
     /**
      * All ClassLoaderValue are reset at run time for now. See also
-     * {@link Target_jdk_internal_loader_BootLoader_JDK11OrLater#CLASS_LOADER_VALUE_MAP} for resetting of the
-     * boot class loader.
+     * {@link Target_jdk_internal_loader_BootLoader_JDK11OrLater#CLASS_LOADER_VALUE_MAP} for
+     * resetting of the boot class loader.
      */
-    @Alias
-    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = ConcurrentHashMap.class)//
+    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = ConcurrentHashMap.class)//
     @TargetElement(onlyWith = JDK11OrLater.class)//
     ConcurrentHashMap<?, ?> classLoaderValueMap;
 
@@ -53,6 +52,7 @@ public final class Target_java_lang_ClassLoader_JDK11OrLater {
     @TargetElement(onlyWith = JDK11OrLater.class)
     native Stream<Package> packages();
 
+    @SuppressWarnings("static-method")
     @Substitute
     public Target_java_lang_Module_JDK11OrLater getUnnamedModule() {
         return ClassLoaderUtil.unnamedModuleReference.get();
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java
index 7c5f36d0acd3..12a6b1459b19 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java
@@ -44,12 +44,12 @@ public final class Target_java_util_ResourceBundle {
      */
 
     @Substitute
-    private static ResourceBundle getBundle(String baseName, Target_java_lang_Module_JDK11OrLater module) {
+    private static ResourceBundle getBundle(String baseName, @SuppressWarnings("unused") Target_java_lang_Module_JDK11OrLater module) {
         return ImageSingletons.lookup(LocalizationSupport.class).asOptimizedSupport().getCached(baseName, Locale.getDefault());
     }
 
     @Substitute
-    private static ResourceBundle getBundle(String baseName, Locale targetLocale, Target_java_lang_Module_JDK11OrLater module) {
+    private static ResourceBundle getBundle(String baseName, Locale targetLocale, @SuppressWarnings("unused") Target_java_lang_Module_JDK11OrLater module) {
         return ImageSingletons.lookup(LocalizationSupport.class).asOptimizedSupport().getCached(baseName, targetLocale);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RandomAccessors.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RandomAccessors.java
index ebec57abff8d..1c3d3fd0c49d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RandomAccessors.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RandomAccessors.java
@@ -39,6 +39,7 @@ public abstract class RandomAccessors {
      * the SecureRandom code is only reachable and included in the image when requested by the
      * application.
      */
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17 at least with ECJ
     private static final boolean SECURE_SEED = java.security.AccessController.doPrivileged(
                     new java.security.PrivilegedAction<Boolean>() {
                         @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
index 428371a714b9..27325d3b6f01 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
@@ -532,30 +532,33 @@ private static PermissionCollection allPermissions() {
     }
 
     @Override
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     public PermissionCollection getPermissions(CodeSource codesource) {
         return allPermissions();
     }
 
     @Override
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     public PermissionCollection getPermissions(ProtectionDomain domain) {
         return allPermissions();
     }
 
     @Override
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     public boolean implies(ProtectionDomain domain, Permission permission) {
         return true;
     }
 }
 
 /**
- * This class is instantiated indirectly from the {@link Policy#getInstance} methods via the
+ * This class is instantiated indirectly from the {@code Policy#getInstance} methods via the
  * {@link java.security.Security#getProviders security provider} abstractions. We could just
- * substitute the {@link Policy#getInstance} methods to return
- * {@link AllPermissionsPolicy#SINGLETON}, this version is more fool-proof in case someone manually
- * registers security providers for reflective instantiation.
+ * substitute the Policy.getInstance methods to return {@link AllPermissionsPolicy#SINGLETON}, this
+ * version is more fool-proof in case someone manually registers security providers for reflective
+ * instantiation.
  */
 @TargetClass(className = "sun.security.provider.PolicySpiFile")
-@SuppressWarnings({"unused", "static-method"})
+@SuppressWarnings({"unused", "static-method", "deprecation"})
 final class Target_sun_security_provider_PolicySpiFile {
 
     @Substitute
@@ -563,16 +566,19 @@ private Target_sun_security_provider_PolicySpiFile(Policy.Parameters params) {
     }
 
     @Substitute
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     private PermissionCollection engineGetPermissions(CodeSource codesource) {
         return AllPermissionsPolicy.SINGLETON.getPermissions(codesource);
     }
 
     @Substitute
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     private PermissionCollection engineGetPermissions(ProtectionDomain d) {
         return AllPermissionsPolicy.SINGLETON.getPermissions(d);
     }
 
     @Substitute
+    @SuppressWarnings("deprecation") // deprecated starting JDK 17
     private boolean engineImplies(ProtectionDomain d, Permission p) {
         return AllPermissionsPolicy.SINGLETON.implies(d, p);
     }
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index 187c7037b11c..15cdecb526c2 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -56,14 +56,14 @@
 /**
  * This feature:
  * <ul>
- *      <li> synthesizes the runtime boot module layer </li>
- *      <li> ensures that fields/methods from the {@link ClassLoader} class are reachable in order to
- *      make native methods of the {@link Module} class work </li>
+ * <li>synthesizes the runtime boot module layer</li>
+ * <li>ensures that fields/methods from the {@link ClassLoader} class are reachable in order to make
+ * native methods of the {@link Module} class work</li>
  * </ul>
  * <p>
- * This feature synthesizes the runtime boot module layer by using type reachability information.
- * If a type is reachable, its module is also reachable and therefore should be included in the
- * runtime boot module layer.
+ * This feature synthesizes the runtime boot module layer by using type reachability information. If
+ * a type is reachable, its module is also reachable and therefore should be included in the runtime
+ * boot module layer.
  * </p>
  * <p>
  * The configuration for the runtime boot module layer is resolved using the module reachability
@@ -73,8 +73,8 @@
  * We are purposefully avoiding public API for module layer creation, such as
  * {@link ModuleLayer#defineModulesWithOneLoader(Configuration, ClassLoader)}, because as a side
  * effect this will create a new class loader. Instead, we use a private constructor to construct
- * the {@link ModuleLayer} instance, which we then patch using the module reachability data
- * provided to us by the analysis.
+ * the {@link ModuleLayer} instance, which we then patch using the module reachability data provided
+ * to us by the analysis.
  * </p>
  * <p>
  * Because the result of this feature is dependant on the analysis results, and because this feature
@@ -108,8 +108,8 @@ public void afterRegistration(AfterRegistrationAccess access) {
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
         Map<String, Module> baseModules = ModuleLayer.boot().modules()
-                .stream()
-                .collect(Collectors.toMap(Module::getName, m -> m));
+                        .stream()
+                        .collect(Collectors.toMap(Module::getName, m -> m));
         ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, baseModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
@@ -120,12 +120,12 @@ public void afterAnalysis(AfterAnalysisAccess access) {
         AnalysisUniverse universe = accessImpl.getUniverse();
 
         Map<String, Module> reachableModules = universe.getTypes()
-                .stream()
-                .filter(t -> t.isReachable() && !t.isArray())
-                .map(t -> t.getJavaClass().getModule())
-                .distinct()
-                .filter(m -> m.isNamed() && !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
-                .collect(Collectors.toMap(Module::getName, m -> m));
+                        .stream()
+                        .filter(t -> t.isReachable() && !t.isArray())
+                        .map(t -> t.getJavaClass().getModule())
+                        .distinct()
+                        .filter(m -> m.isNamed() && !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
+                        .collect(Collectors.toMap(Module::getName, m -> m));
 
         ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, reachableModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
@@ -144,7 +144,7 @@ private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Map<String,
         }
     }
 
-    private Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Map<String, Module> reachableModules) {
+    private static Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Map<String, Module> reachableModules) {
         ModuleFinder beforeFinder = new BootModuleLayerModuleFinder();
         ModuleFinder afterFinder = ModuleFinder.of(mp.toArray(Path[]::new));
         Set<String> roots = reachableModules.keySet();
@@ -164,25 +164,24 @@ private void patchRuntimeBootLayer(ModuleLayer runtimeBootLayer, Map<String, Mod
         }
     }
 
-
     static class BootModuleLayerModuleFinder implements ModuleFinder {
 
         @Override
         public Optional<ModuleReference> find(String name) {
             return ModuleLayer.boot()
-                    .configuration()
-                    .findModule(name)
-                    .map(ResolvedModule::reference);
+                            .configuration()
+                            .findModule(name)
+                            .map(ResolvedModule::reference);
         }
 
         @Override
         public Set<ModuleReference> findAll() {
             return ModuleLayer.boot()
-                    .configuration()
-                    .modules()
-                    .stream()
-                    .map(ResolvedModule::reference)
-                    .collect(Collectors.toSet());
+                            .configuration()
+                            .modules()
+                            .stream()
+                            .map(ResolvedModule::reference)
+                            .collect(Collectors.toSet());
         }
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java
index 3a6652ac4710..df7e017c0854 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/ClassLoaderSupportImplJDK11OrLater.java
@@ -107,8 +107,8 @@ private static String packageName(String bundleName) {
         return bundleName.substring(0, classSep);
     }
 
-    private void buildPackageToModulesMap(NativeImageClassLoaderSupportJDK11OrLater classLoaderSupport) {
-        for (ModuleLayer layer : allLayers(classLoaderSupport.moduleLayerForImageBuild)) {
+    private void buildPackageToModulesMap(NativeImageClassLoaderSupportJDK11OrLater cls) {
+        for (ModuleLayer layer : allLayers(cls.moduleLayerForImageBuild)) {
             for (Module module : layer.modules()) {
                 for (String packageName : module.getDescriptor().packages()) {
                     addToPackageNameModules(module, packageName);
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
index 8fd5e7c4f666..f9c6c0b89886 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java
@@ -93,7 +93,7 @@ private static ModuleLayer createModuleLayer(Path[] modulePaths, ClassLoader par
         return ModuleLayer.defineModulesWithOneLoader(configuration, List.of(ModuleLayer.boot()), parent).layer();
     }
 
-    private void adjustBootLayerQualifiedExports(ModuleLayer layer) {
+    private static void adjustBootLayerQualifiedExports(ModuleLayer layer) {
         /*
          * For all qualified exports packages of modules in the the boot layer we check if layer
          * contains modules that satisfy such qualified exports. If we find a match we perform a
@@ -129,7 +129,7 @@ private ClassLoader getSingleClassloader(ModuleLayer moduleLayer) {
         return singleClassloader;
     }
 
-    private void implAddReadsAllUnnamed(Module module) {
+    private static void implAddReadsAllUnnamed(Module module) {
         try {
             Method implAddReadsAllUnnamed = Module.class.getDeclaredMethod("implAddReadsAllUnnamed");
             ModuleSupport.openModuleByClass(Module.class, NativeImageClassLoaderSupportJDK11OrLater.class);
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java
index a1f82973ebc7..56ebfe597881 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrSymbolRepository.java
@@ -125,7 +125,7 @@ public int write(JfrChunkWriter writer) {
         return 1;
     }
 
-    private void writeSymbol(JfrChunkWriter writer, JfrSymbol symbol) {
+    private static void writeSymbol(JfrChunkWriter writer, JfrSymbol symbol) {
         writer.writeCompressedLong(symbol.getId());
         writer.writeByte(JfrChunkWriter.StringEncoding.UTF8_BYTE_ARRAY.byteValue);
         byte[] value = symbol.getValue().getBytes(StandardCharsets.UTF_8);
@@ -136,7 +136,7 @@ private void writeSymbol(JfrChunkWriter writer, JfrSymbol symbol) {
         writer.writeBytes(value);
     }
 
-    private void replaceDotWithSlash(byte[] utf8String) {
+    private static void replaceDotWithSlash(byte[] utf8String) {
         for (int i = 0; i < utf8String.length; i++) {
             if (utf8String[i] == '.') {
                 utf8String[i] = '/';
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java
index 585932ec5494..68abedd6ca90 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/SubstrateJVM.java
@@ -403,7 +403,6 @@ public boolean shouldRotateDisk() {
         }
     }
 
-    /** See {@link JVM#getChunkStartNanos}. */
     public long getChunkStartNanos() {
         JfrChunkWriter chunkWriter = unlockedChunkWriter.lock();
         try {
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
index 2cf9121df458..b8f25658f94f 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
@@ -117,7 +117,7 @@ public static long getClassId(Class<?> clazz) {
         return SubstrateJVM.get().getClassId(clazz);
     }
 
-    /** See {@link JVM#getClassIdNonIntrinsic}. */
+    /** See JVM.getClassIdNonIntrinsic(Class). */
     @Substitute
     @TargetElement(onlyWith = JDK16OrEarlier.class)
     public static long getClassIdNonIntrinsic(Class<?> clazz) {
@@ -286,14 +286,13 @@ public double getTimeConversionFactor() {
         return 1;
     }
 
-    /** See {@link JVM#getChunkStartNanos}. */
+    /** See {@link SubstrateJVM#getChunkStartNanos}. */
     @Substitute
     @TargetElement(onlyWith = JDK14OrLater.class)
     public long getChunkStartNanos() {
         return SubstrateJVM.get().getChunkStartNanos();
     }
 
-    /** See {@link JVM#setHandler}. */
     @Substitute
     @TargetElement(onlyWith = JDK15OrLater.class)
     public boolean setHandler(Class<? extends jdk.internal.event.Event> eventClass, EventHandler handler) {
@@ -302,7 +301,7 @@ public boolean setHandler(Class<? extends jdk.internal.event.Event> eventClass,
         throw VMError.shouldNotReachHere("eventHandler does not exist for: " + eventClass);
     }
 
-    /** See {@link JVM#getHandler}. */
+    /** See {@link SubstrateJVM#getHandler}. */
     @Substitute
     @TargetElement(onlyWith = JDK15OrLater.class)
     public Object getHandler(Class<? extends jdk.internal.event.Event> eventClass) {
@@ -385,21 +384,18 @@ public void flush() {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
-    /** See {@link JVM#include}. */
     @Substitute
     @TargetElement(onlyWith = JDK14OrLater.class) //
     public void include(Thread thread) {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
-    /** See {@link JVM#exclude}. */
     @Substitute
     @TargetElement(onlyWith = JDK14OrLater.class) //
     public void exclude(Thread thread) {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
-    /** See {@link JVM#isExcluded}. */
     @Substitute
     @TargetElement(onlyWith = JDK14OrLater.class) //
     public boolean isExcluded(Thread thread) {
@@ -407,7 +403,6 @@ public boolean isExcluded(Thread thread) {
         return false;
     }
 
-    /** See {@link JVM#markChunkFinal}. */
     @Substitute
     @TargetElement(onlyWith = JDK14OrLater.class) //
     public void markChunkFinal() {
diff --git a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/AbstractServiceLoaderTest.java b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/AbstractServiceLoaderTest.java
index a99c4a9e0b5b..ec31c327a764 100644
--- a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/AbstractServiceLoaderTest.java
+++ b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/AbstractServiceLoaderTest.java
@@ -27,6 +27,7 @@
 import java.util.HashSet;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
+import java.util.ServiceLoader.Provider;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -41,8 +42,8 @@
  * Tests a corner case with respect to an abstract class being registered as a
  * {@linkplain ServiceLoader service}. Although abstract service class cannot be instantiated, it is
  * possible to get its {@link Class} because {@link ServiceLoader#stream()} does not force
- * instantiation as it is a {@link java.util.stream.Stream} of {@link ServiceLoader.Provider}. This
- * is in contrast to {@link ServiceLoader#iterator()}, which iterates the instances.
+ * instantiation as it is a {@link java.util.stream.Stream} of {@link Provider}. This is in contrast
+ * to {@link ServiceLoader#iterator()}, which iterates the instances.
  */
 public class AbstractServiceLoaderTest {
 
diff --git a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/NoProviderConstructorServiceLoaderTest.java b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/NoProviderConstructorServiceLoaderTest.java
index a70d41a3772f..aa50b328cb90 100644
--- a/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/NoProviderConstructorServiceLoaderTest.java
+++ b/substratevm/src/com.oracle.svm.test.jdk11/src/com/oracle/svm/test/jdk11/NoProviderConstructorServiceLoaderTest.java
@@ -67,7 +67,7 @@ public abstract static class NoProviderConstructorService implements ServiceInte
         /**
          * Not a provider constructor. This violates the contract of {@link ServiceLoader}.
          */
-        NoProviderConstructorService(Class<?> clazz) {
+        NoProviderConstructorService(@SuppressWarnings("unused") Class<?> clazz) {
         }
     }
 
@@ -75,7 +75,7 @@ public abstract static class NoProviderConstructorService implements ServiceInte
 
     /**
      * This should actually throw an {@link ServiceConfigurationError}.
-     * 
+     *
      * @see #testLazyStreamHotspot()
      */
     @Test
@@ -89,7 +89,7 @@ public void testLazyStreamNativeImage() {
 
     /**
      * This should actually throw an {@link ServiceConfigurationError}.
-     * 
+     *
      * @see #testEagerStreamHotspot()
      */
     @Test
@@ -103,7 +103,7 @@ public void testEagerStreamNativeImage() {
 
     /**
      * This should actually throw an {@link ServiceConfigurationError}.
-     * 
+     *
      * @see #testEagerIteratorHotspot()
      */
     @Test
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java
index 136806e18c10..3d7f9537ccd3 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/StackTraceTests.java
@@ -103,6 +103,7 @@ public static void a(Type type) {
 
     static final class SecurityManagerSubclass extends SecurityManager {
         @Override
+        @SuppressWarnings({"deprecation"}) // deprecated on JDK 17
         protected Class<?>[] getClassContext() {
             return super.getClassContext();
         }
diff --git a/tools/ci.hocon b/tools/ci.hocon
index 0d225190d8f9..619f10fbbde4 100644
--- a/tools/ci.hocon
+++ b/tools/ci.hocon
@@ -43,8 +43,8 @@ toolsWeekly: ${tools-weekly-notifications} {
 
 builds += [
   ${linux-amd64} ${oraclejdk8}    ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-8"},
-  ${linux-amd64} ${oraclejdk11}   ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-11"},
-  ${linux-amd64} ${oraclejdk17}   ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-17"},
+  ${linux-amd64} ${oraclejdk11}   ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-11"},
+  ${linux-amd64} ${oraclejdk17}   ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-17"},
   ${linux-amd64} ${oraclejdk8}    ${toolsCommon} {
     run : [
         ["mx", "build"],
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
index e4dda5c86d07..753cc5aabea7 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
@@ -1270,6 +1270,7 @@ private static class SchedulerThreadFactory implements ThreadFactory {
 
         private final ThreadGroup group;
 
+        @SuppressWarnings("deprecation")
         SchedulerThreadFactory() {
             SecurityManager s = System.getSecurityManager();
             this.group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
diff --git a/truffle/ci.hocon b/truffle/ci.hocon
index a96017701ee5..04a2516f95ba 100644
--- a/truffle/ci.hocon
+++ b/truffle/ci.hocon
@@ -103,12 +103,12 @@ builds += [
     run : [["mx", "--strict-compliance", "gate", "--strict-mode"]],
     targets : [gate],
     name: "gate-truffle-8"},
-  ${linux-amd64} ${oraclejdk11}   ${truffleCommon} ${eclipse} {
+  ${linux-amd64} ${oraclejdk11}   ${truffleCommon} ${eclipse} ${jdt} {
     environment: {DISABLE_DSL_STATE_BITS_TESTS: "true"},
     run : [["mx", "--strict-compliance", "gate", "--strict-mode"]],
     targets : [gate],
     name: "gate-truffle-oraclejdk-11"},
-  ${linux-amd64} ${oraclejdk17}   ${truffleCommon} ${eclipse} {
+  ${linux-amd64} ${oraclejdk17}   ${truffleCommon} ${eclipse} ${jdt} {
     environment: {DISABLE_DSL_STATE_BITS_TESTS: "true"},
     run : [["mx", "--strict-compliance", "gate", "--strict-mode"]],
     targets : [gate],
diff --git a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
index a240bf156881..b8f1ea821b4b 100644
--- a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
+++ b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/ArrayBasedStaticShape.java
@@ -87,6 +87,7 @@ static <T> ArrayBasedStaticShape<T> create(ArrayBasedShapeGenerator<?> generator
     }
 
     @Override
+    @SuppressWarnings("cast")
     Object getStorage(Object obj, boolean primitive) {
         Object receiverObject = cast(obj, storageClass, false);
         if (safetyChecks) {
@@ -125,6 +126,7 @@ Object getStorage(Object obj, boolean primitive) {
         }
     }
 
+    @SuppressWarnings("cast")
     private boolean checkShape(Object receiverObject) {
         ArrayBasedStaticShape<?> receiverShape = cast(UNSAFE.getObject(receiverObject, (long) propertyLayout.generator.getShapeOffset()), ArrayBasedStaticShape.class, false);
         if (this != receiverShape && (receiverShape.superShapes.length < superShapes.length || receiverShape.superShapes[superShapes.length - 1] != this)) {
diff --git a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/StaticProperty.java b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/StaticProperty.java
index 087795e032e5..a15364cdd67c 100644
--- a/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/StaticProperty.java
+++ b/truffle/src/com.oracle.truffle.api.staticobject/src/com/oracle/truffle/api/staticobject/StaticProperty.java
@@ -71,6 +71,7 @@
  * @see StaticShape.Builder#property(StaticProperty, Class, boolean).
  * @since 21.3.0
  */
+@SuppressWarnings("cast") // make ecj happy
 public abstract class StaticProperty {
     private static final Unsafe UNSAFE = getUnsafe();
     private static final byte STORE_AS_FINAL = (byte) (1 << 7);
@@ -84,7 +85,7 @@ public abstract class StaticProperty {
 
     /**
      * Constructor for subclasses.
-     * 
+     *
      * @since 21.3.0
      */
     protected StaticProperty() {
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
index d6f5a7565cac..390e7c4f93cb 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassLoader.java
@@ -93,6 +93,7 @@ final class HostClassLoader extends ClassLoader implements Closeable {
     }
 
     @Override
+    @SuppressWarnings("deprecation") // security.checkPermission deprecated on JDK 17.
     public void close() throws IOException {
         SecurityManager security = System.getSecurityManager();
         if (security != null) {

From a77506678d9d40c50f29176dc7116d974d8fe980 Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.m.marek@oracle.com>
Date: Thu, 30 Sep 2021 13:04:26 +0200
Subject: [PATCH 292/681] Use FASTR_CC env var.

---
 vm/ci_common/common.hocon | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index 42cfe66a25ff..9c3f9b8f76a0 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -128,6 +128,7 @@ fastr_linux: ${fastr} {
     PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/zlib/1.2.11/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre2/10.37/include -I/cm/shared/apps/curl/7.50.1/include"
     PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64"
     FASTR_FC: "/cm/shared/apps/gcc/4.8.5/bin/gfortran"
+    FASTR_CC: "/cm/shared/apps/gcc/4.8.5/bin/gcc"
     GNUR_HOME_BINARY: "/cm/shared/apps/gnur/4.0.3-gcc4.8.5-pcre2/lib64/R"
   }
   downloads: {
@@ -142,6 +143,7 @@ fastr_darwin: ${fastr} {
   environment:  {
     PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH"
     FASTR_FC: "/cm/shared/apps/gcc/8.3.0/bin/gfortran"
+    FASTR_CC: "/cm/shared/apps/gcc/8.3.0/bin/gcc"
     TZDIR: "/usr/share/zoneinfo"
     FASTR_LIBZ_VER: "1.2.11"
     PKG_INCLUDE_FLAGS_OVERRIDE : "-I/cm/shared/apps/pcre2/pcre2-10.37/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/curl/7.50.1/include"

From b607d8d835a1fb7204598cbd76bc18a98f9bd2ff Mon Sep 17 00:00:00 2001
From: Yudi Zheng <yudi.zheng@oracle.com>
Date: Tue, 5 Oct 2021 15:56:18 +0200
Subject: [PATCH 293/681] Add long, double tests to MulNegateTest.

---
 .../compiler/core/test/MulNegateTest.java     | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
index d6bcfeedbf02..90d68978af95 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/MulNegateTest.java
@@ -29,7 +29,7 @@
 
 public class MulNegateTest extends GraalCompilerTest {
 
-    public static final int[] INT_TEST_CASES = {0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE};
+    public static final int[] INT_TEST_VALUES = {0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE};
 
     public static int mulInt(int x, int y) {
         return -x * -y;
@@ -39,27 +39,62 @@ public static int mulInt(int x, int y) {
     public void testInt() {
         assertTrue(getFinalGraph("mulInt").getNodes().filter(NegateNode.class).count() == 0);
 
-        for (int i : INT_TEST_CASES) {
-            for (int j : INT_TEST_CASES) {
+        for (int i : INT_TEST_VALUES) {
+            for (int j : INT_TEST_VALUES) {
                 test("mulInt", i, j);
             }
         }
     }
 
-    public static final float[] FLOAT_TEST_CASES = {0.0f, -0.0f, 1.0f, -1.0f, Float.MIN_VALUE, Float.MIN_NORMAL,
+    public static final long[] LONG_TEST_VALUES = {0L, 1L, -1L, Long.MIN_VALUE, Long.MAX_VALUE};
+
+    public static long mulLong(long x, long y) {
+        return -x * -y;
+    }
+
+    @Test
+    public void testLong() {
+        assertTrue(getFinalGraph("mulLong").getNodes().filter(NegateNode.class).count() == 0);
+
+        for (long i : LONG_TEST_VALUES) {
+            for (long j : LONG_TEST_VALUES) {
+                test("mulLong", i, j);
+            }
+        }
+    }
+
+    public static final float[] FLOAT_TEST_VALUES = {0.0f, -0.0f, 1.0f, -1.0f, Float.MIN_VALUE, Float.MIN_NORMAL,
                     Float.MAX_VALUE, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY, Float.NaN};
 
-    public static float mulFlt(float x, float y) {
+    public static float mulFloat(float x, float y) {
         return -x * -y;
     }
 
     @Test
     public void testFloat() {
-        assertTrue(getFinalGraph("mulFlt").getNodes().filter(NegateNode.class).count() == 0);
+        assertTrue(getFinalGraph("mulFloat").getNodes().filter(NegateNode.class).count() == 0);
+
+        for (float i : FLOAT_TEST_VALUES) {
+            for (float j : FLOAT_TEST_VALUES) {
+                test("mulFloat", i, j);
+            }
+        }
+    }
+
+    public static final double[] DOUBLE_TEST_VALUES = {0.0d, -0.0d, 1.0d, -1.0d, Double.MIN_VALUE, Double.MIN_NORMAL,
+                    Double.MAX_VALUE, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.NaN};
+
+    public static double mulDouble(double x, double y) {
+        return -x * -y;
+    }
+
+    @Test
+    public void testDouble() {
+        assertTrue(getFinalGraph("mulDouble").getNodes().filter(NegateNode.class).count() == 0);
 
-        for (float i : FLOAT_TEST_CASES) {
-            for (float j : FLOAT_TEST_CASES) {
-                test("mulFlt", i, j);
+        for (double i : DOUBLE_TEST_VALUES) {
+            for (double j : DOUBLE_TEST_VALUES) {
+                test("mulDouble", i, j);
             }
         }
     }

From 50e68742073d2f579a6e673900344479f1109311 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Tue, 5 Oct 2021 17:54:58 +0200
Subject: [PATCH 294/681] [GR-34181] Fixed review comments.

---
 .../src/org/graalvm/polyglot/Engine.java      |  66 +++----
 .../src/org/graalvm/polyglot/Source.java      |  26 +--
 .../polyglot/impl/AbstractPolyglotImpl.java   |  37 ++--
 .../test/wrapper/HostPolyglotDispatch.java    |  40 +++-
 .../truffle/polyglot/EngineAccessor.java      |   2 +-
 .../oracle/truffle/polyglot/FileSystems.java  |   2 +-
 .../oracle/truffle/polyglot/PolyglotImpl.java | 136 ++++++++++++-
 .../polyglot/PolyglotSourceFactory.java       | 184 ------------------
 8 files changed, 215 insertions(+), 278 deletions(-)
 delete mode 100644 truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java

diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
index e9d2ec661849..3967fbee45f0 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Engine.java
@@ -879,8 +879,6 @@ static Iterator<? extends AbstractPolyglotImpl> createInvalidPolyglotImpl() {
 
     private static class PolyglotInvalid extends AbstractPolyglotImpl {
 
-        private final EmptySourceFactory sourceFactory = new EmptySourceFactory(this);
-
         /**
          * Forces ahead-of-time initialization.
          *
@@ -938,11 +936,6 @@ private static RuntimeException noPolyglotImplementationFound() {
             return new IllegalStateException("No language and polyglot implementation was found on the classpath. " + suggestion);
         }
 
-        @Override
-        public AbstractSourceFactory getSourceFactory() {
-            return sourceFactory;
-        }
-
         @Override
         public Class<?> loadLanguageClass(String className) {
             return null;
@@ -971,47 +964,40 @@ public FileSystem newDefaultFileSystem() {
             throw noPolyglotImplementationFound();
         }
 
-        static class EmptySourceFactory extends AbstractSourceFactory {
-
-            EmptySourceFactory(AbstractPolyglotImpl polyglot) {
-                super(polyglot);
-            }
-
-            @Override
-            public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
-                            throws IOException {
-                throw noPolyglotImplementationFound();
-            }
+        @Override
+        public <S, T> Object newTargetTypeMapping(Class<S> sourceType, Class<T> targetType, Predicate<S> acceptsValue, Function<S, T> convertValue, TargetMappingPrecedence precedence) {
+            return new Object();
+        }
 
-            @Override
-            public String findLanguage(File file) throws IOException {
-                return null;
-            }
+        @Override
+        public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
+                        throws IOException {
+            throw noPolyglotImplementationFound();
+        }
 
-            @Override
-            public String findLanguage(URL url) throws IOException {
-                return null;
-            }
+        @Override
+        public String findLanguage(File file) throws IOException {
+            return null;
+        }
 
-            @Override
-            public String findMimeType(File file) throws IOException {
-                return null;
-            }
+        @Override
+        public String findLanguage(URL url) throws IOException {
+            return null;
+        }
 
-            @Override
-            public String findMimeType(URL url) throws IOException {
-                return null;
-            }
+        @Override
+        public String findMimeType(File file) throws IOException {
+            return null;
+        }
 
-            @Override
-            public String findLanguage(String mimeType) {
-                return null;
-            }
+        @Override
+        public String findMimeType(URL url) throws IOException {
+            return null;
         }
 
         @Override
-        public <S, T> Object newTargetTypeMapping(Class<S> sourceType, Class<T> targetType, Predicate<S> acceptsValue, Function<S, T> convertValue, TargetMappingPrecedence precedence) {
-            return new Object();
+        public String findLanguage(String mimeType) {
+            return null;
         }
 
     }
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
index 190e9783c3d8..62ffc5c43039 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/Source.java
@@ -51,8 +51,8 @@
 import java.nio.charset.Charset;
 import java.util.Objects;
 
+import org.graalvm.polyglot.impl.AbstractPolyglotImpl;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceDispatch;
-import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceFactory;
 import org.graalvm.polyglot.io.ByteSequence;
 
 /**
@@ -131,17 +131,17 @@
  */
 public final class Source {
 
-    private static volatile AbstractSourceFactory FACTORY;
+    private static volatile AbstractPolyglotImpl IMPL;
 
-    static AbstractSourceFactory getFactory() {
-        if (FACTORY == null) {
+    static AbstractPolyglotImpl getImpl() {
+        if (IMPL == null) {
             synchronized (Engine.class) {
-                if (FACTORY == null) {
-                    FACTORY = Engine.getImpl().getSourceFactory();
+                if (IMPL == null) {
+                    IMPL = Engine.getImpl();
                 }
             }
         }
-        return FACTORY;
+        return IMPL;
     }
 
     final AbstractSourceDispatch dispatch;
@@ -593,7 +593,7 @@ public static Source create(String language, CharSequence source) {
      * @since 19.0
      */
     public static String findLanguage(File file) throws IOException {
-        return getFactory().findLanguage(file);
+        return getImpl().findLanguage(file);
     }
 
     /**
@@ -614,7 +614,7 @@ public static String findLanguage(File file) throws IOException {
      * @since 19.0
      */
     public static String findLanguage(URL url) throws IOException {
-        return getFactory().findLanguage(url);
+        return getImpl().findLanguage(url);
     }
 
     /**
@@ -627,7 +627,7 @@ public static String findLanguage(URL url) throws IOException {
      * @since 19.0
      */
     public static String findMimeType(File file) throws IOException {
-        return getFactory().findMimeType(file);
+        return getImpl().findMimeType(file);
     }
 
     /**
@@ -642,7 +642,7 @@ public static String findMimeType(File file) throws IOException {
      * @since 19.0
      */
     public static String findMimeType(URL url) throws IOException {
-        return getFactory().findMimeType(url);
+        return getImpl().findMimeType(url);
     }
 
     /**
@@ -654,7 +654,7 @@ public static String findMimeType(URL url) throws IOException {
      * @since 19.0
      */
     public static String findLanguage(String mimeType) {
-        return getFactory().findLanguage(mimeType);
+        return getImpl().findLanguage(mimeType);
     }
 
     @SuppressWarnings({"unchecked", "unused"})
@@ -917,7 +917,7 @@ public Builder encoding(Charset encoding) {
          * @since 19.0
          */
         public Source build() throws IOException {
-            Source source = getFactory().build(language, origin, uri, name, mimeType, content, interactive, internal, cached, fileEncoding);
+            Source source = getImpl().build(language, origin, uri, name, mimeType, content, interactive, internal, cached, fileEncoding);
 
             // make sure origin is not consumed again if builder is used twice
             if (source.hasBytes()) {
diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
index e6c1adc78a0c..3da7f585210f 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/impl/AbstractPolyglotImpl.java
@@ -302,7 +302,18 @@ public abstract Engine buildEngine(OutputStream out, OutputStream err, InputStre
 
     public abstract void resetPreInitializedEngine();
 
-    public abstract AbstractSourceFactory getSourceFactory();
+    public abstract Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
+                    throws IOException;
+
+    public abstract String findLanguage(File file) throws IOException;
+
+    public abstract String findLanguage(URL url) throws IOException;
+
+    public abstract String findLanguage(String mimeType);
+
+    public abstract String findMimeType(File file) throws IOException;
+
+    public abstract String findMimeType(URL url) throws IOException;
 
     /**
      * Returns the default host dispatch of this polyglot abstraction.
@@ -342,30 +353,6 @@ public final AbstractPolyglotImpl getPolyglotImpl() {
 
     }
 
-    public abstract static class AbstractSourceFactory {
-
-        protected final AbstractPolyglotImpl engineImpl;
-
-        protected AbstractSourceFactory(AbstractPolyglotImpl engineImpl) {
-            Objects.requireNonNull(engineImpl);
-            this.engineImpl = engineImpl;
-        }
-
-        public abstract Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
-                        throws IOException;
-
-        public abstract String findLanguage(File file) throws IOException;
-
-        public abstract String findLanguage(URL url) throws IOException;
-
-        public abstract String findLanguage(String mimeType);
-
-        public abstract String findMimeType(File file) throws IOException;
-
-        public abstract String findMimeType(URL url) throws IOException;
-
-    }
-
     public abstract static class AbstractSourceDispatch {
 
         protected final AbstractPolyglotImpl engineImpl;
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
index e60efa30cc1e..5eda0ac9a828 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/wrapper/HostPolyglotDispatch.java
@@ -40,8 +40,13 @@
  */
 package com.oracle.truffle.api.test.wrapper;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -109,11 +114,6 @@ public void resetPreInitializedEngine() {
         getNext().resetPreInitializedEngine();
     }
 
-    @Override
-    public AbstractSourceFactory getSourceFactory() {
-        return getNext().getSourceFactory();
-    }
-
     @Override
     public Class<?> loadLanguageClass(String className) {
         return getNext().loadLanguageClass(className);
@@ -158,4 +158,34 @@ public int getPriority() {
         return Integer.MAX_VALUE;
     }
 
+    @Override
+    public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
+                    throws IOException {
+        return getNext().build(language, origin, uri, name, mimeType, content, interactive, internal, cached, encoding);
+    }
+
+    @Override
+    public String findLanguage(File file) throws IOException {
+        return getNext().findLanguage(file);
+    }
+
+    @Override
+    public String findLanguage(URL url) throws IOException {
+        return getNext().findLanguage(url);
+    }
+
+    @Override
+    public String findMimeType(File file) throws IOException {
+        return getNext().findMimeType(file);
+    }
+
+    @Override
+    public String findMimeType(URL url) throws IOException {
+        return getNext().findMimeType(url);
+    }
+
+    @Override
+    public String findLanguage(String mimeType) {
+        return getNext().findLanguage(mimeType);
+    }
 }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
index 19a8c0fd24d7..f5ec7e834134 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/EngineAccessor.java
@@ -115,12 +115,12 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
+import com.oracle.truffle.polyglot.PolyglotImpl.EmbedderFileSystemContext;
 import com.oracle.truffle.polyglot.PolyglotImpl.VMObject;
 import com.oracle.truffle.polyglot.PolyglotLocals.InstrumentContextLocal;
 import com.oracle.truffle.polyglot.PolyglotLocals.InstrumentContextThreadLocal;
 import com.oracle.truffle.polyglot.PolyglotLocals.LanguageContextLocal;
 import com.oracle.truffle.polyglot.PolyglotLocals.LanguageContextThreadLocal;
-import com.oracle.truffle.polyglot.PolyglotSourceFactory.EmbedderFileSystemContext;
 import com.oracle.truffle.polyglot.PolyglotThread.ThreadSpawnRootNode;
 
 final class EngineAccessor extends Accessor {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
index 6b6165e384ce..000886d5d8c4 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/FileSystems.java
@@ -74,7 +74,7 @@
 
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.nodes.LanguageInfo;
-import com.oracle.truffle.polyglot.PolyglotSourceFactory.EmbedderFileSystemContext;
+import com.oracle.truffle.polyglot.PolyglotImpl.EmbedderFileSystemContext;
 
 import java.nio.charset.Charset;
 import org.graalvm.nativeimage.ImageInfo;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
index b127e39e8e5e..9d9fae7dc235 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotImpl.java
@@ -40,14 +40,22 @@
  */
 package com.oracle.truffle.polyglot;
 
+import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
 import static com.oracle.truffle.polyglot.EngineAccessor.INSTRUMENT;
 
+import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
 import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -55,6 +63,7 @@
 import java.util.function.Supplier;
 import java.util.logging.Handler;
 
+import com.oracle.truffle.api.TruffleFile;
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
@@ -63,6 +72,7 @@
 import org.graalvm.polyglot.ResourceLimitEvent;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.impl.AbstractPolyglotImpl;
+import org.graalvm.polyglot.io.ByteSequence;
 import org.graalvm.polyglot.io.FileSystem;
 import org.graalvm.polyglot.io.MessageTransport;
 import org.graalvm.polyglot.proxy.Proxy;
@@ -88,7 +98,6 @@ public final class PolyglotImpl extends AbstractPolyglotImpl {
     static final String OPTION_GROUP_ENGINE = "engine";
     static final String PROP_ALLOW_EXPERIMENTAL_OPTIONS = OptionValuesImpl.SYSTEM_PROPERTY_PREFIX + OPTION_GROUP_ENGINE + ".AllowExperimentalOptions";
 
-    private final PolyglotSourceFactory sourceFactory = new PolyglotSourceFactory(this);
     private final PolyglotSourceDispatch sourceDispatch = new PolyglotSourceDispatch(this);
     private final PolyglotSourceSectionDispatch sourceSectionDispatch = new PolyglotSourceSectionDispatch(this);
     private final PolyglotManagementDispatch executionListenerDispatch = new PolyglotManagementDispatch(this);
@@ -103,6 +112,7 @@ public final class PolyglotImpl extends AbstractPolyglotImpl {
     private final Map<Class<?>, PolyglotValueDispatch> primitiveValues = new HashMap<>();
     Value hostNull; // effectively final
     private PolyglotValueDispatch disconnectedHostValue;
+    private volatile Object defaultFileSystemContext;
 
     private static volatile PolyglotImpl polyglotImpl;
 
@@ -160,14 +170,6 @@ public Object buildLimits(long statementLimit, Predicate<org.graalvm.polyglot.So
         }
     }
 
-    /**
-     * Internal method do not use.
-     */
-    @Override
-    public AbstractSourceFactory getSourceFactory() {
-        return sourceFactory;
-    }
-
     /**
      * Internal method do not use.
      */
@@ -444,6 +446,122 @@ public AbstractHostAccess createHostAccess() {
         return new PolyglotHostAccess(this);
     }
 
+    @Override
+    public String findLanguage(File file) throws IOException {
+        Objects.requireNonNull(file);
+        String mimeType = findMimeType(file);
+        if (mimeType != null) {
+            return findLanguage(mimeType);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String findLanguage(URL url) throws IOException {
+        String mimeType = findMimeType(url);
+        if (mimeType != null) {
+            return findLanguage(mimeType);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String findMimeType(File file) throws IOException {
+        Objects.requireNonNull(file);
+        TruffleFile truffleFile = EngineAccessor.LANGUAGE.getTruffleFile(file.toPath().toString(), getDefaultFileSystemContext());
+        return truffleFile.detectMimeType();
+    }
+
+    @Override
+    public String findMimeType(URL url) throws IOException {
+        Objects.requireNonNull(url);
+        return EngineAccessor.SOURCE.findMimeType(url, getDefaultFileSystemContext());
+    }
+
+    @Override
+    public String findLanguage(String mimeType) {
+        Objects.requireNonNull(mimeType);
+        LanguageCache cache = LanguageCache.languageMimes().get(mimeType);
+        if (cache != null) {
+            return cache.getId();
+        }
+        return null;
+    }
+
+    @Override
+    public org.graalvm.polyglot.Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached,
+                    Charset encoding)
+                    throws IOException {
+        assert language != null;
+        com.oracle.truffle.api.source.Source.SourceBuilder builder;
+        if (origin instanceof File) {
+            builder = EngineAccessor.SOURCE.newBuilder(language, (File) origin);
+        } else if (origin instanceof CharSequence) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((CharSequence) origin), name);
+        } else if (origin instanceof ByteSequence) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((ByteSequence) origin), name);
+        } else if (origin instanceof Reader) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (Reader) origin, name);
+        } else if (origin instanceof URL) {
+            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (URL) origin);
+        } else {
+            throw shouldNotReachHere();
+        }
+
+        if (origin instanceof File || origin instanceof URL) {
+            EngineAccessor.SOURCE.setFileSystemContext(builder, getDefaultFileSystemContext());
+        }
+
+        if (content instanceof CharSequence) {
+            builder.content((CharSequence) content);
+        } else if (content instanceof ByteSequence) {
+            builder.content((ByteSequence) content);
+        }
+
+        builder.uri(uri);
+        builder.name(name);
+        builder.internal(internal);
+        builder.interactive(interactive);
+        builder.mimeType(mimeType);
+        builder.cached(cached);
+        builder.encoding(encoding);
+
+        try {
+            return PolyglotImpl.getOrCreatePolyglotSource(this, builder.build());
+        } catch (IOException e) {
+            throw e;
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw shouldNotReachHere(e);
+        }
+    }
+
+    private Object getDefaultFileSystemContext() {
+        Object res = defaultFileSystemContext;
+        if (res == null) {
+            synchronized (this) {
+                res = defaultFileSystemContext;
+                if (res == null) {
+                    EmbedderFileSystemContext context = new EmbedderFileSystemContext();
+                    res = EngineAccessor.LANGUAGE.createFileSystemContext(context, context.fileSystem);
+                    defaultFileSystemContext = res;
+                }
+            }
+        }
+        return res;
+    }
+
+    static final class EmbedderFileSystemContext {
+
+        final FileSystem fileSystem = FileSystems.newDefaultFileSystem();
+        final Map<String, LanguageCache> cachedLanguages = LanguageCache.languages();
+        final Supplier<Map<String, Collection<? extends TruffleFile.FileTypeDetector>>> fileTypeDetectors = FileSystems.newFileTypeDetectorsSupplier(cachedLanguages.values());
+
+    }
+
     static org.graalvm.polyglot.Source getOrCreatePolyglotSource(PolyglotImpl polyglot, Source source) {
         return EngineAccessor.SOURCE.getOrCreatePolyglotSource(source, (t) -> polyglot.getAPIAccess().newSource(polyglot.sourceDispatch, t));
     }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java
deleted file mode 100644
index 7b82b19d760e..000000000000
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotSourceFactory.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * The Universal Permissive License (UPL), Version 1.0
- *
- * Subject to the condition set forth below, permission is hereby granted to any
- * person obtaining a copy of this software, associated documentation and/or
- * data (collectively the "Software"), free of charge and under any and all
- * copyright rights in the Software, and any and all patent rights owned or
- * freely licensable by each licensor hereunder covering either (i) the
- * unmodified Software as contributed to or provided by such licensor, or (ii)
- * the Larger Works (as defined below), to deal in both
- *
- * (a) the Software, and
- *
- * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
- * one is included with the Software each a "Larger Work" to which the Software
- * is contributed by such licensors),
- *
- * without restriction, including without limitation the rights to copy, create
- * derivative works of, display, perform, and distribute the Software and make,
- * use, sell, offer for sale, import, export, have made, and have sold the
- * Software and the Larger Work(s), and to sublicense the foregoing rights on
- * either these or other terms.
- *
- * This license is subject to the following condition:
- *
- * The above copyright notice and either this complete permission notice or at a
- * minimum a reference to the UPL must be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.oracle.truffle.polyglot;
-
-import com.oracle.truffle.api.TruffleFile;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.impl.AbstractPolyglotImpl.AbstractSourceFactory;
-import org.graalvm.polyglot.io.ByteSequence;
-import org.graalvm.polyglot.io.FileSystem;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-import static com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere;
-
-final class PolyglotSourceFactory extends AbstractSourceFactory {
-
-    private volatile Object defaultFileSystemContext;
-
-    PolyglotSourceFactory(PolyglotImpl polyglot) {
-        super(polyglot);
-    }
-
-    @Override
-    public String findLanguage(File file) throws IOException {
-        Objects.requireNonNull(file);
-        String mimeType = findMimeType(file);
-        if (mimeType != null) {
-            return findLanguage(mimeType);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String findLanguage(URL url) throws IOException {
-        String mimeType = findMimeType(url);
-        if (mimeType != null) {
-            return findLanguage(mimeType);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String findMimeType(File file) throws IOException {
-        Objects.requireNonNull(file);
-        TruffleFile truffleFile = EngineAccessor.LANGUAGE.getTruffleFile(file.toPath().toString(), getDefaultFileSystemContext());
-        return truffleFile.detectMimeType();
-    }
-
-    @Override
-    public String findMimeType(URL url) throws IOException {
-        Objects.requireNonNull(url);
-        return EngineAccessor.SOURCE.findMimeType(url, getDefaultFileSystemContext());
-    }
-
-    @Override
-    public String findLanguage(String mimeType) {
-        Objects.requireNonNull(mimeType);
-        LanguageCache cache = LanguageCache.languageMimes().get(mimeType);
-        if (cache != null) {
-            return cache.getId();
-        }
-        return null;
-    }
-
-    @Override
-    public Source build(String language, Object origin, URI uri, String name, String mimeType, Object content, boolean interactive, boolean internal, boolean cached, Charset encoding)
-                    throws IOException {
-        assert language != null;
-        com.oracle.truffle.api.source.Source.SourceBuilder builder;
-        if (origin instanceof File) {
-            builder = EngineAccessor.SOURCE.newBuilder(language, (File) origin);
-        } else if (origin instanceof CharSequence) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((CharSequence) origin), name);
-        } else if (origin instanceof ByteSequence) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, ((ByteSequence) origin), name);
-        } else if (origin instanceof Reader) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (Reader) origin, name);
-        } else if (origin instanceof URL) {
-            builder = com.oracle.truffle.api.source.Source.newBuilder(language, (URL) origin);
-        } else {
-            throw shouldNotReachHere();
-        }
-
-        if (origin instanceof File || origin instanceof URL) {
-            EngineAccessor.SOURCE.setFileSystemContext(builder, getDefaultFileSystemContext());
-        }
-
-        if (content instanceof CharSequence) {
-            builder.content((CharSequence) content);
-        } else if (content instanceof ByteSequence) {
-            builder.content((ByteSequence) content);
-        }
-
-        builder.uri(uri);
-        builder.name(name);
-        builder.internal(internal);
-        builder.interactive(interactive);
-        builder.mimeType(mimeType);
-        builder.cached(cached);
-        builder.encoding(encoding);
-
-        try {
-            return PolyglotImpl.getOrCreatePolyglotSource((PolyglotImpl) engineImpl, builder.build());
-        } catch (IOException e) {
-            throw e;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw shouldNotReachHere(e);
-        }
-    }
-
-    private Object getDefaultFileSystemContext() {
-        Object res = defaultFileSystemContext;
-        if (res == null) {
-            synchronized (this) {
-                res = defaultFileSystemContext;
-                if (res == null) {
-                    EmbedderFileSystemContext context = new EmbedderFileSystemContext();
-                    res = EngineAccessor.LANGUAGE.createFileSystemContext(context, context.fileSystem);
-                    defaultFileSystemContext = res;
-                }
-            }
-        }
-        return res;
-    }
-
-    static final class EmbedderFileSystemContext {
-
-        final FileSystem fileSystem = FileSystems.newDefaultFileSystem();
-        final Map<String, LanguageCache> cachedLanguages = LanguageCache.languages();
-        final Supplier<Map<String, Collection<? extends TruffleFile.FileTypeDetector>>> fileTypeDetectors = FileSystems.newFileTypeDetectorsSupplier(cachedLanguages.values());
-
-    }
-}

From 9c1be73f7f9e5b1c6570341332c7c5aaf05631ec Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 5 Oct 2021 12:49:28 +0100
Subject: [PATCH 295/681] Color samples with no self hits grey in compilation
 coloring.

---
 .../truffle/tools/profiler/impl/resources/color_change.js     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 97263e6a4cbf..5dfd541ca718 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -56,6 +56,10 @@ function color_for_name(language_index, name) {
 }
 
 function color_for_compilation(interpreted, compiled) {
+    if (interpreted + compiled == 0) {
+        let gray = 192.0
+        return "rgb(" + gray.toFixed() + ", " + gray.toFixed() + ", " + gray.toFixed() + ")";
+    }
     let total = compiled + interpreted;
     let h = total == 0 ? 0.0 : (2.0 / 3.0) * (interpreted / total);
     let h6 = h * 6;

From cc8a112479b53e998ec515c9fa079ad7a7d9f0a2 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 5 Oct 2021 12:49:51 +0100
Subject: [PATCH 296/681] Recalculate compilation coloring when collapsed state
 changes.

---
 .../truffle/tools/profiler/impl/resources/flamegraph.js  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 948ca1d98831..ac5a94beeddd 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -116,6 +116,7 @@ function fg_toggle_collapse() {
     } else {
         zoom(fg_element_for_sample(sample_to_zoom_to));
     }
+    fg_update_color(color_type)
 }
 
 function fg_x_for_sample(sample) {
@@ -417,7 +418,7 @@ function fg_reset_search() {
 }
 
 function fg_update_color(color_type) {
-    let iter = sample_and_children_depth_first(profileData[0]);
+    let iter = fg_sample_and_children_depth_first(profileData[0]);
     let c = iter.next();
     while (!c.done) {
         let sample = c.value;
@@ -440,7 +441,11 @@ function fg_color_for_sample(color_type, sample) {
     } else if (color_type == "bl") {
         return color_for_name(sample.l, name_for_sample(sample));
     } else if (color_type = "bc") {
-        return color_for_compilation(sample.i, sample.c);
+        if (fg_collapsed) {
+            return color_for_compilation(sample.ri, sample.rc);
+        } else {
+            return color_for_compilation(sample.i, sample.c);
+        }
     }
 }
 

From 6e883d5244848c61ce7db91d5ee8c601e60d936b Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 5 Oct 2021 12:54:32 +0100
Subject: [PATCH 297/681] Add no samples compilation color to legend.

---
 .../truffle/tools/profiler/impl/resources/color_change.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 5dfd541ca718..7b5ddbbcc8b6 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -166,14 +166,15 @@ function color_create_legend() {
             }
         }
     } else if (color_type == "bc") {
+        color_legend_entry(e, 0, color_for_compilation(0, 0), "No self samples");
         for (let i = 0; i <= 10; i++) {
             let color = color_for_compilation(10 - i, i);
             let text = (i * 10) + "% samples were compiled.";
 
-            color_legend_entry(e, i, color, text);
+            color_legend_entry(e, i + 1, color, text);
         }
 
-        entry_count = 11;
+        entry_count = 12;
     }
 
     r.height.baseVal.value = (fg_frameheight * 2.5) + (entry_count + 1) * fg_frameheight * 1.5;

From 028cf056a02d88fbe3a5f510c9b2f2ce9d57616b Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 5 Oct 2021 13:09:23 +0100
Subject: [PATCH 298/681] Fix compilation coloring of histogram when recursive
 calls collapsed.

---
 .../tools/profiler/impl/resources/histogram.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index 206d980a3285..123191d70c87 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -70,7 +70,7 @@ function h_reset_search() {
             if (e != null) {
                 let color = bar.currentColor;
                 if (color == undefined) {
-                    color = fg_color_for_sample(color_type, bar);
+                    color = h_color_for_sample(color_type, bar);
                 }
                 let r = e.children[1];
                 r.style.fill = color;
@@ -126,7 +126,7 @@ function h_create_element_for_id(id, bar, width) {
     r.width.baseVal.value = width;
     r.height.baseVal.value = fg_frameheight
 
-    r.style.fill = fg_color_for_sample(color_type, bar);
+    r.style.fill = h_color_for_sample(color_type, bar);
     r.rx.baseVal.value = 2;
     r.ry.baseVal.vlaue = 2;
 
@@ -168,7 +168,7 @@ function h_update_bar(id, bar) {
             (100 * (bar.c + bar.i) / (fg_xmax - fg_xmin)).toFixed(2) + "% of displayed samples.\n";
 
         r.width.baseVal.value = width;
-        r.style.fill = fg_color_for_sample(color_type, bar);
+        r.style.fill = h_color_for_sample(color_type, bar);
         t.textContent = name;
         let t_width = t.textLength.baseVal.value;
         if (t_width < width - 6) {
@@ -267,7 +267,7 @@ function calculate_histogram_bars(bars, sample) {
 function h_update_color(color_type) {
     for (let i = 0; i < histogramData.length; i++) {
         let bar = histogramData[i];
-        let color = fg_color_for_sample(color_type, bar);
+        let color = h_color_for_sample(color_type, bar);
         bar.currentColor = color;
         if (bar.searchMatch != true) {
             let e = h_element_for_id(i);
@@ -279,6 +279,16 @@ function h_update_color(color_type) {
     }
 }
 
+function h_color_for_sample(color_type, sample) {
+    if (color_type == "fg") {
+        return color_for_name(0, name_for_sample(sample));
+    } else if (color_type == "bl") {
+        return color_for_name(sample.l, name_for_sample(sample));
+    } else if (color_type = "bc") {
+        return color_for_compilation(sample.i, sample.c);
+    }
+}
+
 function h_resize(new_width) {
     h_width = new_width
     let h_svg = histogram.parentElement;

From 9e43e05f2d24f0638f74f4e171c783cf7786e6ec Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 5 Oct 2021 19:01:49 +0200
Subject: [PATCH 299/681] Cache leafTypeAssumption in the specialization of
 ConstantClass node

---
 .../truffle/espresso/nodes/bytecodes/InstanceOf.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
index f6aaa7710323..7cda041fff6f 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InstanceOf.java
@@ -30,6 +30,7 @@
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.espresso.analysis.hierarchy.LeafTypeAssumption;
 import com.oracle.truffle.espresso.impl.ArrayKlass;
 import com.oracle.truffle.espresso.impl.Klass;
 import com.oracle.truffle.espresso.impl.ObjectKlass;
@@ -222,11 +223,13 @@ boolean doFallback(Klass maybeSubtype) {
     abstract static class ConstantClass extends InstanceOf {
 
         private final ObjectKlass superType;
-        protected final Assumption superTypeIsLeaf;
 
         ConstantClass(ObjectKlass superType) {
             this.superType = superType;
-            this.superTypeIsLeaf = EspressoContext.get(this).getClassHierarchyOracle().isLeafClass(this.superType).getAssumption();
+        }
+
+        protected LeafTypeAssumption getLeafAssumption() {
+            return EspressoContext.get(this).getClassHierarchyOracle().isLeafClass(superType);
         }
 
         /**
@@ -234,11 +237,12 @@ abstract static class ConstantClass extends InstanceOf {
          * {@code superType} iff it is equal to {@code superType}.
          */
         @Specialization(assumptions = "superTypeIsLeaf")
-        public boolean doLeaf(ObjectKlass maybeSubtype) {
+        public boolean doLeaf(ObjectKlass maybeSubtype,
+                        @SuppressWarnings("unused") @Cached("getLeafAssumption().getAssumption()") Assumption superTypeIsLeaf) {
             return superType == maybeSubtype;
         }
 
-        @Specialization(guards = "!superTypeIsLeaf.isValid()")
+        @Specialization(replaces = "doLeaf")
         public boolean doObjectKlass(ObjectKlass maybeSubtype) {
             return superType == maybeSubtype || superType.checkOrdinaryClassSubclassing(maybeSubtype);
         }

From 61fb26b1851b6907190a65b56eb212bd93731769 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 5 Oct 2021 19:05:05 +0200
Subject: [PATCH 300/681] Rename EnableCHA commandline option to CHA

---
 .../src/com/oracle/truffle/espresso/EspressoOptions.java        | 2 +-
 .../com/oracle/truffle/espresso/runtime/EspressoContext.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
index 65b72e205d82..a3569aa7cd9d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoOptions.java
@@ -238,7 +238,7 @@ public VerifyMode apply(String s) {
 
     @Option(help = "Enable Class Hierarchy Analysis, which optimizes instanceof checks and virtual method calls by keeping track of descendants of a given class or interface.", //
                     category = OptionCategory.EXPERT, stability = OptionStability.EXPERIMENTAL) //
-    public static final OptionKey<Boolean> EnableCHA = new OptionKey<>(false);
+    public static final OptionKey<Boolean> CHA = new OptionKey<>(false);
 
     private static final OptionType<com.oracle.truffle.espresso.jdwp.api.JDWPOptions> JDWP_OPTIONS_OPTION_TYPE = new OptionType<>("JDWPOptions",
                     new Function<String, JDWPOptions>() {
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
index 8de0949cdec3..3969bb1088c7 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
@@ -274,7 +274,7 @@ public EspressoContext(TruffleLanguage.Env env, EspressoLanguage language) {
         this.EnableSignals = env.getOptions().get(EspressoOptions.EnableSignals);
         this.SpecCompliancyMode = env.getOptions().get(EspressoOptions.SpecCompliancy);
         this.livenessAnalysis = env.getOptions().get(EspressoOptions.LivenessAnalysis);
-        this.EnableClassHierarchyAnalysis = env.getOptions().get(EspressoOptions.EnableCHA);
+        this.EnableClassHierarchyAnalysis = env.getOptions().get(EspressoOptions.CHA);
         this.EnableManagement = env.getOptions().get(EspressoOptions.EnableManagement);
         this.EnableAgents = getEnv().getOptions().get(EspressoOptions.EnableAgents);
         this.TrivialMethodSize = getEnv().getOptions().get(EspressoOptions.TrivialMethodSize);

From 0472878e1967e0e07ea43b60990af688aad5b695 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Tue, 5 Oct 2021 18:24:25 +0100
Subject: [PATCH 301/681] Store colour data based on keys rather than name
 strings.

---
 .../oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java  | 2 +-
 .../truffle/tools/profiler/impl/resources/color_change.js     | 4 ++--
 .../truffle/tools/profiler/impl/resources/flamegraph.js       | 4 ++--
 .../truffle/tools/profiler/impl/resources/graphowner.js       | 4 ++++
 .../oracle/truffle/tools/profiler/impl/resources/histogram.js | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index f1b297e4e730..9e6252a6b552 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -545,7 +545,7 @@ private String samples() {
                 if (colorsForNames.containsKey(cm)) {
                     JSONObject map = new JSONObject();
                     for (Map.Entry<String, String> e : colorsForNames.get(cm).entrySet()) {
-                        map.put(e.getKey(), e.getValue());
+                        map.put(nameHash.get(e.getKey()).toString(), e.getValue());
                     }
                     colors.put(map);
                 } else {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 7b5ddbbcc8b6..11adcc846671 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -51,8 +51,8 @@ function update_color(color_type) {
     h_update_color(color_type);
 }
 
-function color_for_name(language_index, name) {
-    return colorData[language_index][name];
+function color_for_key(language_index, key) {
+    return colorData[language_index][key];
 }
 
 function color_for_compilation(interpreted, compiled) {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index ac5a94beeddd..ee2a2647e14d 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -437,9 +437,9 @@ function fg_update_color(color_type) {
 
 function fg_color_for_sample(color_type, sample) {
     if (color_type == "fg") {
-        return color_for_name(0, name_for_sample(sample));
+        return color_for_key(0, key_for_sample(sample));
     } else if (color_type == "bl") {
-        return color_for_name(sample.l, name_for_sample(sample));
+        return color_for_key(sample.l, key_for_sample(sample));
     } else if (color_type = "bc") {
         if (fg_collapsed) {
             return color_for_compilation(sample.ri, sample.rc);
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 9b7535609933..f9389854b638 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -258,6 +258,10 @@ function title(e) {
     }
 }
 
+function key_for_sample(sample) {
+    return sample.n;
+}
+
 function name_for_sample(sample) {
     return profileNames[sample.n];
 }
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index 123191d70c87..b10e35847560 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -281,9 +281,9 @@ function h_update_color(color_type) {
 
 function h_color_for_sample(color_type, sample) {
     if (color_type == "fg") {
-        return color_for_name(0, name_for_sample(sample));
+        return color_for_key(0, key_for_sample(sample));
     } else if (color_type == "bl") {
-        return color_for_name(sample.l, name_for_sample(sample));
+        return color_for_key(sample.l, key_for_sample(sample));
     } else if (color_type = "bc") {
         return color_for_compilation(sample.i, sample.c);
     }

From 8f1e20325417823527714ef6f86301af2b082628 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Tue, 5 Oct 2021 20:03:40 +0200
Subject: [PATCH 302/681] Rename AlwaysInvalid assumption to NeverValid

---
 .../analysis/hierarchy/NoOpClassHierarchyOracle.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
index bb6efadf2d26..a5d3489af394 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -34,9 +34,9 @@
 public class NoOpClassHierarchyOracle implements ClassHierarchyOracle {
     protected static class LeafTypeAssumptionImpl implements LeafTypeAssumption {
         private final Assumption underlying;
-        static final LeafTypeAssumption AlwaysInvalid = new LeafTypeAssumptionImpl("invalid");
+        static final LeafTypeAssumption NeverValidAssumption = new LeafTypeAssumptionImpl("invalid");
         static {
-            AlwaysInvalid.getAssumption().invalidate();
+            NeverValidAssumption.getAssumption().invalidate();
         }
 
         private LeafTypeAssumptionImpl(String assumptionName) {
@@ -56,7 +56,7 @@ public Assumption getAssumption() {
     protected static final LeafTypeAssumptionAccessor assumptionAccessor = new LeafTypeAssumptionAccessor();
 
     protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl("final class is always a CHA leaf");
-    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.AlwaysInvalid;
+    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.NeverValidAssumption;
 
     @Override
     public LeafTypeAssumption createAssumptionForNewKlass(ObjectKlass newKlass) {

From f5ba182fc82f926f89af5b86e5fed87bf50b308e Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 5 Oct 2021 23:54:12 +0300
Subject: [PATCH 303/681] Test docs/examples with GraalVM EE Java 11 21.3-dev

---
 .../architecture-overview.md                  |  5 +-
 docs/examples/java-kotlin-aot.md              | 66 +++++++------
 docs/examples/java-performance-examples.md    | 84 ++++++++--------
 docs/examples/java-simple-stream-benchmark.md | 59 ++++++------
 docs/examples/native-image-examples.md        | 95 ++++++++++---------
 docs/examples/polyglot-javascript-java-r.md   | 68 +++++++------
 6 files changed, 191 insertions(+), 186 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 512e250d54ff..b2e5b935e791 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -56,11 +56,10 @@ Java on Trufle is an experimental technology in GraalVM, available as of version
 
 ## Available Distributions
 
-GraalVM Enterprise distributions are based on Oracle JDK 8, 11, and 16.
+GraalVM Enterprise distributions are based on Oracle JDK 8, 11, and 17.
 GraalVM Enterprise releases include all Oracle Java critical patch updates (CPUs), which are released on a regular schedule to remedy defects and known vulnerabilities.
 
 GraalVM Enterprise is available for Linux, macOS, and Windows platforms on x86 64-bit systems, and for Linux on ARM 64-bit system.
-The GraalVM Enterprise distribution based on Oracle JDK 16 is experimental with [several known limitations](https://docs.oracle.com/en/graalvm/enterprise/21/docs/overview/known-issues/).
 Depending on the platform, the distributions are shipped as *.tar.gz* or *.zip* archives.
 
 ## Certified Platforms
@@ -104,7 +103,7 @@ Tools/Utilities:
 
 Runtimes:
 
-* [Node.js](/reference-manual/js/) -- the Node.js 14.16.1 runtime for JavaScript
+* [Node.js](/reference-manual/js/) -- the Node.js 14.17.6 runtime for JavaScript
 * [Python](/reference-manual/python/) -- Python 3.8.5 compatible
 * [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
 * [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
diff --git a/docs/examples/java-kotlin-aot.md b/docs/examples/java-kotlin-aot.md
index 725c4b71cf6f..e1d3e57feced 100644
--- a/docs/examples/java-kotlin-aot.md
+++ b/docs/examples/java-kotlin-aot.md
@@ -7,38 +7,43 @@ permalink: /examples/java-kotlin-aot/
 
 # Build a Native Image of a Java and Kotlin Application
 
-This example demonstrates how to compile a Java and Kotlin application
-ahead-of-time into a native executable, and illustrates the advantages.
+This example demonstrates how to compile a Java and Kotlin application ahead-of-time into a native executable, and illustrates the advantages.
 
-### Preparation
-
-This example requires the [Maven](https://maven.apache.org/) build tool.
+## Preparation
 
 1&#46; Download or clone the repository and navigate into the `java-kotlin-aot` directory:
 ```shell
 git clone https://github.com/graalvm/graalvm-demos
 cd graalvm-demos/java-kotlin-aot
 ```
-This is a simple Java and Kotlin application showing how easy it is to
-interoperate between JVM-based languages. A Java method accesses a String from
-Kotlin and calls a Kotlin function, which later accesses a String from a Java
-class. Before running this example, you need to build the application.
-
-Note: You can use any JDK for building the application. However, `javac` from GraalVM
-in the build script is used to simplify the prerequisites so another JDK does not need to be installed.
-
-2&#46; Having installed GraalVM, export the home directory as `$GRAALVM_HOME` and add `$GRAALVM_HOME/bin`
-to the path, using a command-line shell for Linux:
-```shell
-export GRAALVM_HOME=/home/${current_user}/path/to/graalvm
+This is a simple Java and Kotlin application showing how easy it is to interoperate between JVM-based languages.
+A Java method accesses a String from Kotlin and calls a Kotlin function, which later accesses a String from a Java class.
+Before running this example, you need to build the application.
+
+Note: You can use any JDK for building the application. However, `javac` from GraalVM in the build script is used to simplify the prerequisites so another JDK does not need to be installed.
+
+2&#46; [Download GraalVM](https://www.graalvm.org/downloads/), unzip the archive, export the GraalVM home directory as the `$JAVA_HOME` and add `$JAVA_HOME/bin` to the `PATH` environment variable:
+  On Linux:
+  ```bash
+  export JAVA_HOME=/home/${current_user}/path/to/graalvm
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On macOS:
+  ```bash
+  export JAVA_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On Windows:
+  ```bash
+  setx /M JAVA_HOME "C:\Progra~1\Java\<graalvm>"
+  setx /M PATH "C:\Progra~1\Java\<graalvm>\bin;%PATH%"
+  ```
+  Note that your paths are likely to be different depending on the download location.
+
+3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) by running.
+```bash
+gu install native-image
 ```
-For macOS, use:
-```shell
-export GRAALVM_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
-```
-Note that your paths are likely to be different depending on the download location.
-
-3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) to make use of the `native-image` utility.
 
 4&#46; Then execute:
 ```shell
@@ -48,18 +53,17 @@ Note that your paths are likely to be different depending on the download locati
 Have a look at the `build.sh` script which creates a native executable from a Java class.
 The `native-image` utility compiles the application ahead-of-time for faster startup and lower general overhead at runtime.
 ```shell
-$GRAALVM_HOME/bin/native-image -cp ./target/mixed-code-hello-world-1.0-SNAPSHOT.jar -H:Name=helloworld -H:Class=hello.JavaHello -H:+ReportUnsupportedElementsAtRuntime --allow-incomplete-classpath
+$JAVA_HOME/bin/native-image --no-fallback -cp ./target/mixed-code-hello-world-1.0-SNAPSHOT-jar-with-dependencies.jar -H:Name=helloworld -H:Class=hello.JavaHello -H:+ReportUnsupportedElementsAtRuntime
 ```
 
-It takes a few parameters: the classpath, the main class of the application with
-`-H:Class=...`, and the name of the resulting executable with `-H:Name=...`.
+It takes a few parameters: the classpath, the main class of the application with `-H:Class=...`, and the name of the resulting executable with `-H:Name=...`.
 
-After executing the `native-image` command, check the directory. It should have
-produced the executable file, `helloworld`.
+After executing the `native-image` command, check the directory.
+It should have produced the executable file, `helloworld`.
 
-### Running the Application
+## Running the Application
 
-To run the application, you need to execute the JAR file in the `target` dir.
+To run the application, you need to execute the JAR file in the `target` directory.
 You can run it as a normal Java application using `java`.
 Or, since we have a native executable prepared, you can run that directly.
 The `run.sh` file executes both, and times them with the `time` utility:
diff --git a/docs/examples/java-performance-examples.md b/docs/examples/java-performance-examples.md
index b5bc2f71ddb0..fac22c279137 100644
--- a/docs/examples/java-performance-examples.md
+++ b/docs/examples/java-performance-examples.md
@@ -7,19 +7,17 @@ permalink: /examples/java-performance-examples/
 
 # Java Performance Examples
 
-The GraalVM compiler achieves excellent performance, especially for highly
-abstracted programs, due to its versatile optimization techniques. Code using
-more abstraction and modern Java features like Streams or Lambdas will see
-greater speedups. The examples below demonstrate this.
+The GraalVM compiler achieves excellent performance, especially for highly abstracted programs, due to its versatile optimization techniques.
+Code using more abstraction and modern Java features like Streams or Lambdas will see greater speedups.
+The examples below demonstrate this.
 
-### Running Examples
+## Running Examples
 
-#### Streams API Example
+### Streams API Example
 
-A simple example based on the [Streams API](https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html)
-is used here to demonstrate performance gains when using the GraalVM compiler.
-This example counts the number of uppercase characters in a body of text. To
-simulate a large load, the same sentence is processed 10 million times:
+A simple example based on the [Streams API](https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html) is used here to demonstrate performance gains when using the GraalVM compiler.
+This example counts the number of uppercase characters in a body of text.
+To simulate a large load, the same sentence is processed 10 million times:
 
 1&#46; Save the following code snippet to a file named `CountUppercase.java`:
 
@@ -49,62 +47,54 @@ public class CountUppercase {
 ```shell
 javac CountUppercase.java
 java CountUppercase In 2021 I would like to run ALL languages in one VM.
-1 (297 ms)
-2 (452 ms)
-3 (136 ms)
-4 (88 ms)
-5 (107 ms)
-6 (135 ms)
-7 (88 ms)
-8 (87 ms)
-9 (78 ms)
-total: 69999993 (1550 ms)
+1 (319 ms)
+2 (275 ms)
+3 (164 ms)
+4 (113 ms)
+5 (100 ms)
+6 (124 ms)
+7 (86 ms)
+8 (76 ms)
+9 (77 ms)
+total: 69999993 (1414 ms)
 ```
 
-The warmup time depends on numerous factors like the source code or how
-many cores a machine has. If the performance profile of `CountUppercase` on your
-machine does not match the above, run it for more iterations by adding
-`-Diterations=N` just after `java` for some `N` greater than 1.
+The warmup time depends on numerous factors like the source code or how many cores a machine has.
+If the performance profile of `CountUppercase` on your machine does not match the above, run it for more iterations by adding `-Diterations=N` just after `java` for some `N` greater than 1.
 
 3&#46; Add the `-Dgraal.PrintCompilation=true` option to see statistics for the compilations:
 ```shell
 java -Dgraal.PrintCompilation=true CountUppercase In 2021 I would like to run ALL languages in one VM.
 ```
 
-This option prints a line after each compilation that shows the method
-compiled, time taken, bytecodes processed (including inlined methods), size
-of machine code produced, and amount of memory allocated during compilation.
+This option prints a line after each compilation that shows the method compiled, time taken, bytecodes processed (including inlined methods), size of machine code produced, and amount of memory allocated during compilation.
 
-4&#46; Use the `-XX:-UseJVMCICompiler` option to disable the GraalVM compiler and
-use the native top tier compiler in the VM to compare performance:
+4&#46; Use the `-XX:-UseJVMCICompiler` option to disable the GraalVM compiler and use the native top tier compiler in the VM to compare performance:
 ```shell
 java -XX:-UseJVMCICompiler CountUppercase In 2021 I would like to run ALL languages in one VM.
-1 (747 ms)
-2 (806 ms)
-3 (640 ms)
-4 (771 ms)
-5 (606 ms)
-6 (582 ms)
-7 (623 ms)
-8 (564 ms)
-9 (682 ms)
-total: 69999993 (6713 ms)
+1 (492 ms)
+2 (441 ms)
+3 (443 ms)
+4 (470 ms)
+5 (422 ms)
+6 (382 ms)
+7 (407 ms)
+8 (425 ms)
+9 (343 ms)
+total: 69999993 (4249 ms)
 ```
 
-The preceding example demonstrates the benefits of partial escape analysis (PEA)
-and advanced inlining, which combine to significantly reduce heap allocation.
+The preceding example demonstrates the benefits of partial escape analysis (PEA) and advanced inlining, which combine to significantly reduce heap allocation.
 The results were obtained using Oracle GraalVM Enterprise Edition.
 
-The GraalVM Community Edition still has good performance compared to the native top-tier
-compiler as shown below. You can simulate the Community Edition on the Enterprise Edition
-by adding the option `-Dgraal.CompilerConfiguration=community`.
+The GraalVM Community Edition still has good performance compared to the native top-tier compiler as shown below.
+You can simulate the Community Edition on the Enterprise Edition by adding the option `-Dgraal.CompilerConfiguration=community`.
 
-#### Sunflow Example
+### Sunflow Example
 
 [Sunflow](http://sunflow.sourceforge.net) is an open source rendering engine.
 The following example is a simplified version of the Sunflow engine core code.
-It performs calculations to blend various values for a point of light in a
-rendered scene.
+It performs calculations to blend various values for a point of light in a rendered scene.
 
 1&#46; Save the following code snippet to a file named `Blender.java`:
 ```java
diff --git a/docs/examples/java-simple-stream-benchmark.md b/docs/examples/java-simple-stream-benchmark.md
index c30306063bb3..881cc96a149c 100644
--- a/docs/examples/java-simple-stream-benchmark.md
+++ b/docs/examples/java-simple-stream-benchmark.md
@@ -7,49 +7,49 @@ permalink: /examples/java-simple-stream-benchmark/
 
 # Simple Java Stream Benchmark
 
-This application is a small benchmark of the Java Stream API. It demonstrates how
-the GraalVM compiler can achieve better performance for highly
-abstracted programs like those using Streams, Lambdas, or other Java features.
-
-### Preparation
-
-This example requires the [Maven](https://maven.apache.org/) build tool.
-
-1&#46; Download or clone the repository and navigate into the `java-simple-stream-benchmark` directory:
+This application is a small benchmark of the Java Stream API. It demonstrates how the GraalVM compiler can achieve better performance for highly abstracted programs like those using Streams, Lambdas, or other Java features.
+
+## Preparation
+
+1&#46; [Download GraalVM](https://www.graalvm.org/downloads/), unzip the archive, export the GraalVM home directory as the `$JAVA_HOME` and add `$JAVA_HOME/bin` to the `PATH` environment variable:
+  On Linux:
+  ```bash
+  export JAVA_HOME=/home/${current_user}/path/to/graalvm
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On macOS:
+  ```bash
+  export JAVA_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On Windows:
+  ```bash
+  setx /M JAVA_HOME "C:\Progra~1\Java\<graalvm>"
+  setx /M PATH "C:\Progra~1\Java\<graalvm>\bin;%PATH%"
+  ```
+  Note that your paths are likely to be different depending on the download location.
+
+2&#46; Download or clone the repository and navigate into the `java-simple-stream-benchmark` directory:
 ```shell
 git clone https://github.com/graalvm/graalvm-demos
 cd graalvm-demos/java-simple-stream-benchmark
 ```
 
-2&#46; Build the benchmark. You can manually execute `mvn package`, but there is also
-a `build.sh` script included for your convenience:
+3&#46; Build the benchmark. You can manually execute `mvn package`, but there is also a `build.sh` script included for your convenience:
 ```shell
 ./build.sh
 ```
-
-3&#46; Export the GraalVM home directory as the `$GRAALVM_HOME` and add `$GRAALVM_HOME/bin`
-to the path, using a command-line shell for Linux:
-```shell
-export GRAALVM_HOME=/path/to/graalvm
-```
-For macOS:
-```shell
-export GRAALVM_HOME=/path/to/graalvm/Contents/Home
-```
-
 Now you are all set to execute the benchmark and compare the results between different JVMs.
 
-### Running the Benchmark
+## Running the Benchmark
 
 To run the benchmark, you need to execute the `target/benchmarks.jar` file.
 You can run it with the following command:
 ```shell
 java -jar target/benchmarks.jar
 ```
-If you would like to run the benchmark on a different JVM, you can run it with
-whatever `java` you have. However, if you just want to run it on the same JVM,
-but without the GraalVM compiler, you may add the `-XX:-UseJVMCICompiler` option
-into the same command:
+If you would like to run the benchmark on a different JVM, you can run it with whatever `java` you have.
+However, if you just want to run it on the same JVM, but without the GraalVM compiler, you may add the `-XX:-UseJVMCICompiler` option into the same command:
 ```shell
 java -XX:-UseJVMCICompiler -jar target/benchmarks.jar
 ```
@@ -58,7 +58,6 @@ This way, the GraalVM compiler will not be used as the JVMCI compiler and the JV
 
 ### Note about Results
 
-The benchmark mode is `AverageTime` in nanoseconds per operation, which means
-lower numbers are better. Note that the results you see can be influenced by the
-hardware you are running this benchmark on, the CPU load, and other factors.
+The benchmark mode is `AverageTime` in nanoseconds per operation, which means lower numbers are better.
+Note that the results you see can be influenced by the hardware you are running this benchmark on, the CPU load, and other factors.
 Interpret them responsibly.
diff --git a/docs/examples/native-image-examples.md b/docs/examples/native-image-examples.md
index b1412280e053..413cdebd2500 100644
--- a/docs/examples/native-image-examples.md
+++ b/docs/examples/native-image-examples.md
@@ -7,38 +7,44 @@ permalink: /examples/native-image-examples/
 
 # Ahead-of-Time Compilation of Java and Polyglot Applications
 
-Below are sample applications illustrating GraalVM's unique
-capabilities to create self-contained executable images which can run
-incredibly fast. Here you will also find a more sophisticated example displaying
-GraalVM's ability to create polyglot native executables.
+Below are sample applications illustrating GraalVM's unique capabilities to create self-contained executable images which can run incredibly fast.
+Here you will also find a more sophisticated example displaying GraalVM's ability to create polyglot native executables.
 
-### Preparation
+## Preparation
 
 1&#46; Download or clone the repository and navigate into the `native-list-dir` directory:
 ```shell
 git clone https://github.com/graalvm/graalvm-demos
 cd graalvm-demos/native-list-dir
 ```
-There are two Java classes, but you will start by building `ListDir.java` for the
-purposes of this demo. You can manually execute `javac ListDir.java`, and there is
-also a `build.sh` script included for your convenience.
-
-Note that you can use
-any JDK for compiling the Java classes. However, we refer to `javac` from GraalVM
-in the build script to simplify the prerequisites so another JDK does not need to be installed.
-
-2&#46; Having installed GraalVM, export the home directory as `$GRAALVM_HOME` and add `$GRAALVM_HOME/bin`
-to the path, using a command-line shell for Linux:
-```shell
-export GRAALVM_HOME=/home/${current_user}/path/to/graalvm
+There are two Java classes, but you will start by building `ListDir.java` for the purposes of this demo.
+You can manually execute `javac ListDir.java`, and there is also a `build.sh` script included for your convenience.
+
+Note that you can use any JDK for compiling the Java classes.
+However, we refer to `javac` from GraalVM in the build script to simplify the prerequisites so another JDK does not need to be installed.
+
+2&#46; [Download GraalVM](https://www.graalvm.org/downloads/), unzip the archive, export the GraalVM home directory as the `$JAVA_HOME` and add `$JAVA_HOME/bin` to the `PATH` environment variable:
+  On Linux:
+  ```bash
+  export JAVA_HOME=/home/${current_user}/path/to/graalvm
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On macOS:
+  ```bash
+  export JAVA_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On Windows:
+  ```bash
+  setx /M JAVA_HOME "C:\Progra~1\Java\<graalvm>"
+  setx /M PATH "C:\Progra~1\Java\<graalvm>\bin;%PATH%"
+  ```
+  Note that your paths are likely to be different depending on the download location.
+
+3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) by running.
+```bash
+gu install native-image
 ```
-For macOS, use:
-```shell
-export GRAALVM_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
-```
-Note that your paths are likely to be different depending on the download location.
-
-3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) to make use of the `native-image` utility.
 
 4&#46; Then execute:
 ```shell
@@ -49,17 +55,14 @@ The `build.sh` script creates a native executable from the Java class.
 
 Look at it in more detail:
 ```shell
-$GRAALVM_HOME/bin/native-image ListDir
+$JAVA_HOME/bin/native-image ListDir
 ```
-The `native-image` utility ahead-of-time compiles the `ListDir` class into a
-standalone binary in the current working directory. After running the
-command, the executable file `listdir` should have been produced.
+The `native-image` utility ahead-of-time compiles the `ListDir` class into a standalone binary in the current working directory.
+After running the command, the executable file `listdir` should have been produced.
 
-### Running the Application
+## Running the Application
 
-To run the application, you need to either execute the `ListDir` class
-as a normal Java application using `java`, or since we have a native executable
-prepared, run that directly.
+To run the application, you need to either execute the `ListDir` class as a normal Java application using `java`, or since we have a native executable prepared, run that directly.
 
 The `run.sh` file executes both, and times them with the `time` utility:
 ```shell
@@ -67,8 +70,7 @@ time java ListDir $1
 time ./listdir $1
 ```
 
-To make it more interesting, pass it to a parent directory: `./run.sh ..`, where `..` is
-the parent of the current directory (the one containing all the demos).
+To make it more interesting, pass it to a parent directory: `./run.sh ..`, where `..` is the parent of the current directory (the one containing all the demos).
 
 Depending on the directory content you pass this script for, the output will be different than this:
 ```shell
@@ -89,35 +91,36 @@ sys	0m0.011s
 ```
 The performance gain of the native version is largely due to the faster startup.
 
-### Polyglot Capabilities
+## Polyglot Capabilities
 
-You can also experiment with a more sophisticated `ExtListDir` example,
-which takes advantage of GraalVM's Java and JavaScript polyglot capabilities.
+You can also experiment with a more sophisticated `ExtListDir` example, which takes advantage of GraalVM's Java and JavaScript polyglot capabilities.
 
 ```shell
-$GRAALVM_HOME/bin/javac ExtListDir.java
+$JAVA_HOME/bin/javac ExtListDir.java
 ```
 
 Building the native executable command is similar to the one above, but since the example uses JavaScript, you need to inform the `native-image` utility about that by passing the `--language:js` option.
 Note that it takes a bit more time because it needs to include the JavaScript support.
 ```shell
-$GRAALVM_HOME/bin/native-image --language:js ExtListDir
+$JAVA_HOME/bin/native-image --language:js ExtListDir
 ```
 
 The execution is the same as in the previous example:
 ```shell
-$ time java ExtListDir $1
-$ time ./extlistdir $1
+time java ExtListDir $1
+time ./extlistdir $1
 ```
 
-### Profile-Guided Optimizations for High Throughput
+## Profile-Guided Optimizations for High Throughput
 
-Oracle GraalVM Enterprise Edition offers extra benefits for building native executables. These are [profile-guided optimisations (PGO)](../reference-manual/native-image/PGOEnterprise.md). As an example, a [program demonstrating Java streams](https://github.com/graalvm/graalvm-demos/blob/master/scala-examples/streams/Streams.java) will be used.
+Oracle GraalVM Enterprise Edition offers extra benefits for building native executables.
+These are [profile-guided optimisations (PGO)](../reference-manual/native-image/PGOEnterprise.md).
+As an example, a [program demonstrating Java streams](https://github.com/graalvm/graalvm-demos/blob/master/scala-examples/streams/Streams.java) will be used.
 
 1&#46; Run the application with `java` to see the output:
 ```shell
 javac Streams.java
-$GRAALVM_HOME/bin/native-image Streams
+$JAVA_HOME/bin/native-image Streams
 ./streams 1000000 200
 ...
 Iteration 20 finished in 1955 milliseconds with checksum 6e36c560485cdc01
@@ -125,14 +128,14 @@ Iteration 20 finished in 1955 milliseconds with checksum 6e36c560485cdc01
 
 2&#46; Build an instrumented image and run it to collect profiles:
 ```shell
-$GRAALVM_HOME/bin/native-image --pgo-instrument Streams
+$JAVA_HOME/bin/native-image --pgo-instrument Streams
 ./streams 1000 200
 ```
 Profiles collected from this run are now stored in the `default.iprof` file. Note that the profiling now runs with a much smaller data size.
 
 3&#46; Use the profiles gathered at the previous step to build an optimized native executable:
 ```shell
-$GRAALVM_HOME/bin/native-image --pgo Streams
+$JAVA_HOME/bin/native-image --pgo Streams
 ```
 
 4&#46; Run that optimized native executable:
diff --git a/docs/examples/polyglot-javascript-java-r.md b/docs/examples/polyglot-javascript-java-r.md
index 9dd251a389d9..78672a957f83 100644
--- a/docs/examples/polyglot-javascript-java-r.md
+++ b/docs/examples/polyglot-javascript-java-r.md
@@ -12,54 +12,64 @@ This page describes an example of a polyglot application you can run with GraalV
 ### Preparation
 
 1&#46; Download or clone the repository and navigate into the `polyglot-javascript-java-r` directory:
-```shell
-git clone https://github.com/graalvm/graalvm-demos
-cd graalvm-demos/polyglot-javascript-java-r
-```
-
-2&#46; [Install GraalVM](/docs/getting-started/#install-graalvm) on your platform.
+  ```bash
+  git clone https://github.com/graalvm/graalvm-demos
+  cd graalvm-demos/polyglot-javascript-java-r
+  ```
+
+2&#46; [Download GraalVM](https://www.graalvm.org/downloads/), unzip the archive, export the GraalVM home directory as the `$JAVA_HOME` and add `$JAVA_HOME/bin` to the `PATH` environment variable:
+  On Linux:
+  ```bash
+  export JAVA_HOME=/home/${current_user}/path/to/graalvm
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On macOS:
+  ```bash
+  export JAVA_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
+  export PATH=$JAVA_HOME/bin:$PATH
+  ```
+  On Windows:
+  ```bash
+  setx /M JAVA_HOME "C:\Progra~1\Java\<graalvm>"
+  setx /M PATH "C:\Progra~1\Java\<graalvm>\bin;%PATH%"
+  ```
+  Note that your paths are likely to be different depending on the download location.
 
 3&#46; To run the demo, you need to enable Node.js support in GraalVM:
-```shell
-gu install nodejs
-```
+  ```bash
+  gu install nodejs
+  ```
 
 4&#46; This application contains R code. The R language support is not enabled by default in GraalVM and you should add it too:
-```shell
-gu install R
-```
+  ```bash
+  gu install R
+  ```
 
 5&#46; Build the benchmark. You can manually execute `npm install`, but there is also a `build.sh` script included for your convenience:
-```shell
-./build.sh
-```
+  ```bash
+  ./build.sh
+  ```
 Now you are all set to run the polyglot JavaScript, Java, R application.
 
 ### Running the Application
 
 To run the application, you need to execute the `server.js` file.
 You can run it with the following command (or run the `run.sh` script):
-```shell
-$GRAALVM_HOME/bin/node --polyglot --jvm server.js
+```bash
+$JAVA_HOME/bin/node --polyglot --jvm server.js
 ```
 
-If you would like to run the benchmark on a different instance of Node,
-you can run it with whatever `node` you have. However, presumably, the polyglot
-capability will not be supported.
+If you would like to run the benchmark on a different instance of Node, you can run it with whatever `node` you have. However, presumably, the polyglot capability will not be supported.
 
 Open [localhost:3000](http://localhost:3000) and see the output of the polyglot app.
-Play with the source code and restart the application to see what else
-you can do with the mix of JavaScript, Java, and R.
+Play with the source code and restart the application to see what else you can do with the mix of JavaScript, Java, and R.
 
 ### Debugging Polyglot Applications
 
-GraalVM also supports debugging of polyglot applications and provides a built-in
-implementation of the [Chrome DevTools Protocol](../tools/chrome-debugger.md). Add the `--inspect` parameter to the command line, open the URL the application
-prints at the startup in the Chrome browser, and start debugging: set breakpoints,
-evaluate expressions of this app in JavaScript and R code alike, and so on.
+GraalVM also supports debugging of polyglot applications and provides a built-in implementation of the [Chrome DevTools Protocol](../tools/chrome-debugger.md).
+Add the `--inspect` parameter to the command line, open the URL the application prints at the startup in the Chrome browser, and start debugging: set breakpoints, evaluate expressions of this app in JavaScript and R code alike, and so on.
 
 ### Note about the Application
 
-For brevity, this sample application contains large snippets of code
-inside the strings. This is not the best approach for structuring polyglot applications,
-but it is the easiest way to demonstrate polyglot capabilities in a single file.
+For brevity, this sample application contains large snippets of code inside the strings.
+This is not the best approach for structuring polyglot applications, but it is the easiest way to demonstrate polyglot capabilities in a single file.

From 1b0c4dee3ff6ffdc73e37f40f3403bdd1faad03c Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Wed, 6 Oct 2021 08:22:36 +0200
Subject: [PATCH 304/681] [GR-34181] Fixed deprecation warning.

---
 .../com/oracle/truffle/api/test/polyglot/SourceAPITest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
index 1ea0419d2589..91bbd45507fc 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/SourceAPITest.java
@@ -41,7 +41,6 @@
 package com.oracle.truffle.api.test.polyglot;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.library.ExportLibrary;
@@ -707,7 +706,7 @@ private static AbstractSourceSectionDispatch getSourceSectionDispatch(AbstractPo
         ProxyLanguage.setDelegate(new ProxyLanguage() {
             @Override
             protected CallTarget parse(ParsingRequest request) {
-                return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(new SourceSectionProvider(request.getSource())));
+                return RootNode.createConstantNode(new SourceSectionProvider(request.getSource())).getCallTarget();
             }
         });
         try (Context context = Context.create(ProxyLanguage.ID)) {

From 7134ac852273ef28c66ae2c8834d785dad20d252 Mon Sep 17 00:00:00 2001
From: Vojin Jovanovic <vojin.jovanovic@oracle.com>
Date: Wed, 6 Oct 2021 08:26:24 +0200
Subject: [PATCH 305/681] Initialize missing Scala classes during build

---
 substratevm/mx.substratevm/mx_substratevm_benchmark.py         | 2 +-
 .../src/com/oracle/svm/polyglot/scala/ScalaFeature.java        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/substratevm/mx.substratevm/mx_substratevm_benchmark.py b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
index 9c82d6cdf0ab..226ada438e2a 100644
--- a/substratevm/mx.substratevm/mx_substratevm_benchmark.py
+++ b/substratevm/mx.substratevm/mx_substratevm_benchmark.py
@@ -64,7 +64,7 @@ def list_jars(path):
     'als'               : [
                            '--allow-incomplete-classpath',
                            '--report-unsupported-elements-at-runtime',
-                           '--initialize-at-build-time=org.slf4j,org.apache.log4j,scala.runtime.LambdaDeserialize,scala.Symbol$',
+                           '--initialize-at-build-time=org.slf4j,org.apache.log4j', # mis-initialized from netty
                            '--initialize-at-run-time=io.netty.channel.unix.IovArray,io.netty.channel.epoll.EpollEventLoop,io.netty.channel.unix.Errors,io.netty.channel.unix.Socket,io.netty.channel.unix.Limits'
                           ],
     'chi-square'        : [
diff --git a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
index 8168795a2911..30e83cf26b5b 100644
--- a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
+++ b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
@@ -66,6 +66,9 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         initializeScalaEnumerations(access);
         RuntimeClassInitialization.initializeAtBuildTime("scala.Symbol");
+        RuntimeClassInitialization.initializeAtBuildTime("scala.Symbol$");
+        /* Initialized through an invokedynamic in `scala.Option` */
+        RuntimeClassInitialization.initializeAtBuildTime("scala.runtime.LambdaDeserialize");
     }
 
     @Override

From 1be861499d528af8cb72ca681881df2b2fc13206 Mon Sep 17 00:00:00 2001
From: Martin Entlicher <martin.entlicher@oracle.com>
Date: Wed, 6 Oct 2021 11:26:17 +0200
Subject: [PATCH 306/681] Prevent from NPEs from profiler when there are nodes
 without source sections. (GR-34094)

---
 .../chromeinspector/test/ProfilerTest.java    | 168 ++++++++++++++++++
 .../chromeinspector/InspectorDebugger.java    |   6 +-
 .../chromeinspector/InspectorProfiler.java    |  24 +--
 .../chromeinspector/InspectorRuntime.java     |   6 +-
 .../tools/chromeinspector/ScriptsHandler.java |  11 +-
 .../chromeinspector/types/StackTrace.java     |  14 +-
 .../truffle/tools/profiler/CPUTracer.java     |   7 +-
 7 files changed, 201 insertions(+), 35 deletions(-)
 create mode 100644 tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java

diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java
new file mode 100644
index 000000000000..b01c882c147c
--- /dev/null
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.tools.chromeinspector.test;
+
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.TruffleSafepoint;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.instrumentation.GenerateWrapper;
+import com.oracle.truffle.api.instrumentation.InstrumentableNode;
+import com.oracle.truffle.api.instrumentation.ProbeNode;
+import com.oracle.truffle.api.instrumentation.StandardTags;
+import com.oracle.truffle.api.instrumentation.Tag;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.source.SourceSection;
+import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
+import com.oracle.truffle.tools.utils.json.JSONObject;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+
+import org.graalvm.polyglot.Source;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+
+public class ProfilerTest {
+
+    @Test
+    public void testNoSourceProfile() throws InterruptedException, IOException, ExecutionException {
+        ProxyLanguage.setDelegate(new TestNoSourceLanguage());
+        InspectorTester tester = InspectorTester.start(false);
+        Source source = Source.newBuilder(ProxyLanguage.ID, "1", "NoSourceProfile").build();
+        tester.sendMessage("{\"id\":1,\"method\":\"Runtime.enable\"}");
+        assertEquals("{\"result\":{},\"id\":1}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":2,\"method\":\"Profiler.enable\"}");
+        assertEquals("{\"result\":{},\"id\":2}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":3,\"method\":\"Profiler.setSamplingInterval\",\"params\":{\"interval\":1000}}");
+        assertEquals("{\"result\":{},\"id\":3}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":4,\"method\":\"Profiler.start\"}");
+        assertEquals("{\"result\":{},\"id\":4}", tester.getMessages(true).trim());
+        tester.eval(source).get();
+        tester.sendMessage("{\"id\":5,\"method\":\"Profiler.stop\"}");
+        JSONObject json = new JSONObject(tester.getMessages(true).trim());
+        assertNotNull(json);
+        assertEquals(json.getInt("id"), 5);
+        JSONObject jsonResult = json.getJSONObject("result");
+        assertNotNull(jsonResult);
+        JSONObject jsonProfile = jsonResult.getJSONObject("profile");
+        assertNotNull(jsonProfile);
+        tester.sendMessage("{\"id\":6,\"method\":\"Profiler.disable\"}");
+        assertEquals("{\"result\":{},\"id\":6}", tester.getMessages(true).trim());
+        ProxyLanguage.setDelegate(new ProxyLanguage());
+        tester.finish();
+    }
+
+    @Test
+    public void testNoSourceCoverage() throws InterruptedException, IOException, ExecutionException {
+        ProxyLanguage.setDelegate(new TestNoSourceLanguage());
+        InspectorTester tester = InspectorTester.start(false);
+        Source source = Source.newBuilder(ProxyLanguage.ID, "1", "NoSourceProfile").build();
+        tester.sendMessage("{\"id\":1,\"method\":\"Runtime.enable\"}");
+        assertEquals("{\"result\":{},\"id\":1}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":2,\"method\":\"Profiler.enable\"}");
+        assertEquals("{\"result\":{},\"id\":2}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":3,\"method\":\"Profiler.startPreciseCoverage\"}");
+        assertEquals("{\"result\":{},\"id\":3}", tester.getMessages(true).trim());
+        tester.eval(source).get();
+        tester.sendMessage("{\"id\":5,\"method\":\"Profiler.takePreciseCoverage\"}");
+        // No results in case of no source section
+        assertEquals("{\"result\":{\"result\":[]},\"id\":5}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":7,\"method\":\"Profiler.stopPreciseCoverage\"}");
+        assertEquals("{\"result\":{},\"id\":7}", tester.getMessages(true).trim());
+        tester.sendMessage("{\"id\":6,\"method\":\"Profiler.disable\"}");
+        assertEquals("{\"result\":{},\"id\":6}", tester.getMessages(true).trim());
+        ProxyLanguage.setDelegate(new ProxyLanguage());
+        tester.finish();
+    }
+
+    private static class TestNoSourceLanguage extends ProxyLanguage {
+
+        @Override
+        protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
+            return Truffle.getRuntime().createCallTarget(new NoSourceRootNode(languageInstance));
+        }
+
+        private final class NoSourceRootNode extends RootNode {
+
+            @Node.Child private NoSourceStatementNode statement;
+
+            NoSourceRootNode(TruffleLanguage<?> language) {
+                super(language);
+                statement = new NoSourceStatementNode();
+                insert(statement);
+            }
+
+            @Override
+            public Object execute(VirtualFrame frame) {
+                return statement.execute(frame);
+            }
+
+            @Override
+            public String getName() {
+                return "1";
+            }
+
+        }
+
+    }
+
+    @GenerateWrapper
+    static class NoSourceStatementNode extends Node implements InstrumentableNode {
+
+        NoSourceStatementNode() {
+        }
+
+        @Override
+        public boolean isInstrumentable() {
+            return true;
+        }
+
+        @Override
+        public InstrumentableNode.WrapperNode createWrapper(ProbeNode probe) {
+            return new NoSourceStatementNodeWrapper(this, probe);
+        }
+
+        public Object execute(VirtualFrame frame) {
+            assert frame != null;
+            TruffleSafepoint.poll(this);
+            return 10;
+        }
+
+        @Override
+        public SourceSection getSourceSection() {
+            return null;
+        }
+
+        @Override
+        public boolean hasTag(Class<? extends Tag> tag) {
+            return StandardTags.StatementTag.class.equals(tag) || StandardTags.RootTag.class.equals(tag);
+        }
+
+    }
+}
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
index e4dda5c86d07..f58e65493ff5 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorDebugger.java
@@ -429,11 +429,7 @@ private CallFrame[] createCallFrames(Iterable<DebugStackFrame> frames, SuspendAn
                 // should not be, double-check
                 continue;
             }
-            int scriptId = scriptsHandler.assureLoaded(source);
-            if (scriptId < 0) {
-                continue;
-            }
-            Script script = scriptsHandler.getScript(scriptId);
+            Script script = scriptsHandler.assureLoaded(source);
             List<Scope> scopes = new ArrayList<>();
             DebugScope dscope;
             try {
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorProfiler.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorProfiler.java
index 19e66023cc75..4e08f437c49e 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorProfiler.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorProfiler.java
@@ -198,9 +198,12 @@ private Params getCoverage(Collection<CPUTracer.Payload> payloads) {
         JSONObject json = new JSONObject();
         Map<Source, Map<String, Collection<CPUTracer.Payload>>> sourceToRoots = new LinkedHashMap<>();
         payloads.forEach(payload -> {
-            Map<String, Collection<CPUTracer.Payload>> rootsToPayloads = sourceToRoots.computeIfAbsent(payload.getSourceSection().getSource(), s -> new LinkedHashMap<>());
-            Collection<CPUTracer.Payload> pls = rootsToPayloads.computeIfAbsent(payload.getRootName(), t -> new LinkedList<>());
-            pls.add(payload);
+            SourceSection sourceSection = payload.getSourceSection();
+            if (sourceSection != null) {
+                Map<String, Collection<CPUTracer.Payload>> rootsToPayloads = sourceToRoots.computeIfAbsent(sourceSection.getSource(), s -> new LinkedHashMap<>());
+                Collection<CPUTracer.Payload> pls = rootsToPayloads.computeIfAbsent(payload.getRootName(), t -> new LinkedList<>());
+                pls.add(payload);
+            }
         });
         JSONArray result = new JSONArray();
         sourceToRoots.entrySet().stream().map(sourceEntry -> {
@@ -214,9 +217,8 @@ private Params getCoverage(Collection<CPUTracer.Payload> payloads) {
                 }
                 functions.add(new FunctionCoverage(rootEntry.getKey(), isBlockCoverage, ranges.toArray(new CoverageRange[ranges.size()])));
             });
-            int scriptId = slh.getScriptId(sourceEntry.getKey());
-            Script script = scriptId < 0 ? null : slh.getScript(scriptId);
-            return new ScriptCoverage(script != null ? script.getId() : 0, script != null ? script.getUrl() : "", functions.toArray(new FunctionCoverage[functions.size()]));
+            Script script = slh.assureLoaded(sourceEntry.getKey());
+            return new ScriptCoverage(script.getId(), script.getUrl(), functions.toArray(new FunctionCoverage[functions.size()]));
         }).forEachOrdered(scriptCoverage -> {
             result.put(scriptCoverage.toJSON());
         });
@@ -248,10 +250,9 @@ private void fillChildren(ProfileNode node, Collection<ProfilerNode<CPUSampler.P
             int id = node2id.get(childProfilerNode);
             if (id < 0) { // not computed yet
                 id = -id;
-                int scriptId = slh.getScriptId(childProfilerNode.getSourceSection().getSource());
-                Script script = scriptId < 0 ? null : slh.getScript(scriptId);
                 SourceSection sourceSection = childProfilerNode.getSourceSection();
-                ProfileNode childNode = new ProfileNode(id, new RuntimeCallFrame(childProfilerNode.getRootName(), script != null ? script.getId() : 0, script != null ? script.getUrl() : "",
+                Script script = slh.assureLoaded(sourceSection.getSource());
+                ProfileNode childNode = new ProfileNode(id, new RuntimeCallFrame(childProfilerNode.getRootName(), script.getId(), script.getUrl(),
                                 sourceSection.getStartLine(), sourceSection.getStartColumn()), childProfilerNode.getPayload().getSelfHitCount());
                 nodes.add(childNode);
                 for (Long timestamp : childProfilerNode.getPayload().getSelfHitTimes()) {
@@ -297,9 +298,8 @@ private Params getTypeProfile(Collection<TypeHandler.SectionTypeProfile> profile
                     entries.add(new TypeProfileEntry(sectionProfile.getSourceSection().getCharEndIndex(), types.toArray(new TypeObject[types.size()])));
                 }
             });
-            int scriptId = slh.getScriptId(entry.getKey());
-            Script script = scriptId < 0 ? null : slh.getScript(scriptId);
-            result.put(new ScriptTypeProfile(script != null ? script.getId() : 0, script != null ? script.getUrl() : "", entries.toArray(new TypeProfileEntry[entries.size()])).toJSON());
+            Script script = slh.assureLoaded(entry.getKey());
+            result.put(new ScriptTypeProfile(script.getId(), script.getUrl(), entries.toArray(new TypeProfileEntry[entries.size()])).toJSON());
         });
         json.put("result", result);
         return new Params(json);
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorRuntime.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorRuntime.java
index dde0b613ea3c..5a6843d6e00f 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorRuntime.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/InspectorRuntime.java
@@ -213,10 +213,8 @@ public Boolean processException(DebugException ex) {
             exceptionText[0] = "<Not suspended>";
         }
         if (parsed && persistScript) {
-            int id = slh.assureLoaded(source);
-            if (id != -1) {
-                ret.put("scriptId", Integer.toString(id));
-            }
+            int id = slh.assureLoaded(source).getId();
+            ret.put("scriptId", Integer.toString(id));
         }
         if (exceptionText[0] != null) {
             fillExceptionDetails(ret, exceptionText[0]);
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/ScriptsHandler.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/ScriptsHandler.java
index 3b2536fdd654..b0eae06c11cb 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/ScriptsHandler.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/ScriptsHandler.java
@@ -102,7 +102,7 @@ void removeLoadScriptListener(LoadScriptListener listener) {
         }
     }
 
-    public int assureLoaded(Source sourceLoaded) {
+    public Script assureLoaded(Source sourceLoaded) {
         DebuggerSession ds = debuggerSession;
         Source sourceResolved = sourceLoaded;
         if (ds != null) {
@@ -110,14 +110,15 @@ public int assureLoaded(Source sourceLoaded) {
         }
         Source source = (sourceResolved != null) ? sourceResolved : sourceLoaded;
         Script scr;
-        int id;
         LoadScriptListener[] listenersToNotify;
         synchronized (sourceIDs) {
             Integer eid = sourceIDs.get(source);
             if (eid != null) {
-                return eid;
+                scr = scripts.get(eid);
+                assert scr != null : sourceLoaded;
+                return scr;
             }
-            id = scripts.size();
+            int id = scripts.size();
             String sourceUrl = getSourceURL(source);
             scr = new Script(id, sourceUrl, source, sourceLoaded);
             sourceIDs.put(source, id);
@@ -128,7 +129,7 @@ public int assureLoaded(Source sourceLoaded) {
         for (LoadScriptListener l : listenersToNotify) {
             l.loadedScript(scr);
         }
-        return id;
+        return scr;
     }
 
     public String getSourceURL(Source source) {
diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/StackTrace.java b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/StackTrace.java
index bfeefd7e5037..ff662f46478a 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/StackTrace.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector/src/com/oracle/truffle/tools/chromeinspector/types/StackTrace.java
@@ -66,14 +66,12 @@ public StackTrace(InspectorExecutionContext context, List<List<DebugStackTraceEl
                 callFrame.put("functionName", frame.getName());
                 ScriptsHandler sch = context.acquireScriptsHandler();
                 try {
-                    int scriptId = sch.assureLoaded(source);
-                    if (scriptId != -1) {
-                        callFrame.put("scriptId", Integer.toString(scriptId));
-                        callFrame.put("url", sch.getScript(scriptId).getUrl());
-                        callFrame.put("lineNumber", sourceSection.getStartLine() - 1);
-                        callFrame.put("columnNumber", sourceSection.getStartColumn() - 1);
-                        callFrames.put(callFrame);
-                    }
+                    int scriptId = sch.assureLoaded(source).getId();
+                    callFrame.put("scriptId", Integer.toString(scriptId));
+                    callFrame.put("url", sch.getScript(scriptId).getUrl());
+                    callFrame.put("lineNumber", sourceSection.getStartLine() - 1);
+                    callFrame.put("columnNumber", sourceSection.getStartColumn() - 1);
+                    callFrames.put(callFrame);
                 } finally {
                     context.releaseScriptsHandler();
                 }
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUTracer.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUTracer.java
index 4649ec6692b2..11d1b56ad0ea 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUTracer.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUTracer.java
@@ -158,6 +158,7 @@ public void clearData() {
 
     private Payload getCounter(EventContext context) {
         SourceSection sourceSection = context.getInstrumentedSourceSection();
+        assert sourceSection != null : context;
         return payloadMap.computeIfAbsent(sourceSection, new Function<SourceSection, Payload>() {
             @Override
             public Payload apply(SourceSection section) {
@@ -192,7 +193,11 @@ private synchronized void resetTracer() {
         this.activeBinding = env.getInstrumenter().attachExecutionEventFactory(f, new ExecutionEventNodeFactory() {
             @Override
             public ExecutionEventNode create(EventContext context) {
-                return new CounterNode(getCounter(context));
+                if (context.getInstrumentedSourceSection() != null) {
+                    return new CounterNode(getCounter(context));
+                } else {
+                    return null;
+                }
             }
         });
     }

From b43d8e3906f0e7c54d92a64f274a4ba85ac74c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gergo.barany@oracle.com>
Date: Wed, 6 Oct 2021 13:27:34 +0200
Subject: [PATCH 307/681] Allow querying the BarrierSet for the need for
 pre-write barriers

---
 .../src/org/graalvm/compiler/nodes/gc/BarrierSet.java    | 9 +++++++++
 .../graalvm/compiler/nodes/gc/CardTableBarrierSet.java   | 5 +++++
 .../src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java  | 5 +++++
 .../core/genscavenge/graal/SubstrateNoBarrierSet.java    | 5 +++++
 4 files changed, 24 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/BarrierSet.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/BarrierSet.java
index 78f687583b79..fa6ba10cad1a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/BarrierSet.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/BarrierSet.java
@@ -48,4 +48,13 @@ public interface BarrierSet {
     BarrierType arrayStoreBarrierType(JavaKind storageKind);
 
     BarrierType guessStoreBarrierType(ValueNode object, ValueNode value);
+
+    /**
+     * Determine whether writes of the given {@code storageKind} may ever need a pre-write barrier.
+     *
+     * @return {@code false} if no writes of {@code storageKind} ever need a pre-write barrier;
+     *         {@code true} if writes of {@code storageKind} may need a pre-write barrier at least
+     *         under certain circumstances.
+     */
+    boolean mayNeedPreWriteBarrier(JavaKind storageKind);
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
index f29782ba2981..d1f16713d2b3 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
@@ -238,4 +238,9 @@ private static boolean matches(FixedAccessNode node, SerialWriteBarrier barrier)
     private static boolean matches(ArrayRangeWrite node, SerialArrayRangeWriteBarrier barrier) {
         return barrier.getAddress() == node.getAddress() && node.getLength() == barrier.getLength() && node.getElementStride() == barrier.getElementStride();
     }
+
+    @Override
+    public boolean mayNeedPreWriteBarrier(JavaKind storageKind) {
+        return false;
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java
index c3d35dd38eff..b5338cfd7c89 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java
@@ -201,4 +201,9 @@ private static void addG1PostWriteBarrier(FixedAccessNode node, AddressNode addr
     private static boolean isObjectValue(ValueNode value) {
         return value.stamp(NodeView.DEFAULT) instanceof AbstractObjectStamp;
     }
+
+    @Override
+    public boolean mayNeedPreWriteBarrier(JavaKind storageKind) {
+        return arrayStoreBarrierType(storageKind) != BarrierType.NONE;
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
index e814cb572969..39bd82093cca 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
@@ -72,4 +72,9 @@ public BarrierType arrayStoreBarrierType(JavaKind storageKind) {
     public BarrierType guessStoreBarrierType(ValueNode object, ValueNode value) {
         return BarrierType.NONE;
     }
+
+    @Override
+    public boolean mayNeedPreWriteBarrier(JavaKind storageKind) {
+        return false;
+    }
 }

From 7973ae7cc0110b063c090249f54cf183986b7e00 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 6 Oct 2021 14:33:17 +0300
Subject: [PATCH 308/681] Test examples and update Gettins started pages

---
 .../graalvm-ce-container-images.md            | 29 ++++++++++---------
 .../get-started-graalvm-community.md          | 21 ++++++++------
 .../graalvm-community/linux-aarch64.md        |  7 ++---
 .../graalvm-community/linux.md                | 12 ++++----
 .../graalvm-community/macos.md                | 17 +++++------
 .../graalvm-community/windows.md              | 17 ++++++-----
 .../get-started-graalvm-enterprise.md         | 23 ++++++++-------
 .../installation-linux-aarch64.md             |  7 ++---
 .../graalvm-enterprise/installation-linux.md  | 12 ++++----
 .../graalvm-enterprise/installation-macos.md  | 22 +++++---------
 .../installation-windows.md                   | 19 ++++++------
 11 files changed, 89 insertions(+), 97 deletions(-)

diff --git a/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md b/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
index a16a8e3b7014..4d3646e906f7 100644
--- a/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
+++ b/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
@@ -22,7 +22,7 @@ FROM ghcr.io/graalvm/graalvm-ce:latest
 
 There are different GraalVM Community container images provided depending on the architecture and the Java version.
 GraalVM binaries are built for Linux, macOS, and Windows platforms on x86 64-bit systems, and for Linux on ARM 64-bit systems.
-The images are multi-arch (`aarch64` or `amd64` will be pulled depending on Docker host architecture), and named per a _platform-jdk-version_ naming scheme, for example, `ghcr.io/graalvm/graalvm-ce:latest:ol8-java11-21.2.0`.
+The images are multi-arch (`aarch64` or `amd64` will be pulled depending on Docker host architecture), and named per a _platform-jdk-version_ naming scheme, for example, `ghcr.io/graalvm/graalvm-ce:latest:ol8-java11-21.3.0`.
 A complete list can be found on the [All versions](https://github.com/orgs/graalvm/packages/container/graalvm-ce/versions) page.
 
 The images are based on Oracle Linux and has GraalVM Community downloaded, unzipped and made available.
@@ -30,23 +30,24 @@ It means that Java, JavaScript, Node.js and the LLVM runtime are available out o
 
 You can start a container and enter the `bash` session with the following run command:
 ```shell
-docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.2.0 bash
+docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.3.0 bash
 ```
 Check that `java`, `js` and other commands work as expected.
 ```shell
-→ docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.2.0 bash
+→ docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.3.0 bash
 bash-4.4# java -version
-openjdk version "11.0.12" 2021-07-20
-OpenJDK Runtime Environment GraalVM CE 21.2.0 (build 11.0.12+6-jvmci-21.2-b06)
-OpenJDK 64-Bit Server VM GraalVM CE 21.2.0 (build 11.0.12+6-jvmci-21.2-b06, mixed mode, sharing)
+openjdk version "17" 2021-09-14
+OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 17+35-jvmci-21.3-b03)
+OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 17+35-jvmci-21.3-b03, mixed mode, sharing)
+
 bash-4.4# js -version
-GraalVM JavaScript (GraalVM CE Native 21.2.0)
+GraalVM JavaScript (GraalVM CE Native 21.3.0)
 > 1 + 1
 2
 > quit()
+>
 bash-4.4# lli --version
-LLVM 10.0.0 (GraalVM CE Native 21.2.0)
-bash-4.4#
+LLVM 12.0.1 (GraalVM CE Native 21.3.0)
 ```
 
 Please note that the image contains only the components immediately available in the GraalVM Community core download.
@@ -56,7 +57,7 @@ However, the [GraalVM Updater, `gu`](/reference-manual/graalvm-updater/), utilit
 For example, the following command installs the Ruby support (the output below is truncated for brevity):
 
 ```shell
-docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.2.0 bash
+docker run -it --rm ghcr.io/graalvm/graalvm-ce:21.3.0 bash
 bash-4.4# gu install ruby
 Downloading: Component catalog
 Processing component archive: Component ruby
@@ -68,13 +69,13 @@ Downloading: Component ruby
 Here is a sample command that maps the `/absolute/path/to/directory/no/trailing/slash` directory from the host system to the `/path/inside/container` inside the container.
 
 ```shell
-docker run -it --rm -v /absolute/path/to/directory/no/trailing/slash:/path/inside/container ghcr.io/graalvm/graalvm-ce:21.2.0 bash
+docker run -it --rm -v /absolute/path/to/directory/no/trailing/slash:/path/inside/container ghcr.io/graalvm/graalvm-ce:21.3.0 bash
 ```
 
-If you want to create Docker images that contain GraalVM with Ruby, R, or Python, you can use a Dockerfile like the example below, which uses `ghcr.io/graalvm/graalvm-ce:21.2.0` as the base image, installs the Ruby support using the `gu` utility, then creates and runs a sample Ruby program.
+If you want to create Docker images that contain GraalVM with Ruby, R, or Python, you can use a Dockerfile like the example below, which uses `ghcr.io/graalvm/graalvm-ce:21.3.0` as the base image, installs the Ruby support using the `gu` utility, then creates and runs a sample Ruby program.
 
 ```shell
-FROM ghcr.io/graalvm/graalvm-ce:21.2.0
+FROM ghcr.io/graalvm/graalvm-ce:21.3.0
 RUN gu install ruby
 WORKDIR /workdir
 RUN echo 'puts "Hello from Ruby!\nVersion: #{RUBY_DESCRIPTION}"' > app.rb
@@ -88,5 +89,5 @@ docker build -t ruby-demo .
 ...
 docker run -it --rm ruby-demo
 Hello from Ruby!
-Version: truffleruby 21.2.0, like ruby 2.7.3, GraalVM CE Native [x86_64-darwin]
+Version: truffleruby 21.3.0, like ruby 2.7.4, GraalVM CE Native [x86_64-darwin]
 ```
diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index f6142b394a12..35a16e43645d 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -42,14 +42,15 @@ GraalVM's `/bin` directory is similar to that of a standard JDK, but includes a
 Check the versions of the runtimes provided by default:
 ```shell
 java -version
-openjdk version "11.0.12" 2021-07-20
-OpenJDK Runtime Environment GraalVM CE 21.2.0 (build 11.0.12+6-jvmci-21.2-b06)
-OpenJDK 64-Bit Server VM GraalVM CE 21.2.0 (build 11.0.12+6-jvmci-21.2-b06, mixed mode, sharing)
+openjdk version "17" 2021-09-14
+OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 17+35-jvmci-21.3-b03)
+OpenJDK 64-Bit Server VM GraalVM CE 21.3.0 (build 17+35-jvmci-21.3-b03, mixed mode, sharing)
+
 js -version
-GraalVM JavaScript (GraalVM CE Native 21.2.0)
+GraalVM JavaScript (GraalVM CE Native 21.3.0)
 
 lli --version
-LLVM 10.0.0 (GraalVM CE Native 21.2.0)
+LLVM 12.0.1 (GraalVM CE Native 21.3.0)
 ```
 
 Further below you will find information on how to add other optionally available GraalVM runtimes including Node.js, Ruby, R, Python, and WebAssembly.
@@ -91,8 +92,10 @@ GraalVM also supports running Node.js applications.
 Node.js support is not installed by default, but can be easily added with GraalVM Updater:
 ```shell
 gu install nodejs
-node -v
-v14.16.1
+```
+```shell
+$JAVA_HOME/bin/node -v
+v14.17.6
 ```
 
 More than 100,000 npm packages are regularly tested and are compatible with GraalVM, including modules like express, react, async, request, browserify, grunt, mocha, and underscore.
@@ -101,7 +104,7 @@ The `npm` command is equivalent to the default Node.js command and supports all
 
 Install the `colors` and `ansispan` modules using `npm install`. After the modules are installed, you can use them from your application.
 ```shell
-npm install colors ansispan
+$JAVA_HOME/bin/npm install colors ansispan
 ```
 
 Use the following code snippet and save it as the `app.js` file in the same directory where you installed the Node.js modules:
@@ -120,7 +123,7 @@ setTimeout(function() { console.log("DONE!"); process.exit(); }, 2000);
 
 Run _app.js_ on GraalVM Enterprise using the `node` command:
 ```shell
-node app.js
+$JAVA_HOME/bin/node app.js
 ```
 
 For more detailed documentation and information on compatibility with Node.js,
diff --git a/docs/getting-started/graalvm-community/linux-aarch64.md b/docs/getting-started/graalvm-community/linux-aarch64.md
index e4fb8d221c09..5119f7b654d9 100644
--- a/docs/getting-started/graalvm-community/linux-aarch64.md
+++ b/docs/getting-started/graalvm-community/linux-aarch64.md
@@ -7,15 +7,14 @@ permalink: /docs/getting-started/linux-aarch64/
 
 # Installation on Linux ARM64 systems
 
-As of version 21.0, we provide GraalVM Community Edition for Linux on ARM 64-bit system, based on OpenJDK 11 for AArch64 architecture.
+As of version 21.0, we provide GraalVM Community Edition for Linux on ARM 64-bit system, based on OpenJDK 11 and OpenJDK 17 for AArch64 architecture.
 This distribution can be installed on Linux systems for AArch64 CPU architecture.
 
-Note: The base GraalVM Community distribution including all components is **experimental** on Linux ARM 64-bit systems.
-
+<!-- Note: The base GraalVM Community distribution including all components is **experimental** on Linux ARM 64-bit systems. -->
 You can install the GraalVM distribution for Linux ARM64 systems from an archive file (_.tar.gz_).
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
-1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 or 16 based distribution for the Linux AArch64 architecture, and download.
+1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Select Java 11 or 17 based distribution for the Linux AArch64 architecture, and download.
 2. Change the directory to the location where you want to install GraalVM, then move the _.tar.gz_ archive to it.
 3. Unzip the archive:
 ```shell
diff --git a/docs/getting-started/graalvm-community/linux.md b/docs/getting-started/graalvm-community/linux.md
index 8b152d3abfda..a9800864d7d6 100644
--- a/docs/getting-started/graalvm-community/linux.md
+++ b/docs/getting-started/graalvm-community/linux.md
@@ -9,7 +9,7 @@ permalink: /docs/getting-started/linux/
 
 Follow these steps to install GraalVM Community Edition on the Linux operating system.
 
-1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 based or Java 8 based distribution for the Linux AMD64 architecture, and download.
+1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Select Java 11 based or Java 17 based distribution for the Linux AMD64 architecture, and download.
 2. Change the directory to the location where you want to install GraalVM, then move the _.tar.gz_ archive to it.
 3. Unzip the archive:
 ```shell
@@ -41,15 +41,13 @@ Tools/Utilities:
 *  [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
+*  [Node.js](/reference-manual/js/) -- Node.js 14.17.6 compatible
 *  [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.2 compatible
+*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.4 compatible
 *  [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
 *  [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to GraalVM.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"} to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-community/macos.md b/docs/getting-started/graalvm-community/macos.md
index 4828d64b6229..6ad5bb3d4cfa 100644
--- a/docs/getting-started/graalvm-community/macos.md
+++ b/docs/getting-started/graalvm-community/macos.md
@@ -10,14 +10,13 @@ permalink: /docs/getting-started/macos/
 GraalVM Community Edition can be installed for a single user and administrator privileges are not required.
 However, if GraalVM is meant to become a default JDK, administrator privileges are required.
 
-GraalVM Community Edition does not provide the installation wizard, unlike OpenJDK
-distributions for macOS that come with the _.dmg_ download.
+GraalVM Community Edition does not provide the installation wizard, unlike OpenJDK distributions for macOS that come with the _.dmg_ download.
 It can be installed from an archive file (_.tar.gz_).
 Note that in macOS, the JDK installation path is: `/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home`.
 
 Follow these steps to install GraalVM Community on the macOS operating system:
 
-1. Navigate to [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 based or Java 8 based distribution for macOS, and download.
+1. Navigate to [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Select Java 11 based or Java 17 based distribution for macOS, and download.
 2. Unzip the archive.
   ```shell
    tar -xzf graalvm-ce-java<version>-darvin-amd64-<version>.tar.gz
@@ -56,7 +55,7 @@ sudo xattr -r -d com.apple.quarantine /path/to/GRAALVM_HOME
 
 #### On JAVA_HOME Command
 The information property file, _Info.plist_, is in the top level _Contents_ folder.
-This means that GraalVM Enterprise participates in the macOS-specific `/usr/libexec/java_home` mechanism. Depending on other JDK 8 installation(s) available, it is now possible that `/usr/libexec/java_home -v1.8` returns `/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home`.
+This means that GraalVM Enterprise participates in the macOS-specific `/usr/libexec/java_home` mechanism. Depending on other JDK installation(s) available, it is now possible that `/usr/libexec/java_home -v1.8` returns `/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home`.
 You can run `/usr/libexec/java_home -v1.8 -V` to see the complete list of 1.8 JVMs available to the `java_home` command. This command sorts the JVMs in decreasing version order and chooses the top one as the default for the specified version.
 Within a specific version, the sort order appears to be stable but is unspecified.
 
@@ -71,15 +70,13 @@ Tools/Utilities:
 *  [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
+*  [Node.js](/reference-manual/js/) -- Node.js 14.17.6 compatible
 *  [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.2 compatible
+*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.4 compatible
 *  [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
 *  [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to GraalVM.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"} to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-community/windows.md b/docs/getting-started/graalvm-community/windows.md
index 75bd7134e958..ada076c6d2ee 100644
--- a/docs/getting-started/graalvm-community/windows.md
+++ b/docs/getting-started/graalvm-community/windows.md
@@ -10,7 +10,7 @@ permalink: /docs/getting-started/windows/
 You can install GraalVM Community Edition on the Windows operating system from an archive file (_zip_).
 Follow these steps:
 
-1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 based or Java 8 based distribution for Windows, and download.
+1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Select Java 11 based or Java 17 based distribution for Windows, and download.
 2. Change the directory to the location where you want to install GraalVM, then move the _.zip_ archive file to it.
 3. Unzip the archive to your file system.
 4. There can be multiple JDKs installed on the machine. The next step is to configure the runtime environment. Setting environment variables via the command line will work the same way for Windows 7, 8 and 10.
@@ -43,12 +43,13 @@ The GraalVM Community distribution for Windows platforms includes OpenJDK with t
 Currently, the GraalVM environment on Windows can be extended with [Native Image](/reference-manual/native-image/), [Java on Trufle](/reference-manual/java-on-truffle/), WebAssembly, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
-To make use of Native Image on Windows, observe the following recommendations.
-The required Microsoft Visual C++ (MSVC) version depends on the JDK version that GraalVM is based on.
-For GraalVM based on JDK 8, you will need MSVC 2010 SP1 version. The recommended installation method is using Microsoft Windows SDK 7.1:
-1. Download the SDK file `GRMSDKX_EN_DVD.iso` for from [Microsoft](https://www.microsoft.com/en-gb/download).
-2. Mount the image by opening `F:\Setup\SDKSetup.exe` directly.
 
-For GraalVM distribution based on JDK 11, you will need MSVC 2017 15.5.5 or later version.
+To start using Native Image on Windows, install Visual Studio Code and Microsoft Visual C++(MSVC). There are two installation options:
+  * Install the Visual Studio Code Build Tools with the Windows 10 SDK
+  * Install Visual Studio Code with the Windows 10 SDK
 
-The last prerequisite, common for both distributions, is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/). On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
+You can use Visual Studio 2017 version 15.9 or later.
+
+Lastly, on Windows, the `native-image` builder will only work when it is executed from the **x64 Native Tools Command Prompt**.
+The command for initiating an x64 Native Tools command prompt is different if you only have the Visual Studio Build Tools installed, versus if you have the full VS Code 2019 installed.
+Check [this link](https://medium.com/graalvm/using-graalvm-and-native-image-on-windows-10-9954dc071311) for step-by-step instructions.
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index 24c251a1b064..22198e511638 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -45,15 +45,15 @@ GraalVM Enterprise's `/bin` directory is similar to that of a standard JDK, but
 
 Check the versions of the runtimes provided by default:
 ```shell
-java version "11.0.12" 2021-07-20 LTS
-Java(TM) SE Runtime Environment GraalVM EE 21.2.0 (build 11.0.12+8-LTS-jvmci-21.2-b06)
-Java HotSpot(TM) 64-Bit Server VM GraalVM EE 21.2.0 (build 11.0.12+8-LTS-jvmci-21.2-b06, mixed mode, sharing)
+java version "11.0.13" 2021-10-19 LTS
+Java(TM) SE Runtime Environment GraalVM EE 21.3.0 (build 11.0.13+9-LTS-jvmci-21.3-b03)
+Java HotSpot(TM) 64-Bit Server VM GraalVM EE 21.3.0 (build 11.0.13+9-LTS-jvmci-21.3-b03, mixed mode, sharing)
 
 js -version
-GraalVM JavaScript (GraalVM EE Native 21.2.0)
+GraalVM JavaScript (GraalVM EE Native 21.3.0)
 
 lli --version
-LLVM 10.0.0 (GraalVM EE Native 21.2.0)
+LLVM 12.0.1 (GraalVM EE Native 21.3.0)
 ```
 
 Further below you will find information on how to add other optionally available GraalVM Enterprise runtimes including Node.js, Ruby, R, Python, and WebAssembly.
@@ -94,8 +94,10 @@ GraalVM Enterprise also supports running Node.js applications.
 Node.js support is not installed by default, but can be easily added with GraalVM Updater:
 ```shell
 gu install nodejs
-node -v
-v15.12.0
+```
+```shell
+$JAVA_HOME/bin/node -v
+v14.17.6
 ```
 
 More than 100,000 npm packages are regularly tested and are compatible with GraalVM Enterprise, including modules like express, react, async, request, browserify, grunt, mocha, and underscore.
@@ -105,7 +107,7 @@ The `npm` command is equivalent to the default Node.js command and supports all
 Install the `colors` and `ansispan` modules using `npm install`.
 After the modules are installed, you can use them from your application.
 ```shell
-npm install colors ansispan
+$JAVA_HOME/bin/npm install colors ansispan
 ```
 
 Use the following code snippet and save it as the `app.js` file in the same directory where you installed the Node.js modules:
@@ -124,7 +126,7 @@ setTimeout(function() { console.log("DONE!"); process.exit(); }, 2000);
 
 Run _app.js_ on GraalVM Enterprise using the `node` command:
 ```shell
-node app.js
+$JAVA_HOME/bin/node app.js
 ```
 
 For more detailed documentation and information on compatibility with Node.js, proceed to [JavaScript and Node.js](/reference-manual/js/).
@@ -254,7 +256,8 @@ int main() {
 }
 ```
 
-Compile it using the most recent [Emscripten compiler frontend](https://emscripten.org/docs/tools_reference/emcc.html) version. It should produce a standalone _floyd.wasm_ file in the current working directory:
+Compile it using the most recent [Emscripten compiler frontend](https://emscripten.org/docs/tools_reference/emcc.html) version.
+It should produce a standalone _floyd.wasm_ file in the current working directory:
 ```shell
 emcc -o floyd.wasm floyd.c
 ```
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
index 320ef5e8a66d..2f0532cca051 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
@@ -5,16 +5,15 @@ permalink: /getting-started/installation-linux-aarch64/
 
 # Installation on Linux ARM64 systems
 
-As of version 21.0, Oracle provides GraalVM Enterprise distributions based on Oracle JDK11 AArch64.
+As of version 21.0, Oracle provides GraalVM Enterprise distributions based on Oracle JDK11 and Oracle JDK17 for AArch64 architecture.
 
This distribution can be installed on Oracle Linux and Red Hat Enterprise Linux(RHEL) systems for AArch64 CPU architecture.
 
-Note: The core GraalVM Enterprise distribution including all components is **experimental** on Linux ARM 64-bit systems.
-
+<!-- Note: The core GraalVM Enterprise distribution including all components is **experimental** on Linux ARM 64-bit systems. -->
 You can install the GraalVM distribution for Linux ARM64 systems from an archive file (_.tar.gz_).
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html?selected_tab=21).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **11** or **16** for the Java version, **Linux** for the operating system, and **aarch64** for the architecture.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **11** or **17** for the Java version, **Linux** for the operating system, and **aarch64** for the architecture.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java11-linux-aarch64-<version>.tar.gz**.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.tar.gz_ archive to it.
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux.md b/docs/getting-started/graalvm-enterprise/installation-linux.md
index 84c9c4e1a3a2..d86e9beba9a2 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux.md
@@ -8,7 +8,7 @@ permalink: /getting-started/installation-linux/
 Follow these steps to install Oracle GraalVM Enterprise Edition on the Linux operating system:
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html?selected_tab=21).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, **Linux** for the operating system, and **amd64** for the architecture.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, **Linux** for the operating system, and **amd64** for the architecture.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java<version>-linux-amd64-<version>.tar.gz**.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.tar.gz_ archive to it.
@@ -40,15 +40,13 @@ Tools/Utilities:
 * [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM Enterprise
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
+* [Node.js](/reference-manual/js/) -- Node.js 14.17.6 compatible
 * [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
+* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.4 compatible
 * [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
 * [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM Enterprise includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
+To assist a user with installation, GraalVM Enterprise includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"} to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
diff --git a/docs/getting-started/graalvm-enterprise/installation-macos.md b/docs/getting-started/graalvm-enterprise/installation-macos.md
index 086dc63feb9d..9e493cb27ecc 100644
--- a/docs/getting-started/graalvm-enterprise/installation-macos.md
+++ b/docs/getting-started/graalvm-enterprise/installation-macos.md
@@ -5,19 +5,15 @@ permalink: /getting-started/installation-macos/
 
 # Installation on macOS Platforms
 
-GraalVM Enterprise can be installed for a single user and administrator
-privileges are not required. However, if GraalVM Enterprise is meant to become a
-default JDK, administrator privileges are required.
+GraalVM Enterprise can be installed for a single user and administrator privileges are not required. However, if GraalVM Enterprise is meant to become a default JDK, administrator privileges are required.
 
-GraalVM Enterprise does not provide the installation wizard, unlike Oracle JDK
-distributions for macOS that come with the _.dmg_ download. Note that in macOS,
-the JDK installation path is:
-`/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home`.
+GraalVM Enterprise does not provide the installation wizard, unlike Oracle JDK distributions for macOS that come with the _.dmg_ download.
+Note that in macOS, the JDK installation path is: `/Library/Java/JavaVirtualMachines/<graalvm>/Contents/Home`.
 
 Follow these steps to install Oracle GraalVM Enterprise Edition on the macOS operating system:
 
 1. Navigate to[ Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, and **macOS** for the operating system.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, and **macOS** for the operating system.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java<version>-darvin-amd64-<version>.tar.gz**.
 5. Unzip the archive:
@@ -71,15 +67,13 @@ Tools/Utilities:
 * [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM Enterprise
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
+* [Node.js](/reference-manual/js/) -- Node.js 14.17.6 compatible
 * [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
+* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.4 compatible
 * [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
 * [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
-To assist users with installation, GraalVM Enterprise includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
+To assist users with installation, GraalVM Enterprise includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"} to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
diff --git a/docs/getting-started/graalvm-enterprise/installation-windows.md b/docs/getting-started/graalvm-enterprise/installation-windows.md
index 0807a4a50643..06c444287c49 100644
--- a/docs/getting-started/graalvm-enterprise/installation-windows.md
+++ b/docs/getting-started/graalvm-enterprise/installation-windows.md
@@ -9,7 +9,7 @@ You can install Oracle GraalVM Enterprise Edition on the Windows operating syste
 Follow these steps:
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, and **Windows** for the operating system.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, and **Windows** for the operating system.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading graalvm-ee-java<version>-windows-amd64-<version>.zip.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.zip_ archive to it.
@@ -40,14 +40,13 @@ The GraalVM Enterprise distribution for Windows platforms includes Oracle JDK wi
 Currently, the GraalVM Enterprise environment on Windows can be extended with [Native Image](/reference-manual/native-image/), [Java on Trufle](/reference-manual/java-on-truffle/), WebAssembly, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
-To make use of Native Image on Windows, observe the following recommendations. The
-required Microsoft Visual C++ (MSVC) version depends on the JDK version that
-GraalVM is based on. For GraalVM Enterprise distribution based on JDK 8, you will need MSVC
-2010 SP1 version. The recommended installation method is using Microsoft Windows
-SDK 7.1:
-1. Download the SDK file `GRMSDKX_EN_DVD.iso` for from [Microsoft](https://www.microsoft.com/en-gb/download).
-2. Mount the image by opening `F:\Setup\SDKSetup.exe` directly.
 
-For GraalVM Enterprise distribution based on JDK 11, you will need MSVC 2017 15.5.5 or later version.
+To start using Native Image on Windows, install Visual Studio Code and Microsoft Visual C++(MSVC). There are two installation options:
+  * Install the Visual Studio Code Build Tools with the Windows 10 SDK
+  * Install Visual Studio Code with the Windows 10 SDK
 
-The last prerequisite, common for both distributions, is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/). On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
+You can use Visual Studio 2017 version 15.9 or later.
+
+Lastly, on Windows, the `native-image` builder will only work when it is executed from the **x64 Native Tools Command Prompt**.
+The command for initiating an x64 Native Tools command prompt is different if you only have the Visual Studio Build Tools installed, versus if you have the full VS Code 2019 installed.
+Check [this link](https://medium.com/graalvm/using-graalvm-and-native-image-on-windows-10-9954dc071311) for step-by-step instructions.

From 073bce2ce3f8d591eb8c9c80aee692fbb9333521 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 6 Oct 2021 15:36:38 +0300
Subject: [PATCH 309/681] Test and review Profiling.md

---
 .../get-started-graalvm-community.md          |  5 +-
 .../get-started-graalvm-enterprise.md         |  4 +-
 docs/introduction.md                          |  4 +-
 docs/tools/profiling.md                       | 85 ++++++++++---------
 4 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index 35a16e43645d..77a7c8537146 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -102,9 +102,10 @@ More than 100,000 npm packages are regularly tested and are compatible with Graa
 To install a Node.js module, use the `npm` executable from the `<graalvm>/bin` folder, which is installed together with `node`.
 The `npm` command is equivalent to the default Node.js command and supports all Node.js APIs.
 
-Install the `colors` and `ansispan` modules using `npm install`. After the modules are installed, you can use them from your application.
+Install the modules `colors`, `ansispan`, and `express` using `npm install`.
+After the modules are installed, you can use them from your application.
 ```shell
-$JAVA_HOME/bin/npm install colors ansispan
+$JAVA_HOME/bin/npm install colors ansispan express
 ```
 
 Use the following code snippet and save it as the `app.js` file in the same directory where you installed the Node.js modules:
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index 22198e511638..6bb021e65e3a 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -104,10 +104,10 @@ More than 100,000 npm packages are regularly tested and are compatible with Graa
 To install a Node.js module, use the `npm` executable from the `<graalvm>/bin` folder, which is installed together with `node`.
 The `npm` command is equivalent to the default Node.js command and supports all Node.js APIs.
 
-Install the `colors` and `ansispan` modules using `npm install`.
+Install the modules `colors`, `ansispan`, and `express` using `npm install`.
 After the modules are installed, you can use them from your application.
 ```shell
-$JAVA_HOME/bin/npm install colors ansispan
+$JAVA_HOME/bin/npm install colors ansispan express
 ```
 
 Use the following code snippet and save it as the `app.js` file in the same directory where you installed the Node.js modules:
diff --git a/docs/introduction.md b/docs/introduction.md
index 65ddeb55c202..9309594c05b5 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -90,9 +90,9 @@ Tools/Utilities:
 
 Runtimes:
 
-* [Node.js](/reference-manual/js/) -- the Node.js 14.16.1 runtime for JavaScript
+* [Node.js](/reference-manual/js/) -- the Node.js 14.17.6 runtime for JavaScript
 * [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
+* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.4 compatible
 * [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
 * [GraalWasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
 
diff --git a/docs/tools/profiling.md b/docs/tools/profiling.md
index f5cc19a9e5f3..9cf6222bf0cb 100644
--- a/docs/tools/profiling.md
+++ b/docs/tools/profiling.md
@@ -84,31 +84,31 @@ algorithm.
     js primes.js --cpusampler
 
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.
-    ----------------------------------------------------------------------------------------------------
-    Sampling Histogram. Recorded 825 samples with period 10ms.
+    ----------------------------------------------------------------------------------------------
+    Sampling Histogram. Recorded 250 samples with period 10ms.
       Self Time: Time spent on the top of the stack.
       Total Time: Time spent somewhere on the stack.
-    ----------------------------------------------------------------------------------------------------
+    ----------------------------------------------------------------------------------------------
     Thread[main,5,main]
-     Name              |             Total Time    ||              Self Time    || Location             
-    ----------------------------------------------------------------------------------------------------
-     accept            |             7330ms  88.8% ||             7330ms  88.8% || primes.js~13-22:191-419
-     :program          |             8250ms 100.0% ||              420ms   5.1% || primes.js~1-46:0-982
-     next              |             7820ms  94.8% ||              250ms   3.0% || primes.js~31-37:537-737
-     DivisibleByFilter |              440ms   5.3% ||              240ms   2.9% || primes.js~7-23:66-421
-     AcceptFilter      |               20ms   0.2% ||               10ms   0.1% || primes.js~1-5:0-63
-     Primes            |               20ms   0.2% ||                0ms   0.0% || primes.js~25-38:424-739
-    ----------------------------------------------------------------------------------------------------
+     Name       ||             Total Time    ||              Self Time    || Location
+    ----------------------------------------------------------------------------------------------
+     accept     ||             2150ms  86.0% ||             2150ms  86.0% || primes.js~13-22:191-419
+     next       ||             2470ms  98.8% ||              320ms  12.8% || primes.js~31-37:537-737
+     :program   ||             2500ms 100.0% ||               30ms   1.2% || primes.js~1-46:0-982
+    ----------------------------------------------------------------------------------------------
     ```
+
     By default the sampler prints an execution time histogram for each JavaScript function.
-    You can produce a flame graph in SVG format by doing 
+    You can produce a flame graph in SVG format by specifying that with the `--cpusampler.Output=flamegraph` option:
+
     ```shell
     js primes.js --cpusampler --cpusampler.Output=flamegraph --cpusampler.OutputFile=primes.svg
     ```
-    which should produce something like this
-    
+
+    It should produce something like this:
+
     ![](img/profiler_flamegraph.png)
-    
+
     You can zoom into the graph by clicking on elements.
 
     By default, CPU sampling takes a sample every 10 milliseconds. From the
@@ -129,28 +129,28 @@ algorithm.
     ```
     Now use the CPU Tracer to collect execution counts of each statement:
 
-4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept`
+4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=accept`
 to collect execution counts for all statements in methods ending with `accept`:
     ```shell
-    js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept
+    js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=accept
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.
     -----------------------------------------------------------------------------------------
-    Tracing Histogram. Counted a total of 351278226 element executions.
+    Tracing Histogram. Counted a total of 468336895 element executions.
       Total Count: Number of times the element was executed and percentage of total executions.
       Interpreted Count: Number of times the element was interpreted and percentage of total executions of this element.
       Compiled Count: Number of times the compiled element was executed and percentage of total executions of this element.
     -----------------------------------------------------------------------------------------
      Name     |          Total Count |    Interpreted Count |       Compiled Count | Location
     -----------------------------------------------------------------------------------------
-     accept   |     117058669  33.3% |         63575   0.1% |     116995094  99.9% | primes.js~15:245-258
-     accept   |     117053670  33.3% |         63422   0.1% |     116990248  99.9% | primes.js~16-18:275-348
-     accept   |     117005061  33.3% |         61718   0.1% |     116943343  99.9% | primes.js~19:362-381
-     accept   |         53608   0.0% |          1857   3.5% |         51751  96.5% | primes.js~14:215-227
-     accept   |         53608   0.0% |          1857   3.5% |         51751  96.5% | primes.js~13-22:191-419
-     accept   |         48609   0.0% |          1704   3.5% |         46905  96.5% | primes.js~17:322-334
-     accept   |          4999   0.0% |           153   3.1% |          4846  96.9% | primes.js~21:409-412
+     accept   |     234117338  50.0% |        365660   0.2% |     233751678  99.8% | primes.js~15:245-258
+     accept   |     117053670  25.0% |        182582   0.2% |     116871088  99.8% | primes.js~16-18:275-348
+     accept   |     117005061  25.0% |        181001   0.2% |     116824060  99.8% | primes.js~19:362-381
+     accept   |         53608   0.0% |          1829   3.4% |         51779  96.6% | primes.js~14:211-227
+     accept   |         53608   0.0% |          1829   3.4% |         51779  96.6% | primes.js~13-22:191-419
+     accept   |         48609   0.0% |          1581   3.3% |         47028  96.7% | primes.js~17:322-334
+     accept   |          4999   0.0% |           248   5.0% |          4751  95.0% | primes.js~21:402-413
      accept   |             1   0.0% |             1 100.0% |             0   0.0% | primes.js~2-4:25-61
-     accept   |             1   0.0% |             1 100.0% |             0   0.0% | primes.js~3:52-55
+     accept   |             1   0.0% |             1 100.0% |             0   0.0% | primes.js~3:45-55
     -----------------------------------------------------------------------------------------
     ```
 
@@ -166,17 +166,16 @@ be preceded by the `--experimental-options` command line option.
     js primes.js --experimental-options --memtracer
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.
     ------------------------------------------------------------
-     Location Histogram with Allocation Counts. Recorded a total of 5013 allocations.
-       Total Count: Number of allocations during the execution of this element.
-       Self Count: Number of allocations in this element alone (excluding sub calls).
-    ------------------------------------------------------------
-     Name        |      Self Count |     Total Count |  Location
-    ------------------------------------------------------------
-     next        |     5000  99.7% |     5000  99.7% | primes.js~31-37:537-737
-     :program    |       11   0.2% |     5013 100.0% | primes.js~1-46:0-966
-     Primes      |        1   0.0% |        1   0.0% | primes.js~25-38:454-739
-    ------------------------------------------------------------
-
+    Location Histogram with Allocation Counts. Recorded a total of 5007 allocations.
+      Total Count: Number of allocations during the execution of this element.
+      Self Count: Number of allocations in this element alone (excluding sub calls).
+   --------------------------------------------------------
+    Name     |      Self Count |     Total Count | Location
+   --------------------------------------------------------
+    next     |     5000  99.9% |     5000  99.9% | primes.js~31-37:537-737
+    :program |        6   0.1% |     5007 100.0% | primes.js~1-46:0-982
+    Primes   |        1   0.0% |        1   0.0% | primes.js~25-38:424-739
+   --------------------------------------------------------
     ```
 
     This output shows the number of allocations which were recorded per function.
@@ -203,19 +202,20 @@ The current set of available options is as follows:
 file paths, for example, `*program*.sl`. The default is &lowast;.
 - `--cpusampler.FilterLanguage=<String>`: profiles languages only with the
 matching mime-type, for example, `+`. The default is no filter.
+- `--cpusampler.FilterMimeType=<String>`: profiles languages with mime-type. There is no filter by default.
 - `--cpusampler.FilterRootName=<Expression>`: applies a wildcard filter for
 program roots, for example, `Math.*`. The default is &lowast;.
 - `--cpusampler.GatherHitTimes`: saves a timestamp for each taken sample. The default is false.
+- `--cpusampler.MinSamples=<Integer>`: removes elements from output if they have less samples than this value (default is `0`).
 - `--cpusampler.Mode=<Mode>`:  describes the level of sampling detail. Please note that increased detail can lead to reduced accuracy.
     - `exclude_inlined_roots`: samples roots excluding inlined functions (enabled by default)
     - `roots`: samples roots including inlined functions
     - `statements`: samples all statements
 - `--cpusampler.Output=<Output>`: prints a `histogram`, `calltree`, `json`, or `flamegraph` as output.
 The default is `histogram`.
+- `--cpusampler.OutputFile=<String>`: saves output to the given file. Output is printed to output stream by default.
 - `--cpusampler.Period=<Long>`: specifies the period, in milliseconds, to
 sample the stack.
-- `--cpusampler.SampleInternal`: captures internal elements. The default is
-false.
 - `--cpusampler.StackLimit=<Integer>`: specifies the maximum number of stack
 elements.
 - `--cpusampler.SummariseThreads `: prints sampling output as a summary of all `per thread` profiles. The default is false.
@@ -227,11 +227,12 @@ elements.
 file paths, for example, `*program*.sl`. The default is &lowast;.
 - `--cputracer.FilterLanguage=<String>`: profiles languages only with the
 matching mime-type, for example, `+`. The default is no filter.
+- `--cputracer.FilterMimeType=<String>`: profiles languages with mime-type. There is no filter by default.
 - `--cputracer.FilterRootName=<Expression>`: applies a wildcard filter for
 program roots, for example, `Math.*`. The default is &lowast;.
 - `--cputracer.Output=<Output>` prints a `histogram` or `json` as output. The default is `histogram`.
+- `--cpusampler.OutputFile=<String>`: saves output to the given file. Output is printed to output stream by default.
 - `--cputracer.TraceCalls`: captures calls when tracing. The default is false.
-- `--cputracer.TraceInternal`: traces internal elements. The default is false.
 - `--cputracer.TraceRoots=<Boolean>`: captures roots when tracing. The default
 is true.
 - `--cputracer.TraceStatements`: captures statements when tracing. The default
@@ -244,10 +245,10 @@ The memory tracer tool is currently an experimental tool. Make sure to prepend t
 - `--memtracer`: enables the memory tracer. Disabled by default.
 - `--memtracer.FilterFile=<Expression>`: applies a wildcard filter for source file paths, for example, `*program*.sl`. The default is &lowast;.
 - `--memtracer.FilterLanguage=<String>`: profiles languages only with the matching mime-type, for example, `+`. The default is no filter.
+- `--memtracer.FilterMimeType=<String>`: profiles languages with mime-type. There is no filter by default.
 - `--memtracer.FilterRootName=<Expression>`: applies a wildcard filter for program roots, for example, `Math.*`. The default is &lowast;.
 - `--memtracer.Output=<Format>`: prints a `typehistogram`, `histogram`, or `calltree` as output. The default is `histogram`.
 - `--memtracer.StackLimit=<Integer>`: sets the maximum number of maximum stack elements.
 - `--memtracer.TraceCalls`: captures calls when tracing. The default is false.
-- `--memtracer.TraceInternal`: captures internal elements. The default is false.
 - `--memtracer.TraceRoots=<Boolean>`: captures roots when tracing. The default is true.
 - `--memtracer.TraceStatements`: captures statements when tracing. The default is false.

From 23989775a8b8457a6aa637da1684a7283fa2ade0 Mon Sep 17 00:00:00 2001
From: Jakub Chaloupka <jakub.chaloupka@oracle.com>
Date: Mon, 4 Oct 2021 08:56:16 +0200
Subject: [PATCH 310/681] Init context thread locals and notify thread
 initialization for the thread used in loading pre-initialized context on SVM.

---
 .../instrumentation/InstrumentAccessor.java   |  6 +++
 .../InstrumentationHandler.java               |  4 ++
 .../ContextPreInitializationTest.java         | 41 +++++++++++++++++--
 .../com/oracle/truffle/api/impl/Accessor.java |  2 +
 .../truffle/polyglot/PolyglotContextImpl.java |  9 ++++
 .../truffle/polyglot/PolyglotEngineImpl.java  | 23 +++++++++--
 6 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentAccessor.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentAccessor.java
index bf11a06ce17e..d96d3671754f 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentAccessor.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentAccessor.java
@@ -212,6 +212,12 @@ public boolean hasContextBindings(Object engine) {
             return instrumentationHandler.hasContextBindings();
         }
 
+        @Override
+        public boolean hasThreadBindings(Object engine) {
+            InstrumentationHandler instrumentationHandler = (InstrumentationHandler) engineAccess().getInstrumentationHandler(engine);
+            return instrumentationHandler.hasThreadBindings();
+        }
+
         @Override
         @CompilerDirectives.TruffleBoundary
         public void notifyContextCreated(Object engine, TruffleContext context) {
diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
index 6defa6af3175..1ca9ec34bf1c 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
@@ -960,6 +960,10 @@ boolean hasContextBindings() {
         return !contextsBindings.isEmpty();
     }
 
+    boolean hasThreadBindings() {
+        return !threadsBindings.isEmpty();
+    }
+
     void notifyContextCreated(TruffleContext context) {
         for (EventBinding<? extends ContextsListener> binding : contextsBindings) {
             binding.getElement().onContextCreated(context);
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
index ea13b05bcd00..14d2b6988597 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextPreInitializationTest.java
@@ -67,6 +67,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -110,6 +111,8 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.ContextsListener;
 import com.oracle.truffle.api.instrumentation.EventBinding;
+import com.oracle.truffle.api.instrumentation.ThreadsActivationListener;
+import com.oracle.truffle.api.instrumentation.ThreadsListener;
 import com.oracle.truffle.api.instrumentation.TruffleInstrument;
 import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -2566,6 +2569,8 @@ public abstract static class BaseInstrument extends TruffleInstrument implements
         private EventBinding<?> verifyContextLocalBinding;
 
         final ContextLocal<TruffleContext> contextLocal = createContextLocal((c) -> c);
+        final ContextThreadLocal<TruffleContext> contextThreadLocal = createContextThreadLocal((c, t) -> c);
+        private final Set<Pair<TruffleContext, Thread>> initializedThreads = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
         @Override
         protected void onCreate(Env env) {
@@ -2576,16 +2581,17 @@ protected void onCreate(Env env) {
 
                     public void onLanguageContextInitialized(TruffleContext context, LanguageInfo language) {
                         assertSame(context, contextLocal.get(context));
+                        assertSame(context, contextThreadLocal.get(context));
                     }
 
                     public void onLanguageContextFinalized(TruffleContext context, LanguageInfo language) {
                         assertSame(context, contextLocal.get(context));
-
+                        assertSame(context, contextThreadLocal.get(context));
                     }
 
                     public void onLanguageContextCreated(TruffleContext context, LanguageInfo language) {
                         assertSame(context, contextLocal.get(context));
-
+                        assertSame(context, contextThreadLocal.get(context));
                     }
 
                     public void onContextCreated(TruffleContext context) {
@@ -2594,15 +2600,43 @@ public void onContextCreated(TruffleContext context) {
 
                     public void onLanguageContextDisposed(TruffleContext context, LanguageInfo language) {
                         assertSame(context, contextLocal.get(context));
+                        assertSame(context, contextThreadLocal.get(context));
                     }
 
                     public void onContextClosed(TruffleContext context) {
                         assertSame(context, contextLocal.get(context));
-
+                        assertSame(context, contextThreadLocal.get(context));
                     }
                 }, false);
                 performAction(null, null);
             }
+            env.getInstrumenter().attachThreadsActivationListener(new ThreadsActivationListener() {
+                @Override
+                public void onEnterThread(TruffleContext context) {
+                    // tests that locals are initialized
+                    contextLocal.get(context);
+                    contextThreadLocal.get(context);
+                }
+
+                @Override
+                public void onLeaveThread(TruffleContext context) {
+                    // tests that locals are initialized
+                    contextLocal.get(context);
+                    contextThreadLocal.get(context);
+                }
+            });
+            env.getInstrumenter().attachThreadsListener(new ThreadsListener() {
+                @Override
+                public void onThreadInitialized(TruffleContext context, Thread thread) {
+                    assertTrue(initializedThreads.add(Pair.create(context, thread)));
+                }
+
+                @Override
+                public void onThreadDisposed(TruffleContext context, Thread thread) {
+                    // tests that onThreadInitialized was called
+                    assertTrue(initializedThreads.contains(Pair.create(context, thread)));
+                }
+            }, true);
         }
 
         @Override
@@ -2687,6 +2721,7 @@ protected OptionDescriptors getOptionDescriptors() {
         protected Map<String, Consumer<Event>> getActions() {
             return actions;
         }
+
     }
 
     @TruffleInstrument.Registration(id = ContextPreInitializationSecondInstrument.ID, name = ContextPreInitializationSecondInstrument.ID, services = Service.class)
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
index 1f7bb14dfd15..e8c5f01fd732 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/Accessor.java
@@ -836,6 +836,8 @@ public final OutputStream getOut(DispatchOutputStream out) {
 
         public abstract boolean hasContextBindings(Object engine);
 
+        public abstract boolean hasThreadBindings(Object engine);
+
         public abstract void notifyContextCreated(Object engine, TruffleContext context);
 
         public abstract void notifyContextClosed(Object engine, TruffleContext context);
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
index f39903316827..7c086788c8cd 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -2616,6 +2616,14 @@ void initializeInstrumentContextLocals(Object[] locals) {
         }
     }
 
+    void initializeInstrumentContextThreadLocals() {
+        for (PolyglotInstrument instrument : engine.idToInstrument.values()) {
+            if (instrument.isCreated()) {
+                invokeContextThreadLocalFactory(instrument.contextThreadLocalLocations);
+            }
+        }
+    }
+
     /**
      * Updates the current thread locals from {@link PolyglotThreadInfo#contextThreadLocals}.
      */
@@ -2758,6 +2766,7 @@ void initializeHostContext(PolyglotLanguageContext context, PolyglotContextConfi
 
     void replayInstrumentationEvents() {
         notifyContextCreated();
+        EngineAccessor.INSTRUMENT.notifyThreadStarted(engine, creatorTruffleContext, Thread.currentThread());
         for (PolyglotLanguageContext lc : contexts) {
             LanguageInfo language = lc.language.info;
             if (lc.eventsEnabled && lc.env != null) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
index 7936693f072c..c067870b1239 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
@@ -1635,12 +1635,23 @@ public PolyglotContextImpl createContext(OutputStream configOut, OutputStream co
             throw PolyglotImpl.guestToHostException(this, t);
         }
         boolean hasContextBindings;
+        boolean hasThreadBindings;
         try {
             if (replayEvents) { // loaded context
-                // we might have new instruments to run with a preinitialized context
+                /*
+                 * There might be new instruments to run with a preinitialized context and these
+                 * instruments might define context locals and context thread locals. The
+                 * instruments were created during the context loading before the context was added
+                 * to the engine's contexts set, and so the instrument creation did not update the
+                 * context's locals and thread locals. Since the context loading needs to enter the
+                 * context on the current thread for patching, we need to update both the context
+                 * locals and context thread locals.
+                 */
                 synchronized (context) {
                     context.resizeContextLocals(this.contextLocalLocations);
                     context.initializeInstrumentContextLocals(context.contextLocals);
+                    context.resizeContextThreadLocals(this.contextThreadLocalLocations);
+                    context.initializeInstrumentContextThreadLocals();
                 }
             } else { // is new context
                 try {
@@ -1661,12 +1672,16 @@ public PolyglotContextImpl createContext(OutputStream configOut, OutputStream co
                 }
             }
             hasContextBindings = EngineAccessor.INSTRUMENT.hasContextBindings(this);
+            hasThreadBindings = EngineAccessor.INSTRUMENT.hasThreadBindings(this);
         } catch (Throwable t) {
             throw PolyglotImpl.guestToHostException(context.getHostContext(), t, false);
         }
-        if (replayEvents && hasContextBindings) {
-            // replace events for preinitialized contexts
-            // events must be replayed without engine lock.
+        if (replayEvents && (hasContextBindings || hasThreadBindings)) {
+            /*
+             * Replay events for preinitialized contexts. Events must be replayed without engine
+             * lock. The events to replay are the context events and also the thread initialization
+             * event for the current thread which was initialized for context patching.
+             */
             final Object[] prev;
             try {
                 prev = enter(context);

From d14b93a3eb4c866104afa22cb6865ce0f2a51cf0 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Wed, 6 Oct 2021 15:36:34 +0200
Subject: [PATCH 311/681] Change prefetch options to useful defaults.

---
 .../com/oracle/svm/core/SubstrateOptions.java | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index cd99fbebf10f..6518ee812b57 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -278,7 +278,7 @@ public Boolean getValue(OptionValues values) {
      * Object and array allocation options.
      */
     @Option(help = "Number of cache lines to load after the array allocation using prefetch instructions.")//
-    public static final HostedOptionKey<Integer> AllocatePrefetchLines = new HostedOptionKey<>(3);
+    public static final HostedOptionKey<Integer> AllocatePrefetchLines = new HostedOptionKey<>(4);
 
     @Option(help = "Number of cache lines to load after the object address using prefetch instructions.")//
     public static final HostedOptionKey<Integer> AllocateInstancePrefetchLines = new HostedOptionKey<>(1);
@@ -289,6 +289,14 @@ public Boolean getValue(OptionValues values) {
     @Option(help = "Sets the prefetch instruction to prefetch ahead of the allocation pointer. Possible values are from 0 to 3. The actual instructions behind the values depend on the platform.")//
     public static final HostedOptionKey<Integer> AllocatePrefetchInstr = new HostedOptionKey<>(0);
 
+    @Option(help = "Sets the size (in bytes) of the prefetch distance for object allocation. " +
+                    "Memory about to be written with the value of new objects is prefetched up to this distance starting from the address of the last allocated object. " +
+                    "Each Java thread has its own allocation point.")//
+    public static final HostedOptionKey<Integer> AllocatePrefetchDistance = new HostedOptionKey<>(192);
+
+    @Option(help = "Sets the step size (in bytes) for sequential prefetch instructions.")//
+    public static final HostedOptionKey<Integer> AllocatePrefetchStepSize = new HostedOptionKey<>(64);
+
     /*
      * Isolate tear down options.
      */
@@ -307,17 +315,6 @@ public static final long getTearDownFailureNanos() {
         return TearDownFailureNanos.getValue().longValue();
     }
 
-    /*
-     * The default value is derived by taking the common value from HotSpot configs.
-     */
-    @Option(help = "Sets the size (in bytes) of the prefetch distance for object allocation. " +
-                    "Memory about to be written with the value of new objects is prefetched up to this distance starting from the address of the last allocated object. " +
-                    "Each Java thread has its own allocation point.")//
-    public static final HostedOptionKey<Integer> AllocatePrefetchDistance = new HostedOptionKey<>(256);
-
-    @Option(help = "Sets the step size (in bytes) for sequential prefetch instructions.")//
-    public static final HostedOptionKey<Integer> AllocatePrefetchStepSize = new HostedOptionKey<>(16);
-
     @Option(help = "Define the maximum number of stores for which the loop that zeroes out objects is unrolled.")//
     public static final HostedOptionKey<Integer> MaxUnrolledObjectZeroingStores = new HostedOptionKey<>(8);
 

From ab7e1d02b6ffc82273e1f383fda3ef715fef4e5e Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Wed, 6 Oct 2021 17:38:37 +0200
Subject: [PATCH 312/681] Move thread implementation around, and provide a new
 class for accessing threads

---
 .../truffle/espresso/descriptors/Symbol.java  |   4 +-
 .../truffle/espresso/impl/ContextAccess.java  |   7 +-
 .../espresso/impl/LinkedKlassFieldLayout.java |   4 +-
 .../oracle/truffle/espresso/meta/Meta.java    |   8 +-
 .../truffle/espresso/nodes/BytecodeNode.java  |   9 +-
 .../espresso/runtime/EspressoContext.java     |  45 +-
 .../runtime/EspressoReferenceDrainer.java     |   2 +-
 .../runtime/EspressoShutdownHandler.java      |  28 +-
 .../espresso/runtime/JDWPContextImpl.java     |  10 +-
 .../Target_java_lang_Thread.java              | 417 ++----------------
 .../substitutions/Target_sun_misc_Unsafe.java |  10 +-
 .../EspressoThreadRegistry.java}              |  40 +-
 .../espresso/threads/GuestRunnable.java       |  67 +++
 .../truffle/espresso/threads/KillStatus.java  |  49 ++
 .../truffle/espresso/threads/State.java       |  39 ++
 .../truffle/espresso/threads/SuspendLock.java | 101 +++++
 .../espresso/threads/ThreadsAccess.java       | 379 ++++++++++++++++
 .../truffle/espresso/vm/InterpreterToVM.java  |   5 +-
 .../truffle/espresso/vm/Management.java       |  11 +-
 .../com/oracle/truffle/espresso/vm/VM.java    |  18 +-
 20 files changed, 773 insertions(+), 480 deletions(-)
 rename espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/{runtime/EspressoThreadManager.java => threads/EspressoThreadRegistry.java} (91%)
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/State.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
 create mode 100644 espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/Symbol.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/Symbol.java
index bd5065d04d3e..32f295559606 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/Symbol.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/Symbol.java
@@ -503,11 +503,9 @@ public static void ensureInitialized() {
         // Thread
         public static final Symbol<Name> interrupted = StaticSymbols.putName("interrupted");
         public static final Symbol<Name> interrupt = StaticSymbols.putName("interrupt");
-        public static final Symbol<Name> HIDDEN_DEATH = StaticSymbols.putName("0HIDDEN_DEATH");
-        public static final Symbol<Name> HIDDEN_DEATH_THROWABLE = StaticSymbols.putName("0HIDDEN_DEATH_THROWABLE");
+        public static final Symbol<Name> HIDDEN_DEPRECATION_SUPPORT = StaticSymbols.putName("0HIDDEN_DEPRECATION_SUPPORT");
         public static final Symbol<Name> HIDDEN_HOST_THREAD = StaticSymbols.putName("0HIDDEN_HOST_THREAD");
         public static final Symbol<Name> HIDDEN_INTERRUPTED = StaticSymbols.putName("0HIDDEN_INTERRUPTED");
-        public static final Symbol<Name> HIDDEN_SUSPEND_LOCK = StaticSymbols.putName("0HIDDEN_SUSPEND_LOCK");
         public static final Symbol<Name> HIDDEN_THREAD_BLOCKED_OBJECT = StaticSymbols.putName("0HIDDEN_THREAD_BLOCKED_OBJECT");
         public static final Symbol<Name> HIDDEN_THREAD_BLOCKED_COUNT = StaticSymbols.putName("0HIDDEN_THREAD_BLOCKED_COUNT");
         public static final Symbol<Name> HIDDEN_THREAD_WAITED_COUNT = StaticSymbols.putName("0HIDDEN_THREAD_WAITED_COUNT");
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ContextAccess.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ContextAccess.java
index c98a05eb2ed5..1c278f219b5e 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ContextAccess.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ContextAccess.java
@@ -23,15 +23,16 @@
 package com.oracle.truffle.espresso.impl;
 
 import com.oracle.truffle.espresso.EspressoLanguage;
-import com.oracle.truffle.espresso.ffi.NativeAccess;
 import com.oracle.truffle.espresso.descriptors.Names;
 import com.oracle.truffle.espresso.descriptors.Signatures;
 import com.oracle.truffle.espresso.descriptors.Types;
+import com.oracle.truffle.espresso.ffi.NativeAccess;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.JavaVersion;
 import com.oracle.truffle.espresso.runtime.StringTable;
 import com.oracle.truffle.espresso.substitutions.Substitutions;
+import com.oracle.truffle.espresso.threads.ThreadsAccess;
 import com.oracle.truffle.espresso.vm.InterpreterToVM;
 import com.oracle.truffle.espresso.vm.VM;
 
@@ -62,6 +63,10 @@ default VM getVM() {
         return getContext().getVM();
     }
 
+    default ThreadsAccess getThreadAccess() {
+        return getContext().getThreadAccess();
+    }
+
     default InterpreterToVM getInterpreterToVM() {
         return getContext().getInterpreterToVM();
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/LinkedKlassFieldLayout.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/LinkedKlassFieldLayout.java
index 7b296f56ce86..f485582cdb55 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/LinkedKlassFieldLayout.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/LinkedKlassFieldLayout.java
@@ -248,9 +248,7 @@ private static HiddenField[] getHiddenFieldsFull(Symbol<Type> holder) {
                 return new HiddenField[]{
                                 new HiddenField(Name.HIDDEN_INTERRUPTED, Type._boolean, VersionRange.lower(13)),
                                 new HiddenField(Name.HIDDEN_HOST_THREAD),
-                                new HiddenField(Name.HIDDEN_DEATH),
-                                new HiddenField(Name.HIDDEN_DEATH_THROWABLE),
-                                new HiddenField(Name.HIDDEN_SUSPEND_LOCK),
+                                new HiddenField(Name.HIDDEN_DEPRECATION_SUPPORT),
 
                                 // Only used for j.l.management bookkeeping.
                                 new HiddenField(Name.HIDDEN_THREAD_BLOCKED_OBJECT),
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
index 334df63f54bd..325a709d3d72 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
@@ -359,9 +359,7 @@ public Meta(EspressoContext context) {
                         .field(higher(14), Name.interrupted, Type._boolean) //
                         .maybeHiddenfield(java_lang_Thread);
         HIDDEN_HOST_THREAD = java_lang_Thread.requireHiddenField(Name.HIDDEN_HOST_THREAD);
-        HIDDEN_DEATH = java_lang_Thread.requireHiddenField(Name.HIDDEN_DEATH);
-        HIDDEN_DEATH_THROWABLE = java_lang_Thread.requireHiddenField(Name.HIDDEN_DEATH_THROWABLE);
-        HIDDEN_SUSPEND_LOCK = java_lang_Thread.requireHiddenField(Name.HIDDEN_SUSPEND_LOCK);
+        HIDDEN_DEPRECATION_SUPPORT = java_lang_Thread.requireHiddenField(Name.HIDDEN_DEPRECATION_SUPPORT);
 
         if (context.EnableManagement) {
             HIDDEN_THREAD_BLOCKED_OBJECT = java_lang_Thread.requireHiddenField(Name.HIDDEN_THREAD_BLOCKED_OBJECT);
@@ -1171,9 +1169,7 @@ private DiffVersionLoadHelper diff() {
     public final Method java_lang_Thread_stop;
     public final Field HIDDEN_HOST_THREAD;
     public final Field HIDDEN_INTERRUPTED;
-    public final Field HIDDEN_DEATH;
-    public final Field HIDDEN_DEATH_THROWABLE;
-    public final Field HIDDEN_SUSPEND_LOCK;
+    public final Field HIDDEN_DEPRECATION_SUPPORT;
     public final Field HIDDEN_THREAD_BLOCKED_OBJECT;
     public final Field HIDDEN_THREAD_BLOCKED_COUNT;
     public final Field HIDDEN_THREAD_WAITED_COUNT;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java
index 6dd3394b3748..dfc308c92617 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java
@@ -257,11 +257,11 @@
 import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
 import com.oracle.truffle.api.instrumentation.Tag;
 import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.nodes.BytecodeOSRNode;
 import com.oracle.truffle.api.nodes.ControlFlowException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.BytecodeOSRNode;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.espresso.analysis.liveness.LivenessAnalysis;
@@ -339,7 +339,6 @@
 import com.oracle.truffle.espresso.runtime.EspressoExitException;
 import com.oracle.truffle.espresso.runtime.ReturnAddress;
 import com.oracle.truffle.espresso.runtime.StaticObject;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
 import com.oracle.truffle.espresso.vm.InterpreterToVM;
 
 /**
@@ -1783,7 +1782,7 @@ private int beforeJumpChecks(long[] primitives, Object[] refs, int curBCI, int t
         CompilerAsserts.partialEvaluationConstant(targetBCI);
         int nextStatementIndex = (instrument == null) ? 0 : instrument.getStatementIndexAfterJump(statementIndex, curBCI, targetBCI);
         if (targetBCI <= curBCI) {
-            checkStopping();
+            checkDeprecation();
             if (++loopCount[0] >= REPORT_LOOP_STRIDE) {
                 LoopNode.reportLoopCount(this, REPORT_LOOP_STRIDE);
                 loopCount[0] = 0;
@@ -1814,9 +1813,9 @@ private int beforeJumpChecks(long[] primitives, Object[] refs, int curBCI, int t
         return nextStatementIndex;
     }
 
-    private void checkStopping() {
+    private void checkDeprecation() {
         if (getContext().shouldCheckDeprecationStatus()) {
-            Target_java_lang_Thread.checkDeprecatedState(getMeta(), getContext().getCurrentThread());
+            getContext().getThreadAccess().checkDeprecation();
         }
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
index 70771e74d2e5..623c999921d0 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
@@ -89,7 +89,8 @@
 import com.oracle.truffle.espresso.perf.TimerCollection;
 import com.oracle.truffle.espresso.redefinition.plugins.api.InternalRedefinitionPlugin;
 import com.oracle.truffle.espresso.substitutions.Substitutions;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
+import com.oracle.truffle.espresso.threads.EspressoThreadRegistry;
+import com.oracle.truffle.espresso.threads.ThreadsAccess;
 import com.oracle.truffle.espresso.vm.InterpreterToVM;
 import com.oracle.truffle.espresso.vm.UnsafeAccess;
 import com.oracle.truffle.espresso.vm.VM;
@@ -132,7 +133,8 @@ public final class EspressoContext {
     // endregion Runtime
 
     // region Helpers
-    private final EspressoThreadManager threadManager;
+    private final EspressoThreadRegistry threadRegistry;
+    @CompilationFinal private ThreadsAccess threads;
     private final EspressoShutdownHandler shutdownManager;
     private final EspressoReferenceDrainer referenceDrainer;
     // endregion Helpers
@@ -247,12 +249,12 @@ public EspressoContext(TruffleLanguage.Env env, EspressoLanguage language) {
         this.substitutions = new Substitutions(this);
         this.methodHandleIntrinsics = new MethodHandleIntrinsics(this);
 
-        this.threadManager = new EspressoThreadManager(this);
+        this.threadRegistry = new EspressoThreadRegistry(this);
         this.referenceDrainer = new EspressoReferenceDrainer(this);
 
         boolean softExit = env.getOptions().get(EspressoOptions.SoftExit);
         this.ExitHost = env.getOptions().get(EspressoOptions.ExitHost);
-        this.shutdownManager = new EspressoShutdownHandler(this, threadManager, referenceDrainer, softExit);
+        this.shutdownManager = new EspressoShutdownHandler(this, threadRegistry, referenceDrainer, softExit);
 
         this.timers = TimerCollection.create(env.getOptions().get(EspressoOptions.EnableTimers));
         this.allocationReporter = env.lookup(AllocationReporter.class);
@@ -477,6 +479,7 @@ private void spawnVM() {
                 this.meta = new Meta(this);
             }
             this.metaInitialized = true;
+            this.threads = new ThreadsAccess(meta);
 
             this.interpreterToVM = new InterpreterToVM(this);
 
@@ -499,7 +502,7 @@ private void spawnVM() {
             }
 
             // Create main thread as soon as Thread class is initialized.
-            threadManager.createMainThread(meta);
+            threadRegistry.createMainThread(meta);
 
             try (DebugCloseable knownClassInit = KNOWN_CLASS_INIT.scope(timers)) {
                 initializeKnownClass(Type.java_lang_Object);
@@ -775,15 +778,19 @@ public TruffleObject bindToAgent(Method method, String mangledName) {
 
     // region Thread management
 
+    public ThreadsAccess getThreadAccess() {
+        return threads;
+    }
+
     /**
      * Creates a new guest thread from the host thread, and adds it to the main thread group.
      */
     public StaticObject createThread(Thread hostThread) {
-        return threadManager.createGuestThreadFromHost(hostThread, meta, vm);
+        return threadRegistry.createGuestThreadFromHost(hostThread, meta, vm);
     }
 
     public StaticObject createThread(Thread hostThread, StaticObject group, String name) {
-        return threadManager.createGuestThreadFromHost(hostThread, meta, vm, name, group);
+        return threadRegistry.createGuestThreadFromHost(hostThread, meta, vm, name, group);
     }
 
     public void disposeThread(@SuppressWarnings("unused") Thread hostThread) {
@@ -792,7 +799,7 @@ public void disposeThread(@SuppressWarnings("unused") Thread hostThread) {
             return;
         }
         if (hostThread != Thread.currentThread()) {
-            String guestName = Target_java_lang_Thread.getThreadName(meta, guestThread);
+            String guestName = threads.getThreadName(guestThread);
             getLogger().warning("unimplemented: disposeThread for non-current thread: " + hostThread + " / " + guestName);
             return;
         }
@@ -802,47 +809,47 @@ public void disposeThread(@SuppressWarnings("unused") Thread hostThread) {
     }
 
     public StaticObject getGuestThreadFromHost(Thread host) {
-        return threadManager.getGuestThreadFromHost(host);
+        return threadRegistry.getGuestThreadFromHost(host);
     }
 
     public StaticObject getCurrentThread() {
-        return threadManager.getGuestThreadFromHost(Thread.currentThread());
+        return threadRegistry.getGuestThreadFromHost(Thread.currentThread());
     }
 
     /**
      * Returns the maximum number of alive (registered) threads at any point, since the VM started.
      */
     public long getPeakThreadCount() {
-        return threadManager.peakThreadCount.get();
+        return threadRegistry.peakThreadCount.get();
     }
 
     /**
      * Returns the number of created threads since the VM started.
      */
     public long getCreatedThreadCount() {
-        return threadManager.createdThreadCount.get();
+        return threadRegistry.createdThreadCount.get();
     }
 
     public StaticObject[] getActiveThreads() {
-        return threadManager.activeThreads();
+        return threadRegistry.activeThreads();
     }
 
     public void registerThread(Thread host, StaticObject self) {
-        threadManager.registerThread(host, self);
+        threadRegistry.registerThread(host, self);
         if (shouldReportVMEvents) {
             eventListener.threadStarted(self);
         }
     }
 
     public void unregisterThread(StaticObject self) {
-        threadManager.unregisterThread(self);
+        threadRegistry.unregisterThread(self);
         if (shouldReportVMEvents) {
             eventListener.threadDied(self);
         }
     }
 
     public void interruptThread(StaticObject guestThread) {
-        threadManager.interruptThread(guestThread);
+        threadRegistry.interruptThread(guestThread);
     }
 
     public void invalidateNoThreadStop(String message) {
@@ -868,15 +875,15 @@ public boolean shouldCheckSuspend() {
     }
 
     public boolean isMainThreadCreated() {
-        return threadManager.isMainThreadCreated();
+        return threadRegistry.isMainThreadCreated();
     }
 
     public StaticObject getMainThread() {
-        return threadManager.getMainThread();
+        return threadRegistry.getMainThread();
     }
 
     public StaticObject getMainThreadGroup() {
-        return threadManager.getMainThreadGroup();
+        return threadRegistry.getMainThreadGroup();
     }
 
     // endregion Thread management
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoReferenceDrainer.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoReferenceDrainer.java
index cf862476da4f..c1dddc5bfdb0 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoReferenceDrainer.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoReferenceDrainer.java
@@ -207,7 +207,7 @@ public void run() {
                     }
                 }
             } finally {
-                Target_java_lang_Thread.terminate(context.getCurrentThread(), meta);
+                context.getThreadAccess().terminate(context.getCurrentThread());
                 if (context.isClosing()) {
                     // Ignore exceptions that arise during closing.
                     return;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
index c5974e0936a6..5106a102a7c7 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
@@ -26,15 +26,14 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.espresso.impl.ContextAccess;
 import com.oracle.truffle.espresso.meta.EspressoError;
-import com.oracle.truffle.espresso.meta.Meta;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
+import com.oracle.truffle.espresso.threads.EspressoThreadRegistry;
 
 class EspressoShutdownHandler implements ContextAccess {
 
     // region context
 
     private final EspressoContext context;
-    private final EspressoThreadManager threadManager;
+    private final EspressoThreadRegistry threadManager;
     private final EspressoReferenceDrainer referenceDrainer;
     private final boolean softExit;
 
@@ -46,7 +45,7 @@ public EspressoContext getContext() {
     // endregion context
 
     EspressoShutdownHandler(EspressoContext context,
-                    EspressoThreadManager threadManager,
+                    EspressoThreadRegistry threadManager,
                     EspressoReferenceDrainer referenceDrainer, boolean softExit) {
         this.context = context;
         this.threadManager = threadManager;
@@ -110,9 +109,8 @@ Object getShutdownSynchronizer() {
     @TruffleBoundary
     void doExit(int code) {
         getContext().getLogger().fine(() -> {
-            Meta meta = getMeta();
             StaticObject currentThread = getContext().getCurrentThread();
-            String guestName = Target_java_lang_Thread.getThreadName(meta, currentThread);
+            String guestName = getThreadAccess().getThreadName(currentThread);
             return "doExit(" + code + ") from " + guestName;
         });
         if (!isClosing()) {
@@ -197,7 +195,7 @@ private void waitForClose() throws EspressoExitException {
 
     private boolean hasActiveNonDaemon(Thread initiating) {
         for (StaticObject guest : threadManager.activeThreads()) {
-            Thread host = Target_java_lang_Thread.getHostFromGuestThread(guest);
+            Thread host = getThreadAccess().getHost(guest);
             if (host != initiating && !host.isDaemon()) {
                 if (host.isAlive()) {
                     return true;
@@ -262,10 +260,10 @@ private void teardown(boolean killThreads) {
      */
     private void teardownPhase1(Thread initiatingThread) {
         for (StaticObject guest : threadManager.activeThreads()) {
-            Thread t = Target_java_lang_Thread.getHostFromGuestThread(guest);
+            Thread t = getThreadAccess().getHost(guest);
             if (t.isAlive() && t != initiatingThread) {
                 if (t.isDaemon()) {
-                    Target_java_lang_Thread.killThread(guest);
+                    context.getThreadAccess().stop(guest, null);
                 }
                 threadManager.interruptThread(guest);
             }
@@ -278,9 +276,9 @@ private void teardownPhase1(Thread initiatingThread) {
      */
     private void teardownPhase2(Thread initiatingThread) {
         for (StaticObject guest : threadManager.activeThreads()) {
-            Thread t = Target_java_lang_Thread.getHostFromGuestThread(guest);
+            Thread t = getThreadAccess().getHost(guest);
             if (t.isAlive() && t != initiatingThread) {
-                Target_java_lang_Thread.killThread(guest);
+                context.getThreadAccess().stop(guest, null);
                 threadManager.interruptThread(guest);
             }
         }
@@ -293,14 +291,14 @@ private void teardownPhase2(Thread initiatingThread) {
      */
     private void teardownPhase3(Thread initiatingThread) {
         for (StaticObject guest : threadManager.activeThreads()) {
-            Thread t = Target_java_lang_Thread.getHostFromGuestThread(guest);
+            Thread t = getThreadAccess().getHost(guest);
             if (t.isAlive() && t != initiatingThread) {
                 /*
                  * Currently, threads in native can not be killed in Espresso. This translates into
                  * a polyglot-side java.lang.IllegalStateException: The language did not complete
                  * all polyglot threads but should have.
                  */
-                Target_java_lang_Thread.forceKillThread(guest);
+                context.getThreadAccess().kill(guest);
                 threadManager.interruptThread(guest);
             }
         }
@@ -311,7 +309,7 @@ private void teardownPhase3(Thread initiatingThread) {
      */
     private void teardownPhase4(Thread initiatingThread) {
         for (StaticObject guest : threadManager.activeThreads()) {
-            Thread t = Target_java_lang_Thread.getHostFromGuestThread(guest);
+            Thread t = getThreadAccess().getHost(guest);
             if (t.isAlive() && t != initiatingThread) {
                 // TODO(garcia): Tell truffle to forget about this thread
                 // Or
@@ -334,7 +332,7 @@ private boolean waitSpin(Thread initiatingThread) {
                 return false;
             }
             for (StaticObject guest : threadManager.activeThreads()) {
-                Thread t = Target_java_lang_Thread.getHostFromGuestThread(guest);
+                Thread t = getThreadAccess().getHost(guest);
                 if (t != initiatingThread) {
                     if (t.isAlive()) {
                         continue spinLoop;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
index 8a9adc3a2b3d..40a15b291a04 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java
@@ -75,7 +75,7 @@
 import com.oracle.truffle.espresso.redefinition.RedefintionNotSupportedException;
 import com.oracle.truffle.espresso.redefinition.plugins.impl.RedefinitionPluginHandler;
 import com.oracle.truffle.espresso.runtime.dispatch.EspressoInterop;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
+import com.oracle.truffle.espresso.threads.State;
 
 public final class JDWPContextImpl implements JDWPContext {
 
@@ -129,7 +129,7 @@ public boolean isValidThread(Object thread, boolean checkTerminated) {
             if (context.getMeta().java_lang_Thread.isAssignableFrom(staticObject.getKlass())) {
                 if (checkTerminated) {
                     // check if thread has been terminated
-                    return getThreadStatus(thread) != Target_java_lang_Thread.State.TERMINATED.value;
+                    return getThreadStatus(thread) != State.TERMINATED.value;
                 }
                 return true;
             }
@@ -252,7 +252,7 @@ public Object asGuestThread(Thread hostThread) {
 
     @Override
     public Thread asHostThread(Object thread) {
-        return Target_java_lang_Thread.getHostFromGuestThread((StaticObject) thread);
+        return context.getThreadAccess().getHost((StaticObject) thread);
     }
 
     @Override
@@ -367,7 +367,7 @@ private static boolean isBoxedPrimitive(Class<?> clazz) {
 
     @Override
     public String getThreadName(Object thread) {
-        return Target_java_lang_Thread.getThreadName(context.getMeta(), (StaticObject) thread);
+        return context.getThreadAccess().getThreadName((StaticObject) thread);
     }
 
     @Override
@@ -543,7 +543,7 @@ public boolean isInstanceOf(Object object, KlassRef klass) {
 
     @Override
     public void stopThread(Object guestThread, Object guestThrowable) {
-        Target_java_lang_Thread.stop0((StaticObject) guestThread, (StaticObject) guestThrowable);
+        context.getThreadAccess().stop((StaticObject) guestThread, (StaticObject) guestThrowable);
     }
 
     @Override
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
index a5586730767f..d4f9d3954653 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
@@ -33,12 +33,11 @@
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.espresso.impl.Field;
 import com.oracle.truffle.espresso.impl.Klass;
-import com.oracle.truffle.espresso.meta.EspressoError;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
-import com.oracle.truffle.espresso.runtime.EspressoException;
-import com.oracle.truffle.espresso.runtime.EspressoExitException;
 import com.oracle.truffle.espresso.runtime.StaticObject;
+import com.oracle.truffle.espresso.threads.State;
+import com.oracle.truffle.espresso.threads.ThreadsAccess;
 
 // @formatter:off
 /**
@@ -82,74 +81,6 @@ public static long getThreadCounter(StaticObject thread, Field hiddenField) {
         return atomicCounter.get();
     }
 
-    public enum State {
-        NEW(0),
-        RUNNABLE(4),
-        BLOCKED(1024),
-        WAITING(16),
-        TIMED_WAITING(32),
-        TERMINATED(2);
-
-        public final int value;
-
-        State(int value) {
-            this.value = value;
-        }
-
-    }
-
-    public static void fromRunnable(StaticObject self, Meta meta, State state) {
-        assert meta.java_lang_Thread_threadStatus.getInt(self) == State.RUNNABLE.value;
-        setState(self, meta, state);
-        checkDeprecatedState(meta, self);
-    }
-
-    public static void toRunnable(StaticObject self, Meta meta, State state) {
-        assert state == State.RUNNABLE;
-        try {
-            checkDeprecatedState(meta, self);
-        } finally {
-            setState(self, meta, state);
-        }
-    }
-
-    private static void setState(StaticObject self, Meta meta, State state) {
-        meta.java_lang_Thread_threadStatus.setInt(self, state.value);
-    }
-
-    @TruffleBoundary
-    public static void checkDeprecatedState(Meta meta, StaticObject thread) {
-        EspressoContext context = meta.getContext();
-        assert thread == context.getCurrentThread();
-        if (context.shouldCheckStop()) {
-            KillStatus status = getKillStatus(thread);
-            switch (status) {
-                case NORMAL:
-                case EXITING:
-                case KILLED:
-                    break;
-                case KILL:
-                    if (context.isClosing()) {
-                        // Give some leeway during closing.
-                        setThreadStop(thread, KillStatus.KILLED);
-                    } else {
-                        setThreadStop(thread, KillStatus.NORMAL);
-                    }
-                    // check if death cause throwable is set, if not throw ThreadDeath
-                    StaticObject deathThrowable = (StaticObject) getDeathThrowable(thread);
-                    throw deathThrowable != null ? meta.throwException(deathThrowable) : meta.throwException(meta.java_lang_ThreadDeath);
-                case SHUTDOWN:
-                    // This thread refuses to stop. Send a host exception.
-                    // throw getMeta().throwEx(ThreadDeath.class);
-                    assert context.isClosing();
-                    throw new EspressoExitException(context.getExitStatus());
-            }
-        }
-        if (context.shouldCheckSuspend()) {
-            trySuspend(thread);
-        }
-    }
-
     @Substitution(isTrivial = true)
     public static @JavaType(Thread.class) StaticObject currentThread(@Inject EspressoContext context) {
         return context.getCurrentThread();
@@ -182,72 +113,28 @@ abstract static class Start0 extends SubstitutionNode {
         @TruffleBoundary
         void doCached(@JavaType(Thread.class) StaticObject self,
                         @Bind("getContext()") EspressoContext context,
-                        @Cached("create(context.getMeta().java_lang_Thread_exit.getCallTarget())") DirectCallNode threadExit) {
+                        @Cached("create(context.getMeta().java_lang_Thread_exit.getCallTarget())") DirectCallNode threadExit,
+                        @Cached("create(context.getMeta().java_lang_Thread_dispatchUncaughtException.getCallTarget())") DirectCallNode dispatchUncaught) {
             Meta meta = context.getMeta();
+            ThreadsAccess threadAccess = context.getThreadAccess();
             if (context.multiThreadingEnabled()) {
                 // Thread.start() is synchronized.
-                KillStatus killStatus = getKillStatus(self);
-                if (killStatus != null || context.isClosing()) {
-
-                    self.getLock().lock();
-                    try {
-                        meta.java_lang_Thread_threadStatus.setInt(self, State.TERMINATED.value);
-                        // Notify waiting threads you were terminated
-                        self.getLock().signalAll();
-                    } finally {
-                        self.getLock().unlock();
-                    }
-
+                if (threadAccess.isStillborn(self)) {
+                    threadAccess.terminateAndNotify(self);
                     return;
                 }
-                setThreadStop(self, KillStatus.NORMAL);
-                if (getSuspendLock(self) == null) {
-                    initSuspendLock(self);
-                }
-                Thread hostThread = context.getEnv().createThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            context.getVM().attachThread(Thread.currentThread());
-                            try {
-                                // Execute the payload
-                                self.getKlass().vtableLookup(meta.java_lang_Thread_run.getVTableIndex()).invokeDirect(self);
-                                checkDeprecatedState(meta, self);
-                            } catch (EspressoException uncaught) {
-                                meta.java_lang_Thread_dispatchUncaughtException.invokeDirect(self, uncaught.getExceptionObject());
-                            }
-                        } catch (EspressoExitException exit) {
-                            /* Suppress */
-                        } finally {
-                            terminate(self, threadExit, meta);
-                            if (context.isClosing()) {
-                                // Ignore exceptions that arise during closing.
-                                return;
-                            }
-                        }
-                    }
-                });
-
-                meta.HIDDEN_HOST_THREAD.setHiddenObject(self, hostThread);
-                hostThread.setDaemon(meta.java_lang_Thread_daemon.getBoolean(self));
-                meta.java_lang_Thread_threadStatus.setInt(self, State.RUNNABLE.value);
-                hostThread.setPriority(meta.java_lang_Thread_priority.getInt(self));
-                if (isInterrupted(self, false)) {
-                    hostThread.interrupt();
-                }
-                context.registerThread(hostThread, self);
-                String guestName = Target_java_lang_Thread.getThreadName(meta, self);
+                Thread hostThread = threadAccess.createJavaThread(self, threadExit, dispatchUncaught);
                 context.getLogger().fine(() -> {
-                    long guestId = Target_java_lang_Thread.getThreadId(meta, self);
+                    String guestName = threadAccess.getThreadName(self);
+                    long guestId = threadAccess.getThreadId(self);
                     return String.format("Thread.start0: [HOST:%s, %d], [GUEST:%s, %d]", hostThread.getName(), hostThread.getId(), guestName, guestId);
                 });
-                hostThread.setName(guestName);
                 hostThread.start();
             } else {
                 String reason = context.getMultiThreadingDisabledReason();
                 Klass threadKlass = self.getKlass();
                 EspressoContext.get(null).getLogger().warning(() -> {
-                    String guestName = Target_java_lang_Thread.getThreadName(meta, self);
+                    String guestName = threadAccess.getThreadName(self);
                     String className = threadKlass.getExternalName();
                     return "Thread.start() called on " + className + " / " + guestName + " but thread support is disabled: " + reason;
                 });
@@ -270,51 +157,6 @@ private static boolean isSystemInnocuousThread(StaticObject thread, Meta meta) {
         return true;
     }
 
-    public static void terminate(StaticObject thread, Meta meta) {
-        terminate(thread, null, meta);
-    }
-
-    private static void terminate(@JavaType(Thread.class) StaticObject self, DirectCallNode threadExit, Meta meta) {
-        setThreadStop(self, KillStatus.EXITING);
-        try {
-            if (threadExit != null) {
-                threadExit.call(self);
-            } else {
-                meta.java_lang_Thread_exit.invokeDirect(self);
-            }
-        } catch (EspressoException | EspressoExitException e) {
-            // just drop it
-        }
-        self.getLock().lock();
-        try {
-            meta.java_lang_Thread_threadStatus.setInt(self, State.TERMINATED.value);
-            // Notify waiting threads you are done working
-            self.getLock().signalAll();
-        } finally {
-            self.getLock().unlock();
-        }
-
-        EspressoContext context = meta.getContext();
-        // Cleanup.
-        context.unregisterThread(self);
-    }
-
-    public static String getThreadName(Meta meta, StaticObject thread) {
-        if (thread == null) {
-            return "<unknown>";
-        } else {
-            return meta.toHostString(meta.java_lang_Thread_name.getObject(thread));
-        }
-    }
-
-    public static long getThreadId(Meta meta, StaticObject thread) {
-        if (thread == null) {
-            return -1;
-        } else {
-            return (long) meta.java_lang_Thread_tid.get(thread);
-        }
-    }
-
     @TruffleBoundary
     @Substitution(isTrivial = true)
     public static void yield() {
@@ -323,9 +165,10 @@ public static void yield() {
 
     @SuppressWarnings("unused")
     @Substitution(hasReceiver = true)
-    public static void setPriority0(@JavaType(Thread.class) StaticObject self, int newPriority) {
+    public static void setPriority0(@JavaType(Thread.class) StaticObject self, int newPriority,
+                    @Inject EspressoContext context) {
         // Priority is set in the guest field in Thread.setPriority().
-        Thread hostThread = getHostFromGuestThread(self);
+        Thread hostThread = context.getThreadAccess().getHost(self);
         if (hostThread == null) {
             return;
         }
@@ -372,256 +215,70 @@ public static boolean holdsLock(@JavaType(Object.class) StaticObject object, @In
     public static void sleep(long millis, @Inject Meta meta) {
         StaticObject thread = meta.getContext().getCurrentThread();
         try {
-            fromRunnable(thread, meta, State.TIMED_WAITING);
+            meta.getThreadAccess().fromRunnable(thread, State.TIMED_WAITING);
             Thread.sleep(millis);
         } catch (InterruptedException e) {
-            setInterrupt(thread, false);
+            meta.getThreadAccess().clearInterruptStatus(thread);
             throw meta.throwExceptionWithMessage(meta.java_lang_InterruptedException, e.getMessage());
         } catch (IllegalArgumentException e) {
             throw meta.throwExceptionWithMessage(meta.java_lang_IllegalArgumentException, e.getMessage());
         } finally {
-            toRunnable(thread, meta, State.RUNNABLE);
+            meta.getThreadAccess().toRunnable(thread);
         }
     }
 
-    public static void setInterrupt(StaticObject self, boolean value) {
-        self.getKlass().getMeta().HIDDEN_INTERRUPTED.setBoolean(self, value, true);
-    }
-
-    static boolean checkInterrupt(StaticObject self) {
-        return self.getKlass().getMeta().HIDDEN_INTERRUPTED.getBoolean(self, true);
-    }
-
     @TruffleBoundary
     @Substitution(hasReceiver = true)
-    public static void interrupt0(@JavaType(Object.class) StaticObject self) {
-        Thread hostThread = getHostFromGuestThread(self);
-        if (hostThread == null) {
-            return;
-        }
-        if (self.getKlass().getMeta().getJavaVersion().java13OrEarlier()) {
-            // Starting from JDK 14, the interrupted status is set in java code.
-            setInterrupt(self, true);
-        }
-        hostThread.interrupt();
+    public static void interrupt0(@JavaType(Object.class) StaticObject self,
+                    @Inject EspressoContext context) {
+        context.getThreadAccess().interrupt(self);
     }
 
     @Substitution
-    public static void clearInterruptEvent() {
-        Thread.interrupted(); // Clear host interruption
+    public static void clearInterruptEvent(@Inject EspressoContext context) {
+        context.getThreadAccess().clearInterruptStatus();
     }
 
     @TruffleBoundary
     @Substitution(hasReceiver = true, versionFilter = VersionFilter.Java13OrEarlier.class)
-    public static boolean isInterrupted(@JavaType(Thread.class) StaticObject self, boolean clear) {
-        boolean result = checkInterrupt(self);
-        if (clear) {
-            Thread hostThread = getHostFromGuestThread(self);
-            EspressoError.guarantee(hostThread == Thread.currentThread(), "Thread#isInterrupted(true) is only supported for the current thread.");
-            if (hostThread != null && hostThread.isInterrupted()) {
-                Thread.interrupted();
-            }
-            setInterrupt(self, false);
-        }
-        return result;
+    public static boolean isInterrupted(@JavaType(Thread.class) StaticObject self, boolean clear,
+                    @Inject EspressoContext context) {
+        return context.getThreadAccess().isInterrupted(self, clear);
     }
 
     @TruffleBoundary
     @SuppressWarnings({"unused"})
     @Substitution(hasReceiver = true)
-    public static void resume0(@JavaType(Object.class) StaticObject self) {
-        SuspendLock lock = getSuspendLock(self);
-        if (lock == null) {
-            return;
-        }
-        synchronized (lock) {
-            lock.shouldSuspend = false;
-            lock.notifyAll();
-        }
+    public static void resume0(@JavaType(Object.class) StaticObject self,
+                    @Inject EspressoContext context) {
+        context.getThreadAccess().resume(self);
     }
 
     @TruffleBoundary
     @SuppressWarnings({"unused"})
     @Substitution(hasReceiver = true)
-    public static void suspend0(@JavaType(Object.class) StaticObject toSuspend) {
+    public static void suspend0(@JavaType(Object.class) StaticObject toSuspend,
+                    @Inject EspressoContext context) {
         toSuspend.getKlass().getContext().invalidateNoSuspend("Calling Thread.suspend()");
-        SuspendLock lock = getSuspendLock(toSuspend);
-        if (lock == null) {
-            if (!isAlive(toSuspend)) {
-                return;
-            }
-            lock = initSuspendLock(toSuspend);
+        if (!isAlive(toSuspend)) {
+            return;
         }
-        suspendHandshake(lock, toSuspend.getKlass().getMeta(), toSuspend);
+        context.getThreadAccess().suspend(toSuspend);
     }
 
     @TruffleBoundary
     @Substitution(hasReceiver = true)
-    public static void stop0(@JavaType(Object.class) StaticObject self, @JavaType(Object.class) StaticObject throwable) {
+    public static void stop0(@JavaType(Object.class) StaticObject self, @JavaType(Object.class) StaticObject throwable,
+                    @Inject EspressoContext context) {
         self.getKlass().getContext().invalidateNoThreadStop("Calling thread.stop()");
-        killThread(self);
-        setInterrupt(self, true);
-        setDeathThrowable(self, throwable);
-        Thread hostThread = getHostFromGuestThread(self);
-        if (hostThread == null) {
-            return;
-        }
-        hostThread.interrupt();
+        context.getThreadAccess().stop(self, throwable);
     }
 
     @TruffleBoundary
     @Substitution(hasReceiver = true)
     public static void setNativeName(@JavaType(Object.class) StaticObject self, @JavaType(String.class) StaticObject name,
                     @Inject Meta meta) {
-        Thread hostThread = getHostFromGuestThread(self);
+        Thread hostThread = meta.getThreadAccess().getHost(self);
         hostThread.setName(meta.toHostString(name));
     }
-
-    public static Thread getHostFromGuestThread(@JavaType(Object.class) StaticObject self) {
-        return (Thread) self.getKlass().getMeta().HIDDEN_HOST_THREAD.getHiddenObject(self);
-    }
-
-    public static boolean checkThreadStatus(StaticObject thread, KillStatus status) {
-        KillStatus stop = (KillStatus) thread.getKlass().getMeta().HIDDEN_DEATH.getHiddenObject(thread);
-        return stop != null && stop == status;
-    }
-
-    public static void setThreadStop(StaticObject thread, KillStatus value) {
-        thread.getKlass().getMeta().HIDDEN_DEATH.setHiddenObject(thread, value);
-    }
-
-    /**
-     * Hints the thread that it should throw a ThreadDeath error whenever he can.
-     */
-    public static void killThread(StaticObject thread) {
-        setThreadStop(thread, KillStatus.KILL);
-    }
-
-    /**
-     * Forces the thread to stop execution at the next safepoint by throwing a host exit exception.
-     */
-    public static void forceKillThread(StaticObject thread) {
-        setThreadStop(thread, KillStatus.SHUTDOWN);
-    }
-
-    public static void setDeathThrowable(StaticObject self, Object deathThrowable) {
-        self.getKlass().getMeta().HIDDEN_DEATH_THROWABLE.setHiddenObject(self, deathThrowable);
-    }
-
-    public static Object getDeathThrowable(StaticObject self) {
-        return self.getKlass().getMeta().HIDDEN_DEATH_THROWABLE.getHiddenObject(self);
-    }
-
-    public static KillStatus getKillStatus(StaticObject thread) {
-        return (KillStatus) thread.getKlass().getMeta().HIDDEN_DEATH.getHiddenObject(thread);
-    }
-
-    public enum KillStatus {
-        /**
-         * Normal state: no Thread.stop() called, or ThreadDeath has already been thrown.
-         */
-        NORMAL,
-        /**
-         * Thread will throw an asynchronous ThreadDeath whenever possible.
-         */
-        KILL,
-        /**
-         * Was killed, but we are in context closing. If the thread is alive for a while in that
-         * state, it will be considered uncooperative.
-         */
-        KILLED,
-        /**
-         * Was killed, and is calling Thread.exit(). Ignore further kill signals.
-         */
-        EXITING,
-        /**
-         * Thread is uncooperative: needs to be killed with a host exception. Very dangerous state
-         * to be in.
-         */
-        SHUTDOWN
-    }
-
-    public static class SuspendLock {
-        private Object notifier = new Object();
-
-        private volatile boolean shouldSuspend;
-        private volatile boolean threadSuspended;
-
-        public boolean shouldSuspend() {
-            return shouldSuspend;
-        }
-
-        public boolean targetThreadIsSuspended() {
-            return threadSuspended;
-        }
-    }
-
-    private static SuspendLock getSuspendLock(@JavaType(Object.class) StaticObject self) {
-        return (SuspendLock) self.getKlass().getMeta().HIDDEN_SUSPEND_LOCK.getHiddenObject(self);
-    }
-
-    /**
-     * Synchronizes on Target_ class to avoid deadlock when locking on thread object.
-     */
-    private static synchronized SuspendLock initSuspendLock(@JavaType(Object.class) StaticObject self) {
-        SuspendLock lock = getSuspendLock(self);
-        if (lock == null) {
-            lock = new SuspendLock();
-            self.getKlass().getMeta().HIDDEN_SUSPEND_LOCK.setHiddenObject(self, lock);
-        }
-        return lock;
-    }
-
-    public static boolean isSuspended(StaticObject self) {
-        assert getSuspendLock(self) != null;
-        return getSuspendLock(self).shouldSuspend();
-    }
-
-    @TruffleBoundary
-    public static void trySuspend(StaticObject self) {
-        SuspendLock lock = getSuspendLock(self);
-        if (lock == null) {
-            return;
-        }
-        synchronized (lock) {
-            if (lock.shouldSuspend()) {
-                synchronized (lock.notifier) {
-                    lock.threadSuspended = true;
-                    lock.notifier.notifyAll();
-                }
-            }
-            while (lock.shouldSuspend()) {
-                try {
-                    lock.wait();
-
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-        lock.threadSuspended = false;
-    }
-
-    @TruffleBoundary
-    private static void suspendHandshake(SuspendLock lock, Meta meta, StaticObject toSuspend) {
-        Object notifier = lock.notifier;
-        boolean wasInterrupted = false;
-        while (!lock.targetThreadIsSuspended()) {
-            lock.shouldSuspend = true;
-            try {
-                synchronized (notifier) {
-                    if (meta.java_lang_Thread_threadStatus.getInt(toSuspend) == State.RUNNABLE.value) {
-                        notifier.wait();
-                    } else {
-                        break;
-                    }
-                }
-            } catch (InterruptedException e) {
-                /* Thread.suspend() is not supposed to be interrupted */
-                wasInterrupted = true;
-            }
-        }
-        if (wasInterrupted) {
-            meta.getContext().interruptThread(meta.getContext().getCurrentThread());
-        }
-    }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
index 99576877207c..790628c488db 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
@@ -52,7 +52,7 @@
 import com.oracle.truffle.espresso.meta.MetaUtil;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.StaticObject;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread.State;
+import com.oracle.truffle.espresso.threads.State;
 import com.oracle.truffle.espresso.vm.InterpreterToVM;
 import com.oracle.truffle.espresso.vm.UnsafeAccess;
 
@@ -1376,12 +1376,12 @@ public static void park(@JavaType(Unsafe.class) StaticObject self, boolean isAbs
         EspressoContext context = meta.getContext();
         StaticObject thread = context.getCurrentThread();
 
-        if (Target_java_lang_Thread.checkInterrupt(thread)) {
+        if (meta.getThreadAccess().isInterrupted(thread, false)) {
             return;
         }
 
         Unsafe unsafe = UnsafeAccess.getIfAllowed(meta);
-        Target_java_lang_Thread.fromRunnable(thread, meta, time > 0 ? State.TIMED_WAITING : State.WAITING);
+        meta.getThreadAccess().fromRunnable(thread, time > 0 ? State.TIMED_WAITING : State.WAITING);
         Thread hostThread = Thread.currentThread();
         Object blocker = LockSupport.getBlocker(hostThread);
         Field parkBlocker = meta.java_lang_Thread.lookupDeclaredField(Symbol.Name.parkBlocker, Type.java_lang_Object);
@@ -1393,7 +1393,7 @@ public static void park(@JavaType(Unsafe.class) StaticObject self, boolean isAbs
 
         parkBoundary(self, isAbsolute, time, meta);
 
-        Target_java_lang_Thread.toRunnable(thread, meta, State.RUNNABLE);
+        meta.getThreadAccess().toRunnable(thread);
         unsafe.putObject(hostThread, PARK_BLOCKER_OFFSET, blocker);
     }
 
@@ -1417,7 +1417,7 @@ public static void parkBoundary(@SuppressWarnings("unused") @JavaType(Unsafe.cla
     @Substitution(hasReceiver = true)
     public static void unpark(@SuppressWarnings("unused") @JavaType(Unsafe.class) StaticObject self, @JavaType(Object.class) StaticObject thread,
                     @Inject Meta meta) {
-        Thread hostThread = (Thread) meta.HIDDEN_HOST_THREAD.getHiddenObject(thread);
+        Thread hostThread = (Thread) meta.getThreadAccess().getHost(thread);
         UnsafeAccess.getIfAllowed(meta).unpark(hostThread);
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoThreadManager.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
similarity index 91%
rename from espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoThreadManager.java
rename to espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
index 49bc570f6253..87d238c1993a 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoThreadManager.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.truffle.espresso.runtime;
+package com.oracle.truffle.espresso.threads;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,13 +38,15 @@
 import com.oracle.truffle.espresso.impl.Method;
 import com.oracle.truffle.espresso.impl.SuppressFBWarnings;
 import com.oracle.truffle.espresso.meta.Meta;
+import com.oracle.truffle.espresso.runtime.EspressoContext;
+import com.oracle.truffle.espresso.runtime.StaticObject;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
 import com.oracle.truffle.espresso.vm.VM;
 
-class EspressoThreadManager implements ContextAccess {
+public class EspressoThreadRegistry implements ContextAccess {
     private static final int DEFAULT_THREAD_ARRAY_SIZE = 8;
 
-    private final TruffleLogger logger = TruffleLogger.getLogger(EspressoLanguage.ID, EspressoThreadManager.class);
+    private final TruffleLogger logger = TruffleLogger.getLogger(EspressoLanguage.ID, EspressoThreadRegistry.class);
     private final EspressoContext context;
 
     private final Set<StaticObject> activeThreads = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -56,7 +58,7 @@ public EspressoContext getContext() {
         return context;
     }
 
-    EspressoThreadManager(EspressoContext context) {
+    public EspressoThreadRegistry(EspressoContext context) {
         this.context = context;
     }
 
@@ -109,8 +111,8 @@ private void registerMainThread(Thread thread, StaticObject self) {
         activeThreads.add(self);
     }
 
-    final AtomicLong createdThreadCount = new AtomicLong();
-    final AtomicLong peakThreadCount = new AtomicLong();
+    public final AtomicLong createdThreadCount = new AtomicLong();
+    public final AtomicLong peakThreadCount = new AtomicLong();
 
     public void registerThread(Thread host, StaticObject guest) {
         activeThreads.add(guest);
@@ -158,12 +160,12 @@ public long applyAsLong(long oldPeak) {
     @SuppressFBWarnings(value = "NN", justification = "Removing a thread from the active set is the state change we need.")
     public void unregisterThread(StaticObject thread) {
         logger.fine(() -> {
-            String guestName = Target_java_lang_Thread.getThreadName(getMeta(), thread);
-            long guestId = Target_java_lang_Thread.getThreadId(getMeta(), thread);
+            String guestName = getThreadAccess().getThreadName(thread);
+            long guestId = getThreadAccess().getThreadId(thread);
             return String.format("unregisterThread([GUEST:%s, %d])", guestName, guestId);
         });
         activeThreads.remove(thread);
-        Thread hostThread = (Thread) getMeta().HIDDEN_HOST_THREAD.getHiddenObject(thread);
+        Thread hostThread = getThreadAccess().getHost(thread);
         int id = Math.toIntExact(hostThread.getId());
         synchronized (activeThreadLock) {
             if (id == mainThreadId) {
@@ -267,7 +269,6 @@ public StaticObject createGuestThreadFromHost(Thread hostThread, Meta meta, VM v
             // Allow guest Thread.currentThread() to work.
             meta.java_lang_Thread_priority.setInt(guestThread, Thread.NORM_PRIORITY);
             meta.HIDDEN_HOST_THREAD.setHiddenObject(guestThread, Thread.currentThread());
-            meta.HIDDEN_DEATH.setHiddenObject(guestThread, Target_java_lang_Thread.KillStatus.NORMAL);
 
             // register the new guest thread
             registerThread(hostThread, guestThread);
@@ -277,14 +278,14 @@ public StaticObject createGuestThreadFromHost(Thread hostThread, Meta meta, VM v
             } else {
                 meta.java_lang_Thread_init_ThreadGroup_String.invokeDirect(guestThread, threadGroup, meta.toGuestString(name));
             }
-            meta.java_lang_Thread_threadStatus.setInt(guestThread, Target_java_lang_Thread.State.RUNNABLE.value);
+            meta.java_lang_Thread_threadStatus.setInt(guestThread, State.RUNNABLE.value);
 
             // now add to the main thread group
             meta.java_lang_ThreadGroup_add.invokeDirect(threadGroup, guestThread);
 
             logger.fine(() -> {
-                String guestName = Target_java_lang_Thread.getThreadName(getMeta(), guestThread);
-                long guestId = Target_java_lang_Thread.getThreadId(getMeta(), guestThread);
+                String guestName = getThreadAccess().getThreadName(guestThread);
+                long guestId = getThreadAccess().getThreadId(guestThread);
                 return String.format("createGuestThreadFromHost: [HOST:%s, %d], [GUEST:%s, %d]", hostThread.getName(), hostThread.getId(), guestName, guestId);
             });
 
@@ -306,7 +307,6 @@ public void createMainThread(Meta meta) {
         // Allow guest Thread.currentThread() to work.
         meta.java_lang_Thread_priority.setInt(mainThread, Thread.NORM_PRIORITY);
         meta.HIDDEN_HOST_THREAD.setHiddenObject(mainThread, hostThread);
-        meta.HIDDEN_DEATH.setHiddenObject(mainThread, Target_java_lang_Thread.KillStatus.NORMAL);
         mainThreadGroup = meta.java_lang_ThreadGroup.allocateInstance();
 
         registerMainThread(hostThread, mainThread);
@@ -323,15 +323,15 @@ public void createMainThread(Meta meta) {
                         .invokeDirect(mainThread,
                                         /* group */ mainThreadGroup,
                                         /* name */ meta.toGuestString("main"));
-        meta.java_lang_Thread_threadStatus.setInt(mainThread, Target_java_lang_Thread.State.RUNNABLE.value);
+        meta.java_lang_Thread_threadStatus.setInt(mainThread, State.RUNNABLE.value);
 
         // Notify native backend about main thread.
         getNativeAccess().prepareThread();
 
         mainThreadCreated = true;
         logger.fine(() -> {
-            String guestName = Target_java_lang_Thread.getThreadName(getMeta(), mainThread);
-            long guestId = Target_java_lang_Thread.getThreadId(getMeta(), mainThread);
+            String guestName = getThreadAccess().getThreadName(mainThread);
+            long guestId = getThreadAccess().getThreadId(mainThread);
             return String.format("createMainThread: [HOST:%s, %d], [GUEST:%s, %d]", hostThread.getName(), hostThread.getId(), guestName, guestId);
         });
     }
@@ -371,7 +371,7 @@ private void refactorGuestThreads(int id, StaticObject self) {
             if (oldThreads[i] != null) {
                 StaticObject guestThread = (StaticObject) oldThreads[i];
                 if (Target_java_lang_Thread.isAlive(guestThread)) {
-                    Thread hostThread = Target_java_lang_Thread.getHostFromGuestThread(guestThread);
+                    Thread hostThread = getThreadAccess().getHost(guestThread);
                     int hostID = (int) hostThread.getId();
                     if (hostID < minID) {
                         minID = hostID;
@@ -398,7 +398,7 @@ private void refactorGuestThreads(int id, StaticObject self) {
         int newOffset = minID - 1;
         newThreads[0] = newOffset;
         for (StaticObject guestThread : toRelocate) {
-            int hostId = (int) Target_java_lang_Thread.getHostFromGuestThread(guestThread).getId();
+            int hostId = (int) context.getThreadAccess().getHost(guestThread).getId();
             newThreads[hostId - newOffset] = guestThread;
         }
         newThreads[id - newOffset] = self;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
new file mode 100644
index 000000000000..57acf7030f55
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.threads;
+
+import com.oracle.truffle.api.nodes.DirectCallNode;
+import com.oracle.truffle.espresso.runtime.EspressoContext;
+import com.oracle.truffle.espresso.runtime.EspressoException;
+import com.oracle.truffle.espresso.runtime.EspressoExitException;
+import com.oracle.truffle.espresso.runtime.StaticObject;
+
+public final class GuestRunnable implements Runnable {
+    private final EspressoContext context;
+    private final StaticObject thread;
+    private final DirectCallNode exit;
+    private final DirectCallNode dispatchUncaught;
+
+    public GuestRunnable(EspressoContext context, StaticObject thread, DirectCallNode exit, DirectCallNode dispatchUncaught) {
+        this.context = context;
+        this.thread = thread;
+        this.exit = exit;
+        this.dispatchUncaught = dispatchUncaught;
+    }
+
+    @Override
+    public void run() {
+        try {
+            context.getVM().attachThread(Thread.currentThread());
+            try {
+                // Execute the payload
+                context.getThreadAccess().checkDeprecation();
+                thread.getKlass().vtableLookup(context.getMeta().java_lang_Thread_run.getVTableIndex()).invokeDirect(thread);
+                context.getThreadAccess().checkDeprecation();
+            } catch (EspressoException uncaught) {
+                dispatchUncaught.call(thread, uncaught.getExceptionObject());
+            }
+        } catch (EspressoExitException exitException) {
+            /* Suppress */
+        } finally {
+            context.getThreadAccess().terminate(thread, exit);
+            if (context.isClosing()) {
+                // Ignore exceptions that arise during closing.
+                return;
+            }
+        }
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
new file mode 100644
index 000000000000..e0a0fcc491ed
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.threads;
+
+public enum KillStatus {
+    /**
+     * Normal state: no Thread.stop() called, or ThreadDeath has already been thrown.
+     */
+    NORMAL,
+    /**
+     * Thread will throw an asynchronous ThreadDeath whenever possible.
+     */
+    STOP,
+    /**
+     * Was killed, but we are in context closing. If the thread is alive for a while in that state,
+     * it will be considered uncooperative.
+     */
+    KILLED,
+    /**
+     * Was killed, and is calling Thread.exit(). Ignore further kill signals.
+     */
+    EXITING,
+    /**
+     * Thread is uncooperative: needs to be killed with a host exception. Very dangerous state to be
+     * in.
+     */
+    KILL
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/State.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/State.java
new file mode 100644
index 000000000000..1fdbe55abc01
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/State.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.threads;
+
+public enum State {
+    NEW(0),
+    RUNNABLE(4),
+    BLOCKED(1024),
+    WAITING(16),
+    TIMED_WAITING(32),
+    TERMINATED(2);
+
+    public final int value;
+
+    State(int value) {
+        this.value = value;
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
new file mode 100644
index 000000000000..4d89a4b15783
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.threads;
+
+import com.oracle.truffle.espresso.runtime.StaticObject;
+
+public class SuspendLock {
+    private Object handshakeLock = new Object() {
+    };
+
+    private volatile boolean shouldSuspend;
+    private volatile boolean threadSuspended;
+
+    public boolean shouldSuspend() {
+        return shouldSuspend;
+    }
+
+    public boolean isSuspended() {
+        return threadSuspended;
+    }
+
+    public void suspend(ThreadsAccess threads, StaticObject thread) {
+        if (threads.getHost(thread) == Thread.currentThread()) {
+            // No need for handshake
+            shouldSuspend = true;
+            selfSuspend();
+        } else {
+            suspendHandshake(threads, thread);
+        }
+    }
+
+    private void suspendHandshake(ThreadsAccess threads, StaticObject thread) {
+        boolean wasInterrupted = false;
+        while (!isSuspended()) {
+            shouldSuspend = true;
+            try {
+                synchronized (handshakeLock) {
+                    if (!threads.isAlive(thread)) {
+                        // If thread terminates, we don't want to wait forever
+                        handshakeLock.wait(100);
+                    } else {
+                        break;
+                    }
+                }
+            } catch (InterruptedException e) {
+                /* Thread.suspend() is not supposed to be interrupted */
+                wasInterrupted = true;
+            }
+        }
+        if (wasInterrupted) {
+            threads.getContext().interruptThread(threads.getContext().getCurrentThread());
+        }
+    }
+
+    public synchronized void selfSuspend() {
+        while (shouldSuspend()) {
+            notifySuspended();
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                /* spin back */
+            }
+        }
+        threadSuspended = false;
+    }
+
+    private void notifySuspended() {
+        synchronized (handshakeLock) {
+            threadSuspended = true;
+            handshakeLock.notifyAll();
+        }
+    }
+
+    public synchronized void resume() {
+        if (shouldSuspend()) {
+            shouldSuspend = false;
+            notifyAll();
+        }
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
new file mode 100644
index 000000000000..a9c8e7b2b388
--- /dev/null
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
@@ -0,0 +1,379 @@
+/*
+ * Copyright (c) 2020, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.truffle.espresso.threads;
+
+import static com.oracle.truffle.espresso.threads.KillStatus.EXITING;
+import static com.oracle.truffle.espresso.threads.KillStatus.KILL;
+import static com.oracle.truffle.espresso.threads.KillStatus.KILLED;
+import static com.oracle.truffle.espresso.threads.KillStatus.NORMAL;
+import static com.oracle.truffle.espresso.threads.KillStatus.STOP;
+
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.nodes.DirectCallNode;
+import com.oracle.truffle.espresso.impl.ContextAccess;
+import com.oracle.truffle.espresso.meta.EspressoError;
+import com.oracle.truffle.espresso.meta.Meta;
+import com.oracle.truffle.espresso.runtime.EspressoContext;
+import com.oracle.truffle.espresso.runtime.EspressoException;
+import com.oracle.truffle.espresso.runtime.EspressoExitException;
+import com.oracle.truffle.espresso.runtime.StaticObject;
+
+public final class ThreadsAccess implements ContextAccess {
+
+    private final Meta meta;
+    private final EspressoContext context;
+
+    public String getThreadName(StaticObject thread) {
+        if (thread == null) {
+            return "<unknown>";
+        } else {
+            return meta.toHostString(meta.java_lang_Thread_name.getObject(thread));
+        }
+    }
+
+    public long getThreadId(StaticObject thread) {
+        if (thread == null) {
+            return -1;
+        } else {
+            return (long) meta.java_lang_Thread_tid.get(thread);
+        }
+    }
+
+    @Override
+    public EspressoContext getContext() {
+        return context;
+    }
+
+    public ThreadsAccess(Meta meta) {
+        this.meta = meta;
+        this.context = meta.getContext();
+    }
+
+    public void fromRunnable(StaticObject self, State state) {
+        assert meta.java_lang_Thread_threadStatus.getInt(self) == State.RUNNABLE.value;
+        setState(self, state);
+        checkDeprecation();
+    }
+
+    public void toRunnable(StaticObject self) {
+        try {
+            checkDeprecation();
+        } finally {
+            setState(self, State.RUNNABLE);
+        }
+    }
+
+    private void setState(StaticObject self, State state) {
+        meta.java_lang_Thread_threadStatus.setInt(self, state.value);
+    }
+
+    public Thread getHost(StaticObject guest) {
+        return (Thread) meta.HIDDEN_HOST_THREAD.getHiddenObject(guest);
+    }
+
+    /**
+     * Implements support for thread deprecated methods ({@link Thread#stop()},
+     * {@link Thread#suspend()}, {@link Thread#resume()}).
+     * <p>
+     * The following performance concerns are to be considered:
+     * <ul>
+     * <li>If these deprecated methods are never called, this method should entirely fold.</li>
+     * <li>When called for the first time, a very large portion of the compiled code will be
+     * invalidated.</li>
+     * <li>After being called for the first time, in most cases, this method should amount to
+     * getting the current thread and reading a field</li>
+     * </ul>
+     */
+    public void checkDeprecation() {
+        if (!context.shouldCheckDeprecationStatus()) {
+            return;
+        }
+        StaticObject current = context.getCurrentThread();
+        DeprecationSupport support = getDeprecationSupport(current, false);
+        if (support == null) {
+            return;
+        }
+        if (context.shouldCheckStop()) {
+            support.handleStop(meta);
+        }
+        if (context.shouldCheckSuspend()) {
+            support.handleSuspend();
+        }
+    }
+
+    public boolean isInterrupted(StaticObject guest, boolean clear) {
+        boolean isInterrupted = meta.HIDDEN_INTERRUPTED.getBoolean(guest, true);
+        if (clear) {
+            Thread host = getHost(guest);
+            EspressoError.guarantee(host == Thread.currentThread(), "Thread#isInterrupted(true) is only supported for the current thread.");
+            if (host != null && host.isInterrupted()) {
+                Thread.interrupted();
+            }
+            clearInterruptStatus(guest);
+        }
+        return isInterrupted;
+    }
+
+    public void interrupt(StaticObject guest) {
+        if (context.getJavaVersion().java13OrEarlier()) {
+            meta.HIDDEN_INTERRUPTED.setBoolean(guest, true, true);
+        }
+        Thread host = getHost(guest);
+        if (host != null) {
+            host.interrupt();
+        }
+    }
+
+    public void clearInterruptStatus() {
+        StaticObject guest = context.getCurrentThread();
+        if (context.getJavaVersion().java13OrEarlier()) {
+            clearInterruptStatus(guest);
+        }
+        Thread.interrupted();
+    }
+
+    public boolean isAlive(StaticObject guest) {
+        int state = meta.java_lang_Thread_threadStatus.getInt(guest);
+        return state != State.NEW.value && state != State.TERMINATED.value;
+    }
+
+    /**
+     * Suspends a thread. On return, guarantees that the given thread has seen the suspend request.
+     */
+    public void suspend(StaticObject guest) {
+        DeprecationSupport support = getDeprecationSupport(guest, true);
+        assert support != null;
+        support.suspend(this);
+    }
+
+    /**
+     * Resumes a thread. Does nothing if the thread was not previously suspended.
+     */
+    public void resume(StaticObject guest) {
+        DeprecationSupport support = getDeprecationSupport(guest, false);
+        if (support == null) {
+            return;
+        }
+        support.resume();
+    }
+
+    /**
+     * Notifies a thread to throw an asynchronous guest throwable whenever possible.
+     */
+    public void stop(StaticObject guest, StaticObject throwable) {
+        DeprecationSupport support = getDeprecationSupport(guest, true);
+        assert support != null;
+        support.stop(throwable);
+        Thread host = getHost(guest);
+        interrupt(guest);
+        if (host != null) {
+            host.interrupt();
+        }
+    }
+
+    /**
+     * Notifies a thread to throw a host {@link EspressoExitException} whenever possible.
+     */
+    public void kill(StaticObject guest) {
+        DeprecationSupport support = getDeprecationSupport(guest, true);
+        support.kill();
+    }
+
+    /**
+     * Creates a thread for the given guest thread. This thread will be ready to be started.
+     */
+    public Thread createJavaThread(StaticObject guest, DirectCallNode exit, DirectCallNode dispatch) {
+        Thread host = context.getEnv().createThread(new GuestRunnable(context, guest, exit, dispatch));
+        // Prepare
+        meta.HIDDEN_HOST_THREAD.setHiddenObject(guest, host);
+        host.setDaemon(meta.java_lang_Thread_daemon.getBoolean(guest));
+        meta.java_lang_Thread_threadStatus.setInt(guest, State.RUNNABLE.value);
+        host.setPriority(meta.java_lang_Thread_priority.getInt(guest));
+        if (isInterrupted(guest, false)) {
+            host.interrupt();
+        }
+        context.registerThread(host, guest);
+        String guestName = context.getThreadAccess().getThreadName(guest);
+        host.setName(guestName);
+        return host;
+    }
+
+    /**
+     * Termination of a threads works as follows:
+     * <ul>
+     * <li>Prevent other threads from {@linkplain #stop(StaticObject, StaticObject)} stopping} the
+     * given thread</li>
+     * <li>Invoke guest {@link Thread#exit()}</li>
+     * <li>Sets the status of this thread to {@link State.TERMINATED} and notifies other threads
+     * waiting on this thread's monitor</li>
+     * <li>Unregisters the thread</li>
+     * </ul>
+     */
+    public void terminate(StaticObject thread) {
+        terminate(thread, null);
+    }
+
+    public void terminate(StaticObject thread, DirectCallNode exit) {
+        DeprecationSupport support = getDeprecationSupport(thread, true);
+        support.exit();
+        try {
+            if (exit == null) {
+                meta.java_lang_Thread_exit.invokeDirect(thread);
+            } else {
+                exit.call(thread);
+            }
+        } catch (EspressoException | EspressoExitException e) {
+            // just drop it
+        }
+        terminateAndNotify(thread);
+        context.unregisterThread(thread);
+    }
+
+    public void terminateAndNotify(StaticObject guest) {
+        guest.getLock().lock();
+        try {
+            meta.java_lang_Thread_threadStatus.setInt(guest, State.TERMINATED.value);
+            // Notify waiting threads you are done working
+            guest.getLock().signalAll();
+        } finally {
+            guest.getLock().unlock();
+        }
+    }
+
+    /**
+     * returns true if this thread has been stopped before starting, or if the context is in
+     * closing.
+     */
+    public boolean isStillborn(StaticObject guest) {
+        if (context.isClosing()) {
+            return true;
+        }
+        DeprecationSupport support = getDeprecationSupport(guest, false);
+        if (support != null) {
+            return support.status != NORMAL;
+        }
+        return false;
+    }
+
+    public void clearInterruptStatus(StaticObject guest) {
+        meta.HIDDEN_INTERRUPTED.setBoolean(guest, false, true);
+    }
+
+    private DeprecationSupport getDeprecationSupport(StaticObject guest, boolean initIfNull) {
+        DeprecationSupport support = (DeprecationSupport) meta.HIDDEN_DEPRECATION_SUPPORT.getHiddenObject(guest);
+        if (initIfNull && support == null) {
+            synchronized (guest) {
+                support = (DeprecationSupport) meta.HIDDEN_DEPRECATION_SUPPORT.getHiddenObject(guest, true);
+                if (support == null) {
+                    support = new DeprecationSupport(guest);
+                    meta.HIDDEN_DEPRECATION_SUPPORT.setHiddenObject(guest, support, true);
+                }
+            }
+        }
+        return support;
+    }
+
+    private static final class DeprecationSupport {
+
+        private final StaticObject thread;
+
+        private volatile StaticObject throwable = null;
+        /*
+         * Non-volatile for general performance purposes. The cost is that the target thread might
+         * take longer to observe requests.;
+         */
+        private KillStatus status = NORMAL;
+        private SuspendLock suspendLock = null;
+
+        DeprecationSupport(StaticObject thread) {
+            this.thread = thread;
+        }
+
+        void suspend(ThreadsAccess threads) {
+            SuspendLock lock = this.suspendLock;
+            if (lock == null) {
+                synchronized (this) {
+                    lock = new SuspendLock();
+                    this.suspendLock = lock;
+                }
+            }
+            lock.suspend(threads, thread);
+        }
+
+        void resume() {
+            SuspendLock lock = this.suspendLock;
+            if (lock == null) {
+                return;
+            }
+            lock.resume();
+        }
+
+        void stop(StaticObject death) {
+            // Writing the throwable must be done before the kill status can be observed
+            throwable = death;
+            status = STOP;
+        }
+
+        void kill() {
+            status = KILL;
+        }
+
+        void exit() {
+            status = EXITING;
+        }
+
+        @TruffleBoundary
+        void handleSuspend() {
+            SuspendLock lock = this.suspendLock;
+            if (lock == null) {
+                return;
+            }
+            lock.selfSuspend();
+        }
+
+        @TruffleBoundary
+        void handleStop(Meta meta) {
+            switch (status) {
+                case NORMAL:
+                case EXITING:
+                case KILLED:
+                    break;
+                case STOP:
+                    if (meta.getContext().isClosing()) {
+                        // Give some leeway during closing.
+                        status = KILLED;
+                    } else {
+                        status = NORMAL;
+                    }
+                    // check if death cause throwable is set, if not throw ThreadDeath
+                    StaticObject deathThrowable = throwable;
+                    throw deathThrowable != null ? meta.throwException(deathThrowable) : meta.throwException(meta.java_lang_ThreadDeath);
+                case KILL:
+                    // This thread refuses to stop. Send a host exception.
+                    assert meta.getContext().isClosing();
+                    throw new EspressoExitException(meta.getContext().getExitStatus());
+            }
+        }
+    }
+}
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/InterpreterToVM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/InterpreterToVM.java
index d4a9904b9c71..691de20467d2 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/InterpreterToVM.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/InterpreterToVM.java
@@ -60,6 +60,7 @@
 import com.oracle.truffle.espresso.substitutions.JavaType;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
 import com.oracle.truffle.espresso.substitutions.Throws;
+import com.oracle.truffle.espresso.threads.State;
 
 public final class InterpreterToVM implements ContextAccess {
 
@@ -399,7 +400,7 @@ public static void monitorEnter(@JavaType(Object.class) StaticObject obj, Meta m
         EspressoContext context = meta.getContext();
         if (!monitorTryLock(lock)) {
             StaticObject thread = context.getCurrentThread();
-            Target_java_lang_Thread.fromRunnable(thread, meta, Target_java_lang_Thread.State.BLOCKED);
+            meta.getThreadAccess().fromRunnable(thread, State.BLOCKED);
             if (context.EnableManagement) {
                 // Locks bookkeeping.
                 meta.HIDDEN_THREAD_BLOCKED_OBJECT.setHiddenObject(thread, obj);
@@ -417,7 +418,7 @@ public static void monitorEnter(@JavaType(Object.class) StaticObject obj, Meta m
             if (context.EnableManagement) {
                 meta.HIDDEN_THREAD_BLOCKED_OBJECT.setHiddenObject(thread, null);
             }
-            Target_java_lang_Thread.toRunnable(thread, meta, Target_java_lang_Thread.State.RUNNABLE);
+            meta.getThreadAccess().toRunnable(thread);
         }
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/Management.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/Management.java
index 2912967b66e0..6e0ad894a56d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/Management.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/Management.java
@@ -60,6 +60,7 @@
 import com.oracle.truffle.espresso.substitutions.JavaType;
 import com.oracle.truffle.espresso.substitutions.SubstitutionProfiler;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
+import com.oracle.truffle.espresso.threads.State;
 
 @GenerateNativeEnv(target = ManagementImpl.class, prependEnv = true)
 public final class Management extends NativeEnv {
@@ -297,7 +298,7 @@ public int GetThreadInfo(@JavaType(long[].class) StaticObject ids, int maxDepth,
             StaticObject thread = StaticObject.NULL;
 
             for (int j = 0; j < activeThreads.length; ++j) {
-                if (Target_java_lang_Thread.getThreadId(meta, activeThreads[j]) == id) {
+                if (getThreadAccess().getThreadId(activeThreads[j]) == id) {
                     thread = activeThreads[j];
                     break;
                 }
@@ -310,7 +311,7 @@ public int GetThreadInfo(@JavaType(long[].class) StaticObject ids, int maxDepth,
                 int threadStatus = meta.java_lang_Thread_threadStatus.getInt(thread);
                 StaticObject lockObj = StaticObject.NULL;
                 StaticObject lockOwner = StaticObject.NULL;
-                int mask = Target_java_lang_Thread.State.BLOCKED.value | Target_java_lang_Thread.State.WAITING.value | Target_java_lang_Thread.State.TIMED_WAITING.value;
+                int mask = State.BLOCKED.value | State.WAITING.value | State.TIMED_WAITING.value;
                 if ((threadStatus & mask) != 0) {
                     lockObj = (StaticObject) meta.HIDDEN_THREAD_BLOCKED_OBJECT.getHiddenObject(thread);
                     if (lockObj == null) {
@@ -567,7 +568,7 @@ public int GetVMGlobals(@JavaType(Object[].class) StaticObject names, /* jmmVMGl
             StaticObject[] activeThreads = getContext().getActiveThreads();
             threadIds = InterpreterToVM.allocatePrimitiveArray((byte) JavaKind.Long.getBasicType(), activeThreads.length, getMeta());
             for (int j = 0; j < activeThreads.length; ++j) {
-                long tid = Target_java_lang_Thread.getThreadId(getMeta(), activeThreads[j]);
+                long tid = getThreadAccess().getThreadId(activeThreads[j]);
                 getInterpreterToVM().setArrayLong(tid, j, threadIds);
             }
         }
@@ -586,7 +587,7 @@ public long GetOneThreadAllocatedMemory(
         StaticObject thread = StaticObject.NULL;
 
         for (int j = 0; j < activeThreads.length; ++j) {
-            if (Target_java_lang_Thread.getThreadId(getMeta(), activeThreads[j]) == threadId) {
+            if (getThreadAccess().getThreadId(activeThreads[j]) == threadId) {
                 thread = activeThreads[j];
                 break;
             }
@@ -620,7 +621,7 @@ public void GetThreadAllocatedMemory(
             StaticObject thread = StaticObject.NULL;
 
             for (int j = 0; j < activeThreads.length; ++j) {
-                if (Target_java_lang_Thread.getThreadId(meta, activeThreads[j]) == id) {
+                if (getThreadAccess().getThreadId(activeThreads[j]) == id) {
                     thread = activeThreads[j];
                     break;
                 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
index 0611052872ce..36599b69517a 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
@@ -146,8 +146,8 @@
 import com.oracle.truffle.espresso.substitutions.SubstitutionProfiler;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_System;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread.State;
 import com.oracle.truffle.espresso.substitutions.Target_java_lang_ref_Reference;
+import com.oracle.truffle.espresso.threads.State;
 import com.oracle.truffle.espresso.vm.structs.JavaVMAttachArgs;
 import com.oracle.truffle.espresso.vm.structs.JdkVersionInfo;
 import com.oracle.truffle.espresso.vm.structs.Structs;
@@ -800,7 +800,7 @@ public void JVM_MonitorWait(@JavaType(Object.class) StaticObject self, long time
         EspressoContext context = getContext();
         StaticObject currentThread = context.getCurrentThread();
         try {
-            Target_java_lang_Thread.fromRunnable(currentThread, meta, (timeout > 0 ? State.TIMED_WAITING : State.WAITING));
+            meta.getThreadAccess().fromRunnable(currentThread, (timeout > 0 ? State.TIMED_WAITING : State.WAITING));
             if (context.EnableManagement) {
                 // Locks bookkeeping.
                 meta.HIDDEN_THREAD_BLOCKED_OBJECT.setHiddenObject(currentThread, self);
@@ -816,7 +816,7 @@ public void JVM_MonitorWait(@JavaType(Object.class) StaticObject self, long time
             }
         } catch (InterruptedException e) {
             profiler.profile(0);
-            Target_java_lang_Thread.setInterrupt(currentThread, false);
+            getThreadAccess().clearInterruptStatus(currentThread);
             throw meta.throwExceptionWithMessage(meta.java_lang_InterruptedException, e.getMessage());
         } catch (IllegalMonitorStateException e) {
             profiler.profile(1);
@@ -828,7 +828,7 @@ public void JVM_MonitorWait(@JavaType(Object.class) StaticObject self, long time
             if (context.EnableManagement) {
                 meta.HIDDEN_THREAD_BLOCKED_OBJECT.setHiddenObject(currentThread, null);
             }
-            Target_java_lang_Thread.toRunnable(currentThread, meta, State.RUNNABLE);
+            meta.getThreadAccess().toRunnable(currentThread);
         }
     }
 
@@ -1519,8 +1519,7 @@ public int DetachCurrentThread(@Inject EspressoContext context) {
             return JNI_OK;
         }
         getLogger().fine(() -> {
-            Meta meta = getMeta();
-            String guestName = Target_java_lang_Thread.getThreadName(meta, currentThread);
+            String guestName = getThreadAccess().getThreadName(currentThread);
             return "DetachCurrentThread: " + guestName;
         });
         // HotSpot will wait forever if the current VM this thread was attached to has exited
@@ -1540,8 +1539,7 @@ public Method visitFrame(FrameInstance frameInstance) {
         if (lastJavaMethod != null) {
             // this thread is executing
             getLogger().warning(() -> {
-                Meta meta = getMeta();
-                String guestName = Target_java_lang_Thread.getThreadName(meta, currentThread);
+                String guestName = getThreadAccess().getThreadName(currentThread);
                 return "DetachCurrentThread called while thread is still executing Java code (" + guestName + ")";
             });
             return JNI_ERR;
@@ -1555,12 +1553,12 @@ public Method visitFrame(FrameInstance frameInstance) {
                 meta.java_lang_Thread_dispatchUncaughtException.invokeDirect(currentThread, pendingException);
             }
 
-            Target_java_lang_Thread.terminate(currentThread, meta);
+            getThreadAccess().terminate(currentThread);
         } catch (EspressoException e) {
             try {
                 StaticObject ex = e.getExceptionObject();
                 String exception = ex.getKlass().getExternalName();
-                String threadName = Target_java_lang_Thread.getThreadName(meta, currentThread);
+                String threadName = getThreadAccess().getThreadName(currentThread);
                 context.getLogger().warning(String.format("Exception: %s thrown while terminating thread \"%s\"", exception, threadName));
                 Method printStackTrace = ex.getKlass().lookupMethod(Name.printStackTrace, Signature._void);
                 printStackTrace.invokeDirect(ex);

From 7ab1d17fb92c959cc8a591a97791b7a87c50abd0 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Wed, 6 Oct 2021 10:06:28 -0700
Subject: [PATCH 313/681] ResolvedJavaMethod.getCode() might not be ==

---
 .../src/org/graalvm/compiler/nodes/FrameState.java             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
index 4a033b71f141..9134d04c84b0 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/FrameState.java
@@ -34,6 +34,7 @@
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -307,7 +308,7 @@ public ResolvedJavaMethod getMethod() {
      * latter has been subject to instrumentation.
      */
     public boolean canProduceBytecodeFrame() {
-        return code != null && code.getCode() == code.getMethod().getCode();
+        return code != null && Arrays.equals(code.getCode(), code.getMethod().getCode());
     }
 
     public void addVirtualObjectMapping(EscapeObjectState virtualObject) {

From 9e326a18094479a5c12b90b584e7c987bafacfc8 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 6 Oct 2021 22:51:29 +0300
Subject: [PATCH 314/681] Test demos with graalvm 21.3-dev and update
 documentation

---
 docs/reference-manual/compiler.md             |   4 +-
 .../embedding/embed-languages.md              |  89 +++++--------
 .../embedding/sandbox-options.md              |  80 +++++++-----
 docs/reference-manual/graalvm-updater.md      | 121 +++++++-----------
 docs/reference-manual/polyglot-programming.md |  50 +++-----
 docs/security/security-guide.md               |  11 +-
 docs/tools/chrome-debugger.md                 |   9 +-
 docs/tools/code-coverage.md                   |  69 ++++------
 docs/tools/dap.md                             |   6 +-
 docs/tools/graalvm-insight.md                 | 106 ++++++---------
 docs/tools/ideal-graph-visualizer.md          |  78 +++++------
 docs/tools/lsp.md                             |   2 +-
 12 files changed, 260 insertions(+), 365 deletions(-)

diff --git a/docs/reference-manual/compiler.md b/docs/reference-manual/compiler.md
index 66da06569e70..0f0d0698cdd0 100644
--- a/docs/reference-manual/compiler.md
+++ b/docs/reference-manual/compiler.md
@@ -41,9 +41,7 @@ GraalVM also includes the [Truffle language implementation framework](/graalvm-a
 These languages can consequently benefit from the optimization possibilities of the GraalVM compiler.
 The pipeline for such compilation is:
 
-* The Truffle framework code and data (Abstract Syntax Trees) is partially evaluated to
-produce a compilation graph. When such an Abstract Syntax Tree (AST) is
-hot (i.e., called many times), it is scheduled for compilation by the compiler.
+* The Truffle framework code and data (Abstract Syntax Trees) is partially evaluated to produce a compilation graph. When such an Abstract Syntax Tree (AST) is hot (i.e., called many times), it is scheduled for compilation by the compiler.
 * The compilation graph is optimized by the GraalVM compiler to produce machine code.
 * JVMCI installs this machine code in the VM's code cache.
 * The AST will automatically redirect execution to the installed machine code once it is available.
diff --git a/docs/reference-manual/embedding/embed-languages.md b/docs/reference-manual/embedding/embed-languages.md
index 24bc455db339..04ba6569ef42 100644
--- a/docs/reference-manual/embedding/embed-languages.md
+++ b/docs/reference-manual/embedding/embed-languages.md
@@ -24,9 +24,8 @@ permalink: /reference-manual/embed-languages/
 
 The GraalVM Polyglot API lets you embed and run code from guest languages in JVM-based host applications.
 
-Throughout this section, you will learn how to create a host application in Java that
-runs on GraalVM and directly calls a guest language. You can use the tabs
-beneath each code example to choose between JavaScript, R, Ruby, and Python.
+Throughout this section, you will learn how to create a host application in Java that runs on GraalVM and directly calls a guest language.
+You can use the tabs beneath each code example to choose between JavaScript, R, Ruby, and Python.
 
 Ensure you set up GraalVM before you begin.
 
@@ -34,9 +33,7 @@ Ensure you set up GraalVM before you begin.
 GraalVM can run polyglot applications written in any language implemented with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/).
 These languages are henceforth referenced as **guest languages**.
 
-Complete the steps in this section to create a sample polyglot
-application that runs on GraalVM and demonstrates programming language
-interoperability.
+Complete the steps in this section to create a sample polyglot application that runs on GraalVM and demonstrates programming language interoperability.
 
 1&#46; Create a `hello-polyglot` project directory.
 
@@ -67,10 +64,8 @@ GraalVM.
 
 4&#46; Run `java HelloPolyglot` to run the application on GraalVM.
 
-You now have a polyglot application that consists of a Java host application
-and guest language code that run on GraalVM. You can use this application with
-other code examples to demonstrate more advanced capabilities of the
-Polyglot API.
+You now have a polyglot application that consists of a Java host application and guest language code that run on GraalVM.
+You can use this application with other code examples to demonstrate more advanced capabilities of the Polyglot API.
 
 To use other code examples in this section, you simply need to do the following:
 
@@ -80,12 +75,9 @@ To use other code examples in this section, you simply need to do the following:
 
 ## Define Guest Language Functions as Java Values
 
-Polyglot applications let you take values from one programming language and
-use them with other languages.
+Polyglot applications let you take values from one programming language and use them with other languages.
 
-Use the code example in this section with your polyglot application to show
-how the Polyglot API can return JavaScript, R, Ruby, or Python functions as
-Java values.
+Use the code example in this section with your polyglot application to show how the Polyglot API can return JavaScript, R, Ruby, or Python functions as Java values.
 
 {%
 include snippet-tabs
@@ -106,12 +98,10 @@ executed.
 
 ## Access Guest Languages Directly from Java
 
-Polyglot applications can readily access most language types and are not
-limited to functions. Host languages, such as Java, can directly access guest
-language values embedded in the polyglot application.
+Polyglot applications can readily access most language types and are not limited to functions.
+Host languages, such as Java, can directly access guest language values embedded in the polyglot application.
 
-Use the code example in this section with your polyglot application to show
-how the Polyglot API can access objects, numbers, strings, and arrays.
+Use the code example in this section with your polyglot application to show how the Polyglot API can access objects, numbers, strings, and arrays.
 
 {%
 include snippet-tabs
@@ -145,17 +135,13 @@ R where indices start with one.
 
 ## Access Java from Guest Languages
 
-Polyglot applications offer bi-directional access between guest languages and
-host languages. As a result, you can pass Java objects to guest languages.
+Polyglot applications offer bi-directional access between guest languages and host languages.
+As a result, you can pass Java objects to guest languages.
 
-Use the code example in this section with your polyglot application to show how
-guest languages can access primitive Java values, objects, arrays, and
-functional interfaces.
+Use the code example in this section with your polyglot application to show how guest languages can access primitive Java values, objects, arrays, and functional interfaces.
 
-To permit guest languages to access any public method or field of a Java
-object, set `allowAllAccess(true)` when the context is built. In this mode, the guest
-language code must be fully trusted, as it can access other not explicitly exported Java methods
-using reflection.
+To permit guest languages to access any public method or field of a Java object, set `allowAllAccess(true)` when the context is built.
+In this mode, the guest language code must be fully trusted, as it can access other not explicitly exported Java methods using reflection.
 
 {%
 include snippet-tabs
@@ -193,11 +179,9 @@ that the script returns a `boolean` value of `true` as a result.
 
 ## Lookup Java Types from Guest Languages
 
-In addition to passing Java objects to the guest language, it is possible
-to allow the lookup of Java types in the guest language.
+In addition to passing Java objects to the guest language, it is possible to allow the lookup of Java types in the guest language.
 
-Use the code example in this section with your polyglot application to show how
-guest languages lookup Java types and instantiate them.
+Use the code example in this section with your polyglot application to show how guest languages lookup Java types and instantiate them.
 
 {%
 include snippet-tabs
@@ -221,14 +205,11 @@ JavaScript using the `new` keyword.
 
 ## Computed Arrays Using Polyglot Proxies
 
-The Polyglot API includes polyglot proxy interfaces that let you
-customize Java interoperability by mimicking guest language types, such as
-objects, arrays, native objects, or primitives.
+The Polyglot API includes polyglot proxy interfaces that let you customize Java interoperability by mimicking guest language types, such as objects, arrays, native objects, or primitives.
 
-Use the code example in this section with your polyglot application to see how
-you can implement arrays that compute their values lazily.
+Use the code example in this section with your polyglot application to see how you can implement arrays that compute their values lazily.
 
-Note: The Polyglot API supports polyglot proxies either on the JVM or in Native Image.
+> Note: The Polyglot API supports polyglot proxies either on the JVM or in Native Image.
 
 {%
 include snippet-tabs
@@ -255,24 +236,20 @@ then returned. Note that array indices from 1-based languages such as R are
 converted to 0-based indices for proxy arrays.
 - The result of the language script is returned as a long value and verified.
 
-For more information about the polyglot proxy interfaces, see the
-[Polyglot API JavaDoc](http://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/package-summary.html).
+For more information about the polyglot proxy interfaces, see the [Polyglot API JavaDoc](http://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/package-summary.html).
 
 ## Host Access
 
 The Polyglot API by default restricts access to certain critical functionality, such as file I/O.
 These restrictions can be lifted entirely by setting `allowAllAccess` to `true`.
 
-Note: The access restrictions are currently only supported with JavaScript.
+> Note: The access restrictions are currently only supported with JavaScript.
 
 ### Controlling Access to Host Functions
 
 It might be desireable to limit the access of guest applications to the host.
-For example, if a Java method is exposed that calls `System.exit` then the guest
-application will be able to exit the host process.
-In order to avoid accidentally exposed methods, no host access is allowed by
-default and every public method or field needs to be annotated with
-`@HostAccess.Export` explicitly.
+For example, if a Java method is exposed that calls `System.exit` then the guest application will be able to exit the host process.
+In order to avoid accidentally exposed methods, no host access is allowed by default and every public method or field needs to be annotated with `@HostAccess.Export` explicitly.
 
 {%
 include snippet-tabs
@@ -394,7 +371,7 @@ The following access parameters may be configured:
 * Allow access to native APIs using [`allowNativeAccess`](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/Context.Builder.html#allowNativeAccess-boolean-).
 * Allow access to IO using [`allowIO`](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/Context.Builder.html#allowIO-boolean-) and proxy file accesses using [`fileSystem`](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/Context.Builder.html#fileSystem-org.graalvm.polyglot.io.FileSystem-).
 
-Note: Granting access to class loading, native APIs, or host I/O effectively grants all access, as these privileges can be used to bypass other access restrictions.
+> Note: Granting access to class loading, native APIs, or host I/O effectively grants all access, as these privileges can be used to bypass other access restrictions.
 
 ## Build Native Images from Polyglot Applications
 
@@ -493,7 +470,7 @@ Caching may be disabled explicitly by setting [cached(boolean cached)](https://
 
 Consider the following code snippet as an example:
 
-```
+```java
 public class Main {
     public static void main(String[] args) {
         try (Engine engine = Engine.create()) {
@@ -543,12 +520,12 @@ public class Main {
     public static void main(String[] args) {
         try (Context outer = Context.newBuilder()
                                    .allowAllAccess(true)
-                               .build()) {            
+                               .build()) {
             outer.eval("js", "inner = Java.type('org.graalvm.polyglot.Context').create()");
             outer.eval("js", "value = inner.eval('js', '({data:42})')");
             int result = outer.eval("js", "value.data").asInt();
             outer.eval("js", "inner.close()");
-            
+
             System.out.println("Valid " + (result == 42));
         }
     }
@@ -566,8 +543,7 @@ In this code:

 
 ## Build a Shell for Many Languages
 
-With just a few lines of code, the GraalVM Polyglot API lets you build
-applications that integrate with any guest language supported by GraalVM.
+With just a few lines of code, the GraalVM Polyglot API lets you build applications that integrate with any guest language supported by GraalVM.
 
 This shell implementation is agnostic to any particular guest language.
 
@@ -600,12 +576,11 @@ for (;;) {
 }
 ```
 
-
-
 ## Step Through with Execution Listeners
 
-The GraalVM Polyglot API allows users to instrument the execution of guest languages through [ExecutionListener class](http://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/management/ExecutionListener.html). For example, it lets you attach an execution listener that is invoked for every statement of the guest language program. Execution listeners
-are designed as simple API for polyglot embedders and may become handy in, e.g., single-stepping through the program.
+The GraalVM Polyglot API allows users to instrument the execution of guest languages through [ExecutionListener class](http://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/management/ExecutionListener.html).
+For example, it lets you attach an execution listener that is invoked for every statement of the guest language program.
+Execution listeners are designed as simple API for polyglot embedders and may become handy in, e.g., single-stepping through the program.
 
 ```java
 import org.graalvm.polyglot.*;
diff --git a/docs/reference-manual/embedding/sandbox-options.md b/docs/reference-manual/embedding/sandbox-options.md
index 116e08e0aef6..9e1b0712c2e1 100644
--- a/docs/reference-manual/embedding/sandbox-options.md
+++ b/docs/reference-manual/embedding/sandbox-options.md
@@ -1,14 +1,14 @@
 ## Enterprise Sandbox Resource Limits
 
-The 20.3 release of GraalVM introduced the experimental Sandbox Resource Limits feature that allows for the limiting of resources used by guest applications.
-These resource limits are not available in the community edition of GraalVM.
-The following document describes how to configure sandbox resource limits using options in the polyglot API
+GraalVM Enterprise provides the experimental Sandbox Resource Limits feature that allows for the limiting of resources used by guest applications.
+These resource limits are not available in the Community Edition of GraalVM.
+The following document describes how to configure sandbox resource limits using options in GraalVM Polyglot API.
 
-In general all resource limit options are prefixed with `sandbox` option group and they can be listed using the help of any language launcher provided in GraalVM e.g. `js --help:tools`.
+In general all resource limit options are prefixed with `sandbox` option group and they can be listed using the help of any language launcher provided in GraalVM, e.g., `js --help:tools`.
 Polyglot options can be provided through the language launcher, using the polyglot embedding API of the Graal SDK, or on the JVM using a system property.
 For better understanding of the examples it is recommended to read the [polyglot embedding guide](/reference-manual/embed-languages/) of the reference manual first.
 
-Currently all sandbox options are experimental therefore in these examples it is assumed that experimental options are enabled (e.g. with `--experimental-options`).
+Currently all sandbox options are experimental therefore in these examples it is assumed that experimental options are enabled (e.g., with `--experimental-options`).
 The options are a best effort approach to limiting resource usage of guest applications.
 
 The resource limits may be configured using the following options:
@@ -31,7 +31,8 @@ The resource limits may be configured using the following options:
 Different configurations may be provided for each polyglot embedding `Context` instance.
 In addition to that the limits may be reset at any point of time during the execution. Resetting is only aplicable to `sandbox.MaxStatements` and `sandbox.MaxCPUTime`.
 
-A guest language might choose to create an inner context within the outer execution context. The limits are applied to the outer context and all inner contexts it spawns. It is not possible to specify a separate limit for inner contexts and it is also not possible to escape any limit by creating an inner context.
+A guest language might choose to create an inner context within the outer execution context. The limits are applied to the outer context and all inner contexts it spawns.
+It is not possible to specify a separate limit for inner contexts and it is also not possible to escape any limit by creating an inner context.
 
 ## Limiting the active CPU time
 
@@ -60,7 +61,7 @@ It is not allowed specify negative values or no time unit with CPU time limit op
 
 ### Example Usage
 
-```
+```java
 try (Context context = Context.newBuilder("js")
                            .allowExperimentalOptions(true)
                            .option("sandbox.MaxCPUTime", "500ms")
@@ -84,9 +85,10 @@ try (Context context = Context.newBuilder("js")
 Specifies the maximum number of statements a context may execute until the the context will be cancelled.
 After the statement limit was triggered for a context, it is no longer usable and every use of the context will throw a `PolyglotException` that returns `true` for `PolyglotException.isCancelled()`.
 The statement limit is independent of the number of threads executing and is applied per context.
-It is also possible to specify this limit using the [ResourceLimits]() API of the polyglot embedding API.
+It is also possible to specify this limit using the `[ResourceLimits]()` API of the polyglot embedding API.
 
-By default there is no statement limit applied. The limit may be set to a negative number to disable it.
+By default there is no statement limit applied.
+The limit may be set to a negative number to disable it.
 Whether this limit is applied internal sources only can be configured using `sandbox.MaxStatementsIncludeInternal`.
 By default the limit does not include statements of sources that are marked internal.
 If a shared engine is used then the same internal configuration must be used for all contexts of an engine.
@@ -100,8 +102,7 @@ The complexity of a single statement may not be constant time depending on the g
 For example, statements that execute JavaScript builtins, like `Array.sort`, may account for a single statement, but its execution time is dependent on the size of the array.
 The statement count limit is therefore not suitable to perform time boxing and must be combined with other more reliable measures like the CPU time limit.
 
-
-```
+```java
 try (Context context = Context.newBuilder("js")
                            .allowExperimentalOptions(true)
                            .option("sandbox.MaxStatements", "2")
@@ -144,20 +145,21 @@ If used together with the AST depth limit it can be used to estimate total stack
 
 Limits the number of threads that can be used by a context at the same point in time.
 By default, an arbitary number of threads can be used.
-If a set limit is exceeded, entering the context fails with a PolyglotException and the polyglot context is canceled.
+If a set limit is exceeded, entering the context fails with a `PolyglotException` and the polyglot context is canceled.
 Resetting resource limits does not affect thread limits.
 
 ## Limiting the maximum heap memory
 
 The `sandbox.MaxHeapMemory` option allows you to specify the maximum heap memory the application is allowed to retain during its run.
-`sandbox.MaxHeapMemory` must be positive. This option is only supported on a HotSpot-based VM. Enabling this option in AOT mode will result in PolyglotException.
+`sandbox.MaxHeapMemory` must be positive. This option is only supported on a HotSpot-based VM.
+Enabling this option in AOT mode will result in PolyglotException.
 When exceeding of the limit is detected, the corresponding context is automatically cancelled and then closed.
 
 The efficacy of this option (also) depends on the garbage collector used.
 
 #### Example Usage
 
-```
+```java
 try (Context context = Context.newBuilder("js")
                            .allowExperimentalOptions(true)
                            .option("sandbox.MaxHeapMemory", "100MB")
@@ -177,43 +179,53 @@ try (Context context = Context.newBuilder("js")
 
 #### Implementation details and expert options
 
-The limit is checked by retained size computation triggered either based on [allocated](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/ThreadMXBean.html#getThreadAllocatedBytes\(long\)) bytes or on
-[low memory notification](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryMXBean.html).
+The limit is checked by retained size computation triggered either based on [allocated](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/ThreadMXBean.html#getThreadAllocatedBytes\(long\)) bytes or on [low memory notification](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryMXBean.html).
 
-The allocated bytes are checked by a separate high-priority thread that will be woken regularly. There is one such thread for each memory-limited context (one with `sandbox.MaxHeapMemory` set).
-The retained bytes computation is done by yet another high-priority thread that is started from the allocated bytes checking thread as needed. The retained bytes computation thread also cancels the context if the heap memory limit is exeeded. Additionaly, when low memory trigger is invoked,
-all contexts on engines with at least one memory-limited context are paused together with their allocation checkers. All individual retained size computations are cancelled.
-Retained bytes in the heap for each memory-limited context are computed by a single high-priority thread. Contexts exceeding their limits are cancelled, and then the execution is resumed.
+The allocated bytes are checked by a separate high-priority thread that will be woken regularly.
+There is one such thread for each memory-limited context (one with `sandbox.MaxHeapMemory` set).
+The retained bytes computation is done by yet another high-priority thread that is started from the allocated bytes checking thread as needed.
+The retained bytes computation thread also cancels the context if the heap memory limit is exeeded.
+Additionaly, when low memory trigger is invoked, all contexts on engines with at least one memory-limited context are paused together with their allocation checkers.
+All individual retained size computations are cancelled.
+Retained bytes in the heap for each memory-limited context are computed by a single high-priority thread.
+Contexts exceeding their limits are cancelled, and then the execution is resumed.
 
 The main goal of the heap memory limits is to prevent heap memory depletion related errors in most cases and thus enable the host VM to run smoothly even in the presence of misbehaving contexts.
-The implementation is best effort. This means that there is no guarantee on the accuracy of the heap memory limit. There is also no guarantee that setting a heap memory limit will prevent the context from causing `OutOfMemory` errors.
+The implementation is best effort. This means that there is no guarantee on the accuracy of the heap memory limit.
+There is also no guarantee that setting a heap memory limit will prevent the context from causing `OutOfMemory` errors.
 Guest applications that allocate many objects in quick succession have a lower accuracy than applications which allocate objects rarely.
-The guest code execution will only be paused if the host heap memory is exhausted and a low memory trigger of the host VM is invoked. Note that the scope of the pause is an engine, so a context without the `sandbox.MaxHeapMemory` option set is also paused in case it shares the engine with other context that is memory-limited.
+The guest code execution will only be paused if the host heap memory is exhausted and a low memory trigger of the host VM is invoked.
+Note that the scope of the pause is an engine, so a context without the `sandbox.MaxHeapMemory` option set is also paused in case it shares the engine with other context that is memory-limited.
 Also note that if one context is cancelled other contexts with the same explicit engine may be slowed down. How the size retained by a context is computed can be
 customized using the expert options `sandbox.AllocatedBytesCheckInterval`, `sandbox.AllocatedBytesCheckEnabled`, `sandbox.AllocatedBytesCheckFactor`, `sandbox.RetainedBytesCheckInterval`, `sandbox.RetainedBytesCheckFactor`, and `sandbox.UseLowMemoryTrigger` described below.
 
-Retained size computation for a context is triggered when a retained bytes estimate exceeds a certain factor of specified `sandbox.MaxHeapMemory`. The estimate is based on heap memory
+Retained size computation for a context is triggered when a retained bytes estimate exceeds a certain factor of specified `sandbox.MaxHeapMemory`.
+The estimate is based on heap memory
 [allocated](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.management/com/sun/management/ThreadMXBean.html#getThreadAllocatedBytes\(long\)) by threads where the context has been active.
 More precisely, the estimate is the result of previous retained bytes computation, if available, plus bytes allocated since the start of the previous computation.
-By default the factor of `sandbox.MaxHeapMemory` is 1.0 and it can be customized by the `sandbox.AllocatedBytesCheckFactor` option. The factor must be positive.
-For example, let `sandbox.MaxHeapMemory` be 100MB and `sandbox.AllocatedBytesCheckFactor` be 0.5. The retained size computation is first triggered when allocated bytes reach 50MB.
+By default the factor of `sandbox.MaxHeapMemory` is 1.0 and it can be customized by the `sandbox.AllocatedBytesCheckFactor` option.
+The factor must be positive.
+For example, let `sandbox.MaxHeapMemory` be 100MB and `sandbox.AllocatedBytesCheckFactor` be 0.5.
+The retained size computation is first triggered when allocated bytes reach 50MB.
 Let the computed retained size be 25MB, then the next retained size computation is triggered when additional 25MB is allocated, etc.
 
-By default, allocated bytes are checked every 10 milliseconds. This can be configured by `sandbox.AllocatedBytesCheckInterval`. The smallest possible interval is 1ms. Any smaller value is interpreted as 1ms.
+By default, allocated bytes are checked every 10 milliseconds. This can be configured by `sandbox.AllocatedBytesCheckInterval`.
+The smallest possible interval is 1ms. Any smaller value is interpreted as 1ms.
 
 The beginnings of two retained size computations of the same context must be by default at least 10 milliseconds apart.
 This can be configured by the `sandbox.RetainedBytesCheckInterval` option. The interval must be positive.
 
-The allocated bytes checking for a context can be disabled by the `sandbox.AllocatedBytesCheckEnabled` option. By default it is enabled ("true"). If disabled ("false"),
-retained size checking for the context can be triggered only by the low memory trigger.
+The allocated bytes checking for a context can be disabled by the `sandbox.AllocatedBytesCheckEnabled` option.
+By default it is enabled ("true"). If disabled ("false"), retained size checking for the context can be triggered only by the low memory trigger.
 
 When the total number of bytes allocated in the heap for the whole host VM exceeds a certain factor of the total heap memory of the VM, [low memory notification](https://docs.oracle.com/en/java/javase/11/docs/api/java.management/java/lang/management/MemoryMXBean.html) is invoked and initiates the following process.
-The execution for all engines with at least one execution context which has the `sandbox.MaxHeapMemory` option set is paused,
-retained bytes in the heap for each memory-limited context are computed, contexts exceeding their limits are cancelled, and then the execution is resumed.
-The default factor is 0.7. This can be configuted by the `sandbox.RetainedBytesCheckFactor` option. The factor must be between 0.0 and 1.0. All contexts using the `sandbox.MaxHeapMemory` option must use the same value for `sandbox.RetainedBytesCheckFactor`.
+The execution for all engines with at least one execution context which has the `sandbox.MaxHeapMemory` option set is paused, retained bytes in the heap for each memory-limited context are computed, contexts exceeding their limits are cancelled, and then the execution is resumed.
+The default factor is 0.7. This can be configuted by the `sandbox.RetainedBytesCheckFactor` option.
+The factor must be between 0.0 and 1.0. All contexts using the `sandbox.MaxHeapMemory` option must use the same value for `sandbox.RetainedBytesCheckFactor`.
 
-The described low memory trigger can be disabled by the `sandbox.UseLowMemoryTrigger` option. By default it is enabled ("true"). If disabled ("false"),
-retained size checking for the execution context can be triggered only by the allocated bytes checker. All contexts using the `sandbox.MaxHeapMemory` option must use the same value for `sandbox.UseLowMemoryTrigger`.
+The described low memory trigger can be disabled by the `sandbox.UseLowMemoryTrigger` option.
+By default it is enabled ("true"). If disabled ("false"), retained size checking for the execution context can be triggered only by the allocated bytes checker.
+All contexts using the `sandbox.MaxHeapMemory` option must use the same value for `sandbox.UseLowMemoryTrigger`.
 
 If exceeding of the heap memory limit is detected then the polyglot context is cancelled and the execution stops by throwing a [`PolyglotException`](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/PolyglotException.html) which returns `true` for `isResourceExhausted()`.
 As soon as the memory limit is triggered, no further application code can be executed with this context.
@@ -234,7 +246,7 @@ This can be useful if a known and trusted initialization script should be exclud
 
 ### Example Usage
 
-```
+```java
 try (Context context = Context.newBuilder("js")
                            .allowExperimentalOptions(true)
                            .option("sandbox.MaxCPUTime", "500ms")
diff --git a/docs/reference-manual/graalvm-updater.md b/docs/reference-manual/graalvm-updater.md
index abf06080ab1a..c005f0711b05 100644
--- a/docs/reference-manual/graalvm-updater.md
+++ b/docs/reference-manual/graalvm-updater.md
@@ -7,15 +7,6 @@ permalink: /reference-manual/graalvm-updater/
 
 # GraalVM Updater
 
-GraalVM Updater, `gu`, is a command-line utility to install and manage optional GraalVM language runtimes and utilities.
-Each of these language runtimes and utilities must be downloaded and installed separately.
-To assist you with the installation, these are pre-packaged as JAR files and referenced in the documentation as "components".
-As of version 21.0.0, GraalVM Updater has become more efficient, and can be used to update your local GraalVM installation to a newer version or upgrade from a Community to Enterprise Edition.
-Read more in [Upgrade GraalVM](#upgrade-graalvm).
-
-GraalVM Updater is included in the base GraalVM distribution and can be used with the `<graalvm>/bin/gu` launcher.
-The source code of GraalVM Updater is located in the `<graalvm>/lib/installer` folder.
-
 * [Component Installation](#component-installation)
 * [Component Uninstallation](#component-uninstallation)
 * [Upgrade GraalVM](#upgrade-graalvm)
@@ -25,6 +16,15 @@ The source code of GraalVM Updater is located in the `<graalvm>/lib/installer` f
 * [Configure Proxies](#configure-proxies)
 * [Replace Components and Files](#replace-components-and-files)
 
+GraalVM Updater, `gu`, is a command-line utility to install and manage optional GraalVM language runtimes and utilities.
+Each of these language runtimes and utilities must be downloaded and installed separately.
+To assist you with the installation, they are pre-packaged as JAR files and referenced in the documentation as "components".
+GraalVM Updater can be also used to update your local GraalVM installation to a newer version or upgrade from a Community to Enterprise Edition.
+Read more in [Upgrade GraalVM](#upgrade-graalvm).
+
+GraalVM Updater is included in the base GraalVM distribution and can be used with the `<graalvm>/bin/gu` launcher.
+The source code of GraalVM Updater is located in the `<graalvm>/lib/installer` folder.
+
 ## Component Installation
 
 The following GraalVM language runtimes and utilities are available for installation.
@@ -36,10 +36,10 @@ Tools/Utilities:
 * [Java on Truffle](/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-* [Python](/python/README.md) -- Python 3.8.5-compatible
-* [Ruby](/ruby/README.md) -- Ruby 2.7.3-compatible
-* [R](/r/README.md) -- GNU R 4.0.3-compatible
+* [Node.js](/reference-manual/js/) -- Node.js 14.17.6 compatible
+* [Python](/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](/ruby/README.md) -- Ruby 2.7.4 compatible
+* [R](/r/README.md) -- GNU R 4.0.3 compatible
 * [Wasm](/wasm/README.md) -- WebAssembly (Wasm)
 
 GraalVM Updater verifies whether or not the version of a component is appropriate for the current GraalVM installation.
@@ -63,21 +63,15 @@ gu available
 ```shell
 gu install ruby
 ```
-GraalVM Updater first downloads the list of components, then uses the
-information in the list to download the actual component package, then installs
-it. To see more verbose output during the installation, like the download
-progress bar, print versions, and dependency information, use the `-v`
-(`--verbose`) switch.
-
-If a component being installed depends on another component, GraalVM Updater will
-search the catalog to find an appropriate dependency and install it as well. If
-the required components cannot be found, installation will fail.
-
-When using custom catalog URLs, it is possible, for a convenience, to set
-the environment variable `GRAALVM_CATALOG` pointing to the custom catalog's URL.
-GraalVM Updater will use the URL defined by `GRAALVM_CATALOG` in preference to
-the builtin ones. You may setup the environment variable in startup or profile
-scripts.
+GraalVM Updater first downloads the list of components, then uses the information in the list to download the actual component package, then installs it.
+To see more verbose output during the installation, like the download progress bar, print versions, and dependency information, use the `-v` (`--verbose`) switch.
+
+If a component being installed depends on another component, GraalVM Updater will search the catalog to find an appropriate dependency and install it as well.
+If the required components cannot be found, installation will fail.
+
+When using custom catalog URLs, it is possible, for a convenience, to set the environment variable `GRAALVM_CATALOG` pointing to the custom catalog's URL.
+GraalVM Updater will use the URL defined by `GRAALVM_CATALOG` in preference to the builtin ones.
+You may setup the environment variable in startup or profile scripts.
 
 Note: If you need, for some reason to set the `GRAALVM_HOME` environment variable, it may affect `gu` operation.
 If it is set, it should point to the intended GraalVM installation, same as `JAVA_HOME` and `PATH`.
@@ -92,7 +86,7 @@ gu -L install component.jar
 ```
 For example, to install Native Image for Java 11 GraalVM Enterprise distribution on macOS, run:
 ```shell
-gu -L install native-image-installable-svm-java11-darwin-amd64-<version>.jar
+gu -L install native-image-installable-svm-svmee-java11-darwin-amd64-<version>.jar
 ```
 
 The `-L` option, equivalent to `--local-file` or `--file`, installs a component from a downloaded JAR.
@@ -112,12 +106,11 @@ GraalVM Updater can then use that folder instead of the catalog:
 gu install -C /path/to/downloads/directory ComponentId
 ```
 
-Specify the directory to use for the components collection. It is possible to type
-a component's name (like `ruby`) instead of a filename. GraalVM Updater will also
-attempt to find required dependencies in the local component collection.
+Specify the directory to use for the components collection.
+It is possible to type a component's name (like `ruby`) instead of a filename.
+GraalVM Updater will also attempt to find required dependencies in the local component collection.
 
-When installing components from a given directory, you can allow installing all
-components which have the correct version number for GraalVM using wildcards:
+When installing components from a given directory, you can allow installing all components which have the correct version number for GraalVM using wildcards:
 ```shell
 ./gu install -C ~/Download/Components/ native*
 ```
@@ -243,9 +236,8 @@ GraalVM Updater common options:
 * `-v, --verbose`: enable verbose output. Print versions and dependency information
 * `--version`: print version
 
-Oracle GraalVM Enterprise Edition users might need to pass an
-additional verification step to login to the Oracle components repository. GraalVM
-Updater tool provides options for that:
+Oracle GraalVM Enterprise Edition users might need to pass an additional verification step to login to the Oracle components repository.
+GraalVM Updater tool provides options for that:
 * `--public-key / -k <path>`: set the path to a custom GPG public key path
 *	`--username/-U`: enter a username
 
@@ -260,34 +252,24 @@ Runtime options:
 
 ## Configure Proxies
 
-If GraalVM Updater needs to reach the component catalog, or download a component
-package, it may need to pass through the HTTP/HTTPS proxy, if the network uses one. On
-_macOS_, the proxy settings are automatically obtained from the OS. On _Linux_,
-ensure that the `http_proxy` and `https_proxy` environment variables are set
-appropriately before launching the `gu` tool. Refer to the distribution
-and/or desktop environment documentation for the details.
+If GraalVM Updater needs to reach the component catalog, or download a component package, it may need to pass through the HTTP/HTTPS proxy, if the network uses one.
+On _macOS_, the proxy settings are automatically obtained from the OS.
+On _Linux_, ensure that the `http_proxy` and `https_proxy` environment variables are set appropriately before launching the `gu` tool.
+Refer to the distribution and/or desktop environment documentation for the details.
 
-GraalVM Updater intentionally does not support an option to disable certificate
-or hostname verification, for security reasons. A user may try to add a proxy's
-certificate to the GraalVM default security trust store. A user can also
-download a component manually to a folder, and then use `gu -L install /path/to/file` or `gu -C /path/to/download/dir install component` to install from a local filesystem.
+GraalVM Updater intentionally does not support an option to disable certificate or hostname verification, for security reasons.
+A user may try to add a proxy's certificate to the GraalVM default security trust store.
+A user can also download a component manually to a folder, and then use `gu -L install /path/to/file` or `gu -C /path/to/download/dir install component` to install from a local filesystem.
 
 ### Working without Internet Access
 
-If your machine cannot access and download the catalog and components from
-the Internet, either because it is behind a proxy, or for security reasons,
-GraalVM Updater can install components from a local directory, or a directory on
-a network share accessible on the target machine.
+If your machine cannot access and download the catalog and components from the Internet, either because it is behind a proxy, or for security reasons, GraalVM Updater can install components from a local directory, or a directory on a network share accessible on the target machine.
 
-You need to prepare a directory, download all components that you want to install
-and their dependencies (in case they require other GraalVM components to work) into
-that directory.
+You need to prepare a directory, download all components that you want to install and their dependencies (in case they require other GraalVM components to work) into that directory.
 
-Then you can use `gu -L install /path/to/file` (where the `-L` option instructs to use local files,
-equivalent to `--local-file` or `--file`). Adding the `-D` option will instruct GraalVM Updater
-to look for potential dependencies in the directory next to the
-installable file. Additionally, `gu -C /path/to/download/dir install component` can be used, with the specified
-directory contents acting as a catalog of components.
+Then you can use `gu -L install /path/to/file` (where the `-L` option instructs to use local files, equivalent to `--local-file` or `--file`).
+Adding the `-D` option will instruct GraalVM Updater to look for potential dependencies in the directory next to the installable file.
+Additionally, `gu -C /path/to/download/dir install component` can be used, with the specified directory contents acting as a catalog of components.
 
 Note that with `gu -L` you need to specify the component's file name, while when using `gu -C <dir>`, the component name must be used:
 ```shell
@@ -300,13 +282,10 @@ gu -C /tmp/instalables install ruby
 
 ## Replace Components and Files
 
-A component may be only installed once. GraalVM Updater refuses to install a
-component if a component with the same ID is already installed. However, the
-installed component can be replaced. GraalVM Updater first uninstalls the
-component and then installs a new package.
+A component may be only installed once. GraalVM Updater refuses to install a component if a component with the same ID is already installed.
+However, the installed component can be replaced. GraalVM Updater first uninstalls the component and then installs a new package.
 
-To replace a component, use the `-r`
-option, and the `-L` (`--local-file` or `--file`) option to treat parameters as local filename of a packaged component:
+To replace a component, use the `-r` option, and the `-L` (`--local-file` or `--file`) option to treat parameters as local filename of a packaged component:
 ```shell
 gu install -L -r component.jar
 gu install -r ruby
@@ -314,18 +293,16 @@ gu install -r ruby
 
 The process is the same as if `gu remove` is run first and `gu install` next.
 
-GraalVM Updater also refuses to overwrite existing files if the
-to-be-installed and existing versions differ. There are cases when refreshing
-file contents may be needed, such as if they were modified or damaged. In this case, use the `-o` option:
+GraalVM Updater also refuses to overwrite existing files if the to-be-installed and existing versions differ.
+There are cases when refreshing file contents may be needed, such as if they were modified or damaged.
+In this case, use the `-o` option:
 ```shell
 gu install -L -o component.jar
 gu install -o ruby
 ```
 
-GraalVM Updater will then instruct the user to replace the contained files of a
-component. By default, it will not alter anything. Alternatively, use the `-f`
-(`--force`) option, which disables most of the checks, and allows the user to
-install non-matching versions.
+GraalVM Updater will then instruct the user to replace the contained files of a component.
+By default, it will not alter anything. Alternatively, use the `-f` (`--force`) option, which disables most of the checks, and allows the user to install non-matching versions.
 
 ### Troubleshooting
 
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index fb8074f062cc..cf52b542691c 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -22,12 +22,10 @@ When writing a language interpreter with Truffle, it will automatically use the
 By having access to this framework, a Ruby application, for example, can run on the same JVM as a Java application.
 Also, a host JVM-based language and a guest language can directly interoperate with each other and pass data back and forth in the same memory space.
 
-In order to provide foreign polyglot values in the languages implemented with Truffle, the so-called _polyglot interoperability protocol_ has been developed. This
-interoperability protocol consists of a set of standardized messages that every
-language implements and uses for foreign polyglot values. The protocol allows
-GraalVM to support interoperability between any combination of languages without
-requiring them to know of each other. For more details, proceed to the
-[High-Performance Cross-Language Interoperability in a Multi-Language Runtime](http://dx.doi.org/10.1145/2816707.2816714) paper.
+In order to provide foreign polyglot values in the languages implemented with Truffle, the so-called _polyglot interoperability protocol_ has been developed.
+This interoperability protocol consists of a set of standardized messages that every language implements and uses for foreign polyglot values.
+The protocol allows GraalVM to support interoperability between any combination of languages without requiring them to know of each other.
+For more details, proceed to the [High-Performance Cross-Language Interoperability in a Multi-Language Runtime](http://dx.doi.org/10.1145/2816707.2816714) paper.
 
 Throughout this section you learn how to combine multiple languages using GraalVM Polyglot APIs.
 
@@ -44,12 +42,10 @@ The below examples work:
   It might be required to [rebuild images](/reference-manual/graalvm-updater/#rebuild-images) to access languages installed with `gu`.
 * with native executables (e.g., `native-image --language:js`).
 
-For native launchers and native executables using Java as a Target Language
-and accessing classes other than Java arrays, it is required to recompile the image and provide
+For native launchers and native executables using Java as a Target Language and accessing classes other than Java arrays, it is required to recompile the image and provide
 a [reflection configuration file](/reference-manual/native-image/Reflection/).
 
-Note: To start an application with LLVM as a Target Language, make sure
-to precompile the _polyglot.c_ file provided below.
+Note: To start an application with LLVM as a Target Language, make sure to precompile the _polyglot.c_ file provided below.
 
 ### Start from JavaScript / Node.js
 
@@ -134,7 +130,6 @@ graalpython --polyglot --jvm polyglot.py
 42
 ```
 
-
 ### Start Language Java
 
 Create the file `Polyglot.java`:
@@ -169,9 +164,8 @@ tab4type="c" tab4id="c_to_python" tab4name="Python" tab4path="polyglot_ref/c_to_
 tab5type="c" tab5id="c_to_java" tab5name="Java" tab5path="polyglot_ref/c_to_java.c"
 %}
 
-The example C code has to be compiled to LLVM bitcode using the LLVM frontend
-such as `clang`. A user can use `clang` shipped with GraalVM by installing a
-pre-built LLVM toolchain support:
+The example C code has to be compiled to LLVM bitcode using the LLVM frontend such as `clang`.
+A user can use `clang` shipped with GraalVM by installing a pre-built LLVM toolchain support:
 
 ```shell
 gu install llvm-toolchain
@@ -187,12 +181,10 @@ lli --polyglot polyglot
 
 ## Polyglot Launcher
 
-With polyglot applications it is often impossible to decide what the primary
-language of an application is. Therefore, an experimental new
-launcher, called `polyglot`, has been added to GraalVM. For the moment, this launcher runs code
-for JavaScript, Ruby, and R without requiring the selection of a primary
-language. The polyglot launcher does not require the `--polyglot` option; it is
-enabled by default.
+With polyglot applications it is often impossible to decide what the primary language of an application is.
+Therefore, an experimental new launcher, called `polyglot`, has been added to GraalVM.
+For the moment, this launcher runs code for JavaScript, Ruby, and R without requiring the selection of a primary language.
+The polyglot launcher does not require the `--polyglot` option; it is enabled by default.
 
 This is how you can run a polyglot application by using the examples from above:
 
@@ -210,20 +202,20 @@ polyglot --jvm --shell
 
 If you have installed all optional languages packs to the core GraalVM installation, then the Polyglot Shell will look like:
 ```shell
-GraalVM MultiLanguage Shell 21.2.0
+GraalVM MultiLanguage Shell 21.3.0
 Copyright (c) 2013-2021, Oracle and/or its affiliates
 Java version 1.8|11
-JavaScript version  21.2.0
+JavaScript version  21.3.0
 Python version 3.8.5
 R version 4.0.3
-Ruby version 2.7.3
+Ruby version 2.7.4
 Usage:
-  Use Ctrl+n to switch language and Ctrl+d to exit.
+  Use Ctrl+n to switch language and  Ctrl+d to exit.
   Enter -usage to get a list of available commands.
 js>
 ```
 
-Note: The `polyglot` launcher and the _Polyglot Shell_ are experimental features in GraalVM.
+> Note: The `polyglot` launcher and the _Polyglot Shell_ are experimental features in GraalVM.
 
 ## Polyglot Options
 
@@ -243,8 +235,7 @@ You can configure a language engine for better throughput or startup.
 ## Passing Options for Language Launchers
 
 Every language launcher has been extended with a set of so called _polyglot options_.
-Polyglot options allow users of any language launcher to access the
-options of other languages supported by GraalVM (implemented with the Truffle language implementation framework).
+Polyglot options allow users of any language launcher to access theoptions of other languages supported by GraalVM (implemented with the Truffle language implementation framework).
 The format is: `--<languageID>.<property>=<value>`.
 For example, the `R` launcher also supports the `--js.atomics=true` JavaScript option.
 
@@ -294,8 +285,7 @@ javac OptionsTest.java
 java OptionsTest
 ```
 
-Note: Tools options can be passed in the same way.
-Options cannot be modified after the context was created.
+> Note: Tools options can be passed in the same way. Options cannot be modified after the context was created.
 
 ## Passing Options Using JVM Arguments
 
@@ -327,4 +317,4 @@ javac SystemPropertiesTest.java
 java -Dpolyglot.js.strict=true SystemPropertiesTest
 ```
 
-Note: System properties are read once when the polyglot context is created. Subsequent changes have no effect.
+> Note: System properties are read once when the polyglot context is created. Subsequent changes have no effect.
diff --git a/docs/security/security-guide.md b/docs/security/security-guide.md
index a1b65bd0b2c0..3d4f12fe4593 100644
--- a/docs/security/security-guide.md
+++ b/docs/security/security-guide.md
@@ -109,14 +109,9 @@ This can either result in sensitive data ending up in the snapshot or fixing ini
 
 Developers can request static initializers that process sensitive information to be instead executed at runtime by either specifying the `--initialize-at-run-time` CLI parameter when building a native image, or making use of the `RuntimeClassInitialization` API.
 
-Native-image provides multiple ways to specify the certificate file used to
-define the default TrustStore. While the default behavior for native-image is
-to capture and use the default TrustStore from the buildtime host environment,
-this can be changed at runtime by setting the "javax.net.ssl.trustStore\*"
-system properties. Please see the
-[documentation](/reference-manual/native-image/CertificateManagement/) for more
-details.
-
+Native-image provides multiple ways to specify the certificate file used to define the default TrustStore.
+While the default behavior for native-image is to capture and use the default TrustStore from the buildtime host environment, this can be changed at runtime by setting the "javax.net.ssl.trustStore\*" system properties.
+Please see the [documentation](/reference-manual/native-image/CertificateManagement/) for more details.
 
 In addition, developers can run the native image builder in a dedicated environment, such as a container, that does not contain any sensitive information in the first place.
 
diff --git a/docs/tools/chrome-debugger.md b/docs/tools/chrome-debugger.md
index 5d87871181d2..7cfa1048d521 100644
--- a/docs/tools/chrome-debugger.md
+++ b/docs/tools/chrome-debugger.md
@@ -26,11 +26,10 @@ console.log("Server running at http://localhost:8000/");
 
 1. Save this program as `HelloWorld.js` and then run:
 ```shell
-node --inspect --jvm HelloWorld.js
-Debugger listening on port 9229.
-To start debugging, open the following URL in Chrome:
-    devtools://devtools/bundled/js_app.html?ws=127.0.1.1:9229/76fcb6dd-35267eb09c3
-Server running at http://localhost:8000/
+$JAVA_HOME/bin/node --inspect --jvm HelloWorld.js
+Debugger listening on ws://127.0.0.1:9229/SBqxI5YIqtREaDrXkFr8hLE0HL1AfKx8TjkI8qPMq2s
+For help, see: https://www.graalvm.org/tools/chrome-debugger
+E.g. in Chrome open: devtools://devtools/bundled/js_app.html?ws=127.0.0.1:9229/SBqxI5YIqtREaDrXkFr8hLE0HL1AfKx8TjkI8qPMq2s
 ```
 
 2. Navigate to `http://localhost:8000/` in your browser to launch the node application.
diff --git a/docs/tools/code-coverage.md b/docs/tools/code-coverage.md
index 5367925cbe33..a4935a6d73be 100644
--- a/docs/tools/code-coverage.md
+++ b/docs/tools/code-coverage.md
@@ -7,17 +7,10 @@ permalink: /tools/code-coverage/
 
 # Code Coverage Command Line Tool
 
-As of version 19.3.0, GraalVM provides a **code coverage command line tool**
-that lets users record and analyze the source code coverage of a particular execution
-of code.
+GraalVM provides a **code coverage command line tool** that lets users record and analyze the source code coverage of a particular execution of code.
 
-Code coverage, as a percentage of source code lines, functions, or statements
-covered, is an important metric for understanding a particular source code
-execution, and is commonly associated with test quality (test coverage).
-Providing a visual coverage overview for individual lines of code shows the
-developer which code paths are covered and which are not, giving insight into
-the character of the execution which can, for example, inform further testing
-efforts.
+Code coverage, as a percentage of source code lines, functions, or statements covered, is an important metric for understanding a particular source code execution, and is commonly associated with test quality (test coverage).
+Providing a visual coverage overview for individual lines of code shows the developer which code paths are covered and which are not, giving insight into the character of the execution which can, for example, inform further testing efforts.
 
 The example application below will be used to demonstrate GraalVM's code
 coverage capabilities. This application defines a
@@ -96,11 +89,10 @@ Shows what percent of each element was covered during execution
  /path/to/primes.js |      20.69% |   26.67% |   22.22%
 --------------------------------------------------------
 ```
-The tracer prints a coverage histogram for each source file. You can see that
-statement coverage is roughly 20%, line coverage is roughly 26%, and root coverage (the
-term "root" covers functions, methods, etc.) is 22.22%. This tells your that our
-simple tests are not particularly good at exercising the source code. Next you
-will figure out which parts of the code are not covered.
+The tracer prints a coverage histogram for each source file.
+You can see that statement coverage is roughly 20%, line coverage is roughly 26%, and root coverage (the term "root" covers functions, methods, etc.) is 22.22%.
+This tells your that our simple tests are not particularly good at exercising the source code.
+Next you will figure out which parts of the code are not covered.
 
 4. Run `js primes.js --coverage --coverage.Output=detailed`. Prepare for a somewhat verbose output.
 Specifying the output as `detailed` will print all the source code lines with a
@@ -175,21 +167,16 @@ p     if (n > cache.length) { return calculatePrime(n); }
 --------------------------------------------------------
 ```
 
-As the legend at the beginning of the output explains, lines that are covered by
-the execution are preceded with a `+`. Lines not covered by the execution are
-preceded with a `-`. Lines that are covered partially are preceded with `p` (e.g., when an `if`
-statement is covered but only one branch is taken, consider the other bench
-to be incidentally covered).
+As the legend at the beginning of the output explains, lines that are covered by the execution are preceded with a `+`.
+Lines not covered by the execution are preceded with a `-`.
+Lines that are covered partially are preceded with `p` (e.g., when an `if` statement is covered but only one branch is taken, consider the other bench to be incidentally covered).
 
-Looking at the output you can see that the `calculatePrime` function and all its
-calls are never executed. Looking again at the assertions and the `getPrime`
-function, it becomes clear that our tests always hit the cache. Thus most of the
-code is never executed. You can improve on that.
+Looking at the output you can see that the `calculatePrime` function and all its calls are never executed. Looking again at the assertions and the `getPrime`
+function, it becomes clear that our tests always hit the cache.
+Thus most of the code is never executed. You can improve on that.
 
-5. Add `console.assert(getPrime(30) == 113);` to the end of the `primes.js` file
-and run `js primes.js --coverage`. Since the new assertion added calls
-`getPrime` with 30 (our cache only has 20 entries) the coverage will look like
-this:
+5. Add `console.assert(getPrime(30) == 113);` to the end of the `primes.js` file and run `js primes.js --coverage`. Since the new assertion added calls
+`getPrime` with 30 (our cache only has 20 entries) the coverage will look like this:
 
 ```shell
 js primes.js --coverage
@@ -205,11 +192,9 @@ Code coverage histogram.
 
 ## Integrating with Other Tools
 
-The code coverage tool provides ways to integrate with other tools. Running
-with `--coverage.Output=lcov` produces output in the commonly used
-[lcov](https://linux.die.net/man/1/lcov) format which is used by multiple tools
-(e.g., `genhtml`) to display coverage data. Take a look at the next example that
-shows how to visualise coverage of a Node.js app with Visual Studio Code.
+The code coverage tool provides ways to integrate with other tools.
+Running with `--coverage.Output=lcov` produces output in the commonly used [lcov](https://linux.die.net/man/1/lcov) format which is used by multiple tools (e.g., `genhtml`) to display coverage data.
+Take a look at the next example that shows how to visualise coverage of a Node.js app with Visual Studio Code.
 
 1. Copy the following code into a new file named `nodeapp.js`:
 
@@ -232,29 +217,27 @@ app.get('/shutdown', (req, res) => {
 app.listen(port, () => console.log(`Example app listening on port ${port}!`))
 ```
 
-2. Install the express module dependency: `npm install express`.
+2. Install the express module dependency:
+```shell
+$JAVA_HOME/bin/npm install express
+```
 
 3. Launch Visual Studio Code and install a code coverage plugin that supports _lcov_.
 The [Code Coverage Highlighter](https://marketplace.visualstudio.com/items?itemName=brainfit.vscode-coverage-highlighter) is used for this example, but other plugins should work similarly.
 
 4. Run the _nodeapp.js_ file with coverage enabled and configured:
 ```shell
-node --coverage --coverage.Output=lcov \
+$JAVA_HOME/bin/node --coverage --coverage.Output=lcov \
 --coverage.OutputFile=coverage/lcov.info \
 nodeapp.js
 ```
 
-Note that the Code Coverage Highlighter plugin looks for the `lcov.info` file in
-the `coverage` directory by default, so direct the output of the code
-coverage tool there.
+Note that the Code Coverage Highlighter plugin looks for the `lcov.info` file in the `coverage` directory by default, so direct the output of the code coverage tool there.
 
 5. Visit [localhost:3000/](http://localhost:3000/) in your browser, then visit [localhost:3000/shutdown](http://localhost:3000/shutdown) to close the app.
 
-6. Open Visual Studio Code, then open the folder containing the `nodeapp.js` file
-and `coverage` directory and you should be greeted with an image similar to the following:
+6. Open Visual Studio Code, then open the folder containing the `nodeapp.js` file and `coverage` directory and you should be greeted with an image similar to the following:
 
 ![](img/vscode-coverage.png)
 
-If you wish to integrate the data gathered by the GraalVM code coverage tool
-with your own visualisation, the `--coverage.Output=json` option results in
-the output being a JSON file with the raw data gathered by the tracker.
+If you wish to integrate the data gathered by the GraalVM code coverage tool with your own visualisation, the `--coverage.Output=json` option results in the output being a JSON file with the raw data gathered by the tracker.
diff --git a/docs/tools/dap.md b/docs/tools/dap.md
index c890f7b60aea..838e7a37a080 100644
--- a/docs/tools/dap.md
+++ b/docs/tools/dap.md
@@ -7,7 +7,7 @@ permalink: /tools/dap/
 
 # Debug Adapter Protocol
 
-GraalVM supports debugging of guest language applications, written in any of the supported languages, i.e., JavaScript/TypeScript, Python R, Ruby, and provides a built-in implementation of the [Debug Adapter Protocol (DAP)](https://microsoft.github.io/debug-adapter-protocol/).
+GraalVM supports debugging of guest language applications, written in any of the supported languages, i.e., JavaScript/TypeScript, Python, R, Ruby, and provides a built-in implementation of the [Debug Adapter Protocol (DAP)](https://microsoft.github.io/debug-adapter-protocol/).
 By definition, Debug Adapter Protocol is to standardize the "communication" between the debugging component and a concrete debugger or runtime.
 This allows you to attach compatible debuggers such as Visual Studio Code (VS Code) to GraalVM.
 
@@ -41,12 +41,12 @@ app.listen(port, () => console.log(`Example app listening on port ${port}!`))
 
 2&#46; Install the `express` module dependency in the directory where you saved the file:
 ```shell
-npm install express
+$JAVA_HOME/bin/npm install express
 ```
 
 3&#46; Run the application with DAP enabled:
 ```shell
-node --dap App.js
+$JAVA_HOME/bin/node --dap App.js
 [Graal DAP] Starting server and listening on localhost/127.0.0.1:4711
 ```
 
diff --git a/docs/tools/graalvm-insight.md b/docs/tools/graalvm-insight.md
index 752869b2375c..39e95e1c6aef 100644
--- a/docs/tools/graalvm-insight.md
+++ b/docs/tools/graalvm-insight.md
@@ -7,22 +7,16 @@ permalink: /tools/graalvm-insight/
 
 # GraalVM Insight
 
-GraalVM Insight is a multipurpose, flexible tool for writing reliable
-microservices solutions that traces program runtime behavior and gathers insights.
+GraalVM Insight is a multipurpose, flexible tool for writing reliable microservices solutions that traces program runtime behavior and gathers insights.
 
-The dynamic nature of the tool helps users to selectively apply tracing pointcuts on
-already running applications with no loss of performance. Insight
-also provides detailed access to runtime behavior of a program, allowing users to
-inspect values and types at invocation or allocation sites. GraalVM Insight further permits users to
-modify computed values, interrupt execution, and quickly experiment with
-behavioral changes without modifying the application code.
+The dynamic nature of the tool helps users to selectively apply tracing pointcuts on already running applications with no loss of performance.
+Insight also provides detailed access to runtime behavior of a program, allowing users to inspect values and types at invocation or allocation sites.
+GraalVM Insight further permits users to modify computed values, interrupt execution, and quickly experiment with behavioral changes without modifying the application code.
 
 This page provides information on GraalVM Insight as of the 20.1 version.
 To learn about Insight on versions 20.0 and 19.3, proceed [here](https://github.com/oracle/graal/blob/release/graal-vm/20.0/tools/docs/T-Trace.md).
 
-Note: The GraalVM Insight tool is offered as a technology preview and requires the user to
-pass the `--experimental-options` option in order to enable the `--insight`
-instrument.
+Note: The GraalVM Insight tool is offered as a technology preview and requires the user to pass the `--experimental-options` option in order to enable the `--insight` instrument.
 
 ## Start Using GraalVM Insight
 
@@ -32,30 +26,25 @@ insight.on('source', function(ev) {
     print(`Loading ${ev.characters.length} characters from ${ev.name}`);
 });
 ```
-2. Having set `JAVA_HOME` to the GraalVM home directory, start the `node` launcher with
-the `--insight` tool and observe what scripts are being loaded and
-evaluated:
+2. Having set `JAVA_HOME` to the GraalVM home directory, start the `node` launcher with the `--insight` tool and observe what scripts are being loaded and evaluated:
 ```shell
 $JAVA_HOME/bin/node --experimental-options --insight=source-tracing.js --js.print -e "print('The result: ' + 6 * 7)" | tail -n 10
-Loading 29938 characters from url.js
-Loading 345 characters from internal/idna.js
-Loading 12642 characters from punycode.js
-Loading 33678 characters from internal/modules/cjs/loader.js
-Loading 13058 characters from vm.js
-Loading 52408 characters from fs.js
-Loading 15920 characters from internal/fs/utils.js
-Loading 505 characters from [eval]-wrapper
+Loading 215 characters from internal/modules/esm/transform_source.js
+Loading 12107 characters from internal/modules/esm/translators.js
+Loading 1756 characters from internal/modules/esm/create_dynamic_module.js
+Loading 12930 characters from internal/vm/module.js
+Loading 2710 characters from internal/modules/run_main.js
+Loading 308 characters from module.js
+Loading 10844 characters from internal/source_map/source_map.js
+Loading 170 characters from [eval]-wrapper
 Loading 29 characters from [eval]
 The result: 42
 ```
-The _source-tracing.js_ script used the provided `insight` object to
-attach a source listener to the runtime. Whenever the script was loaded, the
-listener got notified of it and could take an action -- printing the length and
-name of the processed script.
+The _source-tracing.js_ script used the provided `insight` object to attach a source listener to the runtime.
+Whenever the script was loaded, the listener got notified of it and could take an action -- printing the length and name of the processed script.
 
 The Insight information can be collected to a print statement or a histogram.
-The following _function-histogram-tracing.js_ script counts all method invocations
-and dumps the most frequent ones when the execution of a program is over:
+The following _function-histogram-tracing.js_ script counts all method invocations and dumps the most frequent ones when the execution of a program is over:
 
 ```javascript
 var map = new Map();
@@ -90,39 +79,31 @@ insight.on('enter', function(ev) {
 insight.on('close', dumpHistogram);
 ```
 
-The `map` is a global variable shared inside of the Insight script that allows the
-code to share data between the `insight.on('enter')` function and the `dumpHistogram`
-function. The latter is executed when the node process execution is over
-(registered via `insight.on('close', dumpHistogram`). Invoke it as:
+The `map` is a global variable shared inside of the Insight script that allows the code to share data between the `insight.on('enter')` function and the `dumpHistogram`
+function.
+The latter is executed when the node process execution is over (registered via `insight.on('close', dumpHistogram`).
+Invoke it as:
 ```shell
 $JAVA_HOME/bin/node --experimental-options --insight=function-histogram-tracing.js --js.print -e "print('The result: ' + 6 * 7)"
 The result: 42
-=== Histogram ===
-543 calls to isPosixPathSeparator
-211 calls to E
-211 calls to makeNodeErrorWithCode
-205 calls to NativeModule
-198 calls to uncurryThis
-154 calls to :=>
-147 calls to nativeModuleRequire
-145 calls to NativeModule.compile
- 55 calls to internalBinding
- 53 calls to :anonymous
- 49 calls to :program
- 37 calls to getOptionValue
- 24 calls to copyProps
+==== Histogram ====
+328 calls to isPosixPathSeparator
+236 calls to E
+235 calls to makeNodeErrorWithCode
+137 calls to :=>
+ 64 calls to :program
+ 64 calls to :anonymous
+ 45 calls to getOptionValue
+ 45 calls to getOptionsFromBinding
+ 26 calls to hideStackFrames
  18 calls to validateString
- 13 calls to copyPrototype
- 13 calls to hideStackFrames
- 13 calls to addReadOnlyProcessAlias
-=================
+ 12 calls to defineColorAlias
+===================
 ```
 
 ## Polyglot Tracing
 
-The previous examples were written in JavaScript, but due to GraalVM's polyglot
-nature, you can take the same instrument and use it in a program written in,
-e.g., the Ruby language.
+The previous examples were written in JavaScript, but due to GraalVM's polyglot nature, you can take the same instrument and use it in a program written in, e.g., the Ruby language.
 
 1. Create the _source-trace.js_ file:
 ```javascript
@@ -145,8 +126,7 @@ Hello from GraalVM Ruby!
 ```
 It is necessary to start the Ruby launcher with the `--polyglot` parameter, as the _source-tracing.js_ script remains written in JavaScript.
 
-A user can instrument any language on top of GraalVM, but also the Insight scripts can be
-written in any of the GraalVM supported languages (implemented with the [Truffle language implementation framework](../../truffle/docs/README.md)).
+A user can instrument any language on top of GraalVM, but also the Insight scripts can be written in any of the GraalVM supported languages (implemented with the [Truffle language implementation framework](../../truffle/docs/README.md)).
 
 1. Create the _source-tracing.rb_ Ruby file:
 ```ruby
@@ -178,10 +158,9 @@ With Ruby: 42
 
 ## Inspecting Values
 
-GraalVM Insight not only allows one to trace where the program execution is happening,
-it also offers access to values of local variables and function arguments during
-program execution. You can, for example, write an instrument that shows the value of
-argument `n` in the function `fib`:
+GraalVM Insight not only allows one to trace where the program execution is happening, it also offers access to values of local variables and function arguments during
+program execution.
+You can, for example, write an instrument that shows the value of argument `n` in the function `fib`:
 ```javascript
 insight.on('enter', function(ctx, frame) {
    print('fib for ' + frame.n);
@@ -191,9 +170,8 @@ insight.on('enter', function(ctx, frame) {
 });
 ```
 
-This instrument uses the second function argument, `frame`, to get access to values of
-local variables inside every instrumented function. The above script
-also uses `rootNameFilter` to apply its hook only to the function named `fib`:
+This instrument uses the second function argument, `frame`, to get access to values of local variables inside every instrumented function.
+The above script also uses `rootNameFilter` to apply its hook only to the function named `fib`:
 ```javascript
 function fib(n) {
   if (n < 1) return 0;
@@ -203,9 +181,7 @@ function fib(n) {
 print("Two is the result " + fib(3));
 ```
 
-When the instrument is stored in a `fib-trace.js` file and the actual code is in
-`fib.js`, invoking the following command yields detailed information about the
-program execution and parameters passed between function invocations:
+When the instrument is stored in a `fib-trace.js` file and the actual code is in `fib.js`, invoking the following command yields detailed information about the program execution and parameters passed between function invocations:
 ```shell
 $JAVA_HOME/bin/node --experimental-options --insight=fib-trace.js --js.print fib.js
 fib for 3
diff --git a/docs/tools/ideal-graph-visualizer.md b/docs/tools/ideal-graph-visualizer.md
index 8c2ab3321b41..da869ba73575 100644
--- a/docs/tools/ideal-graph-visualizer.md
+++ b/docs/tools/ideal-graph-visualizer.md
@@ -7,13 +7,13 @@ permalink: /tools/igv/
 
 # Ideal Graph Visualizer
 
-Ideal Graph Visualizer (IGV) is a developer tool allowing users to analyze compilation
-graphs and investigate performance issues. The tool is essential for any
-language implementers building on top of **Oracle GraalVM Enterprise Edition**. It is
-available as a separate download on [Oracle Technology Network](https://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html) and requires accepting the Oracle Technology Network Developer License.
+Ideal Graph Visualizer (IGV) is a developer tool allowing users to analyze compilation graphs and investigate performance issues.
+The tool is essential for any language implementers building on top of **Oracle GraalVM Enterprise Edition**.
+It is available as a separate download on [Oracle Technology Network](https://www.oracle.com/downloads/graalvm-downloads.html) and requires accepting the Oracle Technology Network Developer License.
 
 IGV is developed to view and inspect intermediate representation graphs -- a language-independent intermediate representation (IR) between the source
-language and the machine code, generated by the compiler. See [Dumping Graphs](/tools/igv/#dumping-graphs) below.
+language and the machine code, generated by the compiler.
+See [Dumping Graphs](/tools/igv/#dumping-graphs) below.
 
 1. Unzip the downloaded package and enter `bin` directory:
 ```shell
@@ -40,13 +40,13 @@ puts js_obj[:msg]
 puts js_obj[:payload].join(' ')
 ```
 
-4. From another console window, make sure the `ruby` runtime is available in GraalVM Enterprise,
-and connect the `Test.rb` script to the running IGV:
+4. From another console window, make sure the `ruby` runtime is available in GraalVM Enterprise, and connect the `Test.rb` script to the running IGV:
 ```shell
 gu list
 ruby --jvm --polyglot --vm.Dgraal.Dump=:1 --vm.Dgraal.PrintGraph=Network Test.rb
 ```
-This causes GraalVM Enterprise to dump compiler graphs in the IGV format over the network to an IGV process listening on `127.0.0.1:4445`. Once the connection is made, you are able to see the graphs in the Outline window.
+This causes GraalVM Enterprise to dump compiler graphs in the IGV format over the network to an IGV process listening on `127.0.0.1:4445`.
+Once the connection is made, you are able to see the graphs in the Outline window.
 Find, e.g., the `java.lang.String.char(int)` folder and open its After Parsing graph by double-clicking.
 If the node has `sourceNodePosition` property, then the Processing window will attempt to display its location and the entire stacktrace.
 
@@ -58,57 +58,47 @@ Select a node in the graph and press the Go to Source button in the Stack View w
 
 ![](img/IGV_add_source.png)
 
-Graphs navigation is also available from the Context menu, enabled by focusing
-and right-clicking a specific graph node. The Extract Nodes option will re-render
-a graph and display only the selected nodes and their neighbors.
+Graphs navigation is also available from the Context menu, enabled by focusing and right-clicking a specific graph node.
+The Extract Nodes option will re-render a graph and display only the selected nodes and their neighbors.
 
 ![](img/IGV_context_menu.png)
 
-If the graph is larger than the screen, manipulate with the Satellite view button
-in the main toolbar to move the viewport rectangle.
+If the graph is larger than the screen, manipulate with the Satellite view button in the main toolbar to move the viewport rectangle.
 
 ![](img/IGV_satellite_view.png)
 
-For user preference, the graph color scheme is adjustable by editing
-the Coloring filter, enabled by default in the left sidebar.
+For user preference, the graph color scheme is adjustable by editing the Coloring filter, enabled by default in the left sidebar.
 
 ## Viewing Source Code
 
-Source code views can be opened in manual and assisted modes. Once you select a node
-in the graph view, the Processing view will open. If the IGV knows where the source code
-for the current frame is, the green Go to Source arrow is enabled. If the IGV does not
-know where the source is, the line is greyed out and a Looking Glass button appears.
+Source code views can be opened in manual and assisted modes. Once you select a node in the graph view, the Processing view will open.
+If the IGV knows where the source code for the current frame is, the green Go to Source arrow is enabled.
+If the IGV does not know where the source is, the line is greyed out and a Looking Glass button appears.
 
 ![](img/IGV_add_source.png)
 
 Press it and select Locate in Java project to locate the correct project in the dialog.
 The IGV hides projects which do not contain the required source file.
 The Source Collections serves to display the stand alone roots added by "Add root of sources" general action.
-If the source is located using the preferred method (i.e., from a Java project),
-its project can be later managed on the Project tab. That one is initially hidden,
-but you can display the list of opened projects using Window -> Projects.
+If the source is located using the preferred method (i.e., from a Java project), its project can be later managed on the Project tab.
+That one is initially hidden, but you can display the list of opened projects using Window -> Projects.
 
 ## Dumping Graphs
 
-The IGV tool is developed to allow GraalVM Enterprise language implementers
-to optimize their languages assembled with the [Language Implentation Framework](/graalvm-as-a-platform/language-implementation-framework/). As a development
-tool it should not be installed to production environments.
-
-To dump the GraalVM compiler graphs from an embedded Java application to the IGV,
-you need to add options to GraalVM-based processes. Depending on the language/VM
-used, you may need to prefix the options by `--vm`. See the particular
-language's documentation for the details. The main option to add is
-`-Dgraal.Dump=:1`. This will dump graphs in an IGV readable format to the local
-file system. To send the dumps directly to the IGV over the network, add
-`-Dgraal.PrintGraph=Network` when starting a GraalVM instance. Optionally a
-port can be specified. Then dumps are sent to the IGV from the running GraalVM on
-localhost. If the IGV does not listen on localhost, Options -> Ideal Graph Settings|
-Accept Data From Network can be checked. If there is not an IGV instance
-listening on `127.0.0.1` or it cannot be connected to, the dumps will be
-redirected to the local file system. The file system location is `graal_dumps/`
-under the current working directory of the process and can be changed with the
-`-Dgraal.DumpPath` option.
-
-In case an older GraalVM Enterprise is used, you may need to explicitly request that dumps
-include the `nodeSourcePosition` property. This is done by adding the
-`-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints` options.
+The IGV tool is developed to allow GraalVM Enterprise language implementers to optimize their languages assembled with the [Language Implentation Framework](/graalvm-as-a-platform/language-implementation-framework/).
+As a development tool it should not be installed to production environments.
+
+To dump the GraalVM compiler graphs from an embedded Java application to the IGV, you need to add options to GraalVM-based processes.
+Depending on the language/VM used, you may need to prefix the options by `--vm`.
+See the particular language's documentation for the details.
+The main option to add is `-Dgraal.Dump=:1`.
+This will dump graphs in an IGV readable format to the local file system.
+To send the dumps directly to the IGV over the network, add `-Dgraal.PrintGraph=Network` when starting a GraalVM instance.
+Optionally, a port can be specified.
+Then dumps are sent to the IGV from the running GraalVM on localhost.
+If the IGV does not listen on localhost, Options -> Ideal Graph Settings and Accept Data From Network can be checked.
+If there is not an IGV instance listening on `127.0.0.1` or it cannot be connected to, the dumps will be redirected to the local file system.
+The file system location is `graal_dumps/` under the current working directory of the process and can be changed with the `-Dgraal.DumpPath` option.
+
+In case an older GraalVM Enterprise is used, you may need to explicitly request that dumps include the `nodeSourcePosition` property.
+This is done by adding the `-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints` options.
diff --git a/docs/tools/lsp.md b/docs/tools/lsp.md
index f831f89238ad..bd75d6d6430f 100644
--- a/docs/tools/lsp.md
+++ b/docs/tools/lsp.md
@@ -16,7 +16,7 @@ Note: The GraalVM Language Server is offered as a technology preview and require
 user to pass the `--experimental-options` option for its activation.
 
 ```shell
-node --experimental-options --lsp app.js
+$JAVA_HOME/bin/node --experimental-options --lsp app.js
 [Graal LSP] Starting server and listening on localhost/127.0.0.1:8123
 Example app listening on port 3000!
 ```

From 89dea1135f3087963766765f39b9f9a375e5d670 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Tue, 5 Oct 2021 15:13:48 +0200
Subject: [PATCH 315/681] Include a native-image-configure script launcher in
 native-image installables.

---
 substratevm/mx.substratevm/mx_substratevm.py | 3 +++
 vm/ci_includes/vm.hocon                      | 4 ++--
 vm/mx.vm/ce-complete                         | 4 ++--
 vm/mx.vm/ce-no_native                        | 2 +-
 vm/mx.vm/mx_vm.py                            | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index bfed15e9a0be..16e87119beb3 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -1032,6 +1032,9 @@ def _native_image_configure_extra_jvm_args():
         )
     ],
     jlink=False,
+    installable_id='native-image',
+    installable=True,
+    priority=10,
 ))
 
 
diff --git a/vm/ci_includes/vm.hocon b/vm/ci_includes/vm.hocon
index fd8cbd37a019..efc29712ed17 100644
--- a/vm/ci_includes/vm.hocon
+++ b/vm/ci_includes/vm.hocon
@@ -30,9 +30,9 @@ custom_vm_darwin: {}
 vm_profiles: []
 collect_profiles: []
 
-non-product-vm-components: "nju,nic,dis,pbm,llmulrl,elau"
+non-product-vm-components: "nju,dis,pbm,llmulrl,elau"
 non-product-vm-components-windows: ${non-product-vm-components}",llp"
-non-product-native-launchers: "RMain,polybench"
+non-product-native-launchers: "RMain,polybench,native-image-configure"
 
 vm_setup: {
   short_name: ce
diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index 29f1021891a8..0e9a641bf322 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,5 +1,5 @@
 DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs,truffleruby,graalpython,/wasm,/espresso
 DISABLE_INSTALLABLES=true
-EXCLUDE_COMPONENTS=nju,njucp,nic,dis,pbm,pmh,llmulrl,elau
-FORCE_BASH_LAUNCHERS=polyglot
+EXCLUDE_COMPONENTS=nju,njucp,dis,pbm,pmh,llmulrl,elau
+FORCE_BASH_LAUNCHERS=polyglot,native-image-configure
 SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-no_native b/vm/mx.vm/ce-no_native
index 8372159778ee..4edb3c961621 100644
--- a/vm/mx.vm/ce-no_native
+++ b/vm/mx.vm/ce-no_native
@@ -2,4 +2,4 @@ DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
 DISABLE_INSTALLABLES=ni,nil
 FORCE_BASH_LAUNCHERS=true
 SKIP_LIBRARIES=true
-EXCLUDE_COMPONENTS=nju,njucp,nic,llp,lg,dis,pbm,pmh,llmulrl
+EXCLUDE_COMPONENTS=nju,njucp,llp,lg,dis,pbm,pmh,llmulrl
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index 23527feb4938..e956eb4630c5 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -129,11 +129,11 @@
 
 # pylint: disable=line-too-long
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
-ce_complete_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
+ce_complete_components = ['bpolyglot', 'bnative-image-configure', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bllimul', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']
-ce_no_native_components = ['bgu', 'bjs', 'blli', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'bnative-image', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lsp', 'nfi', 'ni', 'nil', 'polynative', 'pro', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'libpoly', 'poly', 'vvm']
+ce_no_native_components = ['bgu', 'bjs', 'blli', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'polynative', 'pro', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'libpoly', 'poly', 'vvm']
 
 mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'js', 'lg', 'libpoly', 'lsp', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm'], _suite, env_file='ce-win')
 mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64')

From 913217ca01ec1821fdc94e773df68e812b8e8f15 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Wed, 6 Oct 2021 22:38:32 +0200
Subject: [PATCH 316/681] Drop explicit designation of bash launchers in
 installables.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index d17455695618..4c2b3a9748c7 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2265,10 +2265,6 @@ def create_archive(path, **_kw_args):
             other_involved_components += [c for c in registered_graalvm_components(stage1=True) if c.short_name in ('svm', 'svmee')]
 
         name = '{}_INSTALLABLE'.format(component.installable_id.replace('-', '_').upper())
-        if other_involved_components:
-            for launcher_config in launcher_configs:
-                if _force_bash_launchers(launcher_config):
-                    name += '_B' + basename(launcher_config.destination).upper()
         for library_config in library_configs:
             if _skip_libraries(library_config):
                 name += '_S' + basename(library_config.destination).upper()

From 11a0e683e2da457db90a0ebfddf6c81e149af47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Tue, 14 Sep 2021 18:23:19 +0200
Subject: [PATCH 317/681] Switch SVM gates from JDK 8 to JDK 17

---
 substratevm/ci_includes/gate.hocon | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/substratevm/ci_includes/gate.hocon b/substratevm/ci_includes/gate.hocon
index 4f2577c9ba32..9d6b1b86e61b 100644
--- a/substratevm/ci_includes/gate.hocon
+++ b/substratevm/ci_includes/gate.hocon
@@ -18,11 +18,11 @@ gate-svm-js: {
 }
 
 builds += [
-  ${oraclejdk8} ${svm-common-linux-gate} ${gate-svm-js} ${svm-capabilities-base} {
+  ${labsjdk-ce-17} ${svm-common-linux-gate} ${gate-svm-js} ${svm-capabilities-base} {
     name: "gate-svm-js"
     timelimit: "35:00"
   }
-  ${oraclejdk8} ${svm-common-darwin-gate} ${gate-svm-js} {
+  ${labsjdk-ce-17} ${svm-common-darwin-gate} ${gate-svm-js} {
     name: "gate-svm-darwin-js"
   }
   ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
@@ -49,7 +49,7 @@ builds += [
       ${svm-cmd-gate} ["build,hellomodule,test"]
     ]
   }
-  ${oraclejdk8} ${svm-common-linux-gate} ${eclipse} ${jdt} ${linux-deploy} {
+  ${labsjdk-ce-17} ${svm-common-linux-gate} ${eclipse} ${jdt} ${linux-deploy} {
     name: "gate-svm-style-fullbuild"
     timelimit: "45:00"
     environment : {
@@ -60,7 +60,7 @@ builds += [
       ${svm-cmd-gate} ["style,fullbuild,helloworld,test,svmjunit,maven"]
     ]
   }
-  ${oraclejdk8} ${svm-common-gate} ${svm-common-windows-oraclejdk8} {
+  ${labsjdk-ce-17} ${svm-common-gate} ${svm-common-windows-jdk17} {
     name: "gate-svm-windows-basics"
     environment: {
       PATH : "$MVN_HOME;$PATH"  # workaround until GR-10735 is resolved

From 7321664adfe7187de125e5fc1fd508d8d5977c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Wed, 15 Sep 2021 11:15:56 +0200
Subject: [PATCH 318/681] Canonicalize com.oracle.svm.core.jdk15 deps

---
 substratevm/mx.substratevm/suite.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index a4e9499d6de6..a5d6c42463ab 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -247,10 +247,7 @@
         "com.oracle.svm.core.jdk15": {
             "subDir": "src",
             "sourceDirs": ["src"],
-            "dependencies": [
-                "com.oracle.svm.core",
-                "com.oracle.svm.core.jdk11"
-            ],
+            "dependencies": ["com.oracle.svm.core.jdk11"],
             "requiresConcealed" : {
                 "java.base" : [
                     "jdk.internal.loader",

From 05bea07f8c96a3e36845a0ef9325c85da77fdd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Wed, 15 Sep 2021 11:44:22 +0200
Subject: [PATCH 319/681] Fix formatting

---
 .../JavaLangSubstitutions_JDK11OrLater.java   |  6 ++---
 .../com/oracle/svm/core/jdk11/ModuleUtil.java | 24 +++++++++----------
 .../Target_java_lang_Module_JDK15OrLater.java |  2 +-
 .../src/com/oracle/svm/jfr/JfrEnabled.java    |  1 +
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/JavaLangSubstitutions_JDK11OrLater.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/JavaLangSubstitutions_JDK11OrLater.java
index c9fd579dcd7d..520459e893d0 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/JavaLangSubstitutions_JDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/JavaLangSubstitutions_JDK11OrLater.java
@@ -54,7 +54,7 @@ final class Target_jdk_internal_loader_BootLoader_JDK11OrLater {
     static Package getDefinedPackage(String name) {
         if (name != null) {
             Target_java_lang_Package pkg = new Target_java_lang_Package(name, null, null, null,
-                    null, null, null, null, null);
+                            null, null, null, null, null);
             return SubstrateUtil.cast(pkg, Package.class);
         } else {
             return null;
@@ -90,8 +90,8 @@ private static boolean hasClassPath() {
 
     /**
      * All ClassLoaderValue are reset at run time for now. See also
-     * {@link Target_java_lang_ClassLoader_JDK11OrLater#classLoaderValueMap} for resetting of individual class
-     * loaders.
+     * {@link Target_java_lang_ClassLoader_JDK11OrLater#classLoaderValueMap} for resetting of
+     * individual class loaders.
      */
     // Checkstyle: stop
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClass = ConcurrentHashMap.class)//
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/ModuleUtil.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/ModuleUtil.java
index fc8cb07c709a..91926780de73 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/ModuleUtil.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/ModuleUtil.java
@@ -105,7 +105,7 @@ public static void checkIsPackageContainedInModule(String pn, Module module) {
             Module actualModule = namedPackage.module;
             if (!actualModule.equals(module)) {
                 throw new IllegalArgumentException("Package " + pn + " found in module " + actualModule.getName() +
-                        ", not in module: " + module.getName());
+                                ", not in module: " + module.getName());
             }
         }
         if (!module.getPackages().contains(pn)) {
@@ -115,23 +115,23 @@ public static void checkIsPackageContainedInModule(String pn, Module module) {
 
     public static List<String> getPackagesDefinedToLoader(ClassLoader loader) {
         return getDefinedModules().getOrDefault(loader, Set.of())
-                .stream()
-                .flatMap(m -> m.getPackages().stream())
-                .collect(Collectors.toUnmodifiableList());
+                        .stream()
+                        .flatMap(m -> m.getPackages().stream())
+                        .collect(Collectors.toUnmodifiableList());
     }
 
     public static Object getModuleContainingPackage(ClassLoader loader, String pn) {
         return getDefinedModules().getOrDefault(loader, Set.of())
-                .stream()
-                .filter(m -> m.getPackages().contains(pn))
-                .findFirst().orElse(null);
+                        .stream()
+                        .filter(m -> m.getPackages().contains(pn))
+                        .findFirst().orElse(null);
     }
 
     public static boolean bootLayerContainsModule(String name) {
         return ModuleLayer.boot().modules().stream().anyMatch(m -> m.getName().equals(name));
     }
 
-    //Checkstyle: allow synchronization
+    // Checkstyle: allow synchronization
     public static void defineModule(Module module, boolean isOpen, List<String> pns) {
         if (Objects.isNull(module)) {
             throw new NullPointerException("Null module object");
@@ -178,7 +178,7 @@ public static void defineModule(Module module, boolean isOpen, List<String> pns)
 
             if (loader != ClassLoader.getPlatformClassLoader() && ModuleUtil.isPackageNameForbidden(pn)) {
                 throw new IllegalArgumentException("Class loader (instance of): " + loader.getClass().getName() +
-                        " tried to define prohibited package name: " + pn);
+                                " tried to define prohibited package name: " + pn);
             }
         }
 
@@ -202,11 +202,9 @@ public static void defineModule(Module module, boolean isOpen, List<String> pns)
         } else if (Objects.nonNull(definedPackage)) {
             Module moduleContainingDefinedPackage = SubstrateUtil.cast(ModuleUtil.getModuleContainingPackage(loader, definedPackage), Module.class);
             if (moduleContainingDefinedPackage.isNamed()) {
-                throw new IllegalStateException("Package " + definedPackage + " is already in another module, "
-                        + moduleContainingDefinedPackage.getName() + ", defined to the class loader");
+                throw new IllegalStateException("Package " + definedPackage + " is already in another module, " + moduleContainingDefinedPackage.getName() + ", defined to the class loader");
             } else {
-                throw new IllegalStateException("Package " + definedPackage
-                        + " is already in the unnamed module defined to the class loader");
+                throw new IllegalStateException("Package " + definedPackage + " is already in the unnamed module defined to the class loader");
             }
         }
 
diff --git a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java b/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java
index 94a0719002f1..f4ca16397f9e 100644
--- a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java
@@ -38,7 +38,7 @@
 @TargetClass(value = Module.class, onlyWith = JDK15OrLater.class)
 public final class Target_java_lang_Module_JDK15OrLater {
 
-    //Checkstyle: allow synchronization
+    // Checkstyle: allow synchronization
     @Substitute
     private static void defineModule0(Module module, boolean isOpen, String version, String location, Object[] pns) {
         if (Arrays.stream(pns).anyMatch(Objects::isNull)) {
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
index cfa97353c7a0..35101f3a104b 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
@@ -47,6 +47,7 @@ public static boolean get() {
     private static boolean jvmVersionSupported() {
         return JavaVersionUtil.JAVA_SPEC == 11 || JavaVersionUtil.JAVA_SPEC == 16 || JavaVersionUtil.JAVA_SPEC == 17;
     }
+
     private static boolean osSupported() {
         return OS.getCurrent() == OS.LINUX || OS.getCurrent() == OS.DARWIN;
     }

From a6a3134f6e910976eac882788404099ff4781d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Wed, 15 Sep 2021 13:16:23 +0200
Subject: [PATCH 320/681] Fix copyright header

---
 ...Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java
index fcc653fdb16d..5f1ba4730b17 100644
--- a/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_platform_CgroupMetrics_JDK17OrLater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, 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

From 7a4fae237e35b7bdb969be705fdf55ae9bb61bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Wed, 15 Sep 2021 14:51:18 +0200
Subject: [PATCH 321/681] Fix JVMFuncFallbackTest on JDK 17

---
 .../src/com/oracle/svm/test/JVMFuncFallbackTest.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/JVMFuncFallbackTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/JVMFuncFallbackTest.java
index a49e77573ed0..45b27e497c5e 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/JVMFuncFallbackTest.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/JVMFuncFallbackTest.java
@@ -40,10 +40,10 @@ public class JVMFuncFallbackTest {
     public void testImageCodeMethods() {
         if (Boolean.getBoolean("never.be.true.but.compiler.doesn't.know")) {
             /*
-             * Cause image to link to JVM_Clone. This will trigger a linker error if libjvm.a does
-             * not contain the autogenerated JVM_* fallbacks.
+             * Cause image to link to JVM_IHashCode. This will trigger a linker error if libjvm.a
+             * does not contain the autogenerated JVM_* fallbacks.
              */
-            Jvm.JVM_Clone(WordFactory.nullPointer());
+            Jvm.JVM_IHashCode(WordFactory.nullPointer());
         }
     }
 }
@@ -52,5 +52,5 @@ public void testImageCodeMethods() {
 @CLibrary(value = "jvm", requireStatic = true)
 class Jvm {
     @CFunction(transition = CFunction.Transition.NO_TRANSITION)
-    public static native int JVM_Clone(Pointer jni);
+    public static native int JVM_IHashCode(Pointer jni);
 }

From b0d20e7a155a4063f0e0e2e17255bd669ecebcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Thu, 30 Sep 2021 15:19:59 +0200
Subject: [PATCH 322/681] Disable tests that fail with --builder-on-modulepath
 enabled on JDK 17

---
 substratevm/mx.substratevm/mx_substratevm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index bfed15e9a0be..af87cf361230 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -443,6 +443,12 @@ def native_unittests_task():
         '-H:AdditionalSecurityServiceTypes=com.oracle.svm.test.SecurityServiceTest$JCACompliantNoOpService'
     ]
 
+    if svm_java_compliance() == '17':
+        # The following tests fail with --builder-on-modulepath enabled (GR-34117)
+        mx_unittest.add_global_ignore_glob('com.oracle.svm.test.jdk11.jfr.*')
+        if mx.is_windows():
+            mx_unittest.add_global_ignore_glob('com.oracle.svm.test.SecurityServiceTest')
+
     native_unittest(['--builder-on-modulepath', '--build-args', _native_unittest_features] + additional_build_args)
 
 

From e78183c709d2ea9940f9f6a0cee3bed50f3a80f1 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 7 Oct 2021 10:17:11 +0200
Subject: [PATCH 323/681] Improve GC-specific forced inlining.

---
 .../svm/core/genscavenge/GCAccounting.java    |  2 +-
 .../svm/core/genscavenge/HeapChunk.java       |  2 +-
 .../core/genscavenge/ObjectHeaderImpl.java    |  2 ++
 .../oracle/svm/core/genscavenge/Space.java    | 30 +++++++++++--------
 .../remset/AlignedChunkRememberedSet.java     |  2 +-
 .../remset/CardTableBasedRememberedSet.java   |  1 +
 .../genscavenge/remset/FirstObjectTable.java  |  4 +++
 .../heap/InstanceReferenceMapDecoder.java     |  3 +-
 .../oracle/svm/core/hub/LayoutEncoding.java   | 14 ++++++++-
 9 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
index 0533458c1cf6..e18aaad24b3b 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
@@ -148,7 +148,7 @@ void beforeCollection() {
     /** Called after an object has been promoted from the young generation to the old generation. */
     @AlwaysInline("GC performance")
     void onObjectTenured(Object result, boolean survivorOverflow) {
-        UnsignedWord size = LayoutEncoding.getSizeFromObject(result);
+        UnsignedWord size = LayoutEncoding.getSizeFromObjectInline(result);
         tenuredObjectBytes = tenuredObjectBytes.add(size);
         if (survivorOverflow) {
             survivorOverflowObjectBytes = survivorOverflowObjectBytes.add(size);
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
index 424e4e2df3b3..0055d2d28982 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
@@ -288,7 +288,7 @@ public static boolean walkObjectsFromInline(Header<?> that, Pointer startOffset,
             if (!visitor.visitObjectInline(obj)) {
                 return false;
             }
-            offset = offset.add(LayoutEncoding.getSizeFromObject(obj));
+            offset = offset.add(LayoutEncoding.getSizeFromObjectInline(obj));
         }
         return true;
     }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
index 36fa275c4cb6..a838fab7673d 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
+import com.oracle.svm.core.annotate.AlwaysInline;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.CompressEncoding;
@@ -327,6 +328,7 @@ static Object getForwardedObject(Pointer ptr, UnsignedWord header) {
     }
 
     /** In an Object, install a forwarding pointer to a different Object. */
+    @AlwaysInline("GC performance")
     static void installForwardingPointer(Object original, Object copy) {
         assert !isPointerToForwardedObject(Word.objectToUntrackedPointer(original));
         UnsignedWord forwardHeader;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
index d47b6d0bd869..35c5d98133c9 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
@@ -27,6 +27,7 @@
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
+import com.oracle.svm.core.annotate.AlwaysInline;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -172,25 +173,28 @@ public Log report(Log log, boolean traceHeapChunks) {
 
     /**
      * Allocate memory from an AlignedHeapChunk in this Space.
-     *
-     * This is "slow-path" memory allocation.
      */
+    @AlwaysInline("GC performance")
     private Pointer allocateMemory(UnsignedWord objectSize) {
         Pointer result = WordFactory.nullPointer();
-        /* First try allocating in the last chunk. */
+        /* Fast-path: try allocating in the last chunk. */
         AlignedHeapChunk.AlignedHeader oldChunk = getLastAlignedHeapChunk();
         if (oldChunk.isNonNull()) {
             result = AlignedHeapChunk.allocateMemory(oldChunk, objectSize);
         }
-        /* If oldChunk did not provide, try allocating a new chunk for the requested memory. */
-        if (result.isNull()) {
-            AlignedHeapChunk.AlignedHeader newChunk = requestAlignedHeapChunk();
-            if (newChunk.isNonNull()) {
-                /* Allocate the Object within the new chunk. */
-                result = AlignedHeapChunk.allocateMemory(newChunk, objectSize);
-            }
+        if (result.isNonNull()) {
+            return result;
         }
-        return result;
+        /* Slow-path: try allocating a new chunk for the requested memory. */
+        return allocateInNewChunk(objectSize);
+    }
+
+    private Pointer allocateInNewChunk(UnsignedWord objectSize) {
+        AlignedHeapChunk.AlignedHeader newChunk = requestAlignedHeapChunk();
+        if (newChunk.isNonNull()) {
+            return AlignedHeapChunk.allocateMemory(newChunk, objectSize);
+        }
+        return WordFactory.nullPointer();
     }
 
     public void releaseChunks(ChunkReleaser chunkReleaser) {
@@ -352,6 +356,7 @@ private void setLastUnalignedHeapChunk(UnalignedHeapChunk.UnalignedHeader chunk)
     }
 
     /** Promote an aligned Object to this Space. */
+    @AlwaysInline("GC performance")
     Object promoteAlignedObject(Object original, Space originalSpace) {
         assert ObjectHeaderImpl.isAlignedObject(original);
         assert this != originalSpace && originalSpace.isFromSpace();
@@ -363,11 +368,12 @@ Object promoteAlignedObject(Object original, Space originalSpace) {
         return copy;
     }
 
+    @AlwaysInline("GC performance")
     private Object copyAlignedObject(Object originalObj) {
         assert VMOperation.isGCInProgress();
         assert ObjectHeaderImpl.isAlignedObject(originalObj);
 
-        UnsignedWord size = LayoutEncoding.getSizeFromObject(originalObj);
+        UnsignedWord size = LayoutEncoding.getSizeFromObjectInline(originalObj);
         Pointer copyMemory = allocateMemory(size);
         if (probability(VERY_SLOW_PATH_PROBABILITY, copyMemory.isNull())) {
             return null;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
index 786ee8d82642..902eb59b5dec 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
@@ -145,7 +145,7 @@ public static void walkDirtyObjects(AlignedHeader chunk, GreyToBlackObjectVisito
                 while (ptr.belowThan(walkLimit)) {
                     Object obj = ptr.toObject();
                     visitor.visitObjectInline(obj);
-                    ptr = LayoutEncoding.getObjectEnd(obj);
+                    ptr = LayoutEncoding.getObjectEndInline(obj);
                 }
             }
         }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
index 251992239f3e..a3e2b060212b 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
@@ -96,6 +96,7 @@ public void enableRememberedSetForChunk(UnalignedHeader chunk) {
     }
 
     @Override
+    @AlwaysInline("GC performance")
     public void enableRememberedSetForObject(AlignedHeader chunk, Object obj) {
         AlignedChunkRememberedSet.enableRememberedSetForObject(chunk, obj);
     }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java
index 42130392da61..bfca620613c1 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/FirstObjectTable.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge.remset;
 
+import com.oracle.svm.core.annotate.AlwaysInline;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
@@ -177,6 +178,7 @@ private static boolean doInitializeTable(Pointer table, UnsignedWord size) {
         return true;
     }
 
+    @AlwaysInline("GC performance")
     public static void setTableForObject(Pointer table, UnsignedWord startOffset, UnsignedWord endOffset) {
         assert startOffset.belowThan(endOffset);
         UnsignedWord startIndex = memoryOffsetToIndex(startOffset);
@@ -229,6 +231,7 @@ public static void setTableForObject(Pointer table, UnsignedWord startOffset, Un
      * not at the address of the reference). So, we must skip over the first object if it starts
      * outside the current card.
      */
+    @AlwaysInline("GC performance")
     public static Pointer getFirstObjectImprecise(Pointer tableStart, Pointer objectsStart, Pointer objectsLimit, UnsignedWord index) {
         Pointer result;
         Pointer firstObject = getFirstObject(tableStart, objectsStart, objectsLimit, index);
@@ -246,6 +249,7 @@ public static Pointer getFirstObjectImprecise(Pointer tableStart, Pointer object
         return result;
     }
 
+    @AlwaysInline("GC performance")
     private static Pointer getFirstObject(Pointer tableStart, Pointer objectsStart, Pointer objectsLimit, UnsignedWord index) {
         UnsignedWord currentIndex = index;
         int currentEntry = getEntryAtIndex(tableStart, currentIndex);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java
index b5741e274894..c7df8969cf54 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/InstanceReferenceMapDecoder.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.heap;
 
+import com.oracle.svm.core.thread.JavaContinuations;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
@@ -42,7 +43,7 @@ public static boolean walkOffsetsFromPointer(Pointer baseAddress, NonmovableArra
         assert ReferenceMapIndex.denotesValidReferenceMap(referenceMapIndex);
         assert referenceMapEncoding.isNonNull();
 
-        if (referenceMapIndex == ReferenceMapIndex.STORED_CONTINUATION) {
+        if (JavaContinuations.useLoom() && referenceMapIndex == ReferenceMapIndex.STORED_CONTINUATION) {
             return StoredContinuationImpl.walkStoredContinuationFromPointer(baseAddress, visitor, holderObject);
         }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
index 9388cd6dcf01..bae520de89a6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.hub;
 
+import com.oracle.svm.core.annotate.AlwaysInline;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.calc.UnsignedMath;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
@@ -210,6 +211,12 @@ public static UnsignedWord getArraySize(int encoding, int length) {
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static UnsignedWord getSizeFromObject(Object obj) {
+        return getSizeFromObjectInline(obj);
+    }
+
+    @AlwaysInline("GC performance")
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public static UnsignedWord getSizeFromObjectInline(Object obj) {
         int encoding = KnownIntrinsics.readHub(obj).getLayoutEncoding();
         if (isArray(encoding)) {
             return getArraySize(encoding, ArrayLengthNode.arrayLength(obj));
@@ -222,11 +229,16 @@ public static UnsignedWord getSizeFromObject(Object obj) {
 
     /** Returns the end of the Object when the call started, e.g., for logging. */
     public static Pointer getObjectEnd(Object obj) {
+        return getObjectEndInline(obj);
+    }
+
+    @AlwaysInline("GC performance")
+    public static Pointer getObjectEndInline(Object obj) {
         // TODO: This assumes that the object starts at obj.
         // - In other universes obj could point to the hub in the middle of,
         // for example, a butterfly object.
         final Pointer objStart = Word.objectToUntrackedPointer(obj);
-        final UnsignedWord objSize = getSizeFromObject(obj);
+        final UnsignedWord objSize = getSizeFromObjectInline(obj);
         return objStart.add(objSize);
     }
 

From a6f17ebcd80599dd1c29ee591bd483b592e261e2 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 12:46:52 +0300
Subject: [PATCH 324/681] Review and update docs/graalvm-as-a-platform

---
 .../implement-instrument.md                   | 98 ++++++++++---------
 .../implement-language.md                     | 94 +++++++-----------
 2 files changed, 85 insertions(+), 107 deletions(-)

diff --git a/docs/graalvm-as-a-platform/implement-instrument.md b/docs/graalvm-as-a-platform/implement-instrument.md
index 1a2eb62b6290..0c7cc1d9a527 100644
--- a/docs/graalvm-as-a-platform/implement-instrument.md
+++ b/docs/graalvm-as-a-platform/implement-instrument.md
@@ -14,22 +14,18 @@ Instruments can track very fine-grained, VM-level runtime events to profile, ins
 
 ## Simple Tool
 
-To provide an easier starting point for tool developers we have created a
-[Simple Tool](https://github.com/graalvm/simpletool) example project. This is a
-javadoc-rich Maven project which implements a simple code coverage tool.
+To provide an easier starting point for tool developers we have created a [Simple Tool](https://github.com/graalvm/simpletool) example project.
+This is a javadoc-rich Maven project which implements a simple code coverage tool.
 
-We recommend cloning the repository and exploring the source code as a starting
-point for tool development. The following sections will provide a guided tour of
-the steps needed to build and run a GraalVM tool, using Simple Tool source code
-as the running example. These sections do not cover all of the features of the
-[Instrument API](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/package-summary.html) so we encourage you to check the javadoc for more details.
+We recommend cloning the repository and exploring the source code as a starting point for tool development.
+The following sections will provide a guided tour of the steps needed to build and run a GraalVM tool, using Simple Tool source code as the running example.
+These sections do not cover all of the features of the [Instrument API](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/package-summary.html) so we encourage you to check the javadoc for more details.
 
 ### Requirements
 
-As mentioned before, Simple Tool is a code coverage tool. Ultimately, it
-should provide the developer with information on what percentage of source code
-lines was executed, as well as exactly which lines were executed. With that in
-mind, we can define some high-level requirements from our tool:
+As mentioned before, Simple Tool is a code coverage tool.
+Ultimately, it should provide the developer with information on what percentage of source code lines was executed, as well as exactly which lines were executed.
+With that in mind, we can define some high-level requirements from our tool:
 
 1. The tool keeps track of loaded source code.
 2. The tool keeps track of executed source code.
@@ -40,14 +36,10 @@ mind, we can define some high-level requirements from our tool:
 The main starting point for tools is subclassing the [TruffleInstrument](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.html) class.
 Unsurprisingly, the simple tool code base does exactly this, creating the [SimpleCoverageInstrument](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L84) class.
 
-The
-[Registration](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.Registration.html)
-annotation on the class ensures that the newly created instrument is registered
-with the Instrument API, i.e., that it will be automatically
-discovered by the framework. It also provides some metadata about the
-instrument: ID, name, version, which services the instrument provides, and
-whether the instrument is internal or not. In order for this annotation to be
-effective the DSL processor needs to process this class. This is, in the case of Simple Tool, done automatically by having the DSL processor as a dependency in the [Maven configuration](https://github.com/graalvm/simpletool/blob/master/pom.xml#L83).
+The [Registration](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.Registration.html) annotation on the class ensures that the newly created instrument is registered with the Instrument API, i.e., that it will be automatically discovered by the framework.
+It also provides some metadata about the instrument: ID, name, version, which services the instrument provides, and whether the instrument is internal or not.
+In order for this annotation to be effective the DSL processor needs to process this class.
+This is, in the case of Simple Tool, done automatically by having the DSL processor as a dependency in the [Maven configuration](https://github.com/graalvm/simpletool/blob/master/pom.xml#L83).
 
 Now we will look back at the implementation of the `SimpleCoverageInstrument` class, namely which methods from `TruffleInstrument` it overrides.
 These are [onCreate](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L130), [onDispose](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L182), and [getOptionDescriptors](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L245).
@@ -89,22 +81,13 @@ The instrument keeps a mapping from each `Source` to a [Coverage](https://github
 ### Execution Event Node
 
 Guest languages are implemented as Abstract Syntax Tree (AST) interpreters.
-The language implementers annotate certain nodes with tags, which allows us to
-select which nodes we are interested in, by using the aforementioned
-`SourceSectionFilter`, in a language-agnostic manner.
-
-The main power of the Instrument API lies in its ability to insert specialised
-nodes in the AST which "wrap" the nodes of interest. These nodes are built using
-the same infrastructure that the language developers use, and are, from the
-perspective of the runtime, indistinguishable from the language nodes. This
-means that all of the techniques used to optimize guest languages into such high
-performing language implementations are available to the tool developers as
-well.
+The language implementers annotate certain nodes with tags, which allows us to select which nodes we are interested in, by using the aforementioned `SourceSectionFilter`, in a language-agnostic manner.
+
+The main power of the Instrument API lies in its ability to insert specialised nodes in the AST which "wrap" the nodes of interest.
+These nodes are built using the same infrastructure that the language developers use, and are, from the perspective of the runtime, indistinguishable from the language nodes. This means that all of the techniques used to optimize guest languages into such high performing language implementations are available to the tool developers as well.
 
 More information about these techniques is available in the [language implementation documentation](https://github.com/oracle/graal/tree/master/truffle/docs).
-Suffice it to say that for Simple Tool to meet its second requirement, we need to
-instrument all expressions with our own node that will notify us when that
-expression is executed.
+Suffice it to say that for Simple Tool to meet its second requirement, we need to instrument all expressions with our own node that will notify us when that expression is executed.
 
 For this task we use the [CoverageNode](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/CoverageNode.java).
 It is a subclass of [ExecutionEventNode](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/ExecutionEventNode.html) which, as the name implies, is used to instrument events during execution.
@@ -121,8 +104,7 @@ The factory is the [CoverageEventFactory](https://github.com/graalvm/simpletool/
 This class just ensures that each `CoverageNode` knows the `SourceSection` it is instrumenting by looking it up in the provided [EventContext](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/EventContext.html).
 
 Finally, when we are [enabling the instrument](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L173),
-we tell the instrumenter to use our factory to "wrap" the nodes selected by our
-filter.
+we tell the instrumenter to use our factory to "wrap" the nodes selected by our filter.
 
 ### Interaction Between Users and Instruments
 
@@ -237,14 +219,18 @@ The following examples are intended to show common use-cases that can be solved
 
 ### Instrumentation Event Listeners
 
-The Instrument API is defined in the `com.oracle.truffle.api.instrumentation` package. Instrumentation agents can be developed by extending the `TruffleInstrument` class, and can be attached to a running GraalVM instance using the `Instrumenter` class. Once attached to a running language runtime, instrumentation agents remain usable as long as the language runtime is not disposed. Instrumentation agents on GraalVM can monitor a variety of VM-level runtime events, including any of the following:
+The Instrument API is defined in the `com.oracle.truffle.api.instrumentation` package.
+Instrumentation agents can be developed by extending the `TruffleInstrument` class, and can be attached to a running GraalVM instance using the `Instrumenter` class.
+Once attached to a running language runtime, instrumentation agents remain usable as long as the language runtime is not disposed.
+Instrumentation agents on GraalVM can monitor a variety of VM-level runtime events, including any of the following:
 
 1. _Source code-related events_: The agent can be notified every time a new [Source](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/source/Source.html) or [SourceSection](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/source/SourceSection.html) element is loaded by the monitored language runtime.
 2. _Allocation events_: The agent can be notified every time a new object is allocated in the memory space of the monitored language runtime.
 3. _Language runtime and thread creation events_: The agent can be notified as soon as a new [execution context](http://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/Context.html) or a new thread for a monitored language runtime is created.
 4. _Application execution events_: The agent gets notified every time a monitored application executes a specific set of language operations. Examples of such operations include language statements and expressions, thus allowing an instrumentation agent to inspect running applications with very high precision.
 
-For each execution event, instrumentation agents can define _filtering_ criteria that will be used by the GraalVM instrumentation runtime to monitor only the relevant execution events. Currently, GraalVM instruments accept one of the following two filter types:
+For each execution event, instrumentation agents can define _filtering_ criteria that will be used by the GraalVM instrumentation runtime to monitor only the relevant execution events.
+Currently, GraalVM instruments accept one of the following two filter types:
 
 1. `AllocationEventFilter` to filter allocation events by allocation type.
 2. `SourceSectionFilter` to filter source code locations in an application.
@@ -258,9 +244,12 @@ SourceSectionFilter.newBuilder()
                    .build()
 ```
 
-The filter in the example can be used to monitor the execution of all JavaScript statements in a given application. Other filtering options such as line numbers or file extensions can also be provided.
+The filter in the example can be used to monitor the execution of all JavaScript statements in a given application.
+Other filtering options such as line numbers or file extensions can also be provided.
 
-Source section filters like the one in the example can use _Tags_ to specify a set of execution events to be monitored. Language-agnostic tags such as statements and expressions are defined in the [`com.oracle.truffle.api.instrumentation.Tag`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/Tag.html) class, and are supported by all GraalVM languages. In addition to standard tags, GraalVM languages may provide other, language-specific, tags to enable fine-grained profiling of language-specific events. (As an example, the GraalVM JavaScript engine provides JavaScript-specific tags to track the usages of ECMA builtin objects such as `Array`, `Map`, or `Math`.)
+Source section filters like the one in the example can use _Tags_ to specify a set of execution events to be monitored. Language-agnostic tags such as statements and expressions are defined in the [`com.oracle.truffle.api.instrumentation.Tag`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/Tag.html) class, and are supported by all GraalVM languages.
+In addition to standard tags, GraalVM languages may provide other, language-specific, tags to enable fine-grained profiling of language-specific events.
+(As an example, the GraalVM JavaScript engine provides JavaScript-specific tags to track the usages of ECMA builtin objects such as `Array`, `Map`, or `Math`.)
 
 ### Monitoring Execution Events
 
@@ -271,7 +260,8 @@ Application execution events enable very precise and detailed monitoring. GraalV
 
 ### Simple Instrumentation Agent
 
-A simple example of a custom instrumentation agent used to perform runtime code coverage can be found in the `CoverageExample` class. What follows is an overview of the agent, its design, and its capabilities.
+A simple example of a custom instrumentation agent used to perform runtime code coverage can be found in the `CoverageExample` class.
+What follows is an overview of the agent, its design, and its capabilities.
 
 All instruments extend the `TruffleInstrument` abstract class and are registered in the GraalVM runtime through the `@Registration` annotation:
 
@@ -287,7 +277,9 @@ public final class CoverageExample extends TruffleInstrument {
 }
 ```
 
-Instruments override the `onCreate(Env env)` method to perform custom operations at instrument loading time. Typically, an instrument would use this method to register itself in the existing GraalVM execution environment. As an example, an instrument using AST nodes can be registered in the following way:
+Instruments override the `onCreate(Env env)` method to perform custom operations at instrument loading time.
+Typically, an instrument would use this method to register itself in the existing GraalVM execution environment.
+As an example, an instrument using AST nodes can be registered in the following way:
 
 ```java
 @Override
@@ -325,7 +317,10 @@ Execution event nodes can implement certain callback methods to intercept runtim
 2. `onReturnValue`: executed after a source code element returns a value.
 3. `onReturnExceptional`: executed in case the filtered source code element throws an exception.
 
-Execution event nodes are created on a _per code location_ basis. Therefore, they can be used to store data specific to a given source code location in the instrumented application. As an example, an instrumentation node can simply keep track of all code locations that have already been visited using a node-local flag. Such a node-local `boolean` flag can be used to track the execution of AST nodes in the following way:
+Execution event nodes are created on a _per code location_ basis.
+Therefore, they can be used to store data specific to a given source code location in the instrumented application.
+As an example, an instrumentation node can simply keep track of all code locations that have already been visited using a node-local flag.
+Such a node-local `boolean` flag can be used to track the execution of AST nodes in the following way:
 
 ```java
 // To keep track of all source code locations executed
@@ -349,7 +344,9 @@ public ExecutionEventNode create(final EventContext ec) {
 }
 ```
 
-As the above code shows, an `ExecutionEventNode` is a valid AST node. This implies that the instrumentation code will be optimized by the GraalVM runtime together with the instrumented application, resulting in minimal instrumentation overhead. Furthermore, this allows instrument developers to use the [Truffle framework compiler directives](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html) directly from instrumentation nodes. In the example, compiler directives are used to inform the GraalVM compiler that `visited` can be considered compilation-final.
+As the above code shows, an `ExecutionEventNode` is a valid AST node.
+This implies that the instrumentation code will be optimized by the GraalVM runtime together with the instrumented application, resulting in minimal instrumentation overhead. Furthermore, this allows instrument developers to use the [Truffle framework compiler directives](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html) directly from instrumentation nodes.
+In the example, compiler directives are used to inform the GraalVM compiler that `visited` can be considered compilation-final.
 
 Each instrumentation node is bound to a specific code location. Such locations can be accessed by the agent using the provided [`EventContext`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/EventContext.html) object.
 The context object gives instrumentation nodes access to a variety of information about the current AST nodes being executed. Examples of query APIs available to instrumentation agents through `EventContext` include:
@@ -376,7 +373,9 @@ SourceSectionFilter inputGeneratingLocations = SourceSectionFilter.newBuilder()
 instrumenter.attachExecutionEventFactory(sourceSectionFilter, inputGeneratingLocations, factory);
 ```
 
-The first source section filter (`sourceSectionFilter`, in the example) is a normal filter equivalent to other filters described before, and is used to identify the source code locations to be monitored. The second section filter, `inputGeneratingLocations`, is used by the agent to specify the _intermediate values_ that should be monitored for a certain source section. Intermediate values correspond to _all_ observable values that are involved in the execution of a monitored code element, and are reported to the instrumentation agent by means of the `onInputValue` callback. As an example, let us assume an agent needs to profile all _operand_ values provided to sum operations (i.e., `+`) in JavaScript:
+The first source section filter (`sourceSectionFilter`, in the example) is a normal filter equivalent to other filters described before, and is used to identify the source code locations to be monitored.
+The second section filter, `inputGeneratingLocations`, is used by the agent to specify the _intermediate values_ that should be monitored for a certain source section. Intermediate values correspond to _all_ observable values that are involved in the execution of a monitored code element, and are reported to the instrumentation agent by means of the `onInputValue` callback.
+As an example, let us assume an agent needs to profile all _operand_ values provided to sum operations (i.e., `+`) in JavaScript:
 
 ```javascript
 var a = 3;
@@ -421,11 +420,16 @@ onEnter - VariableWrite
 onReturnValue - VariableWrite
 ```
 
-The `onInputValue` method can be used in combination with source section filters to intercept very fine-grained execution events such as intermediate values used by language expressions. The intermediate values that are accessible to the Instrumentation framework greatly depend on the instrumentation support provided by each language. Moreover, languages may provide additional metadata associated with language-specific `Tag` classes.
+The `onInputValue` method can be used in combination with source section filters to intercept very fine-grained execution events such as intermediate values used by language expressions.
+The intermediate values that are accessible to the Instrumentation framework greatly depend on the instrumentation support provided by each language.
+Moreover, languages may provide additional metadata associated with language-specific `Tag` classes.
 
 ### Altering the Execution Flow of an Application
 
-The instrumentation capabilities that we have presented so far enable users to _observe_ certain aspects of a running application. In addition to passive monitoring of an application's behavior, the Instrument API features support for actively _altering_ the behavior of an application at runtime. Such capabilities can be used to write complex instrumentation agents that affect the behavior of a running application to achieve specific runtime semantics. For example, one could alter the semantics of a running application to ensure that certain methods or functions are never executed (e.g., by throwing an exception when they are called).
+The instrumentation capabilities that we have presented so far enable users to _observe_ certain aspects of a running application.
+In addition to passive monitoring of an application's behavior, the Instrument API features support for actively _altering_ the behavior of an application at runtime.
+Such capabilities can be used to write complex instrumentation agents that affect the behavior of a running application to achieve specific runtime semantics.
+For example, one could alter the semantics of a running application to ensure that certain methods or functions are never executed (e.g., by throwing an exception when they are called).
 
 Instrumentation agents with such capabilities can be implemented by leveraging the `onUnwind` callback in execution event listeners and factories. As an example, let's consider the following JavaScript code:
 
diff --git a/docs/graalvm-as-a-platform/implement-language.md b/docs/graalvm-as-a-platform/implement-language.md
index 28c182776fc9..7657a0cedd10 100644
--- a/docs/graalvm-as-a-platform/implement-language.md
+++ b/docs/graalvm-as-a-platform/implement-language.md
@@ -109,21 +109,17 @@ Then attach a Java remote debugger (like Eclipse) on port 8000.
 
 Languages implemented with the [Truffle framework](https://github.com/oracle/graal/tree/master/truffle) can be packaged as _components_ which later can be installed into GraalVM using the [GraalVM Updater](../reference-manual/graalvm-updater.md) tool.
 Running `mvn package` in the SimpleLanguage folder also builds a `sl-component.jar`.
-This file is the SimpleLanguage component for GraalVM and can be installed by
-running:
+This file is the SimpleLanguage component for GraalVM and can be installed by running:
 ```shell
 gu -L install /path/to/sl-component.jar
 ```
 
 ## SimpleLanguage Native Image
 
-A language built with Truffle can be AOT compiled using [Native Image](../reference-manual/native-image/README.md). Running
-`mvn package` in the SimpleLanguage folder also builds a `slnative` executable
-in the `native` directory. This executable is the full SimpleLanguage
-implementation as a single native application, and has no need for GraalVM in
-order to execute SimpleLanguage code. Besides this, a big advantage of using the
-native executable when compared to running on GraalVM is the greatly faster
-startup time as shown bellow:
+A language built with Truffle can be AOT compiled using [Native Image](../reference-manual/native-image/README.md).
+Running `mvn package` in the SimpleLanguage folder also builds a `slnative` executable in the `native` directory.
+This executable is the full SimpleLanguage implementation as a single native application, and has no need for GraalVM in order to execute SimpleLanguage code.
+Besides this, a big advantage of using the native executable when compared to running on GraalVM is the greatly faster startup time as shown bellow:
 ```shell
 time ./sl language/tests/HelloWorld.sl
 == running on org.graalvm.polyglot.Engine@2db0f6b2
@@ -143,23 +139,16 @@ user    0m0.000s
 sys     0m0.000s
 ```
 
-This snipped shows a timed execution of a "Hello World" program using the `sl`
-launcher script, which runs SimpleLanguage on GraalVM, using Native
-Image. We can see that when running on GraalVM the execution takes 405ms. Since
-our SimpleLanguage program does just one print statement, we can conclude that
-almost all of this time is spent starting up GraalVM and initializing the
-language itself. When using the native executable we see that the execution takes
-only 4ms, showing two orders of magnitude faster startup than running on
-GraalVM.
+This snipped shows a timed execution of a "Hello World" program using the `sl` launcher script, which runs SimpleLanguage on GraalVM, using Native Image.
+We can see that when running on GraalVM the execution takes 405ms.
+Since our SimpleLanguage program does just one print statement, we can conclude that almost all of this time is spent starting up GraalVM and initializing the language itself. When using the native executable we see that the execution takes only 4ms, showing two orders of magnitude faster startup than running on GraalVM.
 
 For more information on the `native-image` tool consider reading the [reference manual](../reference-manual/native-image/README.md).
 
 ### Disable SimpleLanguage Native Image Build
 
-Building the native executable through Maven is attached to the Maven `package`
-phase. Since the native executable build can take a bit of time, we provide the
-option to skip this build by setting the `SL_BUILD_NATIVE` environment variable
-to `false` like so:
+Building the native executable through Maven is attached to the Maven `package` phase.
+Since the native executable build can take a bit of time, we provide the option to skip this build by setting the `SL_BUILD_NATIVE` environment variable to `false` like so:
 
 ```shell
 export SL_BUILD_NATIVE=false
@@ -178,12 +167,11 @@ Skipping the native image build because SL_BUILD_NATIVE is set to false.
 ...
 ```
 
-## Run SimpleLanguage with the Newest Compiler 21.2.0
+## Run SimpleLanguage with the Newest Compiler 21.3.0
 
-In the outstanding case that you need to execute SimpleLanguage with the newest
-version of the GraalVM compiler, please follow these instructions:
+In the outstanding case that you need to execute SimpleLanguage with the newest version of the GraalVM compiler, please follow these instructions:
 
-1. Download the latest [JVMCI JDK 8](https://github.com/graalvm/graal-jvmci-8/releases/) and point JAVA_HOME at it:
+1. Download the latest [JVMCI JDK 8](https://github.com/graalvm/graal-jvmci-8/releases/) and point `JAVA_HOME` at it:
 ```shell
 export JAVA_HOME=/path/to/openjdk-8u292-jvmci-21.1-b04
 ```
@@ -210,61 +198,52 @@ mx build
 ```
 7. Run SimpleLanguage using the mx command:
 ```shell
-mx -v --jdk=jvmci vm -cp /path/to/simplelanguage/launcher/target/launcher-21.2.0-SNAPSHOT.jar:/path/to/simplelanguage/language/target/simplelanguage.jar com.oracle.truffle.sl.launcher.SLMain  /path/to/simplelanguage/language/tests/SlScript.sl
+mx -v --jdk=jvmci vm -cp /path/to/simplelanguage/launcher/target/launcher-21.3.0-SNAPSHOT.jar:/path/to/simplelanguage/language/target/simplelanguage.jar com.oracle.truffle.sl.launcher.SLMain  /path/to/simplelanguage/language/tests/SlScript.sl
 ```
 
 ## Run SimpleLanguage Using Command Line
 
-Executing SimpleLanguage code is normally done with the `sl` script which sets
-up the necessary command line depending on whether `JAVA_HOME` points to
-GraalVM or another JVM installation. The following subsections describe the
-command line for both cases.
+Executing SimpleLanguage code is normally done with the `sl` script which sets up the necessary command line depending on whether `JAVA_HOME` points to GraalVM or another JVM installation.
+The following subsections describe the command line for both cases.
 
 ### Run SimpleLanguage with GraalVM as JAVA_HOME
 
-Assuming `JAVA_HOME` points to the GraalVM installation and that the current
-working directory is the `simplelanguage` directory, to run SimpleLanguage one
-should execute the following command:
+Assuming `JAVA_HOME` points to the GraalVM installation and that the current working directory is the `simplelanguage` directory, to run SimpleLanguage one should execute the following command:
 
 ```shell
 $JAVA_HOME/bin/java \
-    -cp launcher/target/launcher-21.2.0-SNAPSHOT.jar \
+    -cp launcher/target/launcher-21.3.0-SNAPSHOT.jar \
     -Dtruffle.class.path.append=language/target/simplelanguage.jar \
     com.oracle.truffle.sl.launcher.SLMain language/tests/Add.sl
 ```
 
-In short, we place the launcher JAR on the class path and execute its main
-class, but we inform GraalVM of the presence of SimpleLanguage by using the
-`-Dtruffle.class.path.append` option and providing it the path to the fat
-language JAR. Having the language on a separate class path ensures a strong
-separation between the language implementation and its embedding context (in
-this case, the launcher).
+In short, we place the launcher JAR on the class path and execute its main class, but we inform GraalVM of the presence of SimpleLanguage by using the `-Dtruffle.class.path.append` option and providing it the path to the fat language JAR.
+Having the language on a separate class path ensures a strong separation between the language implementation and its embedding context (in this case, the launcher).
 
 #### Disable Class Path Separation
 
 *NOTE! This should only be used during development.*
 
-For development purposes it is useful to disable the class path separation and enable having the
-language implementation on the application class path (for example, for testing
+For development purposes it is useful to disable the class path separation and enable having the language implementation on the application class path (for example, for testing
 the internals of the language).
 
-For the GraalVM distribution based on JDK 8, you can add the `-XX:-UseJVMCIClassLoader`
-option. This disables the class path isolation, enabling the language
-implementation to be placed on the application class path. The command line can
-be as follows:
+For the GraalVM distribution based on JDK 8, you can add the `-XX:-UseJVMCIClassLoader` option.
+This disables the class path isolation, enabling the language implementation to be placed on the application class path.
+The command line can be as follows:
 
 ```shell
 $JAVA_HOME/bin/java \
     -XX:-UseJVMCIClassLoader -Dgraalvm.locatorDisabled=true \
-    -cp launcher/target/launcher-21.2.0-SNAPSHOT.jar:language/target/simplelanguage.jar \
+    -cp launcher/target/launcher-21.3.0-SNAPSHOT.jar:language/target/simplelanguage.jar \
     com.oracle.truffle.sl.launcher.SLMain language/tests/Add.sl
 ```
 
-For the JDK 11-based distribution of GraalVM, the `-XX:-UseJVMCIClassLoader` option
-is not valid. The Java Module System isolation is used. You can achieve the same behavior
-using `--add-exports` or `--upgrade-module-path`. The latter is preferable.
+For the JDK 11-based distribution of GraalVM, the `-XX:-UseJVMCIClassLoader` option is not valid.
+The Java Module System isolation is used. You can achieve the same behavior using `--add-exports` or `--upgrade-module-path`.
+The latter is preferable.
 
-The Language API JAR on Maven Central exports all API packages in its module-info. Apply the `--upgrade-module-path` option together with `-Dgraalvm.locatorDisabled=true` and this JAR to export Language API packages:
+The Language API JAR on Maven Central exports all API packages in its module-info.
+Apply the `--upgrade-module-path` option together with `-Dgraalvm.locatorDisabled=true` and this JAR to export Language API packages:
 ```shell
 -Dgraalvm.locatorDisabled=true --module-path=<yourModulePath>:${truffle.dir} --upgrade-module-path=${truffle.dir}/truffle-api.jar
 ```
@@ -273,18 +252,13 @@ A sample POM using `--upgrade-module-path` to export Language API packages can b
 
 ### Other JVM Implementations
 
-Unlike GraalVM, which includes all the dependencies needed to run a language
-implemented with [Truffle](/graalvm-as-a-platform/language-implementation-framework/), other JVM implementations need additional
-JARs to be present on the class path. These are the Language API and GraalVM SDK
-JARs available from Maven Central.
+Unlike GraalVM, which includes all the dependencies needed to run a language implemented with [Truffle](/graalvm-as-a-platform/language-implementation-framework/), other JVM implementations need additional JARs to be present on the class path.
+These are the Language API and GraalVM SDK JARs available from Maven Central.
 
-Assuming `JAVA_HOME` points to a stock JDK installation, and that the current
-working directory is the `simplelanguage` directory and the Language API and
-GraalVM SDK JARs are present in that directory, one can execute SimpleLanguage
-with the following command:
+Assuming `JAVA_HOME` points to a stock JDK installation, and that the current working directory is the `simplelanguage` directory and the Language API and GraalVM SDK JARs are present in that directory, one can execute SimpleLanguage with the following command:
 
 ```shell
 $JAVA_HOME/bin/java \
-    -cp graal-sdk-21.2.0.jar:truffle-api-21.2.0.jar:launcher/target/launcher-21.2.0-SNAPSHOT.jar:language/target/simplelanguage.jar \
+    -cp graal-sdk-21.3.0.jar:truffle-api-21.3.0.jar:launcher/target/launcher-21.3.0-SNAPSHOT.jar:language/target/simplelanguage.jar \
     com.oracle.truffle.sl.launcher.SLMain language/tests/Add.sl
 ```

From 96e9a9246e1b0aed3ccfda2506809772aae3fd83 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:11:10 +0300
Subject: [PATCH 325/681] Review and update java and java on truffle reference
 docs

---
 .../reference-manual/java-on-truffle/Demos.md |   3 +-
 docs/reference-manual/java-on-truffle/FAQ.md  |   9 +-
 .../java-on-truffle/Interoperability.md       |   2 +-
 .../java-on-truffle/README.md                 |  14 +--
 docs/reference-manual/java/Operations.md      | 119 ++++++------------
 docs/reference-manual/java/Options.md         |   2 +-
 6 files changed, 55 insertions(+), 94 deletions(-)

diff --git a/docs/reference-manual/java-on-truffle/Demos.md b/docs/reference-manual/java-on-truffle/Demos.md
index 16f73280241d..dbf6bf341cf7 100644
--- a/docs/reference-manual/java-on-truffle/Demos.md
+++ b/docs/reference-manual/java-on-truffle/Demos.md
@@ -144,11 +144,10 @@ It is a REPL capable of evaluating Java code and consists of two parts:
 This design naturally fits the point we are trying to illustrate. We can build a native executable of the JShell's UI part, and make it include Java on Truffle to run the code dynamically specified at run time.
 
 Prerequisites:
-* [GraalVM 21.0](/downloads/)
+* [GraalVM 21.3](/downloads/)
 * [Native Image](/reference-manual/native-image/#install-native-image)
 * [Java on Truffle](/reference-manual/java-on-truffle/#install-java-on-truffle)
 
-
 1. Clone the [project](https://github.com/graalvm/graalvm-demos) with the demo applications and navigate to the `espresso-jshell` directory:
 
 ```
diff --git a/docs/reference-manual/java-on-truffle/FAQ.md b/docs/reference-manual/java-on-truffle/FAQ.md
index b54113ff9670..449d10b50e70 100644
--- a/docs/reference-manual/java-on-truffle/FAQ.md
+++ b/docs/reference-manual/java-on-truffle/FAQ.md
@@ -10,7 +10,7 @@ permalink: /reference-manual/java-on-truffle/faq/
 ### Does Java running on Truffle implement the Java language running as a Truffle interpreter?
 
 Not quite: it implements the Java Virtual Machine running as a Truffle interpreter.
-That means it can only run a Java program once it has been compiled to Java bytecode (classes, JARs, etc.) with your favorite Java compiler (e.g., javac) or a build tool (Maven, Gradle, etc.).
+That means it can only run a Java program once it has been compiled to Java bytecode (classes, JARs, etc.) with your favorite Java compiler (e.g., `javac`) or a build tool (Maven, Gradle, etc.).
 In the GraalVM family, this is similar to WebAssembly or the LLVM interpreter: while both can run C programs, they have to be complied by a C compiler first.
 
 ### Does Java running on Truffle run on HotSpot too?
@@ -20,7 +20,7 @@ We plan to extend this capability to macOS and Windows platforms also.
 
 ### Does running Java on Truffle require HotSpot?
 No, it doesn't, it works fine as a native image.
-Java on Truffle does require a standard core Java library (the `rt.jar` library for Java 8 or the `lib/modules` file for Java 11 as well as the associated native libraries: `libjava`, `libnio`, etc.)
+Java on Truffle does require a standard core Java library (the `rt.jar` library for Java 8 or the `lib/modules` file for Java 11 and Java 17 as well as the associated native libraries: `libjava`, `libnio`, etc.)
 
 ### Running Java on GraalVM already brings the highest level of optimization, what benefits will Java on Truffle give me?
 - Java on Truffle will inherit the extensive tooling provided by the Truffle framework. This means that for the things like code coverage and profiling you would no longer need to rely on external tools.
@@ -32,9 +32,8 @@ Java on Truffle does require a standard core Java library (the `rt.jar` library
 Java on Truffle is an implementation of the Java Virtual Machine. It is open source and is offered as free software under the [GNU General Public License version two (GPLv2)](https://github.com/oracle/graal/blob/master/tools/LICENSE).
 
 ### Can I run Java on Truffle in production?
-
 Running in production is not recommended.
-While Java on Truffle already passes the Java Compatibility Kit (JCK or TCK for Java SE) 8 and 11 runtimes, it is still an early prototype and experimental feature in GraalVM.
+While Java on Truffle already passes the Java Compatibility Kit (JCK or TCK for Java SE) 8, 11 and 17 runtimes, it is still an early prototype and experimental feature in GraalVM.
 It may undergo significant improvements before being considered production-ready.
 
 ### What performance can I expect from executing Java on Truffle?
@@ -43,7 +42,7 @@ It does not match the speed offered by GraalVM yet for sure, but having created
 
 ### Can I embed Java running on Truffle in my application?
 Yes, you can use [GraalVM's Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html) to run Java bytecodes in a separate context from the host Java VM.
-You can even embed a Java 8 context in a Java 11 application!
+You can even embed a Java 8 context in a Java 11 or Java 17 application!
 
 ### Why do I see "Unrecognized option: -javaagent:.../idea_rt.jar..." when I try to run my app from the IDE?
 Java on Truffle does not yet support attaching Java agents. For the time being add: `-XX:+IgnoreUnrecognizedVMOptions` to the VM options too.
diff --git a/docs/reference-manual/java-on-truffle/Interoperability.md b/docs/reference-manual/java-on-truffle/Interoperability.md
index 4c4e24b27587..ba0336acce36 100644
--- a/docs/reference-manual/java-on-truffle/Interoperability.md
+++ b/docs/reference-manual/java-on-truffle/Interoperability.md
@@ -21,7 +21,7 @@ How this type is attached to foreign objects is an implementation detail.
 
 ## Polyglot
 
-Java on Truffle provides a guest Java Polyglot API, described in [`polyglot.jar`](#).
+Java on Truffle provides a guest Java Polyglot API, described in `polyglot.jar`.
 This JAR is automatically injected on guest Java contexts but can be excluded with `--java.Polyglot=false`.
 
 You can import the `Polyglot` class to interact with other guest languages:
diff --git a/docs/reference-manual/java-on-truffle/README.md b/docs/reference-manual/java-on-truffle/README.md
index 6dfe6681fbc4..94257a1b9ce5 100644
--- a/docs/reference-manual/java-on-truffle/README.md
+++ b/docs/reference-manual/java-on-truffle/README.md
@@ -18,7 +18,7 @@ The Java on Truffle execution mode runs Java via a Java bytecode interpreter, im
 Now Java can be executed by the same principle as other languages in the GraalVM ecosystem (JavaScript, Ruby, Python, R), directly interoperate with those languages, and pass data back and forth in the same memory space.
 Besides complete language interoperability, with Java on Truffle you can:
 
-- run Java bytecodes in a separate context from the host Java VM. It can run either a Java 8 or Java 11 guest or host JVM. In other words, you can embed a Java 8 context in a Java 11 application, by using [GraalVM’s Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html).
+- run Java bytecodes in a separate context from the host Java VM. It can run either a Java 8, Java 11, Java 17 guest or host JVM. In other words, you can embed a Java 8 context in a Java 11 application, by using [GraalVM’s Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html).
 - leverage the whole stack of tools provided by the Truffle framework, not previously available for Java.
 - have an improved isolation of the host Java VM and the Java program running on Truffle, so you can run less trusted guest code.
 - run in the context of a native image while still allowing dynamically-loaded bytecodes.
@@ -90,13 +90,13 @@ This might be important for options such as `MaxDirectMemorySize` which can be s
 
 #### From Command Line
 
-For the purpose of this guide, GraalVM Enterprise 21.2.0 distribution, based on Java 11 for macOS, is used.
+For the purpose of this guide, GraalVM Enterprise 21.3.0 distribution, based on Java 11 for macOS, is used.
 To ensure you have successfully installed Java on Truffle, verify its version:
 ```shell
 java -truffle -version
-java version "11.0.12" 2021-07-20 LTS
-Java(TM) SE Runtime Environment GraalVM EE 21.2.0 (build 11.0.12+8-LTS-jvmci-21.2-b06)
-Espresso 64-Bit VM GraalVM EE 21.2.0 (build 11-espresso-21.2.0, mixed mode)
+java version "11.0.13" 2021-10-19 LTS
+Java(TM) SE Runtime Environment GraalVM EE 21.3.0 (build 11.0.13+9-LTS-jvmci-21.3-b03)
+Espresso 64-Bit VM GraalVM EE 21.3.0 (build 11-espresso-21.3.0, mixed mode)
 ```
 
 Taking this `HelloWorld.java` example, compile it and run from the command line:
@@ -109,8 +109,8 @@ public class HelloWorld {
 ```
 
 ```shell
-<graalvm>/bin/javac HelloWorld.java
-<graalvm>/bin/java -truffle HelloWorld
+$JAVA_HOME/bin/javac HelloWorld.java
+$JAVA_HOME/bin/java -truffle HelloWorld
 HelloWorld.java!
 ```
 
diff --git a/docs/reference-manual/java/Operations.md b/docs/reference-manual/java/Operations.md
index d295a86b7e84..8954db4ac771 100644
--- a/docs/reference-manual/java/Operations.md
+++ b/docs/reference-manual/java/Operations.md
@@ -9,21 +9,16 @@ permalink: /reference-manual/java/operations/
 
 ## Running the GraalVM Compiler in Native Image vs on the JVM
 
-When running the GraalVM compiler on the JVM, it goes through the same warm-up phase that the
-rest of the Java application does. That is, it is first interpreted before
-its hot methods are compiled. This can translate into slightly longer times
-until the application reaches peak performance when compared to the native compilers
-in the JVM such as C1 and C2.
-
-To address the issue of taking longer to reach to peak performance, **libgraal**
-was introduced -- a shared library, produced using [Native Image](../native-image/README.md) to ahead-of-time compile the compiler itself. That means the GraalVM Enterprise
-compiler is deployed as a native shared library.
-
-In this mode, the
-compiler uses memory separate from the HotSpot heap, and it runs compiled from
-the start. Therefore it has execution properties similar to other native HotSpot
-compilers such as C1 and C2. Currently, this is the **default mode** of
-operation. It can be disabled with `-XX:-UseJVMCINativeLibrary`.
+When running the GraalVM compiler on the JVM, it goes through the same warm-up phase that the rest of the Java application does.
+That is, it is first interpreted before its hot methods are compiled.
+This can translate into slightly longer times until the application reaches peak performance when compared to the native compilers in the JVM such as C1 and C2.
+
+To address the issue of taking longer to reach to peak performance, **libgraal** was introduced -- a shared library, produced using [Native Image](../native-image/README.md) to ahead-of-time compile the compiler itself.
+That means the GraalVM Enterprise compiler is deployed as a native shared library.
+
+In this mode, the compiler uses memory separate from the HotSpot heap, and it runs compiled from the start.
+Therefore it has execution properties similar to other native HotSpot compilers such as C1 and C2.
+Currently, this is the **default mode** of operation. It can be disabled with `-XX:-UseJVMCINativeLibrary`.
 
 ## Measuring Performance
 
@@ -37,47 +32,32 @@ when the compiler is initialized:
 Using Graal compiler configuration 'community' provided by org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory loaded from jar:file:/Users/dsimon/graal/graal/compiler/mxbuild/dists/graal.jar!/org/graalvm/compiler/hotspot/CommunityCompilerConfigurationFactory.class
 ```
 
-Note: The GraalVM compiler is only initialized on the first top-tier JIT compilation request
-so if your application is short-lived, you may not see this output.
+> Note: The GraalVM compiler is only initialized on the first top-tier JIT compilation request so if your application is short-lived, you may not see this output.
 
-Optimizing JVM-based applications is a science in itself. The compilation may not
-even be a factor in the case of poor performance as the problem may
-lie in any other part of the VM (I/O, garbage collection, threading, etc), or in
-a poorly written application or 3rd party library code. For this reason, it's
-worth utilizing the [JDK Mission Control](https://www.oracle.com/java/technologies/jdk-mission-control.html) tool chain to
-diagnose the application behavior.
+Optimizing JVM-based applications is a science in itself.
+The compilation may not even be a factor in the case of poor performance as the problem may lie in any other part of the VM (I/O, garbage collection, threading, etc), or in
+a poorly written application or 3rd party library code. For this reason, it is  worth utilizing the [JDK Mission Control](https://www.oracle.com/java/technologies/jdk-mission-control.html) tool chain to diagnose the application behavior.
 
-You can also compare performance against the native top-tier compiler in the JVM by
-adding `-XX:-UseJVMCICompiler` to the command line.
+You can also compare performance against the native top-tier compiler in the JVM by adding `-XX:-UseJVMCICompiler` to the command line.
 
-If you observe a significant performance regression when using the GraalVM compiler, please
-open an issue on GitHub. Attaching a Java Flight Recorder log and instructions
-to reproduce the issue makes investigation easier and thus the
-chances of a fix higher. Even better is if you can submit a [JMH](http://openjdk.java.net/projects/code-tools/jmh/)
-benchmark that represents the hottest parts of your application (as identified
-by a profiler). This allows us to very quickly pinpoint missing optimization
-opportunities or to offer suggestions on how to restructure the code to
-avoid or reduce performance bottlenecks.
+If you observe a significant performance regression when using the GraalVM compiler, please open an issue on GitHub.
+Attaching a Java Flight Recorder log and instructions to reproduce the issue makes investigation easier and thus the chances of a fix higher.
+Even better is if you can submit a [JMH](http://openjdk.java.net/projects/code-tools/jmh/) benchmark that represents the hottest parts of your application (as identified by a profiler).
+This allows us to very quickly pinpoint missing optimization opportunities or to offer suggestions on how to restructure the code to avoid or reduce performance bottlenecks.
 
 ## Troubleshooting the GraalVM Compiler
 
-Like all software, the GraalVM compiler is not guaranteed to be bug free so it is useful to
-know how to diagnose and submit useful bug reports if you encounter issues.
+Like all software, the GraalVM compiler is not guaranteed to be bug free so it is useful to know how to diagnose and submit useful bug reports if you encounter issues.
 
-If you spot a security vulnerability, please do **not** report it via GitHub Issues or the public mailing lists,
-but via the process outlined at [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
+If you spot a security vulnerability, please do **not** report it via GitHub Issues or the public mailing lists, but via the process outlined at [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
 
 ### Compilation Exceptions
 
-One advantage of the compiler being written in Java is that runtime exceptions during
-compilation are not fatal VM errors. Instead, each compilation has an exception
-handler that takes action based on the `graal.CompilationFailureAction`
-property.
+One advantage of the compiler being written in Java is that runtime exceptions during compilation are not fatal VM errors.
+Instead, each compilation has an exception handler that takes action based on the `graal.CompilationFailureAction` property.
 
-The default value is `Silent`. Specifying `Diagnose` causes failing compilations to be retried
-with extra diagnostics enabled. In this case, just before the VM exits, all diagnostic output
-captured during retried compilations is written to a `.zip` file and its location
-is printed on the console:
+The default value is `Silent`. Specifying `Diagnose` causes failing compilations to be retried with extra diagnostics enabled.
+In this case, just before the VM exits, all diagnostic output captured during retried compilations is written to a `.zip` file and its location is printed on the console:
 ```shell
 Graal diagnostic output saved in /Users/demo/graal-dumps/1499768882600/graal_diagnostics_64565.zip
 ```
@@ -92,11 +72,8 @@ are also supported:
 ### Code Generation Errors
 
 The other type of error you might encounter with compilers is the production of incorrect machine code.
-This error can cause a VM crash, which should produce a file that starts with
-`hs_err_pid` in the current working directory of the VM process. In most cases,
-there is a section in the file that shows the stack at the time of the crash,
-including the type of code for each frame in the stack, as in the following
-example:
+This error can cause a VM crash, which should produce a file that starts with `hs_err_pid` in the current working directory of the VM process.
+In most cases, there is a section in the file that shows the stack at the time of the crash, including the type of code for each frame in the stack, as in the following example:
 
 ```shell
 Stack: [0x00007000020b1000,0x00007000021b1000],  sp=0x00007000021af7a0,  free space=1017k
@@ -106,16 +83,14 @@ j  org.graalvm.compiler.core.gen.NodeLIRBuilder.doBlock(Lorg/graalvm/compiler/no
 j  org.graalvm.compiler.core.LIRGenerationPhase.emitBlock(Lorg/graalvm/compiler/nodes/spi/NodeLIRBuilderTool;Lorg/graalvm/compiler/lir/gen/LIRGenerationResult;Lorg/graalvm/compiler/nodes/cfg/Block;Lorg/graalvm/compiler/nodes/StructuredGraph;Lorg/graalvm/compiler/core/common/cfg/BlockMap;)V+65
 ```
 
-This example shows that the top frame was compiled (J) by the JVMCI compiler,
-which is the GraalVM compiler. The crash occurred at offset 0x141 in the machine
-code produced for:
+This example shows that the top frame was compiled (J) by the JVMCI compiler, which is the GraalVM compiler.
+The crash occurred at offset 0x141 in the machine code produced for:
 ```shell
 org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V
 ```
 
-The next two frames in the stack were executed in the interpreter (j). The
-location of the crash is also often indicated near the top of the file with
-something like this:
+The next two frames in the stack were executed in the interpreter (`j`).
+The location of the crash is also often indicated near the top of the file with something like this:
 ```shell
 # Problematic frame:
 # J 761 JVMCI org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
@@ -123,30 +98,22 @@ something like this:
 
 In this example, there is likely an error in the code produced by the GraalVM compiler for `NodeLIRBuilder.matchComplexExpressions`.
 
-When filing an issue on [GitHub](https://github.com/oracle/graal/issues)
-for such a crash, you should first attempt to reproduce the crash with extra
-diagnostics enabled for the compilation of the problematic method.
+When filing an issue on [GitHub](https://github.com/oracle/graal/issues) for such a crash, you should first attempt to reproduce the crash with extra diagnostics enabled for the compilation of the problematic method.
 In this example, you would add the following to your command line:
 ```shell
 -Dgraal.MethodFilter=NodeLIRBuilder.matchComplexExpressions, -Dgraal.Dump=:2
 ```
 
 These options are described in more detail [here](https://github.com/oracle/graal/blob/master/compiler/docs/Debugging.md).
-In brief, these options tell the compiler to capture snapshots of the compiler state at
-verbosity level 2 while compiling any method named `matchComplexExpressions` in
-a class with a simple name of `NodeLIRBuilder`. The complete format of the
-`MethodFilter` option is described in the output of `java -XX:+JVMCIPrintProperties`.
+In brief, these options tell the compiler to capture snapshots of the compiler state at verbosity level 2 while compiling any method named `matchComplexExpressions` in a class with a simple name of `NodeLIRBuilder`.
+The complete format of the `MethodFilter` option is described in the output of `java -XX:+JVMCIPrintProperties`.
 
-Quite often, the crash location does not exist directly in the problematic method
-mentioned in the crash log but comes from an inlined method.
+Quite often, the crash location does not exist directly in the problematic method mentioned in the crash log but comes from an inlined method.
 
-In such a case, simply filtering for the problematic method might not capture an
-erroneous compilation causing a crash.
+In such a case, simply filtering for the problematic method might not capture an erroneous compilation causing a crash.
 
-To improve the likelihood of capturing an erroneous compilation, you need to
-broaden the `MethodFilter` value. To guide this, add `-Dgraal.PrintCompilation=true`
-when trying to reproduce the crash so you can see what was compiled just before
-the crash.
+To improve the likelihood of capturing an erroneous compilation, you need to broaden the `MethodFilter` value.
+To guide this, add `-Dgraal.PrintCompilation=true` when trying to reproduce the crash so you can see what was compiled just before the crash.
 
 The following shows sample output from the console:
 ```shell
@@ -166,19 +133,15 @@ HotSpotCompilation-1221        Lorg/graalvm/compiler/hotspot/amd64/AMD64HotSpotL
 # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again
 ```
 Here we see that the crash happened in a different method than the first crash.
-As such, we expand the filter argument to be `-Dgraal.MethodFilter=
-NodeLIRBuilder.matchComplexExpressions,AMD64HotSpotLIRGenerator.getResult`
-and run again.
+As such, we expand the filter argument to be `-Dgraal.MethodFilter= NodeLIRBuilder.matchComplexExpressions,AMD64HotSpotLIRGenerator.getResult` and run again.
 
-When the VM crashes in this way, it does not execute the shutdown code that
-archives the GraalVM compiler diagnostic output or delete the directory it was written to.
+When the VM crashes in this way, it does not execute the shutdown code that archives the GraalVM compiler diagnostic output or delete the directory it was written to.
 This must be done manually after the crash.
 
 By default, the directory is `$PWD/graal-dumps/<timestamp>`; for example, `./graal-dumps/1499938817387`.
 However, you can set the directory with `-Dgraal.DumpPath=<path>`.
 
-A message, such as the following, is printed to the console when this
-directory is first used by the compiler:
+A message, such as the following, is printed to the console when this directory is first used by the compiler:
 ```shell
 Dumping debug output in /Users/demo/graal-dumps/1499768882600
 ```
diff --git a/docs/reference-manual/java/Options.md b/docs/reference-manual/java/Options.md
index bae8f2e4eb38..e9bfc3744a2a 100644
--- a/docs/reference-manual/java/Options.md
+++ b/docs/reference-manual/java/Options.md
@@ -133,4 +133,4 @@ Becomes:
 js --jvm --vm.Dgraal.ShowConfiguration=info -version
 ```
 
-Note the `-D` prefix is replaced by `--vm.D`.
+> Note the `-D` prefix is replaced by `--vm.D`.

From 4c209e21aad6a0d8fd24216600294526598e2fb4 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:27:38 +0300
Subject: [PATCH 326/681] Review and update LLVM reference docs

---
 docs/reference-manual/java-on-truffle/README.md | 2 +-
 docs/reference-manual/llvm/Compiling.md         | 4 ++--
 docs/reference-manual/llvm/Debugging.md         | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/reference-manual/java-on-truffle/README.md b/docs/reference-manual/java-on-truffle/README.md
index 94257a1b9ce5..2397311f41aa 100644
--- a/docs/reference-manual/java-on-truffle/README.md
+++ b/docs/reference-manual/java-on-truffle/README.md
@@ -129,7 +129,7 @@ cd spring-petclinic
 
 3. Then run it from the command line by selecting the `-truffle` runtime:
 ```java
-java -truffle -jar target/spring-petclinic-2.4.2.jar
+java -truffle -jar target/spring-petclinic-<version>-SNAPSHOT.jar
 ```
 
 4. When the application starts, access it on [localhost:8000](http://localhost:8080/).
diff --git a/docs/reference-manual/llvm/Compiling.md b/docs/reference-manual/llvm/Compiling.md
index 4c7d74b507b1..4ac85eee3d82 100644
--- a/docs/reference-manual/llvm/Compiling.md
+++ b/docs/reference-manual/llvm/Compiling.md
@@ -41,7 +41,7 @@ For GraalVM Enterprise users, the [manual installation](https://www.graalvm.org/
 
 To get the location of the toolchain, use the `--print-toolchain-path` argument of `lli`:
 ```shell
-export LLVM_TOOLCHAIN=$($GRAALVM_HOME/bin/lli --print-toolchain-path)
+export LLVM_TOOLCHAIN=$($JAVA_HOME/bin/lli --print-toolchain-path)
 ```
 
 See the content of the toolchain path for a list of available tools:
@@ -66,7 +66,7 @@ $LLVM_TOOLCHAIN/clang hello.c -o hello
 
 The resulting executable, `hello`, can be executed on GraalVM using `lli`:
 ```shell
-$GRAALVM_HOME/bin/lli hello
+$JAVA_HOME/bin/lli hello
 ```
 
 ## External Library Dependencies
diff --git a/docs/reference-manual/llvm/Debugging.md b/docs/reference-manual/llvm/Debugging.md
index 6cd9556f5273..81b498d643d9 100644
--- a/docs/reference-manual/llvm/Debugging.md
+++ b/docs/reference-manual/llvm/Debugging.md
@@ -12,13 +12,9 @@ This includes support for single-stepping, breakpoints, and inspection of local
 To use this feature, make sure to compile your program with debug information enabled by specifying the `-g` argument when compiling with `clang` (the LLVM toolchain shipped with GraalVM will automatically enable debug information).
 This gives you the ability to step through the program's source code and set breakpoints in it.
 
-With GraalVM 20.0 and older, the option `--llvm.enableLVI=true` is needed for being able to inspect variables during debugging.
-This option is not enabled by default as it decreases the program's run-time performance.
-Starting with GraalVM 20.1, this option is not needed anymore and thus deprecated.
-
 To start debugging, run `lli` with the `--inspect` option:
 ```shell
-$GRAALVM_HOME/bin/lli --inspect <bitcode file>
+$JAVA_HOME/bin/lli --inspect <bitcode file>
 ```
 
 When launched, the inspector will suspend execution at the first instruction of the program and print a link to the console.

From c7f525d18c508f4d46b8d2f63feafd0e9b4aea46 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:31:57 +0300
Subject: [PATCH 327/681] Review and update NI README

---
 docs/getting-started/graalvm-community/windows.md  |  2 +-
 .../graalvm-enterprise/installation-windows.md     |  2 +-
 docs/reference-manual/native-image/README.md       | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/getting-started/graalvm-community/windows.md b/docs/getting-started/graalvm-community/windows.md
index ada076c6d2ee..51907d8cd8bd 100644
--- a/docs/getting-started/graalvm-community/windows.md
+++ b/docs/getting-started/graalvm-community/windows.md
@@ -44,7 +44,7 @@ Currently, the GraalVM environment on Windows can be extended with [Native Image
 
 ## Prerequisites for Using Native Image on Windows
 
-To start using Native Image on Windows, install Visual Studio Code and Microsoft Visual C++(MSVC). There are two installation options:
+To start using Native Image on Windows, install Visual Studio and Microsoft Visual C++(MSVC). There are two installation options:
   * Install the Visual Studio Code Build Tools with the Windows 10 SDK
   * Install Visual Studio Code with the Windows 10 SDK
 
diff --git a/docs/getting-started/graalvm-enterprise/installation-windows.md b/docs/getting-started/graalvm-enterprise/installation-windows.md
index 06c444287c49..d6f671a1abc4 100644
--- a/docs/getting-started/graalvm-enterprise/installation-windows.md
+++ b/docs/getting-started/graalvm-enterprise/installation-windows.md
@@ -41,7 +41,7 @@ Currently, the GraalVM Enterprise environment on Windows can be extended with [N
 
 ## Prerequisites for Using Native Image on Windows
 
-To start using Native Image on Windows, install Visual Studio Code and Microsoft Visual C++(MSVC). There are two installation options:
+To start using Native Image on Windows, install Visual Studio and Microsoft Visual C++(MSVC). There are two installation options:
   * Install the Visual Studio Code Build Tools with the Windows 10 SDK
   * Install Visual Studio Code with the Windows 10 SDK
 
diff --git a/docs/reference-manual/native-image/README.md b/docs/reference-manual/native-image/README.md
index f54ac4b42196..e435289c4172 100644
--- a/docs/reference-manual/native-image/README.md
+++ b/docs/reference-manual/native-image/README.md
@@ -49,7 +49,7 @@ Run this command to install Native Image:
 gu install native-image
 ```
 After this additional step, the `native-image` executable will become available in
-the `GRAALVM_HOME/bin` directory.
+the `$JAVA_HOME/bin` directory.
 
 The above command will install Native Image from the GitHub catalog for GraalVM Community users.
 For GraalVM Enterprise users, the [manual installation](https://www.graalvm.org/reference-manual/graalvm-updater/#manual-installation) is required.
@@ -80,10 +80,16 @@ xcode-select --install
 ```
 
 #### Prerequisites for Using Native Image on Windows
-Building native images on Windows requires a Microsoft Visual C++ (MSVC) that comes with Visual Studio 2017 15.5.5 or later.
 
-In addition, a proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/).
-On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
+To start using Native Image on Windows, install [Visual Studio](https://visualstudio.microsoft.com/vs/) and Microsoft Visual C++(MSVC). There are two installation options:
+  * Install the Visual Studio Code Build Tools with the Windows 10 SDK
+  * Install Visual Studio Code with the Windows 10 SDK
+
+You can use Visual Studio 2017 version 15.9 or later.
+
+Lastly, on Windows, the `native-image` builder will only work when it is executed from the **x64 Native Tools Command Prompt**.
+The command for initiating an x64 Native Tools command prompt is different if you only have the Visual Studio Build Tools installed, versus if you have the full VS Code 2019 installed.
+Check [this link](https://medium.com/graalvm/using-graalvm-and-native-image-on-windows-10-9954dc071311) for step-by-step instructions.
 
 ## Build a Native Image
 

From 23925be228f1aa49daeda70b5a9cfb002ff5972e Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:33:29 +0300
Subject: [PATCH 328/681] Update versions in truffle/docs

---
 truffle/docs/README.md                     | 4 ++--
 truffle/docs/TraversingCompilationQueue.md | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/truffle/docs/README.md b/truffle/docs/README.md
index cb063485ac24..8ef647671c92 100644
--- a/truffle/docs/README.md
+++ b/truffle/docs/README.md
@@ -17,12 +17,12 @@ The Truffle bits are uploaded to [Maven central](https://mvnrepository.com/artif
 <dependency>
     <groupId>org.graalvm.truffle</groupId>
     <artifactId>truffle-api</artifactId>
-    <version>21.2.0</version> <!-- or any later version -->
+    <version>21.3.0</version> <!-- or any later version -->
 </dependency>
 <dependency>
     <groupId>org.graalvm.truffle</groupId>
     <artifactId>truffle-dsl-processor</artifactId>
-    <version>21.2.0</version>
+    <version>21.3.0</version>
     <scope>provided</scope>
 </dependency>
 ```
diff --git a/truffle/docs/TraversingCompilationQueue.md b/truffle/docs/TraversingCompilationQueue.md
index edc8d19a55b9..a8446eeea5a0 100644
--- a/truffle/docs/TraversingCompilationQueue.md
+++ b/truffle/docs/TraversingCompilationQueue.md
@@ -6,7 +6,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/TraversingCo
 ---
 # Truffle Approach to the Compilation Queue
 
-As of version 21.2.0 Truffle has a new approach to compilation queueing.
+As of version 21.3.0 Truffle has a new approach to compilation queueing.
 This document gives motivation and an overview of this approach.
 
 ## What is a Compilation queue?
@@ -70,7 +70,7 @@ This gives a priority boost to targets that are currently "very hot" when compar
 
 For performance reasons the weight for tasks is cached and reused for a period of 1ms. If the cached value is older than 1ms, it is recalculated.
 
-The traversing compilation queue is on by default as of version 21.2.0 and can be disabled using `--engine.TraversingCompilationQueue=false`.
+The traversing compilation queue is on by default as of version 21.3.0 and can be disabled using `--engine.TraversingCompilationQueue=false`.
 
 ## Dynamic Compilation Thresholds
 
@@ -135,5 +135,5 @@ MinScale >|/     .                               .
               MinNormalLoad                   MaxNormalLoad
 ```
 
-The dynamic thresholds only work with the traversing compilation queue and are on by default as of version 21.2.0.
+The dynamic thresholds only work with the traversing compilation queue and are on by default as of version 21.3.0.
 They can be disabled with `--engine.DynamicCompilationThresholds=false`.

From 99c599d531c0070ad11a66cf20a36f83160f19b8 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 7 Oct 2021 12:41:49 +0200
Subject: [PATCH 329/681] Drop duplicated item from changelog.

---
 truffle/CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index 52e95d5e5dfc..962c7f6eac5f 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -6,8 +6,6 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 * Truffle DSL generated code now inherits all annotations on constructor parameters to the static create factory method.
 * Added a [Message#getId()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/library/Message.html#getId--) method returning a unique message id within a library.
 * Added a [LibraryFactory#getMessages()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/library/LibraryFactory.html#getMessages--) method returning a list of messages that the library provides.
-
-*  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` is deprecated and so will be `TruffleRuntime#createCallTarget()` soon. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
 *  Changed behavior of `RootNode#getCallTarget()` such that it lazily initializes its call target. This enforces a one-to-one relationship between root nodes and call targets, which avoids several problems, for example, with regard to instrumentation. As a consequence, `RootNode.setCallTarget()` and `TruffleRuntime#createCallTarget()` are deprecated now. Please use `RootNode#getCallTarget()` to access the call target of a root node from now on.
 * In `TruffleLanguage.finalizeContext(Object)`, there is a new requirement for leaving all remaining unclosed inner contexts created by the language on all threads where the contexts are still active.
 No active inner context is allowed after `TruffleLanguage.finalizeContext(Object)` returns. Not complying with this requirement will result in an internal error. Please note that inactive inner contexts are still closed implicitly by the parent context.

From 5463b06da871ae1202ff757ec3cd2c82cc86b95e Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 6 Oct 2021 00:05:45 +0200
Subject: [PATCH 330/681] remove Graal support for jaotc

---
 compiler/mx.compiler/mx_compiler.py           |   2 -
 .../compiler/code/CompilationResult.java      |  49 +-
 .../amd64/AMD64ArithmeticLIRGenerator.java    |   3 +-
 .../core/amd64/AMD64LIRGenerator.java         |   5 +-
 .../compiler/core/common/GraalOptions.java    |  10 -
 .../core/test/CheckGraalInvariants.java       |   7 +-
 .../compiler/core/gen/LIRCompilerBackend.java |   5 -
 .../compiler/core/phases/BaseTier.java        |  12 +-
 .../phases/EconomyCompilerConfiguration.java  |   6 +-
 .../compiler/core/phases/EconomyHighTier.java |   5 +-
 .../compiler/core/phases/EconomyLowTier.java  |   5 +-
 .../compiler/core/phases/EconomyMidTier.java  |   5 +-
 .../compiler/core/phases/HighTier.java        |   2 +-
 .../graalvm/compiler/core/phases/LowTier.java |   2 +-
 .../graalvm/compiler/core/phases/MidTier.java |   2 +-
 .../aarch64/AArch64HotSpotBackend.java        |  32 +-
 .../AArch64HotSpotDirectStaticCallOp.java     |   2 +-
 .../AArch64HotSpotDirectVirtualCallOp.java    |   2 +-
 .../aarch64/AArch64HotSpotLIRGenerator.java   | 125 +---
 .../aarch64/AArch64HotSpotLoadAddressOp.java  |  10 +-
 .../AArch64HotSpotLoadConfigValueOp.java      |  85 ---
 .../hotspot/aarch64/AArch64HotSpotMove.java   |  37 +-
 .../aarch64/AArch64IndirectCallOp.java        |   2 +-
 .../amd64/AMD64HotSpotAddressLowering.java    |  37 +-
 .../hotspot/amd64/AMD64HotSpotBackend.java    |  35 +-
 .../amd64/AMD64HotSpotBackendFactory.java     |   2 +-
 .../amd64/AMD64HotSpotDirectStaticCallOp.java |   2 +-
 .../amd64/AMD64HotSpotLIRGenerator.java       | 120 +---
 .../amd64/AMD64HotSpotLoadConfigValueOp.java  |  83 ---
 .../amd64/AMD64HotSpotLoweringProvider.java   |  11 -
 .../hotspot/amd64/AMD64HotSpotMove.java       |  21 +-
 .../amd64/AMD64HotSpotSafepointOp.java        |  25 +-
 .../AMD64HotspotDirectVirtualCallOp.java      |   2 +-
 .../hotspot/amd64/AMD64IndirectCallOp.java    |   2 +-
 .../test/AheadOfTimeCompilationTest.java      | 210 ------
 ...inateRedundantInitializationPhaseTest.java | 226 -------
 .../test/HotSpotInvokeDynamicPluginTest.java  | 149 -----
 .../test/HotSpotLazyInitializationTest.java   |  77 ---
 .../test/LoadJavaMirrorWithKlassTest.java     | 123 ----
 .../test/ReplaceConstantNodesPhaseTest.java   | 164 -----
 .../hotspot/AOTGraalHotSpotVMConfig.java      |  59 --
 .../CompilerRuntimeHotSpotVMConfig.java       |  46 --
 .../compiler/hotspot/EncodedSnippets.java     |   2 +-
 .../compiler/hotspot/HotSpotBackend.java      |  41 --
 .../hotspot/HotSpotCompiledCodeBuilder.java   |   2 +-
 .../compiler/hotspot/HotSpotGraalRuntime.java |   3 +-
 .../compiler/hotspot/HotSpotLIRGenerator.java | 104 ---
 .../compiler/hotspot/HotSpotMarkId.java       |   4 +
 .../meta/DefaultHotSpotLoweringProvider.java  |  36 +-
 .../HotSpotAOTClassInitializationPlugin.java  |  96 ---
 .../meta/HotSpotAOTProfilingPlugin.java       |  81 ---
 .../HotSpotGraalConstantFieldProvider.java    |  57 +-
 .../meta/HotSpotGraphBuilderPlugins.java      |  61 +-
 .../meta/HotSpotHostForeignCallsProvider.java |  22 -
 .../meta/HotSpotInvocationPlugins.java        |  28 -
 .../meta/HotSpotInvokeDynamicPlugin.java      | 159 -----
 .../hotspot/meta/HotSpotNodePlugin.java       |  18 +-
 .../hotspot/meta/HotSpotProfilingPlugin.java  | 108 ----
 .../hotspot/meta/HotSpotSuitesProvider.java   |  57 +-
 .../nodes/GraalHotSpotVMConfigNode.java       | 178 ------
 .../hotspot/nodes/aot/EncodedSymbolNode.java  |  72 ---
 .../nodes/aot/InitializeKlassNode.java        |  64 --
 .../nodes/aot/InitializeKlassStubCall.java    | 115 ----
 .../aot/LoadConstantIndirectlyFixedNode.java  | 109 ----
 .../nodes/aot/LoadConstantIndirectlyNode.java | 105 ---
 .../aot/LoadMethodCountersIndirectlyNode.java |  87 ---
 .../nodes/aot/LoadMethodCountersNode.java     |  67 --
 .../nodes/aot/ResolveConstantNode.java        |  69 --
 .../nodes/aot/ResolveConstantStubCall.java    | 117 ----
 .../nodes/aot/ResolveDynamicConstantNode.java |  65 --
 .../nodes/aot/ResolveDynamicStubCall.java     | 116 ----
 .../aot/ResolveMethodAndLoadCountersNode.java |  64 --
 .../ResolveMethodAndLoadCountersStubCall.java |  95 ---
 .../nodes/profiling/ProfileBranchNode.java    |  92 ---
 .../nodes/profiling/ProfileInvokeNode.java    |  58 --
 .../hotspot/nodes/profiling/ProfileNode.java  | 149 -----
 .../ProfileWithNotificationNode.java          |  67 --
 .../nodes/profiling/RandomSeedNode.java       |  54 --
 .../phases/AheadOfTimeVerificationPhase.java  | 114 ----
 .../phases/LoadJavaMirrorWithKlassPhase.java  | 148 -----
 .../hotspot/phases/aot/AOTInliningPolicy.java | 118 ----
 ...EliminateRedundantInitializationPhase.java | 259 --------
 .../phases/aot/ReplaceConstantNodesPhase.java | 603 ------------------
 .../profiling/FinalizeProfileNodesPhase.java  | 175 -----
 .../HotSpotAllocationSnippets.java            |  93 +--
 .../HotSpotG1WriteBarrierSnippets.java        |   7 +-
 .../replacements/HotSpotReplacementsUtil.java |  33 +-
 .../HotSpotSerialWriteBarrierSnippets.java    |   3 +-
 .../hotspot/replacements/HubGetClassNode.java |   3 +-
 .../replacements/InstanceOfSnippets.java      |   6 -
 .../aot/ResolveConstantSnippets.java          | 232 -------
 .../ProbabilisticProfileSnippets.java         | 184 ------
 .../profiling/ProfileSnippets.java            | 166 -----
 .../hotspot/stubs/ForeignCallSnippets.java    |   8 +-
 .../graalvm/compiler/hotspot/stubs/Stub.java  |   5 +-
 .../graalvm/compiler/java/BytecodeParser.java |  81 +--
 .../compiler/lir/aarch64/AArch64Call.java     |  25 +-
 .../compiler/lir/aarch64/AArch64Move.java     |  14 +-
 .../graalvm/compiler/lir/amd64/AMD64Call.java |   5 +-
 .../graalvm/compiler/lir/amd64/AMD64Move.java |  14 +-
 .../lir/asm/CompilationResultBuilder.java     |   6 +-
 .../lir/GraalCompilerState.java               |   6 +-
 .../compiler/nodes/CompressionNode.java       |  10 +-
 .../graalvm/compiler/nodes/EncodedGraph.java  |  13 +-
 .../compiler/nodes/StructuredGraph.java       |  54 --
 .../compiler/nodes/calc/CompareNode.java      |  11 +-
 .../compiler/nodes/extended/LoadHubNode.java  |  33 +-
 .../nodes/extended/LoadHubOrNullNode.java     |  25 +-
 .../GraphBuilderConfiguration.java            |  20 -
 .../graphbuilderconf/InvokeDynamicPlugin.java |  84 ---
 .../graphbuilderconf/ProfilingPlugin.java     |  41 --
 .../nodes/java/DynamicNewArrayNode.java       |   7 -
 .../nodes/java/DynamicNewInstanceNode.java    |   7 -
 .../phases/common/inlining/InliningUtil.java  |   6 -
 .../compiler/replacements/PEGraphDecoder.java |   5 -
 .../replacements/SnippetTemplate.java         |  14 +-
 .../arraycopy/ArrayCopySnippets.java          |   5 -
 .../replacements/nodes/AssertionNode.java     |  12 +-
 .../nodes/IdentityHashCodeNode.java           |   5 -
 ...fleCallBoundaryInstrumentationFactory.java |   2 +-
 .../aarch64/SubstrateAArch64Backend.java      |   2 +-
 .../graal/amd64/SubstrateAMD64Backend.java    |   2 +-
 .../svm/core/graal/llvm/NodeLLVMBuilder.java  |   1 -
 .../graal/meta/SubstrateReplacements.java     |   2 +-
 .../com/oracle/svm/graal/GraalSupport.java    |   2 +-
 vm/mx.vm/mx_vm_gate.py                        |  80 +--
 126 files changed, 256 insertions(+), 6926 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotLazyInitializationTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTClassInitializationPlugin.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvokeDynamicPlugin.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java
 delete mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvokeDynamicPlugin.java
 delete mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index f3fb32bb8dd1..e3475a4188d4 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -562,7 +562,6 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
 _g1VerificationFlags = ['-XX:-UseSerialGC', '-XX:+UseG1GC']
 _exceptionFlags = ['-Dgraal.StressInvokeWithExceptionNode=true']
 _registerPressureFlags = ['-Dgraal.RegisterPressure=' + _registers[mx.get_arch()]]
-_immutableCodeFlags = ['-Dgraal.ImmutableCode=true']
 
 graal_bootstrap_tests = [
     BootstrapTest('BootstrapWithSystemAssertionsFullVerify', _defaultFlags + _assertionFlags + _verificationFlags + _graalErrorFlags, tags=GraalTags.bootstrapfullverify),
@@ -573,7 +572,6 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     BootstrapTest('BootstrapWithSystemAssertionsEconomy', _defaultFlags + _assertionFlags + _graalEconomyFlags + _graalErrorFlags, tags=GraalTags.bootstrap),
     BootstrapTest('BootstrapWithSystemAssertionsExceptionEdges', _defaultFlags + _assertionFlags + _exceptionFlags + _graalErrorFlags, tags=GraalTags.bootstrap),
     BootstrapTest('BootstrapWithSystemAssertionsRegisterPressure', _defaultFlags + _assertionFlags + _registerPressureFlags + _graalErrorFlags, tags=GraalTags.bootstrap),
-    BootstrapTest('BootstrapWithSystemAssertionsImmutableCode', _defaultFlags + _assertionFlags + _immutableCodeFlags + ['-Dgraal.VerifyPhases=true'] + _graalErrorFlags, tags=GraalTags.bootstrap)
 ]
 
 def _graal_gate_runner(args, tasks):
diff --git a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
index 81dcedc60999..3c422def1e3d 100644
--- a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
+++ b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
@@ -37,7 +37,6 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.compiler.core.common.CompilationIdentifier;
 import org.graalvm.compiler.graph.NodeSourcePosition;
@@ -58,7 +57,6 @@
 import jdk.vm.ci.code.site.Site;
 import jdk.vm.ci.meta.Assumptions.Assumption;
 import jdk.vm.ci.meta.InvokeTarget;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
 
@@ -239,33 +237,17 @@ public String toString() {
      */
     private SpeculationLog speculationLog;
 
-    /**
-     * The list of fields that were accessed from the bytecodes.
-     */
-    private ResolvedJavaField[] fields;
-
     private int bytecodeSize;
 
     private boolean hasUnsafeAccess;
 
-    private boolean isImmutablePIC;
-
     public CompilationResult(CompilationIdentifier compilationId) {
-        this(compilationId, null, false);
+        this(compilationId, null);
     }
 
     public CompilationResult(CompilationIdentifier compilationId, String name) {
-        this(compilationId, name, false);
-    }
-
-    public CompilationResult(CompilationIdentifier compilationId, boolean isImmutablePIC) {
-        this(compilationId, null, isImmutablePIC);
-    }
-
-    public CompilationResult(CompilationIdentifier compilationId, String name, boolean isImmutablePIC) {
         this.compilationId = compilationId;
         this.name = name;
-        this.isImmutablePIC = isImmutablePIC;
     }
 
     public CompilationResult(String name) {
@@ -406,31 +388,6 @@ public SpeculationLog getSpeculationLog() {
         return speculationLog;
     }
 
-    /**
-     * Sets the fields that were referenced from the bytecodes that were used as input to the
-     * compilation.
-     *
-     * @param accessedFields the collected set of fields accessed during compilation
-     */
-    public void setFields(EconomicSet<ResolvedJavaField> accessedFields) {
-        if (accessedFields != null) {
-            fields = accessedFields.toArray(new ResolvedJavaField[accessedFields.size()]);
-        }
-    }
-
-    /**
-     * Gets the fields that were referenced from bytecodes that were used as input to the
-     * compilation.
-     *
-     * The caller must not modify the contents of the returned array.
-     *
-     * @return {@code null} if the compilation did not record fields dependencies otherwise the
-     *         fields that were accessed from bytecodes were used as input to the compilation.
-     */
-    public ResolvedJavaField[] getFields() {
-        return fields;
-    }
-
     public void setBytecodeSize(int bytecodeSize) {
         checkOpen();
         this.bytecodeSize = bytecodeSize;
@@ -475,10 +432,6 @@ public void setMaxInterpreterFrameSize(int maxInterpreterFrameSize) {
         this.maxInterpreterFrameSize = maxInterpreterFrameSize;
     }
 
-    public boolean isImmutablePIC() {
-        return this.isImmutablePIC;
-    }
-
     /**
      * Sets the machine that has been generated by the compiler.
      *
diff --git a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java
index 5989749c0d67..ad9af381ee30 100644
--- a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java
@@ -79,7 +79,6 @@
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD;
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS;
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue;
 import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
@@ -1370,7 +1369,7 @@ public void emitCompareOp(AMD64Kind cmpKind, Variable left, Value right) {
                 return;
             } else if (c instanceof VMConstant) {
                 VMConstant vc = (VMConstant) c;
-                if (size == DWORD && !GeneratePIC.getValue(getOptions()) && getLIRGen().target().inlineObjects) {
+                if (size == DWORD && getLIRGen().target().inlineObjects) {
                     getLIRGen().append(new AMD64BinaryConsumer.VMConstOp(CMP.getMIOpcode(DWORD, false), left, vc));
                 } else {
                     getLIRGen().append(new AMD64BinaryConsumer.DataOp(CMP.getRMOpcode(size), size, left, vc));
diff --git a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
index c43fc61c27e5..baf0eb032138 100644
--- a/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java
@@ -33,7 +33,6 @@
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD;
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS;
 import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue;
 import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
@@ -349,7 +348,7 @@ private void emitRawCompareBranch(OperandSize size, Variable left, Value right,
                 return;
             } else if (c instanceof VMConstant) {
                 VMConstant vc = (VMConstant) c;
-                if (size == DWORD && !GeneratePIC.getValue(getResult().getLIR().getOptions()) && target().inlineObjects) {
+                if (size == DWORD && target().inlineObjects) {
                     append(new CmpConstBranchOp(DWORD, left, vc, null, cond, trueLabel, falseLabel, trueLabelProbability));
                 } else {
                     append(new CmpDataBranchOp(size, left, vc, cond, trueLabel, falseLabel, trueLabelProbability));
@@ -573,7 +572,7 @@ public void emitMembar(int barriers) {
     @Override
     protected void emitForeignCallOp(ForeignCallLinkage linkage, Value targetAddress, Value result, Value[] arguments, Value[] temps, LIRFrameState info) {
         long maxOffset = linkage.getMaxCallTargetOffset();
-        if (maxOffset != (int) maxOffset && !GeneratePIC.getValue(getResult().getLIR().getOptions())) {
+        if (maxOffset != (int) maxOffset) {
             append(new AMD64Call.DirectFarForeignCallOp(linkage, result, arguments, temps, info));
         } else {
             append(new AMD64Call.DirectNearForeignCallOp(linkage, result, arguments, temps, info));
diff --git a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
index 3f73efbfaa7d..02539c0d3c31 100644
--- a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
+++ b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/GraalOptions.java
@@ -199,16 +199,6 @@ public final class GraalOptions {
     @Option(help = "", type = OptionType.Debug)
     public static final OptionKey<Boolean> CanOmitFrame = new OptionKey<>(true);
 
-    // Ahead of time compilation
-    @Option(help = "Try to avoid emitting code where patching is required", type = OptionType.Expert)
-    public static final OptionKey<Boolean> ImmutableCode = new OptionKey<>(false);
-
-    @Option(help = "Generate position independent code", type = OptionType.Expert)
-    public static final OptionKey<Boolean> GeneratePIC = new OptionKey<>(false);
-
-    @Option(help = "Generate verify oop checks in AOT code", type = OptionType.Expert)
-    public static final OptionKey<Boolean> AOTVerifyOops = new OptionKey<>(false);
-
     // Runtime settings
     @Option(help = "", type = OptionType.Expert)
     public static final OptionKey<Boolean> SupportJsrBytecodes = new OptionKey<>(true);
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
index bd0cc6fc1601..247d4727bb19 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
@@ -57,6 +57,7 @@
 import org.graalvm.compiler.api.test.ModuleSupport;
 import org.graalvm.compiler.bytecode.BridgeMethodUtils;
 import org.graalvm.compiler.core.CompilerThreadFactory;
+import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
 import org.graalvm.compiler.debug.DebugCloseable;
@@ -533,7 +534,11 @@ private static void collectOptionFieldUsages(Map<ResolvedJavaField, Set<Resolved
     private static void checkOptionFieldUsages(List<String> errors, Map<ResolvedJavaField, Set<ResolvedJavaMethod>> optionFieldUsages) {
         for (Map.Entry<ResolvedJavaField, Set<ResolvedJavaMethod>> e : optionFieldUsages.entrySet()) {
             if (e.getValue().isEmpty()) {
-                errors.add("No uses found for " + e.getKey().format("%H.%n"));
+                if (e.getKey().format("%H.%n").equals(GraalOptions.VerifyPhases.getDescriptor().getLocation())) {
+                    // Special case: This option may only have downstream uses
+                } else {
+                    errors.add("No uses found for " + e.getKey().format("%H.%n"));
+                }
             }
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java
index 66fa406fdee1..e6e17723389c 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java
@@ -27,7 +27,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.graalvm.collections.EconomicSet;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.LIRGenerationPhase;
 import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext;
@@ -67,7 +66,6 @@
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
 import jdk.vm.ci.meta.VMConstant;
@@ -91,7 +89,6 @@ public static <T extends CompilationResult> void emitBackEnd(StructuredGraph gra
                                 graph.getAssumptions(),
                                 graph.method(),
                                 graph.getMethods(),
-                                graph.getFields(),
                                 graph.getSpeculationLog(),
                                 bytecodeSize,
                                 lirGen,
@@ -199,7 +196,6 @@ public static void emitCode(Backend backend,
                     Assumptions assumptions,
                     ResolvedJavaMethod rootMethod,
                     Collection<ResolvedJavaMethod> inlinedMethods,
-                    EconomicSet<ResolvedJavaField> accessedFields,
                     SpeculationLog speculationLog,
                     int bytecodeSize,
                     LIRGenerationResult lirGenRes,
@@ -218,7 +214,6 @@ public static void emitCode(Backend backend,
             }
             if (rootMethod != null) {
                 compilationResult.setMethods(rootMethod, inlinedMethods);
-                compilationResult.setFields(accessedFields);
                 compilationResult.setBytecodeSize(bytecodeSize);
             }
             if (speculationLog != null) {
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
index b577e522672a..ad9e6e57bf16 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/BaseTier.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.compiler.core.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies;
 import org.graalvm.compiler.nodes.loop.LoopPolicies;
 import org.graalvm.compiler.options.OptionValues;
@@ -38,13 +36,7 @@ public LoopPolicies createLoopPolicies(@SuppressWarnings("unused") OptionValues
         return new DefaultLoopPolicies();
     }
 
-    public CanonicalizerPhase createCanonicalizerPhase(OptionValues options) {
-        CanonicalizerPhase canonicalizer = null;
-        if (ImmutableCode.getValue(options)) {
-            canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization();
-        } else {
-            canonicalizer = CanonicalizerPhase.create();
-        }
-        return canonicalizer;
+    public CanonicalizerPhase createCanonicalizerPhase() {
+        return CanonicalizerPhase.create();
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java
index 73ccbaca39a2..87fed39234b7 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java
@@ -48,17 +48,17 @@ public class EconomyCompilerConfiguration implements CompilerConfiguration {
 
     @Override
     public PhaseSuite<HighTierContext> createHighTier(OptionValues options) {
-        return new EconomyHighTier(options);
+        return new EconomyHighTier();
     }
 
     @Override
     public PhaseSuite<MidTierContext> createMidTier(OptionValues options) {
-        return new EconomyMidTier(options);
+        return new EconomyMidTier();
     }
 
     @Override
     public PhaseSuite<LowTierContext> createLowTier(OptionValues options) {
-        return new EconomyLowTier(options);
+        return new EconomyLowTier();
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
index a2a83f2a095e..4950478c89c8 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyHighTier.java
@@ -25,15 +25,14 @@
 package org.graalvm.compiler.core.phases;
 
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.LoweringPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
 
 public class EconomyHighTier extends BaseTier<HighTierContext> {
 
-    public EconomyHighTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
+    public EconomyHighTier() {
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         appendPhase(canonicalizer);
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER, true));
     }
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
index b67add26ef31..4ef1d8ae2fe9 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyLowTier.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.core.phases;
 
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.ExpandLogicPhase;
 import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
@@ -35,8 +34,8 @@
 
 public class EconomyLowTier extends BaseTier<LowTierContext> {
 
-    public EconomyLowTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
+    public EconomyLowTier() {
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER));
         appendPhase(new IncrementalCanonicalizerPhase<>(canonicalizer, new ExpandLogicPhase()));
         appendPhase(new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS));
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
index 3b6e136a7686..449032907ae9 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/EconomyMidTier.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.core.phases;
 
 import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
 import org.graalvm.compiler.phases.common.GuardLoweringPhase;
@@ -37,8 +36,8 @@
 
 public class EconomyMidTier extends BaseTier<MidTierContext> {
 
-    public EconomyMidTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase(options);
+    public EconomyMidTier() {
+        CanonicalizerPhase canonicalizer = this.createCanonicalizerPhase();
         appendPhase(new RemoveValueProxyPhase());
         appendPhase(new LoopSafepointInsertionPhase());
         appendPhase(new GuardLoweringPhase());
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
index f0090dcb2e26..8f764b74a58c 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/HighTier.java
@@ -69,7 +69,7 @@ public static class Options {
     }
 
     public HighTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         appendPhase(canonicalizer);
 
         if (NodeCounterPhase.Options.NodeCounters.getValue(options)) {
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
index 67b8b0e5c0e3..9d48abf0ebd9 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/LowTier.java
@@ -56,7 +56,7 @@ static class Options {
     }
 
     public LowTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
         CanonicalizerPhase canonicalizerWithoutGVN = canonicalizer.copyWithoutGVN();
 
         if (Options.ProfileCompiledMethods.getValue(options)) {
diff --git a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
index 7227895cbae1..285cb3490f3b 100644
--- a/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
+++ b/compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java
@@ -66,7 +66,7 @@
 public class MidTier extends BaseTier<MidTierContext> {
 
     public MidTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = createCanonicalizerPhase(options);
+        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
 
         appendPhase(new LockEliminationPhase());
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
index ce6b98a1f7c5..133ddbf5fd1e 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java
@@ -32,7 +32,6 @@
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp;
 import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
 
 import org.graalvm.compiler.asm.Assembler;
@@ -44,7 +43,6 @@
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules;
-import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.gen.LIRGenerationProvider;
@@ -55,7 +53,6 @@
 import org.graalvm.compiler.hotspot.HotSpotHostBackend;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
 import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -83,7 +80,6 @@
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
-import jdk.vm.ci.hotspot.HotSpotSentinelConstant;
 import jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
@@ -136,8 +132,7 @@ public InstalledCode createInstalledCode(DebugContext debug,
                     boolean isDefault,
                     Object[] context) {
         boolean isStub = (method == null);
-        boolean isAOT = compilationResult.isImmutablePIC();
-        if (!isStub && !isAOT) {
+        if (!isStub) {
             // Non-stub compilation results are installed into HotSpot as nmethods. As AArch64 has
             // a constraint that the instruction at nmethod verified entry point should be a nop or
             // jump, AArch64HotSpotBackend always generate a nop placeholder before the code body
@@ -336,7 +331,7 @@ private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod ins
             Register klass = r10;
             if (config.useCompressedClassPointers) {
                 masm.ldr(32, klass, klassAddress);
-                AArch64HotSpotMove.decodeKlassPointer(crb, masm, klass, klass, config.getKlassEncoding());
+                AArch64HotSpotMove.decodeKlassPointer(masm, klass, klass, config.getKlassEncoding());
             } else {
                 masm.ldr(64, klass, klassAddress);
             }
@@ -351,23 +346,6 @@ private void emitCodePrefix(CompilationResultBuilder crb, ResolvedJavaMethod ins
         masm.align(config.codeEntryAlignment);
         masm.bind(verifiedStub);
         crb.recordMark(crb.compilationResult.getEntryBCI() != -1 ? HotSpotMarkId.OSR_ENTRY : HotSpotMarkId.VERIFIED_ENTRY);
-
-        if (GeneratePIC.getValue(crb.getOptions())) {
-            // Check for method state
-            HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext;
-            if (!frameContext.isStub) {
-                crb.recordInlineDataInCodeWithNote(new HotSpotSentinelConstant(LIRKind.value(AArch64Kind.QWORD), JavaKind.Long), HotSpotConstantLoadAction.MAKE_NOT_ENTRANT);
-                try (ScratchRegister sc = masm.getScratchRegister()) {
-                    Register scratch = sc.getRegister();
-                    masm.adrpAdd(scratch);
-                    masm.ldr(64, scratch, AArch64Address.createBaseRegisterOnlyAddress(64, scratch));
-                    Label noCall = new Label();
-                    masm.cbz(64, scratch, noCall);
-                    AArch64Call.directJmp(crb, masm, getForeignCalls().lookupForeignCall(WRONG_METHOD_HANDLER));
-                    masm.bind(noCall);
-                }
-            }
-        }
     }
 
     private static void emitCodeBody(CompilationResultBuilder crb, LIR lir, AArch64MacroAssembler masm) {
@@ -382,10 +360,8 @@ private static void emitCodeBody(CompilationResultBuilder crb, LIR lir, AArch64M
      * @see "http://mail.openjdk.java.net/pipermail/aarch64-port-dev/2013-September/000273.html"
      */
     public static void emitInvalidatePlaceholder(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        if (!GeneratePIC.getValue(crb.getOptions())) {
-            crb.blockComment("[nop for method invalidation]");
-            masm.nop();
-        }
+        crb.blockComment("[nop for method invalidation]");
+        masm.nop();
     }
 
     private void emitCodeSuffix(CompilationResultBuilder crb, AArch64MacroAssembler masm, FrameMap frameMap) {
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
index dd72b8837dbc..f0c3cdd34f78 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
@@ -62,7 +62,7 @@ final class AArch64HotSpotDirectStaticCallOp extends DirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             // The mark for an invocation that uses an inline cache must be placed at the
             // instruction that loads the Klass from the inline cache.
             // For the first invocation this is set to a bitpattern that is guaranteed to never be a
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
index 12a2cc9942d9..6c5ec7bfed5e 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
@@ -62,7 +62,7 @@ final class AArch64HotSpotDirectVirtualCallOp extends DirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             // The mark for an invocation that uses an inline cache must be placed at the
             // instruction that loads the Klass from the inline cache.
             // For the first invocation this is set to a bitpattern that is guaranteed to never be a
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
index 055299c07c09..b5d3f0abd766 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
@@ -26,15 +26,6 @@
 
 package org.graalvm.compiler.hotspot.aarch64;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_DYNAMIC_INVOKE;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_STRING_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.INITIALIZE;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.LOAD_COUNTERS;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.RESOLVE;
 import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
 import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
@@ -51,10 +42,8 @@
 import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator;
 import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool;
 import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.common.spi.LIRKindTool;
 import org.graalvm.compiler.debug.GraalError;
@@ -65,9 +54,7 @@
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
 import org.graalvm.compiler.hotspot.HotSpotLockStack;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
 import org.graalvm.compiler.hotspot.debug.BenchmarkCounters;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -85,11 +72,9 @@
 import org.graalvm.compiler.lir.aarch64.AArch64Move;
 import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp;
 import org.graalvm.compiler.lir.aarch64.AArch64PrefetchOp;
-import org.graalvm.compiler.lir.aarch64.AArch64ReadTimestampCounter;
 import org.graalvm.compiler.lir.aarch64.AArch64RestoreRegistersOp;
 import org.graalvm.compiler.lir.aarch64.AArch64SaveRegistersOp;
 import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.aarch64.AArch64Kind;
@@ -97,7 +82,6 @@
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterValue;
 import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant;
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
 import jdk.vm.ci.hotspot.HotSpotObjectConstant;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
@@ -258,7 +242,6 @@ protected boolean emitCompare(PlatformKind cmpKind, Value a, Value b, Condition
     @Override
     public Value emitCompress(Value pointer, CompressEncoding encoding, boolean nonNull) {
         LIRKind inputKind = pointer.getValueKind(LIRKind.class);
-        LIRKindTool lirKindTool = getLIRKindTool();
         assert inputKind.getPlatformKind() == AArch64Kind.QWORD;
         if (inputKind.isReference(0)) {
             // oop
@@ -269,16 +252,8 @@ public Value emitCompress(Value pointer, CompressEncoding encoding, boolean nonN
             // metaspace pointer
             Variable result = newVariable(LIRKind.value(AArch64Kind.DWORD));
             AllocatableValue base = Value.ILLEGAL;
-            OptionValues options = getResult().getLIR().getOptions();
-            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
-                if (GeneratePIC.getValue(options)) {
-                    Variable baseAddress = newVariable(lirKindTool.getWordKind());
-                    AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress);
-                    append(move);
-                    base = baseAddress;
-                } else {
-                    base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
-                }
+            if (encoding.hasBase()) {
+                base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
             }
             append(new AArch64HotSpotMove.CompressPointer(result, asAllocatable(pointer), base, encoding, nonNull));
             return result;
@@ -298,16 +273,8 @@ public Value emitUncompress(Value pointer, CompressEncoding encoding, boolean no
             // metaspace pointer
             Variable result = newVariable(LIRKind.value(AArch64Kind.QWORD));
             AllocatableValue base = Value.ILLEGAL;
-            OptionValues options = getResult().getLIR().getOptions();
-            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
-                if (GeneratePIC.getValue(options)) {
-                    Variable baseAddress = newVariable(LIRKind.value(AArch64Kind.QWORD));
-                    AArch64HotSpotMove.BaseMove move = new AArch64HotSpotMove.BaseMove(baseAddress);
-                    append(move);
-                    base = baseAddress;
-                } else {
-                    base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
-                }
+            if (encoding.hasBase()) {
+                base = emitLoadConstant(LIRKind.value(AArch64Kind.QWORD), JavaConstant.forLong(encoding.getBase()));
             }
             append(new AArch64HotSpotMove.UncompressPointer(result, asAllocatable(pointer), base, encoding, nonNull));
             return result;
@@ -467,73 +434,6 @@ public void emitUnwind(Value exception) {
         append(new AArch64HotSpotUnwindOp(config, exceptionParameter));
     }
 
-    @Override
-    public Value emitLoadObjectAddress(Constant constant) {
-        HotSpotObjectConstant objectConstant = (HotSpotObjectConstant) constant;
-        LIRKind kind = objectConstant.isCompressed() ? getLIRKindTool().getNarrowOopKind() : getLIRKindTool().getObjectKind();
-        Variable result = newVariable(kind);
-        append(new AArch64HotSpotLoadAddressOp(result, constant, HotSpotConstantLoadAction.RESOLVE));
-        return result;
-    }
-
-    @Override
-    public Value emitLoadMetaspaceAddress(Constant constant, HotSpotConstantLoadAction action) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) constant;
-        LIRKind kind = metaspaceConstant.isCompressed() ? getLIRKindTool().getNarrowPointerKind() : getLIRKindTool().getWordKind();
-        Variable result = newVariable(kind);
-        append(new AArch64HotSpotLoadAddressOp(result, constant, action));
-        return result;
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, Object[] notes, Constant[] constants, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
-        ForeignCallLinkage linkage = getForeignCalls().lookupForeignCall(foreignCall);
-        append(new AArch64HotSpotConstantRetrievalOp(constants, constantDescriptions, frameState, linkage, notes));
-        AllocatableValue result = linkage.getOutgoingCallingConvention().getReturn();
-        return emitMove(result);
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
-        Constant[] constants = new Constant[]{constant};
-        Object[] notes = new Object[]{action};
-        return emitConstantRetrieval(foreignCall, notes, constants, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitResolveDynamicInvoke(Constant appendix, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[0];
-        return emitConstantRetrieval(RESOLVE_DYNAMIC_INVOKE, INITIALIZE, appendix, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind) {
-        Variable result = newVariable(kind);
-        append(new AArch64HotSpotLoadConfigValueOp(markId, result));
-        return result;
-    }
-
-    @Override
-    public Value emitRandomSeed() {
-        Variable result = newVariable(LIRKind.value(AArch64Kind.QWORD));
-        AArch64ReadTimestampCounter timestamp = new AArch64ReadTimestampCounter(result);
-        append(timestamp);
-        return result;
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, Value constantDescription, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(constantDescription)};
-        return emitConstantRetrieval(foreignCall, action, constant, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitObjectConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(RESOLVE_STRING_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
-    }
-
-    @Override
-    public Value emitMetaspaceConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(RESOLVE_KLASS_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
-    }
-
     @Override
     public void emitReturn(JavaKind kind, Value input) {
         AllocatableValue operand = Value.ILLEGAL;
@@ -545,17 +445,6 @@ public void emitReturn(JavaKind kind, Value input) {
         append(new AArch64HotSpotReturnOp(operand, getStub() != null, config, thread, getResult().requiresReservedStackAccessCheck()));
     }
 
-    @Override
-    public Value emitKlassInitializationAndRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(INITIALIZE_KLASS_BY_SYMBOL, INITIALIZE, constant, constantDescription, frameState);
-    }
-
-    @Override
-    public Value emitResolveMethodAndLoadCounters(Constant method, Value klassHint, Value methodDescription, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(klassHint), asAllocatable(methodDescription)};
-        return emitConstantRetrieval(RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, LOAD_COUNTERS, method, constantDescriptions, frameState);
-    }
-
     /**
      * Gets the {@link Stub} this generator is generating code for or {@code null} if a stub is not
      * being generated.
@@ -601,12 +490,6 @@ public void emitZeroMemory(Value address, Value length, boolean isAligned) {
         // Use DC ZVA if it's not prohibited and AArch64 HotSpot flag UseBlockZeroing is on.
         boolean useDcZva = !isDcZvaProhibited && flags.contains(AArch64.Flag.UseBlockZeroing);
 
-        // Set zva length negative (unknown at compile-time) for AOT compilation, since the value
-        // could be different on different AArch64 CPU implementations.
-        if (GraalOptions.ImmutableCode.getValue(getResult().getLIR().getOptions())) {
-            useDcZva = false;
-        }
-
         emitZeroMemory(address, length, isAligned, useDcZva, zvaLength);
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java
index 3b2c7adcb164..6e88abe2ed95 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadAddressOp.java
@@ -27,11 +27,9 @@
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
 import jdk.vm.ci.aarch64.AArch64Kind;
-import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
 
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.lir.LIRInstructionClass;
@@ -68,12 +66,6 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             default:
                 throw GraalError.shouldNotReachHere("unexpected kind: " + kind);
         }
-        if (crb.compilationResult.isImmutablePIC()) {
-            Register dst = asRegister(result);
-            masm.adrpAdd(dst);
-            masm.ldr(size, dst, AArch64Address.createBaseRegisterOnlyAddress(size, dst));
-        } else {
-            masm.ldr(size, asRegister(result), masm.getPlaceholder(-1));
-        }
+        masm.ldr(size, asRegister(result), masm.getPlaceholder(-1));
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java
deleted file mode 100644
index 750cf8e0513b..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoadConfigValueOp.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, Red Hat Inc. 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.aarch64;
-
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-
-import jdk.vm.ci.aarch64.AArch64Kind;
-import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
-
-public final class AArch64HotSpotLoadConfigValueOp extends AArch64LIRInstruction {
-
-    public static final LIRInstructionClass<AArch64HotSpotLoadConfigValueOp> TYPE = LIRInstructionClass.create(AArch64HotSpotLoadConfigValueOp.class);
-
-    @Def({OperandFlag.REG}) protected AllocatableValue result;
-    private final HotSpotMarkId markId;
-
-    public AArch64HotSpotLoadConfigValueOp(HotSpotMarkId markId, AllocatableValue result) {
-        super(TYPE);
-        this.result = result;
-        this.markId = markId;
-    }
-
-    @Override
-    public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        if (GeneratePIC.getValue(crb.getOptions())) {
-            AArch64Kind kind = (AArch64Kind) result.getPlatformKind();
-            Register reg = asRegister(result);
-            masm.adrpAdd(reg);
-            switch (kind) {
-                case BYTE:
-                    masm.ldrs(32, 8, reg, AArch64Address.createBaseRegisterOnlyAddress(8, reg));
-                    break;
-                case WORD:
-                    masm.ldrs(32, 16, reg, AArch64Address.createBaseRegisterOnlyAddress(16, reg));
-                    break;
-                case DWORD:
-                    masm.ldr(32, reg, AArch64Address.createBaseRegisterOnlyAddress(32, reg));
-                    break;
-                case QWORD:
-                    masm.ldr(64, reg, AArch64Address.createBaseRegisterOnlyAddress(64, reg));
-                    break;
-                default:
-                    throw GraalError.unimplemented();
-            }
-            masm.nop();
-        } else {
-            throw GraalError.unimplemented();
-        }
-        crb.recordMark(markId);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
index fe39dd2c4652..0e1862fdfbac 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java
@@ -27,7 +27,6 @@
 import static jdk.vm.ci.aarch64.AArch64.zr;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
@@ -137,9 +136,8 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             Register resultRegister = asRegister(result);
             Register ptr = asRegister(input);
             Register base = (isRegister(baseRegister) ? asRegister(baseRegister) : zr);
-            boolean pic = GeneratePIC.getValue(crb.getOptions());
             // result = (ptr - base) >> shift
-            if (!pic && !encoding.hasBase()) {
+            if (!encoding.hasBase()) {
                 if (encoding.hasShift()) {
                     masm.lsr(64, resultRegister, ptr, encoding.getShift());
                 } else {
@@ -188,8 +186,7 @@ public UncompressPointer(AllocatableValue result, AllocatableValue input, Alloca
         public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             Register inputRegister = asRegister(input);
             Register resultRegister = asRegister(result);
-            boolean pic = GeneratePIC.getValue(crb.getOptions());
-            Register base = pic || encoding.hasBase() ? asRegister(baseRegister) : null;
+            Register base = encoding.hasBase() ? asRegister(baseRegister) : null;
             emitUncompressCode(masm, inputRegister, resultRegister, base, encoding.getShift(), nonNull);
         }
 
@@ -220,34 +217,12 @@ public static void emitUncompressCode(AArch64MacroAssembler masm, Register input
         }
     }
 
-    //
-    // private static void decompressPointer(CompilationResultBuilder crb, ARMv8MacroAssembler masm,
-    // Register result,
-    // Register ptr, long base, int shift, int alignment) {
-    // assert base != 0 || shift == 0 || alignment == shift;
-    // // result = heapBase + ptr << alignment
-    // Register heapBase = ARMv8.heapBaseRegister;
-    // // if result == 0, we make sure that it will still be 0 at the end, so that it traps when
-    // // loading storing a value.
-    // masm.cmp(32, ptr, 0);
-    // masm.add(64, result, heapBase, ptr, ARMv8Assembler.ExtendType.UXTX, alignment);
-    // masm.cmov(64, result, result, ARMv8.zr, ARMv8Assembler.ConditionFlag.NE);
-    // }
-
-    public static void decodeKlassPointer(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, Register ptr, CompressEncoding encoding) {
+    public static void decodeKlassPointer(AArch64MacroAssembler masm, Register result, Register ptr, CompressEncoding encoding) {
         try (AArch64MacroAssembler.ScratchRegister sc = masm.getScratchRegister()) {
             Register scratch = sc.getRegister();
-            boolean pic = GeneratePIC.getValue(crb.getOptions());
-            if (pic || encoding.hasBase() || encoding.getShift() != 0) {
-                if (pic) {
-                    masm.adrpAdd(scratch);
-                    masm.ldr(64, scratch, AArch64Address.createBaseRegisterOnlyAddress(64, scratch));
-                    masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
-                    crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS);
-                } else {
-                    masm.mov(scratch, encoding.getBase());
-                    masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
-                }
+            if (encoding.hasBase() || encoding.getShift() != 0) {
+                masm.mov(scratch, encoding.getBase());
+                masm.add(64, result, scratch, ptr, AArch64Assembler.ExtendType.UXTX, encoding.getShift());
             }
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java
index 0ccb9d2c8efe..bf21e69d4a7b 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java
@@ -67,7 +67,7 @@ final class AArch64IndirectCallOp extends IndirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(false)) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             crb.recordMark(HotSpotMarkId.INLINE_INVOKE);
             Register callReg = asRegister(targetAddress);
             assert !callReg.equals(METHOD);
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java
index 7417b4ad3240..a1324d1b53dc 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java
@@ -25,20 +25,14 @@
 
 package org.graalvm.compiler.hotspot.amd64;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.compiler.asm.amd64.AMD64Address.Scale;
 import org.graalvm.compiler.core.amd64.AMD64AddressNode;
 import org.graalvm.compiler.core.amd64.AMD64CompressAddressLowering;
 import org.graalvm.compiler.core.common.CompressEncoding;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
-import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
 import org.graalvm.compiler.nodes.CompressionNode;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
@@ -57,10 +51,8 @@
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.JavaKind;
 
 public class AMD64HotSpotAddressLowering extends AMD64CompressAddressLowering {
 
@@ -69,14 +61,10 @@ public class AMD64HotSpotAddressLowering extends AMD64CompressAddressLowering {
 
     private final long heapBase;
     private final Register heapBaseRegister;
-    private final GraalHotSpotVMConfig config;
-    private final boolean generatePIC;
 
-    public AMD64HotSpotAddressLowering(GraalHotSpotVMConfig config, Register heapBaseRegister, OptionValues options) {
+    public AMD64HotSpotAddressLowering(GraalHotSpotVMConfig config, Register heapBaseRegister) {
         this.heapBase = config.getOopEncoding().getBase();
-        this.config = config;
-        this.generatePIC = GeneratePIC.getValue(options);
-        if (heapBase == 0 && !generatePIC) {
+        if (heapBase == 0) {
             this.heapBaseRegister = null;
         } else {
             this.heapBaseRegister = heapBaseRegister;
@@ -91,28 +79,17 @@ protected final boolean improveUncompression(AMD64AddressNode addr, CompressionN
         }
 
         if (heapBaseRegister != null && encoding.getBase() == heapBase) {
-            if ((!generatePIC || compression.stamp(NodeView.DEFAULT) instanceof ObjectStamp) && other == null) {
-                // With PIC it is only legal to do for oops since the base value may be
-                // different at runtime.
+            if (other == null) {
                 ValueNode base = compression.graph().unique(new HeapBaseNode(heapBaseRegister));
                 addr.setBase(base);
             } else {
                 return false;
             }
-        } else if (encoding.getBase() != 0 || (generatePIC && compression.stamp(NodeView.DEFAULT) instanceof KlassPointerStamp)) {
-            if (generatePIC) {
-                if (other == null) {
-                    ValueNode base = compression.graph().unique(new GraalHotSpotVMConfigNode(config, HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS, JavaKind.Long));
-                    addr.setBase(base);
-                } else {
-                    return false;
-                }
+        } else if (encoding.getBase() != 0) {
+            if (updateDisplacement(addr, encoding.getBase(), false)) {
+                addr.setBase(other);
             } else {
-                if (updateDisplacement(addr, encoding.getBase(), false)) {
-                    addr.setBase(other);
-                } else {
-                    return false;
-                }
+                return false;
             }
         } else {
             addr.setBase(other);
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java
index 447ede6a1a0b..1055fde9a51d 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java
@@ -30,7 +30,6 @@
 import static jdk.vm.ci.amd64.AMD64.rsp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static org.graalvm.compiler.core.common.GraalOptions.CanOmitFrame;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
 
 import org.graalvm.compiler.asm.amd64.AMD64Address;
@@ -40,7 +39,6 @@
 import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
-import org.graalvm.compiler.core.common.LIRKind;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
 import org.graalvm.compiler.core.gen.LIRGenerationProvider;
@@ -51,7 +49,6 @@
 import org.graalvm.compiler.hotspot.HotSpotHostBackend;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
 import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -72,13 +69,11 @@
 import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
-import jdk.vm.ci.hotspot.HotSpotSentinelConstant;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
@@ -282,18 +277,13 @@ public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationRes
             if (config.useCompressedClassPointers) {
                 Register register = r10;
                 Register heapBase = providers.getRegisters().getHeapBaseRegister();
-                AMD64HotSpotMove.decodeKlassPointer(crb, asm, register, heapBase, src, config);
-                if (GeneratePIC.getValue(crb.getOptions())) {
-                    asm.movq(heapBase, asm.getPlaceholder(-1));
-                    crb.recordMark(HotSpotMarkId.NARROW_OOP_BASE_ADDRESS);
-                } else {
-                    if (config.narrowKlassBase != 0) {
-                        // The heap base register was destroyed above, so restore it
-                        if (config.narrowOopBase == 0L) {
-                            asm.xorq(heapBase, heapBase);
-                        } else {
-                            asm.movq(heapBase, config.narrowOopBase);
-                        }
+                AMD64HotSpotMove.decodeKlassPointer(asm, register, heapBase, src, config);
+                if (config.narrowKlassBase != 0) {
+                    // The heap base register was destroyed above, so restore it
+                    if (config.narrowOopBase == 0L) {
+                        asm.xorq(heapBase, heapBase);
+                    } else {
+                        asm.movq(heapBase, config.narrowOopBase);
                     }
                 }
                 before = asm.cmpqAndJcc(inlineCacheKlass, register, ConditionFlag.NotEqual, null, false);
@@ -305,17 +295,6 @@ public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, CompilationRes
 
         asm.align(config.codeEntryAlignment);
         crb.recordMark(crb.compilationResult.getEntryBCI() != -1 ? HotSpotMarkId.OSR_ENTRY : HotSpotMarkId.VERIFIED_ENTRY);
-
-        if (GeneratePIC.getValue(crb.getOptions())) {
-            // Check for method state
-            HotSpotFrameContext frameContext = (HotSpotFrameContext) crb.frameContext;
-            if (!frameContext.isStub) {
-                crb.recordInlineDataInCodeWithNote(new HotSpotSentinelConstant(LIRKind.value(AMD64Kind.QWORD), JavaKind.Long), HotSpotConstantLoadAction.MAKE_NOT_ENTRANT);
-                asm.movq(AMD64.rax, asm.getPlaceholder(-1));
-                int before = asm.testqAndJcc(AMD64.rax, AMD64.rax, ConditionFlag.NotZero, null, false);
-                AMD64Call.recordDirectCall(crb, asm, getForeignCalls().lookupForeignCall(WRONG_METHOD_HANDLER), before);
-            }
-        }
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
index 4d9c705bdcb8..a38eb5084405 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java
@@ -118,7 +118,7 @@ protected HotSpotHostForeignCallsProvider createForeignCalls(HotSpotJVMCIRuntime
     protected HotSpotSuitesProvider createSuites(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, Plugins plugins,
                     HotSpotRegistersProvider registers, HotSpotReplacementsImpl replacements, OptionValues options) {
         return new AddressLoweringHotSpotSuitesProvider(new AMD64SuitesCreator(compilerConfiguration, plugins), config, runtime,
-                        new AddressLoweringPhase(new AMD64HotSpotAddressLowering(config, registers.getHeapBaseRegister(), options)));
+                        new AddressLoweringPhase(new AMD64HotSpotAddressLowering(config, registers.getHeapBaseRegister())));
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
index 5f81a014c748..3bbb9e0ab912 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
@@ -59,7 +59,7 @@ final class AMD64HotSpotDirectStaticCallOp extends DirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             crb.recordMark(invokeKind == InvokeKind.Static ? HotSpotMarkId.INVOKESTATIC : HotSpotMarkId.INVOKESPECIAL);
             if (config.supportsMethodHandleDeoptimizationEntry() && config.isMethodHandleCall((HotSpotResolvedJavaMethod) callTarget) && invokeKind != InvokeKind.Static) {
                 crb.setNeedsMHDeoptHandler();
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java
index 3eeec699c038..f00df5dcc0ed 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java
@@ -25,27 +25,16 @@
 package org.graalvm.compiler.hotspot.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.rbp;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_DYNAMIC_INVOKE;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_STRING_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.INITIALIZE;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.LOAD_COUNTERS;
-import static org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction.RESOLVE;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.vm.ci.code.RegisterArray;
 import org.graalvm.compiler.asm.amd64.AMD64Address.Scale;
 import org.graalvm.compiler.core.amd64.AMD64ArithmeticLIRGenerator;
 import org.graalvm.compiler.core.amd64.AMD64LIRGenerator;
 import org.graalvm.compiler.core.amd64.AMD64MoveFactoryBase.BackupSlotProvider;
 import org.graalvm.compiler.core.common.CompressEncoding;
 import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.common.spi.LIRKindTool;
 import org.graalvm.compiler.debug.DebugContext;
@@ -57,9 +46,7 @@
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult;
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
 import org.graalvm.compiler.hotspot.HotSpotLockStack;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
 import org.graalvm.compiler.hotspot.debug.BenchmarkCounters;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.stubs.Stub;
 import org.graalvm.compiler.lir.LIR;
@@ -78,7 +65,6 @@
 import org.graalvm.compiler.lir.amd64.AMD64Move;
 import org.graalvm.compiler.lir.amd64.AMD64Move.MoveFromRegOp;
 import org.graalvm.compiler.lir.amd64.AMD64PrefetchOp;
-import org.graalvm.compiler.lir.amd64.AMD64ReadTimestampCounter;
 import org.graalvm.compiler.lir.amd64.AMD64ReadTimestampCounterWithProcid;
 import org.graalvm.compiler.lir.amd64.AMD64RestoreRegistersOp;
 import org.graalvm.compiler.lir.amd64.AMD64SaveRegistersOp;
@@ -86,19 +72,16 @@
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
 import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.Register;
+import jdk.vm.ci.code.RegisterArray;
 import jdk.vm.ci.code.RegisterConfig;
 import jdk.vm.ci.code.RegisterValue;
 import jdk.vm.ci.code.StackSlot;
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
 import jdk.vm.ci.meta.AllocatableValue;
-import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
@@ -425,83 +408,6 @@ public Variable emitForeignCall(ForeignCallLinkage linkage, LIRFrameState state,
         return result;
     }
 
-    @Override
-    public Value emitLoadObjectAddress(Constant constant) {
-        HotSpotObjectConstant objectConstant = (HotSpotObjectConstant) constant;
-        LIRKind kind = objectConstant.isCompressed() ? getLIRKindTool().getNarrowOopKind() : getLIRKindTool().getObjectKind();
-        Variable result = newVariable(kind);
-        append(new AMD64HotSpotLoadAddressOp(result, constant, HotSpotConstantLoadAction.RESOLVE));
-        return result;
-    }
-
-    @Override
-    public Value emitLoadMetaspaceAddress(Constant constant, HotSpotConstantLoadAction action) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) constant;
-        LIRKind kind = metaspaceConstant.isCompressed() ? getLIRKindTool().getNarrowPointerKind() : getLIRKindTool().getWordKind();
-        Variable result = newVariable(kind);
-        append(new AMD64HotSpotLoadAddressOp(result, constant, action));
-        return result;
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, Object[] notes, Constant[] constants, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
-        ForeignCallLinkage linkage = getForeignCalls().lookupForeignCall(foreignCall);
-        append(new AMD64HotSpotConstantRetrievalOp(constants, constantDescriptions, frameState, linkage, notes));
-        AllocatableValue result = linkage.getOutgoingCallingConvention().getReturn();
-        return emitMove(result);
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, AllocatableValue[] constantDescriptions, LIRFrameState frameState) {
-        Constant[] constants = new Constant[]{constant};
-        Object[] notes = new Object[]{action};
-        return emitConstantRetrieval(foreignCall, notes, constants, constantDescriptions, frameState);
-    }
-
-    private Value emitConstantRetrieval(ForeignCallDescriptor foreignCall, HotSpotConstantLoadAction action, Constant constant, Value constantDescription, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(constantDescription)};
-        return emitConstantRetrieval(foreignCall, action, constant, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitObjectConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(RESOLVE_STRING_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
-    }
-
-    @Override
-    public Value emitMetaspaceConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(RESOLVE_KLASS_BY_SYMBOL, RESOLVE, constant, constantDescription, frameState);
-    }
-
-    @Override
-    public Value emitKlassInitializationAndRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState) {
-        return emitConstantRetrieval(INITIALIZE_KLASS_BY_SYMBOL, INITIALIZE, constant, constantDescription, frameState);
-    }
-
-    @Override
-    public Value emitResolveMethodAndLoadCounters(Constant method, Value klassHint, Value methodDescription, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[]{asAllocatable(klassHint), asAllocatable(methodDescription)};
-        return emitConstantRetrieval(RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, LOAD_COUNTERS, method, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitResolveDynamicInvoke(Constant appendix, LIRFrameState frameState) {
-        AllocatableValue[] constantDescriptions = new AllocatableValue[0];
-        return emitConstantRetrieval(RESOLVE_DYNAMIC_INVOKE, INITIALIZE, appendix, constantDescriptions, frameState);
-    }
-
-    @Override
-    public Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind) {
-        Variable result = newVariable(kind);
-        append(new AMD64HotSpotLoadConfigValueOp(markId, result));
-        return result;
-    }
-
-    @Override
-    public Value emitRandomSeed() {
-        AMD64ReadTimestampCounter timestamp = new AMD64ReadTimestampCounter();
-        append(timestamp);
-        return emitMove(timestamp.getLowResult());
-    }
-
     @Override
     public void emitTailcall(Value[] args, Value address) {
         append(new AMD64TailcallOp(args, address));
@@ -611,16 +517,8 @@ public Value emitCompress(Value pointer, CompressEncoding encoding, boolean nonN
             // metaspace pointer
             Variable result = newVariable(lirKindTool.getNarrowPointerKind());
             AllocatableValue base = Value.ILLEGAL;
-            OptionValues options = getResult().getLIR().getOptions();
-            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
-                if (GeneratePIC.getValue(options)) {
-                    Variable baseAddress = newVariable(lirKindTool.getWordKind());
-                    AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress);
-                    append(move);
-                    base = baseAddress;
-                } else {
-                    base = emitLoadConstant(lirKindTool.getWordKind(), JavaConstant.forLong(encoding.getBase()));
-                }
+            if (encoding.hasBase()) {
+                base = emitLoadConstant(lirKindTool.getWordKind(), JavaConstant.forLong(encoding.getBase()));
             }
             append(new AMD64Move.CompressPointerOp(result, asAllocatable(pointer), base, encoding, nonNull, getLIRKindTool()));
             return result;
@@ -642,16 +540,8 @@ public Value emitUncompress(Value pointer, CompressEncoding encoding, boolean no
             LIRKind uncompressedKind = lirKindTool.getWordKind();
             Variable result = newVariable(uncompressedKind);
             AllocatableValue base = Value.ILLEGAL;
-            OptionValues options = getResult().getLIR().getOptions();
-            if (encoding.hasBase() || GeneratePIC.getValue(options)) {
-                if (GeneratePIC.getValue(options)) {
-                    Variable baseAddress = newVariable(uncompressedKind);
-                    AMD64HotSpotMove.BaseMove move = new AMD64HotSpotMove.BaseMove(baseAddress);
-                    append(move);
-                    base = baseAddress;
-                } else {
-                    base = emitLoadConstant(uncompressedKind, JavaConstant.forLong(encoding.getBase()));
-                }
+            if (encoding.hasBase()) {
+                base = emitLoadConstant(uncompressedKind, JavaConstant.forLong(encoding.getBase()));
             }
             append(new AMD64Move.UncompressPointerOp(result, asAllocatable(pointer), base, encoding, nonNull, lirKindTool));
             return result;
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java
deleted file mode 100644
index ef03d0713ff9..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2015, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.amd64;
-
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-
-import jdk.vm.ci.amd64.AMD64Kind;
-import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
-
-public final class AMD64HotSpotLoadConfigValueOp extends AMD64LIRInstruction {
-
-    public static final LIRInstructionClass<AMD64HotSpotLoadConfigValueOp> TYPE = LIRInstructionClass.create(AMD64HotSpotLoadConfigValueOp.class);
-
-    @Def({OperandFlag.REG}) protected AllocatableValue result;
-    private final HotSpotMarkId markId;
-
-    public AMD64HotSpotLoadConfigValueOp(HotSpotMarkId markId, AllocatableValue result) {
-        super(TYPE);
-        this.result = result;
-        this.markId = markId;
-    }
-
-    @Override
-    public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-        if (GeneratePIC.getValue(crb.getOptions())) {
-            AMD64Kind kind = (AMD64Kind) result.getPlatformKind();
-            Register reg = asRegister(result);
-            AMD64Address placeholder = masm.getPlaceholder(-1);
-            switch (kind) {
-                case BYTE:
-                    masm.movsbl(reg, placeholder);
-                    break;
-                case WORD:
-                    masm.movswl(reg, placeholder);
-                    break;
-                case DWORD:
-                    masm.movl(reg, placeholder);
-                    break;
-                case QWORD:
-                    masm.movq(reg, placeholder);
-                    break;
-                default:
-                    throw GraalError.unimplemented();
-            }
-        } else {
-            throw GraalError.unimplemented();
-        }
-        crb.recordMark(markId);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java
index e8357ab01efc..b7f62fe38d1e 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.hotspot.amd64;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
 
 import org.graalvm.compiler.core.amd64.AMD64LoweringProviderMixin;
@@ -37,9 +36,7 @@
 import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
 import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets;
-import org.graalvm.compiler.hotspot.replacements.profiling.ProbabilisticProfileSnippets;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.calc.FloatConvertNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
@@ -50,7 +47,6 @@
 import org.graalvm.compiler.replacements.amd64.AMD64TruffleArrayUtilsWithMaskSnippets;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.TargetDescription;
@@ -61,7 +57,6 @@
 public class AMD64HotSpotLoweringProvider extends DefaultHotSpotLoweringProvider implements AMD64LoweringProviderMixin {
 
     private AMD64ConvertSnippets.Templates convertSnippets;
-    private ProbabilisticProfileSnippets.Templates profileSnippets;
     private AMD64X87MathSnippets.Templates mathSnippets;
 
     public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAccessProvider metaAccess, ForeignCallsProvider foreignCalls, HotSpotRegistersProvider registers,
@@ -74,10 +69,6 @@ public AMD64HotSpotLoweringProvider(HotSpotGraalRuntimeProvider runtime, MetaAcc
     public void initialize(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, GraalHotSpotVMConfig config,
                     HotSpotAllocationSnippets.Templates allocationSnippetTemplates) {
         convertSnippets = new AMD64ConvertSnippets.Templates(options, factories, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
-        if (JavaVersionUtil.JAVA_SPEC >= 11 && GeneratePIC.getValue(options)) {
-            // AOT only introduced in JDK 9
-            profileSnippets = new ProbabilisticProfileSnippets.Templates(options, factories, providers, providers.getCodeCache().getTarget());
-        }
         mathSnippets = new AMD64X87MathSnippets.Templates(options, factories, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget());
         providers.getReplacements().registerSnippetTemplateCache(
                         new AMD64TruffleArrayUtilsWithMaskSnippets.Templates(options, factories, providers, providers.getSnippetReflection(), providers.getCodeCache().getTarget()));
@@ -91,8 +82,6 @@ public void lower(Node n, LoweringTool tool) {
         }
         if (n instanceof FloatConvertNode) {
             convertSnippets.lower((FloatConvertNode) n, tool);
-        } else if (profileSnippets != null && n instanceof ProfileNode) {
-            profileSnippets.lower((ProfileNode) n, tool);
         } else if (n instanceof UnaryMathIntrinsicNode) {
             lowerUnaryMath((UnaryMathIntrinsicNode) n, tool);
         } else {
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java
index 0c4536623010..a5a251fee577 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java
@@ -27,7 +27,6 @@
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
@@ -65,9 +64,6 @@ public HotSpotLoadObjectConstantOp(AllocatableValue result, HotSpotObjectConstan
 
         @Override
         public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-            if (GeneratePIC.getValue(crb.getOptions())) {
-                throw GraalError.shouldNotReachHere("Object constant load should not be happening directly");
-            }
             boolean compressed = input.isCompressed();
             if (crb.target.inlineObjects) {
                 crb.recordInlineDataInCode(input);
@@ -142,9 +138,6 @@ public HotSpotLoadMetaspaceConstantOp(AllocatableValue result, HotSpotMetaspaceC
 
         @Override
         public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-            if (GeneratePIC.getValue(crb.getOptions())) {
-                throw GraalError.shouldNotReachHere("Metaspace constant load should not be happening directly");
-            }
             boolean compressed = input.isCompressed();
             if (isRegister(result)) {
                 if (compressed) {
@@ -176,21 +169,15 @@ public AllocatableValue getResult() {
         }
     }
 
-    public static void decodeKlassPointer(CompilationResultBuilder crb, AMD64MacroAssembler masm, Register register, Register scratch, AMD64Address address, GraalHotSpotVMConfig config) {
+    public static void decodeKlassPointer(AMD64MacroAssembler masm, Register register, Register scratch, AMD64Address address, GraalHotSpotVMConfig config) {
         CompressEncoding encoding = config.getKlassEncoding();
         masm.movl(register, address);
         if (encoding.getShift() != 0) {
             masm.shlq(register, encoding.getShift());
         }
-        boolean pic = GeneratePIC.getValue(crb.getOptions());
-        if (pic || encoding.hasBase()) {
-            if (pic) {
-                masm.movq(scratch, masm.getPlaceholder(-1));
-                crb.recordMark(HotSpotMarkId.NARROW_KLASS_BASE_ADDRESS);
-            } else {
-                assert encoding.getBase() != 0;
-                masm.movq(scratch, encoding.getBase());
-            }
+        if (encoding.hasBase()) {
+            assert encoding.getBase() != 0;
+            masm.movq(scratch, encoding.getBase());
             masm.addq(register, scratch);
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java
index 9a7bb160b773..ff7ae518cfc8 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java
@@ -26,8 +26,6 @@
 
 import static jdk.vm.ci.amd64.AMD64.rax;
 import static jdk.vm.ci.amd64.AMD64.rip;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
 import static org.graalvm.compiler.core.common.NumUtil.isInt;
 
 import org.graalvm.compiler.asm.amd64.AMD64Address;
@@ -46,8 +44,6 @@
 import jdk.vm.ci.code.RegisterValue;
 import jdk.vm.ci.code.site.InfopointReason;
 import jdk.vm.ci.meta.AllocatableValue;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
 
 /**
@@ -68,7 +64,7 @@ public AMD64HotSpotSafepointOp(LIRFrameState state, GraalHotSpotVMConfig config,
         this.state = state;
         this.config = config;
         this.thread = thread;
-        if (config.useThreadLocalPolling || isPollingPageFar(config) || ImmutableCode.getValue(tool.getOptions())) {
+        if (config.useThreadLocalPolling || isPollingPageFar(config)) {
             temp = tool.getLIRGeneratorTool().newVariable(LIRKind.value(tool.getLIRGeneratorTool().target().arch.getWordKind()));
         } else {
             // Don't waste a register if it's unneeded
@@ -100,24 +96,7 @@ private static boolean isPollingPageFar(GraalHotSpotVMConfig config) {
 
     private static void emitGlobalPoll(CompilationResultBuilder crb, AMD64MacroAssembler asm, GraalHotSpotVMConfig config, boolean atReturn, LIRFrameState state, Register scratch) {
         assert !atReturn || state == null : "state is unneeded at return";
-        if (ImmutableCode.getValue(crb.getOptions())) {
-            JavaKind hostWordKind = JavaKind.Long;
-            int alignment = hostWordKind.getBitCount() / Byte.SIZE;
-            JavaConstant pollingPageAddress = JavaConstant.forIntegerKind(hostWordKind, config.safepointPollingAddress);
-            // This move will be patched to load the safepoint page from a data segment
-            // co-located with the immutable code.
-            if (GeneratePIC.getValue(crb.getOptions())) {
-                asm.movq(scratch, asm.getPlaceholder(-1));
-            } else {
-                asm.movq(scratch, (AMD64Address) crb.recordDataReferenceInCode(pollingPageAddress, alignment));
-            }
-            final int pos = asm.position();
-            crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR);
-            if (state != null) {
-                crb.recordInfopoint(pos, state, InfopointReason.SAFEPOINT);
-            }
-            asm.testl(rax, new AMD64Address(scratch));
-        } else if (isPollingPageFar(config)) {
+        if (isPollingPageFar(config)) {
             asm.movq(scratch, config.safepointPollingAddress);
             crb.recordMark(atReturn ? HotSpotMarkId.POLL_RETURN_FAR : HotSpotMarkId.POLL_FAR);
             final int pos = asm.position();
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
index bc1dbe801729..f984ac60d7de 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
@@ -60,7 +60,7 @@ final class AMD64HotspotDirectVirtualCallOp extends DirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(invokeKind.isDirect())) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             // The mark for an invocation that uses an inline cache must be placed at the
             // instruction that loads the Klass from the inline cache.
             crb.recordMark(invokeKind == InvokeKind.Virtual ? HotSpotMarkId.INVOKEVIRTUAL : HotSpotMarkId.INVOKEINTERFACE);
diff --git a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java
index dd6363cfd86b..68cb3917ce4d 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64IndirectCallOp.java
@@ -66,7 +66,7 @@ final class AMD64IndirectCallOp extends IndirectCallOp {
     @Override
     @SuppressWarnings("try")
     public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext(false)) {
+        try (CompilationResultBuilder.CallContext callContext = crb.openCallContext()) {
             crb.recordMark(HotSpotMarkId.INLINE_INVOKE);
             Register callReg = asRegister(targetAddress);
             assert !callReg.equals(METHOD);
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java
deleted file mode 100644
index e746eae5abe9..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/AheadOfTimeCompilationTest.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2013, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import jdk.vm.ci.aarch64.AArch64;
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes;
-
-/**
- * use
- *
- * <pre>
- * mx unittest AheadOfTimeCompilationTest @-XX:CompileCommand='print,*AheadOfTimeCompilationTest.*'
- * </pre>
- *
- * to print disassembly.
- */
-public class AheadOfTimeCompilationTest extends HotSpotGraalCompilerTest {
-
-    public static final Object STATICFINALOBJECT = new Object();
-    public static final String STATICFINALSTRING = "test string";
-
-    public static Object getStaticFinalObject() {
-        return AheadOfTimeCompilationTest.STATICFINALOBJECT;
-    }
-
-    @Before
-    public void setUp() {
-        Assume.assumeFalse("skipping on AArch64", getTarget().arch instanceof AArch64);
-    }
-
-    @Test
-    public void testStaticFinalObjectAOT() {
-        StructuredGraph result = compile("getStaticFinalObject", true);
-        assertDeepEquals(1, getConstantNodes(result).count());
-        Stamp constantStamp = getConstantNodes(result).first().stamp(NodeView.DEFAULT);
-        Assert.assertTrue(constantStamp.toString(), constantStamp instanceof KlassPointerStamp);
-        int expected = runtime().getVMConfig().classMirrorIsHandle ? 3 : 2;
-        assertDeepEquals(expected, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    @Test
-    public void testStaticFinalObject() {
-        StructuredGraph result = compile("getStaticFinalObject", false);
-        assertDeepEquals(1, getConstantNodes(result).count());
-        assertDeepEquals(JavaKind.Object, getConstantNodes(result).first().getStackKind());
-        assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    public static Class<AheadOfTimeCompilationTest> getClassObject() {
-        return AheadOfTimeCompilationTest.class;
-    }
-
-    @Test
-    public void testClassObjectAOT() {
-        StructuredGraph result = compile("getClassObject", true);
-
-        NodeIterable<ConstantNode> filter = getConstantNodes(result);
-        assertDeepEquals(1, filter.count());
-        HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(AheadOfTimeCompilationTest.class);
-        assertDeepEquals(type.klass(), filter.first().asConstant());
-        int expected = runtime().getVMConfig().classMirrorIsHandle ? 2 : 1;
-        assertDeepEquals(expected, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    @Test
-    public void testClassObject() {
-        StructuredGraph result = compile("getClassObject", false);
-
-        NodeIterable<ConstantNode> filter = getConstantNodes(result);
-        assertDeepEquals(1, filter.count());
-        JavaConstant c = filter.first().asJavaConstant();
-        Assert.assertEquals(getSnippetReflection().asObject(Class.class, c), AheadOfTimeCompilationTest.class);
-
-        assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    public static Class<Integer> getPrimitiveClassObject() {
-        return int.class;
-    }
-
-    @Test
-    public void testPrimitiveClassObjectAOT() {
-        StructuredGraph result = compile("getPrimitiveClassObject", true);
-        NodeIterable<ConstantNode> filter = getConstantNodes(result);
-        assertDeepEquals(1, filter.count());
-        Stamp constantStamp = filter.first().stamp(NodeView.DEFAULT);
-        Assert.assertTrue(constantStamp instanceof KlassPointerStamp);
-        int expected = runtime().getVMConfig().classMirrorIsHandle ? 3 : 2;
-        assertDeepEquals(expected, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    @Test
-    public void testPrimitiveClassObject() {
-        StructuredGraph result = compile("getPrimitiveClassObject", false);
-        NodeIterable<ConstantNode> filter = getConstantNodes(result);
-        assertDeepEquals(1, filter.count());
-        JavaConstant c = filter.first().asJavaConstant();
-        Assert.assertEquals(getSnippetReflection().asObject(Class.class, c), Integer.TYPE);
-
-        assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    public static String getStringObject() {
-        return AheadOfTimeCompilationTest.STATICFINALSTRING;
-    }
-
-    @Test
-    public void testStringObjectAOT() {
-        // embedded strings are fine
-        testStringObjectCommon(true);
-    }
-
-    @Test
-    public void testStringObject() {
-        testStringObjectCommon(false);
-    }
-
-    private void testStringObjectCommon(boolean compileAOT) {
-        StructuredGraph result = compile("getStringObject", compileAOT);
-
-        NodeIterable<ConstantNode> filter = getConstantNodes(result);
-        assertDeepEquals(1, filter.count());
-        JavaConstant c = filter.first().asJavaConstant();
-        Assert.assertEquals(getSnippetReflection().asObject(String.class, c), "test string");
-
-        assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
-        assertDeepEquals(0, result.getNodes().filter(ReadNode.class).count());
-    }
-
-    public static Boolean getBoxedBoolean() {
-        return Boolean.valueOf(true);
-    }
-
-    @Test
-    public void testBoxedBooleanAOT() {
-        StructuredGraph result = compile("getBoxedBoolean", true);
-
-        assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
-        assertDeepEquals(0, result.getNodes().filter(PiNode.class).count());
-        assertDeepEquals(1, getConstantNodes(result).count());
-        ConstantNode constant = getConstantNodes(result).first();
-        assertDeepEquals(JavaKind.Object, constant.getStackKind());
-
-        JavaConstant c = constant.asJavaConstant();
-        Assert.assertEquals(getSnippetReflection().asObject(Boolean.class, c), Boolean.TRUE);
-    }
-
-    @Test
-    public void testBoxedBoolean() {
-        StructuredGraph result = compile("getBoxedBoolean", false);
-        assertDeepEquals(0, result.getNodes().filter(FloatingReadNode.class).count());
-        assertDeepEquals(0, result.getNodes().filter(PiNode.class).count());
-        assertDeepEquals(1, getConstantNodes(result).count());
-        ConstantNode constant = getConstantNodes(result).first();
-        assertDeepEquals(JavaKind.Object, constant.getStackKind());
-
-        JavaConstant c = constant.asJavaConstant();
-        Assert.assertEquals(getSnippetReflection().asObject(Boolean.class, c), Boolean.TRUE);
-    }
-
-    @SuppressWarnings("try")
-    private StructuredGraph compile(String test, boolean compileAOT) {
-        OptionValues options = new OptionValues(getInitialOptions(), ImmutableCode, compileAOT);
-        StructuredGraph graph = parseEager(test, AllowAssumptions.YES, options);
-        compile(graph.method(), graph);
-        return graph;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java
deleted file mode 100644
index 8cd7dda273df..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/EliminateRedundantInitializationPhaseTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2017, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class EliminateRedundantInitializationPhaseTest extends GraalCompilerTest {
-    @Override
-    protected Plugins getDefaultGraphBuilderPlugins() {
-        Plugins plugins = super.getDefaultGraphBuilderPlugins();
-        plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
-        return plugins;
-    }
-
-    public static class X {
-        public static int x;
-        public static int y;
-        public static int z;
-    }
-
-    public static class Y extends X {
-        public static int a;
-        public static int b;
-    }
-
-    public static void assignFields() {
-        X.x = 1;
-        X.y = 2;
-        X.z = 3;
-    }
-
-    public static void assignFieldsConditionally(boolean choice) {
-        X.x = 1;
-        if (choice) {
-            X.y = 2;
-        } else {
-            X.z = 3;
-        }
-    }
-
-    public static void assignFieldsSubclassDominates() {
-        Y.a = 1;
-        X.x = 2;
-        X.y = 3;
-        X.z = 4;
-    }
-
-    public static void assignFieldsConditionallySubclassDominates(boolean choice) {
-        Y.a = 1;
-        if (choice) {
-            X.x = 2;
-        } else {
-            X.y = 3;
-        }
-        Y.z = 4;
-    }
-
-    public static void assignFieldsSubclassPostdominates() {
-        X.x = 1;
-        Y.a = 2;
-    }
-
-    public static void assignFieldsConditionallySubclassPostdominates(boolean choice) {
-        X.x = 1;
-        if (choice) {
-            X.y = 2;
-        } else {
-            X.z = 3;
-        }
-        Y.a = 4;
-    }
-
-    public static void assignFieldsConditionallyMixed(boolean choice) {
-        X.x = 1;
-        if (choice) {
-            Y.a = 2;
-        } else {
-            X.z = 3;
-        }
-        Y.b = 4;
-    }
-
-    public static void assignFieldsInLoop() {
-        X.x = 1;
-        for (int i = 0; i < 10; i++) {
-            X.y += X.z;
-        }
-    }
-
-    public static void assignFieldsInBranches(boolean choice) {
-        if (choice) {
-            X.x = 1;
-        } else {
-            X.y = 2;
-        }
-        X.z = 3;
-    }
-
-    public static void assignFieldsInBranchesMixed(boolean choice) {
-        if (choice) {
-            X.x = 1;
-        } else {
-            Y.a = 2;
-        }
-        X.z = 3;
-    }
-
-    static class SomeClass {
-        @BytecodeParserNeverInline
-        static void method() {
-        }
-
-        @BytecodeParserForceInline
-        static void inlinedMethod() {
-        }
-    }
-
-    public static void invokestatic() {
-        SomeClass.method();
-    }
-
-    public static void invokestaticInlined() {
-        SomeClass.inlinedMethod();
-    }
-
-    private void test(String name, int initNodesAfterParse, int initNodesAfterOpt) {
-        StructuredGraph graph = parseEager(name, AllowAssumptions.NO);
-        Assert.assertEquals(initNodesAfterParse, graph.getNodes().filter(InitializeKlassNode.class).count());
-        HighTierContext highTierContext = getDefaultHighTierContext();
-        new EliminateRedundantInitializationPhase().apply(graph, highTierContext);
-        Assert.assertEquals(initNodesAfterOpt, graph.getNodes().filter(InitializeKlassNode.class).count());
-    }
-
-    @Test
-    public void test1() {
-        test("assignFields", 3, 1);
-    }
-
-    @Test
-    public void test2() {
-        test("assignFieldsConditionally", 3, 1);
-    }
-
-    @Test
-    public void test3() {
-        test("assignFieldsSubclassDominates", 4, 1);
-    }
-
-    @Test
-    public void test4() {
-        test("assignFieldsConditionallySubclassDominates", 4, 1);
-    }
-
-    @Test
-    public void test5() {
-        test("assignFieldsSubclassPostdominates", 2, 2);
-    }
-
-    @Test
-    public void test6() {
-        test("assignFieldsConditionallySubclassPostdominates", 4, 2);
-    }
-
-    @Test
-    public void test7() {
-        test("assignFieldsConditionallyMixed", 4, 3);
-    }
-
-    @Test
-    public void test8() {
-        test("assignFieldsInLoop", 4, 1);
-    }
-
-    @Test
-    public void test9() {
-        test("assignFieldsInBranches", 3, 2);
-    }
-
-    @Test
-    public void test10() {
-        test("assignFieldsInBranchesMixed", 3, 2);
-    }
-
-    @Test
-    public void test11() {
-        test("invokestatic", 1, 0);
-    }
-
-    @Test
-    public void test12() {
-        // Force initialization of SomeClass
-        SomeClass.inlinedMethod();
-        test("invokestaticInlined", 1, 1);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
deleted file mode 100644
index 0ea94340a7d2..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2017, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-import java.security.PrivilegedAction;
-import java.util.function.IntPredicate;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
-import org.graalvm.compiler.hotspot.meta.HotSpotInvokeDynamicPlugin;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicStubCall;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
-import org.graalvm.compiler.phases.common.GuardLoweringPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.junit.Assert;
-import org.junit.Test;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public class HotSpotInvokeDynamicPluginTest extends HotSpotGraalCompilerTest {
-    @Override
-    protected Plugins getDefaultGraphBuilderPlugins() {
-        Plugins plugins = super.getDefaultGraphBuilderPlugins();
-        plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
-        plugins.setInvokeDynamicPlugin(new HotSpotInvokeDynamicPlugin() {
-            @Override
-            public boolean isResolvedDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
-                // Allow invokedynamic testing with older JVMCI
-                ResolvedJavaMethod m = builder.getMethod();
-                if (m.getName().startsWith("invokeDynamic") && m.getDeclaringClass().getName().equals("Lorg/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest;")) {
-                    return false;
-                }
-                return super.isResolvedDynamicInvoke(builder, index, opcode);
-            }
-
-            @Override
-            public boolean supportsDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
-                // Allow invokehandle testing with older JVMCI
-                ResolvedJavaMethod m = builder.getMethod();
-                if (m.getName().startsWith("invokeHandle") && m.getDeclaringClass().getName().equals("Lorg/graalvm/compiler/hotspot/test/HotSpotInvokeDynamicPluginTest;")) {
-                    return true;
-                }
-                return super.supportsDynamicInvoke(builder, index, opcode);
-            }
-        });
-        return plugins;
-    }
-
-    @Override
-    protected InlineInfo bytecodeParserShouldInlineInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
-        return InlineInfo.DO_NOT_INLINE_NO_EXCEPTION;
-    }
-
-    private void test(String name, int expectedResolves, int expectedStubCalls) {
-        StructuredGraph graph = parseEager(name, AllowAssumptions.NO, new OptionValues(getInitialOptions(), GraalOptions.GeneratePIC, true));
-        MidTierContext midTierContext = new MidTierContext(getProviders(), getTargetProvider(), OptimisticOptimizations.ALL, graph.getProfilingInfo());
-
-        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
-        Assert.assertEquals(expectedResolves, graph.getNodes().filter(ResolveDynamicConstantNode.class).count());
-        Assert.assertEquals(0, graph.getNodes().filter(ResolveDynamicStubCall.class).count());
-        CoreProviders context = getProviders();
-        new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, context);
-        new GuardLoweringPhase().apply(graph, midTierContext);
-        new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER).apply(graph, context);
-        new FrameStateAssignmentPhase().apply(graph);
-        new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.LOW_TIER).apply(graph, context);
-        Assert.assertEquals(0, graph.getNodes().filter(ResolveDynamicConstantNode.class).count());
-        Assert.assertEquals(expectedStubCalls, graph.getNodes().filter(ResolveDynamicStubCall.class).count());
-    }
-
-    public static IntPredicate invokeDynamic1() {
-        IntPredicate i = (v) -> v > 1;
-        return i;
-    }
-
-    public static PrivilegedAction<Integer> invokeDynamic2(String s) {
-        return s::length;
-    }
-
-    static final MethodHandle objToStringMH;
-
-    static {
-        MethodHandle mh = null;
-        try {
-            mh = MethodHandles.lookup().findVirtual(Object.class, "toString", MethodType.methodType(String.class));
-        } catch (Exception e) {
-        }
-        objToStringMH = mh;
-    }
-
-    // invokehandle
-    public static String invokeHandle1(Object o) throws Throwable {
-        return (String) objToStringMH.invokeExact(o);
-    }
-
-    @Test
-    public void test1() {
-        test("invokeDynamic1", 1, 1);
-    }
-
-    @Test
-    public void test2() {
-        test("invokeDynamic2", 1, 1);
-    }
-
-    @Test
-    public void test3() {
-        test("invokeHandle1", 1, 1);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotLazyInitializationTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotLazyInitializationTest.java
deleted file mode 100644
index b8d2db0a0a2a..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotLazyInitializationTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2018, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public class HotSpotLazyInitializationTest extends GraalCompilerTest {
-
-    HotSpotAOTClassInitializationPlugin classInitPlugin = new HotSpotAOTClassInitializationPlugin();
-
-    @Override
-    protected Plugins getDefaultGraphBuilderPlugins() {
-        Plugins plugins = super.getDefaultGraphBuilderPlugins();
-        plugins.setClassInitializationPlugin(classInitPlugin);
-        return plugins;
-    }
-
-    static boolean initializerRun = false;
-
-    static class X {
-        static {
-            initializerRun = true;
-        }
-
-        static void foo() {
-        }
-    }
-
-    public static void invokeStatic() {
-        X.foo();
-    }
-
-    // If constant pool can do eager resolve without eager initialization, then fail if the compiler
-    // causes the static initializer to run.
-    private void test(String name) {
-        ResolvedJavaMethod method = getResolvedJavaMethod(name);
-        Assume.assumeTrue("skipping for old JVMCI", classInitPlugin.supportsLazyInitialization(method.getConstantPool()));
-        parseEager(method, AllowAssumptions.NO);
-        Assert.assertFalse(initializerRun);
-    }
-
-    @Test
-    public void test1() {
-        test("invokeStatic");
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java
deleted file mode 100644
index 44508199cc70..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/LoadJavaMirrorWithKlassTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import java.util.Objects;
-
-import org.junit.Test;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.tiers.Suites;
-
-import jdk.vm.ci.meta.JavaKind;
-
-public class LoadJavaMirrorWithKlassTest extends GraalCompilerTest {
-
-    private static class Wrapper {
-        private Class<?> clazz;
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj instanceof Wrapper) {
-                return Objects.equals(this.clazz, ((Wrapper) obj).clazz);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return clazz.hashCode();
-        }
-
-        @Override
-        public String toString() {
-            return "Wrapper-" + clazz;
-        }
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    protected Suites createSuites(OptionValues options) {
-        return super.createSuites(getOptions());
-    }
-
-    private static OptionValues getOptions() {
-        return new OptionValues(getInitialOptions(), GraalOptions.ImmutableCode, true);
-    }
-
-    @Override
-    protected void checkLowTierGraph(StructuredGraph graph) {
-        for (ConstantNode constantNode : graph.getNodes().filter(ConstantNode.class)) {
-            assert constantNode.asJavaConstant() == null || constantNode.asJavaConstant().getJavaKind() != JavaKind.Object ||
-                            constantNode.asJavaConstant().isDefaultForKind() : "Found unexpected object constant " +
-                                            constantNode + ", this should have been removed by the LoadJavaMirrorWithKlassPhase.";
-        }
-    }
-
-    public static Class<?> classConstant() {
-        return Wrapper.class;
-    }
-
-    @Test
-    public void testClassConstant() {
-        test(getOptions(), "classConstant");
-    }
-
-    public static Class<?> primitiveClassConstant() {
-        return int.class;
-    }
-
-    @Test
-    public void testPrimitiveClassConstant() {
-        test(getOptions(), "primitiveClassConstant");
-    }
-
-    public static Wrapper compressedClassConstant(Wrapper w) {
-        w.clazz = Wrapper.class;
-        return w;
-    }
-
-    @Test
-    public void testCompressedClassConstant() {
-        ArgSupplier arg = () -> new Wrapper();
-        test(getOptions(), "compressedClassConstant", arg);
-    }
-
-    public static Wrapper compressedPrimitiveClassConstant(Wrapper w) {
-        w.clazz = int.class;
-        return w;
-    }
-
-    @Test
-    public void testCompressedPrimitiveClassConstant() {
-        ArgSupplier arg = () -> new Wrapper();
-        test(getOptions(), "compressedPrimitiveClassConstant", arg);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
deleted file mode 100644
index 796abfceeda3..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/ReplaceConstantNodesPhaseTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.test;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.meta.HotSpotAOTClassInitializationPlugin;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.hotspot.phases.LoadJavaMirrorWithKlassPhase;
-import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
-import org.graalvm.compiler.hotspot.phases.aot.ReplaceConstantNodesPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ReplaceConstantNodesPhaseTest extends HotSpotGraalCompilerTest {
-    private final GraalHotSpotVMConfig config = runtime().getVMConfig();
-
-    @Override
-    protected Plugins getDefaultGraphBuilderPlugins() {
-        Plugins plugins = super.getDefaultGraphBuilderPlugins();
-        plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
-        return plugins;
-    }
-
-    public static class X {
-        public static int x;
-        public static int y;
-        public static int z;
-        public static Object o;
-    }
-
-    public static class Y extends X {
-        public static int a;
-        public static int b;
-    }
-
-    public static int a;
-
-    public static void assignFields() {
-        X.x = 1;
-        X.y = 2;
-        X.z = 3;
-    }
-
-    public static void assignFieldsInBranches(boolean x) {
-        if (x) {
-            X.y = 1;
-        } else {
-            X.z = 2;
-        }
-    }
-
-    public static void assignFieldsWithDominatingInit(boolean x) {
-        X.x = 1;
-        if (x) {
-            X.y = 2;
-        } else {
-            X.z = 3;
-        }
-    }
-
-    public static void assignString() {
-        X.o = "foo";
-    }
-
-    public static void assignToParentAndChild() {
-        Y.a = 1;
-        X.x = 2;
-    }
-
-    public static void assignToThis() {
-        a = 1;
-    }
-
-    public static void assignFieldsWithDominatingInitOfParent(boolean x) {
-        Y.a = 1;
-        if (x) {
-            X.y = 2;
-        } else {
-            X.z = 3;
-        }
-        Y.b = 4;
-    }
-
-    private void test(String name, int expectedInits, int expectedResolves, int expectedLoads) {
-        StructuredGraph graph = parseEager(name, AllowAssumptions.NO, new OptionValues(getInitialOptions(), GraalOptions.GeneratePIC, true));
-        HighTierContext highTierContext = getDefaultHighTierContext();
-        CanonicalizerPhase canonicalizer = createCanonicalizerPhase();
-        new EliminateRedundantInitializationPhase().apply(graph, highTierContext);
-        new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.HIGH_TIER).apply(graph, highTierContext);
-        new LoadJavaMirrorWithKlassPhase(config).apply(graph, highTierContext);
-        new ReplaceConstantNodesPhase(true, false).apply(graph, highTierContext);
-        Assert.assertEquals(expectedInits, graph.getNodes().filter(InitializeKlassNode.class).count());
-        Assert.assertEquals(expectedResolves, graph.getNodes().filter(ResolveConstantNode.class).count());
-        Assert.assertEquals(expectedLoads, graph.getNodes().filter(LoadConstantIndirectlyNode.class).count());
-    }
-
-    @Test
-    public void test1() {
-        test("assignFields", 1, 0, 0);
-    }
-
-    @Test
-    public void test2() {
-        test("assignFieldsWithDominatingInit", 1, 0, 0);
-    }
-
-    @Test
-    public void test3() {
-        test("assignString", 1, 1, 0);
-    }
-
-    @Test
-    public void test4() {
-        test("assignToParentAndChild", 1, 1, 0);
-    }
-
-    @Test
-    public void test5() {
-        test("assignToThis", 0, 0, 1);
-    }
-
-    @Test
-    public void test6() {
-        test("assignFieldsWithDominatingInitOfParent", 1, 1, 0);
-    }
-
-    @Test
-    public void test7() {
-        test("assignFieldsInBranches", 2, 1, 0);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java
deleted file mode 100644
index 4e28d14939d5..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/AOTGraalHotSpotVMConfig.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot;
-
-import org.graalvm.compiler.core.common.CompressEncoding;
-
-import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
-
-public class AOTGraalHotSpotVMConfig extends GraalHotSpotVMConfig {
-    private final CompressEncoding aotOopEncoding;
-    private final CompressEncoding aotKlassEncoding;
-
-    public AOTGraalHotSpotVMConfig(HotSpotVMConfigStore store) {
-        super(store);
-        // AOT captures VM settings during compilation. For compressed oops this
-        // presents a problem for the case when the VM selects a zero-shift mode
-        // (i.e., when the heap is less than 4G). Compiling an AOT binary with
-        // zero-shift limits its usability. As such we force the shift to be
-        // always equal to alignment to avoid emitting zero-shift AOT code.
-        CompressEncoding vmOopEncoding = super.getOopEncoding();
-        aotOopEncoding = new CompressEncoding(vmOopEncoding.getBase(), logMinObjAlignment());
-        CompressEncoding vmKlassEncoding = super.getKlassEncoding();
-        aotKlassEncoding = new CompressEncoding(vmKlassEncoding.getBase(), logKlassAlignment);
-        assert check();
-        reportErrors();
-    }
-
-    @Override
-    public CompressEncoding getOopEncoding() {
-        return aotOopEncoding;
-    }
-
-    @Override
-    public CompressEncoding getKlassEncoding() {
-        return aotKlassEncoding;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java
deleted file mode 100644
index ba41bf7cd9e9..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/CompilerRuntimeHotSpotVMConfig.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot;
-
-import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
-import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
-
-/**
- * Used to access native configuration details for static compilation support.
- */
-public class CompilerRuntimeHotSpotVMConfig extends HotSpotVMConfigAccess {
-
-    public CompilerRuntimeHotSpotVMConfig(HotSpotVMConfigStore store) {
-        super(store);
-    }
-
-    public final long resolveStringBySymbol = getAddress("CompilerRuntime::resolve_string_by_symbol");
-    public final long resolveDynamicInvoke = getAddress("CompilerRuntime::resolve_dynamic_invoke");
-    public final long resolveKlassBySymbol = getAddress("CompilerRuntime::resolve_klass_by_symbol");
-    public final long resolveMethodBySymbolAndLoadCounters = getAddress("CompilerRuntime::resolve_method_by_symbol_and_load_counters");
-    public final long initializeKlassBySymbol = getAddress("CompilerRuntime::initialize_klass_by_symbol");
-    public final long invocationEvent = getAddress("CompilerRuntime::invocation_event");
-    public final long backedgeEvent = getAddress("CompilerRuntime::backedge_event");
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java
index b7da7658fcfc..6cfa8986e687 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/EncodedSnippets.java
@@ -410,7 +410,7 @@ static class SymbolicEncodedGraph extends EncodedGraph {
         private final String originalMethod;
 
         SymbolicEncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass<?>[] types, String originalMethod, ResolvedJavaType... accessingClasses) {
-            super(encoding, startOffset, objects, types, null, null, null, false, false);
+            super(encoding, startOffset, objects, types, null, null, false, false);
             this.accessingClasses = accessingClasses;
             this.originalMethod = originalMethod;
         }
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
index ad8074b5c8d0..e512ced1529f 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
@@ -53,7 +53,6 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.nodes.VMErrorNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantStubCall;
 import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
@@ -62,7 +61,6 @@
 import org.graalvm.compiler.hotspot.stubs.Stub;
 import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
 import org.graalvm.compiler.lir.LIR;
 import org.graalvm.compiler.lir.LIRFrameState;
 import org.graalvm.compiler.lir.LIRInstruction;
@@ -352,45 +350,6 @@ private static native int counterModeAESCrypt(@ConstantNodeParameter ForeignCall
     public static final HotSpotForeignCallDescriptor NEW_INSTANCE_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_instance_or_null", Object.class,
                     KlassPointer.class);
 
-    /**
-     * @see ResolveConstantStubCall
-     */
-    public static final HotSpotForeignCallDescriptor RESOLVE_STRING_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "resolve_string_by_symbol", Object.class,
-                    Word.class, Word.class);
-
-    /**
-     * @see ResolveConstantStubCall
-     */
-    public static final HotSpotForeignCallDescriptor RESOLVE_DYNAMIC_INVOKE = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "resolve_dynamic_invoke", Object.class, Word.class);
-
-    /**
-     * @see ResolveConstantStubCall
-     */
-    public static final HotSpotForeignCallDescriptor RESOLVE_KLASS_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "resolve_klass_by_symbol", Word.class, Word.class,
-                    Word.class);
-
-    /**
-     * @see ResolveConstantStubCall
-     */
-    public static final HotSpotForeignCallDescriptor INITIALIZE_KLASS_BY_SYMBOL = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), "initialize_klass_by_symbol", Word.class,
-                    Word.class,
-                    Word.class);
-
-    /**
-     * @see ResolveConstantStubCall
-     */
-    public static final HotSpotForeignCallDescriptor RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS,
-                    "resolve_method_by_symbol_and_load_counters", Word.class, Word.class, Word.class,
-                    Word.class);
-
-    /**
-     * Tiered support.
-     */
-    public static final HotSpotForeignCallDescriptor INVOCATION_EVENT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "invocation_event", void.class,
-                    MethodCountersPointer.class);
-    public static final HotSpotForeignCallDescriptor BACKEDGE_EVENT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, "backedge_event", void.class, MethodCountersPointer.class,
-                    int.class, int.class);
-
     public HotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
         super(providers);
         this.runtime = runtime;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java
index d53f318a25a9..3a9d9fdf61bf 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java
@@ -118,7 +118,7 @@ public static HotSpotCompiledCode createCompiledCode(CodeCacheProvider codeCache
 
         int totalFrameSize = compResult.getTotalFrameSize();
         StackSlot customStackArea = compResult.getCustomStackArea();
-        boolean isImmutablePIC = compResult.isImmutablePIC();
+        boolean isImmutablePIC = false; // Legacy API from jaotc that no longer does anything
 
         if (method instanceof HotSpotResolvedJavaMethod) {
             HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
index ebab48d38cb5..89cd0225c089 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java
@@ -26,7 +26,6 @@
 
 import static jdk.vm.ci.common.InitTimer.timer;
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK;
 
@@ -163,7 +162,7 @@ public GlobalMetrics getMetricValues() {
     HotSpotGraalRuntime(String nameQualifier, HotSpotJVMCIRuntime jvmciRuntime, CompilerConfigurationFactory compilerConfigurationFactory, OptionValues initialOptions) {
         this.runtimeName = getClass().getSimpleName() + ":" + nameQualifier;
         HotSpotVMConfigStore store = jvmciRuntime.getConfigStore();
-        config = GeneratePIC.getValue(initialOptions) ? new AOTGraalHotSpotVMConfig(store) : new GraalHotSpotVMConfig(store);
+        config = new GraalHotSpotVMConfig(store);
 
         // Only set HotSpotPrintInlining if it still has its default value (false).
         if (GraalOptions.HotSpotPrintInlining.getValue(initialOptions) == false && config.printInlining) {
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java
index dd8634bfaf05..dee520a5baee 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java
@@ -24,26 +24,13 @@
  */
 package org.graalvm.compiler.hotspot;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.RandomSeedNode;
-import org.graalvm.compiler.hotspot.replacements.EncodedSymbolConstant;
-import org.graalvm.compiler.lir.LIRFrameState;
 import org.graalvm.compiler.lir.VirtualStackSlot;
 import org.graalvm.compiler.lir.gen.LIRGenerator;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.Value;
 
 /**
@@ -74,97 +61,6 @@ public interface HotSpotLIRGenerator extends LIRGeneratorTool {
      */
     void emitDeoptimizeWithExceptionInCaller(Value exception);
 
-    /**
-     * Emits code for a {@link LoadConstantIndirectlyNode}.
-     *
-     * @param constant
-     * @return value of loaded address in register
-     */
-    Value emitLoadObjectAddress(Constant constant);
-
-    /**
-     * Emits code for a {@link LoadConstantIndirectlyNode}.
-     *
-     * @param constant original constant
-     * @param action action to perform on the metaspace object
-     * @return Value of loaded address in register
-     */
-    Value emitLoadMetaspaceAddress(Constant constant, HotSpotConstantLoadAction action);
-
-    /**
-     * Emits code for a {@link GraalHotSpotVMConfigNode}.
-     *
-     * @param markId id of the value to load
-     * @param kind type of the value to load
-     * @return value of loaded global in register
-     */
-    Value emitLoadConfigValue(HotSpotMarkId markId, LIRKind kind);
-
-    /**
-     * Emits code for a {@link ResolveConstantNode} to resolve a {@link HotSpotObjectConstant}.
-     *
-     * @param constant original constant
-     * @param constantDescription a description of the string that need to be materialized (and
-     *            interned) as java.lang.String, generated with {@link EncodedSymbolConstant}
-     * @param frameState frame state for the runtime call
-     * @return the address of the requested constant.
-     */
-    Value emitObjectConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState);
-
-    /**
-     * Emits code to resolve a dynamic constant.
-     *
-     * @param constant original constant
-     * @param frameState frame state for the runtime call
-     * @return the address of the requested constant.
-     */
-    Value emitResolveDynamicInvoke(Constant constant, LIRFrameState frameState);
-
-    /**
-     * Emits code for a {@link ResolveConstantNode} to resolve a {@link HotSpotMetaspaceConstant}.
-     *
-     * @param constant original constant
-     * @param constantDescription a symbolic description of the {@link HotSpotMetaspaceConstant}
-     *            generated by {@link EncodedSymbolConstant}
-     * @param frameState frame state for the runtime call
-     * @return the address of the requested constant.
-     */
-    Value emitMetaspaceConstantRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState);
-
-    /**
-     * Emits code for a {@link ResolveMethodAndLoadCountersNode} to resolve a
-     * {@link HotSpotMetaspaceConstant} that represents a {@link ResolvedJavaMethod} and return the
-     * corresponding MethodCounters object.
-     *
-     * @param method original constant
-     * @param klassHint a klass in which the method is declared
-     * @param methodDescription is symbolic description of the constant generated by
-     *            {@link EncodedSymbolConstant}
-     * @param frameState frame state for the runtime call
-     * @return the address of the requested constant.
-     */
-    Value emitResolveMethodAndLoadCounters(Constant method, Value klassHint, Value methodDescription, LIRFrameState frameState);
-
-    /**
-     * Emits code for a {@link ResolveConstantNode} to resolve a klass
-     * {@link HotSpotMetaspaceConstant} and run static initializer.
-     *
-     *
-     * @param constant original constant
-     * @param constantDescription a symbolic description of the {@link HotSpotMetaspaceConstant}
-     *            generated by {@link EncodedSymbolConstant}
-     * @param frameState frame state for the runtime call
-     * @return the address of the requested constant.
-     */
-    Value emitKlassInitializationAndRetrieval(Constant constant, Value constantDescription, LIRFrameState frameState);
-
-    /**
-     * Emits code for a {@link RandomSeedNode}.
-     *
-     * @return value of the counter
-     */
-    Value emitRandomSeed();
-
     /**
      * Gets a stack slot for a lock at a given lock nesting depth.
      */
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java
index 0be630905b4b..0319ebf3794e 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java
@@ -72,6 +72,10 @@ void setValue(Integer value) {
         this.value = value;
     }
 
+    public int getValue() {
+        return value;
+    }
+
     @Override
     public String getName() {
         return name();
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
index 9beeae736586..ba5b53b14bb8 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
@@ -26,7 +26,6 @@
 
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 import static org.graalvm.compiler.core.common.GraalOptions.AlwaysInlineVTableStubs;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.InlineVTableStubs;
 import static org.graalvm.compiler.core.common.GraalOptions.OmitHotExceptionStacktrace;
 import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.OSR_MIGRATION_END;
@@ -48,7 +47,6 @@
 import java.util.Map;
 
 import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
@@ -70,11 +68,6 @@
 import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode;
 import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode;
 import org.graalvm.compiler.hotspot.nodes.VMErrorNode;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
 import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp;
 import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
 import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp;
@@ -99,9 +92,7 @@
 import org.graalvm.compiler.hotspot.replacements.StringToBytesSnippets;
 import org.graalvm.compiler.hotspot.replacements.UnsafeCopyMemoryNode;
 import org.graalvm.compiler.hotspot.replacements.UnsafeSnippets;
-import org.graalvm.compiler.hotspot.replacements.aot.ResolveConstantSnippets;
 import org.graalvm.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets;
-import org.graalvm.compiler.hotspot.replacements.profiling.ProfileSnippets;
 import org.graalvm.compiler.hotspot.stubs.ForeignCallSnippets;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
@@ -255,8 +246,6 @@ public interface Extensions {
     protected LogSnippets.Templates logSnippets;
     protected ArrayCopySnippets.Templates arraycopySnippets;
     protected StringToBytesSnippets.Templates stringToBytesSnippets;
-    protected ResolveConstantSnippets.Templates resolveConstantSnippets;
-    protected ProfileSnippets.Templates profileSnippets;
     protected ObjectSnippets.Templates objectSnippets;
     protected UnsafeSnippets.Templates unsafeSnippets;
     protected ObjectCloneSnippets.Templates objectCloneSnippets;
@@ -309,7 +298,6 @@ public void initialize(OptionValues options, Iterable<DebugHandlersFactory> fact
         stringToBytesSnippets = new StringToBytesSnippets.Templates(options, factories, providers, target);
         identityHashCodeSnippets = new IdentityHashCodeSnippets.Templates(new HotSpotHashCodeSnippets(), options, factories, providers, target, HotSpotReplacementsUtil.MARK_WORD_LOCATION);
         isArraySnippets = new IsArraySnippets.Templates(new HotSpotIsArraySnippets(), options, factories, providers, target);
-        resolveConstantSnippets = new ResolveConstantSnippets.Templates(options, factories, providers, target);
         objectCloneSnippets = new ObjectCloneSnippets.Templates(options, factories, providers, target);
         foreignCallSnippets = new ForeignCallSnippets.Templates(options, factories, providers, target);
         registerFinalizerSnippets = new RegisterFinalizerSnippets.Templates(options, factories, providers, target);
@@ -317,10 +305,6 @@ public void initialize(OptionValues options, Iterable<DebugHandlersFactory> fact
             objectSnippets = new ObjectSnippets.Templates(options, factories, providers, target);
         }
         unsafeSnippets = new UnsafeSnippets.Templates(options, factories, providers, target);
-        if (JavaVersionUtil.JAVA_SPEC >= 11 && GeneratePIC.getValue(options)) {
-            // AOT only introduced in JDK 9
-            profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
-        }
 
         initializeExtensions(options, factories, providers, config);
     }
@@ -492,24 +476,6 @@ private boolean lowerWithoutDelegation(Node n, LoweringTool tool) {
             lowerHubGetClassNode((HubGetClassNode) n, tool);
         } else if (n instanceof KlassLayoutHelperNode) {
             lowerKlassLayoutHelperNode((KlassLayoutHelperNode) n, tool);
-        } else if (n instanceof ResolveDynamicConstantNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveDynamicConstantNode) n, tool);
-            }
-        } else if (n instanceof ResolveConstantNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveConstantNode) n, tool);
-            }
-        } else if (n instanceof ResolveMethodAndLoadCountersNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((ResolveMethodAndLoadCountersNode) n, tool);
-            }
-        } else if (n instanceof InitializeKlassNode) {
-            if (graph.getGuardsStage().areFrameStatesAtDeopts()) {
-                resolveConstantSnippets.lower((InitializeKlassNode) n, tool);
-            }
-        } else if (n instanceof ProfileNode) {
-            profileSnippets.lower((ProfileNode) n, tool);
         } else if (n instanceof KlassBeingInitializedCheckNode) {
             getAllocationSnippets().lower((KlassBeingInitializedCheckNode) n, tool);
         } else if (n instanceof FastNotifyNode) {
@@ -581,7 +547,7 @@ private void lowerHubGetClassNode(HubGetClassNode n, LoweringTool tool) {
         ValueNode hub = n.getHub();
         GraalHotSpotVMConfig vmConfig = runtime.getVMConfig();
         StructuredGraph graph = n.graph();
-        assert !hub.isConstant() || GraalOptions.ImmutableCode.getValue(graph.getOptions());
+        assert !hub.isConstant();
         AddressNode mirrorAddress = createOffsetAddress(graph, hub, vmConfig.classMirrorOffset);
         FloatingReadNode read = graph.unique(
                         new FloatingReadNode(mirrorAddress, CLASS_MIRROR_LOCATION, null, vmConfig.classMirrorIsHandle ? StampFactory.forKind(target.wordJavaKind) : n.stamp(NodeView.DEFAULT),
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTClassInitializationPlugin.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTClassInitializationPlugin.java
deleted file mode 100644
index 62fb99d5f869..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTClassInitializationPlugin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.meta;
-
-import java.util.function.Supplier;
-
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-
-import jdk.vm.ci.hotspot.HotSpotConstantPool;
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.meta.ConstantPool;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-public final class HotSpotAOTClassInitializationPlugin implements ClassInitializationPlugin {
-    private static boolean shouldApply(GraphBuilderContext builder, ResolvedJavaType type) {
-        if (!builder.parsingIntrinsic()) {
-            if (!type.isArray()) {
-                ResolvedJavaMethod method = builder.getGraph().method();
-                ResolvedJavaType methodHolder = method.getDeclaringClass();
-                // We can elide initialization nodes if type >=: methodHolder.
-                // The type is already initialized by either "new" or "invokestatic".
-
-                // Emit initialization node if type is an interface since:
-                // JLS 12.4: Before a class is initialized, its direct superclass must be
-                // initialized, but interfaces implemented by the class are not
-                // initialized and a class or interface type T will be initialized
-                // immediately before the first occurrence of accesses listed
-                // in JLS 12.4.1.
-
-                return !type.isAssignableFrom(methodHolder) || type.isInterface();
-            } else if (!type.getComponentType().isPrimitive()) {
-                // Always apply to object array types
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean apply(GraphBuilderContext builder, ResolvedJavaType type, Supplier<FrameState> frameState, ValueNode[] classInit) {
-        if (shouldApply(builder, type)) {
-            Stamp hubStamp = builder.getStampProvider().createHubStamp((ObjectStamp) StampFactory.objectNonNull());
-            ConstantNode hub = builder.append(ConstantNode.forConstant(hubStamp, ((HotSpotResolvedObjectType) type).klass(), builder.getMetaAccess(), builder.getGraph()));
-            DeoptimizingFixedWithNextNode result = builder.append(type.isArray() ? new ResolveConstantNode(hub) : new InitializeKlassNode(hub));
-            result.setStateBefore(frameState.get());
-            if (classInit != null) {
-                classInit[0] = result;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public boolean supportsLazyInitialization(ConstantPool cp) {
-        return true;
-    }
-
-    @Override
-    public void loadReferencedType(GraphBuilderContext builder, ConstantPool cp, int cpi, int opcode) {
-        ((HotSpotConstantPool) cp).loadReferencedType(cpi, opcode, false);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java
deleted file mode 100644
index ca67f1030e3f..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotAOTProfilingPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.meta;
-
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public class HotSpotAOTProfilingPlugin extends HotSpotProfilingPlugin {
-    public static class Options {
-        @Option(help = "Do profiling and callbacks to tiered runtime", type = OptionType.User)//
-        public static final OptionKey<Boolean> TieredAOT = new OptionKey<>(false);
-        @Option(help = "Invocation notification frequency", type = OptionType.Expert)//
-        public static final OptionKey<Integer> TierAInvokeNotifyFreqLog = new OptionKey<>(13);
-        @Option(help = "Inlinee invocation notification frequency (-1 means count, but do not notify)", type = OptionType.Expert)//
-        public static final OptionKey<Integer> TierAInvokeInlineeNotifyFreqLog = new OptionKey<>(-1);
-        @Option(help = "Invocation profile probability", type = OptionType.Expert)//
-        public static final OptionKey<Integer> TierAInvokeProfileProbabilityLog = new OptionKey<>(8);
-        @Option(help = "Backedge notification frequency", type = OptionType.Expert)//
-        public static final OptionKey<Integer> TierABackedgeNotifyFreqLog = new OptionKey<>(16);
-        @Option(help = "Backedge profile probability", type = OptionType.Expert)//
-        public static final OptionKey<Integer> TierABackedgeProfileProbabilityLog = new OptionKey<>(12);
-    }
-
-    @Override
-    public boolean shouldProfile(GraphBuilderContext builder, ResolvedJavaMethod method) {
-        return super.shouldProfile(builder, method) && ((HotSpotResolvedObjectType) method.getDeclaringClass()).getFingerprint() != 0;
-    }
-
-    @Override
-    public int invokeNotifyFreqLog(OptionValues options) {
-        return Options.TierAInvokeNotifyFreqLog.getValue(options);
-    }
-
-    @Override
-    public int invokeInlineeNotifyFreqLog(OptionValues options) {
-        return Options.TierAInvokeInlineeNotifyFreqLog.getValue(options);
-    }
-
-    @Override
-    public int invokeProfilePobabilityLog(OptionValues options) {
-        return Options.TierAInvokeProfileProbabilityLog.getValue(options);
-    }
-
-    @Override
-    public int backedgeNotifyFreqLog(OptionValues options) {
-        return Options.TierABackedgeNotifyFreqLog.getValue(options);
-    }
-
-    @Override
-    public int backedgeProfilePobabilityLog(OptionValues options) {
-        return Options.TierABackedgeProfileProbabilityLog.getValue(options);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java
index e004c7f96432..33c9e3e05153 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java
@@ -24,14 +24,6 @@
  */
 package org.graalvm.compiler.hotspot.meta;
 
-import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.options.OptionValues;
@@ -55,54 +47,7 @@ public HotSpotGraalConstantFieldProvider(GraalHotSpotVMConfig config, MetaAccess
 
     @Override
     protected boolean isStaticFieldConstant(ResolvedJavaField field, OptionValues options) {
-        return super.isStaticFieldConstant(field, options) && (!ImmutableCode.getValue(options) || isEmbeddableField(field));
-    }
-
-    /**
-     * The set of fields whose values cannot be constant folded in ImmutableCode mode. This is
-     * volatile to support double-checked locking lazy initialization.
-     */
-    private volatile List<ResolvedJavaField> nonEmbeddableFields;
-
-    protected boolean isEmbeddableField(ResolvedJavaField field) {
-        if (!IS_IN_NATIVE_IMAGE && (IS_BUILDING_NATIVE_IMAGE || nonEmbeddableFields == null)) {
-            synchronized (this) {
-                if (nonEmbeddableFields == null) {
-                    List<ResolvedJavaField> fields = new ArrayList<>();
-                    try {
-                        fields.add(metaAccess.lookupJavaField(Boolean.class.getDeclaredField("TRUE")));
-                        fields.add(metaAccess.lookupJavaField(Boolean.class.getDeclaredField("FALSE")));
-
-                        Class<?> characterCacheClass = Character.class.getDeclaredClasses()[0];
-                        assert "java.lang.Character$CharacterCache".equals(characterCacheClass.getName());
-                        fields.add(metaAccess.lookupJavaField(characterCacheClass.getDeclaredField("cache")));
-
-                        Class<?> byteCacheClass = Byte.class.getDeclaredClasses()[0];
-                        assert "java.lang.Byte$ByteCache".equals(byteCacheClass.getName());
-                        fields.add(metaAccess.lookupJavaField(byteCacheClass.getDeclaredField("cache")));
-
-                        Class<?> shortCacheClass = Short.class.getDeclaredClasses()[0];
-                        assert "java.lang.Short$ShortCache".equals(shortCacheClass.getName());
-                        fields.add(metaAccess.lookupJavaField(shortCacheClass.getDeclaredField("cache")));
-
-                        Class<?> integerCacheClass = Integer.class.getDeclaredClasses()[0];
-                        assert "java.lang.Integer$IntegerCache".equals(integerCacheClass.getName());
-                        fields.add(metaAccess.lookupJavaField(integerCacheClass.getDeclaredField("cache")));
-
-                        Class<?> longCacheClass = Long.class.getDeclaredClasses()[0];
-                        assert "java.lang.Long$LongCache".equals(longCacheClass.getName());
-                        fields.add(metaAccess.lookupJavaField(longCacheClass.getDeclaredField("cache")));
-
-                        fields.add(metaAccess.lookupJavaField(Throwable.class.getDeclaredField("UNASSIGNED_STACK")));
-                        fields.add(metaAccess.lookupJavaField(Throwable.class.getDeclaredField("SUPPRESSED_SENTINEL")));
-                    } catch (SecurityException | NoSuchFieldException e) {
-                        throw new GraalError(e);
-                    }
-                    nonEmbeddableFields = fields;
-                }
-            }
-        }
-        return !nonEmbeddableFields.contains(field);
+        return super.isStaticFieldConstant(field, options);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 9e77ca3fc861..26c8549899ee 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -25,14 +25,12 @@
 package org.graalvm.compiler.hotspot.meta;
 
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.CRC_TABLE_LOCATION;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C;
-import static org.graalvm.compiler.hotspot.meta.HotSpotAOTProfilingPlugin.Options.TieredAOT;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
 import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing;
@@ -60,9 +58,7 @@
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotBackend;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
 import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode;
 import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
@@ -189,36 +185,25 @@ public static Plugins create(HotSpotGraalRuntimeProvider graalRuntime,
             plugins.appendTypePlugin(nodePlugin);
             plugins.appendNodePlugin(nodePlugin);
         }
-        if (!GeneratePIC.getValue(options)) {
-            plugins.appendNodePlugin(new MethodHandlePlugin(constantReflection.getMethodHandleAccess(), !config.supportsMethodHandleDeoptimizationEntry()));
-        }
+        plugins.appendNodePlugin(new MethodHandlePlugin(constantReflection.getMethodHandleAccess(), !config.supportsMethodHandleDeoptimizationEntry()));
         plugins.appendInlineInvokePlugin(replacements);
         if (InlineDuringParsing.getValue(options)) {
             plugins.appendInlineInvokePlugin(new InlineDuringParsingPlugin());
         }
 
-        if (GeneratePIC.getValue(options)) {
-            plugins.setClassInitializationPlugin(new HotSpotAOTClassInitializationPlugin());
-            if (TieredAOT.getValue(options)) {
-                plugins.setProfilingPlugin(new HotSpotAOTProfilingPlugin());
-            }
-        } else {
-            if (config.instanceKlassInitThreadOffset != -1) {
-                plugins.setClassInitializationPlugin(new HotSpotJITClassInitializationPlugin());
-            }
+        if (config.instanceKlassInitThreadOffset != -1) {
+            plugins.setClassInitializationPlugin(new HotSpotJITClassInitializationPlugin());
         }
 
         invocationPlugins.defer(new Runnable() {
 
             @Override
             public void run() {
-                registerObjectPlugins(invocationPlugins, options, config, replacements);
+                registerObjectPlugins(invocationPlugins, config, replacements);
                 registerClassPlugins(plugins, config, replacements);
                 registerSystemPlugins(invocationPlugins);
                 registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacements);
-                if (!GeneratePIC.getValue(options)) {
-                    registerCallSitePlugins(invocationPlugins);
-                }
+                registerCallSitePlugins(invocationPlugins);
                 registerReflectionPlugins(invocationPlugins, replacements);
                 registerAESPlugins(invocationPlugins, config, replacements);
                 registerCRC32Plugins(invocationPlugins, config, replacements);
@@ -287,29 +272,21 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
     }
 
-    private static void registerObjectPlugins(InvocationPlugins plugins, OptionValues options, GraalHotSpotVMConfig config, Replacements replacements) {
+    private static void registerObjectPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         Registration r = new Registration(plugins, Object.class, replacements);
-        if (!GeneratePIC.getValue(options)) {
-            // FIXME: clone() requires speculation and requires a fix in here (to check that
-            // b.getAssumptions() != null), and in ReplacementImpl.getSubstitution() where there is
-            // an instantiation of IntrinsicGraphBuilder using a constructor that sets
-            // AllowAssumptions to YES automatically. The former has to inherit the assumptions
-            // settings from the root compile instead. So, for now, I'm disabling it for
-            // GeneratePIC.
-            r.register1("clone", Receiver.class, new InvocationPlugin() {
-                @Override
-                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                    ValueNode object = receiver.get();
-                    b.addPush(JavaKind.Object, new ObjectCloneNode(MacroParams.of(b, targetMethod, object)));
-                    return true;
-                }
+        r.register1("clone", Receiver.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                ValueNode object = receiver.get();
+                b.addPush(JavaKind.Object, new ObjectCloneNode(MacroParams.of(b, targetMethod, object)));
+                return true;
+            }
 
-                @Override
-                public boolean inlineOnly() {
-                    return true;
-                }
-            });
-        }
+            @Override
+            public boolean inlineOnly() {
+                return true;
+            }
+        });
         r.register1("hashCode", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
@@ -995,7 +972,7 @@ private static void registerCRC32Plugins(InvocationPlugins plugins, GraalHotSpot
             r.register2("update", int.class, int.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode crc, ValueNode arg) {
-                    final ValueNode crcTableRawAddress = b.add(new GraalHotSpotVMConfigNode(config, HotSpotMarkId.CRC_TABLE_ADDRESS, JavaKind.Long));
+                    final ValueNode crcTableRawAddress = ConstantNode.forLong(config.crcTableAddress);
                     ValueNode c = new XorNode(crc, ConstantNode.forInt(-1));
                     ValueNode index = new AndNode(new XorNode(arg, c), ConstantNode.forInt(0xff));
                     ValueNode offset = new LeftShiftNode(index, ConstantNode.forInt(2));
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 721104ea0a12..36243ca2a141 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -25,10 +25,8 @@
 package org.graalvm.compiler.hotspot.meta;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_DREM;
 import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_FREM;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.BACKEDGE_EVENT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
@@ -40,8 +38,6 @@
 import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.INVOCATION_EVENT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_MULTIPLY;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_SQUARE;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.MULTIPLY_TO_LEN;
@@ -52,10 +48,6 @@
 import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_DYNAMIC_INVOKE;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_KLASS_BY_SYMBOL;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.RESOLVE_STRING_BY_SYMBOL;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS;
@@ -66,7 +58,6 @@
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.VECTORIZED_MISMATCH;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.VM_ERROR;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.WRONG_METHOD_HANDLER;
 import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED;
 import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS;
 import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP;
@@ -111,7 +102,6 @@
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.hotspot.ArrayIndexOfStub;
-import org.graalvm.compiler.hotspot.CompilerRuntimeHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
 import org.graalvm.compiler.hotspot.replacements.arraycopy.CheckcastArrayCopyCallNode;
@@ -516,18 +506,6 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
         linkForeignCall(options, providers, G1WBPOSTCALL, c.writeBarrierPostAddress, PREPEND_THREAD);
         linkForeignCall(options, providers, VALIDATE_OBJECT, c.validateObject, PREPEND_THREAD);
 
-        if (GeneratePIC.getValue(options)) {
-            registerForeignCall(WRONG_METHOD_HANDLER, c.handleWrongMethodStub, NativeCall);
-            CompilerRuntimeHotSpotVMConfig cr = new CompilerRuntimeHotSpotVMConfig(HotSpotJVMCIRuntime.runtime().getConfigStore());
-            linkForeignCall(options, providers, RESOLVE_STRING_BY_SYMBOL, cr.resolveStringBySymbol, PREPEND_THREAD);
-            linkForeignCall(options, providers, RESOLVE_DYNAMIC_INVOKE, cr.resolveDynamicInvoke, PREPEND_THREAD);
-            linkForeignCall(options, providers, RESOLVE_KLASS_BY_SYMBOL, cr.resolveKlassBySymbol, PREPEND_THREAD);
-            linkForeignCall(options, providers, RESOLVE_METHOD_BY_SYMBOL_AND_LOAD_COUNTERS, cr.resolveMethodBySymbolAndLoadCounters, PREPEND_THREAD);
-            linkForeignCall(options, providers, INITIALIZE_KLASS_BY_SYMBOL, cr.initializeKlassBySymbol, PREPEND_THREAD);
-            linkForeignCall(options, providers, INVOCATION_EVENT, cr.invocationEvent, PREPEND_THREAD);
-            linkForeignCall(options, providers, BACKEDGE_EVENT, cr.backedgeEvent, PREPEND_THREAD);
-        }
-
         linkForeignCall(options, providers, TEST_DEOPTIMIZE_CALL_INT, c.testDeoptimizeCallInt, PREPEND_THREAD);
 
         registerArrayCopy(JavaKind.Byte, c.jbyteArraycopy, c.jbyteAlignedArraycopy, c.jbyteDisjointArraycopy, c.jbyteAlignedDisjointArraycopy);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
index 54175cfb416c..ea5c6c4cf0cf 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
@@ -31,23 +31,17 @@
 import java.util.List;
 import java.util.function.Predicate;
 
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
-import org.graalvm.compiler.hotspot.phases.AheadOfTimeVerificationPhase;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
 import org.graalvm.compiler.replacements.nodes.MacroInvokable;
 
-import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
@@ -89,31 +83,9 @@ public void checkNewNodes(GraphBuilderContext b, InvocationPlugin plugin, NodeIt
                 assert plugin.inlineOnly() : String.format("plugin that creates a %s (%s) must return true for inlineOnly(): %s", MacroInvokable.class.getSimpleName(), node, plugin);
             }
         }
-        if (GraalOptions.ImmutableCode.getValue(b.getOptions())) {
-            for (Node node : newNodes) {
-                if (node.hasUsages() && node instanceof ConstantNode) {
-                    ConstantNode c = (ConstantNode) node;
-                    if (c.getStackKind() == JavaKind.Object && AheadOfTimeVerificationPhase.isIllegalObjectConstant(c)) {
-                        if (isClass(c)) {
-                            // This will be handled later by LoadJavaMirrorWithKlassPhase
-                        } else {
-                            // Tolerate uses in unused FrameStates
-                            if (node.usages().filter((n) -> !(n instanceof FrameState) || n.hasUsages()).isNotEmpty()) {
-                                throw new AssertionError("illegal constant node in AOT: " + node);
-                            }
-                        }
-                    }
-                }
-            }
-        }
         super.checkNewNodes(b, plugin, newNodes);
     }
 
-    private static boolean isClass(ConstantNode node) {
-        ResolvedJavaType type = StampTool.typeOrNull(node);
-        return type != null && "Ljava/lang/Class;".equals(type.getName());
-    }
-
     @Override
     public void registerIntrinsificationPredicate(Predicate<ResolvedJavaType> predicate) {
         intrinsificationPredicates.add(predicate);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvokeDynamicPlugin.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvokeDynamicPlugin.java
deleted file mode 100644
index 12d85d3bc6d5..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvokeDynamicPlugin.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.meta;
-
-import org.graalvm.compiler.bytecode.Bytecodes;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvokeDynamicPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-
-import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.meta.ConstantPool;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
-
-public class HotSpotInvokeDynamicPlugin implements InvokeDynamicPlugin {
-
-    private static final Class<? extends ConstantPool> hscp;
-    private static final MethodHandle isResolvedDynamicInvokeMH;
-
-    static {
-        MethodHandle m = null;
-        Class<? extends ConstantPool> c = null;
-        try {
-            c = Class.forName("jdk.vm.ci.hotspot.HotSpotConstantPool").asSubclass(ConstantPool.class);
-            m = MethodHandles.lookup().findVirtual(c, "isResolvedDynamicInvoke", MethodType.methodType(boolean.class, int.class, int.class));
-        } catch (Exception e) {
-        }
-        isResolvedDynamicInvokeMH = m;
-        hscp = c;
-    }
-
-    private static boolean isResolvedDynamicInvoke(ConstantPool constantPool, int index, int opcode) {
-        if (isResolvedDynamicInvokeMH != null) {
-            if (!hscp.isInstance(constantPool)) {
-                return false;
-            }
-            try {
-                return (boolean) isResolvedDynamicInvokeMH.invoke(constantPool, index, opcode);
-            } catch (Throwable t) {
-                throw GraalError.shouldNotReachHere(t);
-            }
-        }
-        throw GraalError.shouldNotReachHere("isResolvedDynamicInvokeMH not set");
-    }
-
-    private final DynamicTypeStore dynoStore;
-    private final boolean treatAppendixAsConstant;
-
-    public HotSpotInvokeDynamicPlugin(DynamicTypeStore dynoStore, boolean treatAppendixAsConstant) {
-        this.dynoStore = dynoStore;
-        this.treatAppendixAsConstant = treatAppendixAsConstant;
-    }
-
-    public HotSpotInvokeDynamicPlugin(DynamicTypeStore dynoStore) {
-        this(dynoStore, true);
-    }
-
-    public HotSpotInvokeDynamicPlugin() {
-        this(null);
-    }
-
-    // invokehandle support
-    @Override
-    public boolean isResolvedDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
-        ConstantPool constantPool = builder.getCode().getConstantPool();
-        if (isResolvedDynamicInvokeMH == null) {
-            // If older JVMCI, but HotSpotInvokeDynamicPlugin is being
-            // used for testing, return true so that we continue along the
-            // plugin path.
-            return true;
-        }
-        return isResolvedDynamicInvoke(constantPool, index, opcode);
-    }
-
-    @Override
-    public boolean supportsDynamicInvoke(GraphBuilderContext builder, int index, int opcode) {
-        return opcode == Bytecodes.INVOKEDYNAMIC || isResolvedDynamicInvokeMH != null;
-    }
-
-    public DynamicTypeStore getDynamicTypeStore() {
-        return dynoStore;
-    }
-
-    @Override
-    public void recordDynamicMethod(GraphBuilderContext builder, int index, int opcode, ResolvedJavaMethod target) {
-        assert supportsDynamicInvoke(builder, index, opcode);
-        HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) builder.getMethod();
-        HotSpotResolvedObjectType methodHolder = method.getDeclaringClass();
-
-        HotSpotResolvedJavaMethod adapter = (HotSpotResolvedJavaMethod) target;
-        if (dynoStore != null) {
-            dynoStore.recordAdapter(opcode, methodHolder, index, adapter);
-        }
-    }
-
-    @Override
-    public ValueNode genAppendixNode(GraphBuilderContext builder, int index, int opcode, JavaConstant appendixConstant, FrameState frameState) {
-        JavaConstant appendix = appendixConstant;
-        assert supportsDynamicInvoke(builder, index, opcode);
-        HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) builder.getMethod();
-        HotSpotResolvedObjectType methodHolder = method.getDeclaringClass();
-
-        if (dynoStore != null) {
-            appendix = dynoStore.recordAppendix(opcode, methodHolder, index, appendix);
-        }
-
-        ConstantNode appendixNode = ConstantNode.forConstant(appendix, builder.getMetaAccess(), builder.getGraph());
-
-        Stamp appendixStamp = appendixNode.stamp(NodeView.DEFAULT);
-        Stamp resolveStamp = treatAppendixAsConstant ? appendixStamp : appendixStamp.unrestricted();
-        ResolveDynamicConstantNode resolveNode = new ResolveDynamicConstantNode(resolveStamp, appendixNode);
-        ResolveDynamicConstantNode added = builder.append(resolveNode);
-        assert added == resolveNode;
-        added.setStateBefore(frameState);
-        return resolveNode;
-    }
-
-    public interface DynamicTypeStore {
-
-        void recordAdapter(int opcode, HotSpotResolvedObjectType holder, int cpi, HotSpotResolvedJavaMethod adapter);
-
-        JavaConstant recordAppendix(int opcode, HotSpotResolvedObjectType holder, int cpi, JavaConstant appendix);
-
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
index 51338b6e8f44..11a1c06138ae 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.compiler.hotspot.meta;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.core.common.type.StampPair;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -93,12 +91,10 @@ public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod method, Va
 
     @Override
     public boolean handleLoadField(GraphBuilderContext b, ValueNode object, ResolvedJavaField field) {
-        if (!ImmutableCode.getValue(b.getOptions()) || b.parsingIntrinsic()) {
-            if (object.isConstant()) {
-                JavaConstant asJavaConstant = object.asJavaConstant();
-                if (tryReadField(b, field, asJavaConstant)) {
-                    return true;
-                }
+        if (object.isConstant()) {
+            JavaConstant asJavaConstant = object.asJavaConstant();
+            if (tryReadField(b, field, asJavaConstant)) {
+                return true;
             }
         }
         if (b.parsingIntrinsic() && wordOperationPlugin.handleLoadField(b, object, field)) {
@@ -109,10 +105,8 @@ public boolean handleLoadField(GraphBuilderContext b, ValueNode object, Resolved
 
     @Override
     public boolean handleLoadStaticField(GraphBuilderContext b, ResolvedJavaField field) {
-        if (!ImmutableCode.getValue(b.getOptions()) || b.parsingIntrinsic()) {
-            if (tryReadField(b, field, null)) {
-                return true;
-            }
+        if (tryReadField(b, field, null)) {
+            return true;
         }
         if (b.parsingIntrinsic() && wordOperationPlugin.handleLoadStaticField(b, field)) {
             return true;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java
deleted file mode 100644
index 221cef20885d..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotProfilingPlugin.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.meta;
-
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileBranchNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.ProfilingPlugin;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public abstract class HotSpotProfilingPlugin implements ProfilingPlugin {
-    public static class Options {
-        @Option(help = "Emit profiling of invokes", type = OptionType.Expert)//
-        public static final OptionKey<Boolean> ProfileInvokes = new OptionKey<>(true);
-        @Option(help = "Emit profiling of backedges", type = OptionType.Expert)//
-        public static final OptionKey<Boolean> ProfileBackedges = new OptionKey<>(true);
-    }
-
-    public abstract int invokeNotifyFreqLog(OptionValues options);
-
-    public abstract int invokeInlineeNotifyFreqLog(OptionValues options);
-
-    public abstract int invokeProfilePobabilityLog(OptionValues options);
-
-    public abstract int backedgeNotifyFreqLog(OptionValues options);
-
-    public abstract int backedgeProfilePobabilityLog(OptionValues options);
-
-    @Override
-    public boolean shouldProfile(GraphBuilderContext builder, ResolvedJavaMethod method) {
-        return !builder.parsingIntrinsic();
-    }
-
-    @Override
-    public void profileInvoke(GraphBuilderContext builder, ResolvedJavaMethod method, FrameState frameState) {
-        assert shouldProfile(builder, method);
-        OptionValues options = builder.getOptions();
-        if (Options.ProfileInvokes.getValue(options) && !method.isClassInitializer()) {
-            ProfileNode p = builder.append(new ProfileInvokeNode(method, invokeNotifyFreqLog(options), invokeProfilePobabilityLog(options)));
-            p.setStateBefore(frameState);
-        }
-    }
-
-    @Override
-    public void profileGoto(GraphBuilderContext builder, ResolvedJavaMethod method, int bci, int targetBci, FrameState frameState) {
-        assert shouldProfile(builder, method);
-        OptionValues options = builder.getOptions();
-        if (Options.ProfileBackedges.getValue(options) && targetBci <= bci) {
-            ProfileNode p = builder.append(new ProfileBranchNode(method, backedgeNotifyFreqLog(options), backedgeProfilePobabilityLog(options), bci, targetBci));
-            p.setStateBefore(frameState);
-        }
-    }
-
-    @Override
-    public void profileIf(GraphBuilderContext builder, ResolvedJavaMethod method, int bci, LogicNode condition, int trueBranchBci, int falseBranchBci, FrameState frameState) {
-        assert shouldProfile(builder, method);
-        OptionValues options = builder.getOptions();
-        if (Options.ProfileBackedges.getValue(options) && (falseBranchBci <= bci || trueBranchBci <= bci)) {
-            boolean negate = false;
-            int targetBci = trueBranchBci;
-            if (falseBranchBci <= bci) {
-                assert trueBranchBci > bci;
-                negate = true;
-                targetBci = falseBranchBci;
-            } else {
-                assert trueBranchBci <= bci && falseBranchBci > bci;
-            }
-            ValueNode trueValue = builder.append(ConstantNode.forBoolean(!negate));
-            ValueNode falseValue = builder.append(ConstantNode.forBoolean(negate));
-            ConditionalNode branchCondition = builder.append(new ConditionalNode(condition, trueValue, falseValue));
-            ProfileNode p = builder.append(new ProfileBranchNode(method, backedgeNotifyFreqLog(options), backedgeProfilePobabilityLog(options), branchCondition, bci, targetBci));
-            p.setStateBefore(frameState);
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
index 2e362cc97d8c..b4a2de09526f 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java
@@ -24,13 +24,6 @@
  */
 package org.graalvm.compiler.hotspot.meta;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-import static org.graalvm.compiler.core.common.GraalOptions.VerifyPhases;
-import static org.graalvm.compiler.core.phases.HighTier.Options.Inline;
-
-import java.util.ListIterator;
-
 import org.graalvm.compiler.debug.Assertions;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.HotSpotBackend;
@@ -38,12 +31,6 @@
 import org.graalvm.compiler.hotspot.HotSpotInstructionProfiling;
 import org.graalvm.compiler.hotspot.lir.HotSpotZapRegistersPhase;
 import org.graalvm.compiler.hotspot.lir.VerifyMaxRegisterSizePhase;
-import org.graalvm.compiler.hotspot.phases.AheadOfTimeVerificationPhase;
-import org.graalvm.compiler.hotspot.phases.LoadJavaMirrorWithKlassPhase;
-import org.graalvm.compiler.hotspot.phases.aot.AOTInliningPolicy;
-import org.graalvm.compiler.hotspot.phases.aot.EliminateRedundantInitializationPhase;
-import org.graalvm.compiler.hotspot.phases.aot.ReplaceConstantNodesPhase;
-import org.graalvm.compiler.hotspot.phases.profiling.FinalizeProfileNodesPhase;
 import org.graalvm.compiler.java.GraphBuilderPhase;
 import org.graalvm.compiler.java.SuitesProviderBase;
 import org.graalvm.compiler.lir.phases.LIRSuites;
@@ -56,12 +43,7 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.BasePhase;
 import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningPhase;
 import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
 import org.graalvm.compiler.phases.tiers.Suites;
 import org.graalvm.compiler.phases.tiers.SuitesCreator;
 
@@ -84,42 +66,7 @@ public HotSpotSuitesProvider(SuitesCreator defaultSuitesCreator, GraalHotSpotVMC
 
     @Override
     public Suites createSuites(OptionValues options) {
-        Suites ret = defaultSuitesCreator.createSuites(options);
-
-        if (ImmutableCode.getValue(options)) {
-            ListIterator<BasePhase<? super MidTierContext>> midTierLowering = ret.getMidTier().findPhase(LoweringPhase.class);
-
-            // lowering introduces class constants, therefore it must be after lowering
-            midTierLowering.add(new LoadJavaMirrorWithKlassPhase(config));
-
-            if (VerifyPhases.getValue(options)) {
-                midTierLowering.add(new AheadOfTimeVerificationPhase());
-            }
-
-            if (GeneratePIC.getValue(options)) {
-                ListIterator<BasePhase<? super HighTierContext>> highTierLowering = ret.getHighTier().findPhase(LoweringPhase.class);
-                highTierLowering.previous();
-                highTierLowering.add(new EliminateRedundantInitializationPhase());
-                if (HotSpotAOTProfilingPlugin.Options.TieredAOT.getValue(options)) {
-                    highTierLowering.add(new FinalizeProfileNodesPhase(HotSpotAOTProfilingPlugin.Options.TierAInvokeInlineeNotifyFreqLog.getValue(options)));
-                }
-                midTierLowering.add(new ReplaceConstantNodesPhase(true));
-
-                // Replace possible constants after GC barrier expansion.
-                ListIterator<BasePhase<? super LowTierContext>> lowTierLowering = ret.getLowTier().findPhase(LoweringPhase.class);
-                lowTierLowering.add(new ReplaceConstantNodesPhase(false));
-
-                // Replace inlining policy
-                if (Inline.getValue(options)) {
-                    ListIterator<BasePhase<? super HighTierContext>> iter = ret.getHighTier().findPhase(InliningPhase.class);
-                    InliningPhase inlining = (InliningPhase) iter.previous();
-                    CanonicalizerPhase canonicalizer = inlining.getCanonicalizer();
-                    iter.set(new InliningPhase(new AOTInliningPolicy(null), canonicalizer));
-                }
-            }
-        }
-
-        return ret;
+        return defaultSuitesCreator.createSuites(options);
     }
 
     protected PhaseSuite<HighTierContext> createGraphBuilderSuite() {
@@ -144,7 +91,7 @@ protected void run(StructuredGraph graph, HighTierContext context) {
 
                 StructuredGraph targetGraph = new StructuredGraph.Builder(graph.getOptions(), graph.getDebug(), AllowAssumptions.YES).method(graph.method()).trackNodeSourcePosition(
                                 graph.trackNodeSourcePosition()).build();
-                SimplifyingGraphDecoder graphDecoder = new SimplifyingGraphDecoder(runtime.getTarget().arch, targetGraph, context, !ImmutableCode.getValue(graph.getOptions()));
+                SimplifyingGraphDecoder graphDecoder = new SimplifyingGraphDecoder(runtime.getTarget().arch, targetGraph, context, true);
                 graphDecoder.decode(encodedGraph);
             }
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java
deleted file mode 100644
index 2ea6f9b7dd1f..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/GraalHotSpotVMConfigNode.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2015, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes;
-
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-import static org.graalvm.compiler.core.common.GraalOptions.AOTVerifyOops;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.HotSpotMarkId;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.Value;
-
-/**
- * Represents {@link GraalHotSpotVMConfig} values that may change after compilation.
- */
-@NodeInfo(cycles = CYCLES_1, size = SIZE_1)
-@NodeIntrinsicFactory
-public class GraalHotSpotVMConfigNode extends FloatingNode implements LIRLowerable, Canonicalizable {
-    public static final NodeClass<GraalHotSpotVMConfigNode> TYPE = NodeClass.create(GraalHotSpotVMConfigNode.class);
-
-    private final GraalHotSpotVMConfig config;
-    protected final HotSpotMarkId markId;
-
-    /**
-     * Constructor for node intrinsics below.
-     *
-     * @param config
-     * @param markId id of the config value
-     */
-    public GraalHotSpotVMConfigNode(@InjectedNodeParameter Stamp stamp, @InjectedNodeParameter GraalHotSpotVMConfig config, HotSpotMarkId markId) {
-        super(TYPE, stamp);
-        this.config = config;
-        this.markId = markId;
-        assert markId != null;
-    }
-
-    /**
-     * Constructor with explicit type specification.
-     *
-     * @param config
-     * @param markId id of the config value
-     * @param kind explicit type of the node
-     */
-    public GraalHotSpotVMConfigNode(GraalHotSpotVMConfig config, HotSpotMarkId markId, JavaKind kind) {
-        super(TYPE, StampFactory.forKind(kind));
-        this.config = config;
-        this.markId = markId;
-        assert markId != null;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool generator) {
-        Value res = ((HotSpotLIRGenerator) generator.getLIRGeneratorTool()).emitLoadConfigValue(markId, generator.getLIRGeneratorTool().getLIRKind(stamp));
-        generator.setResult(this, res);
-    }
-
-    @NodeIntrinsic
-    private static native long loadLongConfigValue(@ConstantNodeParameter HotSpotMarkId markId);
-
-    @NodeIntrinsic
-    private static native int loadIntConfigValue(@ConstantNodeParameter HotSpotMarkId markId);
-
-    @NodeIntrinsic
-    private static native boolean loadBoolConfigValue(@ConstantNodeParameter HotSpotMarkId markId);
-
-    public static long cardTableAddress() {
-        return loadLongConfigValue(HotSpotMarkId.CARD_TABLE_ADDRESS);
-    }
-
-    public static long crcTableAddress() {
-        return loadLongConfigValue(HotSpotMarkId.CRC_TABLE_ADDRESS);
-    }
-
-    public static int logOfHeapRegionGrainBytes() {
-        return loadIntConfigValue(HotSpotMarkId.LOG_OF_HEAP_REGION_GRAIN_BYTES);
-    }
-
-    public static boolean verifyOops() {
-        return loadBoolConfigValue(HotSpotMarkId.VERIFY_OOPS);
-    }
-
-    public static long verifyOopBits() {
-        return loadLongConfigValue(HotSpotMarkId.VERIFY_OOP_BITS);
-    }
-
-    public static long verifyOopMask() {
-        return loadLongConfigValue(HotSpotMarkId.VERIFY_OOP_MASK);
-    }
-
-    public static long verifyOopCounterAddress() {
-        return loadLongConfigValue(HotSpotMarkId.VERIFY_OOP_COUNT_ADDRESS);
-    }
-
-    public static boolean intrinsify(GraphBuilderContext b, @InjectedNodeParameter Stamp returnStamp, @InjectedNodeParameter GraalHotSpotVMConfig config, HotSpotMarkId mark) {
-        if (b.getReplacements().isEncodingSnippets()) {
-            // This plugin must be deferred so that these constants aren't embedded in libgraal
-            return false;
-        }
-        b.addPush(returnStamp.getStackKind(), new GraalHotSpotVMConfigNode(returnStamp, config, mark));
-        return true;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        boolean generatePIC = GeneratePIC.getValue(tool.getOptions());
-        boolean aotVerifyOops = AOTVerifyOops.getValue(tool.getOptions());
-        if (!generatePIC || !markId.isAvailable()) {
-            if (markId == HotSpotMarkId.CARD_TABLE_ADDRESS) {
-                return ConstantNode.forLong(config.cardtableStartAddress);
-            } else if (markId == HotSpotMarkId.CRC_TABLE_ADDRESS) {
-                return ConstantNode.forLong(config.crcTableAddress);
-            } else if (markId == HotSpotMarkId.LOG_OF_HEAP_REGION_GRAIN_BYTES) {
-                return ConstantNode.forInt(config.logOfHRGrainBytes);
-            } else if (markId == HotSpotMarkId.VERIFY_OOPS) {
-                return ConstantNode.forBoolean(config.verifyOops);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_BITS) {
-                return ConstantNode.forLong(config.verifyOopBits);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_MASK) {
-                return ConstantNode.forLong(config.verifyOopMask);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_COUNT_ADDRESS) {
-                return ConstantNode.forLong(config.verifyOopCounterAddress);
-            } else {
-                throw GraalError.shouldNotReachHere(markId.toString());
-            }
-        } else if (generatePIC && !aotVerifyOops) {
-            if (markId == HotSpotMarkId.VERIFY_OOPS) {
-                return ConstantNode.forBoolean(false);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_BITS) {
-                return ConstantNode.forLong(0L);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_MASK) {
-                return ConstantNode.forLong(0L);
-            } else if (markId == HotSpotMarkId.VERIFY_OOP_COUNT_ADDRESS) {
-                return ConstantNode.forLong(0L);
-            }
-        }
-        return this;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java
deleted file mode 100644
index 08d7d4b3d5eb..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/EncodedSymbolNode.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.replacements.EncodedSymbolConstant;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.word.Word;
-
-import jdk.vm.ci.meta.Constant;
-
-@NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED)
-public final class EncodedSymbolNode extends FloatingNode implements Canonicalizable {
-
-    public static final NodeClass<EncodedSymbolNode> TYPE = NodeClass.create(EncodedSymbolNode.class);
-
-    @OptionalInput protected ValueNode value;
-
-    public EncodedSymbolNode(@InjectedNodeParameter Stamp stamp, ValueNode value) {
-        super(TYPE, stamp);
-        assert value != null;
-        this.value = value;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            Constant constant = GraphUtil.foldIfConstantAndRemove(this, value);
-            if (constant != null) {
-                return new ConstantNode(new EncodedSymbolConstant(constant), StampFactory.pointer());
-            }
-        }
-        return this;
-    }
-
-    @NodeIntrinsic
-    public static native Word encode(Object constant);
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
deleted file mode 100644
index 53fddb8ae0c5..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.word.LocationIdentity;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_16, allowedUsageTypes = {Memory})
-public class InitializeKlassNode extends DeoptimizingFixedWithNextNode implements Lowerable, SingleMemoryKill {
-    public static final NodeClass<InitializeKlassNode> TYPE = NodeClass.create(InitializeKlassNode.class);
-
-    @Input ValueNode value;
-
-    public InitializeKlassNode(ValueNode value) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-    }
-
-    public ValueNode value() {
-        return value;
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
deleted file mode 100644
index 82611d3b6a53..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/InitializeKlassStubCall.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-/**
- * A call to the VM via a regular stub.
- */
-@NodeInfo(allowedUsageTypes = {InputType.Memory}, cycles = CYCLES_UNKNOWN, size = SIZE_16)
-public class InitializeKlassStubCall extends AbstractMemoryCheckpoint implements LIRLowerable, Canonicalizable, DeoptimizingNode.DeoptBefore, SingleMemoryKill {
-    public static final NodeClass<InitializeKlassStubCall> TYPE = NodeClass.create(InitializeKlassStubCall.class);
-
-    @OptionalInput protected ValueNode value;
-    @Input protected ValueNode string;
-    @OptionalInput(InputType.State) protected FrameState stateBefore;
-    protected Constant constant;
-
-    protected InitializeKlassStubCall(ValueNode value, ValueNode string) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.string = string;
-    }
-
-    @NodeIntrinsic
-    public static native KlassPointer initializeKlass(KlassPointer value, Word string);
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value stringValue = gen.operand(string);
-        LIRFrameState fs = gen.state(this);
-        assert fs != null : "Frame state should be set";
-        assert constant instanceof HotSpotMetaspaceConstant;
-        Value result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitKlassInitializationAndRetrieval(constant, stringValue, fs);
-        gen.setResult(this, result);
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-
-    @Override
-    public FrameState stateBefore() {
-        return stateBefore;
-    }
-
-    @Override
-    public void setStateBefore(FrameState f) {
-        updateUsages(stateBefore, f);
-        stateBefore = f;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java
deleted file mode 100644
index 494bccae4caa..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyFixedNode.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.hotspot.word.MethodPointer;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_1)
-public class LoadConstantIndirectlyFixedNode extends FixedWithNextNode implements Canonicalizable, LIRLowerable {
-
-    public static final NodeClass<LoadConstantIndirectlyFixedNode> TYPE = NodeClass.create(LoadConstantIndirectlyFixedNode.class);
-
-    @OptionalInput protected ValueNode value;
-    protected Constant constant;
-    protected HotSpotConstantLoadAction action;
-
-    public LoadConstantIndirectlyFixedNode(ValueNode value) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.constant = null;
-        this.action = HotSpotConstantLoadAction.RESOLVE;
-    }
-
-    public LoadConstantIndirectlyFixedNode(ValueNode value, HotSpotConstantLoadAction action) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.constant = null;
-        this.action = action;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value result;
-        if (constant instanceof HotSpotObjectConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitLoadObjectAddress(constant);
-        } else if (constant instanceof HotSpotMetaspaceConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitLoadMetaspaceAddress(constant, action);
-        } else {
-            throw new PermanentBailoutException("Unsupported constant type: " + constant);
-        }
-        gen.setResult(this, result);
-    }
-
-    @NodeIntrinsic
-    public static native KlassPointer loadKlass(KlassPointer klassPointer, @ConstantNodeParameter HotSpotConstantLoadAction action);
-
-    @NodeIntrinsic
-    public static native KlassPointer loadKlass(KlassPointer klassPointer);
-
-    @NodeIntrinsic
-    public static native MethodPointer loadMethod(MethodPointer klassPointer);
-
-    @NodeIntrinsic
-    public static native Object loadObject(Object object);
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java
deleted file mode 100644
index 44421747b93d..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadConstantIndirectlyNode.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_1)
-public class LoadConstantIndirectlyNode extends FloatingNode implements Canonicalizable, LIRLowerable {
-
-    public static final NodeClass<LoadConstantIndirectlyNode> TYPE = NodeClass.create(LoadConstantIndirectlyNode.class);
-
-    @OptionalInput protected ValueNode value;
-    protected Constant constant;
-    protected HotSpotConstantLoadAction action;
-
-    public LoadConstantIndirectlyNode(ValueNode value) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.constant = null;
-        this.action = HotSpotConstantLoadAction.RESOLVE;
-    }
-
-    public LoadConstantIndirectlyNode(ValueNode value, HotSpotConstantLoadAction action) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.constant = null;
-        this.action = action;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value result;
-        if (constant instanceof HotSpotObjectConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitLoadObjectAddress(constant);
-        } else if (constant instanceof HotSpotMetaspaceConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitLoadMetaspaceAddress(constant, action);
-        } else {
-            throw new PermanentBailoutException("Unsupported constant type: " + constant);
-        }
-        gen.setResult(this, result);
-    }
-
-    @NodeIntrinsic
-    public static native KlassPointer loadKlass(KlassPointer klassPointer, @ConstantNodeParameter HotSpotConstantLoadAction action);
-
-    @NodeIntrinsic
-    public static native KlassPointer loadKlass(KlassPointer klassPointer);
-
-    @NodeIntrinsic
-    public static native Object loadObject(Object object);
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java
deleted file mode 100644
index 9e3dec055fb8..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersIndirectlyNode.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
-
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.nodes.type.MethodCountersPointerStamp;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
-import org.graalvm.compiler.hotspot.word.MethodPointer;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_4)
-public class LoadMethodCountersIndirectlyNode extends FloatingNode implements Canonicalizable, LIRLowerable {
-
-    public static final NodeClass<LoadMethodCountersIndirectlyNode> TYPE = NodeClass.create(LoadMethodCountersIndirectlyNode.class);
-
-    @OptionalInput protected ValueNode value;
-    protected Constant constant;
-
-    public LoadMethodCountersIndirectlyNode(ValueNode value) {
-        super(TYPE, MethodCountersPointerStamp.methodCounters());
-        this.value = value;
-        this.constant = null;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value result;
-        if (constant instanceof HotSpotMetaspaceConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitLoadMetaspaceAddress(constant, HotSpotConstantLoadAction.LOAD_COUNTERS);
-        } else {
-            throw new PermanentBailoutException("Unsupported constant type: " + constant);
-        }
-        gen.setResult(this, result);
-    }
-
-    @NodeIntrinsic
-    public static native MethodCountersPointer loadMethodCounters(MethodPointer methodPointer);
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java
deleted file mode 100644
index c5f13e5aa6b5..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/LoadMethodCountersNode.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
-
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.hotspot.nodes.type.MethodCountersPointerStamp;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_4)
-public class LoadMethodCountersNode extends FloatingNode implements LIRLowerable {
-    public static final NodeClass<LoadMethodCountersNode> TYPE = NodeClass.create(LoadMethodCountersNode.class);
-
-    ResolvedJavaMethod method;
-
-    public LoadMethodCountersNode(ResolvedJavaMethod method) {
-        super(TYPE, MethodCountersPointerStamp.methodCountersNonNull());
-        this.method = method;
-    }
-
-    public ResolvedJavaMethod getMethod() {
-        return method;
-    }
-
-    public static NodeIterable<LoadMethodCountersNode> getLoadMethodCountersNodes(StructuredGraph graph) {
-        return graph.getNodes().filter(LoadMethodCountersNode.class);
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool generator) {
-        // TODO: With AOT we don't need this, as this node will be replaced.
-        // Implement later when profiling is needed in the JIT mode.
-        throw GraalError.unimplemented();
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java
deleted file mode 100644
index b10cb7e15ce4..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_16)
-public class ResolveConstantNode extends DeoptimizingFixedWithNextNode implements Lowerable {
-    public static final NodeClass<ResolveConstantNode> TYPE = NodeClass.create(ResolveConstantNode.class);
-
-    @Input ValueNode value;
-    protected HotSpotConstantLoadAction action;
-
-    public ResolveConstantNode(ValueNode value, HotSpotConstantLoadAction action) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.action = action;
-    }
-
-    public ResolveConstantNode(ValueNode value) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.action = HotSpotConstantLoadAction.RESOLVE;
-    }
-
-    public ValueNode value() {
-        return value;
-    }
-
-    public HotSpotConstantLoadAction action() {
-        return action;
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java
deleted file mode 100644
index fc0e2dcfb33a..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveConstantStubCall.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.nodes.DeoptimizingStubCall;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.word.Word;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-/**
- * A call to the VM via a regular stub.
- */
-@NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_16)
-public class ResolveConstantStubCall extends DeoptimizingStubCall implements Canonicalizable, LIRLowerable {
-    public static final NodeClass<ResolveConstantStubCall> TYPE = NodeClass.create(ResolveConstantStubCall.class);
-
-    @OptionalInput protected ValueNode value;
-    @Input protected ValueNode string;
-    protected Constant constant;
-    protected HotSpotConstantLoadAction action;
-
-    public ResolveConstantStubCall(ValueNode value, ValueNode string) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.string = string;
-        this.action = HotSpotConstantLoadAction.RESOLVE;
-    }
-
-    public ResolveConstantStubCall(ValueNode value, ValueNode string, HotSpotConstantLoadAction action) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-        this.string = string;
-        this.action = action;
-    }
-
-    @NodeIntrinsic
-    public static native Object resolveObject(Object value, Object symbol);
-
-    @NodeIntrinsic
-    public static native KlassPointer resolveKlass(KlassPointer value, Word symbol);
-
-    @NodeIntrinsic
-    public static native KlassPointer resolveKlass(KlassPointer value, Word symbol, @ConstantNodeParameter HotSpotConstantLoadAction action);
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value stringValue = gen.operand(string);
-        Value result;
-        LIRFrameState fs = gen.state(this);
-        assert fs != null : "The stateAfter is null";
-        if (constant instanceof HotSpotObjectConstant) {
-            result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitObjectConstantRetrieval(constant, stringValue, fs);
-        } else if (constant instanceof HotSpotMetaspaceConstant) {
-            if (action == HotSpotConstantLoadAction.RESOLVE) {
-                result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitMetaspaceConstantRetrieval(constant, stringValue, fs);
-            } else {
-                assert action == HotSpotConstantLoadAction.INITIALIZE;
-                result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitKlassInitializationAndRetrieval(constant, stringValue, fs);
-            }
-        } else {
-            throw new PermanentBailoutException("Unsupported constant type: " + constant);
-        }
-        gen.setResult(this, result);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
deleted file mode 100644
index 677882aca627..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicConstantNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.word.LocationIdentity;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_16, allowedUsageTypes = {InputType.Memory})
-public class ResolveDynamicConstantNode extends DeoptimizingFixedWithNextNode implements Lowerable, SingleMemoryKill {
-    public static final NodeClass<ResolveDynamicConstantNode> TYPE = NodeClass.create(ResolveDynamicConstantNode.class);
-
-    @Input ValueNode value;
-
-    public ResolveDynamicConstantNode(Stamp valueStamp, ValueNode value) {
-        super(TYPE, valueStamp);
-        this.value = value;
-    }
-
-    public ValueNode value() {
-        return value;
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
deleted file mode 100644
index 6d4b1d81881a..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveDynamicStubCall.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2017, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-/**
- * A call to the VM via a regular stub.
- */
-@NodeInfo(allowedUsageTypes = {InputType.Memory}, cycles = CYCLES_UNKNOWN, size = SIZE_16)
-public class ResolveDynamicStubCall extends AbstractMemoryCheckpoint implements LIRLowerable, Canonicalizable, DeoptimizingNode.DeoptBefore, SingleMemoryKill {
-    public static final NodeClass<ResolveDynamicStubCall> TYPE = NodeClass.create(ResolveDynamicStubCall.class);
-
-    @OptionalInput protected ValueNode value;
-    @OptionalInput(InputType.State) protected FrameState stateBefore;
-    protected Constant constant;
-
-    public ResolveDynamicStubCall(ValueNode value) {
-        super(TYPE, value.stamp(NodeView.DEFAULT));
-        this.value = value;
-    }
-
-    @NodeIntrinsic
-    public static native Object resolveInvoke(Object value);
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (value != null) {
-            constant = GraphUtil.foldIfConstantAndRemove(this, value);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert constant != null : "Expected the value to fold: " + value;
-        Value result;
-        LIRFrameState fs = gen.state(this);
-        assert fs != null : "The stateAfter is null";
-        result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitResolveDynamicInvoke(constant, fs);
-        gen.setResult(this, result);
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-
-    @Override
-    public FrameState stateBefore() {
-        return stateBefore;
-    }
-
-    @Override
-    public void setStateBefore(FrameState f) {
-        updateUsages(stateBefore, f);
-        stateBefore = f;
-    }
-
-    @Override
-    public void markDeleted() {
-        throw GraalError.shouldNotReachHere("ResolveDynamicStubCall node deleted");
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java
deleted file mode 100644
index 4937a94f97c1..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersNode.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.hotspot.nodes.type.MethodCountersPointerStamp;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo(cycles = CYCLES_4, size = SIZE_16)
-public class ResolveMethodAndLoadCountersNode extends DeoptimizingFixedWithNextNode implements Lowerable {
-    public static final NodeClass<ResolveMethodAndLoadCountersNode> TYPE = NodeClass.create(ResolveMethodAndLoadCountersNode.class);
-
-    ResolvedJavaMethod method;
-    @Input ValueNode hub;
-
-    public ResolveMethodAndLoadCountersNode(ResolvedJavaMethod method, ValueNode hub) {
-        super(TYPE, MethodCountersPointerStamp.methodCountersNonNull());
-        this.method = method;
-        this.hub = hub;
-    }
-
-    public ResolvedJavaMethod getMethod() {
-        return method;
-    }
-
-    public ValueNode getHub() {
-        return hub;
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java
deleted file mode 100644
index a880291aa278..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/aot/ResolveMethodAndLoadCountersStubCall.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.aot;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.hotspot.nodes.DeoptimizingStubCall;
-import org.graalvm.compiler.hotspot.nodes.type.MethodCountersPointerStamp;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
-import org.graalvm.compiler.hotspot.word.MethodPointer;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.word.Word;
-
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.Value;
-
-/**
- * A call to the VM via a regular stub.
- */
-@NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_16)
-public class ResolveMethodAndLoadCountersStubCall extends DeoptimizingStubCall implements Canonicalizable, LIRLowerable {
-    public static final NodeClass<ResolveMethodAndLoadCountersStubCall> TYPE = NodeClass.create(ResolveMethodAndLoadCountersStubCall.class);
-
-    @OptionalInput protected ValueNode method;
-    @Input protected ValueNode klassHint;
-    @Input protected ValueNode methodDescription;
-    protected Constant methodConstant;
-
-    public ResolveMethodAndLoadCountersStubCall(ValueNode method, ValueNode klassHint, ValueNode methodDescription) {
-        super(TYPE, MethodCountersPointerStamp.methodCountersNonNull());
-        this.klassHint = klassHint;
-        this.method = method;
-        this.methodDescription = methodDescription;
-    }
-
-    @NodeIntrinsic
-    public static native MethodCountersPointer resolveMethodAndLoadCounters(MethodPointer method, KlassPointer klassHint, Word methodDescription);
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (method != null) {
-            methodConstant = GraphUtil.foldIfConstantAndRemove(this, method);
-        }
-        return this;
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        assert methodConstant != null : "Expected method to fold: " + method;
-
-        Value methodDescriptionValue = gen.operand(methodDescription);
-        Value klassHintValue = gen.operand(klassHint);
-        LIRFrameState fs = gen.state(this);
-        assert fs != null : "The stateAfter is null";
-
-        Value result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitResolveMethodAndLoadCounters(methodConstant, klassHintValue, methodDescriptionValue, fs);
-
-        gen.setResult(this, result);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java
deleted file mode 100644
index 55e059ebd1ac..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileBranchNode.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.profiling;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo
-public class ProfileBranchNode extends ProfileWithNotificationNode {
-    public static final NodeClass<ProfileBranchNode> TYPE = NodeClass.create(ProfileBranchNode.class);
-
-    @OptionalInput ValueNode branchCondition;
-    protected int bci;
-    protected int targetBci;
-
-    public ProfileBranchNode(ResolvedJavaMethod method, int freqLog, int probabilityLog, ConditionalNode branchCondition, int bci, int targetBci) {
-        super(TYPE, method, freqLog, probabilityLog);
-        assert targetBci <= bci;
-        this.branchCondition = branchCondition;
-        this.bci = bci;
-        this.targetBci = targetBci;
-    }
-
-    public ProfileBranchNode(ResolvedJavaMethod method, int freqLog, int probabilityLog, int bci, int targetBci) {
-        super(TYPE, method, freqLog, probabilityLog);
-        assert targetBci <= bci;
-        this.branchCondition = null;
-        this.bci = bci;
-        this.targetBci = targetBci;
-    }
-
-    public int bci() {
-        return bci;
-    }
-
-    public int targetBci() {
-        return targetBci;
-    }
-
-    public ValueNode branchCondition() {
-        return branchCondition;
-    }
-
-    public boolean hasCondition() {
-        return branchCondition != null;
-    }
-
-    @Override
-    protected boolean canBeMergedWith(ProfileNode p) {
-        if (p instanceof ProfileBranchNode) {
-            ProfileBranchNode that = (ProfileBranchNode) p;
-            return this.method.equals(that.method) && this.bci == that.bci;
-        }
-        return false;
-    }
-
-    /**
-     * Gathers all the {@link ProfileBranchNode}s that are inputs to the
-     * {@linkplain StructuredGraph#getNodes() live nodes} in a given graph.
-     */
-    public static NodeIterable<ProfileBranchNode> getProfileBranchNodes(StructuredGraph graph) {
-        return graph.getNodes().filter(ProfileBranchNode.class);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java
deleted file mode 100644
index 40c8999b17d0..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileInvokeNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.profiling;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StructuredGraph;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo
-public class ProfileInvokeNode extends ProfileWithNotificationNode {
-    public static final NodeClass<ProfileInvokeNode> TYPE = NodeClass.create(ProfileInvokeNode.class);
-
-    public ProfileInvokeNode(ResolvedJavaMethod method, int freqLog, int probabilityLog) {
-        super(TYPE, method, freqLog, probabilityLog);
-    }
-
-    @Override
-    protected boolean canBeMergedWith(ProfileNode p) {
-        if (p instanceof ProfileInvokeNode) {
-            ProfileInvokeNode that = (ProfileInvokeNode) p;
-            return this.method.equals(that.method);
-        }
-        return false;
-    }
-
-    /**
-     * Gathers all the {@link ProfileInvokeNode}s that are inputs to the
-     * {@linkplain StructuredGraph#getNodes() live nodes} in a given graph.
-     */
-    public static NodeIterable<ProfileInvokeNode> getProfileInvokeNodes(StructuredGraph graph) {
-        return graph.getNodes().filter(ProfileInvokeNode.class);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java
deleted file mode 100644
index 1141991169fb..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileNode.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.profiling;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-import static org.graalvm.compiler.nodes.util.GraphUtil.removeFixedWithUnusedInputs;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo(cycles = CYCLES_IGNORED, cyclesRationale = "profiling should be ignored", size = SIZE_IGNORED, sizeRationale = "profiling should be ignored")
-public abstract class ProfileNode extends DeoptimizingFixedWithNextNode implements SingleMemoryKill, Simplifiable, Lowerable {
-    public static class Options {
-        @Option(help = "Control probabilistic profiling on AMD64", type = OptionType.Expert)//
-        public static final OptionKey<Boolean> ProbabilisticProfiling = new OptionKey<>(true);
-    }
-
-    public static final NodeClass<ProfileNode> TYPE = NodeClass.create(ProfileNode.class);
-
-    protected ResolvedJavaMethod method;
-
-    // Only used if ProbabilisticProfiling == true and may be ignored by lowerer.
-    @OptionalInput protected ValueNode random;
-
-    // Logarithm base 2 of the profile probability.
-    protected int probabilityLog;
-
-    // Step value to add to the profile counter.
-    protected int step;
-
-    protected ProfileNode(NodeClass<? extends DeoptimizingFixedWithNextNode> c, ResolvedJavaMethod method, int probabilityLog) {
-        super(c, StampFactory.forVoid());
-        this.method = method;
-        this.probabilityLog = probabilityLog;
-        this.step = 1;
-    }
-
-    public ProfileNode(ResolvedJavaMethod method, int probabilityLog) {
-        this(TYPE, method, probabilityLog);
-    }
-
-    @Override
-    public boolean canDeoptimize() {
-        return true;
-    }
-
-    public ResolvedJavaMethod getProfiledMethod() {
-        return method;
-    }
-
-    public ValueNode getRandom() {
-        return random;
-    }
-
-    public void setRandom(ValueNode r) {
-        updateUsages(random, r);
-        this.random = r;
-    }
-
-    public int getStep() {
-        return step;
-    }
-
-    public void setStep(int s) {
-        step = s;
-    }
-
-    /**
-     * Get the logarithm base 2 of the profile probability.
-     */
-    public int getProbabilityLog() {
-        return probabilityLog;
-    }
-
-    /**
-     * Gathers all the {@link ProfileNode}s that are inputs to the
-     * {@linkplain StructuredGraph#getNodes() live nodes} in a given graph.
-     */
-    public static NodeIterable<ProfileNode> getProfileNodes(StructuredGraph graph) {
-        return graph.getNodes().filter(ProfileNode.class);
-    }
-
-    protected abstract boolean canBeMergedWith(ProfileNode p);
-
-    @Override
-    public void simplify(SimplifierTool tool) {
-        for (Node p = predecessor(); p != null; p = p.predecessor()) {
-            // Terminate search when we hit a control split or merge.
-            if (p instanceof ControlSplitNode || p instanceof AbstractMergeNode) {
-                break;
-            }
-            if (p instanceof ProfileNode) {
-                ProfileNode that = (ProfileNode) p;
-                if (this.canBeMergedWith(that)) {
-                    that.setStep(this.getStep() + that.getStep());
-                    removeFixedWithUnusedInputs(this);
-                    tool.addToWorkList(that);
-                    break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return LocationIdentity.any();
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java
deleted file mode 100644
index 078f242878f4..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/ProfileWithNotificationNode.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.nodes.profiling;
-
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-@NodeInfo
-public abstract class ProfileWithNotificationNode extends ProfileNode {
-    public static final NodeClass<ProfileWithNotificationNode> TYPE = NodeClass.create(ProfileWithNotificationNode.class);
-
-    protected int freqLog;
-
-    protected ProfileWithNotificationNode(NodeClass<? extends ProfileNode> c, ResolvedJavaMethod method, int freqLog, int probabilityLog) {
-        super(c, method, probabilityLog);
-        this.freqLog = freqLog;
-    }
-
-    public ProfileWithNotificationNode(ResolvedJavaMethod method, int freqLog, int probabilityLog) {
-        super(TYPE, method, probabilityLog);
-        this.freqLog = freqLog;
-    }
-
-    /**
-     * Get the logarithm base 2 of the notification frequency.
-     */
-    public int getNotificationFreqLog() {
-        return freqLog;
-    }
-
-    /**
-     * Set the logarithm base 2 of the notification frequency.
-     */
-    public void setNotificationFreqLog(int freqLog) {
-        assert freqLog < 32;
-        this.freqLog = freqLog;
-    }
-
-    public void setNotificationOff() {
-        setNotificationFreqLog(-1);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java
deleted file mode 100644
index 48258b541e30..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/nodes/profiling/RandomSeedNode.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package org.graalvm.compiler.hotspot.nodes.profiling;
-
-import jdk.vm.ci.meta.Value;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-
-@NodeInfo(cycles = CYCLES_1, size = SIZE_1)
-public class RandomSeedNode extends FloatingNode implements LIRLowerable {
-    public static final NodeClass<RandomSeedNode> TYPE = NodeClass.create(RandomSeedNode.class);
-
-    public RandomSeedNode() {
-        super(TYPE, StampFactory.intValue());
-    }
-
-    @Override
-    public void generate(NodeLIRBuilderTool gen) {
-        Value result = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitRandomSeed();
-        gen.setResult(this, result);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
deleted file mode 100644
index 29e96a7a78f8..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/AheadOfTimeVerificationPhase.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2013, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases;
-
-import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes;
-
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.phases.VerifyPhase;
-
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.JavaKind;
-
-/**
- * Checks for {@link #isIllegalObjectConstant(ConstantNode) illegal} object constants in a graph
- * processed for AOT compilation.
- *
- * @see LoadJavaMirrorWithKlassPhase
- */
-public class AheadOfTimeVerificationPhase extends VerifyPhase<CoreProviders> {
-
-    @Override
-    protected void verify(StructuredGraph graph, CoreProviders context) {
-        for (ConstantNode node : getConstantNodes(graph)) {
-            if (isIllegalObjectConstant(node)) {
-                throw new VerificationError("illegal object constant: " + node);
-            }
-        }
-    }
-
-    public static boolean isIllegalObjectConstant(ConstantNode node) {
-        return isObject(node) &&
-                        !isNullReference(node) &&
-                        !isInternedString(node) &&
-                        !isDirectMethodHandle(node) &&
-                        !isBoundMethodHandle(node) &&
-                        !isVarHandle(node);
-    }
-
-    private static boolean isObject(ConstantNode node) {
-        return node.getStackKind() == JavaKind.Object;
-    }
-
-    private static boolean isNullReference(ConstantNode node) {
-        return isObject(node) && node.isNullConstant();
-    }
-
-    private static boolean isDirectMethodHandle(ConstantNode node) {
-        String typeName = StampTool.typeOrNull(node).getName();
-        if (!isObject(node)) {
-            return false;
-        }
-
-        switch (typeName) {
-            case "Ljava/lang/invoke/DirectMethodHandle;":
-            case "Ljava/lang/invoke/DirectMethodHandle$StaticAccessor;":
-            case "Ljava/lang/invoke/DirectMethodHandle$Accessor;":
-            case "Ljava/lang/invoke/DirectMethodHandle$Constructor;":
-            case "Ljava/lang/invoke/DirectMethodHandle$Special;":
-            case "Ljava/lang/invoke/DirectMethodHandle$Interface;":
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    private static boolean isBoundMethodHandle(ConstantNode node) {
-        if (!isObject(node)) {
-            return false;
-        }
-        return StampTool.typeOrNull(node).getName().startsWith("Ljava/lang/invoke/BoundMethodHandle");
-    }
-
-    private static boolean isVarHandle(ConstantNode node) {
-        if (!isObject(node)) {
-            return false;
-        }
-        String name = StampTool.typeOrNull(node).getName();
-        return name.equals("Ljava/lang/invoke/VarHandle$AccessDescriptor;");
-    }
-
-    private static boolean isInternedString(ConstantNode node) {
-        if (!isObject(node)) {
-            return false;
-        }
-
-        HotSpotObjectConstant c = (HotSpotObjectConstant) node.asConstant();
-        return c.isInternedString();
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java
deleted file mode 100644
index 70657aff2e98..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/LoadJavaMirrorWithKlassPhase.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2013, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases;
-
-import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.FINAL_LOCATION;
-
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
-import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp;
-import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
-import org.graalvm.compiler.hotspot.replacements.HubGetClassNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.hotspot.HotSpotResolvedJavaField;
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.hotspot.HotSpotResolvedPrimitiveType;
-import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-/**
- * For AOT compilation we aren't allowed to use a {@link Class} reference ({@code javaMirror})
- * directly. Instead the {@link Class} reference should be obtained from the {@code Klass} object.
- * The reason for this is, that in Class Data Sharing (CDS) a {@code Klass} object is mapped to a
- * fixed address in memory, but the {@code javaMirror} is not (which lives in the Java heap).
- *
- * Lowering can introduce new {@link ConstantNode}s containing a {@link Class} reference, thus this
- * phase must be applied after {@link LoweringPhase}.
- *
- * @see AheadOfTimeVerificationPhase
- */
-public class LoadJavaMirrorWithKlassPhase extends BasePhase<CoreProviders> {
-
-    private final CompressEncoding oopEncoding;
-
-    public LoadJavaMirrorWithKlassPhase(GraalHotSpotVMConfig config) {
-        this.oopEncoding = config.useCompressedOops ? config.getOopEncoding() : null;
-    }
-
-    private ValueNode getClassConstantReplacement(StructuredGraph graph, CoreProviders context, JavaConstant constant) {
-        if (constant instanceof HotSpotObjectConstant) {
-            ConstantReflectionProvider constantReflection = context.getConstantReflection();
-            ResolvedJavaType type = constantReflection.asJavaType(constant);
-            if (type != null) {
-                MetaAccessProvider metaAccess = context.getMetaAccess();
-                Stamp stamp = StampFactory.objectNonNull(TypeReference.createExactTrusted(metaAccess.lookupJavaType(Class.class)));
-
-                if (type instanceof HotSpotResolvedObjectType) {
-                    ConstantNode klass = ConstantNode.forConstant(KlassPointerStamp.klassNonNull(), ((HotSpotResolvedObjectType) type).klass(), metaAccess, graph);
-                    ValueNode getClass = graph.unique(new HubGetClassNode(metaAccess, klass));
-
-                    if (((HotSpotObjectConstant) constant).isCompressed()) {
-                        return HotSpotCompressionNode.compress(getClass, oopEncoding);
-                    } else {
-                        return getClass;
-                    }
-                } else {
-                    /*
-                     * Primitive classes are more difficult since they don't have a corresponding
-                     * Klass* so get them from Class.TYPE for the java box type.
-                     */
-                    HotSpotResolvedPrimitiveType primitive = (HotSpotResolvedPrimitiveType) type;
-                    ResolvedJavaType boxingClass = metaAccess.lookupJavaType(primitive.getJavaKind().toBoxedJavaClass());
-                    ConstantNode clazz = ConstantNode.forConstant(context.getConstantReflection().asJavaClass(boxingClass), metaAccess, graph);
-                    HotSpotResolvedJavaField[] a = (HotSpotResolvedJavaField[]) boxingClass.getStaticFields();
-                    HotSpotResolvedJavaField typeField = null;
-                    for (HotSpotResolvedJavaField f : a) {
-                        if (f.getName().equals("TYPE")) {
-                            typeField = f;
-                            break;
-                        }
-                    }
-                    if (typeField == null) {
-                        throw new GraalError("Can't find TYPE field in class");
-                    }
-
-                    if (oopEncoding != null) {
-                        stamp = HotSpotNarrowOopStamp.compressed((AbstractObjectStamp) stamp, oopEncoding);
-                    }
-                    AddressNode address = graph.unique(new OffsetAddressNode(clazz, ConstantNode.forLong(typeField.getOffset(), graph)));
-                    ValueNode read = graph.unique(new FloatingReadNode(address, FINAL_LOCATION, null, stamp));
-
-                    if (oopEncoding == null || ((HotSpotObjectConstant) constant).isCompressed()) {
-                        return read;
-                    } else {
-                        return HotSpotCompressionNode.uncompress(read, oopEncoding);
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected void run(StructuredGraph graph, CoreProviders context) {
-        for (ConstantNode node : getConstantNodes(graph)) {
-            JavaConstant constant = node.asJavaConstant();
-            ValueNode freadNode = getClassConstantReplacement(graph, context, constant);
-            if (freadNode != null) {
-                node.replace(graph, freadNode);
-            }
-        }
-    }
-
-    @Override
-    public float codeSizeIncrease() {
-        return 2.5f;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java
deleted file mode 100644
index 95e57ba1143d..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/AOTInliningPolicy.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases.aot;
-
-import static org.graalvm.compiler.core.common.GraalOptions.InlineEverything;
-import static org.graalvm.compiler.core.common.GraalOptions.TrivialInliningSize;
-
-import java.util.Map;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy;
-import org.graalvm.compiler.phases.common.inlining.policy.InliningPolicy;
-import org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation;
-
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-
-public class AOTInliningPolicy extends GreedyInliningPolicy {
-    public static class Options {
-        // @formatter:off
-        @Option(help = "", type = OptionType.Expert)
-        public static final OptionKey<Double> AOTInliningDepthToSizeRate = new OptionKey<>(2.5);
-        @Option(help = "", type = OptionType.Expert)
-        public static final OptionKey<Integer> AOTInliningSizeMaximum = new OptionKey<>(300);
-        @Option(help = "", type = OptionType.Expert)
-        public static final OptionKey<Integer> AOTInliningSizeMinimum = new OptionKey<>(50);
-        // @formatter:on
-    }
-
-    public AOTInliningPolicy(Map<Invoke, Double> hints) {
-        super(hints);
-    }
-
-    protected double maxInliningSize(int inliningDepth, OptionValues options) {
-        return Math.max(Options.AOTInliningSizeMaximum.getValue(options) / (inliningDepth * Options.AOTInliningDepthToSizeRate.getValue(options)), Options.AOTInliningSizeMinimum.getValue(options));
-    }
-
-    @Override
-    public Decision isWorthInlining(Replacements replacements, MethodInvocation invocation, InlineInfo calleeInfo, int inliningDepth, boolean fullyProcessed) {
-        OptionValues options = calleeInfo.graph().getOptions();
-        final boolean isTracing = GraalOptions.TraceInlining.getValue(options) || calleeInfo.graph().getDebug().hasCompilationListener();
-
-        final InlineInfo info = invocation.callee();
-
-        for (int i = 0; i < info.numberOfMethods(); ++i) {
-            HotSpotResolvedObjectType t = (HotSpotResolvedObjectType) info.methodAt(i).getDeclaringClass();
-            if (t.getFingerprint() == 0) {
-                return InliningPolicy.Decision.NO.withReason(isTracing, "missing fingerprint");
-            }
-        }
-
-        final double probability = invocation.probability();
-        final double relevance = invocation.relevance();
-
-        if (InlineEverything.getValue(options)) {
-            InliningUtil.traceInlinedMethod(info, inliningDepth, fullyProcessed, "inline everything");
-            return InliningPolicy.Decision.YES.withReason(isTracing, "inline everything");
-        }
-
-        if (isIntrinsic(replacements, info)) {
-            InliningUtil.traceInlinedMethod(info, inliningDepth, fullyProcessed, "intrinsic");
-            return InliningPolicy.Decision.YES.withReason(isTracing, "intrinsic");
-        }
-
-        if (info.shouldInline()) {
-            InliningUtil.traceInlinedMethod(info, inliningDepth, fullyProcessed, "forced inlining");
-            return InliningPolicy.Decision.YES.withReason(isTracing, "forced inlining");
-        }
-
-        double inliningBonus = getInliningBonus(info);
-        int nodes = info.determineNodeCount();
-
-        if (nodes < TrivialInliningSize.getValue(options) * inliningBonus) {
-            InliningUtil.traceInlinedMethod(info, inliningDepth, fullyProcessed, "trivial (relevance=%f, probability=%f, bonus=%f, nodes=%d)", relevance, probability, inliningBonus, nodes);
-            return InliningPolicy.Decision.YES.withReason(isTracing, "trivial (relevance=%f, probability=%f, bonus=%f, nodes=%d)", relevance, probability, inliningBonus, nodes);
-        }
-
-        double maximumNodes = computeMaximumSize(relevance, (int) (maxInliningSize(inliningDepth, options) * inliningBonus));
-        if (nodes <= maximumNodes) {
-            InliningUtil.traceInlinedMethod(info, inliningDepth, fullyProcessed, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d <= %f)", relevance, probability, inliningBonus,
-                            nodes, maximumNodes);
-            return InliningPolicy.Decision.YES.withReason(isTracing, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d <= %f)", relevance, probability, inliningBonus,
-                            nodes, maximumNodes);
-        }
-
-        InliningUtil.traceNotInlinedMethod(info, inliningDepth, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d > %f)", relevance, probability, inliningBonus, nodes, maximumNodes);
-        return InliningPolicy.Decision.NO.withReason(isTracing, "relevance-based (relevance=%f, probability=%f, bonus=%f, nodes=%d > %f)", relevance, probability, inliningBonus, nodes, maximumNodes);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java
deleted file mode 100644
index eb8d222f0ce0..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/EliminateRedundantInitializationPhase.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases.aot;
-
-import static org.graalvm.util.CollectionsUtil.anyMatch;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.graph.MergeableState;
-import org.graalvm.compiler.phases.graph.PostOrderNodeIterator;
-
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-public class EliminateRedundantInitializationPhase extends BasePhase<CoreProviders> {
-    /**
-     * Find each {@link Invoke} that has a corresponding {@link InitializeKlassNode}. These
-     * {@link InitializeKlassNode} are redundant and are removed.
-     */
-    private static void removeInitsAtStaticCalls(StructuredGraph graph) {
-        for (Invoke invoke : graph.getInvokes()) {
-            Node classInit = invoke.classInit();
-            if (classInit != null) {
-                classInit.replaceAtUsages(null);
-                graph.removeFixed((FixedWithNextNode) classInit);
-            }
-        }
-    }
-
-    /**
-     * Remove redundant {@link InitializeKlassNode} or {@link ResolveConstantNode} instances from
-     * the graph.
-     *
-     * @param graph the program graph
-     */
-    private static void removeRedundantInits(StructuredGraph graph) {
-        // Find and remove redundant nodes from the graph.
-        List<FixedWithNextNode> redundantNodes = findRedundantInits(graph);
-        for (FixedWithNextNode n : redundantNodes) {
-            graph.removeFixed(n);
-        }
-    }
-
-    /**
-     * Find {@link InitializeKlassNode} and {@link ResolveConstantNode} instances that can be
-     * removed because there is an existing dominating node.
-     *
-     * @param graph the program graph
-     */
-    private static List<FixedWithNextNode> findRedundantInits(StructuredGraph graph) {
-        EliminateRedundantInitializationIterator i = new EliminateRedundantInitializationIterator(graph.start(), new InitializedTypes());
-        i.apply();
-        return i.getRedundantNodes();
-    }
-
-    /**
-     * State for {@link EliminateRedundantInitializationIterator}.
-     */
-    private static class InitializedTypes extends MergeableState<InitializedTypes> implements Cloneable {
-        private EconomicSet<ResolvedJavaType> types;
-
-        InitializedTypes() {
-            types = EconomicSet.create();
-        }
-
-        private InitializedTypes(EconomicSet<ResolvedJavaType> types) {
-            this.types = types;
-        }
-
-        @Override
-        public InitializedTypes clone() {
-            return new InitializedTypes(EconomicSet.create(types));
-        }
-
-        public boolean contains(ResolvedJavaType type) {
-            if (type.isInterface() || type.isArray()) {
-                // Check for exact match for interfaces
-                return types.contains(type);
-            }
-            // For other types see if there is the same type or a subtype
-            return anyMatch(types, t -> type.isAssignableFrom(t));
-        }
-
-        public void add(ResolvedJavaType type) {
-            types.add(type);
-        }
-
-        /**
-         * Merge two given types. Interfaces and arrays have to be the same to merge successfully.
-         * For other types the answer is the LCA.
-         *
-         * @param a initialized type
-         * @param b initialized type
-         * @return lowest common type that is initialized if either a or b are initialized, null if
-         *         no such type exists.
-         */
-        private static ResolvedJavaType merge(ResolvedJavaType a, ResolvedJavaType b) {
-            // We want exact match for interfaces or arrays
-            if (a.isInterface() || b.isInterface() || a.isArray() || b.isArray()) {
-                if (a.equals(b)) {
-                    return a;
-                } else {
-                    return null;
-                }
-            } else {
-                // And LCA for other types
-                ResolvedJavaType c = a.findLeastCommonAncestor(b);
-                if (c.isJavaLangObject()) {
-                    // Not a very useful type, always initialized, don't pollute the sets.
-                    return null;
-                }
-                return c;
-            }
-        }
-
-        /**
-         * Merge two sets of types. Essentially a computation of the LCA for each element of the
-         * cartesian product of the input sets. Interfaces have to match exactly.
-         *
-         * @param a set of initialized types
-         * @param b set of initialized types
-         * @return set of common types that would be initialized if types in either a or b are
-         *         initialized
-         */
-        private static EconomicSet<ResolvedJavaType> merge(EconomicSet<ResolvedJavaType> a, EconomicSet<ResolvedJavaType> b) {
-            EconomicSet<ResolvedJavaType> c = EconomicSet.create();
-            for (ResolvedJavaType ta : a) {
-                for (ResolvedJavaType tb : b) {
-                    ResolvedJavaType tc = merge(ta, tb);
-                    if (tc != null) {
-                        c.add(tc);
-                        if (tc.isInterface() || tc.isArray()) {
-                            // Interfaces and arrays are not going merge with anything else, so bail
-                            // out early.
-                            break;
-                        }
-                    }
-                }
-            }
-            return c;
-        }
-
-        @Override
-        public boolean merge(AbstractMergeNode merge, List<InitializedTypes> withStates) {
-            for (InitializedTypes ts : withStates) {
-                types = merge(types, ts.types);
-            }
-            return true;
-        }
-
-        protected static String toString(EconomicSet<ResolvedJavaType> types) {
-            StringBuilder b = new StringBuilder();
-            b.append("[");
-            Iterator<ResolvedJavaType> i = types.iterator();
-            while (i.hasNext()) {
-                ResolvedJavaType t = i.next();
-                b.append(t.toString());
-                if (i.hasNext()) {
-                    b.append(",");
-                }
-            }
-            b.append("]");
-            return b.toString();
-        }
-
-        @Override
-        public String toString() {
-            return toString(types);
-        }
-    }
-
-    /**
-     * Do data flow analysis of class initializations and array resolutions. Collect redundant
-     * nodes.
-     */
-    private static class EliminateRedundantInitializationIterator extends PostOrderNodeIterator<InitializedTypes> {
-        private List<FixedWithNextNode> redundantNodes = new ArrayList<>();
-
-        public List<FixedWithNextNode> getRedundantNodes() {
-            return redundantNodes;
-        }
-
-        EliminateRedundantInitializationIterator(FixedNode start, InitializedTypes initialState) {
-            super(start, initialState);
-        }
-
-        private void processType(FixedWithNextNode node, Constant c) {
-            HotSpotMetaspaceConstant klass = (HotSpotMetaspaceConstant) c;
-            ResolvedJavaType t = klass.asResolvedJavaType();
-            if (t != null) {
-                if (state.contains(t)) {
-                    redundantNodes.add(node);
-                } else {
-                    state.add(t);
-                }
-            }
-        }
-
-        @Override
-        protected void node(FixedNode node) {
-            if (node instanceof InitializeKlassNode) {
-                InitializeKlassNode i = (InitializeKlassNode) node;
-                if (i.value().isConstant()) {
-                    processType(i, i.value().asConstant());
-                }
-            } else if (node instanceof ResolveConstantNode) {
-                ResolveConstantNode r = (ResolveConstantNode) node;
-                if (r.hasNoUsages()) {
-                    if (r.value().isConstant()) {
-                        processType(r, r.value().asConstant());
-                    }
-                }
-            }
-        }
-
-    }
-
-    @Override
-    protected void run(StructuredGraph graph, CoreProviders context) {
-        removeInitsAtStaticCalls(graph);
-        removeRedundantInits(graph);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
deleted file mode 100644
index a41598fae333..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/aot/ReplaceConstantNodesPhase.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases.aot;
-
-import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.strictlyDominates;
-import static org.graalvm.compiler.hotspot.nodes.aot.LoadMethodCountersNode.getLoadMethodCountersNodes;
-import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes;
-
-import java.lang.ref.Reference;
-import java.util.HashSet;
-import java.util.List;
-
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyFixedNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadMethodCountersNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.Block;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
-
-import jdk.vm.ci.code.BytecodeFrame;
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.hotspot.HotSpotResolvedJavaType;
-import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
-import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-public class ReplaceConstantNodesPhase extends BasePhase<CoreProviders> {
-
-    private final boolean verifyFingerprints;
-    private final boolean allowResolution;
-
-    static Class<?> characterCacheClass = Character.class.getDeclaredClasses()[0];
-    static Class<?> byteCacheClass = Byte.class.getDeclaredClasses()[0];
-    static Class<?> shortCacheClass = Short.class.getDeclaredClasses()[0];
-    static Class<?> integerCacheClass = Integer.class.getDeclaredClasses()[0];
-    static Class<?> longCacheClass = Long.class.getDeclaredClasses()[0];
-
-    static class ClassInfo {
-
-        private ResolvedJavaType stringType;
-        private ResolvedJavaType referenceType;
-        private final HashSet<ResolvedJavaType> builtIns = new HashSet<>();
-
-        ClassInfo(MetaAccessProvider metaAccessProvider) {
-            builtIns.add(metaAccessProvider.lookupJavaType(Boolean.class));
-
-            assert "java.lang.Character$CharacterCache".equals(characterCacheClass.getName());
-            builtIns.add(metaAccessProvider.lookupJavaType(characterCacheClass));
-
-            assert "java.lang.Byte$ByteCache".equals(byteCacheClass.getName());
-            builtIns.add(metaAccessProvider.lookupJavaType(byteCacheClass));
-
-            assert "java.lang.Short$ShortCache".equals(shortCacheClass.getName());
-            builtIns.add(metaAccessProvider.lookupJavaType(shortCacheClass));
-
-            assert "java.lang.Integer$IntegerCache".equals(integerCacheClass.getName());
-            builtIns.add(metaAccessProvider.lookupJavaType(integerCacheClass));
-
-            assert "java.lang.Long$LongCache".equals(longCacheClass.getName());
-            builtIns.add(metaAccessProvider.lookupJavaType(longCacheClass));
-
-            stringType = metaAccessProvider.lookupJavaType(String.class);
-            referenceType = metaAccessProvider.lookupJavaType(Reference.class);
-        }
-    }
-
-    private static boolean isReplacementNode(Node n) {
-        // @formatter:off
-        return n instanceof LoadConstantIndirectlyNode      ||
-                n instanceof LoadConstantIndirectlyFixedNode ||
-                n instanceof ResolveDynamicConstantNode      ||
-                n instanceof ResolveConstantNode             ||
-                n instanceof InitializeKlassNode;
-        // @formatter:on
-    }
-
-    private static boolean anyUsagesNeedReplacement(ConstantNode node) {
-        return node.usages().filter(n -> !isReplacementNode(n)).isNotEmpty();
-    }
-
-    private static boolean anyUsagesNeedReplacement(LoadMethodCountersNode node) {
-        return node.usages().filter(n -> !(n instanceof ResolveMethodAndLoadCountersNode)).isNotEmpty();
-    }
-
-    private static boolean checkForBadFingerprint(HotSpotResolvedJavaType type) {
-        if (type.isArray()) {
-            if (type.getElementalType().isPrimitive()) {
-                return false;
-            }
-            return ((HotSpotResolvedObjectType) (type.getElementalType())).getFingerprint() == 0;
-        }
-        return ((HotSpotResolvedObjectType) type).getFingerprint() == 0;
-    }
-
-    /**
-     * Insert the replacement node into the graph. We may need to insert it into a place different
-     * than the original {@link FloatingNode} since we need to make sure that replacement will have
-     * a valid state assigned.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node
-     * @param replacement
-     */
-    private static void insertReplacement(StructuredGraph graph, FrameStateMapperClosure stateMapper, FloatingNode node, FixedWithNextNode replacement) {
-        FixedWithNextNode insertionPoint = findInsertionPoint(graph, stateMapper, node);
-        graph.addAfterFixed(insertionPoint, replacement);
-        stateMapper.addState(replacement, stateMapper.getState(insertionPoint));
-    }
-
-    /**
-     * Find a good place to insert a stateful fixed node that is above the given node. A good
-     * insertion point should have a valid FrameState reaching it.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node start search from this node up
-     * @return an insertion point
-     */
-    private static FixedWithNextNode findInsertionPoint(StructuredGraph graph, FrameStateMapperClosure stateMapper, FloatingNode node) {
-        FixedWithNextNode fixed = findFixedBeforeFloating(graph, node);
-        FixedWithNextNode result = findFixedWithValidState(graph, stateMapper, fixed);
-        return result;
-    }
-
-    /**
-     * Find the first {@link FixedWithNextNode} that is currently scheduled before the given
-     * floating node.
-     *
-     * @param graph
-     * @param node start search from this node up
-     * @return the first {@link FixedWithNextNode}
-     */
-    private static FixedWithNextNode findFixedBeforeFloating(StructuredGraph graph, FloatingNode node) {
-        ScheduleResult schedule = graph.getLastSchedule();
-        NodeMap<Block> nodeToBlock = schedule.getNodeToBlockMap();
-        Block block = nodeToBlock.get(node);
-        BlockMap<List<Node>> blockToNodes = schedule.getBlockToNodesMap();
-        FixedWithNextNode result = null;
-        for (Node n : blockToNodes.get(block)) {
-            if (n.equals(node)) {
-                break;
-            }
-            if (n instanceof FixedWithNextNode) {
-                result = (FixedWithNextNode) n;
-            }
-        }
-        assert result != null;
-        return result;
-    }
-
-    /**
-     * Find first dominating {@link FixedWithNextNode} that has a valid state reaching it starting
-     * from the given node.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node
-     * @return {@link FixedWithNextNode} that we can use as an insertion point
-     */
-    private static FixedWithNextNode findFixedWithValidState(StructuredGraph graph, FrameStateMapperClosure stateMapper, FixedWithNextNode node) {
-        ScheduleResult schedule = graph.getLastSchedule();
-        NodeMap<Block> nodeToBlock = schedule.getNodeToBlockMap();
-        Block block = nodeToBlock.get(node);
-
-        Node n = node;
-        do {
-            if (isFixedWithValidState(stateMapper, n)) {
-                return (FixedWithNextNode) n;
-            }
-            while (n != block.getBeginNode()) {
-                n = n.predecessor();
-                if (isFixedWithValidState(stateMapper, n)) {
-                    return (FixedWithNextNode) n;
-                }
-            }
-            block = block.getDominator();
-            if (block != null) {
-                n = block.getEndNode();
-            }
-        } while (block != null);
-
-        return graph.start();
-    }
-
-    private static boolean isFixedWithValidState(FrameStateMapperClosure stateMapper, Node n) {
-        if (n instanceof FixedWithNextNode) {
-            FixedWithNextNode fixed = (FixedWithNextNode) n;
-            assert stateMapper.getState(fixed) != null;
-            if (!BytecodeFrame.isPlaceholderBci(stateMapper.getState(fixed).bci)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Compute frame states for all fixed nodes in the graph.
-     */
-    private static class FrameStateMapperClosure extends NodeIteratorClosure<FrameState> {
-        private NodeMap<FrameState> reachingStates;
-
-        @Override
-        protected FrameState processNode(FixedNode node, FrameState previousState) {
-            FrameState currentState = previousState;
-            if (node instanceof StateSplit) {
-                StateSplit stateSplit = (StateSplit) node;
-                FrameState stateAfter = stateSplit.stateAfter();
-                if (stateAfter != null) {
-                    currentState = stateAfter;
-                }
-            }
-            reachingStates.put(node, currentState);
-            return currentState;
-        }
-
-        @Override
-        protected FrameState merge(AbstractMergeNode merge, List<FrameState> states) {
-            FrameState singleFrameState = singleFrameState(states);
-            FrameState currentState = singleFrameState == null ? merge.stateAfter() : singleFrameState;
-            reachingStates.put(merge, currentState);
-            return currentState;
-        }
-
-        @Override
-        protected FrameState afterSplit(AbstractBeginNode node, FrameState oldState) {
-            return oldState;
-        }
-
-        @Override
-        protected EconomicMap<LoopExitNode, FrameState> processLoop(LoopBeginNode loop, FrameState initialState) {
-            return ReentrantNodeIterator.processLoop(this, loop, initialState).exitStates;
-        }
-
-        private static FrameState singleFrameState(List<FrameState> states) {
-            FrameState singleState = states.get(0);
-            for (int i = 1; i < states.size(); ++i) {
-                if (states.get(i) != singleState) {
-                    return null;
-                }
-            }
-            return singleState;
-        }
-
-        FrameStateMapperClosure(StructuredGraph graph) {
-            reachingStates = new NodeMap<>(graph);
-        }
-
-        public FrameState getState(Node n) {
-            return reachingStates.get(n);
-        }
-
-        public void addState(Node n, FrameState s) {
-            reachingStates.setAndGrow(n, s);
-        }
-    }
-
-    /**
-     * Try to find dominating node doing the resolution that can be reused.
-     *
-     * @param graph
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} that needs
-     *            resolution.
-     * @return return true if all usages of the node have been replaced
-     */
-    private static boolean tryToReplaceWithExisting(StructuredGraph graph, ConstantNode node) {
-        boolean allUsagesReplaced = true;
-        ScheduleResult schedule = graph.getLastSchedule();
-        NodeMap<Block> nodeToBlock = schedule.getNodeToBlockMap();
-        BlockMap<List<Node>> blockToNodes = schedule.getBlockToNodesMap();
-
-        EconomicMap<Block, Node> blockToExisting = EconomicMap.create(Equivalence.IDENTITY);
-        for (Node n : node.usages().filter(n -> isReplacementNode(n))) {
-            blockToExisting.put(nodeToBlock.get(n), n);
-        }
-        for (Node use : node.usages().filter(n -> !isReplacementNode(n)).snapshot()) {
-            boolean replaced = false;
-            Block b = nodeToBlock.get(use);
-            Node e = blockToExisting.get(b);
-            if (e != null) {
-                // There is an initialization or resolution in the same block as the use, look if
-                // the use is scheduled after it.
-                for (Node n : blockToNodes.get(b)) {
-                    if (n.equals(use)) {
-                        // Usage is before initialization, can't use it
-                        break;
-                    }
-                    if (n.equals(e)) {
-                        use.replaceFirstInput(node, e);
-                        replaced = true;
-                        break;
-                    }
-                }
-            }
-            if (!replaced) {
-                // Look for dominating blocks that have existing nodes
-                for (Block d : blockToExisting.getKeys()) {
-                    if (strictlyDominates(d, b)) {
-                        use.replaceFirstInput(node, blockToExisting.get(d));
-                        replaced = true;
-                        break;
-                    }
-                }
-            }
-            if (!replaced && allUsagesReplaced) {
-                allUsagesReplaced = false;
-            }
-        }
-        return allUsagesReplaced;
-    }
-
-    /**
-     * Replace the uses of a constant with {@link ResolveConstantNode}.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} that needs
-     *            resolution.
-     */
-    private static void replaceWithResolution(StructuredGraph graph, FrameStateMapperClosure stateMapper, ConstantNode node, ClassInfo classInfo) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) node.asConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) metaspaceConstant.asResolvedJavaType();
-
-        FixedWithNextNode fixedReplacement;
-        if (classInfo.builtIns.contains(type)) {
-            // Special case of klass constants that come from {@link BoxingSnippets}.
-            fixedReplacement = graph.add(new ResolveConstantNode(node, HotSpotConstantLoadAction.INITIALIZE));
-        } else {
-            fixedReplacement = graph.add(new ResolveConstantNode(node));
-        }
-        insertReplacement(graph, stateMapper, node, fixedReplacement);
-        node.replaceAtUsages(fixedReplacement, n -> !isReplacementNode(n));
-    }
-
-    /**
-     * Replace the uses of a constant with either {@link LoadConstantIndirectlyNode} if possible.
-     *
-     * @param graph
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} that needs
-     *            resolution.
-     * @return return true if all usages of the node have been replaced
-     */
-    private static boolean replaceWithLoad(StructuredGraph graph, ConstantNode node, ClassInfo classInfo) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) node.asConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) metaspaceConstant.asResolvedJavaType();
-        ResolvedJavaType topMethodHolder = graph.method().getDeclaringClass();
-        ValueNode replacement = null;
-        if ((type.isArray() && type.getComponentType().isPrimitive()) || type.equals(classInfo.referenceType)) {
-            // Special case for primitive arrays and j.l.ref.Reference.
-            // The AOT runtime pre-resolves them, so we may omit the resolution call.
-            replacement = graph.addOrUnique(new LoadConstantIndirectlyNode(node));
-        } else if (type.equals(topMethodHolder) || (type.isAssignableFrom(topMethodHolder) && !type.isInterface())) {
-            // If it's a supertype of or the same class that declares the top method, we are
-            // guaranteed to have it resolved already. If it's an interface, we just test for
-            // equality.
-            replacement = graph.addOrUnique(new LoadConstantIndirectlyNode(node));
-        }
-        if (replacement != null) {
-            node.replaceAtUsages(replacement, n -> !isReplacementNode(n));
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Verify that {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} has a valid
-     * fingerprint.
-     *
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType}.
-     */
-    private void verifyFingerprint(ConstantNode node) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) node.asConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) metaspaceConstant.asResolvedJavaType();
-        if (type != null) {
-            assert !metaspaceConstant.isCompressed() : "No support for replacing compressed metaspace constants";
-            if (verifyFingerprints && checkForBadFingerprint(type)) {
-                throw new GraalError("Type with bad fingerprint: " + type);
-            }
-        }
-    }
-
-    /**
-     * Replace {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} with indirection.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} that needs
-     *            resolution.
-     */
-    private static void handleHotSpotMetaspaceConstant(StructuredGraph graph, FrameStateMapperClosure stateMapper, ConstantNode node, ClassInfo classInfo) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) node.asConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) metaspaceConstant.asResolvedJavaType();
-        if (type != null) {
-            if (!tryToReplaceWithExisting(graph, node) && !replaceWithLoad(graph, node, classInfo)) {
-                replaceWithResolution(graph, stateMapper, node, classInfo);
-            }
-        } else {
-            throw new GraalError("Unsupported metaspace constant type: " + type);
-        }
-    }
-
-    /**
-     * Replace {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} with a load. This
-     * variant handles only constants that don't require resolution.
-     *
-     * @param graph
-     * @param node {@link ConstantNode} containing a {@link HotSpotResolvedJavaType} that needs
-     *            resolution.
-     */
-    private static void handleHotSpotMetaspaceConstantWithoutResolution(StructuredGraph graph, ConstantNode node, ClassInfo classInfo) {
-        HotSpotMetaspaceConstant metaspaceConstant = (HotSpotMetaspaceConstant) node.asConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) metaspaceConstant.asResolvedJavaType();
-        if (type != null) {
-            replaceWithLoad(graph, node, classInfo);
-        } else {
-            throw new GraalError("Unsupported metaspace constant type: " + type);
-        }
-    }
-
-    /**
-     * Replace an object constant with an indirect load {@link ResolveConstantNode}. Currently we
-     * support only strings.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node {@link ConstantNode} containing a {@link HotSpotObjectConstant} that needs
-     *            resolution.
-     */
-    private static void handleHotSpotObjectConstant(StructuredGraph graph, FrameStateMapperClosure stateMapper, ConstantNode node, ClassInfo classInfo) {
-        HotSpotObjectConstant constant = (HotSpotObjectConstant) node.asJavaConstant();
-        HotSpotResolvedJavaType type = (HotSpotResolvedJavaType) constant.getType();
-        if (type.equals(classInfo.stringType)) {
-            assert !constant.isCompressed() : "No support for replacing compressed oop constants";
-            FixedWithNextNode replacement = graph.add(new ResolveConstantNode(node));
-            insertReplacement(graph, stateMapper, node, replacement);
-            node.replaceAtUsages(replacement, n -> !(n instanceof ResolveConstantNode));
-        } else {
-            throw new GraalError("Unsupported object constant type: " + type);
-        }
-    }
-
-    /**
-     * Replace {@link LoadMethodCountersNode} with indirect load
-     * {@link ResolveMethodAndLoadCountersNode}, expose a klass constant of the holder.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param node
-     * @param context
-     */
-    private static void handleLoadMethodCounters(StructuredGraph graph, FrameStateMapperClosure stateMapper, LoadMethodCountersNode node, CoreProviders context) {
-        ResolvedJavaType type = node.getMethod().getDeclaringClass();
-        Stamp hubStamp = context.getStampProvider().createHubStamp((ObjectStamp) StampFactory.objectNonNull());
-        ConstantReflectionProvider constantReflection = context.getConstantReflection();
-        ConstantNode klassHint = ConstantNode.forConstant(hubStamp, constantReflection.asObjectHub(type), context.getMetaAccess(), graph);
-        FixedWithNextNode replacement = graph.add(new ResolveMethodAndLoadCountersNode(node.getMethod(), klassHint));
-        insertReplacement(graph, stateMapper, node, replacement);
-        node.replaceAtUsages(replacement, n -> !(n instanceof ResolveMethodAndLoadCountersNode));
-    }
-
-    /**
-     * Replace {@link LoadMethodCountersNode} with {@link ResolveMethodAndLoadCountersNode}, expose
-     * klass constants.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param context
-     */
-    private static void replaceLoadMethodCounters(StructuredGraph graph, FrameStateMapperClosure stateMapper, CoreProviders context) {
-        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, context, false);
-
-        for (LoadMethodCountersNode node : getLoadMethodCountersNodes(graph)) {
-            if (anyUsagesNeedReplacement(node)) {
-                handleLoadMethodCounters(graph, stateMapper, node, context);
-            }
-        }
-    }
-
-    /**
-     * Replace object and klass constants with resolution nodes or reuse preceding initializations.
-     *
-     * @param graph
-     * @param stateMapper
-     * @param classInfo
-     * @param context
-     */
-    private void replaceKlassesAndObjects(StructuredGraph graph, FrameStateMapperClosure stateMapper, ClassInfo classInfo, CoreProviders context) {
-        new SchedulePhase(SchedulingStrategy.LATEST_OUT_OF_LOOPS, true).apply(graph, context, false);
-
-        for (ConstantNode node : getConstantNodes(graph)) {
-            Constant constant = node.asConstant();
-            if (constant instanceof HotSpotMetaspaceConstant && anyUsagesNeedReplacement(node)) {
-                verifyFingerprint(node);
-                handleHotSpotMetaspaceConstant(graph, stateMapper, node, classInfo);
-            } else if (constant instanceof HotSpotObjectConstant && anyUsagesNeedReplacement(node)) {
-                handleHotSpotObjectConstant(graph, stateMapper, node, classInfo);
-            }
-        }
-    }
-
-    /**
-     * Replace well-known klass constants with indirect loads.
-     *
-     * @param graph
-     * @param classInfo
-     */
-    private static void replaceKlassesWithoutResolution(StructuredGraph graph, ClassInfo classInfo) {
-        for (ConstantNode node : getConstantNodes(graph)) {
-            Constant constant = node.asConstant();
-            if (constant instanceof HotSpotMetaspaceConstant && anyUsagesNeedReplacement(node)) {
-                handleHotSpotMetaspaceConstantWithoutResolution(graph, node, classInfo);
-            }
-        }
-    }
-
-    @Override
-    protected void run(StructuredGraph graph, CoreProviders context) {
-        if (allowResolution) {
-            FrameStateMapperClosure stateMapper = new FrameStateMapperClosure(graph);
-            ReentrantNodeIterator.apply(stateMapper, graph.start(), null);
-
-            // Replace LoadMethodCountersNode with ResolveMethodAndLoadCountersNode, expose klass
-            // constants.
-            replaceLoadMethodCounters(graph, stateMapper, context);
-
-            // Replace object and klass constants (including the ones added in the previous pass)
-            // with resolution nodes.
-            replaceKlassesAndObjects(graph, stateMapper, new ClassInfo(context.getMetaAccess()), context);
-        } else {
-            replaceKlassesWithoutResolution(graph, new ClassInfo(context.getMetaAccess()));
-        }
-    }
-
-    @Override
-    public boolean checkContract() {
-        return false;
-    }
-
-    public ReplaceConstantNodesPhase(boolean allowResolution) {
-        this(allowResolution, true);
-    }
-
-    public ReplaceConstantNodesPhase(boolean allowResolution, boolean verifyFingerprints) {
-        this.allowResolution = allowResolution;
-        this.verifyFingerprints = verifyFingerprints;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java
deleted file mode 100644
index dd6b956439c0..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/profiling/FinalizeProfileNodesPhase.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.phases.profiling;
-
-import static org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode.getProfileInvokeNodes;
-import static org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode.getProfileNodes;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.RandomSeedNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.cfg.Block;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.BasePhase;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public class FinalizeProfileNodesPhase extends BasePhase<CoreProviders> {
-    private int inlineeInvokeNotificationFreqLog;
-
-    public static class Options {
-        @Option(help = "Profile simple methods", type = OptionType.Expert)//
-        public static final OptionKey<Boolean> ProfileSimpleMethods = new OptionKey<>(true);
-        @Option(help = "Maximum number of nodes in a graph for a simple method", type = OptionType.Expert)//
-        public static final OptionKey<Integer> SimpleMethodGraphSize = new OptionKey<>(256);
-        @Option(help = "Maximum number of calls in a simple method", type = OptionType.Expert)//
-        public static final OptionKey<Integer> SimpleMethodCalls = new OptionKey<>(1);
-        @Option(help = "Maximum number of indirect calls in a simple moethod", type = OptionType.Expert)//
-        public static final OptionKey<Integer> SimpleMethodIndirectCalls = new OptionKey<>(0);
-
-    }
-
-    public FinalizeProfileNodesPhase(int inlineeInvokeNotificationFreqLog) {
-        this.inlineeInvokeNotificationFreqLog = inlineeInvokeNotificationFreqLog;
-    }
-
-    private static void removeAllProfilingNodes(StructuredGraph graph) {
-        getProfileNodes(graph).forEach((n) -> GraphUtil.removeFixedWithUnusedInputs(n));
-    }
-
-    private void assignInlineeInvokeFrequencies(StructuredGraph graph) {
-        for (ProfileInvokeNode node : getProfileInvokeNodes(graph)) {
-            ResolvedJavaMethod profiledMethod = node.getProfiledMethod();
-            if (!profiledMethod.equals(graph.method())) {
-                // Some inlinee, reassign the inlinee frequency
-                node.setNotificationFreqLog(inlineeInvokeNotificationFreqLog);
-            }
-        }
-    }
-
-    // Hacky heuristic to determine whether we want any profiling in this method.
-    // The heuristic is applied after the graph is fully formed and before the first lowering.
-    private static boolean simpleMethodHeuristic(StructuredGraph graph) {
-        if (Options.ProfileSimpleMethods.getValue(graph.getOptions())) {
-            return false;
-        }
-
-        // Check if the graph is smallish..
-        if (graph.getNodeCount() > Options.SimpleMethodGraphSize.getValue(graph.getOptions())) {
-            return false;
-        }
-
-        // Check if method has loops
-        if (graph.hasLoops()) {
-            return false;
-        }
-
-        // Check if method has calls
-        if (graph.getNodes().filter(InvokeNode.class).count() > Options.SimpleMethodCalls.getValue(graph.getOptions())) {
-            return false;
-        }
-
-        // Check if method has calls that need profiling
-        if (graph.getNodes().filter(InvokeNode.class).filter((n) -> ((InvokeNode) n).getInvokeKind().isIndirect()).count() > Options.SimpleMethodIndirectCalls.getDefaultValue()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private static void assignRandomSources(StructuredGraph graph) {
-        ValueNode seed = graph.unique(new RandomSeedNode());
-        ControlFlowGraph cfg = ControlFlowGraph.compute(graph, false, true, false, false);
-        Map<LoopBeginNode, ValueNode> loopRandomValueCache = new HashMap<>();
-
-        for (ProfileNode node : getProfileNodes(graph)) {
-            ValueNode random;
-            Block block = cfg.blockFor(node);
-            Loop<Block> loop = block.getLoop();
-            // Inject <a href=https://en.wikipedia.org/wiki/Linear_congruential_generator>LCG</a>
-            // pseudo-random number generator into the loop
-            if (loop != null) {
-                LoopBeginNode loopBegin = (LoopBeginNode) loop.getHeader().getBeginNode();
-                random = loopRandomValueCache.get(loopBegin);
-                if (random == null) {
-                    PhiNode phi = graph.addWithoutUnique(new ValuePhiNode(seed.stamp(NodeView.DEFAULT), loopBegin));
-                    phi.addInput(seed);
-                    // X_{n+1} = a*X_n + c, using glibc-like constants
-                    ValueNode a = ConstantNode.forInt(1103515245, graph);
-                    ValueNode c = ConstantNode.forInt(12345, graph);
-                    ValueNode next = graph.addOrUniqueWithInputs(new AddNode(c, new MulNode(phi, a)));
-                    for (int i = 0; i < loopBegin.getLoopEndCount(); i++) {
-                        phi.addInput(next);
-                    }
-                    random = phi;
-                    loopRandomValueCache.put(loopBegin, random);
-                }
-            } else {
-                // Graal doesn't compile methods with irreducible loops. So all profile nodes that
-                // are not in a loop are guaranteed to be executed at most once. We feed the seed
-                // value to such nodes directly.
-                random = seed;
-            }
-            node.setRandom(random);
-        }
-    }
-
-    @Override
-    protected void run(StructuredGraph graph, CoreProviders context) {
-        if (simpleMethodHeuristic(graph)) {
-            removeAllProfilingNodes(graph);
-            return;
-        }
-
-        assignInlineeInvokeFrequencies(graph);
-        if (ProfileNode.Options.ProbabilisticProfiling.getValue(graph.getOptions())) {
-            assignRandomSources(graph);
-        }
-    }
-
-    @Override
-    public boolean checkContract() {
-        return false;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
index 1a54e1751168..e2b59546459c 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
@@ -27,7 +27,6 @@
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateRecompile;
 import static jdk.vm.ci.meta.DeoptimizationAction.None;
 import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.MinimalBulkZeroingSize;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
@@ -91,8 +90,6 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
 import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyFixedNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
 import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -176,21 +173,6 @@ public Object allocateArray(KlassPointer hub,
         return piArrayCastToSnippetReplaceeStamp(result, length);
     }
 
-    @Snippet
-    protected Object allocateInstancePIC(KlassPointer hub,
-                    Word prototypeMarkWord,
-                    @ConstantParameter long size,
-                    @ConstantParameter boolean fillContents,
-                    @ConstantParameter boolean emitMemoryBarrier,
-                    @ConstantParameter HotSpotAllocationProfilingData profilingData) {
-        // Klass must be initialized by the time the first instance is allocated, therefore we can
-        // just load it from the corresponding cell and avoid the resolution check. We have to use a
-        // fixed load though, to prevent it from floating above the initialization.
-        KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
-        Object result = allocateInstanceImpl(picHub.asWord(), prototypeMarkWord, WordFactory.unsigned(size), fillContents, emitMemoryBarrier, true, profilingData);
-        return piCastToSnippetReplaceeStamp(result);
-    }
-
     @Snippet
     public Object allocateInstanceDynamic(@NonNullParameter Class<?> type,
                     @ConstantParameter boolean fillContents,
@@ -238,44 +220,6 @@ private static Class<?> validateNewInstanceClass(Class<?> type, Class<?> classCl
         return nonNullType;
     }
 
-    @Snippet
-    public Object allocatePrimitiveArrayPIC(KlassPointer hub,
-                    Word prototypeMarkWord,
-                    int length,
-                    @ConstantParameter int arrayBaseOffset,
-                    @ConstantParameter int log2ElementSize,
-                    @ConstantParameter boolean fillContents,
-                    @ConstantParameter int fillStartOffset,
-                    @ConstantParameter boolean emitMemoryBarrier,
-                    @ConstantParameter boolean maybeUnroll,
-                    @ConstantParameter boolean supportsBulkZeroing,
-                    @ConstantParameter boolean supportsOptimizedFilling,
-                    @ConstantParameter HotSpotAllocationProfilingData profilingData) {
-        // Primitive array types are eagerly pre-resolved. We can use a floating load.
-        KlassPointer picHub = LoadConstantIndirectlyNode.loadKlass(hub);
-        return allocateArrayImpl(picHub.asWord(), prototypeMarkWord, length, arrayBaseOffset, log2ElementSize, fillContents, fillStartOffset, emitMemoryBarrier, maybeUnroll, supportsBulkZeroing,
-                        supportsOptimizedFilling, profilingData);
-    }
-
-    @Snippet
-    public Object allocateArrayPIC(KlassPointer hub,
-                    Word prototypeMarkWord,
-                    int length,
-                    @ConstantParameter int arrayBaseOffset,
-                    @ConstantParameter int log2ElementSize,
-                    @ConstantParameter boolean fillContents,
-                    @ConstantParameter int fillStartOffset,
-                    @ConstantParameter boolean emitMemoryBarrier,
-                    @ConstantParameter boolean maybeUnroll,
-                    @ConstantParameter boolean supportsBulkZeroing,
-                    @ConstantParameter boolean supportsOptimizedFilling,
-                    @ConstantParameter HotSpotAllocationProfilingData profilingData) {
-        // Array type would be resolved by dominating resolution.
-        KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
-        return allocateArrayImpl(picHub.asWord(), prototypeMarkWord, length, arrayBaseOffset, log2ElementSize, fillContents, fillStartOffset, emitMemoryBarrier, maybeUnroll, supportsBulkZeroing,
-                        supportsOptimizedFilling, profilingData);
-    }
-
     @Snippet
     public Object allocateArrayDynamic(Class<?> elementType,
                     Word prototypeMarkWord,
@@ -338,13 +282,6 @@ protected Object newmultiarray(KlassPointer hub, @ConstantParameter int rank, @V
         return newMultiArrayImpl(hub.asWord(), rank, dimensions);
     }
 
-    @Snippet
-    private Object newmultiarrayPIC(KlassPointer hub, @ConstantParameter int rank, @VarargsParameter int[] dimensions) {
-        // Array type would be resolved by dominating resolution.
-        KlassPointer picHub = LoadConstantIndirectlyFixedNode.loadKlass(hub);
-        return newMultiArrayImpl(picHub.asWord(), rank, dimensions);
-    }
-
     @Snippet
     private void verifyHeap() {
         Word tlabInfo = getTLABInfo();
@@ -614,15 +551,11 @@ public static class Templates extends AbstractTemplates {
         private HotSpotAllocationProfilingData profilingData;
 
         private final SnippetInfo allocateInstance;
-        private final SnippetInfo allocateInstancePIC;
         private final SnippetInfo allocateArray;
-        private final SnippetInfo allocateArrayPIC;
-        private final SnippetInfo allocatePrimitiveArrayPIC;
         private final SnippetInfo allocateArrayDynamic;
         private final SnippetInfo allocateInstanceDynamic;
         private final SnippetInfo validateNewInstanceClass;
         private final SnippetInfo newmultiarray;
-        private final SnippetInfo newmultiarrayPIC;
         private final SnippetInfo verifyHeap;
         private final SnippetInfo threadBeingInitializedCheck;
 
@@ -636,11 +569,6 @@ public Templates(HotSpotAllocationSnippets receiver, OptionValues options, Itera
             allocateInstance = snippet(HotSpotAllocationSnippets.class, "allocateInstance", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION, TLAB_END_LOCATION,
                             PROTOTYPE_MARK_WORD_LOCATION);
             allocateArray = snippet(HotSpotAllocationSnippets.class, "allocateArray", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
-            allocateInstancePIC = snippet(HotSpotAllocationSnippets.class, "allocateInstancePIC", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION, TLAB_END_LOCATION,
-                            PROTOTYPE_MARK_WORD_LOCATION);
-            allocateArrayPIC = snippet(HotSpotAllocationSnippets.class, "allocateArrayPIC", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
-            allocatePrimitiveArrayPIC = snippet(HotSpotAllocationSnippets.class, "allocatePrimitiveArrayPIC", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION,
-                            TLAB_END_LOCATION);
             allocateArrayDynamic = snippet(HotSpotAllocationSnippets.class, "allocateArrayDynamic", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION,
                             TLAB_END_LOCATION);
             allocateInstanceDynamic = snippet(HotSpotAllocationSnippets.class, "allocateInstanceDynamic", null, receiver, MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION,
@@ -648,7 +576,6 @@ public Templates(HotSpotAllocationSnippets receiver, OptionValues options, Itera
             validateNewInstanceClass = snippet(HotSpotAllocationSnippets.class, "validateNewInstanceClass", MARK_WORD_LOCATION, HUB_WRITE_LOCATION, TLAB_TOP_LOCATION,
                             TLAB_END_LOCATION, PROTOTYPE_MARK_WORD_LOCATION, CLASS_INIT_STATE_LOCATION);
             newmultiarray = snippet(HotSpotAllocationSnippets.class, "newmultiarray", null, receiver, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
-            newmultiarrayPIC = snippet(HotSpotAllocationSnippets.class, "newmultiarrayPIC", null, receiver, TLAB_TOP_LOCATION, TLAB_END_LOCATION);
             verifyHeap = snippet(HotSpotAllocationSnippets.class, "verifyHeap", null, receiver);
             threadBeingInitializedCheck = snippet(HotSpotAllocationSnippets.class, "threadBeingInitializedCheck", null, receiver);
         }
@@ -677,8 +604,7 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
             long size = instanceSize(type);
 
             OptionValues localOptions = graph.getOptions();
-            SnippetInfo snippet = GeneratePIC.getValue(localOptions) ? allocateInstancePIC : allocateInstance;
-            Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
+            Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("hub", hub);
             args.add("prototypeMarkWord", type.prototypeMarkWord());
             args.addConst("size", size);
@@ -704,18 +630,7 @@ public void lower(NewArrayNode node, LoweringTool tool) {
             int log2ElementSize = CodeUtil.log2(tool.getMetaAccess().getArrayIndexScale(elementKind));
 
             OptionValues localOptions = graph.getOptions();
-            SnippetInfo snippet;
-            if (GeneratePIC.getValue(localOptions)) {
-                if (elementType.isPrimitive()) {
-                    snippet = allocatePrimitiveArrayPIC;
-                } else {
-                    snippet = allocateArrayPIC;
-                }
-            } else {
-                snippet = allocateArray;
-            }
-
-            Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
+            Arguments args = new Arguments(allocateArray, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("hub", hub);
             assert arrayType.prototypeMarkWord() == lookupArrayClass(tool, JavaKind.Object).prototypeMarkWord() : "all array types are assumed to have the same prototypeMarkWord";
             args.add("prototypeMarkWord", arrayType.prototypeMarkWord());
@@ -738,7 +653,6 @@ public void lower(NewArrayNode node, LoweringTool tool) {
 
         public void lower(NewMultiArrayNode node, LoweringTool tool) {
             StructuredGraph graph = node.graph();
-            OptionValues localOptions = graph.getOptions();
             int rank = node.dimensionCount();
             ValueNode[] dims = new ValueNode[rank];
             for (int i = 0; i < node.dimensionCount(); i++) {
@@ -747,8 +661,7 @@ public void lower(NewMultiArrayNode node, LoweringTool tool) {
             HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) node.type();
             ConstantNode hub = ConstantNode.forConstant(KlassPointerStamp.klassNonNull(), type.klass(), providers.getMetaAccess(), graph);
 
-            SnippetInfo snippet = GeneratePIC.getValue(localOptions) ? newmultiarrayPIC : newmultiarray;
-            Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
+            Arguments args = new Arguments(newmultiarray, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("hub", hub);
             args.addConst("rank", rank);
             args.addVarargs("dimensions", int.class, StampFactory.forKind(JavaKind.Int), dims);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
index a1e4e7ff0fa2..aa6b42b0e1d5 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
@@ -38,7 +38,6 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.gc.G1ArrayRangePostWriteBarrier;
@@ -129,14 +128,14 @@ protected byte youngCardValue() {
 
     @Override
     protected Word cardTableAddress(Pointer oop) {
-        Word cardTable = WordFactory.unsigned(GraalHotSpotVMConfigNode.cardTableAddress());
+        Word cardTable = WordFactory.unsigned(HotSpotReplacementsUtil.cardTableStart(INJECTED_VMCONFIG));
         int cardTableShift = HotSpotReplacementsUtil.cardTableShift(INJECTED_VMCONFIG);
         return cardTable.add(oop.unsignedShiftRight(cardTableShift));
     }
 
     @Override
     protected int logOfHeapRegionGrainBytes() {
-        return GraalHotSpotVMConfigNode.logOfHeapRegionGrainBytes();
+        return HotSpotReplacementsUtil.logOfHeapRegionGrainBytes(INJECTED_VMCONFIG);
     }
 
     @Override
@@ -151,7 +150,7 @@ protected ForeignCallDescriptor postWriteBarrierCallDescriptor() {
 
     @Override
     protected boolean verifyOops() {
-        return GraalHotSpotVMConfigNode.verifyOops();
+        return HotSpotReplacementsUtil.verifyOops(INJECTED_VMCONFIG);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
index 0bca26b68f08..42c88a39b221 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
@@ -41,7 +41,6 @@
 import org.graalvm.compiler.graph.Node.NodeIntrinsic;
 import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.CanonicalizableLocation;
 import org.graalvm.compiler.nodes.CompressionNode;
@@ -640,6 +639,11 @@ public static int cardTableShift(@InjectedParameter GraalHotSpotVMConfig config)
         return config.cardtableShift;
     }
 
+    @Fold
+    public static long cardTableStart(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.cardtableStartAddress;
+    }
+
     @Fold
     public static int g1CardQueueIndexOffset(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.g1CardQueueIndexOffset;
@@ -650,6 +654,11 @@ public static int g1CardQueueBufferOffset(@InjectedParameter GraalHotSpotVMConfi
         return config.g1CardQueueBufferOffset;
     }
 
+    @Fold
+    public static int logOfHeapRegionGrainBytes(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.logOfHRGrainBytes;
+    }
+
     @Fold
     public static int g1SATBQueueMarkingOffset(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.g1SATBQueueMarkingOffset;
@@ -725,13 +734,33 @@ public static KlassPointer loadHub(Object object) {
         return loadHubIntrinsic(object);
     }
 
+    @Fold
+    public static boolean verifyOops(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.verifyOops;
+    }
+
     public static Object verifyOop(Object object) {
-        if (GraalHotSpotVMConfigNode.verifyOops()) {
+        if (verifyOops(INJECTED_VMCONFIG)) {
             verifyOopStub(VERIFY_OOP, object);
         }
         return object;
     }
 
+    @Fold
+    public static long verifyOopBits(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.verifyOopBits;
+    }
+
+    @Fold
+    public static long verifyOopMask(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.verifyOopMask;
+    }
+
+    @Fold
+    public static long verifyOopCounterAddress(@InjectedParameter GraalHotSpotVMConfig config) {
+        return config.verifyOopCounterAddress;
+    }
+
     @NodeIntrinsic(ForeignCallNode.class)
     private static native Object verifyOopStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Object object);
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
index 6fd4241f0568..01b7955bb998 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
@@ -28,7 +28,6 @@
 
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
 import org.graalvm.compiler.nodes.gc.SerialArrayRangeWriteBarrier;
 import org.graalvm.compiler.nodes.gc.SerialWriteBarrier;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
@@ -50,7 +49,7 @@ public HotSpotSerialWriteBarrierSnippets() {
 
     @Override
     public Word cardTableAddress() {
-        return WordFactory.unsigned(GraalHotSpotVMConfigNode.cardTableAddress());
+        return WordFactory.unsigned(HotSpotReplacementsUtil.cardTableStart(INJECTED_VMCONFIG));
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java
index 128c29044168..bfd277389fe1 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java
@@ -27,7 +27,6 @@
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.graph.Node;
@@ -74,7 +73,7 @@ public Node canonical(CanonicalizerTool tool) {
             return null;
         } else {
             MetaAccessProvider metaAccess = tool.getMetaAccess();
-            if (metaAccess != null && hub.isConstant() && !GraalOptions.ImmutableCode.getValue(tool.getOptions())) {
+            if (metaAccess != null && hub.isConstant()) {
                 ResolvedJavaType exactType = tool.getConstantReflection().asJavaType(hub.asConstant());
                 if (exactType != null) {
                     return ConstantNode.forConstant(tool.getConstantReflection().asJavaClass(exactType), metaAccess);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java
index 49554a1b8ca4..b5e16370e046 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java
@@ -26,7 +26,6 @@
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 import static jdk.vm.ci.meta.DeoptimizationReason.OptimizedTypeCheckViolated;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION;
 import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic;
@@ -275,11 +274,6 @@ protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool
 
                 OptionValues localOptions = instanceOf.getOptions();
                 JavaTypeProfile profile = instanceOf.profile();
-                if (GeneratePIC.getValue(localOptions)) {
-                    // FIXME: We can't embed constants in hints. We can't really load them from GOT
-                    // either. Hard problem.
-                    profile = null;
-                }
                 TypeCheckHints hintInfo = new TypeCheckHints(instanceOf.type(), profile, assumptions, TypeCheckMinProfileHitProbability.getValue(localOptions),
                                 TypeCheckMaxHints.getValue(localOptions));
                 final HotSpotResolvedObjectType type = (HotSpotResolvedObjectType) instanceOf.type().getType();
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java
deleted file mode 100644
index f4628bca004e..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/aot/ResolveConstantSnippets.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2016, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements.aot;
-
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.meta.HotSpotConstantLoadAction;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.aot.EncodedSymbolNode;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassNode;
-import org.graalvm.compiler.hotspot.nodes.aot.InitializeKlassStubCall;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadConstantIndirectlyNode;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadMethodCountersIndirectlyNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveConstantStubCall;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicConstantNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveDynamicStubCall;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersNode;
-import org.graalvm.compiler.hotspot.nodes.aot.ResolveMethodAndLoadCountersStubCall;
-import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
-import org.graalvm.compiler.hotspot.word.MethodPointer;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-
-import jdk.vm.ci.code.TargetDescription;
-import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant;
-import jdk.vm.ci.hotspot.HotSpotObjectConstant;
-import jdk.vm.ci.meta.Constant;
-
-public class ResolveConstantSnippets implements Snippets {
-
-    @Snippet
-    public static Object resolveObjectConstant(Object constant) {
-        Object result = LoadConstantIndirectlyNode.loadObject(constant);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result == null)) {
-            result = ResolveConstantStubCall.resolveObject(constant, EncodedSymbolNode.encode(constant));
-        }
-        return result;
-    }
-
-    @Snippet
-    public static Object resolveDynamicConstant(Object constant) {
-        Object result = LoadConstantIndirectlyNode.loadObject(constant);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result == null)) {
-            result = ResolveDynamicStubCall.resolveInvoke(constant);
-        }
-        return result;
-    }
-
-    @Snippet
-    public static KlassPointer resolveKlassConstant(KlassPointer constant) {
-        KlassPointer result = LoadConstantIndirectlyNode.loadKlass(constant);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result.isNull())) {
-            result = ResolveConstantStubCall.resolveKlass(constant, EncodedSymbolNode.encode(constant));
-        }
-        return result;
-    }
-
-    @Snippet
-    public static MethodCountersPointer resolveMethodAndLoadCounters(MethodPointer method, KlassPointer klassHint) {
-        MethodCountersPointer result = LoadMethodCountersIndirectlyNode.loadMethodCounters(method);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result.isNull())) {
-            result = ResolveMethodAndLoadCountersStubCall.resolveMethodAndLoadCounters(method, klassHint, EncodedSymbolNode.encode(method));
-        }
-        return result;
-    }
-
-    @Snippet
-    public static KlassPointer initializeKlass(KlassPointer constant) {
-        KlassPointer result = LoadConstantIndirectlyNode.loadKlass(constant, HotSpotConstantLoadAction.INITIALIZE);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result.isNull())) {
-            result = InitializeKlassStubCall.initializeKlass(constant, EncodedSymbolNode.encode(constant));
-        }
-        return result;
-    }
-
-    @Snippet
-    public static KlassPointer pureInitializeKlass(KlassPointer constant) {
-        KlassPointer result = LoadConstantIndirectlyNode.loadKlass(constant, HotSpotConstantLoadAction.INITIALIZE);
-        if (probability(VERY_SLOW_PATH_PROBABILITY, result.isNull())) {
-            result = ResolveConstantStubCall.resolveKlass(constant, EncodedSymbolNode.encode(constant), HotSpotConstantLoadAction.INITIALIZE);
-        }
-        return result;
-    }
-
-    public static class Templates extends AbstractTemplates {
-        private final SnippetInfo resolveObjectConstant = snippet(ResolveConstantSnippets.class, "resolveObjectConstant");
-        private final SnippetInfo resolveDynamicConstant = snippet(ResolveConstantSnippets.class, "resolveDynamicConstant");
-        private final SnippetInfo resolveKlassConstant = snippet(ResolveConstantSnippets.class, "resolveKlassConstant");
-        private final SnippetInfo resolveMethodAndLoadCounters = snippet(ResolveConstantSnippets.class, "resolveMethodAndLoadCounters");
-        private final SnippetInfo initializeKlass = snippet(ResolveConstantSnippets.class, "initializeKlass");
-        private final SnippetInfo pureInitializeKlass = snippet(ResolveConstantSnippets.class, "pureInitializeKlass");
-
-        public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, TargetDescription target) {
-            super(options, factories, providers, providers.getSnippetReflection(), target);
-        }
-
-        public void lower(ResolveDynamicConstantNode resolveConstantNode, LoweringTool tool) {
-            StructuredGraph graph = resolveConstantNode.graph();
-
-            ValueNode value = resolveConstantNode.value();
-            assert value.isConstant() : "Expected a constant: " + value;
-            SnippetInfo snippet = resolveDynamicConstant;
-
-            Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
-            args.add("constant", value);
-
-            SnippetTemplate template = template(resolveConstantNode, args);
-            template.instantiate(providers.getMetaAccess(), resolveConstantNode, DEFAULT_REPLACER, args);
-
-            assert resolveConstantNode.hasNoUsages();
-            if (!resolveConstantNode.isDeleted()) {
-                GraphUtil.killWithUnusedFloatingInputs(resolveConstantNode);
-            }
-        }
-
-        public void lower(ResolveConstantNode resolveConstantNode, LoweringTool tool) {
-            StructuredGraph graph = resolveConstantNode.graph();
-
-            ValueNode value = resolveConstantNode.value();
-            assert value.isConstant() : "Expected a constant: " + value;
-            Constant constant = value.asConstant();
-            SnippetInfo snippet = null;
-
-            if (constant instanceof HotSpotMetaspaceConstant) {
-                HotSpotMetaspaceConstant hotspotMetaspaceConstant = (HotSpotMetaspaceConstant) constant;
-                if (hotspotMetaspaceConstant.asResolvedJavaType() != null) {
-                    if (resolveConstantNode.action() == HotSpotConstantLoadAction.RESOLVE) {
-                        snippet = resolveKlassConstant;
-                    } else {
-                        assert resolveConstantNode.action() == HotSpotConstantLoadAction.INITIALIZE;
-                        snippet = pureInitializeKlass;
-                    }
-                }
-            } else if (constant instanceof HotSpotObjectConstant) {
-                snippet = resolveObjectConstant;
-                HotSpotObjectConstant hotspotObjectConstant = (HotSpotObjectConstant) constant;
-                assert hotspotObjectConstant.isInternedString();
-            }
-            if (snippet == null) {
-                throw new GraalError("Unsupported constant type: " + constant);
-            }
-
-            Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
-            args.add("constant", value);
-
-            SnippetTemplate template = template(resolveConstantNode, args);
-            template.instantiate(providers.getMetaAccess(), resolveConstantNode, DEFAULT_REPLACER, args);
-
-            assert resolveConstantNode.hasNoUsages();
-            if (!resolveConstantNode.isDeleted()) {
-                GraphUtil.killWithUnusedFloatingInputs(resolveConstantNode);
-            }
-        }
-
-        public void lower(InitializeKlassNode initializeKlassNode, LoweringTool tool) {
-            StructuredGraph graph = initializeKlassNode.graph();
-
-            ValueNode value = initializeKlassNode.value();
-            assert value.isConstant() : "Expected a constant: " + value;
-            Constant constant = value.asConstant();
-
-            if (constant instanceof HotSpotMetaspaceConstant) {
-                Arguments args = new Arguments(initializeKlass, graph.getGuardsStage(), tool.getLoweringStage());
-                args.add("constant", value);
-
-                SnippetTemplate template = template(initializeKlassNode, args);
-                template.instantiate(providers.getMetaAccess(), initializeKlassNode, DEFAULT_REPLACER, args);
-                assert initializeKlassNode.hasNoUsages();
-                if (!initializeKlassNode.isDeleted()) {
-                    GraphUtil.killWithUnusedFloatingInputs(initializeKlassNode);
-                }
-
-            } else {
-                throw new GraalError("Unsupported constant type: " + constant);
-            }
-        }
-
-        public void lower(ResolveMethodAndLoadCountersNode resolveMethodAndLoadCountersNode, LoweringTool tool) {
-            StructuredGraph graph = resolveMethodAndLoadCountersNode.graph();
-            ConstantNode method = ConstantNode.forConstant(MethodPointerStamp.methodNonNull(), resolveMethodAndLoadCountersNode.getMethod().getEncoding(), tool.getMetaAccess(), graph);
-            Arguments args = new Arguments(resolveMethodAndLoadCounters, graph.getGuardsStage(), tool.getLoweringStage());
-            args.add("method", method);
-            args.add("klassHint", resolveMethodAndLoadCountersNode.getHub());
-            SnippetTemplate template = template(resolveMethodAndLoadCountersNode, args);
-            template.instantiate(providers.getMetaAccess(), resolveMethodAndLoadCountersNode, DEFAULT_REPLACER, args);
-
-            assert resolveMethodAndLoadCountersNode.hasNoUsages();
-            if (!resolveMethodAndLoadCountersNode.isDeleted()) {
-                GraphUtil.killWithUnusedFloatingInputs(resolveMethodAndLoadCountersNode);
-            }
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java
deleted file mode 100644
index 2e36c480921c..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProbabilisticProfileSnippets.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements.profiling;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.backedgeCounterOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterIncrement;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterShift;
-import static org.graalvm.compiler.hotspot.replacements.profiling.ProfileSnippets.METHOD_COUNTERS;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadMethodCountersNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileBranchNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-
-import jdk.vm.ci.code.CodeUtil;
-import jdk.vm.ci.code.TargetDescription;
-
-public class ProbabilisticProfileSnippets implements Snippets {
-    @Snippet
-    public static boolean shouldProfile(@ConstantParameter int probLog, int random) {
-        int probabilityMask = (1 << probLog) - 1;
-        return (random & probabilityMask) == 0;
-    }
-
-    @Snippet
-    public static int notificationMask(int freqLog, int probLog, int stepLog) {
-        int frequencyMask = (1 << freqLog) - 1;
-        int stepMask = (1 << (stepLog + probLog)) - 1;
-        return frequencyMask & ~stepMask;
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void methodInvocationEvent(@ConstantNodeParameter ForeignCallDescriptor descriptor, MethodCountersPointer counters);
-
-    @Snippet
-    public static void profileMethodEntryWithProbability(MethodCountersPointer counters, int random, int step, int stepLog, @ConstantParameter int freqLog, @ConstantParameter int probLog) {
-        if (probability(1.0 / (1 << probLog), shouldProfile(probLog, random))) {
-            int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog);
-            counters.writeIntSideEffectFree(invocationCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS);
-            if (freqLog >= 0) {
-                int mask = notificationMask(freqLog, probLog, stepLog);
-                if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) {
-                    methodInvocationEvent(HotSpotBackend.INVOCATION_EVENT, counters);
-                }
-            }
-        }
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void methodBackedgeEvent(@ConstantNodeParameter ForeignCallDescriptor descriptor, MethodCountersPointer counters, int bci, int targetBci);
-
-    @Snippet
-    public static void profileBackedgeWithProbability(MethodCountersPointer counters, int random, int step, int stepLog, @ConstantParameter int freqLog, @ConstantParameter int probLog, int bci,
-                    int targetBci) {
-        if (probability(1.0 / (1 << probLog), shouldProfile(probLog, random))) {
-            int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + ((invocationCounterIncrement(INJECTED_VMCONFIG) * step) << probLog);
-            counters.writeIntSideEffectFree(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS);
-            int mask = notificationMask(freqLog, probLog, stepLog);
-            if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) {
-                methodBackedgeEvent(HotSpotBackend.BACKEDGE_EVENT, counters, bci, targetBci);
-            }
-        }
-    }
-
-    @Snippet
-    public static void profileConditionalBackedgeWithProbability(MethodCountersPointer counters, int random, int step, int stepLog, @ConstantParameter int freqLog,
-                    @ConstantParameter int probLog, boolean branchCondition,
-                    int bci, int targetBci) {
-        if (branchCondition) {
-            profileBackedgeWithProbability(counters, random, step, stepLog, freqLog, probLog, bci, targetBci);
-        }
-    }
-
-    public static class Templates extends AbstractTemplates {
-        private final SnippetInfo profileMethodEntryWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileMethodEntryWithProbability");
-        private final SnippetInfo profileBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileBackedgeWithProbability");
-        private final SnippetInfo profileConditionalBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileConditionalBackedgeWithProbability");
-
-        public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, TargetDescription target) {
-            super(options, factories, providers, providers.getSnippetReflection(), target);
-        }
-
-        public void lower(ProfileNode profileNode, LoweringTool tool) {
-            assert profileNode.getRandom() != null;
-
-            StructuredGraph graph = profileNode.graph();
-            LoadMethodCountersNode counters = graph.unique(new LoadMethodCountersNode(profileNode.getProfiledMethod()));
-            ConstantNode step = ConstantNode.forInt(profileNode.getStep(), graph);
-            ConstantNode stepLog = ConstantNode.forInt(CodeUtil.log2(profileNode.getStep()), graph);
-
-            if (profileNode instanceof ProfileBranchNode) {
-                // Backedge event
-                ProfileBranchNode profileBranchNode = (ProfileBranchNode) profileNode;
-                SnippetInfo snippet = profileBranchNode.hasCondition() ? profileConditionalBackedgeWithProbability : profileBackedgeWithProbability;
-                Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
-                ConstantNode bci = ConstantNode.forInt(profileBranchNode.bci(), graph);
-                ConstantNode targetBci = ConstantNode.forInt(profileBranchNode.targetBci(), graph);
-
-                args.add("counters", counters);
-                args.add("random", profileBranchNode.getRandom());
-                args.add("step", step);
-                args.add("stepLog", stepLog);
-                args.addConst("freqLog", profileBranchNode.getNotificationFreqLog());
-                args.addConst("probLog", profileBranchNode.getProbabilityLog());
-                if (profileBranchNode.hasCondition()) {
-                    args.add("branchCondition", profileBranchNode.branchCondition());
-                }
-                args.add("bci", bci);
-                args.add("targetBci", targetBci);
-
-                SnippetTemplate template = template(profileNode, args);
-                template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
-            } else if (profileNode instanceof ProfileInvokeNode) {
-                ProfileInvokeNode profileInvokeNode = (ProfileInvokeNode) profileNode;
-                // Method invocation event
-                Arguments args = new Arguments(profileMethodEntryWithProbability, graph.getGuardsStage(), tool.getLoweringStage());
-
-                args.add("counters", counters);
-                args.add("random", profileInvokeNode.getRandom());
-                args.add("step", step);
-                args.add("stepLog", stepLog);
-                args.addConst("freqLog", profileInvokeNode.getNotificationFreqLog());
-                args.addConst("probLog", profileInvokeNode.getProbabilityLog());
-                SnippetTemplate template = template(profileNode, args);
-                template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
-            } else {
-                throw new GraalError("Unsupported profile node type: " + profileNode);
-            }
-
-            assert profileNode.hasNoUsages();
-            if (!profileNode.isDeleted()) {
-                GraphUtil.killWithUnusedFloatingInputs(profileNode);
-            }
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java
deleted file mode 100644
index 3a5ad282d3ac..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/profiling/ProfileSnippets.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2016, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements.profiling;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.backedgeCounterOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterIncrement;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.invocationCounterShift;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.aot.LoadMethodCountersNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileBranchNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileInvokeNode;
-import org.graalvm.compiler.hotspot.nodes.profiling.ProfileNode;
-import org.graalvm.compiler.hotspot.word.MethodCountersPointer;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-
-import jdk.vm.ci.code.CodeUtil;
-import jdk.vm.ci.code.TargetDescription;
-import org.graalvm.word.LocationIdentity;
-
-public class ProfileSnippets implements Snippets {
-    public static final LocationIdentity METHOD_COUNTERS = NamedLocationIdentity.mutable("MethodCounters");
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void methodInvocationEvent(@ConstantNodeParameter ForeignCallDescriptor descriptor, MethodCountersPointer counters);
-
-    @Snippet
-    protected static int notificationMask(int freqLog, int stepLog) {
-        int stepMask = (1 << stepLog) - 1;
-        int frequencyMask = (1 << freqLog) - 1;
-        return frequencyMask & ~stepMask;
-    }
-
-    @Snippet
-    public static void profileMethodEntry(MethodCountersPointer counters, int step, int stepLog, @ConstantParameter int freqLog) {
-        int counterValue = counters.readInt(invocationCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + invocationCounterIncrement(INJECTED_VMCONFIG) * step;
-        counters.writeIntSideEffectFree(invocationCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS);
-        if (freqLog >= 0) {
-            final int mask = notificationMask(freqLog, stepLog);
-            if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) {
-                methodInvocationEvent(HotSpotBackend.INVOCATION_EVENT, counters);
-            }
-        }
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void methodBackedgeEvent(@ConstantNodeParameter ForeignCallDescriptor descriptor, MethodCountersPointer counters, int bci, int targetBci);
-
-    @Snippet
-    public static void profileBackedge(MethodCountersPointer counters, int step, int stepLog, @ConstantParameter int freqLog, int bci, int targetBci) {
-        int counterValue = counters.readInt(backedgeCounterOffset(INJECTED_VMCONFIG), METHOD_COUNTERS) + invocationCounterIncrement(INJECTED_VMCONFIG) * step;
-        counters.writeIntSideEffectFree(backedgeCounterOffset(INJECTED_VMCONFIG), counterValue, METHOD_COUNTERS);
-        final int mask = notificationMask(freqLog, stepLog);
-        if (probability(SLOW_PATH_PROBABILITY, (counterValue & (mask << invocationCounterShift(INJECTED_VMCONFIG))) == 0)) {
-            methodBackedgeEvent(HotSpotBackend.BACKEDGE_EVENT, counters, bci, targetBci);
-        }
-    }
-
-    @Snippet
-    public static void profileConditionalBackedge(MethodCountersPointer counters, int step, int stepLog, @ConstantParameter int freqLog, boolean branchCondition, int bci, int targetBci) {
-        if (branchCondition) {
-            profileBackedge(counters, step, stepLog, freqLog, bci, targetBci);
-        }
-    }
-
-    public static class Templates extends AbstractTemplates {
-        private final SnippetInfo profileMethodEntry = snippet(ProfileSnippets.class, "profileMethodEntry");
-        private final SnippetInfo profileBackedge = snippet(ProfileSnippets.class, "profileBackedge");
-        private final SnippetInfo profileConditionalBackedge = snippet(ProfileSnippets.class, "profileConditionalBackedge");
-
-        public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, TargetDescription target) {
-            super(options, factories, providers, providers.getSnippetReflection(), target);
-        }
-
-        public void lower(ProfileNode profileNode, LoweringTool tool) {
-            StructuredGraph graph = profileNode.graph();
-            LoadMethodCountersNode counters = graph.unique(new LoadMethodCountersNode(profileNode.getProfiledMethod()));
-            ConstantNode step = ConstantNode.forInt(profileNode.getStep(), graph);
-            ConstantNode stepLog = ConstantNode.forInt(CodeUtil.log2(profileNode.getStep()), graph);
-
-            if (profileNode instanceof ProfileBranchNode) {
-                // Backedge event
-                ProfileBranchNode profileBranchNode = (ProfileBranchNode) profileNode;
-                SnippetInfo snippet = profileBranchNode.hasCondition() ? profileConditionalBackedge : profileBackedge;
-                Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
-                ConstantNode bci = ConstantNode.forInt(profileBranchNode.bci(), graph);
-                ConstantNode targetBci = ConstantNode.forInt(profileBranchNode.targetBci(), graph);
-                args.add("counters", counters);
-                args.add("step", step);
-                args.add("stepLog", stepLog);
-                args.addConst("freqLog", profileBranchNode.getNotificationFreqLog());
-                if (profileBranchNode.hasCondition()) {
-                    args.add("branchCondition", profileBranchNode.branchCondition());
-                }
-                args.add("bci", bci);
-                args.add("targetBci", targetBci);
-
-                SnippetTemplate template = template(profileNode, args);
-                template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
-            } else if (profileNode instanceof ProfileInvokeNode) {
-                ProfileInvokeNode profileInvokeNode = (ProfileInvokeNode) profileNode;
-                // Method invocation event
-                Arguments args = new Arguments(profileMethodEntry, graph.getGuardsStage(), tool.getLoweringStage());
-                args.add("counters", counters);
-                args.add("step", step);
-                args.add("stepLog", stepLog);
-                args.addConst("freqLog", profileInvokeNode.getNotificationFreqLog());
-                SnippetTemplate template = template(profileNode, args);
-                template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
-            } else {
-                throw new GraalError("Unsupported profile node type: " + profileNode);
-            }
-
-            assert profileNode.hasNoUsages();
-            if (!profileNode.isDeleted()) {
-                GraphUtil.killWithUnusedFloatingInputs(profileNode);
-            }
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java
index a094ee5f5890..b1446eedad72 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java
@@ -38,7 +38,7 @@
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.nodes.DeoptimizeCallerNode;
-import org.graalvm.compiler.hotspot.nodes.GraalHotSpotVMConfigNode;
+import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.PiNode;
@@ -87,15 +87,15 @@ public static void handlePendingException(Word thread, boolean shouldClearExcept
      */
     @Snippet
     public static Object verifyObject(Object object) {
-        if (GraalHotSpotVMConfigNode.verifyOops()) {
-            Word verifyOopCounter = WordFactory.unsigned(GraalHotSpotVMConfigNode.verifyOopCounterAddress());
+        if (HotSpotReplacementsUtil.verifyOops(INJECTED_VMCONFIG)) {
+            Word verifyOopCounter = WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopCounterAddress(INJECTED_VMCONFIG));
             verifyOopCounter.writeInt(0, verifyOopCounter.readInt(0) + 1);
 
             Pointer oop = Word.objectToTrackedPointer(object);
             if (object != null) {
                 GuardingNode anchorNode = SnippetAnchorNode.anchor();
                 // make sure object is 'reasonable'
-                if (!oop.and(WordFactory.unsigned(GraalHotSpotVMConfigNode.verifyOopMask())).equal(WordFactory.unsigned(GraalHotSpotVMConfigNode.verifyOopBits()))) {
+                if (!oop.and(WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopMask(INJECTED_VMCONFIG))).equal(WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopBits(INJECTED_VMCONFIG)))) {
                     fatal("oop not in heap: %p", oop.rawValue());
                 }
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java
index d7aa77d32cb0..289f6a4a250b 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.hotspot.stubs;
 
 import static org.graalvm.compiler.core.GraalCompiler.emitFrontEnd;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.RegisterPressure;
 import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets;
 import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP;
@@ -198,8 +197,6 @@ public synchronized InstalledCode getCode(final Backend backend) {
                     try (DebugContext.Scope s = debug.scope("CodeInstall", compResult);
                                     DebugContext.Activation a = debug.activate()) {
                         assert destroyedCallerRegisters != null;
-                        // Add a GeneratePIC check here later, we don't want to install
-                        // code if we don't have a corresponding VM global symbol.
                         HotSpotCompiledCode compiledCode = HotSpotCompiledCodeBuilder.createCompiledCode(codeCache, null, null, compResult, options);
                         code = codeCache.installCode(null, compiledCode, null, null, false);
                     } catch (Throwable e) {
@@ -219,7 +216,7 @@ public synchronized InstalledCode getCode(final Backend backend) {
     private CompilationResult buildCompilationResult(DebugContext debug, final Backend backend) {
         CompilationIdentifier compilationId = getStubCompilationId();
         final StructuredGraph graph = getGraph(debug, compilationId);
-        CompilationResult compResult = new CompilationResult(compilationId, toString(), GeneratePIC.getValue(options));
+        CompilationResult compResult = new CompilationResult(compilationId, toString());
 
         // Stubs cannot be recompiled so they cannot be compiled with assumptions
         assert graph.getAssumptions() == null;
diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index 3eda28121872..2abb4da4d865 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -243,7 +243,6 @@
 import static org.graalvm.compiler.bytecode.Bytecodes.TABLESWITCH;
 import static org.graalvm.compiler.bytecode.Bytecodes.nameOf;
 import static org.graalvm.compiler.core.common.GraalOptions.DeoptALot;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining;
 import static org.graalvm.compiler.core.common.GraalOptions.PrintProfilingInformation;
 import static org.graalvm.compiler.core.common.GraalOptions.StressExplicitExceptionCode;
@@ -409,9 +408,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvokeDynamicPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ProfilingPlugin;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.compiler.nodes.java.FinalFieldBarrierNode;
@@ -1122,12 +1119,6 @@ protected void build(FixedWithNextNode startInstruction, FrameStateBuilder start
                     genMonitorEnter(methodSynchronizedObject, bci());
                 }
 
-                ProfilingPlugin profilingPlugin = this.graphBuilderConfig.getPlugins().getProfilingPlugin();
-                if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-                    FrameState stateBefore = createCurrentFrameState();
-                    profilingPlugin.profileInvoke(this, method, stateBefore);
-                }
-
                 genInfoPointNode(InfopointReason.METHOD_START, null);
             }
 
@@ -1487,12 +1478,6 @@ protected ValueNode genZeroExtend(ValueNode input, int bitCount) {
     }
 
     protected void genGoto() {
-        ProfilingPlugin profilingPlugin = this.graphBuilderConfig.getPlugins().getProfilingPlugin();
-        if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-            FrameState stateBefore = createCurrentFrameState();
-            int targetBci = currentBlock.getSuccessor(0).startBci;
-            profilingPlugin.profileGoto(this, method, bci(), targetBci, stateBefore);
-        }
         appendGoto(currentBlock.getSuccessor(0));
         assert currentBlock.numNormalSuccessors() == 1;
     }
@@ -1742,40 +1727,14 @@ protected void genInvokeVirtual(ResolvedJavaMethod resolvedTarget) {
     private boolean genDynamicInvokeHelper(ResolvedJavaMethod target, int cpi, int opcode) {
         assert opcode == INVOKEDYNAMIC || opcode == INVOKEVIRTUAL;
 
-        InvokeDynamicPlugin invokeDynamicPlugin = graphBuilderConfig.getPlugins().getInvokeDynamicPlugin();
-
-        if (opcode == INVOKEVIRTUAL && invokeDynamicPlugin != null && !invokeDynamicPlugin.isResolvedDynamicInvoke(this, cpi, opcode)) {
-            // regular invokevirtual, let caller handle it
-            return false;
-        }
-
-        if (GeneratePIC.getValue(options) && (invokeDynamicPlugin == null || !invokeDynamicPlugin.supportsDynamicInvoke(this, cpi, opcode))) {
-            // bail out if static compiler and no dynamic type support
-            append(new DeoptimizeNode(InvalidateRecompile, Unresolved));
-            return true;
-        }
-
         JavaConstant appendix = constantPool.lookupAppendix(cpi, opcode);
         ValueNode appendixNode = null;
 
         if (appendix != null) {
-            if (invokeDynamicPlugin != null) {
-                invokeDynamicPlugin.recordDynamicMethod(this, cpi, opcode, target);
-
-                // Will perform runtime type checks and static initialization
-                FrameState stateBefore = createCurrentFrameState();
-                appendixNode = invokeDynamicPlugin.genAppendixNode(this, cpi, opcode, appendix, stateBefore);
-            } else {
-                appendixNode = ConstantNode.forConstant(appendix, getMetaAccess(), graph);
-            }
+            appendixNode = ConstantNode.forConstant(appendix, getMetaAccess(), graph);
 
             frameState.push(JavaKind.Object, appendixNode);
 
-        } else if (GeneratePIC.getValue(options)) {
-            // Need to emit runtime guard and perform static initialization.
-            // Not implemented yet.
-            append(new DeoptimizeNode(InvalidateRecompile, Unresolved));
-            return true;
         }
 
         boolean hasReceiver = (opcode == INVOKEDYNAMIC) ? false : !target.isStatic();
@@ -3672,11 +3631,6 @@ protected void genIf(LogicNode conditionInput, BciBlock trueBlockInput, BciBlock
         BciBlock falseBlock = falseBlockInput;
         LogicNode condition = conditionInput;
         BranchProbabilityData profileData = originalProfileData;
-        FrameState stateBefore = null;
-        ProfilingPlugin profilingPlugin = this.graphBuilderConfig.getPlugins().getProfilingPlugin();
-        if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-            stateBefore = createCurrentFrameState();
-        }
 
         // Remove a logic negation node.
         if (condition instanceof LogicNegationNode) {
@@ -3714,9 +3668,6 @@ protected void genIf(LogicNode conditionInput, BciBlock trueBlockInput, BciBlock
                 }
                 boolean negated = deoptBlock == trueBlock;
                 if (!isPotentialCountedLoopExit(condition, deoptBlock)) {
-                    if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-                        profilingPlugin.profileGoto(this, method, bci(), noDeoptBlock.startBci, stateBefore);
-                    }
                     append(new FixedGuardNode(condition, UnreachedCode, InvalidateReprofile, negated, survivingSuccessorPosition));
                     appendGoto(noDeoptBlock);
                 } else {
@@ -3738,10 +3689,6 @@ protected void genIf(LogicNode conditionInput, BciBlock trueBlockInput, BciBlock
                 return;
             }
 
-            if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-                profilingPlugin.profileIf(this, method, bci(), condition, trueBlock.startBci, falseBlock.startBci, stateBefore);
-            }
-
             int oldBci = stream.currentBCI();
             int trueBlockInt = checkPositiveIntConstantPushed(trueBlock);
             if (trueBlockInt != -1) {
@@ -3862,19 +3809,9 @@ private void genConstantTargetIf(BciBlock trueBlock, BciBlock falseBlock, LogicN
         if (targetAtStart == Bytecodes.GOTO && nextBlock.getPredecessorCount() == 1) {
             // This is an empty block. Skip it.
             BciBlock successorBlock = nextBlock.successors.get(0);
-            ProfilingPlugin profilingPlugin = graphBuilderConfig.getPlugins().getProfilingPlugin();
-            if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-                FrameState stateBefore = createCurrentFrameState();
-                profilingPlugin.profileGoto(this, method, bci(), successorBlock.startBci, stateBefore);
-            }
             appendGoto(successorBlock);
             assert nextBlock.numNormalSuccessors() == 1;
         } else {
-            ProfilingPlugin profilingPlugin = graphBuilderConfig.getPlugins().getProfilingPlugin();
-            if (profilingPlugin != null && profilingPlugin.shouldProfile(this, method)) {
-                FrameState stateBefore = createCurrentFrameState();
-                profilingPlugin.profileGoto(this, method, bci(), nextBlock.startBci, stateBefore);
-            }
             appendGoto(nextBlock);
         }
     }
@@ -4789,10 +4726,6 @@ private void genGetField(JavaField field, ValueNode receiverInput) {
     }
 
     private void genGetField(ResolvedJavaField resolvedField, ValueNode receiver) {
-        if (!parsingIntrinsic() && GeneratePIC.getValue(getOptions())) {
-            graph.recordField(resolvedField);
-        }
-
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
             if (plugin.handleLoadField(this, receiver, resolvedField)) {
                 return;
@@ -4886,10 +4819,6 @@ private void genPutField(JavaField field, ValueNode value) {
             ValueNode receiver = maybeEmitExplicitNullCheck(receiverInput);
             ResolvedJavaField resolvedField = (ResolvedJavaField) field;
 
-            if (!parsingIntrinsic() && GeneratePIC.getValue(getOptions())) {
-                graph.recordField(resolvedField);
-            }
-
             for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
                 if (plugin.handleStoreField(this, receiver, resolvedField, value)) {
                     return;
@@ -4916,10 +4845,6 @@ private void genGetStatic(JavaField field) {
             return;
         }
 
-        if (!parsingIntrinsic() && GeneratePIC.getValue(getOptions())) {
-            graph.recordField(resolvedField);
-        }
-
         /*
          * Javac does not allow use of "$assertionsDisabled" for a field name but Eclipse does, in
          * which case a suffix is added to the generated field.
@@ -5010,10 +4935,6 @@ protected void genPutStatic(JavaField field) {
             return;
         }
 
-        if (!parsingIntrinsic() && GeneratePIC.getValue(getOptions())) {
-            graph.recordField(resolvedField);
-        }
-
         ClassInitializationPlugin classInitializationPlugin = this.graphBuilderConfig.getPlugins().getClassInitializationPlugin();
         ResolvedJavaType holder = resolvedField.getDeclaringClass();
         if (classInitializationPlugin != null) {
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
index 087e3325af2d..2a9f6634db14 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
@@ -27,7 +27,6 @@
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
@@ -208,16 +207,12 @@ public static void directCall(CompilationResultBuilder crb, AArch64MacroAssemble
     public static void directCall(CompilationResultBuilder crb, AArch64MacroAssembler masm, InvokeTarget callTarget, Register scratch, LIRFrameState info, Label label) {
         int before = masm.position();
         if (scratch != null) {
-            if (GeneratePIC.getValue(crb.getOptions())) {
-                masm.bl(0);
-            } else {
-                /*
-                 * Offset might not fit into a 28-bit immediate, generate an indirect call with a
-                 * 64-bit immediate address which is fixed up by HotSpot.
-                 */
-                masm.movNativeAddress(scratch, 0L, true);
-                masm.blr(scratch);
-            }
+            /*
+             * Offset might not fit into a 28-bit immediate, generate an indirect call with a 64-bit
+             * immediate address which is fixed up by HotSpot.
+             */
+            masm.movNativeAddress(scratch, 0L, true);
+            masm.blr(scratch);
         } else {
             // Address is fixed up by HotSpot.
             masm.bl(0);
@@ -244,12 +239,8 @@ public static void indirectCall(CompilationResultBuilder crb, AArch64MacroAssemb
     public static void directJmp(CompilationResultBuilder crb, AArch64MacroAssembler masm, InvokeTarget callTarget) {
         try (AArch64MacroAssembler.ScratchRegister scratch = masm.getScratchRegister()) {
             int before = masm.position();
-            if (GeneratePIC.getValue(crb.getOptions())) {
-                masm.jmp();
-            } else {
-                masm.movNativeAddress(scratch.getRegister(), 0L);
-                masm.jmp(scratch.getRegister());
-            }
+            masm.movNativeAddress(scratch.getRegister(), 0L);
+            masm.jmp(scratch.getRegister());
             int after = masm.position();
             crb.recordDirectCall(before, after, callTarget, null);
             masm.ensureUniquePC();
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
index f2c3165df520..d68cc6521533 100755
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
@@ -33,7 +33,6 @@
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
@@ -64,7 +63,6 @@
 import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
 import org.graalvm.compiler.lir.VirtualStackSlot;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.MemoryBarriers;
@@ -672,8 +670,8 @@ protected PointerCompressionOp(LIRInstructionClass<? extends PointerCompressionO
             this.lirKindTool = lirKindTool;
         }
 
-        public static boolean hasBase(OptionValues options, CompressEncoding encoding) {
-            return GeneratePIC.getValue(options) || encoding.hasBase();
+        public static boolean hasBase(CompressEncoding encoding) {
+            return encoding.hasBase();
         }
 
         public final Value getInput() {
@@ -688,8 +686,8 @@ protected final Register getResultRegister() {
             return asRegister(result);
         }
 
-        protected final Register getBaseRegister(CompilationResultBuilder crb) {
-            return hasBase(crb.getOptions(), encoding) ? asRegister(baseRegister) : Register.None;
+        protected final Register getBaseRegister() {
+            return hasBase(encoding) ? asRegister(baseRegister) : Register.None;
         }
 
         protected final int getShift() {
@@ -718,7 +716,7 @@ private CompressPointerOp(LIRInstructionClass<? extends PointerCompressionOp> ty
         protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             Register resultRegister = getResultRegister();
             Register ptr = asRegister(getInput());
-            Register base = getBaseRegister(crb);
+            Register base = getBaseRegister();
             // result = (ptr - base) >> shift
             if (!encoding.hasBase()) {
                 if (encoding.hasShift()) {
@@ -759,7 +757,7 @@ private UncompressPointerOp(LIRInstructionClass<? extends PointerCompressionOp>
         protected void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             Register inputRegister = asRegister(getInput());
             Register resultRegister = getResultRegister();
-            Register base = encoding.hasBase() ? getBaseRegister(crb) : null;
+            Register base = encoding.hasBase() ? getBaseRegister() : null;
 
             // result = base + (ptr << shift)
             if (nonNull || base == null) {
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java
index a4f19259ad29..77b3f11bf0f2 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Call.java
@@ -26,7 +26,6 @@
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
@@ -196,7 +195,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static void directCall(CompilationResultBuilder crb, AMD64MacroAssembler masm, InvokeTarget callTarget, Register scratch, boolean align, LIRFrameState info) {
         int before;
-        if (scratch != null && !GeneratePIC.getValue(crb.getOptions())) {
+        if (scratch != null) {
             assert !align;
             // offset might not fit a 32-bit immediate, generate an
             // indirect call with a 64-bit immediate
@@ -215,7 +214,7 @@ public static void directCall(CompilationResultBuilder crb, AMD64MacroAssembler
 
     public static void directJmp(CompilationResultBuilder crb, AMD64MacroAssembler masm, InvokeTarget target, Register scratch) {
         int before;
-        if (scratch != null && !GeneratePIC.getValue(crb.getOptions())) {
+        if (scratch != null) {
             // offset might not fit a 32-bit immediate, generate an
             // indirect call with a 64-bit immediate
             before = masm.directJmp(0L, scratch);
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
index ce51b09f38b7..d4e16ac76f4f 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
@@ -31,7 +31,6 @@
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
 import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
 import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
@@ -63,7 +62,6 @@
 import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
 import org.graalvm.compiler.lir.VirtualStackSlot;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -834,8 +832,8 @@ protected PointerCompressionOp(LIRInstructionClass<? extends PointerCompressionO
             this.lirKindTool = lirKindTool;
         }
 
-        public static boolean hasBase(OptionValues options, CompressEncoding encoding) {
-            return GeneratePIC.getValue(options) || encoding.hasBase();
+        public static boolean hasBase(CompressEncoding encoding) {
+            return encoding.hasBase();
         }
 
         public final Value getInput() {
@@ -850,8 +848,8 @@ protected final Register getResultRegister() {
             return asRegister(result);
         }
 
-        protected final Register getBaseRegister(CompilationResultBuilder crb) {
-            return hasBase(crb.getOptions(), encoding) ? asRegister(baseRegister) : Register.None;
+        protected final Register getBaseRegister() {
+            return hasBase(encoding) ? asRegister(baseRegister) : Register.None;
         }
 
         protected final int getShift() {
@@ -915,7 +913,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
             move(lirKindTool.getObjectKind(), crb, masm);
 
             final Register resReg = getResultRegister();
-            final Register baseReg = getBaseRegister(crb);
+            final Register baseReg = getBaseRegister();
             if (!baseReg.equals(Register.None)) {
                 if (!nonNull) {
                     masm.testq(resReg, resReg);
@@ -945,7 +943,7 @@ private UncompressPointerOp(LIRInstructionClass<? extends PointerCompressionOp>
 
         @Override
         public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-            Register baseReg = getBaseRegister(crb);
+            Register baseReg = getBaseRegister();
             int shift = getShift();
             Register resReg = getResultRegister();
             if (nonNull && !baseReg.equals(Register.None) && getInput() instanceof RegisterValue) {
diff --git a/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java b/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java
index d8bab3b08f7e..aa238727d126 100644
--- a/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java
+++ b/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java
@@ -737,14 +737,10 @@ void recordMark(CompilationResult.CodeMark m) {
         }
     }
 
-    public CallContext openCallContext(boolean direct) {
+    public CallContext openCallContext() {
         if (currentCallContext != null) {
             throw GraalError.shouldNotReachHere("Call context already open");
         }
-        // Currently only AOT requires call context information and only for direct calls.
-        if (compilationResult.isImmutablePIC() && direct) {
-            currentCallContext = new CallContext();
-        }
         return currentCallContext;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
index 2e003bb1ec33..6436a169062a 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
@@ -466,9 +466,9 @@ protected final void emitCode() {
         int bytecodeSize = request.graph.method() == null ? 0 : request.graph.getBytecodeSize();
         SpeculationLog speculationLog = null;
         request.compilationResult.setHasUnsafeAccess(request.graph.hasUnsafeAccess());
-        LIRCompilerBackend.emitCode(request.backend, request.graph.getAssumptions(), request.graph.method(), request.graph.getMethods(), request.graph.getFields(),
-                        speculationLog, bytecodeSize, lirGenRes,
-                        request.compilationResult, request.installedCodeOwner, request.factory);
+        LIRCompilerBackend.emitCode(request.backend, request.graph.getAssumptions(), request.graph.method(), request.graph.getMethods(), speculationLog,
+                        bytecodeSize, lirGenRes, request.compilationResult,
+                        request.installedCodeOwner, request.factory);
     }
 
     protected StructuredGraph graph() {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java
index ea45cb8d368a..38d05fec7840 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CompressionNode.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.nodes;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
 
@@ -33,18 +32,18 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.calc.ConvertNode;
 import org.graalvm.compiler.nodes.calc.UnaryNode;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.LIRLowerable;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
+import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.Value;
 
 /**
@@ -125,11 +124,6 @@ public CompressEncoding getEncoding() {
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
         if (forValue.isConstant()) {
-            if (GeneratePIC.getValue(tool.getOptions())) {
-                // We always want uncompressed constants
-                return this;
-            }
-
             ConstantNode constant = (ConstantNode) forValue;
             return ConstantNode.forConstant(stamp(NodeView.DEFAULT), convert(constant.getValue(), tool.getConstantReflection()), constant.getStableDimension(), constant.isDefaultStable(),
                             tool.getMetaAccess());
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java
index 147b980f2a27..5783821b9dc4 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/EncodedGraph.java
@@ -26,11 +26,9 @@
 
 import java.util.List;
 
-import org.graalvm.collections.EconomicSet;
 import org.graalvm.compiler.graph.NodeClass;
 
 import jdk.vm.ci.meta.Assumptions;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -47,7 +45,6 @@ public class EncodedGraph {
     private final Assumptions assumptions;
     private final List<ResolvedJavaMethod> inlinedMethods;
     private final boolean trackNodeSourcePosition;
-    private final EconomicSet<ResolvedJavaField> fields;
     private final boolean hasUnsafeAccess;
 
     /**
@@ -57,12 +54,11 @@ public class EncodedGraph {
     protected int[] nodeStartOffsets;
 
     public EncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass<?>[] types, StructuredGraph sourceGraph) {
-        this(encoding, startOffset, objects, types, sourceGraph.getAssumptions(), sourceGraph.getMethods(), sourceGraph.getFields(), sourceGraph.hasUnsafeAccess(),
-                        sourceGraph.trackNodeSourcePosition());
+        this(encoding, startOffset, objects, types, sourceGraph.getAssumptions(), sourceGraph.getMethods(), sourceGraph.hasUnsafeAccess(), sourceGraph.trackNodeSourcePosition());
     }
 
     public EncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClass<?>[] types, Assumptions assumptions, List<ResolvedJavaMethod> inlinedMethods,
-                    EconomicSet<ResolvedJavaField> fields, boolean hasUnsafeAccess, boolean trackNodeSourcePosition) {
+                    boolean hasUnsafeAccess, boolean trackNodeSourcePosition) {
         this.encoding = encoding;
         this.startOffset = startOffset;
         this.objects = objects;
@@ -70,7 +66,6 @@ public EncodedGraph(byte[] encoding, int startOffset, Object[] objects, NodeClas
         this.assumptions = assumptions;
         this.inlinedMethods = inlinedMethods;
         this.trackNodeSourcePosition = trackNodeSourcePosition;
-        this.fields = fields;
         this.hasUnsafeAccess = hasUnsafeAccess;
     }
 
@@ -110,10 +105,6 @@ public boolean trackNodeSourcePosition() {
         return trackNodeSourcePosition;
     }
 
-    public EconomicSet<ResolvedJavaField> getFields() {
-        return fields;
-    }
-
     public boolean hasUnsafeAccess() {
         return hasUnsafeAccess;
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 27e3a26e1b5f..4e0905ba1a90 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -39,7 +39,6 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.compiler.api.replacements.MethodSubstitution;
@@ -71,7 +70,6 @@
 import jdk.vm.ci.meta.DefaultProfilingInfo;
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ProfilingInfo;
-import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
 import jdk.vm.ci.meta.TriState;
@@ -460,11 +458,6 @@ boolean implies(FrameStateVerificationFeature feature) {
      */
     private final List<ResolvedJavaMethod> methods;
 
-    /**
-     * Records the fields that were accessed while constructing this graph.
-     */
-    private EconomicSet<ResolvedJavaField> fields = null;
-
     private enum UnsafeAccessState {
         NO_ACCESS,
         HAS_ACCESS,
@@ -724,9 +717,6 @@ private StructuredGraph copy(String newName, ResolvedJavaMethod rootMethodForCop
         copy.setGuardsStage(getGuardsStage());
         copy.stageFlags = EnumSet.copyOf(stageFlags);
         copy.trackNodeSourcePosition = trackNodeSourcePositionForCopy;
-        if (fields != null) {
-            copy.fields = createFieldSet(fields);
-        }
         EconomicMap<Node, Node> replacements = EconomicMap.create(Equivalence.IDENTITY);
         replacements.put(start, copy.start);
         UnmodifiableEconomicMap<Node, Node> duplicates;
@@ -1111,15 +1101,6 @@ private boolean checkFrameStatesAgainstInlinedMethods() {
         return true;
     }
 
-    private static EconomicSet<ResolvedJavaField> createFieldSet(EconomicSet<ResolvedJavaField> init) {
-        // Multiple ResolvedJavaField objects can represent the same field so they
-        // need to be compared with equals().
-        if (init != null) {
-            return EconomicSet.create(Equivalence.DEFAULT, init);
-        }
-        return EconomicSet.create(Equivalence.DEFAULT);
-    }
-
     /**
      * Gets an unmodifiable view of the methods that were inlined while constructing this graph.
      */
@@ -1155,41 +1136,6 @@ public void updateMethods(StructuredGraph other) {
         }
     }
 
-    /**
-     * Gets an unmodifiable view of the fields that were accessed while constructing this graph.
-     *
-     * @return {@code null} if no field accesses were recorded
-     */
-    public EconomicSet<ResolvedJavaField> getFields() {
-        return fields;
-    }
-
-    /**
-     * Records that {@code field} was accessed in this graph.
-     */
-    public void recordField(ResolvedJavaField field) {
-        assert GraalOptions.GeneratePIC.getValue(getOptions());
-        if (this.fields == null) {
-            this.fields = createFieldSet(null);
-        }
-        fields.add(field);
-    }
-
-    /**
-     * Updates the {@linkplain #getFields() fields} of this graph with the accessed fields of
-     * another graph.
-     */
-    public void updateFields(StructuredGraph other) {
-        assert this != other;
-        assert GraalOptions.GeneratePIC.getValue(getOptions());
-        if (other.fields != null) {
-            if (this.fields == null) {
-                this.fields = createFieldSet(null);
-            }
-            this.fields.addAll(other.fields);
-        }
-    }
-
     /**
      * Gets the input bytecode {@linkplain ResolvedJavaMethod#getCodeSize() size} from which this
      * graph is constructed. This ignores how many bytecodes in each constituent method are actually
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
index 0b58f353aadf..72eba3553023 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/CompareNode.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.nodes.calc;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
 
 import org.graalvm.compiler.core.common.PermanentBailoutException;
@@ -223,7 +222,7 @@ protected LogicNode canonicalizeSymmetricConstant(ConstantReflectionProvider con
                 }
 
                 if (isConstantConversionSupported(convert, view, smallestCompareWidth)) {
-                    ConstantNode newConstant = canonicalConvertConstant(constantReflection, metaAccess, options, condition, convert, constant, view);
+                    ConstantNode newConstant = canonicalConvertConstant(constantReflection, metaAccess, condition, convert, constant, view);
                     if (newConstant != null) {
                         if (mirrored) {
                             return duplicateModified(newConstant, convert.getValue(), unorderedIsTrue, view);
@@ -253,15 +252,11 @@ private static boolean isConstantConversionSupported(ConvertNode convert, NodeVi
             return supported;
         }
 
-        private static ConstantNode canonicalConvertConstant(ConstantReflectionProvider constantReflection, MetaAccessProvider metaAccess, OptionValues options, CanonicalCondition condition,
-                        ConvertNode convert, Constant constant, NodeView view) {
+        private static ConstantNode canonicalConvertConstant(ConstantReflectionProvider constantReflection, MetaAccessProvider metaAccess, CanonicalCondition condition, ConvertNode convert,
+                        Constant constant, NodeView view) {
             if (convert.preservesOrder(condition, constant, constantReflection)) {
                 Constant reverseConverted = convert.reverse(constant, constantReflection);
                 if (reverseConverted != null && convert.convert(reverseConverted, constantReflection).equals(constant)) {
-                    if (GeneratePIC.getValue(options)) {
-                        // We always want uncompressed constants
-                        return null;
-                    }
                     return ConstantNode.forConstant(convert.getValue().stamp(view), reverseConverted, metaAccess);
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java
index 810d0e748d20..d45628666477 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.nodes.extended;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
@@ -91,36 +90,30 @@ public LoadHubNode(Stamp stamp, ValueNode value) {
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool) {
-        if (!GeneratePIC.getValue(tool.getOptions())) {
-            NodeView view = NodeView.from(tool);
-            MetaAccessProvider metaAccess = tool.getMetaAccess();
-            ValueNode curValue = getValue();
-            ValueNode newNode = findSynonym(curValue, stamp(view), metaAccess, tool.getConstantReflection());
-            if (newNode != null) {
-                return newNode;
-            }
+        NodeView view = NodeView.from(tool);
+        MetaAccessProvider metaAccess = tool.getMetaAccess();
+        ValueNode curValue = getValue();
+        ValueNode newNode = findSynonym(curValue, stamp(view), metaAccess, tool.getConstantReflection());
+        if (newNode != null) {
+            return newNode;
         }
         return this;
     }
 
     public static ValueNode findSynonym(ValueNode curValue, Stamp stamp, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection) {
-        if (!GeneratePIC.getValue(curValue.getOptions())) {
-            TypeReference type = StampTool.typeReferenceOrNull(curValue);
-            if (type != null && type.isExact()) {
-                return ConstantNode.forConstant(stamp, constantReflection.asObjectHub(type.getType()), metaAccess);
-            }
+        TypeReference type = StampTool.typeReferenceOrNull(curValue);
+        if (type != null && type.isExact()) {
+            return ConstantNode.forConstant(stamp, constantReflection.asObjectHub(type.getType()), metaAccess);
         }
         return null;
     }
 
     @Override
     public void virtualize(VirtualizerTool tool) {
-        if (!GeneratePIC.getValue(tool.getOptions())) {
-            ValueNode alias = tool.getAlias(getValue());
-            TypeReference type = StampTool.typeReferenceOrNull(alias);
-            if (type != null && type.isExact()) {
-                tool.replaceWithValue(ConstantNode.forConstant(stamp(NodeView.DEFAULT), tool.getConstantReflection().asObjectHub(type.getType()), tool.getMetaAccess(), graph()));
-            }
+        ValueNode alias = tool.getAlias(getValue());
+        TypeReference type = StampTool.typeReferenceOrNull(alias);
+        if (type != null && type.isExact()) {
+            tool.replaceWithValue(ConstantNode.forConstant(stamp(NodeView.DEFAULT), tool.getConstantReflection().asObjectHub(type.getType()), tool.getMetaAccess(), graph()));
         }
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java
index 40d71ad59aa2..7f509542d73c 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java
@@ -24,7 +24,6 @@
  */
 package org.graalvm.compiler.nodes.extended;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
 
@@ -91,14 +90,12 @@ public LoadHubOrNullNode(Stamp stamp, ValueNode value) {
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool) {
-        if (!GeneratePIC.getValue(tool.getOptions())) {
-            NodeView view = NodeView.from(tool);
-            MetaAccessProvider metaAccess = tool.getMetaAccess();
-            ValueNode curValue = getValue();
-            ValueNode newNode = findSynonym(curValue, (AbstractPointerStamp) stamp(view), metaAccess, tool.getConstantReflection());
-            if (newNode != null) {
-                return newNode;
-            }
+        NodeView view = NodeView.from(tool);
+        MetaAccessProvider metaAccess = tool.getMetaAccess();
+        ValueNode curValue = getValue();
+        ValueNode newNode = findSynonym(curValue, (AbstractPointerStamp) stamp(view), metaAccess, tool.getConstantReflection());
+        if (newNode != null) {
+            return newNode;
         }
         return this;
     }
@@ -112,12 +109,10 @@ public static ValueNode findSynonym(ValueNode curValue, AbstractPointerStamp sta
 
     @Override
     public void virtualize(VirtualizerTool tool) {
-        if (!GeneratePIC.getValue(tool.getOptions())) {
-            ValueNode alias = tool.getAlias(getValue());
-            TypeReference type = StampTool.typeReferenceOrNull(alias);
-            if (type != null && type.isExact()) {
-                tool.replaceWithValue(ConstantNode.forConstant(stamp(NodeView.DEFAULT), tool.getConstantReflection().asObjectHub(type.getType()), tool.getMetaAccess(), graph()));
-            }
+        ValueNode alias = tool.getAlias(getValue());
+        TypeReference type = StampTool.typeReferenceOrNull(alias);
+        if (type != null && type.isExact()) {
+            tool.replaceWithValue(ConstantNode.forConstant(stamp(NodeView.DEFAULT), tool.getConstantReflection().asObjectHub(type.getType()), tool.getMetaAccess(), graph()));
         }
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
index 4bf7c471c24e..97660444bc13 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
@@ -42,8 +42,6 @@ public static class Plugins {
         private TypePlugin[] typePlugins;
         private InlineInvokePlugin[] inlineInvokePlugins;
         private ClassInitializationPlugin classInitializationPlugin;
-        private InvokeDynamicPlugin invokeDynamicPlugin;
-        private ProfilingPlugin profilingPlugin;
 
         /**
          * Creates a copy of a given set of plugins. The {@link InvocationPlugins} in
@@ -57,8 +55,6 @@ public Plugins(Plugins copyFrom, InvocationPlugins invocationPlugins) {
             this.typePlugins = copyFrom.typePlugins;
             this.inlineInvokePlugins = copyFrom.inlineInvokePlugins;
             this.classInitializationPlugin = copyFrom.classInitializationPlugin;
-            this.invokeDynamicPlugin = copyFrom.invokeDynamicPlugin;
-            this.profilingPlugin = copyFrom.profilingPlugin;
         }
 
         public Plugins(Plugins copyFrom) {
@@ -167,22 +163,6 @@ public void setClassInitializationPlugin(ClassInitializationPlugin plugin) {
             this.classInitializationPlugin = plugin;
         }
 
-        public InvokeDynamicPlugin getInvokeDynamicPlugin() {
-            return invokeDynamicPlugin;
-        }
-
-        public void setInvokeDynamicPlugin(InvokeDynamicPlugin plugin) {
-            this.invokeDynamicPlugin = plugin;
-        }
-
-        public ProfilingPlugin getProfilingPlugin() {
-            return profilingPlugin;
-        }
-
-        public void setProfilingPlugin(ProfilingPlugin plugin) {
-            this.profilingPlugin = plugin;
-        }
-
         public StampPair getOverridingStamp(GraphBuilderTool b, JavaType type, boolean nonNull) {
             for (TypePlugin plugin : getTypePlugins()) {
                 StampPair stamp = plugin.interceptType(b, type, nonNull);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvokeDynamicPlugin.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvokeDynamicPlugin.java
deleted file mode 100644
index 11ebe26e02b3..000000000000
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvokeDynamicPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.nodes.graphbuilderconf;
-
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.JavaConstant;
-
-/**
- * {@link GraphBuilderPlugin} interface for static compilation mode, allowing references to dynamic
- * types.
- */
-public interface InvokeDynamicPlugin extends GraphBuilderPlugin {
-
-    /**
-     * Checks for a resolved dynamic adapter method at the specified index, resulting from either a
-     * resolved invokedynamic or invokevirtual on a signature polymorphic MethodHandle method
-     * (HotSpot invokehandle).
-     *
-     * @param builder context for the invoke
-     * @param cpi the constant pool index
-     * @param opcode the opcode of the instruction for which the lookup is being performed
-     * @return {@code true} if a signature polymorphic method reference was found, otherwise
-     *         {@code false}
-     */
-    boolean isResolvedDynamicInvoke(GraphBuilderContext builder, int cpi, int opcode);
-
-    /**
-     * Checks if this plugin instance supports the specified dynamic invoke.
-     *
-     * @param builder context for the invoke
-     * @param cpi the constant pool index
-     * @param opcode the opcode of the invoke instruction
-     * @return {@code true} if this dynamic invoke is supported
-     */
-    boolean supportsDynamicInvoke(GraphBuilderContext builder, int cpi, int opcode);
-
-    /**
-     * Notifies this object of the value and context of the dynamic method target (e.g., A HotSpot
-     * adapter method) for a resolved dynamic invoke.
-     *
-     * @param builder context for the invoke
-     * @param cpi the constant pool index
-     * @param opcode the opcode of the instruction for which the lookup is being performed
-     * @param target dynamic target method to record
-     */
-    void recordDynamicMethod(GraphBuilderContext builder, int cpi, int opcode, ResolvedJavaMethod target);
-
-    /**
-     * Notifies this object of the value and context of the dynamic appendix object for a resolved
-     * dynamic invoke.
-     *
-     * @param builder context for the invoke
-     * @param cpi the constant pool index
-     * @param opcode the opcode of the instruction for which the lookup is being performed
-     * @return {@link ValueNode} for appendix constant
-     */
-    ValueNode genAppendixNode(GraphBuilderContext builder, int cpi, int opcode, JavaConstant appendix, FrameState frameState);
-
-}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java
deleted file mode 100644
index e1e132fd5712..000000000000
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/ProfilingPlugin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.nodes.graphbuilderconf;
-
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.LogicNode;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-public interface ProfilingPlugin extends GraphBuilderPlugin {
-    boolean shouldProfile(GraphBuilderContext builder, ResolvedJavaMethod method);
-
-    void profileInvoke(GraphBuilderContext builder, ResolvedJavaMethod method, FrameState frameState);
-
-    void profileGoto(GraphBuilderContext builder, ResolvedJavaMethod method, int bci, int targetBci, FrameState frameState);
-
-    void profileIf(GraphBuilderContext builder, ResolvedJavaMethod method, int bci, LogicNode condition, int trueBranchBci, int falseBranchBci, FrameState frameState);
-
-}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java
index a4acb314df7f..c5de8e936b28 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java
@@ -25,8 +25,6 @@
 //JaCoCo Exclude
 package org.graalvm.compiler.nodes.java;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
@@ -100,11 +98,6 @@ public JavaKind getKnownElementKind() {
     @Override
     public Node canonical(CanonicalizerTool tool) {
         if (elementType.isConstant()) {
-            if (GeneratePIC.getValue(tool.getOptions())) {
-                // Can't fold for AOT, because the resulting NewArrayNode will be missing its
-                // ResolveConstantNode for the array class.
-                return this;
-            }
             ResolvedJavaType type = tool.getConstantReflection().asJavaType(elementType.asConstant());
             if (type != null && !throwsIllegalArgumentException(type) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type.getArrayClass())) {
                 return createNewArrayNode(type);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java
index 54e370269fe7..b8b47e310c48 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.compiler.nodes.java;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
-
 import java.lang.reflect.Modifier;
 
 import org.graalvm.compiler.core.common.type.ObjectStamp;
@@ -64,11 +62,6 @@ public ValueNode getInstanceType() {
 
     public static boolean canConvertToNonDynamic(ValueNode clazz, CanonicalizerTool tool) {
         if (clazz.isConstant()) {
-            if (GeneratePIC.getValue(tool.getOptions())) {
-                // Can't fold for AOT, because the resulting NewInstanceNode will be missing its
-                // InitializeKlassNode.
-                return false;
-            }
             ResolvedJavaType type = tool.getConstantReflection().asJavaType(clazz.asConstant());
             if (type != null && !throwsInstantiationException(type, tool.getMetaAccess()) && tool.getMetaAccessExtensionProvider().canConstantFoldDynamicAllocation(type)) {
                 return true;
diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
index 0da6acbe0091..b9d984fc8035 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
@@ -41,7 +41,6 @@
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.collections.UnmodifiableMapCursor;
 import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
@@ -624,11 +623,6 @@ private static ValueNode finishInlining(Invoke invoke, StructuredGraph graph, Fi
         // Copy inlined methods from inlinee to caller
         graph.updateMethods(inlineGraph);
 
-        // Update the set of accessed fields
-        if (GraalOptions.GeneratePIC.getValue(graph.getOptions())) {
-            graph.updateFields(inlineGraph);
-        }
-
         if (inlineGraph.hasUnsafeAccess()) {
             graph.markUnsafeAccess();
         }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 1a83d8f51e9e..5c726a6b1de4 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -822,11 +822,6 @@ private void recordGraphElements(EncodedGraph encodedGraph) {
         } else {
             assert inlinedAssumptions == null : String.format("cannot inline graph (%s) which makes assumptions into a graph (%s) that doesn't", encodedGraph, graph);
         }
-        if (encodedGraph.getFields() != null) {
-            for (ResolvedJavaField field : encodedGraph.getFields()) {
-                graph.recordField(field);
-            }
-        }
         if (encodedGraph.hasUnsafeAccess()) {
             graph.markUnsafeAccess();
         }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 714b24388bd8..f553c5da39b3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -884,12 +884,7 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
                 fallbackInvoke = fallbackInvokes.get(0);
             }
 
-            CanonicalizerPhase canonicalizer;
-            if (GraalOptions.ImmutableCode.getValue(snippetCopy.getOptions())) {
-                canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization();
-            } else {
-                canonicalizer = CanonicalizerPhase.create();
-            }
+            CanonicalizerPhase canonicalizer = CanonicalizerPhase.create();
 
             /*-
              * Mirror the behavior of normal compilations here (without aggressive optimizations
@@ -1192,12 +1187,7 @@ public static void explodeLoops(final StructuredGraph snippetCopy, CoreProviders
                 if (loopBegin != null) {
                     LoopEx loop = providers.getLoopsDataProvider().getLoopsData(snippetCopy).loop(loopBegin);
                     Mark mark = snippetCopy.getMark();
-                    CanonicalizerPhase canonicalizer = null;
-                    if (GraalOptions.ImmutableCode.getValue(snippetCopy.getOptions())) {
-                        canonicalizer = CanonicalizerPhase.createWithoutReadCanonicalization();
-                    } else {
-                        canonicalizer = CanonicalizerPhase.create();
-                    }
+                    CanonicalizerPhase canonicalizer = CanonicalizerPhase.create();
                     try {
                         LoopTransformations.fullUnroll(loop, providers, canonicalizer);
                     } catch (RetryableBailoutException e) {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 3aa0459427d2..52c8b0d31684 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.replacements.arraycopy;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-import static org.graalvm.compiler.core.common.GraalOptions.GeneratePIC;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY;
 import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
 
@@ -517,10 +516,6 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
                     snippetInfo = delayedGenericArraycopySnippet;
                     // no need for additional type check to avoid duplicated work
                     arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
-                } else if (GeneratePIC.getValue(options)) {
-                    // use generic copying for AOT compilation
-                    snippetInfo = delayedGenericArraycopySnippet;
-                    arrayTypeCheck = ArrayCopyTypeCheck.NO_ARRAY_TYPE_CHECK;
                 } else if (srcComponentType != null && destComponentType != null) {
                     if (!srcComponentType.isPrimitive() && !destComponentType.isPrimitive()) {
                         // it depends on the array content if the copy succeeds - we need
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java
index 843449ab0437..98a25eb2bed7 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java
@@ -27,7 +27,6 @@
 import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.GraalOptions;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
@@ -104,22 +103,13 @@ public Node canonical(CanonicalizerTool tool) {
     @Override
     public void lower(LoweringTool tool) {
         if (!compileTimeAssertion) {
-            if (GraalOptions.ImmutableCode.getValue(getOptions())) {
-                // Snippet assertions are disabled for AOT
-                graph().removeFixed(this);
-            } else {
-                tool.getLowerer().lower(this, tool);
-            }
+            tool.getLowerer().lower(this, tool);
         }
     }
 
     @Override
     public void generate(NodeLIRBuilderTool generator) {
         assert compileTimeAssertion;
-        if (GraalOptions.ImmutableCode.getValue(getOptions())) {
-            // Snippet assertions are disabled for AOT
-            return;
-        }
         if (condition.isConstant()) {
             if (condition.asJavaConstant().asInt() == 0) {
                 throw new GraalError("%s: failed compile-time assertion: %s", this, message);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java
index b2804437f2c4..1e95f7a8a239 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.compiler.replacements.nodes;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
-
 import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.Node;
@@ -76,9 +74,6 @@ public Node canonical(CanonicalizerTool tool) {
         if (object.isConstant()) {
             assert object.stamp(NodeView.DEFAULT) instanceof AbstractObjectStamp;
             JavaConstant c = (JavaConstant) object.asConstant();
-            if (ImmutableCode.getValue(tool.getOptions())) {
-                return this;
-            }
 
             int identityHashCode;
             if (c.isNull()) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.amd64/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.amd64/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
index 1609955b730a..94f310b3d837 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.amd64/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.amd64/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
@@ -80,7 +80,7 @@ protected void injectTailCallCode(int installedCodeOffset, int entryPointOffset)
                             masm.movl(spillRegister, new AMD64Address(thisRegister, installedCodeOffset), true);
                             assert masm.position() - pos >= AMD64HotSpotBackend.PATCHED_VERIFIED_ENTRY_POINT_INSTRUCTION_SIZE;
                             CompressEncoding encoding = config.getOopEncoding();
-                            Register heapBaseRegister = AMD64Move.UncompressPointerOp.hasBase(options, encoding) ? registers.getHeapBaseRegister() : Register.None;
+                            Register heapBaseRegister = AMD64Move.UncompressPointerOp.hasBase(encoding) ? registers.getHeapBaseRegister() : Register.None;
                             AMD64Move.UncompressPointerOp.emitUncompressCode(masm, spillRegister, encoding.getShift(), heapBaseRegister, true);
                         } else {
                             // First instruction must be at least 5 bytes long to be safe for
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
index 27dc89fc5e69..f710a2bccc67 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -901,7 +901,7 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
                 masm.adrpLdr(srcSize, resultReg, resultReg);
             }
             if (!constant.isCompressed()) { // the result is expected to be uncompressed
-                Register baseReg = getBaseRegister(crb);
+                Register baseReg = getBaseRegister();
                 assert !baseReg.equals(Register.None) || getShift() != 0 : "no compression in place";
                 masm.add(64, resultReg, baseReg, resultReg, ShiftType.LSL, getShift());
             }
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
index d0c1672bf8c4..2d87bba507d3 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -983,7 +983,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
                     }
                 }
                 if (!constant.isCompressed()) { // the result is expected to be uncompressed
-                    Register baseReg = getBaseRegister(crb);
+                    Register baseReg = getBaseRegister();
                     boolean preserveFlagsRegister = true;
                     emitUncompressWithBaseRegister(masm, resultReg, baseReg, getShift(), preserveFlagsRegister);
                 }
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
index 0b2ea1f335e3..a1ca1fbd62c6 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
@@ -160,7 +160,6 @@ private static void setCompilationResultMethod(CompilationResult result, Structu
         ResolvedJavaMethod rootMethod = graph.method();
         if (rootMethod != null) {
             result.setMethods(rootMethod, graph.getMethods());
-            result.setFields(graph.getFields());
         }
 
         result.setHasUnsafeAccess(graph.hasUnsafeAccess());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
index 0a7f1ddde179..d2d9d7e69566 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
@@ -211,7 +211,7 @@ public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod
             parameterPlugin = new ConstantBindingParameterPlugin(args, providers.getMetaAccess(), snippetReflection);
         }
 
-        EncodedGraph encodedGraph = new EncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, null, null, null, false, trackNodeSourcePosition);
+        EncodedGraph encodedGraph = new EncodedGraph(snippetEncoding, startOffset, snippetObjects, snippetNodeClasses, null, null, false, trackNodeSourcePosition);
         try (DebugContext debug = openDebugContext("SVMSnippet_", method, options)) {
             StructuredGraph result = new StructuredGraph.Builder(options, debug).method(method).trackNodeSourcePosition(trackNodeSourcePosition).setIsSubstitution(true).build();
             PEGraphDecoder graphDecoder = new PEGraphDecoder(ConfigurationValues.getTarget().arch, result, providers, null, snippetInvocationPlugins, new InlineInvokePlugin[0], parameterPlugin, null,
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
index 1c99945a3aa9..94af62be2e31 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
@@ -293,7 +293,7 @@ public static EncodedGraph encodedGraph(SharedRuntimeMethod method, boolean trac
         if (startOffset == -1) {
             return null;
         }
-        return new EncodedGraph(get().graphEncoding, startOffset, get().graphObjects, get().graphNodeTypes, null, null, null, false, trackNodeSourcePosition);
+        return new EncodedGraph(get().graphEncoding, startOffset, get().graphObjects, get().graphNodeTypes, null, null, false, trackNodeSourcePosition);
     }
 
     public static StructuredGraph decodeGraph(DebugContext debug, String name, CompilationIdentifier compilationId, SharedRuntimeMethod method) {
diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
index 8f40d9227e61..6bdd62cb4542 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -96,49 +96,49 @@ def gate_body(args, tasks):
                             '-jar', mx.library('DACAPO').get_path(True), 'avrora', '-n', '1'])
 
                     # Ensure that fatal errors in libgraal route back to HotSpot
-                    try:
-                        vmargs = ['-XX:+UseJVMCICompiler',
-                                  '-XX:+UseJVMCINativeLibrary',
-                                  '-XX:+PrintFlagsFinal',
-                                  '-Dlibgraal.CrashAt=length,hashCode',
-                                  '-Dlibgraal.CrashAtIsFatal=true']
-                        cmd = ["dacapo:avrora", "--tracker=none", "--"] + vmargs + ["--", "--preserve"]
-                        out = mx.OutputCapture()
-                        exitcode, bench_suite, _ = mx_benchmark.gate_mx_benchmark(cmd, nonZeroIsFatal=False, out=out, err=out)
-                        if exitcode == 0:
-                            if 'CrashAtIsFatal: no fatalError function pointer installed' in out.data:
-                                # Executing a VM that does not configure fatal errors handling
-                                # in libgraal to route back through the VM.
-                                pass
-                            else:
-                                mx.abort('Expected following benchmark to result in non-zero exit code: ' + ' '.join(cmd))
+                    vmargs = ['-XX:+UseJVMCICompiler',
+                              '-XX:+UseJVMCINativeLibrary',
+                              '-XX:+PrintFlagsFinal',
+                              '-Dlibgraal.CrashAt=length,hashCode',
+                              '-Dlibgraal.CrashAtIsFatal=true']
+                    cmd = ["dacapo:avrora", "--tracker=none", "--"] + vmargs + ["--", "--preserve"]
+                    out = mx.OutputCapture()
+                    exitcode, bench_suite, _ = mx_benchmark.gate_mx_benchmark(cmd, nonZeroIsFatal=False, out=out, err=out)
+                    if exitcode == 0:
+                        if 'CrashAtIsFatal: no fatalError function pointer installed' in out.data:
+                            # Executing a VM that does not configure fatal errors handling
+                            # in libgraal to route back through the VM.
+                            pass
                         else:
-                            if len(bench_suite.scratchDirs()) == 0:
-                                mx.abort("No scratch dir found despite error being expected!")
-                            latest_scratch_dir = bench_suite.scratchDirs()[-1]
-                            seen_libjvmci_log = False
-                            hs_errs = glob.glob(join(latest_scratch_dir, 'hs_err_pid*.log'))
-                            if not hs_errs:
-                                mx.abort('Expected a file starting with "hs_err_pid" in test directory. Entries found=' + str(listdir(latest_scratch_dir)))
-                            for hs_err in hs_errs:
-                                mx.log("Verifying content of {}".format(join(latest_scratch_dir, hs_err)))
-                                with open(join(latest_scratch_dir, hs_err)) as fp:
-                                    contents = fp.read()
-                                if 'libjvmci' in hs_err:
-                                    seen_libjvmci_log = True
-                                    if 'Fatal error: Forced crash' not in contents:
-                                        mx.abort('Expected "Fatal error: Forced crash" to be in contents of ' + hs_err + ':' + linesep + contents)
-                                else:
-                                    if 'Fatal error in JVMCI' not in contents:
-                                        mx.abort('Expected "Fatal error in JVMCI" to be in contents of ' + hs_err + ':' + linesep + contents)
+                            mx.abort('Expected following benchmark to result in non-zero exit code: ' + ' '.join(cmd))
+                    else:
+                        if len(bench_suite.scratchDirs()) == 0:
+                            mx.abort("No scratch dir found despite error being expected!")
+                        latest_scratch_dir = bench_suite.scratchDirs()[-1]
+                        seen_libjvmci_log = False
+                        hs_errs = glob.glob(join(latest_scratch_dir, 'hs_err_pid*.log'))
+                        if not hs_errs:
+                            mx.abort('Expected a file starting with "hs_err_pid" in test directory. Entries found=' + str(listdir(latest_scratch_dir)))
+
+                        for hs_err in hs_errs:
+                            mx.log("Verifying content of {}".format(join(latest_scratch_dir, hs_err)))
+                            with open(join(latest_scratch_dir, hs_err)) as fp:
+                                contents = fp.read()
+                            if 'libjvmci' in hs_err:
+                                seen_libjvmci_log = True
+                                if 'Fatal error: Forced crash' not in contents:
+                                    mx.abort('Expected "Fatal error: Forced crash" to be in contents of ' + hs_err + ':' + linesep + contents)
+                            else:
+                                if 'Fatal error in JVMCI' not in contents:
+                                    mx.abort('Expected "Fatal error in JVMCI" to be in contents of ' + hs_err + ':' + linesep + contents)
 
-                            if 'JVMCINativeLibraryErrorFile' in out.data and not seen_libjvmci_log:
-                                mx.abort('Expected a file matching "hs_err_pid*_libjvmci.log" in test directory. Entries found=' + str(listdir(latest_scratch_dir)))
+                        if 'JVMCINativeLibraryErrorFile' in out.data and not seen_libjvmci_log:
+                            mx.abort('Expected a file matching "hs_err_pid*_libjvmci.log" in test directory. Entries found=' + str(listdir(latest_scratch_dir)))
 
-                    finally:
-                        for scratch_dir in bench_suite.scratchDirs():
-                            mx.log("Cleaning up scratch dir after gate task completion: {}".format(scratch_dir))
-                            mx.rmtree(scratch_dir)
+                    # Only clean up scratch dir on success
+                    for scratch_dir in bench_suite.scratchDirs():
+                        mx.log("Cleaning up scratch dir after gate task completion: {}".format(scratch_dir))
+                        mx.rmtree(scratch_dir)
 
             with Task('LibGraal Compiler:CTW', tasks, tags=[VmGateTasks.libgraal]) as t:
                 if t:

From 7de65b0172eab29234b3ba675f0d2250a54b3bf1 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 15:47:19 +0300
Subject: [PATCH 331/681] Follow Boris S. comment

---
 truffle/docs/TraversingCompilationQueue.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/truffle/docs/TraversingCompilationQueue.md b/truffle/docs/TraversingCompilationQueue.md
index a8446eeea5a0..edc8d19a55b9 100644
--- a/truffle/docs/TraversingCompilationQueue.md
+++ b/truffle/docs/TraversingCompilationQueue.md
@@ -6,7 +6,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/TraversingCo
 ---
 # Truffle Approach to the Compilation Queue
 
-As of version 21.3.0 Truffle has a new approach to compilation queueing.
+As of version 21.2.0 Truffle has a new approach to compilation queueing.
 This document gives motivation and an overview of this approach.
 
 ## What is a Compilation queue?
@@ -70,7 +70,7 @@ This gives a priority boost to targets that are currently "very hot" when compar
 
 For performance reasons the weight for tasks is cached and reused for a period of 1ms. If the cached value is older than 1ms, it is recalculated.
 
-The traversing compilation queue is on by default as of version 21.3.0 and can be disabled using `--engine.TraversingCompilationQueue=false`.
+The traversing compilation queue is on by default as of version 21.2.0 and can be disabled using `--engine.TraversingCompilationQueue=false`.
 
 ## Dynamic Compilation Thresholds
 
@@ -135,5 +135,5 @@ MinScale >|/     .                               .
               MinNormalLoad                   MaxNormalLoad
 ```
 
-The dynamic thresholds only work with the traversing compilation queue and are on by default as of version 21.3.0.
+The dynamic thresholds only work with the traversing compilation queue and are on by default as of version 21.2.0.
 They can be disabled with `--engine.DynamicCompilationThresholds=false`.

From 76aae7fd114cd4a2cd42f1b089692314a36147d6 Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Thu, 7 Oct 2021 13:53:23 +0200
Subject: [PATCH 332/681] Cleanups and documentation

---
 .../espresso/runtime/EspressoContext.java     |   2 +-
 .../runtime/EspressoShutdownHandler.java      |   6 +-
 .../Target_java_lang_Thread.java              |  18 +-
 .../substitutions/Target_sun_misc_Unsafe.java |   2 +-
 .../threads/EspressoThreadRegistry.java       |  15 +-
 .../truffle/espresso/threads/KillStatus.java  |  10 +-
 .../truffle/espresso/threads/SuspendLock.java |  74 ++++---
 .../espresso/threads/ThreadsAccess.java       | 192 ++++++++++++------
 8 files changed, 192 insertions(+), 127 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
index 623c999921d0..394b70910170 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoContext.java
@@ -849,7 +849,7 @@ public void unregisterThread(StaticObject self) {
     }
 
     public void interruptThread(StaticObject guestThread) {
-        threadRegistry.interruptThread(guestThread);
+        threads.interruptThread(guestThread);
     }
 
     public void invalidateNoThreadStop(String message) {
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
index 5106a102a7c7..2a475e3c3d08 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java
@@ -265,7 +265,7 @@ private void teardownPhase1(Thread initiatingThread) {
                 if (t.isDaemon()) {
                     context.getThreadAccess().stop(guest, null);
                 }
-                threadManager.interruptThread(guest);
+                context.getThreadAccess().interruptThread(guest);
             }
         }
     }
@@ -279,7 +279,7 @@ private void teardownPhase2(Thread initiatingThread) {
             Thread t = getThreadAccess().getHost(guest);
             if (t.isAlive() && t != initiatingThread) {
                 context.getThreadAccess().stop(guest, null);
-                threadManager.interruptThread(guest);
+                context.getThreadAccess().interruptThread(guest);
             }
         }
     }
@@ -299,7 +299,7 @@ private void teardownPhase3(Thread initiatingThread) {
                  * all polyglot threads but should have.
                  */
                 context.getThreadAccess().kill(guest);
-                threadManager.interruptThread(guest);
+                context.getThreadAccess().interruptThread(guest);
             }
         }
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
index d4f9d3954653..5fb155777a77 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_java_lang_Thread.java
@@ -119,8 +119,7 @@ void doCached(@JavaType(Thread.class) StaticObject self,
             ThreadsAccess threadAccess = context.getThreadAccess();
             if (context.multiThreadingEnabled()) {
                 // Thread.start() is synchronized.
-                if (threadAccess.isStillborn(self)) {
-                    threadAccess.terminateAndNotify(self);
+                if (threadAccess.terminateIfStillborn(self)) {
                     return;
                 }
                 Thread hostThread = threadAccess.createJavaThread(self, threadExit, dispatchUncaught);
@@ -176,9 +175,9 @@ public static void setPriority0(@JavaType(Thread.class) StaticObject self, int n
     }
 
     @Substitution(hasReceiver = true)
-    public static boolean isAlive(@JavaType(Thread.class) StaticObject self) {
-        int state = self.getKlass().getMeta().java_lang_Thread_threadStatus.getInt(self);
-        return state != State.NEW.value && state != State.TERMINATED.value;
+    public static boolean isAlive(@JavaType(Thread.class) StaticObject self,
+                    @Inject EspressoContext context) {
+        return context.getThreadAccess().isAlive(self);
     }
 
     @Substitution(hasReceiver = true)
@@ -236,7 +235,7 @@ public static void interrupt0(@JavaType(Object.class) StaticObject self,
 
     @Substitution
     public static void clearInterruptEvent(@Inject EspressoContext context) {
-        context.getThreadAccess().clearInterruptStatus();
+        context.getThreadAccess().clearInterruptEvent();
     }
 
     @TruffleBoundary
@@ -259,10 +258,7 @@ public static void resume0(@JavaType(Object.class) StaticObject self,
     @Substitution(hasReceiver = true)
     public static void suspend0(@JavaType(Object.class) StaticObject toSuspend,
                     @Inject EspressoContext context) {
-        toSuspend.getKlass().getContext().invalidateNoSuspend("Calling Thread.suspend()");
-        if (!isAlive(toSuspend)) {
-            return;
-        }
+        context.invalidateNoSuspend("Calling Thread.suspend()");
         context.getThreadAccess().suspend(toSuspend);
     }
 
@@ -270,7 +266,7 @@ public static void suspend0(@JavaType(Object.class) StaticObject toSuspend,
     @Substitution(hasReceiver = true)
     public static void stop0(@JavaType(Object.class) StaticObject self, @JavaType(Object.class) StaticObject throwable,
                     @Inject EspressoContext context) {
-        self.getKlass().getContext().invalidateNoThreadStop("Calling thread.stop()");
+        context.invalidateNoThreadStop("Calling thread.stop()");
         context.getThreadAccess().stop(self, throwable);
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
index 790628c488db..d93a4247f92d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_misc_Unsafe.java
@@ -1417,7 +1417,7 @@ public static void parkBoundary(@SuppressWarnings("unused") @JavaType(Unsafe.cla
     @Substitution(hasReceiver = true)
     public static void unpark(@SuppressWarnings("unused") @JavaType(Unsafe.class) StaticObject self, @JavaType(Object.class) StaticObject thread,
                     @Inject Meta meta) {
-        Thread hostThread = (Thread) meta.getThreadAccess().getHost(thread);
+        Thread hostThread = meta.getThreadAccess().getHost(thread);
         UnsafeAccess.getIfAllowed(meta).unpark(hostThread);
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
index 87d238c1993a..90c12cc69cf7 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/EspressoThreadRegistry.java
@@ -35,15 +35,13 @@
 import com.oracle.truffle.espresso.EspressoLanguage;
 import com.oracle.truffle.espresso.descriptors.Symbol;
 import com.oracle.truffle.espresso.impl.ContextAccess;
-import com.oracle.truffle.espresso.impl.Method;
 import com.oracle.truffle.espresso.impl.SuppressFBWarnings;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.StaticObject;
-import com.oracle.truffle.espresso.substitutions.Target_java_lang_Thread;
 import com.oracle.truffle.espresso.vm.VM;
 
-public class EspressoThreadRegistry implements ContextAccess {
+public final class EspressoThreadRegistry implements ContextAccess {
     private static final int DEFAULT_THREAD_ARRAY_SIZE = 8;
 
     private final TruffleLogger logger = TruffleLogger.getLogger(EspressoLanguage.ID, EspressoThreadRegistry.class);
@@ -180,7 +178,7 @@ public void unregisterThread(StaticObject thread) {
             } else {
                 Object[] threads = guestThreads;
                 int threadIndex = getThreadIndex(id, threads);
-                if (Target_java_lang_Thread.isAlive(thread)) {
+                if (getThreadAccess().isAlive(thread)) {
                     assert threads[threadIndex] == thread;
                     threads[threadIndex] = null;
                 } else {
@@ -370,7 +368,7 @@ private void refactorGuestThreads(int id, StaticObject self) {
         for (int i = 1; i < oldThreads.length; i++) {
             if (oldThreads[i] != null) {
                 StaticObject guestThread = (StaticObject) oldThreads[i];
-                if (Target_java_lang_Thread.isAlive(guestThread)) {
+                if (getThreadAccess().isAlive(guestThread)) {
                     Thread hostThread = getThreadAccess().getHost(guestThread);
                     int hostID = (int) hostThread.getId();
                     if (hostID < minID) {
@@ -409,11 +407,4 @@ private void refactorGuestThreads(int id, StaticObject self) {
     private static int getThreadIndex(int id, Object[] threads) {
         return id - (int) threads[0];
     }
-
-    public void interruptThread(StaticObject guestThread) {
-        assert guestThread != null && getMeta().java_lang_Thread.isAssignableFrom(guestThread.getKlass());
-        Method interruptMethod = guestThread.getKlass().vtableLookup(getMeta().java_lang_Thread_interrupt.getVTableIndex());
-        assert interruptMethod != null;
-        interruptMethod.invokeDirect(guestThread);
-    }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
index e0a0fcc491ed..4dd766925ead 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/KillStatus.java
@@ -33,17 +33,11 @@ public enum KillStatus {
      */
     STOP,
     /**
-     * Was killed, but we are in context closing. If the thread is alive for a while in that state,
-     * it will be considered uncooperative.
-     */
-    KILLED,
-    /**
-     * Was killed, and is calling Thread.exit(). Ignore further kill signals.
+     * Thread is terminated, and is calling Thread.exit(). Ignore further stop signals.
      */
     EXITING,
     /**
-     * Thread is uncooperative: needs to be killed with a host exception. Very dangerous state to be
-     * in.
+     * Thread is uncooperative: needs to be killed with a host exception. Unrecoverable state.
      */
     KILL
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
index 4d89a4b15783..cf132c5e3494 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/SuspendLock.java
@@ -25,38 +25,64 @@
 
 import com.oracle.truffle.espresso.runtime.StaticObject;
 
-public class SuspendLock {
-    private Object handshakeLock = new Object() {
+public final class SuspendLock {
+    private final Object handshakeLock = new Object() {
     };
+    private final ThreadsAccess access;
+    private final StaticObject thread;
 
     private volatile boolean shouldSuspend;
     private volatile boolean threadSuspended;
 
-    public boolean shouldSuspend() {
-        return shouldSuspend;
-    }
-
-    public boolean isSuspended() {
-        return threadSuspended;
+    public SuspendLock(ThreadsAccess access, StaticObject thread) {
+        this.access = access;
+        this.thread = thread;
     }
 
-    public void suspend(ThreadsAccess threads, StaticObject thread) {
-        if (threads.getHost(thread) == Thread.currentThread()) {
+    public void suspend() {
+        if (access.getHost(thread) == Thread.currentThread()) {
             // No need for handshake
             shouldSuspend = true;
             selfSuspend();
         } else {
-            suspendHandshake(threads, thread);
+            suspendHandshake();
+        }
+    }
+
+    public synchronized void selfSuspend() {
+        while (shouldSuspend()) {
+            notifySuspended();
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                /* spin back */
+            }
+        }
+        threadSuspended = false;
+    }
+
+    public synchronized void resume() {
+        if (shouldSuspend()) {
+            shouldSuspend = false;
+            notifyAll();
         }
     }
 
-    private void suspendHandshake(ThreadsAccess threads, StaticObject thread) {
+    private boolean shouldSuspend() {
+        return shouldSuspend;
+    }
+
+    private boolean isSuspended() {
+        return threadSuspended;
+    }
+
+    private void suspendHandshake() {
         boolean wasInterrupted = false;
         while (!isSuspended()) {
             shouldSuspend = true;
             try {
                 synchronized (handshakeLock) {
-                    if (!threads.isAlive(thread)) {
+                    if (!access.isAlive(thread)) {
                         // If thread terminates, we don't want to wait forever
                         handshakeLock.wait(100);
                     } else {
@@ -69,20 +95,9 @@ private void suspendHandshake(ThreadsAccess threads, StaticObject thread) {
             }
         }
         if (wasInterrupted) {
-            threads.getContext().interruptThread(threads.getContext().getCurrentThread());
-        }
-    }
-
-    public synchronized void selfSuspend() {
-        while (shouldSuspend()) {
-            notifySuspended();
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                /* spin back */
-            }
+            // Re-interrupt ourselves
+            Thread.currentThread().interrupt();
         }
-        threadSuspended = false;
     }
 
     private void notifySuspended() {
@@ -91,11 +106,4 @@ private void notifySuspended() {
             handshakeLock.notifyAll();
         }
     }
-
-    public synchronized void resume() {
-        if (shouldSuspend()) {
-            shouldSuspend = false;
-            notifyAll();
-        }
-    }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
index a9c8e7b2b388..ad36f951cd5c 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
@@ -25,13 +25,13 @@
 
 import static com.oracle.truffle.espresso.threads.KillStatus.EXITING;
 import static com.oracle.truffle.espresso.threads.KillStatus.KILL;
-import static com.oracle.truffle.espresso.threads.KillStatus.KILLED;
 import static com.oracle.truffle.espresso.threads.KillStatus.NORMAL;
 import static com.oracle.truffle.espresso.threads.KillStatus.STOP;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.espresso.impl.ContextAccess;
+import com.oracle.truffle.espresso.impl.Method;
 import com.oracle.truffle.espresso.meta.EspressoError;
 import com.oracle.truffle.espresso.meta.Meta;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
@@ -39,11 +39,24 @@
 import com.oracle.truffle.espresso.runtime.EspressoExitException;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 
+/**
+ * Provides bridges to guest world thread implementation.
+ */
 public final class ThreadsAccess implements ContextAccess {
 
     private final Meta meta;
     private final EspressoContext context;
 
+    public ThreadsAccess(Meta meta) {
+        this.meta = meta;
+        this.context = meta.getContext();
+    }
+
+    @Override
+    public EspressoContext getContext() {
+        return context;
+    }
+
     public String getThreadName(StaticObject thread) {
         if (thread == null) {
             return "<unknown>";
@@ -60,15 +73,15 @@ public long getThreadId(StaticObject thread) {
         }
     }
 
-    @Override
-    public EspressoContext getContext() {
-        return context;
+    /**
+     * Returns the host thread associated with this guest thread, or null if the guest thread has
+     * not yet been registered.
+     */
+    public Thread getHost(StaticObject guest) {
+        return (Thread) meta.HIDDEN_HOST_THREAD.getHiddenObject(guest);
     }
 
-    public ThreadsAccess(Meta meta) {
-        this.meta = meta;
-        this.context = meta.getContext();
-    }
+    // region thread state transition
 
     public void fromRunnable(StaticObject self, State state) {
         assert meta.java_lang_Thread_threadStatus.getInt(self) == State.RUNNABLE.value;
@@ -88,13 +101,13 @@ private void setState(StaticObject self, State state) {
         meta.java_lang_Thread_threadStatus.setInt(self, state.value);
     }
 
-    public Thread getHost(StaticObject guest) {
-        return (Thread) meta.HIDDEN_HOST_THREAD.getHiddenObject(guest);
-    }
+    // endregion thread state transition
+
+    // region thread control
 
     /**
-     * Implements support for thread deprecated methods ({@link Thread#stop()},
-     * {@link Thread#suspend()}, {@link Thread#resume()}).
+     * Implements support for thread deprecated methods ({@code Thread#stop()},
+     * {@code Thread#suspend()}, {@code Thread#resume()}).
      * <p>
      * The following performance concerns are to be considered:
      * <ul>
@@ -106,6 +119,7 @@ public Thread getHost(StaticObject guest) {
      * </ul>
      */
     public void checkDeprecation() {
+        // TODO: safepoints
         if (!context.shouldCheckDeprecationStatus()) {
             return;
         }
@@ -122,6 +136,20 @@ public void checkDeprecation() {
         }
     }
 
+    /**
+     * Lookups and calls the guest Thread.interrupt() method.
+     */
+    public void interruptThread(StaticObject guestThread) {
+        assert guestThread != null && getMeta().java_lang_Thread.isAssignableFrom(guestThread.getKlass());
+        // Thread.interrupt is non-final.
+        Method interruptMethod = guestThread.getKlass().vtableLookup(getMeta().java_lang_Thread_interrupt.getVTableIndex());
+        assert interruptMethod != null;
+        interruptMethod.invokeDirect(guestThread);
+    }
+
+    /**
+     * Implementation of {@link Thread#isInterrupted()}.
+     */
     public boolean isInterrupted(StaticObject guest, boolean clear) {
         boolean isInterrupted = meta.HIDDEN_INTERRUPTED.getBoolean(guest, true);
         if (clear) {
@@ -135,8 +163,12 @@ public boolean isInterrupted(StaticObject guest, boolean clear) {
         return isInterrupted;
     }
 
+    /**
+     * Implementation of {@link Thread#interrupt()}.
+     */
     public void interrupt(StaticObject guest) {
         if (context.getJavaVersion().java13OrEarlier()) {
+            // In JDK 13+, the interrupted status is set in java code.
             meta.HIDDEN_INTERRUPTED.setBoolean(guest, true, true);
         }
         Thread host = getHost(guest);
@@ -145,23 +177,40 @@ public void interrupt(StaticObject guest) {
         }
     }
 
-    public void clearInterruptStatus() {
-        StaticObject guest = context.getCurrentThread();
-        if (context.getJavaVersion().java13OrEarlier()) {
-            clearInterruptStatus(guest);
-        }
+    /**
+     * Implementation of {@code Thread.clearInterruptEvent} (JDK 13+)
+     */
+    public void clearInterruptEvent() {
+        assert !context.getJavaVersion().java13OrEarlier();
         Thread.interrupted();
     }
 
+    /**
+     * Sets the interrupted field of the given thread to {@code false}
+     */
+    public void clearInterruptStatus(StaticObject guest) {
+        meta.HIDDEN_INTERRUPTED.setBoolean(guest, false, true);
+    }
+
+    /**
+     * Implementation of {@link Thread#isAlive()}.
+     */
     public boolean isAlive(StaticObject guest) {
         int state = meta.java_lang_Thread_threadStatus.getInt(guest);
         return state != State.NEW.value && state != State.TERMINATED.value;
     }
 
+    // endregion thread control
+
+    // region deprecated methods support
+
     /**
      * Suspends a thread. On return, guarantees that the given thread has seen the suspend request.
      */
     public void suspend(StaticObject guest) {
+        if (!isAlive(guest)) {
+            return;
+        }
         DeprecationSupport support = getDeprecationSupport(guest, true);
         assert support != null;
         support.suspend(this);
@@ -205,17 +254,19 @@ public void kill(StaticObject guest) {
      */
     public Thread createJavaThread(StaticObject guest, DirectCallNode exit, DirectCallNode dispatch) {
         Thread host = context.getEnv().createThread(new GuestRunnable(context, guest, exit, dispatch));
-        // Prepare
+        // Link guest to host
         meta.HIDDEN_HOST_THREAD.setHiddenObject(guest, host);
+        // Prepare host thread
         host.setDaemon(meta.java_lang_Thread_daemon.getBoolean(guest));
         meta.java_lang_Thread_threadStatus.setInt(guest, State.RUNNABLE.value);
         host.setPriority(meta.java_lang_Thread_priority.getInt(guest));
         if (isInterrupted(guest, false)) {
             host.interrupt();
         }
-        context.registerThread(host, guest);
         String guestName = context.getThreadAccess().getThreadName(guest);
         host.setName(guestName);
+        // Make the thread known to the context
+        context.registerThread(host, guest);
         return host;
     }
 
@@ -224,8 +275,8 @@ public Thread createJavaThread(StaticObject guest, DirectCallNode exit, DirectCa
      * <ul>
      * <li>Prevent other threads from {@linkplain #stop(StaticObject, StaticObject)} stopping} the
      * given thread</li>
-     * <li>Invoke guest {@link Thread#exit()}</li>
-     * <li>Sets the status of this thread to {@link State.TERMINATED} and notifies other threads
+     * <li>Invoke guest {@code Thread.exit()}</li>
+     * <li>Sets the status of this thread to {@link State#TERMINATED} and notifies other threads
      * waiting on this thread's monitor</li>
      * <li>Unregisters the thread</li>
      * </ul>
@@ -234,7 +285,7 @@ public void terminate(StaticObject thread) {
         terminate(thread, null);
     }
 
-    public void terminate(StaticObject thread, DirectCallNode exit) {
+    void terminate(StaticObject thread, DirectCallNode exit) {
         DeprecationSupport support = getDeprecationSupport(thread, true);
         support.exit();
         try {
@@ -246,11 +297,25 @@ public void terminate(StaticObject thread, DirectCallNode exit) {
         } catch (EspressoException | EspressoExitException e) {
             // just drop it
         }
-        terminateAndNotify(thread);
+        setTerminateStatusAndNotify(thread);
         context.unregisterThread(thread);
     }
 
-    public void terminateAndNotify(StaticObject guest) {
+    /**
+     * returns true if this thread has been stopped before starting, or if the context is in
+     * closing.
+     * <p>
+     * If this method returns true, the thread will have been terminated.
+     */
+    public boolean terminateIfStillborn(StaticObject guest) {
+        if (isStillborn(guest)) {
+            setTerminateStatusAndNotify(guest);
+            return true;
+        }
+        return false;
+    }
+
+    private void setTerminateStatusAndNotify(StaticObject guest) {
         guest.getLock().lock();
         try {
             meta.java_lang_Thread_threadStatus.setInt(guest, State.TERMINATED.value);
@@ -261,23 +326,21 @@ public void terminateAndNotify(StaticObject guest) {
         }
     }
 
-    /**
-     * returns true if this thread has been stopped before starting, or if the context is in
-     * closing.
-     */
-    public boolean isStillborn(StaticObject guest) {
+    private boolean isStillborn(StaticObject guest) {
         if (context.isClosing()) {
             return true;
         }
-        DeprecationSupport support = getDeprecationSupport(guest, false);
-        if (support != null) {
-            return support.status != NORMAL;
+        /*
+         * A bit of a special case. We want to make sure we observe the stillborn status
+         * synchronously.
+         */
+        synchronized (guest) {
+            DeprecationSupport support = (DeprecationSupport) meta.HIDDEN_DEPRECATION_SUPPORT.getHiddenObject(guest, true);
+            if (support != null) {
+                return support.status != NORMAL;
+            }
+            return false;
         }
-        return false;
-    }
-
-    public void clearInterruptStatus(StaticObject guest) {
-        meta.HIDDEN_INTERRUPTED.setBoolean(guest, false, true);
     }
 
     private DeprecationSupport getDeprecationSupport(StaticObject guest, boolean initIfNull) {
@@ -314,11 +377,11 @@ void suspend(ThreadsAccess threads) {
             SuspendLock lock = this.suspendLock;
             if (lock == null) {
                 synchronized (this) {
-                    lock = new SuspendLock();
+                    lock = new SuspendLock(threads, thread);
                     this.suspendLock = lock;
                 }
             }
-            lock.suspend(threads, thread);
+            lock.suspend();
         }
 
         void resume() {
@@ -329,18 +392,26 @@ void resume() {
             lock.resume();
         }
 
-        void stop(StaticObject death) {
-            // Writing the throwable must be done before the kill status can be observed
-            throwable = death;
-            status = STOP;
+        synchronized void stop(StaticObject death) {
+            KillStatus s = status;
+            if (s == NORMAL || s == STOP) {
+                // Writing the throwable must be done before the kill status can be observed
+                throwable = death;
+                updateKillState(STOP);
+            }
         }
 
-        void kill() {
-            status = KILL;
+        synchronized void kill() {
+            updateKillState(KILL);
         }
 
-        void exit() {
-            status = EXITING;
+        synchronized void exit() {
+            updateKillState(EXITING);
+        }
+
+        private void updateKillState(KillStatus state) {
+            assert Thread.holdsLock(this);
+            status = state;
         }
 
         @TruffleBoundary
@@ -357,18 +428,21 @@ void handleStop(Meta meta) {
             switch (status) {
                 case NORMAL:
                 case EXITING:
-                case KILLED:
-                    break;
+                    return;
                 case STOP:
-                    if (meta.getContext().isClosing()) {
-                        // Give some leeway during closing.
-                        status = KILLED;
-                    } else {
-                        status = NORMAL;
+                    synchronized (this) {
+                        // synchronize to mqke sure we are still stopped.
+                        KillStatus s = status;
+                        if (s == STOP) {
+                            updateKillState(NORMAL);
+                            // check if death cause throwable is set, if not throw ThreadDeath
+                            StaticObject deathThrowable = throwable;
+                            throw deathThrowable != null ? meta.throwException(deathThrowable) : meta.throwException(meta.java_lang_ThreadDeath);
+                        } else if (s != KILL) {
+                            return;
+                        }
                     }
-                    // check if death cause throwable is set, if not throw ThreadDeath
-                    StaticObject deathThrowable = throwable;
-                    throw deathThrowable != null ? meta.throwException(deathThrowable) : meta.throwException(meta.java_lang_ThreadDeath);
+                    // fallthrough
                 case KILL:
                     // This thread refuses to stop. Send a host exception.
                     assert meta.getContext().isClosing();
@@ -376,4 +450,6 @@ void handleStop(Meta meta) {
             }
         }
     }
+
+    // region deprecated methods support
 }

From 5596267356fdb99928364d27f9f641d322365680 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 18:34:20 +0300
Subject: [PATCH 333/681] Add Alpine Linux to certified platforms list

---
 docs/enterprise-overview/architecture-overview.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index b2e5b935e791..8924085116d4 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -70,9 +70,12 @@ The following are the certified platforms for GraalVM Enterprise 21:
 |------------------------------------	|--------------	|--------------	|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------	|
 | Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
 | Red Hat Enterprise Linux(RHEL) 	| 7, 8 	| x86 64-bit 	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
+| Alpine Linux  | 7, 8  | x86 64-bit | [Static Native Images](../reference-manual/native-image/StaticImages.md) |
 | macOS 	| 10.14 (Mojave), 10.15 (Catalina)	| x86 64-bit 	| [Installation Guide for macOS](/getting-started/installation-macos/) 	|
 | Microsoft Windows 	| Server 2016, 2019	| x86 64-bit 	| [Installation Guide for Windows](/getting-started/installation-windows/) 	|
 
+> Note: Alpine Linux is only certified for running executables created with GraalVM Native Image and statically linked to `muslc`.
+
 ## Distribution Components List
 
 GraalVM Enterprise consists of core and additional functionalities.

From 5fa726229e32037b0aa99dcefe4211d006034bc5 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Wed, 6 Oct 2021 17:00:36 +0100
Subject: [PATCH 334/681] Convert to using keys instead of names..

---
 .../tools/profiler/impl/SVGSamplerOutput.java | 160 ++++++++++--------
 .../profiler/impl/resources/flamegraph.js     |   5 +-
 .../profiler/impl/resources/graphowner.js     |  13 +-
 .../profiler/impl/resources/histogram.js      |  17 +-
 4 files changed, 109 insertions(+), 86 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index 9e6252a6b552..a835ae92bb5a 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -216,14 +216,18 @@ private static class GraphOwner implements SVGComponent {
         private ArrayList<SVGComponent> components;
         private Random random = new Random();
         private Map<GraphColorMap, String> languageColors;
-        private Map<GraphColorMap, Map<String, String>> colorsForNames = new HashMap<>();
+        private Map<GraphColorMap, Map<SampleKey, String>> colorsForKeys = new HashMap<>();
         private int sampleId;
         public final Map<String, Integer> nameHash = new HashMap<>();
         public final Map<String, Integer> sourceHash = new HashMap<>();
+        public final Map<SampleKey, Integer> keyHash = new HashMap<>();
+        public final ArrayList<SampleKey> sampleKeys = new ArrayList<>();
         public int nameCounter = 0;
         public int sourceCounter = 0;
+        public int keyCounter = 0;
         public final JSONArray sampleNames = new JSONArray();
         public final JSONArray sourceNames = new JSONArray();
+        public final JSONArray sampleJsonKeys = new JSONArray();
         public final JSONArray sampleData = new JSONArray();
 
         GraphOwner(StringBuilder output, Map<TruffleContext, CPUSamplerData> data) {
@@ -314,13 +318,7 @@ private void buildSampleData() {
             ArrayDeque<Task> tasks = new ArrayDeque<>();
             JSONObject root = new JSONObject();
             sampleData.put(root);
-            root.put("n", nameCounter);
-            root.put("f", sourceCounter);
-            root.put("fl", 0);
-            nameHash.put("<top>", nameCounter++);
-            sampleNames.put("<top>");
-            sourceHash.put("<none>", sourceCounter++);
-            sourceNames.put("<none>");
+            root.put("k", indexForSampleKey("Thread: <top>", "<none>", 0));
             root.put("id", sampleId++);
             root.put("i", 0);
             root.put("c", 0);
@@ -388,6 +386,48 @@ public boolean equals(Object obj) {
             }
         }
 
+        private int indexForSampleKey(String name, SourceSection section) {
+            final String sourceName;
+            int sourceLine = 0;
+            if (section != null && section.isAvailable()) {
+                sourceLine = section.getStartLine();
+                Source source = section.getSource();
+                if (source != null) {
+                    String path = source.getPath();
+                    if (path != null) {
+                        sourceName = path;
+                    } else {
+                        sourceName = source.getName();
+                    }
+                } else {
+                    sourceName = "<none>";
+                }
+            } else {
+                sourceName = "<none>";
+            }
+            return indexForSampleKey(name, sourceName, sourceLine);
+        }
+
+        private int indexForSampleKey(String name, String sourceFile, int line) {
+            int nameId = nameHash.computeIfAbsent(name, k -> {
+                    sampleNames.put(k);
+                    return nameCounter++;
+                });
+            int sourceId = sourceHash.computeIfAbsent(sourceFile, k -> {
+                    sourceNames.put(k);
+                    return sourceCounter++;
+                });
+            return keyHash.computeIfAbsent(new SampleKey(nameId, sourceId, line), k -> {
+                    sampleKeys.add(k);
+                    JSONArray jsonKey = new JSONArray();
+                    jsonKey.put(k.nameId);
+                    jsonKey.put(k.sourceId);
+                    jsonKey.put(k.sourceLine);
+                    sampleJsonKeys.put(jsonKey);
+                    return keyCounter++;
+                });
+        }
+
         private HashMap<Integer, HashMap<SampleKey, JSONObject>> recursiveChildMap = new HashMap<>();
 
         private HashMap<SampleKey, JSONObject> childrenByKeyForSample(JSONObject sample) {
@@ -438,11 +478,11 @@ private void calculateRecursiveData(JSONObject sample) {
                 } else {
                     owner = parent;
                 }
-                if (parent.getInt("n") == sample.getInt("n")) {
+                if (parent.getInt("k") == sample.getInt("k")) {
                     mergeCounts(owner, sample, true);
                 } else {
                     HashMap<SampleKey, JSONObject> siblings = childrenByKeyForSample(owner);
-                    SampleKey key = new SampleKey(sample.getInt("n"), sample.getInt("f"), sample.getInt("fl"));
+                    SampleKey key = sampleKeys.get(sample.getInt("k"));
                     if (siblings.containsKey(key)) {
                         JSONObject sibling = siblings.get(key);
                         mergeCounts(sibling, sample, false);
@@ -495,15 +535,7 @@ private long threadSampleData(Thread thread, Collection<ProfilerNode<CPUSampler.
             JSONObject threadSample = new JSONObject();
             long totalSamples = x;
             int id = sampleId++;
-            threadSample.put("n", nameHash.computeIfAbsent(thread.getName(), k -> {
-                sampleNames.put(thread.getName());
-                return nameCounter++;
-            }));
-            threadSample.put("f", sourceHash.computeIfAbsent("<none>", k -> {
-                sourceNames.put("<none>");
-                return sourceCounter++;
-            }));
-            threadSample.put("fl", 0);
+            threadSample.put("k", indexForSampleKey(thread.getName(), "<none>", 0));
             threadSample.put("id", id);
             threadSample.put("p", 0);
             sampleData.put(threadSample);
@@ -535,6 +567,9 @@ private String samples() {
             result.append("var sourceNames = ");
             result.append(sourceNames.toString());
             result.append(";\n");
+            result.append("var sampleKeys = ");
+            result.append(sampleJsonKeys.toString());
+            result.append(";\n");
             result.append("var profileData = ");
             result.append(sampleData.toString());
             result.append(";\n");
@@ -542,10 +577,10 @@ private String samples() {
             result.append("var colorData = ");
             JSONArray colors = new JSONArray();
             for (GraphColorMap cm : GraphColorMap.values()) {
-                if (colorsForNames.containsKey(cm)) {
+                if (colorsForKeys.containsKey(cm)) {
                     JSONObject map = new JSONObject();
-                    for (Map.Entry<String, String> e : colorsForNames.get(cm).entrySet()) {
-                        map.put(nameHash.get(e.getKey()).toString(), e.getValue());
+                    for (Map.Entry<SampleKey, String> e : colorsForKeys.get(cm).entrySet()) {
+                        map.put(keyHash.get(e.getKey()).toString(), e.getValue());
                     }
                     colors.put(map);
                 } else {
@@ -572,35 +607,7 @@ private String samples() {
 
         private void processSample(Task task, ArrayDeque<Task> tasks) {
             JSONObject result = new JSONObject();
-            final int nameId = nameHash.computeIfAbsent(task.sample.getRootName(), k -> {
-                sampleNames.put(task.sample.getRootName());
-                return nameCounter++;
-            });
-            result.put("n", nameId);
-            final String sourceName;
-            int sourceLine = 0;
-            SourceSection section = task.sample.getSourceSection();
-            if (section != null && section.isAvailable()) {
-                sourceLine = section.getStartLine();
-                Source source = section.getSource();
-                if (source != null) {
-                    String path = source.getPath();
-                    if (path != null) {
-                        sourceName = path;
-                    } else {
-                        sourceName = source.getName();
-                    }
-                } else {
-                    sourceName = "<none>";
-                }
-            } else {
-                sourceName = "<none>";
-            }
-            result.put("f", sourceHash.computeIfAbsent(sourceName, k -> {
-                sourceNames.put(k);
-                return sourceCounter++;
-            }));
-            result.put("fl", sourceLine);
+            result.put("k", indexForSampleKey(task.sample.getRootName(), task.sample.getSourceSection()));
             int id = sampleId++;
             result.put("id", id);
             result.put("p", task.parent);
@@ -632,6 +639,11 @@ protected JSONObject sampleDataForId(int id) {
             return (JSONObject) sampleData.get(id);
         }
 
+        protected String nameForKeyId(int keyId) {
+            SampleKey key = sampleKeys.get(keyId);
+            return sampleNames.getString(key.nameId);
+        }
+
         private void buildColorData() {
             for (Object sample : sampleData) {
                 buildColorDataForSample((JSONObject) sample);
@@ -639,8 +651,8 @@ private void buildColorData() {
         }
 
         private void buildColorDataForSample(JSONObject sample) {
-            colorForName(sample.getInt("n"), GraphColorMap.FLAME);
-            colorForName(sample.getInt("n"), GraphColorMap.values()[sample.getInt("l")]);
+            colorForKey(sample.getInt("k"), GraphColorMap.FLAME);
+            colorForKey(sample.getInt("k"), GraphColorMap.values()[sample.getInt("l")]);
         }
 
         public String initFunction(String argName) {
@@ -706,21 +718,21 @@ public String drawCanvas(double x, double y) {
             return canvas.toString();
         }
 
-        public Map<String, String> colorsForType(GraphColorMap type) {
-            if (colorsForNames.containsKey(type)) {
-                return colorsForNames.get(type);
+        public Map<SampleKey, String> colorsForType(GraphColorMap type) {
+            if (colorsForKeys.containsKey(type)) {
+                return colorsForKeys.get(type);
             } else {
-                Map<String, String> colors = new HashMap<>();
-                colorsForNames.put(type, colors);
+                Map<SampleKey, String> colors = new HashMap<>();
+                colorsForKeys.put(type, colors);
                 return colors;
             }
         }
 
-        public String colorForName(int nameId, GraphColorMap type) {
-            String name = sampleNames.getString(nameId);
-            Map<String, String> colors = colorsForType(type);
-            if (colors.containsKey(name)) {
-                return colors.get(name);
+        public String colorForKey(int keyId, GraphColorMap type) {
+            SampleKey key = sampleKeys.get(keyId);
+            Map<SampleKey, String> colors = colorsForType(type);
+            if (colors.containsKey(key)) {
+                return colors.get(key);
             }
 
             double v1;
@@ -780,7 +792,7 @@ public String colorForName(int nameId, GraphColorMap type) {
                     b = r;
             }
             String color = allocateColor(r, g, b);
-            colors.put(name, color);
+            colors.put(key, color);
             return color;
         }
 
@@ -1004,7 +1016,8 @@ private String drawSample(double baseY, DrawTask task, ArrayDeque<DrawTask> task
             }
             HashMap<String, String> groupAttrs = new HashMap<>();
             int id = sample.getInt("id");
-            String fullText = owner.sampleNames.getString(sample.getInt("n"));
+            String fullText = owner.nameForKeyId(sample.getInt("k"));
+            GraphOwner.SampleKey key = owner.sampleKeys.get(sample.getInt("k"));
 
             groupAttrs.put("class", "func_g");
             groupAttrs.put("onclick", id == 0 ? "unzoom()" : "zoom(this)");
@@ -1021,13 +1034,13 @@ private String drawSample(double baseY, DrawTask task, ArrayDeque<DrawTask> task
             double totalPercent = 100.0 * total / sampleCount;
             title.append(String.format("Self samples: %d (%.2f%%)\n", interpreted + compiled, percent));
             title.append(String.format("total samples:  %d (%.2f%%)\n", total, totalPercent));
-            title.append(String.format("Source location: %s:%d\n", owner.sourceNames.get(sample.getInt("f")), sample.getInt("fl")));
+            title.append(String.format("Source location: %s:%d\n", owner.sourceNames.get(key.sourceId), key.sourceLine));
             groupAttrs.put("title", escape(title.toString()));
             output.append(startGroup(groupAttrs));
 
             HashMap<String, String> rectAttrs = new HashMap<>();
 
-            output.append(fillRectangle(x, y, width, FRAMEHEIGHT, owner.colorForName(sample.getInt("n"), GraphColorMap.FLAME), "rx=\"2\" ry=\"2\"", rectAttrs));
+            output.append(fillRectangle(x, y, width, FRAMEHEIGHT, owner.colorForKey(sample.getInt("k"), GraphColorMap.FLAME), "rx=\"2\" ry=\"2\"", rectAttrs));
 
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), x + 3, y - 5 + FRAMEHEIGHT, owner.abbreviate(fullText, width), null, ""));
             output.append(endGroup(groupAttrs));
@@ -1097,7 +1110,7 @@ private static class SVGHistogram implements SVGComponent {
         }
 
         private List<JSONObject> buildHistogram(JSONObject sample) {
-            Map<String, JSONObject> bars = new HashMap<>();
+            Map<GraphOwner.SampleKey, JSONObject> bars = new HashMap<>();
             ArrayDeque<JSONObject> samples = new ArrayDeque<>();
 
             JSONObject next = sample;
@@ -1111,15 +1124,15 @@ private List<JSONObject> buildHistogram(JSONObject sample) {
             return lines;
         }
 
-        private void buildHistogram(JSONObject sample, ArrayDeque<JSONObject> samples, Map<String, JSONObject> bars) {
-            JSONObject bar = bars.computeIfAbsent(owner.sampleNames.getString(sample.getInt("n")),
+        private void buildHistogram(JSONObject sample, ArrayDeque<JSONObject> samples, Map<GraphOwner.SampleKey, JSONObject> bars) {
+            JSONObject bar = bars.computeIfAbsent(owner.sampleKeys.get(sample.getInt("k")),
                             k -> {
                                 JSONObject entry = new JSONObject();
                                 entry.put("id", sample.getInt("id"));
                                 entry.put("i", 0);
                                 entry.put("c", 0);
                                 entry.put("l", sample.getInt("l"));
-                                entry.put("n", sample.getInt("n"));
+                                entry.put("k", sample.getInt("k"));
                                 return entry;
                             });
             bar.put("i", bar.getInt("i") + sample.getInt("i"));
@@ -1181,8 +1194,7 @@ public String drawCanvas(double x, double y) {
         }
 
         private String drawElement(JSONObject bar, int position) {
-            int nameId = owner.sampleDataForId(bar.getInt("id")).getInt("n");
-            String name = owner.sampleNames.getString(nameId);
+            String name = owner.nameForKeyId(bar.getInt("k"));
             long selfTime = bar.getInt("c") + bar.getInt("i");
             double width = widthPerTime * selfTime;
 
@@ -1212,7 +1224,7 @@ private String drawElement(JSONObject bar, int position) {
 
             HashMap<String, String> rectAttrs = new HashMap<>();
 
-            output.append(fillRectangle(x1, y1, width, FRAMEHEIGHT, owner.colorForName(nameId, GraphColorMap.FLAME), "rx=\"2\" ry=\"2\"", rectAttrs));
+            output.append(fillRectangle(x1, y1, width, FRAMEHEIGHT, owner.colorForKey(bar.getInt("k"), GraphColorMap.FLAME), "rx=\"2\" ry=\"2\"", rectAttrs));
             double afterWidth = IMAGEWIDTH - width - XPAD * 2;
             int textLength = (int) (width / (owner.fontSize() / owner.fontWidth()));
             int afterLength = (int) (afterWidth / (owner.fontSize() / owner.fontWidth()));
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index ee2a2647e14d..83b4d758ff72 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -181,6 +181,7 @@ function zoom_child(sample) {
     let t = e.lastElementChild;
     let name = name_for_sample(sample);
     let source = source_for_sample(sample);
+    let sourceLine = source_line_for_sample(sample);
 
     let compiled = 0;
     let interpreted = 0;
@@ -198,7 +199,7 @@ function zoom_child(sample) {
     title.textContent = name + " (" + languageNames[sample.l] + ")\n" +
         "Self samples: " + (interpreted + compiled) + " (" + (100 * (compiled + interpreted) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
         "Total samples: " + (hits) + " (" + (100 * (hits) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
-        "Source location: " + source + ":" + sample.fl + "\n";
+        "Source location: " + source + ":" + sourceLine + "\n";
 
     r.x.baseVal.value = x;
     r.y.baseVal.value = y;
@@ -296,7 +297,7 @@ function zoom_internal(sample, parents, unrelated) {
         zoom_child(c.value);
         c = iter.next();
     }
-    fg_search_update();
+    fg_search_update(search_matches);
     fg_canvas_resize();
     rebuild_histogram(sample);
 }
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index f9389854b638..77d919e35e3c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -259,15 +259,22 @@ function title(e) {
 }
 
 function key_for_sample(sample) {
-    return sample.n;
+    return sample.k;
 }
 
 function name_for_sample(sample) {
-    return profileNames[sample.n];
+    let key = sampleKeys[sample.k];
+    return profileNames[key[0]];
 }
 
 function source_for_sample(sample) {
-    return sourceNames[sample.f];
+    let key = sampleKeys[sample.k];
+    return sourceNames[key[1]];
+}
+
+function source_line_for_sample(sample) {
+    let key = sampleKeys[sample.k];
+    return sourceNames[key[2]];
 }
 
 function function_name(e) {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index b10e35847560..46e49b6d8cec 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -162,10 +162,13 @@ function h_update_bar(id, bar) {
         let t = e.lastElementChild;
 
         let name = name_for_sample(bar);
+        let source = source_for_sample(bar);
+        let sourceLine = source_line_for_sample(bar);
+        let hits = bar.i + bar.c;
 
-        title.textContent = "Function: " + name + "\n" +
-            (bar.c + bar.i) + " samples (" + bar.i + " interpreted, " + bar.c + " compiled).\n" +
-            (100 * (bar.c + bar.i) / (fg_xmax - fg_xmin)).toFixed(2) + "% of displayed samples.\n";
+        title.textContent = name + " (" + languageNames[bar.l] + ")\n" +
+            "Samples: " + (hits) + " (" + (100 * (hits) / (fg_xmax - fg_xmin)).toFixed(2) + "%)\n" +
+            "Source location: " + source + ":" + sourceLine + "\n";
 
         r.width.baseVal.value = width;
         r.style.fill = h_color_for_sample(color_type, bar);
@@ -238,16 +241,16 @@ function h_canvas_resize() {
 
 function calculate_histogram_bars(bars, sample) {
     let bar;
-    if (!bars.hasOwnProperty(sample["n"])) {
+    if (!bars.hasOwnProperty(sample.k)) {
         bar = [];
         bar["id"] = sample["id"];
         bar["i"] = 0;
         bar["c"] = 0;
         bar["l"] = sample["l"];
-        bar["n"] = sample["n"];
-        bars[sample["n"]] = bar;
+        bar["k"] = sample["k"];
+        bars[sample.k] = bar;
     } else {
-        bar = bars[sample["n"]];
+        bar = bars[sample.k];
     }
     if (fg_collapsed) {
         bar["i"] = bar["i"] + sample["ri"];

From 3e3fb2fc06aae9a6c09d2801401c470e344da3ca Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Thu, 7 Oct 2021 16:48:22 +0100
Subject: [PATCH 335/681] Update histogram highlighting code to be based on
 keys, not names.

---
 .../profiler/impl/resources/flamegraph.js     | 26 +++---
 .../profiler/impl/resources/graphowner.js     |  2 +-
 .../profiler/impl/resources/histogram.js      | 81 ++++++++++++-------
 3 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 83b4d758ff72..354a0b39f020 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -318,35 +318,39 @@ function unzoom() {
 function fg_search(term) {
     var re = new RegExp(term);
 
-    search_matches = []
+    let search_matches = []
 
     let iter = sample_and_children_depth_first(profileData[0]);
     let c = iter.next();
     while (!c.done) {
         let sample = c.value;
         if (name_for_sample(sample).match(re)) {
-            sample.searchMatch = true;
-            search_matches.push(sample);
-            let e = fg_element_for_sample(sample);
-            if (e != null) {
-                let r = e.children[1];
-                r.style.fill = searchColor;
-            }
+            fg_highlight_sample(search_matches, sample);
         }
         c = iter.next();
     }
 
+    fg_search_update(search_matches);
+
     if (search_matches.length == 0)
         return;
 
     searchbtn.style["opacity"] = "0.8";
     searchbtn.firstChild.nodeValue = "Reset Search"
+}
 
-    fg_search_update();
+function fg_highlight_sample(samples, sample) {
+    sample.searchMatch = true;
+    samples.push(sample);
+    let e = fg_element_for_sample(sample);
+    if (e != null) {
+        let r = e.children[1];
+        r.style.fill = searchColor;
+    }
 }
 
-function fg_search_update() {
-    let samples = search_matches.slice();
+function fg_search_update(samples) {
+    search_matches = samples.slice();
 
     if (samples.length == 0) {
         matchedtxt.style["opacity"] = "0.0";
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 77d919e35e3c..2bf3e53360c5 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -274,7 +274,7 @@ function source_for_sample(sample) {
 
 function source_line_for_sample(sample) {
     let key = sampleKeys[sample.k];
-    return sourceNames[key[2]];
+    return key[2];
 }
 
 function function_name(e) {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index 46e49b6d8cec..82791c079625 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -43,55 +43,80 @@ function h_search(term) {
 
 function h_update_search() {
     let re = h_search_regex;
-    if (re == null) {
-        return;
-    }
-    for (let i = 0; i < histogramData.length; i++) {
-        let bar = histogramData[i];
-        if (name_for_sample(bar).match(re)) {
-            bar.searchMatch = true;
-            let e = h_element_for_id(i);
-            if (e != null) {
-                let r = e.children[1];
-                r.style.fill = searchColor;
+    if (re != null) {
+        for (let i = 0; i < histogramData.length; i++) {
+            let bar = histogramData[i];
+            if (name_for_sample(bar).match(re)) {
+                bar.searchMatch = true;
+                let e = h_element_for_id(i);
+                h_highlight_bar(i, bar);
+            }
+        }
+    } else if (hilight_bar != null) {
+        for (let i = 0; i < histogramData.length; i++) {
+            let bar = histogramData[i];
+            if (hilight_bar.k == bar.k) {
+                bar.searchMatch = true;
+                let e = h_element_for_id(i);
+                h_highlight_bar(i, bar);
             }
         }
     }
 }
 
-var hilight_element = null;
+var hilight_bar = null;
 
 function h_reset_search() {
     for (let i = 0; i < histogramData.length; i++) {
         let bar = histogramData[i];
         if (bar.searchMatch = true) {
             bar.searchMatch = false;
-            let e = h_element_for_id(i);
-            if (e != null) {
-                let color = bar.currentColor;
-                if (color == undefined) {
-                    color = h_color_for_sample(color_type, bar);
-                }
-                let r = e.children[1];
-                r.style.fill = color;
-            }
+            h_unhighlight_bar(i, bar);
         }
     }
     h_search_regex = null;
 }
 
+function h_highlight_bar(id, bar) {
+    let e = h_element_for_id(id)
+    if (e != null) {
+        let r = e.children[1];
+        r.style.fill = searchColor;
+    }
+}
+
+function h_unhighlight_bar(id, bar) {
+    let e = h_element_for_id(id)
+    if (e != null) {
+        let color = bar.currentColor;
+        if (color == undefined) {
+            color = h_color_for_sample(color_type, bar);
+        }
+        let r = e.children[1];
+        r.style.fill = color;
+    }
+}
+
 function h_highlight(e) {
-    if (hilight_element == e) {
+    let id = e.getAttribute("id").substring(2);
+    let bar = histogram_entry_for_id(id);
+    if (hilight_bar != null && hilight_bar.k == bar.k) {
         hilight_element = null;
         reset_search();
     } else {
-        let bar = histogram_entry_for_id(e.getAttribute("id").substring(2));
         reset_search();
-        hilight_element = e;
-        let name = name_for_sample(bar);
-        // Ensure we escape anything that might cause a problem with the regexp.
-        name = "^" + name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + "$"; // $& means the whole matched string
-        search(name);
+        hilight_bar = bar;
+        h_highlight_bar(id, bar);
+
+        let iter = sample_and_children_depth_first(profileData[0]);
+        let c = iter.next();
+        while (!c.done) {
+            let sample = c.value;
+            if (sample.k == bar.k) {
+                fg_highlight_sample(search_matches, sample);
+            }
+            c = iter.next();
+        }
     }
 }
 

From f976953e27a97880e7ea59d694260fbe8ca43a8e Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Thu, 30 Sep 2021 16:45:46 +0100
Subject: [PATCH 336/681] Combine the legend and help into one popup.

---
 .../tools/profiler/impl/SVGSamplerOutput.java |  2 +-
 .../profiler/impl/resources/color_change.js   | 24 ++++---
 .../profiler/impl/resources/graphowner.js     | 64 -------------------
 3 files changed, 12 insertions(+), 78 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index a835ae92bb5a..37e23208bd4c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -956,7 +956,7 @@ public String drawCanvas(double x, double y) {
             output.append(ttfString(black(), owner.fontName(), owner.fontSize() + 5, width() / 2, owner.fontSize() * 2,
                             "Flamegraph", "middle", "id=\"fg_title\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), width() / 2, owner.fontSize() * 3,
-                            "Press \"?\" for help, or \"l\" for legend.", "middle", "id=\"fg_help\""));
+                            "Press \"?\" for legend and help.", "middle", "id=\"fg_help\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), XPAD, owner.fontSize() * 2,
                             "Reset zoom", "", "id=\"unzoom\" onclick=\"unzoom()\" style=\"opacity:0.1;cursor:pointer\""));
             output.append(ttfString(black(), owner.fontName(), owner.fontSize(), width() - XPAD, owner.fontSize() * 2,
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 11adcc846671..6d90821cabfd 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -130,21 +130,10 @@ function color_create_legend() {
     t.style.fontSize = fontSize * 1.5;
     t.style.fontFamily = "Verdana";
     t.style.fill = "rgb(0, 0, 0)";
-    t.textContent = "Legend";
-
-    let t2 = document.createElementNS("http://www.w3.org/2000/svg", "text");
-    t2.className.baseVal = "title";
-    t2.style.textAnchor = "middle";
-    t2.setAttribute("x", 125);
-    t2.setAttribute("y", fg_frameheight * 3);
-    t2.style.fontSize = fontSize;
-    t2.style.fontFamily = "Verdana";
-    t2.style.fill = "rgb(0, 0, 0)";
-    t2.textContent = "Press \"l\" to toggle legend";
+    t.textContent = "Legend & Help";
 
     e.appendChild(r);
     e.appendChild(t);
-    e.appendChild(t2);
     e.style.display = "none";
     svg.appendChild(e);
 
@@ -177,6 +166,15 @@ function color_create_legend() {
         entry_count = 12;
     }
 
+    let help_entry_count = 0;
+
+    for (; help_entry_count < help_strings.length; help_entry_count++) {
+        graph_help_entry(e, entry_count + help_entry_count + 1, help_strings[help_entry_count][0], help_strings[help_entry_count][1]);
+    }
+
+    if (help_entry_count > 0) {
+        entry_count = entry_count + help_entry_count + 1;
+    }
     r.height.baseVal.value = (fg_frameheight * 2.5) + (entry_count + 1) * fg_frameheight * 1.5;
     color_insert_legend(svg);
     return e;
@@ -238,4 +236,4 @@ function color_legend() {
 
 // C for color cycle.
 graph_register_handler("c", "Cycle through graph colorings", color_cycle);
-graph_register_handler("l", "Toggle legend display", color_legend);
+graph_register_handler("?", "Toggle legend & help display", color_legend);
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 2bf3e53360c5..295d5b9c9431 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -370,52 +370,6 @@ function owner_resize(new_width) {
 }
 
 var help_strings = [];
-var help_state = false;
-
-function graph_create_help() {
-    let svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-    let e = document.createElementNS("http://www.w3.org/2000/svg", "g");
-    e.id = "help";
-
-    let r = document.createElementNS("http://www.w3.org/2000/svg", "rect");
-    svg.y.baseVal.value = 50;
-    r.className.baseVal = "popup";
-    r.x.baseVal.value = 0;
-    r.y.baseVal.value = 0;
-    r.width.baseVal.value = 250;
-    r.style.fill = "white";
-    r.style.stroke = "black";
-    r.style["stroke-width"] = 2;
-    r.rx.baseVal.value = 2;
-    r.ry.baseVal.vlaue = 2;
-
-    let t = document.createElementNS("http://www.w3.org/2000/svg", "text");
-    t.className.baseVal = "title";
-    t.style.textAnchor = "middle";
-    t.setAttribute("y", fg_frameheight * 2);
-    t.style.fontSize = fontSize * 1.5;
-    t.style.fontFamily = "Verdana";
-    t.style.fill = "rgb(0, 0, 0)";
-    t.textContent = "Keyboard shortcut";
-
-    e.appendChild(r);
-    e.appendChild(t);
-    e.style.display = "none";
-    svg.appendChild(e);
-
-    let entry_count = 0;
-
-    for (; entry_count < help_strings.length; entry_count++) {
-        graph_help_entry(e, entry_count, help_strings[entry_count][0], help_strings[entry_count][1]);
-    }
-
-    svg.x.baseVal.value = document.firstElementChild.width.baseVal.value - 250 - xpad;
-    t.setAttribute("x", 250 / 2);
-    r.height.baseVal.value = (fg_frameheight * 2.5) + (entry_count + 1) * fg_frameheight * 1.5;
-    document.firstElementChild.appendChild(svg);
-    return e;
-
-}
 
 function graph_help_entry(e, i, key, description) {
     let y = (fg_frameheight * 2) + (i + 1) * fg_frameheight * 1.5;
@@ -475,22 +429,6 @@ function graph_popup_fix_width(e, right_justify) {
     }
 };
 
-function graph_help() {
-    let e = document.getElementById("help");
-    if (e == null) {
-        e = graph_create_help();
-    }
-    if (e != null) {
-        if (e.style["display"] == "none") {
-            e.style["display"] = "block";
-            graph_popup_fix_width(e, true);
-        } else {
-            e.style["display"] = "none";
-        }
-    }
-    help_state = !help_state;
-}
-
 function graph_register_handler(key, description, action) {
     window.addEventListener("keydown", function (e) {
         if (e.key == key && !e.isComposing && !e.altKey && !e.ctrlKey && !e.metaKey) {
@@ -500,5 +438,3 @@ function graph_register_handler(key, description, action) {
     });
     help_strings.push([key, description]);
 }
-
-graph_register_handler("?", "Display keyboard shortcuts", graph_help);

From 8a4f9852cae0b2cf709b1c207d6021b1348f7a49 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Thu, 7 Oct 2021 17:36:25 +0100
Subject: [PATCH 337/681] Refactor to put document height management in one
 place.

---
 .../profiler/impl/resources/color_change.js      |  9 +++++----
 .../tools/profiler/impl/resources/flamegraph.js  |  3 +--
 .../tools/profiler/impl/resources/graphowner.js  | 16 ++++++++++++++++
 .../tools/profiler/impl/resources/histogram.js   |  3 +--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
index 6d90821cabfd..6c9a5d5a6d9c 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/color_change.js
@@ -156,14 +156,14 @@ function color_create_legend() {
         }
     } else if (color_type == "bc") {
         color_legend_entry(e, 0, color_for_compilation(0, 0), "No self samples");
-        for (let i = 0; i <= 10; i++) {
-            let color = color_for_compilation(10 - i, i);
-            let text = (i * 10) + "% samples were compiled.";
+        for (let i = 0; i <= 4; i++) {
+            let color = color_for_compilation(4 - i, i);
+            let text = (i * 25) + "% samples were compiled.";
 
             color_legend_entry(e, i + 1, color, text);
         }
 
-        entry_count = 12;
+        entry_count = 6;
     }
 
     let help_entry_count = 0;
@@ -232,6 +232,7 @@ function color_legend() {
         }
     }
     legend_state = !legend_state;
+    graph_ensure_space();
 }
 
 // C for color cycle.
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
index 354a0b39f020..bd85da960de4 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/flamegraph.js
@@ -272,8 +272,7 @@ function fg_canvas_resize() {
     let fg_canvas = document.getElementById("fg_canvas");
     fg_canvas.height.baseVal.value = height;
     fg_canvas.y.baseVal.value = -height;
-    svg.height.baseVal.value = svg.height.baseVal.value - old_height + height;
-    svg.viewBox.baseVal.height = svg.height.baseVal.value;
+    graph_ensure_space();
 }
 
 function zoom_internal(sample, parents, unrelated) {
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
index 295d5b9c9431..40e12e4241e0 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/graphowner.js
@@ -427,6 +427,7 @@ function graph_popup_fix_width(e, right_justify) {
     if (right_justify) {
         e.parentElement.x.baseVal.value = fg_width - max_label_end - xpad;
     }
+    graph_ensure_space();
 };
 
 function graph_register_handler(key, description, action) {
@@ -438,3 +439,18 @@ function graph_register_handler(key, description, action) {
     });
     help_strings.push([key, description]);
 }
+
+function graph_ensure_space() {
+    let svg = document.firstElementChild;
+    let maxY = 0;
+    for (const e of svg.getElementsByTagName("svg")) {
+        if (svg.style["display"] != "none") {
+            let y = e.y.baseVal.value + e.height.baseVal.value;
+            if (y > maxY) {
+                maxY = y;
+            }
+        }
+    }
+    svg.height.baseVal.value = maxY;
+    svg.viewBox.baseVal.height = maxY;
+}
diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
index 82791c079625..24948c6c3104 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/resources/histogram.js
@@ -260,8 +260,7 @@ function h_canvas_resize() {
     h_svg.viewBox.baseVal.height = height;
     let h_canvas = document.getElementById("h_canvas");
     h_canvas.height.baseVal.value = height;
-    svg.height.baseVal.value = svg.height.baseVal.value - old_height + height;
-    svg.viewBox.baseVal.height = svg.height.baseVal.value;
+    graph_ensure_space();
 }
 
 function calculate_histogram_bars(bars, sample) {

From 0e6e18c1f6a634fe0adc26c16aa5b4582b654a92 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Thu, 7 Oct 2021 13:32:41 -0700
Subject: [PATCH 338/681] Remove failing assertion

---
 .../src/com/oracle/svm/hosted/meta/HostedMethod.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
index 260c4ff004ca..13d035dabe57 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
@@ -488,7 +488,11 @@ public int compareTo(HostedMethod other) {
         if (result == 0) {
             result = ((HostedType) this.getSignature().getReturnType(null)).compareTo((HostedType) other.getSignature().getReturnType(null));
         }
-        assert result != 0;
+        /*
+         * Note that the result can still be 0 at this point: with class substitutions or incomplete
+         * classpath, two separate methods can have the same signature. Not ordering such methods is
+         * fine. GR-32976 should remove the sorting altogether.
+         */
         return result;
     }
 

From 8297f26304340333574ec5e9a307202099ab3c29 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Thu, 7 Oct 2021 14:14:07 -0700
Subject: [PATCH 339/681] Avoid NullPointerException

---
 .../src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
index 054967f7a780..154209e821ea 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
@@ -39,6 +39,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -382,7 +383,7 @@ private boolean foldInvocationUsingReflection(GraphBuilderContext b, ResolvedJav
 
         /* String representation of the parameters for debug printing. */
         Supplier<String> targetParameters = () -> (receiverValue == null ? "" : receiverValue.toString() + "; ") +
-                        Stream.of(argValues).map(arg -> arg instanceof Object[] ? Arrays.toString((Object[]) arg) : arg.toString()).collect(Collectors.joining(", "));
+                        Stream.of(argValues).map(arg -> arg instanceof Object[] ? Arrays.toString((Object[]) arg) : Objects.toString(arg)).collect(Collectors.joining(", "));
 
         Object returnValue;
         try {

From 1be269c95a353ee3bfa07917b430c58077d762e6 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Wed, 22 Sep 2021 17:19:10 -0700
Subject: [PATCH 340/681] Add verification for invoke receiver types

---
 .../com/oracle/svm/core/SubstrateOptions.java |  3 +
 .../graal/snippets/NonSnippetLowerings.java   | 68 ++++++++++++++++++-
 .../snippets/ImplicitExceptionsFeature.java   |  8 +++
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index cd99fbebf10f..c4e350b410ac 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -620,4 +620,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, String ol
     @APIOption(name = "configure-reflection-metadata")//
     @Option(help = "Limit method reflection metadata to configuration entries instead of including it for all reachable methods")//
     public static final HostedOptionKey<Boolean> ConfigureReflectionMetadata = new HostedOptionKey<>(true);
+
+    @Option(help = "Verify type states computed by the static analysis at run time. This is useful when diagnosing problems in the static analysis, but reduces peak performance significantly.", type = Debug)//
+    public static final HostedOptionKey<Boolean> VerifyTypes = new HostedOptionKey<>(false);
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
index 6c94898c9c5b..bffca2c3bfc3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
@@ -33,15 +33,19 @@
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.type.StampPair;
+import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeInputList;
+import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.CallTargetNode;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.DirectCallTargetNode;
 import org.graalvm.compiler.nodes.FixedGuardNode;
 import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.IndirectCallTargetNode;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.InvokeNode;
@@ -54,11 +58,15 @@
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.IsNullNode;
+import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.GetClassNode;
 import org.graalvm.compiler.nodes.extended.LoadHubNode;
+import org.graalvm.compiler.nodes.extended.OpaqueNode;
+import org.graalvm.compiler.nodes.java.InstanceOfNode;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType;
 import org.graalvm.compiler.nodes.memory.ReadNode;
@@ -73,6 +81,8 @@
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.FrameAccess;
+import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.code.CodeInfoTable;
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
@@ -81,6 +91,8 @@
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.snippets.ImplicitExceptions;
+import com.oracle.svm.core.snippets.SnippetRuntime;
+import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.vm.ci.code.CallingConvention;
@@ -93,9 +105,14 @@
 
 public abstract class NonSnippetLowerings {
 
+    public static final SnippetRuntime.SubstrateForeignCallDescriptor REPORT_VERIFY_TYPES_ERROR = SnippetRuntime.findForeignCall(
+                    NonSnippetLowerings.class, "reportVerifyTypesError", false, LocationIdentity.any());
+
     private final RuntimeConfiguration runtimeConfig;
     private final Predicate<ResolvedJavaMethod> mustNotAllocatePredicate;
 
+    final boolean verifyTypes = SubstrateOptions.VerifyTypes.getValue();
+
     @SuppressWarnings("unused")
     protected NonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<ResolvedJavaMethod> mustNotAllocatePredicate, OptionValues options, Iterable<DebugHandlersFactory> factories,
                     Providers providers, SnippetReflectionProvider snippetReflection, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {
@@ -250,12 +267,53 @@ public void lower(FixedNode node, LoweringTool tool) {
                 SharedMethod method = (SharedMethod) callTarget.targetMethod();
                 JavaType[] signature = method.getSignature().toParameterTypes(callTarget.isStatic() ? null : method.getDeclaringClass());
                 CallingConvention.Type callType = method.getCallingConventionKind().toType(true);
-
                 InvokeKind invokeKind = callTarget.invokeKind();
                 SharedMethod[] implementations = method.getImplementations();
+
+                if (verifyTypes && !callTarget.isStatic() && receiver.getStackKind() == JavaKind.Object && !((SharedMethod) graph.method()).isUninterruptible()) {
+                    /*
+                     * Verify that the receiver is an instance of the class that declares the call
+                     * target method. To avoid that the new type check floats above a deoptimization
+                     * entry point, we need to anchor the receiver to the control flow. To avoid
+                     * that Graal optimizes away the InstanceOfNode immediately, we need an
+                     * OpaqueNode that removes all type information from the receiver. Then we wire
+                     * up an IfNode that leads to a ForeignCallNode in case the verification fails.
+                     */
+                    FixedValueAnchorNode anchoredReceiver = graph.add(new FixedValueAnchorNode(receiver));
+                    graph.addBeforeFixed(node, anchoredReceiver);
+                    ValueNode opaqueReceiver = graph.unique(new OpaqueNode(anchoredReceiver));
+                    TypeReference declaringClass = TypeReference.createTrustedWithoutAssumptions(method.getDeclaringClass());
+                    LogicNode instanceOf = graph.addOrUniqueWithInputs(InstanceOfNode.create(declaringClass, opaqueReceiver));
+                    BeginNode passingBegin = graph.add(new BeginNode());
+                    BeginNode failingBegin = graph.add(new BeginNode());
+                    IfNode ifNode = graph.add(new IfNode(instanceOf, passingBegin, failingBegin, BranchProbabilityNode.EXTREMELY_FAST_PATH_PROFILE));
+
+                    ((FixedWithNextNode) node.predecessor()).setNext(ifNode);
+                    passingBegin.setNext(node);
+
+                    String errorMessage;
+                    if (SubstrateUtil.HOSTED) {
+                        errorMessage = "Invoke " + invokeKind + " of " + method.format("%H.%n(%p)%r");
+                        errorMessage += System.lineSeparator() + "  declaringClass = " + declaringClass;
+                        if (implementations.length == 0 || implementations.length > 10) {
+                            errorMessage += System.lineSeparator() + "  implementations.length = " + implementations.length;
+                        } else {
+                            for (int i = 0; i < implementations.length; i++) {
+                                errorMessage += System.lineSeparator() + "  implementations[" + i + "] = " + implementations[i].format("%H.%n(%p)%r");
+                            }
+                        }
+                    } else {
+                        errorMessage = "Invoke (method name not added because message must be a compile-time constant)";
+                    }
+                    ConstantNode errorConstant = ConstantNode.forConstant(tool.getConstantReflection().forString(errorMessage), tool.getMetaAccess(), graph);
+                    ForeignCallNode reportError = graph.add(new ForeignCallNode(REPORT_VERIFY_TYPES_ERROR, opaqueReceiver, errorConstant));
+                    reportError.setStateAfter(invoke.stateAfter().duplicateModifiedDuringCall(invoke.bci(), node.getStackKind()));
+                    failingBegin.setNext(reportError);
+                    reportError.setNext(graph.add(new LoweredDeadEndNode()));
+                }
+
                 LoadHubNode hub = null;
                 CallTargetNode loweredCallTarget;
-
                 if (invokeKind.isDirect() || implementations.length == 1) {
                     SharedMethod targetMethod = method;
                     if (!invokeKind.isDirect()) {
@@ -352,4 +410,10 @@ private CallTargetNode createUnreachableCallTarget(LoweringTool tool, FixedNode
         }
     }
 
+    @SubstrateForeignCallTarget(stubCallingConvention = true)
+    private static void reportVerifyTypesError(Object object, String message) {
+        throw VMError.shouldNotReachHere("VerifyTypes: object=" + (object == null ? "null" : object.getClass().getTypeName()) +
+                        System.lineSeparator() + message +
+                        System.lineSeparator() + "VerifyTypes found a type error");
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ImplicitExceptionsFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ImplicitExceptionsFeature.java
index 46ac9324b928..404e9117e3bb 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ImplicitExceptionsFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ImplicitExceptionsFeature.java
@@ -25,9 +25,11 @@
 package com.oracle.svm.hosted.snippets;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.graal.GraalFeature;
 import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider;
+import com.oracle.svm.core.graal.snippets.NonSnippetLowerings;
 import com.oracle.svm.core.snippets.ExceptionUnwind;
 import com.oracle.svm.core.snippets.ImplicitExceptions;
 import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
@@ -46,11 +48,17 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         for (SubstrateForeignCallDescriptor descriptor : ExceptionUnwind.FOREIGN_CALLS) {
             access.getBigBang().addRootMethod((AnalysisMethod) descriptor.findMethod(access.getMetaAccess()));
         }
+        if (SubstrateOptions.VerifyTypes.getValue()) {
+            access.getBigBang().addRootMethod((AnalysisMethod) NonSnippetLowerings.REPORT_VERIFY_TYPES_ERROR.findMethod(access.getMetaAccess()));
+        }
     }
 
     @Override
     public void registerForeignCalls(SubstrateForeignCallsProvider foreignCalls) {
         foreignCalls.register(ImplicitExceptions.FOREIGN_CALLS);
         foreignCalls.register(ExceptionUnwind.FOREIGN_CALLS);
+        if (SubstrateOptions.VerifyTypes.getValue()) {
+            foreignCalls.register(NonSnippetLowerings.REPORT_VERIFY_TYPES_ERROR);
+        }
     }
 }

From d03e3b3a5192b8e6ef205d507bf9b46de48c8459 Mon Sep 17 00:00:00 2001
From: Michael Simacek <michael.simacek@oracle.com>
Date: Fri, 8 Oct 2021 07:40:13 +0000
Subject: [PATCH 341/681] [GR-21590] Update imports

PullRequest: graalpython/1987
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index b62029f2e605..8c4e334b0a6e 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "c6fc7c03df46b19bebe808bc67fc42a484473232",
+                "version": "f100bf8941139ece20ec0fed3160ed9191cdbbf5",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From 3957e9b3534fbf948a947f65c5c3ff1bb09c3a98 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Wed, 6 Oct 2021 18:26:10 +0200
Subject: [PATCH 342/681] Fail gracefully when invoking method pointers to null
 or uncompiled methods.

---
 ....java => InvalidMethodPointerHandler.java} | 33 ++++++++++++++-----
 .../ClassInitializationFeature.java           |  5 ++-
 .../oracle/svm/hosted/image/NativeImage.java  | 29 ++++++++++++++--
 .../hosted/image/NativeImageHeapWriter.java   | 12 ++-----
 .../oracle/svm/hosted/meta/MethodPointer.java | 22 +++++++++----
 .../svm/hosted/meta/UniverseBuilder.java      |  6 ++--
 6 files changed, 74 insertions(+), 33 deletions(-)
 rename substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/{InvalidVTableEntryHandler.java => InvalidMethodPointerHandler.java} (65%)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidVTableEntryHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
similarity index 65%
rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidVTableEntryHandler.java
rename to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index 43b7f36d57f5..1d8e548f8c29 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidVTableEntryHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -43,16 +43,33 @@
 import com.oracle.svm.util.ReflectionUtil;
 
 /**
- * Provides a stub method that can be used to fill otherwise unused vtable slots. Instead of a
- * segfault, this method provides a full diagnostic output with a stack trace.
+ * Provides stub methods that can be used for uninitialized method pointers. Instead of a segfault,
+ * the stubs provide full diagnostic output with a stack trace.
  */
-public final class InvalidVTableEntryHandler {
-    public static final Method HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidVTableEntryHandler.class, "invalidVTableEntryHandler");
-    public static final String MSG = "Fatal error: Virtual method call used an illegal vtable entry that was seen as unused by the static analysis";
+public final class InvalidMethodPointerHandler {
+    public static final Method INVALID_VTABLE_ENTRY_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "invalidVTableEntryHandler");
+    public static final String INVALID_VTABLE_ENTRY_MSG = "Fatal error: Virtual method call used an illegal vtable entry that was seen as unused by the static analysis";
+
+    public static final Method METHOD_POINTER_INVALID_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "methodPointerInvalidHandler");
+    public static final String METHOD_POINTER_INVALID_MSG = "Fatal error: Method pointer invoked on a method that is null, was not registered for compilation, or was not seen as invoked by the static analysis";
 
     @StubCallingConvention
     @NeverInline("We need a separate frame that stores all registers")
     private static void invalidVTableEntryHandler() {
+        Pointer callerSP = KnownIntrinsics.readCallerStackPointer();
+        CodePointer callerIP = KnownIntrinsics.readReturnAddress();
+        failFatally(callerSP, callerIP, INVALID_VTABLE_ENTRY_MSG);
+    }
+
+    @StubCallingConvention
+    @NeverInline("We need a separate frame that stores all registers")
+    private static void methodPointerInvalidHandler() {
+        Pointer callerSP = KnownIntrinsics.readCallerStackPointer();
+        CodePointer callerIP = KnownIntrinsics.readReturnAddress();
+        failFatally(callerSP, callerIP, METHOD_POINTER_INVALID_MSG);
+    }
+
+    private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
         VMThreads.StatusSupport.setStatusIgnoreSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
@@ -63,13 +80,11 @@ private static void invalidVTableEntryHandler() {
          * from the method that has the illegal vtable call. That can be helpful when debugging the
          * cause of the fatal error.
          */
-        Pointer callerSP = KnownIntrinsics.readCallerStackPointer();
-        CodePointer callerIP = KnownIntrinsics.readReturnAddress();
         LogHandler logHandler = ImageSingletons.lookup(LogHandler.class);
-        Log log = Log.enterFatalContext(logHandler, callerIP, MSG, null);
+        Log log = Log.enterFatalContext(logHandler, callerIP, message, null);
         if (log != null) {
             SubstrateDiagnostics.printFatalError(log, callerSP, callerIP, WordFactory.nullPointer(), true);
-            log.string(MSG).newline();
+            log.string(message).newline();
         }
         logHandler.fatalError();
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
index deda2c6fc758..5572fe9892a1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
@@ -44,6 +44,7 @@
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.nativeimage.c.function.CFunctionPointer;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
@@ -354,11 +355,13 @@ private static ClassInitializationInfo buildRuntimeInitializationInfo(FeatureImp
          * information.
          */
         assert type.isLinked();
+        CFunctionPointer classInitializerFunction = null;
         AnalysisMethod classInitializer = type.getClassInitializer();
         if (classInitializer != null) {
             assert classInitializer.getCode() != null;
             access.registerAsCompiled(classInitializer);
+            classInitializerFunction = MethodPointer.factory(classInitializer);
         }
-        return new ClassInitializationInfo(MethodPointer.factory(classInitializer));
+        return new ClassInitializationInfo(classInitializerFunction);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index ef1f7597e74b..d43e640168db 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -59,6 +59,7 @@
 import org.graalvm.compiler.debug.Indent;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
+import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
@@ -77,9 +78,11 @@
 import com.oracle.svm.core.BuildArtifacts;
 import com.oracle.svm.core.BuildArtifacts.ArtifactType;
 import com.oracle.svm.core.FrameAccess;
+import com.oracle.svm.core.InvalidMethodPointerHandler;
 import com.oracle.svm.core.Isolates;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
+import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.c.CConst;
 import com.oracle.svm.core.c.CGlobalDataImpl;
 import com.oracle.svm.core.c.CHeader;
@@ -96,6 +99,7 @@
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.NativeImageOptions;
 import com.oracle.svm.hosted.c.CGlobalDataFeature;
 import com.oracle.svm.hosted.c.NativeLibraries;
@@ -564,14 +568,24 @@ private static boolean checkEmbeddedOffset(ProgbitsSectionImpl sectionImpl, fina
         return true;
     }
 
-    private static void markFunctionRelocationSite(final ProgbitsSectionImpl sectionImpl, final int offset, final RelocatableBuffer.Info info) {
+    private void markFunctionRelocationSite(final ProgbitsSectionImpl sectionImpl, final int offset, final RelocatableBuffer.Info info) {
         assert info.getTargetObject() instanceof CFunctionPointer : "Wrong type for FunctionPointer relocation: " + info.getTargetObject().toString();
         final int functionPointerRelocationSize = 8;
         assert info.getRelocationSize() == functionPointerRelocationSize : "Function relocation: " + info.getRelocationSize() + " should be " + functionPointerRelocationSize + " bytes.";
         // References to functions are via relocations to the symbol for the function.
-        ResolvedJavaMethod method = ((MethodPointer) info.getTargetObject()).getMethod();
+        MethodPointer methodPointer = (MethodPointer) info.getTargetObject();
+        HostedMethod target = null;
+        boolean valid = methodPointer.isValid();
+        if (valid) {
+            ResolvedJavaMethod method = methodPointer.getMethod();
+            target = (method instanceof HostedMethod) ? (HostedMethod) method : heap.getUniverse().lookup(method);
+            valid = target.isCompiled();
+        }
+        if (!valid) {
+            target = metaAccess.lookupJavaMethod(InvalidMethodPointerHandler.METHOD_POINTER_INVALID_HANDLER_METHOD);
+        }
         // A reference to a method. Mark the relocation site using the symbol name.
-        sectionImpl.markRelocationSite(offset, RelocationKind.getDirect(functionPointerRelocationSize), localSymbolNameForMethod(method), false, 0L);
+        sectionImpl.markRelocationSite(offset, RelocationKind.getDirect(functionPointerRelocationSize), localSymbolNameForMethod(target), false, 0L);
     }
 
     private static boolean isAddendAligned(Architecture arch, long addend, RelocationKind kind) {
@@ -956,3 +970,12 @@ protected NativeTextSectionImpl(RelocatableBuffer relocatableBuffer, ObjectFile
         protected final NativeImageCodeCache codeCache;
     }
 }
+
+@AutomaticFeature
+final class MethodPointerInvalidHandlerFeature implements Feature {
+    @Override
+    public void beforeAnalysis(BeforeAnalysisAccess a) {
+        FeatureImpl.BeforeAnalysisAccessImpl access = (FeatureImpl.BeforeAnalysisAccessImpl) a;
+        access.registerAsCompiled(InvalidMethodPointerHandler.METHOD_POINTER_INVALID_HANDLER_METHOD);
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
index 71c4684c9081..a06325b43b60 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
@@ -55,13 +55,11 @@
 import com.oracle.svm.hosted.image.NativeImageHeap.ObjectInfo;
 import com.oracle.svm.hosted.meta.HostedClass;
 import com.oracle.svm.hosted.meta.HostedField;
-import com.oracle.svm.hosted.meta.HostedMethod;
 import com.oracle.svm.hosted.meta.MaterializedConstantFields;
 import com.oracle.svm.hosted.meta.MethodPointer;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
 import sun.misc.Unsafe;
 
 /**
@@ -242,14 +240,8 @@ private void addNonDataRelocation(RelocatableBuffer buffer, int index, Relocated
         mustBeReferenceAligned(index);
         assert pointer instanceof CFunctionPointer : "unknown relocated pointer " + pointer;
         assert pointer instanceof MethodPointer : "cannot create relocation for unknown FunctionPointer " + pointer;
-
-        ResolvedJavaMethod method = ((MethodPointer) pointer).getMethod();
-        HostedMethod hMethod = method instanceof HostedMethod ? (HostedMethod) method : heap.getUniverse().lookup(method);
-        if (hMethod.isCompiled()) {
-            // Only compiled methods inserted in vtables require relocation.
-            int pointerSize = ConfigurationValues.getTarget().wordSize;
-            addDirectRelocationWithoutAddend(buffer, index, pointerSize, pointer);
-        }
+        int pointerSize = ConfigurationValues.getTarget().wordSize;
+        addDirectRelocationWithoutAddend(buffer, index, pointerSize, pointer);
     }
 
     private static void writePrimitive(RelocatableBuffer buffer, int index, JavaConstant con) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
index d6c92fbcf01e..9aa3dd79710c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
@@ -29,32 +29,40 @@
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.word.ComparableWord;
 
+import com.oracle.svm.core.InvalidMethodPointerHandler;
+
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
  * A pointer to the compiled code of a method.
  */
 public class MethodPointer implements CFunctionPointer {
+    private static final MethodPointer INVALID = new MethodPointer(null);
 
     private final ResolvedJavaMethod method;
 
     public static CFunctionPointer factory(ResolvedJavaMethod method) {
-        if (method == null) {
-            return null;
-        } else {
-            return new MethodPointer(method);
-        }
+        return (method != null) ? new MethodPointer(method) : INVALID;
     }
 
     protected MethodPointer(ResolvedJavaMethod method) {
-        assert method != null;
         this.method = method;
     }
 
+    public boolean isValid() {
+        return (method != null);
+    }
+
     public ResolvedJavaMethod getMethod() {
+        assert isValid();
         return method;
     }
 
+    /**
+     * Always {@code false} because even a pointer to {@code null} or to a method that is not
+     * compiled will eventually be replaced by
+     * {@link InvalidMethodPointerHandler#METHOD_POINTER_INVALID_HANDLER_METHOD}.
+     */
     @Override
     public boolean isNull() {
         return false;
@@ -62,7 +70,7 @@ public boolean isNull() {
 
     @Override
     public boolean isNonNull() {
-        return true;
+        return !isNull();
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
index b4e1414aa82c..84b69d9d54c7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
@@ -63,7 +63,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.results.AbstractAnalysisResultsBuilder;
 import com.oracle.svm.core.FunctionPointerHolder;
-import com.oracle.svm.core.InvalidVTableEntryHandler;
+import com.oracle.svm.core.InvalidMethodPointerHandler;
 import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
@@ -674,7 +674,7 @@ private void buildVTables() {
          * To avoid segfaults when jumping to address 0, all unused vtable entries are filled with a
          * stub that reports a fatal error.
          */
-        HostedMethod invalidVTableEntryHandler = hMetaAccess.lookupJavaMethod(InvalidVTableEntryHandler.HANDLER_METHOD);
+        HostedMethod invalidVTableEntryHandler = hMetaAccess.lookupJavaMethod(InvalidMethodPointerHandler.INVALID_VTABLE_ENTRY_HANDLER_METHOD);
 
         for (HostedType type : hUniverse.getTypes()) {
             if (type.isArray()) {
@@ -999,6 +999,6 @@ final class InvalidVTableEntryFeature implements Feature {
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess a) {
         BeforeAnalysisAccessImpl access = (BeforeAnalysisAccessImpl) a;
-        access.registerAsCompiled(InvalidVTableEntryHandler.HANDLER_METHOD);
+        access.registerAsCompiled(InvalidMethodPointerHandler.INVALID_VTABLE_ENTRY_HANDLER_METHOD);
     }
 }

From 31469571fa38a34ca7e5da48bf67263ed6acdd35 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Thu, 7 Oct 2021 15:46:27 +0200
Subject: [PATCH 343/681] Disallow MethodPointer for null targets entirely.

---
 .../graal/llvm/LLVMNativeImageCodeCache.java  |  2 +-
 .../svm/core/InvalidMethodPointerHandler.java |  8 +++---
 .../graal/hosted/DeoptimizationFeature.java   |  2 +-
 .../ClassInitializationFeature.java           |  4 +--
 .../code/CEntryPointCallStubSupport.java      |  2 +-
 .../code/CEntryPointLiteralFeature.java       |  2 +-
 .../hosted/image/LIRNativeImageCodeCache.java |  2 +-
 .../oracle/svm/hosted/image/NativeImage.java  | 15 ++++-------
 .../oracle/svm/hosted/meta/MethodPointer.java | 27 +++++--------------
 .../svm/hosted/meta/UniverseBuilder.java      |  2 +-
 .../svm/jni/access/JNIAccessibleMethod.java   | 12 ++++-----
 .../functions/JNIFunctionTablesFeature.java   |  6 ++---
 .../svm/reflect/hosted/ReflectionFeature.java |  2 +-
 13 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
index c931cf6b2cc2..9ee35d616beb 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
@@ -207,7 +207,7 @@ private void linkCompiledBatches(BatchExecutor executor, DebugContext debug, int
         stackMapDumper.close();
 
         HostedMethod firstMethod = (HostedMethod) getFirstCompilation().getMethods()[0];
-        buildRuntimeMetadata(MethodPointer.factory(firstMethod), WordFactory.signed(textSectionInfo.getCodeSize()));
+        buildRuntimeMetadata(new MethodPointer(firstMethod), WordFactory.signed(textSectionInfo.getCodeSize()));
     }
 
     private void llvmOptimize(DebugContext debug, String outputPath, String inputPath) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index 1d8e548f8c29..4b759ea3e307 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -50,8 +50,8 @@ public final class InvalidMethodPointerHandler {
     public static final Method INVALID_VTABLE_ENTRY_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "invalidVTableEntryHandler");
     public static final String INVALID_VTABLE_ENTRY_MSG = "Fatal error: Virtual method call used an illegal vtable entry that was seen as unused by the static analysis";
 
-    public static final Method METHOD_POINTER_INVALID_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "methodPointerInvalidHandler");
-    public static final String METHOD_POINTER_INVALID_MSG = "Fatal error: Method pointer invoked on a method that is null, was not registered for compilation, or was not seen as invoked by the static analysis";
+    public static final Method METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD = ReflectionUtil.lookupMethod(InvalidMethodPointerHandler.class, "methodPointerNotCompiledHandler");
+    public static final String METHOD_POINTER_NOT_COMPILED_MSG = "Fatal error: Method pointer invoked on a method that was not compiled because it was not seen as invoked by the static analysis nor was it directly registered for compilation";
 
     @StubCallingConvention
     @NeverInline("We need a separate frame that stores all registers")
@@ -63,10 +63,10 @@ private static void invalidVTableEntryHandler() {
 
     @StubCallingConvention
     @NeverInline("We need a separate frame that stores all registers")
-    private static void methodPointerInvalidHandler() {
+    private static void methodPointerNotCompiledHandler() {
         Pointer callerSP = KnownIntrinsics.readCallerStackPointer();
         CodePointer callerIP = KnownIntrinsics.readReturnAddress();
-        failFatally(callerSP, callerIP, METHOD_POINTER_INVALID_MSG);
+        failFatally(callerSP, callerIP, METHOD_POINTER_NOT_COMPILED_MSG);
     }
 
     private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
index 3fee955d70b4..0180a73028dd 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
@@ -126,6 +126,6 @@ public void beforeCompilation(BeforeCompilationAccess a) {
         CompilationAccessImpl config = (CompilationAccessImpl) a;
         config.registerAsImmutable(ImageSingletons.lookup(DeoptimizationSupport.class));
         HostedMetaAccess metaAccess = config.getMetaAccess();
-        DeoptimizationSupport.setDeoptStubPointer(MethodPointer.factory(metaAccess.lookupJavaMethod(deoptStubMethod)));
+        DeoptimizationSupport.setDeoptStubPointer(new MethodPointer(metaAccess.lookupJavaMethod(deoptStubMethod)));
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
index 5572fe9892a1..9060a15a291a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
@@ -341,7 +341,7 @@ private static ClassInitializationInfo buildRuntimeInitializationInfo(FeatureImp
             /* Synthesize a VerifyError to be thrown at run time. */
             AnalysisMethod throwVerifyError = access.getMetaAccess().lookupJavaMethod(ExceptionSynthesizer.throwExceptionMethod(VerifyError.class));
             access.registerAsCompiled(throwVerifyError);
-            return new ClassInitializationInfo(MethodPointer.factory(throwVerifyError));
+            return new ClassInitializationInfo(new MethodPointer(throwVerifyError));
         } catch (Throwable t) {
             /*
              * All other linking errors will be reported as NoClassDefFoundError when initialization
@@ -360,7 +360,7 @@ private static ClassInitializationInfo buildRuntimeInitializationInfo(FeatureImp
         if (classInitializer != null) {
             assert classInitializer.getCode() != null;
             access.registerAsCompiled(classInitializer);
-            classInitializerFunction = MethodPointer.factory(classInitializer);
+            classInitializerFunction = new MethodPointer(classInitializer);
         }
         return new ClassInitializationInfo(classInitializerFunction);
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubSupport.java
index c6eb898ece3b..90a80cb80adf 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubSupport.java
@@ -110,7 +110,7 @@ public AnalysisMethod registerJavaStubForMethod(AnalysisMethod method) {
             if (value == null) {
                 assert !bb.getUniverse().sealed();
                 AnalysisMethod nativeStub = registerStubForMethod(method, () -> CEntryPointData.create(method));
-                CFunctionPointer nativeStubAddress = MethodPointer.factory(nativeStub);
+                CFunctionPointer nativeStubAddress = new MethodPointer(nativeStub);
                 String stubName = SubstrateUtil.uniqueShortName(method);
                 ResolvedJavaType holderClass = bb.getMetaAccess().lookupJavaType(IsolateLeaveStub.class).getWrapped();
                 CEntryPointJavaCallStubMethod stub = new CEntryPointJavaCallStubMethod(method.getWrapped(), stubName, holderClass, nativeStubAddress);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointLiteralFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointLiteralFeature.java
index c5fd686aad87..1e69f5e974f8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointLiteralFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointLiteralFeature.java
@@ -81,7 +81,7 @@ public Object apply(Object source) {
                      * Only during compilation and native image writing, we do the actual
                      * replacement.
                      */
-                    return MethodPointer.factory(hStub);
+                    return new MethodPointer(hStub);
                 }
             }
             return source;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
index a1ae28bde450..19e985859367 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
@@ -103,7 +103,7 @@ public void layoutMethods(DebugContext debug, String imageName, BigBang bb, Fork
                 codeCacheSize = NumUtil.roundUp(codeCacheSize + compilation.getTargetCodeSize(), SubstrateOptions.codeAlignment());
             }
 
-            buildRuntimeMetadata(MethodPointer.factory(firstMethod), WordFactory.unsigned(codeCacheSize));
+            buildRuntimeMetadata(new MethodPointer(firstMethod), WordFactory.unsigned(codeCacheSize));
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index d43e640168db..b41457106299 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -574,15 +574,10 @@ private void markFunctionRelocationSite(final ProgbitsSectionImpl sectionImpl, f
         assert info.getRelocationSize() == functionPointerRelocationSize : "Function relocation: " + info.getRelocationSize() + " should be " + functionPointerRelocationSize + " bytes.";
         // References to functions are via relocations to the symbol for the function.
         MethodPointer methodPointer = (MethodPointer) info.getTargetObject();
-        HostedMethod target = null;
-        boolean valid = methodPointer.isValid();
-        if (valid) {
-            ResolvedJavaMethod method = methodPointer.getMethod();
-            target = (method instanceof HostedMethod) ? (HostedMethod) method : heap.getUniverse().lookup(method);
-            valid = target.isCompiled();
-        }
-        if (!valid) {
-            target = metaAccess.lookupJavaMethod(InvalidMethodPointerHandler.METHOD_POINTER_INVALID_HANDLER_METHOD);
+        ResolvedJavaMethod method = methodPointer.getMethod();
+        HostedMethod target = (method instanceof HostedMethod) ? (HostedMethod) method : heap.getUniverse().lookup(method);
+        if (!target.isCompiled()) {
+            target = metaAccess.lookupJavaMethod(InvalidMethodPointerHandler.METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD);
         }
         // A reference to a method. Mark the relocation site using the symbol name.
         sectionImpl.markRelocationSite(offset, RelocationKind.getDirect(functionPointerRelocationSize), localSymbolNameForMethod(target), false, 0L);
@@ -976,6 +971,6 @@ final class MethodPointerInvalidHandlerFeature implements Feature {
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess a) {
         FeatureImpl.BeforeAnalysisAccessImpl access = (FeatureImpl.BeforeAnalysisAccessImpl) a;
-        access.registerAsCompiled(InvalidMethodPointerHandler.METHOD_POINTER_INVALID_HANDLER_METHOD);
+        access.registerAsCompiled(InvalidMethodPointerHandler.METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
index 9aa3dd79710c..d2af190eba9b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/MethodPointer.java
@@ -26,43 +26,28 @@
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
+import java.util.Objects;
+
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.word.ComparableWord;
 
-import com.oracle.svm.core.InvalidMethodPointerHandler;
-
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
  * A pointer to the compiled code of a method.
  */
-public class MethodPointer implements CFunctionPointer {
-    private static final MethodPointer INVALID = new MethodPointer(null);
-
+public final class MethodPointer implements CFunctionPointer {
     private final ResolvedJavaMethod method;
 
-    public static CFunctionPointer factory(ResolvedJavaMethod method) {
-        return (method != null) ? new MethodPointer(method) : INVALID;
-    }
-
-    protected MethodPointer(ResolvedJavaMethod method) {
+    public MethodPointer(ResolvedJavaMethod method) {
+        Objects.requireNonNull(method);
         this.method = method;
     }
 
-    public boolean isValid() {
-        return (method != null);
-    }
-
     public ResolvedJavaMethod getMethod() {
-        assert isValid();
         return method;
     }
 
-    /**
-     * Always {@code false} because even a pointer to {@code null} or to a method that is not
-     * compiled will eventually be replaced by
-     * {@link InvalidMethodPointerHandler#METHOD_POINTER_INVALID_HANDLER_METHOD}.
-     */
     @Override
     public boolean isNull() {
         return false;
@@ -70,7 +55,7 @@ public boolean isNull() {
 
     @Override
     public boolean isNonNull() {
-        return !isNull();
+        return true;
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
index 84b69d9d54c7..c4fd6a6496f4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
@@ -925,7 +925,7 @@ private void buildHubs() {
                  * We install a CodePointer in the vtable; when generating relocation info, we will
                  * know these point into .text
                  */
-                vtable[idx] = MethodPointer.factory(type.vtable[idx]);
+                vtable[idx] = new MethodPointer(type.vtable[idx]);
             }
 
             // pointer maps in Dynamic Hub
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleMethod.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleMethod.java
index adefdc5ab15d..5c85406a0397 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleMethod.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleMethod.java
@@ -124,13 +124,13 @@ public boolean isStatic() {
     void finishBeforeCompilation(CompilationAccessImpl access) {
         HostedUniverse hUniverse = access.getUniverse();
         AnalysisUniverse aUniverse = access.getUniverse().getBigBang().getUniverse();
-        varargsCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(varargsCallWrapperMethod)));
-        arrayCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(arrayCallWrapperMethod)));
-        valistCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(valistCallWrapperMethod)));
+        varargsCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(varargsCallWrapperMethod)));
+        arrayCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(arrayCallWrapperMethod)));
+        valistCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(valistCallWrapperMethod)));
         if (!Modifier.isStatic(modifiers) && !Modifier.isAbstract(modifiers)) {
-            varargsNonvirtualCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(varargsNonvirtualCallWrapperMethod)));
-            arrayNonvirtualCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(arrayNonvirtualCallWrapperMethod)));
-            valistNonvirtualCallWrapper = MethodPointer.factory(hUniverse.lookup(aUniverse.lookup(valistNonvirtualCallWrapperMethod)));
+            varargsNonvirtualCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(varargsNonvirtualCallWrapperMethod)));
+            arrayNonvirtualCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(arrayNonvirtualCallWrapperMethod)));
+            valistNonvirtualCallWrapper = new MethodPointer(hUniverse.lookup(aUniverse.lookup(valistNonvirtualCallWrapperMethod)));
         }
         setHidingSubclasses(access.getMetaAccess(), this::anyMatchIgnoreReturnType);
     }
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctionTablesFeature.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctionTablesFeature.java
index c317c23ac4ef..602e68473758 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctionTablesFeature.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctionTablesFeature.java
@@ -192,7 +192,7 @@ private static CFunctionPointer prepareCallTrampoline(CompilationAccessImpl acce
         HostedMethod hostedTrampoline = access.getUniverse().lookup(analysisTrampoline);
         hostedTrampoline.compilationInfo.setCustomParseFunction(trampolineMethod.createCustomParseFunction());
         hostedTrampoline.compilationInfo.setCustomCompileFunction(trampolineMethod.createCustomCompileFunction());
-        return MethodPointer.factory(hostedTrampoline);
+        return new MethodPointer(hostedTrampoline);
     }
 
     private static ResolvedJavaMethod getSingleMethod(MetaAccessProvider metaAccess, Class<?> holder) {
@@ -203,7 +203,7 @@ private static ResolvedJavaMethod getSingleMethod(MetaAccessProvider metaAccess,
 
     private static CFunctionPointer getStubFunctionPointer(CompilationAccessImpl access, HostedMethod method) {
         AnalysisMethod stub = CEntryPointCallStubSupport.singleton().getStubForMethod(method.getWrapped());
-        return MethodPointer.factory(access.getUniverse().lookup(stub));
+        return new MethodPointer(access.getUniverse().lookup(stub));
     }
 
     private void fillJNIInvocationInterfaceTable(CompilationAccessImpl access, CFunctionPointer[] table, CFunctionPointer defaultValue) {
@@ -236,7 +236,7 @@ private void fillJNIFunctionsTable(CompilationAccessImpl access, CFunctionPointe
             HostedMethod hostedMethod = access.getUniverse().lookup(analysisMethod);
 
             int offset = field.getOffsetInfo().getProperty();
-            setFunctionPointerTable(table, offset, MethodPointer.factory(hostedMethod));
+            setFunctionPointerTable(table, offset, new MethodPointer(hostedMethod));
         }
         for (CallVariant variant : CallVariant.values()) {
             CFunctionPointer trampoline = prepareCallTrampoline(access, variant, false);
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionFeature.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionFeature.java
index 827c4ea7d274..02684b29ba1e 100644
--- a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionFeature.java
+++ b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionFeature.java
@@ -154,7 +154,7 @@ private Object createAccessor(Executable member) {
     private CFunctionPointer register(ResolvedJavaMethod method) {
         AnalysisMethod aMethod = method instanceof AnalysisMethod ? (AnalysisMethod) method : analysisAccess.getUniverse().lookup(method);
         analysisAccess.registerAsCompiled(aMethod);
-        return MethodPointer.factory(aMethod);
+        return new MethodPointer(aMethod);
     }
 
     protected ResolvedJavaMethod createReflectiveInvokeMethod(String name, ResolvedJavaMethod prototype, Method method) {

From d1cd9734ef45f09873c7ef45a537a2160df07b52 Mon Sep 17 00:00:00 2001
From: Loic Ottet <loic.ottet@oracle.com>
Date: Wed, 22 Sep 2021 11:59:08 +0200
Subject: [PATCH 344/681] Add entry point to dump methods present in the image

---
 .../oracle/svm/core/code/CodeInfoDecoder.java | 32 +++++------
 .../svm/core/code/MethodMetadataEncoder.java  | 54 ++++++++++++-------
 .../RuntimeReflectionConstructors.java        |  8 +--
 .../reflect/hosted/ReflectionDataBuilder.java | 18 +++----
 .../RuntimeReflectionConstructorsImpl.java    | 20 +++----
 5 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
index 76f6a232252b..d1cfdb170f44 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
@@ -568,9 +568,9 @@ public static Executable[] getMethodMetadata(int typeID) {
 
             int modifiers = dataReader.getUVInt();
 
-            int paramCount = dataReader.getUVInt();
-            Class<?>[] paramTypes = new Class<?>[paramCount];
-            for (int j = 0; j < paramCount; ++j) {
+            int paramTypeCount = dataReader.getUVInt();
+            Class<?>[] paramTypes = new Class<?>[paramTypeCount];
+            for (int j = 0; j < paramTypeCount; ++j) {
                 int paramTypeIndex = dataReader.getSVInt();
                 paramTypes[j] = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoSourceClasses(info), paramTypeIndex);
             }
@@ -606,27 +606,27 @@ public static Executable[] getMethodMetadata(int typeID) {
                 typeAnnotations[j] = (byte) dataReader.getS1();
             }
 
-            boolean parameterDataPresent = dataReader.getU1() == 1;
-            String[] parameterNames = null;
-            int[] parameterModifiers = null;
-            if (parameterDataPresent) {
-                int parameterCount = dataReader.getUVInt();
-                parameterNames = new String[parameterCount];
-                parameterModifiers = new int[parameterCount];
-                for (int j = 0; j < paramCount; ++j) {
-                    int parameterNameIndex = dataReader.getSVInt();
-                    parameterNames[j] = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoSourceMethodNames(info), parameterNameIndex);
-                    parameterModifiers[j] = dataReader.getS4();
+            boolean reflectParameterDataPresent = dataReader.getU1() == 1;
+            String[] reflectParameterNames = null;
+            int[] reflectParameterModifiers = null;
+            if (reflectParameterDataPresent) {
+                int reflectParameterCount = dataReader.getUVInt();
+                reflectParameterNames = new String[reflectParameterCount];
+                reflectParameterModifiers = new int[reflectParameterCount];
+                for (int j = 0; j < reflectParameterCount; ++j) {
+                    int reflectParameterNameIndex = dataReader.getSVInt();
+                    reflectParameterNames[j] = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoSourceMethodNames(info), reflectParameterNameIndex);
+                    reflectParameterModifiers[j] = dataReader.getS4();
                 }
             }
 
             if (name.equals("<init>")) {
                 assert returnType == void.class;
                 methods[i] = ImageSingletons.lookup(RuntimeReflectionConstructors.class).newConstructor(declaringClass, paramTypes, exceptionTypes, modifiers, signature,
-                                annotations, parameterAnnotations, typeAnnotations, parameterNames, parameterModifiers);
+                                annotations, parameterAnnotations, typeAnnotations, reflectParameterNames, reflectParameterModifiers);
             } else {
                 methods[i] = ImageSingletons.lookup(RuntimeReflectionConstructors.class).newMethod(declaringClass, name, paramTypes, returnType, exceptionTypes, modifiers, signature,
-                                annotations, parameterAnnotations, null, typeAnnotations, parameterNames, parameterModifiers);
+                                annotations, parameterAnnotations, null, typeAnnotations, reflectParameterNames, reflectParameterModifiers);
             }
         }
         return methods;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/MethodMetadataEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/MethodMetadataEncoder.java
index 1c115fed93de..1d31af31d210 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/MethodMetadataEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/MethodMetadataEncoder.java
@@ -44,6 +44,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import org.graalvm.collections.Pair;
 import org.graalvm.compiler.core.common.util.TypeConversion;
 import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -57,6 +58,7 @@
 import com.oracle.svm.core.util.ByteArrayReader;
 import com.oracle.svm.util.ReflectionUtil;
 
+import jdk.vm.ci.meta.JavaType;
 import sun.invoke.util.Wrapper;
 import sun.reflect.annotation.AnnotationType;
 import sun.reflect.annotation.TypeAnnotation;
@@ -67,7 +69,7 @@ public class MethodMetadataEncoder {
     public static final int NO_METHOD_METADATA = -1;
 
     private CodeInfoEncoder.Encoders encoders;
-    private TreeMap<SharedType, Set<Executable>> methodData;
+    private TreeMap<SharedType, Set<Pair<SharedMethod, Executable>>> methodData;
 
     private byte[] methodDataEncoding;
     private byte[] methodDataIndexEncoding;
@@ -111,7 +113,7 @@ public void prepareMetadataForMethod(SharedMethod method, Executable reflectMeth
         }
 
         /* Register string values in annotations */
-        registerStrings(GuardedAnnotationAccess.getDeclaredAnnotations(reflectMethod));
+        registerStrings(GuardedAnnotationAccess.getDeclaredAnnotations(method));
         for (Annotation[] annotations : reflectMethod.getParameterAnnotations()) {
             registerStrings(annotations);
         }
@@ -126,7 +128,7 @@ public void prepareMetadataForMethod(SharedMethod method, Executable reflectMeth
         }
 
         SharedType declaringType = (SharedType) method.getDeclaringClass();
-        methodData.computeIfAbsent(declaringType, t -> new HashSet<>()).add(reflectMethod);
+        methodData.computeIfAbsent(declaringType, t -> new HashSet<>()).add(Pair.create(method, reflectMethod));
     }
 
     private static final Method hasRealParameterData = ReflectionUtil.lookupMethod(Executable.class, "hasRealParameterData");
@@ -135,9 +137,9 @@ private void encodeMethodMetadata() {
         UnsafeArrayTypeWriter dataEncodingBuffer = UnsafeArrayTypeWriter.create(ByteArrayReader.supportsUnalignedMemoryAccess());
         UnsafeArrayTypeWriter indexEncodingBuffer = UnsafeArrayTypeWriter.create(ByteArrayReader.supportsUnalignedMemoryAccess());
         long lastTypeID = -1;
-        for (Map.Entry<SharedType, Set<Executable>> entry : methodData.entrySet()) {
+        for (Map.Entry<SharedType, Set<Pair<SharedMethod, Executable>>> entry : methodData.entrySet()) {
             SharedType declaringType = entry.getKey();
-            Set<Executable> methods = entry.getValue();
+            Set<Pair<SharedMethod, Executable>> methods = entry.getValue();
             long typeID = declaringType.getHub().getTypeID();
             assert typeID > lastTypeID;
             lastTypeID++;
@@ -148,62 +150,70 @@ private void encodeMethodMetadata() {
             long index = dataEncodingBuffer.getBytesWritten();
             indexEncodingBuffer.putS4(index);
             dataEncodingBuffer.putUV(methods.size());
-            for (Executable method : methods) {
-                Class<?> declaringClass = method.getDeclaringClass();
+            for (Pair<SharedMethod, Executable> method : methods) {
+                SharedMethod hostedMethod = method.getLeft();
+                Executable reflectMethod = method.getRight();
+
+                Class<?> declaringClass = getJavaClass((SharedType) hostedMethod.getDeclaringClass());
                 final int classIndex = encoders.sourceClasses.getIndex(declaringClass);
                 dataEncodingBuffer.putSV(classIndex);
 
-                String name = method instanceof Constructor<?> ? "<init>" : ((Method) method).getName();
+                String name = hostedMethod.isConstructor() ? "<init>" : hostedMethod.getName();
                 final int nameIndex = encoders.sourceMethodNames.getIndex(name);
                 dataEncodingBuffer.putSV(nameIndex);
 
-                dataEncodingBuffer.putUV(method.getModifiers());
+                dataEncodingBuffer.putUV(reflectMethod.getModifiers());
 
-                Class<?>[] parameterTypes = method.getParameterTypes();
+                /* Parameter types do not include the receiver */
+                JavaType[] parameterTypes = hostedMethod.getSignature().toParameterTypes(null);
                 dataEncodingBuffer.putUV(parameterTypes.length);
-                for (Class<?> parameterType : parameterTypes) {
-                    final int paramClassIndex = encoders.sourceClasses.getIndex(parameterType);
+                for (JavaType parameterType : parameterTypes) {
+                    Class<?> parameterClass = getJavaClass((SharedType) parameterType);
+                    final int paramClassIndex = encoders.sourceClasses.getIndex(parameterClass);
                     dataEncodingBuffer.putSV(paramClassIndex);
                 }
 
-                Class<?> returnType = method instanceof Constructor<?> ? void.class : ((Method) method).getReturnType();
+                Class<?> returnType = void.class;
+                if (!hostedMethod.isConstructor()) {
+                    returnType = getJavaClass((SharedType) hostedMethod.getSignature().getReturnType(null));
+                }
                 final int returnTypeIndex = encoders.sourceClasses.getIndex(returnType);
                 dataEncodingBuffer.putSV(returnTypeIndex);
 
                 /* Only include types that are in the image (i.e. that can actually be thrown) */
-                Class<?>[] exceptionTypes = filterTypes(method.getExceptionTypes());
+                Class<?>[] exceptionTypes = filterTypes(reflectMethod.getExceptionTypes());
                 dataEncodingBuffer.putUV(exceptionTypes.length);
                 for (Class<?> exceptionClazz : exceptionTypes) {
                     final int exceptionClassIndex = encoders.sourceClasses.getIndex(exceptionClazz);
                     dataEncodingBuffer.putSV(exceptionClassIndex);
                 }
 
-                final int signatureIndex = encoders.sourceMethodNames.getIndex(getSignature(method));
+                final int signatureIndex = encoders.sourceMethodNames.getIndex(getSignature(reflectMethod));
                 dataEncodingBuffer.putSV(signatureIndex);
 
                 try {
-                    byte[] annotations = encodeAnnotations(GuardedAnnotationAccess.getDeclaredAnnotations(method));
+                    byte[] annotations = encodeAnnotations(GuardedAnnotationAccess.getDeclaredAnnotations(hostedMethod));
                     dataEncodingBuffer.putUV(annotations.length);
                     for (byte b : annotations) {
                         dataEncodingBuffer.putS1(b);
                     }
 
-                    byte[] parameterAnnotations = encodeParameterAnnotations(method.getParameterAnnotations());
+                    byte[] parameterAnnotations = encodeParameterAnnotations(reflectMethod.getParameterAnnotations());
                     dataEncodingBuffer.putUV(parameterAnnotations.length);
                     for (byte b : parameterAnnotations) {
                         dataEncodingBuffer.putS1(b);
                     }
 
-                    byte[] typeAnnotations = encodeTypeAnnotations((TypeAnnotation[]) parseAllTypeAnnotations.invoke(null, method));
+                    byte[] typeAnnotations = encodeTypeAnnotations((TypeAnnotation[]) parseAllTypeAnnotations.invoke(null, reflectMethod));
                     dataEncodingBuffer.putUV(typeAnnotations.length);
                     for (byte b : typeAnnotations) {
                         dataEncodingBuffer.putS1(b);
                     }
 
-                    boolean parameterDataPresent = (boolean) hasRealParameterData.invoke(method);
+                    boolean parameterDataPresent = (boolean) hasRealParameterData.invoke(reflectMethod);
                     dataEncodingBuffer.putU1(parameterDataPresent ? 1 : 0);
                     if (parameterDataPresent) {
-                        Parameter[] parameters = method.getParameters();
+                        Parameter[] parameters = reflectMethod.getParameters();
                         dataEncodingBuffer.putUV(parameters.length);
                         for (Parameter parameter : parameters) {
                             final int parameterNameIndex = encoders.sourceMethodNames.getIndex(parameter.getName());
@@ -226,6 +236,10 @@ private void encodeMethodMetadata() {
         indexEncodingBuffer.toArray(methodDataIndexEncoding);
     }
 
+    private static Class<?> getJavaClass(SharedType sharedType) {
+        return sharedType.getHub().getHostedJavaClass();
+    }
+
     private Class<?>[] filterTypes(Class<?>[] types) {
         List<Class<?>> filteredTypes = new ArrayList<>();
         for (Class<?> type : types) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/RuntimeReflectionConstructors.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/RuntimeReflectionConstructors.java
index 70144b88b2a6..49da93a3384c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/RuntimeReflectionConstructors.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/RuntimeReflectionConstructors.java
@@ -41,8 +41,8 @@ Method newMethod(Class<?> declaringClass,
                     byte[] parameterAnnotations,
                     byte[] annotationDefault,
                     byte[] typeAnnotations,
-                    String[] parameterNames,
-                    int[] parameterModifiers);
+                    String[] reflectParameterNames,
+                    int[] reflectParameterModifiers);
 
     Constructor<?> newConstructor(Class<?> declaringClass,
                     Class<?>[] parameterTypes,
@@ -52,6 +52,6 @@ Constructor<?> newConstructor(Class<?> declaringClass,
                     byte[] annotations,
                     byte[] parameterAnnotations,
                     byte[] typeAnnotations,
-                    String[] parameterNames,
-                    int[] parameterModifiers);
+                    String[] reflectParameterNames,
+                    int[] reflectParameterModifiers);
 }
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java
index 661ea1dd667e..0a5d70ab99a0 100644
--- a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java
+++ b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java
@@ -231,12 +231,10 @@ private void processReachableTypes(DuringAnalysisAccessImpl access) {
 
     protected void processMethodMetadata(DuringAnalysisAccessImpl access) {
         if (SubstrateOptions.ConfigureReflectionMetadata.getValue()) {
-            /* Trigger creation of the AnalysisMethod objects needed to store metadata */
             Set<Executable> newQueriedMethods = new HashSet<>();
             for (Executable method : queriedMethods) {
                 if (!SubstitutionReflectivityFilter.shouldExclude(method, access.getMetaAccess(), access.getUniverse())) {
-                    access.getMetaAccess().lookupJavaMethod(method);
-                    registerMetadataForReflection(access, method);
+                    registerMetadataForReflection(access, access.getMetaAccess().lookupJavaMethod(method), method);
                     newQueriedMethods.add(method);
                 }
             }
@@ -248,7 +246,7 @@ protected void processMethodMetadata(DuringAnalysisAccessImpl access) {
                  * method.
                  */
                 if (method.isReachable() && method.hasJavaMethod()) {
-                    registerMetadataForReflection(access, method.getJavaMethod());
+                    registerMetadataForReflection(access, method, method.getJavaMethod());
                 }
             }
         }
@@ -256,18 +254,18 @@ protected void processMethodMetadata(DuringAnalysisAccessImpl access) {
 
     private static final Method parseAllTypeAnnotations = ReflectionUtil.lookupMethod(TypeAnnotationParser.class, "parseAllTypeAnnotations", AnnotatedElement.class);
 
-    private void registerMetadataForReflection(DuringAnalysisAccessImpl access, Executable reflectMethod) {
+    private void registerMetadataForReflection(DuringAnalysisAccessImpl access, AnalysisMethod analysisMethod, Executable reflectMethod) {
         /*
          * Reflection signature parsing will try to instantiate classes via Class.forName().
          */
-        makeTypeReachable(access, reflectMethod.getDeclaringClass(), false);
+        makeTypeReachable(access, analysisMethod.getDeclaringClass().getJavaClass(), false);
         for (TypeVariable<?> type : reflectMethod.getTypeParameters()) {
             makeTypeReachable(access, type, true);
         }
-        for (Type paramType : reflectMethod.getGenericParameterTypes()) {
+        for (Type paramType : analysisMethod.getGenericParameterTypes()) {
             makeTypeReachable(access, paramType, true);
         }
-        if (reflectMethod instanceof Method) {
+        if (!analysisMethod.isConstructor()) {
             makeTypeReachable(access, ((Method) reflectMethod).getGenericReturnType(), true);
         }
         for (Type exceptionType : reflectMethod.getGenericExceptionTypes()) {
@@ -277,7 +275,7 @@ private void registerMetadataForReflection(DuringAnalysisAccessImpl access, Exec
         /*
          * Enable runtime parsing of annotations
          */
-        for (Annotation annotation : GuardedAnnotationAccess.getDeclaredAnnotations(reflectMethod)) {
+        for (Annotation annotation : GuardedAnnotationAccess.getDeclaredAnnotations(analysisMethod)) {
             makeTypeReachable(access, annotation.annotationType(), false);
         }
         for (Annotation[] parameterAnnotations : reflectMethod.getParameterAnnotations()) {
@@ -304,7 +302,7 @@ private void makeTypeReachable(DuringAnalysisAccessImpl access, Type type, boole
             return;
         }
         seenTypes.add(type);
-        if (type instanceof Class<?>) {
+        if (type instanceof Class<?> && !SubstitutionReflectivityFilter.shouldExclude((Class<?>) type, access.getMetaAccess(), access.getUniverse())) {
             Class<?> clazz = (Class<?>) type;
             if (access.getMetaAccess().lookupJavaType(clazz).registerAsReachable()) {
                 access.requireAnalysisIteration();
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/RuntimeReflectionConstructorsImpl.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/RuntimeReflectionConstructorsImpl.java
index e6a1c33372e1..ec0bcbb0d9ca 100644
--- a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/RuntimeReflectionConstructorsImpl.java
+++ b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/RuntimeReflectionConstructorsImpl.java
@@ -35,32 +35,32 @@
 public class RuntimeReflectionConstructorsImpl implements RuntimeReflectionConstructors {
     @Override
     public Method newMethod(Class<?> declaringClass, String name, Class<?>[] parameterTypes, Class<?> returnType, Class<?>[] checkedExceptions, int modifiers, String signature,
-                    byte[] annotations, byte[] parameterAnnotations, byte[] annotationDefault, byte[] typeAnnotations, String[] parameterNames, int[] parameterModifiers) {
+                    byte[] annotations, byte[] parameterAnnotations, byte[] annotationDefault, byte[] typeAnnotations, String[] reflectParameterNames, int[] reflectParameterModifiers) {
         Target_java_lang_reflect_Method method = new Target_java_lang_reflect_Method();
         method.constructor(declaringClass, name, parameterTypes, returnType, checkedExceptions, modifiers, -1, signature, annotations, parameterAnnotations, annotationDefault);
-        fillParameters(SubstrateUtil.cast(method, Target_java_lang_reflect_Executable.class), parameterNames, parameterModifiers);
+        fillReflectParameters(SubstrateUtil.cast(method, Target_java_lang_reflect_Executable.class), reflectParameterNames, reflectParameterModifiers);
         SubstrateUtil.cast(method, Target_java_lang_reflect_Executable.class).typeAnnotations = typeAnnotations;
         return SubstrateUtil.cast(method, Method.class);
     }
 
     @Override
     public Constructor<?> newConstructor(Class<?> declaringClass, Class<?>[] parameterTypes, Class<?>[] checkedExceptions, int modifiers, String signature,
-                    byte[] annotations, byte[] parameterAnnotations, byte[] typeAnnotations, String[] parameterNames, int[] parameterModifiers) {
+                    byte[] annotations, byte[] parameterAnnotations, byte[] typeAnnotations, String[] reflectParameterNames, int[] reflectParameterModifiers) {
         Target_java_lang_reflect_Constructor cons = new Target_java_lang_reflect_Constructor();
         cons.constructor(declaringClass, parameterTypes, checkedExceptions, modifiers, -1, signature, annotations, parameterAnnotations);
-        fillParameters(SubstrateUtil.cast(cons, Target_java_lang_reflect_Executable.class), parameterNames, parameterModifiers);
+        fillReflectParameters(SubstrateUtil.cast(cons, Target_java_lang_reflect_Executable.class), reflectParameterNames, reflectParameterModifiers);
         SubstrateUtil.cast(cons, Target_java_lang_reflect_Executable.class).typeAnnotations = typeAnnotations;
         return SubstrateUtil.cast(cons, Constructor.class);
     }
 
-    private static void fillParameters(Target_java_lang_reflect_Executable executable, String[] parameterNames, int[] parameterModifiers) {
-        if (parameterNames != null && parameterModifiers != null) {
+    private static void fillReflectParameters(Target_java_lang_reflect_Executable executable, String[] reflectParameterNames, int[] reflectParameterModifiers) {
+        if (reflectParameterNames != null && reflectParameterModifiers != null) {
             executable.hasRealParameterData = true;
-            assert parameterNames.length == parameterModifiers.length;
-            executable.parameters = new Target_java_lang_reflect_Parameter[parameterNames.length];
-            for (int i = 0; i < parameterNames.length; ++i) {
+            assert reflectParameterNames.length == reflectParameterModifiers.length;
+            executable.parameters = new Target_java_lang_reflect_Parameter[reflectParameterNames.length];
+            for (int i = 0; i < reflectParameterNames.length; ++i) {
                 executable.parameters[i] = new Target_java_lang_reflect_Parameter();
-                executable.parameters[i].constructor(parameterNames[i], parameterModifiers[i], executable, i);
+                executable.parameters[i].constructor(reflectParameterNames[i], reflectParameterModifiers[i], executable, i);
             }
         } else {
             executable.hasRealParameterData = false;

From eb20426be6b77266babdb8d51c5a31316eba7634 Mon Sep 17 00:00:00 2001
From: Loic Ottet <loic.ottet@oracle.com>
Date: Tue, 5 Oct 2021 14:02:09 +0200
Subject: [PATCH 345/681] Fix espresso names gate

---
 espresso/mx.espresso/mx_espresso.py                      | 9 ++++++++-
 .../include/libespresso_dynamic.h                        | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/espresso/mx.espresso/mx_espresso.py b/espresso/mx.espresso/mx_espresso.py
index 879b402edc4b..bf408b7a8c66 100644
--- a/espresso/mx.espresso/mx_espresso.py
+++ b/espresso/mx.espresso/mx_espresso.py
@@ -129,7 +129,14 @@ def _espresso_gate_runner(args, tasks):
                             break
 
                 with open(generated_header, 'r') as generated_header_file:
-                    generated_header_lines = generated_header_file.readlines()
+                    generated_header_lines = []
+                    for line in generated_header_file.readlines():
+                        # Ignore definitions that are not needed for Espresso
+                        if not line.startswith("typedef") or "(*Espresso_" in line or "__graal" in line or "(*graal_" in line:
+                            generated_header_lines.append(line)
+                        else:
+                            newline = generated_header_lines.pop()  # Remove newline before ignored declaration
+                            assert newline == "\n"
 
                 errors = errors or mx.update_file(committed_header, ''.join(committed_header_copyright + generated_header_lines), showDiff=True)
 
diff --git a/espresso/src/com.oracle.truffle.espresso.mokapot/include/libespresso_dynamic.h b/espresso/src/com.oracle.truffle.espresso.mokapot/include/libespresso_dynamic.h
index 3ad28a709a59..d86a18b168cf 100644
--- a/espresso/src/com.oracle.truffle.espresso.mokapot/include/libespresso_dynamic.h
+++ b/espresso/src/com.oracle.truffle.espresso.mokapot/include/libespresso_dynamic.h
@@ -42,8 +42,6 @@ typedef int (*Espresso_CloseContext_fn_t)(graal_isolatethread_t* thread, struct
 
 typedef void (*Espresso_Exit_fn_t)(graal_isolatethread_t* thread, struct JavaVM_* javaVM);
 
-typedef void (*vmLocatorSymbol_fn_t)(graal_isolatethread_t* thread);
-
 #if defined(__cplusplus)
 }
 #endif

From c00c4bc0cb073310ee90bb0a7f116349eaaaf712 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 7 Oct 2021 12:41:07 +0200
Subject: [PATCH 346/681] Improve error and doc for
 ProxyObject#getMemberKeys().

---
 .../graalvm/polyglot/proxy/ProxyObject.java   | 17 +++--
 .../api/test/polyglot/ProxySPITest.java       | 74 ++++++++++++++++++-
 .../com/oracle/truffle/host/HostProxy.java    |  9 +++
 3 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/proxy/ProxyObject.java b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/proxy/ProxyObject.java
index eeaec2a074b7..3116b4893391 100644
--- a/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/proxy/ProxyObject.java
+++ b/sdk/src/org.graalvm.polyglot/src/org/graalvm/polyglot/proxy/ProxyObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,6 +45,7 @@
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.HostAccess;
 
 /**
  * Interface to be implemented to mimic guest language objects that contain members.
@@ -63,16 +64,16 @@ public interface ProxyObject extends Proxy {
     Object getMember(String key);
 
     /**
-     * Returns array of member keys. The returned array must be interpreted as having array elements
-     * using the semantics of {@link Context#asValue(Object)} otherwise and
-     * {@link IllegalStateException} is thrown. If one of the return values of the array is not a
-     * {@link String} then a {@link ClassCastException} is thrown. Examples for valid return values
-     * are:
+     * Returns an array of member keys. The returned array must be interpreted as having array
+     * elements using the semantics of {@link Context#asValue(Object)} and taking host access into
+     * consideration. Otherwise, an {@link IllegalStateException} is thrown. If one of the return
+     * values of the array is not a {@link String} then a {@link ClassCastException} is thrown.
+     * Examples for valid return values are:
      * <ul>
      * <li><code>null</code> for no member keys
      * <li>{@link ProxyArray} that returns {@link String} values for each array element
-     * <li>{@link List } with exclusively String elements
-     * <li>{@link String String[]}
+     * <li>{@link List } with exclusively String elements ({@link HostAccess} must allowListAccess)
+     * <li>{@link String String[]} ({@link HostAccess} must allowArrayAccess)
      * <li>A guest language object representing an array of strings.
      * </ul>
      * Every member key returned by the {@link #getMemberKeys()} method must return
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxySPITest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxySPITest.java
index f0d3de2acd48..8880e8ab7841 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxySPITest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ProxySPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,6 +43,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -55,6 +56,9 @@
 import java.util.Map;
 
 import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.HostAccess;
+import org.graalvm.polyglot.PolyglotAccess;
+import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.Proxy;
 import org.graalvm.polyglot.proxy.ProxyArray;
@@ -71,6 +75,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.interop.InteropException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
@@ -78,6 +83,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.RootNode;
 
 /**
  * Testing the behavior of proxies towards languages.
@@ -282,6 +288,72 @@ public void testProxyObject() throws Throwable {
         assertEmpty(INTEROP.getMembers(proxyInner));
     }
 
+    /*
+     * Test for GR27558.
+     */
+    @Test
+    public void testProxyObjectAndHostAccess() {
+        setupEnv(Context.newBuilder(ProxyLanguage.ID).allowPolyglotAccess(PolyglotAccess.ALL).allowHostAccess(HostAccess.NONE).build(), new ProxyLanguage() {
+            @Override
+            protected CallTarget parse(ParsingRequest request) throws Exception {
+                String bindingMemberName = request.getSource().getCharacters().toString();
+                InteropLibrary interopLibrary = InteropLibrary.getUncached();
+                Object memberKeys = interopLibrary.getMembers(interopLibrary.readMember(languageEnv.getPolyglotBindings(), bindingMemberName));
+                return RootNode.createConstantNode(memberKeys).getCallTarget();
+            }
+        });
+
+        class MemberKeysProxy implements ProxyObject {
+            private Object memberKeys;
+
+            MemberKeysProxy(Object memberKeys) {
+                this.memberKeys = memberKeys;
+            }
+
+            @Override
+            public Object getMemberKeys() {
+                return memberKeys;
+            }
+
+            @Override
+            public boolean hasMember(String key) {
+                return true;
+            }
+
+            @Override
+            public Object getMember(String key) {
+                return null;
+            }
+
+            @Override
+            public void putMember(String key, Value value) {
+            }
+        }
+
+        context.initialize(ProxyLanguage.ID);
+
+        Object[] memberKeys = new Object[]{"one", "two"};
+        context.getPolyglotBindings().putMember("proxyArray", new MemberKeysProxy(memberKeys));
+        context.getPolyglotBindings().putMember("proxyList", new MemberKeysProxy(Arrays.asList(memberKeys)));
+        context.getPolyglotBindings().putMember("proxyProxyArray", new MemberKeysProxy(ProxyArray.fromArray(memberKeys)));
+        try {
+            context.eval(ProxyLanguage.ID, "proxyArray");
+            fail();
+        } catch (PolyglotException e) {
+            assertTrue(e.getMessage().contains("allowArrayAccess in HostAccess is false."));
+        }
+        try {
+            context.eval(ProxyLanguage.ID, "proxyList");
+            fail();
+        } catch (PolyglotException e) {
+            assertTrue(e.getMessage().contains("allowListAccess in HostAccess is false."));
+        }
+        Value proxyArrayMembers = context.eval(ProxyLanguage.ID, "proxyProxyArray");
+        assertTrue(proxyArrayMembers.hasArrayElements());
+        assertEquals(2, proxyArrayMembers.getArraySize());
+        assertEquals("two", proxyArrayMembers.getArrayElement(1).asString());
+    }
+
     @Test
     public void testProxyObjectUnsupported() throws Throwable {
         ProxyObject proxyOuter = new ProxyObject() {
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostProxy.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostProxy.java
index a9b07dc869c4..85539494dacf 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostProxy.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostProxy.java
@@ -48,6 +48,7 @@
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.List;
 
 import org.graalvm.polyglot.Value;
 import org.graalvm.polyglot.proxy.Proxy;
@@ -288,6 +289,14 @@ Object getMembers(@SuppressWarnings("unused") boolean includeInternal,
             Object guestValue = context.toGuestValue(library, result);
             InteropLibrary interop = InteropLibrary.getFactory().getUncached();
             if (!interop.hasArrayElements(guestValue)) {
+                if (guestValue instanceof HostObject) {
+                    HostObject hostObject = (HostObject) guestValue;
+                    if (hostObject.obj.getClass().isArray() && !hostObject.getHostClassCache().isArrayAccess()) {
+                        throw illegalProxy(context, "getMemberKeys() returned a Java array %s, but allowArrayAccess in HostAccess is false.", context.asValue(library, guestValue).toString());
+                    } else if (hostObject.obj instanceof List && !hostObject.getHostClassCache().isListAccess()) {
+                        throw illegalProxy(context, "getMemberKeys() returned a Java List %s, but allowListAccess in HostAccess is false.", context.asValue(library, guestValue).toString());
+                    }
+                }
                 throw illegalProxy(context, "getMemberKeys() returned invalid value %s but must return an array of member key Strings.",
                                 context.asValue(library, guestValue).toString());
             }

From 4827acfe8fc6a20f7a3b0ca15745e45d1ecb3368 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Thu, 7 Oct 2021 09:31:45 +0200
Subject: [PATCH 347/681] Espresso: mark 17 as supported in version metadata

---
 .../src/com/oracle/truffle/espresso/EspressoLanguage.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
index 61166a8a1951..3f1c4ca600bf 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
@@ -72,7 +72,7 @@ public final class EspressoLanguage extends TruffleLanguage<EspressoContext> {
     public static final String ID = "java";
     public static final String NAME = "Java";
     public static final String IMPLEMENTATION_NAME = "Espresso";
-    public static final String VERSION = "1.8|11";
+    public static final String VERSION = "1.8|11|17";
 
     // Espresso VM info
     public static final String VM_SPECIFICATION_NAME = "Java Virtual Machine Specification";

From 463b0945570cf22e6dd12bfde62e364623a96ad1 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Thu, 7 Oct 2021 11:11:46 +0200
Subject: [PATCH 348/681] Bump copyright year in polyglot launcher

---
 .../src/org/graalvm/launcher/MultiLanguageShell.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java
index 4923727ecbf1..1a857ac824f3 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/MultiLanguageShell.java
@@ -223,7 +223,7 @@ private boolean handleBuiltins() {
 
     private void printHeader() {
         println("GraalVM MultiLanguage Shell " + context.getEngine().getVersion());
-        println("Copyright (c) 2013-2020, Oracle and/or its affiliates");
+        println("Copyright (c) 2013-2021, Oracle and/or its affiliates");
         for (Language language : languages) {
             println("  " + language.getName() + " version " + language.getVersion());
         }

From bcbc91a5fde77a2a0e9d07466756fbd1ec187d4e Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Fri, 8 Oct 2021 11:54:31 +0200
Subject: [PATCH 349/681] Remove version in espresso language registration

This version should rather be the implementation version for which the
default value works fine.
---
 .../src/com/oracle/truffle/espresso/EspressoLanguage.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
index 3f1c4ca600bf..d3f9d3dd0325 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/EspressoLanguage.java
@@ -25,13 +25,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
-import com.oracle.truffle.api.ContextThreadLocal;
-import com.oracle.truffle.espresso.runtime.EspressoThreadLocalState;
 import org.graalvm.home.Version;
 import org.graalvm.options.OptionDescriptors;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.ContextThreadLocal;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
 import com.oracle.truffle.api.instrumentation.ProvidedTags;
@@ -56,6 +55,7 @@
 import com.oracle.truffle.espresso.nodes.interop.GetBindingsNode;
 import com.oracle.truffle.espresso.runtime.EspressoContext;
 import com.oracle.truffle.espresso.runtime.EspressoExitException;
+import com.oracle.truffle.espresso.runtime.EspressoThreadLocalState;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 import com.oracle.truffle.espresso.runtime.StaticObject.StaticObjectFactory;
 import com.oracle.truffle.espresso.substitutions.Substitutions;
@@ -63,7 +63,6 @@
 @Registration(id = EspressoLanguage.ID, //
                 name = EspressoLanguage.NAME, //
                 implementationName = EspressoLanguage.IMPLEMENTATION_NAME, //
-                version = EspressoLanguage.VERSION, //
                 contextPolicy = TruffleLanguage.ContextPolicy.EXCLUSIVE, //
                 dependentLanguages = {"nfi", "llvm"})
 @ProvidedTags({StandardTags.RootTag.class, StandardTags.RootBodyTag.class, StandardTags.StatementTag.class})
@@ -72,7 +71,6 @@ public final class EspressoLanguage extends TruffleLanguage<EspressoContext> {
     public static final String ID = "java";
     public static final String NAME = "Java";
     public static final String IMPLEMENTATION_NAME = "Espresso";
-    public static final String VERSION = "1.8|11|17";
 
     // Espresso VM info
     public static final String VM_SPECIFICATION_NAME = "Java Virtual Machine Specification";

From 4f7d8dc845d50bc746d3e84b163322fb7fb1dd54 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 7 Oct 2021 11:41:10 +0200
Subject: [PATCH 350/681] Improve heap verifier.

---
 .../svm/core/genscavenge/HeapVerifier.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
index 279319c09629..78f8cb73c4a5 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
@@ -361,17 +361,28 @@ private static boolean verifyReference(Object parentObject, Pointer reference, P
 
         if (!HeapImpl.getHeapImpl().isInHeap(referencedObject)) {
             Log.log().string("Object reference at ").zhex(reference).string(" points outside the Java heap: ").zhex(referencedObject).string(". ");
-            if (parentObject != null) {
-                Log.log().string("The object that contains the invalid reference is of type ").string(parentObject.getClass().getName()).newline();
-            } else {
-                Log.log().string("The invalid reference is on the stack.").newline();
-            }
+            printParentObject(parentObject);
+            return false;
+        }
+
+        if (!ObjectHeaderImpl.getObjectHeaderImpl().pointsToObjectHeader(referencedObject)) {
+            Log.log().string("Object reference at ").zhex(reference).string(" does not point to a Java object or the object header of the Java object is invalid: ").zhex(referencedObject)
+                            .string(". ");
+            printParentObject(parentObject);
             return false;
         }
 
         return true;
     }
 
+    private static void printParentObject(Object parentObject) {
+        if (parentObject != null) {
+            Log.log().string("The object that contains the invalid reference is of type ").string(parentObject.getClass().getName()).newline();
+        } else {
+            Log.log().string("The invalid reference is on the stack.").newline();
+        }
+    }
+
     private static class ImageHeapRegionVerifier implements MemoryWalker.ImageHeapRegionVisitor {
         private final ImageHeapObjectVerifier objectVerifier;
 

From 01a0e755c678cfc0d6616e700168e01cd6f8b6b7 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 7 Oct 2021 13:33:33 +0200
Subject: [PATCH 351/681] Improve the zeroing of unaligned chunks.

---
 .../core/genscavenge/HeapChunkProvider.java   | 12 ++++---
 .../genscavenge/ThreadLocalAllocation.java    |  9 ++---
 .../svm/core/code/RuntimeCodeInfoAccess.java  |  4 +--
 .../os/AbstractCommittedMemoryProvider.java   | 33 ++++++++++++++++++
 .../svm/core/os/CommittedMemoryProvider.java  | 34 +++++++++++++++++--
 .../core/os/OSCommittedMemoryProvider.java    |  5 +++
 6 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
index 8b00abcf8196..f1cdc1cc1fa1 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
@@ -109,7 +109,7 @@ AlignedHeader produceAlignedChunk() {
         if (result.isNull()) {
             /* Unused list was empty, need to allocate memory. */
             noteFirstAllocationTime();
-            result = (AlignedHeader) CommittedMemoryProvider.get().allocate(chunkSize, HeapParameters.getAlignedHeapChunkAlignment(), false);
+            result = (AlignedHeader) CommittedMemoryProvider.get().allocateAlignedChunk(chunkSize, HeapParameters.getAlignedHeapChunkAlignment());
             if (result.isNull()) {
                 throw ALIGNED_OUT_OF_MEMORY_ERROR;
             }
@@ -267,7 +267,7 @@ UnalignedHeader produceUnalignedChunk(UnsignedWord objectSize) {
         log().string("[HeapChunkProvider.produceUnalignedChunk  objectSize: ").unsigned(objectSize).string("  chunkSize: ").zhex(chunkSize).newline();
 
         noteFirstAllocationTime();
-        UnalignedHeader result = (UnalignedHeader) CommittedMemoryProvider.get().allocate(chunkSize, CommittedMemoryProvider.UNALIGNED, false);
+        UnalignedHeader result = (UnalignedHeader) CommittedMemoryProvider.get().allocateUnalignedChunk(chunkSize);
         if (result.isNull()) {
             throw UNALIGNED_OUT_OF_MEMORY_ERROR;
         }
@@ -283,6 +283,10 @@ UnalignedHeader produceUnalignedChunk(UnsignedWord objectSize) {
         return result;
     }
 
+    public boolean areUnalignedChunksZeroed() {
+        return CommittedMemoryProvider.get().areUnalignedChunksZeroed();
+    }
+
     /**
      * Releases a list of UnalignedHeapChunks back to the operating system. They are never recycled
      * to a free list.
@@ -362,12 +366,12 @@ static void freeUnalignedChunkList(UnalignedHeader first) {
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     private static void freeAlignedChunk(AlignedHeader chunk) {
-        CommittedMemoryProvider.get().free(chunk, HeapParameters.getAlignedHeapChunkSize(), HeapParameters.getAlignedHeapChunkAlignment(), false);
+        CommittedMemoryProvider.get().freeAlignedChunk(chunk, HeapParameters.getAlignedHeapChunkSize(), HeapParameters.getAlignedHeapChunkAlignment());
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     private static void freeUnalignedChunk(UnalignedHeader chunk) {
-        CommittedMemoryProvider.get().free(chunk, unalignedChunkSize(chunk), CommittedMemoryProvider.UNALIGNED, false);
+        CommittedMemoryProvider.get().freeUnalignedChunk(chunk, unalignedChunkSize(chunk));
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
index 323dbc14b516..12c240f616eb 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -234,8 +234,9 @@ private static Object slowPathNewArrayWithoutAllocating(DynamicHub hub, int leng
 
             if (size.aboveOrEqual(HeapParameters.getLargeArrayThreshold())) {
                 /* Large arrays go into their own unaligned chunk. */
+                boolean needsZeroing = !HeapImpl.getChunkProvider().areUnalignedChunksZeroed();
                 UnalignedHeapChunk.UnalignedHeader newTlabChunk = HeapImpl.getChunkProvider().produceUnalignedChunk(size);
-                return allocateLargeArrayInNewTlab(hub, length, size, fillStartOffset, newTlabChunk);
+                return allocateLargeArrayInNewTlab(hub, length, size, fillStartOffset, newTlabChunk, needsZeroing);
             }
             /* Small arrays go into the regular aligned chunk. */
 
@@ -274,7 +275,7 @@ private static Object allocateSmallArrayInNewTlab(DynamicHub hub, int length, Un
     }
 
     @Uninterruptible(reason = "Holds uninitialized memory, modifies TLAB")
-    private static Object allocateLargeArrayInNewTlab(DynamicHub hub, int length, UnsignedWord size, int fillStartOffset, UnalignedHeapChunk.UnalignedHeader newTlabChunk) {
+    private static Object allocateLargeArrayInNewTlab(DynamicHub hub, int length, UnsignedWord size, int fillStartOffset, UnalignedHeapChunk.UnalignedHeader newTlabChunk, boolean needsZeroing) {
         ThreadLocalAllocation.Descriptor tlab = getTlab();
 
         HeapChunk.setNext(newTlabChunk, tlab.getUnalignedChunk());
@@ -284,8 +285,8 @@ private static Object allocateLargeArrayInNewTlab(DynamicHub hub, int length, Un
         Pointer memory = UnalignedHeapChunk.allocateMemory(newTlabChunk, size);
         assert memory.isNonNull();
 
-        /* Install the DynamicHub and length, and zero the elements. */
-        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, true, true, fillStartOffset, true);
+        /* Install the DynamicHub and length. Also zero the elements if necessary. */
+        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, true, needsZeroing, fillStartOffset, true);
     }
 
     @Uninterruptible(reason = "Returns uninitialized memory, modifies TLAB", callerMustBe = true)
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
index bc6322ac101e..f519a203535f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
@@ -233,12 +233,12 @@ private static void releaseMemory(CodeInfo info, boolean notifyGC) {
     }
 
     public static CodePointer allocateCodeMemory(UnsignedWord size) {
-        return (CodePointer) CommittedMemoryProvider.get().allocate(size, WordFactory.unsigned(SubstrateOptions.codeAlignment()), true);
+        return (CodePointer) CommittedMemoryProvider.get().allocateExecutableMemory(size, WordFactory.unsigned(SubstrateOptions.codeAlignment()));
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public static void releaseCodeMemory(CodePointer codeStart, UnsignedWord codeSize) {
-        CommittedMemoryProvider.get().free(codeStart, codeSize, WordFactory.unsigned(SubstrateOptions.codeAlignment()), true);
+        CommittedMemoryProvider.get().freeExecutableMemory(codeStart, codeSize, WordFactory.unsigned(SubstrateOptions.codeAlignment()));
     }
 
     public static void makeCodeMemoryExecutableReadOnly(CodePointer codeStart, UnsignedWord codeSize) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
index 3acca7f3f2dd..87412abf2579 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
@@ -48,6 +48,39 @@ public boolean guaranteesHeapPreferredAddressSpaceAlignment() {
         return SubstrateOptions.SpawnIsolates.getValue() && ImageHeapProvider.get().guaranteesHeapPreferredAddressSpaceAlignment();
     }
 
+    @Override
+    public Pointer allocateAlignedChunk(UnsignedWord nbytes, UnsignedWord alignment) {
+        return allocate(nbytes, alignment, false);
+    }
+
+    @Override
+    public Pointer allocateUnalignedChunk(UnsignedWord nbytes) {
+        return allocate(nbytes, CommittedMemoryProvider.UNALIGNED, false);
+    }
+
+    @Override
+    public Pointer allocateExecutableMemory(UnsignedWord nbytes, UnsignedWord alignment) {
+        return allocate(nbytes, alignment, true);
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public void freeAlignedChunk(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment) {
+        free(start, nbytes, alignment, false);
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public void freeUnalignedChunk(PointerBase start, UnsignedWord nbytes) {
+        free(start, nbytes, CommittedMemoryProvider.UNALIGNED, false);
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public void freeExecutableMemory(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment) {
+        free(start, nbytes, alignment, true);
+    }
+
     @Uninterruptible(reason = "Still being initialized.")
     protected static int protectSingleIsolateImageHeap() {
         assert !SubstrateOptions.SpawnIsolates.getValue() : "Must be handled by ImageHeapProvider when SpawnIsolates is enabled";
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
index 5c982b45b59b..1782f18eb5c5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
@@ -26,6 +26,7 @@
 
 import java.util.EnumSet;
 
+import com.oracle.svm.core.util.VMError;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.WordPointer;
@@ -99,7 +100,23 @@ default UnsignedWord getGranularity() {
      * @return The start of the allocated block, or {@link WordFactory#nullPointer()} in case of an
      *         error.
      */
-    Pointer allocate(UnsignedWord nbytes, UnsignedWord alignment, boolean executable);
+    default Pointer allocate(UnsignedWord nbytes, UnsignedWord alignment, boolean executable) {
+        // We need this default method temporarily so that we can remove the methods allocate and
+        // free from all subclasses in GR-34236.
+        throw VMError.shouldNotReachHere("Subclasses must overwrite this method");
+    }
+
+    Pointer allocateAlignedChunk(UnsignedWord nbytes, UnsignedWord alignment);
+
+    Pointer allocateUnalignedChunk(UnsignedWord nbytes);
+
+    Pointer allocateExecutableMemory(UnsignedWord nbytes, UnsignedWord alignment);
+
+    /**
+     * This method returns {@code true} if the memory returned by {@link #allocateUnalignedChunk} is
+     * guaranteed to be zeroed.
+     */
+    boolean areUnalignedChunksZeroed();
 
     /**
      * Release a block of committed memory that was allocated with {@link #allocate}, requiring the
@@ -112,7 +129,20 @@ default UnsignedWord getGranularity() {
      * @return true on success, or false otherwise.
      */
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-    boolean free(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment, boolean executable);
+    default boolean free(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment, boolean executable) {
+        // We need this default method temporarily so that we can remove the methods allocate and
+        // free from all subclasses in GR-34236.
+        throw VMError.shouldNotReachHere("Subclasses must overwrite this method");
+    }
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    void freeAlignedChunk(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment);
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    void freeUnalignedChunk(PointerBase start, UnsignedWord nbytes);
+
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    void freeExecutableMemory(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment);
 
     /**
      * Called by the garbage collector before a collection is started, as an opportunity to perform
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java
index 001d5f5679af..1c2e63e80773 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java
@@ -101,6 +101,11 @@ public Pointer allocate(UnsignedWord size, UnsignedWord alignment, boolean execu
         return committed;
     }
 
+    @Override
+    public boolean areUnalignedChunksZeroed() {
+        return false;
+    }
+
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean free(PointerBase start, UnsignedWord nbytes, UnsignedWord alignment, boolean executable) {

From 9abe2aea28c7a949aeb0e92bea6b19b7d01f674a Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Fri, 8 Oct 2021 13:40:25 +0200
Subject: [PATCH 352/681] Do not fill pre-zeroed memory with garbage if
 assertions are enabled.

---
 .../HotSpotAllocationSnippets.java            | 16 +++++-----
 .../replacements/AllocationSnippets.java      | 29 ++++++++++++++-----
 .../genscavenge/ThreadLocalAllocation.java    | 16 ++++++----
 .../graal/GenScavengeAllocationSnippets.java  |  4 +--
 .../graal/nodes/FormatArrayNode.java          |  4 ++-
 .../graal/nodes/FormatObjectNode.java         |  3 +-
 .../snippets/SubstrateAllocationSnippets.java | 22 +++++++-------
 7 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
index e2b59546459c..c57b9dff5f95 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java
@@ -148,7 +148,7 @@ public HotSpotAllocationSnippets(GraalHotSpotVMConfig config, HotSpotRegistersPr
     protected Object allocateInstance(KlassPointer hub,
                     Word prototypeMarkWord,
                     @ConstantParameter long size,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter HotSpotAllocationProfilingData profilingData) {
         Object result = allocateInstanceImpl(hub.asWord(), prototypeMarkWord, WordFactory.unsigned(size), fillContents, emitMemoryBarrier, true, profilingData);
@@ -161,7 +161,7 @@ public Object allocateArray(KlassPointer hub,
                     int length,
                     @ConstantParameter int arrayBaseOffset,
                     @ConstantParameter int log2ElementSize,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter int fillStartOffset,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter boolean maybeUnroll,
@@ -175,7 +175,7 @@ public Object allocateArray(KlassPointer hub,
 
     @Snippet
     public Object allocateInstanceDynamic(@NonNullParameter Class<?> type,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter HotSpotAllocationProfilingData profilingData) {
 
@@ -225,7 +225,7 @@ public Object allocateArrayDynamic(Class<?> elementType,
                     Word prototypeMarkWord,
                     Class<?> voidClass,
                     int length,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter JavaKind knownElementKind,
                     @ConstantParameter int knownLayoutHelper,
@@ -608,7 +608,7 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
             args.add("hub", hub);
             args.add("prototypeMarkWord", type.prototypeMarkWord());
             args.addConst("size", size);
-            args.addConst("fillContents", node.fillContents());
+            args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
             args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
             args.addConst("profilingData", getProfilingData(localOptions, "instance", type));
 
@@ -638,7 +638,7 @@ public void lower(NewArrayNode node, LoweringTool tool) {
             args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
             args.addConst("arrayBaseOffset", arrayBaseOffset);
             args.addConst("log2ElementSize", log2ElementSize);
-            args.addConst("fillContents", node.fillContents());
+            args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
             args.addConst("fillStartOffset", arrayBaseOffset);
             args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
             args.addConst("maybeUnroll", length.isConstant());
@@ -674,7 +674,7 @@ public void lower(DynamicNewInstanceNode node, LoweringTool tool) {
 
             Arguments args = new Arguments(allocateInstanceDynamic, node.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("type", node.getInstanceType());
-            args.addConst("fillContents", node.fillContents());
+            args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
             args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
             args.addConst("profilingData", getProfilingData(localOptions, "", null));
 
@@ -702,7 +702,7 @@ public void lower(DynamicNewArrayNode node, LoweringTool tool) {
             args.add("prototypeMarkWord", lookupArrayClass(tool, JavaKind.Object).prototypeMarkWord());
             args.add("voidClass", voidClass);
             args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
-            args.addConst("fillContents", node.fillContents());
+            args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
             args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
             /*
              * We use Kind.Illegal as a marker value instead of null because constant snippet
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java
index f1fbb9982810..98c8cdc2fb90 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/AllocationSnippets.java
@@ -50,7 +50,7 @@ public abstract class AllocationSnippets implements Snippets {
     protected Object allocateInstanceImpl(Word hub,
                     Word prototypeMarkWord,
                     UnsignedWord size,
-                    boolean fillContents,
+                    FillContent fillContents,
                     boolean emitMemoryBarrier,
                     boolean constantSize,
                     AllocationProfilingData profilingData) {
@@ -76,7 +76,7 @@ protected Object allocateArrayImpl(Word hub,
                     int length,
                     int arrayBaseOffset,
                     int log2ElementSize,
-                    boolean fillContents,
+                    FillContent fillContents,
                     int fillStartOffset,
                     boolean emitMemoryBarrier,
                     boolean maybeUnroll,
@@ -267,15 +267,15 @@ protected Object formatObject(Word hub,
                     Word prototypeMarkWord,
                     UnsignedWord size,
                     Word memory,
-                    boolean fillContents,
+                    FillContent fillContents,
                     boolean emitMemoryBarrier,
                     boolean constantSize,
                     AllocationSnippetCounters snippetCounters) {
         initializeObjectHeader(memory, hub, prototypeMarkWord, false);
         int headerSize = instanceHeaderSize();
-        if (fillContents) {
+        if (fillContents == FillContent.WITH_ZEROES) {
             zeroMemory(memory, headerSize, size, constantSize, false, false, false, snippetCounters);
-        } else if (REPLACEMENTS_ASSERTIONS_ENABLED) {
+        } else if (REPLACEMENTS_ASSERTIONS_ENABLED && fillContents == FillContent.WITH_GARBAGE_IF_ASSERTIONS_ENABLED) {
             fillWithGarbage(memory, headerSize, size, constantSize, false, false, snippetCounters);
         }
         if (emitMemoryBarrier) {
@@ -292,7 +292,7 @@ protected Object formatArray(Word hub,
                     UnsignedWord allocationSize,
                     int length,
                     Word memory,
-                    boolean fillContents,
+                    FillContent fillContents,
                     int fillStartOffset,
                     boolean emitMemoryBarrier,
                     boolean maybeUnroll,
@@ -303,9 +303,9 @@ protected Object formatArray(Word hub,
         // Store hub last as the concurrent garbage collectors assume length is valid if hub field
         // is not null.
         initializeObjectHeader(memory, hub, prototypeMarkWord, true);
-        if (fillContents) {
+        if (fillContents == FillContent.WITH_ZEROES) {
             zeroMemory(memory, fillStartOffset, allocationSize, false, maybeUnroll, supportsBulkZeroing, supportsOptimizedFilling, snippetCounters);
-        } else if (REPLACEMENTS_ASSERTIONS_ENABLED) {
+        } else if (REPLACEMENTS_ASSERTIONS_ENABLED && fillContents == FillContent.WITH_GARBAGE_IF_ASSERTIONS_ENABLED) {
             fillWithGarbage(memory, fillStartOffset, allocationSize, false, maybeUnroll, supportsOptimizedFilling, snippetCounters);
         }
         if (emitMemoryBarrier) {
@@ -374,6 +374,19 @@ protected Object callNewInstanceStub(Word hub, UnsignedWord size) {
 
     protected abstract int objectAlignment();
 
+    public enum FillContent {
+        DO_NOT_FILL,
+        WITH_ZEROES,
+        WITH_GARBAGE_IF_ASSERTIONS_ENABLED;
+
+        public static FillContent fromBoolean(boolean fillContents) {
+            if (fillContents) {
+                return WITH_ZEROES;
+            }
+            return WITH_GARBAGE_IF_ASSERTIONS_ENABLED;
+        }
+    }
+
     public static class AllocationProfilingData {
         final AllocationSnippetCounters snippetCounters;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
index 12c240f616eb..166cb20c673a 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -28,6 +28,7 @@
 import static com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets.TLAB_TOP_IDENTITY;
 
 import org.graalvm.compiler.api.replacements.Fold;
+import org.graalvm.compiler.replacements.AllocationSnippets.FillContent;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
@@ -256,7 +257,7 @@ private static Object slowPathNewArrayWithoutAllocating(DynamicHub hub, int leng
     @Uninterruptible(reason = "Holds uninitialized memory.")
     private static Object allocateInstanceInNewTlab(DynamicHub hub, UnsignedWord size, AlignedHeader newTlabChunk) {
         Pointer memory = allocateRawMemoryInNewTlab(size, newTlabChunk);
-        return FormatObjectNode.formatObject(memory, DynamicHub.toClass(hub), false, true, true);
+        return FormatObjectNode.formatObject(memory, DynamicHub.toClass(hub), false, FillContent.WITH_ZEROES, true);
     }
 
     @Uninterruptible(reason = "Holds uninitialized memory.")
@@ -265,13 +266,13 @@ private static Object allocateSmallArrayInCurrentTlab(DynamicHub hub, int length
             return null;
         }
         Pointer memory = allocateRawMemoryInTlab(size, getTlab());
-        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, false, true, fillStartOffset, true);
+        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, false, FillContent.WITH_ZEROES, fillStartOffset, true);
     }
 
     @Uninterruptible(reason = "Holds uninitialized memory.")
     private static Object allocateSmallArrayInNewTlab(DynamicHub hub, int length, UnsignedWord size, int fillStartOffset, AlignedHeader newTlabChunk) {
         Pointer memory = allocateRawMemoryInNewTlab(size, newTlabChunk);
-        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, false, true, fillStartOffset, true);
+        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, false, FillContent.WITH_ZEROES, fillStartOffset, true);
     }
 
     @Uninterruptible(reason = "Holds uninitialized memory, modifies TLAB")
@@ -285,8 +286,13 @@ private static Object allocateLargeArrayInNewTlab(DynamicHub hub, int length, Un
         Pointer memory = UnalignedHeapChunk.allocateMemory(newTlabChunk, size);
         assert memory.isNonNull();
 
-        /* Install the DynamicHub and length. Also zero the elements if necessary. */
-        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, true, needsZeroing, fillStartOffset, true);
+        /*
+         * Install the DynamicHub and length and zero the elements if necessary. If the memory is
+         * already pre-zeroed, we need to ensure that the snippet code does not fill the memory in
+         * any way.
+         */
+        FillContent fillKind = needsZeroing ? FillContent.WITH_ZEROES : FillContent.DO_NOT_FILL;
+        return FormatArrayNode.formatArray(memory, DynamicHub.toClass(hub), length, false, true, fillKind, fillStartOffset, true);
     }
 
     @Uninterruptible(reason = "Returns uninitialized memory, modifies TLAB", callerMustBe = true)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
index 02c26ff0112b..53f6d2cdeb4a 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
@@ -80,7 +80,7 @@ public static void registerLowering(OptionValues options, Iterable<DebugHandlers
     }
 
     @Snippet
-    public Object formatObjectSnippet(Word memory, DynamicHub hub, boolean rememberedSet, boolean fillContents, boolean emitMemoryBarrier,
+    public Object formatObjectSnippet(Word memory, DynamicHub hub, boolean rememberedSet, FillContent fillContents, boolean emitMemoryBarrier,
                     @ConstantParameter AllocationSnippetCounters snippetCounters) {
         DynamicHub hubNonNull = (DynamicHub) PiNode.piCastNonNull(hub, SnippetAnchorNode.anchor());
         int layoutEncoding = hubNonNull.getLayoutEncoding();
@@ -90,7 +90,7 @@ public Object formatObjectSnippet(Word memory, DynamicHub hub, boolean remembere
     }
 
     @Snippet
-    public Object formatArraySnippet(Word memory, DynamicHub hub, int length, boolean rememberedSet, boolean unaligned, boolean fillContents, int fillStartOffset, boolean emitMemoryBarrier,
+    public Object formatArraySnippet(Word memory, DynamicHub hub, int length, boolean rememberedSet, boolean unaligned, FillContent fillContents, int fillStartOffset, boolean emitMemoryBarrier,
                     @ConstantParameter boolean supportsBulkZeroing, @ConstantParameter boolean supportsOptimizedFilling, @ConstantParameter AllocationSnippetCounters snippetCounters) {
         DynamicHub hubNonNull = (DynamicHub) PiNode.piCastNonNull(hub, SnippetAnchorNode.anchor());
         int layoutEncoding = hubNonNull.getLayoutEncoding();
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
index 4600b8e0747f..b2e9f6f1c9b9 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
@@ -33,6 +33,7 @@
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.replacements.AllocationSnippets;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
@@ -94,5 +95,6 @@ public ValueNode getEmitMemoryBarrier() {
     }
 
     @NodeIntrinsic
-    public static native Object formatArray(Pointer memory, Class<?> hub, int length, boolean rememberedSet, boolean unaligned, boolean fillContents, int fillStartOffset, boolean emitMemoryBarrier);
+    public static native Object formatArray(Pointer memory, Class<?> hub, int length, boolean rememberedSet, boolean unaligned, AllocationSnippets.FillContent fillContents, int fillStartOffset,
+                    boolean emitMemoryBarrier);
 }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
index f26e502aa2f2..4af31b952e94 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
@@ -33,6 +33,7 @@
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.replacements.AllocationSnippets.FillContent;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
@@ -75,5 +76,5 @@ public ValueNode getEmitMemoryBarrier() {
     }
 
     @NodeIntrinsic
-    public static native Object formatObject(Pointer memory, Class<?> hub, boolean rememberedSet, boolean fillContents, boolean emitMemoryBarrier);
+    public static native Object formatObject(Pointer memory, Class<?> hub, boolean rememberedSet, FillContent fillContents, boolean emitMemoryBarrier);
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
index 10164d1d354b..1a660a7d2e45 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
@@ -50,6 +50,7 @@
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.SnippetAnchorNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallWithExceptionNode;
@@ -81,7 +82,6 @@
 import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider;
 import com.oracle.svm.core.graal.nodes.NewStoredContinuationNode;
 import com.oracle.svm.core.graal.nodes.SubstrateNewHybridInstanceNode;
-import org.graalvm.compiler.nodes.UnreachableNode;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.StoredContinuation;
 import com.oracle.svm.core.hub.DynamicHub;
@@ -117,7 +117,7 @@ public static void registerForeignCalls(SubstrateForeignCallsProvider foreignCal
     @Snippet
     protected Object allocateInstance(DynamicHub hub,
                     @ConstantParameter long size,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter AllocationProfilingData profilingData) {
         DynamicHub checkedHub = checkHub(hub);
@@ -131,7 +131,7 @@ protected Object allocateStoredContinuationInstance(DynamicHub hub,
                     @ConstantParameter AllocationProfilingData profilingData) {
         DynamicHub checkedHub = checkHub(hub);
         Object result = allocateInstanceImpl(encodeAsTLABObjectHeader(checkedHub), WordFactory.nullPointer(), WordFactory.unsigned(size),
-                        false, true, false, profilingData);
+                        FillContent.WITH_GARBAGE_IF_ASSERTIONS_ENABLED, true, false, profilingData);
         return piCastToSnippetReplaceeStamp(result);
     }
 
@@ -140,7 +140,7 @@ public Object allocateArray(DynamicHub hub,
                     int length,
                     @ConstantParameter int arrayBaseOffset,
                     @ConstantParameter int log2ElementSize,
-                    @ConstantParameter boolean fillContents,
+                    @ConstantParameter FillContent fillContents,
                     @ConstantParameter int fillStartOffset,
                     @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter boolean maybeUnroll,
@@ -154,7 +154,7 @@ public Object allocateArray(DynamicHub hub,
     }
 
     @Snippet
-    public Object allocateInstanceDynamic(@NonNullParameter DynamicHub hub, @ConstantParameter boolean fillContents, @ConstantParameter boolean emitMemoryBarrier,
+    public Object allocateInstanceDynamic(@NonNullParameter DynamicHub hub, @ConstantParameter FillContent fillContents, @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter AllocationProfilingData profilingData) {
         UnsignedWord size = LayoutEncoding.getInstanceSize(hub.getLayoutEncoding());
         Object result = allocateInstanceImpl(encodeAsTLABObjectHeader(hub), WordFactory.nullPointer(), size, fillContents, emitMemoryBarrier, false, profilingData);
@@ -162,7 +162,7 @@ public Object allocateInstanceDynamic(@NonNullParameter DynamicHub hub, @Constan
     }
 
     @Snippet
-    public Object allocateArrayDynamic(DynamicHub elementType, int length, @ConstantParameter boolean fillContents, @ConstantParameter boolean emitMemoryBarrier,
+    public Object allocateArrayDynamic(DynamicHub elementType, int length, @ConstantParameter FillContent fillContents, @ConstantParameter boolean emitMemoryBarrier,
                     @ConstantParameter boolean supportsBulkZeroing, @ConstantParameter boolean supportsOptimizedFilling, @ConstantParameter AllocationProfilingData profilingData) {
         DynamicHub checkedArrayHub = getCheckedArrayHub(elementType);
 
@@ -520,7 +520,7 @@ public void lower(NewInstanceNode node, LoweringTool tool) {
                 Arguments args = new Arguments(allocateInstance, graph.getGuardsStage(), tool.getLoweringStage());
                 args.add("hub", hubConstant);
                 args.addConst("size", size);
-                args.addConst("fillContents", node.fillContents());
+                args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
                 args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
                 args.addConst("profilingData", getProfilingData(node, type));
 
@@ -552,7 +552,7 @@ public void lower(SubstrateNewHybridInstanceNode node, LoweringTool tool) {
                 args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
                 args.addConst("arrayBaseOffset", arrayBaseOffset);
                 args.addConst("log2ElementSize", log2ElementSize);
-                args.addConst("fillContents", fillContents);
+                args.addConst("fillContents", FillContent.fromBoolean(fillContents));
                 args.addConst("fillStartOffset", afterArrayLengthOffset());
                 args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
                 args.addConst("maybeUnroll", length.isConstant());
@@ -585,7 +585,7 @@ public void lower(NewArrayNode node, LoweringTool tool) {
                 args.add("length", length.isAlive() ? length : graph.addOrUniqueWithInputs(length));
                 args.addConst("arrayBaseOffset", arrayBaseOffset);
                 args.addConst("log2ElementSize", log2ElementSize);
-                args.addConst("fillContents", node.fillContents());
+                args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
                 args.addConst("fillStartOffset", afterArrayLengthOffset());
                 args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
                 args.addConst("maybeUnroll", length.isConstant());
@@ -633,7 +633,7 @@ public void lower(DynamicNewInstanceNode node, LoweringTool tool) {
 
                 Arguments args = new Arguments(allocateInstanceDynamic, graph.getGuardsStage(), tool.getLoweringStage());
                 args.add("hub", node.getInstanceType());
-                args.addConst("fillContents", node.fillContents());
+                args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
                 args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
                 args.addConst("profilingData", getProfilingData(node, null));
 
@@ -652,7 +652,7 @@ public void lower(DynamicNewArrayNode node, LoweringTool tool) {
                 Arguments args = new Arguments(allocateArrayDynamic, graph.getGuardsStage(), tool.getLoweringStage());
                 args.add("elementType", node.getElementType());
                 args.add("length", node.length());
-                args.addConst("fillContents", node.fillContents());
+                args.addConst("fillContents", FillContent.fromBoolean(node.fillContents()));
                 args.addConst("emitMemoryBarrier", node.emitMemoryBarrier());
                 args.addConst("supportsBulkZeroing", tool.getLowerer().supportsBulkZeroing());
                 args.addConst("supportsOptimizedFilling", tool.getLowerer().supportsOptimizedFilling(graph.getOptions()));

From e0c9201ac51b4ad7e2d0fd73258b488538279632 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Fri, 8 Oct 2021 10:47:11 +0200
Subject: [PATCH 353/681] Make the safepoint thread more patient.

---
 .../oracle/svm/core/posix/headers/Sched.java  |   5 +
 .../svm/core/posix/thread/PosixVMThreads.java |  12 +++
 .../WindowsProcessPropertiesSupport.java      |   6 +-
 .../WindowsSystemPropertiesSupport.java       |   2 +-
 .../oracle/svm/core/windows/WindowsUtils.java |   2 +-
 .../core/windows/WindowsVMLockSupport.java    |  24 ++---
 .../svm/core/windows/WindowsVMThreads.java    |  17 ++-
 .../svm/core/windows/headers/Process.java     | 100 +++++++++---------
 .../com/oracle/svm/core/thread/Safepoint.java |  89 ++++++++--------
 .../com/oracle/svm/core/thread/VMThreads.java |  10 ++
 10 files changed, 152 insertions(+), 115 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Sched.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Sched.java
index 20d98e2166dd..660a90989c79 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Sched.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Sched.java
@@ -37,4 +37,9 @@ public class Sched {
 
     @CFunction
     public static native int sched_yield();
+
+    public static class NoTransitions {
+        @CFunction(transition = CFunction.Transition.NO_TRANSITION)
+        public static native int sched_yield();
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
index 2d4b08238ae5..dfb7d2c0cb45 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.posix.thread;
 
+import com.oracle.svm.core.posix.headers.Sched;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.function.CFunction;
@@ -76,6 +77,17 @@ public void nativeSleep(int milliseconds) {
         Time.NoTransitions.nanosleep(ts, WordFactory.nullPointer());
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Override
+    public void yield() {
+        Sched.NoTransitions.sched_yield();
+    }
+
+    @Override
+    public boolean supportsPatientSafepoints() {
+        return true;
+    }
+
     @Uninterruptible(reason = "Thread state not set up.")
     @Override
     protected boolean initializeOnce() {
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsProcessPropertiesSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsProcessPropertiesSupport.java
index afee09ac495e..0f5704d77964 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsProcessPropertiesSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsProcessPropertiesSupport.java
@@ -85,7 +85,7 @@ public void exec(Path executable, String[] args) {
 
     @Override
     public long getProcessID() {
-        return Process.GetCurrentProcessId();
+        return Process.NoTransitions.GetCurrentProcessId();
     }
 
     @Override
@@ -135,11 +135,11 @@ public boolean destroy(long processID) {
 
     @Override
     public boolean destroyForcibly(long processID) {
-        HANDLE handle = Process.OpenProcess(Process.PROCESS_TERMINATE(), 0, (int) processID);
+        HANDLE handle = Process.NoTransitions.OpenProcess(Process.PROCESS_TERMINATE(), 0, (int) processID);
         if (handle.isNull()) {
             return false;
         }
-        boolean result = Process.TerminateProcess(handle, 1) != 0;
+        boolean result = Process.NoTransitions.TerminateProcess(handle, 1) != 0;
         WinBase.CloseHandle(handle);
         return result;
     }
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java
index 8ae7f86a2845..ae542af21b06 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java
@@ -92,7 +92,7 @@ protected String userNameValue() {
     @Override
     protected String userHomeValue() {
         WinBase.LPHANDLE tokenHandle = StackValue.get(WinBase.LPHANDLE.class);
-        if (Process.OpenProcessToken(Process.GetCurrentProcess(), Process.TOKEN_QUERY(), tokenHandle) == 0) {
+        if (Process.NoTransitions.OpenProcessToken(Process.NoTransitions.GetCurrentProcess(), Process.TOKEN_QUERY(), tokenHandle) == 0) {
             return "C:\\"; // matches openjdk
         }
 
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java
index dab7acd92e7f..66ab86a0a68e 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsUtils.java
@@ -61,7 +61,7 @@ private static final class Target_java_lang_ProcessImpl {
 
     public static int getpid(java.lang.Process process) {
         Target_java_lang_ProcessImpl processImpl = SubstrateUtil.cast(process, Target_java_lang_ProcessImpl.class);
-        return com.oracle.svm.core.windows.headers.Process.GetProcessId(WordFactory.pointer(processImpl.handle));
+        return com.oracle.svm.core.windows.headers.Process.NoTransitions.GetProcessId(WordFactory.pointer(processImpl.handle));
     }
 
     @TargetClass(java.io.FileDescriptor.class)
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 49a555f2d534..db02b50f3260 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -147,10 +147,10 @@ public static void initialize() {
         WindowsVMLockSupport support = WindowsVMLockSupport.singleton();
         for (WindowsVMMutex mutex : support.mutexes) {
             // critical sections on windows always support recursive locking
-            Process.InitializeCriticalSection(mutex.getStructPointer());
+            Process.NoTransitions.InitializeCriticalSection(mutex.getStructPointer());
         }
         for (WindowsVMCondition condition : support.conditions) {
-            Process.InitializeConditionVariable(condition.getStructPointer());
+            Process.NoTransitions.InitializeConditionVariable(condition.getStructPointer());
         }
     }
 
@@ -205,14 +205,14 @@ public VMMutex lock() {
     @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
     public void lockNoTransition() {
         assertNotOwner("Recursive locking is not supported");
-        Process.EnterCriticalSectionNoTrans(getStructPointer());
+        Process.NoTransitions.EnterCriticalSection(getStructPointer());
         setOwnerToCurrentThread();
     }
 
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
     public void lockNoTransitionUnspecifiedOwner() {
-        Process.EnterCriticalSectionNoTrans(getStructPointer());
+        Process.NoTransitions.EnterCriticalSection(getStructPointer());
         setOwnerToUnspecified();
     }
 
@@ -220,20 +220,20 @@ public void lockNoTransitionUnspecifiedOwner() {
     @Uninterruptible(reason = "Called from uninterruptible code.")
     public void unlock() {
         clearCurrentThreadOwner();
-        Process.LeaveCriticalSection(getStructPointer());
+        Process.NoTransitions.LeaveCriticalSection(getStructPointer());
     }
 
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.")
     public void unlockNoTransitionUnspecifiedOwner() {
         clearUnspecifiedOwner();
-        Process.LeaveCriticalSection(getStructPointer());
+        Process.NoTransitions.LeaveCriticalSection(getStructPointer());
     }
 
     @Override
     public void unlockWithoutChecks() {
         clearCurrentThreadOwner();
-        Process.LeaveCriticalSectionNoTrans(getStructPointer());
+        Process.NoTransitions.LeaveCriticalSection(getStructPointer());
     }
 }
 
@@ -262,7 +262,7 @@ public void block() {
     @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
     public void blockNoTransition() {
         mutex.clearCurrentThreadOwner();
-        WindowsVMLockSupport.checkResult(Process.SleepConditionVariableCSNoTrans(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), SynchAPI.INFINITE()),
+        WindowsVMLockSupport.checkResult(Process.NoTransitions.SleepConditionVariableCS(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), SynchAPI.INFINITE()),
                         "SleepConditionVariableCS");
         mutex.setOwnerToCurrentThread();
     }
@@ -271,7 +271,7 @@ public void blockNoTransition() {
     @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
     public void blockNoTransitionUnspecifiedOwner() {
         mutex.clearUnspecifiedOwner();
-        WindowsVMLockSupport.checkResult(Process.SleepConditionVariableCSNoTrans(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), SynchAPI.INFINITE()),
+        WindowsVMLockSupport.checkResult(Process.NoTransitions.SleepConditionVariableCS(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), SynchAPI.INFINITE()),
                         "SleepConditionVariableCS");
         mutex.setOwnerToUnspecified();
     }
@@ -308,7 +308,7 @@ public long blockNoTransition(long waitNanos) {
         int dwMilliseconds = (int) (waitNanos / WindowsUtils.NANOSECS_PER_MILLISEC);
 
         mutex.clearCurrentThreadOwner();
-        final int timedwaitResult = Process.SleepConditionVariableCSNoTrans(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), dwMilliseconds);
+        final int timedwaitResult = Process.NoTransitions.SleepConditionVariableCS(getStructPointer(), ((WindowsVMMutex) getMutex()).getStructPointer(), dwMilliseconds);
         mutex.setOwnerToCurrentThread();
 
         /* If the timed wait timed out, then I am done blocking. */
@@ -325,12 +325,12 @@ public long blockNoTransition(long waitNanos) {
 
     @Override
     public void signal() {
-        Process.WakeConditionVariable(getStructPointer());
+        Process.NoTransitions.WakeConditionVariable(getStructPointer());
     }
 
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.")
     public void broadcast() {
-        Process.WakeAllConditionVariable(getStructPointer());
+        Process.NoTransitions.WakeAllConditionVariable(getStructPointer());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java
index bf486e90bc73..d15cc5a6eaaf 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMThreads.java
@@ -46,8 +46,8 @@ public final class WindowsVMThreads extends VMThreads {
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     @Override
     public OSThreadHandle getCurrentOSThreadHandle() {
-        WinBase.HANDLE pseudoThreadHandle = Process.GetCurrentThread();
-        WinBase.HANDLE pseudoProcessHandle = Process.GetCurrentProcess();
+        WinBase.HANDLE pseudoThreadHandle = Process.NoTransitions.GetCurrentThread();
+        WinBase.HANDLE pseudoProcessHandle = Process.NoTransitions.GetCurrentProcess();
 
         // convert the thread pseudo handle to a real handle using DuplicateHandle
         WinBase.LPHANDLE pointerToResult = StackValue.get(WinBase.LPHANDLE.class);
@@ -61,7 +61,7 @@ public OSThreadHandle getCurrentOSThreadHandle() {
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     @Override
     protected OSThreadId getCurrentOSThreadId() {
-        return WordFactory.unsigned(Process.GetCurrentThreadId());
+        return WordFactory.unsigned(Process.NoTransitions.GetCurrentThreadId());
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.")
@@ -80,6 +80,17 @@ public void nativeSleep(int milliseconds) {
         SynchAPI.NoTransitions.Sleep(milliseconds);
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    @Override
+    public void yield() {
+        Process.NoTransitions.SwitchToThread();
+    }
+
+    @Override
+    public boolean supportsPatientSafepoints() {
+        return true;
+    }
+
     /**
      * Make sure the runtime is initialized for threading.
      */
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/Process.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/Process.java
index e46fdb7ecbe1..b21eedc4617a 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/Process.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/Process.java
@@ -44,27 +44,9 @@
 @CContext(WindowsDirectives.class)
 public class Process {
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native HANDLE GetCurrentProcess();
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native HANDLE OpenProcess(int dwDesiredAccess, int bInheritHandle, int dwProcessId);
-
     @CConstant
     public static native int PROCESS_TERMINATE();
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int TerminateProcess(HANDLE hProcess, int uExitCode);
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int GetCurrentProcessId();
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int GetProcessId(HANDLE hProcess);
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int OpenProcessToken(HANDLE processHandle, int desiredAccess, LPHANDLE tokenHandle);
-
     @CConstant
     public static native int TOKEN_QUERY();
 
@@ -81,18 +63,9 @@ public static native HANDLE _beginthreadex(PointerBase security, int stacksize,
     @CFunction
     public static native int ResumeThread(HANDLE hThread);
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int GetExitCodeThread(HANDLE hThread, CIntPointer lpExitCode);
-
     @CFunction
     public static native int SwitchToThread();
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native int GetCurrentThreadId();
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native HANDLE GetCurrentThread();
-
     @CConstant
     public static native int SYNCHRONIZE();
 
@@ -104,21 +77,9 @@ public interface PCRITICAL_SECTION extends PointerBase {
     public interface CRITICAL_SECTION extends PointerBase {
     }
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native void InitializeCriticalSection(PCRITICAL_SECTION mutex);
-
-    @CFunction(transition = Transition.TO_NATIVE)
+    @CFunction
     public static native void EnterCriticalSection(PCRITICAL_SECTION mutex);
 
-    @CFunction(value = "EnterCriticalSection", transition = Transition.NO_TRANSITION)
-    public static native void EnterCriticalSectionNoTrans(PCRITICAL_SECTION mutex);
-
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native void LeaveCriticalSection(PCRITICAL_SECTION mutex);
-
-    @CFunction(value = "LeaveCriticalSection", transition = Transition.NO_TRANSITION)
-    public static native void LeaveCriticalSectionNoTrans(PCRITICAL_SECTION mutex);
-
     @CStruct
     public interface PCONDITION_VARIABLE extends PointerBase {
     }
@@ -127,18 +88,59 @@ public interface PCONDITION_VARIABLE extends PointerBase {
     public interface CONDITION_VARIABLE extends PointerBase {
     }
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native void InitializeConditionVariable(PCONDITION_VARIABLE cond);
-
     @CFunction
     public static native int SleepConditionVariableCS(PCONDITION_VARIABLE cond, PCRITICAL_SECTION mutex, int dwMilliseconds);
 
-    @CFunction(value = "SleepConditionVariableCS", transition = Transition.NO_TRANSITION)
-    public static native int SleepConditionVariableCSNoTrans(PCONDITION_VARIABLE cond, PCRITICAL_SECTION mutex, int dwMilliseconds);
+    public static class NoTransitions {
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native HANDLE GetCurrentProcess();
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native void WakeConditionVariable(PCONDITION_VARIABLE cond);
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native HANDLE OpenProcess(int dwDesiredAccess, int bInheritHandle, int dwProcessId);
 
-    @CFunction(transition = Transition.NO_TRANSITION)
-    public static native void WakeAllConditionVariable(PCONDITION_VARIABLE cond);
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int TerminateProcess(HANDLE hProcess, int uExitCode);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int GetCurrentProcessId();
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int GetProcessId(HANDLE hProcess);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int OpenProcessToken(HANDLE processHandle, int desiredAccess, LPHANDLE tokenHandle);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int GetExitCodeThread(HANDLE hThread, CIntPointer lpExitCode);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int SwitchToThread();
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int GetCurrentThreadId();
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native HANDLE GetCurrentThread();
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void InitializeCriticalSection(PCRITICAL_SECTION mutex);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void EnterCriticalSection(PCRITICAL_SECTION mutex);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void LeaveCriticalSection(PCRITICAL_SECTION mutex);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void InitializeConditionVariable(PCONDITION_VARIABLE cond);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native int SleepConditionVariableCS(PCONDITION_VARIABLE cond, PCRITICAL_SECTION mutex, int dwMilliseconds);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void WakeConditionVariable(PCONDITION_VARIABLE cond);
+
+        @CFunction(transition = Transition.NO_TRANSITION)
+        public static native void WakeAllConditionVariable(PCONDITION_VARIABLE cond);
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index e7dd8fa0483c..88398b08f9f4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -701,15 +701,18 @@ private static void restoreSafepointRequestedValue(IsolateThread vmThread) {
 
         /** Wait for there to be no threads (except myself) still waiting to reach a safepoint. */
         private static void waitForSafepoints(String reason) {
-            final Log trace = Log.noopLog().string("[Safepoint.Master.waitForSafepoints:  reason: ").string(reason).newline();
             VMThreads.THREAD_MUTEX.assertIsOwner("Must hold mutex while waiting for safepoints.");
             final long startNanos = System.nanoTime();
             long loopNanos = startNanos;
 
+            long warningNanos = -1;
+            long failureNanos = -1;
+
             for (int loopCount = 1; /* return */; loopCount += 1) {
                 int atSafepoint = 0;
                 int ignoreSafepoints = 0;
                 int notAtSafepoint = 0;
+                int lostUpdates = 0;
                 for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
                     if (isMyself(vmThread)) {
                         /* Don't wait for myself. */
@@ -727,6 +730,7 @@ private static void waitForSafepoints(String reason) {
                                 /* Re-request the safepoint in case of a lost update. */
                                 if (getSafepointRequested(vmThread) > 0 && !StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
                                     requestSafepoint(vmThread);
+                                    lostUpdates++;
                                 }
                                 notAtSafepoint += 1;
                                 break;
@@ -758,24 +762,48 @@ private static void waitForSafepoints(String reason) {
                     }
                 }
                 if (notAtSafepoint == 0) {
-                    trace.string("  returns");
-                    if (trace.isEnabled() && Statistics.Options.GatherSafepointStatistics.getValue()) {
-                        trace.string(" with installed: ").signed(Statistics.getInstalled());
-                    }
-                    trace.string("]").newline();
                     return;
                 }
 
-                trace.string("  loopCount: ").signed(loopCount)
-                                .string("  atSafepoint: ").signed(atSafepoint)
-                                .string("  ignoreSafepoints: ").signed(ignoreSafepoints)
-                                .string("  notAtSafepoint: ").signed(notAtSafepoint)
-                                .newline();
-                loopNanos = doNotLoopTooLong(loopNanos, startNanos, reason);
-                maybeFatallyTooLong(startNanos, reason);
+                if (warningNanos == -1 || failureNanos == -1) {
+                    warningNanos = Safepoint.getSafepointPromptnessWarningNanos();
+                    failureNanos = Safepoint.getSafepointPromptnessFailureNanos();
+                }
 
-                // Wait impatiently for requested threads to come to a safepoint.
-                PauseNode.pause();
+                long nanosSinceStart = TimeUtils.nanoSecondsSince(startNanos);
+                if (warningNanos > 0 || failureNanos > 0) {
+                    long nanosSinceLastWarning = TimeUtils.nanoSecondsSince(loopNanos);
+
+                    boolean printWarning = warningNanos > 0 && TimeUtils.nanoTimeLessThan(warningNanos, nanosSinceLastWarning);
+                    boolean fatalError = failureNanos > 0 && TimeUtils.nanoTimeLessThan(failureNanos, nanosSinceStart);
+                    if (printWarning || fatalError) {
+                        Log.log().string("[Safepoint.Master: not all threads reached a safepoint (").string(reason).string(") within ").signed(warningNanos).string(" ns. Total wait time so far: ")
+                                        .signed(nanosSinceStart).string(" ns.").newline();
+                        Log.log().string("  loopCount: ").signed(loopCount)
+                                        .string("  atSafepoint: ").signed(atSafepoint)
+                                        .string("  ignoreSafepoints: ").signed(ignoreSafepoints)
+                                        .string("  notAtSafepoint: ").signed(notAtSafepoint)
+                                        .string("  lostUpdates: ").signed(lostUpdates)
+                                        .string("]")
+                                        .newline();
+
+                        loopNanos = System.nanoTime();
+                        if (fatalError) {
+                            VMError.guarantee(false, "Safepoint promptness failure.");
+                        }
+                    }
+                }
+
+                // Wait for requested threads to come to a safepoint.
+                if (VMThreads.singleton().supportsPatientSafepoints()) {
+                    if (nanosSinceStart < TimeUtils.nanosPerMilli) {
+                        VMThreads.singleton().yield();
+                    } else {
+                        VMThreads.singleton().nativeSleep(1);
+                    }
+                } else {
+                    PauseNode.pause();
+                }
             }
         }
 
@@ -808,37 +836,6 @@ private static void releaseSafepoints(String reason) {
             trace.string("]").newline();
         }
 
-        /** Have I looped for too long? If so, complain, but reset the wait. */
-        private static long doNotLoopTooLong(long loopNanos, long startNanos, String reason) {
-            long result = loopNanos;
-            final long waitedNanos = TimeUtils.nanoSecondsSince(loopNanos);
-            final long warningNanos = Safepoint.getSafepointPromptnessWarningNanos();
-            if ((0 < warningNanos) && TimeUtils.nanoTimeLessThan(warningNanos, waitedNanos)) {
-                final Log warning = Log.log().string("[Safepoint.Master.doNotLoopTooLong:");
-                warning.string("  warningNanos: ").signed(warningNanos).string(" < ").string(" waitedNanos: ").signed(waitedNanos);
-                warning.string("  startNanos: ").signed(startNanos);
-                warning.string("  reason: ").string(reason).string("]").newline();
-                result = System.nanoTime();
-            }
-            return result;
-        }
-
-        private static void maybeFatallyTooLong(long startNanos, String reason) {
-            final long failureNanos = Safepoint.getSafepointPromptnessFailureNanos();
-            if (0 < failureNanos) {
-                /* If a promptness limit was set. */
-                final long nanosSinceStart = TimeUtils.nanoSecondsSince(startNanos);
-                if (TimeUtils.nanoTimeLessThan(failureNanos, nanosSinceStart)) {
-                    /* If the promptness limit was exceeded. */
-                    final Log warning = Log.log().string("[Safepoint.Master.maybeFatallyTooLong:");
-                    warning.string("  failureNanos: ").signed(failureNanos).string(" < nanosSinceStart: ").signed(nanosSinceStart);
-                    warning.string("  startNanos: ").signed(startNanos);
-                    warning.string("  reason: ").string(reason).string("]").newline();
-                    VMError.guarantee(false, "Safepoint promptness failure.");
-                }
-            }
-        }
-
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         protected IsolateThread getRequestingThread() {
             return requestingThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 1cb5883f88b4..6b89d79b492a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -524,6 +524,16 @@ public void nativeSleep(@SuppressWarnings("unused") int milliseconds) {
         throw VMError.shouldNotReachHere();
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+    public void yield() {
+        throw VMError.shouldNotReachHere();
+    }
+
+    // Should not be implemented and will be removed with GR-34388.
+    public boolean supportsPatientSafepoints() {
+        return false;
+    }
+
     @Uninterruptible(reason = "Called from uninterruptible verification code.", mayBeInlined = true)
     public boolean verifyThreadIsAttached(IsolateThread thread) {
         return nextThread(thread) != thread;

From bcbcdfb306b0c31367f256c35b0ac86913ac2c53 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Thu, 19 Aug 2021 16:50:36 +0200
Subject: [PATCH 354/681] Use Polybench to create AOT Sulong benchmarks

---
 sulong/mx.sulong/mx_sulong.py                 |   5 +-
 sulong/mx.sulong/mx_sulong_benchmarks.py      | 140 +++++++++++++++++-
 .../truffle/llvm/launcher/LLVMLauncher.java   |  14 +-
 .../launcher/LLVMMultiContextLauncher.java    |   2 +-
 .../src/org/graalvm/polybench/Config.java     |  17 ++-
 .../graalvm/polybench/PolyBenchLauncher.java  | 139 +++++++++++++++--
 6 files changed, 287 insertions(+), 30 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong.py b/sulong/mx.sulong/mx_sulong.py
index e71de3b8fcc7..e81f03ac3578 100644
--- a/sulong/mx.sulong/mx_sulong.py
+++ b/sulong/mx.sulong/mx_sulong.py
@@ -314,7 +314,10 @@ def _open_for_reading(path):
     _env_flags = os.environ['CPPFLAGS'].split(' ')
 
 
-mx_benchmark.add_bm_suite(mx_sulong_benchmarks.SulongBenchmarkSuite())
+# Legacy bm suite
+mx_benchmark.add_bm_suite(mx_sulong_benchmarks.SulongBenchmarkSuite(False))
+# Polybench bm suite
+mx_benchmark.add_bm_suite(mx_sulong_benchmarks.SulongBenchmarkSuite(True))
 
 
 _toolchains = {}
diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 5a31be18842b..257a289655d2 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -65,9 +65,10 @@ def _parse_results_gen():
 
 
 class SulongBenchmarkSuite(VmBenchmarkSuite):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, use_polybench, *args, **kwargs):
         super(SulongBenchmarkSuite, self).__init__(*args, **kwargs)
         self.bench_to_exec = {}
+        self.use_polybench = use_polybench
 
     def group(self):
         return 'Graal'
@@ -76,7 +77,7 @@ def subgroup(self):
         return 'sulong'
 
     def name(self):
-        return 'csuite'
+        return 'csuite-polybench' if self.use_polybench else 'csuite'
 
     def run(self, benchnames, bmSuiteArgs):
         vm = self.get_vm_registry().get_vm_from_suite_args(bmSuiteArgs)
@@ -101,7 +102,11 @@ def run(self, benchnames, bmSuiteArgs):
                 # prepare_env adds CC, CXX, CFLAGS, etc... and we copy the environment to avoid modifying the default one.
                 env = vm.prepare_env(env)
 
-                out = os.path.join(bench_out_dir, vm.out_file())
+                outName = vm.out_file()
+                if self.use_polybench:
+                    env['POLYBENCH'] = 'y'
+                    outName += '.so'
+                out = os.path.join(bench_out_dir, outName)
                 cmdline = ['make', '-f', '../Makefile', out]
                 if mx._opts.verbose:
                     # The Makefiles should have logic to disable the @ sign
@@ -142,6 +147,12 @@ def flakySkipPatterns(self, benchmarks, bmSuiteArgs):
         return []
 
     def rules(self, out, benchmarks, bmSuiteArgs):
+        if self.use_polybench:
+            return self.polybenchRules(out, benchmarks, bmSuiteArgs)
+        else:
+            return self.legacyRules(out, benchmarks, bmSuiteArgs)
+        
+    def legacyRules(self, out, benchmarks, bmSuiteArgs):
         return [
             SulongBenchmarkRule(
 		r'^run (?P<run>[\d]+) first [\d]+ warmup iterations (?P<benchmark>[\S]+):(?P<line>([ ,]+(?:\d+(?:\.\d+)?))+)',
@@ -211,6 +222,47 @@ def rules(self, out, benchmarks, bmSuiteArgs):
             }),
         ]
 
+    def polybenchRules(self, output, benchmarks, bmSuiteArgs):
+        metric_name = self._get_metric_name(bmSuiteArgs)
+        return [
+            mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after warmup: (?P<value>.*) (?P<unit>.*)", {
+                "benchmark": ("<name>", str),
+                "metric.better": "lower",
+                "metric.name": "warmup",
+                "metric.unit": ("<unit>", str),
+                "metric.value": ("<value>", float),
+                "metric.type": "numeric",
+                "metric.score-function": "id",
+                "metric.iteration": 0,
+            }),
+            mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after run: (?P<value>.*) (?P<unit>.*)", {
+                "benchmark": ("<name>", str),
+                "metric.better": "lower",
+                "metric.name": metric_name,
+                "metric.unit": ("<unit>", str),
+                "metric.value": ("<value>", float),
+                "metric.type": "numeric",
+                "metric.score-function": "id",
+                "metric.iteration": 0,
+            })
+
+        ]
+
+    def _get_metric_name(self, bmSuiteArgs):
+        metric = None
+        for arg in bmSuiteArgs:
+            if arg.startswith("--metric="):
+                metric = arg[len("--metric="):]
+                break
+        if metric == "compilation-time":
+            return "compile-time"
+        elif metric == "partial-evaluation-time":
+            return "pe-time"
+        elif metric == "one-shot":
+            return "one-shot"
+        else:
+            return "time"
+
     def workingDirectory(self, benchmarks, bmSuiteArgs):
         if len(benchmarks) != 1:
             mx.abort(
@@ -225,14 +277,15 @@ def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
         vmArgs = self.vmArgs(bmSuiteArgs)
         runArgs = self.runArgs(bmSuiteArgs)
         try:
-            runArgs += ['--time', str(int(time.clock_gettime(time.CLOCK_REALTIME) * 1000000))]
+            if not self.use_polybench:
+                runArgs += ['--time', str(int(time.clock_gettime(time.CLOCK_REALTIME) * 1000000))]
         except:
             # We can end up here in case the python version we're running on doesn't have clock_gettime or CLOCK_REALTIME.
             pass
         return vmArgs + [self.bench_to_exec[benchmarks[0]]] + runArgs
 
     def get_vm_registry(self):
-        return native_vm_registry
+        return native_polybench_vm_registry if self.use_polybench else native_vm_registry
 
 
 class CExecutionEnvironmentMixin(object):
@@ -447,6 +500,80 @@ def launcherClass(self):
     def launcherName(self):
         return "llimul"
 
+class PolybenchVm(CExecutionEnvironmentMixin, GuestVm):
+    def config_name(self):
+        return "default"
+
+    def toolchain_name(self):
+        return "native"
+
+    def name(self):
+        return "polybench"
+
+    def launcherClass(self):
+        return "org.graalvm.polybench.PolyBenchLauncher"
+
+    def launcherName(self):
+        return "polybench"
+
+    def run(self, cwd, args):
+        bench_file = args[-1:]
+        bench_args = args[:-1]
+        launcher_args = ['--path'] + bench_file + bench_args
+        if hasattr(self.host_vm(), 'run_launcher'):
+            result = self.host_vm().run_launcher(self.launcherName(), launcher_args, cwd)
+        else:
+            def _filter_properties(args):
+                props = []
+                remaining_args = []
+                vm_prefix = "--vm.D"
+                for arg in args:
+                    if arg.startswith(vm_prefix):
+                        props.append('-D' + arg[len(vm_prefix):])
+                    else:
+                        remaining_args.append(arg)
+                return props, remaining_args
+
+            props, launcher_args = _filter_properties(launcher_args)
+            sulongCmdLine = self.launcher_vm_args() + \
+                            props + \
+                            ['-XX:-UseJVMCIClassLoader', self.launcherClass(), '--path']  + bench_file + bench_args
+            result = self.host_vm().run(cwd, sulongCmdLine)
+
+        ret_code, out, vm_dims = result
+        return ret_code, add_run_numbers(out), vm_dims
+
+    def prepare_env(self, env):
+        # if hasattr(self.host_vm(), 'run_launcher'):
+        #     import mx_sdk_vm_impl
+        #     env['CC'] = os.path.join(mx_sdk_vm_impl.graalvm_home(fatalIfMissing=True), 'jre', 'languages', 'llvm', self.toolchain_name(), 'bin', 'graalvm-{}-clang'.format(self.toolchain_name()))
+        # else:
+        # we always use the bootstrap toolchain since the toolchain is not installed by default in a graalvm
+        # change this if we can properly install components into a graalvm deployment
+        env['CC'] = mx_subst.path_substitutions.substitute('<toolchainGetToolPath:{},CC>'.format(self.toolchain_name()))
+        env['CXX'] = mx_subst.path_substitutions.substitute('<toolchainGetToolPath:{},CXX>'.format(self.toolchain_name()))
+        return env
+
+    def out_file(self):
+        return 'bench'
+
+    def opt_phases(self):
+        return []
+
+    def launcher_vm_args(self):
+        return mx_sulong.getClasspathOptions(['POLYBENCH'])
+
+    def launcher_args(self, args):
+        launcher_args = [
+            '--experimental-options',
+            '--engine.CompilationFailureAction=ExitVM',
+            '--engine.TreatPerformanceWarningsAsErrors=call,instanceof,store',
+        ]
+        return launcher_args + args
+
+    def hosting_registry(self):
+        return java_vm_registry
+
 _suite = mx.suite("sulong")
 
 native_vm_registry = VmRegistry("Native", known_host_registries=[java_vm_registry])
@@ -460,3 +587,6 @@ def launcherName(self):
 native_vm_registry.add_vm(ClangVm('O3', ['-O3']), _suite)
 native_vm_registry.add_vm(SulongVm(), _suite, 10)
 native_vm_registry.add_vm(SulongMultiContextVm(), _suite, 10)
+
+native_polybench_vm_registry = VmRegistry("NativePolybench", known_host_registries=[java_vm_registry])
+native_polybench_vm_registry.add_vm(PolybenchVm(), _suite, 10)
diff --git a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
index 1d44197b16c8..f40ed909a665 100644
--- a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
+++ b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
@@ -29,6 +29,13 @@
  */
 package com.oracle.truffle.llvm.launcher;
 
+import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -40,13 +47,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.graalvm.launcher.AbstractLanguageLauncher;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-
 public class LLVMLauncher extends AbstractLanguageLauncher {
 
     public static void main(String[] args) {
diff --git a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java
index 94ed96829c13..31ecbfe521dc 100644
--- a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java
+++ b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java
@@ -119,7 +119,7 @@ protected int execute(Context.Builder contextBuilder) {
                     if (i == 0) {
                         contextBuilder.option("engine.DebugCachePreinitializeContext", "false").option("engine.DebugCacheCompile", "aot").//
                                         option("engine.DebugTraceCache", "true").//
-                                        option("engine.DebugCacheLoad", "true").//
+                                        option("engine.DebugCacheLoad", "false").//
                                         option("engine.DebugCacheStore", "true").//
                                         option("engine.MultiTier", "false").//
                                         option("llvm.AOTCacheStore", "true").//
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
index ac9b6fe11c9a..68bd19c5b424 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
@@ -24,9 +24,12 @@
  */
 package org.graalvm.polybench;
 
+import org.graalvm.polyglot.Value;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import org.graalvm.polyglot.Value;
+import java.util.Map;
 
 class Config {
     String path;
@@ -35,6 +38,10 @@ class Config {
     int iterations;
     Mode mode;
     Metric metric;
+    int runCount = 1;
+    boolean useDebugCache;
+    final Map<String, String> multiContextEngineOptions = new HashMap<>();
+    final List<Map<String, String>> perIterationContextOptions = new ArrayList<>();
     List<String> unrecognizedArguments = new ArrayList<>();
 
     private static final int DEFAULT = -1;
@@ -49,19 +56,23 @@ class Config {
         this.iterations = DEFAULT;
         this.mode = Mode.standard;
         this.metric = new PeakTimeMetric();
+        this.perIterationContextOptions.add(new HashMap<>()); // iteration 0 options
+        this.perIterationContextOptions.add(new HashMap<>()); // iteration >0 options
     }
 
     public void parseBenchSpecificDefaults(Value benchmark) {
         if (warmupIterations == DEFAULT) {
             if (benchmark.hasMember("warmupIterations")) {
-                warmupIterations = benchmark.getMember("warmupIterations").asInt();
+            	Value warmupIterationsMember = benchmark.getMember("warmupIterations");
+                warmupIterations = warmupIterationsMember.canExecute() ? warmupIterationsMember.execute().asInt() : warmupIterationsMember.asInt();
             } else {
                 warmupIterations = DEFAULT_WARMUP;
             }
         }
         if (iterations == DEFAULT) {
             if (benchmark.hasMember("iterations")) {
-                iterations = benchmark.getMember("iterations").asInt();
+            	Value iterationsMember = benchmark.getMember("iterations");
+                iterations = iterationsMember.canExecute() ? iterationsMember.execute().asInt() : iterationsMember.asInt();
             } else {
                 iterations = DEFAULT_ITERATIONS;
             }
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 31ecf94b7357..0b36f4d3af94 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -24,8 +24,17 @@
  */
 package org.graalvm.polybench;
 
+import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.proxy.ProxyArray;
+
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -34,23 +43,25 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.logging.Handler;
 
-import org.graalvm.launcher.AbstractLanguageLauncher;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.proxy.ProxyArray;
-
 public final class PolyBenchLauncher extends AbstractLanguageLauncher {
     static class ArgumentConsumer {
         private final String prefix;
         private final BiConsumer<String, Config> action;
+        private final Consumer<Config> flagAction;
 
         ArgumentConsumer(String prefix, BiConsumer<String, Config> action) {
             this.prefix = prefix;
             this.action = action;
+            this.flagAction = null;
+        }
+
+        ArgumentConsumer(String prefix, Consumer<Config> flagAction) {
+            this.prefix = prefix;
+            this.action = null;
+            this.flagAction = flagAction;
         }
 
         boolean consume(String argument, Iterator<String> args, Config options) {
@@ -66,6 +77,10 @@ boolean consume(String argument, Iterator<String> args, Config options) {
                 if (!argument.equals(prefix)) {
                     return false;
                 }
+                if (flagAction != null) {
+                    flagAction.accept(options);
+                    return true;
+                }
                 try {
                     value = args.next();
                 } catch (NoSuchElementException e) {
@@ -124,6 +139,12 @@ static class ArgumentParser {
             this.consumers.add(new ArgumentConsumer("-i", (value, config) -> {
                 config.iterations = Integer.parseInt(value);
             }));
+            this.consumers.add(new ArgumentConsumer("--use-debug-cache", (config) -> {
+                config.useDebugCache = true;
+            }));
+            this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> {
+                config.runCount = Integer.parseInt(value);
+            }));
         }
 
         Config parse(List<String> arguments) {
@@ -160,6 +181,43 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
         } catch (IllegalArgumentException e) {
             throw abort(e.getMessage());
         }
+
+        if (this.config.runCount > 1) {
+            List<String> engineArgs = new ArrayList<>();
+            List<List<String>> perIterationArgs = new ArrayList<>();
+            perIterationArgs.add(new ArrayList<>()); // iteration 0 args
+            perIterationArgs.add(new ArrayList<>()); // iteration 1 args
+
+            Iterator<String> iterator = this.config.unrecognizedArguments.iterator();
+            while (iterator.hasNext()) {
+                String option = iterator.next();
+
+                if (option.contains("=")) {
+                    String[] nameValue = option.split("=", 2);
+                    if (nameValue[0].endsWith(".0")) {
+                        iterator.remove();
+                        perIterationArgs.get(0).add(nameValue[0].substring(0, nameValue[0].length() - 2) + "=" + nameValue[1]);
+                    } else if (nameValue[0].endsWith(".1")) {
+                        iterator.remove();
+                        perIterationArgs.get(1).add(nameValue[0].substring(0, nameValue[0].length() - 2) + "=" + nameValue[1]);
+                    }
+                }
+
+                // The engine options must be separated and used later when building a context
+                if (option.startsWith("--engine.")) {
+                    iterator.remove();
+                    engineArgs.add(option);
+                } else if ("--experimental-options".equals(option)) {
+                    engineArgs.add(option);
+                    perIterationArgs.get(0).add(option);
+                    perIterationArgs.get(1).add(option);
+                }
+            }
+
+            parseUnrecognizedOptions(getLanguageId(config.path), config.multiContextEngineOptions, engineArgs);
+            parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(0), perIterationArgs.get(0));
+            parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(1), perIterationArgs.get(1));
+        }
         return this.config.unrecognizedArguments;
     }
 
@@ -178,11 +236,52 @@ protected void validateArguments(Map<String, String> polyglotOptions) {
     @Override
     protected void launch(Context.Builder contextBuilder) {
         contextBuilder.allowAllAccess(true);
-        runHarness(contextBuilder);
+
+        contextBuilder.options(config.multiContextEngineOptions);
+        if (!config.useDebugCache && config.runCount > 1) {
+            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.multiContextEngineOptions).build());
+        }
+
+        if (config.runCount == 0) {
+            // Create the context and close it right afterwards to trigger the compilation of AOT
+            // roots
+            try (Context context = contextBuilder.build()) {
+                context.eval(Source.newBuilder(getLanguageId(config.path), Paths.get(config.path).toFile()).build());
+                return;
+            } catch (IOException e) {
+                throw abort(String.format("Error loading file '%s' (%s)", config.path, e.getMessage()));
+            }
+        }
+
+        for (int i = 0; i < config.runCount; i++) {
+            if (!config.useDebugCache) {
+                runHarness(contextBuilder);
+            } else {
+                if (i == 0) {
+                    contextBuilder.option("engine.DebugCachePreinitializeContext", "false").//
+                            option("engine.DebugCacheCompile", "aot").//
+                            option("engine.DebugCacheStore", "true").//
+                            option("engine.MultiTier", "false").//
+                            option("engine.CompileAOTOnCreate", "false");
+                    contextBuilder.options(config.perIterationContextOptions.get(0));
+                    try (Context context = contextBuilder.build()) {
+                        context.eval(Source.newBuilder(getLanguageId(config.path), Paths.get(config.path).toFile()).build());
+                    } catch (IOException e) {
+                        throw abort(String.format("Error loading file '%s' (%s)", config.path, e.getMessage()));
+                    }
+                } else {
+                    contextBuilder.option("engine.DebugCacheStore", "false").//
+                            option("engine.DebugCacheLoad", "true");
+                    contextBuilder.options(config.perIterationContextOptions.get(1));
+                    runHarness(contextBuilder);
+                }
+            }
+        }
     }
 
     @Override
     protected String getLanguageId() {
+        // TODO: this should reflect the language of the input file
         return "js";
     }
 
@@ -198,7 +297,7 @@ protected void printHelp(OptionCategory maxCategory) {
         System.out.println("Run a benchmark in an arbitrary language on the PolyBench harness.");
     }
 
-    private static String getExtension(String path) {
+    static String getExtension(String path) {
         int lastDot = path.lastIndexOf('.');
         if (lastDot < 0) {
             return null;
@@ -206,6 +305,23 @@ private static String getExtension(String path) {
         return path.substring(lastDot + 1);
     }
 
+    String getLanguageId(String path) {
+        final File file = new File(path);
+        if ("jar".equals(getExtension(path))) {
+            return "java";
+        } else {
+            try {
+                String language = Source.findLanguage(file);
+                if (language == null) {
+                    throw abort("Could not determine the language for file " + file);
+                }
+                return language;
+            } catch (IOException e) {
+                throw abort("Error while examining source file '" + file + "': " + e.getMessage());
+            }
+        }
+    }
+
     private EvalResult evalSource(Context context, String path) {
         final File file = new File(path);
         if ("jar".equals(getExtension(path))) {
@@ -224,10 +340,7 @@ private EvalResult evalSource(Context context, String path) {
             Source source;
             String language;
             try {
-                language = Source.findLanguage(file);
-                if (language == null) {
-                    throw abort("Could not determine the language for file " + file);
-                }
+                language = getLanguageId(path);
                 source = Source.newBuilder(language, file).build();
             } catch (IOException e) {
                 throw abort("Error while examining source file '" + file + "': " + e.getMessage());

From 9b94083b1d8d073f64d425eb1d330439bdbe272b Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Thu, 26 Aug 2021 14:46:50 +0200
Subject: [PATCH 355/681] AOT related fixes

---
 .../nodes/others/LLVMAccessSymbolNode.java     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
index 0fd97ab199ea..36ea67e2e584 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
@@ -29,8 +29,6 @@
  */
 package com.oracle.truffle.llvm.runtime.nodes.others;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateAOT;
@@ -42,7 +40,6 @@
 import com.oracle.truffle.llvm.runtime.except.LLVMIllegalSymbolIndexException;
 import com.oracle.truffle.llvm.runtime.except.LLVMLinkerException;
 import com.oracle.truffle.llvm.runtime.memory.LLVMStack;
-import com.oracle.truffle.llvm.runtime.memory.LLVMStack.LLVMStackAccess;
 import com.oracle.truffle.llvm.runtime.nodes.api.LLVMExpressionNode;
 import com.oracle.truffle.llvm.runtime.nodes.func.LLVMRootNode;
 import com.oracle.truffle.llvm.runtime.pointer.LLVMPointer;
@@ -57,8 +54,6 @@ public abstract class LLVMAccessSymbolNode extends LLVMExpressionNode {
 
     protected final LLVMSymbol symbol;
 
-    @CompilationFinal private LLVMStackAccess stackAccess;
-
     LLVMAccessSymbolNode(LLVMSymbol symbol) {
         this.symbol = LLVMAlias.resolveAlias(symbol);
     }
@@ -98,13 +93,14 @@ public LLVMPointer accessSingleContext(@Cached BranchProfile exception) throws L
         return checkNull(getContext().getSymbol(symbol, exception), exception);
     }
 
+    protected LLVMStack.LLVMStackAccessHolder createStackAccessHolder() {
+        return new LLVMStack.LLVMStackAccessHolder(((LLVMRootNode) getRootNode()).getStackAccess());
+    }
+
     @Specialization
     public LLVMPointer accessMultiContext(VirtualFrame frame,
-                    @Cached BranchProfile exception) throws LLVMIllegalSymbolIndexException {
-        if (stackAccess == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            stackAccess = ((LLVMRootNode) getRootNode()).getStackAccess();
-        }
-        return checkNull(stackAccess.executeGetStack(frame).getContext().getSymbol(symbol, exception), exception);
+                                          @Cached("createStackAccessHolder()") LLVMStack.LLVMStackAccessHolder stackAccessHolder,
+                                          @Cached BranchProfile exception) throws LLVMIllegalSymbolIndexException {
+        return checkNull(stackAccessHolder.stackAccess.executeGetStack(frame).getContext().getSymbol(symbol, exception), exception);
     }
 }

From 412915a90fd8119d720a1e61c08e0053eeec73ea Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Mon, 30 Aug 2021 11:58:56 +0200
Subject: [PATCH 356/681] Polybench launcher JavaDoc plus minor fixes

---
 sulong/mx.sulong/mx_sulong_benchmarks.py      |  36 ++++--
 .../src/org/graalvm/polybench/Config.java     |   4 +-
 .../graalvm/polybench/PolyBenchLauncher.java  | 120 ++++++++++++------
 3 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 257a289655d2..60595e96b4de 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -113,6 +113,7 @@ def run(self, benchnames, bmSuiteArgs):
                     # so that all executed commands are visible.
                     cmdline += ["MX_VERBOSE=y"]
                 mx.run(cmdline, env=env)
+                mx.log("Making " + out)
                 self.bench_to_exec[bench] = out
             finally:
                 # reset current Directory
@@ -151,7 +152,7 @@ def rules(self, out, benchmarks, bmSuiteArgs):
             return self.polybenchRules(out, benchmarks, bmSuiteArgs)
         else:
             return self.legacyRules(out, benchmarks, bmSuiteArgs)
-        
+
     def legacyRules(self, out, benchmarks, bmSuiteArgs):
         return [
             SulongBenchmarkRule(
@@ -223,18 +224,12 @@ def legacyRules(self, out, benchmarks, bmSuiteArgs):
         ]
 
     def polybenchRules(self, output, benchmarks, bmSuiteArgs):
+        warmupIterCountRule = mx_benchmark.StdOutRule(r"warmup-iterations: (?P<value>.*)", {
+            "result": ("<value>", int),
+        }),
+        warmupIterCount = warmupIterCountRule[0].parse(output)[0]['result']
         metric_name = self._get_metric_name(bmSuiteArgs)
-        return [
-            mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after warmup: (?P<value>.*) (?P<unit>.*)", {
-                "benchmark": ("<name>", str),
-                "metric.better": "lower",
-                "metric.name": "warmup",
-                "metric.unit": ("<unit>", str),
-                "metric.value": ("<value>", float),
-                "metric.type": "numeric",
-                "metric.score-function": "id",
-                "metric.iteration": 0,
-            }),
+        rules = [
             mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after run: (?P<value>.*) (?P<unit>.*)", {
                 "benchmark": ("<name>", str),
                 "metric.better": "lower",
@@ -245,8 +240,21 @@ def polybenchRules(self, output, benchmarks, bmSuiteArgs):
                 "metric.score-function": "id",
                 "metric.iteration": 0,
             })
-
         ]
+        if warmupIterCount > 0:
+            rules += [
+            	mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after warmup: (?P<value>.*) (?P<unit>.*)", {
+                    "benchmark": ("<name>", str),
+                    "metric.better": "lower",
+                    "metric.name": "warmup",
+                    "metric.unit": ("<unit>", str),
+                    "metric.value": ("<value>", float),
+                    "metric.type": "numeric",
+                    "metric.score-function": "id",
+                    "metric.iteration": 0,
+                })
+        	]
+        return rules
 
     def _get_metric_name(self, bmSuiteArgs):
         metric = None
@@ -508,7 +516,7 @@ def toolchain_name(self):
         return "native"
 
     def name(self):
-        return "polybench"
+        return "sulong-polybench"
 
     def launcherClass(self):
         return "org.graalvm.polybench.PolyBenchLauncher"
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
index 68bd19c5b424..9aa890a515ac 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
@@ -63,7 +63,7 @@ class Config {
     public void parseBenchSpecificDefaults(Value benchmark) {
         if (warmupIterations == DEFAULT) {
             if (benchmark.hasMember("warmupIterations")) {
-            	Value warmupIterationsMember = benchmark.getMember("warmupIterations");
+                Value warmupIterationsMember = benchmark.getMember("warmupIterations");
                 warmupIterations = warmupIterationsMember.canExecute() ? warmupIterationsMember.execute().asInt() : warmupIterationsMember.asInt();
             } else {
                 warmupIterations = DEFAULT_WARMUP;
@@ -71,7 +71,7 @@ public void parseBenchSpecificDefaults(Value benchmark) {
         }
         if (iterations == DEFAULT) {
             if (benchmark.hasMember("iterations")) {
-            	Value iterationsMember = benchmark.getMember("iterations");
+                Value iterationsMember = benchmark.getMember("iterations");
                 iterations = iterationsMember.canExecute() ? iterationsMember.execute().asInt() : iterationsMember.asInt();
             } else {
                 iterations = DEFAULT_ITERATIONS;
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 0b36f4d3af94..1a5a43f3ad6b 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -46,6 +46,29 @@
 import java.util.function.Consumer;
 import java.util.logging.Handler;
 
+/**
+ * This launcher allows for multi-context benchmarking, which is enabled by the
+ * <code>--multi-context-runs</code> option. The value of this option determines the number of
+ * benchmark runs and can be <code>0</code> or greater. When zero runs is specified, a new context
+ * is created and closed right after the source file is parsed without running the benchmark,
+ * though. (N.B. This is especially useful for storing auxiliary engine cache containing ASTs
+ * created during the parsing of the source file.) On the other hand, if the number of runs is
+ * greater than 1, then a new engine is created and used for each context created for each run. If
+ * the number of runs is 1 (the default) then no engine is explicitly created.
+ * <p/>
+ * It is possible to specify different arguments for each iteration (N.B. currently for the first
+ * two iterations only). The pattern of an iteration specific argument is:
+ * 
+ * <pre>
+ * &lt;arg_name&gt;.&lt;iteration&gt;=&lt;value&gt;
+ * </pre>
+ * <p/>
+ * In order to facilitate debugging of benchmarks using auxiliary engine cache, the
+ * <code>--use-debug-cache</code> option can be used. Using this option should be accompanied by
+ * <code>--multi-context-runs=2</code>. In the first iteration the source is parsed and the
+ * in-memory auxiliary engine cache is stored without running the benchmark, while the second
+ * iteration will load the in-memory cache and run the benchmark.
+ */
 public final class PolyBenchLauncher extends AbstractLanguageLauncher {
     static class ArgumentConsumer {
         private final String prefix;
@@ -183,42 +206,57 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
         }
 
         if (this.config.runCount > 1) {
-            List<String> engineArgs = new ArrayList<>();
-            List<List<String>> perIterationArgs = new ArrayList<>();
-            perIterationArgs.add(new ArrayList<>()); // iteration 0 args
-            perIterationArgs.add(new ArrayList<>()); // iteration 1 args
-
-            Iterator<String> iterator = this.config.unrecognizedArguments.iterator();
-            while (iterator.hasNext()) {
-                String option = iterator.next();
-
-                if (option.contains("=")) {
-                    String[] nameValue = option.split("=", 2);
-                    if (nameValue[0].endsWith(".0")) {
+            processMultiContextArguments();
+        }
+        return this.config.unrecognizedArguments;
+    }
+
+    private void processMultiContextArguments() {
+        List<String> engineArgs = new ArrayList<>();
+        // The storage for the iteration-specific arguments
+        List<List<String>> perIterationArgs = new ArrayList<>();
+        // Iteration-specific arguments can be specified for the two first iterations only atm.
+        perIterationArgs.add(new ArrayList<>()); // iteration 0 args
+        perIterationArgs.add(new ArrayList<>()); // iteration 1 args
+
+        Iterator<String> iterator = this.config.unrecognizedArguments.iterator();
+        while (iterator.hasNext()) {
+            String option = iterator.next();
+
+            // Extract iteration-specific arguments. The pattern of an iteration specific arguments
+            // is: <arg_name>.<iteration>=<arg_value>
+            if (option.contains("=")) {
+                String[] nameValue = option.split("=", 2);
+                String indexedArgName = nameValue[0];
+                if (indexedArgName.length() >= 3) {
+                    String argName = indexedArgName.substring(0, indexedArgName.length() - 2);
+                    String argValue = nameValue[1];
+                    if (indexedArgName.endsWith(".0")) {
                         iterator.remove();
-                        perIterationArgs.get(0).add(nameValue[0].substring(0, nameValue[0].length() - 2) + "=" + nameValue[1]);
-                    } else if (nameValue[0].endsWith(".1")) {
+                        perIterationArgs.get(0).add(argName + "=" + argValue);
+                        continue;
+                    } else if (indexedArgName.endsWith(".1")) {
                         iterator.remove();
-                        perIterationArgs.get(1).add(nameValue[0].substring(0, nameValue[0].length() - 2) + "=" + nameValue[1]);
+                        perIterationArgs.get(1).add(argName + "=" + argValue);
+                        continue;
                     }
                 }
-
-                // The engine options must be separated and used later when building a context
-                if (option.startsWith("--engine.")) {
-                    iterator.remove();
-                    engineArgs.add(option);
-                } else if ("--experimental-options".equals(option)) {
-                    engineArgs.add(option);
-                    perIterationArgs.get(0).add(option);
-                    perIterationArgs.get(1).add(option);
-                }
             }
 
-            parseUnrecognizedOptions(getLanguageId(config.path), config.multiContextEngineOptions, engineArgs);
-            parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(0), perIterationArgs.get(0));
-            parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(1), perIterationArgs.get(1));
+            // The engine options must be separated and used later when building a context
+            if (option.startsWith("--engine.")) {
+                iterator.remove();
+                engineArgs.add(option);
+            } else if ("--experimental-options".equals(option)) {
+                engineArgs.add(option);
+                perIterationArgs.get(0).add(option);
+                perIterationArgs.get(1).add(option);
+            }
         }
-        return this.config.unrecognizedArguments;
+
+        parseUnrecognizedOptions(getLanguageId(config.path), config.multiContextEngineOptions, engineArgs);
+        parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(0), perIterationArgs.get(0));
+        parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(1), perIterationArgs.get(1));
     }
 
     @Override
@@ -254,16 +292,17 @@ protected void launch(Context.Builder contextBuilder) {
         }
 
         for (int i = 0; i < config.runCount; i++) {
-            if (!config.useDebugCache) {
-                runHarness(contextBuilder);
-            } else {
+            Map<String, String> perIterationOptions = config.perIterationContextOptions.get(i);
+            if (perIterationOptions != null) {
+                contextBuilder.options(perIterationOptions);
+            }
+            if (config.useDebugCache) {
+                // The debug engine cache facilitation
                 if (i == 0) {
-                    contextBuilder.option("engine.DebugCachePreinitializeContext", "false").//
-                            option("engine.DebugCacheCompile", "aot").//
-                            option("engine.DebugCacheStore", "true").//
-                            option("engine.MultiTier", "false").//
-                            option("engine.CompileAOTOnCreate", "false");
-                    contextBuilder.options(config.perIterationContextOptions.get(0));
+                    contextBuilder.option("engine.DebugCacheCompile", "aot").//
+                                    option("engine.DebugCacheStore", "true").//
+                                    option("engine.MultiTier", "false").//
+                                    option("engine.CompileAOTOnCreate", "false");
                     try (Context context = contextBuilder.build()) {
                         context.eval(Source.newBuilder(getLanguageId(config.path), Paths.get(config.path).toFile()).build());
                     } catch (IOException e) {
@@ -271,10 +310,11 @@ protected void launch(Context.Builder contextBuilder) {
                     }
                 } else {
                     contextBuilder.option("engine.DebugCacheStore", "false").//
-                            option("engine.DebugCacheLoad", "true");
-                    contextBuilder.options(config.perIterationContextOptions.get(1));
+                                    option("engine.DebugCacheLoad", "true");
                     runHarness(contextBuilder);
                 }
+            } else {
+                runHarness(contextBuilder);
             }
         }
     }

From f5dad36c87184f43589a787a26c3978dd7cd9142 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Tue, 7 Sep 2021 16:15:54 +0200
Subject: [PATCH 357/681] Minor changes in sulong/polybench configuration

---
 sulong/mx.sulong/mx_sulong_benchmarks.py      | 107 ++++++++++++------
 .../nodes/others/LLVMAccessSymbolNode.java    |   4 +-
 .../graalvm/polybench/PolyBenchLauncher.java  |   2 +
 3 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 60595e96b4de..b5c7b27f2a0d 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -63,6 +63,19 @@ def _parse_results_gen():
                     yield r
         return (x for x in _parse_results_gen())
 
+class PolybenchExcludeWarmupRule(mx_benchmark.StdOutRule):
+    """Rule that behaves as the StdOutRule, but skips input until a certain pattern."""
+
+    def __init__(self, *args, **kwargs):
+        self.startPattern = re.compile(kwargs.pop('startPattern'))
+        super(PolybenchExcludeWarmupRule, self).__init__(*args, **kwargs)
+
+    def parse(self, text):
+        m = self.startPattern.search(text)
+        if m:
+            return super(PolybenchExcludeWarmupRule, self).parse(text[m.end()+1:])
+        else:
+            return []
 
 class SulongBenchmarkSuite(VmBenchmarkSuite):
     def __init__(self, use_polybench, *args, **kwargs):
@@ -113,7 +126,6 @@ def run(self, benchnames, bmSuiteArgs):
                     # so that all executed commands are visible.
                     cmdline += ["MX_VERBOSE=y"]
                 mx.run(cmdline, env=env)
-                mx.log("Making " + out)
                 self.bench_to_exec[bench] = out
             finally:
                 # reset current Directory
@@ -143,8 +155,12 @@ def flakySkipPatterns(self, benchmarks, bmSuiteArgs):
         # preparatory benchmark is run using the llimul launcher and passing --multi-context-runs=0.
         # We can capture this argument here and instruct the benchmark infrastructure to ignore
         # the output of this benchmark.
-        if any(a == "--multi-context-runs=0" for a in bmSuiteArgs):
-            return [re.compile(r'.*', re.MULTILINE)]
+        if self.use_polybench:
+            if any(a == "store-aux-engine-cache" for a in bmSuiteArgs):
+                return [re.compile(r'.*', re.MULTILINE)]
+        else:
+            if any(a == "--multi-context-runs=0" for a in bmSuiteArgs):
+                return [re.compile(r'.*', re.MULTILINE)]
         return []
 
     def rules(self, out, benchmarks, bmSuiteArgs):
@@ -224,36 +240,30 @@ def legacyRules(self, out, benchmarks, bmSuiteArgs):
         ]
 
     def polybenchRules(self, output, benchmarks, bmSuiteArgs):
-        warmupIterCountRule = mx_benchmark.StdOutRule(r"warmup-iterations: (?P<value>.*)", {
-            "result": ("<value>", int),
-        }),
-        warmupIterCount = warmupIterCountRule[0].parse(output)[0]['result']
-        metric_name = self._get_metric_name(bmSuiteArgs)
         rules = [
-            mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after run: (?P<value>.*) (?P<unit>.*)", {
-                "benchmark": ("<name>", str),
-                "metric.better": "lower",
-                "metric.name": metric_name,
-                "metric.unit": ("<unit>", str),
-                "metric.value": ("<value>", float),
-                "metric.type": "numeric",
-                "metric.score-function": "id",
-                "metric.iteration": 0,
-            })
+           mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] iteration ([0-9]*): (?P<value>.*) (?P<unit>.*)", {
+               "bench-suite": "csuite",
+               "benchmark": benchmarks[0],
+               "metric.better": "lower",
+               "metric.name": "warmup",
+               "metric.unit": ("<unit>", str),
+               "metric.value": ("<value>", float),
+               "metric.type": "numeric",
+               "metric.score-function": "id",
+               "metric.iteration": ("$iteration", int),
+           }),
+           PolybenchExcludeWarmupRule(r"\[(?P<name>.*)\] iteration (?P<iteration>[0-9]*): (?P<value>.*) (?P<unit>.*)", {
+               "bench-suite": "csuite",
+               "benchmark": benchmarks[0],
+               "metric.better": "lower",
+               "metric.name": "time",
+               "metric.unit": ("<unit>", str),
+               "metric.value": ("<value>", float),
+               "metric.type": "numeric",
+               "metric.score-function": "id",
+               "metric.iteration": ("<iteration>", int),
+           }, startPattern=r"::: Running :::")
         ]
-        if warmupIterCount > 0:
-            rules += [
-            	mx_benchmark.StdOutRule(r"\[(?P<name>.*)\] after warmup: (?P<value>.*) (?P<unit>.*)", {
-                    "benchmark": ("<name>", str),
-                    "metric.better": "lower",
-                    "metric.name": "warmup",
-                    "metric.unit": ("<unit>", str),
-                    "metric.value": ("<value>", float),
-                    "metric.type": "numeric",
-                    "metric.score-function": "id",
-                    "metric.iteration": 0,
-                })
-        	]
         return rules
 
     def _get_metric_name(self, bmSuiteArgs):
@@ -277,7 +287,12 @@ def workingDirectory(self, benchmarks, bmSuiteArgs):
                 "Please run a specific benchmark (mx benchmark csuite:<benchmark-name>) or all the benchmarks (mx benchmark csuite:*)")
         vm = self.get_vm_registry().get_vm_from_suite_args(bmSuiteArgs)
         assert isinstance(vm, CExecutionEnvironmentMixin)
-        return join(_benchmarksDirectory(), benchmarks[0], vm.bin_dir())
+
+        if self.use_polybench and (any(a == "store-aux-engine-cache" for a in bmSuiteArgs) or any(a == "load-aux-engine-cache" for a in bmSuiteArgs)):
+            # When storing or loading an aux engine cache, the working directory must be the same (the cache for the source is selected by its URL)
+            return join(_benchmarksDirectory(), benchmarks[0], 'aux-engine-cache')
+        else:
+            return join(_benchmarksDirectory(), benchmarks[0], vm.bin_dir())
 
     def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
         if len(benchmarks) != 1:
@@ -509,8 +524,17 @@ def launcherName(self):
         return "llimul"
 
 class PolybenchVm(CExecutionEnvironmentMixin, GuestVm):
+
+    def __init__(self, config_name, options, host_vm=None):
+        super(PolybenchVm, self).__init__(host_vm)
+        self._config_name = config_name
+        self._options = options
+
+    def with_host_vm(self, host_vm):
+        return PolybenchVm(self._config_name, self._options, host_vm)
+
     def config_name(self):
-        return "default"
+        return self._config_name
 
     def toolchain_name(self):
         return "native"
@@ -527,7 +551,7 @@ def launcherName(self):
     def run(self, cwd, args):
         bench_file = args[-1:]
         bench_args = args[:-1]
-        launcher_args = ['--path'] + bench_file + bench_args
+        launcher_args = ['--path'] + bench_file + self._options + bench_args
         if hasattr(self.host_vm(), 'run_launcher'):
             result = self.host_vm().run_launcher(self.launcherName(), launcher_args, cwd)
         else:
@@ -545,7 +569,7 @@ def _filter_properties(args):
             props, launcher_args = _filter_properties(launcher_args)
             sulongCmdLine = self.launcher_vm_args() + \
                             props + \
-                            ['-XX:-UseJVMCIClassLoader', self.launcherClass(), '--path']  + bench_file + bench_args
+                            ['-XX:-UseJVMCIClassLoader', self.launcherClass(), '--path']  + bench_file + launcher_args
             result = self.host_vm().run(cwd, sulongCmdLine)
 
         ret_code, out, vm_dims = result
@@ -597,4 +621,15 @@ def hosting_registry(self):
 native_vm_registry.add_vm(SulongMultiContextVm(), _suite, 10)
 
 native_polybench_vm_registry = VmRegistry("NativePolybench", known_host_registries=[java_vm_registry])
-native_polybench_vm_registry.add_vm(PolybenchVm(), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('debug-aux-engine-cache',
+    ['--experimental-options', '--use-debug-cache', '--llvm.AOTCacheStore.0=true', '--llvm.AOTCacheLoad.0=false',
+     '--llvm.AOTCacheStore.1=false', '--llvm.AOTCacheLoad.1=true', '--engine.DebugCachePreinitializeContext=false',
+     '--engine.DebugTraceCache=true', '--multi-context-runs=2', '-w', '0', '-i', '10']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('store-aux-engine-cache',
+    ['--experimental-options', '--multi-context-runs=0', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
+     '--llvm.AOTCacheStore=true', '--engine.CacheCompile=aot', '--engine.CachePreinitializeContext=false',
+     '--engine.TraceCache=true']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('load-aux-engine-cache',
+    ['--experimental-options', '--multi-context-runs=1', '--engine.CacheLoad=' + os.path.join(os.getcwd(), 'test.image'),
+     '--llvm.AOTCacheLoad=true', '--engine.CachePreinitializeContext=false', '--engine.TraceCache=true',
+     '-w', '0', '-i', '10']), _suite, 10)
diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
index 36ea67e2e584..ec3c504e7b24 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/others/LLVMAccessSymbolNode.java
@@ -99,8 +99,8 @@ protected LLVMStack.LLVMStackAccessHolder createStackAccessHolder() {
 
     @Specialization
     public LLVMPointer accessMultiContext(VirtualFrame frame,
-                                          @Cached("createStackAccessHolder()") LLVMStack.LLVMStackAccessHolder stackAccessHolder,
-                                          @Cached BranchProfile exception) throws LLVMIllegalSymbolIndexException {
+                    @Cached("createStackAccessHolder()") LLVMStack.LLVMStackAccessHolder stackAccessHolder,
+                    @Cached BranchProfile exception) throws LLVMIllegalSymbolIndexException {
         return checkNull(stackAccessHolder.stackAccess.executeGetStack(frame).getContext().getSymbol(symbol, exception), exception);
     }
 }
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 1a5a43f3ad6b..9140bc8a50f9 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -68,8 +68,10 @@
  * <code>--multi-context-runs=2</code>. In the first iteration the source is parsed and the
  * in-memory auxiliary engine cache is stored without running the benchmark, while the second
  * iteration will load the in-memory cache and run the benchmark.
+ *
  */
 public final class PolyBenchLauncher extends AbstractLanguageLauncher {
+
     static class ArgumentConsumer {
         private final String prefix;
         private final BiConsumer<String, Config> action;

From 5fe0c0e6ca7799fdd004c7c10ec401db77a81ca5 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Mon, 20 Sep 2021 17:21:32 +0200
Subject: [PATCH 358/681] PolyBenchLauncher: Improved options handling and
 JavaDoc extended.

---
 sulong/mx.sulong/mx_sulong_benchmarks.py      |   8 +-
 .../truffle/llvm/launcher/LLVMLauncher.java   |  14 +-
 .../src/org/graalvm/polybench/Config.java     |  15 +-
 .../graalvm/polybench/PolyBenchLauncher.java  | 351 +++++++++++-------
 4 files changed, 244 insertions(+), 144 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index b5c7b27f2a0d..2e6bb6f9883b 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -622,11 +622,13 @@ def hosting_registry(self):
 
 native_polybench_vm_registry = VmRegistry("NativePolybench", known_host_registries=[java_vm_registry])
 native_polybench_vm_registry.add_vm(PolybenchVm('debug-aux-engine-cache',
-    ['--experimental-options', '--use-debug-cache', '--llvm.AOTCacheStore.0=true', '--llvm.AOTCacheLoad.0=false',
-     '--llvm.AOTCacheStore.1=false', '--llvm.AOTCacheLoad.1=true', '--engine.DebugCachePreinitializeContext=false',
+    ['--experimental-options', '--eval-source-only.0',
+     '--llvm.AOTCacheStore.0=true', '--llvm.AOTCacheLoad.0=false', '--engine.DebugCacheCompile.0=aot', '--engine.DebugCacheStore.0=true',
+     '--llvm.AOTCacheStore.1=false', '--llvm.AOTCacheLoad.1=true', '--engine.DebugCacheStore.1=false', '--engine.DebugCacheLoad.1=true',
+     '--engine.MultiTier=false', '--engine.CompileAOTOnCreate=false', '--engine.DebugCachePreinitializeContext=false',
      '--engine.DebugTraceCache=true', '--multi-context-runs=2', '-w', '0', '-i', '10']), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('store-aux-engine-cache',
-    ['--experimental-options', '--multi-context-runs=0', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
+    ['--experimental-options', '--multi-context-runs=1', '--eval-source-only', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
      '--llvm.AOTCacheStore=true', '--engine.CacheCompile=aot', '--engine.CachePreinitializeContext=false',
      '--engine.TraceCache=true']), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('load-aux-engine-cache',
diff --git a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
index f40ed909a665..1d44197b16c8 100644
--- a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
+++ b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMLauncher.java
@@ -29,13 +29,6 @@
  */
 package com.oracle.truffle.llvm.launcher;
 
-import org.graalvm.launcher.AbstractLanguageLauncher;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
@@ -47,6 +40,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+
 public class LLVMLauncher extends AbstractLanguageLauncher {
 
     public static void main(String[] args) {
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
index 9aa890a515ac..df35db7923f8 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
@@ -38,14 +38,17 @@ class Config {
     int iterations;
     Mode mode;
     Metric metric;
-    int runCount = 1;
-    boolean useDebugCache;
-    final Map<String, String> multiContextEngineOptions = new HashMap<>();
-    final List<Map<String, String>> perIterationContextOptions = new ArrayList<>();
+    final Map<String, String> engineOptions = new HashMap<>();
+    boolean evalSourceOnly;
+
+    int numberOfRuns = 1;
+    boolean sharedEngine;
+    final Map<Integer, Map<String, String>> runOptionsMap = new HashMap<>();
+    final Map<Integer, Boolean> evalSourceOnlyFlagsMap = new HashMap<>();
+
     List<String> unrecognizedArguments = new ArrayList<>();
 
     private static final int DEFAULT = -1;
-
     private static final int DEFAULT_WARMUP = 20;
     private static final int DEFAULT_ITERATIONS = 30;
 
@@ -56,8 +59,6 @@ class Config {
         this.iterations = DEFAULT;
         this.mode = Mode.standard;
         this.metric = new PeakTimeMetric();
-        this.perIterationContextOptions.add(new HashMap<>()); // iteration 0 options
-        this.perIterationContextOptions.add(new HashMap<>()); // iteration >0 options
     }
 
     public void parseBenchSpecificDefaults(Value benchmark) {
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 9140bc8a50f9..96691999db79 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -34,8 +34,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
@@ -43,50 +43,111 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.logging.Handler;
 
 /**
- * This launcher allows for multi-context benchmarking, which is enabled by the
- * <code>--multi-context-runs</code> option. The value of this option determines the number of
- * benchmark runs and can be <code>0</code> or greater. When zero runs is specified, a new context
- * is created and closed right after the source file is parsed without running the benchmark,
- * though. (N.B. This is especially useful for storing auxiliary engine cache containing ASTs
- * created during the parsing of the source file.) On the other hand, if the number of runs is
- * greater than 1, then a new engine is created and used for each context created for each run. If
- * the number of runs is 1 (the default) then no engine is explicitly created.
+ * This launcher is designed for benchmarking Truffle languages. It repeatedly executes the source
+ * file specified by its path, whereas the number of warmup and hot iterations can be specified
+ * either explicitly or determined via interop from the evaluated source value by reading or
+ * executing members <code>iterations</code> and <code>warmupIterations</code>.
+ * <p>
+ * The launcher generates a structured output containing information on individual iterations as
+ * well as the benchmark summary.
+ * <p>
+ * The following options are accepted:
+ * <ul>
+ * <li>--path &lt;script&gt;</li>
+ * <li>--class-name &lt;class&gt;</li> The class name of an Espresso benchmark inside the jar
+ * specified by <code>path</code>.
+ * <li>--mode [interpreter | standard]</li> Indicates whether the benchmark will be run in the
+ * interpreter only or the Graal compiler will be used.
+ * <li>--metric [peak-time | compilation-time | partial-evaluation-time | one-shot | none]</li>
+ * <li>-w &lt;N&gt;</li> The number of warmup iterations
+ * <li>-i &lt;N&gt;</li> The number of hot iterations
+ * <li>--eval-source-only</li> Indicates that the source file will be evaluated only, and the
+ * benchmark execution will be skipped. It can be useful for parsing time benchmarking or for using
+ * the debug auxiliary engine cache. N.B. This option can also be specified for each run in a
+ * multi-context benchmarking. See below.
+ * </ul>
+ * <h3>Multi-context benchmarking</h3>
+ * <p>
+ * This launcher allows for multi-context benchmarking consisting of several consecutive benchmark
+ * <code>runs</code>. Each run is executed using a new context instance, while all contexts can
+ * share a single engine. A multi-context benchmarking can be configured using the following
+ * options:
+ * <ul>
+ * <li>--multi-context-runs</li> The number of runs
+ * <li>--shared-engine</li> Indicates whether the contexts will share a single engine
+ * </ul>
  * <p/>
- * It is possible to specify different arguments for each iteration (N.B. currently for the first
- * two iterations only). The pattern of an iteration specific argument is:
+ * It is possible to specify different arguments for each iteration. The pattern of an iteration
+ * specific argument is:
  * 
  * <pre>
  * &lt;arg_name&gt;.&lt;iteration&gt;=&lt;value&gt;
+ * OR
+ * &lt;arg_name&gt;.&lt;iteration&gt;
  * </pre>
  * <p/>
- * In order to facilitate debugging of benchmarks using auxiliary engine cache, the
- * <code>--use-debug-cache</code> option can be used. Using this option should be accompanied by
- * <code>--multi-context-runs=2</code>. In the first iteration the source is parsed and the
- * in-memory auxiliary engine cache is stored without running the benchmark, while the second
- * iteration will load the in-memory cache and run the benchmark.
- *
+ * <h3>Examples</h3>
+ * <h4>A single run with 5 warmup and 10 hot iterations</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so -w 5 -i 10
+ * </pre>
+ * 
+ * <h4>Two runs with 5 warmup and 10 hot iterations each (no shared engine)</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --multi-context-runs=2 -w 5 -i 10
+ * </pre>
+ * 
+ * <h4>Two runs with 5 warmup and 10 hot iterations each with a shared engine</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --multi-context-runs=2 --shared-engine -w 5 -i 10
+ * </pre>
+ * 
+ * <h4>Storing the auxiliary engine cache and skipping the benchmark</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --eval-source-only --experimental-options --engine.CacheStore=test.image --engine.CacheCompile=aot
+ * </pre>
+ * 
+ * <h4>Loading the auxiliary engine cache and running the benchmark</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --experimental-options --engine.CacheLoad=test.image -w 0 -i 10
+ * </pre>
+ * 
+ * <h4>Using the debug engine cache. The first run only evaluates the source and stores the debug
+ * engine cache, while the second run executes the benchmark with the cache.</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --multi-context-runs=2 --eval-source-only.0 -w 0 -i 10 --experimental-options --engine.DebugCacheCompile.0=aot --engine.DebugCacheStore.0=true --engine.DebugCacheStore.1=false --engine.DebugCacheLoad.1=true
+ * </pre>
+ * 
+ * <h4>Reporting the source evaluation time only for 10 runs</h4>
+ * 
+ * <pre>
+ *     polybench --path bench.so --multi-context-runs=10 --eval-source-only
+ * </pre>
  */
 public final class PolyBenchLauncher extends AbstractLanguageLauncher {
 
     static class ArgumentConsumer {
         private final String prefix;
         private final BiConsumer<String, Config> action;
-        private final Consumer<Config> flagAction;
+        private final boolean isFlag;
 
-        ArgumentConsumer(String prefix, BiConsumer<String, Config> action) {
+        /**
+         * @param isFlag if <code>true</code>, the action is invoked only if the option is present.
+         *            The <code>value</code> is then <code>null</code>.
+         */
+        ArgumentConsumer(String prefix, BiConsumer<String, Config> action, boolean isFlag) {
             this.prefix = prefix;
             this.action = action;
-            this.flagAction = null;
-        }
-
-        ArgumentConsumer(String prefix, Consumer<Config> flagAction) {
-            this.prefix = prefix;
-            this.action = null;
-            this.flagAction = flagAction;
+            this.isFlag = isFlag;
         }
 
         boolean consume(String argument, Iterator<String> args, Config options) {
@@ -97,19 +158,31 @@ boolean consume(String argument, Iterator<String> args, Config options) {
             final String value;
             if (prefix.length() > 2 && argument.contains("=")) {
                 // Only multi-character flags support the equals syntax.
-                value = argument.split("=", 2)[1];
+                String[] argNameValue = argument.split("=", 2);
+                if (!argNameValue[0].equals(prefix)) {
+                    return false;
+                }
+                if (isFlag) {
+                    if (!Boolean.parseBoolean(argNameValue[1])) {
+                        return true;
+                    } else {
+                        value = null;
+                    }
+                } else {
+                    value = argNameValue[1];
+                }
             } else {
                 if (!argument.equals(prefix)) {
                     return false;
                 }
-                if (flagAction != null) {
-                    flagAction.accept(options);
-                    return true;
-                }
-                try {
-                    value = args.next();
-                } catch (NoSuchElementException e) {
-                    throw new IllegalArgumentException("Premature end of arguments for prefix " + prefix + ".");
+                if (isFlag) {
+                    value = null;
+                } else {
+                    try {
+                        value = args.next();
+                    } catch (NoSuchElementException e) {
+                        throw new IllegalArgumentException("Premature end of arguments for prefix " + prefix + ".");
+                    }
                 }
             }
             action.accept(value, options);
@@ -128,13 +201,13 @@ static class ArgumentParser {
             this.consumers = new ArrayList<>();
             this.consumers.add(new ArgumentConsumer("--path", (value, config) -> {
                 config.path = value;
-            }));
+            }, false));
             this.consumers.add(new ArgumentConsumer("--class-name", (value, config) -> {
                 config.className = value;
-            }));
+            }, false));
             this.consumers.add(new ArgumentConsumer("--mode", (value, config) -> {
                 config.mode = Config.Mode.parse(value);
-            }));
+            }, false));
             this.consumers.add(new ArgumentConsumer("--metric", (value, config) -> {
                 switch (value) {
                     case "peak-time":
@@ -157,19 +230,22 @@ static class ArgumentParser {
                     default:
                         throw new IllegalArgumentException("Unknown metric: " + value);
                 }
-            }));
+            }, false));
             this.consumers.add(new ArgumentConsumer("-w", (value, config) -> {
                 config.warmupIterations = Integer.parseInt(value);
-            }));
+            }, false));
             this.consumers.add(new ArgumentConsumer("-i", (value, config) -> {
                 config.iterations = Integer.parseInt(value);
-            }));
-            this.consumers.add(new ArgumentConsumer("--use-debug-cache", (config) -> {
-                config.useDebugCache = true;
-            }));
+            }, false));
+            this.consumers.add(new ArgumentConsumer("--shared-engine", (value, config) -> {
+                config.sharedEngine = true;
+            }, true));
+            this.consumers.add(new ArgumentConsumer("--eval-source-only", (value, config) -> {
+                config.evalSourceOnly = true;
+            }, true));
             this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> {
-                config.runCount = Integer.parseInt(value);
-            }));
+                config.numberOfRuns = Integer.parseInt(value);
+            }, false));
         }
 
         Config parse(List<String> arguments) {
@@ -188,6 +264,38 @@ Config parse(List<String> arguments) {
         }
     }
 
+    static class RunOption {
+        final int runIndex;
+        final String name;
+        final String value;
+
+        RunOption(int runIndex, String name, String value) {
+            this.runIndex = runIndex;
+            this.name = name;
+            this.value = value;
+        }
+
+        static RunOption parse(String option) {
+            String[] nameValue = option.split("=", 2);
+            if (nameValue.length < 1) {
+                return null;
+            }
+            String indexedName = nameValue[0];
+            int lastDot = indexedName.lastIndexOf('.');
+            if (lastDot < 0 || lastDot == indexedName.length() - 1) {
+                return null;
+            }
+            String name = indexedName.substring(0, lastDot);
+            String runIndexStr = indexedName.substring(lastDot + 1);
+            try {
+                int runIndex = Integer.parseInt(runIndexStr);
+                return new RunOption(runIndex, name, nameValue.length > 1 ? nameValue[1] : null);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+    }
+
     private static final ArgumentParser PARSER = new ArgumentParser();
     private Config config;
     private Optional<Double> contextEvalTime = Optional.empty();
@@ -207,19 +315,16 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
             throw abort(e.getMessage());
         }
 
-        if (this.config.runCount > 1) {
-            processMultiContextArguments();
-        }
+        processMultiContextArguments();
+
         return this.config.unrecognizedArguments;
     }
 
     private void processMultiContextArguments() {
         List<String> engineArgs = new ArrayList<>();
         // The storage for the iteration-specific arguments
-        List<List<String>> perIterationArgs = new ArrayList<>();
-        // Iteration-specific arguments can be specified for the two first iterations only atm.
-        perIterationArgs.add(new ArrayList<>()); // iteration 0 args
-        perIterationArgs.add(new ArrayList<>()); // iteration 1 args
+        Map<Integer, List<String>> runOptionsMap = new HashMap<>();
+        boolean useExperimental = false;
 
         Iterator<String> iterator = this.config.unrecognizedArguments.iterator();
         while (iterator.hasNext()) {
@@ -227,21 +332,16 @@ private void processMultiContextArguments() {
 
             // Extract iteration-specific arguments. The pattern of an iteration specific arguments
             // is: <arg_name>.<iteration>=<arg_value>
-            if (option.contains("=")) {
-                String[] nameValue = option.split("=", 2);
-                String indexedArgName = nameValue[0];
-                if (indexedArgName.length() >= 3) {
-                    String argName = indexedArgName.substring(0, indexedArgName.length() - 2);
-                    String argValue = nameValue[1];
-                    if (indexedArgName.endsWith(".0")) {
-                        iterator.remove();
-                        perIterationArgs.get(0).add(argName + "=" + argValue);
-                        continue;
-                    } else if (indexedArgName.endsWith(".1")) {
-                        iterator.remove();
-                        perIterationArgs.get(1).add(argName + "=" + argValue);
-                        continue;
-                    }
+            RunOption runOption = RunOption.parse(option);
+            if (runOption != null) {
+                if ("--eval-source-only".equals(runOption.name)) {
+                    iterator.remove();
+                    config.evalSourceOnlyFlagsMap.put(runOption.runIndex, runOption.value == null || Boolean.parseBoolean(runOption.value));
+                } else {
+                    iterator.remove();
+                    List<String> runOptions = runOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new ArrayList<>());
+                    runOptions.add(runOption.name + "=" + runOption.value);
+                    continue;
                 }
             }
 
@@ -250,15 +350,22 @@ private void processMultiContextArguments() {
                 iterator.remove();
                 engineArgs.add(option);
             } else if ("--experimental-options".equals(option)) {
+                useExperimental = true;
                 engineArgs.add(option);
-                perIterationArgs.get(0).add(option);
-                perIterationArgs.get(1).add(option);
             }
         }
 
-        parseUnrecognizedOptions(getLanguageId(config.path), config.multiContextEngineOptions, engineArgs);
-        parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(0), perIterationArgs.get(0));
-        parseUnrecognizedOptions(getLanguageId(config.path), config.perIterationContextOptions.get(1), perIterationArgs.get(1));
+        // Parse engine options and store them to config.engineOptions
+        parseUnrecognizedOptions(getLanguageId(config.path), config.engineOptions, engineArgs);
+
+        // Parse run specific options and store them to config.runOptionsMap
+        for (Map.Entry<Integer, List<String>> runOptionsEntry : runOptionsMap.entrySet()) {
+            Map<String, String> runOptions = config.runOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
+            if (useExperimental) {
+                runOptionsEntry.getValue().add("--experimental-options");
+            }
+            parseUnrecognizedOptions(getLanguageId(config.path), runOptions, runOptionsEntry.getValue());
+        }
     }
 
     @Override
@@ -275,49 +382,32 @@ protected void validateArguments(Map<String, String> polyglotOptions) {
 
     @Override
     protected void launch(Context.Builder contextBuilder) {
-        contextBuilder.allowAllAccess(true);
-
-        contextBuilder.options(config.multiContextEngineOptions);
-        if (!config.useDebugCache && config.runCount > 1) {
-            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.multiContextEngineOptions).build());
+        String compilationOptionValue;
+        switch (config.mode) {
+            case interpreter:
+                compilationOptionValue = "false";
+                break;
+            case standard:
+                compilationOptionValue = "true";
+                break;
+            default:
+                throw new AssertionError("Unknown execution-mode: " + config.mode);
         }
+        config.engineOptions.put("engine.Compilation", compilationOptionValue);
 
-        if (config.runCount == 0) {
-            // Create the context and close it right afterwards to trigger the compilation of AOT
-            // roots
-            try (Context context = contextBuilder.build()) {
-                context.eval(Source.newBuilder(getLanguageId(config.path), Paths.get(config.path).toFile()).build());
-                return;
-            } catch (IOException e) {
-                throw abort(String.format("Error loading file '%s' (%s)", config.path, e.getMessage()));
-            }
+        if (config.sharedEngine) {
+            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.engineOptions).build());
+        } else {
+            contextBuilder.options(config.engineOptions);
         }
+        contextBuilder.allowAllAccess(true);
 
-        for (int i = 0; i < config.runCount; i++) {
-            Map<String, String> perIterationOptions = config.perIterationContextOptions.get(i);
+        for (int i = 0; i < config.numberOfRuns; i++) {
+            Map<String, String> perIterationOptions = config.runOptionsMap.get(i);
             if (perIterationOptions != null) {
                 contextBuilder.options(perIterationOptions);
             }
-            if (config.useDebugCache) {
-                // The debug engine cache facilitation
-                if (i == 0) {
-                    contextBuilder.option("engine.DebugCacheCompile", "aot").//
-                                    option("engine.DebugCacheStore", "true").//
-                                    option("engine.MultiTier", "false").//
-                                    option("engine.CompileAOTOnCreate", "false");
-                    try (Context context = contextBuilder.build()) {
-                        context.eval(Source.newBuilder(getLanguageId(config.path), Paths.get(config.path).toFile()).build());
-                    } catch (IOException e) {
-                        throw abort(String.format("Error loading file '%s' (%s)", config.path, e.getMessage()));
-                    }
-                } else {
-                    contextBuilder.option("engine.DebugCacheStore", "false").//
-                                    option("engine.DebugCacheLoad", "true");
-                    runHarness(contextBuilder);
-                }
-            } else {
-                runHarness(contextBuilder);
-            }
+            runHarness(contextBuilder, config.evalSourceOnlyFlagsMap.getOrDefault(i, config.evalSourceOnly));
         }
     }
 
@@ -348,6 +438,10 @@ static String getExtension(String path) {
     }
 
     String getLanguageId(String path) {
+        if (path == null) {
+            return null;
+        }
+
         final File file = new File(path);
         if ("jar".equals(getExtension(path))) {
             return "java";
@@ -410,21 +504,11 @@ static class EvalResult {
         }
     }
 
-    private void runHarness(Context.Builder contextBuilder) {
+    private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly) {
         log("::: Starting " + config.path + " :::");
         log(config.toString());
         log("");
 
-        switch (config.mode) {
-            case interpreter:
-                contextBuilder.option("engine.Compilation", "false");
-                break;
-            case standard:
-                contextBuilder.option("engine.Compilation", "true");
-                break;
-            default:
-                throw new AssertionError("Unknown execution-mode: " + config.mode);
-        }
         contextBuilder.options(config.metric.getEngineOptions(config));
         Handler handler = config.metric.getLogHandler();
         if (handler != null) {
@@ -444,11 +528,15 @@ private void runHarness(Context.Builder contextBuilder) {
         try (Context context = contextBuilder.build()) {
             log("::: Initializing :::");
 
+            PeakTimeMetric evalSourceMetric = new PeakTimeMetric();
+            evalSourceMetric.beforeIteration(false, 0, config);
             EvalResult evalResult = evalSource(context, config.path);
+            evalSourceMetric.afterIteration(false, 0, config);
 
-            log("language: " + evalResult.languageId);
-            log("type:     " + (evalResult.isBinarySource ? "binary" : "source code"));
-            log("length:   " + evalResult.sourceLength + (evalResult.isBinarySource ? " bytes" : " characters"));
+            log("language:   " + evalResult.languageId);
+            log("type:       " + (evalResult.isBinarySource ? "binary" : "source code"));
+            log("length:     " + evalResult.sourceLength + (evalResult.isBinarySource ? " bytes" : " characters"));
+            log("evaluation: " + round(evalSourceMetric.reportAfterAll().get()) + " " + evalSourceMetric.unit());
             log("");
 
             log("::: Bench specific options :::");
@@ -459,9 +547,18 @@ private void runHarness(Context.Builder contextBuilder) {
             log("Initialization completed.");
             log("");
 
-            log("::: Running warmup :::");
-            repeatIterations(context, evalResult.languageId, evalResult.sourceName, evalResult.value, true, config.warmupIterations);
-            log("");
+            if (evalSourceOnly) {
+                log("::: Iterations skipped :::");
+            } else {
+                log("::: Running warmup :::");
+                repeatIterations(context, evalResult.languageId, evalResult.sourceName, evalResult.value, true, config.warmupIterations);
+                log("");
+
+                log("::: Running :::");
+                config.metric.reset();
+                repeatIterations(context, evalResult.languageId, evalResult.sourceName, evalResult.value, false, config.iterations);
+                log("");
+            }
 
             log("::: Running :::");
             config.metric.reset();

From 6501cfabe7fb35d0454aac87937f24ba14f6e6a5 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Wed, 29 Sep 2021 13:20:08 +0200
Subject: [PATCH 359/681] PR comments addressed

---
 sulong/mx.sulong/mx_sulong_benchmarks.py      |   4 +-
 .../src/org/graalvm/polybench/Config.java     |  47 +++++-
 .../graalvm/polybench/PolyBenchLauncher.java  | 155 +++++++-----------
 3 files changed, 100 insertions(+), 106 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 2e6bb6f9883b..ba0f705ae1d3 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -622,13 +622,13 @@ def hosting_registry(self):
 
 native_polybench_vm_registry = VmRegistry("NativePolybench", known_host_registries=[java_vm_registry])
 native_polybench_vm_registry.add_vm(PolybenchVm('debug-aux-engine-cache',
-    ['--experimental-options', '--eval-source-only.0',
+    ['--experimental-options', '--eval-source-only.0=true',
      '--llvm.AOTCacheStore.0=true', '--llvm.AOTCacheLoad.0=false', '--engine.DebugCacheCompile.0=aot', '--engine.DebugCacheStore.0=true',
      '--llvm.AOTCacheStore.1=false', '--llvm.AOTCacheLoad.1=true', '--engine.DebugCacheStore.1=false', '--engine.DebugCacheLoad.1=true',
      '--engine.MultiTier=false', '--engine.CompileAOTOnCreate=false', '--engine.DebugCachePreinitializeContext=false',
      '--engine.DebugTraceCache=true', '--multi-context-runs=2', '-w', '0', '-i', '10']), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('store-aux-engine-cache',
-    ['--experimental-options', '--multi-context-runs=1', '--eval-source-only', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
+    ['--experimental-options', '--multi-context-runs=1', '--eval-source-only=true', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
      '--llvm.AOTCacheStore=true', '--engine.CacheCompile=aot', '--engine.CachePreinitializeContext=false',
      '--engine.TraceCache=true']), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('load-aux-engine-cache',
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
index df35db7923f8..ce5dfd75355c 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
@@ -27,31 +27,48 @@
 import org.graalvm.polyglot.Value;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 class Config {
+
+    public static final String EVAL_SOURCE_ONLY_OPTION = "--eval-source-only";
+
     String path;
     String className;
     int warmupIterations;
     int iterations;
     Mode mode;
     Metric metric;
-    final Map<String, String> engineOptions = new HashMap<>();
-    boolean evalSourceOnly;
-
-    int numberOfRuns = 1;
-    boolean sharedEngine;
-    final Map<Integer, Map<String, String>> runOptionsMap = new HashMap<>();
-    final Map<Integer, Boolean> evalSourceOnlyFlagsMap = new HashMap<>();
+    boolean evalSourceOnlyDefault;
 
-    List<String> unrecognizedArguments = new ArrayList<>();
+    final List<String> unrecognizedArguments = new ArrayList<>();
 
     private static final int DEFAULT = -1;
     private static final int DEFAULT_WARMUP = 20;
     private static final int DEFAULT_ITERATIONS = 30;
 
+    /**
+     * Multi-context runs related configuration.
+     */
+    int numberOfRuns = 1;
+    boolean sharedEngine;
+    final Map<String, String> engineOptions = new HashMap<>();
+    final Map<Integer, Map<String, String>> polyglotRunOptionsMap = new HashMap<>();
+    final Map<Integer, Map<String, String>> polybenchRunOptionsMap = new HashMap<>();
+
+    /**
+     * Polybench options that can be specified per run.
+     */
+    private static final Set<String> POLYBENCH_RUN_OPTIONS = new HashSet<>();
+    static {
+        POLYBENCH_RUN_OPTIONS.add(EVAL_SOURCE_ONLY_OPTION);
+    }
+
     Config() {
         this.path = null;
         this.className = null;
@@ -85,7 +102,10 @@ public String toString() {
         return "execution-mode:    " + mode + "\n" +
                         "metric:            " + metric.name() + " (" + metric.unit() + ")" + "\n" +
                         "warmup-iterations: " + (warmupIterations == DEFAULT ? "default" : warmupIterations) + "\n" +
-                        "iterations:        " + (iterations == DEFAULT ? "default" : iterations);
+                        "iterations:        " + (iterations == DEFAULT ? "default"
+                                        : iterations + "\n" +
+                                                        "runs:              " + numberOfRuns + "\n" +
+                                                        "shared engine:     " + sharedEngine);
     }
 
     enum Mode {
@@ -103,4 +123,13 @@ static Mode parse(String name) throws IllegalArgumentException {
 
     }
 
+    static boolean isPolybenchRunOption(String optionName) {
+        return POLYBENCH_RUN_OPTIONS.contains(optionName);
+    }
+
+    boolean isEvalSourceOnly(int run) {
+        String evalSourceOptionValue = polybenchRunOptionsMap.getOrDefault(run, Collections.emptyMap()).get(EVAL_SOURCE_ONLY_OPTION);
+        return evalSourceOptionValue == null ? evalSourceOnlyDefault : Boolean.parseBoolean(evalSourceOptionValue);
+    }
+
 }
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 96691999db79..ee74ff3b8cdb 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -58,9 +58,9 @@
  * <ul>
  * <li>--path &lt;script&gt;</li>
  * <li>--class-name &lt;class&gt;</li> The class name of an Espresso benchmark inside the jar
- * specified by <code>path</code>.
- * <li>--mode [interpreter | standard]</li> Indicates whether the benchmark will be run in the
- * interpreter only or the Graal compiler will be used.
+ * specified by <code>path</code> (only relevant when executing Java workloads).
+ * <li>--mode &lt;mode&gt;</li> Specified the mode which the benchmark will be running in. Consult
+ * the available modes via the help command.
  * <li>--metric [peak-time | compilation-time | partial-evaluation-time | one-shot | none]</li>
  * <li>-w &lt;N&gt;</li> The number of warmup iterations
  * <li>-i &lt;N&gt;</li> The number of hot iterations
@@ -76,17 +76,17 @@
  * share a single engine. A multi-context benchmarking can be configured using the following
  * options:
  * <ul>
- * <li>--multi-context-runs</li> The number of runs
- * <li>--shared-engine</li> Indicates whether the contexts will share a single engine
+ * <li>--multi-context-runs=&lt;N&gt;</li> The number of runs
+ * <li>--shared-engine=[true | false]</li> Indicates whether the contexts will share a single
+ * engine. If <code>false</code>, the context of each run will have a separate engine, otherwise all
+ * contexts will share a single engine.
  * </ul>
- * <p/>
- * It is possible to specify different arguments for each iteration. The pattern of an iteration
- * specific argument is:
+ * <p>
+ * It is possible to specify different arguments for each run. The pattern of a run specific
+ * argument is:
  * 
  * <pre>
- * &lt;arg_name&gt;.&lt;iteration&gt;=&lt;value&gt;
- * OR
- * &lt;arg_name&gt;.&lt;iteration&gt;
+ * &lt;arg_name&gt;.&lt;run&gt;=&lt;value&gt;
  * </pre>
  * <p/>
  * <h3>Examples</h3>
@@ -105,13 +105,13 @@
  * <h4>Two runs with 5 warmup and 10 hot iterations each with a shared engine</h4>
  * 
  * <pre>
- *     polybench --path bench.so --multi-context-runs=2 --shared-engine -w 5 -i 10
+ *     polybench --path bench.so --multi-context-runs=2 --shared-engine=true -w 5 -i 10
  * </pre>
  * 
  * <h4>Storing the auxiliary engine cache and skipping the benchmark</h4>
  * 
  * <pre>
- *     polybench --path bench.so --eval-source-only --experimental-options --engine.CacheStore=test.image --engine.CacheCompile=aot
+ *     polybench --path bench.so --eval-source-only=true --experimental-options --engine.CacheStore=test.image --engine.CacheCompile=aot
  * </pre>
  * 
  * <h4>Loading the auxiliary engine cache and running the benchmark</h4>
@@ -124,13 +124,13 @@
  * engine cache, while the second run executes the benchmark with the cache.</h4>
  * 
  * <pre>
- *     polybench --path bench.so --multi-context-runs=2 --eval-source-only.0 -w 0 -i 10 --experimental-options --engine.DebugCacheCompile.0=aot --engine.DebugCacheStore.0=true --engine.DebugCacheStore.1=false --engine.DebugCacheLoad.1=true
+ *     polybench --path bench.so --multi-context-runs=2 --eval-source-only.0=true -w 0 -i 10 --experimental-options --engine.DebugCacheCompile.0=aot --engine.DebugCacheStore.0=true --engine.DebugCacheStore.1=false --engine.DebugCacheLoad.1=true
  * </pre>
  * 
  * <h4>Reporting the source evaluation time only for 10 runs</h4>
  * 
  * <pre>
- *     polybench --path bench.so --multi-context-runs=10 --eval-source-only
+ *     polybench --path bench.so --multi-context-runs=10 --eval-source-only=true
  * </pre>
  */
 public final class PolyBenchLauncher extends AbstractLanguageLauncher {
@@ -138,16 +138,10 @@ public final class PolyBenchLauncher extends AbstractLanguageLauncher {
     static class ArgumentConsumer {
         private final String prefix;
         private final BiConsumer<String, Config> action;
-        private final boolean isFlag;
 
-        /**
-         * @param isFlag if <code>true</code>, the action is invoked only if the option is present.
-         *            The <code>value</code> is then <code>null</code>.
-         */
-        ArgumentConsumer(String prefix, BiConsumer<String, Config> action, boolean isFlag) {
+        ArgumentConsumer(String prefix, BiConsumer<String, Config> action) {
             this.prefix = prefix;
             this.action = action;
-            this.isFlag = isFlag;
         }
 
         boolean consume(String argument, Iterator<String> args, Config options) {
@@ -162,27 +156,15 @@ boolean consume(String argument, Iterator<String> args, Config options) {
                 if (!argNameValue[0].equals(prefix)) {
                     return false;
                 }
-                if (isFlag) {
-                    if (!Boolean.parseBoolean(argNameValue[1])) {
-                        return true;
-                    } else {
-                        value = null;
-                    }
-                } else {
-                    value = argNameValue[1];
-                }
+                value = argNameValue[1];
             } else {
                 if (!argument.equals(prefix)) {
                     return false;
                 }
-                if (isFlag) {
-                    value = null;
-                } else {
-                    try {
-                        value = args.next();
-                    } catch (NoSuchElementException e) {
-                        throw new IllegalArgumentException("Premature end of arguments for prefix " + prefix + ".");
-                    }
+                try {
+                    value = args.next();
+                } catch (NoSuchElementException e) {
+                    throw new IllegalArgumentException("Premature end of arguments for prefix " + prefix + ".");
                 }
             }
             action.accept(value, options);
@@ -199,15 +181,9 @@ static class ArgumentParser {
 
         ArgumentParser() {
             this.consumers = new ArrayList<>();
-            this.consumers.add(new ArgumentConsumer("--path", (value, config) -> {
-                config.path = value;
-            }, false));
-            this.consumers.add(new ArgumentConsumer("--class-name", (value, config) -> {
-                config.className = value;
-            }, false));
-            this.consumers.add(new ArgumentConsumer("--mode", (value, config) -> {
-                config.mode = Config.Mode.parse(value);
-            }, false));
+            this.consumers.add(new ArgumentConsumer("--path", (value, config) -> config.path = value));
+            this.consumers.add(new ArgumentConsumer("--class-name", (value, config) -> config.className = value));
+            this.consumers.add(new ArgumentConsumer("--mode", (value, config) -> config.mode = Config.Mode.parse(value)));
             this.consumers.add(new ArgumentConsumer("--metric", (value, config) -> {
                 switch (value) {
                     case "peak-time":
@@ -230,22 +206,12 @@ static class ArgumentParser {
                     default:
                         throw new IllegalArgumentException("Unknown metric: " + value);
                 }
-            }, false));
-            this.consumers.add(new ArgumentConsumer("-w", (value, config) -> {
-                config.warmupIterations = Integer.parseInt(value);
-            }, false));
-            this.consumers.add(new ArgumentConsumer("-i", (value, config) -> {
-                config.iterations = Integer.parseInt(value);
-            }, false));
-            this.consumers.add(new ArgumentConsumer("--shared-engine", (value, config) -> {
-                config.sharedEngine = true;
-            }, true));
-            this.consumers.add(new ArgumentConsumer("--eval-source-only", (value, config) -> {
-                config.evalSourceOnly = true;
-            }, true));
-            this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> {
-                config.numberOfRuns = Integer.parseInt(value);
-            }, false));
+            }));
+            this.consumers.add(new ArgumentConsumer("-w", (value, config) -> config.warmupIterations = Integer.parseInt(value)));
+            this.consumers.add(new ArgumentConsumer("-i", (value, config) -> config.iterations = Integer.parseInt(value)));
+            this.consumers.add(new ArgumentConsumer("--shared-engine", (value, config) -> config.sharedEngine = Boolean.parseBoolean(value)));
+            this.consumers.add(new ArgumentConsumer("--eval-source-only", (value, config) -> config.evalSourceOnlyDefault = Boolean.parseBoolean(value)));
+            this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> config.numberOfRuns = Integer.parseInt(value)));
         }
 
         Config parse(List<String> arguments) {
@@ -321,8 +287,8 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
     }
 
     private void processMultiContextArguments() {
-        List<String> engineArgs = new ArrayList<>();
-        // The storage for the iteration-specific arguments
+        List<String> engineOptions = new ArrayList<>();
+        // The storage for the run-specific options
         Map<Integer, List<String>> runOptionsMap = new HashMap<>();
         boolean useExperimental = false;
 
@@ -330,37 +296,38 @@ private void processMultiContextArguments() {
         while (iterator.hasNext()) {
             String option = iterator.next();
 
-            // Extract iteration-specific arguments. The pattern of an iteration specific arguments
-            // is: <arg_name>.<iteration>=<arg_value>
+            // Extract run-specific arguments. The pattern of a run-specific option
+            // is: <option_name>.<run>=<option_value>
             RunOption runOption = RunOption.parse(option);
             if (runOption != null) {
-                if ("--eval-source-only".equals(runOption.name)) {
-                    iterator.remove();
-                    config.evalSourceOnlyFlagsMap.put(runOption.runIndex, runOption.value == null || Boolean.parseBoolean(runOption.value));
+                iterator.remove();
+                if (Config.isPolybenchRunOption(runOption.name)) {
+                    // a run-level PolyBench option
+                    Map<String, String> pbRunOptions = config.polybenchRunOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new HashMap<>());
+                    pbRunOptions.put(runOption.name, runOption.value);
                 } else {
+                    // a run-level polyglot option
+                    List<String> runOptionsToParse = runOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new ArrayList<>());
+                    runOptionsToParse.add(runOption.name + "=" + runOption.value);
+                }
+            } else {
+                // The engine options must be separated and used later when building a context
+                if (option.startsWith("--engine.")) {
                     iterator.remove();
-                    List<String> runOptions = runOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new ArrayList<>());
-                    runOptions.add(runOption.name + "=" + runOption.value);
-                    continue;
+                    engineOptions.add(option);
+                } else if ("--experimental-options".equals(option)) {
+                    useExperimental = true;
+                    engineOptions.add(option);
                 }
             }
-
-            // The engine options must be separated and used later when building a context
-            if (option.startsWith("--engine.")) {
-                iterator.remove();
-                engineArgs.add(option);
-            } else if ("--experimental-options".equals(option)) {
-                useExperimental = true;
-                engineArgs.add(option);
-            }
         }
 
         // Parse engine options and store them to config.engineOptions
-        parseUnrecognizedOptions(getLanguageId(config.path), config.engineOptions, engineArgs);
+        parseUnrecognizedOptions(getLanguageId(config.path), config.engineOptions, engineOptions);
 
         // Parse run specific options and store them to config.runOptionsMap
         for (Map.Entry<Integer, List<String>> runOptionsEntry : runOptionsMap.entrySet()) {
-            Map<String, String> runOptions = config.runOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
+            Map<String, String> runOptions = config.polyglotRunOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
             if (useExperimental) {
                 runOptionsEntry.getValue().add("--experimental-options");
             }
@@ -396,18 +363,18 @@ protected void launch(Context.Builder contextBuilder) {
         config.engineOptions.put("engine.Compilation", compilationOptionValue);
 
         if (config.sharedEngine) {
-            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.engineOptions).build());
+            contextBuilder.engine(Engine.newBuilder().options(config.engineOptions).build());
         } else {
             contextBuilder.options(config.engineOptions);
         }
         contextBuilder.allowAllAccess(true);
 
         for (int i = 0; i < config.numberOfRuns; i++) {
-            Map<String, String> perIterationOptions = config.runOptionsMap.get(i);
-            if (perIterationOptions != null) {
-                contextBuilder.options(perIterationOptions);
+            Map<String, String> perRunOptions = config.polyglotRunOptionsMap.get(i);
+            if (perRunOptions != null) {
+                contextBuilder.options(perRunOptions);
             }
-            runHarness(contextBuilder, config.evalSourceOnlyFlagsMap.getOrDefault(i, config.evalSourceOnly));
+            runHarness(contextBuilder, config.isEvalSourceOnly(i), i);
         }
     }
 
@@ -463,7 +430,7 @@ private EvalResult evalSource(Context context, String path) {
         if ("jar".equals(getExtension(path))) {
             // Espresso cannot eval .jar files, instead we load the JAR's main class.
             String className = config.className;
-            Value mainKlass = null;
+            Value mainKlass;
             if (className != null) {
                 mainKlass = context.getBindings("java").getMember(className);
             } else {
@@ -504,7 +471,7 @@ static class EvalResult {
         }
     }
 
-    private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly) {
+    private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly, int run) {
         log("::: Starting " + config.path + " :::");
         log(config.toString());
         log("");
@@ -533,6 +500,7 @@ private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly)
             EvalResult evalResult = evalSource(context, config.path);
             evalSourceMetric.afterIteration(false, 0, config);
 
+            log("run:        " + run);
             log("language:   " + evalResult.languageId);
             log("type:       " + (evalResult.isBinarySource ? "binary" : "source code"));
             log("length:     " + evalResult.sourceLength + (evalResult.isBinarySource ? " bytes" : " characters"));
@@ -560,9 +528,6 @@ private void runHarness(Context.Builder contextBuilder, boolean evalSourceOnly)
                 log("");
             }
 
-            log("::: Running :::");
-            config.metric.reset();
-            repeatIterations(context, evalResult.languageId, evalResult.sourceName, evalResult.value, false, config.iterations);
             // this log message is parsed in mx_vm_benchmark.py, if changed adapt parse rule.
             contextEvalTime.ifPresent(delta -> log("### Truffle Context eval time (ms): " + round(delta)));
             log("");

From 872ac6bca71ec2bd7060382c4f1d23c0132c8ee2 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Fri, 8 Oct 2021 13:47:54 +0200
Subject: [PATCH 360/681] A new Sulong Polybench VM for 3 shared/exclusive runs
 registered

---
 sulong/mx.sulong/mx_sulong_benchmarks.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index ba0f705ae1d3..f063ee5777a6 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -635,3 +635,7 @@ def hosting_registry(self):
     ['--experimental-options', '--multi-context-runs=1', '--engine.CacheLoad=' + os.path.join(os.getcwd(), 'test.image'),
      '--llvm.AOTCacheLoad=true', '--engine.CachePreinitializeContext=false', '--engine.TraceCache=true',
      '-w', '0', '-i', '10']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-exclusive-engine',
+    ['--multi-context-runs=3', '--shared-engine=false', '-w', '10', '-i', '10']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-shared-engine',
+    ['--multi-context-runs=3', '--shared-engine=true', '-w', '10', '-i', '10']), _suite, 10)

From 01560f5d573ed15d4212c85bd9362f034277078d Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Fri, 1 Oct 2021 10:41:25 +0200
Subject: [PATCH 361/681] PolyBench peak metric can also be initialized via a
 member execution

---
 .../src/org/graalvm/polybench/PeakTimeMetric.java         | 8 +++++---
 .../src/org/graalvm/polybench/PolyBenchLauncher.java      | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PeakTimeMetric.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PeakTimeMetric.java
index 880a5d3526b1..44843a375b94 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PeakTimeMetric.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PeakTimeMetric.java
@@ -59,11 +59,13 @@ private enum Unit {
     @Override
     public void parseBenchSpecificOptions(Value runner) {
         if (runner.hasMember("batchSize")) {
-            batchSize = runner.getMember("batchSize").asInt();
+            Value batchSizeMember = runner.getMember("batchSize");
+            this.batchSize = batchSizeMember.canExecute() ? batchSizeMember.execute().asInt() : batchSizeMember.asInt();
         }
         if (runner.hasMember("unit")) {
-            String u = runner.getMember("unit").asString();
-            unit = Unit.valueOf(u);
+            Value unitMember = runner.getMember("unit");
+            String u = unitMember.canExecute() ? unitMember.execute().asString() : unitMember.asString();
+            this.unit = Unit.valueOf(u);
         }
     }
 
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index ee74ff3b8cdb..49164d4dbc20 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -329,6 +329,8 @@ private void processMultiContextArguments() {
         for (Map.Entry<Integer, List<String>> runOptionsEntry : runOptionsMap.entrySet()) {
             Map<String, String> runOptions = config.polyglotRunOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
             if (useExperimental) {
+                // the enabled experimental-options flag must be propagated to runOptions to enable parsing of
+                // run-level experimental options
                 runOptionsEntry.getValue().add("--experimental-options");
             }
             parseUnrecognizedOptions(getLanguageId(config.path), runOptions, runOptionsEntry.getValue());
@@ -363,7 +365,8 @@ protected void launch(Context.Builder contextBuilder) {
         config.engineOptions.put("engine.Compilation", compilationOptionValue);
 
         if (config.sharedEngine) {
-            contextBuilder.engine(Engine.newBuilder().options(config.engineOptions).build());
+            // allowExperimentalOptions must be enabled as engine.Compilation is experimental
+            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.engineOptions).build());
         } else {
             contextBuilder.options(config.engineOptions);
         }

From b11197628d80cf2a6b8c89f7c86efc5780de9350 Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Fri, 8 Oct 2021 15:29:18 +0200
Subject: [PATCH 362/681] Format pass + more documentation

---
 .../espresso/threads/GuestRunnable.java       | 17 +++++++++--
 .../espresso/threads/ThreadsAccess.java       | 28 +++++++++++--------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
index 57acf7030f55..cb47044fa949 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/GuestRunnable.java
@@ -29,13 +29,26 @@
 import com.oracle.truffle.espresso.runtime.EspressoExitException;
 import com.oracle.truffle.espresso.runtime.StaticObject;
 
-public final class GuestRunnable implements Runnable {
+/**
+ * The payload of the host thread executing a guest {@linkplain #thread thread}.
+ * 
+ * When started, the host thread:
+ * <ul>
+ * <li>Attached itself to the context.</li>
+ * <li>Fetches the guest {@link Thread#run()} methods and executes it.</li>
+ * <li>If an exception escapes the guest thread, call
+ * {@code Thread#dispatchUncaughtException(Throwable)}.</li>
+ * <li>Upon completion, {@link ThreadsAccess#terminate(StaticObject, DirectCallNode) terminates} the
+ * guest thread.</li>
+ * </ul>
+ */
+final class GuestRunnable implements Runnable {
     private final EspressoContext context;
     private final StaticObject thread;
     private final DirectCallNode exit;
     private final DirectCallNode dispatchUncaught;
 
-    public GuestRunnable(EspressoContext context, StaticObject thread, DirectCallNode exit, DirectCallNode dispatchUncaught) {
+    GuestRunnable(EspressoContext context, StaticObject thread, DirectCallNode exit, DirectCallNode dispatchUncaught) {
         this.context = context;
         this.thread = thread;
         this.exit = exit;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
index ad36f951cd5c..9dd1a643052e 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
@@ -178,7 +178,7 @@ public void interrupt(StaticObject guest) {
     }
 
     /**
-     * Implementation of {@code Thread.clearInterruptEvent} (JDK 13+)
+     * Implementation of {@code Thread.clearInterruptEvent} (JDK 13+).
      */
     public void clearInterruptEvent() {
         assert !context.getJavaVersion().java13OrEarlier();
@@ -186,7 +186,7 @@ public void clearInterruptEvent() {
     }
 
     /**
-     * Sets the interrupted field of the given thread to {@code false}
+     * Sets the interrupted field of the given thread to {@code false}.
      */
     public void clearInterruptStatus(StaticObject guest) {
         meta.HIDDEN_INTERRUPTED.setBoolean(guest, false, true);
@@ -271,14 +271,16 @@ public Thread createJavaThread(StaticObject guest, DirectCallNode exit, DirectCa
     }
 
     /**
-     * Termination of a threads works as follows:
+     * Terminates a given thread.
+     * <p>
+     * The following procedure is applied for termination:
      * <ul>
      * <li>Prevent other threads from {@linkplain #stop(StaticObject, StaticObject)} stopping} the
-     * given thread</li>
-     * <li>Invoke guest {@code Thread.exit()}</li>
+     * given thread.</li>
+     * <li>Invoke guest {@code Thread.exit()}.</li>
      * <li>Sets the status of this thread to {@link State#TERMINATED} and notifies other threads
-     * waiting on this thread's monitor</li>
-     * <li>Unregisters the thread</li>
+     * waiting on this thread's monitor.</li>
+     * <li>Unregisters the thread from the context.</li>
      * </ul>
      */
     public void terminate(StaticObject thread) {
@@ -431,23 +433,25 @@ void handleStop(Meta meta) {
                     return;
                 case STOP:
                     synchronized (this) {
-                        // synchronize to mqke sure we are still stopped.
+                        // synchronize to make sure we are still stopped.
                         KillStatus s = status;
                         if (s == STOP) {
                             updateKillState(NORMAL);
                             // check if death cause throwable is set, if not throw ThreadDeath
                             StaticObject deathThrowable = throwable;
                             throw deathThrowable != null ? meta.throwException(deathThrowable) : meta.throwException(meta.java_lang_ThreadDeath);
-                        } else if (s != KILL) {
-                            return;
+                        } else if (s == KILL) {
+                            throw new EspressoExitException(meta.getContext().getExitStatus());
                         }
+                        // Stop status has been
+                        assert s == NORMAL || s == EXITING;
+                        return;
                     }
-                    // fallthrough
                 case KILL:
                     // This thread refuses to stop. Send a host exception.
-                    assert meta.getContext().isClosing();
                     throw new EspressoExitException(meta.getContext().getExitStatus());
             }
+            throw EspressoError.shouldNotReachHere();
         }
     }
 

From 12d85593d63cb33917d265e3bac519855e3f1fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Thu, 7 Oct 2021 11:41:17 +0200
Subject: [PATCH 363/681] Remove obsolete maven tag from SVM gates

---
 substratevm/ci_includes/gate.hocon | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/substratevm/ci_includes/gate.hocon b/substratevm/ci_includes/gate.hocon
index 9d6b1b86e61b..e5cd60e10be3 100644
--- a/substratevm/ci_includes/gate.hocon
+++ b/substratevm/ci_includes/gate.hocon
@@ -35,12 +35,11 @@ builds += [
       }
     }
     environment : {
-      MAVEN_REPO_LOCAL : "$BUILD_DIR/.m2"
       PATH : "$MUSL_LIBS/bin:$PATH"
     }
     run: [
       ["$MUSL_LIBS/fix_paths.sh"]
-      ${svm-cmd-gate} ["build,helloworld,test,maven,nativeimagehelp,muslcbuild"]
+      ${svm-cmd-gate} ["build,helloworld,test,nativeimagehelp,muslcbuild"]
     ]
   }
   ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
@@ -53,21 +52,16 @@ builds += [
     name: "gate-svm-style-fullbuild"
     timelimit: "45:00"
     environment : {
-      MAVEN_REPO_LOCAL : "$BUILD_DIR/.m2"
       MX_BUILD_EXPLODED : "true" # test native-image MX_BUILD_EXPLODED compatibility
     }
     run: [
-      ${svm-cmd-gate} ["style,fullbuild,helloworld,test,svmjunit,maven"]
+      ${svm-cmd-gate} ["style,fullbuild,helloworld,test,svmjunit"]
     ]
   }
   ${labsjdk-ce-17} ${svm-common-gate} ${svm-common-windows-jdk17} {
     name: "gate-svm-windows-basics"
-    environment: {
-      PATH : "$MVN_HOME;$PATH"  # workaround until GR-10735 is resolved
-      MAVEN_REPO_LOCAL : "$BUILD_DIR\.m2"
-    }
     run: [
-      ${svm-cmd-gate} ["build,helloworld,test,svmjunit,maven"]
+      ${svm-cmd-gate} ["build,helloworld,test,svmjunit"]
     ]
   }
 ]

From 693d3ed5c3eb6b39b64f2e765a278acf5b9d99c7 Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Fri, 8 Oct 2021 16:10:02 +0100
Subject: [PATCH 364/681] Make methods static that can be static.

---
 .../oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index 37e23208bd4c..f63ecbbb2c96 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -500,7 +500,7 @@ private void calculateRecursiveData(JSONObject sample) {
             }
         }
 
-        private void addRecursiveChild(JSONObject sample, JSONObject child) {
+        private static void addRecursiveChild(JSONObject sample, JSONObject child) {
             final JSONArray children;
             if (!sample.has("rs")) {
                 children = new JSONArray();
@@ -514,7 +514,7 @@ private void addRecursiveChild(JSONObject sample, JSONObject child) {
             child.put("rh", child.getInt("h"));
         }
         
-        private void mergeCounts(JSONObject a, JSONObject b, boolean child) {
+        private static void mergeCounts(JSONObject a, JSONObject b, boolean child) {
             int aRI = a.has("ri") ? a.getInt("ri") : a.getInt("i");
             int aRC = a.has("rc") ? a.getInt("rc") : a.getInt("c");
             int aRH = a.has("rh") ? a.getInt("rh") : a.getInt("h");

From eb90d434234304f6520be0e7d5ac3c36111d73f4 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 30 Sep 2021 14:24:41 +0200
Subject: [PATCH 365/681] fix NPE in FrameStateAssigmentPhaseBenchmark
 (GR-34009)

---
 .../microbenchmarks/graal/util/FrameStateAssignmentState.java | 2 +-
 .../compiler/microbenchmarks/graal/util/GraphState.java       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java
index 5848addc694e..b491ed03b64b 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java
@@ -34,7 +34,7 @@ public class FrameStateAssignmentState extends GraphState {
 
     @Override
     protected StructuredGraph preprocessOriginal(StructuredGraph structuredGraph) {
-        new GuardLoweringPhase().apply(structuredGraph, null);
+        new GuardLoweringPhase().apply(structuredGraph, graal.providers);
         return structuredGraph;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
index 158a9ca7ec7b..e6f6cacedd37 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
@@ -44,9 +44,11 @@
 @State(Scope.Thread)
 public abstract class GraphState {
 
+    final GraalState graal;
+
     @SuppressWarnings("try")
     public GraphState() {
-        GraalState graal = new GraalState();
+        graal = new GraalState();
         DebugContext debug = graal.debug;
         ResolvedJavaMethod method = graal.metaAccess.lookupJavaMethod(getMethodFromMethodSpec(getClass()));
         StructuredGraph structuredGraph = null;

From f2869f3476c3f9cb9c939df5eb5ba16d78d2f5ee Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 4 Oct 2021 14:56:52 +0200
Subject: [PATCH 366/681] Custom GraalVM distributions defined with an explicit
 component list should respect component dependencies.

For example, a custom GraalVM that includes 'GraalVM compiler' should
also include 'Truffle', since the former lists the latter among its
dependencies.
---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index d17455695618..6757dee23ae8 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -880,13 +880,14 @@ def build(self):
 class GraalVmLayoutDistribution(BaseGraalVmLayoutDistribution, LayoutSuper):  # pylint: disable=R0901
     def __init__(self, base_name, theLicense=None, stage1=False, components=None, **kw_args):
         self.base_name = base_name
-        name, base_dir, self.vm_config_name = _get_graalvm_configuration(base_name, components=components, stage1=stage1)
+        components_with_dependencies = [] if components is None else GraalVmLayoutDistribution._add_dependencies(components)
+        name, base_dir, self.vm_config_name = _get_graalvm_configuration(base_name, components=components_with_dependencies, stage1=stage1)
 
         super(GraalVmLayoutDistribution, self).__init__(
             suite=_suite,
             name=name,
             deps=[],
-            components=components,
+            components=components_with_dependencies,
             is_graalvm=True,
             exclLibs=[],
             platformDependent=True,
@@ -898,6 +899,17 @@ def __init__(self, base_name, theLicense=None, stage1=False, components=None, **
             stage1=stage1,
             **kw_args)
 
+    @staticmethod
+    def _add_dependencies(components):
+        components_with_repetitions = components[:]
+        components_with_dependencies = []
+        while components_with_repetitions:
+            component = components_with_repetitions.pop(0)
+            if component not in components_with_dependencies:
+                components_with_dependencies.append(component)
+                components_with_repetitions.extend(component.direct_dependencies())
+        return components_with_dependencies
+
     def extra_suite_revisions_data(self):
         base_jdk_info = _base_jdk_info()
         if self == get_final_graalvm_distribution() and base_jdk_info:

From 3a0a1aec66fcaf427a71371b5c136b7e3c2c6156 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 28 Sep 2021 11:39:17 +0200
Subject: [PATCH 367/681] removed makegraaljdk command

---
 compiler/mx.compiler/mx_compiler.py | 390 +++++++---------------------
 sdk/mx.sdk/mx_sdk_vm_impl.py        |  10 +-
 2 files changed, 103 insertions(+), 297 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index e3475a4188d4..e3afae88a698 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -28,7 +28,7 @@
 
 from __future__ import print_function
 import os
-from os.path import join, exists, getmtime, basename, dirname, isdir, islink
+from os.path import join, exists, getmtime, basename, dirname, isdir
 from argparse import ArgumentParser, RawDescriptionHelpFormatter, REMAINDER
 import re
 import stat
@@ -36,10 +36,7 @@
 import tarfile
 import subprocess
 import tempfile
-import shutil
 import sys
-import hashlib
-import io
 
 import mx_truffle
 import mx_sdk_vm
@@ -55,7 +52,6 @@
 from mx_javamodules import as_java_module
 from mx_updategraalinopenjdk import updategraalinopenjdk
 from mx_renamegraalpackages import renamegraalpackages
-from mx_sdk_vm import jlink_new_jdk
 import mx_sdk_vm_impl
 
 import mx_benchmark
@@ -426,16 +422,6 @@ def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVM
     ]
     UnitTestRun('XcompUnitTests', [], tags=GraalTags.test).run(['compiler'], tasks, ['-Xcomp', '-XX:-UseJVMCICompiler'] + _remove_empty_entries(extraVMarguments) + xcompTests)
 
-    # Ensure makegraaljdk works
-    with Task('MakeGraalJDK', tasks, tags=GraalTags.test) as t:
-        if t:
-            ws = mx.ensure_dir_exists('MakeGraalJDK-ws')
-            graaljdk = join(ws, 'graaljdk-' + str(jdk.javaCompliance))
-            try:
-                makegraaljdk_cli(['-a', join(ws, 'graaljdk-' + str(jdk.javaCompliance) + '.tar'), '-b', graaljdk])
-            finally:
-                mx.rmtree(ws)
-
     # Run ctw against rt.jar on hosted
     with Task('CTW:hosted', tasks, tags=GraalTags.ctw) as t:
         if t:
@@ -641,10 +627,16 @@ def _unittest_config_participant(config):
             # ALL-UNNAMED.
             mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=jdk.internal.vm.compiler,ALL-UNNAMED'])
 
+            limited_modules = None
+            for arg in vmArgs:
+                if arg.startswith('--limit-modules'):
+                    assert arg.startswith('--limit-modules='), ('--limit-modules must be separated from its value by "="')
+                    limited_modules = arg[len('--limit-modules='):].split(',')
+
             # Export packages in all Graal modules and their dependencies
             for dist in _graal_config().dists:
                 jmd = as_java_module(dist, jdk)
-                if _graaljdk_override is None or jmd in _graaljdk_override.get_modules():
+                if limited_modules is None or jmd.name in limited_modules:
                     mainClassArgs.extend(['-JUnitOpenPackages', jmd.name + '/*'])
                     vmArgs.append('--add-modules=' + jmd.name)
 
@@ -669,6 +661,7 @@ def _unittest_config_participant(config):
     # TODO: GR-31197, this should be removed.
     vmArgs.append('-Dpolyglot.engine.DynamicCompilationThresholds=false')
     vmArgs.append('-Dpolyglot.engine.AllowExperimentalOptions=true')
+
     return (vmArgs, mainClass, mainClassArgs)
 
 mx_unittest.add_config_participant(_unittest_config_participant)
@@ -735,6 +728,29 @@ def _parseVmArgs(args, addDefaultArgs=True):
     if not any(a.startswith('-Dgraal.ObjdumpExecutables=') for a in args):
         argsPrefix.append('-Dgraal.ObjdumpExecutables=objdump,gobjdump')
 
+    # The GraalVM locator must be disabled so that Truffle languages
+    # are loaded from the class path. This is the configuration expected
+    # by the unit tests and benchmarks run via the compiler suite.
+    if not any(a.startswith('-Dgraalvm.locatorDisabled=') for a in args):
+        argsPrefix.append('-Dgraalvm.locatorDisabled=true')
+
+    # On JDK8 running a GraalJDK requires putting Truffle and all components
+    # that have boot jars on the boot class path.
+    if isJDK8:
+        new_args = []
+        bcpa = []
+        # Filter out all instances of -Xbootclasspath/a: from args, keeping
+        # the last, if any.
+        for a in args:
+            if a.startswith('-Xbootclasspath/a:'):
+                bcpa = a[len('-Xbootclasspath/a:'):].split(os.pathsep)
+            else:
+                new_args.append(a)
+        gc = _graal_config()
+        bcpa = [bj for bj in gc.boot_jars if basename(bj) != 'graal-sdk.jar'] + gc.truffle_jars + bcpa
+        argsPrefix.append('-Xbootclasspath/a:' + os.pathsep.join(bcpa))
+        args = new_args
+
     return argsPrefix + args
 
 def _check_bootstrap_config(args):
@@ -808,23 +824,46 @@ def __exit__(self, exc_type, exc_value, traceback):
             finally:
                 os.remove(tmp_file)
 
-_graaljdk_override = None
+def _graaljdk_dist(edition=None):
+    """
+    Gets the GraalJDK distribution specified by `edition`.
+    A GraalJDK is a fixed GraalVM configuration specified by the `cmp_ce_components` field.
 
-def _graaljdk_home(base_name):
-    graaljdks = [d for d in mx.sorted_dists() if isinstance(d, mx_sdk_vm_impl.GraalVmLayoutDistribution) and d.base_name == base_name]
+    :param str edition: 'ce', 'ee' or None. If None, then an EE GraalJDK is returned if available otherwise a CE GraalJDK.
+    """
+    candidates = [d for d in mx.sorted_dists() if isinstance(d, mx_sdk_vm_impl.GraalVmLayoutDistribution)]
+    if edition is None:
+        graaljdks = [d for d in candidates if d.base_name == 'GraalJDK_EE']
+        if graaljdks:
+            base_name = 'GraalJDK_EE'
+        else:
+            graaljdks = [d for d in candidates if d.base_name == 'GraalJDK_CE']
+            if graaljdks:
+                base_name = 'GraalJDK_CE'
+            else:
+                mx.abort("Cannot find any GraalJDK images")
+    else:
+        assert edition in ('ce', 'ee'), edition
+        base_name = 'GraalJDK_{}'.format(edition.upper())
+        graaljdks = [d for d in candidates if d.base_name == base_name]
     if not graaljdks:
-        raise mx.abort("Cannot find GraalJDK images with base name '{}'".format(base_name))
+        raise mx.abort("Cannot find GraalJDK image with base name '{}'".format(base_name))
     if len(graaljdks) > 1:
         raise mx.abort("Found multiple GraalJDKs with the same base name '{}'".format(base_name))
-    return join(graaljdks[0].output, graaljdks[0].jdk_base)
+    return graaljdks[0]
 
-def get_graaljdk():
-    if _graaljdk_override is None:
-        graaljdk_dir, _ = _update_graaljdk(jdk)
-        graaljdk = mx.JDKConfig(graaljdk_dir)
-    else:
-        graaljdk = _graaljdk_override
-    return graaljdk
+def _graaljdk_home(edition=None):
+    """
+    Gets the JAVA_HOME directory for the GraalJDK distribution (see _graaljdk_dist above).
+    """
+    graaljdk_dist = _graaljdk_dist(edition)
+    return join(graaljdk_dist.output, graaljdk_dist.jdk_base)
+
+def get_graaljdk(edition=None):
+    graaljdk_dir = _graaljdk_home(edition)
+    if not exists(graaljdk_dir):
+        mx.abort('{} does not exist - forgot to run `mx build`?'.format(graaljdk_dir))
+    return mx.JDKConfig(graaljdk_dir)
 
 def collate_metrics(args):
     """
@@ -897,9 +936,6 @@ def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=No
     graaljdk = get_graaljdk()
     vm_args = _parseVmArgs(args, addDefaultArgs=addDefaultArgs)
     args = ['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI'] + vm_args
-    add_exports = join(graaljdk.home, '.add_exports')
-    if exists(add_exports):
-        args = ['@' + add_exports] + args
     _check_bootstrap_config(args)
     cmd = get_vm_prefix() + [graaljdk.java] + ['-server'] + args
     map_file = join(graaljdk.home, 'proguard.map')
@@ -1076,28 +1112,21 @@ def sl(args):
 def java_base_unittest(args):
     """tests whether the Graal compiler runs on a JDK with a minimal set of modules"""
 
-    global _graaljdk_override
-    try:
-        # Remove GRAAL_MANAGEMENT from the module path as it
-        # depends on the java.management module which is not in
-        # the limited module set
-        base_modules = ['java.base', 'java.logging', 'jdk.internal.vm.ci', 'jdk.unsupported', 'jdk.compiler']
-        compiler_modules = [as_java_module(d, jdk).name for d in _graal_config().dists if d.name != 'GRAAL_MANAGEMENT']
-        root_module_names = base_modules + compiler_modules
-        graaljdk_dir, _ = _update_graaljdk(jdk, root_module_names=root_module_names)
-        _graaljdk_override = mx.JDKConfig(graaljdk_dir)
-
-        if mx_gate.Task.verbose:
-            extra_args = ['--verbose', '--enable-timing']
-        else:
-            extra_args = []
-        # the base JDK doesn't include jdwp
-        if _graaljdk_override.debug_args:
-            mx.warn('Ignoring Java debugger arguments because base JDK doesn\'t include jdwp')
-        with mx.DisableJavaDebugging():
-            mx_unittest.unittest(['--suite', 'compiler', '--fail-fast'] + extra_args + args)
-    finally:
-        _graaljdk_override = None
+    # Remove GRAAL_MANAGEMENT from the module path as it
+    # depends on the java.management module which is not in
+    # the limited module set
+    base_modules = ['java.base', 'java.logging', 'jdk.internal.vm.ci', 'jdk.unsupported', 'jdk.compiler']
+    compiler_modules = [as_java_module(d, jdk).name for d in _graal_config().dists if d.name != 'GRAAL_MANAGEMENT']
+    root_module_names = base_modules + compiler_modules
+    extra_args = ['--limit-modules=' + ','.join(root_module_names)]
+
+    if mx_gate.Task.verbose:
+        extra_args.extend(['--verbose', '--enable-timing'])
+    # the base JDK doesn't include jdwp
+    if get_graaljdk().debug_args:
+        mx.warn('Ignoring Java debugger arguments because base JDK doesn\'t include jdwp')
+    with mx.DisableJavaDebugging():
+        mx_unittest.unittest(['--suite', 'compiler', '--fail-fast'] + extra_args + args)
 
 def javadoc(args):
     # metadata package was deprecated, exclude it
@@ -1149,243 +1178,7 @@ def _zipadd(arc, filename, arcname):
 
 def makegraaljdk_cli(args):
     """make a JDK with Graal as the default top level JIT"""
-    parser = ArgumentParser(prog='mx makegraaljdk')
-    parser.add_argument('-f', '--force', action='store_true', help='overwrite existing GraalJDK')
-    parser.add_argument('-a', '--archive', action='store', help='name of archive to create', metavar='<path>')
-    parser.add_argument('-b', '--bootstrap', action='store_true', help='execute a bootstrap of the created GraalJDK')
-    parser.add_argument('-l', '--license', action='store', help='path to the license file', metavar='<path>')
-    parser.add_argument('-o', '--overlay', action='store_true', help='Only write the Graal files into the destination')
-    parser.add_argument('dest', help='destination directory for GraalJDK', metavar='<path>')
-    args = parser.parse_args(args)
-
-    if args.overlay and not isJDK8:
-        mx.abort('The --overlay option is only supported on JDK 8')
-
-    dst_jdk_dir = os.path.abspath(args.dest)
-    if exists(dst_jdk_dir):
-        if args.force:
-            shutil.rmtree(dst_jdk_dir)
-
-    _, updated = _update_graaljdk(jdk, dst_jdk_dir, export_truffle=False, with_compiler_name_file=True)
-    dst_jdk = mx.JDKConfig(dst_jdk_dir)
-    if not updated:
-        mx.log(dst_jdk_dir + ' is already up to date')
-
-    if args.license:
-        shutil.copy(args.license, join(dst_jdk_dir, 'LICENSE'))
-    if args.bootstrap:
-        map_file = join(dst_jdk_dir, 'proguard.map')
-        with StdoutUnstripping(args=[], out=None, err=None, mapFiles=[map_file]) as u:
-            # Just use a set of flags that will work on all JVMCI enabled VMs without trying
-            # to remove flags that are unnecessary for a specific VM.
-            mx.run([dst_jdk.java, '-XX:+UnlockExperimentalVMOptions', '-XX:+UseJVMCICompiler', '-XX:+BootstrapJVMCI', '-version'], out=u.out, err=u.err)
-    if args.archive:
-        mx.log('Archiving {}'.format(args.archive))
-        create_archive(dst_jdk_dir, args.archive, basename(args.dest) + '/')
-
-def _update_graaljdk(src_jdk, dst_jdk_dir=None, root_module_names=None, export_truffle=True, with_compiler_name_file=False):
-    """
-    Creates or updates a GraalJDK in `dst_jdk_dir` from `src_jdk`.
-
-    :param str dst_jdk_dir: path where GraalJDK is (to be) located. If None, then a path name is
-                            derived based on _graalvm_components and `root_module_names`.
-    :param list root_module_names: names of modules in the root set for the new JDK image. If None,
-                            the root set is derived from _graalvm_components.
-    :param bool export_truffle: specifies if Truffle API packages should be visible to the app class loader.
-                            On JDK 8, this causes Truffle to be on the boot class path. On JDK 9+, this results
-                            in a ``.add_exports`` file in `dst_dst_dir` which can be used as an @argfile VM argument.
-    :param bool with_compiler_name_file: if True, a ``compiler-name`` file is written in the ``jvmci`` directory under
-                            `dst_jdk_dir`. Depending on `src_jdk`, the existence of this file can set the
-                            value of UseJVMCICompiler be true. For example, see
-                            https://github.com/graalvm/graal-jvmci-8/blob/master/src/share/vm/jvmci/jvmci_globals.hpp#L52
-    :return: a tuple containing the path where the GraalJDK is located and a boolean denoting whether
-                            the GraalJDK was update/created (True) or was already up to date (False)
-
-    """
-    update_reason = None
-    if dst_jdk_dir is None:
-        graaljdks_dir = mx.ensure_dir_exists(join(_suite.get_output_root(platformDependent=True), 'graaljdks'))
-        graalvm_compiler_short_names = [c.short_name for c in mx_sdk_vm.graalvm_components() if isinstance(c, mx_sdk_vm.GraalVmJvmciComponent) and c.graal_compiler]
-        jdk_suffix = '-'.join(graalvm_compiler_short_names)
-        if root_module_names:
-            jdk_suffix += '-' + hashlib.sha1(_encode(','.join(root_module_names))).hexdigest()
-        if mx.get_opts().strip_jars:
-            jdk_suffix += '-stripped'
-        dst_jdk_dir = join(graaljdks_dir, 'jdk{}-{}'.format(src_jdk.javaCompliance, jdk_suffix))
-        if dst_jdk_dir == src_jdk.home:
-            # Avoid overwriting source JDK
-            dst_jdk_dir += '_new'
-    else:
-        if dst_jdk_dir == src_jdk.home:
-            mx.abort("Cannot overwrite source JDK: {}".format(src_jdk))
-
-    # When co-developing JVMCI/JDK changes with Graal, the source JDK
-    # may have changed and we want to pick up these changes.
-    source_jdk_timestamps_file = dst_jdk_dir + '.source_jdk_timestamps'
-    timestamps = []
-    nl = '\n'
-    for root, _, filenames in os.walk(jdk.home):
-        for name in filenames:
-            ts = mx.TimeStampFile(join(root, name))
-            timestamps.append(str(ts))
-    timestamps = sorted(timestamps)
-    jdk_timestamps = jdk.home + nl + nl.join(timestamps)
-    jdk_timestamps_outdated = False
-    if exists(source_jdk_timestamps_file):
-        with open(source_jdk_timestamps_file) as fp:
-            old_jdk_timestamps = fp.read()
-        if old_jdk_timestamps != jdk_timestamps:
-            jdk_timestamps_outdated = True
-            old_jdk_home = old_jdk_timestamps.split(nl, 1)[0]
-            if old_jdk_home == jdk.home:
-                import difflib
-                old_timestamps = old_jdk_timestamps.split(nl)
-                diff = difflib.unified_diff(timestamps, old_timestamps, 'new_timestamps.txt', 'old_timestamps.txt')
-                update_reason = 'source JDK was updated as shown by following time stamps diff:{}{}'.format(nl, nl.join(diff))
-            else:
-                update_reason = 'source JDK was changed from {} to {}'.format(old_jdk_home, jdk.home)
-    else:
-        jdk_timestamps_outdated = True
-
-    if jdk_timestamps_outdated:
-        with mx.SafeFileCreation(source_jdk_timestamps_file) as sfc:
-            with open(sfc.tmpPath, 'w') as fp:
-                fp.write(jdk_timestamps)
-
-    jvmci_release_file = mx.TimeStampFile(join(dst_jdk_dir, 'release.jvmci'))
-    if update_reason is None:
-        if not exists(dst_jdk_dir):
-            update_reason = dst_jdk_dir + ' does not exist'
-        else:
-            newer = [e for e in _graal_config().jars if jvmci_release_file.isOlderThan(e)]
-            if newer:
-                update_reason = '{} is older than {}'.format(jvmci_release_file, mx.TimeStampFile(newer[0]))
-
-    if update_reason is None:
-        return dst_jdk_dir, False
-
-    with SafeDirectoryUpdater(dst_jdk_dir) as sdu:
-        tmp_dst_jdk_dir = sdu.directory
-        mx.log('Updating/creating {} from {} using intermediate directory {} since {}'.format(dst_jdk_dir, src_jdk.home, tmp_dst_jdk_dir, update_reason))
-        def _copy_file(src, dst):
-            mx.log('Copying {} to {}'.format(src, dst))
-            if mx.can_symlink():
-                if exists(dst) and islink(dst):
-                    os.remove(dst)
-                os.symlink(src, dst)
-            else:
-                shutil.copyfile(src, dst)
-
-        vm_name = 'Server VM Graal'
-        for d in _graal_config().jvmci_dists:
-            version = d.suite.version()
-            s = ':' + d.suite.name
-            if version:
-                s += '_' + d.suite.version()
-            if s not in vm_name:
-                vm_name = vm_name + s
-
-        if isJDK8:
-            jre_dir = join(tmp_dst_jdk_dir, 'jre')
-            shutil.copytree(src_jdk.home, tmp_dst_jdk_dir)
-
-            boot_dir = mx.ensure_dir_exists(join(jre_dir, 'lib', 'boot'))
-            jvmci_dir = mx.ensure_dir_exists(join(jre_dir, 'lib', 'jvmci'))
-
-            for src_jar in _graal_config().jvmci_jars:
-                _copy_file(src_jar, join(jvmci_dir, basename(src_jar)))
-
-            boot_jars = _graal_config().boot_jars
-            if not export_truffle:
-                truffle_dir = mx.ensure_dir_exists(join(jre_dir, 'lib', 'truffle'))
-                for src_jar in _graal_config().truffle_jars:
-                    _copy_file(src_jar, join(truffle_dir, basename(src_jar)))
-                for jvmci_parent_jar in _graal_config().jvmci_parent_jars:
-                    with open(join(jvmci_dir, 'parentClassLoader.classpath'), 'w') as fp:
-                        fp.write(join('..', 'truffle', basename(jvmci_parent_jar)))
-            else:
-                boot_jars += _graal_config().jvmci_parent_jars
-
-            for src_jar in boot_jars:
-                dst_jar = join(boot_dir, basename(src_jar))
-                _copy_file(src_jar, dst_jar)
-
-        else:
-            module_dists = _graal_config().dists
-            _check_using_latest_jars(module_dists)
-            vendor_info = {'vendor-version' : vm_name}
-            # Setting dedup_legal_notices=False avoids due to license files conflicting
-            # when switching JAVA_HOME from an OpenJDK to an OracleJDK or vice versa between executions.
-            if mx_sdk_vm_impl._jlink_libraries():
-                jlink_new_jdk(jdk, tmp_dst_jdk_dir, module_dists, ignore_dists=[], root_module_names=root_module_names, vendor_info=vendor_info, dedup_legal_notices=False)
-                if export_truffle:
-                    jmd = as_java_module(_graal_config().dists_dict['truffle:TRUFFLE_API'], jdk)
-                    add_exports = []
-                    for package in jmd.packages:
-                        if package == 'com.oracle.truffle.api.impl':
-                            # The impl package should remain private
-                            continue
-                        if jmd.get_package_visibility(package, "<unnamed>") == 'concealed':
-                            add_exports.append('--add-exports={}/{}=ALL-UNNAMED'.format(jmd.name, package))
-                    if add_exports:
-                        with open(join(tmp_dst_jdk_dir, '.add_exports'), 'w') as fp:
-                            fp.write(os.linesep.join(add_exports))
-            else:
-                mx.warn("--no-jlinking flag used. The resulting VM will be HotSpot, not GraalVM")
-                shutil.copytree(jdk.home, tmp_dst_jdk_dir, symlinks=True)
-            jre_dir = tmp_dst_jdk_dir
-            jvmci_dir = mx.ensure_dir_exists(join(jre_dir, 'lib', 'jvmci'))
-
-        if with_compiler_name_file:
-            with open(join(jvmci_dir, 'compiler-name'), 'w') as fp:
-                print('graal', file=fp)
-
-        if jdk.javaCompliance < '9' and mx.get_os() not in ['darwin', 'windows']:
-            # On JDK 8, the server directory containing the JVM library is
-            # in an architecture specific directory (except for Darwin and Windows).
-            libjvm_dir = join(jre_dir, 'lib', mx.get_arch(), 'server')
-        elif mx.get_os() == 'windows':
-            libjvm_dir = join(jre_dir, 'bin', 'server')
-        else:
-            libjvm_dir = join(jre_dir, 'lib', 'server')
-        mx.ensure_dir_exists(libjvm_dir)
-        jvmlib = join(libjvm_dir, mx.add_lib_prefix(mx.add_lib_suffix('jvm')))
-
-        with open(join(tmp_dst_jdk_dir, 'release.jvmci'), 'w') as fp:
-            for d in _graal_config().jvmci_dists:
-                s = d.suite
-                if s.vc:
-                    print('{}={}'.format(d.name, s.vc.parent(s.dir)), file=fp)
-            for d in _graal_config().boot_dists + _graal_config().truffle_dists:
-                s = d.suite
-                if s.vc:
-                    print('{}={}'.format(d.name, s.vc.parent(s.dir)), file=fp)
-
-        assert exists(jvmlib), jvmlib + ' does not exist'
-        out = mx.LinesOutputCapture()
-        mx.run([jdk.java, '-version'], err=out)
-        line = None
-        pattern = re.compile(r'(.* )(?:Server|Graal) VM .*\((?:.+ )?build.*')
-        for line in out.lines:
-            m = pattern.match(line)
-            if m:
-                with io.open(join(libjvm_dir, 'vm.properties'), 'w', newline='') as fp:
-                    # Modify VM name in `java -version` to be Graal along
-                    # with a suffix denoting the commit of each Graal jar.
-                    # For example:
-                    # Java HotSpot(TM) 64-Bit Graal:compiler_88847fb25d1a62977a178331a5e78fa5f8fcbb1a (build 25.71-b01-internal-jvmci-0.34, mixed mode)
-                    print(u'name=' + m.group(1) + vm_name, file=fp)
-                line = True
-                break
-        if line is not True:
-            mx.abort('Could not find "{}" in output of `java -version`:\n{}'.format(pattern.pattern, os.linesep.join(out.lines)))
-
-        unstrip_map = mx.make_unstrip_map(_graal_config().dists)
-        if unstrip_map:
-            with open(join(tmp_dst_jdk_dir, 'proguard.map'), 'w') as fp:
-                fp.write(unstrip_map)
-
-    return dst_jdk_dir, True
+    mx.abort('The makegraaljdk command is no longer supported. Use the graaljdk-home command instead.')
 
 __graal_config = None
 
@@ -1476,11 +1269,19 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
     graal_jdk_dist.maven = {'groupId': 'org.graalvm', 'tag': 'graaljdk'}
     register_distribution(graal_jdk_dist)
 
+
+def _parse_graaljdk_edition(description, args):
+    parser = ArgumentParser(description=description)
+    parser.add_argument('--edition', choices=['ce', 'ee'], default=None, help='GraalJDK CE or EE')
+    return parser.parse_args(args).edition
+
 def print_graaljdk_home(args):
-    parser = ArgumentParser(description='Print the GraalJDK home directory')
-    parser.add_argument('--edition', choices=['ce', 'ee'], default='ce', help='GraalJDK CE or EE')
-    args = parser.parse_args(args)
-    print(_graaljdk_home('GraalJDK_{}'.format(args.edition.upper())))
+    """print the GraalJDK JAVA_HOME directory"""
+    print(_graaljdk_home(_parse_graaljdk_edition('Print the GraalJDK JAVA_HOME directory', args)))
+
+def print_graaljdk_config(args):
+    """print the GraalJDK config"""
+    mx_sdk_vm_impl.graalvm_show([], _graaljdk_dist(_parse_graaljdk_edition('Print the GraalJDK config', args)))
 
 mx.update_commands(_suite, {
     'sl' : [sl, '[SL args|@VM options]'],
@@ -1494,6 +1295,7 @@ def print_graaljdk_home(args):
     'javadoc': [javadoc, ''],
     'makegraaljdk': [makegraaljdk_cli, '[options]'],
     'graaljdk-home': [print_graaljdk_home, '[options]'],
+    'graaljdk-show': [print_graaljdk_config, '[options]'],
 })
 
 def mx_post_parse_cmd_line(opts):
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 6757dee23ae8..df2ddbe31130 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2907,13 +2907,17 @@ def graalvm_enter(args):
     mx.run(args.cmd, env=env)
 
 
-def graalvm_show(args):
-    """print the GraalVM config"""
+def graalvm_show(args, graalvm_dist=None):
+    """print the GraalVM config
+    
+    :param graalvm_dist: the GraalVM distribution whose config is printed. If None, then the
+                         GraalVM configured by the current environment variables is printed.
+    """
     parser = ArgumentParser(prog='mx graalvm-show', description='Print the GraalVM config')
     parser.add_argument('--stage1', action='store_true', help='show the components for stage1')
     args = parser.parse_args(args)
 
-    graalvm_dist = get_stage1_graalvm_distribution() if args.stage1 else get_final_graalvm_distribution()
+    graalvm_dist = graalvm_dist or (get_stage1_graalvm_distribution() if args.stage1 else get_final_graalvm_distribution())
     print("GraalVM distribution: {}".format(graalvm_dist))
     print("Version: {}".format(_suite.release_version()))
     print("Config name: {}".format(graalvm_dist.vm_config_name))

From cfe4bb9ae9ef536d843c569748cc71cca6fc652f Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 4 Oct 2021 23:10:58 +0200
Subject: [PATCH 368/681] Check for invalid GraalVM distributions with forced
 component lists.

GraalVmLauncher and GraalVmLibrary depend on the global stage1 or final GraalVM images.
---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index df2ddbe31130..5d2402ce8230 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -881,6 +881,11 @@ class GraalVmLayoutDistribution(BaseGraalVmLayoutDistribution, LayoutSuper):  #
     def __init__(self, base_name, theLicense=None, stage1=False, components=None, **kw_args):
         self.base_name = base_name
         components_with_dependencies = [] if components is None else GraalVmLayoutDistribution._add_dependencies(components)
+        if components is not None:
+            for c in components:
+                if c.launcher_configs or c.library_configs:
+                    mx.abort('Cannot define a GraalVM layout distribution with a forced list of components that includes launcher or library configs. '
+                    'The corresponding projects refer to the global stage1 and final GraalVM distributions.')
         name, base_dir, self.vm_config_name = _get_graalvm_configuration(base_name, components=components_with_dependencies, stage1=stage1)
 
         super(GraalVmLayoutDistribution, self).__init__(
@@ -2909,9 +2914,9 @@ def graalvm_enter(args):
 
 def graalvm_show(args, graalvm_dist=None):
     """print the GraalVM config
-    
+
     :param graalvm_dist: the GraalVM distribution whose config is printed. If None, then the
-                         GraalVM configured by the current environment variables is printed.
+                         config of the global stage1 or final GraalVM distribution is printed.
     """
     parser = ArgumentParser(prog='mx graalvm-show', description='Print the GraalVM config')
     parser.add_argument('--stage1', action='store_true', help='show the components for stage1')

From 44cdcba35d7d19c07324482a4bb176a01466cc08 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 4 Oct 2021 23:13:31 +0200
Subject: [PATCH 369/681] When forcing a GraalVM dist, graalvm_show() prints
 information about components from that dist.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 89 +++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 5d2402ce8230..9d0255e9be22 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2912,65 +2912,68 @@ def graalvm_enter(args):
     mx.run(args.cmd, env=env)
 
 
-def graalvm_show(args, graalvm_dist=None):
+def graalvm_show(args, forced_graalvm_dist=None):
     """print the GraalVM config
 
-    :param graalvm_dist: the GraalVM distribution whose config is printed. If None, then the
+    :param forced_graalvm_dist: the GraalVM distribution whose config is printed. If None, then the
                          config of the global stage1 or final GraalVM distribution is printed.
     """
     parser = ArgumentParser(prog='mx graalvm-show', description='Print the GraalVM config')
     parser.add_argument('--stage1', action='store_true', help='show the components for stage1')
     args = parser.parse_args(args)
 
-    graalvm_dist = graalvm_dist or (get_stage1_graalvm_distribution() if args.stage1 else get_final_graalvm_distribution())
+    graalvm_dist = forced_graalvm_dist or (get_stage1_graalvm_distribution() if args.stage1 else get_final_graalvm_distribution())
     print("GraalVM distribution: {}".format(graalvm_dist))
     print("Version: {}".format(_suite.release_version()))
     print("Config name: {}".format(graalvm_dist.vm_config_name))
     print("Components:")
-    for component in registered_graalvm_components(stage1=args.stage1):
+    for component in graalvm_dist.components:
         print(" - {} ('{}', /{})".format(component.name, component.short_name, component.dir_name))
 
-    launchers = [p for p in _suite.projects if isinstance(p, GraalVmLauncher) and p.get_containing_graalvm() == graalvm_dist]
-    if launchers:
-        print("Launchers:")
-        for launcher in launchers:
-            suffix = ''
-            profile_cnt = len(_image_profile(GraalVmNativeProperties.canonical_image_name(launcher.native_image_config)))
-            if profile_cnt > 0:
-                suffix += " ({} pgo profile file{})".format(profile_cnt, 's' if profile_cnt > 1 else '')
-            print(" - {} ({}){}".format(launcher.native_image_name, "native" if launcher.is_native() else "bash", suffix))
-    else:
-        print("No launcher")
-
-    libraries = [p for p in _suite.projects if isinstance(p, GraalVmLibrary)]
-    if libraries and not args.stage1:
-        print("Libraries:")
-        for library in libraries:
-            suffix = ''
-            if library.is_skipped():
-                suffix += " (skipped)"
-            profile_cnt = len(_image_profile(GraalVmNativeProperties.canonical_image_name(library.native_image_config)))
-            if profile_cnt > 0:
-                suffix += " ({} pgo profile file{})".format(profile_cnt, 's' if profile_cnt > 1 else '')
-            print(" - {}{}".format(library.native_image_name, suffix))
-    else:
-        print("No library")
+    if forced_graalvm_dist is None:
+        # Custom GraalVM distributions with a forced component list do not yet support launchers and libraries.
+        # No installable or standalone is derived from them.
+        launchers = [p for p in _suite.projects if isinstance(p, GraalVmLauncher) and p.get_containing_graalvm() == graalvm_dist]
+        if launchers:
+            print("Launchers:")
+            for launcher in launchers:
+                suffix = ''
+                profile_cnt = len(_image_profile(GraalVmNativeProperties.canonical_image_name(launcher.native_image_config)))
+                if profile_cnt > 0:
+                    suffix += " ({} pgo profile file{})".format(profile_cnt, 's' if profile_cnt > 1 else '')
+                print(" - {} ({}){}".format(launcher.native_image_name, "native" if launcher.is_native() else "bash", suffix))
+        else:
+            print("No launcher")
+
+        libraries = [p for p in _suite.projects if isinstance(p, GraalVmLibrary)]
+        if libraries and not args.stage1:
+            print("Libraries:")
+            for library in libraries:
+                suffix = ''
+                if library.is_skipped():
+                    suffix += " (skipped)"
+                profile_cnt = len(_image_profile(GraalVmNativeProperties.canonical_image_name(library.native_image_config)))
+                if profile_cnt > 0:
+                    suffix += " ({} pgo profile file{})".format(profile_cnt, 's' if profile_cnt > 1 else '')
+                print(" - {}{}".format(library.native_image_name, suffix))
+        else:
+            print("No library")
 
-    installables = _get_dists(GraalVmInstallableComponent)
-    if installables and not args.stage1:
-        print("Installables:")
-        for i in installables:
-            print(" - {}".format(i))
-    else:
-        print("No installable")
+        installables = _get_dists(GraalVmInstallableComponent)
+        if installables and not args.stage1:
+            print("Installables:")
+            for i in installables:
+                print(" - {}".format(i))
+        else:
+            print("No installable")
 
-    standalones = _get_dists(GraalVmStandaloneComponent)
-    if standalones and not args.stage1:
-        print("Standalones:")
-        for s in standalones:
-            print(" - {}".format(s))
-    else:
-        print("No standalone")
+        standalones = _get_dists(GraalVmStandaloneComponent)
+        if standalones and not args.stage1:
+            print("Standalones:")
+            for s in standalones:
+                print(" - {}".format(s))
+        else:
+            print("No standalone")
 
 
 def _get_dists(dist_class):

From fbe4ac585385f3de99f9fcd06c79a1a3b265b4bb Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Fri, 8 Oct 2021 18:17:24 +0200
Subject: [PATCH 370/681] fixed pylint warnings

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 15772f9af0ed..4a68c7e4b5bb 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -815,9 +815,6 @@ def name(self):
         else:
             return "dacapo-{}".format(self.workloadSize())
 
-    def version(self):
-        return super(DaCapoBenchmarkSuite, self).version()
-
     def defaultSuiteVersion(self):
         return "9.12-MR1-bach"
 
@@ -1313,7 +1310,7 @@ def runArgs(self, bmSuiteArgs):
             # Skips initial check benchmark which tests for javac.jar on classpath.
             runArgs += ["-pja", "-Dspecjvm.run.initial.check=false"]
         return runArgs
-    
+
     def vmArgs(self, bmSuiteArgs):
         vmArgs = super(SpecJvm2008BenchmarkSuite, self).vmArgs(bmSuiteArgs)
         if java_home_jdk().javaCompliance >= '16' and \
@@ -1866,9 +1863,6 @@ def renaissanceIterations(self):
                 del benchmarks["neo4j-analytics"]
         return benchmarks
 
-    def version(self):
-        return super(RenaissanceBenchmarkSuite, self).version()
-
     def defaultSuiteVersion(self):
         #  return self.availableSuiteVersions()[-1]
         return "0.11.0"  # stick to 0.11.0 for both JIT and AOT until Native Image is compatible with 0.13.0 (GR-34147)

From 95f1f7303b9dbccb425cf72111ff8e32cbadbe86 Mon Sep 17 00:00:00 2001
From: ol-automation_ww <ol-automation_ww@oracle.com>
Date: Sat, 9 Oct 2021 05:50:23 +0000
Subject: [PATCH 371/681] [GR-23997] Periodic update of the graal import
 (2021-10-08).

PullRequest: js/2188
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 8c4e334b0a6e..f3f69d035de7 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "082c333db671f03aba82d15e6d572e196b3878ea",
+                "version": "5261f7865f77e399ad1b49bfa5de9b784e740e8a",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "082c333db671f03aba82d15e6d572e196b3878ea",
+                "version": "5261f7865f77e399ad1b49bfa5de9b784e740e8a",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From 01f82d345f1bf42b77b212533cea40502276ff04 Mon Sep 17 00:00:00 2001
From: "cengfeng.lzy" <cengfeng.lzy@alibaba-inc.com>
Date: Fri, 10 Sep 2021 10:32:28 +0800
Subject: [PATCH 372/681] Refactor iterative analysis code to common method

Extract the iteratively analyzing code from NativeImageGenerator to
PointsToAnalysis so it can be used by both native image generation and
standalone pointsto analysis.
---
 .../com/oracle/graal/pointsto/BigBang.java    |  4 ++
 .../graal/pointsto/PointsToAnalysis.java      | 58 +++++++++++++++++++
 .../svm/hosted/NativeImageGenerator.java      | 54 ++++-------------
 3 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
index 4d34825d0c7e..b17b5d7707ea 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
@@ -26,6 +26,7 @@
 
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
+import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.graal.pointsto.util.Timer;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -36,6 +37,7 @@
 
 import java.io.PrintWriter;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * Central static analysis interface that groups together the functionality of reachability analysis
@@ -92,4 +94,6 @@ public interface BigBang extends ReachabilityAnalysis, HeapScanning {
     Runnable getHeartbeatCallback();
 
     boolean extendedAsserts();
+
+    void runAnalysis(DebugContext debug, Function<AnalysisUniverse, Boolean> duringAnalysisAction) throws InterruptedException;
 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
index d73228a53fc1..78c3cc170897 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
@@ -43,7 +43,9 @@
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicLongArray;
+import java.util.function.Function;
 
+import com.oracle.graal.pointsto.util.AnalysisError;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
@@ -703,6 +705,62 @@ public HostVM getHostVM() {
         return hostVM;
     }
 
+    /**
+     * Iterate until analysis reaches a fixpoint.
+     *
+     *
+     * @param debugContext debug context
+     * @param duringAnalysisAction  The action handler taken during analysis, return true if no more iteration is required.
+     *                              It could be the {@link org.graalvm.nativeimage.hosted.Feature#duringAnalysis}
+     *                              for Native Image generation, but also can be other similar actions for standalone pointsto
+     *                              analysis that does not dependent on {@link com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl}
+     *                              and {@link com.oracle.svm.hosted.NativeImageGenerator.AnalysisFeatureHandler}.
+     *
+     * @return The error message during the analysis. If the analysis ends successfully, an empty String is returned, otherwise
+     * the actual error message is returned.
+     * @throws InterruptedException
+     */
+    @SuppressWarnings("try")
+    @Override
+    public void runAnalysis(DebugContext debugContext, Function<AnalysisUniverse, Boolean> duringAnalysisAction) throws InterruptedException {
+        int numIterations = 0;
+        while (true) {
+            try (Indent indent2 = debugContext.logAndIndent("new analysis iteration")) {
+                /*
+                 * Do the analysis (which itself is done in a similar iterative process)
+                 */
+                boolean analysisChanged = finish();
+
+                numIterations++;
+                if (numIterations > 1000) {
+                    /*
+                     * Usually there are < 10 iterations. If we have so many iterations, we
+                     * probably have an endless loop (but at least we have a performance
+                     * problem because we re-start the analysis so often).
+                     */
+                    AnalysisError.shouldNotReachHere(String.format("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
+                                    "The analysis itself %s find a change in type states in the last iteration.",
+                            numIterations, analysisChanged ? "DID" : "DID NOT"));
+                }
+
+                /*
+                 * Allow features to change the universe.
+                 */
+                try (StopTimer t2 = getProcessFeaturesTimer().start()) {
+                    int numTypes = universe.getTypes().size();
+                    int numMethods = universe.getMethods().size();
+                    int numFields = universe.getFields().size();
+                    if (duringAnalysisAction.apply(universe)) {
+                        if (numTypes != universe.getTypes().size() || numMethods != universe.getMethods().size() || numFields != universe.getFields().size()) {
+                            AnalysisError.shouldNotReachHere("When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()");
+                        }
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
     @SuppressFBWarnings(value = "NP_NONNULL_PARAM_VIOLATION", justification = "ForkJoinPool does support null for the exception handler.")
     public static ForkJoinPool createExecutor(DebugContext debug, int numberOfThreads) {
         ForkJoinPool.ForkJoinWorkerThreadFactory factory = debugThreadFactory(debug.areScopesEnabled() || debug.areMetricsEnabled() ? debug : null);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index b01843f59fa6..130b39dc9b34 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -59,6 +59,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import com.oracle.graal.pointsto.util.AnalysisError;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -693,51 +694,16 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
             }
 
             try (StopTimer t = bb.getAnalysisTimer().start()) {
-
-                /*
-                 * Iterate until analysis reaches a fixpoint.
-                 */
                 DuringAnalysisAccessImpl config = new DuringAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
-                int numIterations = 0;
-                while (true) {
-                    try (Indent indent2 = debug.logAndIndent("new analysis iteration")) {
-                        /*
-                         * Do the analysis (which itself is done in a similar iterative process)
-                         */
-                        boolean analysisChanged = bb.finish();
-
-                        numIterations++;
-                        if (numIterations > 1000) {
-                            /*
-                             * Usually there are < 10 iterations. If we have so many iterations, we
-                             * probably have an endless loop (but at least we have a performance
-                             * problem because we re-start the analysis so often).
-                             */
-                            throw UserError.abort("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
-                                            "The analysis itself %s find a change in type states in the last iteration.",
-                                            numIterations, analysisChanged ? "DID" : "DID NOT");
-                        }
-
-                        /*
-                         * Allow features to change the universe.
-                         */
-                        try (StopTimer t2 = bb.getProcessFeaturesTimer().start()) {
-                            int numTypes = aUniverse.getTypes().size();
-                            int numMethods = aUniverse.getMethods().size();
-                            int numFields = aUniverse.getFields().size();
-
-                            bb.getHostVM().notifyClassReachabilityListener(aUniverse, config);
-                            featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
-
-                            if (!config.getAndResetRequireAnalysisIteration()) {
-                                if (numTypes != aUniverse.getTypes().size() || numMethods != aUniverse.getMethods().size() || numFields != aUniverse.getFields().size()) {
-                                    throw UserError.abort(
-                                                    "When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()");
-                                }
-                                break;
-                            }
-                        }
-                    }
+                try {
+                    bb.runAnalysis(debug,
+                            (aUniverse) -> {
+                                bb.getHostVM().notifyClassReachabilityListener(aUniverse, config);
+                                featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
+                                return !config.getAndResetRequireAnalysisIteration();
+                            });
+                } catch (AnalysisError e) {
+                    throw UserError.abort(e, "Analysis step failed. Reason: %s.", e.getMessage());
                 }
                 assert verifyAssignableTypes(imageName);
 

From fc4b193a6347f86483d40ed7c99da293823564d6 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Thu, 7 Oct 2021 18:21:47 +0200
Subject: [PATCH 373/681] Do not collect data if sampler is not collecting.

---
 .../src/com/oracle/truffle/tools/profiler/CPUSampler.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
index a69bbe8742bf..3b415774ee79 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/CPUSampler.java
@@ -797,6 +797,9 @@ public void run() {
                         continue;
                     }
                     synchronized (CPUSampler.this) {
+                        if (!collecting) {
+                            return;
+                        }
                         final MutableSamplerData mutableSamplerData = activeContexts.get(result.context);
                         for (StackSample sample : result.samples) {
                             mutableSamplerData.biasStatistic.accept(sample.biasNs);

From be7b76df267e5d61cfc17e56bf037e003cac42ec Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Fri, 1 Oct 2021 09:56:44 +0200
Subject: [PATCH 374/681] Try to separate single- and multi-engine code paths.

---
 .../src/org/graalvm/polybench/Config.java     | 76 ++++++++++++++-----
 .../graalvm/polybench/PolyBenchLauncher.java  | 56 +++++++-------
 2 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
index ce5dfd75355c..5e83971f2a50 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/Config.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.polybench;
 
-import org.graalvm.polyglot.Value;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,6 +32,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.graalvm.polyglot.Value;
+
 class Config {
 
     public static final String EVAL_SOURCE_ONLY_OPTION = "--eval-source-only";
@@ -55,11 +55,16 @@ class Config {
     /**
      * Multi-context runs related configuration.
      */
-    int numberOfRuns = 1;
-    boolean sharedEngine;
-    final Map<String, String> engineOptions = new HashMap<>();
-    final Map<Integer, Map<String, String>> polyglotRunOptionsMap = new HashMap<>();
-    final Map<Integer, Map<String, String>> polybenchRunOptionsMap = new HashMap<>();
+    MultiEngineConfig multiEngine;
+
+    Config() {
+        this.path = null;
+        this.className = null;
+        this.warmupIterations = DEFAULT;
+        this.iterations = DEFAULT;
+        this.mode = Mode.standard;
+        this.metric = new PeakTimeMetric();
+    }
 
     /**
      * Polybench options that can be specified per run.
@@ -69,13 +74,11 @@ class Config {
         POLYBENCH_RUN_OPTIONS.add(EVAL_SOURCE_ONLY_OPTION);
     }
 
-    Config() {
-        this.path = null;
-        this.className = null;
-        this.warmupIterations = DEFAULT;
-        this.iterations = DEFAULT;
-        this.mode = Mode.standard;
-        this.metric = new PeakTimeMetric();
+    public MultiEngineConfig initMultiEngine() {
+        if (multiEngine == null) {
+            multiEngine = new MultiEngineConfig();
+        }
+        return multiEngine;
     }
 
     public void parseBenchSpecificDefaults(Value benchmark) {
@@ -99,13 +102,34 @@ public void parseBenchSpecificDefaults(Value benchmark) {
 
     @Override
     public String toString() {
-        return "execution-mode:    " + mode + "\n" +
+        String config = "execution-mode:    " + mode + "\n" +
                         "metric:            " + metric.name() + " (" + metric.unit() + ")" + "\n" +
                         "warmup-iterations: " + (warmupIterations == DEFAULT ? "default" : warmupIterations) + "\n" +
-                        "iterations:        " + (iterations == DEFAULT ? "default"
-                                        : iterations + "\n" +
-                                                        "runs:              " + numberOfRuns + "\n" +
-                                                        "shared engine:     " + sharedEngine);
+                        "iterations:        " + (iterations == DEFAULT ? "default" : iterations + "\n");
+        if (multiEngine != null) {
+            config += "runs:              " + multiEngine.numberOfRuns + "\n" +
+                            "shared engine:     " + multiEngine.sharedEngine;
+        }
+        return config;
+    }
+
+    boolean isSingleEngine() {
+        return multiEngine == null;
+    }
+
+    String compilation() {
+        String compilationOptionValue;
+        switch (mode) {
+            case interpreter:
+                compilationOptionValue = "false";
+                break;
+            case standard:
+                compilationOptionValue = "true";
+                break;
+            default:
+                throw new AssertionError("Unknown execution-mode: " + mode);
+        }
+        return compilationOptionValue;
     }
 
     enum Mode {
@@ -128,8 +152,20 @@ static boolean isPolybenchRunOption(String optionName) {
     }
 
     boolean isEvalSourceOnly(int run) {
-        String evalSourceOptionValue = polybenchRunOptionsMap.getOrDefault(run, Collections.emptyMap()).get(EVAL_SOURCE_ONLY_OPTION);
+        if (multiEngine == null) {
+            return evalSourceOnlyDefault;
+        }
+        String evalSourceOptionValue = multiEngine.polybenchRunOptionsMap.getOrDefault(run, Collections.emptyMap()).get(EVAL_SOURCE_ONLY_OPTION);
         return evalSourceOptionValue == null ? evalSourceOnlyDefault : Boolean.parseBoolean(evalSourceOptionValue);
     }
 
+    static final class MultiEngineConfig {
+        final Map<String, String> engineOptions = new HashMap<>();
+        final Map<Integer, Map<String, String>> polyglotRunOptionsMap = new HashMap<>();
+        final Map<Integer, Map<String, String>> polybenchRunOptionsMap = new HashMap<>();
+        int numberOfRuns = 1;
+        boolean sharedEngine;
+
+    }
+
 }
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 49164d4dbc20..f5d2c737b690 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -209,9 +209,9 @@ static class ArgumentParser {
             }));
             this.consumers.add(new ArgumentConsumer("-w", (value, config) -> config.warmupIterations = Integer.parseInt(value)));
             this.consumers.add(new ArgumentConsumer("-i", (value, config) -> config.iterations = Integer.parseInt(value)));
-            this.consumers.add(new ArgumentConsumer("--shared-engine", (value, config) -> config.sharedEngine = Boolean.parseBoolean(value)));
+            this.consumers.add(new ArgumentConsumer("--shared-engine", (value, config) -> config.initMultiEngine().sharedEngine = Boolean.parseBoolean(value)));
             this.consumers.add(new ArgumentConsumer("--eval-source-only", (value, config) -> config.evalSourceOnlyDefault = Boolean.parseBoolean(value)));
-            this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> config.numberOfRuns = Integer.parseInt(value)));
+            this.consumers.add(new ArgumentConsumer("--multi-context-runs", (value, config) -> config.initMultiEngine().numberOfRuns = Integer.parseInt(value)));
         }
 
         Config parse(List<String> arguments) {
@@ -303,7 +303,7 @@ private void processMultiContextArguments() {
                 iterator.remove();
                 if (Config.isPolybenchRunOption(runOption.name)) {
                     // a run-level PolyBench option
-                    Map<String, String> pbRunOptions = config.polybenchRunOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new HashMap<>());
+                    Map<String, String> pbRunOptions = config.initMultiEngine().polybenchRunOptionsMap.computeIfAbsent(runOption.runIndex, (i) -> new HashMap<>());
                     pbRunOptions.put(runOption.name, runOption.value);
                 } else {
                     // a run-level polyglot option
@@ -323,17 +323,20 @@ private void processMultiContextArguments() {
         }
 
         // Parse engine options and store them to config.engineOptions
-        parseUnrecognizedOptions(getLanguageId(config.path), config.engineOptions, engineOptions);
-
+        HashMap<String, String> polyglotOptions = new HashMap<>();
+        parseUnrecognizedOptions(getLanguageId(config.path), polyglotOptions, engineOptions);
+        if (!polyglotOptions.isEmpty()) {
+            config.initMultiEngine().engineOptions.putAll(polyglotOptions);
+        }
         // Parse run specific options and store them to config.runOptionsMap
         for (Map.Entry<Integer, List<String>> runOptionsEntry : runOptionsMap.entrySet()) {
-            Map<String, String> runOptions = config.polyglotRunOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
-            if (useExperimental) {
-                // the enabled experimental-options flag must be propagated to runOptions to enable parsing of
-                // run-level experimental options
-                runOptionsEntry.getValue().add("--experimental-options");
+            if (!runOptionsEntry.getValue().isEmpty()) {
+                Map<String, String> runOptions = config.initMultiEngine().polyglotRunOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
+                if (useExperimental) {
+                    runOptionsEntry.getValue().add("--experimental-options");
+                }
+                parseUnrecognizedOptions(getLanguageId(config.path), runOptions, runOptionsEntry.getValue());
             }
-            parseUnrecognizedOptions(getLanguageId(config.path), runOptions, runOptionsEntry.getValue());
         }
     }
 
@@ -351,29 +354,26 @@ protected void validateArguments(Map<String, String> polyglotOptions) {
 
     @Override
     protected void launch(Context.Builder contextBuilder) {
-        String compilationOptionValue;
-        switch (config.mode) {
-            case interpreter:
-                compilationOptionValue = "false";
-                break;
-            case standard:
-                compilationOptionValue = "true";
-                break;
-            default:
-                throw new AssertionError("Unknown execution-mode: " + config.mode);
+        if (config.isSingleEngine()) {
+            contextBuilder.option("engine.Compilation", config.compilation());
+            runHarness(contextBuilder, config.evalSourceOnlyDefault, 0);
+        } else {
+            multiEngineLaunch(contextBuilder);
         }
-        config.engineOptions.put("engine.Compilation", compilationOptionValue);
+    }
+
+    private void multiEngineLaunch(Context.Builder contextBuilder) {
+        config.multiEngine.engineOptions.put("engine.Compilation", config.compilation());
 
-        if (config.sharedEngine) {
-            // allowExperimentalOptions must be enabled as engine.Compilation is experimental
-            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.engineOptions).build());
+        if (config.multiEngine.sharedEngine) {
+            contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(config.multiEngine.engineOptions).build());
         } else {
-            contextBuilder.options(config.engineOptions);
+            contextBuilder.options(config.multiEngine.engineOptions);
         }
         contextBuilder.allowAllAccess(true);
 
-        for (int i = 0; i < config.numberOfRuns; i++) {
-            Map<String, String> perRunOptions = config.polyglotRunOptionsMap.get(i);
+        for (int i = 0; i < config.multiEngine.numberOfRuns; i++) {
+            Map<String, String> perRunOptions = config.multiEngine.polyglotRunOptionsMap.get(i);
             if (perRunOptions != null) {
                 contextBuilder.options(perRunOptions);
             }

From ed4dc1961401c71b8b7b3e8c6b6aae6071b7e733 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 11 Oct 2021 11:42:05 +0200
Subject: [PATCH 375/681] Allow Node.getCost() to be overridden.

Fixes #1385
---
 .../truffle/api/dsl/test/NodeCostTest.java    | 26 ++++++++++++++++++-
 .../generator/FlatNodeGenFactory.java         |  9 +++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeCostTest.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeCostTest.java
index 5cec950f2986..5d75415498d2 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeCostTest.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/NodeCostTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -48,6 +48,7 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.test.NodeCostTestFactory.CostTestNodeFactory;
+import com.oracle.truffle.api.dsl.test.NodeCostTestFactory.CostViaMethodOverrideNodeFactory;
 import com.oracle.truffle.api.dsl.test.NodeCostTestFactory.CostWithNodeInfoNodeFactory;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.TestRootNode;
 import com.oracle.truffle.api.dsl.test.TypeSystemTest.ValueNode;
@@ -88,6 +89,29 @@ Object cost(Object left) {
 
     }
 
+    @Test
+    public void testNodeCostViaMethodOverride() {
+        TestRootNode<CostViaMethodOverrideNode> node = TestHelper.createRoot(CostViaMethodOverrideNodeFactory.getInstance());
+        assertEquals(NodeCost.NONE, node.getNode().getCost());
+        assertEquals(21, executeWith(node, 21));
+        assertEquals(NodeCost.NONE, node.getNode().getCost());
+    }
+
+    @NodeChild
+    abstract static class CostViaMethodOverrideNode extends ValueNode {
+
+        @Specialization
+        int costInt(int left) {
+            return left;
+        }
+
+        @Override
+        public final NodeCost getCost() {
+            return NodeCost.NONE;
+        }
+
+    }
+
     @Test
     public void testNodeCostWithNodeInfo() {
         TestRootNode<CostWithNodeInfoNode> node = TestHelper.createRoot(CostWithNodeInfoNodeFactory.getInstance());
diff --git a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
index 1dcd40c130b7..9496f8ac5b6f 100644
--- a/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
+++ b/truffle/src/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/FlatNodeGenFactory.java
@@ -640,7 +640,7 @@ public CodeTypeElement create(CodeTypeElement clazz) {
         } catch (UnsupportedOperationException e) {
         }
         String cost = nodeInfo != null ? ElementUtils.getAnnotationValue(VariableElement.class, nodeInfo, "cost").getSimpleName().toString() : null;
-        if (cost == null || cost.equals("MONOMORPHIC") /* the default */) {
+        if ((cost == null || cost.equals("MONOMORPHIC") /* the default */) && isUndeclaredOrOverrideable(clazz, "getCost")) {
             if (primaryNode) {
                 clazz.add(createGetCostMethod(false));
             }
@@ -712,7 +712,7 @@ public CodeTypeElement create(CodeTypeElement clazz) {
                 wrapWithTraceOnReturn(uncached.add(createUncachedExecute(type)));
             }
 
-            if (cost == null || cost.equals("MONOMORPHIC") /* the default */) {
+            if ((cost == null || cost.equals("MONOMORPHIC") /* the default */) && isUndeclaredOrOverrideable(uncached, "getCost")) {
                 uncached.add(createGetCostMethod(true));
             }
             CodeExecutableElement isAdoptable = CodeExecutableElement.cloneNoAnnotations(ElementUtils.findExecutableElement(types.Node, "isAdoptable"));
@@ -2915,6 +2915,11 @@ private Element createGetCostMethod(boolean uncached) {
 
     }
 
+    private static boolean isUndeclaredOrOverrideable(TypeElement sourceType, String methodName) {
+        List<ExecutableElement> elements = ElementUtils.getDeclaredMethodsInSuperTypes(sourceType, methodName);
+        return elements.isEmpty() || !elements.iterator().next().getModifiers().contains(Modifier.FINAL);
+    }
+
     private ExecutableElement createAccessChildMethod(NodeChildData child, boolean uncached) {
         if (child.getAccessElement() != null && child.getAccessElement().getModifiers().contains(Modifier.ABSTRACT)) {
             ExecutableElement getter = (ExecutableElement) child.getAccessElement();

From da748b7feb299b780489bb1516863fc1ee5b301c Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Mon, 11 Oct 2021 10:07:37 +0000
Subject: [PATCH 376/681] [GR-34408] Export object of inspector module should
 be usable with WeakMap.

PullRequest: js/2189
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index f3f69d035de7..76101ae7684a 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "5261f7865f77e399ad1b49bfa5de9b784e740e8a",
+                "version": "43f5bc397a09a45f6f6c34ed5b283e58eca1e7ae",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "5261f7865f77e399ad1b49bfa5de9b784e740e8a",
+                "version": "43f5bc397a09a45f6f6c34ed5b283e58eca1e7ae",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From 326e19a0c35c766b4c25701d14da779df5ba1917 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Fri, 8 Oct 2021 13:47:54 +0200
Subject: [PATCH 377/681] A new Sulong Polybench VM for 3 shared/exclusive runs
 registered

---
 sulong/mx.sulong/mx_sulong_benchmarks.py |  4 +++
 vm/ci_includes/vm-bench-sulong.hocon     | 33 +++++++++++++++++++-----
 vm/mx.vm/mx_vm.py                        |  1 +
 vm/mx.vm/polybench-sulong-ce             |  3 +++
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 vm/mx.vm/polybench-sulong-ce

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index ba0f705ae1d3..f063ee5777a6 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -635,3 +635,7 @@ def hosting_registry(self):
     ['--experimental-options', '--multi-context-runs=1', '--engine.CacheLoad=' + os.path.join(os.getcwd(), 'test.image'),
      '--llvm.AOTCacheLoad=true', '--engine.CachePreinitializeContext=false', '--engine.TraceCache=true',
      '-w', '0', '-i', '10']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-exclusive-engine',
+    ['--multi-context-runs=3', '--shared-engine=false', '-w', '10', '-i', '10']), _suite, 10)
+native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-shared-engine',
+    ['--multi-context-runs=3', '--shared-engine=true', '-w', '10', '-i', '10']), _suite, 10)
diff --git a/vm/ci_includes/vm-bench-sulong.hocon b/vm/ci_includes/vm-bench-sulong.hocon
index 2ca28b508aff..4a9c1be0e4ff 100644
--- a/vm/ci_includes/vm-bench-sulong.hocon
+++ b/vm/ci_includes/vm-bench-sulong.hocon
@@ -89,19 +89,38 @@ csuite-stockfish {
   }
 }
 
-bench-llvm-sulong-graalvm-ce-llimul: ${bench_vm_ce_linux_base} ${bench-llvm-sulong-common} ${sulong-weekly-notifications} {
+
+bench-llvm-sulong-3-runs-shared-engine-ce: ${bench_vm_ce_linux_base} ${bench-llvm-sulong-common} ${sulong-weekly-notifications} {
+  targets: [gate],
+  timelimit: "45:00"
   environment: {
-      VM_DIST: ce-llimul
+      VM_DIST: polybench-sulong-ce
   }
   setup: ${bench_vm_ce_linux_base.setup} [
     [git, clone, --depth, "1", ${repoBase}"${BENCH_REPO_NAME}.git", "../../${BENCH_REPO_NAME}"]
   ]
   run: [
-    [mx, --dynamicimport, sulong-benchmarks, --env, ce-llimul, benchmark, --results-file, ${bench_vm_ce_linux_base.resultFile}, "csuite:*", --, --native-vm, sulong-multi, --native-vm-config, default, --jvm, graalvm-ce, --jvm-config, "${JVM_CONFIG}", "--multi-context-runs=3"]
+    [mx, --dynamicimport, sulong-benchmarks, --env, "${VM_DIST}", benchmark, --results-file, ${bench_vm_ce_linux_base.resultFile}, "csuite-polybench:deltablue", --, --nativepolybench-vm, sulong-polybench, --nativepolybench-vm-config, 3-runs-shared-engine, --jvm, graalvm-ce, --jvm-config, "${JVM_CONFIG}"]
+  ]
+  teardown: [
+    [cat, ${bench_vm_ce_linux_base.resultFile}]
+    [bench-uploader.py, ${bench_vm_ce_linux_base.resultFile}]
   ]
-  timelimit: "10:00:01"
 }
 
+#bench-llvm-sulong-graalvm-ce-llimul: ${bench_vm_ce_linux_base} ${bench-llvm-sulong-common} ${sulong-weekly-notifications} {
+#  environment: {
+#      VM_DIST: ce-llimul
+#  }
+#  setup: ${bench_vm_ce_linux_base.setup} [
+#    [git, clone, --depth, "1", ${repoBase}"${BENCH_REPO_NAME}.git", "../../${BENCH_REPO_NAME}"]
+#  ]
+#  run: [
+#    [mx, --dynamicimport, sulong-benchmarks, --env, ce-llimul, benchmark, --results-file, ${bench_vm_ce_linux_base.resultFile}, "csuite:*", --, --native-vm, sulong-multi, --native-vm-config, default, --jvm, graalvm-ce, --jvm-config, "${JVM_CONFIG}", "--multi-context-runs=3"]
+#  ]
+#  timelimit: "10:00:01"
+#}
+
 bench-llvm-native: ${bench-llvm-common} ${bench-llvm-linux} ${sulong-weekly-notifications} {
   targets: [weekly, bench]
   run: [
@@ -116,8 +135,10 @@ builds += [
   ${bench-llvm-sulong-graalvm-ce} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-native-csuite", environment: { JVM_CONFIG: native } }
   ${bench-llvm-sulong-graalvm-ce} ${csuite-stockfish} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-jvm-3-compiler-threads-csuite-stockfish", environment: { JVM_CONFIG: jvm-3-compiler-threads } }
   ${bench-llvm-sulong-graalvm-ce} ${csuite-stockfish} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-native-3-compiler-threads-csuite-stockfish", environment: { JVM_CONFIG: native-3-compiler-threads } }
-  ${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-jvm-csuite", environment: { JVM_CONFIG: jvm } }
-  ${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-native-csuite", environment: { JVM_CONFIG: native } }
+  #${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-jvm-csuite", environment: { JVM_CONFIG: jvm } }
+  #${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-native-csuite", environment: { JVM_CONFIG: native } }
+  ${bench-llvm-sulong-3-runs-shared-engine-ce} {targets: [daily, bench], name: "daily-bench-sulong-3-runs-shared-engine-ce-jvm", environment: { JVM_CONFIG: jvm } }
+  ${bench-llvm-sulong-3-runs-shared-engine-ce} {targets: [daily, bench], name: "daily-bench-sulong-3-runs-shared-engine-ce-native", environment: { JVM_CONFIG: native } }
   ${bench-llvm-sulong-core} {name: daily-bench-sulong-graal-core-csuite}
   # sulong reference benchmark
   ${bench-llvm-native} {name: "weekly-bench-clangO3-csuite"}
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index 23527feb4938..39dd08a1f027 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -151,6 +151,7 @@
 mx_sdk_vm.register_vm_config('ce', ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'java', 'libpoly', 'sespresso', 'spolyglot', 'ejvm', 'bjs', 'blli', 'bnative-image', 'btruffleruby', 'pynl', 'bgraalpython', 'pyn', 'bwasm', 'cmp', 'gwa', 'js', 'lg', 'llp', 'nfi', 'ni', 'nil', 'pbm', 'pmh', 'rby', 'rbyl', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file='polybench-ce')
 mx_sdk_vm.register_vm_config('ce', ['pbm', 'pmh', 'ni', 'js', 'lg', 'nfi', 'tfl', 'svm', 'nil', 'rgx', 'sdk', 'cmp', 'tflm', 'svmnfi', 'bnative-image', 'bjs', 'snative-image-agent', 'snative-image-diagnostics-agent'], _suite, env_file='polybench-nfi-ce')
 mx_sdk_vm.register_vm_config('ce', ce_components + ['llmulrl'], _suite, env_file='ce-llimul')
+mx_sdk_vm.register_vm_config('ce', ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'blli', 'bnative-image', 'cmp', 'lg', 'llrc', 'llrl', 'llrn', 'nfi', 'ni', 'nil', 'pbm', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file='polybench-sulong-ce')
 
 if mx.get_os() == 'windows':
     mx_sdk_vm.register_vm_config('svm', ['bnative-image', 'bnative-image-configure', 'bpolyglot', 'cmp', 'gvm', 'nfi', 'ni', 'nil', 'nju', 'njucp', 'nic', 'poly', 'polynative', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file=False)
diff --git a/vm/mx.vm/polybench-sulong-ce b/vm/mx.vm/polybench-sulong-ce
new file mode 100644
index 000000000000..862114493584
--- /dev/null
+++ b/vm/mx.vm/polybench-sulong-ce
@@ -0,0 +1,3 @@
+DYNAMIC_IMPORTS=/substratevm,/sulong
+COMPONENTS=Polybench Launcher,Native Image,LLVM Runtime Launcher,LLVM Runtime Native,LibGraal
+NATIVE_IMAGES=polybench,lib:jvmcicompiler

From 901fafe9a4a9883244e983d4b6b1376a4e7c5f66 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Mon, 11 Oct 2021 13:25:48 +0300
Subject: [PATCH 378/681] Remove Alpine Linux

---
 docs/enterprise-overview/architecture-overview.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 8924085116d4..b6986a8829df 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -70,7 +70,6 @@ The following are the certified platforms for GraalVM Enterprise 21:
 |------------------------------------	|--------------	|--------------	|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------	|
 | Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
 | Red Hat Enterprise Linux(RHEL) 	| 7, 8 	| x86 64-bit 	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
-| Alpine Linux  | 7, 8  | x86 64-bit | [Static Native Images](../reference-manual/native-image/StaticImages.md) |
 | macOS 	| 10.14 (Mojave), 10.15 (Catalina)	| x86 64-bit 	| [Installation Guide for macOS](/getting-started/installation-macos/) 	|
 | Microsoft Windows 	| Server 2016, 2019	| x86 64-bit 	| [Installation Guide for Windows](/getting-started/installation-windows/) 	|
 

From bfdf9dd9ff20f84df5511d2f9be5c47f0f91a271 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 7 Oct 2021 09:36:19 +0200
Subject: [PATCH 379/681] Fix G1 write barrier location identities.

---
 .../HotSpotG1WriteBarrierSnippets.java        | 10 ++---
 .../gc/G1WriteBarrierSnippets.java            | 42 +++++++++----------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
index aa6b42b0e1d5..367cdc3e324a 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
@@ -202,15 +202,15 @@ public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories,
             this.lowerer = new HotspotG1WriteBarrierLowerer(config, factory);
 
             HotSpotG1WriteBarrierSnippets receiver = new HotSpotG1WriteBarrierSnippets(providers.getRegisters());
-            g1PreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PreWriteBarrier", null, receiver, GC_INDEX_LOCATION, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION, SATB_QUEUE_INDEX_LOCATION,
+            g1PreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PreWriteBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION, SATB_QUEUE_INDEX_LOCATION,
                             SATB_QUEUE_BUFFER_LOCATION);
-            g1ReferentReadBarrier = snippet(G1WriteBarrierSnippets.class, "g1ReferentReadBarrier", null, receiver, GC_INDEX_LOCATION, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
+            g1ReferentReadBarrier = snippet(G1WriteBarrierSnippets.class, "g1ReferentReadBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
                             SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION);
-            g1PostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_INDEX_LOCATION, GC_LOG_LOCATION, CARD_QUEUE_INDEX_LOCATION,
+            g1PostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_LOG_LOCATION, CARD_QUEUE_INDEX_LOCATION,
                             CARD_QUEUE_BUFFER_LOCATION);
-            g1ArrayRangePreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePreWriteBarrier", null, receiver, GC_INDEX_LOCATION, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
+            g1ArrayRangePreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePreWriteBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
                             SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION);
-            g1ArrayRangePostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_INDEX_LOCATION, GC_LOG_LOCATION,
+            g1ArrayRangePostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_LOG_LOCATION,
                             CARD_QUEUE_INDEX_LOCATION, CARD_QUEUE_BUFFER_LOCATION);
         }
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
index c520568d6238..e7c4033394e3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
@@ -76,18 +76,19 @@
  */
 public abstract class G1WriteBarrierSnippets extends WriteBarrierSnippets implements Snippets {
 
+    // This location identity is used by the pre- and the post-write barrier to write the different
+    // kinds of barrier data. It is sufficient to have one location identity as that data is only
+    // read by the GC.
     public static final LocationIdentity GC_LOG_LOCATION = NamedLocationIdentity.mutable("GC-Log");
-    public static final LocationIdentity GC_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Index");
     public static final LocationIdentity SATB_QUEUE_MARKING_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Marking");
     public static final LocationIdentity SATB_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Index");
     public static final LocationIdentity SATB_QUEUE_BUFFER_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Buffer");
     public static final LocationIdentity CARD_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Index");
     public static final LocationIdentity CARD_QUEUE_BUFFER_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Buffer");
 
-    protected static final LocationIdentity[] KILLED_PRE_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION, GC_LOG_LOCATION,
-                    GC_INDEX_LOCATION};
+    protected static final LocationIdentity[] KILLED_PRE_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION, GC_LOG_LOCATION};
     protected static final LocationIdentity[] KILLED_POST_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{CARD_QUEUE_INDEX_LOCATION, CARD_QUEUE_BUFFER_LOCATION, GC_LOG_LOCATION,
-                    GC_INDEX_LOCATION, GC_CARD_LOCATION};
+                    GC_CARD_LOCATION};
 
     public static class Counters {
         Counters(SnippetCounter.Group.Factory factory) {
@@ -167,17 +168,14 @@ private void satbBarrier(Address address, Object object, Object expectedObject,
                 counters.g1ExecutedPreWriteBarrierCounter.inc();
                 // If the thread-local SATB buffer is full issue a native call which will
                 // initialize a new one and add the entry.
-                Word indexAddress = thread.add(satbQueueIndexOffset());
-                Word indexValue = indexAddress.readWord(0, SATB_QUEUE_INDEX_LOCATION);
+                Word indexValue = thread.readWord(satbQueueIndexOffset(), SATB_QUEUE_INDEX_LOCATION);
                 if (probability(FREQUENT_PROBABILITY, indexValue.notEqual(0))) {
                     Word bufferAddress = thread.readWord(satbQueueBufferOffset(), SATB_QUEUE_BUFFER_LOCATION);
                     Word nextIndex = indexValue.subtract(wordSize());
-                    Word logAddress = bufferAddress.add(nextIndex);
-                    // Log the object to be marked as well as update the SATB's buffer next
-                    // index.
-                    Word previousOop = Word.objectToTrackedPointer(previousObject);
-                    logAddress.writeWord(0, previousOop, GC_LOG_LOCATION);
-                    indexAddress.writeWord(0, nextIndex, GC_INDEX_LOCATION);
+
+                    // Log the object to be marked as well as update the SATB's buffer next index.
+                    bufferAddress.writeWord(nextIndex, Word.objectToTrackedPointer(previousObject), GC_LOG_LOCATION);
+                    thread.writeWord(satbQueueIndexOffset(), nextIndex, SATB_QUEUE_INDEX_LOCATION);
                 } else {
                     g1PreBarrierStub(previousObject);
                 }
@@ -245,12 +243,11 @@ public void g1PostWriteBarrier(Address address, Object object, Object value, @Co
                         if (probability(FREQUENT_PROBABILITY, indexValue.notEqual(0))) {
                             Word bufferAddress = thread.readWord(cardQueueBufferOffset(), CARD_QUEUE_BUFFER_LOCATION);
                             Word nextIndex = indexValue.subtract(wordSize());
-                            Word logAddress = bufferAddress.add(nextIndex);
-                            Word indexAddress = thread.add(cardQueueIndexOffset());
-                            // Log the object to be scanned as well as update
-                            // the card queue's next index.
-                            logAddress.writeWord(0, cardAddress, GC_LOG_LOCATION);
-                            indexAddress.writeWord(0, nextIndex, GC_INDEX_LOCATION);
+
+                            // Log the object to be scanned as well as update the card queue's next
+                            // index.
+                            bufferAddress.writeWord(nextIndex, cardAddress, GC_LOG_LOCATION);
+                            thread.writeWord(cardQueueIndexOffset(), nextIndex, CARD_QUEUE_INDEX_LOCATION);
                         } else {
                             g1PostBarrierStub(cardAddress);
                         }
@@ -283,10 +280,9 @@ public void g1ArrayRangePreWriteBarrier(Address address, long length, @ConstantP
                 if (probability(FREQUENT_PROBABILITY, indexValue != 0)) {
                     indexValue = indexValue - wordSize();
                     Word logAddress = bufferAddress.add(WordFactory.unsigned(indexValue));
-                    // Log the object to be marked as well as update the SATB's buffer next index.
-                    Word previousOop = Word.objectToTrackedPointer(previousObject);
-                    logAddress.writeWord(0, previousOop, GC_LOG_LOCATION);
-                    indexAddress.writeWord(0, WordFactory.unsigned(indexValue), GC_INDEX_LOCATION);
+                    // Log the object to be marked and update the SATB's buffer next index.
+                    logAddress.writeWord(0, Word.objectToTrackedPointer(previousObject), GC_LOG_LOCATION);
+                    indexAddress.writeWord(0, WordFactory.unsigned(indexValue), SATB_QUEUE_INDEX_LOCATION);
                 } else {
                     g1PreBarrierStub(previousObject);
                 }
@@ -325,7 +321,7 @@ public void g1ArrayRangePostWriteBarrier(Address address, long length, @Constant
                         // Log the object to be scanned as well as update
                         // the card queue's next index.
                         logAddress.writeWord(0, cur, GC_LOG_LOCATION);
-                        indexAddress.writeWord(0, WordFactory.unsigned(indexValue), GC_INDEX_LOCATION);
+                        indexAddress.writeWord(0, WordFactory.unsigned(indexValue), CARD_QUEUE_INDEX_LOCATION);
                     } else {
                         g1PostBarrierStub(cur);
                     }

From 4f9b4976c20a4c9f817454ce6747b3e10ddaa389 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Fri, 8 Oct 2021 09:02:56 +0200
Subject: [PATCH 380/681] Renamed and split G1 write barrier location
 identities.

---
 .../hotspot/GraalHotSpotVMConfig.java         |  6 ++--
 .../HotSpotG1WriteBarrierSnippets.java        | 12 +++----
 .../replacements/HotSpotReplacementsUtil.java |  2 +-
 .../gc/G1WriteBarrierSnippets.java            | 33 +++++++++----------
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
index 9cb08c907359..056579f96201 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -630,7 +630,7 @@ private static String markWordField(String simpleName) {
     // G1 Collector Related Values.
     public final byte dirtyCardValue;
     public final byte g1YoungCardValue;
-    public final int g1SATBQueueMarkingOffset;
+    public final int g1SATBQueueMarkingActiveOffset;
     public final int g1SATBQueueIndexOffset;
     public final int g1SATBQueueBufferOffset;
     public final int g1CardQueueIndexOffset;
@@ -649,13 +649,13 @@ private static String markWordField(String simpleName) {
             g1YoungCardValue = getFieldValue("CompilerToVM::Data::g1_young_card", Byte.class, "int");
             g1CardQueueIndexOffset = javaThreadDirtyCardQueueOffset + dirtyCardQueueIndexOffset;
             g1CardQueueBufferOffset = javaThreadDirtyCardQueueOffset + dirtyCardQueueBufferOffset;
-            g1SATBQueueMarkingOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueActiveOffset;
+            g1SATBQueueMarkingActiveOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueActiveOffset;
             g1SATBQueueIndexOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueIndexOffset;
             g1SATBQueueBufferOffset = javaThreadSatbMarkQueueOffset + satbMarkQueueBufferOffset;
         } else {
             dirtyCardValue = getConstant("CardTable::dirty_card", Byte.class);
             g1YoungCardValue = getConstant("G1CardTable::g1_young_gen", Byte.class);
-            g1SATBQueueMarkingOffset = getConstant("G1ThreadLocalData::satb_mark_queue_active_offset", Integer.class);
+            g1SATBQueueMarkingActiveOffset = getConstant("G1ThreadLocalData::satb_mark_queue_active_offset", Integer.class);
             g1SATBQueueIndexOffset = getConstant("G1ThreadLocalData::satb_mark_queue_index_offset", Integer.class);
             g1SATBQueueBufferOffset = getConstant("G1ThreadLocalData::satb_mark_queue_buffer_offset", Integer.class);
             g1CardQueueIndexOffset = getConstant("G1ThreadLocalData::dirty_card_queue_index_offset", Integer.class);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
index 367cdc3e324a..a9801142b312 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
@@ -92,7 +92,7 @@ protected int objectArrayIndexScale() {
     }
 
     @Override
-    protected int satbQueueMarkingOffset() {
+    protected int satbQueueMarkingActiveOffset() {
         return HotSpotReplacementsUtil.g1SATBQueueMarkingOffset(INJECTED_VMCONFIG);
     }
 
@@ -202,15 +202,15 @@ public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories,
             this.lowerer = new HotspotG1WriteBarrierLowerer(config, factory);
 
             HotSpotG1WriteBarrierSnippets receiver = new HotSpotG1WriteBarrierSnippets(providers.getRegisters());
-            g1PreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PreWriteBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION, SATB_QUEUE_INDEX_LOCATION,
+            g1PreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PreWriteBarrier", null, receiver, SATB_QUEUE_LOG_LOCATION, SATB_QUEUE_MARKING_ACTIVE_LOCATION, SATB_QUEUE_INDEX_LOCATION,
                             SATB_QUEUE_BUFFER_LOCATION);
-            g1ReferentReadBarrier = snippet(G1WriteBarrierSnippets.class, "g1ReferentReadBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
+            g1ReferentReadBarrier = snippet(G1WriteBarrierSnippets.class, "g1ReferentReadBarrier", null, receiver, SATB_QUEUE_LOG_LOCATION, SATB_QUEUE_MARKING_ACTIVE_LOCATION,
                             SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION);
-            g1PostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_LOG_LOCATION, CARD_QUEUE_INDEX_LOCATION,
+            g1PostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1PostWriteBarrier", null, receiver, GC_CARD_LOCATION, CARD_QUEUE_LOG_LOCATION, CARD_QUEUE_INDEX_LOCATION,
                             CARD_QUEUE_BUFFER_LOCATION);
-            g1ArrayRangePreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePreWriteBarrier", null, receiver, GC_LOG_LOCATION, SATB_QUEUE_MARKING_LOCATION,
+            g1ArrayRangePreWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePreWriteBarrier", null, receiver, SATB_QUEUE_LOG_LOCATION, SATB_QUEUE_MARKING_ACTIVE_LOCATION,
                             SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION);
-            g1ArrayRangePostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePostWriteBarrier", null, receiver, GC_CARD_LOCATION, GC_LOG_LOCATION,
+            g1ArrayRangePostWriteBarrier = snippet(G1WriteBarrierSnippets.class, "g1ArrayRangePostWriteBarrier", null, receiver, GC_CARD_LOCATION, CARD_QUEUE_LOG_LOCATION,
                             CARD_QUEUE_INDEX_LOCATION, CARD_QUEUE_BUFFER_LOCATION);
         }
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
index 42c88a39b221..ec169219f8bf 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
@@ -661,7 +661,7 @@ public static int logOfHeapRegionGrainBytes(@InjectedParameter GraalHotSpotVMCon
 
     @Fold
     public static int g1SATBQueueMarkingOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.g1SATBQueueMarkingOffset;
+        return config.g1SATBQueueMarkingActiveOffset;
     }
 
     @Fold
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
index e7c4033394e3..989768d9e9fb 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
@@ -76,18 +76,17 @@
  */
 public abstract class G1WriteBarrierSnippets extends WriteBarrierSnippets implements Snippets {
 
-    // This location identity is used by the pre- and the post-write barrier to write the different
-    // kinds of barrier data. It is sufficient to have one location identity as that data is only
-    // read by the GC.
-    public static final LocationIdentity GC_LOG_LOCATION = NamedLocationIdentity.mutable("GC-Log");
-    public static final LocationIdentity SATB_QUEUE_MARKING_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Marking");
-    public static final LocationIdentity SATB_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Index");
-    public static final LocationIdentity SATB_QUEUE_BUFFER_LOCATION = NamedLocationIdentity.mutable("GC-Queue-Buffer");
-    public static final LocationIdentity CARD_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Index");
+    public static final LocationIdentity SATB_QUEUE_MARKING_ACTIVE_LOCATION = NamedLocationIdentity.mutable("GC-SATB-Marking-Active");
+    public static final LocationIdentity SATB_QUEUE_BUFFER_LOCATION = NamedLocationIdentity.mutable("GC-SATB-Queue-Buffer");
+    public static final LocationIdentity SATB_QUEUE_LOG_LOCATION = NamedLocationIdentity.mutable("GC-SATB-Queue-Log");
+    public static final LocationIdentity SATB_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-SATB-Queue-Index");
+
     public static final LocationIdentity CARD_QUEUE_BUFFER_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Buffer");
+    public static final LocationIdentity CARD_QUEUE_LOG_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Log");
+    public static final LocationIdentity CARD_QUEUE_INDEX_LOCATION = NamedLocationIdentity.mutable("GC-Card-Queue-Index");
 
-    protected static final LocationIdentity[] KILLED_PRE_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION, GC_LOG_LOCATION};
-    protected static final LocationIdentity[] KILLED_POST_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{CARD_QUEUE_INDEX_LOCATION, CARD_QUEUE_BUFFER_LOCATION, GC_LOG_LOCATION,
+    protected static final LocationIdentity[] KILLED_PRE_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{SATB_QUEUE_INDEX_LOCATION, SATB_QUEUE_BUFFER_LOCATION, SATB_QUEUE_LOG_LOCATION};
+    protected static final LocationIdentity[] KILLED_POST_WRITE_BARRIER_STUB_LOCATIONS = new LocationIdentity[]{CARD_QUEUE_INDEX_LOCATION, CARD_QUEUE_BUFFER_LOCATION, CARD_QUEUE_LOG_LOCATION,
                     GC_CARD_LOCATION};
 
     public static class Counters {
@@ -132,7 +131,7 @@ private void satbBarrier(Address address, Object object, Object expectedObject,
         Word thread = getThread();
         verifyOop(object);
         Word field = Word.fromAddress(address);
-        byte markingValue = thread.readByte(satbQueueMarkingOffset(), SATB_QUEUE_MARKING_LOCATION);
+        byte markingValue = thread.readByte(satbQueueMarkingActiveOffset(), SATB_QUEUE_MARKING_ACTIVE_LOCATION);
 
         boolean trace = isTracingActive(traceStartCycle);
         int gcCycle = 0;
@@ -174,7 +173,7 @@ private void satbBarrier(Address address, Object object, Object expectedObject,
                     Word nextIndex = indexValue.subtract(wordSize());
 
                     // Log the object to be marked as well as update the SATB's buffer next index.
-                    bufferAddress.writeWord(nextIndex, Word.objectToTrackedPointer(previousObject), GC_LOG_LOCATION);
+                    bufferAddress.writeWord(nextIndex, Word.objectToTrackedPointer(previousObject), SATB_QUEUE_LOG_LOCATION);
                     thread.writeWord(satbQueueIndexOffset(), nextIndex, SATB_QUEUE_INDEX_LOCATION);
                 } else {
                     g1PreBarrierStub(previousObject);
@@ -246,7 +245,7 @@ public void g1PostWriteBarrier(Address address, Object object, Object value, @Co
 
                             // Log the object to be scanned as well as update the card queue's next
                             // index.
-                            bufferAddress.writeWord(nextIndex, cardAddress, GC_LOG_LOCATION);
+                            bufferAddress.writeWord(nextIndex, cardAddress, CARD_QUEUE_LOG_LOCATION);
                             thread.writeWord(cardQueueIndexOffset(), nextIndex, CARD_QUEUE_INDEX_LOCATION);
                         } else {
                             g1PostBarrierStub(cardAddress);
@@ -260,7 +259,7 @@ public void g1PostWriteBarrier(Address address, Object object, Object value, @Co
     @Snippet
     public void g1ArrayRangePreWriteBarrier(Address address, long length, @ConstantParameter int elementStride) {
         Word thread = getThread();
-        byte markingValue = thread.readByte(satbQueueMarkingOffset(), SATB_QUEUE_MARKING_LOCATION);
+        byte markingValue = thread.readByte(satbQueueMarkingActiveOffset(), SATB_QUEUE_MARKING_ACTIVE_LOCATION);
         // If the concurrent marker is not enabled or the vector length is zero, return.
         if (probability(FREQUENT_PROBABILITY, markingValue == (byte) 0 || length == 0)) {
             return;
@@ -281,7 +280,7 @@ public void g1ArrayRangePreWriteBarrier(Address address, long length, @ConstantP
                     indexValue = indexValue - wordSize();
                     Word logAddress = bufferAddress.add(WordFactory.unsigned(indexValue));
                     // Log the object to be marked and update the SATB's buffer next index.
-                    logAddress.writeWord(0, Word.objectToTrackedPointer(previousObject), GC_LOG_LOCATION);
+                    logAddress.writeWord(0, Word.objectToTrackedPointer(previousObject), SATB_QUEUE_LOG_LOCATION);
                     indexAddress.writeWord(0, WordFactory.unsigned(indexValue), SATB_QUEUE_INDEX_LOCATION);
                 } else {
                     g1PreBarrierStub(previousObject);
@@ -320,7 +319,7 @@ public void g1ArrayRangePostWriteBarrier(Address address, long length, @Constant
                         Word logAddress = bufferAddress.add(WordFactory.unsigned(indexValue));
                         // Log the object to be scanned as well as update
                         // the card queue's next index.
-                        logAddress.writeWord(0, cur, GC_LOG_LOCATION);
+                        logAddress.writeWord(0, cur, CARD_QUEUE_LOG_LOCATION);
                         indexAddress.writeWord(0, WordFactory.unsigned(indexValue), CARD_QUEUE_INDEX_LOCATION);
                     } else {
                         g1PostBarrierStub(cur);
@@ -337,7 +336,7 @@ public void g1ArrayRangePostWriteBarrier(Address address, long length, @Constant
 
     protected abstract int objectArrayIndexScale();
 
-    protected abstract int satbQueueMarkingOffset();
+    protected abstract int satbQueueMarkingActiveOffset();
 
     protected abstract int satbQueueBufferOffset();
 

From 0287f8cefd85ec29e9cd47bef761f3806e5bc92f Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Mon, 11 Oct 2021 12:56:46 +0200
Subject: [PATCH 381/681] Minor renamings.

---
 .../hotspot/replacements/HotSpotG1WriteBarrierSnippets.java     | 2 +-
 .../compiler/hotspot/replacements/HotSpotReplacementsUtil.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
index a9801142b312..18fe93b4f2d6 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
@@ -93,7 +93,7 @@ protected int objectArrayIndexScale() {
 
     @Override
     protected int satbQueueMarkingActiveOffset() {
-        return HotSpotReplacementsUtil.g1SATBQueueMarkingOffset(INJECTED_VMCONFIG);
+        return HotSpotReplacementsUtil.g1SATBQueueMarkingActiveOffset(INJECTED_VMCONFIG);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
index ec169219f8bf..ef7d46718cc8 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
@@ -660,7 +660,7 @@ public static int logOfHeapRegionGrainBytes(@InjectedParameter GraalHotSpotVMCon
     }
 
     @Fold
-    public static int g1SATBQueueMarkingOffset(@InjectedParameter GraalHotSpotVMConfig config) {
+    public static int g1SATBQueueMarkingActiveOffset(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.g1SATBQueueMarkingActiveOffset;
     }
 

From cf5d9cae439f7f3f94188f79dbff2a8844dbf9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Mon, 11 Oct 2021 13:45:46 +0200
Subject: [PATCH 382/681] Ensure paths for resource lookup contains no
 duplicates

---
 .../src/com/oracle/svm/hosted/ResourcesFeature.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
index fbdaa447b084..4ad543dc9683 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -50,7 +50,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.oracle.svm.core.util.VMError;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionType;
@@ -74,6 +73,7 @@
 import com.oracle.svm.core.option.LocatableMultiOptionValue;
 import com.oracle.svm.core.util.ClasspathUtils;
 import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.config.ConfigurationParserUtils;
@@ -220,7 +220,7 @@ public void duringAnalysis(DuringAnalysisAccess access) {
          */
 
         ImageClassLoader loader = accessImpl.imageClassLoader;
-        Stream.concat(loader.modulepath().stream(), loader.classpath().stream()).forEach(classpathFile -> {
+        Stream.concat(loader.modulepath().stream(), loader.classpath().stream()).distinct().forEach(classpathFile -> {
             try {
                 if (Files.isDirectory(classpathFile)) {
                     scanDirectory(debugContext, classpathFile, includePatterns, excludePatterns);

From ec1955e292fad32b047a194106403c1d60a9f875 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Sat, 11 Sep 2021 13:07:43 +0300
Subject: [PATCH 383/681] Try using relative links instead of permalinks

---
 docs/enterprise-overview/architecture-overview.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 512e250d54ff..4b4f5be3e878 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -29,9 +29,9 @@ The conceptual overview and advantages of GraalVM Enterprise are described on th
 
 The preceding diagram illustrates a complete high-level architecture of GraalVM Enterprise.
 
-GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](/reference-manual/compiler/), which is written in Java, to the HotSpot Java Virtual Machine.
+GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](../reference-manual/compiler.md), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](../../truffle/docs/README.md) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With GraalVM Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes

From 8239a729099507fb1008b33d3f9ff5d6d99ae30d Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Sat, 11 Sep 2021 14:00:07 +0300
Subject: [PATCH 384/681] Revert changes

---
 docs/enterprise-overview/architecture-overview.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 4b4f5be3e878..512e250d54ff 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -29,9 +29,9 @@ The conceptual overview and advantages of GraalVM Enterprise are described on th
 
 The preceding diagram illustrates a complete high-level architecture of GraalVM Enterprise.
 
-GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](../reference-manual/compiler.md), which is written in Java, to the HotSpot Java Virtual Machine.
+GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](/reference-manual/compiler/), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](../../truffle/docs/README.md) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With GraalVM Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes

From a19f921576d053825a04548f7a2fa0da042626df Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 21:43:48 +0300
Subject: [PATCH 385/681] Update docs/enterprise-overview

---
 .../architecture-overview.md                  | 52 +++++++++----------
 .../enterprise-overview/solutions-overview.md |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 512e250d54ff..07b912d070f8 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -10,7 +10,7 @@ It is designed to accelerate the execution of applications written in Java and o
 GraalVM Enterprise's polyglot capabilities make it possible to mix multiple programming languages in a single application while eliminating any foreign language call costs.
 
 This page provides developers, solution architects, and infrastructure architects with an architectural overview of GraalVM Enterprise, as well as information about runtime modes, supported platforms, available distributions, core and additional functionalities, and support levels for various features.
-The conceptual overview and advantages of GraalVM Enterprise are described on the [Solutions Overview](https://docs.oracle.com/en/graalvm/enterprise/21/docs/overview/) page.
+The conceptual overview and advantages of GraalVM Enterprise are described on the [Solutions Overview](overview.md) page.
 
 * [GraalVM Enterprise Architecture](#graalvm-enterprise-architecture)
 * [Runtime Modes](#runtime-modes)
@@ -29,38 +29,38 @@ The conceptual overview and advantages of GraalVM Enterprise are described on th
 
 The preceding diagram illustrates a complete high-level architecture of GraalVM Enterprise.
 
-GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](/reference-manual/compiler/), which is written in Java, to the HotSpot Java Virtual Machine.
+GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](../reference-manual/compiler.md), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
-With GraalVM Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
+In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../graalvm-as-a-platform/graalvm-as-a-platform.md), makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+With Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes
 
 GraalVM Enterprise is unique as a runtime environment offering several modes of operation: JVM runtime mode, Native Image, Java on Truffle (the same Java applications can be run on either).
 
 #### JVM Runtime Mode
-When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](/reference-manual/compiler/) as the top-tier JIT compiler.
+When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](../reference-manual/compiler.md) as the top-tier JIT compiler.
 At runtime, an application is loaded and executed normally on the JVM.
 The JVM passes bytecodes for Java or any other JVM-native language to the compiler, which compiles that to the machine code and returns it to the JVM.
-Interpreters for supported languages, written on top of the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/), are themselves Java programs that run on the JVM.
+Interpreters for supported languages, written on top of the [Truffle framework](../graalvm-as-a-platform/graalvm-as-a-platform.md), are themselves Java programs that run on the JVM.
 
 #### Native Image
-[Native Image](/reference-manual/native-image/) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
+[Native Image](../reference-manual/native-image/README.md) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
 The Java bytecode that is processed during the native image build includes all application classes, dependencies, third party dependent libraries, and any JDK classes that are required.
 A generated self-contained native executable is specific to each individual operating systems and machine architecture that does not require a JVM.
 
 #### Java on Truffle
-[Java on Truffle](/reference-manual/java-on-truffle/) is an implementation of the Java Virtual Machine Specification, built with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/).
+[Java on Truffle](../reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle framework](../graalvm-as-a-platform/graalvm-as-a-platform.md).
 It is a complete Java VM that includes all core components, implements the same API as the Java Runtime Environment library, and reuses all JARs and native libraries from GraalVM.
 Java on Trufle is an experimental technology in GraalVM, available as of version 21.0.0.
 
 ## Available Distributions
 
-GraalVM Enterprise distributions are based on Oracle JDK 8, 11, and 16.
+GraalVM Enterprise distributions are based on Oracle JDK 8, 11, and 17.
 GraalVM Enterprise releases include all Oracle Java critical patch updates (CPUs), which are released on a regular schedule to remedy defects and known vulnerabilities.
 
 GraalVM Enterprise is available for Linux, macOS, and Windows platforms on x86 64-bit systems, and for Linux on ARM 64-bit system.
-The GraalVM Enterprise distribution based on Oracle JDK 16 is experimental with [several known limitations](https://docs.oracle.com/en/graalvm/enterprise/21/docs/overview/known-issues/).
+The GraalVM Enterprise distribution based on Oracle JDK 17 is experimental with [several known limitations](https://docs.oracle.com/en/graalvm/enterprise/21/docs/overview/known-issues/).
 Depending on the platform, the distributions are shipped as *.tar.gz* or *.zip* archives.
 
 ## Certified Platforms
@@ -69,10 +69,10 @@ The following are the certified platforms for GraalVM Enterprise 21:
 
 | Operating System 	| Version 	| Architecture 	| Installation Guide 	|
 |------------------------------------	|--------------	|--------------	|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------	|
-| Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
-| Red Hat Enterprise Linux(RHEL) 	| 7, 8 	| x86 64-bit 	| [Installation Guide for Linux](/getting-started/installation-linux/) 	|
-| macOS 	| 10.14 (Mojave), 10.15 (Catalina)	| x86 64-bit 	| [Installation Guide for macOS](/getting-started/installation-macos/) 	|
-| Microsoft Windows 	| Server 2016, 2019	| x86 64-bit 	| [Installation Guide for Windows](/getting-started/installation-windows/) 	|
+| Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](../getting-started/graalvm-enterprise/installation-linux-aarch64.md) 	|
+| Red Hat Enterprise Linux(RHEL) 	| 7, 8 	| x86 64-bit 	| [Installation Guide for Linux](../getting-started/graalvm-enterprise/installation-linux.md) 	|
+| macOS 	| 10.14 (Mojave), 10.15 (Catalina)	| x86 64-bit 	| [Installation Guide for macOS](../getting-started/graalvm-enterprise/installation-macos.md) 	|
+| Microsoft Windows 	| Server 2016, 2019	| x86 64-bit 	| [Installation Guide for Windows](../getting-started/graalvm-enterprise/installation-windows.md) 	|
 
 ## Distribution Components List
 
@@ -91,24 +91,24 @@ GraalVM Enterprise consists of core and additional functionalities.
 **Utilities**
 * JavaScript REPL with the JavaScript interpreter
 * `lli` tool to directly execute programs from LLVM bitcode
-* [GraalVM Updater](/reference-manual/graalvm-updater/) to install additional functionalities
+* [GraalVM Updater](../reference-manual/graalvm-updater.md) to install additional functionalities
 
 ### Additional Functionalities
 GraalVM Enterprise core installation can be extended with more languages runtimes and utilities.
 
 Tools/Utilities:
 
-* [Native Image](/reference-manual/native-image/) -- a technology to compile an application ahead-of-time into a native platform executable.
-* [LLVM toolchain](/reference-manual/llvm/) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM.
-* [Java on Truffle](/reference-manual/java-on-truffle/) -- a JVM implementation built upon the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) to run Java via a Java bytecode interpreter.
+* [Native Image](../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native platform executable.
+* [LLVM toolchain](../reference-manual/llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM.
+* [Java on Truffle](../reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) to run Java via a Java bytecode interpreter.
 
 Runtimes:
 
-* [Node.js](/reference-manual/js/) -- the Node.js 14.16.1 runtime for JavaScript
-* [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
-* [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-* [GraalWasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+* [Node.js](../reference-manual/js/README.md) -- the Node.js 14.17.6 runtime for JavaScript
+* [Python](../reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](../reference-manual/ruby/README.md) -- Ruby 2.7.3 compatible
+* [R](../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [GraalWasm](../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 
 ## Licensing and Support
 
@@ -143,9 +143,9 @@ The following table lists supported and experimental features in GraalVM Enterpr
 
 ## What to Read Next
 
-Users who are new to GraalVM Enterprise or have little experience using it, continue to [Getting Started with GraalVM Enterprise](/getting-started//#install-graalvm-enterprise).
+Users who are new to GraalVM Enterprise or have little experience using it, continue to [Getting Started with GraalVM Enterprise](../getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md).
 Download and install GraalVM Enterprise on your local machine, try running the examples provided in the guide, or test GraalVM Enterprise with your workload.
-We suggest you then look at more complex [Examples Applications](/docs/examples/).
+We suggest you then look at more complex [Examples Applications](../examples/examples.md).
 
-Developers, who have GraalVM Enterprise already installed or have experience using it in the past, can skip the getting started guide and proceed to the [Reference Manuals](/reference-manual/) for
+Developers, who have GraalVM Enterprise already installed or have experience using it in the past, can skip the getting started guide and proceed to the [Reference Manuals](../reference-manual/reference-manuals.md) for
 in-depth coverage of GraalVM Enterprise technologies.
diff --git a/docs/enterprise-overview/solutions-overview.md b/docs/enterprise-overview/solutions-overview.md
index 1f7a5dc3b625..25bcd89418b9 100644
--- a/docs/enterprise-overview/solutions-overview.md
+++ b/docs/enterprise-overview/solutions-overview.md
@@ -96,7 +96,7 @@ vulnerabilities.
 
 ## Get Started with GraalVM Enterprise
 
-[Get started with GraalVM Enterprise](/getting-started/) and:
+[Get started with GraalVM Enterprise](../getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md) and:
 * reduce IT and storage costs
 * provide customers with quicker response time
 * employ fewer resources, freeing up CPU

From 80083a19bb0650cfa1cefd310cbd0d528c6d10d8 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 21:53:52 +0300
Subject: [PATCH 386/681] Proofread and update links in docs/examples

---
 docs/examples/mle-oracle.md                 | 6 ++++--
 docs/examples/polyglot-javascript-java-r.md | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/examples/mle-oracle.md b/docs/examples/mle-oracle.md
index 3806fd535cfe..be336d69dca2 100644
--- a/docs/examples/mle-oracle.md
+++ b/docs/examples/mle-oracle.md
@@ -46,9 +46,9 @@ END;
 /
 ```
 
-Please also note the EXCEPTION clause which makes sure that the context gets dropped either way. This is important to avoid resource leakage.
+Note: There is the `EXCEPTION` clause which makes sure that the context gets dropped either way. This is important to avoid resource leakage.
 
-2&#46; Now here's an example that shows how values can be passed between PL/SQL and MLE. As expected, the output is `49`:
+2&#46; Now here is an example that shows how values can be passed between PL/SQL and MLE. As expected, the output is `49`:
 ```sql
 SET SERVEROUTPUT ON;
 DECLARE
@@ -139,6 +139,7 @@ END;
 ```
 
 ## Type Conversions
+
 Let us now have a closer look at conversions from Oracle types (as retrieved by SQL queries) to JavaScript types.
 
 By default, Oracle data types get automatically converted to regular, native JavaScript types, which can lead to a loss of precision.
@@ -249,6 +250,7 @@ END;
 ```
 
 ## Further Reading
+
 Here is a set of resources that we recommend for further reading about MLE:
 - [Multilingual Engine: Executing JavaScript in Oracle Database](https://medium.com/graalvm/mle-executing-javascript-in-oracle-database-c545feb1a010) provides further insight into the MLE architecture based on GraalVM.
 - [MLE and the Future of Server-Side Programming in Oracle APEX](https://blogs.oracle.com/apex/mle-and-the-future-of-server-side-programming-in-oracle-apex) shows step-by-step how to set up a free Oracle Cloud account, provision a database instance and run some JavaScript code in Oracle APEX (powered by MLE).
diff --git a/docs/examples/polyglot-javascript-java-r.md b/docs/examples/polyglot-javascript-java-r.md
index 9dd251a389d9..31e52eaf4eaf 100644
--- a/docs/examples/polyglot-javascript-java-r.md
+++ b/docs/examples/polyglot-javascript-java-r.md
@@ -17,7 +17,7 @@ git clone https://github.com/graalvm/graalvm-demos
 cd graalvm-demos/polyglot-javascript-java-r
 ```
 
-2&#46; [Install GraalVM](/docs/getting-started/#install-graalvm) on your platform.
+2&#46; [Install GraalVM](../getting-started/graalvm-community/get-started-graalvm-community.md/#install-graalvm) on your platform.
 
 3&#46; To run the demo, you need to enable Node.js support in GraalVM:
 ```shell

From b647d4679e2e6db218e30669a316be0b6be9fa87 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 22:49:48 +0300
Subject: [PATCH 387/681] Proofread and update links in docs/getting-started

---
 .../architecture-overview.md                  |  2 +-
 .../graalvm-ce-container-images.md            |  3 +-
 .../get-started-graalvm-community.md          | 64 +++++++++----------
 .../graalvm-community/linux-aarch64.md        |  6 +-
 .../graalvm-community/linux.md                | 22 +++----
 .../graalvm-community/macos.md                | 22 +++----
 .../graalvm-community/windows.md              | 19 +++---
 .../get-started-graalvm-enterprise.md         | 64 +++++++++----------
 .../installation-linux-aarch64.md             |  6 +-
 .../graalvm-enterprise/installation-linux.md  | 24 ++++---
 .../graalvm-enterprise/installation-macos.md  | 24 ++++---
 .../installation-windows.md                   | 23 ++++---
 .../oci/compute-instances.md                  |  2 +-
 13 files changed, 136 insertions(+), 145 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 07b912d070f8..dc47810edac4 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -69,7 +69,7 @@ The following are the certified platforms for GraalVM Enterprise 21:
 
 | Operating System 	| Version 	| Architecture 	| Installation Guide 	|
 |------------------------------------	|--------------	|--------------	|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------	|
-| Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](../getting-started/graalvm-enterprise/installation-linux-aarch64.md) 	|
+| Oracle Linux 	| 7, 8 	| x86 64-bit, ARM 64-bit	| [Installation Guide for Linux](../getting-started/graalvm-enterprise/oci/compute-instances.md) 	|
 | Red Hat Enterprise Linux(RHEL) 	| 7, 8 	| x86 64-bit 	| [Installation Guide for Linux](../getting-started/graalvm-enterprise/installation-linux.md) 	|
 | macOS 	| 10.14 (Mojave), 10.15 (Catalina)	| x86 64-bit 	| [Installation Guide for macOS](../getting-started/graalvm-enterprise/installation-macos.md) 	|
 | Microsoft Windows 	| Server 2016, 2019	| x86 64-bit 	| [Installation Guide for Windows](../getting-started/graalvm-enterprise/installation-windows.md) 	|
diff --git a/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md b/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
index a16a8e3b7014..ed2edb613a87 100644
--- a/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
+++ b/docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md
@@ -50,9 +50,8 @@ bash-4.4#
 ```
 
 Please note that the image contains only the components immediately available in the GraalVM Community core download.
-However, the [GraalVM Updater](/reference-manual/graalvm-updater/) utility is on the `PATH` and you can install the support for additional languages and runtimes like Node.js, Ruby, R, Python or WebAssembly at will.
+However, the [GraalVM Updater, `gu`](../../../reference-manual/graalvm-updater.md), utility is included in the container image and may be used to install additional languages and runtimes like Node.js, Ruby, R, Python or WebAssembly.
 
-However, the [GraalVM Updater, `gu`](/reference-manual/graalvm-updater/), utility is included in the container image and may be used to install additional languages and runtimes like Node.js, Ruby, R, Python or WebAssembly.
 For example, the following command installs the Ruby support (the output below is truncated for brevity):
 
 ```shell
diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index f6142b394a12..71f41f11f9dd 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -14,18 +14,18 @@ GraalVM's polyglot capabilities make it possible to mix multiple programming lan
 Here you will find information about installing GraalVM Community Edition, running basic applications with it, and adding support for accompanying features.
 Further, you will learn about the polyglot capabilities of GraalVM and see how to build platform-specific native executables of JVM-based applications.
 
-If you are new to GraalVM, we recommend starting with [Introduction to GraalVM](/docs/introduction/), where you will find information about GraalVM's architecture, distributions available, supported platforms, core and additional features, and much more.
+If you are new to GraaVM, we recommend starting with [Introduction to GraalVM](../../introduction.md), where you will find information about GraalVM's architecture, distributions available, supported platforms, core and additional features, and much more.
 
-If you have GraalVM already installed and have experience using it, you can skip this getting started guide and proceed to the in-depth [Reference Manuals](/reference-manual/).
+If you have GraalVM already installed and have experience using it, you can skip this getting started guide and proceed to the in-depth [Reference Manuals](../../reference-manual/reference-manuals.md).
 
 ## Install GraalVM
 
 Getting GraalVM installed and ready-to-go should take a few minutes.
 Choose the operating system and proceed to the installation steps:
-* [Linux](/docs/getting-started/linux/)
-* [Linux AArch64](/docs/getting-started/linux-aarch64/)
-* [macOS](/docs/getting-started/macos/)
-* [Windows](/docs/getting-started/windows/)
+* [Linux](linux.md)
+* [Linux AArch64](linux-aarch64.md)
+* [macOS](macos.md)
+* [Windows](windows.md)
 
 ## Start Running Applications
 
@@ -73,10 +73,10 @@ java HelloWorld
 Hello World!
 ```
 
-You can find a collection of larger Java examples on the [Examples Applications](/examples/) page.
+You can find a collection of larger Java examples on the [Examples Applications](../../examples/examples.md) page.
 For more information on the GraalVM
-compiler, go to [Compiler](/reference-manual/compiler/).
-For more extensive documentation on running Java, proceed to [JVM Languages](/reference-manual/java/).
+compiler, go to [Compiler](../../reference-manual/compiler.md).
+For more extensive documentation on running Java, proceed to [JVM Languages](../../reference-manual/java/README.md).
 
 ## Run JavaScript and Node.js
 
@@ -92,7 +92,7 @@ Node.js support is not installed by default, but can be easily added with GraalV
 ```shell
 gu install nodejs
 node -v
-v14.16.1
+v14.17.6
 ```
 
 More than 100,000 npm packages are regularly tested and are compatible with GraalVM, including modules like express, react, async, request, browserify, grunt, mocha, and underscore.
@@ -124,7 +124,7 @@ node app.js
 ```
 
 For more detailed documentation and information on compatibility with Node.js,
-proceed to [JavaScript and Node.js](/reference-manual/js/).
+proceed to [JavaScript and Node.js](../../reference-manual/js/README.md).
 
 ## Run LLVM Languages
 
@@ -154,12 +154,12 @@ $LLVM_TOOLCHAIN/clang hello.c -o hello
 lli hello
 ```
 
-For in-depth documentation and more examples of running LLVM bitcode on GraalVM, go to [LLVM Languages](/reference-manual/llvm/).
+For in-depth documentation and more examples of running LLVM bitcode on GraalVM, go to [LLVM Languages](../../reference-manual/llvm/README.md).
 
 ## Run Python
 
 With GraalVM you can run Python applications in the Python 3 runtime environment.
-The support is not available by default, but you can quickly add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The support is not available by default, but you can quickly add it to GraalVM using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install python
 ```
@@ -173,12 +173,12 @@ graalpython
 >>> exit()
 ```
 
-More examples and additional information on Python support in GraalVM can be found in the [Python reference manual](/reference-manual/python/).
+More examples and additional information on Python support in GraalVM can be found in the [Python reference manual](../../reference-manual/python/README.md).
 
 ## Run Ruby
 
 GraalVM provides a high-performance Ruby runtime environment including the `gem` command that allows you to interact with RubyGems, Ruby Bundler, and much more.
-The Ruby runtime is not available by default in GraalVM, but can be easily added using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The Ruby runtime is not available by default in GraalVM, but can be easily added using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install ruby
 ```
@@ -189,7 +189,7 @@ ruby [options] program.rb
 ```
 
 GraalVM Ruby runtime environment uses the
-[same options as the standard implementation of Ruby](/reference-manual/ruby/Options/),
+[same options as the standard implementation of Ruby](../../reference-manual/ruby/Options.md),
 with some additions. For example:
 ```shell
 gem install chunky_png
@@ -197,12 +197,12 @@ ruby -r chunky_png -e "puts ChunkyPNG::Color.to_hex(ChunkyPNG::Color('mintcream
 #f5fffa80
 ```
 
-More examples and in-depth documentation can be found in the [Ruby reference manual](/reference-manual/ruby/).
+More examples and in-depth documentation can be found in the [Ruby reference manual](../../reference-manual/ruby/README.md).
 
 ## Run R
 
 GraalVM provides a GNU-compatible environment to run R programs directly or in the REPL mode.
-Although the R language support is not available by default, you can add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+Although the R language support is not available by default, you can add it to GraalVM using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install R
 ```
@@ -217,12 +217,12 @@ R version 4.0.3 (FastR)
 [1] 2
 ```
 
-More examples and in-depth documentation can be found in the [R reference manual](/reference-manual/r/).
+More examples and in-depth documentation can be found in the [R reference manual](../../reference-manual/r/README.md).
 
 ## Run WebAssembly
 
 With GraalVM you can run programs compiled to WebAssembly.
-The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install wasm
 ```
@@ -256,7 +256,7 @@ Then you can run the compiled WebAssembly binary on GraalVM as follows:
 wasm --Builtins=wasi_snapshot_preview1 floyd.wasm
 ```
 
-More details can be found in the [WebAssembly reference manual](/reference-manual/wasm/).
+More details can be found in the [WebAssembly reference manual](../../reference-manual/wasm/README.md).
 
 ## Combine Languages
 
@@ -265,12 +265,12 @@ To enable interoperability, GraalVM provides the `--polyglot` flag.
 
 For example, running `js --jvm --polyglot example.js` executes `example.js` in a polyglot context.
 If the program calls any code in other supported languages, GraalVM executes that code in the same runtime as the `example.js` application.
-For more information on running polyglot applications, see [Polyglot Programming](/reference-manual/polyglot-programming/).
+For more information on running polyglot applications, see [Polyglot Programming](../../reference-manual/polyglot-programming.md).
 
 ## Native Images
 
 With GraalVM you can compile Java bytecode into a platform-specific, self-contained, native executable - a native image - to achieve faster startup and smaller footprint for your application.
-The [Native Image](/reference-manual/native-image/) functionality is not available by default, but can be easily installed with the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The [Native Image](../../reference-manual/native-image/README.md) functionality is not available by default, but can be easily installed with the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install native-image
 ```
@@ -285,7 +285,7 @@ public class HelloWorld {
 }
 ```
 
-> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](/reference-manual/native-image/#prerequisites).
+> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md/#prerequisites).
 
 Compile _HelloWorld.java_ to bytecode and then build a native image:
 ```shell
@@ -300,7 +300,7 @@ Invoking it executes the natively compiled code of the `HelloWorld` class as fol
 Hello, World!
 ```
 
-More detailed documentation on this innovative technology is available in the [Native Image reference manual](/reference-manual/native-image/).
+More detailed documentation on this innovative technology is available in the [Native Image reference manual](../../reference-manual/native-image/README.md).
 
 ## Polyglot Capabilities of Native Images
 
@@ -336,7 +336,7 @@ javac PrettyPrintJSON.java
 native-image --language:js --initialize-at-build-time PrettyPrintJSON
 ```
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
-Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) included, which is the case here.
+Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](../../graalvm-as-a-platform/graalvm-as-a-platform.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 ```shell
@@ -384,14 +384,14 @@ sys	0m0.016s
 ## What to Read Next
 
 ### New Users
-Since this guide is intended mainly for users new to GraalVM, or users who are familiar with GraalVM but may have little experience using it, please consider investigating more complex [Example Applications](/examples/).
-We also recommend checking our [GraalVM Team Blog](/blog/).
+Since this guide is intended mainly for users new to GraalVM, or users who are familiar with GraalVM but may have little experience using it, please consider investigating more complex [Example Applications](../../examples/examples.md).
+We also recommend checking our [GraalVM Team Blog](https://medium.com/graalvm).
 
 ### Advanced Users
-If you are mostly interested in GraalVM support for a specific language, or want more in-depth details about GraalVM's diverse technologies, proceed to [Reference Manuals](/reference-manual/).
+If you are mostly interested in GraalVM support for a specific language, or want more in-depth details about GraalVM's diverse technologies, proceed to [Reference Manuals](../../reference-manual/reference-manuals.md).
 
-If you are looking for the tooling support GraalVM offers, proceed to [Debugging and Monitoring Tools](/tools/).
+If you are looking for the tooling support GraalVM offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](/graalvm-as-a-platform/language-implementation-framework/).
+If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](../../graalvm-as-a-platform/graalvm-as-a-platform.md).
 
-You can find information on GraalVM's security model in the [Security Guide](/security-guide/), and rich API documentation in [GraalVM SDK Javadoc](https://www.graalvm.org/sdk/javadoc/) and [Truffle Javadoc](https://www.graalvm.org/truffle/javadoc/).
+You can find information on GraalVM's security model in the [Security Guide](../../security/security-guide.md), and rich API documentation in [GraalVM SDK Javadoc](https://www.graalvm.org/sdk/javadoc/) and [Truffle Javadoc](https://www.graalvm.org/truffle/javadoc/).
diff --git a/docs/getting-started/graalvm-community/linux-aarch64.md b/docs/getting-started/graalvm-community/linux-aarch64.md
index e4fb8d221c09..eb9aea7b63eb 100644
--- a/docs/getting-started/graalvm-community/linux-aarch64.md
+++ b/docs/getting-started/graalvm-community/linux-aarch64.md
@@ -15,7 +15,7 @@ Note: The base GraalVM Community distribution including all components is **expe
 You can install the GraalVM distribution for Linux ARM64 systems from an archive file (_.tar.gz_).
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
-1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 or 16 based distribution for the Linux AArch64 architecture, and download.
+1. Navigate to the [GraalVM Releases repository on GitHub](https://github.com/graalvm/graalvm-ce-builds/releases). Depending on the workload, select Java 11 or 17 based distribution for the Linux AArch64 architecture, and download.
 2. Change the directory to the location where you want to install GraalVM, then move the _.tar.gz_ archive to it.
 3. Unzip the archive:
 ```shell
@@ -38,6 +38,6 @@ For Oracle GraalVM Enterprise Edition users, find the installation instructions
 
 ## Supported Functionalities
 
-The 64-bit GraalVM Community distribution for Linux platforms includes OpenJDK with the GraalVM compiler enabled, the [GraalVM Updater, `gu`](/reference-manual/graalvm-updater/), tool, the JavaScript runtime, and some developer tools (e.g., Chrome inspector based debugger, Visual VM).
-Support for [Native Image](/reference-manual/native-image/), Node.js, LLVM and WebAssembly runtimes can be installed with `gu`.
+The 64-bit GraalVM Community distribution for Linux platforms includes OpenJDK with the GraalVM compiler enabled, the [GraalVM Updater, `gu`](../../reference-manual/graalvm-updater.md), tool, the JavaScript runtime, and some developer tools (e.g., Chrome inspector based debugger, Visual VM).
+Support for [Native Image](../../reference-manual/native-image/README.md), Node.js, LLVM and WebAssembly runtimes can be installed with `gu`.
 Runtimes for Python, FastR, and Ruby languages are not available in this distribution yet.
diff --git a/docs/getting-started/graalvm-community/linux.md b/docs/getting-started/graalvm-community/linux.md
index 8b152d3abfda..65bdf352011d 100644
--- a/docs/getting-started/graalvm-community/linux.md
+++ b/docs/getting-started/graalvm-community/linux.md
@@ -36,20 +36,18 @@ The base distribution of GraalVM Community Edition for Linux (AMD64) platforms i
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](/reference-manual/native-image/) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](/reference-manual/llvm/Compiling/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-*  [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.2 compatible
-*  [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-*  [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to GraalVM.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-community/macos.md b/docs/getting-started/graalvm-community/macos.md
index 4828d64b6229..6ef34b5b7f57 100644
--- a/docs/getting-started/graalvm-community/macos.md
+++ b/docs/getting-started/graalvm-community/macos.md
@@ -66,20 +66,18 @@ The base distribution of GraalVM Community Edition for macOS includes OpenJDK wi
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](/reference-manual/native-image/) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](/reference-manual/llvm/Compiling/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-*  [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-*  [Ruby](/reference-manual/ruby/) -- Ruby 2.7.2 compatible
-*  [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-*  [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to GraalVM.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-community/windows.md b/docs/getting-started/graalvm-community/windows.md
index 75bd7134e958..b48ac12cfac7 100644
--- a/docs/getting-started/graalvm-community/windows.md
+++ b/docs/getting-started/graalvm-community/windows.md
@@ -39,16 +39,17 @@ To run GraalVM Community Edition based on OpenJDK 8u292 on a Windows platform, t
 
 ## Supported Functionalities
 
-The GraalVM Community distribution for Windows platforms includes OpenJDK with the GraalVM compiler enabled, the [GraalVM Updater](/reference-manual/graalvm-updater/) tool to install additional functionalities, the JavaScript runtime, and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
-Currently, the GraalVM environment on Windows can be extended with [Native Image](/reference-manual/native-image/), [Java on Trufle](/reference-manual/java-on-truffle/), WebAssembly, and Node.js support.
+The GraalVM Community distribution for Windows platforms includes OpenJDK with the GraalVM compiler enabled, the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool to install additional functionalities, the JavaScript runtime, and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
+Currently, the GraalVM environment on Windows can be extended with [Native Image](../../reference-manual/native-image/README.md), [Java on Trufle](../../reference-manual/java-on-truffle/README.md), WebAssembly, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
-To make use of Native Image on Windows, observe the following recommendations.
-The required Microsoft Visual C++ (MSVC) version depends on the JDK version that GraalVM is based on.
-For GraalVM based on JDK 8, you will need MSVC 2010 SP1 version. The recommended installation method is using Microsoft Windows SDK 7.1:
-1. Download the SDK file `GRMSDKX_EN_DVD.iso` for from [Microsoft](https://www.microsoft.com/en-gb/download).
-2. Mount the image by opening `F:\Setup\SDKSetup.exe` directly.
+On Windows, Native Image requires Visual Studio Code and Microsoft Visual C++(MSVC).
+You can use Visual Studio 2017 version 15.9 or later.
+There are two installation options:
+- Install the Visual Studio Code Build Tools with the Windows 10 SDK
+- Install Visual Studio Code with the Windows 10 SDK
 
-For GraalVM distribution based on JDK 11, you will need MSVC 2017 15.5.5 or later version.
+The last prerequisite is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/).
+On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
 
-The last prerequisite, common for both distributions, is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/). On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
+Step by step instructions on installing Visual Studio Build Tools and Windows 10 SDK, and starting using Native Image can be found [here](https://medium.com/graalvm/using-graalvm-and-native-image-on-windows-10-9954dc071311).
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index 24c251a1b064..d6e8179693a8 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -8,10 +8,10 @@ permalink: /getting-started/
 Here you will find information about downloading and installing GraalVM Enterprise, running basic applications with it, and adding support for its accompanying features.
 Further, you will learn about the polyglot capabilities of GraalVM Enterprise and see how to build platform-specific native executables of JVM-based applications.
 
-If you are new to GraalVM Enterprise or have little experience using it, we recommend starting with the [GraalVM Enterprise Overview](https://docs.oracle.com/en/graalvm/enterprise/21/docs/overview/architecture/) page.
+If you are new to GraalVM Enterprise or have little experience using it, we recommend starting with the [GraalVM Enterprise Overview](../../enterprise-overview/architecture-overview.md) page.
 There you will find information about GraalVM Enterprise's architecture, the distributions available, supported platforms, licensing and support, core and additional features, and much more.
 
-If you have GraalVM Enterprise already installed and have experience using it, you can skip this getting started guide and proceed to the in-depth [Reference Manuals](/reference-manual/).
+If you have GraalVM Enterprise already installed and have experience using it, you can skip this getting started guide and proceed to the in-depth [Reference Manuals](../../reference-manual/reference-manuals.md).
 
 ## Download GraalVM Enterprise
 
@@ -25,11 +25,11 @@ You can get Oracle GraalVM Enterprise Edition by:
 Getting GraalVM Enterprise installed and ready-to-go should take a few minutes.
 Choose your operating system and proceed to the installation steps for your specific platform:
 
-* [Linux](/getting-started/installation-linux/)
-* [Linux ARM64](/getting-started/installation-linux-aarch64/)
-* [Oracle Linux](/getting-started/oci/compute-instances/)
-* [macOS](/getting-started/installation-macos/)
-* [Windows](/getting-started/installation-windows/)
+* [Linux](installation-linux.md)
+* [Linux ARM64](installation-linux-aarch64.md)
+* [Oracle Linux](oci/compute-instances.md)
+* [macOS](installation-macos.md)
+* [Windows](installation-windows.md)
 
 ## Start Running Applications
 
@@ -78,9 +78,9 @@ java HelloWorld
 Hello World!
 ```
 
-You can find a collection of larger Java examples on the [Examples Applications](/examples/) page.
-For more information on the GraalVM compiler, go to [Compiler](/reference-manual/compiler/).
-For more extensive documentation on running Java, proceed to [JVM Languages](/reference-manual/java/).
+You can find a collection of larger Java examples on the [Examples Applications](../../examples/examples.md) page.
+For more information on the GraalVM compiler, go to [Compiler](../../reference-manual/compiler.md).
+For more extensive documentation on running Java, proceed to [JVM Languages](../../reference-manual/java/README.md).
 
 ### JavaScript and Node.js
 GraalVM Enterprise can execute plain JavaScript code, both in REPL mode and by executing script files directly:
@@ -95,7 +95,7 @@ Node.js support is not installed by default, but can be easily added with GraalV
 ```shell
 gu install nodejs
 node -v
-v15.12.0
+v14.17.6
 ```
 
 More than 100,000 npm packages are regularly tested and are compatible with GraalVM Enterprise, including modules like express, react, async, request, browserify, grunt, mocha, and underscore.
@@ -127,7 +127,7 @@ Run _app.js_ on GraalVM Enterprise using the `node` command:
 node app.js
 ```
 
-For more detailed documentation and information on compatibility with Node.js, proceed to [JavaScript and Node.js](/reference-manual/js/).
+For more detailed documentation and information on compatibility with Node.js, proceed to [JavaScript and Node.js](../../reference-manual/js/README.md).
 
 ### LLVM Languages
 
@@ -161,12 +161,12 @@ $LLVM_TOOLCHAIN/clang hello.c -o hello
 lli hello
 ```
 
-For in-depth documentation and more examples of running LLVM bitcode on GraalVM Enterprise, go to [LLVM Languages](/reference-manual/llvm/).
+For in-depth documentation and more examples of running LLVM bitcode on GraalVM Enterprise, go to [LLVM Languages](../../reference-manual/llvm/README.md).
 
 ### Python
 
 With GraalVM Enterprise you can run Python applications in the Python 3 runtime environment.
-The support is not available by default, but you can quickly add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The support is not available by default, but you can quickly add it to GraalVM using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install python
 ```
@@ -180,12 +180,12 @@ graalpython
 >>> exit()
 ```
 
-More examples and additional information on Python support in GraalVM can be found in the [Python reference manual](/reference-manual/python/).
+More examples and additional information on Python support in GraalVM can be found in the [Python reference manual](../../reference-manual/python/README.md).
 
 ### Ruby
 
 GraalVM Enterprise provides a high-performance Ruby runtime environment including the `gem` command that allows you to interact with RubyGems, Ruby Bundler, and much more.
-The Ruby runtime is not available by default in GraalVM, but can be easily added using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The Ruby runtime is not available by default in GraalVM, but can be easily added using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install ruby
 ```
@@ -196,7 +196,7 @@ ruby [options] program.rb
 ```
 
 GraalVM Ruby runtime environment uses the
-[same options as the standard implementation of Ruby](/reference-manual/ruby/Options/),
+[same options as the standard implementation of Ruby](../../reference-manual/ruby/Options.md),
 with some additions. For example:
 ```shell
 gem install chunky_png
@@ -204,12 +204,12 @@ ruby -r chunky_png -e "puts ChunkyPNG::Color.to_hex(ChunkyPNG::Color('mintcream
 #f5fffa80
 ```
 
-More examples and in-depth documentation can be found in the [Ruby reference manual](/reference-manual/ruby/).
+More examples and in-depth documentation can be found in the [Ruby reference manual](../../reference-manual/ruby/README.md).
 
 ### R
 
 GraalVM Enterprise provides a GNU-compatible environment to run R programs directly or in the REPL mode.
-Although the R language support is not available by default, you can add it to GraalVM Enterprise using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+Although the R language support is not available by default, you can add it to GraalVM Enterprise using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install R
 ```
@@ -224,12 +224,12 @@ R version 4.0.3 (FastR)
 [1] 2
 ```
 
-More examples and in-depth documentation can be found in the [R reference manual](/reference-manual/r/).
+More examples and in-depth documentation can be found in the [R reference manual](../../reference-manual/r/README.md).
 
 ### WebAssembly
 
 With GraalVM Enterprise you can run programs compiled to WebAssembly.
-The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install wasm
 ```
@@ -264,12 +264,12 @@ Then you can run the compiled WebAssembly binary on GraalVM as follows:
 wasm --Builtins=wasi_snapshot_preview1 floyd.wasm
 ```
 
-More details can be found in the [WebAssembly reference manual](/reference-manual/wasm/).
+More details can be found in the [WebAssembly reference manual](../../reference-manual/wasm/README.md).
 
 ## Native Images
 
 With GraalVM Enterprise you can compile Java bytecode into a platform-specific, self-contained, native executable - a native image - to achieve faster startup and a smaller footprint for your application.
-The [Native Image](/reference-manual/native-image/) functionality is not available by default, but can be easily installed with the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The [Native Image](../../reference-manual/native-image/README.md) functionality is not available by default, but can be easily installed with the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
 ```shell
 gu install native-image
 ```
@@ -284,7 +284,7 @@ public class HelloWorld {
 }
 ```
 
-> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](/reference-manual/native-image/#prerequisites).
+> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md/#prerequisites).
 
 Compile _HelloWorld.java_ to bytecode and then build a native image:
 ```shell
@@ -299,7 +299,7 @@ Invoking it executes the natively compiled code of the `HelloWorld` class as fol
 Hello, World!
 ```
 
-More detailed documentation on this innovative technology is available in the [Native Image reference manual](/reference-manual/native-image/).
+More detailed documentation on this innovative technology is available in the [Native Image reference manual](../../reference-manual/native-image/README.md).
 
 ## Polyglot Capabilities of Native Images
 
@@ -335,7 +335,7 @@ native-image --language:js --initialize-at-build-time PrettyPrintJSON
 
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
 Additionally, the image building requires large amounts of physical memory, especially if you build an image with
-the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) included, which is the case here.
+the [Truffle language implementation framework](../../graalvm-as-a-platform/graalvm-as-a-platform.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 
@@ -388,24 +388,24 @@ To enable interoperability, GraalVM Enterprise provides the `--polyglot` flag.
 
 For example, running `js --jvm --polyglot example.js` executes `example.js` in a polyglot context.
 If the program calls any code in other supported languages, GraalVM Enterprise executes that code in the same runtime as the `example.js` application.
-For more information on running polyglot applications, see [Polyglot Programming](/reference-manual/polyglot-programming/).
+For more information on running polyglot applications, see [Polyglot Programming](../../reference-manual/polyglot-programming.md).
 
 ## What to Read Next
 
 ### New Users
 Since this guide is intended mainly for users new to GraalVM Enterprise, or users
-who are familiar with GraalVM Enterprise but may have little experience using it, consider investigating more complex [Example Applications](/examples/).
+who are familiar with GraalVM Enterprise but may have little experience using it, consider investigating more complex [Example Applications](../../examples/examples.md).
 
 ### Oracle Cloud Users
 Oracle Cloud users considering GraalVM Enterprise for their cloud workloads are
-invited to read [GraalVM Enterprise on OCI](/getting-started/oci/compute-instances/).
+invited to read [GraalVM Enterprise on OCI](oci/compute-instances.md).
 This page focuses on using GraalVM Enterprise with the Oracle Cloud Infrastructure Virtual Machine compute instance.
 
 ### Advanced Users
-If you are mostly interested in GraalVM Enterprise support for a specific language, or want more in-depth details about GraalVM Enterprise's diverse features, proceed to [Reference Manuals](/reference-manual/).
+If you are mostly interested in GraalVM Enterprise support for a specific language, or want more in-depth details about GraalVM Enterprise's diverse features, proceed to [Reference Manuals](../../reference-manual/reference-manuals.md).
 
-If you are looking for the tooling support GraalVM Enterprise offers, proceed to [Debugging and Monitoring Tools](/tools/).
+If you are looking for the tooling support GraalVM Enterprise offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](/graalvm-as-a-platform/).
+If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](../../graalvm-as-a-platform/graalvm-as-a-platform.md).
 
 You can find information on GraalVM Enterprise's security model in the [Security Guide](/security-guide/), and rich API documentation in [GraalVM SDK Javadoc](https://docs.oracle.com/en/graalvm/enterprise/21/sdk/index.html).
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
index 320ef5e8a66d..4f486a86bc16 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
@@ -14,7 +14,7 @@ You can install the GraalVM distribution for Linux ARM64 systems from an archive
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html?selected_tab=21).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **11** or **16** for the Java version, **Linux** for the operating system, and **aarch64** for the architecture.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **11** or **17** for the Java version, **Linux** for the operating system, and **aarch64** for the architecture.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java11-linux-aarch64-<version>.tar.gz**.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.tar.gz_ archive to it.
@@ -37,6 +37,6 @@ Optionally, you can specify GraalVM Enterprise as the default JRE or JDK install
 
 ## Supported Functionalities
 
-The 64-bit GraalVM Enterprise distribution for Linux platforms includes Oracle JDK with the GraalVM compiler enabled, the [GraalVM Updater, `gu`](/reference-manual/graalvm-updater/) tool, the JavaScript runtime, and some developer tools (e.g., Chrome inspector based debugger, Visual VM).
-Support for [Native Image](/reference-manual/native-image/), Node.js, LLVM and WebAssembly runtimes can be installed with `gu`.
+The 64-bit GraalVM Enterprise distribution for Linux platforms includes Oracle JDK with the GraalVM compiler enabled, the [GraalVM Updater, `gu`](../../reference-manual/graalvm-updater.md) tool, the JavaScript runtime, and some developer tools (e.g., Chrome inspector based debugger, Visual VM).
+Support for [Native Image](../../reference-manual/native-image/README.md), Node.js, LLVM and WebAssembly runtimes can be installed with `gu`.
 Runtimes for Python, FastR, and Ruby languages are not available in this distribution yet.
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux.md b/docs/getting-started/graalvm-enterprise/installation-linux.md
index 84c9c4e1a3a2..56fda647c330 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux.md
@@ -8,7 +8,7 @@ permalink: /getting-started/installation-linux/
 Follow these steps to install Oracle GraalVM Enterprise Edition on the Linux operating system:
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html?selected_tab=21).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, **Linux** for the operating system, and **amd64** for the architecture.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, **Linux** for the operating system, and **amd64** for the architecture.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java<version>-linux-amd64-<version>.tar.gz**.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.tar.gz_ archive to it.
@@ -35,20 +35,18 @@ The base distribution of GraalVM Enterprise for Linux (AMD64) platforms includes
 The base installation can be extended with:
 
 Tools/Utilities:
-* [Native Image](/reference-manual/enterprise-native-image/) -- a technology to compile an application ahead-of-time into a native executable
-* [LLVM toolchain](/reference-manual/llvm/) -- a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM Enterprise
-* [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM Enterprise
+*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-* [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
-* [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-* [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
-To assist a user with installation, GraalVM Enterprise includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-enterprise/installation-macos.md b/docs/getting-started/graalvm-enterprise/installation-macos.md
index 086dc63feb9d..2484107b3f84 100644
--- a/docs/getting-started/graalvm-enterprise/installation-macos.md
+++ b/docs/getting-started/graalvm-enterprise/installation-macos.md
@@ -17,7 +17,7 @@ the JDK installation path is:
 Follow these steps to install Oracle GraalVM Enterprise Edition on the macOS operating system:
 
 1. Navigate to[ Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, and **macOS** for the operating system.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, and **macOS** for the operating system.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading **graalvm-ee-java<version>-darvin-amd64-<version>.tar.gz**.
 5. Unzip the archive:
@@ -66,20 +66,18 @@ The base distribution of GraalVM Enterprise for macOS platforms includes Oracle
 The base installation can be extended with:
 
 Tools/Utilities:
-* [Native Image](/reference-manual/native-image/) -- a technology to compile an application ahead-of-time into a native executable
-* [LLVM toolchain](/reference-manual/llvm/) -- a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM Enterprise
-* [Java on Truffle](/reference-manual/java-on-truffle/) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM Enterprise
+*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-* [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
-* [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-* [Wasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
-To assist users with installation, GraalVM Enterprise includes
-**GraalVM Updater**, a command line utility to install and manage additional
-functionalities. Proceed to the [installation steps](/reference-manual/graalvm-updater/#component-installation){:target="_blank"}
-to add any necessary language runtime or utility from above to the GraalVM Enterprise core.
+To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-enterprise/installation-windows.md b/docs/getting-started/graalvm-enterprise/installation-windows.md
index 0807a4a50643..78d933cbe076 100644
--- a/docs/getting-started/graalvm-enterprise/installation-windows.md
+++ b/docs/getting-started/graalvm-enterprise/installation-windows.md
@@ -9,7 +9,7 @@ You can install Oracle GraalVM Enterprise Edition on the Windows operating syste
 Follow these steps:
 
 1. Navigate to [Oracle GraalVM Downloads](https://www.oracle.com/downloads/graalvm-downloads.html).
-2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **16** for the Java version, and **Windows** for the operating system.
+2. Select the preferable GraalVM Enterprise version in the Release Version dropdown, **8**, **11**, or **17** for the Java version, and **Windows** for the operating system.
 3. Click on the **GraalVM Enterprise Core** download link. Before you download a file, you must accept the [Oracle License Agreement](https://www.oracle.com/downloads/licenses/graalvm-otn-license.html) in the popup window.
 4. When the download button becomes active, press it to start downloading graalvm-ee-java<version>-windows-amd64-<version>.zip.
 5. Change the directory to the location where you want to install GraalVM Enterprise, then move the _.zip_ archive to it.
@@ -36,18 +36,17 @@ Optionally, you can specify GraalVM Enterprise as the JRE or JDK installation in
 
 ## Supported Functionalities
 
-The GraalVM Enterprise distribution for Windows platforms includes Oracle JDK with the GraalVM compiler enabled, the [GraalVM Updater](/reference-manual/graalvm-updater/) tool, the JavaScript runtime, and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
-Currently, the GraalVM Enterprise environment on Windows can be extended with [Native Image](/reference-manual/native-image/), [Java on Trufle](/reference-manual/java-on-truffle/), WebAssembly, and Node.js support.
+The GraalVM Enterprise distribution for Windows platforms includes Oracle JDK with the GraalVM compiler enabled, the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool, the JavaScript runtime, and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
+Currently, the GraalVM Enterprise environment on Windows can be extended with [Native Image](../../reference-manual/native-image/README.md), [Java on Trufle](../../reference-manual/java-on-truffle/README.md), WebAssembly, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
-To make use of Native Image on Windows, observe the following recommendations. The
-required Microsoft Visual C++ (MSVC) version depends on the JDK version that
-GraalVM is based on. For GraalVM Enterprise distribution based on JDK 8, you will need MSVC
-2010 SP1 version. The recommended installation method is using Microsoft Windows
-SDK 7.1:
-1. Download the SDK file `GRMSDKX_EN_DVD.iso` for from [Microsoft](https://www.microsoft.com/en-gb/download).
-2. Mount the image by opening `F:\Setup\SDKSetup.exe` directly.
+On Windows, Native Image requires Visual Studio Code and Microsoft Visual C++(MSVC).
+You can use Visual Studio 2017 version 15.9 or later.
+There are two installation options:
+- Install the Visual Studio Code Build Tools with the Windows 10 SDK
+- Install Visual Studio Code with the Windows 10 SDK
 
-For GraalVM Enterprise distribution based on JDK 11, you will need MSVC 2017 15.5.5 or later version.
+The last prerequisite is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/).
+On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
 
-The last prerequisite, common for both distributions, is the proper [Developer Command Prompt](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019#developer_command_prompt_shortcuts) for your version of [Visual Studio](https://visualstudio.microsoft.com/vs/). On Windows the `native-image` tool only works when it is executed from the **x64 Native Tools Command Prompt**.
+Step by step instructions on installing Visual Studio Build Tools and Windows 10 SDK, and starting using Native Image can be found [here](https://medium.com/graalvm/using-graalvm-and-native-image-on-windows-10-9954dc071311).
diff --git a/docs/getting-started/graalvm-enterprise/oci/compute-instances.md b/docs/getting-started/graalvm-enterprise/oci/compute-instances.md
index 341a50daaa77..221d231b9537 100644
--- a/docs/getting-started/graalvm-enterprise/oci/compute-instances.md
+++ b/docs/getting-started/graalvm-enterprise/oci/compute-instances.md
@@ -79,7 +79,7 @@ Now you have a ready-to-go VM instance with GraalVM Enterprise installed and rea
    ```
 
 2. Look up the necessary RPM package name and add it to GraalVM Enterprise with the `yum install <package_name> command` command.
-For example, to install [Native Image](/reference-manual/native-image/), which is a technology to ahead-of-time compile Java code to a standalone native executable, run this command:
+For example, to install [Native Image](../../../reference-manual/native-image/README.md), which is a technology to ahead-of-time compile Java code to a standalone native executable, run this command:
 
    ```shell
    sudo yum install graalvm21-ee-11-native-image

From f55661d696c912d1fec4fdd0fe8929bf29865493 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 22:50:34 +0300
Subject: [PATCH 388/681] Follow up

---
 .../graalvm-community/get-started-graalvm-community.md         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index 71f41f11f9dd..805fb85c7929 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -123,8 +123,7 @@ Run _app.js_ on GraalVM Enterprise using the `node` command:
 node app.js
 ```
 
-For more detailed documentation and information on compatibility with Node.js,
-proceed to [JavaScript and Node.js](../../reference-manual/js/README.md).
+For more detailed documentation and information on compatibility with Node.js, proceed to [JavaScript and Node.js](../../reference-manual/js/README.md).
 
 ## Run LLVM Languages
 

From 26487183fc2471520b0483812cc97de802aaf6c6 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 23:18:05 +0300
Subject: [PATCH 389/681] Proofread and update links in
 docs/graalvm-as-a-platform

---
 .../architecture-overview.md                  |   6 +-
 .../get-started-graalvm-community.md          |   4 +-
 .../get-started-graalvm-enterprise.md         |   4 +-
 .../graalvm-as-a-platform.md                  |   8 +-
 .../implement-instrument.md                   | 103 +++++++++---------
 .../implement-language.md                     |  90 +++++----------
 6 files changed, 93 insertions(+), 122 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index dc47810edac4..6c5e3999851e 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -31,7 +31,7 @@ The preceding diagram illustrates a complete high-level architecture of GraalVM
 
 GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](../reference-manual/compiler.md), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../graalvm-as-a-platform/graalvm-as-a-platform.md), makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../graalvm-as-a-platform/truffle/README.md), makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes
@@ -42,7 +42,7 @@ GraalVM Enterprise is unique as a runtime environment offering several modes of
 When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](../reference-manual/compiler.md) as the top-tier JIT compiler.
 At runtime, an application is loaded and executed normally on the JVM.
 The JVM passes bytecodes for Java or any other JVM-native language to the compiler, which compiles that to the machine code and returns it to the JVM.
-Interpreters for supported languages, written on top of the [Truffle framework](../graalvm-as-a-platform/graalvm-as-a-platform.md), are themselves Java programs that run on the JVM.
+Interpreters for supported languages, written on top of the [Truffle framework](../graalvm-as-a-platform/truffle/README.md), are themselves Java programs that run on the JVM.
 
 #### Native Image
 [Native Image](../reference-manual/native-image/README.md) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
@@ -50,7 +50,7 @@ The Java bytecode that is processed during the native image build includes all a
 A generated self-contained native executable is specific to each individual operating systems and machine architecture that does not require a JVM.
 
 #### Java on Truffle
-[Java on Truffle](../reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle framework](../graalvm-as-a-platform/graalvm-as-a-platform.md).
+[Java on Truffle](../reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle framework](../graalvm-as-a-platform/truffle/README.md).
 It is a complete Java VM that includes all core components, implements the same API as the Java Runtime Environment library, and reuses all JARs and native libraries from GraalVM.
 Java on Trufle is an experimental technology in GraalVM, available as of version 21.0.0.
 
diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index 805fb85c7929..ad0c41664ff9 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -335,7 +335,7 @@ javac PrettyPrintJSON.java
 native-image --language:js --initialize-at-build-time PrettyPrintJSON
 ```
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
-Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](../../graalvm-as-a-platform/graalvm-as-a-platform.md) included, which is the case here.
+Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 ```shell
@@ -391,6 +391,6 @@ If you are mostly interested in GraalVM support for a specific language, or want
 
 If you are looking for the tooling support GraalVM offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](../../graalvm-as-a-platform/graalvm-as-a-platform.md).
+If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](../../graalvm-as-a-platform/truffle/README.md).
 
 You can find information on GraalVM's security model in the [Security Guide](../../security/security-guide.md), and rich API documentation in [GraalVM SDK Javadoc](https://www.graalvm.org/sdk/javadoc/) and [Truffle Javadoc](https://www.graalvm.org/truffle/javadoc/).
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index d6e8179693a8..4a1c4c755809 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -335,7 +335,7 @@ native-image --language:js --initialize-at-build-time PrettyPrintJSON
 
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
 Additionally, the image building requires large amounts of physical memory, especially if you build an image with
-the [Truffle language implementation framework](../../graalvm-as-a-platform/graalvm-as-a-platform.md) included, which is the case here.
+the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 
@@ -406,6 +406,6 @@ If you are mostly interested in GraalVM Enterprise support for a specific langua
 
 If you are looking for the tooling support GraalVM Enterprise offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](../../graalvm-as-a-platform/graalvm-as-a-platform.md).
+If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](../../graalvm-as-a-platform/truffle/README.md).
 
 You can find information on GraalVM Enterprise's security model in the [Security Guide](/security-guide/), and rich API documentation in [GraalVM SDK Javadoc](https://docs.oracle.com/en/graalvm/enterprise/21/sdk/index.html).
diff --git a/docs/graalvm-as-a-platform/graalvm-as-a-platform.md b/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
index 10e957fb8e01..f5cd20a924a5 100644
--- a/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
+++ b/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
@@ -8,21 +8,21 @@ toc_group: graalvm-as-a-platform
 
 # GraalVM as a Platform
 
-GraalVM is an open ecosystem and allows users to implement a custom language or tool on top of it with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) which offers APIs for writing interpreters for programming languages in the form of Java programs.
+GraalVM is an open ecosystem and allows users to implement a custom language or tool on top of it with the [Truffle language implementation framework](truffle/README.md) which offers APIs for writing interpreters for programming languages in the form of Java programs.
 
 GraalVM loads and runs the Truffle framework, which itself is a Java program -- a collection of JAR files -- together with interpreters.
 These get optimized at runtime into efficient machine code for executing loaded programs.
 
-Learn more about this framework from its [reference documentation](/graalvm-as-a-platform/language-implementation-framework/).
+Learn more about this framework from its [reference documentation](truffle/README.md).
 
 ## Implement Your Language
 
 With the [Language API](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/package-summary.html) offered by the Truffle framework, you can implement a language interpreter on top of GraalVM.
 
-To get started, proceed to [Implement Your Language](/graalvm-as-a-platform/implement-language/).
+To get started, proceed to [Implement Your Language](implement-language.md).
 
 ## Implement Your Tool
 
 With the [Instrument API](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/package-summary.html) offered by the Truffle framework, you can create language-agnostic tools like debuggers, profilers, or other instruments on top of GraalVM.
 
-To get started, proceed to [Implement Your Tool](/graalvm-as-a-platform/implement-instrument/).
+To get started, proceed to [Implement Your Tool](implement-instrument.md).
diff --git a/docs/graalvm-as-a-platform/implement-instrument.md b/docs/graalvm-as-a-platform/implement-instrument.md
index 1a2eb62b6290..697d245a9f83 100644
--- a/docs/graalvm-as-a-platform/implement-instrument.md
+++ b/docs/graalvm-as-a-platform/implement-instrument.md
@@ -14,22 +14,18 @@ Instruments can track very fine-grained, VM-level runtime events to profile, ins
 
 ## Simple Tool
 
-To provide an easier starting point for tool developers we have created a
-[Simple Tool](https://github.com/graalvm/simpletool) example project. This is a
-javadoc-rich Maven project which implements a simple code coverage tool.
+To provide an easier starting point for tool developers we have created a [Simple Tool](https://github.com/graalvm/simpletool) example project.
+This is a javadoc-rich Maven project which implements a simple code coverage tool.
 
-We recommend cloning the repository and exploring the source code as a starting
-point for tool development. The following sections will provide a guided tour of
-the steps needed to build and run a GraalVM tool, using Simple Tool source code
-as the running example. These sections do not cover all of the features of the
-[Instrument API](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/package-summary.html) so we encourage you to check the javadoc for more details.
+We recommend cloning the repository and exploring the source code as a starting point for tool development.
+The following sections will provide a guided tour of the steps needed to build and run a GraalVM tool, using Simple Tool source code as the running example.
+These sections do not cover all of the features of the [Instrument API](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/package-summary.html) so we encourage you to check the javadoc for more details.
 
 ### Requirements
 
-As mentioned before, Simple Tool is a code coverage tool. Ultimately, it
-should provide the developer with information on what percentage of source code
-lines was executed, as well as exactly which lines were executed. With that in
-mind, we can define some high-level requirements from our tool:
+As mentioned before, Simple Tool is a code coverage tool.
+Ultimately, it should provide the developer with information on what percentage of source code lines was executed, as well as exactly which lines were executed.
+With that in mind, we can define some high-level requirements from our tool:
 
 1. The tool keeps track of loaded source code.
 2. The tool keeps track of executed source code.
@@ -40,14 +36,10 @@ mind, we can define some high-level requirements from our tool:
 The main starting point for tools is subclassing the [TruffleInstrument](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.html) class.
 Unsurprisingly, the simple tool code base does exactly this, creating the [SimpleCoverageInstrument](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L84) class.
 
-The
-[Registration](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.Registration.html)
-annotation on the class ensures that the newly created instrument is registered
-with the Instrument API, i.e., that it will be automatically
-discovered by the framework. It also provides some metadata about the
-instrument: ID, name, version, which services the instrument provides, and
-whether the instrument is internal or not. In order for this annotation to be
-effective the DSL processor needs to process this class. This is, in the case of Simple Tool, done automatically by having the DSL processor as a dependency in the [Maven configuration](https://github.com/graalvm/simpletool/blob/master/pom.xml#L83).
+The [Registration](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/TruffleInstrument.Registration.html) annotation on the class ensures that the newly created instrument is registered with the Instrument API, i.e., that it will be automatically discovered by the framework.
+It also provides some metadata about the instrument: ID, name, version, which services the instrument provides, and whether the instrument is internal or not.
+In order for this annotation to be effective the DSL processor needs to process this class.
+This is, in the case of Simple Tool, done automatically by having the DSL processor as a dependency in the [Maven configuration](https://github.com/graalvm/simpletool/blob/master/pom.xml#L83).
 
 Now we will look back at the implementation of the `SimpleCoverageInstrument` class, namely which methods from `TruffleInstrument` it overrides.
 These are [onCreate](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L130), [onDispose](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L182), and [getOptionDescriptors](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L245).
@@ -68,6 +60,7 @@ Similarly, in the `onDispose` method we check the options for the state of the `
 
 What does it mean "to enable a tool?"
 In general, it means that we tell the framework about the events we are interested in and how we want to react to them. Looking at our `enable` method, it does the following:
+
 - First, it defines [SourceSectionFilter](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/SourceSectionFilter.html).
 This filter is a declarative definition of the parts of the source code we are interested in.
 In our example, we care about all nodes that are considered expressions, and we do not care about internal language parts.
@@ -89,22 +82,14 @@ The instrument keeps a mapping from each `Source` to a [Coverage](https://github
 ### Execution Event Node
 
 Guest languages are implemented as Abstract Syntax Tree (AST) interpreters.
-The language implementers annotate certain nodes with tags, which allows us to
-select which nodes we are interested in, by using the aforementioned
-`SourceSectionFilter`, in a language-agnostic manner.
-
-The main power of the Instrument API lies in its ability to insert specialised
-nodes in the AST which "wrap" the nodes of interest. These nodes are built using
-the same infrastructure that the language developers use, and are, from the
-perspective of the runtime, indistinguishable from the language nodes. This
-means that all of the techniques used to optimize guest languages into such high
-performing language implementations are available to the tool developers as
-well.
+The language implementers annotate certain nodes with tags, which allows us to select which nodes we are interested in, by using the aforementioned `SourceSectionFilter`, in a language-agnostic manner.
+
+The main power of the Instrument API lies in its ability to insert specialised nodes in the AST which "wrap" the nodes of interest.
+These nodes are built using the same infrastructure that the language developers use, and are, from the perspective of the runtime, indistinguishable from the language nodes.
+This means that all of the techniques used to optimize guest languages into such high performing language implementations are available to the tool developers as well.
 
 More information about these techniques is available in the [language implementation documentation](https://github.com/oracle/graal/tree/master/truffle/docs).
-Suffice it to say that for Simple Tool to meet its second requirement, we need to
-instrument all expressions with our own node that will notify us when that
-expression is executed.
+Suffice it to say that for Simple Tool to meet its second requirement, we need to instrument all expressions with our own node that will notify us when that expression is executed.
 
 For this task we use the [CoverageNode](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/CoverageNode.java).
 It is a subclass of [ExecutionEventNode](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/ExecutionEventNode.html) which, as the name implies, is used to instrument events during execution.
@@ -113,16 +98,13 @@ This method is invoked when the "wrapped" node returns a value, i.e., is success
 The implementation is rather simple. We just notify the instrument that the node with this particular `SourceSection` has been executed, and the instrument updates the `Coverage` object in its coverage map.
 
 The instrument is notified only once per node, as the logic is guarded by the [flag](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/CoverageNode.java#L60).
-The fact that this flag is annotated with [CompilationFinal](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.CompilationFinal.html) and that the call to the instrument is preceded by a call to [transferToInterpreterAndInvalidate()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html#transferToInterpreterAndInvalidate--) is a standard technique in Truffle which ensures that once this instrumentation is no longer needed (i.e., a node has been executed), the instrumentation is removed from further compilations, along with any performance overhead.
+The fact that this flag is annotated with [CompilationFinal](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.CompilationFinal.html) and that the call to the instrument is preceded by a call to [transferToInterpreterAndInvalidate()](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html#transferToInterpreterAndInvalidate--) is a standard technique in Truffle, which ensures that once this instrumentation is no longer needed (i.e., a node has been executed), the instrumentation is removed from further compilations, along with any performance overhead.
 
-In order for the framework to know how to instantiate the `CoverageNode` when it
-is needed, we need to provide a factory for it.
+In order for the framework to know how to instantiate the `CoverageNode` when it is needed, we need to provide a factory for it.
 The factory is the [CoverageEventFactory](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/CoverageEventFactory.java), a subclass of [ExecutionEventNodeFactory](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/ExecutionEventNodeFactory.html).
 This class just ensures that each `CoverageNode` knows the `SourceSection` it is instrumenting by looking it up in the provided [EventContext](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/EventContext.html).
 
-Finally, when we are [enabling the instrument](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L173),
-we tell the instrumenter to use our factory to "wrap" the nodes selected by our
-filter.
+Finally, when we are [enabling the instrument](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L173), we tell the instrumenter to use our factory to "wrap" the nodes selected by our filter.
 
 ### Interaction Between Users and Instruments
 
@@ -146,7 +128,7 @@ As mentioned before, Simple Tool is a Maven project.
 Setting `JAVA_HOME` to a GraalVM installation and running `mvn package` produces a `target/simpletool-<version>.jar`.
 This is the Simple Tool distribution form.
 
-The [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) offers a clear separation between the language/tooling code and the application code.
+The [Truffle framework](truffle/README.md) offers a clear separation between the language/tooling code and the application code.
 For this reason, putting the JAR on the class path will not result in the framework realizing a new tool is needed.
 To achieve this we use `--vm.Dtruffle.class.path.append=/path/to/simpletool-<version>.jar` as is illustrated in a [launcher script for our simple tool](https://github.com/graalvm/simpletool/blob/master/simpletool).
 This script also shows we can [set the CLI options](https://github.com/graalvm/simpletool/blob/master/simpletool#L19) we specified for Simple Tool.
@@ -325,7 +307,10 @@ Execution event nodes can implement certain callback methods to intercept runtim
 2. `onReturnValue`: executed after a source code element returns a value.
 3. `onReturnExceptional`: executed in case the filtered source code element throws an exception.
 
-Execution event nodes are created on a _per code location_ basis. Therefore, they can be used to store data specific to a given source code location in the instrumented application. As an example, an instrumentation node can simply keep track of all code locations that have already been visited using a node-local flag. Such a node-local `boolean` flag can be used to track the execution of AST nodes in the following way:
+Execution event nodes are created on a _per code location_ basis.
+Therefore, they can be used to store data specific to a given source code location in the instrumented application.
+As an example, an instrumentation node can simply keep track of all code locations that have already been visited using a node-local flag.
+Such a node-local `boolean` flag can be used to track the execution of AST nodes in the following way:
 
 ```java
 // To keep track of all source code locations executed
@@ -349,10 +334,13 @@ public ExecutionEventNode create(final EventContext ec) {
 }
 ```
 
-As the above code shows, an `ExecutionEventNode` is a valid AST node. This implies that the instrumentation code will be optimized by the GraalVM runtime together with the instrumented application, resulting in minimal instrumentation overhead. Furthermore, this allows instrument developers to use the [Truffle framework compiler directives](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html) directly from instrumentation nodes. In the example, compiler directives are used to inform the GraalVM compiler that `visited` can be considered compilation-final.
+As the above code shows, an `ExecutionEventNode` is a valid AST node.
+This implies that the instrumentation code will be optimized by the GraalVM runtime together with the instrumented application, resulting in minimal instrumentation overhead. Furthermore, this allows instrument developers to use the [Truffle framework compiler directives](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/CompilerDirectives.html) directly from instrumentation nodes.
+In the example, compiler directives are used to inform the GraalVM compiler that `visited` can be considered compilation-final.
 
-Each instrumentation node is bound to a specific code location. Such locations can be accessed by the agent using the provided [`EventContext`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/EventContext.html) object.
-The context object gives instrumentation nodes access to a variety of information about the current AST nodes being executed. Examples of query APIs available to instrumentation agents through `EventContext` include:
+Each instrumentation node is bound to a specific code location.
+Such locations can be accessed by the agent using the provided [`EventContext`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/instrumentation/EventContext.html) object. The context object gives instrumentation nodes access to a variety of information about the current AST nodes being executed.
+Examples of query APIs available to instrumentation agents through `EventContext` include:
 
 1. `hasTag`: to query an instrumented node for a certain node `Tag` (e.g., to check if a statement node is also a conditional node).
 2. `getInstrumentedSourceSection`: to access the [`SourceSection`](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/source/SourceSection.html) associated with the current node.
@@ -376,7 +364,10 @@ SourceSectionFilter inputGeneratingLocations = SourceSectionFilter.newBuilder()
 instrumenter.attachExecutionEventFactory(sourceSectionFilter, inputGeneratingLocations, factory);
 ```
 
-The first source section filter (`sourceSectionFilter`, in the example) is a normal filter equivalent to other filters described before, and is used to identify the source code locations to be monitored. The second section filter, `inputGeneratingLocations`, is used by the agent to specify the _intermediate values_ that should be monitored for a certain source section. Intermediate values correspond to _all_ observable values that are involved in the execution of a monitored code element, and are reported to the instrumentation agent by means of the `onInputValue` callback. As an example, let us assume an agent needs to profile all _operand_ values provided to sum operations (i.e., `+`) in JavaScript:
+The first source section filter (`sourceSectionFilter`, in the example) is a normal filter equivalent to other filters described before, and is used to identify the source code locations to be monitored.
+The second section filter, `inputGeneratingLocations`, is used by the agent to specify the _intermediate values_ that should be monitored for a certain source section.
+Intermediate values correspond to _all_ observable values that are involved in the execution of a monitored code element, and are reported to the instrumentation agent by means of the `onInputValue` callback.
+As an example, let us assume an agent needs to profile all _operand_ values provided to sum operations (i.e., `+`) in JavaScript:
 
 ```javascript
 var a = 3;
@@ -421,13 +412,19 @@ onEnter - VariableWrite
 onReturnValue - VariableWrite
 ```
 
-The `onInputValue` method can be used in combination with source section filters to intercept very fine-grained execution events such as intermediate values used by language expressions. The intermediate values that are accessible to the Instrumentation framework greatly depend on the instrumentation support provided by each language. Moreover, languages may provide additional metadata associated with language-specific `Tag` classes.
+The `onInputValue` method can be used in combination with source section filters to intercept very fine-grained execution events such as intermediate values used by language expressions.
+The intermediate values that are accessible to the Instrumentation framework greatly depend on the instrumentation support provided by each language.
+Moreover, languages may provide additional metadata associated with language-specific `Tag` classes.
 
 ### Altering the Execution Flow of an Application
 
-The instrumentation capabilities that we have presented so far enable users to _observe_ certain aspects of a running application. In addition to passive monitoring of an application's behavior, the Instrument API features support for actively _altering_ the behavior of an application at runtime. Such capabilities can be used to write complex instrumentation agents that affect the behavior of a running application to achieve specific runtime semantics. For example, one could alter the semantics of a running application to ensure that certain methods or functions are never executed (e.g., by throwing an exception when they are called).
+The instrumentation capabilities that we have presented so far enable users to _observe_ certain aspects of a running application.
+In addition to passive monitoring of an application's behavior, the Instrument API features support for actively _altering_ the behavior of an application at runtime.
+Such capabilities can be used to write complex instrumentation agents that affect the behavior of a running application to achieve specific runtime semantics.
+For example, one could alter the semantics of a running application to ensure that certain methods or functions are never executed (e.g., by throwing an exception when they are called).
 
-Instrumentation agents with such capabilities can be implemented by leveraging the `onUnwind` callback in execution event listeners and factories. As an example, let's consider the following JavaScript code:
+Instrumentation agents with such capabilities can be implemented by leveraging the `onUnwind` callback in execution event listeners and factories.
+As an example, let's consider the following JavaScript code:
 
 ```javascript
 function inc(x) {
@@ -484,6 +481,10 @@ public static class UniversalAnswerInstrument extends TruffleInstrument {
 }
 ```
 
-When enabled, the instrument will execute its `onReturnValue` callback each time a function call returns. The callback reads the associated source section (using `getInstrumentedSourceSection`) and looks for a specific source code pattern (the function call `inc(c)`, in this case). As soon as such code pattern is found, the instrument throws a special runtime exception, called `UnwindException`, that instructs the Instrumentation framework about a change in the current application's execution flow. The exception is intercepted by the `onUnwind` callback of the instrumentation agent, which can be used to return _any_ arbitrary value to the original instrumented application.
+When enabled, the instrument will execute its `onReturnValue` callback each time a function call returns.
+The callback reads the associated source section (using `getInstrumentedSourceSection`) and looks for a specific source code pattern (the function call `inc(c)`, in this case).
+As soon as such code pattern is found, the instrument throws a special runtime exception, called `UnwindException`, that instructs the Instrumentation framework about a change in the current application's execution flow.
+The exception is intercepted by the `onUnwind` callback of the instrumentation agent, which can be used to return _any_ arbitrary value to the original instrumented application.
 
-In the example, all calls to `inc(c)` will return `42` regardless of any application-specific data. A more realistic instrument might access and monitor several aspects of an application, and might not rely on source code locations, but rather on object instances or other application-specific data.
+In the example, all calls to `inc(c)` will return `42` regardless of any application-specific data.
+A more realistic instrument might access and monitor several aspects of an application, and might not rely on source code locations, but rather on object instances or other application-specific data.
diff --git a/docs/graalvm-as-a-platform/implement-language.md b/docs/graalvm-as-a-platform/implement-language.md
index 28c182776fc9..de08b6962c7a 100644
--- a/docs/graalvm-as-a-platform/implement-language.md
+++ b/docs/graalvm-as-a-platform/implement-language.md
@@ -11,7 +11,7 @@ toc_group: graalvm-as-a-platform
 We have found that the easiest way to get started with implementing your own language is by extending an existing language such as SimpleLanguage.
 [SimpleLanguage](https://github.com/graalvm/simplelanguage) is a demonstration language built using the [Language API](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/package-summary.html).
 The SimpleLanguage project provides a showcase on how to use the Language APIs for writing your own language.
-It aims to use most of the available [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) (henceforth "Truffle") features, and documents their use extensively with inline source documentation.
+It aims to use most of the available [Truffle language implementation framework](truffle/README.md) (henceforth "Truffle") features, and documents their use extensively with inline source documentation.
 
 To start, ensure [Maven3](https://maven.apache.org/download.cgi) and GraalVM are available in your system.
 
@@ -29,12 +29,7 @@ For macOS, use:
 export JAVA_HOME=/path/to/graalvm/Contents/Home
 export PATH=/path/to/graalvm/Contents/Home/bin:$PATH
 ```
-4. Execute `mvn package` from the SimpleLanguage folder to build the language.
-The command also builds a `slnative` executable in the `simplelanguage/native`
-directory and a `sl-component.jar` language component which later can be installed
-into GraalVM using the [GraalVM Updater](../reference-manual/graalvm-updater.md) tool.
-Please verify ithat the `native-image` plugin is available in your GraalVM distribution
-to avoid build failure:
+4. Execute `mvn package` from the SimpleLanguage folder to build the language. The command also builds a `slnative` executable in the `simplelanguage/native` directory and a `sl-component.jar` language component which later can be installed into GraalVM using the [GraalVM Updater](../reference-manual/graalvm-updater.md) tool. Please verify ithat the `native-image` plugin is available in your GraalVM distribution to avoid build failure:
 ```shell
 gu list
 gu install native-image
@@ -53,7 +48,8 @@ The SimpleLanguage demonstration language is licensed under the [Universal Permi
 
 ## IDE Setup
 
-The [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) provides language-agnostic infrastructure to realize standard IDE features by providing additional APIs. If you would like to experiment with your language and get the benefits of an IDE, consider importing SimpleLanguage as an example.
+The [Truffle framework](truffle/README.md) provides language-agnostic infrastructure to realize standard IDE features by providing additional APIs.
+If you would like to experiment with your language and get the benefits of an IDE, consider importing SimpleLanguage as an example.
 
 ### Eclipse
 
@@ -117,13 +113,10 @@ gu -L install /path/to/sl-component.jar
 
 ## SimpleLanguage Native Image
 
-A language built with Truffle can be AOT compiled using [Native Image](../reference-manual/native-image/README.md). Running
-`mvn package` in the SimpleLanguage folder also builds a `slnative` executable
-in the `native` directory. This executable is the full SimpleLanguage
-implementation as a single native application, and has no need for GraalVM in
-order to execute SimpleLanguage code. Besides this, a big advantage of using the
-native executable when compared to running on GraalVM is the greatly faster
-startup time as shown bellow:
+A language built with Truffle can be AOT compiled using [Native Image](../reference-manual/native-image/README.md).
+Running `mvn package` in the SimpleLanguage folder also builds a `slnative` executable in the `native` directory.
+This executable is the full SimpleLanguage implementation as a single native application, and has no need for GraalVM in order to execute SimpleLanguage code.
+Besides this, a big advantage of using the native executable when compared to running on GraalVM is the greatly faster startup time as shown bellow:
 ```shell
 time ./sl language/tests/HelloWorld.sl
 == running on org.graalvm.polyglot.Engine@2db0f6b2
@@ -143,23 +136,17 @@ user    0m0.000s
 sys     0m0.000s
 ```
 
-This snipped shows a timed execution of a "Hello World" program using the `sl`
-launcher script, which runs SimpleLanguage on GraalVM, using Native
-Image. We can see that when running on GraalVM the execution takes 405ms. Since
-our SimpleLanguage program does just one print statement, we can conclude that
-almost all of this time is spent starting up GraalVM and initializing the
-language itself. When using the native executable we see that the execution takes
-only 4ms, showing two orders of magnitude faster startup than running on
-GraalVM.
+This snipped shows a timed execution of a "Hello World" program using the `sl` launcher script, which runs SimpleLanguage on GraalVM, using Native Image.
+We can see that when running on GraalVM the execution takes 405ms.
+Since our SimpleLanguage program does just one print statement, we can conclude that almost all of this time is spent starting up GraalVM and initializing the language itself.
+When using the native executable we see that the execution takes only 4ms, showing two orders of magnitude faster startup than running on GraalVM.
 
 For more information on the `native-image` tool consider reading the [reference manual](../reference-manual/native-image/README.md).
 
 ### Disable SimpleLanguage Native Image Build
 
-Building the native executable through Maven is attached to the Maven `package`
-phase. Since the native executable build can take a bit of time, we provide the
-option to skip this build by setting the `SL_BUILD_NATIVE` environment variable
-to `false` like so:
+Building the native executable through Maven is attached to the Maven `package` phase.
+Since the native executable build can take a bit of time, we provide the option to skip this build by setting the `SL_BUILD_NATIVE` environment variable to `false` like so:
 
 ```shell
 export SL_BUILD_NATIVE=false
@@ -180,8 +167,7 @@ Skipping the native image build because SL_BUILD_NATIVE is set to false.
 
 ## Run SimpleLanguage with the Newest Compiler 21.2.0
 
-In the outstanding case that you need to execute SimpleLanguage with the newest
-version of the GraalVM compiler, please follow these instructions:
+In the outstanding case that you need to execute SimpleLanguage with the newest version of the GraalVM compiler, please follow these instructions:
 
 1. Download the latest [JVMCI JDK 8](https://github.com/graalvm/graal-jvmci-8/releases/) and point JAVA_HOME at it:
 ```shell
@@ -215,16 +201,12 @@ mx -v --jdk=jvmci vm -cp /path/to/simplelanguage/launcher/target/launcher-21.2.0
 
 ## Run SimpleLanguage Using Command Line
 
-Executing SimpleLanguage code is normally done with the `sl` script which sets
-up the necessary command line depending on whether `JAVA_HOME` points to
-GraalVM or another JVM installation. The following subsections describe the
-command line for both cases.
+Executing SimpleLanguage code is normally done with the `sl` script which sets up the necessary command line depending on whether `JAVA_HOME` points to GraalVM or another JVM installation.
+The following subsections describe the command line for both cases.
 
 ### Run SimpleLanguage with GraalVM as JAVA_HOME
 
-Assuming `JAVA_HOME` points to the GraalVM installation and that the current
-working directory is the `simplelanguage` directory, to run SimpleLanguage one
-should execute the following command:
+Assuming `JAVA_HOME` points to the GraalVM installation and that the current working directory is the `simplelanguage` directory, to run SimpleLanguage one should execute the following command:
 
 ```shell
 $JAVA_HOME/bin/java \
@@ -233,25 +215,18 @@ $JAVA_HOME/bin/java \
     com.oracle.truffle.sl.launcher.SLMain language/tests/Add.sl
 ```
 
-In short, we place the launcher JAR on the class path and execute its main
-class, but we inform GraalVM of the presence of SimpleLanguage by using the
-`-Dtruffle.class.path.append` option and providing it the path to the fat
-language JAR. Having the language on a separate class path ensures a strong
-separation between the language implementation and its embedding context (in
-this case, the launcher).
+In short, we place the launcher JAR on the class path and execute its main class, but we inform GraalVM of the presence of SimpleLanguage by using the `-Dtruffle.class.path.append` option and providing it the path to the fat language JAR.
+Having the language on a separate class path ensures a strong separation between the language implementation and its embedding context (in this case, the launcher).
 
 #### Disable Class Path Separation
 
 *NOTE! This should only be used during development.*
 
-For development purposes it is useful to disable the class path separation and enable having the
-language implementation on the application class path (for example, for testing
+For development purposes it is useful to disable the class path separation and enable having the language implementation on the application class path (for example, for testing
 the internals of the language).
 
-For the GraalVM distribution based on JDK 8, you can add the `-XX:-UseJVMCIClassLoader`
-option. This disables the class path isolation, enabling the language
-implementation to be placed on the application class path. The command line can
-be as follows:
+For the GraalVM distribution based on JDK 8, you can add the `-XX:-UseJVMCIClassLoader` option.
+This disables the class path isolation, enabling the language implementation to be placed on the application class path. The command line can be as follows:
 
 ```shell
 $JAVA_HOME/bin/java \
@@ -260,11 +235,11 @@ $JAVA_HOME/bin/java \
     com.oracle.truffle.sl.launcher.SLMain language/tests/Add.sl
 ```
 
-For the JDK 11-based distribution of GraalVM, the `-XX:-UseJVMCIClassLoader` option
-is not valid. The Java Module System isolation is used. You can achieve the same behavior
-using `--add-exports` or `--upgrade-module-path`. The latter is preferable.
+For the JDK 11-based distribution of GraalVM, the `-XX:-UseJVMCIClassLoader` option is not valid.
+The Java Module System isolation is used. You can achieve the same behavior using `--add-exports` or `--upgrade-module-path`. The latter is preferable.
 
-The Language API JAR on Maven Central exports all API packages in its module-info. Apply the `--upgrade-module-path` option together with `-Dgraalvm.locatorDisabled=true` and this JAR to export Language API packages:
+The Language API JAR on Maven Central exports all API packages in its module-info.
+Apply the `--upgrade-module-path` option together with `-Dgraalvm.locatorDisabled=true` and this JAR to export Language API packages:
 ```shell
 -Dgraalvm.locatorDisabled=true --module-path=<yourModulePath>:${truffle.dir} --upgrade-module-path=${truffle.dir}/truffle-api.jar
 ```
@@ -273,15 +248,10 @@ A sample POM using `--upgrade-module-path` to export Language API packages can b
 
 ### Other JVM Implementations
 
-Unlike GraalVM, which includes all the dependencies needed to run a language
-implemented with [Truffle](/graalvm-as-a-platform/language-implementation-framework/), other JVM implementations need additional
-JARs to be present on the class path. These are the Language API and GraalVM SDK
-JARs available from Maven Central.
+Unlike GraalVM, which includes all the dependencies needed to run a language implemented with [Truffle](truffle/README.md), other JVM implementations need additional JARs to be present on the class path.
+These are the Language API and GraalVM SDK JARs available from Maven Central.
 
-Assuming `JAVA_HOME` points to a stock JDK installation, and that the current
-working directory is the `simplelanguage` directory and the Language API and
-GraalVM SDK JARs are present in that directory, one can execute SimpleLanguage
-with the following command:
+Assuming `JAVA_HOME` points to a stock JDK installation, and that the current working directory is the `simplelanguage` directory and the Language API and GraalVM SDK JARs are present in that directory, one can execute SimpleLanguage with the following command:
 
 ```shell
 $JAVA_HOME/bin/java \

From e8c31d61ffa086d028ca10aa05c5da6fa310c394 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 23:20:36 +0300
Subject: [PATCH 390/681] Proofread and update links in docs/guides

---
 docs/guides/guides.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guides/guides.md b/docs/guides/guides.md
index cddfe00d279a..ee499535af58 100644
--- a/docs/guides/guides.md
+++ b/docs/guides/guides.md
@@ -21,10 +21,10 @@ At runtime, an application is loaded and executed normally by the JVM.
 In order to follow the steps in this guide, you must have GraalVM installed.
 In case you do not have it installed, getting GraalVM  downloaded and ready-to-go should only take a few minutes.
 Choose your operating system and proceed to the installation steps:
-- [Linux](/docs/getting-started/linux/)
-- [Linux AArch64](/docs/getting-started/linux-aarch64/)
-- [macOS](/docs/getting-started/macos/)
-- [Windows](/docs/getting-started/windows/)
+- [Linux](../getting-started/graalvm-community/linux.md)
+- [Linux AArch64](../getting-started/graalvm-community/linux-aarch64.md)
+- [macOS](../getting-started/graalvm-community/macos.md)
+- [Windows](../getting-started/graalvm-community/windows.md)
 
 For the purpose of this guide, GraalVM Enterprise based on Java 11 distribution for macOS platform is used.
 To ensure you have successfully installed GraalVM, verify it is available in the `PATH` environment variable and the `JAVA_HOME` points to it.

From 9ea0d14a34b95af01907aba8f8e386c194d4e3bb Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 21 Sep 2021 23:29:17 +0300
Subject: [PATCH 391/681] Proofread and update links in docs/introduction.md

---
 docs/introduction.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/introduction.md b/docs/introduction.md
index 65ddeb55c202..bfa72daa728c 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -26,7 +26,7 @@ This page provides an architectural overview of GraalVM and its runtime modes, s
 
 GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](https://github.com/oracle/graal/tree/master/compiler), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, GraalVM's [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](graalvm-as-a-platform/truffle/README.md) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With GraalVM Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes
@@ -34,18 +34,18 @@ With GraalVM Truffle, Java and other supported languages can directly interopera
 GraalVM is unique as a runtime environment offering several modes of operation: JVM runtime mode, Native Image, Java on Truffle (the same Java applications can be run on either).
 
 #### JVM Runtime Mode
-When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](/reference-manual/compiler/) as the top-tier JIT compiler.
+When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](reference-manual/compiler.md) as the top-tier JIT compiler.
 At runtime, an application is loaded and executed normally on the JVM.
 The JVM passes bytecodes for Java or any other JVM-native language to the compiler, which compiles that to the machine code and returns it to the JVM.
-Interpreters for supported languages, written on top of the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/), are themselves Java programs that run on the JVM.
+Interpreters for supported languages, written on top of the [Truffle framework](graalvm-as-a-platform/truffle/README.md), are themselves Java programs that run on the JVM.
 
 #### Native Image
-[Native Image](/reference-manual/native-image/) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
+[Native Image](reference-manual/native-image/README.md) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
 The Java bytecode that is processed during the native image build includes all application classes, dependencies, third party dependent libraries, and any JDK classes that are required.
 A generated self-contained native executable is specific to each individual operating systems and machine architecture that does not require a JVM.
 
 #### Java on Truffle
-[Java on Truffle](/reference-manual/java-on-truffle/) is an implementation of the Java Virtual Machine Specification, built with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/).
+[Java on Truffle](reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle language implementation framework](graalvm-as-a-platform/truffle/README.md).
 It is a complete Java VM that includes all core components, implements the same API as the Java Runtime Environment library, and reuses all JARs and native libraries from GraalVM.
 Java on Trufle is an experimental technology in GraalVM, available as of version 21.0.0.
 
@@ -55,9 +55,9 @@ GraalVM is available as **GraalVM Enterprise** and **GraalVM Community** edition
 GraalVM Enterprise is based on Oracle JDK while GraalVM Community is based on OpenJDK.
 
 GraalVM is available for Linux, macOS, and Windows platforms on x86 64-bit systems, and for Linux on ARM 64-bit system.
-The GraalVM distribution based on Oracle JDK 16 is experimental with [several known limitations](/release-notes/known-issues/).
+The GraalVM distribution based on Oracle JDK 17 is experimental with [several known limitations](https://www.graalvm.org/release-notes/known-issues/).
 Depending on the platform, the distributions are shipped as *.tar.gz* or *.zip* archives.
-See the [Getting Started guide](/docs/getting-started/) for installation instructions.
+See the [Getting Started guide](getting-started/graalvm-community/get-started-graalvm-community.md) for installation instructions.
 
 ## Distribution Components List
 
@@ -77,24 +77,24 @@ The core components enable using GraalVM as a runtime platform for programs writ
 **Utilities**
 * JavaScript REPL with the JavaScript interpreter
 * `lli` tool to directly execute programs from LLVM bitcode
-* [GraalVM Updater](/reference-manual/graalvm-updater/) to install additional functionalities
+* [GraalVM Updater](reference-manual/graalvm-updater.md) to install additional functionalities
 
 ### Additional Components
 GraalVM core installation can be extended with more languages runtimes and utilities.
 
 Tools/Utilities:
 
-* [Native Image](/reference-manual/native-image/) -- a technology to compile an application ahead-of-time into a native executable.
-* [LLVM toolchain](/reference-manual/llvm/) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime.
-* [Java on Truffle](/reference-manual/java-on-truffle/) -- a JVM implementation built upon the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) to run Java via a Java bytecode interpreter.
+* [Native Image](reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable.
+* [LLVM toolchain](reference-manual/llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime.
+* [Java on Truffle](reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](graalvm-as-a-platform/truffle/README.md) to run Java via a Java bytecode interpreter.
 
 Runtimes:
 
-* [Node.js](/reference-manual/js/) -- the Node.js 14.16.1 runtime for JavaScript
-* [Python](/reference-manual/python/) -- Python 3.8.5 compatible
-* [Ruby](/reference-manual/ruby/) -- Ruby 2.7.3 compatible
-* [R](/reference-manual/r/) -- GNU R 4.0.3 compatible
-* [GraalWasm](/reference-manual/wasm/) -- WebAssembly (Wasm)
+* [Node.js](reference-manual/js/README.md) -- the Node.js 14.17.6 runtime for JavaScript
+* [Python](reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](reference-manual/ruby/README.md) -- Ruby 2.7.3 compatible
+* [R](reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [GraalWasm](reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 
 ## Licensing and Support
 
@@ -126,11 +126,11 @@ The following table lists production-ready and experimental features in GraalVM
 
 ## What to Read Next
 
-Whether you are new to GraalVM or have little experience using it, continue to [Get Started with GraalVM](/docs/getting-started/).
+Whether you are new to GraalVM or have little experience using it, continue to [Get Started with GraalVM](getting-started/graalvm-community/get-started-graalvm-community.md).
 Install GraalVM on your local machine, try running the examples provided in the guide, or test GraalVM with your workload.
-After that we suggest you to look at more complex [Examples Applications](/examples/).
+After that we suggest you to look at more complex [Examples Applications](examples/examples.md).
 
-Developers who have GraalVM already installed or have experience using, can skip the getting started guide and proceed to the [Reference Manuals](/reference-manual/) for in-depth coverage of GraalVM technologies.
+Developers who have GraalVM already installed or have experience using, can skip the getting started guide and proceed to the [Reference Manuals](reference-manual/reference-manuals.md) for in-depth coverage of GraalVM technologies.
 
 To start coding with the GraalVM Polyglot APIs, check out the [GraalVM SDK Java API Reference](http://www.graalvm.org/sdk/javadoc).
 

From 1439006547d9669a414160675992f1b826d6f5ab Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 23 Sep 2021 21:53:06 +0300
Subject: [PATCH 392/681] Proofread and update permalinks to rel paths in
 graal/docs/tools

---
 docs/tools/chrome-debugger.md        |  4 +-
 docs/tools/code-coverage.md          | 59 ++++++++------------
 docs/tools/dap.md                    |  4 +-
 docs/tools/graalvm-insight.md        | 58 +++++++++-----------
 docs/tools/ideal-graph-visualizer.md | 80 +++++++++++++---------------
 docs/tools/lsp.md                    | 12 ++---
 docs/tools/profiling.md              | 58 ++++++++------------
 docs/tools/visualvm.md               | 72 +++++++++++--------------
 docs/tools/vscode/graalvm/README.md  |  4 +-
 docs/tools/vscode/vscode.md          |  6 +--
 10 files changed, 152 insertions(+), 205 deletions(-)

diff --git a/docs/tools/chrome-debugger.md b/docs/tools/chrome-debugger.md
index 5d87871181d2..506e0ac7592d 100644
--- a/docs/tools/chrome-debugger.md
+++ b/docs/tools/chrome-debugger.md
@@ -8,9 +8,11 @@ redirect_from: /docs/tools/chrome-debugger/
 
 # Chrome Debugger
 
-GraalVM supports debugging of guest language applications and provides a built-in implementation of the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/). This allows you to attach compatible debuggers such as [Chrome Developer Tools](https://developers.google.com/web/tools/chrome-devtools/) to GraalVM.
+GraalVM supports debugging of guest language applications and provides a built-in implementation of the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/).
+This allows you to attach compatible debuggers such as [Chrome Developer Tools](https://developers.google.com/web/tools/chrome-devtools/) to GraalVM.
 
 To debug guest language applications, pass the `--inspect` option to the command line launcher, as in the following example with a Node.js _HelloWorld_ program:
+
 ```javascript
 var http = require('http');
 
diff --git a/docs/tools/code-coverage.md b/docs/tools/code-coverage.md
index 5367925cbe33..81d6ae8910ed 100644
--- a/docs/tools/code-coverage.md
+++ b/docs/tools/code-coverage.md
@@ -7,22 +7,15 @@ permalink: /tools/code-coverage/
 
 # Code Coverage Command Line Tool
 
-As of version 19.3.0, GraalVM provides a **code coverage command line tool**
-that lets users record and analyze the source code coverage of a particular execution
-of code.
+GraalVM provides a **code coverage command line tool** that lets users record and analyze the source code coverage of a particular execution of code.
 
-Code coverage, as a percentage of source code lines, functions, or statements
-covered, is an important metric for understanding a particular source code
+Code coverage, as a percentage of source code lines, functions, or statements covered, is an important metric for understanding a particular source code
 execution, and is commonly associated with test quality (test coverage).
-Providing a visual coverage overview for individual lines of code shows the
-developer which code paths are covered and which are not, giving insight into
-the character of the execution which can, for example, inform further testing
-efforts.
+Providing a visual coverage overview for individual lines of code shows the developer which code paths are covered and which are not, giving insight into the character of the execution which can, for example, inform further testing efforts.
 
-The example application below will be used to demonstrate GraalVM's code
-coverage capabilities. This application defines a
-`getPrime` function that calculates the n-th prime using a basic prime number
-calculator based on the [Sieve of Eratosthenes](https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes) algorithm. It also has a somewhat naive cache of the first 20 prime numbers.
+The example application below will be used to demonstrate GraalVM's code coverage capabilities.
+This application defines a `getPrime` function that calculates the n-th prime using a basic prime number calculator based on the [Sieve of Eratosthenes](https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes) algorithm.
+It also has a somewhat naive cache of the first 20 prime numbers.
 
 1. Copy the following code into a new file named `primes.js`:
 
@@ -96,11 +89,10 @@ Shows what percent of each element was covered during execution
  /path/to/primes.js |      20.69% |   26.67% |   22.22%
 --------------------------------------------------------
 ```
-The tracer prints a coverage histogram for each source file. You can see that
-statement coverage is roughly 20%, line coverage is roughly 26%, and root coverage (the
-term "root" covers functions, methods, etc.) is 22.22%. This tells your that our
-simple tests are not particularly good at exercising the source code. Next you
-will figure out which parts of the code are not covered.
+The tracer prints a coverage histogram for each source file.
+You can see that statement coverage is roughly 20%, line coverage is roughly 26%, and root coverage (the term "root" covers functions, methods, etc.) is 22.22%.
+This tells your that our simple tests are not particularly good at exercising the source code.
+Next you will figure out which parts of the code are not covered.
 
 4. Run `js primes.js --coverage --coverage.Output=detailed`. Prepare for a somewhat verbose output.
 Specifying the output as `detailed` will print all the source code lines with a
@@ -175,16 +167,15 @@ p     if (n > cache.length) { return calculatePrime(n); }
 --------------------------------------------------------
 ```
 
-As the legend at the beginning of the output explains, lines that are covered by
-the execution are preceded with a `+`. Lines not covered by the execution are
-preceded with a `-`. Lines that are covered partially are preceded with `p` (e.g., when an `if`
-statement is covered but only one branch is taken, consider the other bench
+As the legend at the beginning of the output explains, lines that are covered by the execution are preceded with a `+`.
+Lines not covered by the execution are preceded with a `-`.
+Lines that are covered partially are preceded with `p` (e.g., when an `if` statement is covered but only one branch is taken, consider the other bench
 to be incidentally covered).
 
-Looking at the output you can see that the `calculatePrime` function and all its
-calls are never executed. Looking again at the assertions and the `getPrime`
-function, it becomes clear that our tests always hit the cache. Thus most of the
-code is never executed. You can improve on that.
+Looking at the output you can see that the `calculatePrime` function and all its calls are never executed.
+Looking again at the assertions and the `getPrime` function, it becomes clear that our tests always hit the cache.
+Thus most of the code is never executed.
+You can improve on that.
 
 5. Add `console.assert(getPrime(30) == 113);` to the end of the `primes.js` file
 and run `js primes.js --coverage`. Since the new assertion added calls
@@ -205,11 +196,9 @@ Code coverage histogram.
 
 ## Integrating with Other Tools
 
-The code coverage tool provides ways to integrate with other tools. Running
-with `--coverage.Output=lcov` produces output in the commonly used
-[lcov](https://linux.die.net/man/1/lcov) format which is used by multiple tools
-(e.g., `genhtml`) to display coverage data. Take a look at the next example that
-shows how to visualise coverage of a Node.js app with Visual Studio Code.
+The code coverage tool provides ways to integrate with other tools.
+Running with `--coverage.Output=lcov` produces output in the commonly used [lcov](https://linux.die.net/man/1/lcov) format which is used by multiple tools (e.g., `genhtml`) to display coverage data.
+Take a look at the next example that shows how to visualise coverage of a Node.js app with Visual Studio Code.
 
 1. Copy the following code into a new file named `nodeapp.js`:
 
@@ -244,9 +233,7 @@ node --coverage --coverage.Output=lcov \
 nodeapp.js
 ```
 
-Note that the Code Coverage Highlighter plugin looks for the `lcov.info` file in
-the `coverage` directory by default, so direct the output of the code
-coverage tool there.
+Note that the Code Coverage Highlighter plugin looks for the `lcov.info` file in the `coverage` directory by default, so direct the output of the code coverage tool there.
 
 5. Visit [localhost:3000/](http://localhost:3000/) in your browser, then visit [localhost:3000/shutdown](http://localhost:3000/shutdown) to close the app.
 
@@ -255,6 +242,4 @@ and `coverage` directory and you should be greeted with an image similar to the
 
 ![](img/vscode-coverage.png)
 
-If you wish to integrate the data gathered by the GraalVM code coverage tool
-with your own visualisation, the `--coverage.Output=json` option results in
-the output being a JSON file with the raw data gathered by the tracker.
+If you wish to integrate the data gathered by the GraalVM code coverage tool with your own visualisation, the `--coverage.Output=json` option results in the output being a JSON file with the raw data gathered by the tracker.
diff --git a/docs/tools/dap.md b/docs/tools/dap.md
index c890f7b60aea..42256a1ec8fe 100644
--- a/docs/tools/dap.md
+++ b/docs/tools/dap.md
@@ -77,10 +77,10 @@ code .
 8&#46; Start debugging (F5).
 
 The other approach is to use VS Code with the GraalVM extension installed.
-Follow the steps described in
-[Node.js and JavaScript Debugging](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm#javascript-and-node.js-debugging), and launch the application being debugged directly from VS Code.
+Follow the steps described in [Node.js and JavaScript Debugging](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm#javascript-and-node.js-debugging), and launch the application being debugged directly from VS Code.
 When debugging a guest language application from VS Code, a user can choose a protocol to use by setting the protocol attribute in the corresponding debug configuration to either `chromeDevTools` or `debugAdapter`.
 To connect to the open DAP port in this scenario, the content of the _launch.json_ should be:
+
 ```json
 {
     "version": "0.2.0",
diff --git a/docs/tools/graalvm-insight.md b/docs/tools/graalvm-insight.md
index 752869b2375c..8bdf45600b1b 100644
--- a/docs/tools/graalvm-insight.md
+++ b/docs/tools/graalvm-insight.md
@@ -7,22 +7,20 @@ permalink: /tools/graalvm-insight/
 
 # GraalVM Insight
 
-GraalVM Insight is a multipurpose, flexible tool for writing reliable
-microservices solutions that traces program runtime behavior and gathers insights.
+* [Start Using GraalVM Insight](#start-using-graalvm-insight)
+* [Polyglot Tracing](#polyglot-tracing)
+* [Inspecting Values](#inspecting-values)
 
-The dynamic nature of the tool helps users to selectively apply tracing pointcuts on
-already running applications with no loss of performance. Insight
-also provides detailed access to runtime behavior of a program, allowing users to
-inspect values and types at invocation or allocation sites. GraalVM Insight further permits users to
-modify computed values, interrupt execution, and quickly experiment with
-behavioral changes without modifying the application code.
+GraalVM Insight is a multipurpose, flexible tool for writing reliable microservices solutions that traces program runtime behavior and gathers insights.
+
+The dynamic nature of the tool helps users to selectively apply tracing pointcuts on already running applications with no loss of performance.
+GraalVM Insight also provides detailed access to runtime behavior of a program, allowing users to inspect values and types at invocation or allocation sites.
+The tool further permits users to modify computed values, interrupt execution, and quickly experiment with behavioral changes without modifying the application code.
 
 This page provides information on GraalVM Insight as of the 20.1 version.
 To learn about Insight on versions 20.0 and 19.3, proceed [here](https://github.com/oracle/graal/blob/release/graal-vm/20.0/tools/docs/T-Trace.md).
 
-Note: The GraalVM Insight tool is offered as a technology preview and requires the user to
-pass the `--experimental-options` option in order to enable the `--insight`
-instrument.
+Note: The GraalVM Insight tool is offered as a technology preview and requires the user to pass the `--experimental-options` option in order to enable the `--insight` instrument.
 
 ## Start Using GraalVM Insight
 
@@ -48,14 +46,11 @@ Loading 505 characters from [eval]-wrapper
 Loading 29 characters from [eval]
 The result: 42
 ```
-The _source-tracing.js_ script used the provided `insight` object to
-attach a source listener to the runtime. Whenever the script was loaded, the
-listener got notified of it and could take an action -- printing the length and
-name of the processed script.
+The _source-tracing.js_ script used the provided `insight` object to attach a source listener to the runtime.
+Whenever the script was loaded, the listener got notified of it and could take an action -- printing the length and name of the processed script.
 
 The Insight information can be collected to a print statement or a histogram.
-The following _function-histogram-tracing.js_ script counts all method invocations
-and dumps the most frequent ones when the execution of a program is over:
+The following _function-histogram-tracing.js_ script counts all method invocations and dumps the most frequent ones when the execution of a program is over:
 
 ```javascript
 var map = new Map();
@@ -90,10 +85,9 @@ insight.on('enter', function(ev) {
 insight.on('close', dumpHistogram);
 ```
 
-The `map` is a global variable shared inside of the Insight script that allows the
-code to share data between the `insight.on('enter')` function and the `dumpHistogram`
-function. The latter is executed when the node process execution is over
-(registered via `insight.on('close', dumpHistogram`). Invoke it as:
+The `map` is a global variable shared inside of the Insight script that allows the code to share data between the `insight.on('enter')` function and the `dumpHistogram` function.
+The latter is executed when the node process execution is over (registered via `insight.on('close', dumpHistogram`). Invoke it as:
+
 ```shell
 $JAVA_HOME/bin/node --experimental-options --insight=function-histogram-tracing.js --js.print -e "print('The result: ' + 6 * 7)"
 The result: 42
@@ -120,9 +114,7 @@ The result: 42
 
 ## Polyglot Tracing
 
-The previous examples were written in JavaScript, but due to GraalVM's polyglot
-nature, you can take the same instrument and use it in a program written in,
-e.g., the Ruby language.
+The previous examples were written in JavaScript, but due to GraalVM's polyglot nature, you can take the same instrument and use it in a program written in, e.g., the Ruby language.
 
 1. Create the _source-trace.js_ file:
 ```javascript
@@ -178,10 +170,9 @@ With Ruby: 42
 
 ## Inspecting Values
 
-GraalVM Insight not only allows one to trace where the program execution is happening,
-it also offers access to values of local variables and function arguments during
-program execution. You can, for example, write an instrument that shows the value of
-argument `n` in the function `fib`:
+GraalVM Insight not only allows one to trace where the program execution is happening, it also offers access to values of local variables and function arguments during program execution.
+You can, for example, write an instrument that shows the value of argument `n` in the function `fib`:
+
 ```javascript
 insight.on('enter', function(ctx, frame) {
    print('fib for ' + frame.n);
@@ -191,9 +182,9 @@ insight.on('enter', function(ctx, frame) {
 });
 ```
 
-This instrument uses the second function argument, `frame`, to get access to values of
-local variables inside every instrumented function. The above script
-also uses `rootNameFilter` to apply its hook only to the function named `fib`:
+This instrument uses the second function argument, `frame`, to get access to values of local variables inside every instrumented function.
+The above script also uses `rootNameFilter` to apply its hook only to the function named `fib`:
+
 ```javascript
 function fib(n) {
   if (n < 1) return 0;
@@ -203,9 +194,8 @@ function fib(n) {
 print("Two is the result " + fib(3));
 ```
 
-When the instrument is stored in a `fib-trace.js` file and the actual code is in
-`fib.js`, invoking the following command yields detailed information about the
-program execution and parameters passed between function invocations:
+When the instrument is stored in a `fib-trace.js` file and the actual code is in `fib.js`, invoking the following command yields detailed information about the program execution and parameters passed between function invocations:
+
 ```shell
 $JAVA_HOME/bin/node --experimental-options --insight=fib-trace.js --js.print fib.js
 fib for 3
diff --git a/docs/tools/ideal-graph-visualizer.md b/docs/tools/ideal-graph-visualizer.md
index 8c2ab3321b41..0ea34d012602 100644
--- a/docs/tools/ideal-graph-visualizer.md
+++ b/docs/tools/ideal-graph-visualizer.md
@@ -7,13 +7,17 @@ permalink: /tools/igv/
 
 # Ideal Graph Visualizer
 
-Ideal Graph Visualizer (IGV) is a developer tool allowing users to analyze compilation
-graphs and investigate performance issues. The tool is essential for any
-language implementers building on top of **Oracle GraalVM Enterprise Edition**. It is
-available as a separate download on [Oracle Technology Network](https://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html) and requires accepting the Oracle Technology Network Developer License.
+* [Browsing Graphs](#browsing-graphs)
+* [Viewing Source Code](#viewing-source-code)
+* [Dumping Graphs](#dumping-graphs)
+
+Ideal Graph Visualizer (IGV) is a developer tool allowing users to analyze compilation graphs and investigate performance issues.
+The tool is essential for any language implementers building on top of **Oracle GraalVM Enterprise Edition**.
+It is available as a separate download on [Oracle Technology Network](https://www.oracle.com/downloads/graalvm-downloads.html) and requires accepting the Oracle Technology Network Developer License.
 
 IGV is developed to view and inspect intermediate representation graphs -- a language-independent intermediate representation (IR) between the source
-language and the machine code, generated by the compiler. See [Dumping Graphs](/tools/igv/#dumping-graphs) below.
+language and the machine code, generated by the compiler.
+See [Dumping Graphs](#dumping-graphs) below.
 
 1. Unzip the downloaded package and enter `bin` directory:
 ```shell
@@ -46,7 +50,8 @@ and connect the `Test.rb` script to the running IGV:
 gu list
 ruby --jvm --polyglot --vm.Dgraal.Dump=:1 --vm.Dgraal.PrintGraph=Network Test.rb
 ```
-This causes GraalVM Enterprise to dump compiler graphs in the IGV format over the network to an IGV process listening on `127.0.0.1:4445`. Once the connection is made, you are able to see the graphs in the Outline window.
+This causes GraalVM Enterprise to dump compiler graphs in the IGV format over the network to an IGV process listening on `127.0.0.1:4445`.
+Once the connection is made, you are able to see the graphs in the Outline window.
 Find, e.g., the `java.lang.String.char(int)` folder and open its After Parsing graph by double-clicking.
 If the node has `sourceNodePosition` property, then the Processing window will attempt to display its location and the entire stacktrace.
 
@@ -58,57 +63,48 @@ Select a node in the graph and press the Go to Source button in the Stack View w
 
 ![](img/IGV_add_source.png)
 
-Graphs navigation is also available from the Context menu, enabled by focusing
-and right-clicking a specific graph node. The Extract Nodes option will re-render
-a graph and display only the selected nodes and their neighbors.
+Graphs navigation is also available from the Context menu, enabled by focusing and right-clicking a specific graph node.
+The Extract Nodes option will re-render a graph and display only the selected nodes and their neighbors.
 
 ![](img/IGV_context_menu.png)
 
-If the graph is larger than the screen, manipulate with the Satellite view button
-in the main toolbar to move the viewport rectangle.
+If the graph is larger than the screen, manipulate with the Satellite view button in the main toolbar to move the viewport rectangle.
 
 ![](img/IGV_satellite_view.png)
 
-For user preference, the graph color scheme is adjustable by editing
-the Coloring filter, enabled by default in the left sidebar.
+For user preference, the graph color scheme is adjustable by editing the Coloring filter, enabled by default in the left sidebar.
 
 ## Viewing Source Code
 
-Source code views can be opened in manual and assisted modes. Once you select a node
-in the graph view, the Processing view will open. If the IGV knows where the source code
-for the current frame is, the green Go to Source arrow is enabled. If the IGV does not
-know where the source is, the line is greyed out and a Looking Glass button appears.
+Source code views can be opened in manual and assisted modes.
+Once you select a node in the graph view, the Processing view will open.
+If the IGV knows where the source code for the current frame is, the green Go to Source arrow is enabled.
+If the IGV does not know where the source is, the line is greyed out and a Looking Glass button appears.
 
 ![](img/IGV_add_source.png)
 
 Press it and select Locate in Java project to locate the correct project in the dialog.
 The IGV hides projects which do not contain the required source file.
 The Source Collections serves to display the stand alone roots added by "Add root of sources" general action.
-If the source is located using the preferred method (i.e., from a Java project),
-its project can be later managed on the Project tab. That one is initially hidden,
-but you can display the list of opened projects using Window -> Projects.
+If the source is located using the preferred method (i.e., from a Java project), its project can be later managed on the Project tab.
+That one is initially hidden, but you can display the list of opened projects using Window -> Projects.
 
 ## Dumping Graphs
 
-The IGV tool is developed to allow GraalVM Enterprise language implementers
-to optimize their languages assembled with the [Language Implentation Framework](/graalvm-as-a-platform/language-implementation-framework/). As a development
-tool it should not be installed to production environments.
-
-To dump the GraalVM compiler graphs from an embedded Java application to the IGV,
-you need to add options to GraalVM-based processes. Depending on the language/VM
-used, you may need to prefix the options by `--vm`. See the particular
-language's documentation for the details. The main option to add is
-`-Dgraal.Dump=:1`. This will dump graphs in an IGV readable format to the local
-file system. To send the dumps directly to the IGV over the network, add
-`-Dgraal.PrintGraph=Network` when starting a GraalVM instance. Optionally a
-port can be specified. Then dumps are sent to the IGV from the running GraalVM on
-localhost. If the IGV does not listen on localhost, Options -> Ideal Graph Settings|
-Accept Data From Network can be checked. If there is not an IGV instance
-listening on `127.0.0.1` or it cannot be connected to, the dumps will be
-redirected to the local file system. The file system location is `graal_dumps/`
-under the current working directory of the process and can be changed with the
-`-Dgraal.DumpPath` option.
-
-In case an older GraalVM Enterprise is used, you may need to explicitly request that dumps
-include the `nodeSourcePosition` property. This is done by adding the
-`-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints` options.
+The IGV tool is developed to allow GraalVM Enterprise language implementers to optimize their languages assembled with the [Language Implentation Framework](../graalvm-as-a-platform/truffle/README.md).
+As a development tool it should not be installed to production environments.
+
+To dump the GraalVM compiler graphs from an embedded Java application to the IGV, you need to add options to GraalVM-based processes.
+Depending on the language/VM used, you may need to prefix the options by `--vm`.
+See the particular language's documentation for the details.
+The main option to add is `-Dgraal.Dump=:1`.
+This will dump graphs in an IGV readable format to the local file system.
+To send the dumps directly to the IGV over the network, add `-Dgraal.PrintGraph=Network` when starting a GraalVM instance.
+Optionally a port can be specified.
+Then dumps are sent to the IGV from the running GraalVM on localhost.
+If the IGV does not listen on localhost, Options -> Ideal Graph Settings|Accept Data From Network can be checked.
+If there is not an IGV instance listening on `127.0.0.1` or it cannot be connected to, the dumps will be redirected to the local file system.
+The file system location is `graal_dumps/` under the current working directory of the process and can be changed with the `-Dgraal.DumpPath` option.
+
+In case an older GraalVM Enterprise is used, you may need to explicitly request that dumps include the `nodeSourcePosition` property.
+This is done by adding the `-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints` options.
diff --git a/docs/tools/lsp.md b/docs/tools/lsp.md
index f831f89238ad..5ebcc01a9ebd 100644
--- a/docs/tools/lsp.md
+++ b/docs/tools/lsp.md
@@ -7,13 +7,12 @@ permalink: /tools/lsp/
 
 # Language Server Protocol
 
-GraalVM supports [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) (LSP) for guest languages. It provides features like code-completion, find usages and alike for the client tools -- IDEs like Visual Studio Code.
+GraalVM supports [Language Server Protocol](https://microsoft.github.io/language-server-protocol/) (LSP) for guest languages.
+It provides features like code-completion, find usages and alike for the client tools -- IDEs like Visual Studio Code.
 
-To start the GraalVM Language Server, pass the `--lsp` option to the command
-line launcher as in the following example with a Node.js application.
+To start the GraalVM Language Server, pass the `--lsp` option to the command line launcher as in the following example with a Node.js application.
 
-Note: The GraalVM Language Server is offered as a technology preview and requires the
-user to pass the `--experimental-options` option for its activation.
+Note: The GraalVM Language Server is offered as a technology preview and requires the user to pass the `--experimental-options` option for its activation.
 
 ```shell
 node --experimental-options --lsp app.js
@@ -23,7 +22,8 @@ Example app listening on port 3000!
 ![](img/vscode_cc_1.png)
 _GraalVM Enterprise-provided code completion for R script, part of the Node.js Polyglot application_
 
-The GraalVM Language Server itself does not provide the static data usually gathered by parsing the application sources (as these data are sometimes fuzzy in the cases of dynamic languages). Instead, the Language Server was designed to provide the accurate dynamic data gathered from the application runtime.
+The GraalVM Language Server itself does not provide the static data usually gathered by parsing the application sources (as these data are sometimes fuzzy in the cases of dynamic languages).
+Instead, the Language Server was designed to provide the accurate dynamic data gathered from the application runtime.
 
 However, the Language Server could delegate to the existing language servers written specially for the particular languages (using the `--lsp.Delegates` launcher option) and merge the static data returned from these servers with its own dynamic data to a single result.
 
diff --git a/docs/tools/profiling.md b/docs/tools/profiling.md
index f5cc19a9e5f3..074829129442 100644
--- a/docs/tools/profiling.md
+++ b/docs/tools/profiling.md
@@ -7,17 +7,13 @@ permalink: /tools/profiling/
 
 # Profiling Command Line Tools
 
-GraalVM **profiling command line tools** help you optimize your code
-through analysis of CPU and memory usage.
+GraalVM **profiling command line tools** help you optimize your code through analysis of CPU and memory usage.
 
-Most applications spend 80% of their runtime in 20% of the code. For this
-reason, to optimize the code, it is essential to know where the application
-spends its time. In this section, we use an example application to demonstrate
-the three main profiling capabilities that GraalVM offers: CPU Tracer, CPU
-Sampler, and Memory Tracer.
+Most applications spend 80% of their runtime in 20% of the code.
+For this reason, to optimize the code, it is essential to know where the application spends its time.
+In this section, we use an example application to demonstrate the three main profiling capabilities that GraalVM offers: CPU Tracer, CPU Sampler, and Memory Tracer.
 
-This example application uses a basic prime
-number calculator based on the [Sieve of Eratosthenes](https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes)
+This example application uses a basic prime number calculator based on the [Sieve of Eratosthenes](https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes)
 algorithm.
 
 1. Copy the following code into a new file named `primes.js`:
@@ -90,7 +86,7 @@ algorithm.
       Total Time: Time spent somewhere on the stack.
     ----------------------------------------------------------------------------------------------------
     Thread[main,5,main]
-     Name              |             Total Time    ||              Self Time    || Location             
+     Name              |             Total Time    ||              Self Time    || Location
     ----------------------------------------------------------------------------------------------------
      accept            |             7330ms  88.8% ||             7330ms  88.8% || primes.js~13-22:191-419
      :program          |             8250ms 100.0% ||              420ms   5.1% || primes.js~1-46:0-982
@@ -101,19 +97,18 @@ algorithm.
     ----------------------------------------------------------------------------------------------------
     ```
     By default the sampler prints an execution time histogram for each JavaScript function.
-    You can produce a flame graph in SVG format by doing 
+    You can produce a flame graph in SVG format by doing
     ```shell
     js primes.js --cpusampler --cpusampler.Output=flamegraph --cpusampler.OutputFile=primes.svg
     ```
     which should produce something like this
-    
+
     ![](img/profiler_flamegraph.png)
-    
+
     You can zoom into the graph by clicking on elements.
 
-    By default, CPU sampling takes a sample every 10 milliseconds. From the
-    result, we can see that roughly 89% of the time is spent
-    in the `DivisibleByFilter.accept` function.
+    By default, CPU sampling takes a sample every 10 milliseconds.
+    From the result, we can see that roughly 89% of the time is spent in the `DivisibleByFilter.accept` function.
 
     ```javascript
     accept(n) {
@@ -129,8 +124,7 @@ algorithm.
     ```
     Now use the CPU Tracer to collect execution counts of each statement:
 
-4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept`
-to collect execution counts for all statements in methods ending with `accept`:
+4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept` to collect execution counts for all statements in methods ending with `accept`:
     ```shell
     js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.
@@ -154,14 +148,10 @@ to collect execution counts for all statements in methods ending with `accept`:
     -----------------------------------------------------------------------------------------
     ```
 
-    The output shows execution counters for each statement, instead of timing
-    information. Tracing histograms often provides insights into the behavior
-    of the algorithm that needs optimization.
+    The output shows execution counters for each statement, instead of timing information.
+    Tracing histograms often provides insights into the behavior of the algorithm that needs optimization.
 
-5. Run `js primes.js --experimental-options --memtracer` to display source code locations and
-counts of reported allocations. Note that the Memory Tracer tool for capturing allocations is currently an
-experimental feature in GraalVM. As such, `--memtracer` must
-be preceded by the `--experimental-options` command line option.
+5. Run `js primes.js --experimental-options --memtracer` to display source code locations and counts of reported allocations. Note that the Memory Tracer tool for capturing allocations is currently an experimental feature in GraalVM. As such, `--memtracer` must be preceded by the `--experimental-options` command line option.
     ```shell
     js primes.js --experimental-options --memtracer
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.
@@ -179,21 +169,15 @@ be preceded by the `--experimental-options` command line option.
 
     ```
 
-    This output shows the number of allocations which were recorded per function.
-    For each prime number that was computed, the program allocates one object in
-    `next` and one in `constructor` of `DivisibleByFilter`. Allocations are recorded
-    independently of whether they could get eliminated by the compiler.
+    This output shows the number of allocations which were recorded per function. For each prime number that was computed, the program allocates one object in `next` and one in `constructor` of `DivisibleByFilter`.
+    Allocations are recorded independently of whether they could get eliminated by the compiler.
 
-    The GraalVM compiler is particularly powerful in optimizing allocations and can push
-    allocations into infrequent branches to increase execution performance. The
-    GraalVM team plans to add information about memory optimizations to the
-    memory tracer in the future.
+    The GraalVM compiler is particularly powerful in optimizing allocations and can push allocations into infrequent branches to increase execution performance.
+    The GraalVM team plans to add information about memory optimizations to the memory tracer in the future.
 
 ## Tools Options
-Use the `--help:tools` option in all guest language launchers to display
-reference information for CPU Sampler, CPU Tracer, and Memory Tracer.
-
-The current set of available options is as follows:
+Use the `--help:tools` option in all guest language launchers to display reference information for CPU Sampler, CPU Tracer, and Memory Tracer.
+The current set of available options is as follows.
 
 ### CPU Sampler Options
 
diff --git a/docs/tools/visualvm.md b/docs/tools/visualvm.md
index fd9a18b21e7c..cb34b024619e 100644
--- a/docs/tools/visualvm.md
+++ b/docs/tools/visualvm.md
@@ -21,66 +21,59 @@ currently available:
 To start VisualVM, execute `jvisualvm`. Immediately after startup, the tool shows all locally running Java processes in the Applications area, including the VisualVM process, itself.
 
 ### Capture a Heap Dump
-To capture a heap dump of, for example, a Ruby application for later analysis,
-start your application and let it run for a few seconds to warm up. Then
-right-click its process in VisualVM and invoke the Heap Dump action. A
-new heap viewer for the Ruby process opens.
-
-__Note:__ [Native Image](../reference-manual/native-image/README.md) does not implement the JVMTI agent, so triggering heap dump creation from the Applications area is impossible. Apply the `-H:+AllowVMInspection` flag with the `native-image` tool for native image processes. This way your application will handle signals and capture a heap dump when it receives the SIGUSR1 signal. The guest language REPL process must be started also with the `--jvm` flag to monitor it using VisualVM. This functionality is available with [GraalVM Enterprise Edition](https://www.oracle.com/downloads/graalvm-downloads.html). It is not available in GraalVM Community Edition. See the [Generating Native Heap Dumps](../reference-manual/native-image/NativeImageHeapdumpEnterprise.md) page for details on capturing heap dumps from a native image process.
+To capture a heap dump of, for example, a Ruby application for later analysis, start your application and let it run for a few seconds to warm up.
+Then right-click its process in VisualVM and invoke the Heap Dump action.
+A new heap viewer for the Ruby process opens.
+
+__Note:__ [Native Image](../reference-manual/native-image/README.md) does not implement the JVMTI agent, so triggering heap dump creation from the Applications area is impossible.
+Apply the `-H:+AllowVMInspection` flag with the `native-image` tool for native image processes.
+This way your application will handle signals and capture a heap dump when it receives the SIGUSR1 signal.
+The guest language REPL process must be started also with the `--jvm` flag to monitor it using VisualVM.
+This functionality is available with [GraalVM Enterprise Edition](https://www.oracle.com/downloads/graalvm-downloads.html).
+It is not available in GraalVM Community Edition.
+See the [Generating Native Heap Dumps](../reference-manual/native-image/NativeImageHeapdumpEnterprise.md) page for details on capturing heap dumps from a native image process.
 
 ### Analyzing Objects
-Initially the Summary view for the Java heap is displayed. To analyze the Ruby
-heap, click the leftmost (Summary) dropdown in the Heap Viewer toolbar, choose
-the Ruby Heap scope and select the Objects view. Now the heap viewer displays
-all Ruby heap objects, aggregated by their type.
+Initially the Summary view for the Java heap is displayed.
+To analyze the Ruby heap, click the leftmost (Summary) dropdown in the Heap Viewer toolbar, choose the Ruby Heap scope and select the Objects view.
+Now the heap viewer displays all Ruby heap objects, aggregated by their type.
 
 Expand the Proc node in the Results view to see a list of objects of this type.
-Each object displays its logical value as provided by the underlying
-implementation. Expand the objects to access their variables and references,
-where available.
+Each object displays its logical value as provided by the underlying implementation.
+Expand the objects to access their variables and references, where available.
 
 ![](img/HeapViewer_objects.png)
 
-Now enable the Preview, Variables, and References details by clicking the buttons
-in the toolbar, and select the individual _ProcType_ objects. Where available, the
-Preview view shows the corresponding source fragment, the Variables view shows
-variables of the object, and the References view shows objects referring to the
-selected object.
+Now enable the Preview, Variables, and References details by clicking the buttons in the toolbar, and select the individual _ProcType_ objects.
+Where available, the Preview view shows the corresponding source fragment, the Variables view shows variables of the object, and the References view shows objects referring to the selected object.
 
-Last, use the Presets dropdown in the Heap Viewer toolbar to switch the view
-from All Objects to Dominators or GC Roots. To display the heap dominators,
-retained sizes must be computed first, which can take a few minutes for the
-_server.rb_ example. Select the Objects aggregation in the toolbar to view the
-individual dominators or GC roots.
+Last, use the Presets dropdown in the Heap Viewer toolbar to switch the view from All Objects to Dominators or GC Roots.
+To display the heap dominators, retained sizes must be computed first, which can take a few minutes for the _server.rb_ example.
+Select the Objects aggregation in the toolbar to view the individual dominators or GC roots.
 
 ![](img/HeapViewer_objects_dominators.png)
 
 ### Analyzing Threads
-Click the leftmost dropdown in the Heap Viewer toolbar and select the Threads
-view for the Ruby heap. The heap viewer now displays the Ruby thread stack
-trace, including local objects. The stack trace can alternatively be displayed
-textually by clicking the HTML toolbar button.
+Click the leftmost dropdown in the Heap Viewer toolbar and select the Threads view for the Ruby heap.
+The heap viewer now displays the Ruby thread stack trace, including local objects. The stack trace can alternatively be displayed textually by clicking the HTML toolbar button.
 
 ![](img/HeapViewer_thread.png)
 
 ### Reading JFR Snapshots
-The VisualVM tool bundled with GraalVM 19.2.x and later has the ability to read JFR snapshots -- snapshots taken with JDK Flight Recorder (previously Java Flight Recorder). JFR is a tool for collecting
-diagnostic and profiling data about a running Java application. It is integrated
-into the Java Virtual Machine (JVM) and causes almost no performance overhead,
-so it can be used even in heavily loaded production environments.
+The VisualVM tool bundled with GraalVM 19.2.x and later has the ability to read JFR snapshots -- snapshots taken with JDK Flight Recorder (previously Java Flight Recorder).
+JFR is a tool for collecting diagnostic and profiling data about a running Java application.
+It is integrated into the Java Virtual Machine (JVM) and causes almost no performance overhead, so it can be used even in heavily loaded production environments.
 
 To install the JFR support, released as a plugin:
 1. Run `<GRAALVM_HOME>/bin/jvisualvm` to start VisualVM;
 2. Navigate to Tools > Plugins > Available Plugins to list all available plugins, then install the _VisualVM-JFR_ and
 _VisualVM-JFR-Generic_ modules.
 
-The JFR snapshots can be opened using either the File > Load action, or by
-double-clicking the JFR Snapshots node and adding the snapshot into the JFR
-repository, permanently. Please follow the documentation for your Java version to
-create JFR snapshots.
+The JFR snapshots can be opened using either the File > Load action, or by double-clicking the JFR Snapshots node and adding the snapshot into the JFR
+repository, permanently.
+Please follow the documentation for your Java version to create JFR snapshots.
 
-The JFR viewer reads all JFR snapshots created from Java 7 onward, and presents the data in typical
-VisualVM views familiar to the tool users.
+The JFR viewer reads all JFR snapshots created from Java 7 onward, and presents the data in typical VisualVM views familiar to the tool users.
 
 ![](img/visualvm_jfr.png)
 
@@ -109,7 +102,4 @@ usage, etc.
 * Recording tab - lists the recording settings and basic snapshot telemetry like
 number of events, total recording time, etc.
 
-Note: the support of JDK Flight Recorder is currently experimental. Some advanced features like
-analyzing JVM internals, showing event stack traces, or support for creating JFR
-snapshots from live processes are not available in this preview version and will
-be addressed incrementally in the following releases.
+Note: The support of JDK Flight Recorder is currently experimental. Some advanced features like analyzing JVM internals, showing event stack traces, or support for creating JFR snapshots from live processes are not available in this preview version and will be addressed incrementally in the following releases.
diff --git a/docs/tools/vscode/graalvm/README.md b/docs/tools/vscode/graalvm/README.md
index 2f0ba532c380..10b1036a5887 100644
--- a/docs/tools/vscode/graalvm/README.md
+++ b/docs/tools/vscode/graalvm/README.md
@@ -216,7 +216,7 @@ This brings the visual Java tooling to VS Code.
 
 ![VisualVM and VS Code Integration](images/vscode_visualvm.png)
 
-To get started, you need to get the latest stable GraalVM release using the **Download & Install GraalVM** action from the **Gr** activity view, as described in the [Installation and Setup](README.md#installation-and-setup) section.
+To get started, you need to get the latest stable GraalVM release using the **Download & Install GraalVM** action from the **Gr** activity view, as described in the [Installation and Setup](#installation-and-setup) section.
 Make sure the GraalVM is set as **active**.
 
 Once a GraalVM installation is set as active, the Command Palette contains the following commands related to VisualVM:
@@ -552,7 +552,7 @@ Once the `solargraph` gem is installed, the Ruby Language Server is automaticall
 
 ### Additional Editor Features
 
-Since the easy writing of [polyglot](https://www.graalvm.org/docs/reference-manual/polyglot) applications is one of the defining features of GraalVM, the code completion invoked inside JavaScript sources provides items for `Polyglot.eval(...)`, `Polyglot.evalFile(...)`, and `Java.type(...)` calls.
+Since the easy writing of [polyglot applications](https://www.graalvm.org/reference-manual/polyglot-programming/) is one of the defining features of GraalVM, the code completion invoked inside JavaScript sources provides items for `Polyglot.eval(...)`, `Polyglot.evalFile(...)`, and `Java.type(...)` calls.
 
 ![Image Code Completion](images/code-completion-js.png)
 
diff --git a/docs/tools/vscode/vscode.md b/docs/tools/vscode/vscode.md
index a5dddceafd15..948adab0a8d2 100644
--- a/docs/tools/vscode/vscode.md
+++ b/docs/tools/vscode/vscode.md
@@ -12,13 +12,13 @@ VS Code is an integrated development environment that provides the embedded Gi
 
 The following extensions are available for download from Visual Studio Code Marketplace:
 
-- [**GraalVM Tools for Java**](/tools/vscode/graalvm-extension/) provides a full-fledged support for the Java language and, additionally, enables a polyglot environment in VS Code, making it a comfortable and convenient integrated development environment to work with.
+- [**GraalVM Tools for Java**](graalvm/README.md) provides a full-fledged support for the Java language and, additionally, enables a polyglot environment in VS Code, making it a comfortable and convenient integrated development environment to work with.
 Users can edit, run and debug either single-language applications written in any of the GraalVM-supported languages (Java, JS, Ruby, R, and Python), or polyglot applications without the need to install any other additional extensions.
 The extension also offers the installation wizard that allows to download and install GraalVM and its optional features directly from the user interface. Get the extension from [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm).
 
-- [**GraalVM Tools for Micronaut**](/tools/vscode/micronaut-extension/) provides full support for developing applications based on the [Micronaut framework](https://micronaut.io/). The extension also enables the [Micronaut Launch](https://micronaut.io/launch/) application that allows you to create Micronaut projects through an interface inside VS Code, in addition to using the console CLI. This extension is integrated with GraalVM to provide all Native Image capabilities. You can generate native images directly from VS Code, and deploy them to a Docker Registry. Get the extension from [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.micronaut).
+- [**GraalVM Tools for Micronaut**](micronaut/README.md) provides full support for developing applications based on the [Micronaut framework](https://micronaut.io/). The extension also enables the [Micronaut Launch](https://micronaut.io/launch/) application that allows you to create Micronaut projects through an interface inside VS Code, in addition to using the console CLI. This extension is integrated with GraalVM to provide all Native Image capabilities. You can generate native images directly from VS Code, and deploy them to a Docker Registry. Get the extension from [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.micronaut).
 
-- [**GraalVM Extension Pack for Java**](/tools/vscode/graalvm-extension-pack/) is a collection of extensions that helps users write, debug and test Java, JavaScript, Python, Ruby, R and polyglot applications running on GraalVM, either standalone or using the Micronaut framework.
+- [**GraalVM Extension Pack for Java**](graalvm-pack/README.md) is a collection of extensions that helps users write, debug and test Java, JavaScript, Python, Ruby, R and polyglot applications running on GraalVM, either standalone or using the Micronaut framework.
 GraalVM Extension Pack for Java bundles [GraalVM Tools for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm), [GraalVM Tools for Micronaut](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.micronaut), and [Apache NetBeans Language Server](https://marketplace.visualstudio.com/items?itemName=asf.apache-netbeans-java) extensions. Get the extension pack from [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack).
 
 As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature - the integration with VisualVM (https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.

From 0a9f90728064d869b3c6730dd7b33ff05ec139ea Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 23 Sep 2021 22:08:35 +0300
Subject: [PATCH 393/681] Docs/reference-manuals updated ref links from
 permalinks to rel paths; Start sentences from a new line

---
 docs/reference-manual/compiler.md             |  10 +-
 docs/reference-manual/graalvm-updater.md      | 102 +++++++-----------
 docs/reference-manual/polyglot-programming.md |  19 ++--
 docs/reference-manual/reference-manuals.md    |  26 ++---
 4 files changed, 67 insertions(+), 90 deletions(-)

diff --git a/docs/reference-manual/compiler.md b/docs/reference-manual/compiler.md
index 66da06569e70..7a267b595390 100644
--- a/docs/reference-manual/compiler.md
+++ b/docs/reference-manual/compiler.md
@@ -27,7 +27,7 @@ The GraalVM compiler assures performance advantages for highly-abstracted progra
 Code using more abstraction and modern Java features like Streams or Lambdas will see greater speedups.
 Low-level code or code that converges to things like I/O, memory allocation, or garbage collection will see less improvement.
 Consequently, an application running on GraalVM needs to spend less time doing memory management and garbage collection.
-For more information on performance tuning, refer to [Compiler Configuration on JVM](/reference-manual/java/options/).
+For more information on performance tuning, refer to [Compiler Configuration on JVM](java/Options.md).
 
 ## Graph Compilation
 
@@ -37,7 +37,7 @@ A *graph* was selected for this role.
 The graph can represent similar statements of different languages in the same way, like "if" statements or loops, which makes it possible to mix languages in the same program.
 The GraalVM compiler can then perform language-independent optimization and generate machine code on this graph.
 
-GraalVM also includes the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) -- a library, written in Java -- to build interpreters for programming languages, which then run on GraalVM.
+GraalVM also includes the [Truffle language implementation framework](../graalvm-as-a-platform/truffle/README.md) -- a library, written in Java -- to build interpreters for programming languages, which then run on GraalVM.
 These languages can consequently benefit from the optimization possibilities of the GraalVM compiler.
 The pipeline for such compilation is:
 
@@ -50,9 +50,9 @@ hot (i.e., called many times), it is scheduled for compilation by the compiler.
 
 ## Ahead-of-time Compilation
 
-Besides the Truffle framework, GraalVM incorporates its optimizing compiler into an advanced ahead-of-time (AOT) compilation technology -- [Native Image](/reference-manual/native-image/) -- which translates Java and JVM-based code into a native platform executable.
+Besides the Truffle framework, GraalVM incorporates its optimizing compiler into an advanced ahead-of-time (AOT) compilation technology -- [Native Image](native-image/README.md) -- which translates Java and JVM-based code into a native platform executable.
 These native executables start nearly instantaneously, are smaller, and consume less resources of the same Java application, making them ideal for cloud deployments and microservices.
-For more information about AOT compilation, go to [Native Image](/reference-manual/native-image/).
+For more information about AOT compilation, go to [Native Image](native-image/README.md).
 
 ## Compiler Operating Modes
 
@@ -80,7 +80,7 @@ This will produce diagnostic data for every method compiled by the compiler.
 To refine the set of methods for which diagnostic data is produced, use the `-Dgraal.MethodFilter=<class>.<method>` option.
 For example, `-Dgraal.MethodFilter=java.lang.String.*,HashMap.get` will produce diagnostic data only for methods in the `java.lang.String` class as well as methods named `get` in a class whose non-qualified name is `HashMap`.
 
-Instead of being written to a file, diagnostic data can also be sent over the network to the [Ideal Graph Visualizer](/tools/igv/).
+Instead of being written to a file, diagnostic data can also be sent over the network to the [Ideal Graph Visualizer](../tools/ideal-graph-visualizer.md).
 This requires the `-Dgraal.PrintGraph=Network` option, upon which the compiler will try to send diagnostic data to _127.0.0.1:4445_.
 This network endpoint can be configured with the `-Dgraal.PrintGraphHost` and `-Dgraal.PrintGraphPort` options.
 
diff --git a/docs/reference-manual/graalvm-updater.md b/docs/reference-manual/graalvm-updater.md
index abf06080ab1a..fd9bd47d4ee3 100644
--- a/docs/reference-manual/graalvm-updater.md
+++ b/docs/reference-manual/graalvm-updater.md
@@ -31,16 +31,16 @@ The following GraalVM language runtimes and utilities are available for installa
 
 Tools/Utilities:
 
-* [Native Image](/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
-* [LLVM toolchain](/llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM
-* [Java on Truffle](/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+* [Native Image](native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+* [LLVM toolchain](llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM
+* [Java on Truffle](java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-* [Node.js](/reference-manual/js/) -- Node.js 14.16.1 compatible
-* [Python](/python/README.md) -- Python 3.8.5-compatible
-* [Ruby](/ruby/README.md) -- Ruby 2.7.3-compatible
-* [R](/r/README.md) -- GNU R 4.0.3-compatible
-* [Wasm](/wasm/README.md) -- WebAssembly (Wasm)
+* [Node.js](js/README.md) -- Node.js 14.16.1 compatible
+* [Python](python/README.md) -- Python 3.8.5-compatible
+* [Ruby](ruby/README.md) -- Ruby 2.7.3-compatible
+* [R](r/README.md) -- GNU R 4.0.3-compatible
+* [Wasm](wasm/README.md) -- WebAssembly (Wasm)
 
 GraalVM Updater verifies whether or not the version of a component is appropriate for the current GraalVM installation.
 Components are released for each GraalVM distribution with respective updates, and those downloaded for previous release(s) cannot be used with newer ones.
@@ -63,21 +63,16 @@ gu available
 ```shell
 gu install ruby
 ```
-GraalVM Updater first downloads the list of components, then uses the
-information in the list to download the actual component package, then installs
-it. To see more verbose output during the installation, like the download
-progress bar, print versions, and dependency information, use the `-v`
-(`--verbose`) switch.
-
-If a component being installed depends on another component, GraalVM Updater will
-search the catalog to find an appropriate dependency and install it as well. If
-the required components cannot be found, installation will fail.
-
-When using custom catalog URLs, it is possible, for a convenience, to set
-the environment variable `GRAALVM_CATALOG` pointing to the custom catalog's URL.
-GraalVM Updater will use the URL defined by `GRAALVM_CATALOG` in preference to
-the builtin ones. You may setup the environment variable in startup or profile
-scripts.
+
+GraalVM Updater first downloads the list of components, then uses the information in the list to download the actual component package, then installs it.
+To see more verbose output during the installation, like the download progress bar, print versions, and dependency information, use the `-v` (`--verbose`) switch.
+
+If a component being installed depends on another component, GraalVM Updater will search the catalog to find an appropriate dependency and install it as well.
+If the required components cannot be found, installation will fail.
+
+When using custom catalog URLs, it is possible, for a convenience, to set the environment variable `GRAALVM_CATALOG` pointing to the custom catalog's URL.
+GraalVM Updater will use the URL defined by `GRAALVM_CATALOG` in preference to the builtin ones.
+You may setup the environment variable in startup or profile scripts.
 
 Note: If you need, for some reason to set the `GRAALVM_HOME` environment variable, it may affect `gu` operation.
 If it is set, it should point to the intended GraalVM installation, same as `JAVA_HOME` and `PATH`.
@@ -243,9 +238,8 @@ GraalVM Updater common options:
 * `-v, --verbose`: enable verbose output. Print versions and dependency information
 * `--version`: print version
 
-Oracle GraalVM Enterprise Edition users might need to pass an
-additional verification step to login to the Oracle components repository. GraalVM
-Updater tool provides options for that:
+Oracle GraalVM Enterprise Edition users might need to pass an additional verification step to login to the Oracle components repository.
+GraalVM Updater tool provides options for that:
 * `--public-key / -k <path>`: set the path to a custom GPG public key path
 *	`--username/-U`: enter a username
 
@@ -260,34 +254,25 @@ Runtime options:
 
 ## Configure Proxies
 
-If GraalVM Updater needs to reach the component catalog, or download a component
-package, it may need to pass through the HTTP/HTTPS proxy, if the network uses one. On
-_macOS_, the proxy settings are automatically obtained from the OS. On _Linux_,
-ensure that the `http_proxy` and `https_proxy` environment variables are set
-appropriately before launching the `gu` tool. Refer to the distribution
-and/or desktop environment documentation for the details.
+If GraalVM Updater needs to reach the component catalog, or download a component package, it may need to pass through the HTTP/HTTPS proxy, if the network uses one.
+On _macOS_, the proxy settings are automatically obtained from the OS.
+On _Linux_, ensure that the `http_proxy` and `https_proxy` environment variables are set appropriately before launching the `gu` tool.
+Refer to the distribution and/or desktop environment documentation for the details.
 
-GraalVM Updater intentionally does not support an option to disable certificate
-or hostname verification, for security reasons. A user may try to add a proxy's
-certificate to the GraalVM default security trust store. A user can also
-download a component manually to a folder, and then use `gu -L install /path/to/file` or `gu -C /path/to/download/dir install component` to install from a local filesystem.
+GraalVM Updater intentionally does not support an option to disable certificate or hostname verification, for security reasons.
+A user may try to add a proxy's certificate to the GraalVM default security trust store.
+A user can also download a component manually to a folder, and then use `gu -L install /path/to/file` or `gu -C /path/to/download/dir install component` to install from a local filesystem.
 
 ### Working without Internet Access
 
-If your machine cannot access and download the catalog and components from
-the Internet, either because it is behind a proxy, or for security reasons,
-GraalVM Updater can install components from a local directory, or a directory on
-a network share accessible on the target machine.
+If your machine cannot access and download the catalog and components from the Internet, either because it is behind a proxy, or for security reasons,
+GraalVM Updater can install components from a local directory, or a directory on a network share accessible on the target machine.
 
-You need to prepare a directory, download all components that you want to install
-and their dependencies (in case they require other GraalVM components to work) into
-that directory.
+You need to prepare a directory, download all components that you want to install and their dependencies (in case they require other GraalVM components to work) into that directory.
 
-Then you can use `gu -L install /path/to/file` (where the `-L` option instructs to use local files,
-equivalent to `--local-file` or `--file`). Adding the `-D` option will instruct GraalVM Updater
-to look for potential dependencies in the directory next to the
-installable file. Additionally, `gu -C /path/to/download/dir install component` can be used, with the specified
-directory contents acting as a catalog of components.
+Then you can use `gu -L install /path/to/file` (where the `-L` option instructs to use local files, equivalent to `--local-file` or `--file`).
+Adding the `-D` option will instruct GraalVM Updater to look for potential dependencies in the directory next to the installable file.
+Additionally, `gu -C /path/to/download/dir install component` can be used, with the specified directory contents acting as a catalog of components.
 
 Note that with `gu -L` you need to specify the component's file name, while when using `gu -C <dir>`, the component name must be used:
 ```shell
@@ -300,13 +285,10 @@ gu -C /tmp/instalables install ruby
 
 ## Replace Components and Files
 
-A component may be only installed once. GraalVM Updater refuses to install a
-component if a component with the same ID is already installed. However, the
-installed component can be replaced. GraalVM Updater first uninstalls the
-component and then installs a new package.
+A component may be only installed once. GraalVM Updater refuses to install a component if a component with the same ID is already installed.
+However, the installed component can be replaced. GraalVM Updater first uninstalls the component and then installs a new package.
 
-To replace a component, use the `-r`
-option, and the `-L` (`--local-file` or `--file`) option to treat parameters as local filename of a packaged component:
+To replace a component, use the `-r` option, and the `-L` (`--local-file` or `--file`) option to treat parameters as local filename of a packaged component:
 ```shell
 gu install -L -r component.jar
 gu install -r ruby
@@ -314,18 +296,16 @@ gu install -r ruby
 
 The process is the same as if `gu remove` is run first and `gu install` next.
 
-GraalVM Updater also refuses to overwrite existing files if the
-to-be-installed and existing versions differ. There are cases when refreshing
-file contents may be needed, such as if they were modified or damaged. In this case, use the `-o` option:
+GraalVM Updater also refuses to overwrite existing files if the to-be-installed and existing versions differ.
+There are cases when refreshing file contents may be needed, such as if they were modified or damaged.
+In this case, use the `-o` option:
 ```shell
 gu install -L -o component.jar
 gu install -o ruby
 ```
 
-GraalVM Updater will then instruct the user to replace the contained files of a
-component. By default, it will not alter anything. Alternatively, use the `-f`
-(`--force`) option, which disables most of the checks, and allows the user to
-install non-matching versions.
+GraalVM Updater will then instruct the user to replace the contained files of a component.
+By default, it will not alter anything. Alternatively, use the `-f` (`--force`) option, which disables most of the checks, and allows the user to install non-matching versions.
 
 ### Troubleshooting
 
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index fb8074f062cc..752c3584e3fd 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -14,20 +14,17 @@ permalink: /reference-manual/polyglot-programming/
 * [Passing Options Programmatically](#passing-options-programmatically)
 * [Passing Options Using JVM Arguments](#passing-options-using-jvm-arguments)
 
-GraalVM allows users to write polyglot applications that seamlessly
-pass values from one language to another by means of the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) (henceforth "Truffle").
+GraalVM allows users to write polyglot applications that seamlessly pass values from one language to another by means of the [Truffle language implementation framework](../graalvm-as-a-platform/truffle/README.md) (henceforth "Truffle").
 
 Truffle is a Java library for building programming languages implementations as interpreters for self-modifying Abstract Syntax Trees.
 When writing a language interpreter with Truffle, it will automatically use the GraalVM compiler as a just-in-time compiler for the language.
 By having access to this framework, a Ruby application, for example, can run on the same JVM as a Java application.
 Also, a host JVM-based language and a guest language can directly interoperate with each other and pass data back and forth in the same memory space.
 
-In order to provide foreign polyglot values in the languages implemented with Truffle, the so-called _polyglot interoperability protocol_ has been developed. This
-interoperability protocol consists of a set of standardized messages that every
-language implements and uses for foreign polyglot values. The protocol allows
-GraalVM to support interoperability between any combination of languages without
-requiring them to know of each other. For more details, proceed to the
-[High-Performance Cross-Language Interoperability in a Multi-Language Runtime](http://dx.doi.org/10.1145/2816707.2816714) paper.
+In order to provide foreign polyglot values in the languages implemented with Truffle, the so-called _polyglot interoperability protocol_ has been developed.
+This interoperability protocol consists of a set of standardized messages that every language implements and uses for foreign polyglot values.
+The protocol allows GraalVM to support interoperability between any combination of languages without requiring them to know of each other.
+For more details, proceed to the [High-Performance Cross-Language Interoperability in a Multi-Language Runtime](http://dx.doi.org/10.1145/2816707.2816714) paper.
 
 Throughout this section you learn how to combine multiple languages using GraalVM Polyglot APIs.
 
@@ -41,12 +38,12 @@ Ensure you set up GraalVM before you begin.
 The below examples work:
 * on a JVM, by passing `--polyglot --jvm`.
 * on native launchers with `--polyglot` (e.g., `js --polyglot`).
-  It might be required to [rebuild images](/reference-manual/graalvm-updater/#rebuild-images) to access languages installed with `gu`.
+  It might be required to [rebuild images](graalvm-updater.md/#rebuild-images) to access languages installed with `gu`.
 * with native executables (e.g., `native-image --language:js`).
 
 For native launchers and native executables using Java as a Target Language
 and accessing classes other than Java arrays, it is required to recompile the image and provide
-a [reflection configuration file](/reference-manual/native-image/Reflection/).
+a [reflection configuration file](native-image/Reflection.md).
 
 Note: To start an application with LLVM as a Target Language, make sure
 to precompile the _polyglot.c_ file provided below.
@@ -201,7 +198,7 @@ polyglot --jvm polyglot.js polyglot.R polyglot.rb
 ```
 
 We have also included a basic experimental shell for multiple languages called the _Polyglot Shell_.
-It is useful to quickly test the interactivity of languages implemented with the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/).
+It is useful to quickly test the interactivity of languages implemented with the [Truffle framework](../graalvm-as-a-platform/truffle/README.md).
 This is how you can start it:
 
 ```shell
diff --git a/docs/reference-manual/reference-manuals.md b/docs/reference-manual/reference-manuals.md
index 969593093a0d..3c1e33cd879d 100644
--- a/docs/reference-manual/reference-manuals.md
+++ b/docs/reference-manual/reference-manuals.md
@@ -14,25 +14,25 @@ environment for their workloads.
 
 ## Technologies
 
-[Native Image](/reference-manual/native-image/) - learn in detail about Native Image: GraalVM's innovative technology that can ahead-of-time compile Java code to a self-contained native executable.
+[Native Image](native-image/README.md) - learn in detail about Native Image: GraalVM's innovative technology that can ahead-of-time compile Java code to a self-contained native executable.
 
-[Compiler](/reference-manual/compiler/) - learn about the uniqueness of the GraalVM compiler and its advantages.
+[Compiler](compiler.md) - learn about the uniqueness of the GraalVM compiler and its advantages.
 
-[Updater](/reference-manual/graalvm-updater/) - learn how to add more capabilities and upgrade the core GraalVM installation.
+[Updater](graalvm-updater.md) - learn how to add more capabilities and upgrade the core GraalVM installation.
 
-[Polyglot Programming](/reference-manual/polyglot-programming/) - learn how to write polyglot applications and allow languages to directly interoperate with each other in the same memory space.
+[Polyglot Programming](polyglot-programming.md) - learn how to write polyglot applications and allow languages to directly interoperate with each other in the same memory space.
 
-[Embedding Languages](/reference-manual/embed-languages/) - learn how to embed polyglot applications in Java host applications or native images.
+[Embedding Languages](embedding/embed-languages.md) - learn how to embed polyglot applications in Java host applications or native images.
 
 ## Specific Languages
 
 If you are mostly interested in the GraalVM support for a specific language, here you can find the most extensive documentation:
 
-* [Java](/reference-manual/java/)
-* [Java on Truffle](/reference-manual/java-on-truffle/)
-* [JavaScript and Node.js](/reference-manual/js/)
-* [LLVM Languages](/reference-manual/llvm/)
-* [Python](/reference-manual/python/)
-* [R](/reference-manual/r/)
-* [Ruby](/reference-manual/ruby/)
-* [WebAssembly](/reference-manual/wasm/)
+* [Java](java/README.md)
+* [Java on Truffle](java-on-truffle/README.md)
+* [JavaScript and Node.js](js/README.md)
+* [LLVM Languages](llvm/README.md)
+* [Python](python/README.md)
+* [R](r/README.md)
+* [Ruby](ruby/README.md)
+* [WebAssembly](wasm/README.md)

From 7d272da3ce44ecbeec24cd51aea3807d9cb41e82 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 23 Sep 2021 22:39:20 +0300
Subject: [PATCH 394/681] docs/embedding, docs/java, docs/java-on-truffle,
 docs/llvm, docs/wasm update ref links to rel paths; start sentences from a
 new line

---
 .../embedding/embed-languages.md              |   6 +-
 .../embedding/sandbox-options.md              |   2 +-
 .../reference-manual/java-on-truffle/Demos.md |   8 +-
 docs/reference-manual/java-on-truffle/FAQ.md  |   2 +-
 .../java-on-truffle/HotSwapPluginAPI.md       |   6 +-
 .../java-on-truffle/ImplementationDetails.md  |   8 +-
 .../java-on-truffle/Interoperability.md       |   2 +-
 .../java-on-truffle/README.md                 |  20 +--
 docs/reference-manual/java/Operations.md      | 126 +++++++-----------
 docs/reference-manual/java/README.md          |   2 +-
 docs/reference-manual/llvm/Compatibility.md   |  18 +--
 docs/reference-manual/llvm/Compiling.md       |  42 +++---
 docs/reference-manual/llvm/Debugging.md       |  15 +--
 .../reference-manual/llvm/Interoperability.md |  21 +--
 docs/reference-manual/llvm/NativeExecution.md |  18 +--
 docs/reference-manual/llvm/README.md          |  13 +-
 docs/reference-manual/wasm/README.md          |   6 +-
 17 files changed, 125 insertions(+), 190 deletions(-)

diff --git a/docs/reference-manual/embedding/embed-languages.md b/docs/reference-manual/embedding/embed-languages.md
index 24bc455db339..6f5c07cd083a 100644
--- a/docs/reference-manual/embedding/embed-languages.md
+++ b/docs/reference-manual/embedding/embed-languages.md
@@ -31,7 +31,7 @@ beneath each code example to choose between JavaScript, R, Ruby, and Python.
 Ensure you set up GraalVM before you begin.
 
 ## Compile and Run a Polyglot Application
-GraalVM can run polyglot applications written in any language implemented with the [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/).
+GraalVM can run polyglot applications written in any language implemented with the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md).
 These languages are henceforth referenced as **guest languages**.
 
 Complete the steps in this section to create a sample polyglot
@@ -543,12 +543,12 @@ public class Main {
     public static void main(String[] args) {
         try (Context outer = Context.newBuilder()
                                    .allowAllAccess(true)
-                               .build()) {            
+                               .build()) {
             outer.eval("js", "inner = Java.type('org.graalvm.polyglot.Context').create()");
             outer.eval("js", "value = inner.eval('js', '({data:42})')");
             int result = outer.eval("js", "value.data").asInt();
             outer.eval("js", "inner.close()");
-            
+
             System.out.println("Valid " + (result == 42));
         }
     }
diff --git a/docs/reference-manual/embedding/sandbox-options.md b/docs/reference-manual/embedding/sandbox-options.md
index 116e08e0aef6..2c20f3904650 100644
--- a/docs/reference-manual/embedding/sandbox-options.md
+++ b/docs/reference-manual/embedding/sandbox-options.md
@@ -6,7 +6,7 @@ The following document describes how to configure sandbox resource limits using
 
 In general all resource limit options are prefixed with `sandbox` option group and they can be listed using the help of any language launcher provided in GraalVM e.g. `js --help:tools`.
 Polyglot options can be provided through the language launcher, using the polyglot embedding API of the Graal SDK, or on the JVM using a system property.
-For better understanding of the examples it is recommended to read the [polyglot embedding guide](/reference-manual/embed-languages/) of the reference manual first.
+For better understanding of the examples it is recommended to read the [polyglot embedding guide](embed-languages.md) of the reference manual first.
 
 Currently all sandbox options are experimental therefore in these examples it is assumed that experimental options are enabled (e.g. with `--experimental-options`).
 The options are a best effort approach to limiting resource usage of guest applications.
diff --git a/docs/reference-manual/java-on-truffle/Demos.md b/docs/reference-manual/java-on-truffle/Demos.md
index 16f73280241d..6e1af7f10350 100644
--- a/docs/reference-manual/java-on-truffle/Demos.md
+++ b/docs/reference-manual/java-on-truffle/Demos.md
@@ -131,7 +131,7 @@ GraalVM Native Image technology allows compiling applications ahead-of-time (AOT
 The main trade off for using Native Image is that the analysis and compilation of your program happens under the closed world assumption, meaning the static analysis needs to process all bytecode which will ever be executed in the application.
 This makes using some language features like dynamic class loading or reflection tricky.
 
-Java on Truffle is a JVM implementation of a JVM bytecode interpreter, built on the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/).
+Java on Truffle is a JVM implementation of a JVM bytecode interpreter, built on the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md).
 It is essentially a Java application, as are the Truffle framework itself and the GraalVM JIT compiler.
 All three of them can be compiled ahead-of-time with `native-image`.
 Using Java on Truffle for some parts of your application makes it possible to isolate the required dynamic behaviour and still use the native image on the rest of your code.
@@ -144,9 +144,9 @@ It is a REPL capable of evaluating Java code and consists of two parts:
 This design naturally fits the point we are trying to illustrate. We can build a native executable of the JShell's UI part, and make it include Java on Truffle to run the code dynamically specified at run time.
 
 Prerequisites:
-* [GraalVM 21.0](/downloads/)
-* [Native Image](/reference-manual/native-image/#install-native-image)
-* [Java on Truffle](/reference-manual/java-on-truffle/#install-java-on-truffle)
+* [GraalVM 21.0](https://www.graalvm.org/downloads/)
+* [Native Image](../native-image/README.md/#install-native-image)
+* [Java on Truffle](README.md/#install-java-on-truffle)
 
 
 1. Clone the [project](https://github.com/graalvm/graalvm-demos) with the demo applications and navigate to the `espresso-jshell` directory:
diff --git a/docs/reference-manual/java-on-truffle/FAQ.md b/docs/reference-manual/java-on-truffle/FAQ.md
index b54113ff9670..8020dd6535f8 100644
--- a/docs/reference-manual/java-on-truffle/FAQ.md
+++ b/docs/reference-manual/java-on-truffle/FAQ.md
@@ -14,7 +14,7 @@ That means it can only run a Java program once it has been compiled to Java byte
 In the GraalVM family, this is similar to WebAssembly or the LLVM interpreter: while both can run C programs, they have to be complied by a C compiler first.
 
 ### Does Java running on Truffle run on HotSpot too?
-Like other languages implemented with the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/), it can run both as a native image or on top of HotSpot.
+Like other languages implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md), it can run both as a native image or on top of HotSpot.
 Running on top of HotSpot is currently only possible on Linux.
 We plan to extend this capability to macOS and Windows platforms also.
 
diff --git a/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md b/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
index 55891a5abf89..3f755bab2d7b 100644
--- a/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
+++ b/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
@@ -7,7 +7,7 @@ permalink: /reference-manual/java-on-truffle/hotswap-plugin/
 
 # Truffle on Java HotSwap Plugin API
 
-With Java on Truffle you can benefit from enhanced HotSwap [capabilites](/reference-manual/java-on-truffle/demos/#enhanced-hotswap-capabilities-with-java-on-truffle) that allow the code to evolve naturally during development without the need for restarting a running application.
+With Java on Truffle you can benefit from enhanced HotSwap [capabilites](Demos.md/#enhanced-hotswap-capabilities-with-java-on-truffle) that allow the code to evolve naturally during development without the need for restarting a running application.
 ​
 While code reloading (HotSwap) is a powerful tool, it is not sufficient to reflect all kinds of changes, e.g., changes to annotations, framework-specific changes such as implemented services or beans.
 For these things the code often needs to be executed to reload configurations or contexts before the changes are fully reflected in the running instance.
@@ -18,7 +18,7 @@ The main design principle is that you can register various HotSwap listeners tha
 Examples include the ability to re-run a static initializer, a generic post HotSwap callback and hooks when implementations for a certain service provider changes.
 ​
 **Note**: The HotSwap Plugin API is under development and more fine-grained registration of HotSwap listeners are likely to be added upon requests from the community.
-You are welcomed to send enhancement requests to help shape the API through our community support [channels](/community/).
+You are welcomed to send enhancement requests to help shape the API through our community support [channels](https://www.graalvm.org/community/).
 
 Review the HotSwap Plugin API by going through a running example that will enable more powerful reloading support on [Micronaut](https://micronaut.io/).
 ​
@@ -138,7 +138,7 @@ Here is a sample application created from the tutorial ["Creating your first Mic
 Example's sources can be downloaded as a ready-made Gradle project from [here](https://guides.micronaut.io/latest/micronaut-creating-first-graal-app-gradle-java.zip).
 Download, unzip and open the project in your IDE.
 
-Before you proceed, make sure that you have Java on Truffle [installed](/reference-manual/java-on-truffle/#install-java-on-truffle) and set the GraalVM as the project SDK.
+Before you proceed, make sure that you have Java on Truffle [installed](README.md/#install-java-on-truffle) and set the GraalVM as the project SDK.
 ​
 1. In your IDE navigate to the root `build.gradle` within the sample project. Add:
 
diff --git a/docs/reference-manual/java-on-truffle/ImplementationDetails.md b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
index 02b49e1b5ae7..a5a83ccb56fe 100644
--- a/docs/reference-manual/java-on-truffle/ImplementationDetails.md
+++ b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
@@ -21,7 +21,7 @@ Java on Truffle is a minified Java VM that implements all core components of a V
 * Java Debug Wire Protocol (JDWP)
 
 Java on Truffle reuses all JARs and native libraries from GraalVM.
-All native libraries and methods are loaded/accessed/called via [Truffle Native Function Interface (JNI)](https://www.graalvm.org/graalvm-as-a-platform/language-implementation-framework/NFI/).
+All native libraries and methods are loaded/accessed/called via [Truffle Native Function Interface (JNI)](../../graalvm-as-a-platform/truffle/NFI.md).
 JNI handles are implemented in Java on Truffle, e.g., all Truffle NFI methods only receive and return primitives.
 Some methods are substituted for performance, e.g., `Math.sqrt`, `System.arraycopy`, avoiding the expensive transition to native.
 
@@ -33,8 +33,8 @@ This mode is not used when running in a native image since there will be no conf
 
 * Java on Truffle does not implement the [JVM Tool Interface (JVMTI)](https://docs.oracle.com/en/java/javase/11/docs/specs/jvmti.html). As a result, it does not support the `-agentlib`, or `-agentpath` VM options.
 * Java on Truffle does not implement the `java.lang.instrument` interface. As a result it does not support the `-javaagent` VM option.
-* Java on Truffle currently uses the standard native libraries from the Java core library. This requires allowing a polyglot `Context` native access. Because of the way these libraries are loaded (via [Truffle NFI](https://www.graalvm.org/graalvm-as-a-platform/language-implementation-framework/NFI/)), running on top of HotSpot only works on Linux (with `glibc`). Running as part of a native image works on Linux, Windows, and macOS but it currently limited to one context.
+* Java on Truffle currently uses the standard native libraries from the Java core library. This requires allowing a polyglot `Context` native access. Because of the way these libraries are loaded (via [Truffle NFI](../../graalvm-as-a-platform/truffle/NFI.md)), running on top of HotSpot only works on Linux (with `glibc`). Running as part of a native image works on Linux, Windows, and macOS but it currently limited to one context.
 * Support for [Java Management Extensions (JMX)](https://docs.oracle.com/javase/tutorial/jmx/index.html) is partial and some methods might return partial data.
-* The [Debugger Protocol Implementation (JDWP)](https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html) lacks some capabilities compared to HotSpot. It will correctly report the supported [capabilities](https://docs.oracle.com/javase/8/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_VirtualMachine_Capabilities). In particular actions that require to enumerate all Java objects are not supported. However it does support a few hot reloading cases that HotSpot does not. See [Enhanced HotSwap Capabilities with Java on Truffle](/reference-manual/java-on-truffle/demos/#enhanced-hotswap-capabilities-with-java-on-truffle).
+* The [Debugger Protocol Implementation (JDWP)](https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html) lacks some capabilities compared to HotSpot. It will correctly report the supported [capabilities](https://docs.oracle.com/javase/8/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_VirtualMachine_Capabilities). In particular actions that require to enumerate all Java objects are not supported. However it does support a few hot reloading cases that HotSpot does not. See [Enhanced HotSwap Capabilities with Java on Truffle](Demos.md/#enhanced-hotswap-capabilities-with-java-on-truffle).
 * When the `java.MultiThreaded` option is set to "false", [reference processing](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ref/package-summary.html) will not happen. Depending on the application, this could create resource leaks. Note that this option is set to "false" automatically if Java on Truffle runs in a context where a single-threaded language is enabled (e.g., JavaScript).
-* Java on Truffle does not support the [Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html) yet. However, it provides a guest Java Polyglot API, described in `polyglot.jar`. For more information, see [Interoperability with Truffle Languages](/reference-manual/java-on-truffle/interoperability/).
+* Java on Truffle does not support the [Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html) yet. However, it provides a guest Java Polyglot API, described in `polyglot.jar`. For more information, see [Interoperability with Truffle Languages](Interoperability.md).
diff --git a/docs/reference-manual/java-on-truffle/Interoperability.md b/docs/reference-manual/java-on-truffle/Interoperability.md
index 4c4e24b27587..2cd16b77f0cc 100644
--- a/docs/reference-manual/java-on-truffle/Interoperability.md
+++ b/docs/reference-manual/java-on-truffle/Interoperability.md
@@ -7,7 +7,7 @@ permalink: /reference-manual/java-on-truffle/interoperability/
 
 # Interoperability with Truffle Languages
 
-Java on Truffle allows you to interface other "Truffle" languages (languages which interpreters are implemented with the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/)) to create polyglot programs -- programs written in more than one language.
+Java on Truffle allows you to interface other "Truffle" languages (languages which interpreters are implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md)) to create polyglot programs -- programs written in more than one language.
 
 This guide describes how to load code written in foreign languages, how to export and import objects between languages, how to use Java on Truffle objects from a foreign language, how to use foreign objects from Java on Truffle, and how to embed in host Java.
 
diff --git a/docs/reference-manual/java-on-truffle/README.md b/docs/reference-manual/java-on-truffle/README.md
index 6dfe6681fbc4..5adec74167a6 100644
--- a/docs/reference-manual/java-on-truffle/README.md
+++ b/docs/reference-manual/java-on-truffle/README.md
@@ -7,14 +7,14 @@ permalink: /reference-manual/java-on-truffle/
 
 # Java on Truffle
 
-Using GraalVM, you can run Java applications normally [on the JVM](/reference-manual/java/), in [Native Image](/reference-manual/native-image/), and now on Truffle.
+Using GraalVM, you can run Java applications normally [on the JVM](../java/README.md), in [Native Image](../native-image/README.md), and now on Truffle.
 Java on Truffle is an implementation of the Java Virtual Machine Specification, [Java SE 8](https://docs.oracle.com/javase/specs/jvms/se8/html/index.html) and [Java SE 11](https://docs.oracle.com/javase/specs/jvms/se11/html/index.html), built upon GraalVM as a Truffle interpreter.
 It is a minified Java VM that includes all core components of a VM, implements the same API as the Java Runtime Environment library (libjvm.so), and reuses all JARs and native libraries from GraalVM.
-See the [Implementation Details](/reference-manual/java-on-truffle/implementation/) for more information.
+See the [Implementation Details](ImplementationDetails.md) for more information.
 The project name behind this implementation is "Espresso".
 Its open source version is available on [GitHub](https://github.com/oracle/graal/tree/master/espresso).
 
-The Java on Truffle execution mode runs Java via a Java bytecode interpreter, implemented with the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) – an open-source library for writing interpreters for programming languages.
+The Java on Truffle execution mode runs Java via a Java bytecode interpreter, implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md) – an open-source library for writing interpreters for programming languages.
 Now Java can be executed by the same principle as other languages in the GraalVM ecosystem (JavaScript, Ruby, Python, R), directly interoperate with those languages, and pass data back and forth in the same memory space.
 Besides complete language interoperability, with Java on Truffle you can:
 
@@ -28,8 +28,8 @@ It is available as of version 21.0.0.
 
 ## Install Java on Truffle
 
-To run Java on Truffle, you need to have [GraalVM installed](/docs/getting-started/#install-graalvm).
-The Java on Truffle runtime is not available by default, but can be easily added to GraalVM using the [GraalVM Updater tool](/reference-manual/graalvm-updater/).
+To run Java on Truffle, you need to have [GraalVM installed](../../getting-started/graalvm-community/get-started-graalvm-community.md).
+The Java on Truffle runtime is not available by default, but can be easily added to GraalVM using the [GraalVM Updater tool](../graalvm-updater.md).
 
 For GraalVM Community Edition users, run the following command to install Java on Truffle from the GitHub catalog:
 ```shell
@@ -81,7 +81,7 @@ You can still influence the performance by passing the following options to `jav
 * `--engine.MultiTier=true` to enable multi-tier compilation;
 * `--engine.Inlining=false` in combination with `--java.InlineFieldAccessors=true` to make the compilation faster, in exchange for slower performance.
 
-The `--vm.XX:` syntax ensures the option is passed to the underlying [native image VM](https://www.graalvm.org/reference-manual/native-image/HostedvsRuntimeOptions).
+The `--vm.XX:` syntax ensures the option is passed to the underlying [native image VM](../native-image/HostedvsRuntimeOptions.md).
 When using the `-XX:` syntax, the VM first checks if there is such an option in the Java on Truffle runtime.
 If there is none, it will try to apply this option to the underlying native image VM.
 This might be important for options such as `MaxDirectMemorySize` which can be set independently at both levels: `-XX:MaxDirectMemorySize=256M` controls how much native memory can be reserved by the Java program running on Truffle (the guest VM), while `--vm.XX:MaxDirectMemorySize=256M` controls how much native memory can be reserved by native image (the host VM).
@@ -167,11 +167,11 @@ It should show GraalVM as project's JRE and VM options should include `-truffle
 ## What to Read Next
 
 Java on Truffle enables a seamless Java interoperability with other languages in the GraalVM ecosystem.
-Check the [Interoperability with Truffle Languages guide](/reference-manual/java-on-truffle/interoperability/) to learn how to load code written in foreign languages, export and import objects between languages, how to use Java-on-Truffle objects from a foreign language and vice versa to create powerful polyglot programs.
+Check the [Interoperability with Truffle Languages guide](Interoperability.md) to learn how to load code written in foreign languages, export and import objects between languages, how to use Java-on-Truffle objects from a foreign language and vice versa to create powerful polyglot programs.
 
-To learn about the implementation approach, project's current status, and known limitations proceed to [Implementation Details](/reference-manual/java-on-truffle/implementation/).
+To learn about the implementation approach, project's current status, and known limitations proceed to [Implementation Details](ImplementationDetails.md).
 
 You can already run some large applications like the Eclipse IDE, Scala or other languages REPLs, etc. in the Java on Truffle execution mode.
-We recommend having a look at the collection of [Demo Applications](/reference-manual/java-on-truffle/demos/).
+We recommend having a look at the collection of [Demo Applications](Demos.md).
 
-If you have a question, check the available [FAQs](/reference-manual/java-on-truffle/faq/), or reach us directly over the **#espresso** channel in [GraalVM Slack](https://www.graalvm.org/slack-invitation/).
+If you have a question, check the available [FAQs](FAQ.md), or reach us directly over the **#espresso** channel in [GraalVM Slack](https://www.graalvm.org/slack-invitation/).
diff --git a/docs/reference-manual/java/Operations.md b/docs/reference-manual/java/Operations.md
index d295a86b7e84..88064a7c2416 100644
--- a/docs/reference-manual/java/Operations.md
+++ b/docs/reference-manual/java/Operations.md
@@ -9,75 +9,55 @@ permalink: /reference-manual/java/operations/
 
 ## Running the GraalVM Compiler in Native Image vs on the JVM
 
-When running the GraalVM compiler on the JVM, it goes through the same warm-up phase that the
-rest of the Java application does. That is, it is first interpreted before
-its hot methods are compiled. This can translate into slightly longer times
-until the application reaches peak performance when compared to the native compilers
-in the JVM such as C1 and C2.
-
-To address the issue of taking longer to reach to peak performance, **libgraal**
-was introduced -- a shared library, produced using [Native Image](../native-image/README.md) to ahead-of-time compile the compiler itself. That means the GraalVM Enterprise
-compiler is deployed as a native shared library.
-
-In this mode, the
-compiler uses memory separate from the HotSpot heap, and it runs compiled from
-the start. Therefore it has execution properties similar to other native HotSpot
-compilers such as C1 and C2. Currently, this is the **default mode** of
-operation. It can be disabled with `-XX:-UseJVMCINativeLibrary`.
+When running the GraalVM compiler on the JVM, it goes through the same warm-up phase that the rest of the Java application does.
+That is, it is first interpreted before its hot methods are compiled.
+This can translate into slightly longer times until the application reaches peak performance when compared to the native compilers in the JVM such as C1 and C2.
+
+To address the issue of taking longer to reach to peak performance, **libgraal** was introduced -- a shared library, produced using [Native Image](../native-image/README.md) to ahead-of-time compile the compiler itself.
+That means the GraalVM Enterprise compiler is deployed as a native shared library.
+
+In this mode, the compiler uses memory separate from the HotSpot heap, and it runs compiled from the start.
+Therefore it has execution properties similar to other native HotSpot compilers such as C1 and C2.
+Currently, this is the **default mode** of operation.
+It can be disabled with `-XX:-UseJVMCINativeLibrary`.
 
 ## Measuring Performance
 
 The first thing to be sure of when measuring performance is to ensure the JVM is using the GraalVM Enterprise compiler.
-In the GraalVM binary, the JVM is configured to use the GraalVM compiler
-as the top tier compiler by default. You can confirm this by adding `-Dgraal.ShowConfiguration=info`
-to the command line. It will produce a line of output similar to the one below
-when the compiler is initialized:
+In the GraalVM binary, the JVM is configured to use the GraalVM compiler as the top tier compiler by default.
+You can confirm this by adding `-Dgraal.ShowConfiguration=info` to the command line.
+It will produce a line of output similar to the one below when the compiler is initialized:
 
 ```shell
 Using Graal compiler configuration 'community' provided by org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory loaded from jar:file:/Users/dsimon/graal/graal/compiler/mxbuild/dists/graal.jar!/org/graalvm/compiler/hotspot/CommunityCompilerConfigurationFactory.class
 ```
 
-Note: The GraalVM compiler is only initialized on the first top-tier JIT compilation request
-so if your application is short-lived, you may not see this output.
+Note: The GraalVM compiler is only initialized on the first top-tier JIT compilation request so if your application is short-lived, you may not see this output.
 
-Optimizing JVM-based applications is a science in itself. The compilation may not
-even be a factor in the case of poor performance as the problem may
-lie in any other part of the VM (I/O, garbage collection, threading, etc), or in
-a poorly written application or 3rd party library code. For this reason, it's
-worth utilizing the [JDK Mission Control](https://www.oracle.com/java/technologies/jdk-mission-control.html) tool chain to
-diagnose the application behavior.
+Optimizing JVM-based applications is a science in itself. The compilation may not even be a factor in the case of poor performance as the problem may
+lie in any other part of the VM (I/O, garbage collection, threading, etc), or in a poorly written application or 3rd party library code.
+For this reason, it's worth utilizing the [JDK Mission Control](https://www.oracle.com/java/technologies/jdk-mission-control.html) tool chain to diagnose the application behavior.
 
-You can also compare performance against the native top-tier compiler in the JVM by
-adding `-XX:-UseJVMCICompiler` to the command line.
+You can also compare performance against the native top-tier compiler in the JVM by adding `-XX:-UseJVMCICompiler` to the command line.
 
-If you observe a significant performance regression when using the GraalVM compiler, please
-open an issue on GitHub. Attaching a Java Flight Recorder log and instructions
-to reproduce the issue makes investigation easier and thus the
-chances of a fix higher. Even better is if you can submit a [JMH](http://openjdk.java.net/projects/code-tools/jmh/)
-benchmark that represents the hottest parts of your application (as identified
-by a profiler). This allows us to very quickly pinpoint missing optimization
-opportunities or to offer suggestions on how to restructure the code to
-avoid or reduce performance bottlenecks.
+If you observe a significant performance regression when using the GraalVM compiler, please open an issue on GitHub.
+Attaching a Java Flight Recorder log and instructions to reproduce the issue makes investigation easier and thus the chances of a fix higher.
+Even better is if you can submit a [JMH](http://openjdk.java.net/projects/code-tools/jmh/) benchmark that represents the hottest parts of your application (as identified by a profiler).
+This allows us to very quickly pinpoint missing optimization opportunities or to offer suggestions on how to restructure the code to avoid or reduce performance bottlenecks.
 
 ## Troubleshooting the GraalVM Compiler
 
-Like all software, the GraalVM compiler is not guaranteed to be bug free so it is useful to
-know how to diagnose and submit useful bug reports if you encounter issues.
+Like all software, the GraalVM compiler is not guaranteed to be bug free so it is useful to know how to diagnose and submit useful bug reports if you encounter issues.
 
-If you spot a security vulnerability, please do **not** report it via GitHub Issues or the public mailing lists,
-but via the process outlined at [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
+If you spot a security vulnerability, please do **not** report it via GitHub Issues or the public mailing lists, but via the process outlined at [Reporting Vulnerabilities guide](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html).
 
 ### Compilation Exceptions
 
-One advantage of the compiler being written in Java is that runtime exceptions during
-compilation are not fatal VM errors. Instead, each compilation has an exception
-handler that takes action based on the `graal.CompilationFailureAction`
-property.
+One advantage of the compiler being written in Java is that runtime exceptions during compilation are not fatal VM errors.
+Instead, each compilation has an exception handler that takes action based on the `graal.CompilationFailureAction` property.
 
-The default value is `Silent`. Specifying `Diagnose` causes failing compilations to be retried
-with extra diagnostics enabled. In this case, just before the VM exits, all diagnostic output
-captured during retried compilations is written to a `.zip` file and its location
-is printed on the console:
+The default value is `Silent`. Specifying `Diagnose` causes failing compilations to be retried with extra diagnostics enabled.
+In this case, just before the VM exits, all diagnostic output captured during retried compilations is written to a `.zip` file and its location is printed on the console:
 ```shell
 Graal diagnostic output saved in /Users/demo/graal-dumps/1499768882600/graal_diagnostics_64565.zip
 ```
@@ -92,11 +72,8 @@ are also supported:
 ### Code Generation Errors
 
 The other type of error you might encounter with compilers is the production of incorrect machine code.
-This error can cause a VM crash, which should produce a file that starts with
-`hs_err_pid` in the current working directory of the VM process. In most cases,
-there is a section in the file that shows the stack at the time of the crash,
-including the type of code for each frame in the stack, as in the following
-example:
+This error can cause a VM crash, which should produce a file that starts with `hs_err_pid` in the current working directory of the VM process.
+In most cases, there is a section in the file that shows the stack at the time of the crash, including the type of code for each frame in the stack, as in the following example:
 
 ```shell
 Stack: [0x00007000020b1000,0x00007000021b1000],  sp=0x00007000021af7a0,  free space=1017k
@@ -106,16 +83,14 @@ j  org.graalvm.compiler.core.gen.NodeLIRBuilder.doBlock(Lorg/graalvm/compiler/no
 j  org.graalvm.compiler.core.LIRGenerationPhase.emitBlock(Lorg/graalvm/compiler/nodes/spi/NodeLIRBuilderTool;Lorg/graalvm/compiler/lir/gen/LIRGenerationResult;Lorg/graalvm/compiler/nodes/cfg/Block;Lorg/graalvm/compiler/nodes/StructuredGraph;Lorg/graalvm/compiler/core/common/cfg/BlockMap;)V+65
 ```
 
-This example shows that the top frame was compiled (J) by the JVMCI compiler,
-which is the GraalVM compiler. The crash occurred at offset 0x141 in the machine
-code produced for:
+This example shows that the top frame was compiled (J) by the JVMCI compiler, which is the GraalVM compiler.
+The crash occurred at offset 0x141 in the machine code produced for:
 ```shell
 org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V
 ```
 
-The next two frames in the stack were executed in the interpreter (j). The
-location of the crash is also often indicated near the top of the file with
-something like this:
+The next two frames in the stack were executed in the interpreter (j).
+The location of the crash is also often indicated near the top of the file with something like this:
 ```shell
 # Problematic frame:
 # J 761 JVMCI org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
@@ -123,8 +98,7 @@ something like this:
 
 In this example, there is likely an error in the code produced by the GraalVM compiler for `NodeLIRBuilder.matchComplexExpressions`.
 
-When filing an issue on [GitHub](https://github.com/oracle/graal/issues)
-for such a crash, you should first attempt to reproduce the crash with extra
+When filing an issue on [GitHub](https://github.com/oracle/graal/issues) for such a crash, you should first attempt to reproduce the crash with extra
 diagnostics enabled for the compilation of the problematic method.
 In this example, you would add the following to your command line:
 ```shell
@@ -132,21 +106,15 @@ In this example, you would add the following to your command line:
 ```
 
 These options are described in more detail [here](https://github.com/oracle/graal/blob/master/compiler/docs/Debugging.md).
-In brief, these options tell the compiler to capture snapshots of the compiler state at
-verbosity level 2 while compiling any method named `matchComplexExpressions` in
-a class with a simple name of `NodeLIRBuilder`. The complete format of the
-`MethodFilter` option is described in the output of `java -XX:+JVMCIPrintProperties`.
+In brief, these options tell the compiler to capture snapshots of the compiler state at verbosity level 2 while compiling any method named `matchComplexExpressions` in a class with a simple name of `NodeLIRBuilder`.
+The complete format of the `MethodFilter` option is described in the output of `java -XX:+JVMCIPrintProperties`.
 
-Quite often, the crash location does not exist directly in the problematic method
-mentioned in the crash log but comes from an inlined method.
+Quite often, the crash location does not exist directly in the problematic method mentioned in the crash log but comes from an inlined method.
 
-In such a case, simply filtering for the problematic method might not capture an
-erroneous compilation causing a crash.
+In such a case, simply filtering for the problematic method might not capture an erroneous compilation causing a crash.
 
-To improve the likelihood of capturing an erroneous compilation, you need to
-broaden the `MethodFilter` value. To guide this, add `-Dgraal.PrintCompilation=true`
-when trying to reproduce the crash so you can see what was compiled just before
-the crash.
+To improve the likelihood of capturing an erroneous compilation, you need to broaden the `MethodFilter` value.
+To guide this, add `-Dgraal.PrintCompilation=true` when trying to reproduce the crash so you can see what was compiled just before the crash.
 
 The following shows sample output from the console:
 ```shell
@@ -166,19 +134,15 @@ HotSpotCompilation-1221        Lorg/graalvm/compiler/hotspot/amd64/AMD64HotSpotL
 # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again
 ```
 Here we see that the crash happened in a different method than the first crash.
-As such, we expand the filter argument to be `-Dgraal.MethodFilter=
-NodeLIRBuilder.matchComplexExpressions,AMD64HotSpotLIRGenerator.getResult`
-and run again.
+As such, we expand the filter argument to be `-Dgraal.MethodFilter=NodeLIRBuilder.matchComplexExpressions,AMD64HotSpotLIRGenerator.getResult` and run again.
 
-When the VM crashes in this way, it does not execute the shutdown code that
-archives the GraalVM compiler diagnostic output or delete the directory it was written to.
+When the VM crashes in this way, it does not execute the shutdown code that archives the GraalVM compiler diagnostic output or delete the directory it was written to.
 This must be done manually after the crash.
 
 By default, the directory is `$PWD/graal-dumps/<timestamp>`; for example, `./graal-dumps/1499938817387`.
 However, you can set the directory with `-Dgraal.DumpPath=<path>`.
 
-A message, such as the following, is printed to the console when this
-directory is first used by the compiler:
+A message, such as the following, is printed to the console when this directory is first used by the compiler:
 ```shell
 Dumping debug output in /Users/demo/graal-dumps/1499768882600
 ```
diff --git a/docs/reference-manual/java/README.md b/docs/reference-manual/java/README.md
index a710012e773a..39b017e18d15 100644
--- a/docs/reference-manual/java/README.md
+++ b/docs/reference-manual/java/README.md
@@ -14,7 +14,7 @@ The JVM passes bytecode to the GraalVM compiler, which compiles that to the mach
 
 GraalVM's dynamic compiler can improve the efficiency and the speed of applications written in Java, Scala, Kotlin, or other JVM languages through unique approaches to code analysis and optimization.
 For example, it assures performance advantages for highly abstracted programs due to its ability to remove costly object allocations.
-To learn more, go to the [Compiler](/reference-manual/compiler/) page.
+To learn more, go to the [Compiler](../compiler.md) page.
 The open source compiler's code is available on [GitHub](https://github.com/oracle/graal/tree/master/compiler).
 
 ## Compiler Operating Modes
diff --git a/docs/reference-manual/llvm/Compatibility.md b/docs/reference-manual/llvm/Compatibility.md
index 7f285f5a1331..c2925c1ea2a3 100644
--- a/docs/reference-manual/llvm/Compatibility.md
+++ b/docs/reference-manual/llvm/Compatibility.md
@@ -11,21 +11,15 @@ It is recommended to use the LLVM toolchain shipped with GraalVM.
 
 ## Optimizations Flags
 
-In contrast to the static compilation model of LLVM languages, in GraalVM the
-machine code is not directly produced from the LLVM bitcode. There is an
-additional dynamic compilation step by the GraalVM compiler.
+In contrast to the static compilation model of LLVM languages, in GraalVM the machine code is not directly produced from the LLVM bitcode.
+There is an additional dynamic compilation step by the GraalVM compiler.
 
-First, the LLVM frontend (e.g., `clang`) performs optimizations on
-the bitcode level, and then the GraalVM compiler does its own optimizations on top of that
-during dynamic compilation. Some optimizations are better when done
-ahead-of-time on bitcode, while other optimizations are better left for the
-dynamic compilation of the GraalVM compiler, when profiling information is available.
+First, the LLVM frontend (e.g., `clang`) performs optimizations on the bitcode level, and then the GraalVM compiler does its own optimizations on top of that during dynamic compilation.
+Some optimizations are better when done ahead-of-time on bitcode, while other optimizations are better left for the dynamic compilation of the GraalVM compiler, when profiling information is available.
 
-The LLVM toolchain that is shipped with GraalVM automatically selects the
-recommended flags by default.
+The LLVM toolchain that is shipped with GraalVM automatically selects the recommended flags by default.
 
-Generally, all optimization levels should work, but for a better result, it is
-recommended to compile the bitcode with the optimization level `-O1`.
+Generally, all optimization levels should work, but for a better result, it is recommended to compile the bitcode with the optimization level `-O1`.
 
 For cross-language interoperability, the `-mem2reg` optimization is required.
 There are two ways to get that: either compile with at least `-O1`, or use the `opt` tool to apply the `-mem2reg` optimization manually.
diff --git a/docs/reference-manual/llvm/Compiling.md b/docs/reference-manual/llvm/Compiling.md
index 4c7d74b507b1..1500c2a0600e 100644
--- a/docs/reference-manual/llvm/Compiling.md
+++ b/docs/reference-manual/llvm/Compiling.md
@@ -11,8 +11,7 @@ As the first step, you have to compile a program to LLVM bitcode using some LLVM
 
 ## File Format
 
-While the GraalVM LLVM runtime can execute [plain bitcode files](https://llvm.org/docs/BitCodeFormat.html),
-the preferred format is a _native executable_ with _embedded bitcode_.
+While the GraalVM LLVM runtime can execute [plain bitcode files](https://llvm.org/docs/BitCodeFormat.html), the preferred format is a _native executable_ with _embedded bitcode_.
 The executable file formats differ on Linux and macOS.
 Linux by default uses ELF files.
 The bitcode is stored in a section called `.llvmbc`.
@@ -31,13 +30,13 @@ To simplify compiling C/C++ to executables with embedded bitcode, GraalVM comes
 The toolchain contains compilers such as `clang` for C or `clang++` for C++, but also other tools that are needed
 for building native projects such as a linker (`ld`), or an archiver (`ar`) for creating static libraries.
 
-The LLVM toolchain can be added to GraalVM on demand with the [GraalVM Updater](https://www.graalvm.org/reference-manual/graalvm-updater) tool:
+The LLVM toolchain can be added to GraalVM on demand with the [GraalVM Updater](../graalvm-updater.md) tool:
 ```shell
 $GRAALVM_HOME/bin/gu install llvm-toolchain
 ```
 
 The above command will install the LLVM toolchain from the GitHub catalog for GraalVM Community users.
-For GraalVM Enterprise users, the [manual installation](https://www.graalvm.org/reference-manual/graalvm-updater/#manual-installation) is required.
+For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md/#manual-installation) is required.
 
 To get the location of the toolchain, use the `--print-toolchain-path` argument of `lli`:
 ```shell
@@ -71,8 +70,8 @@ $GRAALVM_HOME/bin/lli hello
 
 ## External Library Dependencies
 
-If the bitcode file depends on external libraries, GraalVM will automatically
-pick up the dependencies from the binary headers. For example:
+If the bitcode file depends on external libraries, GraalVM will automatically pick up the dependencies from the binary headers.
+For example:
 ```c
 #include <unistd.h>
 #include <ncurses.h>
@@ -95,9 +94,9 @@ lli hello-curses
 
 ## Running C++
 
-For running C++ code, the GraalVM LLVM runtime requires the
-[`libc++`](https://libcxx.llvm.org) standard library from the LLVM project. The
-LLVM toolchain shipped with GraalVM automatically links against `libc++`. For example, save this code as a _hello-c++.cpp_ file:
+For running C++ code, the GraalVM LLVM runtime requires the [`libc++`](https://libcxx.llvm.org) standard library from the LLVM project.
+The LLVM toolchain shipped with GraalVM automatically links against `libc++`.
+For example, save this code as a _hello-c++.cpp_ file:
 ```c++
 #include <iostream>
 
@@ -115,9 +114,8 @@ Hello, C++ World!
 
 ## Running Rust
 
-The LLVM toolchain, bundled with GraalVM, does not come with the Rust
-compiler. To install Rust, run the following in your command prompt, then follow the
-onscreen instructions:
+The LLVM toolchain, bundled with GraalVM, does not come with the Rust compiler.
+To install Rust, run the following in your command prompt, then follow the onscreen instructions:
 ```shell
 curl https://sh.rustup.rs -sSf | sh
 ```
@@ -134,32 +132,26 @@ This can be then compiled to bitcode with the `--emit=llvm-bc` flag:
 rustc --emit=llvm-bc hello-rust.rs
 ```
 
-To run the Rust program, we have to tell GraalVM where to find the Rust
-standard libraries:
+To run the Rust program, we have to tell GraalVM where to find the Rust standard libraries:
 ```shell
 lli --lib $(rustc --print sysroot)/lib/libstd-* hello-rust.bc
 Hello Rust!
 ```
 
-Since the Rust compiler is not using the LLVM toolchain shipped with GraalVM, depending on the
-local Rust installation, an error similar to one of the following might happen:
+Since the Rust compiler is not using the LLVM toolchain shipped with GraalVM, depending on the local Rust installation, an error similar to one of the following might happen:
 ```
 Mismatching target triple (expected x86_64-unknown-linux-gnu, got x86_64-pc-linux-gnu)
 Mismatching target triple (expected x86_64-apple-macosx10.11.0, got x86_64-apple-darwin)
 ```
 
-This indicates that the Rust compiler used a different target triple than the LLVM toolchain
-shipped with GraalVM. In this particular case, the differences are just different naming
-conventions across Linux distributions or MacOS versions, there is no real difference.
+This indicates that the Rust compiler used a different target triple than the LLVM toolchain shipped with GraalVM.
+In this particular case, the differences are just different naming conventions across Linux distributions or MacOS versions, there is no real difference.
 In that case, the error can be safely ignored:
 
 ```shell
 lli --experimental-options --llvm.verifyBitcode=false --lib $(rustc --print sysroot)/lib/libstd-* hello-rust.bc
 ```
 
-This option should only be used after manually verifying that the target triples are
-really compatible, i.e., the architecture, operating system, and C library all match.
-For example, `x86_64-unknown-linux-musl` and `x86_64-unknown-linux-gnu` are really different,
-the bitcode is compiled for a different C library. The `--llvm.verifyBitcode=false` option
-disables all checks, GraalVM will then try to run the bitcode regardless, which might randomly
-fail in unexpected ways.
+This option should only be used after manually verifying that the target triples are really compatible, i.e., the architecture, operating system, and C library all match.
+For example, `x86_64-unknown-linux-musl` and `x86_64-unknown-linux-gnu` are really different, the bitcode is compiled for a different C library.
+The `--llvm.verifyBitcode=false` option disables all checks, GraalVM will then try to run the bitcode regardless, which might randomly fail in unexpected ways.
diff --git a/docs/reference-manual/llvm/Debugging.md b/docs/reference-manual/llvm/Debugging.md
index 6cd9556f5273..e1ee07053df8 100644
--- a/docs/reference-manual/llvm/Debugging.md
+++ b/docs/reference-manual/llvm/Debugging.md
@@ -12,9 +12,9 @@ This includes support for single-stepping, breakpoints, and inspection of local
 To use this feature, make sure to compile your program with debug information enabled by specifying the `-g` argument when compiling with `clang` (the LLVM toolchain shipped with GraalVM will automatically enable debug information).
 This gives you the ability to step through the program's source code and set breakpoints in it.
 
-With GraalVM 20.0 and older, the option `--llvm.enableLVI=true` is needed for being able to inspect variables during debugging.
+<!-- With GraalVM 20.0 and older, the option `--llvm.enableLVI=true` is needed for being able to inspect variables during debugging.
 This option is not enabled by default as it decreases the program's run-time performance.
-Starting with GraalVM 20.1, this option is not needed anymore and thus deprecated.
+Starting with GraalVM 20.1, this option is not needed anymore and thus deprecated. -->
 
 To start debugging, run `lli` with the `--inspect` option:
 ```shell
@@ -35,14 +35,13 @@ To instead parse functions eagerly, and be able to set breakpoints also in funct
 Program-defined breakpoints using the `__builtin_debugtrap` function enables you to mark locations in the program at which you explicitly want GraalVM to halt the program and switch to the debugger.
 The debugger automatically halts at each call to this function as if a breakpoint were set on the call.
 You can use this feature to quickly reach the code you are actually trying to debug without having to first find and set a breakpoint on it after launching your application.
-You can also instruct Chrome Inspector not to suspend your program at the first source-level statement being executed. When doing so, GraalVM will instead execute your program until it reaches a call to `__builtin_debugtrap()` before invoking the debugger.
+You can also instruct Chrome Inspector not to suspend your program at the first source-level statement being executed.
+When doing so, GraalVM will instead execute your program until it reaches a call to `__builtin_debugtrap()` before invoking the debugger.
 To enable this behavior you need to pass the arguments `lli --inspect.Suspend=false --inspect.WaitAttached=true`.
 
 ## Locating Source Files
 
-Debug information in LLVM bitcode files contains absolute search paths to identify the
-location of source code. If the source files did not move, it should be found automatically.
+Debug information in LLVM bitcode files contains absolute search paths to identify the location of source code.
+If the source files did not move, it should be found automatically.
 
-If the source files moved, or were compiled on a different machine, a search path can be
-specified using the `--inspect.SourcePath=<path>` option (multiple paths can be separated
-by `:`).
+If the source files moved, or were compiled on a different machine, a search path can be specified using the `--inspect.SourcePath=<path>` option (multiple paths can be separated by `:`).
diff --git a/docs/reference-manual/llvm/Interoperability.md b/docs/reference-manual/llvm/Interoperability.md
index 7910a0e0b877..9900f825bba0 100644
--- a/docs/reference-manual/llvm/Interoperability.md
+++ b/docs/reference-manual/llvm/Interoperability.md
@@ -9,13 +9,10 @@ permalink: /reference-manual/llvm/Interoperability/
 GraalVM supports several other programming languages including JavaScript, Python, Ruby, and R.
 While GraalVM's implementation of `lli` is designed to run LLVM bitcode, it also provides the API for programming language interoperability that lets you execute code from any other GraalVM-supported language.
 
-Dynamic languages like JavaScript usually access object members by name. Since
-normally names are not preserved in LLVM bitcode, it must be compiled with debug
-information enabled (the LLVM toolchain shipped with GraalVM will automatically enable
-debugging information).
+Dynamic languages like JavaScript usually access object members by name.
+Since normally names are not preserved in LLVM bitcode, it must be compiled with debug information enabled (the LLVM toolchain shipped with GraalVM will automatically enable debugging information).
 
-The following example demonstrates how you can use the API for interoperability
-with other programming languages.
+The following example demonstrates how you can use the API for interoperability with other programming languages.
 
 Define a C struct for points and implement allocation functions in a file named _cpart.c_:
 
@@ -52,9 +49,7 @@ void printPoint(struct Point *p) {
 }
 ```
 
-Make sure `LLVM_TOOLCHAIN` resolves to the GraalVM LLVM toolchain (`lli --print-toolchain-path`),
-and then compile _cpart.c_  (the graalvm-llvm library defines the polyglot
-API functions used in the example):
+Make sure `LLVM_TOOLCHAIN` resolves to the GraalVM LLVM toolchain (`lli --print-toolchain-path`), and then compile _cpart.c_  (the graalvm-llvm library defines the Polyglot API functions used in the example):
 ```shell
 $LLVM_TOOLCHAIN/clang -shared cpart.c -lgraalvm-llvm -o cpart.so
 ```
@@ -104,9 +99,8 @@ Point<17.000000,42.000000>
 
 ## Polyglot C API
 
-There are also lower level API functions for directly accessing polyglot values
-from C. See the [Polyglot Programming](https://graalvm.org/reference-manual/polyglot-programming/) reference
-and the comments in `polyglot.h` for more details.
+There are also lower level API functions for directly accessing polyglot values from C.
+See the [Polyglot Programming](../polyglot-programming.md) reference and the comments in `polyglot.h` for more details.
 
 For example, this program allocates and accesses a Java array from C:
 ```c
@@ -163,5 +157,4 @@ java Polyglot
 24
 ```
 
-See the [Embedding Languages](https://graalvm.org/reference-manual/embed-languages/) reference for
-more information.
+See the [Embedding Languages](../embedding/embed-languages.md) reference for more information.
diff --git a/docs/reference-manual/llvm/NativeExecution.md b/docs/reference-manual/llvm/NativeExecution.md
index 6171d928ffc6..6892db89e2f7 100644
--- a/docs/reference-manual/llvm/NativeExecution.md
+++ b/docs/reference-manual/llvm/NativeExecution.md
@@ -12,24 +12,16 @@ The difference lies in safety guarantees and cross-language interoperability.
 
 Note: Managed execution mode for LLVM bitcode is possible with GraalVM Enterprise only.
 
-In the default configuration, cross-language interoperability requires bitcode
-to be compiled with the debug information enabled (`-g`), and the `-mem2reg`
-optimization performed on LLVM bitcode (compiled with at least `-O1`, or
-explicitly using the `opt` tool). These requirements can be overcome in a
-managed environment of GraalVM Enterprise that allows native code to participate in the
-polyglot programs, passing and receiving the data from any other supported
-language. In terms of security, the execution of native code in a managed
-environment passes with additional safety features: catching illegal pointer
-accesses, accessing arrays outside of the bounds, etc.
+In the default configuration, cross-language interoperability requires bitcode to be compiled with the debug information enabled (`-g`), and the `-mem2reg` optimization performed on LLVM bitcode (compiled with at least `-O1`, or explicitly using the `opt` tool).
+These requirements can be overcome in a managed environment of GraalVM Enterprise that allows native code to participate in the polyglot programs, passing and receiving the data from any other supported language.
+In terms of security, the execution of native code in a managed environment passes with additional safety features: catching illegal pointer accesses, accessing arrays outside of the bounds, etc.
 
 There are certain limitations and differences to the native execution depending on the GraalVM edition.
 Consider them respectively.
 
 ### Limitations and Differences to Native Execution on Top of GraalVM Community
-The LLVM interpreter in GraalVM Community Edition environment allows executing LLVM bitcode within a
-multilingual context. Even though it aspires to be a generic LLVM runtime, there
-are certain fundamental and/or implementational limitations that users need to
-be aware of.
+The LLVM interpreter in GraalVM Community Edition environment allows executing LLVM bitcode within a multilingual context.
+Even though it aspires to be a generic LLVM runtime, there are certain fundamental and/or implementational limitations that users need to be aware of.
 
 The following restrictions and differences to native execution (i.e., bitcode compiled down to native code) exist when LLVM bitcode is executed with the LLVM interpreter on top of GraalVM Community:
 
diff --git a/docs/reference-manual/llvm/README.md b/docs/reference-manual/llvm/README.md
index dfcd66c93ff0..829b9d8c943c 100644
--- a/docs/reference-manual/llvm/README.md
+++ b/docs/reference-manual/llvm/README.md
@@ -14,15 +14,16 @@ This allows seamless interoperability with the dynamic languages supported by Gr
 
 ## Running LLVM Bitcode on GraalVM
 
-To run LLVM-based languages on GraalVM, the binaries need to be compiled with embedded
-bitcode. The [Compiling](Compiling.md) guide provides information on
-how to compile a program to LLVM bitcode and what file format is expected.
+To run LLVM-based languages on GraalVM, the binaries need to be compiled with embedded bitcode.
+The [Compiling](Compiling.md) guide provides information on how to compile a program to LLVM bitcode and what file format is expected.
 
 The syntax to execute programs in LLVM bitcode format on GraalVM is:
 ```shell
 lli [LLI options] [GraalVM options] [polyglot options] <bitcode file> [program args]
 ```
-Here, `<bitcode file>` is [a compiled program with embedded LLVM bitcode](Compiling.md). See [LLI Command Options](Options.md) or use `lli --help` for options explanations.
 
-Note: LLVM bitcode is platform-dependent. The program must be compiled to
-bitcode for an appropriate platform.
+Here, `<bitcode file>` is [a compiled program with embedded LLVM bitcode](Compiling.md).
+See [LLI Command Options](Options.md) or use `lli --help` for options explanations.
+
+Note: LLVM bitcode is platform-dependent.
+The program must be compiled to bitcode for an appropriate platform.
diff --git a/docs/reference-manual/wasm/README.md b/docs/reference-manual/wasm/README.md
index 4c47f89a120d..2b6f7b191cca 100644
--- a/docs/reference-manual/wasm/README.md
+++ b/docs/reference-manual/wasm/README.md
@@ -13,12 +13,12 @@ The support for WebAssembly is in the early stages of its development.
 
 ## Installing Wasm
 
-The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](/reference-manual/graalvm-updater/) tool:
+The support is not available by default, but you can add it to GraalVM using the [GraalVM Updater](../graalvm-updater.md) tool:
 ```shell
 gu install wasm
 ```
 The above command will install a community version of a component from the GitHub catalog.
-For GraalVM Enterprise users, the [manual component installation](/reference-manual/graalvm-updater/#component-installation) is required.
+For GraalVM Enterprise users, the [manual component installation](../graalvm-updater.md/#component-installation) is required.
 
 Then `wasm` launcher, which can run compiled WebAssembly binary code, becomes available.
 
@@ -75,4 +75,4 @@ Value mainFunction = context.getBindings("wasm").getMember("main").getMember("_s
 mainFunction.execute();
 ```
 
-For more polyglot examples, visit the [Polyglot Programming](/reference-manual/polyglot-programming/) page.
+For more polyglot examples, visit the [Polyglot Programming](../polyglot-programming.md) page.

From fceb33743665882f6d3929c3e4b80bed05506972 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@redhat.com>
Date: Mon, 11 Oct 2021 13:55:25 +0100
Subject: [PATCH 395/681] Use correct form code (DW_FORM_sec_offset) for
 stmt_list attribute.

---
 .../oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java | 6 +++---
 .../src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java | 3 ++-
 .../oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java   | 2 +-
 .../com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java   | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
index 26916fc8cec1..e8ab5db09050 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
@@ -277,8 +277,8 @@ public void createContent() {
          *
          * <li><code>DW_AT_use_UTF8 : ... DW_FORM_flag</code>
          *
-         * <li><code>DW_AT_stmt_list : .. DW_FORM_data4</code> n.b only for <code>abbrev-code ==
-         * class_unit1</code>
+         * <li><code>DW_AT_stmt_list : .. DW_FORM_sec_offset</code> n.b only for <code>abbrev-code
+         * == class_unit1</code>
          *
          * </ul>
          *
@@ -886,7 +886,7 @@ private int writeClassUnitAbbrev(@SuppressWarnings("unused") DebugContext contex
         }
         if (abbrevCode == DwarfDebugInfo.DW_ABBREV_CODE_class_unit1) {
             pos = writeAttrType(DwarfDebugInfo.DW_AT_stmt_list, buffer, pos);
-            pos = writeAttrForm(DwarfDebugInfo.DW_FORM_data4, buffer, pos);
+            pos = writeAttrForm(DwarfDebugInfo.DW_FORM_sec_offset, buffer, pos);
         }
         /*
          * Now terminate.
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java
index 8fcad6f32b1d..9adc3617678a 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfDebugInfo.java
@@ -169,11 +169,12 @@ public class DwarfDebugInfo extends DebugInfoBase {
     @SuppressWarnings("unused") public static final int DW_FORM_data8 = 0x7;
     @SuppressWarnings("unused") private static final int DW_FORM_string = 0x8;
     @SuppressWarnings("unused") public static final int DW_FORM_block1 = 0x0a;
+    public static final int DW_FORM_ref_addr = 0x10;
     @SuppressWarnings("unused") public static final int DW_FORM_ref1 = 0x11;
     @SuppressWarnings("unused") public static final int DW_FORM_ref2 = 0x12;
     @SuppressWarnings("unused") public static final int DW_FORM_ref4 = 0x13;
     @SuppressWarnings("unused") public static final int DW_FORM_ref8 = 0x14;
-    public static final int DW_FORM_ref_addr = 0x10;
+    public static final int DW_FORM_sec_offset = 0x17;
     public static final int DW_FORM_data1 = 0x0b;
     public static final int DW_FORM_flag = 0xc;
     public static final int DW_FORM_strp = 0xe;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
index b20f1c80f71b..9a93f68fd374 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
@@ -457,7 +457,7 @@ private int writePrimaryClassUnit(DebugContext context, ClassEntry classEntry, b
         /* Only write stmt_list if the entry actually has line number info. */
         if (abbrevCode == DwarfDebugInfo.DW_ABBREV_CODE_class_unit1) {
             log(context, "  [0x%08x]     stmt_list  0x%08x", pos, lineIndex);
-            pos = writeAttrData4(lineIndex, buffer, pos);
+            pos = writeAttrSecOffset(lineIndex, buffer, pos);
         }
 
         /* Now write the child DIEs starting with the layout and pointer type. */
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
index ce45876549e2..bfe21bdb33c0 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
@@ -340,6 +340,10 @@ protected int writeAttrData4(int value, byte[] buffer, int pos) {
         }
     }
 
+    protected int writeAttrSecOffset(int value, byte[] buffer, int pos) {
+        return writeAttrData4(value, buffer, pos);
+    }
+
     protected int writeAttrData2(short value, byte[] buffer, int pos) {
         if (buffer == null) {
             return pos + putShort(value, scratch, 0);

From b1f7d424832a3ea6d1ba6a6db417d0f26c866fa5 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 23 Sep 2021 23:42:59 +0300
Subject: [PATCH 396/681] docs/reference-manual/native-image update ref links
 to rel paths; start sentences from a new line

---
 docs/reference-manual/native-image/Agent.md   |  94 +++++++-----
 .../native-image/BuildConfiguration.md        | 103 ++++++-------
 docs/reference-manual/native-image/C-API.md   |   6 +-
 .../native-image/ClassInitialization.md       |   7 +-
 .../native-image/DynamicProxy.md              |   5 +-
 .../native-image/HostedvsRuntimeOptions.md    |  13 +-
 .../ImplementingNativeMethodsInJavaWithSVM.md | 138 +++++++-----------
 docs/reference-manual/native-image/JNI.md     |   5 +-
 .../native-image/LLVMBackend.md               |   9 +-
 .../native-image/Limitations.md               |  28 ++--
 .../NativeImageHeapdumpEnterprise.md          |  48 +++---
 docs/reference-manual/native-image/Options.md |  22 +--
 docs/reference-manual/native-image/README.md  |  63 ++++----
 .../native-image/Reflection.md                |   7 +-
 docs/reference-manual/native-image/Reports.md |   9 +-
 .../native-image/Resources.md                 |  25 ++--
 16 files changed, 256 insertions(+), 326 deletions(-)

diff --git a/docs/reference-manual/native-image/Agent.md b/docs/reference-manual/native-image/Agent.md
index 1505c516379d..bfbf7d51c920 100644
--- a/docs/reference-manual/native-image/Agent.md
+++ b/docs/reference-manual/native-image/Agent.md
@@ -72,11 +72,9 @@ public class ReflectionExample {
 }
 ```
 
-This is a simple Java program where non-constant strings for accessing program
-elements by name must come as external inputs. The main method invokes a method
-of a particular class (`Class.forName`) whose names are passed as command line
-arguments. Providing any other class or method name on the command line leads to
-an exception.
+This is a simple Java program where non-constant strings for accessing program elements by name must come as external inputs.
+The main method invokes a method of a particular class (`Class.forName`) whose names are passed as command line arguments.
+Providing any other class or method name on the command line leads to an exception.
 
 Having compiled the example, invoke each method:
 ```shell
@@ -94,10 +92,7 @@ $JAVA_HOME/bin/native-image ReflectionExample
 ...
 ./reflectionexample
 ```
-The `reflectionexample` binary is just a launcher for the JVM. To
-build a native image with reflective lookup operations, apply the tracing
-agent to write a configuration file to be later fed into the native image
-build together.
+The `reflectionexample` binary is just a launcher for the JVM. To build a native image with reflective lookup operations, apply the tracing agent to write a configuration file to be later fed into the native image build together.
 
 1. Create a directory `META-INF/native-image` in the working directory:
 ```shell
@@ -108,17 +103,16 @@ mkdir -p META-INF/native-image
 ```shell
 $JAVA_HOME/bin/java -agentlib:native-image-agent=config-output-dir=META-INF/native-image ReflectionExample StringReverser reverse "hello"
 ```
-This command creates a _reflection-config.json_ file which makes the `StringReverser` class and the `reverse()` method accessible via reflection. The _jni-config.json_, _proxy-config.json_ , and _resource-config.json_ configuration files are written in that directory too.
+This command creates a _reflection-config.json_ file which makes the `StringReverser` class and the `reverse()` method accessible via reflection.
+The _jni-config.json_, _proxy-config.json_ , and _resource-config.json_ configuration files are written in that directory too.
 
 3. Build a native image:
 ```shell
 $JAVA_HOME/bin/native-image --no-fallback ReflectionExample
 ```
-The native image builder automatically picks up configuration files in the
-_META-INF/native-image_ directory or subdirectories. However, it is recommended
-to have _META-INF/native-image_ location on the class path, either via a JAR
-file or via the `-cp` flag. It will help to avoid confusion for IDE users where a
-directory structure is defined by the tool.
+The native image builder automatically picks up configuration files in the _META-INF/native-image_ directory or subdirectories.
+However, it is recommended to have _META-INF/native-image_ location on the class path, either via a JAR file or via the `-cp` flag.
+It will help to avoid confusion for IDE users where a directory structure is defined by the tool.
 
 4. Test the methods, but remember that you have not run the tracing agent twice to create a configuration that supports both:
 ```shell
@@ -131,20 +125,15 @@ Exception in thread "main" java.lang.ClassNotFoundException: StringCapitalizer
 	at ReflectionExample.main(ReflectionExample.java:21)
 ```
 
-Neither the tracing agent nor native images generator can automatically check
-if the provided configuration files are complete. The agent only observes and
-records which values are accessed through reflection so that the same accesses
-are possible in a native image. You can either manually edit the
-_reflection-config.json_ file, or re-run the tracing agent to transform the
-existing configuration file, or extend it by using `config-merge-dir` option:
+Neither the tracing agent nor native images generator can automatically check if the provided configuration files are complete.
+The agent only observes and records which values are accessed through reflection so that the same accesses are possible in a native image.
+You can either manually edit the _reflection-config.json_ file, or re-run the tracing agent to transform the existing configuration file, or extend it by using `config-merge-dir` option:
 
 ```shell
 $JAVA_HOME/bin/java -agentlib:native-image-agent=config-merge-dir=META-INF/native-image ReflectionExample StringCapitalizer capitalize "hello"
 ```
-Note, the different `config-merge-dir` option instructs the agent to extend the
-existing configuration files instead of overwriting them. After re-building the
-native image, the `StringCapitalizer` class and the `capitalize` method will be
-accessible too.
+Note, the different `config-merge-dir` option instructs the agent to extend the existing configuration files instead of overwriting them.
+After re-building the native image, the `StringCapitalizer` class and the `capitalize` method will be accessible too.
 
 ![](/img/reflect_config_file_merged.png)
 
@@ -152,9 +141,13 @@ accessible too.
 
 ### Caller-based Filters
 
-By default, the agent filters dynamic accesses which Native Image supports without configuration. The filter mechanism works by identifying the Java method performing the access, also referred to as _caller_ method, and matching its declaring class against a sequence of filter rules. The built-in filter rules exclude dynamic accesses which originate in the JVM, or in parts of a Java class library directly supported by Native Image (such as `java.nio`) from the generated configuration files. Which item (class, method, field, resource, etc.) is being accessed is not relevant for filtering.
+By default, the agent filters dynamic accesses which Native Image supports without configuration.
+The filter mechanism works by identifying the Java method performing the access, also referred to as _caller_ method, and matching its declaring class against a sequence of filter rules.
+The built-in filter rules exclude dynamic accesses which originate in the JVM, or in parts of a Java class library directly supported by Native Image (such as `java.nio`) from the generated configuration files.
+Which item (class, method, field, resource, etc.) is being accessed is not relevant for filtering.
 
-In addition to the built-in filter, custom filter files with additional rules can be specified using the `caller-filter-file` option. For example: `-agentlib:caller-filter-file=/path/to/filter-file,config-output-dir=...`
+In addition to the built-in filter, custom filter files with additional rules can be specified using the `caller-filter-file` option.
+For example: `-agentlib:caller-filter-file=/path/to/filter-file,config-output-dir=...`
 
 Filter files have the following structure:
 ```json
@@ -166,25 +159,46 @@ Filter files have the following structure:
 }
 ```
 
-The `rules` section contains a sequence of rules. Each rule specifies either `includeClasses`, which means that lookups originating in matching classes will be included in the resulting configuration, or `excludeClasses`, which excludes lookups originating in matching classes from the configuration. Each rule defines a pattern for the set of matching classes, which can end in `.*` or `.**`: a `.*` ending matches all classes in a package and that package only, while a `.**` ending matches all classes in the package as well as in all subpackages at any depth. Without `.*` or `.**`, the rule applies only to a single class with the qualified name that matches the pattern. All rules are processed in the sequence in which they are specified, so later rules can partially or entirely override earlier ones. When multiple filter files are provided (by specifying multiple `caller-filter-file` options), their rules are chained together in the order in which the files are specified. The rules of the built-in caller filter are always processed first, so they can be overridden in custom filter files.
+The `rules` section contains a sequence of rules.
+Each rule specifies either `includeClasses`, which means that lookups originating in matching classes will be included in the resulting configuration, or `excludeClasses`, which excludes lookups originating in matching classes from the configuration.
+Each rule defines a pattern for the set of matching classes, which can end in `.*` or `.**`: a `.*` ending matches all classes in a package and that package only, while a `.**` ending matches all classes in the package as well as in all subpackages at any depth. Without `.*` or `.**`, the rule applies only to a single class with the qualified name that matches the pattern.
+All rules are processed in the sequence in which they are specified, so later rules can partially or entirely override earlier ones.
+When multiple filter files are provided (by specifying multiple `caller-filter-file` options), their rules are chained together in the order in which the files are specified.
+The rules of the built-in caller filter are always processed first, so they can be overridden in custom filter files.
 
-In the example above, the first rule excludes lookups originating in all classes from package `com.oracle.svm` and from all of its subpackages (and their subpackages, etc.) from the generated configuration. In the next rule however, lookups from those classes that are directly in package `com.oracle.svm.tutorial` are included again. Finally, lookups from the `HostedHelper` class is excluded again. Each of these rules partially overrides the previous ones. For example, if the rules were in the reverse order, the exclusion of `com.oracle.svm.**` would be the last rule and would override all other rules.
+In the example above, the first rule excludes lookups originating in all classes from package `com.oracle.svm` and from all of its subpackages (and their subpackages, etc.) from the generated configuration.
+In the next rule however, lookups from those classes that are directly in package `com.oracle.svm.tutorial` are included again.
+Finally, lookups from the `HostedHelper` class is excluded again. Each of these rules partially overrides the previous ones.
+For example, if the rules were in the reverse order, the exclusion of `com.oracle.svm.**` would be the last rule and would override all other rules.
 
-For testing purposes, the built-in filter for Java class library lookups can be disabled by adding the `no-builtin-caller-filter` option, but the resulting configuration files are generally unsuitable for a native image build. Similarly, the built-in filter for Java VM-internal accesses based on heuristics can be disabled with `no-builtin-heuristic-filter` and will also generally lead to less usable configuration files. For example: `-agentlib:native-image-agent=no-builtin-caller-filter,no-builtin-heuristic-filter,config-output-dir=...`
+For testing purposes, the built-in filter for Java class library lookups can be disabled by adding the `no-builtin-caller-filter` option, but the resulting configuration files are generally unsuitable for a native image build.
+Similarly, the built-in filter for Java VM-internal accesses based on heuristics can be disabled with `no-builtin-heuristic-filter` and will also generally lead to less usable configuration files.
+For example: `-agentlib:native-image-agent=no-builtin-caller-filter,no-builtin-heuristic-filter,config-output-dir=...`
 
 ### Access Filters
 
-Unlike the caller-based filters described above, which filter dynamic accesses based on where they originate from, _access filters_ apply to the _target_ of the access. Therefore, access filters enable directly excluding packages and classes (and their members) from the generated configuration.
+Unlike the caller-based filters described above, which filter dynamic accesses based on where they originate from, _access filters_ apply to the _target_ of the access.
+Therefore, access filters enable directly excluding packages and classes (and their members) from the generated configuration.
 
-By default, all accessed classes (which also pass the caller-based filters and the built-in filters) are included in the generated configuration. Using the `access-filter-file` option, a custom filter file that follows the file structure described above can be added. The option can be specified more than once to add multiple filter files and can be combined with the other filter options. For example: `-agentlib:access-filter-file=/path/to/access-filter-file,caller-filter-file=/path/to/caller-filter-file,config-output-dir=...`
+By default, all accessed classes (which also pass the caller-based filters and the built-in filters) are included in the generated configuration.
+Using the `access-filter-file` option, a custom filter file that follows the file structure described above can be added.
+The option can be specified more than once to add multiple filter files and can be combined with the other filter options.
+For example: `-agentlib:access-filter-file=/path/to/access-filter-file,caller-filter-file=/path/to/caller-filter-file,config-output-dir=...`
 
 ### Specifying Configuration Files as Native Image Arguments
 
-A directory containing configuration files that is not part of the class path can be specified to `native-image` via `-H:ConfigurationFileDirectories=/path/to/config-dir/`. This directory must directly contain all four files: `jni-config.json`, `reflect-config.json`, `proxy-config.json` and `resource-config.json`. A directory with the same four configuration files that is on the class path, but not in `META-INF/native-image/`, can be provided via `-H:ConfigurationResourceRoots=path/to/resources/`. Both `-H:ConfigurationFileDirectories` and `-H:ConfigurationResourceRoots` can also take a comma-separated list of directories.
+A directory containing configuration files that is not part of the class path can be specified to `native-image` via `-H:ConfigurationFileDirectories=/path/to/config-dir/`.
+This directory must directly contain all four files: `jni-config.json`, `reflect-config.json`, `proxy-config.json` and `resource-config.json`.
+A directory with the same four configuration files that is on the class path, but not in `META-INF/native-image/`, can be provided via `-H:ConfigurationResourceRoots=path/to/resources/`.
+Both `-H:ConfigurationFileDirectories` and `-H:ConfigurationResourceRoots` can also take a comma-separated list of directories.
 
 ### Injecting the Agent via the Process Environment
 
-Altering the `java` command line to inject the agent can prove to be difficult if the Java process is launched by an application or script file, or if Java is even embedded in an existing process. In that case, it is also possible to inject the agent via the `JAVA_TOOL_OPTIONS` environment variable. This environment variable can be picked up by multiple Java processes which run at the same time, in which case each agent must write to a separate output directory with `config-output-dir`. (The next section describes how to merge sets of configuration files.) In order to use separate paths with a single global `JAVA_TOOL_OPTIONS` variable, the agent's output path options support placeholders:
+Altering the `java` command line to inject the agent can prove to be difficult if the Java process is launched by an application or script file, or if Java is even embedded in an existing process.
+In that case, it is also possible to inject the agent via the `JAVA_TOOL_OPTIONS` environment variable.
+This environment variable can be picked up by multiple Java processes which run at the same time, in which case each agent must write to a separate output directory with `config-output-dir`.
+(The next section describes how to merge sets of configuration files.)
+In order to use separate paths with a single global `JAVA_TOOL_OPTIONS` variable, the agent's output path options support placeholders:
 ```shell
 export JAVA_TOOL_OPTIONS="-agentlib:native-image-agent=config-output-dir=/path/to/config-output-dir-{pid}-{datetime}/"
 ```
@@ -193,26 +207,30 @@ The `{pid}` placeholder is replaced with the process identifier, while `{datetim
 
 ### Trace Files
 
-In the examples above, `native-image-agent` has been used to both keep track of the dynamic accesses in a Java VM and then to generate a set of configuration files from them. However, for a better understanding of the execution, the agent can also write a _trace file_ in JSON format that contains each individual access:
+In the examples above, `native-image-agent` has been used to both keep track of the dynamic accesses in a Java VM and then to generate a set of configuration files from them.
+However, for a better understanding of the execution, the agent can also write a _trace file_ in JSON format that contains each individual access:
 ```shell
 $JAVA_HOME/bin/java -agentlib:native-image-agent=trace-output=/path/to/trace-file.json ...
 ```
 
-The `native-image-configure` tool can transform trace files to configuration files that can be used in native image builds. The following command reads and processes `trace-file.json` and generates a set of configuration files in directory `/path/to/config-dir/`:
+The `native-image-configure` tool can transform trace files to configuration files that can be used in native image builds.
+The following command reads and processes `trace-file.json` and generates a set of configuration files in directory `/path/to/config-dir/`:
 ```shell
 native-image-configure generate --trace-input=/path/to/trace-file.json --output-dir=/path/to/config-dir/
 ```
 
 ### Interoperability
 
-Although the agent is distributed with GraalVM, it uses the JVM Tool Interface (JVMTI) and can potentially be used with other JVMs that support JVMTI. In this case, it is necessary to provide the absolute path of the agent:
+Although the agent is distributed with GraalVM, it uses the JVM Tool Interface (JVMTI) and can potentially be used with other JVMs that support JVMTI.
+In this case, it is necessary to provide the absolute path of the agent:
 ```shell
 /path/to/some/java -agentpath:/path/to/graalvm/jre/lib/amd64/libnative-image-agent.so=<options> ...
 ```
 
 ### Native Image Configure Tool
 
-When using the agent in multiple processes at the same time as described in the previous section, `config-output-dir` is a safe option, but results in multiple sets of configuration files. The `native-image-configure-launcher` tool can be used to merge these configuration files. This tool must first be built with:
+When using the agent in multiple processes at the same time as described in the previous section, `config-output-dir` is a safe option, but results in multiple sets of configuration files. The `native-image-configure-launcher` tool can be used to merge these configuration files.
+This tool must first be built with:
 ```shell
 native-image --macro:native-image-configure-launcher
 ```
diff --git a/docs/reference-manual/native-image/BuildConfiguration.md b/docs/reference-manual/native-image/BuildConfiguration.md
index d7718abb2707..60303172d45b 100644
--- a/docs/reference-manual/native-image/BuildConfiguration.md
+++ b/docs/reference-manual/native-image/BuildConfiguration.md
@@ -18,22 +18,17 @@ Native Image supports a wide range of options to configure a native image build
 
 ## Embedding a Configuration File
 
-A recommended way to provide configuration is to embed a
-**native-image.properties** file into a project JAR file. The Native Image builder
-will automatically pick up all configuration options provided anywhere below the
-resource location `META-INF/native-image/` and use it to construct
-`native-image` command line arguments.
-
-To avoid a situation when constituent parts of a project are built
-with overlapping configurations, it is recommended to use "subdirectories" within
-`META-INF/native-image`. That way a JAR file built from multiple maven projects
-cannot suffer from overlapping `native-image` configurations. For example:
+A recommended way to provide configuration is to embed a **native-image.properties** file into a project JAR file.
+The Native Image builder will automatically pick up all configuration options provided anywhere below the resource location `META-INF/native-image/` and use it to construct `native-image` command line arguments.
+
+To avoid a situation when constituent parts of a project are built with overlapping configurations, it is recommended to use "subdirectories" within `META-INF/native-image`.
+That way a JAR file built from multiple maven projects cannot suffer from overlapping `native-image` configurations.
+For example:
 * _foo.jar_ has its configurations in `META-INF/native-image/foo_groupID/foo_artifactID`
 * _bar.jar_ has its configurations in `META-INF/native-image/bar_groupID/bar_artifactID`
 
-The JAR file that contains `foo` and `bar` will then contain both configurations
-without conflicting with one another. Therefore the recommended layout for
-storing native image configuration data in JAR files is the following:
+The JAR file that contains `foo` and `bar` will then contain both configurations without conflicting with one another.
+Therefore the recommended layout for storing native image configuration data in JAR files is the following:
 ```
 META-INF/
 └── native-image
@@ -42,12 +37,9 @@ META-INF/
             └── native-image.properties
 ```
 
-Note that the use of `${.}` in a _native-image.properties_ file expands to the
-resource location that contains that exact configuration file. This can be
-useful if the _native-image.properties_ file wants to refer to resources within
-its "subfolder", for example, `-H:SubstitutionResources=${.}/substitutions.json`.
-Always make sure to use the option variants that take resources, i.e., use
-`-H:ResourceConfigurationResources` instead of `-H:ResourceConfigurationFiles`.
+Note that the use of `${.}` in a _native-image.properties_ file expands to the resource location that contains that exact configuration file.
+This can be useful if the _native-image.properties_ file wants to refer to resources within its "subfolder", for example, `-H:SubstitutionResources=${.}/substitutions.json`.
+Always make sure to use the option variants that take resources, i.e., use `-H:ResourceConfigurationResources` instead of `-H:ResourceConfigurationFiles`.
 Other options that are known to work in this context are:
 * `-H:DynamicProxyConfigurationResources`
 * `-H:JNIConfigurationResources`
@@ -56,16 +48,14 @@ Other options that are known to work in this context are:
 * `-H:SubstitutionResources`
 * `-H:SerializationConfigurationResources`
 
-By having such a composable _native-image.properties_ file, building an image
-does not require any additional arguments specified on command line. It is
-sufficient to just run the following command:
+By having such a composable _native-image.properties_ file, building an image does not require any additional arguments specified on command line.
+It is sufficient to just run the following command:
 ```shell
 $JAVA_HOME/bin/native-image -jar target/<name>.jar
 ```
 
-To debug which configuration data gets applied for the image building, use `native-image --verbose`. This will show from where `native-image` picks up the
-configurations to construct the final composite configuration command line
-options for the native image builder.
+To debug which configuration data gets applied for the image building, use `native-image --verbose`.
+This will show from where `native-image` picks up the configurations to construct the final composite configuration command line options for the native image builder.
 ```shell
 native-image --verbose -jar build/basic-app-0.1-all.jar
 Apply jar:file://~/build/basic-app-0.1-all.jar!/META-INF/native-image/io.netty/common/native-image.properties
@@ -89,44 +79,38 @@ supported.
 
 **Args**
 
-Use this property if your project requires custom `native-image` command line options to build correctly. For example, the `native-image-configure-examples/configure-at-runtime-example` has `Args = --initialize-at-build-time=com.fasterxml.jackson.annotation.JsonProperty$Access`  in its `native-image.properties` file to ensure the class `com.fasterxml.jackson.annotation.JsonProperty$Access` gets initialized at image build time.
+Use this property if your project requires custom `native-image` command line options to build correctly.
+For example, the `native-image-configure-examples/configure-at-runtime-example` has `Args = --initialize-at-build-time=com.fasterxml.jackson.annotation.JsonProperty$Access` in its `native-image.properties` file to ensure the class `com.fasterxml.jackson.annotation.JsonProperty$Access` gets initialized at image build time.
 
 **JavaArgs**
 
-Sometimes it can be necessary to provide custom options to the JVM that runs the
-native image builder. The `JavaArgs` property can be used in this case.
+Sometimes it can be necessary to provide custom options to the JVM that runs the native image builder.
+The `JavaArgs` property can be used in this case.
 
 **ImageName**
 
-This property can be used to specify a user-defined name for the image. If
-`ImageName` is not used, a name gets automatically chosen:
+This property can be used to specify a user-defined name for the image.
+If `ImageName` is not used, a name gets automatically chosen:
 * `native-image -jar <name.jar>` has a default image name `<name>`
 * `native-image -cp ... fully.qualified.MainClass` has a default image name `fully.qualified.mainclass`
 
-Note that using `ImageName` does not prevent the user to override the name later via command line. For example, if `foo.bar` contains `ImageName=foo_app`:
+Note that using `ImageName` does not prevent the user to override the name later via command line.
+For example, if `foo.bar` contains `ImageName=foo_app`:
 * `native-image -jar foo.bar` generates the image `foo_app` but
 * `native-image -jar foo.bar application` generates the image `application`
 
 ### Order of Arguments Evaluation
-The arguments passed to `native-image` are evaluated left-to-right. This also
-extends to arguments that get passed indirectly via `META-INF/native-image`
-based native image configuration. Suppose you have a JAR file that contains
-_native-image.properties_ with `Args = -H:Optimize=0`. Then by using the
-`-H:Optimize=2` option after `-cp <jar-file>` you can override the setting that
-comes from the JAR file.
+The arguments passed to `native-image` are evaluated left-to-right.
+This also extends to arguments that get passed indirectly via `META-INF/native-image` based native image configuration.
+Suppose you have a JAR file that contains _native-image.properties_ with `Args = -H:Optimize=0`.
+Then by using the `-H:Optimize=2` option after `-cp <jar-file>` you can override the setting that comes from the JAR file.
 
 ### Specifying Default Options for Native Image
-If there is a need to pass some options for every image build unconditionally, for
-example, to always generate an image in verbose mode (`--verbose`), you can
-make use of the `NATIVE_IMAGE_CONFIG_FILE` environment variable.
-If it is set to a Java properties file, the Native Image builder will use the
-default setting defined in there on each invocation. Write a
-configuration file and export
-`NATIVE_IMAGE_CONFIG_FILE=$HOME/.native-image/default.properties` in
-`~/.bash_profile`. Every time `native-image` gets used, it will implicitly use
-the arguments specified as `NativeImageArgs`, plus the arguments specified on the
-command line. Here is an example of a configuration file, saved as
-`~/.native-image/default.properties`:
+If there is a need to pass some options for every image build unconditionally, for example, to always generate an image in verbose mode (`--verbose`), you can make use of the `NATIVE_IMAGE_CONFIG_FILE` environment variable.
+If it is set to a Java properties file, the Native Image builder will use the default setting defined in there on each invocation.
+Write a configuration file and export `NATIVE_IMAGE_CONFIG_FILE=$HOME/.native-image/default.properties` in `~/.bash_profile`.
+Every time `native-image` gets used, it will implicitly use the arguments specified as `NativeImageArgs`, plus the arguments specified on the command line.
+Here is an example of a configuration file, saved as `~/.native-image/default.properties`:
 
 ```
 NativeImageArgs = --configurations-path /home/user/custom-image-configs \
@@ -146,9 +130,9 @@ export NATIVE_IMAGE_USER_HOME= $HOME/.local/share/native-image
 The native image build runs on the Java HotSpot VM and uses the memory management of the underlying platform.
 The usual Java HotSpot command-line options for garbage collection apply to the native image builder.
 
-During the native image build, the representation of a whole program is created to
-figure out which classes and methods will be used at run time. It is a
-computationally intensive process. The default values for memory usage at image build time are:
+During the native image build, the representation of a whole program is created to figure out which classes and methods will be used at run time.
+It is a computationally intensive process.
+The default values for memory usage at image build time are:
 ```
 -Xss10M \
 -Xms1G \
@@ -164,21 +148,16 @@ Check other related options to the native image builder from the `native-image -
 
 ## Runtime vs Build-Time Initialization
 
-Building your application into a native image allows you to decide which parts
-of your application should be run at image build time and which parts have to
-run at image run time.
+Building your application into a native image allows you to decide which parts of your application should be run at image build time and which parts have to run at image run time.
 
-All class-initialization code (static initializers and static
-field initialization) of the application you build an image for is executed
-at image run time by default. Sometimes it is beneficial to allow class
-initialization code to get executed at image build time for faster startup (e.g.,
-if some static fields get initialized to run-time independent data). This can be
-controlled with the following `native-image` options:
+All class-initialization code (static initializers and static field initialization) of the application you build an image for is executed at image run time by default.
+Sometimes it is beneficial to allow class initialization code to get executed at image build time for faster startup (e.g., if some static fields get initialized to run-time independent data).
+This can be controlled with the following `native-image` options:
 
 * `--initialize-at-build-time=<comma-separated list of packages and classes>`
 * `--initialize-at-run-time=<comma-separated list of packages and classes>`
 
-In addition to that, arbitrary computations are allowed at build time that can be put into `ImageSingletons` that are
-accessible at image run time. For more information please have a look at [Native Image configuration examples](https://github.com/graalvm/graalvm-demos/tree/master/native-image-configure-examples).
+In addition to that, arbitrary computations are allowed at build time that can be put into `ImageSingletons` that are accessible at image run time.
+For more information please have a look at [Native Image configuration examples](https://github.com/graalvm/graalvm-demos/tree/master/native-image-configure-examples).
 
 For more information, continue reading to the [Class Initialization in Native Image](ClassInitialization.md) guide.
diff --git a/docs/reference-manual/native-image/C-API.md b/docs/reference-manual/native-image/C-API.md
index d662844d550e..a482cb8c7788 100644
--- a/docs/reference-manual/native-image/C-API.md
+++ b/docs/reference-manual/native-image/C-API.md
@@ -6,7 +6,7 @@ permalink: /reference-manual/native-image/C-API/
 ---
 #  Native Image C API
 
-Native Image provides an API for the C language for initializing isolates and attaching threads for use with the entry point feature that is demonstrated [here](README.md#images-and-entry-points).
+Native Image provides an API for the C language for initializing isolates and attaching threads for use with the entry point feature that is demonstrated [here](README.md/#images-and-entry-points).
 The C API is available when Native Image is built as a shared library and its declarations are included in the header file that is generated during the build.
 
 ```c
@@ -79,6 +79,4 @@ int graal_detach_thread(graal_isolatethread_t* thread);
  */
 int graal_tear_down_isolate(graal_isolatethread_t* thread);
 ```
-In addition to the C level API, there is also a way to initialize an isolate
-from Java and thus use Java and Native Image to
-[implement native methods in Java](ImplementingNativeMethodsInJavaWithSVM.md).
+In addition to the C level API, there is also a way to initialize an isolate from Java and thus use Java and Native Image to [implement native methods in Java](ImplementingNativeMethodsInJavaWithSVM.md).
diff --git a/docs/reference-manual/native-image/ClassInitialization.md b/docs/reference-manual/native-image/ClassInitialization.md
index 5b457b014fca..225191923327 100644
--- a/docs/reference-manual/native-image/ClassInitialization.md
+++ b/docs/reference-manual/native-image/ClassInitialization.md
@@ -19,7 +19,9 @@ Access to the static fields that were initialized at build time is transparent t
 Specifying class initialization policies can be complicated due to the following constraints that come from class initialization semantics:
 
 * When a class is initialized, all super classes and super interfaces with default methods must also be initialized.
-Interfaces without default methods, however, are not initialized. To describe this, a short-term "relevant supertype" is used furhter, and a relevant subtype for subtypes of classes and interfaces with default methods.
+Interfaces without default methods, however, are not initialized.
+To describe this, a short-term "relevant supertype" is used furhter, and a relevant subtype for subtypes of classes and interfaces with default methods.
+
 * Relevant supertypes of types initialized at build time must also be initialized at build time.
 * Relevant subtypes of types initialized at run time must also be initialized at run time.
 * No instances classes that are initialized at run time must be present in the image.
@@ -31,7 +33,8 @@ To enjoy the complete out-of-the-box experience of Native Image and still get th
 * [Explicitly Specifying Class Initialization](#explicitly-specifying-class-initialization)
 
 To track which classes were initialized and why, one can use the flag `-H:+PrintClassInitialization`.
-This flag greatly helps to configure the image build to work as intended. The goal is to have as many classes as possible initialized at build time, yet keep the correct semantics of the program.
+This flag greatly helps to configure the image build to work as intended.
+The goal is to have as many classes as possible initialized at build time, yet keep the correct semantics of the program.
 
 ## Build-Time Initialization of Native Image Runtime
 
diff --git a/docs/reference-manual/native-image/DynamicProxy.md b/docs/reference-manual/native-image/DynamicProxy.md
index d70cbaf4b534..e64d68d5c6d0 100644
--- a/docs/reference-manual/native-image/DynamicProxy.md
+++ b/docs/reference-manual/native-image/DynamicProxy.md
@@ -12,11 +12,12 @@ Dynamic proxy classes are generated from a list of interfaces.
 Native Image does not provide machinery for generating and interpreting bytecodes at run time.
 Therefore all dynamic proxy classes need to be generated at native image build time.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
 
 ## Automatic Detection
 
-Native Image employs a simple static analysis that detects calls to `java.lang.reflect.Proxy.newProxyInstance(ClassLoader, Class<?>[], InvocationHandler)` and `java.lang.reflect.Proxy.getProxyClass(ClassLoader, Class<?>[])`, then tries to determine the list of interfaces that define dynamic proxies automatically. Given the list of interfaces, Native Image generates proxy classes at image build time and adds them to the native image heap.
+Native Image employs a simple static analysis that detects calls to `java.lang.reflect.Proxy.newProxyInstance(ClassLoader, Class<?>[], InvocationHandler)` and `java.lang.reflect.Proxy.getProxyClass(ClassLoader, Class<?>[])`, then tries to determine the list of interfaces that define dynamic proxies automatically.
+Given the list of interfaces, Native Image generates proxy classes at image build time and adds them to the native image heap.
 In addition to generating the dynamic proxy class, the constructor of the generated class that takes a `java.lang.reflect.InvocationHandler` argument, i.e., the one reflectively invoked by `java.lang.reflect.Proxy.newProxyInstance(ClassLoader, Class<?>[], InvocationHandler)`, is registered for reflection so that dynamic proxy instances can be allocated at run time.
 
 The analysis is limited to situations where the list of interfaces comes from a constant array or an array that is allocated in the same method.
diff --git a/docs/reference-manual/native-image/HostedvsRuntimeOptions.md b/docs/reference-manual/native-image/HostedvsRuntimeOptions.md
index 1c15425aa568..27a9fc34f329 100644
--- a/docs/reference-manual/native-image/HostedvsRuntimeOptions.md
+++ b/docs/reference-manual/native-image/HostedvsRuntimeOptions.md
@@ -6,8 +6,7 @@ permalink: /reference-manual/native-image/HostedvsRuntimeOptions/
 ---
 # Native Image Hosted and Runtime Options
 
-Along with all the options listed in the [Options](Options.md)
-guide,  Native Image also distinguishes hosted and runtime options.
+Along with all the options listed in the [Options](Options.md) guide, Native Image also distinguishes hosted and runtime options.
 
 * Hosted options: configure a native image build, i.e., influence what is put into the image and how the image is built.
 These are set using the prefix `-H:` on the command line.
@@ -19,15 +18,11 @@ For developer documentation on how to define and use options, read the documenta
 ## List of Useful Options
 
 ### Graph Dumping
-Native Image re-used the GraalVM options for graph dumping, logging, counters,
-and everything else in the GraalVM debug environment. These GraalVM options can
-be used both as hosted options (if you want to dump graphs of the native image
-builder), and as runtime options (if you want to dump graphs during dynamic
+Native Image re-used the GraalVM options for graph dumping, logging, counters, and everything else in the GraalVM debug environment.
+These GraalVM options can be used both as hosted options (if you want to dump graphs of the native image builder), and as runtime options (if you want to dump graphs during dynamic
 compilation at runtime).
 
-The GraalVM compiler options that work as expected include `Dump`, `DumpOnError`, `Log`,
-`MethodFilter`, and the options to specify file names and ports for the dump
-handlers.
+The GraalVM compiler options that work as expected include `Dump`, `DumpOnError`, `Log`, `MethodFilter`, and the options to specify file names and ports for the dump handlers.
 
 For example:
 * To dump the compiler graphs of the native image builder: `-H:Dump= -H:MethodFilter=ClassName.MethodName`.
diff --git a/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md b/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
index d5bf3ac44288..422818d8c979 100644
--- a/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
+++ b/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
@@ -6,20 +6,15 @@ permalink: /reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM
 ---
 # Implementing Native Methods in Java with Native Image
 
-Native Image can be used to implement low-level system operations in Java and
-make them available via JNI to Java code executing on a standard JVM. As
-a result one can use the same language to write the application logic
-as well as the system calls.
+Native Image can be used to implement low-level system operations in Java and make them available via JNI to Java code executing on a standard JVM.
+As a result one can use the same language to write the application logic as well as the system calls.
 
-Note that this document describes the opposite of what is commonly done via JNI:
-usually low-level system operations are implemented in C and invoked from Java
-using JNI. If you are interested in how Native Image supports the common use case,
-continue reading to the [Native Image JNI support](JNI.md) guide instead.
+Note that this document describes the opposite of what is commonly done via JNI: usually low-level system operations are implemented in C and invoked from Java using JNI.
+If you are interested in how Native Image supports the common use case, continue reading to the [Native Image JNI support](JNI.md) guide instead.
 
 ## Create a Shared Library
 
-First of all one has to use the `native-image` builder to generate a shared library
-with some JNI-compatible [entry points](README.md#build-a-shared-library).
+First of all one has to use the `native-image` builder to generate a shared library with some JNI-compatible [entry points](README.md/#build-a-shared-library).
 Start with the Java code:
 ```java
 package org.pkg.implnative;
@@ -34,20 +29,15 @@ public final class NativeImpl {
     }
 }
 ```
-After being processed by the `native-image` builder, the code
-[exposes a C function](C-API.md) `Java_org_pkg_apinative_Native_add`
-(the name follows conventions of JNI that will be handy later) and
-a Native Image signature typical for JNI methods. The first parameter
-is a reference to the `JNIEnv*` value. The second parameter is a reference
-to the `jclass` value for the class declaring the method. The third parameter is a
-portable (e.g., `long`) identifier of the [Native Image isolatethread](C-API.md).
-The rest of the parameters are the actual parameters of the Java `Native.add`
-method described in the next section. Compile the code with the `--shared` option:
+After being processed by the `native-image` builder, the code [exposes a C function](C-API.md) `Java_org_pkg_apinative_Native_add` (the name follows conventions of JNI that will be handy later) and a Native Image signature typical for JNI methods.
+The first parameter is a reference to the `JNIEnv*` value.
+The second parameter is a reference to the `jclass` value for the class declaring the method.
+The third parameter is a portable (e.g., `long`) identifier of the [Native Image isolatethread](C-API.md).
+The rest of the parameters are the actual parameters of the Java `Native.add` method described in the next section. Compile the code with the `--shared` option:
 ```shell
 $GRAALVM/bin/native-image --shared -H:Name=libnativeimpl -cp nativeimpl
 ```
-The `libnativeimpl.so` is generated. We are ready to use it from standard
-Java code.
+The `libnativeimpl.so` is generated. We are ready to use it from standard Java code.
 
 ## Bind a Java Native Method
 
@@ -59,16 +49,14 @@ public final class Native {
     private static native int add(long isolateThreadId, int a, int b);
 }
 ```
-The package name of the class, as well as the name of the method, has to correspond
-(after the [JNI mangling](https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/design.html))
-to the name of the `@CEntryPoint` introduced previously. The first argument is
-a portable (e.g., `long`) identifier of the Native Image isolate thread. The rest of the arguments
-match the parameters of the entry point.
+The package name of the class, as well as the name of the method, has to correspond (after the [JNI mangling](https://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/design.html)) to the name of the `@CEntryPoint` introduced previously.
+The first argument is a portable (e.g., `long`) identifier of the Native Image isolate thread.
+The rest of the arguments match the parameters of the entry point.
 
 ## Loading the Native Library
 
-The next step is to bind the JDK with the generated `.so` library. For example,
-make sure the implementation of the native `Native.add` method is loaded.
+The next step is to bind the JDK with the generated `.so` library.
+For example, make sure the implementation of the native `Native.add` method is loaded.
 Simple `load` or `loadLibrary` calls will do:
 ```java
 public static void main(String[] args) {
@@ -76,27 +64,23 @@ public static void main(String[] args) {
     // ...
 }
 ```
-This is assuming your `LD_LIBRARY_PATH` environment variable is specified,
-or the `java.library.path` Java property is properly set.
+This is assuming your `LD_LIBRARY_PATH` environment variable is specified, or the `java.library.path` Java property is properly set.
 
 ## Initializing a Native Image Isolate
 
-Before making calls to the `Native.add` method, we need to create a Native Image
-isolate. Native Image provides a special built-in to allow that:
-`CEntryPoint.Builtin.CREATE_ISOLATE`. Define another method along your other
-existing `@CEntryPoint` methods. Let it return `IsolateThread` and take no parameters:
+Before making calls to the `Native.add` method, we need to create a Native Image isolate.
+Native Image provides a special built-in to allow that: `CEntryPoint.Builtin.CREATE_ISOLATE`.
+Define another method along your other existing `@CEntryPoint` methods.
+Let it return `IsolateThread` and take no parameters:
 ```java
 public final class NativeImpl {
     @CEntryPoint(name = "Java_org_pkg_apinative_Native_createIsolate", builtin=CEntryPoint.Builtin.CREATE_ISOLATE)
     public static native IsolateThread createIsolate();
 }
 ```
-Native Image then generates default native implementation of the
-method into the final `.so` library.
-The method initializes the Native Image runtime and
-returns a portable identification, e.g., `long`, to hold
-an instance of a [Native Image isolatethread](C-API.md). The isolate thread can then be used for
-multiple invocations of the native part of your code:
+Native Image then generates default native implementation of the method into the final `.so` library.
+The method initializes the Native Image runtime and returns a portable identification, e.g., `long`, to hold an instance of a [Native Image isolatethread](C-API.md).
+The isolate thread can then be used for multiple invocations of the native part of your code:
 ```java
 package org.pkg.apinative;
 
@@ -115,19 +99,16 @@ public final class Native {
     private static native long createIsolate();
 }
 ```
-The standard JVM is started. It initializes a Native Image isolate,
-attaches the current thread to the isolate, and the universal answer `42` is
-then computed three times inside of the isolate.
+The standard JVM is started. It initializes a Native Image isolate, attaches the current thread to the isolate, and the universal answer `42` is then computed three times inside of the isolate.
 
 ## Calling JVM from Native Java
 
-There is a detailed [tutorial on the C interface](https://github.com/oracle/graal/blob/master/substratevm/src/com.oracle.svm.tutorial/src/com/oracle/svm/tutorial/CInterfaceTutorial.java) of Native Image. The following example shows how to make a callback to JVM.
+There is a detailed [tutorial on the C interface](https://github.com/oracle/graal/blob/master/substratevm/src/com.oracle.svm.tutorial/src/com/oracle/svm/tutorial/CInterfaceTutorial.java) of Native Image.
+The following example shows how to make a callback to JVM.
 
-In the classical setup, when C needs to call into JVM, it uses a [jni.h](JNI.md)
-header file. The file defines essential JVM structures (like `JNIEnv`) as well as
-functions one can invoke to inspect classes, access fields, and call methods
-in the JVM. In order to call these functions from the `NativeImpl` class in the above
-example, you need to define appropriate Java API wrappers of the `jni.h` concepts:
+In the classical setup, when C needs to call into JVM, it uses a [jni.h](JNI.md) header file.
+The file defines essential JVM structures (like `JNIEnv`) as well as functions one can invoke to inspect classes, access fields, and call methods in the JVM.
+In order to call these functions from the `NativeImpl` class in the above example, you need to define appropriate Java API wrappers of the `jni.h` concepts:
 
 ```java
 @CContext(JNIHeaderDirectives.class)
@@ -172,20 +153,14 @@ interface JMethodID extends PointerBase {
 }
 ```
 
-Leaving aside the meaning of `JNIHeaderDirectives` for now, the rest
-of the interfaces are type-safe representations of the C pointers found in the
-`jni.h` file. `JClass`, `JMethodID`, and `JObject` are all pointers. Thanks to
-the above definitions, you now have Java interfaces to represent
-instances of these objects in your native Java code in a type-safe way.
-
-The core part of any [JNI](JNI.md) API is the set of functions one can call
-when talking to the JVM. There are dozens of them, but in the `JNINativeInterface`
-definition, you just define wrappers for those few that are needed in the example.
-Again, give them proper types, so in your native Java code you can use
-`GetMethodId.find(...)`, `CallStaticVoidMethod.call(...)`, etc. In addition,
-there is another important part missing in the puzzle - the `jvalue` union type
-wrapping all the possible Java primitive and object types. Here are definitions
-of its getters and setters:
+Leaving aside the meaning of `JNIHeaderDirectives` for now, the rest of the interfaces are type-safe representations of the C pointers found in the `jni.h` file. `JClass`, `JMethodID`, and `JObject` are all pointers.
+Thanks to the above definitions, you now have Java interfaces to represent instances of these objects in your native Java code in a type-safe way.
+
+The core part of any [JNI](JNI.md) API is the set of functions one can call when talking to the JVM.
+There are dozens of them, but in the `JNINativeInterface` definition, you just define wrappers for those few that are needed in the example.
+Again, give them proper types, so in your native Java code you can use `GetMethodId.find(...)`, `CallStaticVoidMethod.call(...)`, etc.
+In addition, there is another important part missing in the puzzle - the `jvalue` union type wrapping all the possible Java primitive and object types.
+Here are definitions of its getters and setters:
 
 ```java
 @CContext(JNIHeaderDirectives.class)
@@ -215,13 +190,9 @@ interface JValue extends PointerBase {
     JValue addressOf(int index);
 }
 ```
-The `addressOf` method is a special Native Image construct used to perform
-C pointer arithmetics. Given a pointer, one can treat it as the initial element of
-an array, then, for example, use `addressOf(1)` to access the subsequent element.
-With this you have all the API needed to make a callback - redefine
-the previously introduced `NativeImpl.add` method to accept properly typed
-pointers, and then use these pointers to invoke a JVM method before computing
-the sum of `a + b`:
+The `addressOf` method is a special Native Image construct used to perform C pointer arithmetics.
+Given a pointer, one can treat it as the initial element of an array, then, for example, use `addressOf(1)` to access the subsequent element.
+With this you have all the API needed to make a callback - redefine the previously introduced `NativeImpl.add` method to accept properly typed pointers, and then use these pointers to invoke a JVM method before computing the sum of `a + b`:
 
 ```java
 @CEntryPoint(name = "Java_org_pkg_apinative_Native_add")
@@ -250,13 +221,9 @@ static int add(JNIEnvironment env, JClass clazz, @CEntryPoint.IsolateThreadConte
 }
 ```
 
-The above example seeks a static method `hello` and invokes it with eight
-`JValue` parameters in an array reserved by `StackValue.get`
-on the stack. Individual parameters are accessed by use of
-the `addressOf` operator and filled with appropriate primitive values
-before the call happens. The method `hello` is defined in the class `Native`
-and prints values of all parameters to verify they are properly
-propagated from the `NativeImpl.add` caller:
+The above example seeks a static method `hello` and invokes it with eight `JValue` parameters in an array reserved by `StackValue.get` on the stack.
+Individual parameters are accessed by use of the `addressOf` operator and filled with appropriate primitive values before the call happens.
+The method `hello` is defined in the class `Native` and prints values of all parameters to verify they are properly propagated from the `NativeImpl.add` caller:
 
 ```
 public class Native {
@@ -268,11 +235,9 @@ public class Native {
 ```
 
 There is just one final piece to explain: the `JNIHeaderDirectives`.
-The Native Image C interface needs to understand the layout of the C structures. It
-needs to know at which offset of `JNINativeInterface` structure it can find
-the pointer to the `GetMethodId` function. To do so, it needs `jni.h` and additional
-files during compilation. One can specify them by `@CContext` annotation and
-implementation of its `Directives`:
+The Native Image C interface needs to understand the layout of the C structures.
+It needs to know at which offset of `JNINativeInterface` structure it can find the pointer to the `GetMethodId` function.
+To do so, it needs `jni.h` and additional files during compilation. One can specify them by `@CContext` annotation and implementation of its `Directives`:
 
 ```java
 final class JNIHeaderDirectives implements CContext.Directives {
@@ -300,10 +265,7 @@ final class JNIHeaderDirectives implements CContext.Directives {
 }
 ```
 
-The good thing is that `jni.h` is inside of every JDK, so one can use the
-`java.home` property to locate the necessary header files. The actual logic
-can, of course, be made more robust and OS-independent.
+The good thing is that `jni.h` is inside of every JDK, so one can use the `java.home` property to locate the necessary header files.
+The actual logic can, of course, be made more robust and OS-independent.
 
-Implementing any JVM native method in Java and/or making callbacks to the JVM
-with Native Image should now be as easy as expanding upon the given example
-and invoking `native-image`.
+Implementing any JVM native method in Java and/or making callbacks to the JVM with Native Image should now be as easy as expanding upon the given example and invoking `native-image`.
diff --git a/docs/reference-manual/native-image/JNI.md b/docs/reference-manual/native-image/JNI.md
index b658101f7818..d932552b3903 100644
--- a/docs/reference-manual/native-image/JNI.md
+++ b/docs/reference-manual/native-image/JNI.md
@@ -9,7 +9,7 @@ permalink: /reference-manual/native-image/JNI/
 JNI is a native API that enables Java code to interact with native code and vice versa.
 This page gives an overview of the JNI implementation in Native Image.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
 
 ## Integration
 JNI support is enabled by default and built into Native Image builds. Individual classes, methods, and fields that should be accessible via JNI must be specified during native image generation in a configuration file (read below).
@@ -53,7 +53,8 @@ class JNIRegistrationFeature implements Feature {
   }
 }
 ```
-To activate the custom feature `--features=<fully qualified name of JNIRegistrationFeature class>` needs to be passed to native-image. [Native Image Build Configuration](BuildConfiguration.md) explains how this can be automated with a `native-image.properties` file in `META-INF/native-image`.
+To activate the custom feature `--features=<fully qualified name of JNIRegistrationFeature class>` needs to be passed to native-image.
+[Native Image Build Configuration](BuildConfiguration.md) explains how this can be automated with a `native-image.properties` file in `META-INF/native-image`.
 
 ## Object Handles
 JNI does not permit direct access to Java objects.
diff --git a/docs/reference-manual/native-image/LLVMBackend.md b/docs/reference-manual/native-image/LLVMBackend.md
index e25dd6aacaa0..15e22d898bf8 100644
--- a/docs/reference-manual/native-image/LLVMBackend.md
+++ b/docs/reference-manual/native-image/LLVMBackend.md
@@ -6,7 +6,8 @@ permalink: /reference-manual/native-image/LLVMBackend/
 ---
 # LLVM Backend for Native Image
 
-Native Image includes an alternative backend which uses the [LLVM intermediate representation](https://llvm.org/docs/LangRef.html) and the [LLVM compiler](http://llvm.org/docs/CommandGuide/llc.html) to produce native executables. To use it, add the `-H:CompilerBackend=llvm` option to the Native Image invocation.
+Native Image includes an alternative backend which uses the [LLVM intermediate representation](https://llvm.org/docs/LangRef.html) and the [LLVM compiler](http://llvm.org/docs/CommandGuide/llc.html) to produce native executables.
+To use it, add the `-H:CompilerBackend=llvm` option to the Native Image invocation.
 
 The LLVM backend requires GraalVM's LLVM toolchain to be installed (with `gu install llvm-toolchain`).
 
@@ -29,13 +30,15 @@ The LLVM backend requires GraalVM's LLVM toolchain to be installed (with `gu ins
 
 ## How to Add a Target Architecture to GraalVM Using LLVM Backend
 
-An interesting use case for the LLVM backend is to target a new architecture without having to implement a complete new backend for Native Image. The following are the necessary steps to achieve this at the moment.
+An interesting use case for the LLVM backend is to target a new architecture without having to implement a complete new backend for Native Image.
+The following are the necessary steps to achieve this at the moment.
 
 ### Target-Specific LLVM Settings
 
 There are a few instances where the GraalVM code has to go deeper than the target-independent nature of LLVM.
 These are most notably inline assembly snippets to implement direct register accesses and direct register jumps (for trampolines), as well as precisions about the structure of the stack frames of the code emitted by LLVM.
-All in all, this represents less than a dozen simple values to be set for each new target. It is our goal that in the future this will be the only addition needed to support a new target.
+All in all, this represents less than a dozen simple values to be set for each new target.
+It is our goal that in the future this will be the only addition needed to support a new target.
 
 _([Complete set of values for AArch64](https://github.com/oracle/graal/commit/80cceec6f6299181d94e844eb22dffbef3ecc9e4))_
 
diff --git a/docs/reference-manual/native-image/Limitations.md b/docs/reference-manual/native-image/Limitations.md
index 23974f379729..38bca092e4c3 100644
--- a/docs/reference-manual/native-image/Limitations.md
+++ b/docs/reference-manual/native-image/Limitations.md
@@ -19,7 +19,9 @@ If an application is not optimizable, then a so-called fallback image is generat
 
 ## Class Metadata Features (Require Configuration)
 
-The following features generally require the configuration at image build time in order to use the closed-world optimization. This configuration ensures that the minimum amount of space necessary is used in the native image binary.
+The following features generally require the configuration at image build time in order to use the closed-world optimization.
+This configuration ensures that the minimum amount of space necessary is used in the native image binary.
+
 If one of the following features is used without providing a configuration at image build time, a fallback image is generated.
 
 ### Dynamic Class Loading
@@ -47,7 +49,8 @@ For more details, read the [Dynamic Proxies support](DynamicProxy.md) guide.
 
 ### JNI (Java Native Interface)
 Native code may access Java objects, classes, methods and fields by name, in a similar way to using the reflection API in Java code.
-For the same reasons, any Java artifacts accessed by name via JNI must be specified during a native image generation in a [configuration file](BuildConfiguration.md). For more details, read the [JNI Implementation](JNI.md) guide.
+For the same reasons, any Java artifacts accessed by name via JNI must be specified during a native image generation in a [configuration file](BuildConfiguration.md).
+For more details, read the [JNI Implementation](JNI.md) guide.
 
 As an alternative, and in addition to JNI, Native Image provides its own native interface that is much simpler than JNI and with lower overhead.
 It allows calls between Java and C, and access of C data structures from Java code.
@@ -56,8 +59,8 @@ For more details, read the [JavaDoc of the package `org.graalvm.nativeimage.c` a
 
 ### Serialization
 Java serialization requires class metadata information in order to function and must be specified during a native image generation in a [configuration file](BuildConfiguration.md).
-However, Java serialization has been a persistent source of security vulnerabilities. The Java architects have announced that the existing serialization mechanism will be replaced
-with a new mechanism avoiding these problems in the near future.
+However, Java serialization has been a persistent source of security vulnerabilities.
+The Java architects have announced that the existing serialization mechanism will be replaced with a new mechanism avoiding these problems in the near future.
 
 ## Features Incompatible with Closed-World Optimization
 
@@ -80,16 +83,12 @@ Native Image implements some Java features in a different way than the Java HotS
 
 ### Signal Handlers
 
-Registering a signal handler requires to start a new thread that handles the
-signal and invokes the shutdown hooks. By default, no signal handlers are
-registered when building a native image, unless they are registered explicitly by the user.
-For example, it is not recommended to register the default signal
-handlers when building a shared library, but it is desirable to include
-signal handlers when building native images for containerized environments, like
-Docker containers.
+Registering a signal handler requires to start a new thread that handles the signal and invokes the shutdown hooks.
+By default, no signal handlers are registered when building a native image, unless they are registered explicitly by the user.
+For example, it is not recommended to register the default signal handlers when building a shared library, but it is desirable to include signal handlers when building native images for containerized environments, like Docker containers.
 
-To register the default signal handlers, pass the `--install-exit-handlers` option to the
-`native-image` builder. This option gives you the same signal handlers as a JVM does.
+To register the default signal handlers, pass the `--install-exit-handlers` option to the `native-image` builder.
+This option gives you the same signal handlers as a JVM does.
 
 ### Class Initializers
 By default, classes are initialized at image run time.
@@ -99,8 +98,7 @@ Class initialization behaviour can be adjusted using the options `--initialize-
 See `native-image --help` for details.
 Classes of the JDK class libraries are handled for you and do not need special consideration from the user.
 
-Native Image users should be aware that class initialization at image build time
-may break specific assumptions in existing code.
+Native Image users should be aware that class initialization at image build time may break specific assumptions in existing code.
 For example, files loaded in a class initializer may not be in the same place at image build time as at image run time.
 Also, certain objects such as a file descriptors or running threads must not be stored into a native image binary.
 If such objects are reachable at image build time, image generation fails with an error.
diff --git a/docs/reference-manual/native-image/NativeImageHeapdumpEnterprise.md b/docs/reference-manual/native-image/NativeImageHeapdumpEnterprise.md
index 3cf3f0c9c362..9c89b0cb884f 100644
--- a/docs/reference-manual/native-image/NativeImageHeapdumpEnterprise.md
+++ b/docs/reference-manual/native-image/NativeImageHeapdumpEnterprise.md
@@ -8,24 +8,20 @@ permalink: /reference-manual/native-image/NativeImageHeapdump/
 
 With GraalVM Enterprise Edition you can generate heap dumps of the Native Image processes to monitor the execution.
 
-Native Image does not implement JVMTI agent and it is not possible to trigger
-heap dump creation using tools like _VisualVM_ or _jmap_. You can build a native image for your application in a way so that it can handle certain signals and then get a heap
-dump when the application receives the `USR1` signal (other supported signals are `QUIT/BREAK` for stackdumps and `USR2` to dump runtime compilation info). You only need to build your image with GraalVM Enterprise Native Image and use the `-H:+AllowVMInspection` option.
+Native Image does not implement JVMTI agent and it is not possible to trigger heap dump creation using tools like _VisualVM_ or _jmap_.
+You can build a native image for your application in a way so that it can handle certain signals and then get a heap dump when the application receives the `USR1` signal (other supported signals are `QUIT/BREAK` for stackdumps and `USR2` to dump runtime compilation info).
+You only need to build your image with GraalVM Enterprise Native Image and use the `-H:+AllowVMInspection` option.
 
-Another possibility is to
-write a special method which will generate a heap dump at certain points in the
-lifetime of your application. For example, when certain conditions are met while
-executing a native image, your application code can trigger heap dump creation.
-A dedicated [`org.graalvm.nativeimage.VMRuntime#dumpHeap`](https://github.com/oracle/graal/blob/master/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspection.java) API exists for this
-purpose. Both possibilities are covered in this guide.
+Another possibility is to write a special method which will generate a heap dump at certain points in the lifetime of your application. For example, when certain conditions are met while executing a native image, your application code can trigger heap dump creation.
+A dedicated [`org.graalvm.nativeimage.VMRuntime#dumpHeap`](https://github.com/oracle/graal/blob/master/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspection.java) API exists for this purpose.
+Both possibilities are covered in this guide.
 
 Note: This feature is available with **GraalVM Enterprise** only.
 
 ## Handle SIGUSR1 Signal
-The following Java example is a simple multi-threaded application which runs for
-60 seconds. There is enough time to get its PID and send the SIGUSR1 signal
-which will generate a heap dump into the application's working directory. Save
-the following code as _SVMHeapDump.java_ file on your disk:
+The following Java example is a simple multi-threaded application which runs for 60 seconds.
+There is enough time to get its PID and send the SIGUSR1 signal which will generate a heap dump into the application's working directory.
+Save the following code as _SVMHeapDump.java_ file on your disk:
 ```java
 import java.text.DateFormat;
 import java.util.Date;
@@ -81,9 +77,8 @@ $JAVA_HOME/bin/javac SVMHeapDump.java
 ```
 If you run it on `java`, you will see that it runs for 60 seconds then finishes.
 
-Build a native executable and provide the `-H:+AllowVMInspection` option for the
-builder. This way the native executable will accept SIGUSR1 signal to produce a
-heap dump.
+Build a native executable and provide the `-H:+AllowVMInspection` option for the builder.
+This way the native executable will accept SIGUSR1 signal to produce a heap dump.
 
 ```shell
 $JAVA_HOME/bin/native-image SVMHeapDump -H:+AllowVMInspection
@@ -105,9 +100,8 @@ $JAVA_HOME/bin/native-image SVMHeapDump -H:+AllowVMInspection
 [svmheapdump:41691]      [total]:  47,805.47 ms,  2.62 GB
 ```
 
-The `native-image` builder analyzes existing `SVMHeapDump.class` and creates from
-it an executable file. When the command completes, `svmheapdump` is created in
-the current directory.
+The `native-image` builder analyzes existing `SVMHeapDump.class` and creates from it an executable file.
+When the command completes, `svmheapdump` is created in the current directory.
 
 ##### Run the application and check the heap dump
 Run the application:
@@ -121,10 +115,7 @@ Starting thread!
 May 15, 2020, 4:28:14 PM: Thread started, it will run for 60 seconds
 ```
 
-Open the 2nd terminal to get the process ID of the running `svmheapdump`
-application using a command like `ps -C svmheapdump -o pid=` for Linux OS and
-`pgrep svmheapdump` for macOS. Copy the printed process ID, e.g. 100, and use it
-to send the signal to the running application:
+Open the 2nd terminal to get the process ID of the running `svmheapdump` application using a command like `ps -C svmheapdump -o pid=` for Linux OS and `pgrep svmheapdump` for macOS. Copy the printed process ID, e.g. 100, and use it to send the signal to the running application:
 ```shell
 kill -SIGUSR1 100
 ```
@@ -132,8 +123,7 @@ The heap dump will be available at the working directory while the application c
 
 ## Generate a Heap Dump from within a Java Application
 
-The following Java example shows how a heap dump can be generated from within
-a running Java application using `VMRuntime.dumpHeap()` after some condition is met.
+The following Java example shows how a heap dump can be generated from within a running Java application using `VMRuntime.dumpHeap()` after some condition is met.
 The condition to generate a heap dump is provided as an option on the command line.
 Save the code snippet below as _SVMHeapDumpAPI.java_.
 
@@ -186,8 +176,7 @@ public class SVMHeapDumpAPI {
  }
 }
 ```
-The application creates some data to have something to dump, checks the command line
-to see if heap dump has to be created, and then in method `createHeapDump()` creates
+The application creates some data to have something to dump, checks the command line to see if heap dump has to be created, and then in method `createHeapDump()` creates
 the actual heap dump, performing checks for file's existence.
 
 #### Building a Native Image
@@ -219,8 +208,7 @@ $JAVA_HOME/bin/native-image SVMHeapDumpAPI
 When the command completes, the `svmheapdumpapi` executable is created in the current directory.
 
 ##### Run the application and check the heap dump
-Now you can run your native image application and generate a heap dump from it
-with the output similar to one below:
+Now you can run your native image application and generate a heap dump from it with the output similar to one below:
 ```shell
 ./svmheapdumpapi --heapdump
 Sep 15, 2020, 4:06:36 PM: Hello GraalVM native image developer.
@@ -228,4 +216,4 @@ Your command line options are: --heapdump
   Heap dump created /var/folders/hw/s9d78jts67gdc8cfyq5fjcdm0000gp/T/SVMHeapDump-6437252222863577987.hprof, size: 8051959
 ```
 
-The resulting heap dump can be then opened with the [VisualVM](/tools/visualvm/) tool like any other Java heap dump.
+The resulting heap dump can be then opened with the [VisualVM](../../tools/visualvm.md) tool like any other Java heap dump.
diff --git a/docs/reference-manual/native-image/Options.md b/docs/reference-manual/native-image/Options.md
index 63c20d8b84c8..d9be72e84b20 100644
--- a/docs/reference-manual/native-image/Options.md
+++ b/docs/reference-manual/native-image/Options.md
@@ -6,29 +6,23 @@ permalink: /reference-manual/native-image/Options/
 ---
 # Native Image Options
 
-The `native-image` builder needs to provide the classpath for all classes
-using the familiar option from the `java` launcher: `-cp` is followed by a list
-of directories or JAR files, separated by `:`. The name of the class containing
-the `main` method is the last argument, or you can use `-jar` and provide a JAR
-file that specifies the main method in its manifest.
+The `native-image` builder needs to provide the classpath for all classes using the familiar option from the `java` launcher: `-cp` is followed by a list of directories or JAR files, separated by `:`.
+The name of the class containing the `main` method is the last argument, or you can use `-jar` and provide a JAR file that specifies the main method in its manifest.
 
 The syntax of the `native-image` command is:
 
-- `native-image [options] class [imagename] [options]` to build an executable file for a class in the
-current working directory. Invoking it executes the native-compiled code of that
+- `native-image [options] class [imagename] [options]` to build an executable file for a class in the current working directory. Invoking it executes the native-compiled code of that
 class.
 
 - `native-image [options] -jar jarfile [imagename] [options]` to build an image for a JAR file.
 
-The options passed to `native-image` are evaluated left-to-right. For more information, see [Native Image Build Configuration](BuildConfiguration.md#order-of-arguments-evaluation).
+The options passed to `native-image` are evaluated left-to-right. For more information, see [Native Image Build Configuration](BuildConfiguration.md/#order-of-arguments-evaluation).
 
-The options fall into four categories:
-image generation options, macro options, non-standard options, and server options.
+The options fall into four categories: image generation options, macro options, non-standard options, and server options.
 Non-standard and server options are subject to change through a deprecation cycle.
 
-Command-line help is available. Run `native-image --help` to get
-the commands overview, and `native-image --help-extra` to print help on non-standard,
-macro, and server options.
+Command-line help is available.
+Run `native-image --help` to get the commands overview, and `native-image --help-extra` to print help on non-standard, macro, and server options.
 
 ### Options to Native Image Builder
 
@@ -94,7 +88,7 @@ instantiation is traced for.
 * `--tool:lsp`: add the Language Server Protocol support to later attach compatible debuggers to GraalVM in IDEs like VS Code
 * `--tool:profiler`: add profiling support to a GraalVM supported language
 
-The `--language:python`, `--language:ruby` and `--language:R` polyglot macro options become available once the corresponding languages are added to the base GraalVM installation (see the [GraalVM Updater](https://www.graalvm.org/reference-manual/graalvm-updater/) guide).
+The `--language:python`, `--language:ruby` and `--language:R` polyglot macro options become available once the corresponding languages are added to the base GraalVM installation (see the [GraalVM Updater](../graalvm-updater.md) guide).
 
 ### Non-standard Options
 * `--expert-options`: list image build options for experts
diff --git a/docs/reference-manual/native-image/README.md b/docs/reference-manual/native-image/README.md
index f54ac4b42196..c6ad06cc7082 100644
--- a/docs/reference-manual/native-image/README.md
+++ b/docs/reference-manual/native-image/README.md
@@ -18,11 +18,9 @@ Then it ahead-of-time compiles that reachable code and data to a native executab
 This entire process is called **building an image** (or the **image build time**) to clearly distinguish it from the compilation of Java source code to bytecode.
 
 Native Image supports JVM-based languages, e.g., Java, Scala, Clojure, Kotlin.
-The resulting image can, optionally, execute dynamic languages like
-JavaScript, Ruby, R or Python. Polyglot embeddings can also be compiled
-ahead-of-time. To inform `native-image` of a guest language used by an
-application, specify `--language:<languageId>` for each guest language (e.g.,
-`--language:js`).
+The resulting image can, optionally, execute dynamic languages like JavaScript, Ruby, R or Python.
+Polyglot embeddings can also be compiled ahead-of-time.
+To inform `native-image` of a guest language used by an application, specify `--language:<languageId>` for each guest language (e.g., `--language:js`).
 
 * [Install Native Image](#install-native-image)
 * [Prerequisites](#prerequisites)
@@ -42,7 +40,7 @@ For more information, check the [Oracle Technology Network License Agreement for
 
 ## Install Native Image
 
-Native Image can be added to GraalVM with the [GraalVM Updater](https://www.graalvm.org/reference-manual/graalvm-updater/) tool.
+Native Image can be added to GraalVM with the [GraalVM Updater](../graalvm-updater.md) tool.
 
 Run this command to install Native Image:
 ```shell
@@ -52,13 +50,11 @@ After this additional step, the `native-image` executable will become available
 the `GRAALVM_HOME/bin` directory.
 
 The above command will install Native Image from the GitHub catalog for GraalVM Community users.
-For GraalVM Enterprise users, the [manual installation](https://www.graalvm.org/reference-manual/graalvm-updater/#manual-installation) is required.
+For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md/#manual-installation) is required.
 
 ## Prerequisites
 
-For compilation `native-image` depends on the local toolchain. Install
- `glibc-devel`, `zlib-devel` (header files for the C library and `zlib`)
-and `gcc`, using a package manager available on your OS. Some Linux distributions may additionally require `libstdc++-static`.
+For compilation `native-image` depends on the local toolchain. Install `glibc-devel`, `zlib-devel` (header files for the C library and `zlib`) and `gcc`, using a package manager available on your OS. Some Linux distributions may additionally require `libstdc++-static`.
 
 On Oracle Linux use `yum` package manager:
 ```shell
@@ -105,12 +101,9 @@ To build a native image of a JAR file, use:
 native-image [options] -jar jarfile [imagename] [options]
 ```
 
-The `native-image` command needs to provide the class path for all classes using
-the familiar option from the java launcher: `-cp` followed by a list of
+The `native-image` command needs to provide the class path for all classes using the familiar option from the java launcher: `-cp` followed by a list of
 directories or JAR files, separated by `:` on Linux and macOS platforms, or `;` on Windows.
-The name of the class containing the
-main method is the last argument, or you can use `-jar` and provide a JAR
-file that specifies the main method in its manifest.
+The name of the class containing the main method is the last argument, or you can use `-jar` and provide a JAR file that specifies the main method in its manifest.
 
 As an example, take this small Java program that reverses a String using recursion:
 ```java
@@ -134,20 +127,18 @@ Compile it and build a native image from the Java class:
 javac Example.java
 native-image Example
 ```
-The native image builder ahead-of-time compiles the `Example` class into a
-standalone executable, `example`, in the current working directory. Run the executable:
+The native image builder ahead-of-time compiles the `Example` class into a standalone executable, `example`, in the current working directory.
+Run the executable:
 ```shell
 ./example
 ```
 
-Another option to the native image builder that might be helpful is
-`--install-exit-handlers`. It is not recommended to register the default signal
-handlers when building a shared library. However, it is desirable to include
-signal handlers when building a native image for containerized environments, like
-Docker containers. The `--install-exit-handlers` option gives you the same
-signal handlers that a JVM does.
+Another option to the native image builder that might be helpful is `--install-exit-handlers`.
+It is not recommended to register the default signal handlers when building a shared library.
+However, it is desirable to include signal handlers when building a native image for containerized environments, like Docker containers.
+The `--install-exit-handlers` option gives you the same signal handlers that a JVM does.
 
-For more complex examples, visit the [native image generation](https://www.graalvm.org/examples/native-image-examples/) or [compiling a Java and Kotlin app ahead-of-time](https://www.graalvm.org/examples/java-kotlin-aot/) pages.
+For more complex examples, visit the [native image generation](../../examples/native-image-examples.md) or [compiling a Java and Kotlin app ahead-of-time](../../examples/java-kotlin-aot.md) pages.
 
 ## Build a Shared Library
 
@@ -165,7 +156,9 @@ Note: if you build a shared library where you do not specify a main class, you m
 
 As mentioned in the previous section, you need to have at least one entry point method for a native image to be useful.
 For shared libraries, Native Image provides the `@CEntryPoint` annotation to specify entry point methods that should be exported and callable from C.
-Entry point methods must be static and may only have non-object parameters and return types – this includes Java primitives, but also Word types (including pointers). One of the parameters of an entry point method has to be of type `IsolateThread` or `Isolate`. This parameter provides the current thread's execution context for the call.
+Entry point methods must be static and may only have non-object parameters and return types – this includes Java primitives, but also Word types (including pointers).
+One of the parameters of an entry point method has to be of type `IsolateThread` or `Isolate`.
+This parameter provides the current thread's execution context for the call.
 
 For example:
 
@@ -176,7 +169,8 @@ For example:
 ```
 
 When building a shared library, an additional C header file is generated.
-This header file contains declarations for the [C API](C-API.md), which allows creating isolates and attaching threads from C code, as well as declarations for each entry point in the source code. The generated C declaration for the above example is:
+This header file contains declarations for the [C API](C-API.md), which allows creating isolates and attaching threads from C code, as well as declarations for each entry point in the source code.
+The generated C declaration for the above example is:
 ```c
 int add(graal_isolatethread_t* thread, int a, int b);
 ```
@@ -192,9 +186,9 @@ native-image -cp hello EmptyHello
 ...
 ```
 
-If you do not know what GraalVM distribution is set to the `PATH` environment
-variable, how to determine if a native image was compiled with Community or
-Enterprise Edition? Run this command:
+If you do not know what GraalVM distribution is set to the `PATH` environment variable, how to determine if a native image was compiled with Community or
+Enterprise Edition?
+Run this command:
 ```shell
 strings emptyhello | grep com.oracle.svm.core.VM
 ```
@@ -229,10 +223,7 @@ com.oracle.svm.core.VM=GraalVM <version> Java 11 EE
 
 ## Ahead-of-time Compilation Limitations
 
-There is a small portion of Java features are not susceptible to ahead-of-time
-compilation, and will therefore miss out on the performance advantages. To be
-able to build a highly optimized native executable, GraalVM runs an aggressive static
-analysis that requires a closed-world assumption, which means that all classes
-and all bytecodes that are reachable at run time must be known at build time.
-Therefore, it is not possible to load new data that have not been available
-during ahead-of-time compilation. Continue reading to [GraalVM Native Image Compatibility and Optimization](Limitations.md).
+There is a small portion of Java features are not susceptible to ahead-of-time compilation, and will therefore miss out on the performance advantages.
+To be able to build a highly optimized native executable, GraalVM runs an aggressive static analysis that requires a closed-world assumption, which means that all classes and all bytecodes that are reachable at run time must be known at build time. 
+Therefore, it is not possible to load new data that have not been available during ahead-of-time compilation.
+Continue reading to [GraalVM Native Image Compatibility and Optimization](Limitations.md).
diff --git a/docs/reference-manual/native-image/Reflection.md b/docs/reference-manual/native-image/Reflection.md
index 483653e2b70e..23016e1553e7 100644
--- a/docs/reference-manual/native-image/Reflection.md
+++ b/docs/reference-manual/native-image/Reflection.md
@@ -15,7 +15,7 @@ Examining and accessing program elements through `java.lang.reflect.*` or loadin
 Native Image tries to resolve the target elements through a static analysis that detects calls to the Reflection API.
 Where the analysis fails, the program elements reflectively accessed at run time must be specified using a manual configuration.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
 
 ## Automatic Detection
 
@@ -144,7 +144,7 @@ Conditional configuration is the *preferred* way to specify reflection configura
 
 If a `condition` is omitted, the element is always included. When the same `condition` is used for two distinct elements in two configuration entries, both elements will be included when the condition is satisfied. When a configuration entry should be enabled if one of several types are reachable, it is necessary to add two configuration entries: one entry for each condition.
 
-When used with [assisted configuration](BuildConfiguration.md#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries as agent-collected entries.
+When used with [assisted configuration](BuildConfiguration.md/#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries as agent-collected entries.
 
 ### Configuration with Features
 
@@ -165,7 +165,8 @@ class RuntimeReflectionRegistrationFeature implements Feature {
   }
 }
 ```
-To activate the custom feature `--features=<fully qualified name of RuntimeReflectionRegistrationFeature class>` needs to be passed to native-image. [Native Image Build Configuration](BuildConfiguration.md) explains how this can be automated with a `native-image.properties` file in `META-INF/native-image`.
+To activate the custom feature `--features=<fully qualified name of RuntimeReflectionRegistrationFeature class>` needs to be passed to native-image.
+[Native Image Build Configuration](BuildConfiguration.md) explains how this can be automated with a `native-image.properties` file in `META-INF/native-image`.
 
 ### Use of Reflection during Native Image Generation
 Reflection can be used without restrictions during a native image generation, for example, in static initializers.
diff --git a/docs/reference-manual/native-image/Reports.md b/docs/reference-manual/native-image/Reports.md
index d0aee5feae2b..1b518cdabfdc 100644
--- a/docs/reference-manual/native-image/Reports.md
+++ b/docs/reference-manual/native-image/Reports.md
@@ -6,12 +6,9 @@ permalink: /reference-manual/native-image/Reports/
 ---
 # Points-to Analysis Reports
 
-The points-to analysis produces two kinds of reports: analysis call tree and
-image object tree. This information is produced by an intermediate step in the
-image building process and represents the static analysis view of the call graph
-and heap object graph. These graphs are further transformed in the image
-building process before they are AOT compiled into the image and written into
-the image heap, respectively.
+The points-to analysis produces two kinds of reports: analysis call tree and image object tree.
+This information is produced by an intermediate step in the image building process and represents the static analysis view of the call graph and heap object graph.
+These graphs are further transformed in the image building process before they are AOT compiled into the image and written into the image heap, respectively.
 
 #### Call tree
 The call tree is a a breadth-first tree reduction of the call graph as seen by the points-to analysis.
diff --git a/docs/reference-manual/native-image/Resources.md b/docs/reference-manual/native-image/Resources.md
index 3c12fe49671f..03fbf4ec0073 100644
--- a/docs/reference-manual/native-image/Resources.md
+++ b/docs/reference-manual/native-image/Resources.md
@@ -26,7 +26,9 @@ To make calls such as `Class.getResource()` or `Class.getResourceAsStream()` (or
 }
 ```
 
-The configuration file's path must be provided to `native-image` with `-H:ResourceConfigurationFiles=/path/to/resource-config.json`. Alternatively, individual resource paths can also be specified directly to `native-image`:
+The configuration file's path must be provided to `native-image` with `-H:ResourceConfigurationFiles=/path/to/resource-config.json`.
+Alternatively, individual resource paths can also be specified directly to `native-image`:
+
 ```shell
 native-image -H:IncludeResources=<Java regexp that matches resources to be included in the image> -H:ExcludeResources=<Java regexp that matches resources to be excluded from the image> ...
 ```
@@ -56,13 +58,12 @@ Then:
    (or alternatively with a single `.*/(Resource0|Resource1).txt$`).
 *  Also, if we want to include everything except the `Resource2.txt` file, we can simply exclude it with `-H:IncludeResources='.*/Resource.*txt$'` followed by `-H:ExcludeResources='.*/Resource2.txt$'`.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
 
 ## Locales
 
-It is also possible to specify which locales should be included in the image and what should be the default one. For
-example, to switch the default locale to German and also include French and English, one can use the following hosted
-options.
+It is also possible to specify which locales should be included in the image and what should be the default one.
+For example, to switch the default locale to German and also include French and English, one can use the following hosted options.
 ```shell
 native-image -H:DefaultLocale=de -H:IncludeLocales=fr,en
 ```
@@ -74,7 +75,8 @@ binary.
 
 Java localization support (`java.util.ResourceBundle`) enables Java code to load L10N resources and show the right user messages suitable for actual runtime settings like time locale and format, etc.
 
-Native Image needs ahead-of-time knowledge of the resource bundles your application needs so that it can load and store the appropriate bundles for usage in the generated binary. The bundles can be specified in the resource configuration file (see above), in the `bundles` section:
+Native Image needs ahead-of-time knowledge of the resource bundles your application needs so that it can load and store the appropriate bundles for usage in the generated binary.
+The bundles can be specified in the resource configuration file (see above), in the `bundles` section:
 
 ```json
 {
@@ -91,13 +93,12 @@ Alternatively, bundles can be specified directly as options to `native-image` as
 ```shell
 native-image -H:IncludeResourceBundles=your.pgk.Bundle,another.pkg.Resource,etc.Bundle ...
 ```
-By default, the requested bundles are included for all requested locales. In order to optimize this, it is possible to
-use ``IncludeResourceBundles`` with locale specific substring, for
-example ``-H:+IncludeResourceBundles=com.company.bundles.MyBundle_fr-FR`` will include the bundle only in French.
+By default, the requested bundles are included for all requested locales.
+In order to optimize this, it is possible to use ``IncludeResourceBundles`` with locale specific substring, for example ``-H:+IncludeResourceBundles=com.company.bundles.MyBundle_fr-FR`` will include the bundle only in French.
 
 ### JVM Mode of Localization
 
-Resource Bundle lookup is a complex and dynamic mechanism which utilizes a lot of the infrastructure of JVM. As a result of that, it causes image size increase
-for smaller applications such as Hello World. Therefore, an optimized mode is set by default in which this lookup is simplified utilizing the fact the all
-bundles are known ahead of time.
+Resource Bundle lookup is a complex and dynamic mechanism which utilizes a lot of the infrastructure of JVM.
+As a result of that, it causes image size increase for smaller applications such as Hello World.
+Therefore, an optimized mode is set by default in which this lookup is simplified utilizing the fact the all bundles are known ahead of time.
 In case you would like to use the original JVM lookup, use the `-H:-LocalizationOptimizedMode` option.

From 59710028f1813818402af8a75a960f0682a52100 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 23 Sep 2021 23:56:50 +0300
Subject: [PATCH 397/681] Update links to internal docs from using permalinks
 to relative paths in graal/truffle/docs

---
 truffle/docs/AuxiliaryEngineCachingEnterprise.md |  2 +-
 truffle/docs/DynamicObjectModel.md               |  2 +-
 truffle/docs/InteropMigration.md                 |  2 +-
 truffle/docs/LanguageTutorial.md                 |  2 +-
 truffle/docs/OnStackReplacement.md               | 11 +++++------
 truffle/docs/Optimizing.md                       |  2 +-
 truffle/docs/Profiling.md                        |  2 +-
 truffle/docs/README.md                           |  2 +-
 truffle/docs/StaticObjectModel.md                |  2 +-
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/truffle/docs/AuxiliaryEngineCachingEnterprise.md b/truffle/docs/AuxiliaryEngineCachingEnterprise.md
index fc1e709deae4..43c93e1e4eeb 100644
--- a/truffle/docs/AuxiliaryEngineCachingEnterprise.md
+++ b/truffle/docs/AuxiliaryEngineCachingEnterprise.md
@@ -19,7 +19,7 @@ This includes:
 2. Execution and profiling of the guest application in the interpreter.
 3. Compilation of the AST to machine code.
 
-Within a single OS process, the work performed during warmup can be shared by specifying an [explicit engine](https://www.graalvm.org/reference-manual/embed-languages/#code-caching-across-multiple-contexts).
+Within a single OS process, the work performed during warmup can be shared by specifying an [explicit engine](../../reference-manual/embedding/embed-languages.md/#code-caching-across-multiple-contexts).
 This requires language implementations to disable context-related optimizations to avoid deoptimizations between contexts that share code.
 Auxiliary engine caching builds upon the mechanism for disabling context-related optimizations and adds the capability to persist an engine with ASTs and optimized machine code to disk.
 This way, the work performed during warmup can be significantly reduced in the first application context of a new process.
diff --git a/truffle/docs/DynamicObjectModel.md b/truffle/docs/DynamicObjectModel.md
index f922cbaa220b..ad63e1ae0606 100644
--- a/truffle/docs/DynamicObjectModel.md
+++ b/truffle/docs/DynamicObjectModel.md
@@ -184,4 +184,4 @@ public abstract class MakePairNode extends BinaryExpressionNode {
 
 A high-level description of the object model has been published in [**An Object Storage Model for the Truffle Language Implementation Framework**](http://dl.acm.org/citation.cfm?id=2647517).
 
-See [Truffle documentation](https://github.com/oracle/graal/tree/master/truffle/docs) and [publications](https://github.com/oracle/graal/blob/master/docs/Publications.md) for more tutorials, presentations, and publications about Truffle and GraalVM.
+See [Truffle publications](https://github.com/oracle/graal/blob/master/docs/Publications.md) for more presentations and publications about Truffle and GraalVM.
diff --git a/truffle/docs/InteropMigration.md b/truffle/docs/InteropMigration.md
index 7baf9f706f45..f311f74db028 100644
--- a/truffle/docs/InteropMigration.md
+++ b/truffle/docs/InteropMigration.md
@@ -7,7 +7,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/InteropMigra
 # Truffle Interop 2.0
 
 This document is targeted at guest language and tool implementers.
-It is recommended to read the [Truffle Library Tutorial](https://github.com/oracle/graal/blob/master/truffle/docs/TruffleLibraries.md) first, before proceeding.
+It is recommended to read the [Truffle Library Tutorial](./TruffleLibraries.md) first, before proceeding.
 
 ## Motivation
 
diff --git a/truffle/docs/LanguageTutorial.md b/truffle/docs/LanguageTutorial.md
index f64a1570b074..2e14b4324c5b 100644
--- a/truffle/docs/LanguageTutorial.md
+++ b/truffle/docs/LanguageTutorial.md
@@ -19,5 +19,5 @@ Conference on Programming Language Design and Implementation [PLDI 2016](http://
 Next Steps:
 * Start to subclass [TruffleLanguage](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html) for your own language implementation.
 * Fork [SimpleLanguage](https://github.com/graalvm/simplelanguage), a toy language that demonstrates how to use many Truffle features.
-* Embed Truffle languages in Java host applications using the [Polyglot API](https://graalvm.org/reference-manual/embed-languages/).
+* Embed Truffle languages in Java host applications using the [Polyglot API](../../reference-manual/embedding/embed-languages.md).
 * Read [GraalVM/Truffle publications](https://github.com/oracle/graal/blob/master/docs/Publications.md).
diff --git a/truffle/docs/OnStackReplacement.md b/truffle/docs/OnStackReplacement.md
index 722bf2df0161..7645ae9f6ef2 100644
--- a/truffle/docs/OnStackReplacement.md
+++ b/truffle/docs/OnStackReplacement.md
@@ -1,7 +1,7 @@
 ---
 layout: docs
 toc_group: truffle
-link_title: On-Stack Replacement 
+link_title: On-Stack Replacement
 permalink: /graalvm-as-a-platform/language-implementation-framework/OnStackReplacement/
 ---
 # On-Stack Replacement (OSR)
@@ -15,7 +15,7 @@ On-stack replacement (OSR) is a technique used in Truffle to "break out" of the
 Truffle supports OSR for both AST interpreters (i.e., ASTs with `LoopNode`s) and bytecode interpreters (i.e., nodes with dispatch loops).
 In either case, Truffle uses heuristics to detect when a long-running loop is being interpreted and can perform OSR to speed up execution.
 
-## OSR for AST interpreters 
+## OSR for AST interpreters
 
 Languages using standard Truffle APIs get OSR for free on Graal.
 The runtime tracks the number of times a `LoopNode` (created using `TruffleRuntime.createLoopNode(RepeatingNode)`) executes in the interpreter.
@@ -33,9 +33,9 @@ A bytecode dispatch node typically looks something like the following:
 ```java
 class BytecodeDispatchNode extends Node {
   @CompilationFinal byte[] bytecode;
-  
+
   ...
-  
+
   @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.MERGE_EXPLODE)
   Object execute(VirtualFrame frame) {
     int bci = 0;
@@ -81,7 +81,7 @@ The example above can be refactored to support OSR as follows:
 class BytecodeDispatchNode extends Node implements BytecodeOSRNode {
   @CompilationFinal byte[] bytecode;
   @CompilationFinal private Object osrMetadata;
-  
+
   ...
 
   Object execute(VirtualFrame frame) {
@@ -176,4 +176,3 @@ For example, in the compilation log, a bytecode OSR entry may look something lik
 ```
 
 See [Debugging](https://github.com/oracle/graal/blob/master/compiler/docs/Debugging.md) for more details on debugging Graal compilations.
-
diff --git a/truffle/docs/Optimizing.md b/truffle/docs/Optimizing.md
index 1824da72f7aa..bb642996e41f 100644
--- a/truffle/docs/Optimizing.md
+++ b/truffle/docs/Optimizing.md
@@ -577,7 +577,7 @@ The `--engine.TraceCompilation` option also shows CallTarget invalidations with
 
 ## Ideal Graph Visualizer
 
-The [Ideal Graph Visualizer (IGV)](https://docs.oracle.com/en/graalvm/enterprise/21/docs/tools/igv/) is a tool to understand Truffle ASTs and the GraalVM compiler graphs.
+The [Ideal Graph Visualizer (IGV)](../../tools/ideal-graph-visualizer.md) is a tool to understand Truffle ASTs and the GraalVM compiler graphs.
 
 A typical usage is to run with `--vm.Dgraal.Dump=Truffle:1 --vm.Dgraal.PrintGraph=Network`, which will show you Truffle ASTs, guest-language call graphs, and the Graal graphs as they leave the Truffle phase.
 If the `-Dgraal.PrintGraph=Network` flag is omitted then the dump files are placed in the `graal_dumps` directory, which you should then open in IGV.
diff --git a/truffle/docs/Profiling.md b/truffle/docs/Profiling.md
index 1435783b2144..e09e1701786a 100644
--- a/truffle/docs/Profiling.md
+++ b/truffle/docs/Profiling.md
@@ -9,7 +9,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/Profiling/
 There is no shortage of tools for profiling interpreters written using Truffle.
 When running in JVM mode you can use standard JVM tooling such as VisualVM, Java Flight Recorder, and Oracle Developer Studio. When running in Native Image you can use `callgrind` from the Valgrind tool suite, and other system tools such as `strace`.
 As a language running on GraalVM, other GraalVM tools can be used.
-For a broad enough definition of profiling, you can also use the [Ideal Graph Visualizer (IGV)](https://docs.oracle.com/en/graalvm/enterprise/21/docs/tools/igv/) and C1 Visualizer to inspect the compiler output.
+For a broad enough definition of profiling, you can also use the [Ideal Graph Visualizer (IGV)](../../tools/ideal-graph-visualizer.md) and C1 Visualizer to inspect the compiler output.
 
 This guide is less about how to use each tool and more about suggestions for extracting the most useful information from the tools, assuming a basic knowledge of their usage.
 
diff --git a/truffle/docs/README.md b/truffle/docs/README.md
index cb063485ac24..8e6ffe01268d 100644
--- a/truffle/docs/README.md
+++ b/truffle/docs/README.md
@@ -50,7 +50,7 @@ Consider reading [these publications](https://github.com/oracle/graal/blob/maste
 Implementing a language using Truffle offers a way to interoperate with other "Truffle" languages.
 To learn more about verifying that your language is a valid polyglot citizen, read more about using the [Polyglot TCK](./TCK.md).
 Somewhat related topics worth exploring are [Truffle Libraries](./TruffleLibraries.md), as well as how to use them to implement a language [interoperability](./InteropMigration.md).
-Languages implemented with Truffle can also be embedded in Java host applications using the [Polyglot API](https://graalvm.org/reference-manual/embed-languages/).
+Languages implemented with Truffle can also be embedded in Java host applications using the [Polyglot API](../../reference-manual/embedding/embed-languages.md).
 
 To better understand how to improve the performance of your language please consult the documentation on [profiling](./Profiling.md) and [optimizing](./Optimizing.md) your language.
 Also, to better understand how to use Truffle's automated monomorphization feature (i.e., splitting), look at the [related documentation](./splitting/Monomorphization.md).
diff --git a/truffle/docs/StaticObjectModel.md b/truffle/docs/StaticObjectModel.md
index b19c4041b12e..d09d5454713f 100644
--- a/truffle/docs/StaticObjectModel.md
+++ b/truffle/docs/StaticObjectModel.md
@@ -222,7 +222,7 @@ public void wrongShape(TruffleLanguage<?> language) {
 ```
 
 While these checks are often useful, they might be redundant if the language implementation already performs them, for example using a verifier.
-While the first type of checks (on property type) is very efficient and cannot be disabled, the second type of checks (on the shape) is computationally expensive and can be disabled via a command line argument: 
+While the first type of checks (on property type) is very efficient and cannot be disabled, the second type of checks (on the shape) is computationally expensive and can be disabled via a command line argument:
 ```
 --experimental-options --engine.RelaxStaticObjectSafetyChecks=true
 ```

From ccccfdabfefdcae3c4509aa79ef440f3b40983a3 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 29 Sep 2021 13:16:34 +0300
Subject: [PATCH 398/681] Correct the path to Truffle readme, following the
 last meeting solution

---
 docs/enterprise-overview/architecture-overview.md         | 6 +++---
 .../graalvm-community/get-started-graalvm-community.md    | 4 ++--
 .../graalvm-enterprise/get-started-graalvm-enterprise.md  | 4 ++--
 docs/introduction.md                                      | 8 ++++----
 docs/reference-manual/compiler.md                         | 2 +-
 docs/reference-manual/embedding/embed-languages.md        | 2 +-
 docs/reference-manual/java-on-truffle/Demos.md            | 2 +-
 docs/reference-manual/java-on-truffle/FAQ.md              | 2 +-
 docs/reference-manual/java-on-truffle/Interoperability.md | 2 +-
 docs/reference-manual/java-on-truffle/README.md           | 2 +-
 docs/reference-manual/polyglot-programming.md             | 4 ++--
 docs/tools/ideal-graph-visualizer.md                      | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 6c5e3999851e..ef3aaf880a84 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -31,7 +31,7 @@ The preceding diagram illustrates a complete high-level architecture of GraalVM
 
 GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](../reference-manual/compiler.md), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../graalvm-as-a-platform/truffle/README.md), makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../../truffle/docs/README.md), makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes
@@ -42,7 +42,7 @@ GraalVM Enterprise is unique as a runtime environment offering several modes of
 When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](../reference-manual/compiler.md) as the top-tier JIT compiler.
 At runtime, an application is loaded and executed normally on the JVM.
 The JVM passes bytecodes for Java or any other JVM-native language to the compiler, which compiles that to the machine code and returns it to the JVM.
-Interpreters for supported languages, written on top of the [Truffle framework](../graalvm-as-a-platform/truffle/README.md), are themselves Java programs that run on the JVM.
+Interpreters for supported languages, written on top of the [Truffle framework](../../truffle/docs/README.md), are themselves Java programs that run on the JVM.
 
 #### Native Image
 [Native Image](../reference-manual/native-image/README.md) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
@@ -50,7 +50,7 @@ The Java bytecode that is processed during the native image build includes all a
 A generated self-contained native executable is specific to each individual operating systems and machine architecture that does not require a JVM.
 
 #### Java on Truffle
-[Java on Truffle](../reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle framework](../graalvm-as-a-platform/truffle/README.md).
+[Java on Truffle](../reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle framework](../../truffle/docs/README.md).
 It is a complete Java VM that includes all core components, implements the same API as the Java Runtime Environment library, and reuses all JARs and native libraries from GraalVM.
 Java on Trufle is an experimental technology in GraalVM, available as of version 21.0.0.
 
diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index ad0c41664ff9..63248c6f148e 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -335,7 +335,7 @@ javac PrettyPrintJSON.java
 native-image --language:js --initialize-at-build-time PrettyPrintJSON
 ```
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
-Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md) included, which is the case here.
+Additionally, the image building requires large amounts of physical memory, especially if you build an image with the [Truffle language implementation framework](../../../truffle/docs/README.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 ```shell
@@ -391,6 +391,6 @@ If you are mostly interested in GraalVM support for a specific language, or want
 
 If you are looking for the tooling support GraalVM offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](../../graalvm-as-a-platform/truffle/README.md).
+If you are considering GraalVM as a platform for your future language or tool implementation, go to [GraalVM as a Platform](../../../truffle/docs/README.md).
 
 You can find information on GraalVM's security model in the [Security Guide](../../security/security-guide.md), and rich API documentation in [GraalVM SDK Javadoc](https://www.graalvm.org/sdk/javadoc/) and [Truffle Javadoc](https://www.graalvm.org/truffle/javadoc/).
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index 4a1c4c755809..8bf0843113bb 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -335,7 +335,7 @@ native-image --language:js --initialize-at-build-time PrettyPrintJSON
 
 The native image generatation will take several minutes as it does not just build the `PrettyPrintJSON` class, but also builds JavaScript.
 Additionally, the image building requires large amounts of physical memory, especially if you build an image with
-the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md) included, which is the case here.
+the [Truffle language implementation framework](../../../truffle/docs/README.md) included, which is the case here.
 
 The resulting executable can now perform JSON pretty-printing:
 
@@ -406,6 +406,6 @@ If you are mostly interested in GraalVM Enterprise support for a specific langua
 
 If you are looking for the tooling support GraalVM Enterprise offers, proceed to [Debugging and Monitoring Tools](../../tools/tools.md).
 
-If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](../../graalvm-as-a-platform/truffle/README.md).
+If you are considering GraalVM Enterprise as a platform for your future language or tool implementation, go to [GraalVM Enterprise as a Platform](../../../truffle/docs/README.md).
 
 You can find information on GraalVM Enterprise's security model in the [Security Guide](/security-guide/), and rich API documentation in [GraalVM SDK Javadoc](https://docs.oracle.com/en/graalvm/enterprise/21/sdk/index.html).
diff --git a/docs/introduction.md b/docs/introduction.md
index bfa72daa728c..b8af73d11e14 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -26,7 +26,7 @@ This page provides an architectural overview of GraalVM and its runtime modes, s
 
 GraalVM adds an [advanced just-in-time (JIT) optimizing compiler](https://github.com/oracle/graal/tree/master/compiler), which is written in Java, to the HotSpot Java Virtual Machine.
 
-In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](graalvm-as-a-platform/truffle/README.md) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
+In addition to running Java and JVM-based languages, [GraalVM's language implementation framework (Truffle)](../truffle/docs/README.md) makes it possible to run JavaScript, Ruby, Python, and a number of other popular languages on the JVM.
 With GraalVM Truffle, Java and other supported languages can directly interoperate with each other and pass data back and forth in the same memory space.
 
 ## Runtime Modes
@@ -37,7 +37,7 @@ GraalVM is unique as a runtime environment offering several modes of operation:
 When running programs on the HotSpot JVM, GraalVM defaults to the [GraalVM compiler](reference-manual/compiler.md) as the top-tier JIT compiler.
 At runtime, an application is loaded and executed normally on the JVM.
 The JVM passes bytecodes for Java or any other JVM-native language to the compiler, which compiles that to the machine code and returns it to the JVM.
-Interpreters for supported languages, written on top of the [Truffle framework](graalvm-as-a-platform/truffle/README.md), are themselves Java programs that run on the JVM.
+Interpreters for supported languages, written on top of the [Truffle framework](../truffle/docs/README.md), are themselves Java programs that run on the JVM.
 
 #### Native Image
 [Native Image](reference-manual/native-image/README.md) is an innovative technology that compiles Java code into a standalone binary executable or a native shared library.
@@ -45,7 +45,7 @@ The Java bytecode that is processed during the native image build includes all a
 A generated self-contained native executable is specific to each individual operating systems and machine architecture that does not require a JVM.
 
 #### Java on Truffle
-[Java on Truffle](reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle language implementation framework](graalvm-as-a-platform/truffle/README.md).
+[Java on Truffle](reference-manual/java-on-truffle/README.md) is an implementation of the Java Virtual Machine Specification, built with the [Truffle language implementation framework](../truffle/docs/README.md).
 It is a complete Java VM that includes all core components, implements the same API as the Java Runtime Environment library, and reuses all JARs and native libraries from GraalVM.
 Java on Trufle is an experimental technology in GraalVM, available as of version 21.0.0.
 
@@ -86,7 +86,7 @@ Tools/Utilities:
 
 * [Native Image](reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable.
 * [LLVM toolchain](reference-manual/llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime.
-* [Java on Truffle](reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](graalvm-as-a-platform/truffle/README.md) to run Java via a Java bytecode interpreter.
+* [Java on Truffle](reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](../truffle/docs/README.md) to run Java via a Java bytecode interpreter.
 
 Runtimes:
 
diff --git a/docs/reference-manual/compiler.md b/docs/reference-manual/compiler.md
index 7a267b595390..1e8f12e5033b 100644
--- a/docs/reference-manual/compiler.md
+++ b/docs/reference-manual/compiler.md
@@ -37,7 +37,7 @@ A *graph* was selected for this role.
 The graph can represent similar statements of different languages in the same way, like "if" statements or loops, which makes it possible to mix languages in the same program.
 The GraalVM compiler can then perform language-independent optimization and generate machine code on this graph.
 
-GraalVM also includes the [Truffle language implementation framework](../graalvm-as-a-platform/truffle/README.md) -- a library, written in Java -- to build interpreters for programming languages, which then run on GraalVM.
+GraalVM also includes the [Truffle language implementation framework](../../truffle/docs/README.md) -- a library, written in Java -- to build interpreters for programming languages, which then run on GraalVM.
 These languages can consequently benefit from the optimization possibilities of the GraalVM compiler.
 The pipeline for such compilation is:
 
diff --git a/docs/reference-manual/embedding/embed-languages.md b/docs/reference-manual/embedding/embed-languages.md
index 6f5c07cd083a..1a0a1b29077c 100644
--- a/docs/reference-manual/embedding/embed-languages.md
+++ b/docs/reference-manual/embedding/embed-languages.md
@@ -31,7 +31,7 @@ beneath each code example to choose between JavaScript, R, Ruby, and Python.
 Ensure you set up GraalVM before you begin.
 
 ## Compile and Run a Polyglot Application
-GraalVM can run polyglot applications written in any language implemented with the [Truffle language implementation framework](../../graalvm-as-a-platform/truffle/README.md).
+GraalVM can run polyglot applications written in any language implemented with the [Truffle language implementation framework](../../../truffle/docs/README.md).
 These languages are henceforth referenced as **guest languages**.
 
 Complete the steps in this section to create a sample polyglot
diff --git a/docs/reference-manual/java-on-truffle/Demos.md b/docs/reference-manual/java-on-truffle/Demos.md
index 6e1af7f10350..2bb2bc569721 100644
--- a/docs/reference-manual/java-on-truffle/Demos.md
+++ b/docs/reference-manual/java-on-truffle/Demos.md
@@ -131,7 +131,7 @@ GraalVM Native Image technology allows compiling applications ahead-of-time (AOT
 The main trade off for using Native Image is that the analysis and compilation of your program happens under the closed world assumption, meaning the static analysis needs to process all bytecode which will ever be executed in the application.
 This makes using some language features like dynamic class loading or reflection tricky.
 
-Java on Truffle is a JVM implementation of a JVM bytecode interpreter, built on the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md).
+Java on Truffle is a JVM implementation of a JVM bytecode interpreter, built on the [Truffle framework](../../../truffle/docs/README.md).
 It is essentially a Java application, as are the Truffle framework itself and the GraalVM JIT compiler.
 All three of them can be compiled ahead-of-time with `native-image`.
 Using Java on Truffle for some parts of your application makes it possible to isolate the required dynamic behaviour and still use the native image on the rest of your code.
diff --git a/docs/reference-manual/java-on-truffle/FAQ.md b/docs/reference-manual/java-on-truffle/FAQ.md
index 8020dd6535f8..b130e63066e2 100644
--- a/docs/reference-manual/java-on-truffle/FAQ.md
+++ b/docs/reference-manual/java-on-truffle/FAQ.md
@@ -14,7 +14,7 @@ That means it can only run a Java program once it has been compiled to Java byte
 In the GraalVM family, this is similar to WebAssembly or the LLVM interpreter: while both can run C programs, they have to be complied by a C compiler first.
 
 ### Does Java running on Truffle run on HotSpot too?
-Like other languages implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md), it can run both as a native image or on top of HotSpot.
+Like other languages implemented with the [Truffle framework](../../../truffle/docs/README.md), it can run both as a native image or on top of HotSpot.
 Running on top of HotSpot is currently only possible on Linux.
 We plan to extend this capability to macOS and Windows platforms also.
 
diff --git a/docs/reference-manual/java-on-truffle/Interoperability.md b/docs/reference-manual/java-on-truffle/Interoperability.md
index 2cd16b77f0cc..7551851d064e 100644
--- a/docs/reference-manual/java-on-truffle/Interoperability.md
+++ b/docs/reference-manual/java-on-truffle/Interoperability.md
@@ -7,7 +7,7 @@ permalink: /reference-manual/java-on-truffle/interoperability/
 
 # Interoperability with Truffle Languages
 
-Java on Truffle allows you to interface other "Truffle" languages (languages which interpreters are implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md)) to create polyglot programs -- programs written in more than one language.
+Java on Truffle allows you to interface other "Truffle" languages (languages which interpreters are implemented with the [Truffle framework](../../../truffle/docs/README.md)) to create polyglot programs -- programs written in more than one language.
 
 This guide describes how to load code written in foreign languages, how to export and import objects between languages, how to use Java on Truffle objects from a foreign language, how to use foreign objects from Java on Truffle, and how to embed in host Java.
 
diff --git a/docs/reference-manual/java-on-truffle/README.md b/docs/reference-manual/java-on-truffle/README.md
index 5adec74167a6..6576102facb1 100644
--- a/docs/reference-manual/java-on-truffle/README.md
+++ b/docs/reference-manual/java-on-truffle/README.md
@@ -14,7 +14,7 @@ See the [Implementation Details](ImplementationDetails.md) for more information.
 The project name behind this implementation is "Espresso".
 Its open source version is available on [GitHub](https://github.com/oracle/graal/tree/master/espresso).
 
-The Java on Truffle execution mode runs Java via a Java bytecode interpreter, implemented with the [Truffle framework](../../graalvm-as-a-platform/truffle/README.md) – an open-source library for writing interpreters for programming languages.
+The Java on Truffle execution mode runs Java via a Java bytecode interpreter, implemented with the [Truffle framework](../../../truffle/docs/README.md) – an open-source library for writing interpreters for programming languages.
 Now Java can be executed by the same principle as other languages in the GraalVM ecosystem (JavaScript, Ruby, Python, R), directly interoperate with those languages, and pass data back and forth in the same memory space.
 Besides complete language interoperability, with Java on Truffle you can:
 
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index 752c3584e3fd..68acdc34d70e 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -14,7 +14,7 @@ permalink: /reference-manual/polyglot-programming/
 * [Passing Options Programmatically](#passing-options-programmatically)
 * [Passing Options Using JVM Arguments](#passing-options-using-jvm-arguments)
 
-GraalVM allows users to write polyglot applications that seamlessly pass values from one language to another by means of the [Truffle language implementation framework](../graalvm-as-a-platform/truffle/README.md) (henceforth "Truffle").
+GraalVM allows users to write polyglot applications that seamlessly pass values from one language to another by means of the [Truffle language implementation framework](../../../truffle/docs/README.md) (henceforth "Truffle").
 
 Truffle is a Java library for building programming languages implementations as interpreters for self-modifying Abstract Syntax Trees.
 When writing a language interpreter with Truffle, it will automatically use the GraalVM compiler as a just-in-time compiler for the language.
@@ -198,7 +198,7 @@ polyglot --jvm polyglot.js polyglot.R polyglot.rb
 ```
 
 We have also included a basic experimental shell for multiple languages called the _Polyglot Shell_.
-It is useful to quickly test the interactivity of languages implemented with the [Truffle framework](../graalvm-as-a-platform/truffle/README.md).
+It is useful to quickly test the interactivity of languages implemented with the [Truffle framework](../../truffle/docs/README.md).
 This is how you can start it:
 
 ```shell
diff --git a/docs/tools/ideal-graph-visualizer.md b/docs/tools/ideal-graph-visualizer.md
index 0ea34d012602..ac85fd3b9bf1 100644
--- a/docs/tools/ideal-graph-visualizer.md
+++ b/docs/tools/ideal-graph-visualizer.md
@@ -91,7 +91,7 @@ That one is initially hidden, but you can display the list of opened projects us
 
 ## Dumping Graphs
 
-The IGV tool is developed to allow GraalVM Enterprise language implementers to optimize their languages assembled with the [Language Implentation Framework](../graalvm-as-a-platform/truffle/README.md).
+The IGV tool is developed to allow GraalVM Enterprise language implementers to optimize their languages assembled with the [Language Implentation Framework](../../truffle/docs/README.md).
 As a development tool it should not be installed to production environments.
 
 To dump the GraalVM compiler graphs from an embedded Java application to the IGV, you need to add options to GraalVM-based processes.

From a032c565ff88c5b01bbaec598f0b25432e2a4f8f Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 6 Oct 2021 19:31:49 +0300
Subject: [PATCH 399/681] Follow Benoit Daloze comments

---
 .../architecture-overview.md                  |  2 +-
 docs/examples/java-kotlin-aot.md              |  2 +-
 docs/examples/native-image-examples.md        |  2 +-
 docs/examples/polyglot-javascript-java-r.md   |  2 +-
 .../get-started-graalvm-community.md          |  2 +-
 .../graalvm-community/linux.md                | 18 ++++++++---------
 .../graalvm-community/macos.md                | 18 ++++++++---------
 .../get-started-graalvm-enterprise.md         |  2 +-
 .../graalvm-enterprise/installation-linux.md  | 18 ++++++++---------
 .../graalvm-enterprise/installation-macos.md  | 18 ++++++++---------
 .../reference-manual/java-on-truffle/Demos.md |  4 ++--
 .../java-on-truffle/HotSwapPluginAPI.md       |  4 ++--
 .../java-on-truffle/ImplementationDetails.md  |  2 +-
 docs/reference-manual/java/README.md          |  2 +-
 docs/reference-manual/llvm/Compiling.md       |  2 +-
 docs/reference-manual/native-image/C-API.md   |  2 +-
 .../native-image/DynamicProxy.md              |  2 +-
 .../ImplementingNativeMethodsInJavaWithSVM.md |  2 +-
 docs/reference-manual/native-image/JNI.md     |  2 +-
 docs/reference-manual/native-image/Options.md |  2 +-
 docs/reference-manual/native-image/README.md  |  2 +-
 .../native-image/Reflection.md                |  4 ++--
 .../native-image/Resources.md                 |  2 +-
 docs/reference-manual/polyglot-programming.md |  2 +-
 docs/reference-manual/wasm/README.md          |  2 +-
 docs/tools/vscode/graalvm/README.md           | 20 +++++++++----------
 docs/tools/vscode/micronaut/README.md         |  2 +-
 27 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index ef3aaf880a84..41b6882f5d53 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -10,7 +10,7 @@ It is designed to accelerate the execution of applications written in Java and o
 GraalVM Enterprise's polyglot capabilities make it possible to mix multiple programming languages in a single application while eliminating any foreign language call costs.
 
 This page provides developers, solution architects, and infrastructure architects with an architectural overview of GraalVM Enterprise, as well as information about runtime modes, supported platforms, available distributions, core and additional functionalities, and support levels for various features.
-The conceptual overview and advantages of GraalVM Enterprise are described on the [Solutions Overview](overview.md) page.
+The conceptual overview and advantages of GraalVM Enterprise are described on the [Solutions Overview](solutions-overview.md) page.
 
 * [GraalVM Enterprise Architecture](#graalvm-enterprise-architecture)
 * [Runtime Modes](#runtime-modes)
diff --git a/docs/examples/java-kotlin-aot.md b/docs/examples/java-kotlin-aot.md
index 725c4b71cf6f..dcca8454177f 100644
--- a/docs/examples/java-kotlin-aot.md
+++ b/docs/examples/java-kotlin-aot.md
@@ -38,7 +38,7 @@ export GRAALVM_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
 ```
 Note that your paths are likely to be different depending on the download location.
 
-3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) to make use of the `native-image` utility.
+3&#46; [Install Native Image](../reference-manual/native-image/README.md#install-native-image) to make use of the `native-image` utility.
 
 4&#46; Then execute:
 ```shell
diff --git a/docs/examples/native-image-examples.md b/docs/examples/native-image-examples.md
index b1412280e053..cc24d0c1bbb2 100644
--- a/docs/examples/native-image-examples.md
+++ b/docs/examples/native-image-examples.md
@@ -38,7 +38,7 @@ export GRAALVM_HOME=/Users/${current_user}/path/to/graalvm/Contents/Home
 ```
 Note that your paths are likely to be different depending on the download location.
 
-3&#46; [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) to make use of the `native-image` utility.
+3&#46; [Install Native Image](../reference-manual/native-image/README.md#install-native-image) to make use of the `native-image` utility.
 
 4&#46; Then execute:
 ```shell
diff --git a/docs/examples/polyglot-javascript-java-r.md b/docs/examples/polyglot-javascript-java-r.md
index 31e52eaf4eaf..32c82e4ae8d4 100644
--- a/docs/examples/polyglot-javascript-java-r.md
+++ b/docs/examples/polyglot-javascript-java-r.md
@@ -17,7 +17,7 @@ git clone https://github.com/graalvm/graalvm-demos
 cd graalvm-demos/polyglot-javascript-java-r
 ```
 
-2&#46; [Install GraalVM](../getting-started/graalvm-community/get-started-graalvm-community.md/#install-graalvm) on your platform.
+2&#46; [Install GraalVM](../getting-started/graalvm-community/get-started-graalvm-community.md#install-graalvm) on your platform.
 
 3&#46; To run the demo, you need to enable Node.js support in GraalVM:
 ```shell
diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index 63248c6f148e..ea7c393b83d6 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -284,7 +284,7 @@ public class HelloWorld {
 }
 ```
 
-> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md/#prerequisites).
+> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md#prerequisites).
 
 Compile _HelloWorld.java_ to bytecode and then build a native image:
 ```shell
diff --git a/docs/getting-started/graalvm-community/linux.md b/docs/getting-started/graalvm-community/linux.md
index 65bdf352011d..dcaf41dda0a0 100644
--- a/docs/getting-started/graalvm-community/linux.md
+++ b/docs/getting-started/graalvm-community/linux.md
@@ -36,18 +36,18 @@ The base distribution of GraalVM Community Edition for Linux (AMD64) platforms i
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+* [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+* [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
-*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
-*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
-*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
-*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
+* [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+* [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+* [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
 To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
-Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-community/macos.md b/docs/getting-started/graalvm-community/macos.md
index 6ef34b5b7f57..1f25684ffc00 100644
--- a/docs/getting-started/graalvm-community/macos.md
+++ b/docs/getting-started/graalvm-community/macos.md
@@ -66,18 +66,18 @@ The base distribution of GraalVM Community Edition for macOS includes OpenJDK wi
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+* [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+* [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
-*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
-*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
-*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
-*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
+* [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+* [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+* [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Community base distribution and must be installed separately.
 
 To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
-Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index 8bf0843113bb..f7ea8016c2fd 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -284,7 +284,7 @@ public class HelloWorld {
 }
 ```
 
-> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md/#prerequisites).
+> Note: For compilation `native-image` depends on the local toolchain. Make sure your system meets the [prerequisites](../../reference-manual/native-image/README.md#prerequisites).
 
 Compile _HelloWorld.java_ to bytecode and then build a native image:
 ```shell
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux.md b/docs/getting-started/graalvm-enterprise/installation-linux.md
index 56fda647c330..c1419588f83a 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux.md
@@ -35,18 +35,18 @@ The base distribution of GraalVM Enterprise for Linux (AMD64) platforms includes
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+* [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+* [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
-*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
-*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
-*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
-*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
+* [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+* [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+* [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
 To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
-Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/getting-started/graalvm-enterprise/installation-macos.md b/docs/getting-started/graalvm-enterprise/installation-macos.md
index 2484107b3f84..34d15f565608 100644
--- a/docs/getting-started/graalvm-enterprise/installation-macos.md
+++ b/docs/getting-started/graalvm-enterprise/installation-macos.md
@@ -66,18 +66,18 @@ The base distribution of GraalVM Enterprise for macOS platforms includes Oracle
 The base installation can be extended with:
 
 Tools/Utilities:
-*  [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
-*  [LLVM toolchain](../../reference-manual/llvm/Compiling.md/#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-*  [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
+* [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
+* [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
-*  [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
-*  [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
-*  [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
-*  [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
-*  [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
+* [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
+* [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
+* [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
+* [R](/../../reference-manual/r/README.md) -- GNU R 4.0.3 compatible
+* [Wasm](../../reference-manual/wasm/README.md) -- WebAssembly (Wasm)
 ​
 These runtimes are not part of the GraalVM Enterprise base distribution and must be installed separately.
 
 To assist a user with installation, GraalVM includes **GraalVM Updater**, a command line utility to install and manage additional functionalities.
-Proceed to the [installation steps](../../reference-manual/graalvm-updater.md/#component-installation) to add any necessary language runtime or utility from above to GraalVM.
+Proceed to the [installation steps](../../reference-manual/graalvm-updater.md#component-installation) to add any necessary language runtime or utility from above to GraalVM.
diff --git a/docs/reference-manual/java-on-truffle/Demos.md b/docs/reference-manual/java-on-truffle/Demos.md
index 2bb2bc569721..4a58b715cf93 100644
--- a/docs/reference-manual/java-on-truffle/Demos.md
+++ b/docs/reference-manual/java-on-truffle/Demos.md
@@ -145,8 +145,8 @@ This design naturally fits the point we are trying to illustrate. We can build a
 
 Prerequisites:
 * [GraalVM 21.0](https://www.graalvm.org/downloads/)
-* [Native Image](../native-image/README.md/#install-native-image)
-* [Java on Truffle](README.md/#install-java-on-truffle)
+* [Native Image](../native-image/README.md#install-native-image)
+* [Java on Truffle](README.md#install-java-on-truffle)
 
 
 1. Clone the [project](https://github.com/graalvm/graalvm-demos) with the demo applications and navigate to the `espresso-jshell` directory:
diff --git a/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md b/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
index 3f755bab2d7b..145c056976a3 100644
--- a/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
+++ b/docs/reference-manual/java-on-truffle/HotSwapPluginAPI.md
@@ -7,7 +7,7 @@ permalink: /reference-manual/java-on-truffle/hotswap-plugin/
 
 # Truffle on Java HotSwap Plugin API
 
-With Java on Truffle you can benefit from enhanced HotSwap [capabilites](Demos.md/#enhanced-hotswap-capabilities-with-java-on-truffle) that allow the code to evolve naturally during development without the need for restarting a running application.
+With Java on Truffle you can benefit from enhanced HotSwap [capabilites](Demos.md#enhanced-hotswap-capabilities-with-java-on-truffle) that allow the code to evolve naturally during development without the need for restarting a running application.
 ​
 While code reloading (HotSwap) is a powerful tool, it is not sufficient to reflect all kinds of changes, e.g., changes to annotations, framework-specific changes such as implemented services or beans.
 For these things the code often needs to be executed to reload configurations or contexts before the changes are fully reflected in the running instance.
@@ -138,7 +138,7 @@ Here is a sample application created from the tutorial ["Creating your first Mic
 Example's sources can be downloaded as a ready-made Gradle project from [here](https://guides.micronaut.io/latest/micronaut-creating-first-graal-app-gradle-java.zip).
 Download, unzip and open the project in your IDE.
 
-Before you proceed, make sure that you have Java on Truffle [installed](README.md/#install-java-on-truffle) and set the GraalVM as the project SDK.
+Before you proceed, make sure that you have Java on Truffle [installed](README.md#install-java-on-truffle) and set the GraalVM as the project SDK.
 ​
 1. In your IDE navigate to the root `build.gradle` within the sample project. Add:
 
diff --git a/docs/reference-manual/java-on-truffle/ImplementationDetails.md b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
index a5a83ccb56fe..ba327146a7bf 100644
--- a/docs/reference-manual/java-on-truffle/ImplementationDetails.md
+++ b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
@@ -35,6 +35,6 @@ This mode is not used when running in a native image since there will be no conf
 * Java on Truffle does not implement the `java.lang.instrument` interface. As a result it does not support the `-javaagent` VM option.
 * Java on Truffle currently uses the standard native libraries from the Java core library. This requires allowing a polyglot `Context` native access. Because of the way these libraries are loaded (via [Truffle NFI](../../graalvm-as-a-platform/truffle/NFI.md)), running on top of HotSpot only works on Linux (with `glibc`). Running as part of a native image works on Linux, Windows, and macOS but it currently limited to one context.
 * Support for [Java Management Extensions (JMX)](https://docs.oracle.com/javase/tutorial/jmx/index.html) is partial and some methods might return partial data.
-* The [Debugger Protocol Implementation (JDWP)](https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html) lacks some capabilities compared to HotSpot. It will correctly report the supported [capabilities](https://docs.oracle.com/javase/8/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_VirtualMachine_Capabilities). In particular actions that require to enumerate all Java objects are not supported. However it does support a few hot reloading cases that HotSpot does not. See [Enhanced HotSwap Capabilities with Java on Truffle](Demos.md/#enhanced-hotswap-capabilities-with-java-on-truffle).
+* The [Debugger Protocol Implementation (JDWP)](https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html) lacks some capabilities compared to HotSpot. It will correctly report the supported [capabilities](https://docs.oracle.com/javase/8/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_VirtualMachine_Capabilities). In particular actions that require to enumerate all Java objects are not supported. However it does support a few hot reloading cases that HotSpot does not. See [Enhanced HotSwap Capabilities with Java on Truffle](Demos.md#enhanced-hotswap-capabilities-with-java-on-truffle).
 * When the `java.MultiThreaded` option is set to "false", [reference processing](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ref/package-summary.html) will not happen. Depending on the application, this could create resource leaks. Note that this option is set to "false" automatically if Java on Truffle runs in a context where a single-threaded language is enabled (e.g., JavaScript).
 * Java on Truffle does not support the [Polyglot API](https://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/package-summary.html) yet. However, it provides a guest Java Polyglot API, described in `polyglot.jar`. For more information, see [Interoperability with Truffle Languages](Interoperability.md).
diff --git a/docs/reference-manual/java/README.md b/docs/reference-manual/java/README.md
index 39b017e18d15..ce9337c9355f 100644
--- a/docs/reference-manual/java/README.md
+++ b/docs/reference-manual/java/README.md
@@ -28,7 +28,7 @@ This is the default and recommended mode of operation.
 - **jargraal**: the GraalVM compiler goes through the same warm-up phase that the rest of the Java application does. That is, it is first interpreted before its hot methods are compiled.
 This mode is selected with the `-XX:-UseJVMCINativeLibrary` command-line option.
 This will delay the time to reach peak performance as the compiler itself needs to be compiled before it produces code quickly.
-This mode allows you to [debug the GraalVM compiler with a Java debugger](Operations.md/#troubleshooting-the-graalvm-compiler).
+This mode allows you to [debug the GraalVM compiler with a Java debugger](Operations.md#troubleshooting-the-graalvm-compiler).
 
 
 ## Interoperability
diff --git a/docs/reference-manual/llvm/Compiling.md b/docs/reference-manual/llvm/Compiling.md
index 1500c2a0600e..aed0ad20800c 100644
--- a/docs/reference-manual/llvm/Compiling.md
+++ b/docs/reference-manual/llvm/Compiling.md
@@ -36,7 +36,7 @@ $GRAALVM_HOME/bin/gu install llvm-toolchain
 ```
 
 The above command will install the LLVM toolchain from the GitHub catalog for GraalVM Community users.
-For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md/#manual-installation) is required.
+For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md#manual-installation) is required.
 
 To get the location of the toolchain, use the `--print-toolchain-path` argument of `lli`:
 ```shell
diff --git a/docs/reference-manual/native-image/C-API.md b/docs/reference-manual/native-image/C-API.md
index a482cb8c7788..a0611d270dfb 100644
--- a/docs/reference-manual/native-image/C-API.md
+++ b/docs/reference-manual/native-image/C-API.md
@@ -6,7 +6,7 @@ permalink: /reference-manual/native-image/C-API/
 ---
 #  Native Image C API
 
-Native Image provides an API for the C language for initializing isolates and attaching threads for use with the entry point feature that is demonstrated [here](README.md/#images-and-entry-points).
+Native Image provides an API for the C language for initializing isolates and attaching threads for use with the entry point feature that is demonstrated [here](README.md#images-and-entry-points).
 The C API is available when Native Image is built as a shared library and its declarations are included in the header file that is generated during the build.
 
 ```c
diff --git a/docs/reference-manual/native-image/DynamicProxy.md b/docs/reference-manual/native-image/DynamicProxy.md
index e64d68d5c6d0..0ff440024398 100644
--- a/docs/reference-manual/native-image/DynamicProxy.md
+++ b/docs/reference-manual/native-image/DynamicProxy.md
@@ -12,7 +12,7 @@ Dynamic proxy classes are generated from a list of interfaces.
 Native Image does not provide machinery for generating and interpreting bytecodes at run time.
 Therefore all dynamic proxy classes need to be generated at native image build time.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
 
 ## Automatic Detection
 
diff --git a/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md b/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
index 422818d8c979..89f20feb3201 100644
--- a/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
+++ b/docs/reference-manual/native-image/ImplementingNativeMethodsInJavaWithSVM.md
@@ -14,7 +14,7 @@ If you are interested in how Native Image supports the common use case, continue
 
 ## Create a Shared Library
 
-First of all one has to use the `native-image` builder to generate a shared library with some JNI-compatible [entry points](README.md/#build-a-shared-library).
+First of all one has to use the `native-image` builder to generate a shared library with some JNI-compatible [entry points](README.md#build-a-shared-library).
 Start with the Java code:
 ```java
 package org.pkg.implnative;
diff --git a/docs/reference-manual/native-image/JNI.md b/docs/reference-manual/native-image/JNI.md
index d932552b3903..18099d071af9 100644
--- a/docs/reference-manual/native-image/JNI.md
+++ b/docs/reference-manual/native-image/JNI.md
@@ -9,7 +9,7 @@ permalink: /reference-manual/native-image/JNI/
 JNI is a native API that enables Java code to interact with native code and vice versa.
 This page gives an overview of the JNI implementation in Native Image.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
 
 ## Integration
 JNI support is enabled by default and built into Native Image builds. Individual classes, methods, and fields that should be accessible via JNI must be specified during native image generation in a configuration file (read below).
diff --git a/docs/reference-manual/native-image/Options.md b/docs/reference-manual/native-image/Options.md
index d9be72e84b20..a6b43c6fcc7d 100644
--- a/docs/reference-manual/native-image/Options.md
+++ b/docs/reference-manual/native-image/Options.md
@@ -16,7 +16,7 @@ class.
 
 - `native-image [options] -jar jarfile [imagename] [options]` to build an image for a JAR file.
 
-The options passed to `native-image` are evaluated left-to-right. For more information, see [Native Image Build Configuration](BuildConfiguration.md/#order-of-arguments-evaluation).
+The options passed to `native-image` are evaluated left-to-right. For more information, see [Native Image Build Configuration](BuildConfiguration.md#order-of-arguments-evaluation).
 
 The options fall into four categories: image generation options, macro options, non-standard options, and server options.
 Non-standard and server options are subject to change through a deprecation cycle.
diff --git a/docs/reference-manual/native-image/README.md b/docs/reference-manual/native-image/README.md
index c6ad06cc7082..dbe44de953dd 100644
--- a/docs/reference-manual/native-image/README.md
+++ b/docs/reference-manual/native-image/README.md
@@ -50,7 +50,7 @@ After this additional step, the `native-image` executable will become available
 the `GRAALVM_HOME/bin` directory.
 
 The above command will install Native Image from the GitHub catalog for GraalVM Community users.
-For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md/#manual-installation) is required.
+For GraalVM Enterprise users, the [manual installation](../graalvm-updater.md#manual-installation) is required.
 
 ## Prerequisites
 
diff --git a/docs/reference-manual/native-image/Reflection.md b/docs/reference-manual/native-image/Reflection.md
index 23016e1553e7..86176c7e3a16 100644
--- a/docs/reference-manual/native-image/Reflection.md
+++ b/docs/reference-manual/native-image/Reflection.md
@@ -15,7 +15,7 @@ Examining and accessing program elements through `java.lang.reflect.*` or loadin
 Native Image tries to resolve the target elements through a static analysis that detects calls to the Reflection API.
 Where the analysis fails, the program elements reflectively accessed at run time must be specified using a manual configuration.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
 
 ## Automatic Detection
 
@@ -144,7 +144,7 @@ Conditional configuration is the *preferred* way to specify reflection configura
 
 If a `condition` is omitted, the element is always included. When the same `condition` is used for two distinct elements in two configuration entries, both elements will be included when the condition is satisfied. When a configuration entry should be enabled if one of several types are reachable, it is necessary to add two configuration entries: one entry for each condition.
 
-When used with [assisted configuration](BuildConfiguration.md/#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries as agent-collected entries.
+When used with [assisted configuration](BuildConfiguration.md#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries as agent-collected entries.
 
 ### Configuration with Features
 
diff --git a/docs/reference-manual/native-image/Resources.md b/docs/reference-manual/native-image/Resources.md
index 03fbf4ec0073..e1aa1e5d8b72 100644
--- a/docs/reference-manual/native-image/Resources.md
+++ b/docs/reference-manual/native-image/Resources.md
@@ -58,7 +58,7 @@ Then:
    (or alternatively with a single `.*/(Resource0|Resource1).txt$`).
 *  Also, if we want to include everything except the `Resource2.txt` file, we can simply exclude it with `-H:IncludeResources='.*/Resource.*txt$'` followed by `-H:ExcludeResources='.*/Resource2.txt$'`.
 
-See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md/#assisted-configuration-of-native-image-builds).
+See also the [guide on assisted configuration of Java resources and other dynamic features](BuildConfiguration.md#assisted-configuration-of-native-image-builds).
 
 ## Locales
 
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index 68acdc34d70e..8c4fc237511f 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -38,7 +38,7 @@ Ensure you set up GraalVM before you begin.
 The below examples work:
 * on a JVM, by passing `--polyglot --jvm`.
 * on native launchers with `--polyglot` (e.g., `js --polyglot`).
-  It might be required to [rebuild images](graalvm-updater.md/#rebuild-images) to access languages installed with `gu`.
+  It might be required to [rebuild images](graalvm-updater.md#rebuild-images) to access languages installed with `gu`.
 * with native executables (e.g., `native-image --language:js`).
 
 For native launchers and native executables using Java as a Target Language
diff --git a/docs/reference-manual/wasm/README.md b/docs/reference-manual/wasm/README.md
index 2b6f7b191cca..66b106f68f37 100644
--- a/docs/reference-manual/wasm/README.md
+++ b/docs/reference-manual/wasm/README.md
@@ -18,7 +18,7 @@ The support is not available by default, but you can add it to GraalVM using the
 gu install wasm
 ```
 The above command will install a community version of a component from the GitHub catalog.
-For GraalVM Enterprise users, the [manual component installation](../graalvm-updater.md/#component-installation) is required.
+For GraalVM Enterprise users, the [manual component installation](../graalvm-updater.md#component-installation) is required.
 
 Then `wasm` launcher, which can run compiled WebAssembly binary code, becomes available.
 
diff --git a/docs/tools/vscode/graalvm/README.md b/docs/tools/vscode/graalvm/README.md
index 10b1036a5887..7e547ea330c0 100644
--- a/docs/tools/vscode/graalvm/README.md
+++ b/docs/tools/vscode/graalvm/README.md
@@ -192,7 +192,7 @@ Open the _launch.json_ file and click the Add Configuration... button in the bot
 5&#46; Generate load to the running process to invoke more code and generate the best configuration.
 Once all possible execution paths have been executed, terminate the process. At this point the Native Image agent dumps the collected configuration to the selected output directory.
 
-Once the configuration for Native Image has been generated, follow the documentation on how to [generate a native image for a project](https://www.graalvm.org/reference-manual/native-image/#build-a-native-image) from the command line, or how to [build native images right from VS Code](../micronaut/README.md#generate-native-images-of-micronaut-projects).
+Once the configuration for Native Image has been generated, follow the documentation on how to [generate a native image for a project](https://www.graalvm.org/reference-manual/native-image#build-a-native-image) from the command line, or how to [build native images right from VS Code](../micronaut/README.md#generate-native-images-of-micronaut-projects).
 
 ## Native Image Debugger
 
@@ -461,7 +461,7 @@ For example, to connect to the Chrome Dev Tools protocol port, the content of th
 
 Alternatively, to pass the `--polyglot` option to any of the existing application launchers, add the `runtimeArgs` attribute containing the `--polyglot` value to their respective debug configurations.
 
-> Note: In some cases (polyglot application calls Java or R, or native launcher accesses languages installed with `gu` without [rebuilding images](https://www.graalvm.org/reference-manual/graalvm-updater/#component-uninstallation)), also passing the `--jvm` option is necessary.
+> Note: In some cases (polyglot application calls Java or R, or native launcher accesses languages installed with `gu` without [rebuilding images](https://www.graalvm.org/reference-manual/graalvm-updater#component-uninstallation)), also passing the `--jvm` option is necessary.
 
 ![Image Debug Configuration for Python](images/polyglot-debug-config.png)
 
@@ -502,14 +502,14 @@ GraalVM supports smart editing features of development tools used to create gues
 This allows you to attach compatible development tools such as VS Code to GraalVM and to get features like auto complete, go to declaration, or documentation on hover.
 
 Currently, [GraalVM's Language Server Protocol](https://www.graalvm.org/tools/lsp/) implementation supports the following services:
-* [Text Document Synchronization](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_synchronization)
-* [Hover Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover)
-* [Completion Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion)
-* [Signature Help Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp)
-* [Document Highlight Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight)
-* [Code Action Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction)
-* [Code Lens Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeLens)
-* [Execute Command Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_executeCommand)
+* [Text Document Synchronization](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_synchronization)
+* [Hover Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_hover)
+* [Completion Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_completion)
+* [Signature Help Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_signatureHelp)
+* [Document Highlight Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_documentHighlight)
+* [Code Action Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_codeAction)
+* [Code Lens Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_codeLens)
+* [Execute Command Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#workspace_executeCommand)
 
 > Note: The Language Server Protocol is offered as a technology preview and requires to pass the `--experimental-options` option for its activation.
 
diff --git a/docs/tools/vscode/micronaut/README.md b/docs/tools/vscode/micronaut/README.md
index 8e8935c68048..8f7a736296ce 100644
--- a/docs/tools/vscode/micronaut/README.md
+++ b/docs/tools/vscode/micronaut/README.md
@@ -11,7 +11,7 @@ permalink: /tools/vscode/micronaut-extension/
 The extension is Technology Preview.
 
 The extension also enables the [Micronaut Launch](https://micronaut.io/launch/) application that allows you to create Micronaut projects through an interface inside VS Code, in addition to using the console CLI.
-There are, of course, other ways to create a new Micronaut application. If you provide a path to the [Micronaut CLI installation](https://micronaut-projects.github.io/micronaut-starter/latest/guide/#installation), you can create a project using the `mn` executable. If you prefer not to install the Micronaut CLI, and you are running on Linux or macOS, you can `curl` the project. Lastly, you can navigate to Micronaut Launch in a browser, create a new project, download it and open in VS Code.
+There are, of course, other ways to create a new Micronaut application. If you provide a path to the [Micronaut CLI installation](https://micronaut-projects.github.io/micronaut-starter/latest/guide#installation), you can create a project using the `mn` executable. If you prefer not to install the Micronaut CLI, and you are running on Linux or macOS, you can `curl` the project. Lastly, you can navigate to Micronaut Launch in a browser, create a new project, download it and open in VS Code.
 
 In combination with the [GraalVM Tools for Java extension](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm), you can run Micronaut projects on GraalVM, and debug them directly from the VS Code development environment with different debugging protocols enabled with the extension. This extension for Micronaut was also developed to help developers build native images directly from VS Code.
 

From 5328deb3b404335edd6b24d167d8233f1568b5ca Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 6 Oct 2021 19:48:19 +0300
Subject: [PATCH 400/681] Follow Benoit Daloze comments

---
 truffle/docs/AOTOverview.md                      | 2 +-
 truffle/docs/AuxiliaryEngineCachingEnterprise.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/truffle/docs/AOTOverview.md b/truffle/docs/AOTOverview.md
index d03e1f3ba362..6cc08039af29 100644
--- a/truffle/docs/AOTOverview.md
+++ b/truffle/docs/AOTOverview.md
@@ -28,7 +28,7 @@ For more information see [TruffleLanguage.patchContext](https://www.graalvm.org/
 ### Code sharing within the same Isolate/Process
 
 A polyglot engine can be used in order to determine the scope of code sharing between contexts.
-An example of how that can be done can be found in the [reference manual](https://www.graalvm.org/reference-manual/embed-languages/#code-caching-across-multiple-contexts).
+An example of how that can be done can be found in the [reference manual](../../docs/reference-manual/embedding/embed-languages.md#code-caching-across-multiple-contexts).
 When a language is initialized for a polyglot context, a new language instance is requested from an engine.
 If the language supports [ContextPolicy.SHARED](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.ContextPolicy.html#SHARED), then the language instance will be reused for an engine instance.
 The source parsing cache is associated with a language instance, so parsing happens once per language instance.
diff --git a/truffle/docs/AuxiliaryEngineCachingEnterprise.md b/truffle/docs/AuxiliaryEngineCachingEnterprise.md
index 43c93e1e4eeb..3f829d487181 100644
--- a/truffle/docs/AuxiliaryEngineCachingEnterprise.md
+++ b/truffle/docs/AuxiliaryEngineCachingEnterprise.md
@@ -19,7 +19,7 @@ This includes:
 2. Execution and profiling of the guest application in the interpreter.
 3. Compilation of the AST to machine code.
 
-Within a single OS process, the work performed during warmup can be shared by specifying an [explicit engine](../../reference-manual/embedding/embed-languages.md/#code-caching-across-multiple-contexts).
+Within a single OS process, the work performed during warmup can be shared by specifying an [explicit engine](../../docs/reference-manual/embedding/embed-languages.md#code-caching-across-multiple-contexts).
 This requires language implementations to disable context-related optimizations to avoid deoptimizations between contexts that share code.
 Auxiliary engine caching builds upon the mechanism for disabling context-related optimizations and adds the capability to persist an engine with ASTs and optimized machine code to disk.
 This way, the work performed during warmup can be significantly reduced in the first application context of a new process.

From 301a4c304f4415d7c46cd0fe01f2a88d3ca4a0d3 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:42:37 +0300
Subject: [PATCH 401/681] Follow Gilles D. comments

---
 docs/enterprise-overview/architecture-overview.md             | 2 +-
 docs/getting-started/graalvm-community/linux.md               | 2 +-
 docs/getting-started/graalvm-community/macos.md               | 2 +-
 docs/getting-started/graalvm-enterprise/installation-linux.md | 2 +-
 docs/getting-started/graalvm-enterprise/installation-macos.md | 2 +-
 docs/reference-manual/graalvm-updater.md                      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index 41b6882f5d53..5ef72aecffed 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -100,10 +100,10 @@ Tools/Utilities:
 
 * [Native Image](../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native platform executable.
 * [LLVM toolchain](../reference-manual/llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM.
-* [Java on Truffle](../reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](/graalvm-as-a-platform/language-implementation-framework/) to run Java via a Java bytecode interpreter.
 
 Runtimes:
 
+* [Java on Truffle](../reference-manual/java-on-truffle/README.md) -- a JVM implementation built upon the [Truffle framework](../../truffle/docs/README.md) to run Java via a Java bytecode interpreter.
 * [Node.js](../reference-manual/js/README.md) -- the Node.js 14.17.6 runtime for JavaScript
 * [Python](../reference-manual/python/README.md) -- Python 3.8.5 compatible
 * [Ruby](../reference-manual/ruby/README.md) -- Ruby 2.7.3 compatible
diff --git a/docs/getting-started/graalvm-community/linux.md b/docs/getting-started/graalvm-community/linux.md
index dcaf41dda0a0..fa4cf5873ff6 100644
--- a/docs/getting-started/graalvm-community/linux.md
+++ b/docs/getting-started/graalvm-community/linux.md
@@ -38,9 +38,9 @@ The base installation can be extended with:
 Tools/Utilities:
 * [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
 * [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 * [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
 * [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
 * [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
diff --git a/docs/getting-started/graalvm-community/macos.md b/docs/getting-started/graalvm-community/macos.md
index 1f25684ffc00..3ed2bc31fe32 100644
--- a/docs/getting-started/graalvm-community/macos.md
+++ b/docs/getting-started/graalvm-community/macos.md
@@ -68,9 +68,9 @@ The base installation can be extended with:
 Tools/Utilities:
 * [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
 * [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 * [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
 * [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
 * [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux.md b/docs/getting-started/graalvm-enterprise/installation-linux.md
index c1419588f83a..e40d026bc347 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux.md
@@ -37,9 +37,9 @@ The base installation can be extended with:
 Tools/Utilities:
 * [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
 * [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 * [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
 * [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
 * [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
diff --git a/docs/getting-started/graalvm-enterprise/installation-macos.md b/docs/getting-started/graalvm-enterprise/installation-macos.md
index 34d15f565608..dbd2f65e64fc 100644
--- a/docs/getting-started/graalvm-enterprise/installation-macos.md
+++ b/docs/getting-started/graalvm-enterprise/installation-macos.md
@@ -68,9 +68,9 @@ The base installation can be extended with:
 Tools/Utilities:
 * [Native Image](../../reference-manual/native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
 * [LLVM toolchain](../../reference-manual/llvm/Compiling.md#llvm-toolchain-for-compiling-cc) --  a set of tools and APIs for compiling native programs to bitcode that can be executed with on the GraalVM runtime
-* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
+* [Java on Truffle](../../reference-manual/java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 * [Node.js](../../reference-manual/js/README.md) -- Node.js v14.17.6 compatible
 * [Python](../../reference-manual/python/README.md) -- Python 3.8.5 compatible
 * [Ruby](../../reference-manual/ruby/README.md) -- Ruby 2.7.2 compatible
diff --git a/docs/reference-manual/graalvm-updater.md b/docs/reference-manual/graalvm-updater.md
index fd9bd47d4ee3..bc1754a85fe0 100644
--- a/docs/reference-manual/graalvm-updater.md
+++ b/docs/reference-manual/graalvm-updater.md
@@ -33,9 +33,9 @@ Tools/Utilities:
 
 * [Native Image](native-image/README.md) -- a technology to compile an application ahead-of-time into a native executable
 * [LLVM toolchain](llvm/README.md) --  a set of tools and APIs for compiling native programs to bitcode that can be executed on GraalVM
-* [Java on Truffle](java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 
 Runtimes:
+* [Java on Truffle](java-on-truffle/README.md) -- a Java Virtual Machine implementation based on a Truffle interpreter for GraalVM
 * [Node.js](js/README.md) -- Node.js 14.16.1 compatible
 * [Python](python/README.md) -- Python 3.8.5-compatible
 * [Ruby](ruby/README.md) -- Ruby 2.7.3-compatible

From f9134bf8bd37bb3dca5f75d6fe2ce35a7c166e8d Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Thu, 7 Oct 2021 13:53:39 +0300
Subject: [PATCH 402/681] Fix broken links reported by absolutize.rb script

---
 docs/graalvm-as-a-platform/graalvm-as-a-platform.md         | 4 ++--
 docs/graalvm-as-a-platform/implement-instrument.md          | 4 ++--
 docs/graalvm-as-a-platform/implement-language.md            | 6 +++---
 .../java-on-truffle/ImplementationDetails.md                | 4 ++--
 docs/reference-manual/polyglot-programming.md               | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/graalvm-as-a-platform/graalvm-as-a-platform.md b/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
index f5cd20a924a5..7c5af0090264 100644
--- a/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
+++ b/docs/graalvm-as-a-platform/graalvm-as-a-platform.md
@@ -8,12 +8,12 @@ toc_group: graalvm-as-a-platform
 
 # GraalVM as a Platform
 
-GraalVM is an open ecosystem and allows users to implement a custom language or tool on top of it with the [Truffle language implementation framework](truffle/README.md) which offers APIs for writing interpreters for programming languages in the form of Java programs.
+GraalVM is an open ecosystem and allows users to implement a custom language or tool on top of it with the [Truffle language implementation framework](../../truffle/docs/README.md) which offers APIs for writing interpreters for programming languages in the form of Java programs.
 
 GraalVM loads and runs the Truffle framework, which itself is a Java program -- a collection of JAR files -- together with interpreters.
 These get optimized at runtime into efficient machine code for executing loaded programs.
 
-Learn more about this framework from its [reference documentation](truffle/README.md).
+Learn more about this framework from its [reference documentation](../../truffle/docs/README.md).
 
 ## Implement Your Language
 
diff --git a/docs/graalvm-as-a-platform/implement-instrument.md b/docs/graalvm-as-a-platform/implement-instrument.md
index 697d245a9f83..a4a3f54ea8e6 100644
--- a/docs/graalvm-as-a-platform/implement-instrument.md
+++ b/docs/graalvm-as-a-platform/implement-instrument.md
@@ -46,7 +46,7 @@ These are [onCreate](https://github.com/graalvm/simpletool/blob/master/src/main/
 The `onCreate` and `onDispose` methods are self-explanatory: they are called by the framework when the instrument is created and disposed.
 We will discuss their implementations later, but first let us discuss the remaining one: `getOptionDescriptors`.
 
-The [Truffle language implementation framework](/graalvm-as-a-platform/language-implementation-framework/) comes with its own system for specifying command-line options.
+The [Truffle language implementation framework](../../truffle/docs/README.md) comes with its own system for specifying command-line options.
 These options allow tool users to control the tool either from the command line or when creating [polyglot contexts](https://www.graalvm.org/truffle/javadoc/org/graalvm/polyglot/Context.html).
 It is annotation-based, and examples for such options are the [ENABLED](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L91) and [PRINT_COVERAGE](https://github.com/graalvm/simpletool/blob/master/src/main/java/com/oracle/truffle/st/SimpleCoverageInstrument.java#L97) fields of `SimpleCoverageInstrument`.
 Both of these are static final fields of the type [OptionKey](https://www.graalvm.org/truffle/javadoc/org/graalvm/options/OptionKey.html) annotated with [Option](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/Option.html) which, similar to the `Registration` annotation, provides some metadata for the option.
@@ -128,7 +128,7 @@ As mentioned before, Simple Tool is a Maven project.
 Setting `JAVA_HOME` to a GraalVM installation and running `mvn package` produces a `target/simpletool-<version>.jar`.
 This is the Simple Tool distribution form.
 
-The [Truffle framework](truffle/README.md) offers a clear separation between the language/tooling code and the application code.
+The [Truffle framework](../../truffle/docs/README.md) offers a clear separation between the language/tooling code and the application code.
 For this reason, putting the JAR on the class path will not result in the framework realizing a new tool is needed.
 To achieve this we use `--vm.Dtruffle.class.path.append=/path/to/simpletool-<version>.jar` as is illustrated in a [launcher script for our simple tool](https://github.com/graalvm/simpletool/blob/master/simpletool).
 This script also shows we can [set the CLI options](https://github.com/graalvm/simpletool/blob/master/simpletool#L19) we specified for Simple Tool.
diff --git a/docs/graalvm-as-a-platform/implement-language.md b/docs/graalvm-as-a-platform/implement-language.md
index de08b6962c7a..07b0a70facc2 100644
--- a/docs/graalvm-as-a-platform/implement-language.md
+++ b/docs/graalvm-as-a-platform/implement-language.md
@@ -11,7 +11,7 @@ toc_group: graalvm-as-a-platform
 We have found that the easiest way to get started with implementing your own language is by extending an existing language such as SimpleLanguage.
 [SimpleLanguage](https://github.com/graalvm/simplelanguage) is a demonstration language built using the [Language API](https://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/package-summary.html).
 The SimpleLanguage project provides a showcase on how to use the Language APIs for writing your own language.
-It aims to use most of the available [Truffle language implementation framework](truffle/README.md) (henceforth "Truffle") features, and documents their use extensively with inline source documentation.
+It aims to use most of the available [Truffle language implementation framework](../../truffle/docs/README.md) (henceforth "Truffle") features, and documents their use extensively with inline source documentation.
 
 To start, ensure [Maven3](https://maven.apache.org/download.cgi) and GraalVM are available in your system.
 
@@ -48,7 +48,7 @@ The SimpleLanguage demonstration language is licensed under the [Universal Permi
 
 ## IDE Setup
 
-The [Truffle framework](truffle/README.md) provides language-agnostic infrastructure to realize standard IDE features by providing additional APIs.
+The [Truffle framework](../../truffle/docs/README.md) provides language-agnostic infrastructure to realize standard IDE features by providing additional APIs.
 If you would like to experiment with your language and get the benefits of an IDE, consider importing SimpleLanguage as an example.
 
 ### Eclipse
@@ -248,7 +248,7 @@ A sample POM using `--upgrade-module-path` to export Language API packages can b
 
 ### Other JVM Implementations
 
-Unlike GraalVM, which includes all the dependencies needed to run a language implemented with [Truffle](truffle/README.md), other JVM implementations need additional JARs to be present on the class path.
+Unlike GraalVM, which includes all the dependencies needed to run a language implemented with [Truffle](../../truffle/docs/README.md), other JVM implementations need additional JARs to be present on the class path.
 These are the Language API and GraalVM SDK JARs available from Maven Central.
 
 Assuming `JAVA_HOME` points to a stock JDK installation, and that the current working directory is the `simplelanguage` directory and the Language API and GraalVM SDK JARs are present in that directory, one can execute SimpleLanguage with the following command:
diff --git a/docs/reference-manual/java-on-truffle/ImplementationDetails.md b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
index ba327146a7bf..866eb7486e3b 100644
--- a/docs/reference-manual/java-on-truffle/ImplementationDetails.md
+++ b/docs/reference-manual/java-on-truffle/ImplementationDetails.md
@@ -21,7 +21,7 @@ Java on Truffle is a minified Java VM that implements all core components of a V
 * Java Debug Wire Protocol (JDWP)
 
 Java on Truffle reuses all JARs and native libraries from GraalVM.
-All native libraries and methods are loaded/accessed/called via [Truffle Native Function Interface (JNI)](../../graalvm-as-a-platform/truffle/NFI.md).
+All native libraries and methods are loaded/accessed/called via [Truffle Native Function Interface (JNI)](../../../truffle/docs/NFI.md).
 JNI handles are implemented in Java on Truffle, e.g., all Truffle NFI methods only receive and return primitives.
 Some methods are substituted for performance, e.g., `Math.sqrt`, `System.arraycopy`, avoiding the expensive transition to native.
 
@@ -33,7 +33,7 @@ This mode is not used when running in a native image since there will be no conf
 
 * Java on Truffle does not implement the [JVM Tool Interface (JVMTI)](https://docs.oracle.com/en/java/javase/11/docs/specs/jvmti.html). As a result, it does not support the `-agentlib`, or `-agentpath` VM options.
 * Java on Truffle does not implement the `java.lang.instrument` interface. As a result it does not support the `-javaagent` VM option.
-* Java on Truffle currently uses the standard native libraries from the Java core library. This requires allowing a polyglot `Context` native access. Because of the way these libraries are loaded (via [Truffle NFI](../../graalvm-as-a-platform/truffle/NFI.md)), running on top of HotSpot only works on Linux (with `glibc`). Running as part of a native image works on Linux, Windows, and macOS but it currently limited to one context.
+* Java on Truffle currently uses the standard native libraries from the Java core library. This requires allowing a polyglot `Context` native access. Because of the way these libraries are loaded (via [Truffle NFI](../../../truffle/docs/NFI.md)), running on top of HotSpot only works on Linux (with `glibc`). Running as part of a native image works on Linux, Windows, and macOS but it currently limited to one context.
 * Support for [Java Management Extensions (JMX)](https://docs.oracle.com/javase/tutorial/jmx/index.html) is partial and some methods might return partial data.
 * The [Debugger Protocol Implementation (JDWP)](https://docs.oracle.com/javase/8/docs/technotes/guides/jpda/jdwp-spec.html) lacks some capabilities compared to HotSpot. It will correctly report the supported [capabilities](https://docs.oracle.com/javase/8/docs/platform/jpda/jdwp/jdwp-protocol.html#JDWP_VirtualMachine_Capabilities). In particular actions that require to enumerate all Java objects are not supported. However it does support a few hot reloading cases that HotSpot does not. See [Enhanced HotSwap Capabilities with Java on Truffle](Demos.md#enhanced-hotswap-capabilities-with-java-on-truffle).
 * When the `java.MultiThreaded` option is set to "false", [reference processing](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ref/package-summary.html) will not happen. Depending on the application, this could create resource leaks. Note that this option is set to "false" automatically if Java on Truffle runs in a context where a single-threaded language is enabled (e.g., JavaScript).
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index 8c4fc237511f..8377017f6ae2 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -14,7 +14,7 @@ permalink: /reference-manual/polyglot-programming/
 * [Passing Options Programmatically](#passing-options-programmatically)
 * [Passing Options Using JVM Arguments](#passing-options-using-jvm-arguments)
 
-GraalVM allows users to write polyglot applications that seamlessly pass values from one language to another by means of the [Truffle language implementation framework](../../../truffle/docs/README.md) (henceforth "Truffle").
+GraalVM allows users to write polyglot applications that seamlessly pass values from one language to another by means of the [Truffle language implementation framework](../../truffle/docs/README.md) (henceforth "Truffle").
 
 Truffle is a Java library for building programming languages implementations as interpreters for self-modifying Abstract Syntax Trees.
 When writing a language interpreter with Truffle, it will automatically use the GraalVM compiler as a just-in-time compiler for the language.

From 9e3e2489cbda59d727e5ec8febfa7c7ccd2b47db Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 8 Oct 2021 14:44:53 +0300
Subject: [PATCH 403/681] Fix broken links reported by check_links.rb script

---
 .../graalvm-community/get-started-graalvm-community.md     | 2 +-
 docs/reference-manual/embedding/embed-languages.md         | 7 ++-----
 truffle/docs/LanguageTutorial.md                           | 2 +-
 truffle/docs/Optimizing.md                                 | 2 +-
 truffle/docs/Profiling.md                                  | 2 +-
 truffle/docs/README.md                                     | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
index ea7c393b83d6..6e92f80a5719 100644
--- a/docs/getting-started/graalvm-community/get-started-graalvm-community.md
+++ b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -188,7 +188,7 @@ ruby [options] program.rb
 ```
 
 GraalVM Ruby runtime environment uses the
-[same options as the standard implementation of Ruby](../../reference-manual/ruby/Options.md),
+[same options as the standard implementation of Ruby](../../reference-manual/ruby/options.md),
 with some additions. For example:
 ```shell
 gem install chunky_png
diff --git a/docs/reference-manual/embedding/embed-languages.md b/docs/reference-manual/embedding/embed-languages.md
index 1a0a1b29077c..af23ca87db09 100644
--- a/docs/reference-manual/embedding/embed-languages.md
+++ b/docs/reference-manual/embedding/embed-languages.md
@@ -17,11 +17,10 @@ permalink: /reference-manual/embed-languages/
 * [Build Native Images from Polyglot Applications](#build-native-images-from-polyglot-applications)
 * [Code Caching Across Multiple Contexts](#code-caching-across-multiple-contexts)
 * [Embed languages in Guest Languages](#embed-languages-in-guest-languages)
-* [Step Through with Execution Listeners](#step-through-with-execution-listeners)
 * [Build a Shell for Many Languages](#build-a-shell-for-many-languages)
+* [Step Through with Execution Listeners](#step-through-with-execution-listeners)
 * [Configure Sandbox Resource Limits](#configure-sandbox-resource-limits)
 
-
 The GraalVM Polyglot API lets you embed and run code from guest languages in JVM-based host applications.
 
 Throughout this section, you will learn how to create a host application in Java that
@@ -493,7 +492,7 @@ Caching may be disabled explicitly by setting [cached(boolean cached)](https://
 
 Consider the following code snippet as an example:
 
-```
+```java
 public class Main {
     public static void main(String[] args) {
         try (Engine engine = Engine.create()) {
@@ -600,8 +599,6 @@ for (;;) {
 }
 ```
 
-
-
 ## Step Through with Execution Listeners
 
 The GraalVM Polyglot API allows users to instrument the execution of guest languages through [ExecutionListener class](http://www.graalvm.org/sdk/javadoc/org/graalvm/polyglot/management/ExecutionListener.html). For example, it lets you attach an execution listener that is invoked for every statement of the guest language program. Execution listeners
diff --git a/truffle/docs/LanguageTutorial.md b/truffle/docs/LanguageTutorial.md
index 2e14b4324c5b..a90a8c9811a9 100644
--- a/truffle/docs/LanguageTutorial.md
+++ b/truffle/docs/LanguageTutorial.md
@@ -19,5 +19,5 @@ Conference on Programming Language Design and Implementation [PLDI 2016](http://
 Next Steps:
 * Start to subclass [TruffleLanguage](http://www.graalvm.org/truffle/javadoc/com/oracle/truffle/api/TruffleLanguage.html) for your own language implementation.
 * Fork [SimpleLanguage](https://github.com/graalvm/simplelanguage), a toy language that demonstrates how to use many Truffle features.
-* Embed Truffle languages in Java host applications using the [Polyglot API](../../reference-manual/embedding/embed-languages.md).
+* Embed Truffle languages in Java host applications using the [Polyglot API](../../docs/reference-manual/embedding/embed-languages.md).
 * Read [GraalVM/Truffle publications](https://github.com/oracle/graal/blob/master/docs/Publications.md).
diff --git a/truffle/docs/Optimizing.md b/truffle/docs/Optimizing.md
index bb642996e41f..e8a86116117a 100644
--- a/truffle/docs/Optimizing.md
+++ b/truffle/docs/Optimizing.md
@@ -577,7 +577,7 @@ The `--engine.TraceCompilation` option also shows CallTarget invalidations with
 
 ## Ideal Graph Visualizer
 
-The [Ideal Graph Visualizer (IGV)](../../tools/ideal-graph-visualizer.md) is a tool to understand Truffle ASTs and the GraalVM compiler graphs.
+The [Ideal Graph Visualizer (IGV)](../../docs/tools/ideal-graph-visualizer.md) is a tool to understand Truffle ASTs and the GraalVM compiler graphs.
 
 A typical usage is to run with `--vm.Dgraal.Dump=Truffle:1 --vm.Dgraal.PrintGraph=Network`, which will show you Truffle ASTs, guest-language call graphs, and the Graal graphs as they leave the Truffle phase.
 If the `-Dgraal.PrintGraph=Network` flag is omitted then the dump files are placed in the `graal_dumps` directory, which you should then open in IGV.
diff --git a/truffle/docs/Profiling.md b/truffle/docs/Profiling.md
index e09e1701786a..c324bf8b1cbe 100644
--- a/truffle/docs/Profiling.md
+++ b/truffle/docs/Profiling.md
@@ -9,7 +9,7 @@ permalink: /graalvm-as-a-platform/language-implementation-framework/Profiling/
 There is no shortage of tools for profiling interpreters written using Truffle.
 When running in JVM mode you can use standard JVM tooling such as VisualVM, Java Flight Recorder, and Oracle Developer Studio. When running in Native Image you can use `callgrind` from the Valgrind tool suite, and other system tools such as `strace`.
 As a language running on GraalVM, other GraalVM tools can be used.
-For a broad enough definition of profiling, you can also use the [Ideal Graph Visualizer (IGV)](../../tools/ideal-graph-visualizer.md) and C1 Visualizer to inspect the compiler output.
+For a broad enough definition of profiling, you can also use the [Ideal Graph Visualizer (IGV)](../../docs/tools/ideal-graph-visualizer.md) and C1 Visualizer to inspect the compiler output.
 
 This guide is less about how to use each tool and more about suggestions for extracting the most useful information from the tools, assuming a basic knowledge of their usage.
 
diff --git a/truffle/docs/README.md b/truffle/docs/README.md
index 8e6ffe01268d..ce9d7a63a3c7 100644
--- a/truffle/docs/README.md
+++ b/truffle/docs/README.md
@@ -50,7 +50,7 @@ Consider reading [these publications](https://github.com/oracle/graal/blob/maste
 Implementing a language using Truffle offers a way to interoperate with other "Truffle" languages.
 To learn more about verifying that your language is a valid polyglot citizen, read more about using the [Polyglot TCK](./TCK.md).
 Somewhat related topics worth exploring are [Truffle Libraries](./TruffleLibraries.md), as well as how to use them to implement a language [interoperability](./InteropMigration.md).
-Languages implemented with Truffle can also be embedded in Java host applications using the [Polyglot API](../../reference-manual/embedding/embed-languages.md).
+Languages implemented with Truffle can also be embedded in Java host applications using the [Polyglot API](../../docs/reference-manual/embedding/embed-languages.md).
 
 To better understand how to improve the performance of your language please consult the documentation on [profiling](./Profiling.md) and [optimizing](./Optimizing.md) your language.
 Also, to better understand how to use Truffle's automated monomorphization feature (i.e., splitting), look at the [related documentation](./splitting/Monomorphization.md).

From 69f7dd2cbfa0980d84a3022eac92a5f766ff983f Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 11 Oct 2021 11:56:48 +0200
Subject: [PATCH 404/681] Fix formatting of examples in JavaDoc.

Closes #1517.
---
 .../truffle/api/dsl/Specialization.java       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java b/truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java
index bd832d6a50e3..7fa179c72690 100644
--- a/truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java
+++ b/truffle/src/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/Specialization.java
@@ -262,9 +262,13 @@
      * <b>Example usage:</b>
      *
      * <pre>
-     * static boolean acceptOperand(int operand) { assert operand <= 42; return operand & 1 ==
-     * 1; } &#064;Specialization(guards = {"operand <= 42", "acceptOperand(operand)"}) void
-     * doSpecialization(int operand) {...}
+     * static boolean acceptOperand(int operand) {
+     *     assert operand <= 42;
+     *     return (operand & 1) == 1;
+     * }
+     *
+     * &#64;Specialization(guards = {"operand <= 42", "acceptOperand(operand)"})
+     * void doSpecialization(int operand) {...}
      * </pre>
      *
      * </p>
@@ -305,11 +309,11 @@
      * <b>Example usage:</b>
      *
      * <pre>
-     * abstract static class DynamicObject() { abstract Shape getShape(); ... } static
-     * abstract class Shape() { abstract Assumption getUnmodifiedAssuption(); ... }
-     * &#064;Specialization(guards = "operand.getShape() == cachedShape", assumptions =
-     * "cachedShape.getUnmodifiedAssumption()") void doAssumeUnmodifiedShape(DynamicObject
-     * operand, @Cached("operand.getShape()") Shape cachedShape) {...}
+     * abstract static class DynamicObject() { abstract Shape getShape(); ... }
+     * abstract static class Shape() { abstract Assumption getUnmodifiedAssuption(); ... }
+     *
+     * &#64;Specialization(guards = "operand.getShape() == cachedShape", assumptions = "cachedShape.getUnmodifiedAssumption()")
+     * void doAssumeUnmodifiedShape(DynamicObject operand, @Cached("operand.getShape()") Shape cachedShape) {...}
      * </pre>
      *
      * </p>
@@ -350,10 +354,12 @@
      * <b>Example usage:</b>
      *
      * <pre>
-     * static int getCacheLimit() { return
-     * Integer.parseInt(System.getProperty("language.cacheLimit")); } &#064;Specialization(guards =
-     * "operand == cachedOperand", limit = "getCacheLimit()") void doCached(Object
-     * operand, @Cached("operand") Object cachedOperand) {...}
+     * static int getCacheLimit() {
+     *     return Integer.parseInt(System.getProperty("language.cacheLimit"));
+     * }
+     *
+     * &#64;Specialization(guards = "operand == cachedOperand", limit = "getCacheLimit()")
+     * void doCached(Object operand, @Cached("operand") Object cachedOperand) {...}
      * </pre>
      *
      * </p>

From c997a8a71a0ac520abe93575b157e6f092baf233 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 11 Oct 2021 15:29:56 +0200
Subject: [PATCH 405/681] Set $JDT to `builtin` on public gates.

---
 .github/workflows/main.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b5dce652c33e..8ae3f6512a89 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ env:
   MX_GIT_CACHE: refcache
   MX_PYTHON_VERSION: 3
   JAVA_HOME: ${{ github.workspace }}/jdk
+  JDT: builtin
   MX_PATH: ${{ github.workspace }}/mx
 
 jobs:
@@ -150,16 +151,6 @@ jobs:
           git fetch --unshallow
         fi
 
-        if [[ ${GATE} == *fullbuild* ]]
-        then
-          # Only test JDT on JDK8
-          if [ "${JDK}" == "openjdk8" ]
-          then
-            export JDT=${MX_PATH}/ecj.jar
-            wget --no-verbose https://archive.eclipse.org/eclipse/downloads/drops4/R-4.14-201912100610/ecj-4.14.jar -O ${JDT}
-          fi
-        fi
-
         echo ${JAVA_HOME}
         ${JAVA_HOME}/bin/java -version
         if [[ ${WITHOUT_VCS} ]]

From ec12f06dd452cfa6c112ff94ede4ec524d58d34a Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Mon, 11 Oct 2021 13:51:30 +0200
Subject: [PATCH 406/681] LLVMMultiContextLauncher removed as it is replaced by
 Polybench

---
 sulong/mx.sulong/mx_sulong.py                 |  31 ----
 sulong/mx.sulong/mx_sulong_benchmarks.py      |  10 --
 .../launcher/LLVMMultiContextLauncher.java    | 152 ------------------
 vm/ci_includes/vm-bench-sulong.hocon          |  16 --
 vm/mx.vm/mx_vm.py                             |   3 +-
 .../graalvm/polybench/PolyBenchLauncher.java  |   3 +-
 6 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java

diff --git a/sulong/mx.sulong/mx_sulong.py b/sulong/mx.sulong/mx_sulong.py
index e81f03ac3578..94e2fbacd41f 100644
--- a/sulong/mx.sulong/mx_sulong.py
+++ b/sulong/mx.sulong/mx_sulong.py
@@ -233,15 +233,6 @@ def runLLVM(args=None, out=None, err=None, timeout=None, nonZeroIsFatal=True, ge
         dists.append('CHROMEINSPECTOR')
     return mx.run_java(getCommonOptions(False) + vmArgs + get_classpath_options(dists) + ["com.oracle.truffle.llvm.launcher.LLVMLauncher"] + sulongArgs, timeout=timeout, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err)
 
-@mx.command(_suite.name, "llimul")
-def runLLVMMul(args=None, out=None, err=None, timeout=None, nonZeroIsFatal=True, get_classpath_options=getClasspathOptions):
-    """uses Sulong to execute a LLVM IR file"""
-    vmArgs, sulongArgs = truffle_extract_VM_args(args)
-    dists = []
-    if "tools" in (s.name for s in mx.suites()):
-        dists.append('CHROMEINSPECTOR')
-    return mx.run_java(getCommonOptions(False) + vmArgs + get_classpath_options(dists) + ["com.oracle.truffle.llvm.launcher.LLVMMultiContextLauncher"] + sulongArgs, timeout=timeout, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err)
-
 @mx.command(_suite.name, "lli")
 def lli(args=None, out=None):
     """run lli via the current GraalVM"""
@@ -507,25 +498,3 @@ def _get_jar_dists(self):
     ],
     installable=False,
 ))
-
-mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
-    suite=_suite,
-    name='LLVM Multi-Context Runtime Launcher',
-    short_name='llmulrl',
-    dir_name='llvm',
-    license_files=[],
-    third_party_license_files=[],
-    dependencies=[],
-    truffle_jars=[],
-    support_distributions=[],
-    launcher_configs=[
-        mx_sdk_vm.LanguageLauncherConfig(
-            destination='bin/<exe:llimul>',
-            jar_distributions=['sulong:SULONG_LAUNCHER'],
-            main_class='com.oracle.truffle.llvm.launcher.LLVMMultiContextLauncher',
-            build_args=[],
-            language='llvm',
-        ),
-    ],
-    installable=False,
-))
diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index f063ee5777a6..3e48d867d96d 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -513,15 +513,6 @@ def launcher_args(self, args):
     def hosting_registry(self):
         return java_vm_registry
 
-class SulongMultiContextVm(SulongVm):
-    def name(self):
-        return "sulong-multi"
-
-    def launcherClass(self):
-        return "com.oracle.truffle.llvm.launcher.LLVMMultiContextLauncher"
-
-    def launcherName(self):
-        return "llimul"
 
 class PolybenchVm(CExecutionEnvironmentMixin, GuestVm):
 
@@ -618,7 +609,6 @@ def hosting_registry(self):
 native_vm_registry.add_vm(GccVm('O3', ['-O3']), _suite)
 native_vm_registry.add_vm(ClangVm('O3', ['-O3']), _suite)
 native_vm_registry.add_vm(SulongVm(), _suite, 10)
-native_vm_registry.add_vm(SulongMultiContextVm(), _suite, 10)
 
 native_polybench_vm_registry = VmRegistry("NativePolybench", known_host_registries=[java_vm_registry])
 native_polybench_vm_registry.add_vm(PolybenchVm('debug-aux-engine-cache',
diff --git a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java b/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java
deleted file mode 100644
index 31ecbfe521dc..000000000000
--- a/sulong/projects/com.oracle.truffle.llvm.launcher/src/com/oracle/truffle/llvm/launcher/LLVMMultiContextLauncher.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates.
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
- * conditions and the following disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.oracle.truffle.llvm.launcher;
-
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Engine;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class LLVMMultiContextLauncher extends LLVMLauncher {
-
-    private static final int DEFAULT_NUMBER_OF_RUNS = 1;
-
-    private final Map<String, String> multiContextEngineOptions = new HashMap<>();
-    private int numOfRuns = DEFAULT_NUMBER_OF_RUNS;
-    private boolean useDebugCache = false;
-
-    public static void main(String[] args) {
-        new LLVMMultiContextLauncher().launch(args);
-    }
-
-    @Override
-    protected List<String> preprocessArguments(List<String> arguments, Map<String, String> polyglotOptions) {
-        List<String> unrecognizedOptions = super.preprocessArguments(arguments, polyglotOptions);
-
-        // The engine options must be separated and used later when building the shared engine
-        List<String> engineArgs = new ArrayList<>();
-        Iterator<String> iterator = unrecognizedOptions.iterator();
-        while (iterator.hasNext()) {
-            String option = iterator.next();
-            if (option.startsWith("--engine.")) {
-                iterator.remove();
-                engineArgs.add(option);
-                continue;
-            } else if (option.startsWith("--use-debug-cache")) {
-                iterator.remove();
-                this.useDebugCache = true;
-            } else if (option.startsWith("--multi-context-runs")) {
-                iterator.remove();
-                String[] argPair = option.split("=");
-                if (argPair.length < 2) {
-                    throw abort("Missing integer value for " + argPair[0]);
-                }
-                try {
-                    numOfRuns = Integer.parseInt(argPair[1]);
-                } catch (NumberFormatException e) {
-                    throw abort("Invalid integer value for " + argPair[0]);
-                }
-            } else if ("--experimental-options".equals(option)) {
-                engineArgs.add(option);
-            }
-        }
-
-        parseUnrecognizedOptions(getLanguageId(), multiContextEngineOptions, engineArgs);
-
-        return unrecognizedOptions;
-    }
-
-    @Override
-    protected int execute(Context.Builder contextBuilder) {
-        contextBuilder.options(multiContextEngineOptions);
-        if (!useDebugCache) {
-            if (numOfRuns <= 1) {
-                // Do not create the shared engine for the number of runs <= 1
-                contextBuilder.options(multiContextEngineOptions);
-            } else {
-                contextBuilder.engine(Engine.newBuilder().allowExperimentalOptions(true).options(multiContextEngineOptions).build());
-            }
-        }
-        if (numOfRuns == 0) {
-            // Create the context and close it right afterwards to trigger the compilation of AOT
-            // roots
-            try (Context context = contextBuilder.build()) {
-                context.eval(Source.newBuilder(getLanguageId(), file).build());
-                return 0;
-            } catch (IOException e) {
-                throw abort(String.format("Error loading file '%s' (%s)", file, e.getMessage()));
-            }
-        } else {
-            int ret = 0;
-            for (int i = 0; i < numOfRuns; i++) {
-                if (!useDebugCache) {
-                    ret = super.execute(contextBuilder);
-                } else {
-                    if (i == 0) {
-                        contextBuilder.option("engine.DebugCachePreinitializeContext", "false").option("engine.DebugCacheCompile", "aot").//
-                                        option("engine.DebugTraceCache", "true").//
-                                        option("engine.DebugCacheLoad", "false").//
-                                        option("engine.DebugCacheStore", "true").//
-                                        option("engine.MultiTier", "false").//
-                                        option("llvm.AOTCacheStore", "true").//
-                                        option("engine.CompileAOTOnCreate", "false");
-                        try (Context context = contextBuilder.build()) {
-                            Value library = context.eval(Source.newBuilder(getLanguageId(), file).build());
-                            if (!library.canExecute()) {
-                                throw abort("no main function found");
-                            }
-                            Value main = library.getMember("main");
-                            if (!main.canExecute()) {
-                                throw abort("no executable main function found");
-                            }
-                        } catch (IOException e) {
-                            throw abort(String.format("Error loading file '%s' (%s)", file, e.getMessage()));
-                        }
-                    } else {
-                        contextBuilder.option("engine.DebugCacheStore", "false").//
-                                        option("engine.DebugCacheLoad", "true").//
-                                        option("llvm.AOTCacheStore", "false").//
-                                        option("llvm.AOTCacheLoad", "true").//
-                                        option("engine.CompileAOTOnCreate", "false");
-                        ret = super.execute(contextBuilder);
-                    }
-                }
-            }
-            return ret;
-        }
-    }
-}
diff --git a/vm/ci_includes/vm-bench-sulong.hocon b/vm/ci_includes/vm-bench-sulong.hocon
index 4a9c1be0e4ff..a706bcf35af0 100644
--- a/vm/ci_includes/vm-bench-sulong.hocon
+++ b/vm/ci_includes/vm-bench-sulong.hocon
@@ -89,7 +89,6 @@ csuite-stockfish {
   }
 }
 
-
 bench-llvm-sulong-3-runs-shared-engine-ce: ${bench_vm_ce_linux_base} ${bench-llvm-sulong-common} ${sulong-weekly-notifications} {
   targets: [gate],
   timelimit: "45:00"
@@ -108,19 +107,6 @@ bench-llvm-sulong-3-runs-shared-engine-ce: ${bench_vm_ce_linux_base} ${bench-llv
   ]
 }
 
-#bench-llvm-sulong-graalvm-ce-llimul: ${bench_vm_ce_linux_base} ${bench-llvm-sulong-common} ${sulong-weekly-notifications} {
-#  environment: {
-#      VM_DIST: ce-llimul
-#  }
-#  setup: ${bench_vm_ce_linux_base.setup} [
-#    [git, clone, --depth, "1", ${repoBase}"${BENCH_REPO_NAME}.git", "../../${BENCH_REPO_NAME}"]
-#  ]
-#  run: [
-#    [mx, --dynamicimport, sulong-benchmarks, --env, ce-llimul, benchmark, --results-file, ${bench_vm_ce_linux_base.resultFile}, "csuite:*", --, --native-vm, sulong-multi, --native-vm-config, default, --jvm, graalvm-ce, --jvm-config, "${JVM_CONFIG}", "--multi-context-runs=3"]
-#  ]
-#  timelimit: "10:00:01"
-#}
-
 bench-llvm-native: ${bench-llvm-common} ${bench-llvm-linux} ${sulong-weekly-notifications} {
   targets: [weekly, bench]
   run: [
@@ -135,8 +121,6 @@ builds += [
   ${bench-llvm-sulong-graalvm-ce} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-native-csuite", environment: { JVM_CONFIG: native } }
   ${bench-llvm-sulong-graalvm-ce} ${csuite-stockfish} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-jvm-3-compiler-threads-csuite-stockfish", environment: { JVM_CONFIG: jvm-3-compiler-threads } }
   ${bench-llvm-sulong-graalvm-ce} ${csuite-stockfish} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-native-3-compiler-threads-csuite-stockfish", environment: { JVM_CONFIG: native-3-compiler-threads } }
-  #${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-jvm-csuite", environment: { JVM_CONFIG: jvm } }
-  #${bench-llvm-sulong-graalvm-ce-llimul} {targets: [daily, bench], name: "daily-bench-sulong-graalvm-ce-llimul-native-csuite", environment: { JVM_CONFIG: native } }
   ${bench-llvm-sulong-3-runs-shared-engine-ce} {targets: [daily, bench], name: "daily-bench-sulong-3-runs-shared-engine-ce-jvm", environment: { JVM_CONFIG: jvm } }
   ${bench-llvm-sulong-3-runs-shared-engine-ce} {targets: [daily, bench], name: "daily-bench-sulong-3-runs-shared-engine-ce-native", environment: { JVM_CONFIG: native } }
   ${bench-llvm-sulong-core} {name: daily-bench-sulong-graal-core-csuite}
diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index 39dd08a1f027..a1c6b2fcfc56 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -131,7 +131,7 @@
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_complete_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
-ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bllimul', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llmulrl', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
+ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']
 ce_no_native_components = ['bgu', 'bjs', 'blli', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'bnative-image', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lsp', 'nfi', 'ni', 'nil', 'polynative', 'pro', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'libpoly', 'poly', 'vvm']
 
@@ -150,7 +150,6 @@
 mx_sdk_vm.register_vm_config('toolchain-only-bash', ['bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgraalvm-native-binutil', 'tfl', 'tflm', 'gu', 'svm', 'svmnfi', 'gvm', 'polynative', 'llp', 'nfi', 'svml', 'bgu', 'sdk', 'llrc', 'llrn', 'cmp'], _suite, env_file=False)
 mx_sdk_vm.register_vm_config('ce', ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'java', 'libpoly', 'sespresso', 'spolyglot', 'ejvm', 'bjs', 'blli', 'bnative-image', 'btruffleruby', 'pynl', 'bgraalpython', 'pyn', 'bwasm', 'cmp', 'gwa', 'js', 'lg', 'llp', 'nfi', 'ni', 'nil', 'pbm', 'pmh', 'rby', 'rbyl', 'rgx', 'sdk', 'llrc', 'llrn', 'llrl', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file='polybench-ce')
 mx_sdk_vm.register_vm_config('ce', ['pbm', 'pmh', 'ni', 'js', 'lg', 'nfi', 'tfl', 'svm', 'nil', 'rgx', 'sdk', 'cmp', 'tflm', 'svmnfi', 'bnative-image', 'bjs', 'snative-image-agent', 'snative-image-diagnostics-agent'], _suite, env_file='polybench-nfi-ce')
-mx_sdk_vm.register_vm_config('ce', ce_components + ['llmulrl'], _suite, env_file='ce-llimul')
 mx_sdk_vm.register_vm_config('ce', ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'blli', 'bnative-image', 'cmp', 'lg', 'llrc', 'llrl', 'llrn', 'nfi', 'ni', 'nil', 'pbm', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'svm', 'svmnfi', 'tfl', 'tflm'], _suite, env_file='polybench-sulong-ce')
 
 if mx.get_os() == 'windows':
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 49164d4dbc20..40a00c2d63af 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -329,7 +329,8 @@ private void processMultiContextArguments() {
         for (Map.Entry<Integer, List<String>> runOptionsEntry : runOptionsMap.entrySet()) {
             Map<String, String> runOptions = config.polyglotRunOptionsMap.computeIfAbsent(runOptionsEntry.getKey(), (i) -> new HashMap<>());
             if (useExperimental) {
-                // the enabled experimental-options flag must be propagated to runOptions to enable parsing of
+                // the enabled experimental-options flag must be propagated to runOptions to enable
+                // parsing of
                 // run-level experimental options
                 runOptionsEntry.getValue().add("--experimental-options");
             }

From 4985f200fe26334d4a94473b300c188587dcfb2c Mon Sep 17 00:00:00 2001
From: David Kozak <david.kozak@oracle.com>
Date: Thu, 7 Oct 2021 13:48:24 +0200
Subject: [PATCH 407/681] introduce an option to change the default charset

---
 ...ContentSubstitutedLocalizationSupport.java |  5 +--
 .../jdk/localization/LocalizationFeature.java | 36 +++++++++++++------
 .../jdk/localization/LocalizationSupport.java |  5 ++-
 .../OptimizedLocalizationSupport.java         |  5 +--
 .../Target_java_nio_charset_Charset.java      |  8 +----
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
index 5a23e72535bf..ea7742149315 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.jdk.localization;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListResourceBundle;
@@ -65,8 +66,8 @@ public class BundleContentSubstitutedLocalizationSupport extends LocalizationSup
 
     private final Map<Class<?>, StoredBundle> storedBundles = new ConcurrentHashMap<>();
 
-    public BundleContentSubstitutedLocalizationSupport(Locale defaultLocale, Set<Locale> locales, List<String> requestedPatterns, ForkJoinPool pool) {
-        super(defaultLocale, locales);
+    public BundleContentSubstitutedLocalizationSupport(Locale defaultLocale, Set<Locale> locales, Charset defaultCharset, List<String> requestedPatterns, ForkJoinPool pool) {
+        super(defaultLocale, locales, defaultCharset);
         this.pool = pool;
         this.compressBundlesPatterns = parseCompressBundlePatterns(requestedPatterns);
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
index 61473859ebaf..2243cc09d93e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
@@ -28,6 +28,8 @@
 
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.text.spi.BreakIteratorProvider;
 import java.text.spi.CollatorProvider;
@@ -134,6 +136,8 @@ public abstract class LocalizationFeature implements Feature {
      */
     protected Locale defaultLocale = Locale.getDefault();
 
+    private Charset defaultCharset;
+
     protected Set<Locale> allLocales;
 
     protected LocalizationSupport support;
@@ -150,6 +154,9 @@ public static class Options {
         @Option(help = "Default locale of the image, by the default it is the same as the default locale of the image builder.", type = OptionType.User)//
         public static final HostedOptionKey<String> DefaultLocale = new HostedOptionKey<>(Locale.getDefault().toLanguageTag());
 
+        @Option(help = "Default charset of the image, by the default it is the same as the default charset of the image builder.", type = OptionType.User)//
+        public static final HostedOptionKey<String> DefaultCharset = new HostedOptionKey<>(Charset.defaultCharset().name());
+
         @Option(help = "Comma separated list of locales to be included into the image. The default locale is included in the list automatically if not present.", type = OptionType.User)//
         public static final HostedOptionKey<LocatableMultiOptionValue.Strings> IncludeLocales = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
 
@@ -228,6 +235,13 @@ public void afterRegistration(AfterRegistrationAccess access) {
         allLocales = processLocalesOption();
         defaultLocale = parseLocaleFromTag(Options.DefaultLocale.getValue());
         UserError.guarantee(defaultLocale != null, "Invalid default locale %s", Options.DefaultLocale.getValue());
+        try {
+            defaultCharset = Charset.forName(Options.DefaultCharset.getValue());
+            VMError.guarantee(defaultCharset.name().equals(Options.DefaultCharset.getValue()),
+                            "Failed to locate charset " + Options.DefaultCharset.getValue() + ", instead " + defaultCharset.name() + " was provided");
+        } catch (IllegalCharsetNameException | UnsupportedCharsetException ex) {
+            throw UserError.abort(ex, "Invalid default charset %s", Options.DefaultCharset.getValue());
+        }
         allLocales.add(defaultLocale);
         support = selectLocalizationSupport();
         ImageSingletons.add(LocalizationSupport.class, support);
@@ -245,12 +259,12 @@ public void afterRegistration(AfterRegistrationAccess access) {
     @Platforms(Platform.HOSTED_ONLY.class)
     private LocalizationSupport selectLocalizationSupport() {
         if (optimizedMode) {
-            return new OptimizedLocalizationSupport(defaultLocale, allLocales);
+            return new OptimizedLocalizationSupport(defaultLocale, allLocales, defaultCharset);
         } else if (substituteLoadLookup) {
             List<String> requestedPatterns = Options.LocalizationCompressBundles.getValue().values();
-            return new BundleContentSubstitutedLocalizationSupport(defaultLocale, allLocales, requestedPatterns, compressionPool);
+            return new BundleContentSubstitutedLocalizationSupport(defaultLocale, allLocales, defaultCharset, requestedPatterns, compressionPool);
         }
-        return new LocalizationSupport(defaultLocale, allLocales);
+        return new LocalizationSupport(defaultLocale, allLocales, defaultCharset);
     }
 
     @Override
@@ -317,19 +331,19 @@ private static Set<Locale> processLocalesOption() {
      * more than this can add additional charsets.
      */
     @Platforms(Platform.HOSTED_ONLY.class)
-    private static void addCharsets() {
+    private void addCharsets() {
         if (Options.AddAllCharsets.getValue()) {
             for (Charset c : Charset.availableCharsets().values()) {
                 addCharset(c);
             }
         } else {
-            addCharset(Charset.defaultCharset());
-            addCharset(Charset.forName("US-ASCII"));
-            addCharset(Charset.forName("ISO-8859-1"));
-            addCharset(Charset.forName("UTF-8"));
-            addCharset(Charset.forName("UTF-16BE"));
-            addCharset(Charset.forName("UTF-16LE"));
-            addCharset(Charset.forName("UTF-16"));
+            addCharset(defaultCharset);
+            addCharset(StandardCharsets.US_ASCII);
+            addCharset(StandardCharsets.ISO_8859_1);
+            addCharset(StandardCharsets.UTF_8);
+            addCharset(StandardCharsets.UTF_16BE);
+            addCharset(StandardCharsets.UTF_16LE);
+            addCharset(StandardCharsets.UTF_16);
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
index cd601c0dcc46..f5a95b1cd59d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
@@ -63,9 +63,12 @@ public class LocalizationSupport {
 
     public final ResourceBundle.Control control = ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_DEFAULT);
 
-    public LocalizationSupport(Locale defaultLocale, Set<Locale> locales) {
+    public final Charset defaultCharset;
+
+    public LocalizationSupport(Locale defaultLocale, Set<Locale> locales, Charset defaultCharset) {
         this.defaultLocale = defaultLocale;
         this.allLocales = locales.toArray(new Locale[0]);
+        this.defaultCharset = defaultCharset;
         this.supportedLanguageTags = locales.stream().map(Locale::toString).collect(Collectors.toSet());
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
index 0ce86b49d2ea..d064ac0cf0c3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
@@ -27,6 +27,7 @@
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import org.graalvm.collections.Pair;
 
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -50,8 +51,8 @@ public class OptimizedLocalizationSupport extends LocalizationSupport {
 
     private final String includeResourceBundlesOption = SubstrateOptionsParser.commandArgument(LocalizationFeature.Options.IncludeResourceBundles, "");
 
-    public OptimizedLocalizationSupport(Locale defaultLocale, Set<Locale> locales) {
-        super(defaultLocale, locales);
+    public OptimizedLocalizationSupport(Locale defaultLocale, Set<Locale> locales, Charset defaultCharset) {
+        super(defaultLocale, locales, defaultCharset);
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java
index 1f3b52c8ddbd..47ee22a10192 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_nio_charset_Charset.java
@@ -42,15 +42,9 @@
 @SuppressWarnings({"unused"})
 final class Target_java_nio_charset_Charset {
 
-    @Alias private static Charset defaultCharset;
-
     @Substitute
     private static Charset defaultCharset() {
-        /*
-         * The default charset is initialized during native image generation and therefore always
-         * available without any checks.
-         */
-        return defaultCharset;
+        return ImageSingletons.lookup(LocalizationSupport.class).defaultCharset;
     }
 
     @Substitute

From e04d3e2cd23cf42a20ca02dd8ff8cd37b139b1e0 Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Mon, 11 Oct 2021 16:06:21 +0200
Subject: [PATCH 408/681] Use NeverValidAssumption and AlwaysValidAssumption
 for never leaf and always leaf classes in CHA

---
 .../hierarchy/NoOpClassHierarchyOracle.java         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
index a5d3489af394..8ff1fe2bbb77 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/analysis/hierarchy/NoOpClassHierarchyOracle.java
@@ -25,6 +25,8 @@
 
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.Truffle;
+import com.oracle.truffle.api.utilities.AlwaysValidAssumption;
+import com.oracle.truffle.api.utilities.NeverValidAssumption;
 import com.oracle.truffle.espresso.impl.ObjectKlass;
 
 /**
@@ -34,9 +36,10 @@
 public class NoOpClassHierarchyOracle implements ClassHierarchyOracle {
     protected static class LeafTypeAssumptionImpl implements LeafTypeAssumption {
         private final Assumption underlying;
-        static final LeafTypeAssumption NeverValidAssumption = new LeafTypeAssumptionImpl("invalid");
-        static {
-            NeverValidAssumption.getAssumption().invalidate();
+
+        // Used only to create never valid and always valid instances
+        private LeafTypeAssumptionImpl(Assumption underlyingAssumption) {
+            underlying = underlyingAssumption;
         }
 
         private LeafTypeAssumptionImpl(String assumptionName) {
@@ -55,8 +58,8 @@ public Assumption getAssumption() {
 
     protected static final LeafTypeAssumptionAccessor assumptionAccessor = new LeafTypeAssumptionAccessor();
 
-    protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl("final class is always a CHA leaf");
-    protected static final LeafTypeAssumption NotLeaf = LeafTypeAssumptionImpl.NeverValidAssumption;
+    protected static final LeafTypeAssumption FinalIsAlwaysLeaf = new LeafTypeAssumptionImpl(AlwaysValidAssumption.INSTANCE);
+    protected static final LeafTypeAssumption NotLeaf = new LeafTypeAssumptionImpl(NeverValidAssumption.INSTANCE);
 
     @Override
     public LeafTypeAssumption createAssumptionForNewKlass(ObjectKlass newKlass) {

From 32796df1c5d2e060b2048d6dab2f29f4ec130960 Mon Sep 17 00:00:00 2001
From: Ondrej Tethal <ondrej.tethal@oracle.com>
Date: Mon, 11 Oct 2021 14:42:58 +0000
Subject: [PATCH 409/681] [GR-21590] Update imports

PullRequest: graalpython/1994
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 76101ae7684a..18842643c9a6 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "f100bf8941139ece20ec0fed3160ed9191cdbbf5",
+                "version": "a48aebd1681cc9b0bb454ab0995c97c5d2cbc5df",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From 6d61e2d778c27193780f30338bb4e48cd1580437 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Mon, 11 Oct 2021 18:44:25 +0200
Subject: [PATCH 410/681] Prevent a safepoint when thread tries to print a
 fatal error.

---
 .../oracle/svm/core/genscavenge/GCImpl.java   |  10 +-
 .../posix/pthread/PthreadVMLockSupport.java   |   2 +-
 .../core/windows/WindowsVMLockSupport.java    |   2 +-
 .../svm/core/InvalidMethodPointerHandler.java |   2 +-
 .../oracle/svm/core/SubstrateDiagnostics.java |   5 +
 .../svm/core/SubstrateSegfaultHandler.java    |   2 +-
 .../graal/snippets/CEntryPointSnippets.java   |   2 +-
 .../svm/core/graal/snippets/DeoptTester.java  |   3 +-
 .../svm/core/jdk/VMErrorSubstitutions.java    |   2 +-
 .../oracle/svm/core/thread/JavaThreads.java   |   5 +-
 .../com/oracle/svm/core/thread/Safepoint.java |  42 ++--
 .../com/oracle/svm/core/thread/VMThreads.java | 213 ++++++++++++------
 .../svm/jni/functions/JNIFunctions.java       |   2 +-
 13 files changed, 191 insertions(+), 101 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 83f506087d87..8dc6e9965bdb 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -783,14 +783,10 @@ private void blackenStackRoots() {
                          */
                         continue;
                     }
-                    if (VMThreads.StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
+                    if (!VMThreads.SafepointBehavior.safepointChecksEnabled(vmThread)) {
                         /*
-                         * When a thread is ignoring safepoints, it is reporting a fatal VM error.
-                         * The thread is not paused and we cannot safely walk its stack (we don't
-                         * even know where it starts). We simply ignore it and keep collecting until
-                         * it terminates the VM rather than crashing here. The thread might access
-                         * the heap to print diagnostics, but it must do so with due caution and
-                         * should not crash because of our ongoing GC.
+                         * When a thread is ignoring safepoints, then the thread is not paused and
+                         * we cannot safely walk its stack (we don't even know where it starts).
                          */
                         continue;
                     }
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
index 8e10d8674795..f19e589eef9d 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
@@ -166,7 +166,7 @@ protected static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+            VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
             Log.log().string(functionName).string(" returned ").signed(result).newline();
             ImageSingletons.lookup(LogHandler.class).fatalError();
         }
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 49a555f2d534..44ddefc253e6 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -161,7 +161,7 @@ static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+            VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
             int lastError = WinBase.GetLastError();
             Log.log().string(functionName).string(" failed with error ").hex(lastError).newline();
             ImageSingletons.lookup(LogHandler.class).fatalError();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index 4b759ea3e307..d6061d66f714 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -70,7 +70,7 @@ private static void methodPointerNotCompiledHandler() {
     }
 
     private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
-        VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         /*
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
index f2fb6cc092bc..ff6ef10c845e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
@@ -26,6 +26,7 @@
 
 import java.util.Arrays;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
@@ -616,6 +617,10 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
                 log.string("Threads:").indent(true);
                 for (IsolateThread thread = VMThreads.firstThreadUnsafe(); thread.isNonNull(); thread = VMThreads.nextThread(thread)) {
                     log.zhex(thread).spaces(1).string(VMThreads.StatusSupport.getStatusString(thread));
+                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(thread);
+                    if (safepointBehavior != SafepointBehavior.ALLOW_SAFEPOINT) {
+                        log.string(" (").string(SafepointBehavior.toString(safepointBehavior)).string(")");
+                    }
                     if (allowJavaHeapAccess) {
                         Thread threadObj = JavaThreads.fromVMThread(thread);
                         log.string(" \"").string(threadObj.getName()).string("\" - ").object(threadObj);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
index 2f5ff9018b2c..94ac2f378480 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
@@ -153,7 +153,7 @@ protected static boolean tryEnterIsolate(RegisterDumper.Context context) {
     @Uninterruptible(reason = "Must be uninterruptible until we get immune to safepoints.", calleeMustBe = false)
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in segfault handler.", overridesCallers = true)
     protected static void dump(PointerBase signalInfo, RegisterDumper.Context context) {
-        VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         dumpInterruptibly(signalInfo, context);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index bf6fd263cc54..08bfdf6ca930 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -565,7 +565,7 @@ public static int reportExceptionSnippet(Throwable exception) {
     @Uninterruptible(reason = "Avoid StackOverflowError and safepoints until they are disabled permanently", calleeMustBe = false)
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     private static int reportException(Throwable exception) {
-        VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         logException(exception);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
index cf23fa5a53ae..eb20a6b52c3d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
@@ -29,7 +29,6 @@
 
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.options.Option;
-import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
@@ -112,7 +111,7 @@ public static void deoptTest() {
                             !CEntryPointSnippets.isIsolateInitialized() ||
                             ThreadingSupportImpl.isRecurringCallbackPaused() ||
                             VMOperation.isInProgress() ||
-                            VMThreads.StatusSupport.isStatusIgnoreSafepoints(CurrentIsolate.getCurrentThread()) ||
+                            !VMThreads.SafepointBehavior.safepointChecksEnabled() ||
                             !JavaThreads.currentJavaThreadInitialized()) {
                 return; // Thread or VM is not in a safe (or sane) state for deoptimization
             }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
index c8dc6da515a5..a6957ee1ee75 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
@@ -99,7 +99,7 @@ public class VMErrorSubstitutions {
     @Uninterruptible(reason = "Allow VMError to be used in uninterruptible code.")
     static RuntimeException shouldNotReachHere(CodePointer callerIP, String msg, Throwable ex) {
         ThreadStackPrinter.printBacktrace();
-        VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
         VMErrorSubstitutions.shutdown(callerIP, msg, ex);
         throw UnreachableNode.unreachable();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index bb208acc802d..7a5f25aa3ffe 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -36,6 +36,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
@@ -421,12 +422,12 @@ public boolean tearDown() {
      * When this method is being executed, we expect that the current thread owns
      * {@linkplain VMThreads#THREAD_MUTEX}. This is fine even though this method is not
      * {@linkplain Uninterruptible} because this method is either executed as part of a VM operation
-     * or {@linkplain StatusSupport#setStatusIgnoreSafepoints()} was called.
+     * or {@linkplain SafepointBehavior#setIgnoreThreadInSafepointHandling()} was called.
      */
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while detaching a thread.")
     public static void detachThread(IsolateThread vmThread) {
         VMThreads.THREAD_MUTEX.assertIsOwner("Must hold the VMThreads mutex");
-        assert StatusSupport.isStatusIgnoreSafepoints(vmThread) || VMOperation.isInProgress();
+        assert SafepointBehavior.isIgnoredBySafepointHandling(vmThread) || VMOperation.isInProgress();
 
         Thread thread = currentThread.get(vmThread);
         ParkEvent.detach(getUnsafeParkEvent(thread));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index e7dd8fa0483c..30bb4e0273b8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -26,6 +26,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
@@ -386,8 +387,8 @@ private static void enterSlowPathSafepointCheck() throws Throwable {
     @AlwaysInline("Always inline into foreign call stub")
     @Uninterruptible(reason = "Must not contain safepoint checks")
     public static void slowPathSafepointCheck() throws Throwable {
-        if (StatusSupport.isStatusIgnoreSafepoints(CurrentIsolate.getCurrentThread())) {
-            /* The thread is detaching so it won't ever need to execute a safepoint again. */
+        if (!SafepointBehavior.safepointChecksEnabled()) {
+            /* Safepoints are explicitly disabled for this thread. */
             Safepoint.setSafepointRequested(THREAD_REQUEST_RESET);
             return;
         }
@@ -518,8 +519,8 @@ public static void transitionVMToNative() {
     @Uninterruptible(reason = "Must not contain safepoint checks")
     private static void enterSlowPathTransitionFromNativeToNewStatus(int newStatus) {
         VMError.guarantee(StatusSupport.isStatusNativeOrSafepoint(), "Must either be at a safepoint or in native mode");
-        VMError.guarantee(!StatusSupport.isStatusIgnoreSafepoints(CurrentIsolate.getCurrentThread()),
-                        "When safepoints are disabled, the thread can only be in Native mode, so the fast path transition must succeed and this slow path must not be called");
+        VMError.guarantee(SafepointBehavior.safepointChecksEnabled(),
+                        "When safepoint checks are disabled, the thread can only be in Native mode, so the fast path transition must succeed and this slow path must not be called");
 
         Statistics.incSlowPathFrozen();
         try {
@@ -634,16 +635,12 @@ private static void requestSafepoints(String reason) {
             final Log trace = Log.noopLog().string("[Safepoint.Master.requestSafepoints:  reason: ").string(reason);
 
             // Walk the threads list and ask each thread (except myself) to come to a safepoint.
-            // TODO: Do I always bring *all* threads to a safepoint? Could I stop some of them?
             for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
                 if (isMyself(vmThread)) {
                     continue;
                 }
-                if (StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
-                    /*
-                     * If the thread is exiting/exited or safepoints are disabled for another
-                     * reason, do not ask it to stop at safepoints.
-                     */
+                if (!SafepointBehavior.safepointChecksEnabled(vmThread)) {
+                    /* If safepoints are disabled, do not ask it to stop at safepoints. */
                     continue;
                 }
                 requestSafepoint(vmThread);
@@ -713,19 +710,22 @@ private static void waitForSafepoints(String reason) {
                 for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
                     if (isMyself(vmThread)) {
                         /* Don't wait for myself. */
-                    } else if (StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
-                        /*
-                         * If the thread has exited or safepoints are disabled for another reason,
-                         * then I do not need to worry about bringing it to a safepoint.
-                         */
-                        ignoreSafepoints += 1;
+                        continue;
+                    }
+
+                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(vmThread);
+                    if (safepointBehavior == SafepointBehavior.PREVENT_VM_FROM_REACHING_SAFEPOINT) {
+                        notAtSafepoint++;
+                    } else if (safepointBehavior == SafepointBehavior.IGNORE_THREAD_IN_SAFEPOINT_HANDLING) {
+                        ignoreSafepoints++;
                     } else {
+                        assert safepointBehavior == SafepointBehavior.ALLOW_SAFEPOINT;
                         int status = StatusSupport.getStatusVolatile(vmThread);
                         switch (status) {
                             case StatusSupport.STATUS_IN_JAVA:
                             case StatusSupport.STATUS_IN_VM: {
                                 /* Re-request the safepoint in case of a lost update. */
-                                if (getSafepointRequested(vmThread) > 0 && !StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
+                                if (getSafepointRequested(vmThread) > 0) {
                                     requestSafepoint(vmThread);
                                 }
                                 notAtSafepoint += 1;
@@ -785,7 +785,7 @@ private static void releaseSafepoints(String reason) {
             VMThreads.THREAD_MUTEX.assertIsOwner("Must hold mutex when releasing safepoints.");
             // Set all the thread statuses that are at safepoint back to being in native code.
             for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
-                if (!isMyself(vmThread) && !StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
+                if (!isMyself(vmThread) && SafepointBehavior.safepointChecksEnabled(vmThread)) {
                     if (trace.isEnabled()) {
                         trace.string("  vmThread status: ").string(StatusSupport.getStatusString(vmThread));
                     }
@@ -864,9 +864,13 @@ public static int countingVMOperation() {
                 int notAtSafepoint = 0;
 
                 for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
-                    if (StatusSupport.isStatusIgnoreSafepoints(vmThread)) {
+                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(vmThread);
+                    if (safepointBehavior == SafepointBehavior.PREVENT_VM_FROM_REACHING_SAFEPOINT) {
+                        notAtSafepoint++;
+                    } else if (safepointBehavior == SafepointBehavior.IGNORE_THREAD_IN_SAFEPOINT_HANDLING) {
                         ignoreSafepoints += 1;
                     } else {
+                        assert safepointBehavior == SafepointBehavior.ALLOW_SAFEPOINT;
                         // Check if the thread is at a safepoint or in native code.
                         int status = StatusSupport.getStatusVolatile(vmThread);
                         switch (status) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 1cb5883f88b4..95f2eda2fd57 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -87,7 +87,7 @@ public static VMThreads singleton() {
      * <li>Acquire the mutex outside of a VM operation but only execute uninterruptible code. This
      * is safe as the uninterruptible code cannot trigger a safepoint.</li>
      * <li>Acquire the mutex from a thread that previously called
-     * {@link StatusSupport#setStatusIgnoreSafepoints()}.</li>
+     * {@link SafepointBehavior#setIgnoreThreadInSafepointHandling()}.</li>
      * </ol>
      *
      * Deadlock example 1:
@@ -120,7 +120,9 @@ public static VMThreads singleton() {
      */
     protected static final VMCondition THREAD_LIST_CONDITION = new VMCondition(THREAD_MUTEX);
 
-    /** The first element in the linked list of {@link IsolateThread}s. */
+    /**
+     * The first element in the linked list of {@link IsolateThread}s.
+     */
     private static IsolateThread head;
     /**
      * This field is used to guarantee that all isolate threads that were started by SVM have exited
@@ -142,7 +144,9 @@ public static VMThreads singleton() {
     private static final FastThreadLocalWord<OSThreadId> OSThreadIdTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadIdTL");
     protected static final FastThreadLocalWord<OSThreadHandle> OSThreadHandleTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadHandleTL");
     public static final FastThreadLocalWord<Isolate> IsolateTL = FastThreadLocalFactory.createWord("VMThreads.IsolateTL");
-    /** The highest stack address. */
+    /**
+     * The highest stack address.
+     */
     public static final FastThreadLocalWord<UnsignedWord> StackBase = FastThreadLocalFactory.createWord("VMThreads.StackBase");
     /**
      * The lowest stack address. Note that this value does not necessarily match the value that is
@@ -161,13 +165,17 @@ public static boolean isInitialized() {
         return initializationState.get() >= STATE_INITIALIZED;
     }
 
-    /** Is threading being torn down? */
+    /**
+     * Is threading being torn down?
+     */
     @Uninterruptible(reason = "Called from uninterruptible code during tear down.")
     public static boolean isTearingDown() {
         return initializationState.get() >= STATE_TEARING_DOWN;
     }
 
-    /** Note that threading is being torn down. */
+    /**
+     * Note that threading is being torn down.
+     */
     static void setTearingDown() {
         initializationState.set(STATE_TEARING_DOWN);
     }
@@ -329,7 +337,7 @@ public void detachThread(IsolateThread thread) {
 
         cleanupBeforeDetach(thread);
 
-        setStatusIgnoreSafepointsAndLock();
+        setIgnoreThreadInSafepointHandlingAndLock();
         OSThreadHandle threadToCleanup;
         try {
             detachThreadInSafeContext(thread);
@@ -356,11 +364,11 @@ public void detachThread(IsolateThread thread) {
     }
 
     /*
-     * Make me immune to safepoints (the safepoint mechanism ignores me). We are calling functions
-     * that are not marked as @Uninterruptible during the detach process. We hold the THREAD_MUTEX,
-     * so we know that we are not going to be interrupted by a safepoint. But a safepoint can
-     * already be requested, or our safepoint counter can reach 0 - so it is still possible that we
-     * enter the safepoint slow path.
+     * Make me immune to safepoints and make the safepoint mechanism ignore me. We are calling
+     * functions that are not marked as @Uninterruptible during the detach process. We hold the
+     * THREAD_MUTEX, so we know that we are not going to be interrupted by a safepoint. But a
+     * safepoint can already be requested, or our safepoint counter can reach 0 - so it is still
+     * possible that we enter the safepoint slow path.
      *
      * Between setting the status and acquiring the TREAD_MUTEX, we must not access the heap.
      * Otherwise, we risk a race with the GC as this thread will continue executing even though the
@@ -368,8 +376,8 @@ public void detachThread(IsolateThread thread) {
      */
     @Uninterruptible(reason = "Called from uninterruptible code.")
     @NeverInline("Prevent that anything floats between setting the status and acquiring the mutex.")
-    private static void setStatusIgnoreSafepointsAndLock() {
-        StatusSupport.setStatusIgnoreSafepoints();
+    private static void setIgnoreThreadInSafepointHandlingAndLock() {
+        SafepointBehavior.setIgnoreThreadInSafepointHandling();
         THREAD_MUTEX.lockNoTransition();
     }
 
@@ -607,51 +615,56 @@ public static boolean printLocationInfo(Log log, UnsignedWord value, boolean all
      * Access to platform-specific implementations.
      */
 
-    /** A thread-local enum giving the thread status of a VMThread. And supporting methods. */
+    /**
+     * A thread-local enum giving the thread status of a VMThread. And supporting methods.
+     */
     public static class StatusSupport {
 
-        /** The status of a {@link IsolateThread}. */
+        /**
+         * The status of a {@link IsolateThread}.
+         */
         public static final FastThreadLocalInt statusTL = FastThreadLocalFactory.createInt("StatusSupport.statusTL").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
         /**
-         * Boolean flag whether safepoints are disabled. This is a separate thread local in addition
-         * to the {@link #statusTL} because we need the disabled flag to be "sticky": once
-         * safepoints are disabled, they must never be enabled again. Either the thread is getting
-         * detached, or a fatal error occurred and we are printing diagnostics before killing the
-         * VM.
+         * An illegal thread state for places where we need to pass a value.
          */
-        private static final FastThreadLocalInt safepointsDisabledTL = FastThreadLocalFactory.createInt("StatusSupport.safepointsDisabledTL");
-
-        /** An illegal thread state for places where we need to pass a value. */
         public static final int STATUS_ILLEGAL = -1;
         /**
          * {@link IsolateThread} memory has been allocated for the thread, but the thread is not on
          * the VMThreads list yet.
          */
         public static final int STATUS_CREATED = 0;
-        /** The thread is running in Java code. */
+        /**
+         * The thread is running in Java code.
+         */
         public static final int STATUS_IN_JAVA = STATUS_CREATED + 1;
-        /** The thread has been requested to stop at a safepoint. */
+        /**
+         * The thread has been requested to stop at a safepoint.
+         */
         public static final int STATUS_IN_SAFEPOINT = STATUS_IN_JAVA + 1;
-        /** The thread is running in native code. */
+        /**
+         * The thread is running in native code.
+         */
         public static final int STATUS_IN_NATIVE = STATUS_IN_SAFEPOINT + 1;
-        /** The thread is running in trusted native code that was linked into the image. */
+        /**
+         * The thread is running in trusted native code that was linked into the image.
+         */
         public static final int STATUS_IN_VM = STATUS_IN_NATIVE + 1;
         private static final int MAX_STATUS = STATUS_IN_VM;
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        private static String statusToString(int status, boolean safepointsDisabled) {
+        private static String statusToString(int status) {
             switch (status) {
                 case STATUS_CREATED:
-                    return safepointsDisabled ? "STATUS_CREATED (safepoints disabled)" : "STATUS_CREATED";
+                    return "STATUS_CREATED";
                 case STATUS_IN_JAVA:
-                    return safepointsDisabled ? "STATUS_IN_JAVA (safepoints disabled)" : "STATUS_IN_JAVA";
+                    return "STATUS_IN_JAVA";
                 case STATUS_IN_SAFEPOINT:
-                    return safepointsDisabled ? "STATUS_IN_SAFEPOINT (safepoints disabled)" : "STATUS_IN_SAFEPOINT";
+                    return "STATUS_IN_SAFEPOINT";
                 case STATUS_IN_NATIVE:
-                    return safepointsDisabled ? "STATUS_IN_NATIVE (safepoints disabled)" : "STATUS_IN_NATIVE";
+                    return "STATUS_IN_NATIVE";
                 case STATUS_IN_VM:
-                    return safepointsDisabled ? "STATUS_IN_VM (safepoints disabled)" : "STATUS_IN_VM";
+                    return "STATUS_IN_VM";
                 default:
                     return "STATUS error";
             }
@@ -659,10 +672,12 @@ private static String statusToString(int status, boolean safepointsDisabled) {
 
         /* Access methods to treat VMThreads.statusTL as a volatile int. */
 
-        /** For debugging. */
+        /**
+         * For debugging.
+         */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static String getStatusString(IsolateThread vmThread) {
-            return statusToString(statusTL.getVolatile(vmThread), isStatusIgnoreSafepoints(vmThread));
+            return statusToString(statusTL.getVolatile(vmThread));
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@@ -685,12 +700,16 @@ public static void setStatusNative(IsolateThread vmThread) {
             statusTL.setVolatile(vmThread, STATUS_IN_NATIVE);
         }
 
-        /** There is no unguarded change to safepoint. */
+        /**
+         * There is no unguarded change to safepoint.
+         */
         public static boolean compareAndSetNativeToSafepoint(IsolateThread vmThread) {
             return statusTL.compareAndSet(vmThread, STATUS_IN_NATIVE, STATUS_IN_SAFEPOINT);
         }
 
-        /** An <em>unguarded</em> transition to Java. */
+        /**
+         * An <em>unguarded</em> transition to Java.
+         */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setStatusJavaUnguarded() {
             statusTL.setVolatile(STATUS_IN_JAVA);
@@ -700,7 +719,9 @@ public static void setStatusVM() {
             statusTL.setVolatile(STATUS_IN_VM);
         }
 
-        /** A guarded transition from native to another status. */
+        /**
+         * A guarded transition from native to another status.
+         */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static boolean compareAndSetNativeToNewStatus(int newStatus) {
             return statusTL.compareAndSet(STATUS_IN_NATIVE, newStatus);
@@ -741,16 +762,6 @@ public static boolean isStatusJava() {
             return (statusTL.getVolatile() == STATUS_IN_JAVA);
         }
 
-        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static boolean isStatusIgnoreSafepoints() {
-            return safepointsDisabledTL.getVolatile() == 1;
-        }
-
-        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static boolean isStatusIgnoreSafepoints(IsolateThread vmThread) {
-            return safepointsDisabledTL.getVolatile(vmThread) == 1;
-        }
-
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void assertStatusJava() {
             String msg = "Thread status must be 'Java'.";
@@ -787,20 +798,10 @@ public static void assertStatusVM() {
             }
         }
 
-        /**
-         * Make myself immune to safepoints. Set the thread status to ensure that the safepoint
-         * mechanism ignores me. It is not necessary to clear a pending safepoint request (i.e., to
-         * reset the safepoint counter) because the safepoint slow path is going to do that in case.
-         *
-         * Be careful with this method. If a thread is marked to ignore safepoints, it means that it
-         * can continue executing while a safepoint (and therefore a GC) is in progress. So, either
-         * prevent that a safepoint can be initiated (by holding the {@link #THREAD_MUTEX}) or make
-         * sure that this thread does not access any movable heap objects (even executing write
-         * barriers can already cause issues).
-         */
+        // This method will be removed in GR-34435.
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setStatusIgnoreSafepoints() {
-            safepointsDisabledTL.setVolatile(1);
+            SafepointBehavior.setPreventVMFromReachingSafepoint();
         }
 
         public static boolean isValidStatus(int status) {
@@ -828,17 +829,99 @@ public static int getNewThreadStatus(CFunctionOptions.Transition transition) {
         }
     }
 
+    public static class SafepointBehavior {
+        /** Determines how this thread interacts with the safepoint handling. */
+        private static final FastThreadLocalInt safepointBehaviorTL = FastThreadLocalFactory.createInt("StatusSupport.safepointBehaviorTL");
+
+        /** The thread will freeze as soon as possible if a safepoint is requested. */
+        public static final int ALLOW_SAFEPOINT = 0;
+
+        /**
+         * The thread won't freeze at a safepoint, and will actively prevent the VM from reaching a
+         * safepoint (regardless of the thread status).
+         */
+        static final int PREVENT_VM_FROM_REACHING_SAFEPOINT = 1;
+
+        /**
+         * The thread won't freeze at a safepoint and the safepoint handling will ignore the thread.
+         * So, the VM will be able to reach a safepoint regardless of the status of this thread.
+         */
+        static final int IGNORE_THREAD_IN_SAFEPOINT_HANDLING = 2;
+
+        public static boolean isIgnoredBySafepointHandling(IsolateThread vmThread) {
+            return safepointBehaviorTL.getVolatile(vmThread) == IGNORE_THREAD_IN_SAFEPOINT_HANDLING;
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        public static boolean safepointChecksEnabled() {
+            return safepointBehaviorTL.getVolatile() == ALLOW_SAFEPOINT;
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        public static boolean safepointChecksEnabled(IsolateThread vmThread) {
+            return safepointBehaviorTL.getVolatile(vmThread) == ALLOW_SAFEPOINT;
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        public static int getSafepointBehavior(IsolateThread vmThread) {
+            return safepointBehaviorTL.getVolatile(vmThread);
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        public static void setPreventVMFromReachingSafepoint() {
+            assert safepointChecksEnabled();
+            safepointBehaviorTL.setVolatile(PREVENT_VM_FROM_REACHING_SAFEPOINT);
+        }
+
+        /**
+         * Changes the safepoint behavior so that this thread won't freeze at a safepoint and the
+         * safepoint handling will ignore the thread. So, the VM will be able to reach a safepoint
+         * regardless of the status of this thread.
+         *
+         * Be careful with this. If a thread is ignored by the safepoint handling, it means that it
+         * can continue executing while a safepoint (and therefore a GC) is in progress. So, either
+         * prevent that a safepoint can be initiated (by holding the {@link #THREAD_MUTEX}) or make
+         * sure that this thread does not access any movable heap objects (even executing write
+         * barriers can already cause issues).
+         */
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        static void setIgnoreThreadInSafepointHandling() {
+            assert safepointChecksEnabled();
+            safepointBehaviorTL.setVolatile(IGNORE_THREAD_IN_SAFEPOINT_HANDLING);
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        public static String toString(int safepointBehavior) {
+            switch (safepointBehavior) {
+                case ALLOW_SAFEPOINT:
+                    return "";
+                case PREVENT_VM_FROM_REACHING_SAFEPOINT:
+                    return "PREVENT_VM_FROM_REACHING_SAFEPOINT";
+                case IGNORE_THREAD_IN_SAFEPOINT_HANDLING:
+                    return "IGNORE_THREAD_IN_SAFEPOINT_HANDLING";
+                default:
+                    return "Invalid safepoint behavior";
+            }
+        }
+    }
+
     /**
      * A thread-local enum conveying any actions needed before thread begins executing Java code.
      */
     public static class ActionOnTransitionToJavaSupport {
 
-        /** The actions to be performed. */
+        /**
+         * The actions to be performed.
+         */
         private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt("ActionOnTransitionToJavaSupport.actionTL");
 
-        /** The thread does not need to take any action. */
+        /**
+         * The thread does not need to take any action.
+         */
         private static final int NO_ACTION = 0;
-        /** Code synchronization should be performed due to newly installed code. */
+        /**
+         * Code synchronization should be performed due to newly installed code.
+         */
         private static final int SYNCHRONIZE_CODE = NO_ACTION + 1;
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@@ -886,7 +969,9 @@ public static class ActionOnExitSafepointSupport {
          */
         private static final int SWITCH_STACK = NO_ACTION + 1;
 
-        /** Target of stack switching. */
+        /**
+         * Target of stack switching.
+         */
         private static final FastThreadLocalWord<Pointer> returnSP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnSP");
         private static final FastThreadLocalWord<CodePointer> returnIP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnIP");
 
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
index 32815f040dcd..d6df15bb1676 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
@@ -832,7 +832,7 @@ static void FatalError(JNIEnvironment env, CCharPointer message) {
         if (log != null) {
             try {
                 log.string("Fatal error reported via JNI: ").string(message).newline();
-                VMThreads.StatusSupport.setStatusIgnoreSafepoints();
+                VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
                 SubstrateDiagnostics.printFatalError(log, KnownIntrinsics.readCallerStackPointer(), callerIP);
             } catch (Throwable ignored) {
                 /*

From fce8ec4f96f5cf6450ebeeea09a44320946ef61c Mon Sep 17 00:00:00 2001
From: Duncan MacGregor <duncan.macgregor@oracle.com>
Date: Mon, 11 Oct 2021 14:16:21 +0100
Subject: [PATCH 411/681] Fix linter errors.

---
 .../tools/profiler/impl/SVGSamplerOutput.java | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
index f63ecbbb2c96..f7dbe37e5b2b 100644
--- a/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
+++ b/tools/src/com.oracle.truffle.tools.profiler/src/com/oracle/truffle/tools/profiler/impl/SVGSamplerOutput.java
@@ -369,19 +369,25 @@ public int hashCode() {
 
             @Override
             public boolean equals(Object obj) {
-                if (this == obj)
+                if (this == obj) {
                     return true;
-                if (obj == null)
+                }
+                if (obj == null) {
                     return false;
-                if (getClass() != obj.getClass())
+                }
+                if (getClass() != obj.getClass()) {
                     return false;
+                }
                 SampleKey other = (SampleKey) obj;
-                if (nameId != other.nameId)
+                if (nameId != other.nameId) {
                     return false;
-                if (sourceId != other.sourceId)
+                }
+                if (sourceId != other.sourceId) {
                     return false;
-                if (sourceLine != other.sourceLine)
+                }
+                if (sourceLine != other.sourceLine) {
                     return false;
+                }
                 return true;
             }
         }
@@ -410,38 +416,38 @@ private int indexForSampleKey(String name, SourceSection section) {
 
         private int indexForSampleKey(String name, String sourceFile, int line) {
             int nameId = nameHash.computeIfAbsent(name, k -> {
-                    sampleNames.put(k);
-                    return nameCounter++;
-                });
+                sampleNames.put(k);
+                return nameCounter++;
+            });
             int sourceId = sourceHash.computeIfAbsent(sourceFile, k -> {
-                    sourceNames.put(k);
-                    return sourceCounter++;
-                });
+                sourceNames.put(k);
+                return sourceCounter++;
+            });
             return keyHash.computeIfAbsent(new SampleKey(nameId, sourceId, line), k -> {
-                    sampleKeys.add(k);
-                    JSONArray jsonKey = new JSONArray();
-                    jsonKey.put(k.nameId);
-                    jsonKey.put(k.sourceId);
-                    jsonKey.put(k.sourceLine);
-                    sampleJsonKeys.put(jsonKey);
-                    return keyCounter++;
-                });
+                sampleKeys.add(k);
+                JSONArray jsonKey = new JSONArray();
+                jsonKey.put(k.nameId);
+                jsonKey.put(k.sourceId);
+                jsonKey.put(k.sourceLine);
+                sampleJsonKeys.put(jsonKey);
+                return keyCounter++;
+            });
         }
 
         private HashMap<Integer, HashMap<SampleKey, JSONObject>> recursiveChildMap = new HashMap<>();
 
         private HashMap<SampleKey, JSONObject> childrenByKeyForSample(JSONObject sample) {
             return recursiveChildMap.computeIfAbsent(sample.getInt("id"), k -> {
-                    HashMap<SampleKey, JSONObject> childMap = new HashMap<>();
-                    return childMap;
-                });
+                HashMap<SampleKey, JSONObject> childMap = new HashMap<>();
+                return childMap;
+            });
         }
 
         private static final class RecursivePositionTask {
             JSONObject sample;
             long x;
 
-            public RecursivePositionTask(JSONObject sample, long x) {
+            RecursivePositionTask(JSONObject sample, long x) {
                 this.sample = sample;
                 this.x = x;
             }
@@ -513,7 +519,7 @@ private static void addRecursiveChild(JSONObject sample, JSONObject child) {
             child.put("ri", child.getInt("i"));
             child.put("rh", child.getInt("h"));
         }
-        
+
         private static void mergeCounts(JSONObject a, JSONObject b, boolean child) {
             int aRI = a.has("ri") ? a.getInt("ri") : a.getInt("i");
             int aRC = a.has("rc") ? a.getInt("rc") : a.getInt("c");
@@ -1140,7 +1146,7 @@ private void buildHistogram(JSONObject sample, ArrayDeque<JSONObject> samples, M
             if (sample.has("s")) {
                 JSONArray children = sample.getJSONArray("s");
                 for (Object childId : children) {
-                    samples.add(owner.sampleDataForId((Integer)childId));
+                    samples.add(owner.sampleDataForId((Integer) childId));
                 }
             }
         }

From 567a6d2648a891b91847dd51c0390b390c63593a Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 11 Oct 2021 19:46:08 +0200
Subject: [PATCH 412/681] Fix invalid handle creation when we know that a
 compiler is already initialized.

---
 .../hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
index a9b1155a115e..b17238329ec9 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
@@ -144,7 +144,7 @@ public void shutdown() {
     @SuppressWarnings("try")
     public void installTruffleCallBoundaryMethod(ResolvedJavaMethod method) {
         try (LibGraalScope scope = new LibGraalScope(LibGraalScope.DetachAction.DETACH_RUNTIME_AND_RELEASE)) {
-            TruffleToLibGraalCalls.installTruffleCallBoundaryMethod(getIsolateThread(), handle(optionsEncoder(null), null, false), LibGraal.translate(method));
+            TruffleToLibGraalCalls.installTruffleCallBoundaryMethod(getIsolateThread(), handle(), LibGraal.translate(method));
         }
     }
 
@@ -152,7 +152,7 @@ public void installTruffleCallBoundaryMethod(ResolvedJavaMethod method) {
     @SuppressWarnings("try")
     public void installTruffleReservedOopMethod(ResolvedJavaMethod method) {
         try (LibGraalScope scope = new LibGraalScope(LibGraalScope.DetachAction.DETACH_RUNTIME_AND_RELEASE)) {
-            TruffleToLibGraalCalls.installTruffleReservedOopMethod(getIsolateThread(), handle(optionsEncoder(null), null, false), LibGraal.translate(method));
+            TruffleToLibGraalCalls.installTruffleReservedOopMethod(getIsolateThread(), handle(), LibGraal.translate(method));
         }
     }
 

From 63574f381fc3da6214173defe09dd008fe8fe0bf Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 11 Oct 2021 19:51:07 +0200
Subject: [PATCH 413/681] Improve documentation in bypassedReservedOop.

---
 .../AbstractHotSpotTruffleRuntime.java        | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
index 2cf0b48d2099..b1756139cc6b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot/src/org/graalvm/compiler/truffle/runtime/hotspot/AbstractHotSpotTruffleRuntime.java
@@ -465,7 +465,6 @@ public boolean bypassedReservedOop(boolean waitForInit) {
             throw CompilerDirectives.shouldNotReachHere("bypassedReservedOop without field available. default fast thread locals should be used instead.");
         }
 
-        // finish initialization
         CompilationTask task = initializationTask;
         if (task != null) {
             while (waitForInit) {
@@ -478,17 +477,46 @@ public boolean bypassedReservedOop(boolean waitForInit) {
                     continue;
                 }
             }
-            // compiler init did install the methods
+            /*
+             * We were currently initializing. No need to reinstall the code stubs. Just try using
+             * them again has a very likely-hood of succeeding or if we do not wait for
+             * inititialization then the caller can use oop accessor methods
+             * (setJVMCIReservedReference0, getJVMCIReservedReference0) instead.
+             */
             return true;
         }
+
         if (!truffleCompilerInitialized) {
+            /*
+             * If the initialization did not yet complete here, then this means that initializing
+             * the compiler failed. We can therefore not continue installing the stubs. So we
+             * re-throw the compiler initialization error or we return false which will likely
+             * trigger an assertion error in the caller at a later point.
+             */
             if (truffleCompilerInitializationException != null) {
                 throw new AssertionError("Compiler initialization failed cannot continue.", truffleCompilerInitializationException);
             }
             return false;
         }
-        // otherwise stubs are installed as part of initialization.
+
+        /*
+         * If we reached this point we are not initializing anymore and the compiler is successfully
+         * initialized. If bypassedReservedOop was called this also means that we skipped the
+         * installed code for the JVMCI reserved oop accessor. This can happen if the debugger steps
+         * over the code and invalidates any installed Java code stub, the HotSpot code cache
+         * decides to clean up the the stub for the accessor method or this happened due to an
+         * initialization race condition. In all three cases the best we can do is to try to install
+         * the stub code again even if this means repeated compilation and installation of this
+         * method during debug-stepping. Unfortunately there is no known way to detect invalidation
+         * of HotSpot installed code reliably.
+         */
         installReservedOopMethods((HotSpotTruffleCompiler) truffleCompiler);
+
+        /*
+         * We have reinstalled the stubs. Returning true indicates that the caller should retry
+         * calling the stubs or use other available means like the oop accessor methods
+         * (setJVMCIReservedReference0, getJVMCIReservedReference0).
+         */
         return true;
     }
 

From c5099360721ac8d6bf9ef663f9ca4af1fa83b024 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 11 Oct 2021 21:58:11 +0200
Subject: [PATCH 414/681] Avoid transient issues by refactoring
 NoTagSamplingTest to no longer be timing based.

---
 .../profiler/test/NoTagSamplingTest.java      | 82 ++++++++++++-------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
index 755a20734e9f..8939a359323d 100644
--- a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
+++ b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
@@ -24,15 +24,23 @@
  */
 package com.oracle.truffle.tools.profiler.test;
 
-import java.util.Collection;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Source;
-import org.junit.Assert;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleSafepoint;
@@ -40,24 +48,49 @@
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.test.polyglot.ProxyLanguage;
 import com.oracle.truffle.tools.profiler.CPUSampler;
-import com.oracle.truffle.tools.profiler.CPUSamplerData;
-import com.oracle.truffle.tools.profiler.ProfilerNode;
+import com.oracle.truffle.tools.profiler.StackTraceEntry;
 
 public class NoTagSamplingTest {
 
+    private static final String TEST_ROOT_NAME = LILRootNode.class.getName();
+
+    private static Semaphore await;
+
     @Test
-    public void testNoTagSampling() {
-        Context context = Context.create(NoTagLanguage.ID);
-        CPUSampler sampler = CPUSampler.find(context.getEngine());
-        sampler.setCollecting(true);
-        Source source = Source.newBuilder(NoTagLanguage.ID, "", "").buildLiteral();
-        // Eval twice so that we compile on first call when running with compile immediately.
-        context.eval(source);
-        context.eval(source);
-        sampler.setCollecting(false);
-        final CPUSamplerData data = sampler.getData().values().iterator().next();
-        final Collection<ProfilerNode<CPUSampler.Payload>> profilerNodes = data.getThreadData().values().iterator().next();
-        Assert.assertEquals(1, profilerNodes.size());
+    public void testNoTagSampling() throws InterruptedException, ExecutionException {
+        ExecutorService singleThread = Executors.newSingleThreadExecutor();
+        await = new Semaphore(0);
+        try (Context context = Context.create(NoTagLanguage.ID)) {
+            CPUSampler sampler = CPUSampler.find(context.getEngine());
+            Source source = Source.newBuilder(NoTagLanguage.ID, "", "").buildLiteral();
+            Future<?> f = singleThread.submit(() -> {
+                return context.eval(source).asInt();
+            });
+
+            Map<Thread, List<StackTraceEntry>> sample = null;
+            for (int i = 0; i < 10000; i++) {// times out ofter 10s
+                sample = sampler.takeSample();
+                if (!sample.isEmpty()) {
+                    break;
+                }
+                try {
+                    Thread.sleep(1);
+                } catch (InterruptedException e) {
+                    throw new AssertionError(e);
+                }
+            }
+
+            // wait for future
+            await.release();
+            assertEquals(42, f.get());
+            assertTrue(!sample.isEmpty());
+            List<StackTraceEntry> entries = sample.values().iterator().next();
+            assertEquals(1, entries.size());
+            assertEquals(TEST_ROOT_NAME, entries.get(0).getRootName());
+
+            singleThread.shutdown();
+            singleThread.awaitTermination(10, TimeUnit.SECONDS);
+        }
 
     }
 
@@ -67,21 +100,14 @@ protected LILRootNode(TruffleLanguage<?> language) {
             super(language);
         }
 
-        @TruffleBoundary
-        private static void sleepSomeTime() {
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                Assert.fail();
-            }
+        @Override
+        public String getName() {
+            return TEST_ROOT_NAME;
         }
 
         @Override
         public Object execute(VirtualFrame frame) {
-            for (int i = 0; i < 100; i++) {
-                sleepSomeTime();
-                TruffleSafepoint.poll(this);
-            }
+            TruffleSafepoint.setBlockedThreadInterruptible(this, Semaphore::acquire, await);
             return 42;
         }
     }

From 1dc204bea9f692a37565fbf078596982183d7e52 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 11 Oct 2021 22:22:58 +0200
Subject: [PATCH 415/681] Fix checkstyle.

---
 .../oracle/truffle/tools/profiler/test/NoTagSamplingTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
index 8939a359323d..3290875cb74d 100644
--- a/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
+++ b/tools/src/com.oracle.truffle.tools.profiler.test/src/com/oracle/truffle/tools/profiler/test/NoTagSamplingTest.java
@@ -68,7 +68,7 @@ public void testNoTagSampling() throws InterruptedException, ExecutionException
             });
 
             Map<Thread, List<StackTraceEntry>> sample = null;
-            for (int i = 0; i < 10000; i++) {// times out ofter 10s
+            for (int i = 0; i < 10000; i++) { // times out after 10s
                 sample = sampler.takeSample();
                 if (!sample.isEmpty()) {
                     break;

From ca6ac05e8598e679b0b5f8a8d128a36e7e591d4d Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 12 Oct 2021 07:11:56 +0000
Subject: [PATCH 416/681] Use getCallTarget() instead of createCallTarget().

---
 .../truffle/tools/chromeinspector/test/ProfilerTest.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java
index b01c882c147c..0764458c8541 100644
--- a/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java
+++ b/tools/src/com.oracle.truffle.tools.chromeinspector.test/src/com/oracle/truffle/tools/chromeinspector/test/ProfilerTest.java
@@ -25,7 +25,6 @@
 package com.oracle.truffle.tools.chromeinspector.test;
 
 import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -105,7 +104,7 @@ private static class TestNoSourceLanguage extends ProxyLanguage {
 
         @Override
         protected final CallTarget parse(TruffleLanguage.ParsingRequest request) throws Exception {
-            return Truffle.getRuntime().createCallTarget(new NoSourceRootNode(languageInstance));
+            return new NoSourceRootNode(languageInstance).getCallTarget();
         }
 
         private final class NoSourceRootNode extends RootNode {

From b8a3cb9cae550e148e7b37e82f798a8b910a9861 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Tue, 12 Oct 2021 10:48:19 +0200
Subject: [PATCH 417/681] Minor fix.

---
 .../src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java  | 2 +-
 .../com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
index f1cdc1cc1fa1..df8cc8897bb4 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java
@@ -283,7 +283,7 @@ UnalignedHeader produceUnalignedChunk(UnsignedWord objectSize) {
         return result;
     }
 
-    public boolean areUnalignedChunksZeroed() {
+    public static boolean areUnalignedChunksZeroed() {
         return CommittedMemoryProvider.get().areUnalignedChunksZeroed();
     }
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
index 166cb20c673a..1f124f2bbcc9 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -235,7 +235,7 @@ private static Object slowPathNewArrayWithoutAllocating(DynamicHub hub, int leng
 
             if (size.aboveOrEqual(HeapParameters.getLargeArrayThreshold())) {
                 /* Large arrays go into their own unaligned chunk. */
-                boolean needsZeroing = !HeapImpl.getChunkProvider().areUnalignedChunksZeroed();
+                boolean needsZeroing = !HeapChunkProvider.areUnalignedChunksZeroed();
                 UnalignedHeapChunk.UnalignedHeader newTlabChunk = HeapImpl.getChunkProvider().produceUnalignedChunk(size);
                 return allocateLargeArrayInNewTlab(hub, length, size, fillStartOffset, newTlabChunk, needsZeroing);
             }

From 01135c19e990277519ca06b7e00276e2f2f42d62 Mon Sep 17 00:00:00 2001
From: Matthias Neugschwandtner <matthias.neugschwandtner@oracle.com>
Date: Thu, 19 Aug 2021 11:04:43 +0200
Subject: [PATCH 418/681] Add LanguageLibraryConfig and native launcher

A native launcher application that can launch language libraries.
---
 espresso/mx.espresso/mx_espresso.py           |   1 +
 sdk/CHANGELOG.md                              |   1 +
 sdk/mx.sdk/mx_sdk.py                          |   1 +
 sdk/mx.sdk/mx_sdk_vm.py                       |  18 +-
 sdk/mx.sdk/mx_sdk_vm_impl.py                  |  89 ++++++-
 .../src/launcher.cc                           | 236 ++++++++++++++++++
 .../org.graalvm.launcher/launcher.jniconfig   |   8 +
 .../native-image.properties                   |   3 +-
 .../launcher/AbstractLanguageLauncher.java    |  84 ++++++-
 .../org/graalvm/nativeimage/ImageInfo.java    |   4 +-
 .../svm/core/posix/SunMiscSubstitutions.java  |   3 +
 .../svm/core/SubstrateExitHandlerFeature.java |   3 +-
 .../com/oracle/svm/core/SubstrateOptions.java |  19 +-
 13 files changed, 453 insertions(+), 17 deletions(-)
 create mode 100644 sdk/src/org.graalvm.launcher.native/src/launcher.cc
 create mode 100644 sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/launcher.jniconfig

diff --git a/espresso/mx.espresso/mx_espresso.py b/espresso/mx.espresso/mx_espresso.py
index bf408b7a8c66..4634a54c2393 100644
--- a/espresso/mx.espresso/mx_espresso.py
+++ b/espresso/mx.espresso/mx_espresso.py
@@ -173,6 +173,7 @@ def _espresso_gate_runner(args, tasks):
         '--language:java',
         '--tool:all',
         '-H:+EnableSignalAPI',
+        '-R:+EnableSignalHandling',
         '-R:+InstallSegfaultHandler',
         '--features=com.oracle.truffle.espresso.FinalizationFeature',
     ],
diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
index 063ed15bffd5..7e9aed9588b2 100644
--- a/sdk/CHANGELOG.md
+++ b/sdk/CHANGELOG.md
@@ -4,6 +4,7 @@ This changelog summarizes major changes between GraalVM SDK versions. The main f
 
 ## Version 22.0.0
 * (GR-33657) Native Image API: Added `CEntryPoint#include` attribute which can be used to controll if the entry point should be automatically added to the shared library.
+* (GR-33207) Native image language libraries: languages can now be deployed as native image libraries, facilitating native embedding scenarios. In this case, a native launcher loads the library dynamically.
 
 ## Version 21.3.0
 * Added the ability to share values between contexts. Please see  `Context.Builder.allowValueSharing(boolean)` for further details. 
diff --git a/sdk/mx.sdk/mx_sdk.py b/sdk/mx.sdk/mx_sdk.py
index 4095538281ff..71bf8556addd 100644
--- a/sdk/mx.sdk/mx_sdk.py
+++ b/sdk/mx.sdk/mx_sdk.py
@@ -143,6 +143,7 @@ def mx_post_parse_cmd_line(args):
 LauncherConfig = mx_sdk_vm.LauncherConfig
 LanguageLauncherConfig = mx_sdk_vm.LanguageLauncherConfig
 LibraryConfig = mx_sdk_vm.LibraryConfig
+LanguageLibraryConfig = mx_sdk_vm.LanguageLibraryConfig
 GraalVmComponent = mx_sdk_vm.GraalVmComponent
 GraalVmTruffleComponent = mx_sdk_vm.GraalVmTruffleComponent
 GraalVmLanguage = mx_sdk_vm.GraalVmLanguage
diff --git a/sdk/mx.sdk/mx_sdk_vm.py b/sdk/mx.sdk/mx_sdk_vm.py
index 9067f23c0f43..0b5df4036d1b 100644
--- a/sdk/mx.sdk/mx_sdk_vm.py
+++ b/sdk/mx.sdk/mx_sdk_vm.py
@@ -191,14 +191,28 @@ def __init__(self, destination, jar_distributions, main_class, build_args, langu
 
 
 class LibraryConfig(AbstractNativeImageConfig):
-    def __init__(self, destination, jar_distributions, build_args, jvm_library=False, use_modules=None, **kwargs):
+    def __init__(self, destination, jar_distributions, build_args, jvm_library=False, use_modules=None, home_finder=False, **kwargs):
         """
         :param bool jvm_library
         """
-        super(LibraryConfig, self).__init__(destination, jar_distributions, build_args, use_modules, **kwargs)
+        super(LibraryConfig, self).__init__(destination, jar_distributions, build_args, use_modules, home_finder=home_finder, **kwargs)
         self.jvm_library = jvm_library
 
 
+class LanguageLibraryConfig(LibraryConfig):
+    def __init__(self, destination, jar_distributions, main_class, build_args, language, is_sdk_launcher=True, launchers=None, **kwargs):
+        """
+        :param str language
+        :param str main_class
+        """
+        super(LanguageLibraryConfig, self).__init__(destination, jar_distributions, build_args, home_finder=True, **kwargs)
+        self.is_sdk_launcher = is_sdk_launcher
+        self.main_class = main_class
+        self.language = language
+        self.default_symlinks = None
+        self.relative_home_paths = {}
+        self.launchers = [mx_subst.path_substitutions.substitute(l) for l in launchers] if launchers else []
+
 class GraalVmComponent(object):
     def __init__(self,
                  suite,
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index fff469e96bea..2385cd4a6af8 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -59,6 +59,7 @@
 
 import mx
 import mx_gate
+import mx_native
 import mx_subst
 import mx_sdk
 import mx_sdk_vm
@@ -721,6 +722,11 @@ def _find_escaping_links(root_dir):
                     # add `LibraryConfig.destination` and the generated header files to the layout
                     _add(layout, _svm_library_dest, _source_type + ':' + _library_project_name, _component)
                     _add(layout, _svm_library_home, _source_type + ':' + _library_project_name + '/*.h', _component)
+                if (not stage1 or _skip_libraries(_library_config)) and isinstance(_library_config, mx_sdk.LanguageLibraryConfig):
+                    # add native launchers for language libraries
+                    for _executable in _library_config.launchers:
+                        _add(layout, join(_component_base, _executable), 'dependency:{}'.format(NativeLibraryLauncherProject.library_launcher_project_name(_library_config)), _component)
+                        _add_link(_jdk_jre_bin, _component_base + _executable)
                 _add_native_image_macro(_library_config, _component)
 
             graalvm_dists.update(_component.polyglot_lib_jar_dependencies)
@@ -1280,9 +1286,15 @@ def contents(self):
             else:
                 raise mx.abort("Unsupported image config type: " + str(type(image_config)))
 
-            if isinstance(image_config, mx_sdk.LanguageLauncherConfig):
+            if isinstance(image_config, (mx_sdk.LanguageLauncherConfig, mx_sdk.LanguageLibraryConfig)):
                 build_args += ['--language:' + image_config.language, '--tool:all']
 
+            if isinstance(image_config, mx_sdk.LanguageLibraryConfig):
+                build_args += [
+                    '-Dorg.graalvm.launcher.class=' + image_config.main_class,
+                    '-H:+EnableSignalAPI',
+                ]
+
             source_type = 'skip' if isinstance(image_config, mx_sdk.LibraryConfig) and _skip_libraries(image_config) else 'dependency'
             graalvm_image_destination = graalvm_dist.find_single_source_location(source_type + ':' + project_name_f(image_config))
 
@@ -1292,13 +1304,12 @@ def contents(self):
                     '-Dorg.graalvm.launcher.relative.home=' + relpath(graalvm_image_destination, graalvm_home),
                 ]
 
-            if isinstance(image_config, mx_sdk.LauncherConfig):
+            if isinstance(image_config, (mx_sdk.LauncherConfig, mx_sdk.LanguageLibraryConfig)):
                 if image_config.is_sdk_launcher:
                     launcher_classpath = NativePropertiesBuildTask.get_launcher_classpath(graalvm_dist, graalvm_home, image_config, self.subject.component, exclude_implicit=True)
-                    build_args += [
-                        '-H:-ParseRuntimeOptions',
-                        '-Dorg.graalvm.launcher.classpath=' + os.pathsep.join(launcher_classpath),
-                    ]
+                    build_args += ['-Dorg.graalvm.launcher.classpath=' + os.pathsep.join(launcher_classpath)]
+                    if isinstance(image_config, mx_sdk.LauncherConfig):
+                        build_args += ['-H:-ParseRuntimeOptions']
 
                 build_args += [
                     '--install-exit-handlers',
@@ -2559,6 +2570,65 @@ def _get_native_image_configs(component, config_type):
 def _libpolyglot_macro_dist_name(component):
     return component.short_name + "_libpolyglot_macro"
 
+class NativeLibraryLauncherProject(mx_native.DefaultNativeProject):
+    def __init__(self, component, language_library_config):
+        _dir = join(_suite.dir, "src", "org.graalvm.launcher.native")
+        self.language_library_config = language_library_config
+        self.component = component
+        self.jvm_launcher = _skip_libraries(self.language_library_config) or not _get_svm_support().is_supported()
+        _dependencies = [] if self.jvm_launcher else [GraalVmNativeImage.project_name(self.language_library_config)]
+        super(NativeLibraryLauncherProject, self).__init__(_suite, NativeLibraryLauncherProject.library_launcher_project_name(self.language_library_config), 'src', [], _dependencies, None, _dir, 'executable', deliverable=self.language_library_config.language, use_jdk_headers=True)
+
+    @staticmethod
+    def library_launcher_project_name(language_library_config):
+        return "org.graalvm.launcher.native." + language_library_config.language
+
+    @property
+    def cflags(self):
+        _dist = get_final_graalvm_distribution()
+        _exe_path = _dist.find_single_source_location('dependency:' + NativeLibraryLauncherProject.library_launcher_project_name(self.language_library_config))
+        _dynamic_cflags = [
+            '-DCP_SEP=' + os.pathsep,
+            '-DDIR_SEP=' + ('\\\\' if mx.is_windows() else '/'),
+        ]
+        if self.jvm_launcher:
+            _graalvm_home = _get_graalvm_archive_path("")
+            _cp = NativePropertiesBuildTask.get_launcher_classpath(_dist, _graalvm_home, self.language_library_config, self.component, exclude_implicit=True)
+            _cp = [join(_dist.path_substitutions.substitute('<jdk_base>'), x) for x in _cp]
+            # path from langauge launcher to jars
+            _cp = [relpath(x, start=dirname(_exe_path)) for x in _cp]
+            if mx.is_windows():
+                _libjvm_path = join(_dist.path_substitutions.substitute('<jre_base>'), 'bin', 'server', 'jvm.dll')
+                _libjvm_path = relpath(_libjvm_path, start=dirname(_exe_path)).replace('\\', '\\\\')
+                _cp = [x.replace('\\', '\\\\') for x in _cp]
+            else:
+                if _src_jdk_version < 9 and mx.is_linux():
+                    _libjvm_path = join(_dist.path_substitutions.substitute('<jre_base>'), 'lib', mx.get_arch(), 'server', mx.add_lib_suffix("libjvm"))
+                else:
+                    _libjvm_path = join(_dist.path_substitutions.substitute('<jre_base>'), 'lib', 'server', mx.add_lib_suffix("libjvm"))
+                _libjvm_path = relpath(_libjvm_path, start=dirname(_exe_path))
+            _dynamic_cflags += [
+                '-DJVM',
+                '-DLAUNCHER_CLASS=' + self.language_library_config.main_class,
+                '-DLAUNCHER_CLASSPATH="{\\"' + '\\", \\"'.join(_cp) + '\\"}"',
+                '-DLIBLANG_RELPATH=' + _libjvm_path,
+            ]
+        else:
+            _lib_path = _dist.find_single_source_location('dependency:' + GraalVmLibrary.project_name(self.language_library_config))
+            # path from language launcher to library
+            _liblang_relpath = relpath(_lib_path, start=dirname(_exe_path))
+            _dynamic_cflags += [
+                '-DLIBLANG_RELPATH=' + (_liblang_relpath.replace('\\', '\\\\') if mx.is_windows() else _liblang_relpath)
+            ]
+        return super(NativeLibraryLauncherProject, self).cflags + _dynamic_cflags
+
+    @property
+    def ldlibs(self):
+        _dynamic_ldlibs = []
+        if not mx.is_windows():
+            _dynamic_ldlibs += ['-ldl']
+        return super(NativeLibraryLauncherProject, self).ldlibs + _dynamic_ldlibs
+
 def has_vm_suite():
     global _vm_suite
     if _vm_suite == 'uninitialized':
@@ -2605,12 +2675,15 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
                     needs_stage1 = True
                 if with_svm:
                     register_project(GraalVmNativeProperties(component, launcher_config))
-            if with_svm:
-                for library_config in _get_library_configs(component):
+            for library_config in _get_library_configs(component):
+                if with_svm:
                     register_project(GraalVmLibrary(component, GraalVmNativeImage.project_name(library_config), [], library_config))
                     assert with_svm
                     register_project(GraalVmNativeProperties(component, library_config))
                     needs_stage1 = True  # library configs need a stage1 even when they are skipped
+                if isinstance(library_config, mx_sdk.LanguageLibraryConfig):
+                    launcher_project = NativeLibraryLauncherProject(component, library_config)
+                    register_project(launcher_project)
         if component.installable and not _disable_installable(component):
             installables.setdefault(component.installable_id, []).append(component)
         if libpolyglot_component is not None and GraalVmLibPolyglotNativeProperties.needs_lib_polyglot_native_properties(component):
diff --git a/sdk/src/org.graalvm.launcher.native/src/launcher.cc b/sdk/src/org.graalvm.launcher.native/src/launcher.cc
new file mode 100644
index 000000000000..f9fd5cc9b4ce
--- /dev/null
+++ b/sdk/src/org.graalvm.launcher.native/src/launcher.cc
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <jni.h>
+#include <string.h>
+
+#define QUOTE(name) #name
+#define STR(macro) QUOTE(macro)
+
+#ifdef JVM
+    #ifndef LAUNCHER_CLASS
+        #error launcher class undefined
+    #endif
+    #define LAUNCHER_CLASS_STR STR(LAUNCHER_CLASS)
+    #ifndef LAUNCHER_CLASSPATH
+        #error launcher classpath undefined
+    #endif
+#endif
+
+#ifndef LIBLANG_RELPATH
+    #error path to native library undefined
+#endif
+
+#ifndef DIR_SEP
+    #error directory separator undefined
+#endif
+
+#ifndef CP_SEP
+    #error class path separator undefined
+#endif
+
+#define LIBLANG_RELPATH_STR STR(LIBLANG_RELPATH)
+#define DIR_SEP_STR STR(DIR_SEP)
+#define CP_SEP_STR STR(CP_SEP)
+
+#if defined (__linux__)
+    #include <dlfcn.h>
+    #include <stdlib.h>
+    #include <libgen.h>
+    #include <limits.h>
+#elif defined (__APPLE__)
+    #include <dlfcn.h>
+    #include <stdlib.h>
+    #include <libgen.h>
+    #include <mach-o/dyld.h>
+    #include <sys/syslimits.h>
+#elif defined (_WIN32)
+    #include <windows.h>
+    #include <libloaderapi.h>
+    #include <cstdlib>
+#else
+    #error platform not supported or undefined
+#endif
+
+typedef jint(*CreateJVM)(JavaVM **, void **, void *);
+
+char *exe_directory() {
+    #if defined (__linux__)
+        return dirname(realpath("/proc/self/exe", NULL));
+    #elif defined (__APPLE__)
+        char path[PATH_MAX];
+        uint32_t path_len = PATH_MAX;
+        _NSGetExecutablePath(path, &path_len);
+        return dirname(realpath(path, NULL));
+    #elif defined (_WIN32)
+        char *path = (char *)malloc(_MAX_PATH);
+        GetModuleFileNameA(NULL, path, _MAX_PATH);
+        // get the directory part
+        char drive[_MAX_DRIVE];
+        char dir[_MAX_DIR];
+        _splitpath_s(path, drive, _MAX_DRIVE, dir, _MAX_DIR, NULL, 0, NULL, 0);
+        _makepath_s(path, _MAX_PATH, drive, dir, NULL, NULL);
+        return path;
+    #endif
+}
+
+CreateJVM loadliblang(char *exe_dir) {
+        int size = strlen(exe_dir) + sizeof(DIR_SEP_STR) + sizeof(LIBLANG_RELPATH_STR) + 1;
+        char *liblang_path = (char*)malloc(size);
+        strcpy(liblang_path, exe_dir);
+        strcat(liblang_path, DIR_SEP_STR);
+        strcat(liblang_path, LIBLANG_RELPATH_STR);
+#if defined (__linux__) || defined (__APPLE__)
+        void* jvm_handle = dlopen(liblang_path, RTLD_NOW);
+        if (jvm_handle != NULL) {
+            return (CreateJVM) dlsym(jvm_handle, "JNI_CreateJavaVM");
+        }
+#else
+        HMODULE jvm_handle = LoadLibraryA(liblang_path);
+        if (jvm_handle != NULL) {
+            return (CreateJVM) GetProcAddress(jvm_handle, "JNI_CreateJavaVM");
+        }
+#endif
+    return NULL;
+}
+
+int main(int argc, char **argv) {
+    char *exe_dir = exe_directory();
+    CreateJVM createJVM = loadliblang(exe_dir);
+    if (!createJVM) {
+        fprintf(stderr, "Could not load language library.\n");
+        return -1;
+    }
+    JavaVM *jvm;
+    JNIEnv *env;
+    JavaVMInitArgs vm_args;
+    JavaVMOption options[4];
+    #ifdef JVM
+        const char *cp_entries[] = LAUNCHER_CLASSPATH;
+        int cp_cnt = sizeof(cp_entries) / sizeof(*cp_entries);
+        int size = (strlen(exe_dir) + sizeof(DIR_SEP_STR)) * cp_cnt + sizeof(CP_SEP_STR) * (cp_cnt-1) + 1;
+        for (int i = 0; i < cp_cnt; i++) {
+            size += strlen(cp_entries[i]);
+        }
+        const char cp_property[] = "-Djava.class.path=";
+        size += sizeof(cp_property);
+        char *cp = (char *)malloc(size);
+        strcpy(cp, cp_property);
+        for (int i = 0; i < cp_cnt; i++) {
+            strcat(cp, exe_dir);
+            strcat(cp, DIR_SEP_STR);
+            strcat(cp, cp_entries[i]);
+            if (i < cp_cnt-1) {
+                strcat(cp, CP_SEP_STR);
+            }
+        }
+        options[0].optionString = cp;
+        options[1].optionString = "-Dorg.graalvm.launcher.class=" LAUNCHER_CLASS_STR;
+        vm_args.nOptions = 2;
+    #else
+        vm_args.nOptions = 0;
+    #endif
+    vm_args.version = JNI_VERSION_1_8;
+    vm_args.options = options;
+    vm_args.ignoreUnrecognized = false;
+
+    int res = createJVM(&jvm, (void**)&env, &vm_args);
+    if (res != JNI_OK) {
+        fprintf(stderr, "Creation of the JVM failed.\n");
+        return -1;
+    }
+    jclass byteArrayClass = env->FindClass("[B");
+    if (byteArrayClass == NULL) {
+        fprintf(stderr, "Byte array class not found.\n");
+        if (env->ExceptionCheck()) {
+            env->ExceptionDescribe();
+        }
+        return -1;
+    }
+    jclass launcherClass = env->FindClass("org/graalvm/launcher/AbstractLanguageLauncher");
+    if (launcherClass == NULL) {
+        fprintf(stderr, "Launcher class not found.\n");
+        if (env->ExceptionCheck()) {
+            env->ExceptionDescribe();
+        }
+        return -1;
+    }
+    jmethodID mid = env->GetStaticMethodID(launcherClass, "runLauncher", "([[BIJ)V");
+    if (mid == NULL) {
+        fprintf(stderr, "Launcher entry point not found.\n");
+        if (env->ExceptionCheck()) {
+            env->ExceptionDescribe();
+        }
+        return -1;
+    }
+
+    // create args string array
+    long argv_native = (long)argv;
+    int argc_native = argc;
+    argv++;
+    argc--;
+
+    jobjectArray args = env->NewObjectArray(argc, byteArrayClass, NULL);
+    for (int i = 0; i < argc; i++) {
+        int arraySize = strlen(argv[i]);
+        jbyteArray arg = env->NewByteArray(arraySize);
+        env->SetByteArrayRegion(arg, 0, arraySize, (jbyte *)(argv[i]));
+        if (env->ExceptionCheck()) {
+            fprintf(stderr, "Error in SetByteArrayRegion:\n");
+            env->ExceptionDescribe();
+            return -1;
+        }
+        env->SetObjectArrayElement(args, i, arg);
+        if (env->ExceptionCheck()) {
+            fprintf(stderr, "Error in SetObjectArrayElement:\n");
+            env->ExceptionDescribe();
+            return -1;
+        }
+    }
+
+    // invoke launcher entry point
+    env->CallStaticVoidMethod(launcherClass, mid, args, argc_native, argv_native);
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        return -1;
+    }
+	return 0;
+}
diff --git a/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/launcher.jniconfig b/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/launcher.jniconfig
new file mode 100644
index 000000000000..3a35a5d84541
--- /dev/null
+++ b/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/launcher.jniconfig
@@ -0,0 +1,8 @@
+[
+  {
+    "name": "org.graalvm.launcher.AbstractLanguageLauncher",
+    "methods": [
+      { "name": "runLauncher" }
+    ]
+  }
+]
diff --git a/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/native-image.properties b/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/native-image.properties
index c5657e153d52..f2f92c7b5c9e 100644
--- a/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/native-image.properties
+++ b/sdk/src/org.graalvm.launcher/src/META-INF/native-image/org.graalvm.launcher/native-image.properties
@@ -1 +1,2 @@
-Args = --features=com.oracle.svm.thirdparty.jline.JLine3Feature
+Args = --features=com.oracle.svm.thirdparty.jline.JLine3Feature \
+       -H:JNIConfigurationResources=${.}/launcher.jniconfig
\ No newline at end of file
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
index c5c12f2ed490..20c3350846a0 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,6 +40,7 @@
  */
 package org.graalvm.launcher;
 
+import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -47,6 +48,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.graalvm.nativeimage.RuntimeOptions;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Language;
@@ -54,6 +56,38 @@
 
 public abstract class AbstractLanguageLauncher extends LanguageLauncherBase {
 
+    private static final Constructor<AbstractLanguageLauncher> LAUNCHER_CTOR;
+    private int nativeArgc;
+    private long nativeArgv;
+
+    static {
+        LAUNCHER_CTOR = getLauncherCtor();
+    }
+
+    /**
+     * Looks up the launcher constructor based on the launcher class passed in via the
+     * org.graalvm.launcher.class system property.
+     *
+     * @return launcher constructor, if found.
+     */
+    @SuppressWarnings("unchecked")
+    private static Constructor<AbstractLanguageLauncher> getLauncherCtor() {
+        String launcherClassName = System.getProperty("org.graalvm.launcher.class");
+        Constructor<AbstractLanguageLauncher> launcherCtor = null;
+        if (launcherClassName != null) {
+            try {
+                Class<AbstractLanguageLauncher> launcherClass = (Class<AbstractLanguageLauncher>) Class.forName(launcherClassName);
+                if (!AbstractLanguageLauncher.class.isAssignableFrom(launcherClass)) {
+                    throw new Exception("Launcher does not implement " + AbstractLanguageLauncher.class.getName());
+                }
+                launcherCtor = launcherClass.getConstructor();
+            } catch (Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+        return launcherCtor;
+    }
+
     /**
      * This starts the launcher. it should be called from the main method:
      *
@@ -81,6 +115,54 @@ protected final void launch(String[] args) {
         }
     }
 
+    /**
+     * Entry point for invoking the launcher via JNI. Relies on a launcher constructor to be set via
+     * the org.graalvm.launcher.class system property.
+     *
+     * @param args the command line arguments as an encoding-agnostic byte array
+     * @param argc the number of native command line arguments
+     * @param argv pointer to argv
+     * @throws Exception if no launcher constructor has been set.
+     */
+    public static void runLauncher(byte[][] args, int argc, long argv) throws Exception {
+        if (isAOT()) {
+            // enable signal handling for the launcher
+            RuntimeOptions.set("EnableSignalHandling", true);
+        }
+
+        if (LAUNCHER_CTOR == null) {
+            throw new Exception("Launcher constructor has not been set.");
+        }
+
+        String[] arguments = new String[args.length];
+        for (int i = 0; i < args.length; i++) {
+            arguments[i] = new String(args[i]);
+        }
+
+        AbstractLanguageLauncher launcher = LAUNCHER_CTOR.newInstance();
+        launcher.nativeArgc = argc;
+        launcher.nativeArgv = argv;
+        launcher.launch(arguments);
+    }
+
+    /**
+     * The native argument count as passed to the main method of the native launcher.
+     *
+     * @return native argument count, including the program name
+     */
+    protected int getNativeArgc() {
+        return nativeArgc;
+    }
+
+    /**
+     * The native argument values as passed to the main method of the native launcher.
+     *
+     * @return pointer to the native argument values, including the program name
+     */
+    protected long getNativeArgv() {
+        return nativeArgv;
+    }
+
     protected static final boolean IS_LIBPOLYGLOT = Boolean.getBoolean("graalvm.libpolyglot");
 
     final void launch(List<String> args, Map<String, String> defaultOptions, boolean doNativeSetup) {
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java
index a9534889435d..94a3090fc1fd 100644
--- a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java
+++ b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -143,7 +143,7 @@ public static boolean inImageBuildtimeCode() {
     }
 
     /**
-     * Returns true if the image is build as an executable.
+     * Returns true if the image is built as an executable.
      *
      * @since 19.0
      */
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java
index 18130398b026..b4e3799697d9 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/SunMiscSubstitutions.java
@@ -136,6 +136,9 @@ private Util_jdk_internal_misc_Signal() {
      * signals that the VM itself uses.
      */
     static long handle0(int sig, long nativeH) {
+        if (!SubstrateOptions.EnableSignalHandling.getValue()) {
+            return sunMiscSignalIgnoreHandler;
+        }
         ensureInitialized();
         final Signal.SignalDispatcher newDispatcher = nativeHToDispatcher(nativeH);
         /* If the dispatcher is the CSunMiscSignal handler, then check if the signal is in range. */
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateExitHandlerFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateExitHandlerFeature.java
index bce7b3801781..a50ba94c0619 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateExitHandlerFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateExitHandlerFeature.java
@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core;
 
-import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.annotate.Alias;
@@ -36,7 +35,7 @@
 public class SubstrateExitHandlerFeature implements Feature {
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
-        if (SubstrateOptions.InstallExitHandlers.getValue() && ImageInfo.isExecutable()) {
+        if (SubstrateOptions.InstallExitHandlers.getValue()) {
             RuntimeSupport.getRuntimeSupport().addStartupHook(new SubstrateExitHandlerStartupHook());
         }
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index c4e350b410ac..b03574525b03 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -46,6 +46,7 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.deopt.DeoptimizationSupport;
@@ -425,7 +426,7 @@ public static boolean useLLVMBackend() {
     public static final HostedOptionKey<Boolean> CheckToolchain = new HostedOptionKey<>(true);
 
     @APIOption(name = "install-exit-handlers")//
-    @Option(help = "Provide java.lang.Terminator exit handlers for executable images", type = User)//
+    @Option(help = "Provide java.lang.Terminator exit handlers", type = User)//
     public static final HostedOptionKey<Boolean> InstallExitHandlers = new HostedOptionKey<>(false);
 
     @Option(help = "When set to true, the image generator verifies that the image heap does not contain a home directory as a substring", type = User)//
@@ -564,6 +565,22 @@ public Boolean getValue(OptionValues values) {
         }
     };
 
+    @Option(help = "Enables signal handling", stability = OptionStability.EXPERIMENTAL, type = Expert)//
+    public static final RuntimeOptionKey<Boolean> EnableSignalHandling = new RuntimeOptionKey<Boolean>(null) {
+        @Override
+        public Boolean getValueOrDefault(UnmodifiableEconomicMap<OptionKey<?>, Object> values) {
+            if (values.containsKey(this)) {
+                return (Boolean) values.get(this);
+            }
+            return ImageInfo.isExecutable();
+        }
+
+        @Override
+        public Boolean getValue(OptionValues values) {
+            return getValueOrDefault(values.getMap());
+        }
+    };
+
     @Option(help = "Enable Java Flight Recorder.")//
     public static final RuntimeOptionKey<Boolean> FlightRecorder = new RuntimeOptionKey<>(false);
 

From ec3c9dc2b94a9a456b74f46611f6e9cba8813614 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Mon, 6 Sep 2021 16:07:27 +0200
Subject: [PATCH 419/681] Initial cleanup of compilation tracing.

---
 .../truffle/runtime/OptimizedCallTarget.java  |  8 +++
 .../debug/TraceCompilationListener.java       | 65 +++++++++----------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
index e4c5c33eab42..0b1d424a8019 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Supplier;
 
@@ -328,6 +329,8 @@ public Class<?> getType() {
 
     private volatile WeakReference<OptimizedDirectCallNode> singleCallNode = NO_CALL;
     volatile List<OptimizedCallTarget> blockCompilations;
+    private final int id;
+    private static final AtomicInteger idCounter = new AtomicInteger(0);
 
     protected OptimizedCallTarget(OptimizedCallTarget sourceCallTarget, RootNode rootNode) {
         assert sourceCallTarget == null || sourceCallTarget.sourceCallTarget == null : "Cannot create a clone of a cloned CallTarget";
@@ -339,6 +342,7 @@ protected OptimizedCallTarget(OptimizedCallTarget sourceCallTarget, RootNode roo
         // Do not adopt children of OSRRootNodes; we want to preserve the parent of the child
         // node(s).
         this.uninitializedNodeCount = !isOSR() ? GraalRuntimeAccessor.NODES.adoptChildrenAndCount(rootNode) : -1;
+        id = idCounter.getAndIncrement();
     }
 
     final Assumption getNodeRewritingAssumption() {
@@ -1683,4 +1687,8 @@ private boolean prepareForAOTImpl() {
     boolean isOSR() {
         return rootNode instanceof BaseOSRRootNode;
     }
+
+    public int id() {
+        return id;
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index af174b538f64..ffbcbd32bd86 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -69,32 +69,32 @@ private static Map<String, Object> defaultProperties(OptimizedCallTarget target)
     @Override
     public void onCompilationQueued(OptimizedCallTarget target, int tier) {
         if (target.engine.traceCompilationDetails) {
-            runtime.logEvent(target, 0, "opt queued", queueProperties(target, tier));
+            log(target, "opt queued", queueProperties(target, tier, 1));
         }
     }
 
     @Override
     public void onCompilationDequeued(OptimizedCallTarget target, Object source, CharSequence reason, int tier) {
         if (target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = queueProperties(target, tier);
+            Map<String, Object> properties = queueProperties(target, tier, -1);
             properties.put("Reason", reason);
-            runtime.logEvent(target, 0, "opt unqueued", properties);
+            log(target, "opt unqueued", properties);
         }
     }
 
-    private Map<String, Object> queueProperties(OptimizedCallTarget target, int tier) {
+    private Map<String, Object> queueProperties(OptimizedCallTarget target, int tier, int queueChange) {
         Map<String, Object> properties = new LinkedHashMap<>();
-        GraalTruffleRuntimeListener.addASTSizeProperty(target, properties);
         properties.put("Tier", Integer.toString(tier)); // to avoid padding
-        int callThreshold = tier == 1 ? target.engine.callThresholdInInterpreter : target.engine.callThresholdInFirstTier;
         int scale = runtime.compilationThresholdScale();
-        properties.put("Calls/Thres", String.format("%7d/%5d", target.getCallCount(), FixedPointMath.multiply(scale, callThreshold)));
         int callAndLoopThreshold = tier == 1 ? target.engine.callAndLoopThresholdInInterpreter : target.engine.callAndLoopThresholdInFirstTier;
         properties.put("CallsAndLoop/Thres", String.format("%7d/%5d", target.getCallAndLoopCount(), FixedPointMath.multiply(scale, callAndLoopThreshold)));
-        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-        properties.put("QueueSize", runtime.getCompilationQueueSize());
+        properties.put("Queue", String.format("(Size %d, Change %c%d, Scale %.2f)",
+                        runtime.getCompilationQueueSize(),
+                        queueChange >= 0 ? '+' : '-',
+                        Math.abs(queueChange),
+                        FixedPointMath.toDouble(scale)));
         properties.put("Time", System.nanoTime() - startTime);
-        properties.put("Scale", FixedPointMath.toDouble(scale));
+        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
         return properties;
     }
 
@@ -106,7 +106,7 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
             } else {
                 Map<String, Object> properties = compilationEndProperties(target, null, null, null, tier);
                 properties.put("Reason", reason);
-                runtime.logEvent(target, 0, "opt failed", properties);
+                log(target, "opt failed", properties);
             }
             currentCompilation.set(null);
         }
@@ -115,7 +115,7 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
     @Override
     public void onCompilationStarted(OptimizedCallTarget target, int tier) {
         if (target.engine.traceCompilationDetails) {
-            runtime.logEvent(target, 0, "opt start", queueProperties(target, tier));
+            log(target, "opt start", queueProperties(target, tier, -1));
         }
 
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
@@ -123,13 +123,18 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier) {
         }
     }
 
+    private void log(OptimizedCallTarget target, String event, Map<String, Object> properties) {
+        String subject = String.format("id=%-6d %s", target.id(), target.getName());
+        runtime.logEvent(target, 0, event, subject, properties, null);
+    }
+
     @Override
     public void onCompilationDeoptimized(OptimizedCallTarget target, Frame frame) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
             Map<String, Object> properties = new LinkedHashMap<>();
             GraalTruffleRuntimeListener.addASTSizeProperty(target, properties);
             properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-            runtime.logEvent(target, 0, "opt deopt", properties);
+            log(target, "opt deopt", properties);
         }
     }
 
@@ -150,43 +155,35 @@ public void onCompilationSuccess(OptimizedCallTarget target, TruffleInlining inl
 
         Map<String, Object> properties = compilationEndProperties(target, inliningDecision, graph, result, tier);
 
-        runtime.logEvent(target, 0, "opt done", properties);
+        log(target, "opt done", properties);
 
         currentCompilation.set(null);
     }
 
     private Map<String, Object> compilationEndProperties(OptimizedCallTarget target, TruffleInlining inliningDecision, GraphInfo graph, CompilationResultInfo result, int tier) {
         long timeCompilationFinished = System.nanoTime();
-        int nodeCountLowered = graph == null ? 0 : graph.getNodeCount();
         Times compilation = currentCompilation.get();
 
-        int calls = 0;
-        int inlinedCalls;
-        if (inliningDecision == null) {
-            CallCountVisitor visitor = new CallCountVisitor();
-            target.accept(visitor);
-            calls = visitor.calls;
-            inlinedCalls = 0;
-        } else {
-            calls = inliningDecision.countCalls();
-            inlinedCalls = inliningDecision.countInlinedCalls();
-        }
 
-        int dispatchedCalls = calls - inlinedCalls;
         Map<String, Object> properties = new LinkedHashMap<>();
-        GraalTruffleRuntimeListener.addASTSizeProperty(target, properties);
         properties.put("Tier", Integer.toString(tier)); // to avoid padding
         properties.put("Time", String.format("%4.0f(%4.0f+%-4.0f)ms", //
                         (timeCompilationFinished - compilation.timeCompilationStarted) / 1e6, //
                         (compilation.timePartialEvaluationFinished - compilation.timeCompilationStarted) / 1e6, //
                         (timeCompilationFinished - compilation.timePartialEvaluationFinished) / 1e6));
-        properties.put("Inlined", String.format("%3dY %3dN", inlinedCalls, dispatchedCalls));
-        properties.put("IR", String.format("%5d/%5d", compilation.nodeCountPartialEval, nodeCountLowered));
-        properties.put("CodeSize", result == null ? 0 : result.getTargetCodeSize());
+        if (inliningDecision != null) {
+            int inlinedCalls = inliningDecision.countInlinedCalls();
+            int dispatchedCalls = inliningDecision.countCalls() - inlinedCalls;
+            properties.put("Inlined", String.format("%3dY %3dN", inlinedCalls, dispatchedCalls));
+        }
+        if (graph != null) {
+            properties.put("IR", String.format("%5d/%5d", compilation.nodeCountPartialEval, graph.getNodeCount()));
+        }
+        if (result != null) {
+            properties.put("CodeSize", result.getTargetCodeSize());
+        }
         if (target.getCodeAddress() != 0) {
             properties.put("Addr", "0x" + Long.toHexString(target.getCodeAddress()));
-        } else {
-            properties.put("Addr", "N/A");
         }
         properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
         return properties;
@@ -204,7 +201,7 @@ public void onCompilationInvalidated(OptimizedCallTarget target, Object source,
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
             Map<String, Object> properties = defaultProperties(target);
             properties.put("Reason", reason);
-            runtime.logEvent(target, 0, "opt inv.", properties);
+            log(target, "opt inv.", properties);
         }
     }
 

From da01a39cc76664556beac50b70038f8d2b010ac1 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Mon, 6 Sep 2021 17:57:04 +0200
Subject: [PATCH 420/681] Better tracing for "compilation started".

---
 .../common/TruffleCompilationTask.java        | 16 ++++++++
 .../runtime/BackgroundCompileQueue.java       | 14 ++-----
 .../truffle/runtime/CompilationTask.java      | 40 +++++++++++++++++--
 .../truffle/runtime/GraalTruffleRuntime.java  |  1 +
 .../runtime/GraalTruffleRuntimeListener.java  |  8 +++-
 ...GraalTruffleRuntimeListenerDispatcher.java |  5 +++
 .../runtime/TraversingBlockingQueue.java      | 36 +++++++++++------
 .../debug/TraceCompilationListener.java       | 36 ++++++++++-------
 8 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilationTask.java b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilationTask.java
index db8757acfe78..cb318c15b4cb 100644
--- a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilationTask.java
+++ b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilationTask.java
@@ -52,4 +52,20 @@ default int tier() {
     TruffleInliningData inliningData();
 
     boolean hasNextTier();
+
+    default long time() {
+        return 0;
+    }
+
+    default double weight() {
+        return Double.NaN;
+    }
+
+    default double rate() {
+        return Double.NaN;
+    }
+
+    default int queueChange() {
+        return 0;
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/BackgroundCompileQueue.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/BackgroundCompileQueue.java
index 9b0b779df64f..22f4206a1270 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/BackgroundCompileQueue.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/BackgroundCompileQueue.java
@@ -193,17 +193,9 @@ private long nextId() {
     }
 
     public int getQueueSize() {
-        final ExecutorService threadPool = compilationExecutorService;
-        if (threadPool instanceof ThreadPoolExecutor) {
-            BlockingQueue<Runnable> queue = ((ThreadPoolExecutor) threadPool).getQueue();
-            int count = 0;
-            for (Runnable runnable : queue) {
-                CompilationTask.ExecutorServiceWrapper wrapper = (CompilationTask.ExecutorServiceWrapper) runnable;
-                if (!wrapper.isCancelled() && !wrapper.compileTask.isCancelled()) {
-                    count++;
-                }
-            }
-            return count;
+        final ThreadPoolExecutor threadPool = compilationExecutorService;
+        if (threadPool != null) {
+            return threadPool.getQueue().size();
         } else {
             return 0;
         }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
index bff7c078f4af..731e66eea396 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
@@ -70,6 +70,10 @@ public void accept(CompilationTask task) {
     private double lastWeight;
     private boolean isOSR;
 
+    private double lastRate;
+    private long time;
+    private int queueChange;
+
     private CompilationTask(BackgroundCompileQueue.Priority priority, WeakReference<OptimizedCallTarget> targetRef, Consumer<CompilationTask> action, long id) {
         this.priority = priority;
         this.targetRef = targetRef;
@@ -264,9 +268,10 @@ boolean updateWeight(long currentTime) {
             return true;
         }
         int count = target.getCallAndLoopCount();
-        double weight = rate(count, elapsed) * count;
+        lastRate = rate(count, elapsed);
         lastTime = currentTime;
         lastCount = count;
+        double weight = lastRate * lastCount;
         if (engineData.traversingFirstTierPriority) {
             lastWeight = weight;
         } else {
@@ -290,8 +295,8 @@ boolean updateWeight(long currentTime) {
     }
 
     private double rate(int count, long elapsed) {
-        double rawRate = ((double) count - lastCount) / elapsed;
-        return 1.0 + (Double.isNaN(rawRate) ? 0 : rawRate);
+        lastRate = ((double) count - lastCount) / elapsed;
+        return 1.0 + (Double.isNaN(lastRate) ? 0 : lastRate);
     }
 
     public int targetHighestCompiledTier() {
@@ -302,6 +307,35 @@ public int targetHighestCompiledTier() {
         return target.highestCompiledTier();
     }
 
+    @Override
+    public long time() {
+        return time;
+    }
+
+    @Override
+    public double weight() {
+        return lastWeight;
+    }
+
+    @Override
+    public double rate() {
+        return lastRate;
+    }
+
+    @Override
+    public int queueChange() {
+        return queueChange;
+    }
+
+    void setTime(long time) {
+        this.time = time;
+    }
+
+    void setQueueChange(int queueChange) {
+        this.queueChange = queueChange;
+    }
+
+
     /**
      * Since {@link BackgroundCompileQueue} uses a {@link java.util.concurrent.ThreadPoolExecutor}
      * to run compilations, and since the executor expects each {@link Callable} (in our case, the
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index 16ed9eb4e42f..bb8407a1f096 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -782,6 +782,7 @@ private void compileImpl(TruffleDebugContext initialDebug, OptimizedCallTarget c
                     debug = compiler.openDebugContext(optionsMap, compilation);
                 }
                 listeners.onCompilationStarted(callTarget, task.tier());
+                listeners.onCompilationStarted(callTarget, task.tier(), task.time(), task.weight(), task.rate(), task.queueChange());
                 compilationStarted = true;
                 try {
                     compiler.doCompile(debug, compilation, optionsMap, task, listeners.isEmpty() ? null : listeners);
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index 9de24d2bd264..bb987d1828c3 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -119,13 +119,19 @@ default void onCompilationStarted(OptimizedCallTarget target) {
         onCompilationStarted(target, 0);
     }
 
+    /**
+     * @deprecated Use {@link #onCompilationStarted(OptimizedCallTarget, int)}
+     */
+    @Deprecated
+    default void onCompilationStarted(OptimizedCallTarget target, int tier) {}
+
     /**
      * Notifies this object when compilation of {@code target} is about to start.
      *
      * @param target the call target about to be compiled
      * @param tier Which compilation tier is in question.
      */
-    default void onCompilationStarted(OptimizedCallTarget target, int tier) {
+    default void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
index 17cc552d9c88..bce665f14612 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
@@ -78,6 +78,11 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier) {
         invokeListeners((l) -> l.onCompilationStarted(target, tier));
     }
 
+    @Override
+    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+        invokeListeners((l) -> l.onCompilationStarted(target, tier, time, weight, rate, queueChange));
+    }
+
     @Override
     public void onCompilationTruffleTierFinished(OptimizedCallTarget target, TruffleInlining inliningDecision, GraphInfo graph) {
         invokeListeners((l) -> l.onCompilationTruffleTierFinished(target, inliningDecision, graph));
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TraversingBlockingQueue.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TraversingBlockingQueue.java
index 6d29f5870772..58bc083ae0c8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TraversingBlockingQueue.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TraversingBlockingQueue.java
@@ -79,23 +79,33 @@ private synchronized Runnable takeMax() {
         if (entries.isEmpty()) {
             return null;
         }
-        long time = System.nanoTime();
-        Iterator<Runnable> it = entries.iterator();
         Runnable max = null;
-        while (it.hasNext()) {
-            Runnable entry = it.next();
-            CompilationTask task = task(entry);
-            // updateWeight returns false only if the task's target does not exist
-            if (task.isCancelled() || !task.updateWeight(time)) {
-                it.remove();
-                continue;
+        long time = System.nanoTime();
+        int removed = 0;
+        try {
+            Iterator<Runnable> it = entries.iterator();
+            while (it.hasNext()) {
+                Runnable entry = it.next();
+                CompilationTask task = task(entry);
+                // updateWeight returns false only if the task's target does not exist
+                if (task.isCancelled() || !task.updateWeight(time)) {
+                    it.remove();
+                    removed--;
+                    continue;
+                }
+                if (max == null || task.isHigherPriorityThan(task(max))) {
+                    max = entry;
+                }
             }
-            if (max == null || task.isHigherPriorityThan(task(max))) {
-                max = entry;
+            // entries.remove can only return false if a sleeping thread takes the only element
+            return entries.remove(max) ? max : null;
+        } finally {
+            if (max != null) {
+                CompilationTask task = task(max);
+                task.setTime(System.nanoTime() - time);
+                task.setQueueChange(removed - 1);
             }
         }
-        // entries.remove can only return false if a sleeping thread takes the only element
-        return entries.remove(max) ? max : null;
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index ffbcbd32bd86..05985ad4379e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -49,7 +49,6 @@
 public final class TraceCompilationListener extends AbstractGraalTruffleRuntimeListener {
 
     private final ThreadLocal<Times> currentCompilation = new ThreadLocal<>();
-    private long startTime = System.nanoTime();
 
     private TraceCompilationListener(GraalTruffleRuntime runtime) {
         super(runtime);
@@ -59,13 +58,6 @@ public static void install(GraalTruffleRuntime runtime) {
         runtime.addListener(new TraceCompilationListener(runtime));
     }
 
-    private static Map<String, Object> defaultProperties(OptimizedCallTarget target) {
-        Map<String, Object> properties = new LinkedHashMap<>();
-        properties.putAll(target.getDebugProperties());
-        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-        return properties;
-    }
-
     @Override
     public void onCompilationQueued(OptimizedCallTarget target, int tier) {
         if (target.engine.traceCompilationDetails) {
@@ -76,7 +68,7 @@ public void onCompilationQueued(OptimizedCallTarget target, int tier) {
     @Override
     public void onCompilationDequeued(OptimizedCallTarget target, Object source, CharSequence reason, int tier) {
         if (target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = queueProperties(target, tier, -1);
+            Map<String, Object> properties = queueProperties(target, tier, 0);
             properties.put("Reason", reason);
             log(target, "opt unqueued", properties);
         }
@@ -93,7 +85,7 @@ private Map<String, Object> queueProperties(OptimizedCallTarget target, int tier
                         queueChange >= 0 ? '+' : '-',
                         Math.abs(queueChange),
                         FixedPointMath.toDouble(scale)));
-        properties.put("Time", System.nanoTime() - startTime);
+        properties.put("Time", System.nanoTime());
         properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
         return properties;
     }
@@ -113,9 +105,9 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier) {
+    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
         if (target.engine.traceCompilationDetails) {
-            log(target, "opt start", queueProperties(target, tier, -1));
+            log(target, "opt start", startedProperties(target, tier, time, weight, rate, queueChange));
         }
 
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
@@ -123,6 +115,22 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier) {
         }
     }
 
+    private Map<String, Object> startedProperties(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+        Map<String, Object> properties = new LinkedHashMap<>();
+        properties.put("Tier", Integer.toString(tier)); // to avoid padding
+        properties.put("Weight", weight);
+        properties.put("Rate", Double.toString(rate));
+        properties.put("Queue", String.format("(Size %d, Change %c%d, Scale %.2f, Time %dus)",
+                        runtime.getCompilationQueueSize(),
+                        queueChange >= 0 ? '+' : '-',
+                        Math.abs(queueChange),
+                        FixedPointMath.toDouble(runtime.compilationThresholdScale()),
+                        time / 1000));
+        properties.put("Time", System.nanoTime());
+        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
+        return properties;
+    }
+
     private void log(OptimizedCallTarget target, String event, Map<String, Object> properties) {
         String subject = String.format("id=%-6d %s", target.id(), target.getName());
         runtime.logEvent(target, 0, event, subject, properties, null);
@@ -132,7 +140,6 @@ private void log(OptimizedCallTarget target, String event, Map<String, Object> p
     public void onCompilationDeoptimized(OptimizedCallTarget target, Frame frame) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
             Map<String, Object> properties = new LinkedHashMap<>();
-            GraalTruffleRuntimeListener.addASTSizeProperty(target, properties);
             properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
             log(target, "opt deopt", properties);
         }
@@ -199,7 +206,8 @@ private static String formatSourceSection(SourceSection sourceSection) {
     @Override
     public void onCompilationInvalidated(OptimizedCallTarget target, Object source, CharSequence reason) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = defaultProperties(target);
+            Map<String, Object> properties = new LinkedHashMap<>();
+            properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
             properties.put("Reason", reason);
             log(target, "opt inv.", properties);
         }

From 3f61edfffe18a3d133a35172e4416234b5649a9d Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 7 Sep 2021 11:18:50 +0200
Subject: [PATCH 421/681] Dealing with the deprecation.

---
 .../compiler/truffle/runtime/CompilationTask.java        | 1 -
 .../truffle/runtime/GraalTruffleRuntimeListener.java     | 9 +--------
 .../runtime/GraalTruffleRuntimeListenerDispatcher.java   | 1 +
 .../compiler/truffle/runtime/debug/JFRListener.java      | 2 +-
 .../truffle/runtime/debug/StatisticsListener.java        | 6 +++---
 .../truffle/runtime/debug/TraceCompilationListener.java  | 1 -
 .../truffle/test/GraalTruffleRuntimeListenerTest.java    | 2 +-
 .../truffle/test/TruffleBoundaryExceptionsTest.java      | 2 +-
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
index 731e66eea396..3ec41ee58993 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
@@ -335,7 +335,6 @@ void setQueueChange(int queueChange) {
         this.queueChange = queueChange;
     }
 
-
     /**
      * Since {@link BackgroundCompileQueue} uses a {@link java.util.concurrent.ThreadPoolExecutor}
      * to run compilations, and since the executor expects each {@link Callable} (in our case, the
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index bb987d1828c3..760e45f9b8c7 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -115,16 +115,9 @@ default void onCompilationDequeued(OptimizedCallTarget target, Object source, Ch
      * @deprecated Use {@link #onCompilationStarted(OptimizedCallTarget, int)}
      */
     @Deprecated
-    default void onCompilationStarted(OptimizedCallTarget target) {
-        onCompilationStarted(target, 0);
+    default void onCompilationStarted(OptimizedCallTarget target, int tier) {
     }
 
-    /**
-     * @deprecated Use {@link #onCompilationStarted(OptimizedCallTarget, int)}
-     */
-    @Deprecated
-    default void onCompilationStarted(OptimizedCallTarget target, int tier) {}
-
     /**
      * Notifies this object when compilation of {@code target} is about to start.
      *
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
index bce665f14612..16eae36525dd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
@@ -74,6 +74,7 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void onCompilationStarted(OptimizedCallTarget target, int tier) {
         invokeListeners((l) -> l.onCompilationStarted(target, tier));
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
index 950b6195efd8..2c82817e3b28 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
@@ -104,7 +104,7 @@ public static boolean isInstrumented(ResolvedJavaMethod method) {
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier) {
+    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
         CompilationEvent event = null;
         if (factory != null) {
             event = factory.createCompilationEvent();
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
index bd20d827d5e9..b88c28833177 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
@@ -167,7 +167,7 @@ public synchronized void onCompilationInvalidated(OptimizedCallTarget target, Ob
     }
 
     @Override
-    public synchronized void onCompilationStarted(OptimizedCallTarget target, int tier) {
+    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
         compilations++;
         final Times times = new Times();
         compilationTimes.set(times);
@@ -620,10 +620,10 @@ public void onCompilationQueued(OptimizedCallTarget target, int tier) {
         }
 
         @Override
-        public void onCompilationStarted(OptimizedCallTarget target, int tier) {
+        public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
             StatisticsListener listener = target.engine.statisticsListener;
             if (listener != null) {
-                listener.onCompilationStarted(target, tier);
+                listener.onCompilationStarted(target, tier, time, weight, rate, queueChange);
             }
         }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index 05985ad4379e..396e6cabc1dc 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -171,7 +171,6 @@ private Map<String, Object> compilationEndProperties(OptimizedCallTarget target,
         long timeCompilationFinished = System.nanoTime();
         Times compilation = currentCompilation.get();
 
-
         Map<String, Object> properties = new LinkedHashMap<>();
         properties.put("Tier", Integer.toString(tier)); // to avoid padding
         properties.put("Time", String.format("%4.0f(%4.0f+%-4.0f)ms", //
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
index fb13b5d17f4a..6afe468b0f5a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
@@ -373,7 +373,7 @@ public void onCompilationDequeued(OptimizedCallTarget target, Object source, Cha
         }
 
         @Override
-        public void onCompilationStarted(OptimizedCallTarget target, int tier) {
+        public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
             if (isImportant(target)) {
                 waitForInitialTarget();
                 events.add(EventType.COMPILATION_STARTED);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
index 6307b305fdd3..bac986321e63 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
@@ -88,7 +88,7 @@ public void throwExceptionBoundary() {
         final int[] compilationCount = {0};
         GraalTruffleRuntimeListener listener = new GraalTruffleRuntimeListener() {
             @Override
-            public void onCompilationStarted(OptimizedCallTarget target, int tier) {
+            public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
                 compilationCount[0]++;
             }
         };

From c0d3baad11bee340c6f30ea052d5575aa9c29a04 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 7 Sep 2021 13:26:00 +0200
Subject: [PATCH 422/681] Fix compilation retry.

---
 .../truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
index 16eae36525dd..48c040949d77 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
@@ -169,6 +169,6 @@ public void onFailure(CompilableTruffleAST compilable, String reason, boolean ba
     @Override
     public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
         onCompilationQueued((OptimizedCallTarget) compilable, tier);
-        onCompilationStarted((OptimizedCallTarget) compilable, tier);
+        onCompilationStarted((OptimizedCallTarget) compilable, tier, 0, 0, 0, 0);
     }
 }

From 053c0978b2b73eea62a8d822e0a916ec53794fc6 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 7 Sep 2021 14:23:32 +0200
Subject: [PATCH 423/681] Update javadoc.

---
 .../truffle/runtime/GraalTruffleRuntimeListener.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index 760e45f9b8c7..7d6049454726 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -112,9 +112,13 @@ default void onCompilationDequeued(OptimizedCallTarget target, Object source, Ch
     }
 
     /**
+     * @param target the call target about to be compiled
+     * @param tier Which compilation tier is in question.
+     *
      * @deprecated Use {@link #onCompilationStarted(OptimizedCallTarget, int)}
      */
     @Deprecated
+    @SuppressWarnings("unused")
     default void onCompilationStarted(OptimizedCallTarget target, int tier) {
     }
 
@@ -122,8 +126,13 @@ default void onCompilationStarted(OptimizedCallTarget target, int tier) {
      * Notifies this object when compilation of {@code target} is about to start.
      *
      * @param target the call target about to be compiled
-     * @param tier Which compilation tier is in question.
+     * @param tier which compilation tier is in question.
+     * @param weight the parameter by which we choose this compilation among others form the queue.
+     * @param rate the dynamic component that contributes to weight.
+     * @param queueChange how has starting this compilation impacted the number of compilations in
+     *            the queue.
      */
+    @SuppressWarnings("unused")
     default void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
     }
 

From 2058ed7978ba0fcb11a49a065c86cc162af05152 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 7 Sep 2021 16:00:34 +0200
Subject: [PATCH 424/681] Fix test.

---
 .../com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
index 9bf7876dbd75..dcca349a9fac 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/examples/AOTTutorial.java
@@ -372,7 +372,7 @@ public void testAOT() {
             // immediately compiled at parse time without prior execution.
             Value v = context.parse("AOTTestLanguage", "sample");
             String beforeExecute = log.toString();
-            assertTrue(beforeExecute, beforeExecute.contains("[engine] opt done     sample"));
+            assertTrue(beforeExecute, beforeExecute.contains("[engine] opt done") && beforeExecute.contains("sample"));
 
             // we can compile the function and it is executed compiled immediately.
             // note that if we would use any other types than the ones used during AOT

From b1ec312e9fb6d452406e4ae02b662a6015693ae0 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Fri, 24 Sep 2021 08:48:25 +0200
Subject: [PATCH 425/681] Better compilation tracing format.

---
 .../truffle/runtime/CompilationTask.java      |   4 +-
 .../truffle/runtime/OptimizedCallTarget.java  |   8 +-
 .../debug/TraceCompilationListener.java       | 166 +++++++++---------
 3 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
index 3ec41ee58993..9b315d6ce8d5 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/CompilationTask.java
@@ -271,7 +271,7 @@ boolean updateWeight(long currentTime) {
         lastRate = rate(count, elapsed);
         lastTime = currentTime;
         lastCount = count;
-        double weight = lastRate * lastCount;
+        double weight = (1 + lastRate) * lastCount;
         if (engineData.traversingFirstTierPriority) {
             lastWeight = weight;
         } else {
@@ -296,7 +296,7 @@ boolean updateWeight(long currentTime) {
 
     private double rate(int count, long elapsed) {
         lastRate = ((double) count - lastCount) / elapsed;
-        return 1.0 + (Double.isNaN(lastRate) ? 0 : lastRate);
+        return (Double.isNaN(lastRate) ? 0 : lastRate);
     }
 
     public int targetHighestCompiledTier() {
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
index 0b1d424a8019..fc1a90521c77 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedCallTarget.java
@@ -329,7 +329,7 @@ public Class<?> getType() {
 
     private volatile WeakReference<OptimizedDirectCallNode> singleCallNode = NO_CALL;
     volatile List<OptimizedCallTarget> blockCompilations;
-    private final int id;
+    public final int id;
     private static final AtomicInteger idCounter = new AtomicInteger(0);
 
     protected OptimizedCallTarget(OptimizedCallTarget sourceCallTarget, RootNode rootNode) {
@@ -997,7 +997,7 @@ public final String getName() {
         if (result == null) {
             result = rootNode.toString();
             if (sourceCallTarget != null) {
-                result += " <split-" + Integer.toHexString(hashCode()) + ">";
+                result += " <split-" + id + ">";
             }
             nameCache = result;
         }
@@ -1687,8 +1687,4 @@ private boolean prepareForAOTImpl() {
     boolean isOSR() {
         return rootNode instanceof BaseOSRRootNode;
     }
-
-    public int id() {
-        return id;
-    }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index 396e6cabc1dc..f1288e4330b6 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -24,9 +24,6 @@
  */
 package org.graalvm.compiler.truffle.runtime.debug;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.CompilationResultInfo;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.GraphInfo;
 import org.graalvm.compiler.truffle.runtime.AbstractGraalTruffleRuntimeListener;
@@ -58,47 +55,74 @@ public static void install(GraalTruffleRuntime runtime) {
         runtime.addListener(new TraceCompilationListener(runtime));
     }
 
+    public static final String TIER_FORMAT = " Tier %d ";
+    private static final String QUEUE_FORMAT = "Queue: Size %4d Change %c%-2d Scale %5.2f Elapsed %4dus ";
+    private static final String TARGET_FORMAT = "id=%-5d %-50s ";
+    // @formatter:off
+    private static final String QUEUED_FORMAT   = "opt queued   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d ";
+    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d ";
+    private static final String START_FORMAT    = "opt start    " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Weight %8d | Rate %.5f | " + QUEUE_FORMAT + "| Src %s | Time %d ";
+    private static final String DONE_FORMAT     = "opt done     " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d ";
+    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d ";
+    private static final String INV_FORMAT      = "opt inv      " + TARGET_FORMAT + "| Reason %s | Src %s | Time %d ";
+    private static final String DEOPT_FORMAT    = "opt deopt    " + TARGET_FORMAT + "| Src %s | Time %d ";
+    // @formatter:on
+
     @Override
     public void onCompilationQueued(OptimizedCallTarget target, int tier) {
         if (target.engine.traceCompilationDetails) {
-            log(target, "opt queued", queueProperties(target, tier, 1));
+            int callAndLoopThreshold = tier == 1 ? target.engine.callAndLoopThresholdInInterpreter : target.engine.callAndLoopThresholdInFirstTier;
+            int scale = runtime.compilationThresholdScale();
+            log(target, String.format(QUEUED_FORMAT,
+                            target.id,
+                            target.getName(),
+                            tier,
+                            target.getCallAndLoopCount(),
+                            FixedPointMath.multiply(scale, callAndLoopThreshold),
+                            runtime.getCompilationQueueSize(),
+                            '+',
+                            1,
+                            FixedPointMath.toDouble(scale),
+                            0,
+                            formatSourceSection(target.getRootNode().getSourceSection()),
+                            System.nanoTime()));
         }
     }
 
     @Override
     public void onCompilationDequeued(OptimizedCallTarget target, Object source, CharSequence reason, int tier) {
         if (target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = queueProperties(target, tier, 0);
-            properties.put("Reason", reason);
-            log(target, "opt unqueued", properties);
+            int callAndLoopThreshold = tier == 1 ? target.engine.callAndLoopThresholdInInterpreter : target.engine.callAndLoopThresholdInFirstTier;
+            int scale = runtime.compilationThresholdScale();
+            log(target, String.format(UNQUEUED_FORMAT,
+                            target.id,
+                            target.getName(),
+                            tier,
+                            target.getCallAndLoopCount(),
+                            FixedPointMath.multiply(scale, callAndLoopThreshold),
+                            runtime.getCompilationQueueSize(),
+                            ' ',
+                            0,
+                            FixedPointMath.toDouble(scale),
+                            0,
+                            formatSourceSection(target.getRootNode().getSourceSection()),
+                            System.nanoTime()));
         }
     }
 
-    private Map<String, Object> queueProperties(OptimizedCallTarget target, int tier, int queueChange) {
-        Map<String, Object> properties = new LinkedHashMap<>();
-        properties.put("Tier", Integer.toString(tier)); // to avoid padding
-        int scale = runtime.compilationThresholdScale();
-        int callAndLoopThreshold = tier == 1 ? target.engine.callAndLoopThresholdInInterpreter : target.engine.callAndLoopThresholdInFirstTier;
-        properties.put("CallsAndLoop/Thres", String.format("%7d/%5d", target.getCallAndLoopCount(), FixedPointMath.multiply(scale, callAndLoopThreshold)));
-        properties.put("Queue", String.format("(Size %d, Change %c%d, Scale %.2f)",
-                        runtime.getCompilationQueueSize(),
-                        queueChange >= 0 ? '+' : '-',
-                        Math.abs(queueChange),
-                        FixedPointMath.toDouble(scale)));
-        properties.put("Time", System.nanoTime());
-        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-        return properties;
-    }
-
     @Override
     public void onCompilationFailed(OptimizedCallTarget target, String reason, boolean bailout, boolean permanentBailout, int tier) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
             if (!isPermanentFailure(bailout, permanentBailout)) {
                 onCompilationDequeued(target, null, "Non permanent bailout: " + reason, tier);
             } else {
-                Map<String, Object> properties = compilationEndProperties(target, null, null, null, tier);
-                properties.put("Reason", reason);
-                log(target, "opt failed", properties);
+                log(target, String.format(FAILED_FORMAT,
+                                target.id,
+                                target.getName(),
+                                tier,
+                                compilationTime(),
+                                formatSourceSection(target.getRootNode().getSourceSection()),
+                                System.nanoTime()));
             }
             currentCompilation.set(null);
         }
@@ -107,7 +131,19 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
     @Override
     public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
         if (target.engine.traceCompilationDetails) {
-            log(target, "opt start", startedProperties(target, tier, time, weight, rate, queueChange));
+            log(target, String.format(START_FORMAT,
+                            target.id,
+                            target.getName(),
+                            tier,
+                            (int) weight,
+                            rate,
+                            runtime.getCompilationQueueSize(),
+                            queueChange >= 0 ? '+' : '-',
+                            Math.abs(queueChange),
+                            FixedPointMath.toDouble(runtime.compilationThresholdScale()),
+                            time / 1000,
+                            formatSourceSection(target.getRootNode().getSourceSection()),
+                            System.nanoTime()));
         }
 
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
@@ -115,33 +151,18 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier, long time
         }
     }
 
-    private Map<String, Object> startedProperties(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
-        Map<String, Object> properties = new LinkedHashMap<>();
-        properties.put("Tier", Integer.toString(tier)); // to avoid padding
-        properties.put("Weight", weight);
-        properties.put("Rate", Double.toString(rate));
-        properties.put("Queue", String.format("(Size %d, Change %c%d, Scale %.2f, Time %dus)",
-                        runtime.getCompilationQueueSize(),
-                        queueChange >= 0 ? '+' : '-',
-                        Math.abs(queueChange),
-                        FixedPointMath.toDouble(runtime.compilationThresholdScale()),
-                        time / 1000));
-        properties.put("Time", System.nanoTime());
-        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-        return properties;
-    }
-
-    private void log(OptimizedCallTarget target, String event, Map<String, Object> properties) {
-        String subject = String.format("id=%-6d %s", target.id(), target.getName());
-        runtime.logEvent(target, 0, event, subject, properties, null);
+    private void log(OptimizedCallTarget target, String message) {
+        runtime.log(target, message);
     }
 
     @Override
     public void onCompilationDeoptimized(OptimizedCallTarget target, Frame frame) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = new LinkedHashMap<>();
-            properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-            log(target, "opt deopt", properties);
+            log(target, String.format(DEOPT_FORMAT,
+                            target.id,
+                            target.getName(),
+                            formatSourceSection(target.getRootNode().getSourceSection()),
+                            System.nanoTime()));
         }
     }
 
@@ -159,40 +180,23 @@ public void onCompilationSuccess(OptimizedCallTarget target, TruffleInlining inl
         if (!target.engine.traceCompilation && !target.engine.traceCompilationDetails) {
             return;
         }
-
-        Map<String, Object> properties = compilationEndProperties(target, inliningDecision, graph, result, tier);
-
-        log(target, "opt done", properties);
-
+        log(target, String.format(DONE_FORMAT,
+                        target.id,
+                        target.getName(),
+                        tier,
+                        compilationTime(),
+                        formatSourceSection(target.getRootNode().getSourceSection()),
+                        System.nanoTime()));
         currentCompilation.set(null);
     }
 
-    private Map<String, Object> compilationEndProperties(OptimizedCallTarget target, TruffleInlining inliningDecision, GraphInfo graph, CompilationResultInfo result, int tier) {
+    private String compilationTime() {
         long timeCompilationFinished = System.nanoTime();
         Times compilation = currentCompilation.get();
-
-        Map<String, Object> properties = new LinkedHashMap<>();
-        properties.put("Tier", Integer.toString(tier)); // to avoid padding
-        properties.put("Time", String.format("%4.0f(%4.0f+%-4.0f)ms", //
+        return String.format("%4.0f(%4.0f+%-4.0f)ms", //
                         (timeCompilationFinished - compilation.timeCompilationStarted) / 1e6, //
                         (compilation.timePartialEvaluationFinished - compilation.timeCompilationStarted) / 1e6, //
-                        (timeCompilationFinished - compilation.timePartialEvaluationFinished) / 1e6));
-        if (inliningDecision != null) {
-            int inlinedCalls = inliningDecision.countInlinedCalls();
-            int dispatchedCalls = inliningDecision.countCalls() - inlinedCalls;
-            properties.put("Inlined", String.format("%3dY %3dN", inlinedCalls, dispatchedCalls));
-        }
-        if (graph != null) {
-            properties.put("IR", String.format("%5d/%5d", compilation.nodeCountPartialEval, graph.getNodeCount()));
-        }
-        if (result != null) {
-            properties.put("CodeSize", result.getTargetCodeSize());
-        }
-        if (target.getCodeAddress() != 0) {
-            properties.put("Addr", "0x" + Long.toHexString(target.getCodeAddress()));
-        }
-        properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-        return properties;
+                        (timeCompilationFinished - compilation.timePartialEvaluationFinished) / 1e6);
     }
 
     private static String formatSourceSection(SourceSection sourceSection) {
@@ -205,10 +209,12 @@ private static String formatSourceSection(SourceSection sourceSection) {
     @Override
     public void onCompilationInvalidated(OptimizedCallTarget target, Object source, CharSequence reason) {
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
-            Map<String, Object> properties = new LinkedHashMap<>();
-            properties.put("Src", formatSourceSection(target.getRootNode().getSourceSection()));
-            properties.put("Reason", reason);
-            log(target, "opt inv.", properties);
+            log(target, String.format(INV_FORMAT,
+                            target.id,
+                            target.getName(),
+                            reason,
+                            formatSourceSection(target.getRootNode().getSourceSection()),
+                            System.nanoTime()));
         }
     }
 

From 54416e702de3204618b863d69204950dda353c4f Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 28 Sep 2021 09:44:19 +0200
Subject: [PATCH 426/681] Print reason where it's needed.

---
 .../truffle/runtime/debug/TraceCompilationListener.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index f1288e4330b6..54b39e089edd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -60,10 +60,10 @@ public static void install(GraalTruffleRuntime runtime) {
     private static final String TARGET_FORMAT = "id=%-5d %-50s ";
     // @formatter:off
     private static final String QUEUED_FORMAT   = "opt queued   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d ";
-    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d ";
+    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Reason: %s | Src %s | Time %d ";
     private static final String START_FORMAT    = "opt start    " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Weight %8d | Rate %.5f | " + QUEUE_FORMAT + "| Src %s | Time %d ";
     private static final String DONE_FORMAT     = "opt done     " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d ";
-    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d ";
+    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Reason: %s | Src %s | Time %d ";
     private static final String INV_FORMAT      = "opt inv      " + TARGET_FORMAT + "| Reason %s | Src %s | Time %d ";
     private static final String DEOPT_FORMAT    = "opt deopt    " + TARGET_FORMAT + "| Src %s | Time %d ";
     // @formatter:on
@@ -105,6 +105,7 @@ public void onCompilationDequeued(OptimizedCallTarget target, Object source, Cha
                             0,
                             FixedPointMath.toDouble(scale),
                             0,
+                            reason,
                             formatSourceSection(target.getRootNode().getSourceSection()),
                             System.nanoTime()));
         }
@@ -121,6 +122,7 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
                                 target.getName(),
                                 tier,
                                 compilationTime(),
+                                reason,
                                 formatSourceSection(target.getRootNode().getSourceSection()),
                                 System.nanoTime()));
             }

From 11636bce94d608ecdbe36ea085edb199e2963ac5 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Fri, 24 Sep 2021 08:50:50 +0200
Subject: [PATCH 427/681] Remove call to deprecated method.

---
 .../graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java  | 1 -
 .../compiler/truffle/runtime/GraalTruffleRuntimeListener.java  | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index bb8407a1f096..7b45a85f9c0e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -781,7 +781,6 @@ private void compileImpl(TruffleDebugContext initialDebug, OptimizedCallTarget c
                 if (debug == null) {
                     debug = compiler.openDebugContext(optionsMap, compilation);
                 }
-                listeners.onCompilationStarted(callTarget, task.tier());
                 listeners.onCompilationStarted(callTarget, task.tier(), task.time(), task.weight(), task.rate(), task.queueChange());
                 compilationStarted = true;
                 try {
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index 7d6049454726..7345a3763da0 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -132,8 +132,9 @@ default void onCompilationStarted(OptimizedCallTarget target, int tier) {
      * @param queueChange how has starting this compilation impacted the number of compilations in
      *            the queue.
      */
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "deprecated"})
     default void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+        onCompilationStarted(target, tier);
     }
 
     /**

From 119cf3eca7aec33141b16f85289a0546de7c1ee4 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Wed, 29 Sep 2021 13:43:13 +0200
Subject: [PATCH 428/681] Update docs.

---
 truffle/docs/Optimizing.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/truffle/docs/Optimizing.md b/truffle/docs/Optimizing.md
index e8a86116117a..071700057d5d 100644
--- a/truffle/docs/Optimizing.md
+++ b/truffle/docs/Optimizing.md
@@ -49,16 +49,16 @@ The `--engine.TraceCompilation` command prints a line each time a method is comp
 The `--engine.TraceCompilationDetails` command prints a line when compilation is queued, started, or completed:
 
 ```shell
-[engine] opt queued   BinaryConstraint.output                                     |AST   19|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:416|QueueSize      0|Time 1725905750
-[engine] opt start    BinaryConstraint.output                                     |AST   19|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:416|QueueSize      0|Time 1734518023
-[engine] opt queued   OrderedCollection.size                                      |AST   10|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:71|QueueSize      0|Time 1743713143
-[engine] opt start    OrderedCollection.size                                      |AST   10|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:71|QueueSize      0|Time 1744034479
-[engine] opt queued   Planner.addConstraintsConsumingTo                           |AST   51|Tier      2|Calls/Thres     368/    3|CallsAndLoop/Thres    1001/ 1000|Src octane-deltablue.js:743|QueueSize      1|Time 1791073465
-... more queues ...
-[engine] opt queued   BinaryConstraint.markInputs                                 |AST   13|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:402|QueueSize     27|Time 2813136318
-[engine] opt done     BinaryConstraint.output                                     |AST   19|Tier      2|Time 1146( 851+295 )ms|Inlined   0Y   0N|IR   106/  167|CodeSize    634|Addr 0x7f600586f990|Src octane-deltablue.js:416
-[engine] opt start    Planner.removePropagateFrom                                 |AST  149|Tier      2|Calls/Thres       8/    3|CallsAndLoop/Thres    2052/ 1000|Src octane-deltablue.js:717|QueueSize     26|Time 2903518862
-[engine] opt queued   UnaryConstraint.output                                      |AST    7|Tier      2|Calls/Thres    1000/    3|CallsAndLoop/Thres    1000/ 1000|Src octane-deltablue.js:255|QueueSize     27|Time 3175165217
+[engine] opt queued   id=237   BinaryConstraint.output                            | Tier 1 | Count/Thres        25/      25 | Queue: Size    1 Change +1  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:416 | Time 317044280158387 
+[engine] opt start    id=237   BinaryConstraint.output                            | Tier 1 | Weight       25 | Rate 0.00000 | Queue: Size    0 Change +0  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:416 | Time 317044278139824 
+[engine] opt queued   id=239   OrderedCollection.size                             | Tier 1 | Count/Thres        25/      25 | Queue: Size    1 Change +1  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:71 | Time 317044313989575 
+[engine] opt queued   id=52    Array.prototype.push                               | Tier 1 | Count/Thres        25/      50 | Queue: Size    2 Change +1  Scale  0.13 Elapsed    0us | Src <builtin>:1 | Time 317044336408392 
+[engine] opt start    id=239   OrderedCollection.size                             | Tier 1 | Weight    88875 | Rate 0.00000 | Queue: Size    6 Change -1  Scale  0.31 Elapsed  328us | Src octane-deltablue.js:71 | Time 317045054478062 
+... more log ...
+[engine] opt start    id=237   BinaryConstraint.output                            | Tier 2 | Weight   256510 | Rate 0.00007 | Queue: Size   21 Change -1  Scale  1.00 Elapsed   17us | Src octane-deltablue.js:416 | Time 317056014011223 
+[engine] opt done     id=293   change                                             | Tier 1 | Elapsed       271( 186+86  )ms | Src octane-deltablue.js:867 | Time 317056063627727 
+[engine] opt start    id=271   Plan.size                                          | Tier 2 | Weight   233921 | Rate 0.00008 | Queue: Size   20 Change -1  Scale  1.00 Elapsed   26us | Src octane-deltablue.js:770 | Time 317056067292754 
+[engine] opt done     id=237   BinaryConstraint.output                            | Tier 2 | Elapsed       140( 124+17  )ms | Src octane-deltablue.js:416 | Time 317056154362876 
 ```
 
 The `--engine.TraceCompilationAST` command prints the Truffle AST for each compilation:

From efe16b5373dfc6a2e303d3fae3f35571514772f0 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Fri, 24 Sep 2021 09:08:59 +0200
Subject: [PATCH 429/681] Pass compilation task to listeners.

---
 .../hotspot/libgraal/TruffleFromLibGraal.java     |  2 +-
 .../truffle/common/TruffleCompilerListener.java   |  7 ++++---
 .../libgraal/HSTruffleCompilerListener.java       |  6 ++++--
 .../truffle/compiler/TruffleCompilerImpl.java     |  2 +-
 .../libgraal/TruffleFromLibGraalEntryPoints.java  |  4 ++--
 .../truffle/runtime/GraalTruffleRuntime.java      |  2 +-
 .../runtime/GraalTruffleRuntimeListener.java      |  5 +++--
 .../GraalTruffleRuntimeListenerDispatcher.java    | 11 ++++++-----
 .../truffle/runtime/debug/JFRListener.java        |  3 ++-
 .../truffle/runtime/debug/StatisticsListener.java |  9 +++++----
 .../runtime/debug/TraceCompilationListener.java   | 15 ++++++++-------
 .../test/GraalTruffleRuntimeListenerTest.java     |  3 ++-
 .../test/TruffleBoundaryExceptionsTest.java       |  3 ++-
 .../test/libgraal/JNIExceptionWrapperTest.java    |  4 ----
 .../IsolatedTruffleCompilerEventForwarder.java    |  8 ++++----
 15 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.common.hotspot.libgraal/src/org/graalvm/compiler/truffle/common/hotspot/libgraal/TruffleFromLibGraal.java b/compiler/src/org.graalvm.compiler.truffle.common.hotspot.libgraal/src/org/graalvm/compiler/truffle/common/hotspot/libgraal/TruffleFromLibGraal.java
index 27676762aa98..40a663c7bedd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.common.hotspot.libgraal/src/org/graalvm/compiler/truffle/common/hotspot/libgraal/TruffleFromLibGraal.java
+++ b/compiler/src/org.graalvm.compiler.truffle.common.hotspot.libgraal/src/org/graalvm/compiler/truffle/common/hotspot/libgraal/TruffleFromLibGraal.java
@@ -112,7 +112,7 @@ enum Id implements FromLibGraalId {
         Log(void.class, Object.class, String.class, Object.class, String.class),
         OnCodeInstallation(void.class, Object.class, Object.class, long.class),
         OnCompilationFailed(void.class, Object.class, Supplier.class, boolean.class, boolean.class, boolean.class, boolean.class),
-        OnCompilationRetry(void.class, Object.class, Object.class, int.class),
+        OnCompilationRetry(void.class, Object.class, Object.class, Object.class),
         OnFailure(void.class, Object.class, Object.class, String.class, boolean.class, boolean.class, int.class),
         OnGraalTierFinished(void.class, Object.class, Object.class, long.class),
         OnSuccess(void.class, Object.class, Object.class, Object.class, long.class, long.class, int.class),
diff --git a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
index 0f69111afa87..0b839e0900b7 100644
--- a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
@@ -172,8 +172,8 @@ default void onFailure(CompilableTruffleAST compilable, String reason, boolean b
      * @deprecated use {@link #onCompilationRetry(CompilableTruffleAST, int)}
      */
     @Deprecated
-    default void onCompilationRetry(CompilableTruffleAST compilable) {
-        onCompilationRetry(compilable, 0);
+    @SuppressWarnings("unused")
+    default void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
     }
 
     /**
@@ -183,6 +183,7 @@ default void onCompilationRetry(CompilableTruffleAST compilable) {
      * @param compilable the Truffle AST which is going to be re-compiled.
      * @param tier Which compilation tier is in question.
      */
-    default void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
+    default void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
+        onCompilationRetry(compilable, task.tier());
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
index f30d5d68afb6..b98f72a5a5bf 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
@@ -39,6 +39,7 @@
 import java.io.Closeable;
 
 import org.graalvm.compiler.truffle.common.CompilableTruffleAST;
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener;
 import org.graalvm.compiler.truffle.common.TruffleInliningData;
 import org.graalvm.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal;
@@ -102,10 +103,11 @@ public void onFailure(CompilableTruffleAST compilable, String serializedExceptio
 
     @TruffleFromLibGraal(OnCompilationRetry)
     @Override
-    public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
+    public void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
         JObject hsCompilable = ((HSCompilableTruffleAST) compilable).getHandle();
+        JObject hsTask = ((HSTruffleCompilationTask) task).getHandle();
         JNIEnv env = JNIMethodScope.env();
-        callOnCompilationRetry(env, getHandle(), hsCompilable, tier);
+        callOnCompilationRetry(env, getHandle(), hsCompilable, hsTask);
     }
 
     private static final class LibGraalObjectHandleScope implements Closeable {
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
index 0175d6e8ae39..048d4defa0a4 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
@@ -698,7 +698,7 @@ protected ExceptionAction lookupAction(OptionValues compilerOptions, Throwable c
 
         @Override
         protected DebugContext createRetryDebugContext(DebugContext initialDebug, OptionValues compilerOptions, PrintStream logStream) {
-            listener.onCompilationRetry(compilable, task.tier());
+            listener.onCompilationRetry(compilable, task);
             return createDebugContext(compilerOptions, compilationId, compilable, logStream);
         }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/TruffleFromLibGraalEntryPoints.java b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/TruffleFromLibGraalEntryPoints.java
index 1793f52afb19..624b75821f95 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/TruffleFromLibGraalEntryPoints.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/TruffleFromLibGraalEntryPoints.java
@@ -383,8 +383,8 @@ static void onFailure(Object listener, Object compilable, String reason, boolean
     }
 
     @TruffleFromLibGraal(OnCompilationRetry)
-    static void onCompilationRetry(Object listener, Object compilable, int tier) {
-        ((TruffleCompilerListener) listener).onCompilationRetry((CompilableTruffleAST) compilable, tier);
+    static void onCompilationRetry(Object listener, Object compilable, Object task) {
+        ((TruffleCompilerListener) listener).onCompilationRetry((CompilableTruffleAST) compilable, (TruffleCompilationTask) task);
     }
 
     @TruffleFromLibGraal(OnGraalTierFinished)
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
index 7b45a85f9c0e..521c63c1b563 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntime.java
@@ -781,7 +781,7 @@ private void compileImpl(TruffleDebugContext initialDebug, OptimizedCallTarget c
                 if (debug == null) {
                     debug = compiler.openDebugContext(optionsMap, compilation);
                 }
-                listeners.onCompilationStarted(callTarget, task.tier(), task.time(), task.weight(), task.rate(), task.queueChange());
+                listeners.onCompilationStarted(callTarget, task);
                 compilationStarted = true;
                 try {
                     compiler.doCompile(debug, compilation, optionsMap, task, listeners.isEmpty() ? null : listeners);
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index 7345a3763da0..1aad23ad9cac 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -26,6 +26,7 @@
 
 import java.util.Map;
 
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.CompilationResultInfo;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.GraphInfo;
 
@@ -133,8 +134,8 @@ default void onCompilationStarted(OptimizedCallTarget target, int tier) {
      *            the queue.
      */
     @SuppressWarnings({"unused", "deprecated"})
-    default void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
-        onCompilationStarted(target, tier);
+    default void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
+        onCompilationStarted(target, task.tier());
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
index 48c040949d77..b3e341250f1b 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
@@ -28,6 +28,7 @@
 import java.util.function.Consumer;
 
 import org.graalvm.compiler.truffle.common.CompilableTruffleAST;
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener;
 import org.graalvm.compiler.truffle.common.TruffleInliningData;
 
@@ -80,8 +81,8 @@ public void onCompilationStarted(OptimizedCallTarget target, int tier) {
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
-        invokeListeners((l) -> l.onCompilationStarted(target, tier, time, weight, rate, queueChange));
+    public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
+        invokeListeners((l) -> l.onCompilationStarted(target, task));
     }
 
     @Override
@@ -167,8 +168,8 @@ public void onFailure(CompilableTruffleAST compilable, String reason, boolean ba
     }
 
     @Override
-    public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
-        onCompilationQueued((OptimizedCallTarget) compilable, tier);
-        onCompilationStarted((OptimizedCallTarget) compilable, tier, 0, 0, 0, 0);
+    public void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
+        onCompilationQueued((OptimizedCallTarget) compilable, task.tier());
+        onCompilationStarted((OptimizedCallTarget) compilable, (CompilationTask) task);
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
index 2c82817e3b28..8b59a10e1b81 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/JFRListener.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.CompilationResultInfo;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.GraphInfo;
 import org.graalvm.compiler.truffle.jfr.CompilationEvent;
@@ -104,7 +105,7 @@ public static boolean isInstrumented(ResolvedJavaMethod method) {
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+    public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
         CompilationEvent event = null;
         if (factory != null) {
             event = factory.createCompilationEvent();
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
index b88c28833177..945df1805c77 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/StatisticsListener.java
@@ -38,8 +38,8 @@
 import java.util.function.Function;
 import java.util.logging.Level;
 
-import com.oracle.truffle.api.nodes.NodeVisitor;
 import org.graalvm.compiler.truffle.common.CompilableTruffleAST;
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.CompilationResultInfo;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.GraphInfo;
 import org.graalvm.compiler.truffle.runtime.AbstractGraalTruffleRuntimeListener;
@@ -55,6 +55,7 @@
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
+import com.oracle.truffle.api.nodes.NodeVisitor;
 
 public final class StatisticsListener extends AbstractGraalTruffleRuntimeListener {
 
@@ -167,7 +168,7 @@ public synchronized void onCompilationInvalidated(OptimizedCallTarget target, Ob
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+    public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
         compilations++;
         final Times times = new Times();
         compilationTimes.set(times);
@@ -620,10 +621,10 @@ public void onCompilationQueued(OptimizedCallTarget target, int tier) {
         }
 
         @Override
-        public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+        public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
             StatisticsListener listener = target.engine.statisticsListener;
             if (listener != null) {
-                listener.onCompilationStarted(target, tier, time, weight, rate, queueChange);
+                listener.onCompilationStarted(target, task);
             }
         }
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index 54b39e089edd..a824dba02d7e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.truffle.runtime.debug;
 
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.CompilationResultInfo;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener.GraphInfo;
 import org.graalvm.compiler.truffle.runtime.AbstractGraalTruffleRuntimeListener;
@@ -131,19 +132,19 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
     }
 
     @Override
-    public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+    public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
         if (target.engine.traceCompilationDetails) {
             log(target, String.format(START_FORMAT,
                             target.id,
                             target.getName(),
-                            tier,
-                            (int) weight,
-                            rate,
+                            task.tier(),
+                            (int) task.weight(),
+                            task.rate(),
                             runtime.getCompilationQueueSize(),
-                            queueChange >= 0 ? '+' : '-',
-                            Math.abs(queueChange),
+                            task.queueChange() >= 0 ? '+' : '-',
+                            Math.abs(task.queueChange()),
                             FixedPointMath.toDouble(runtime.compilationThresholdScale()),
-                            time / 1000,
+                            task.time() / 1000,
                             formatSourceSection(target.getRootNode().getSourceSection()),
                             System.nanoTime()));
         }
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
index 6afe468b0f5a..cbbce3f0a329 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java
@@ -34,6 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener;
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntimeListener;
@@ -373,7 +374,7 @@ public void onCompilationDequeued(OptimizedCallTarget target, Object source, Cha
         }
 
         @Override
-        public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+        public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
             if (isImportant(target)) {
                 waitForInitialTarget();
                 events.add(EventType.COMPILATION_STARTED);
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
index bac986321e63..f8737f74a231 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java
@@ -28,6 +28,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import org.graalvm.compiler.truffle.common.TruffleCompilationTask;
 import org.graalvm.compiler.truffle.options.PolyglotCompilerOptions;
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntimeListener;
@@ -88,7 +89,7 @@ public void throwExceptionBoundary() {
         final int[] compilationCount = {0};
         GraalTruffleRuntimeListener listener = new GraalTruffleRuntimeListener() {
             @Override
-            public void onCompilationStarted(OptimizedCallTarget target, int tier, long time, double weight, double rate, int queueChange) {
+            public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
                 compilationCount[0]++;
             }
         };
diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
index 3b12a9715dd7..40bba5eecd1d 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java
@@ -139,10 +139,6 @@ public void onSuccess(CompilableTruffleAST compilable, TruffleInliningData inlin
         @Override
         public void onFailure(CompilableTruffleAST compilable, String reason, boolean bailout, boolean permanentBailout, int tier) {
         }
-
-        @Override
-        public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
-        }
     }
 
     private static class TestTruffleCompilationTask implements TruffleCompilationTask {
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
index ad5e1e046153..464c1f797cef 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
@@ -85,8 +85,8 @@ public void onFailure(CompilableTruffleAST compilable, String reason, boolean ba
     }
 
     @Override
-    public void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
-        onCompilationRetry0(IsolatedCompileContext.get().getClient(), contextHandle, tier);
+    public void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
+        onCompilationRetry0(IsolatedCompileContext.get().getClient(), contextHandle, IsolatedCompileClient.get().hand(task));
     }
 
     @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
@@ -124,9 +124,9 @@ private static void onFailure0(@SuppressWarnings("unused") ClientIsolateThread c
 
     @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
     @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
-    private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle, int tier) {
+    private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle, @SuppressWarnings("unused") ClientHandle<TruffleCompilationTask> task) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
-        context.listener.onCompilationRetry(context.compilable, tier);
+        context.listener.onCompilationRetry(context.compilable, context.task);
     }
 }
 

From 6c9968d9b49ebb2e62cd1ef20cce1debbbf79c28 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Thu, 30 Sep 2021 14:41:33 +0200
Subject: [PATCH 430/681] Fix libgraal bridge.

---
 .../compiler/hotspot/libgraal/HSTruffleCompilerListener.java  | 3 ++-
 .../compiler/truffle/compiler/TruffleCompilerImpl.java        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
index b98f72a5a5bf..a61240580a9e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler.hotspot.libgraal/src/org/graalvm/compiler/truffle/compiler/hotspot/libgraal/HSTruffleCompilerListener.java
@@ -43,6 +43,7 @@
 import org.graalvm.compiler.truffle.common.TruffleCompilerListener;
 import org.graalvm.compiler.truffle.common.TruffleInliningData;
 import org.graalvm.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal;
+import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
 import org.graalvm.nativebridge.jni.HSObject;
 import org.graalvm.nativebridge.jni.JNI.JNIEnv;
 import org.graalvm.nativebridge.jni.JNI.JObject;
@@ -105,7 +106,7 @@ public void onFailure(CompilableTruffleAST compilable, String serializedExceptio
     @Override
     public void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
         JObject hsCompilable = ((HSCompilableTruffleAST) compilable).getHandle();
-        JObject hsTask = ((HSTruffleCompilationTask) task).getHandle();
+        JObject hsTask = ((HSTruffleCompilationTask) ((TruffleCompilerImpl.CancellableTruffleCompilationTask) task).getDelegate()).getHandle();
         JNIEnv env = JNIMethodScope.env();
         callOnCompilationRetry(env, getHandle(), hsCompilable, hsTask);
     }
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
index 048d4defa0a4..e0a06e084367 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
@@ -947,6 +947,10 @@ public boolean hasNextTier() {
         public String toString() {
             return delegate.toString();
         }
+
+        public TruffleCompilationTask getDelegate() {
+            return delegate;
+        }
     }
 
     private static final class TTYToPolyglotLoggerBridge implements Consumer<String> {

From 93cb5095bbcffb896d552d40fb9dd735517ad358 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Thu, 30 Sep 2021 14:54:29 +0200
Subject: [PATCH 431/681] Cleanup and checkstyle.

---
 .../truffle/common/TruffleCompilerListener.java    |  2 +-
 .../runtime/debug/TraceCompilationListener.java    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
index 0b839e0900b7..65e4d194cd3e 100644
--- a/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.common/src/org/graalvm/compiler/truffle/common/TruffleCompilerListener.java
@@ -181,7 +181,7 @@ default void onCompilationRetry(CompilableTruffleAST compilable, int tier) {
      * compilation problem.
      *
      * @param compilable the Truffle AST which is going to be re-compiled.
-     * @param tier Which compilation tier is in question.
+     * @param task Which compilation task is in question.
      */
     default void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
         onCompilationRetry(compilable, task.tier());
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index a824dba02d7e..633127f71d48 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -60,13 +60,13 @@ public static void install(GraalTruffleRuntime runtime) {
     private static final String QUEUE_FORMAT = "Queue: Size %4d Change %c%-2d Scale %5.2f Elapsed %4dus ";
     private static final String TARGET_FORMAT = "id=%-5d %-50s ";
     // @formatter:off
-    private static final String QUEUED_FORMAT   = "opt queued   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d ";
-    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Reason: %s | Src %s | Time %d ";
-    private static final String START_FORMAT    = "opt start    " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Weight %8d | Rate %.5f | " + QUEUE_FORMAT + "| Src %s | Time %d ";
-    private static final String DONE_FORMAT     = "opt done     " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d ";
-    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Reason: %s | Src %s | Time %d ";
-    private static final String INV_FORMAT      = "opt inv      " + TARGET_FORMAT + "| Reason %s | Src %s | Time %d ";
-    private static final String DEOPT_FORMAT    = "opt deopt    " + TARGET_FORMAT + "| Src %s | Time %d ";
+    private static final String QUEUED_FORMAT   = "opt queued   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d";
+    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Reason: %s | Src %s | Time %d";
+    private static final String START_FORMAT    = "opt start    " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Weight %8d | Rate %.5f | " + QUEUE_FORMAT + "| Src %s | Time %d";
+    private static final String DONE_FORMAT     = "opt done     " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d";
+    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Reason: %s | Src %s | Time %d";
+    private static final String INV_FORMAT      = "opt inv      " + TARGET_FORMAT + "| Reason %s | Src %s | Time %d";
+    private static final String DEOPT_FORMAT    = "opt deopt    " + TARGET_FORMAT + "| Src %s | Time %d";
     // @formatter:on
 
     @Override

From c90fd63fc9ec15b1f231afd8cb9b0b82cbd7dde6 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Tue, 12 Oct 2021 11:14:37 +0200
Subject: [PATCH 432/681] Don't differentiate between explicit and implicit
 relocation addend.

On a given <architecture, os> a relocation addend will be either
explicit or implicit.
---
 .../objectfile/BasicProgbitsSectionImpl.java  | 14 +--
 .../src/com/oracle/objectfile/ObjectFile.java | 17 +---
 .../oracle/objectfile/StringSectionImpl.java  |  6 +-
 .../com/oracle/objectfile/elf/ELFMachine.java | 57 +----------
 .../oracle/objectfile/elf/ELFObjectFile.java  | 44 +++++----
 .../objectfile/elf/ELFProgbitsSection.java    |  4 +-
 .../objectfile/elf/ELFRelocationSection.java  | 21 +++-
 .../objectfile/elf/ELFUserDefinedSection.java | 35 ++++---
 .../elf/dwarf/DwarfSectionImpl.java           |  4 +-
 .../objectfile/macho/MachOObjectFile.java     |  2 +-
 .../objectfile/macho/MachORegularSection.java |  4 +-
 .../macho/MachORelocationElement.java         | 96 +++++++++----------
 .../macho/MachOUserDefinedSection.java        | 31 +++---
 .../objectfile/pecoff/PECoffMachine.java      | 47 +--------
 .../objectfile/pecoff/PECoffObjectFile.java   |  8 +-
 .../pecoff/PECoffProgbitsSection.java         |  6 +-
 .../pecoff/PECoffRelocationTable.java         | 25 +----
 .../pecoff/PECoffUserDefinedSection.java      | 50 +++-------
 .../objectfile/pecoff/cv/CVLineRecord.java    |  4 +-
 .../pecoff/cv/CVSymbolSubrecord.java          |  4 +-
 .../code/aarch64/AArch64HostedPatcher.java    | 12 +--
 .../oracle/svm/hosted/image/NativeImage.java  | 19 ++--
 .../svm/hosted/image/RelocatableBuffer.java   | 22 ++---
 23 files changed, 198 insertions(+), 334 deletions(-)

diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/BasicProgbitsSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/BasicProgbitsSectionImpl.java
index f0269d2e1447..b74d2177a943 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/BasicProgbitsSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/BasicProgbitsSectionImpl.java
@@ -113,21 +113,21 @@ public List<Section> getElements() {
     }
 
     @Override
-    public void markRelocationSite(int offset, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        ((RelocatableSectionImpl) getElement()).markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, useImplicitAddend,
-                        explicitAddend);
+    public void markRelocationSite(int offset, RelocationKind k, String symbolName, long addend) {
+        ((RelocatableSectionImpl) getElement()).markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName,
+                        addend);
     }
 
     @Override
-    public final void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
+    public final void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, long addend) {
         assert getContent() == null || bb.array() == getContent();
-        ((RelocatableSectionImpl) getElement()).markRelocationSite(offset, bb, k, symbolName, useImplicitAddend, explicitAddend);
+        ((RelocatableSectionImpl) getElement()).markRelocationSite(offset, bb, k, symbolName, addend);
     }
 
     @Override
-    public Element getOrCreateRelocationElement(boolean useImplicitAddend) {
+    public Element getOrCreateRelocationElement(long addend) {
         // FIXME: This looks suspicious: turning an Element back into an Impl?
-        return ((RelocatableSectionImpl) getElement()).getOrCreateRelocationElement(useImplicitAddend);
+        return ((RelocatableSectionImpl) getElement()).getOrCreateRelocationElement(addend);
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
index 3c879bec2cb9..5484b9f97b49 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
@@ -358,11 +358,6 @@ public static int getRelocationSize(RelocationKind kind) {
      * Interface implemented by objects implementing a specific relocation method and size.
      */
     public interface RelocationMethod {
-
-        boolean canUseImplicitAddend();
-
-        boolean canUseExplicitAddend();
-
         /*
          * If we were implementing a linker, we'd have a method something like
          *
@@ -412,10 +407,9 @@ public interface RelocatableSectionImpl extends ElementImpl {
          * @param k the kind of fixup to be applied
          * @param symbolName the name of the symbol whose value is used to compute the fixed-up
          *            bytes
-         * @param useImplicitAddend whether the current bytes are to be used as an addend
-         * @param explicitAddend a full-width addend, or null if useImplicitAddend is true
+         * @param addend a full-width addend, or 0 if unneeded
          */
-        void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend);
+        void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, long addend);
 
         /**
          * Force the creation of a relocation section/element for this section, and return it. This
@@ -423,13 +417,12 @@ public interface RelocatableSectionImpl extends ElementImpl {
          * which leads to unpredictable results (e.g. not appearing in the ELF SHT, if the SHT was
          * written before the section was created).
          *
-         * @param useImplicitAddend whether the relocation section of interest is for implicit
-         *            addends
+         * @param addend whether a full-width addend, or 0 if unneeded
          *
          * @return the element which will hold relocation records (of the argument-specified kind)
          *         for this section
          */
-        Element getOrCreateRelocationElement(boolean useImplicitAddend);
+        Element getOrCreateRelocationElement(long addend);
     }
 
     /**
@@ -446,7 +439,7 @@ public interface ProgbitsSectionImpl extends RelocatableSectionImpl {
          * passed a buffer. It uses the byte array accessed by {@link #getContent} and
          * {@link #setContent}.
          */
-        void markRelocationSite(int offset, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend);
+        void markRelocationSite(int offset, RelocationKind k, String symbolName, long addend);
     }
 
     public interface NobitsSectionImpl extends ElementImpl {
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/StringSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/StringSectionImpl.java
index fc262713ac3a..a96531f0f1a2 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/StringSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/StringSectionImpl.java
@@ -119,17 +119,17 @@ public StringSectionImpl() {
      */
 
     @Override
-    public Element getOrCreateRelocationElement(boolean useImplicitAddend) {
+    public Element getOrCreateRelocationElement(long addend) {
         throw new UnsupportedOperationException("can't mark relocaction sites in string section");
     }
 
     @Override
-    public void markRelocationSite(int offset, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
+    public void markRelocationSite(int offset, RelocationKind k, String symbolName, long addend) {
         throw new UnsupportedOperationException("can't mark relocaction sites in string section");
     }
 
     @Override
-    public void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
+    public void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, long addend) {
         throw new UnsupportedOperationException("can't mark relocaction sites in string section");
     }
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java
index c7b69cf630f8..4e1aa9456449 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFMachine.java
@@ -33,12 +33,6 @@
  * ELF machine type (incomplete). Each machine type also defines its set of relocation types.
  */
 public enum ELFMachine/* implements Integral */ {
-    NONE {
-        @Override
-        Class<? extends Enum<? extends RelocationMethod>> relocationTypes() {
-            return ELFDummyRelocation.class;
-        }
-    },
     X86_64 {
         @Override
         Class<? extends Enum<? extends RelocationMethod>> relocationTypes() {
@@ -136,16 +130,13 @@ public static ELFRelocationMethod getRelocation(ELFMachine m, RelocationKind k)
 
                 }
             default:
-            case NONE:
-                return ELFDummyRelocation.R_NONE;
+                throw new IllegalStateException("unknown ELF machine type");
         }
     }
 
     // TODO: use explicit enum values
     public static ELFMachine from(int m) {
         switch (m) {
-            case 0:
-                return NONE;
             case 0x3E:
                 return X86_64;
             case 0xB7:
@@ -156,9 +147,7 @@ public static ELFMachine from(int m) {
     }
 
     public short toShort() {
-        if (this == NONE) {
-            return 0;
-        } else if (this == AArch64) {
+        if (this == AArch64) {
             return 0xB7;
         } else if (this == X86_64) {
             return 0x3E;
@@ -176,25 +165,6 @@ public static ELFMachine getSystemNativeValue() {
     }
 }
 
-enum ELFDummyRelocation implements ELFRelocationMethod {
-    R_NONE;
-
-    @Override
-    public boolean canUseExplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public boolean canUseImplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public long toLong() {
-        return ordinal();
-    }
-}
-
 enum ELFX86_64Relocation implements ELFRelocationMethod {
     // These are all named R_X86_64_... in elf.h,
     // but we just use R_... to keep it short.
@@ -245,19 +215,6 @@ enum ELFX86_64Relocation implements ELFRelocationMethod {
         assert R_COUNT.ordinal() == 39;
     }
 
-    /*
-     * x86-64 relocs always use explicit addends.
-     */
-    @Override
-    public boolean canUseExplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public boolean canUseImplicitAddend() {
-        return false;
-    }
-
     @Override
     public long toLong() {
         return ordinal();
@@ -398,16 +355,6 @@ enum ELFAArch64Relocation implements ELFRelocationMethod {
         this.code = code;
     }
 
-    @Override
-    public boolean canUseImplicitAddend() {
-        return false;
-    }
-
-    @Override
-    public boolean canUseExplicitAddend() {
-        return true;
-    }
-
     @Override
     public long toLong() {
         return code;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFObjectFile.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFObjectFile.java
index 9e696a1bbaa7..ab705f9717f6 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFObjectFile.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFObjectFile.java
@@ -35,6 +35,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+
 import com.oracle.objectfile.BuildDependency;
 import com.oracle.objectfile.ElementImpl;
 import com.oracle.objectfile.LayoutDecision;
@@ -45,15 +48,13 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
 import com.oracle.objectfile.elf.dwarf.DwarfARangesSectionImpl;
 import com.oracle.objectfile.elf.dwarf.DwarfAbbrevSectionImpl;
+import com.oracle.objectfile.elf.dwarf.DwarfDebugInfo;
 import com.oracle.objectfile.elf.dwarf.DwarfFrameSectionImpl;
 import com.oracle.objectfile.elf.dwarf.DwarfInfoSectionImpl;
 import com.oracle.objectfile.elf.dwarf.DwarfLineSectionImpl;
-import com.oracle.objectfile.elf.dwarf.DwarfDebugInfo;
 import com.oracle.objectfile.elf.dwarf.DwarfStrSectionImpl;
 import com.oracle.objectfile.io.AssemblyBuffer;
 import com.oracle.objectfile.io.OutputAssembler;
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.Platform;
 
 /**
  * Represents an ELF object file (of any kind: relocatable, shared library, executable, core, ...).
@@ -469,9 +470,9 @@ public class ELFHeader extends ObjectFile.Header {
          */
         class Struct {
 
-            IdentStruct ident = new IdentStruct();
-            ELFType type;
-            ELFMachine machine;
+            final IdentStruct ident;
+            final ELFType type;
+            final ELFMachine machine;
             int version;
             long entry;
             long phoff;
@@ -484,10 +485,10 @@ class Struct {
             short shnum;
             short shstrndx;
 
-            Struct() {
+            Struct(ELFType type, ELFMachine machine) {
                 ident = new IdentStruct();
-                type = ELFType.NONE;
-                machine = ELFMachine.NONE;
+                this.type = type;
+                this.machine = machine;
             }
 
             /**
@@ -618,7 +619,8 @@ public Iterable<BuildDependency> getDependencies(Map<Element, LayoutDecisionMap>
         public byte[] getOrDecideContent(Map<Element, LayoutDecisionMap> alreadyDecided, byte[] contentHint) {
             // we serialize ourselves by writing a Struct to a bytebuffer
             OutputAssembler oa = AssemblyBuffer.createOutputAssembler(getDataEncoding().toByteOrder());
-            Struct contents = new Struct(); // also creates ident struct, which we need to populate
+            /* Also creates ident struct, which we need to populate. */
+            Struct contents = new Struct(getType(), getMachine());
 
             // don't assign magic -- its default value is correct
             contents.ident.fileClass = getFileClass();
@@ -626,8 +628,6 @@ public byte[] getOrDecideContent(Map<Element, LayoutDecisionMap> alreadyDecided,
             contents.ident.version = getVersion();
             contents.ident.osabi = getOsAbi();
             contents.ident.abiVersion = (char) getAbiVersion();
-            contents.type = getType();
-            contents.machine = getMachine();
             contents.version = getVersion();
             contents.entry = 0;
             contents.shoff = (int) alreadyDecided.get(sht).getDecidedValue(LayoutDecision.Kind.OFFSET);
@@ -668,7 +668,7 @@ public int getOrDecideOffset(Map<Element, LayoutDecisionMap> alreadyDecided, int
 
         @Override
         public int getOrDecideSize(Map<Element, LayoutDecisionMap> alreadyDecided, int sizeHint) {
-            int size = (new Struct()).getWrittenSize();
+            int size = (new Struct(getType(), getMachine())).getWrittenSize();
             assert sizeHint == -1 || sizeHint == size;
             return size;
         }
@@ -1193,13 +1193,19 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
          * decision set and causes an NPE during reloc section write. So we need to create the
          * relevant reloc sections here in advance.
          */
-        elfStrSectionImpl.getOrCreateRelocationElement(false);
-        elfAbbrevSectionImpl.getOrCreateRelocationElement(false);
-        frameSectionImpl.getOrCreateRelocationElement(false);
-        elfInfoSectionImpl.getOrCreateRelocationElement(false);
-        elfARangesSectionImpl.getOrCreateRelocationElement(false);
-        elfLineSectionImpl.getOrCreateRelocationElement(false);
+        elfStrSectionImpl.getOrCreateRelocationElement(0);
+        elfAbbrevSectionImpl.getOrCreateRelocationElement(0);
+        frameSectionImpl.getOrCreateRelocationElement(0);
+        elfInfoSectionImpl.getOrCreateRelocationElement(0);
+        elfARangesSectionImpl.getOrCreateRelocationElement(0);
+        elfLineSectionImpl.getOrCreateRelocationElement(0);
         /* Ok now we can populate the debug info model. */
         dwarfSections.installDebugInfo(debugInfoProvider);
     }
+
+    @SuppressWarnings("unused")
+    static boolean useExplicitAddend(long addend) {
+        // For now, we are always using explicit addends
+        return true;
+    }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFProgbitsSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFProgbitsSection.java
index c08176850a51..d06775fb809a 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFProgbitsSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFProgbitsSection.java
@@ -69,7 +69,7 @@ public void setContent(byte[] c) {
     }
 
     @Override
-    public void markRelocationSite(int offset, ObjectFile.RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, useImplicitAddend, explicitAddend);
+    public void markRelocationSite(int offset, ObjectFile.RelocationKind k, String symbolName, long addend) {
+        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, addend);
     }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFRelocationSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFRelocationSection.java
index 538a2bf4352e..52a10326b91d 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFRelocationSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFRelocationSection.java
@@ -108,6 +108,19 @@ int getWrittenSize() {
 
     interface ELFRelocationMethod extends RelocationMethod {
 
+        /*
+         * For now, ELF relocations are always using explicit addends. This can change in the
+         * future.
+         */
+
+        default boolean canUseImplicitAddend() {
+            return false;
+        }
+
+        default boolean canUseExplicitAddend() {
+            return true;
+        }
+
         long toLong();
     }
 
@@ -172,8 +185,8 @@ public int hashCode() {
         }
     }
 
-    public Entry addEntry(ELFSection s, long offset, ELFRelocationMethod t, ELFSymtab.Entry sym, Long explicitAddend) {
-        if (explicitAddend != null) {
+    void addEntry(ELFSection s, long offset, ELFRelocationMethod t, ELFSymtab.Entry sym, long addend) {
+        if (ELFObjectFile.useExplicitAddend(addend)) {
             if (!t.canUseExplicitAddend()) {
                 throw new IllegalArgumentException("cannot use relocation method " + t + " with explicit addends");
             }
@@ -181,6 +194,7 @@ public Entry addEntry(ELFSection s, long offset, ELFRelocationMethod t, ELFSymta
                 throw new IllegalStateException("cannot create relocation with addend in .rel section");
             }
         } else {
+            // use implicit addend
             if (!t.canUseImplicitAddend()) {
                 throw new IllegalArgumentException("cannot use relocation method " + t + " with implicit addends");
             }
@@ -188,8 +202,7 @@ public Entry addEntry(ELFSection s, long offset, ELFRelocationMethod t, ELFSymta
                 throw new IllegalStateException("cannot create relocation without addend in .rela section");
             }
         }
-        long addend = (explicitAddend != null) ? explicitAddend : 0L;
-        return entries.computeIfAbsent(new Entry(s, offset, t, sym, addend), Function.identity());
+        entries.computeIfAbsent(new Entry(s, offset, t, sym, addend), Function.identity());
     }
 
     public boolean isDynamic() {
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFUserDefinedSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFUserDefinedSection.java
index 6d3f29be036b..e8a3df3e4444 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFUserDefinedSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/ELFUserDefinedSection.java
@@ -126,36 +126,35 @@ public LayoutDecisionMap getDecisions(LayoutDecisionMap copyingIn) {
     }
 
     @Override
-    public Element getOrCreateRelocationElement(boolean useImplicitAddend) {
+    public Element getOrCreateRelocationElement(long addend) {
         ELFSymtab syms = (ELFSymtab) getOwner().elementForName(".symtab");
         if (syms == null) {
             throw new IllegalStateException("cannot create a relocation section without corresponding symtab");
         }
-        boolean withExplicitAddends = !useImplicitAddend;
-        ELFRelocationSection rs = withExplicitAddends ? rela : rel;
-        if (rs == null) {
-            // we have to create the section if it doesn't exist
-            rs = getOwner().getOrCreateRelocSection(this, syms, withExplicitAddends);
-            assert rs != null;
-            if (withExplicitAddends) {
-                rela = rs;
-            } else {
-                rel = rs;
+
+        if (ELFObjectFile.useExplicitAddend(addend)) {
+            if (rela == null) {
+                rela = getOwner().getOrCreateRelocSection(this, syms, true);
+                assert rela != null;
+            }
+            return rela;
+        } else {
+            // use implicit addend
+            if (rel == null) {
+                rel = getOwner().getOrCreateRelocSection(this, syms, false);
+                assert rel != null;
             }
+            return rel;
         }
-        return rs;
     }
 
     @Override
-    public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        if (useImplicitAddend != (explicitAddend == null)) {
-            throw new IllegalArgumentException("must have either an explicit or implicit addend");
-        }
+    public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationKind k, String symbolName, long addend) {
         ELFSymtab syms = (ELFSymtab) getOwner().elementForName(".symtab");
-        ELFRelocationSection rs = (ELFRelocationSection) getOrCreateRelocationElement(useImplicitAddend);
+        ELFRelocationSection rs = (ELFRelocationSection) getOrCreateRelocationElement(addend);
         assert symbolName != null;
         ELFSymtab.Entry ent = syms.getSymbol(symbolName);
         assert ent != null;
-        rs.addEntry(this, offset, ELFMachine.getRelocation(getOwner().getMachine(), k), ent, explicitAddend);
+        rs.addEntry(this, offset, ELFMachine.getRelocation(getOwner().getMachine(), k), ent, addend);
     }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
index ce45876549e2..d4c88a8a5ea1 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
@@ -206,7 +206,7 @@ protected int putRelocatableCodeOffset(long l, byte[] buffer, int p) {
         /*
          * Mark address so it is relocated relative to the start of the text segment.
          */
-        markRelocationSite(pos, ObjectFile.RelocationKind.DIRECT_8, DwarfDebugInfo.TEXT_SECTION_NAME, false, Long.valueOf(l));
+        markRelocationSite(pos, ObjectFile.RelocationKind.DIRECT_8, DwarfDebugInfo.TEXT_SECTION_NAME, l);
         pos = putLong(0, buffer, pos);
         return pos;
     }
@@ -216,7 +216,7 @@ protected int putRelocatableHeapOffset(long l, byte[] buffer, int p) {
         /*
          * Mark address so it is relocated relative to the start of the heap.
          */
-        markRelocationSite(pos, ObjectFile.RelocationKind.DIRECT_8, DwarfDebugInfo.HEAP_BEGIN_NAME, false, Long.valueOf(l));
+        markRelocationSite(pos, ObjectFile.RelocationKind.DIRECT_8, DwarfDebugInfo.HEAP_BEGIN_NAME, l);
         pos = putLong(0, buffer, pos);
         return pos;
     }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOObjectFile.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOObjectFile.java
index 413614d77c74..f453c86bbdec 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOObjectFile.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOObjectFile.java
@@ -429,7 +429,7 @@ public MachORelocationElement getRelocationElement() {
         return relocs;
     }
 
-    public MachORelocationElement getOrCreateRelocationElement(@SuppressWarnings("unused") boolean useImplicitAddend) {
+    public MachORelocationElement getOrCreateRelocationElement() {
         if (relocs == null) {
             final Segment64Command containingSegment = getOrCreateSegment(getUnnamedSegmentName(), null, false, false);
             relocs = new MachORelocationElement(containingSegment);
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORegularSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORegularSection.java
index 791c4e0f5f55..8ec4fcde87fe 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORegularSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORegularSection.java
@@ -50,8 +50,8 @@ public byte[] getContent() {
     }
 
     @Override
-    public void markRelocationSite(int offset, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, useImplicitAddend, explicitAddend);
+    public void markRelocationSite(int offset, RelocationKind k, String symbolName, long addend) {
+        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, addend);
     }
 
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
index 12328ce998c7..1c454c06e53e 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
@@ -50,14 +50,14 @@ class MachORelocationElement extends MachOObjectFile.LinkEditElement {
      * within the section.
      */
 
-    private static int compareSectionThenOffset(RelocationInfo p, RelocationInfo q) {
+    private static int compareSectionThenOffset(MachORelocationInfo p, MachORelocationInfo q) {
         if (!p.getRelocatedSection().equals(q.getRelocatedSection())) {
             return p.getRelocatedSection().hashCode() - q.getRelocatedSection().hashCode();
         }
         return Math.toIntExact(p.getOffset() - q.getOffset());
     }
 
-    private Map<RelocationInfo, RelocationInfo> infos = new TreeMap<>(MachORelocationElement::compareSectionThenOffset);
+    private Map<MachORelocationInfo, MachORelocationInfo> infos = new TreeMap<>(MachORelocationElement::compareSectionThenOffset);
     private Set<MachOSection> relocatedSections = new HashSet<>();
 
     MachORelocationElement(Segment64Command segment) {
@@ -66,7 +66,7 @@ private static int compareSectionThenOffset(RelocationInfo p, RelocationInfo q)
         segment.getOwner().relocs = this;
     }
 
-    public void add(RelocationInfo rec) {
+    public void add(MachORelocationInfo rec) {
         if (infos.putIfAbsent(rec, rec) == null) {
             relocatedSections.add(rec.getRelocatedSection());
         }
@@ -79,7 +79,7 @@ public boolean relocatesSegment(Segment64Command seg) {
     @Override
     public byte[] getOrDecideContent(Map<Element, LayoutDecisionMap> alreadyDecided, byte[] contentHint) {
         OutputAssembler out = AssemblyBuffer.createOutputAssembler(getOwner().getByteOrder());
-        for (RelocationInfo rec : infos.keySet()) {
+        for (MachORelocationInfo rec : infos.keySet()) {
             rec.write(out, alreadyDecided);
         }
         assert getOrDecideSize(alreadyDecided, -1) == out.pos();
@@ -98,7 +98,7 @@ public Iterable<BuildDependency> getDependencies(Map<Element, LayoutDecisionMap>
 
     public int startIndexFor(MachOSection s) {
         int i = 0;
-        for (RelocationInfo info : infos.keySet()) {
+        for (MachORelocationInfo info : infos.keySet()) {
             if (info.getRelocatedSection() == s) {
                 return i;
             }
@@ -108,7 +108,7 @@ public int startIndexFor(MachOSection s) {
     }
 
     public int encodedEntrySize() {
-        return RelocationInfo.getEncodedSize();
+        return MachORelocationInfo.getEncodedSize();
     }
 
     public int countFor(MachOSection s) {
@@ -116,50 +116,60 @@ public int countFor(MachOSection s) {
     }
 }
 
+/**
+ * These are defined as an enum in
+ * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/EXTERNAL_HEADERS/mach-o/x86_64/reloc.h#L173
+ * which we reproduce. Of course, take care to preserve the order!
+ *
+ * For examples of how these symbols are used, see the linked file above and
+ * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/EXTERNAL_HEADERS/mach-o/reloc.h.
+ */
 enum X86_64Reloc {
-    /*
-     * These are defined as an enum in /usr/include/mach-o/x86-64/reloc.h, which we reproduce. Of
-     * course, take care to preserve the order!
-     */
-    UNSIGNED,
-    SIGNED,
-    BRANCH,
-    GOT_LOAD,
-    GOT,
-    SUBTRACTOR,
-    SIGNED_1,
-    SIGNED_2,
-    SIGNED_4,
-    TLV;
+    UNSIGNED, // for absolute addresses
+    SIGNED, // for signed 32-bit displacement
+    BRANCH, // a CALL/JMP instruction with 32-bit displacement
+    GOT_LOAD, // a MOVQ load of a GOT entry
+    GOT, // other GOT references
+    SUBTRACTOR, // must be followed by a X86_64_RELOC_UNSIGNED
+    SIGNED_1, // for signed 32-bit displacement with a -1 addend
+    SIGNED_2, // for signed 32-bit displacement with a -2 addend
+    SIGNED_4, // for signed 32-bit displacement with a -4 addend
+    TLV; // for thread local variables
 
     public int getValue() {
         return ordinal();
     }
 }
 
+/**
+ * These are defined as an enum in
+ * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/EXTERNAL_HEADERS/mach-o/arm64/reloc.h#L26,
+ * which we reproduce. Of course, take care to preserve the order!
+ *
+ * For examples of how these symbols are used, see
+ * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/EXTERNAL_HEADERS/mach-o/arm/reloc.h
+ * (for AArch32 information, but does provide some insight) and
+ * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/EXTERNAL_HEADERS/mach-o/reloc.h.
+ */
 enum ARM64Reloc {
-    /*
-     * These are defined as an enum in /usr/include/mach-o/arm64/reloc.h, which we reproduce. Of
-     * course, take care to preserve the order!
-     */
-    UNSIGNED,
-    SUBTRACTOR,
-    BRANCH26,
-    PAGE21,
-    PAGEOFF12,
-    GOT_LOAD_PAGE21,
-    GOT_LOAD_PAGEOFF12,
-    POINTER_TO_GOT,
-    TLVP_LOAD_PAGE21,
-    TLVP_LOAD_PAGEOFF12,
-    ADDEND;
+    UNSIGNED, // for pointers
+    SUBTRACTOR, // must be followed by a ARM64_RELOC_UNSIGNED
+    BRANCH26, // a B/BL instruction with 26-bit displacement
+    PAGE21, // pc-rel distance to page of target
+    PAGEOFF12, // offset within page, scaled by r_length
+    GOT_LOAD_PAGE21, // pc-rel distance to page of GOT slot
+    GOT_LOAD_PAGEOFF12, // offset within page of GOT slot, scaled by r_length
+    POINTER_TO_GOT, // for pointers to GOT slots
+    TLVP_LOAD_PAGE21, // pc-rel distance to page of TLVP slot
+    TLVP_LOAD_PAGEOFF12, // offset within page of TLVP slot, scaled by r_length
+    ADDEND; // must be followed by PAGE21 or PAGEOFF12
 
     public int getValue() {
         return ordinal();
     }
 }
 
-final class RelocationInfo implements RelocationRecord, RelocationMethod {
+final class MachORelocationInfo implements RelocationRecord, RelocationMethod {
 
     private final MachORelocationElement containingElement;
     private final MachOSection relocatedSection;
@@ -179,7 +189,7 @@ final class RelocationInfo implements RelocationRecord, RelocationMethod {
      * @param kind the kind of relocation to perform at the relocation site
      * @param symbolName the symbol against which to relocate
      */
-    RelocationInfo(MachORelocationElement containingElement, MachOSection relocatedSection, int offset, int requestedLength, RelocationKind kind, String symbolName, boolean asLocalReloc) {
+    MachORelocationInfo(MachORelocationElement containingElement, MachOSection relocatedSection, int offset, int requestedLength, RelocationKind kind, String symbolName, boolean asLocalReloc) {
         this.containingElement = containingElement;
         this.relocatedSection = relocatedSection;
         this.sectionOffset = offset; // gets turned into a vaddr on write-out
@@ -261,16 +271,6 @@ public Symbol getReferencedSymbol() {
         return sym;
     }
 
-    @Override
-    public boolean canUseExplicitAddend() {
-        return false;
-    }
-
-    @Override
-    public boolean canUseImplicitAddend() {
-        return true;
-    }
-
     public MachOSection getRelocatedSection() {
         return relocatedSection;
     }
@@ -341,7 +341,7 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj != null && getClass() == obj.getClass()) {
-            RelocationInfo other = (RelocationInfo) obj;
+            MachORelocationInfo other = (MachORelocationInfo) obj;
             return sectionOffset == other.sectionOffset && log2length == other.log2length && Objects.equals(containingElement, other.containingElement) &&
                             Objects.equals(getRelocatedSection(), other.getRelocatedSection()) && kind == other.kind &&
                             Objects.equals(sym, other.sym) && Objects.equals(targetSection, other.targetSection);
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOUserDefinedSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOUserDefinedSection.java
index 8a98f5e8448f..33d930f31c76 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOUserDefinedSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachOUserDefinedSection.java
@@ -154,35 +154,26 @@ public LayoutDecisionMap getDecisions(LayoutDecisionMap copyingIn) {
     }
 
     @Override
-    public MachORelocationElement getOrCreateRelocationElement(boolean useImplicitAddend) {
-        return getOwner().getOrCreateRelocationElement(useImplicitAddend);
+    public MachORelocationElement getOrCreateRelocationElement(long addend) {
+        return getOwner().getOrCreateRelocationElement();
     }
 
     @Override
-    public void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        MachORelocationElement el = getOrCreateRelocationElement(useImplicitAddend);
+    public void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, String symbolName, long addend) {
+        MachORelocationElement el = getOrCreateRelocationElement(addend);
         AssemblyBuffer sbb = new AssemblyBuffer(bb);
         sbb.setByteOrder(getOwner().getByteOrder());
         sbb.pushSeek(offset);
         /*
          * NOTE: Mach-O does not support explicit addends, and inline addends are applied even
-         * during dynamic linking. So if the caller supplies an explicit addend, we turn it into an
-         * implicit one by updating our content.
+         * during dynamic linking.
          */
         int length = ObjectFile.RelocationKind.getRelocationSize(k);
-        long currentInlineAddendValue = sbb.readTruncatedLong(length);
-        long desiredInlineAddendValue;
-        if (explicitAddend != null) {
-            /*
-             * This assertion is conservatively disallowing double-addend (could
-             * "add currentValue to explicitAddend"), because that seems more likely to be a bug
-             * than a feature.
-             */
-            assert currentInlineAddendValue == 0;
-            desiredInlineAddendValue = explicitAddend;
-        } else {
-            desiredInlineAddendValue = currentInlineAddendValue;
-        }
+        /*
+         * The addend is passed as a method parameter. The initial implicit addend value within the
+         * instruction does not need to be read, as it is noise.
+         */
+        long desiredInlineAddendValue = addend;
 
         /*
          * One more complication: for PC-relative relocation, at least on x86-64, Mach-O linkers
@@ -212,7 +203,7 @@ public void markRelocationSite(int offset, ByteBuffer bb, RelocationKind k, Stri
 
         // return ByteBuffer cursor to where it was
         sbb.pop();
-        RelocationInfo rec = new RelocationInfo(el, this, offset, length, k, symbolName, createAsLocalReloc);
+        MachORelocationInfo rec = new MachORelocationInfo(el, this, offset, length, k, symbolName, createAsLocalReloc);
         el.add(rec);
     }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffMachine.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffMachine.java
index 5aa80dce0669..2961926c1a51 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffMachine.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffMachine.java
@@ -35,12 +35,6 @@
  * PECoff machine type (incomplete). Each machine type also defines its set of relocation types.
  */
 public enum PECoffMachine/* implements Integral */ {
-    NONE {
-        @Override
-        Class<? extends Enum<? extends RelocationMethod>> relocationTypes() {
-            return PECoffDummyRelocation.class;
-        }
-    },
     X86_64 {
         @Override
         Class<? extends Enum<? extends RelocationMethod>> relocationTypes() {
@@ -69,15 +63,12 @@ public static PECoffRelocationMethod getRelocation(PECoffMachine m, RelocationKi
                         throw new IllegalArgumentException("cannot map unknown relocation kind to an PECoff x86-64 relocation type");
                 }
             default:
-            case NONE:
-                return PECoffDummyRelocation.R_NONE;
+                throw new IllegalStateException("unknown PECoff machine type");
         }
     }
 
     public static PECoffMachine from(int m) {
         switch (m) {
-            case IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_UNKNOWN:
-                return NONE;
             case IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_AMD64:
                 return X86_64;
             default:
@@ -86,9 +77,7 @@ public static PECoffMachine from(int m) {
     }
 
     public short toShort() {
-        if (this == NONE) {
-            return (short) IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_UNKNOWN;
-        } else if (this == X86_64) {
+        if (this == X86_64) {
             return (short) IMAGE_FILE_HEADER.IMAGE_FILE_MACHINE_AMD64;
         } else {
             throw new IllegalStateException("should not reach here");
@@ -104,25 +93,6 @@ public static PECoffMachine getSystemNativeValue() {
     }
 }
 
-enum PECoffDummyRelocation implements PECoffRelocationMethod {
-    R_NONE;
-
-    @Override
-    public boolean canUseExplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public boolean canUseImplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public long toLong() {
-        return ordinal();
-    }
-}
-
 /**
  * @formatter:off
  *
@@ -176,17 +146,4 @@ public long toLong() {
             return IMAGE_RELOCATION.IMAGE_REL_AMD64_REL32;
         }
     };
-
-    /*
-     * x86-64 relocs always use explicit addends.
-     */
-    @Override
-    public boolean canUseExplicitAddend() {
-        return true;
-    }
-
-    @Override
-    public boolean canUseImplicitAddend() {
-        return false;
-    }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffObjectFile.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffObjectFile.java
index 138ad8457e33..cc977d3f54bb 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffObjectFile.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffObjectFile.java
@@ -662,11 +662,11 @@ public PECoffMachine getMachine() {
         return machine;
     }
 
-    public PECoffRelocationTable getOrCreateRelocSection(PECoffSymtab syms, boolean withExplicitAddends) {
+    public PECoffRelocationTable getOrCreateRelocSection(PECoffSymtab syms) {
         Element el = elementForName(".reloctab");
         PECoffRelocationTable rs;
         if (el == null) {
-            rs = new PECoffRelocationTable(this, ".reloctab", syms, withExplicitAddends);
+            rs = new PECoffRelocationTable(this, ".reloctab", syms);
         } else if (el instanceof PECoffRelocationTable) {
             rs = (PECoffRelocationTable) el;
         } else {
@@ -719,8 +719,8 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
         // layout constraints included in the layout decision set and causes
         // an NPE during reloc section write. so we need to create the relevant
         // reloc sections here in advance
-        cvSymbolSectionImpl.getOrCreateRelocationElement(false);
-        cvTypeSectionImpl.getOrCreateRelocationElement(false);
+        cvSymbolSectionImpl.getOrCreateRelocationElement(0);
+        cvTypeSectionImpl.getOrCreateRelocationElement(0);
 
         // ok now we can populate the implementations
         cvDebugInfo.installDebugInfo(debugInfoProvider);
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffProgbitsSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffProgbitsSection.java
index 5bb4740dbeb7..e3f7dccae6f6 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffProgbitsSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffProgbitsSection.java
@@ -31,8 +31,8 @@
 import com.oracle.objectfile.BasicProgbitsSectionImpl;
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.objectfile.ObjectFile.ProgbitsSectionImpl;
-import com.oracle.objectfile.pecoff.PECoffObjectFile.PECoffSectionFlag;
 import com.oracle.objectfile.io.InputDisassembler;
+import com.oracle.objectfile.pecoff.PECoffObjectFile.PECoffSectionFlag;
 
 public class PECoffProgbitsSection extends PECoffUserDefinedSection implements ProgbitsSectionImpl {
 
@@ -69,7 +69,7 @@ public void setContent(byte[] c) {
     }
 
     @Override
-    public void markRelocationSite(int offset, ObjectFile.RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, useImplicitAddend, explicitAddend);
+    public void markRelocationSite(int offset, ObjectFile.RelocationKind k, String symbolName, long addend) {
+        markRelocationSite(offset, ByteBuffer.wrap(getContent()).order(getOwner().getByteOrder()), k, symbolName, addend);
     }
 }
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffRelocationTable.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffRelocationTable.java
index f9cdd31e701d..163fe5ebdf38 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffRelocationTable.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffRelocationTable.java
@@ -55,6 +55,7 @@ public ElementImpl getImpl() {
     }
 
     interface PECoffRelocationMethod extends RelocationMethod {
+
         long toLong();
     }
 
@@ -101,19 +102,17 @@ public int hashCode() {
         }
     }
 
-    private final boolean withExplicitAddends;
     private final PECoffSymtab syms;
     private PECoffObjectFile owner = null;
 
-    PECoffRelocationTable(PECoffObjectFile owner, String name, PECoffSymtab syms, boolean withExplicitAddends) {
+    PECoffRelocationTable(PECoffObjectFile owner, String name, PECoffSymtab syms) {
         owner.super(name, 4);
 
         this.owner = owner;
-        this.withExplicitAddends = withExplicitAddends;
         this.syms = syms;
     }
 
-    public Entry addEntry(PECoffSection s, long offset, PECoffRelocationMethod t, PECoffSymtab.Entry sym, Long explicitAddend) {
+    void addEntry(PECoffSection s, long offset, PECoffRelocationMethod t, PECoffSymtab.Entry sym, long addend) {
         Map<Entry, Entry> entries = (Map<Entry, Entry>) s.getRelocEntries();
 
         if (entries == null) {
@@ -121,23 +120,7 @@ public Entry addEntry(PECoffSection s, long offset, PECoffRelocationMethod t, PE
             s.setRelocEntries(entries);
         }
 
-        if (explicitAddend != null) {
-            if (!t.canUseExplicitAddend()) {
-                throw new IllegalArgumentException("cannot use relocation method " + t + " with explicit addends");
-            }
-            if (!withExplicitAddends) {
-                throw new IllegalStateException("cannot create relocation with addend in .rel section");
-            }
-        } else {
-            if (!t.canUseImplicitAddend()) {
-                throw new IllegalArgumentException("cannot use relocation method " + t + " with implicit addends");
-            }
-            if (withExplicitAddends) {
-                throw new IllegalStateException("cannot create relocation without addend in .rela section");
-            }
-        }
-        long addend = (explicitAddend != null) ? explicitAddend : 0L;
-        return entries.computeIfAbsent(new Entry(s, offset, t, sym, addend), Function.identity());
+        entries.computeIfAbsent(new Entry(s, offset, t, sym, addend), Function.identity());
     }
 
     // Returns count of relocation entries for section
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffUserDefinedSection.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffUserDefinedSection.java
index 7ffcc1d003e1..4d34aa1ee8a9 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffUserDefinedSection.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/PECoffUserDefinedSection.java
@@ -49,7 +49,6 @@
 public class PECoffUserDefinedSection extends PECoffSection implements ObjectFile.RelocatableSectionImpl {
 
     private PECoffRelocationTable rel; // the section holding our relocations without addends
-    private PECoffRelocationTable rela; // the section holding our relocations with addends
 
     protected ElementImpl impl;
 
@@ -119,33 +118,23 @@ public LayoutDecisionMap getDecisions(LayoutDecisionMap copyingIn) {
     }
 
     @Override
-    public Element getOrCreateRelocationElement(boolean useImplicitAddend) {
+    public Element getOrCreateRelocationElement(long addend) {
         PECoffSymtab syms = (PECoffSymtab) getOwner().elementForName(".symtab");
         if (syms == null) {
             throw new IllegalStateException("cannot create a relocation section without corresponding symtab");
         }
-        boolean withExplicitAddends = !useImplicitAddend;
-        PECoffRelocationTable rs = withExplicitAddends ? rela : rel;
-        if (rs == null) {
-            // we have to create the section if it doesn't exist
-            rs = getOwner().getOrCreateRelocSection(syms, withExplicitAddends);
-            assert rs != null;
-            if (withExplicitAddends) {
-                rela = rs;
-            } else {
-                rel = rs;
-            }
+
+        if (rel == null) {
+            rel = getOwner().getOrCreateRelocSection(syms);
+            assert rel != null;
         }
-        return rs;
+        return rel;
     }
 
     @Override
-    public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationKind k, String symbolName, boolean useImplicitAddend, Long explicitAddend) {
-        if (useImplicitAddend != (explicitAddend == null)) {
-            throw new IllegalArgumentException("must have either an explicit or implicit addend");
-        }
+    public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationKind k, String symbolName, long addend) {
         PECoffSymtab syms = (PECoffSymtab) getOwner().elementForName(".symtab");
-        PECoffRelocationTable rs = (PECoffRelocationTable) getOrCreateRelocationElement(useImplicitAddend);
+        PECoffRelocationTable rs = (PECoffRelocationTable) getOrCreateRelocationElement(addend);
         assert symbolName != null;
         PECoffSymtab.Entry ent = syms.getSymbol(symbolName);
         if (ent == null) {
@@ -158,23 +147,14 @@ public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationK
         sbb.pushSeek(offset);
         /*
          * NOTE: Windows does not support explicit addends, and inline addends are applied even
-         * during dynamic linking. So if the caller supplies an explicit addend, we turn it into an
-         * implicit one by updating our content.
+         * during dynamic linking.
          */
         int length = ObjectFile.RelocationKind.getRelocationSize(k);
-        long currentInlineAddendValue = sbb.readTruncatedLong(length);
-        long desiredInlineAddendValue;
-        if (explicitAddend != null) {
-            /*
-             * This assertion is conservatively disallowing double-addend (could
-             * "add currentValue to explicitAddend"), because that seems more likely to be a bug
-             * than a feature.
-             */
-            assert currentInlineAddendValue == 0;
-            desiredInlineAddendValue = explicitAddend;
-        } else {
-            desiredInlineAddendValue = currentInlineAddendValue;
-        }
+        /*
+         * The addend is passed as a method parameter. The initial implicit addend value within the
+         * instruction does not need to be read, as it is noise.
+         */
+        long desiredInlineAddendValue = addend;
 
         /*
          * One more complication: for PC-relative relocation, at least on x86-64, Coff linkers
@@ -196,7 +176,7 @@ public void markRelocationSite(int offset, ByteBuffer bb, ObjectFile.RelocationK
         // return ByteBuffer cursor to where it was
         sbb.pop();
 
-        rs.addEntry(this, offset, PECoffMachine.getRelocation(getOwner().getMachine(), k), ent, explicitAddend);
+        rs.addEntry(this, offset, PECoffMachine.getRelocation(getOwner().getMachine(), k), ent, addend);
     }
 
     /**
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVLineRecord.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVLineRecord.java
index 090f30fe4acb..46dc4f9072b7 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVLineRecord.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVLineRecord.java
@@ -92,9 +92,9 @@ private int computeHeader(byte[] buffer, int initialPos) {
         int pos = initialPos;
 
         /* Emit addr:section relocation records. */
-        cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECREL_4, symbolName, false, 1L);
+        cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECREL_4, symbolName, 1L);
         pos = CVUtil.putInt(0, buffer, pos);
-        cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECTION_2, symbolName, false, 1L);
+        cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECTION_2, symbolName, 1L);
         pos = CVUtil.putShort((short) 0, buffer, pos);
 
         /* Emit flags. */
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubrecord.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubrecord.java
index ddb43d1039c7..4a2cf1320132 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubrecord.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubrecord.java
@@ -297,11 +297,11 @@ protected int computeContents(byte[] buffer, int initialPos) {
             pos = CVUtil.putInt(debugEnd, buffer, pos);
             pos = CVUtil.putInt(typeIndex, buffer, pos);
             if (buffer != null) {
-                cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECREL_4, externalName, false, 1L);
+                cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECREL_4, externalName, 1L);
             }
             pos = CVUtil.putInt(0, buffer, pos);
             if (buffer != null) {
-                cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECTION_2, externalName, false, 1L);
+                cvDebugInfo.getCVSymbolSection().markRelocationSite(pos, ObjectFile.RelocationKind.SECTION_2, externalName, 1L);
             }
             pos = CVUtil.putShort((short) 0, buffer, pos);
             pos = CVUtil.putByte(flags, buffer, pos);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
index 305bf88f262b..90f4d6218115 100755
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcher.java
@@ -119,7 +119,7 @@ class AdrpLdrMacroInstructionHostedPatcher extends CompilationResult.CodeAnnotat
     public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
         int siteOffset = compStart + macroInstruction.instructionPosition;
 
-        relocs.addRelocationWithAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADR_PREL_PG_HI21, Long.valueOf(0), ref);
+        relocs.addRelocationWithoutAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADR_PREL_PG_HI21, ref);
         siteOffset += 4;
         RelocationKind secondRelocation;
         switch (macroInstruction.srcSize) {
@@ -141,7 +141,7 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
             default:
                 throw VMError.shouldNotReachHere("Unknown macro instruction src size of " + macroInstruction.srcSize);
         }
-        relocs.addRelocationWithAddend(siteOffset, secondRelocation, Long.valueOf(0), ref);
+        relocs.addRelocationWithoutAddend(siteOffset, secondRelocation, ref);
     }
 
     @Uninterruptible(reason = ".")
@@ -170,9 +170,9 @@ class AdrpAddMacroInstructionHostedPatcher extends CompilationResult.CodeAnnotat
     public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
         int siteOffset = compStart + macroInstruction.instructionPosition;
 
-        relocs.addRelocationWithAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADR_PREL_PG_HI21, Long.valueOf(0), ref);
+        relocs.addRelocationWithoutAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADR_PREL_PG_HI21, ref);
         siteOffset += 4;
-        relocs.addRelocationWithAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADD_ABS_LO12_NC, Long.valueOf(0), ref);
+        relocs.addRelocationWithoutAddend(siteOffset, RelocationKind.AARCH64_R_AARCH64_ADD_ABS_LO12_NC, ref);
     }
 
     @Uninterruptible(reason = ".")
@@ -231,9 +231,9 @@ public void relocate(Reference ref, RelocatableBuffer relocs, int compStart) {
                     continue;
                 }
                 if (i == lastMovIndex) {
-                    relocs.addRelocationWithAddend(siteOffset, relocations[i], Long.valueOf(0), ref);
+                    relocs.addRelocationWithoutAddend(siteOffset, relocations[i], ref);
                 } else {
-                    relocs.addRelocationWithAddend(siteOffset, noCheckRelocations[i], Long.valueOf(0), ref);
+                    relocs.addRelocationWithoutAddend(siteOffset, noCheckRelocations[i], ref);
                 }
                 siteOffset = siteOffset + 4;
             }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index b41457106299..f679cf41263d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -394,7 +394,7 @@ private ObjectFile.Symbol defineRelocationForSymbol(String name, long position)
         }
         ProgbitsSectionImpl baseSectionImpl = (ProgbitsSectionImpl) rwDataSection.getImpl();
         int offsetInSection = Math.toIntExact(RWDATA_CGLOBALS_PARTITION_OFFSET + position);
-        baseSectionImpl.markRelocationSite(offsetInSection, wordSize == 8 ? RelocationKind.DIRECT_8 : RelocationKind.DIRECT_4, name, false, 0L);
+        baseSectionImpl.markRelocationSite(offsetInSection, wordSize == 8 ? RelocationKind.DIRECT_8 : RelocationKind.DIRECT_4, name, 0L);
         return symbol;
     }
 
@@ -580,7 +580,7 @@ private void markFunctionRelocationSite(final ProgbitsSectionImpl sectionImpl, f
             target = metaAccess.lookupJavaMethod(InvalidMethodPointerHandler.METHOD_POINTER_NOT_COMPILED_HANDLER_METHOD);
         }
         // A reference to a method. Mark the relocation site using the symbol name.
-        sectionImpl.markRelocationSite(offset, RelocationKind.getDirect(functionPointerRelocationSize), localSymbolNameForMethod(target), false, 0L);
+        sectionImpl.markRelocationSite(offset, RelocationKind.getDirect(functionPointerRelocationSize), localSymbolNameForMethod(target), 0L);
     }
 
     private static boolean isAddendAligned(Architecture arch, long addend, RelocationKind kind) {
@@ -613,9 +613,8 @@ private void markDataRelocationSite(ProgbitsSectionImpl sectionImpl, int offset,
         assert targetObjectInfo != null;
         String targetSectionName = heapSection.getName();
         long address = targetObjectInfo.getAddress();
-        long relocationInfoAddend = info.hasExplicitAddend() ? info.getExplicitAddend() : 0L;
-        long relocationAddend = address + relocationInfoAddend;
-        sectionImpl.markRelocationSite(offset, info.getRelocationKind(), targetSectionName, false, relocationAddend);
+        long relocationAddend = address + info.getAddend();
+        sectionImpl.markRelocationSite(offset, info.getRelocationKind(), targetSectionName, relocationAddend);
     }
 
     private void markDataRelocationSiteFromText(RelocatableBuffer buffer, final ProgbitsSectionImpl sectionImpl, final int offset, final Info info) {
@@ -624,23 +623,23 @@ private void markDataRelocationSiteFromText(RelocatableBuffer buffer, final Prog
                         info.getRelocationSize();
         Object target = info.getTargetObject();
         if (target instanceof DataSectionReference) {
-            long addend = ((DataSectionReference) target).getOffset() - info.getExplicitAddend();
+            long addend = ((DataSectionReference) target).getOffset() - info.getAddend();
             assert isAddendAligned(arch, addend, info.getRelocationKind()) : "improper addend alignment";
-            sectionImpl.markRelocationSite(offset, info.getRelocationKind(), roDataSection.getName(), false, addend);
+            sectionImpl.markRelocationSite(offset, info.getRelocationKind(), roDataSection.getName(), addend);
         } else if (target instanceof CGlobalDataReference) {
             CGlobalDataReference ref = (CGlobalDataReference) target;
             CGlobalDataInfo dataInfo = ref.getDataInfo();
             CGlobalDataImpl<?> data = dataInfo.getData();
-            long addend = RWDATA_CGLOBALS_PARTITION_OFFSET + dataInfo.getOffset() - info.getExplicitAddend();
+            long addend = RWDATA_CGLOBALS_PARTITION_OFFSET + dataInfo.getOffset() - info.getAddend();
             assert isAddendAligned(arch, addend, info.getRelocationKind()) : "improper addend alignment";
-            sectionImpl.markRelocationSite(offset, info.getRelocationKind(), rwDataSection.getName(), false, addend);
+            sectionImpl.markRelocationSite(offset, info.getRelocationKind(), rwDataSection.getName(), addend);
             if (dataInfo.isSymbolReference()) { // create relocation for referenced symbol
                 if (objectFile.getSymbolTable().getSymbol(data.symbolName) == null) {
                     objectFile.createUndefinedSymbol(data.symbolName, 0, true);
                 }
                 ProgbitsSectionImpl baseSectionImpl = (ProgbitsSectionImpl) rwDataSection.getImpl();
                 int offsetInSection = Math.toIntExact(RWDATA_CGLOBALS_PARTITION_OFFSET + dataInfo.getOffset());
-                baseSectionImpl.markRelocationSite(offsetInSection, RelocationKind.getDirect(wordSize), data.symbolName, false, 0L);
+                baseSectionImpl.markRelocationSite(offsetInSection, RelocationKind.getDirect(wordSize), data.symbolName, 0L);
             }
         } else if (target instanceof ConstantReference) {
             // Direct object reference in code that must be patched (not a linker relocation)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
index 0412c1c788eb..e6d473f46192 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
@@ -53,11 +53,11 @@ public RelocatableBuffer(long size, ByteOrder byteOrder) {
     }
 
     public void addRelocationWithoutAddend(int key, ObjectFile.RelocationKind relocationKind, Object targetObject) {
-        relocations.put(key, new Info(relocationKind, null, targetObject));
+        relocations.put(key, new Info(relocationKind, 0L, targetObject));
     }
 
-    public void addRelocationWithAddend(int key, ObjectFile.RelocationKind relocationKind, Long explicitAddend, Object targetObject) {
-        relocations.put(key, new Info(relocationKind, explicitAddend, targetObject));
+    public void addRelocationWithAddend(int key, ObjectFile.RelocationKind relocationKind, long addend, Object targetObject) {
+        relocations.put(key, new Info(relocationKind, addend, targetObject));
     }
 
     public boolean hasRelocations() {
@@ -78,7 +78,7 @@ public ByteBuffer getByteBuffer() {
 
     static final class Info {
         private final ObjectFile.RelocationKind relocationKind;
-        private final Long explicitAddend;
+        private final long addend;
         /**
          * The referenced object on the heap. If this is an instance of a {@link RelocatedPointer},
          * than the relocation is not treated as a data relocation but has a special meaning, e.g. a
@@ -86,9 +86,9 @@ static final class Info {
          */
         private final Object targetObject;
 
-        Info(ObjectFile.RelocationKind kind, Long explicitAddend, Object targetObject) {
+        Info(ObjectFile.RelocationKind kind, long addend, Object targetObject) {
             this.relocationKind = kind;
-            this.explicitAddend = explicitAddend;
+            this.addend = addend;
             this.targetObject = targetObject;
         }
 
@@ -100,12 +100,8 @@ public ObjectFile.RelocationKind getRelocationKind() {
             return relocationKind;
         }
 
-        public boolean hasExplicitAddend() {
-            return (explicitAddend != null);
-        }
-
-        public Long getExplicitAddend() {
-            return explicitAddend;
+        public long getAddend() {
+            return addend;
         }
 
         public Object getTargetObject() {
@@ -114,7 +110,7 @@ public Object getTargetObject() {
 
         @Override
         public String toString() {
-            return "RelocatableBuffer.Info(targetObject=" + targetObject + " relocationKind=" + relocationKind + " explicitAddend=" + explicitAddend + ")";
+            return "RelocatableBuffer.Info(targetObject=" + targetObject + " relocationKind=" + relocationKind + " addend=" + addend + ")";
         }
     }
 }

From 4f647e947075eeec333e2f9fe70f08b1e6b406fa Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Mon, 4 Oct 2021 19:06:26 +0200
Subject: [PATCH 433/681] Add AArch64DarwinUContextRegisterDumper.

---
 .../AArch64DarwinUContextRegisterDumper.java  | 123 +++++++
 ...> AArch64LinuxUContextRegisterDumper.java} |  18 +-
 .../AMD64DarwinUContextRegisterDumper.java}   |  20 +-
 .../AMD64LinuxUContextRegisterDumper.java     | 109 ++++++
 .../amd64/AMD64UContextRegisterDumper.java    | 109 ------
 .../oracle/svm/core/posix/headers/Signal.java | 314 ++++++++++--------
 .../hosted/c/codegen/CCompilerInvoker.java    |  16 +-
 7 files changed, 441 insertions(+), 268 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java
 rename substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/{AArch64UContextRegisterDumper.java => AArch64LinuxUContextRegisterDumper.java} (90%)
 rename substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/{darwin/DarwinUContextRegisterDumper.java => amd64/AMD64DarwinUContextRegisterDumper.java} (88%)
 create mode 100644 substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java
 delete mode 100644 substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64UContextRegisterDumper.java

diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java
new file mode 100644
index 000000000000..5339e5ad84ec
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64DarwinUContextRegisterDumper.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.posix.aarch64;
+
+import static com.oracle.svm.core.RegisterDumper.dumpReg;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.word.PointerBase;
+import org.graalvm.word.WordFactory;
+
+import com.oracle.svm.core.RegisterDumper;
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.annotate.Uninterruptible;
+import com.oracle.svm.core.graal.aarch64.AArch64ReservedRegisters;
+import com.oracle.svm.core.log.Log;
+import com.oracle.svm.core.posix.UContextRegisterDumper;
+import com.oracle.svm.core.posix.headers.Signal;
+import com.oracle.svm.core.util.VMError;
+
+import jdk.vm.ci.aarch64.AArch64;
+
+@Platforms({Platform.DARWIN_AARCH64.class, Platform.IOS_AARCH64.class})
+@AutomaticFeature
+class AArch64DarwinUContextRegisterDumperFeature implements Feature {
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        VMError.guarantee(AArch64.r27.equals(AArch64ReservedRegisters.HEAP_BASE_REGISTER_CANDIDATE));
+        VMError.guarantee(AArch64.r28.equals(AArch64ReservedRegisters.THREAD_REGISTER_CANDIDATE));
+        ImageSingletons.add(RegisterDumper.class, new AArch64DarwinUContextRegisterDumper());
+    }
+}
+
+public class AArch64DarwinUContextRegisterDumper implements UContextRegisterDumper {
+    @Override
+    public void dumpRegisters(Log log, Signal.ucontext_t uContext, boolean printLocationInfo, boolean allowJavaHeapAccess, boolean allowUnsafeOperations) {
+        Signal.AArch64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_aarch64();
+        Signal.GregsPointer regs = sigcontext.regs();
+        dumpReg(log, "R0  ", regs.read(0), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R1  ", regs.read(1), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R2  ", regs.read(2), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R3  ", regs.read(3), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R4  ", regs.read(4), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R5  ", regs.read(5), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R6  ", regs.read(6), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R7  ", regs.read(7), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R8  ", regs.read(8), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R9  ", regs.read(9), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R10 ", regs.read(10), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R11 ", regs.read(11), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R12 ", regs.read(12), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R13 ", regs.read(13), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R14 ", regs.read(14), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R15 ", regs.read(15), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R16 ", regs.read(16), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R17 ", regs.read(17), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R18 ", regs.read(18), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R19 ", regs.read(19), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R20 ", regs.read(20), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R21 ", regs.read(21), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R22 ", regs.read(22), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R23 ", regs.read(23), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R24 ", regs.read(24), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R25 ", regs.read(25), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R26 ", regs.read(26), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R27 ", regs.read(27), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R28 ", regs.read(28), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R29 ", sigcontext.fp(), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R30 ", sigcontext.lr(), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "SP ", sigcontext.sp(), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "PC ", sigcontext.pc(), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
+    public PointerBase getHeapBase(Signal.ucontext_t uContext) {
+        Signal.AArch64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_aarch64();
+        return WordFactory.pointer(sigcontext.regs().read(27));
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
+    public PointerBase getThreadPointer(Signal.ucontext_t uContext) {
+        Signal.AArch64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_aarch64();
+        return WordFactory.pointer(sigcontext.regs().read(28));
+    }
+
+    @Override
+    public PointerBase getSP(Signal.ucontext_t uContext) {
+        Signal.AArch64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_aarch64();
+        return WordFactory.pointer(sigcontext.sp());
+    }
+
+    @Override
+    public PointerBase getIP(Signal.ucontext_t uContext) {
+        Signal.AArch64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_aarch64();
+        return WordFactory.pointer(sigcontext.pc());
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64UContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java
similarity index 90%
rename from substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64UContextRegisterDumper.java
rename to substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java
index b3c643e630b6..235d1e157234 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64UContextRegisterDumper.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/aarch64/AArch64LinuxUContextRegisterDumper.java
@@ -40,7 +40,7 @@
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.posix.UContextRegisterDumper;
 import com.oracle.svm.core.posix.headers.Signal.GregsPointer;
-import com.oracle.svm.core.posix.headers.Signal.mcontext_t;
+import com.oracle.svm.core.posix.headers.Signal.mcontext_linux_aarch64_t;
 import com.oracle.svm.core.posix.headers.Signal.ucontext_t;
 import com.oracle.svm.core.util.VMError;
 
@@ -48,19 +48,19 @@
 
 @Platforms({Platform.LINUX_AARCH64.class, Platform.ANDROID_AARCH64.class})
 @AutomaticFeature
-class AArch64UContextRegisterDumperFeature implements Feature {
+class AArch64LinuxUContextRegisterDumperFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         VMError.guarantee(AArch64.r27.equals(AArch64ReservedRegisters.HEAP_BASE_REGISTER_CANDIDATE));
         VMError.guarantee(AArch64.r28.equals(AArch64ReservedRegisters.THREAD_REGISTER_CANDIDATE));
-        ImageSingletons.add(RegisterDumper.class, new AArch64UContextRegisterDumper());
+        ImageSingletons.add(RegisterDumper.class, new AArch64LinuxUContextRegisterDumper());
     }
 }
 
-class AArch64UContextRegisterDumper implements UContextRegisterDumper {
+class AArch64LinuxUContextRegisterDumper implements UContextRegisterDumper {
     @Override
     public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInfo, boolean allowJavaHeapAccess, boolean allowUnsafeOperations) {
-        mcontext_t sigcontext = uContext.uc_mcontext();
+        mcontext_linux_aarch64_t sigcontext = uContext.uc_mcontext_linux_aarch64();
         GregsPointer regs = sigcontext.regs();
         dumpReg(log, "R0  ", regs.read(0), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
         dumpReg(log, "R1  ", regs.read(1), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
@@ -100,26 +100,26 @@ public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInf
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
     public PointerBase getHeapBase(ucontext_t uContext) {
-        GregsPointer regs = uContext.uc_mcontext().regs();
+        GregsPointer regs = uContext.uc_mcontext_linux_aarch64().regs();
         return WordFactory.pointer(regs.read(27));
     }
 
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
     public PointerBase getThreadPointer(ucontext_t uContext) {
-        GregsPointer regs = uContext.uc_mcontext().regs();
+        GregsPointer regs = uContext.uc_mcontext_linux_aarch64().regs();
         return WordFactory.pointer(regs.read(28));
     }
 
     @Override
     public PointerBase getSP(ucontext_t uContext) {
-        mcontext_t sigcontext = uContext.uc_mcontext();
+        mcontext_linux_aarch64_t sigcontext = uContext.uc_mcontext_linux_aarch64();
         return WordFactory.pointer(sigcontext.sp());
     }
 
     @Override
     public PointerBase getIP(ucontext_t uContext) {
-        mcontext_t sigcontext = uContext.uc_mcontext();
+        mcontext_linux_aarch64_t sigcontext = uContext.uc_mcontext_linux_aarch64();
         return WordFactory.pointer(sigcontext.pc());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java
similarity index 88%
rename from substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinUContextRegisterDumper.java
rename to substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java
index d3005a855363..ee6a6b101245 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinUContextRegisterDumper.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64DarwinUContextRegisterDumper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.posix.darwin;
+package com.oracle.svm.core.posix.amd64;
 
 import static com.oracle.svm.core.RegisterDumper.dumpReg;
 
@@ -45,21 +45,21 @@
 
 import jdk.vm.ci.amd64.AMD64;
 
-@Platforms({Platform.DARWIN.class})
+@Platforms({Platform.DARWIN_AMD64.class})
 @AutomaticFeature
-class DarwinUContextRegisterDumperFeature implements Feature {
+class AMD64DarwinUContextRegisterDumperFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         VMError.guarantee(AMD64.r14.equals(AMD64ReservedRegisters.HEAP_BASE_REGISTER_CANDIDATE));
         VMError.guarantee(AMD64.r15.equals(AMD64ReservedRegisters.THREAD_REGISTER_CANDIDATE));
-        ImageSingletons.add(RegisterDumper.class, new DarwinUContextRegisterDumper());
+        ImageSingletons.add(RegisterDumper.class, new AMD64DarwinUContextRegisterDumper());
     }
 }
 
-class DarwinUContextRegisterDumper implements UContextRegisterDumper {
+class AMD64DarwinUContextRegisterDumper implements UContextRegisterDumper {
     @Override
     public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInfo, boolean allowJavaHeapAccess, boolean allowUnsafeOperations) {
-        Signal.MContext64 sigcontext = uContext.uc_mcontext64();
+        Signal.AMD64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_amd64();
         dumpReg(log, "RAX ", ((Pointer) sigcontext).readLong(sigcontext.rax_offset()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
         dumpReg(log, "RBX ", ((Pointer) sigcontext).readLong(sigcontext.rbx_offset()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
         dumpReg(log, "RCX ", ((Pointer) sigcontext).readLong(sigcontext.rcx_offset()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
@@ -83,26 +83,26 @@ public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInf
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
     public PointerBase getHeapBase(ucontext_t uContext) {
-        Signal.MContext64 sigcontext = uContext.uc_mcontext64();
+        Signal.AMD64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_amd64();
         return ((Pointer) sigcontext).readWord(sigcontext.r14_offset());
     }
 
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
     public PointerBase getThreadPointer(ucontext_t uContext) {
-        Signal.MContext64 sigcontext = uContext.uc_mcontext64();
+        Signal.AMD64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_amd64();
         return ((Pointer) sigcontext).readWord(sigcontext.r15_offset());
     }
 
     @Override
     public PointerBase getSP(ucontext_t uContext) {
-        Signal.MContext64 sigcontext = uContext.uc_mcontext64();
+        Signal.AMD64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_amd64();
         return ((Pointer) sigcontext).readWord(sigcontext.rsp_offset());
     }
 
     @Override
     public PointerBase getIP(ucontext_t uContext) {
-        Signal.MContext64 sigcontext = uContext.uc_mcontext64();
+        Signal.AMD64DarwinMContext64 sigcontext = uContext.uc_mcontext_darwin_amd64();
         return ((Pointer) sigcontext).readWord(sigcontext.rip_offset());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java
new file mode 100644
index 000000000000..ca6a660c6bb9
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64LinuxUContextRegisterDumper.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018, 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.posix.amd64;
+
+import static com.oracle.svm.core.RegisterDumper.dumpReg;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.word.PointerBase;
+import org.graalvm.word.WordFactory;
+
+import com.oracle.svm.core.RegisterDumper;
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.annotate.Uninterruptible;
+import com.oracle.svm.core.graal.amd64.AMD64ReservedRegisters;
+import com.oracle.svm.core.log.Log;
+import com.oracle.svm.core.posix.UContextRegisterDumper;
+import com.oracle.svm.core.posix.headers.Signal.GregEnumLinuxAMD64;
+import com.oracle.svm.core.posix.headers.Signal.GregsPointer;
+import com.oracle.svm.core.posix.headers.Signal.ucontext_t;
+import com.oracle.svm.core.util.VMError;
+
+import jdk.vm.ci.amd64.AMD64;
+
+@Platforms({Platform.LINUX_AMD64.class})
+@AutomaticFeature
+class AMD64LinuxUContextRegisterDumperFeature implements Feature {
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        VMError.guarantee(AMD64.r14.equals(AMD64ReservedRegisters.HEAP_BASE_REGISTER_CANDIDATE));
+        VMError.guarantee(AMD64.r15.equals(AMD64ReservedRegisters.THREAD_REGISTER_CANDIDATE));
+        ImageSingletons.add(RegisterDumper.class, new AMD64LinuxUContextRegisterDumper());
+    }
+}
+
+class AMD64LinuxUContextRegisterDumper implements UContextRegisterDumper {
+    @Override
+    public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInfo, boolean allowJavaHeapAccess, boolean allowUnsafeOperations) {
+        GregsPointer gregs = uContext.uc_mcontext_linux_amd64_gregs();
+        dumpReg(log, "RAX ", gregs.read(GregEnumLinuxAMD64.REG_RAX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RBX ", gregs.read(GregEnumLinuxAMD64.REG_RBX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RCX ", gregs.read(GregEnumLinuxAMD64.REG_RCX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RDX ", gregs.read(GregEnumLinuxAMD64.REG_RDX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RBP ", gregs.read(GregEnumLinuxAMD64.REG_RBP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RSI ", gregs.read(GregEnumLinuxAMD64.REG_RSI()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RDI ", gregs.read(GregEnumLinuxAMD64.REG_RDI()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RSP ", gregs.read(GregEnumLinuxAMD64.REG_RSP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R8  ", gregs.read(GregEnumLinuxAMD64.REG_R8()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R9  ", gregs.read(GregEnumLinuxAMD64.REG_R9()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R10 ", gregs.read(GregEnumLinuxAMD64.REG_R10()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R11 ", gregs.read(GregEnumLinuxAMD64.REG_R11()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R12 ", gregs.read(GregEnumLinuxAMD64.REG_R12()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R13 ", gregs.read(GregEnumLinuxAMD64.REG_R13()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R14 ", gregs.read(GregEnumLinuxAMD64.REG_R14()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "R15 ", gregs.read(GregEnumLinuxAMD64.REG_R15()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "EFL ", gregs.read(GregEnumLinuxAMD64.REG_EFL()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+        dumpReg(log, "RIP ", gregs.read(GregEnumLinuxAMD64.REG_RIP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true, calleeMustBe = false)
+    public PointerBase getHeapBase(ucontext_t uContext) {
+        GregsPointer gregs = uContext.uc_mcontext_linux_amd64_gregs();
+        return WordFactory.pointer(gregs.read(GregEnumLinuxAMD64.REG_R14()));
+    }
+
+    @Override
+    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true, calleeMustBe = false)
+    public PointerBase getThreadPointer(ucontext_t uContext) {
+        GregsPointer gregs = uContext.uc_mcontext_linux_amd64_gregs();
+        return WordFactory.pointer(gregs.read(GregEnumLinuxAMD64.REG_R15()));
+    }
+
+    @Override
+    public PointerBase getSP(ucontext_t uContext) {
+        GregsPointer gregs = uContext.uc_mcontext_linux_amd64_gregs();
+        return WordFactory.pointer(gregs.read(GregEnumLinuxAMD64.REG_RSP()));
+    }
+
+    @Override
+    public PointerBase getIP(ucontext_t uContext) {
+        GregsPointer gregs = uContext.uc_mcontext_linux_amd64_gregs();
+        return WordFactory.pointer(gregs.read(GregEnumLinuxAMD64.REG_RIP()));
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64UContextRegisterDumper.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64UContextRegisterDumper.java
deleted file mode 100644
index a4c6a205dd14..000000000000
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/amd64/AMD64UContextRegisterDumper.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2018, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.posix.amd64;
-
-import static com.oracle.svm.core.RegisterDumper.dumpReg;
-
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.word.PointerBase;
-import org.graalvm.word.WordFactory;
-
-import com.oracle.svm.core.RegisterDumper;
-import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.annotate.Uninterruptible;
-import com.oracle.svm.core.graal.amd64.AMD64ReservedRegisters;
-import com.oracle.svm.core.log.Log;
-import com.oracle.svm.core.posix.UContextRegisterDumper;
-import com.oracle.svm.core.posix.headers.Signal.GregEnum;
-import com.oracle.svm.core.posix.headers.Signal.GregsPointer;
-import com.oracle.svm.core.posix.headers.Signal.ucontext_t;
-import com.oracle.svm.core.util.VMError;
-
-import jdk.vm.ci.amd64.AMD64;
-
-@Platforms({Platform.LINUX_AMD64.class})
-@AutomaticFeature
-class AMD64UContextRegisterDumperFeature implements Feature {
-    @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        VMError.guarantee(AMD64.r14.equals(AMD64ReservedRegisters.HEAP_BASE_REGISTER_CANDIDATE));
-        VMError.guarantee(AMD64.r15.equals(AMD64ReservedRegisters.THREAD_REGISTER_CANDIDATE));
-        ImageSingletons.add(RegisterDumper.class, new AMD64UContextRegisterDumper());
-    }
-}
-
-class AMD64UContextRegisterDumper implements UContextRegisterDumper {
-    @Override
-    public void dumpRegisters(Log log, ucontext_t uContext, boolean printLocationInfo, boolean allowJavaHeapAccess, boolean allowUnsafeOperations) {
-        GregsPointer gregs = uContext.uc_mcontext_gregs();
-        dumpReg(log, "RAX ", gregs.read(GregEnum.REG_RAX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RBX ", gregs.read(GregEnum.REG_RBX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RCX ", gregs.read(GregEnum.REG_RCX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RDX ", gregs.read(GregEnum.REG_RDX()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RBP ", gregs.read(GregEnum.REG_RBP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RSI ", gregs.read(GregEnum.REG_RSI()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RDI ", gregs.read(GregEnum.REG_RDI()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RSP ", gregs.read(GregEnum.REG_RSP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R8  ", gregs.read(GregEnum.REG_R8()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R9  ", gregs.read(GregEnum.REG_R9()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R10 ", gregs.read(GregEnum.REG_R10()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R11 ", gregs.read(GregEnum.REG_R11()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R12 ", gregs.read(GregEnum.REG_R12()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R13 ", gregs.read(GregEnum.REG_R13()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R14 ", gregs.read(GregEnum.REG_R14()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "R15 ", gregs.read(GregEnum.REG_R15()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "EFL ", gregs.read(GregEnum.REG_EFL()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-        dumpReg(log, "RIP ", gregs.read(GregEnum.REG_RIP()), printLocationInfo, allowJavaHeapAccess, allowUnsafeOperations);
-    }
-
-    @Override
-    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true, calleeMustBe = false)
-    public PointerBase getHeapBase(ucontext_t uContext) {
-        GregsPointer gregs = uContext.uc_mcontext_gregs();
-        return WordFactory.pointer(gregs.read(GregEnum.REG_R14()));
-    }
-
-    @Override
-    @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true, calleeMustBe = false)
-    public PointerBase getThreadPointer(ucontext_t uContext) {
-        GregsPointer gregs = uContext.uc_mcontext_gregs();
-        return WordFactory.pointer(gregs.read(GregEnum.REG_R15()));
-    }
-
-    @Override
-    public PointerBase getSP(ucontext_t uContext) {
-        GregsPointer gregs = uContext.uc_mcontext_gregs();
-        return WordFactory.pointer(gregs.read(GregEnum.REG_RSP()));
-    }
-
-    @Override
-    public PointerBase getIP(ucontext_t uContext) {
-        GregsPointer gregs = uContext.uc_mcontext_gregs();
-        return WordFactory.pointer(gregs.read(GregEnum.REG_RIP()));
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Signal.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Signal.java
index d73b4df2b867..c469a16d391a 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Signal.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Signal.java
@@ -110,19 +110,149 @@ public interface siginfo_t extends PointerBase {
         VoidPointer si_addr();
     }
 
-    @Platforms(Platform.LINUX.class)
+    @Platforms({Platform.LINUX.class, Platform.DARWIN_AARCH64.class, Platform.IOS_AARCH64.class})
     @CPointerTo(nameOfCType = "long long int")
     public interface GregsPointer extends PointerBase {
         long read(int index);
     }
 
+    @CStruct
+    public interface ucontext_t extends RegisterDumper.Context {
+        @CFieldAddress("uc_mcontext.gregs")
+        @Platforms({Platform.LINUX_AMD64.class})
+        GregsPointer uc_mcontext_linux_amd64_gregs();
+
+        @CFieldAddress("uc_mcontext")
+        @Platforms({Platform.LINUX_AARCH64.class, Platform.ANDROID_AARCH64.class})
+        mcontext_linux_aarch64_t uc_mcontext_linux_aarch64();
+
+        @CField("uc_mcontext")
+        @Platforms({Platform.DARWIN_AMD64.class})
+        AMD64DarwinMContext64 uc_mcontext_darwin_amd64();
+
+        @CField("uc_mcontext")
+        @Platforms({Platform.DARWIN_AARCH64.class, Platform.IOS_AARCH64.class})
+        AArch64DarwinMContext64 uc_mcontext_darwin_aarch64();
+    }
+
+    public interface AdvancedSignalDispatcher extends CFunctionPointer {
+        @InvokeCFunctionPointer
+        void dispatch(int signum, siginfo_t siginfo, WordPointer opaque);
+    }
+
+    @CConstant
+    public static native int SA_RESTART();
+
+    @CConstant
+    public static native int SA_SIGINFO();
+
+    @CConstant
+    public static native int SA_NODEFER();
+
+    @CStruct(addStructKeyword = true)
+    public interface sigaction extends PointerBase {
+        @CField
+        SignalDispatcher sa_handler();
+
+        @CField
+        void sa_handler(SignalDispatcher value);
+
+        @CField
+        AdvancedSignalDispatcher sa_sigaction();
+
+        @CField
+        void sa_sigaction(AdvancedSignalDispatcher value);
+
+        @CField
+        int sa_flags();
+
+        @CField
+        void sa_flags(int value);
+
+        @CFieldAddress
+        sigset_tPointer sa_mask();
+    }
+
+    /** @param signum from {@link SignalEnum#getCValue()} */
+    @CFunction
+    public static native int sigaction(int signum, sigaction act, sigaction oldact);
+
+    @CEnum
+    @CContext(PosixDirectives.class)
+    public enum SignalEnum {
+        SIGABRT,
+        SIGALRM,
+        SIGBUS,
+        SIGCHLD,
+        SIGCONT,
+        SIGFPE,
+        SIGHUP,
+        SIGILL,
+        SIGINT,
+        SIGIO,
+        SIGIOT,
+        SIGKILL,
+        SIGPIPE,
+        SIGPROF,
+        SIGQUIT,
+        SIGSEGV,
+        SIGSTOP,
+        SIGSYS,
+        SIGTERM,
+        SIGTRAP,
+        SIGTSTP,
+        SIGTTIN,
+        SIGTTOU,
+        SIGURG,
+        SIGUSR1,
+        SIGUSR2,
+        SIGVTALRM,
+        SIGWINCH,
+        SIGXCPU,
+        SIGXFSZ;
+
+        @CEnumValue
+        public native int getCValue();
+    }
+
+    @Platforms(Platform.LINUX.class)
+    @CEnum
+    @CContext(PosixDirectives.class)
+    public enum LinuxSignalEnum {
+        SIGPOLL,
+        SIGPWR;
+
+        @CEnumValue
+        public native int getCValue();
+    }
+
+    @Platforms(Platform.DARWIN.class)
+    @CEnum
+    @CContext(PosixDirectives.class)
+    public enum DarwinSignalEnum {
+        SIGINFO,
+        SIGEMT;
+
+        @CEnumValue
+        public native int getCValue();
+    }
+
+    @CFunction
+    public static native int sigemptyset(sigset_tPointer set);
+
+    @CFunction
+    public static native int sigaddset(sigset_tPointer set, int signum);
+
     /**
      * Used in {@link SubstrateSegfaultHandler}. So, this must not be a {@link CEnum} as this would
      * result in machine code that needs a proper a heap base.
+     *
+     * Information about Linux's AMD64 struct sigcontext_64 uc_mcontext can be found at
+     * https://github.com/torvalds/linux/blob/9e1ff307c779ce1f0f810c7ecce3d95bbae40896/arch/x86/include/uapi/asm/sigcontext.h#L238
      */
     @Platforms({Platform.LINUX_AMD64.class})
     @CContext(PosixDirectives.class)
-    public static final class GregEnum {
+    public static final class GregEnumLinuxAMD64 {
         @CConstant
         public static native int REG_R8();
 
@@ -193,25 +323,39 @@ public static final class GregEnum {
         public static native int REG_CR2();
     }
 
-    @CStruct
-    public interface ucontext_t extends RegisterDumper.Context {
-        @CFieldAddress("uc_mcontext.gregs")
-        @Platforms({Platform.LINUX_AMD64.class})
-        GregsPointer uc_mcontext_gregs();
+    /**
+     * Information about Linux's AArch64 struct sigcontext uc_mcontext can be found at
+     * https://github.com/torvalds/linux/blob/9e1ff307c779ce1f0f810c7ecce3d95bbae40896/arch/arm64/include/uapi/asm/sigcontext.h#L28
+     */
+    @CStruct(value = "mcontext_t")
+    @Platforms({Platform.LINUX_AARCH64.class, Platform.ANDROID_AARCH64.class})
+    public interface mcontext_linux_aarch64_t extends PointerBase {
+        @CField
+        long fault_address();
 
-        @CFieldAddress("uc_mcontext")
-        @Platforms({Platform.LINUX_AARCH64.class, Platform.ANDROID_AARCH64.class})
-        mcontext_t uc_mcontext();
+        @CFieldAddress
+        GregsPointer regs();
 
-        @CField("uc_mcontext")
-        @Platforms({Platform.DARWIN.class})
-        MContext64 uc_mcontext64();
+        @CField
+        long sp();
+
+        @CField
+        long pc();
+
+        @CField
+        long pstate();
     }
 
-    @Platforms({Platform.DARWIN.class})
+    /**
+     * Information about Darwin's AMD64 mcontext64 can be found at
+     * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/i386/_mcontext.h#L147
+     *
+     * Information about _STRUCT_X86_THREAD_STATE64 can be found at
+     * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/osfmk/mach/i386/_structs.h#L739
+     */
+    @Platforms({Platform.DARWIN_AMD64.class})
     @CStruct(value = "__darwin_mcontext64", addStructKeyword = true)
-    public interface MContext64 extends PointerBase {
-
+    public interface AMD64DarwinMContext64 extends PointerBase {
         @CFieldOffset("__ss.__rax")
         int rax_offset();
 
@@ -267,130 +411,30 @@ public interface MContext64 extends PointerBase {
         int efl_offset();
     }
 
-    @CStruct
-    @Platforms({Platform.LINUX_AARCH64.class, Platform.ANDROID_AARCH64.class})
-    public interface mcontext_t extends PointerBase {
-        @CField
-        long fault_address();
-
-        @CFieldAddress
+    /**
+     * Information about Darwin's AArch64 mcontext64 can be found at
+     * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/arm/_mcontext.h#L70
+     *
+     * Information about _STRUCT_ARM_THREAD_STATE64 can be found at
+     * https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/osfmk/mach/arm/_structs.h#L102
+     */
+    @Platforms({Platform.DARWIN_AARCH64.class, Platform.IOS_AARCH64.class})
+    @CStruct(value = "__darwin_mcontext64", addStructKeyword = true)
+    public interface AArch64DarwinMContext64 extends PointerBase {
+        @CFieldAddress("__ss.__x")
         GregsPointer regs();
 
-        @CField
-        long sp();
-
-        @CField
-        long pc();
-
-        @CField
-        long pstate();
-    }
-
-    public interface AdvancedSignalDispatcher extends CFunctionPointer {
-        @InvokeCFunctionPointer
-        void dispatch(int signum, siginfo_t siginfo, WordPointer opaque);
-    }
-
-    @CConstant
-    public static native int SA_RESTART();
-
-    @CConstant
-    public static native int SA_SIGINFO();
-
-    @CConstant
-    public static native int SA_NODEFER();
-
-    @CStruct(addStructKeyword = true)
-    public interface sigaction extends PointerBase {
-        @CField
-        SignalDispatcher sa_handler();
-
-        @CField
-        void sa_handler(SignalDispatcher value);
-
-        @CField
-        AdvancedSignalDispatcher sa_sigaction();
+        @CField("__ss.__fp")
+        long fp();
 
-        @CField
-        void sa_sigaction(AdvancedSignalDispatcher value);
-
-        @CField
-        int sa_flags();
+        @CField("__ss.__lr")
+        long lr();
 
-        @CField
-        void sa_flags(int value);
-
-        @CFieldAddress
-        sigset_tPointer sa_mask();
-    }
-
-    /** @param signum from {@link SignalEnum#getCValue()} */
-    @CFunction
-    public static native int sigaction(int signum, sigaction act, sigaction oldact);
-
-    @CEnum
-    @CContext(PosixDirectives.class)
-    public enum SignalEnum {
-        SIGABRT,
-        SIGALRM,
-        SIGBUS,
-        SIGCHLD,
-        SIGCONT,
-        SIGFPE,
-        SIGHUP,
-        SIGILL,
-        SIGINT,
-        SIGIO,
-        SIGIOT,
-        SIGKILL,
-        SIGPIPE,
-        SIGPROF,
-        SIGQUIT,
-        SIGSEGV,
-        SIGSTOP,
-        SIGSYS,
-        SIGTERM,
-        SIGTRAP,
-        SIGTSTP,
-        SIGTTIN,
-        SIGTTOU,
-        SIGURG,
-        SIGUSR1,
-        SIGUSR2,
-        SIGVTALRM,
-        SIGWINCH,
-        SIGXCPU,
-        SIGXFSZ;
-
-        @CEnumValue
-        public native int getCValue();
-    }
-
-    @Platforms(Platform.LINUX.class)
-    @CEnum
-    @CContext(PosixDirectives.class)
-    public enum LinuxSignalEnum {
-        SIGPOLL,
-        SIGPWR;
-
-        @CEnumValue
-        public native int getCValue();
-    }
-
-    @Platforms(Platform.DARWIN.class)
-    @CEnum
-    @CContext(PosixDirectives.class)
-    public enum DarwinSignalEnum {
-        SIGINFO,
-        SIGEMT;
+        @CField("__ss.__sp")
+        long sp();
 
-        @CEnumValue
-        public native int getCValue();
+        @CField("__ss.__pc")
+        long pc();
     }
 
-    @CFunction
-    public static native int sigemptyset(sigset_tPointer set);
-
-    @CFunction
-    public static native int sigaddset(sigset_tPointer set, int signum);
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
index f2ddc74f7c7d..b32d97e584a0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
@@ -258,10 +258,10 @@ protected void verify() {
             Class<? extends Architecture> substrateTargetArch = ImageSingletons.lookup(SubstrateTargetDescription.class).arch.getClass();
             Class<? extends Architecture> guessed = guessArchitecture(compilerInfo.targetArch);
             if (guessed == null) {
-                UserError.abort("Native toolchain (%s) has no matching native-image target architecture.", compilerInfo.targetArch);
+                UserError.abort("Linux native toolchain (%s) has no matching native-image target architecture.", compilerInfo.targetArch);
             }
             if (guessed != substrateTargetArch) {
-                UserError.abort("Native toolchain (%s) implies native-image target architecture %s but configured native-image target architecture is %s.",
+                UserError.abort("Linux native toolchain (%s) implies native-image target architecture %s but configured native-image target architecture is %s.",
                                 compilerInfo.targetArch, guessed, substrateTargetArch);
             }
         }
@@ -302,9 +302,14 @@ protected CompilerInfo createCompilerInfo(Path compilerPath, Scanner scanner) {
 
         @Override
         protected void verify() {
-            if (guessArchitecture(compilerInfo.targetArch) != AMD64.class) {
-                UserError.abort("Native-image building on Darwin currently only supports target architecture: %s (%s unsupported)",
-                                AMD64.class.getSimpleName(), compilerInfo.targetArch);
+            Class<? extends Architecture> substrateTargetArch = ImageSingletons.lookup(SubstrateTargetDescription.class).arch.getClass();
+            Class<? extends Architecture> guessed = guessArchitecture(compilerInfo.targetArch);
+            if (guessed == null) {
+                UserError.abort("Darwin native toolchain (%s) has no matching native-image target architecture.", compilerInfo.targetArch);
+            }
+            if (guessed != substrateTargetArch) {
+                UserError.abort("Darwin native toolchain (%s) implies native-image target architecture %s but configured native-image target architecture is %s.",
+                                compilerInfo.targetArch, guessed, substrateTargetArch);
             }
         }
 
@@ -427,6 +432,7 @@ protected static Class<? extends Architecture> guessArchitecture(String archStr)
             case "x64": /* Windows notation */
                 return AMD64.class;
             case "aarch64":
+            case "arm64": /* Darwin notation */
                 return AArch64.class;
             case "i686":
             case "80x86": /* Windows notation */

From 1b56a183092d77c9b764d3dbe00058ba21af7e3a Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Mon, 4 Oct 2021 19:46:30 +0200
Subject: [PATCH 434/681] Reserve register on Darwin AArch64.

---
 .../graal/aarch64/SubstrateAArch64RegisterConfig.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
index d8990cb864bf..b39ba697c41c 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
@@ -28,6 +28,7 @@
 import static jdk.vm.ci.aarch64.AArch64.allRegisters;
 import static jdk.vm.ci.aarch64.AArch64.r0;
 import static jdk.vm.ci.aarch64.AArch64.r1;
+import static jdk.vm.ci.aarch64.AArch64.r18;
 import static jdk.vm.ci.aarch64.AArch64.r19;
 import static jdk.vm.ci.aarch64.AArch64.r2;
 import static jdk.vm.ci.aarch64.AArch64.r20;
@@ -68,6 +69,7 @@
 
 import java.util.ArrayList;
 
+import com.oracle.svm.core.OS;
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.graal.code.SubstrateCallingConvention;
@@ -138,6 +140,13 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta
          */
         regs.remove(ReservedRegisters.singleton().getHeapBaseRegister());
         regs.remove(ReservedRegisters.singleton().getThreadRegister());
+        /*
+         * Darwin specifies that r18 is a platform-reserved register:
+         * https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms
+         */
+        if (OS.getCurrent() == OS.DARWIN) {
+            regs.remove(r18);
+        }
         allocatableRegs = new RegisterArray(regs);
 
         switch (config) {

From 8dcf51febac87c9cc60d320b56c1d7cce9e8121b Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Mon, 4 Oct 2021 19:57:56 +0200
Subject: [PATCH 435/681] Add CPUFeature detection for darwin aarch64.

---
 .../src/cpuid.c                               | 54 ++++++++++++++++---
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c b/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c
index 61fbc311b0ed..1c63fe3ae3af 100644
--- a/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c
+++ b/substratevm/src/com.oracle.svm.native.libchelper/src/cpuid.c
@@ -25,8 +25,8 @@
 
 
 #if defined(__x86_64__) || defined(_WIN64)
-#include<stdint.h>
-#include<string.h>
+#include <stdint.h>
+#include <string.h>
 #include "amd64cpufeatures.h"
 #include "amd64hotspotcpuinfo.h"
 
@@ -550,17 +550,56 @@ void determineCPUFeatures(CPUFeatures *features)
 
 #elif defined(__aarch64__)
 
-#include <sys/auxv.h>
-#include <asm/hwcap.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+/*
+ * The corresponding HotSpot code can be found in vm_version_bsd_aarch64.
+ */
+#if defined(__APPLE__)
+
+#include <stdint.h>
+#include <sys/sysctl.h>
 #include "aarch64cpufeatures.h"
 
+static uint32_t cpu_has(const char* optional) {
+  uint32_t val;
+  size_t len = sizeof(val);
+  if (sysctlbyname(optional, &val, &len, NULL, 0)) {
+    return 0;
+  }
+  return val;
+}
+
+void determineCPUFeatures(CPUFeatures* features) {
+  features->fFP = !!(cpu_has("hw.optional.floatingpoint"));
+  features->fASIMD = !!(cpu_has("hw.optional.neon"));
+  features->fEVTSTRM = 0;
+  features->fAES = 0;
+  features->fPMULL = 0;
+  features->fSHA1 = 0;
+  features->fSHA2 = 0;
+  features->fCRC32 = !!(cpu_has("hw.optional.armv8_crc32"));
+  features->fLSE = !!(cpu_has("hw.optional.armv8_1_atomics"));
+  features->fDCPOP = 0;
+  features->fSHA3 = 0;
+  features->fSHA512 = 0;
+  features->fSVE = 0;
+  features->fSVE2 = 0;
+  features->fSTXRPREFETCH = 0;
+  features->fA53MAC = 0;
+  features->fDMBATOMICS = 0;
+}
+
 /*
  * The corresponding HotSpot code can be found in vm_version_aarch64 and
  * vm_version_linux_aarch64.
  */
+#elif defined(__linux__)
+
+#include <sys/auxv.h>
+#include <asm/hwcap.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "aarch64cpufeatures.h"
 
 #ifndef HWCAP_FP
 #define HWCAP_FP            (1L << 0)
@@ -675,6 +714,7 @@ void determineCPUFeatures(CPUFeatures* features) {
   if (_cpu == CPU_CAVIUM && _model == 0xA1 && _variant == 0)
     features->fDMBATOMICS = 1;
 }
+#endif
 
 #else
 /*

From 9dc465f42a699600057439e7c1cbdf6ca2b11a5d Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Tue, 12 Oct 2021 16:20:05 +0200
Subject: [PATCH 436/681] Remember previous options to reinitialize the isolate
 if needed.

---
 .../LibGraalHotSpotTruffleCompiler.java         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
index b17238329ec9..423c0f8ba73a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime.hotspot.libgraal/src/org/graalvm/compiler/truffle/runtime/hotspot/libgraal/LibGraalHotSpotTruffleCompiler.java
@@ -59,6 +59,7 @@ static final class Handle extends LibGraalObject {
     private final ThreadLocal<LibGraalTruffleCompilation> activeCompilation = new ThreadLocal<>();
 
     private final LibGraalTruffleRuntime runtime;
+    private volatile Map<String, Object> previousOptions;
 
     private long handle(Supplier<Map<String, Object>> optionsSupplier, CompilableTruffleAST compilable, boolean firstInitialization) {
         return handleImpl(() -> {
@@ -92,6 +93,14 @@ private static long handleImpl(Supplier<Handle> handleSupplier) {
     @SuppressWarnings("try")
     @Override
     public void initialize(Map<String, Object> options, CompilableTruffleAST compilable, boolean firstInitialization) {
+        /*
+         * There can only be a single set of options a compiler can be configured with. The first
+         * Truffle engine of a process typically initializes the compiler which also determines the
+         * compiler configuration. Any options specified after that will be ignored. So it is safe
+         * to store the previous options here and reuse later for recreating a disposed isolate if
+         * needed.
+         */
+        previousOptions = options;
         // Force installation of the Truffle call boundary methods.
         // See AbstractHotSpotTruffleRuntime.setDontInlineCallBoundaryMethod
         // for further details.
@@ -144,7 +153,9 @@ public void shutdown() {
     @SuppressWarnings("try")
     public void installTruffleCallBoundaryMethod(ResolvedJavaMethod method) {
         try (LibGraalScope scope = new LibGraalScope(LibGraalScope.DetachAction.DETACH_RUNTIME_AND_RELEASE)) {
-            TruffleToLibGraalCalls.installTruffleCallBoundaryMethod(getIsolateThread(), handle(), LibGraal.translate(method));
+            Map<String, Object> options = previousOptions;
+            assert options != null : "truffle compiler was never initialized";
+            TruffleToLibGraalCalls.installTruffleCallBoundaryMethod(getIsolateThread(), handle(options, null), LibGraal.translate(method));
         }
     }
 
@@ -152,7 +163,9 @@ public void installTruffleCallBoundaryMethod(ResolvedJavaMethod method) {
     @SuppressWarnings("try")
     public void installTruffleReservedOopMethod(ResolvedJavaMethod method) {
         try (LibGraalScope scope = new LibGraalScope(LibGraalScope.DetachAction.DETACH_RUNTIME_AND_RELEASE)) {
-            TruffleToLibGraalCalls.installTruffleReservedOopMethod(getIsolateThread(), handle(), LibGraal.translate(method));
+            Map<String, Object> options = previousOptions;
+            assert options != null : "truffle compiler was never initialized";
+            TruffleToLibGraalCalls.installTruffleReservedOopMethod(getIsolateThread(), handle(options, null), LibGraal.translate(method));
         }
     }
 

From 078769fa0241dd736d1c972cb5256dcaa8e5b990 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 12 Oct 2021 16:39:58 +0200
Subject: [PATCH 437/681] mx eclipseformat.

---
 .../isolated/IsolatedTruffleCompilerEventForwarder.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
index 464c1f797cef..3ee487c86458 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilerEventForwarder.java
@@ -124,7 +124,8 @@ private static void onFailure0(@SuppressWarnings("unused") ClientIsolateThread c
 
     @CEntryPoint(include = CEntryPoint.NotIncludedAutomatically.class)
     @CEntryPointOptions(publishAs = CEntryPointOptions.Publish.NotPublished)
-    private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle, @SuppressWarnings("unused") ClientHandle<TruffleCompilationTask> task) {
+    private static void onCompilationRetry0(@SuppressWarnings("unused") ClientIsolateThread client, ClientHandle<IsolatedEventContext> contextHandle,
+                    @SuppressWarnings("unused") ClientHandle<TruffleCompilationTask> task) {
         IsolatedEventContext context = IsolatedCompileClient.get().unhand(contextHandle);
         context.listener.onCompilationRetry(context.compilable, context.task);
     }

From 2d3e6016d1ce2935e46e93a0a9a0636a05e61740 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Tue, 12 Oct 2021 15:10:33 +0200
Subject: [PATCH 438/681] New formatting for tracing.

---
 .../runtime/GraalTruffleRuntimeListener.java  |  6 +-
 .../debug/TraceCompilationListener.java       | 74 +++++++++++++------
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
index 1aad23ad9cac..c0671be40338 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListener.java
@@ -127,11 +127,7 @@ default void onCompilationStarted(OptimizedCallTarget target, int tier) {
      * Notifies this object when compilation of {@code target} is about to start.
      *
      * @param target the call target about to be compiled
-     * @param tier which compilation tier is in question.
-     * @param weight the parameter by which we choose this compilation among others form the queue.
-     * @param rate the dynamic component that contributes to weight.
-     * @param queueChange how has starting this compilation impacted the number of compilations in
-     *            the queue.
+     * @param task which compilation task is in question.
      */
     @SuppressWarnings({"unused", "deprecated"})
     default void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationTask task) {
diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
index 633127f71d48..e030f2ee385d 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/debug/TraceCompilationListener.java
@@ -56,17 +56,18 @@ public static void install(GraalTruffleRuntime runtime) {
         runtime.addListener(new TraceCompilationListener(runtime));
     }
 
-    public static final String TIER_FORMAT = " Tier %d ";
-    private static final String QUEUE_FORMAT = "Queue: Size %4d Change %c%-2d Scale %5.2f Elapsed %4dus ";
+    public static final String TIER_FORMAT = "Tier %d";
+    private static final String QUEUE_FORMAT = "Queue: Size %4d Change %c%-2d Load %5.2f Time %5dus";
     private static final String TARGET_FORMAT = "id=%-5d %-50s ";
+    public static final String COUNT_THRESHOLD_FORMAT = "Count/Thres  %9d/%9d";
     // @formatter:off
-    private static final String QUEUED_FORMAT   = "opt queued   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Src %s | Time %d";
-    private static final String UNQUEUED_FORMAT = "opt unqueued " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Count/Thres  %8d/%8d | "    + QUEUE_FORMAT + "| Reason: %s | Src %s | Time %d";
-    private static final String START_FORMAT    = "opt start    " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Weight %8d | Rate %.5f | " + QUEUE_FORMAT + "| Src %s | Time %d";
-    private static final String DONE_FORMAT     = "opt done     " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Src %s | Time %d";
-    private static final String FAILED_FORMAT   = "opt failed   " + TARGET_FORMAT + "|" + TIER_FORMAT + "| Elapsed %22s | Reason: %s | Src %s | Time %d";
-    private static final String INV_FORMAT      = "opt inv      " + TARGET_FORMAT + "| Reason %s | Src %s | Time %d";
-    private static final String DEOPT_FORMAT    = "opt deopt    " + TARGET_FORMAT + "| Src %s | Time %d";
+    private static final String QUEUED_FORMAT   = "opt queued " + TARGET_FORMAT + "|" + TIER_FORMAT + "|" + COUNT_THRESHOLD_FORMAT + "|" + QUEUE_FORMAT + "|Timestamp %d|Src %s";
+    private static final String UNQUEUED_FORMAT = "opt unque. " + TARGET_FORMAT + "|" + TIER_FORMAT + "|" + COUNT_THRESHOLD_FORMAT + "|" + QUEUE_FORMAT + "|Timestamp %d|Src %s|Reason %s";
+    private static final String START_FORMAT    = "opt start  " + TARGET_FORMAT + "|" + TIER_FORMAT + "|Priority %9d|Rate %.6f|"         + QUEUE_FORMAT + "|Timestamp %d|Src %s";
+    private static final String DONE_FORMAT     = "opt done   " + TARGET_FORMAT + "|" + TIER_FORMAT + "|Time %18s|AST %4d|Inlined %3dY %3dN|IR %6d/%6d|CodeSize %7d|Timestamp %d|Src %s";
+    private static final String FAILED_FORMAT   = "opt failed " + TARGET_FORMAT + "|" + TIER_FORMAT + "|Time %18s|Reason: %s|Timestamp %d|Src %s";
+    private static final String INV_FORMAT      = "opt inval. " + TARGET_FORMAT + "                                                                                            |Timestamp %d|Src %s|Reason %s";
+    private static final String DEOPT_FORMAT    = "opt deopt  " + TARGET_FORMAT + "                                                                                            |Timestamp %d|Src %s";
     // @formatter:on
 
     @Override
@@ -85,8 +86,8 @@ public void onCompilationQueued(OptimizedCallTarget target, int tier) {
                             1,
                             FixedPointMath.toDouble(scale),
                             0,
-                            formatSourceSection(target.getRootNode().getSourceSection()),
-                            System.nanoTime()));
+                            System.nanoTime(),
+                            formatSourceSection(target.getRootNode().getSourceSection())));
         }
     }
 
@@ -106,9 +107,9 @@ public void onCompilationDequeued(OptimizedCallTarget target, Object source, Cha
                             0,
                             FixedPointMath.toDouble(scale),
                             0,
-                            reason,
+                            System.nanoTime(),
                             formatSourceSection(target.getRootNode().getSourceSection()),
-                            System.nanoTime()));
+                            reason));
         }
     }
 
@@ -124,8 +125,8 @@ public void onCompilationFailed(OptimizedCallTarget target, String reason, boole
                                 tier,
                                 compilationTime(),
                                 reason,
-                                formatSourceSection(target.getRootNode().getSourceSection()),
-                                System.nanoTime()));
+                                System.nanoTime(),
+                                formatSourceSection(target.getRootNode().getSourceSection())));
             }
             currentCompilation.set(null);
         }
@@ -145,8 +146,8 @@ public void onCompilationStarted(OptimizedCallTarget target, TruffleCompilationT
                             Math.abs(task.queueChange()),
                             FixedPointMath.toDouble(runtime.compilationThresholdScale()),
                             task.time() / 1000,
-                            formatSourceSection(target.getRootNode().getSourceSection()),
-                            System.nanoTime()));
+                            System.nanoTime(),
+                            formatSourceSection(target.getRootNode().getSourceSection())));
         }
 
         if (target.engine.traceCompilation || target.engine.traceCompilationDetails) {
@@ -164,8 +165,8 @@ public void onCompilationDeoptimized(OptimizedCallTarget target, Frame frame) {
             log(target, String.format(DEOPT_FORMAT,
                             target.id,
                             target.getName(),
-                            formatSourceSection(target.getRootNode().getSourceSection()),
-                            System.nanoTime()));
+                            System.nanoTime(),
+                            formatSourceSection(target.getRootNode().getSourceSection())));
         }
     }
 
@@ -183,16 +184,43 @@ public void onCompilationSuccess(OptimizedCallTarget target, TruffleInlining inl
         if (!target.engine.traceCompilation && !target.engine.traceCompilationDetails) {
             return;
         }
+        int[] inlinedAndDispatched = inlinedAndDispatched(target, inliningDecision);
+        Times compilation = currentCompilation.get();
         log(target, String.format(DONE_FORMAT,
                         target.id,
                         target.getName(),
                         tier,
                         compilationTime(),
-                        formatSourceSection(target.getRootNode().getSourceSection()),
-                        System.nanoTime()));
+                        target.getNonTrivialNodeCount(),
+                        inlinedAndDispatched[0],
+                        inlinedAndDispatched[1],
+                        compilation.nodeCountPartialEval,
+                        graph == null ? 0 : graph.getNodeCount(),
+                        result == null ? 0 : result.getTargetCodeSize(),
+                        System.nanoTime(),
+                        formatSourceSection(target.getRootNode().getSourceSection())));
         currentCompilation.set(null);
     }
 
+    private static int[] inlinedAndDispatched(OptimizedCallTarget target, TruffleInlining inliningDecision) {
+        int calls = 0;
+        int inlinedCalls;
+        if (inliningDecision == null) {
+            CallCountVisitor visitor = new CallCountVisitor();
+            target.accept(visitor);
+            calls = visitor.calls;
+            inlinedCalls = 0;
+        } else {
+            calls = inliningDecision.countCalls();
+            inlinedCalls = inliningDecision.countInlinedCalls();
+        }
+        int dispatchedCalls = calls - inlinedCalls;
+        int[] inlinedAndDispatched = new int[2];
+        inlinedAndDispatched[0] = inlinedCalls;
+        inlinedAndDispatched[1] = dispatchedCalls;
+        return inlinedAndDispatched;
+    }
+
     private String compilationTime() {
         long timeCompilationFinished = System.nanoTime();
         Times compilation = currentCompilation.get();
@@ -215,9 +243,9 @@ public void onCompilationInvalidated(OptimizedCallTarget target, Object source,
             log(target, String.format(INV_FORMAT,
                             target.id,
                             target.getName(),
-                            reason,
+                            System.nanoTime(),
                             formatSourceSection(target.getRootNode().getSourceSection()),
-                            System.nanoTime()));
+                            reason));
         }
     }
 

From f2b57ae2a29332c83f4d2d47985c2250773ea5e0 Mon Sep 17 00:00:00 2001
From: Brandon Fish <brandon.j.fish@oracle.com>
Date: Tue, 12 Oct 2021 08:53:48 -0500
Subject: [PATCH 439/681] Update macOS 10.12 to 10.13

---
 espresso/ci_common/common.jsonnet                           | 4 ++--
 sulong/mx.sulong/suite.py                                   | 6 +++---
 vm/ci_common/common.hocon                                   | 2 +-
 .../commands/license.ruby/jre/languages/ruby/README.md      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/espresso/ci_common/common.jsonnet b/espresso/ci_common/common.jsonnet
index 8a2342c75db4..4c60f706718c 100644
--- a/espresso/ci_common/common.jsonnet
+++ b/espresso/ci_common/common.jsonnet
@@ -50,8 +50,8 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 
   darwin: self.common + {
     environment+: {
-      // for compatibility with macOS Sierra
-      MACOSX_DEPLOYMENT_TARGET: '10.12',
+      // for compatibility with macOS High Sierra
+      MACOSX_DEPLOYMENT_TARGET: '10.13',
     },
     capabilities: ['darwin', 'amd64'],
   },
diff --git a/sulong/mx.sulong/suite.py b/sulong/mx.sulong/suite.py
index e9829b53129e..79e2f8365e05 100644
--- a/sulong/mx.sulong/suite.py
+++ b/sulong/mx.sulong/suite.py
@@ -653,7 +653,7 @@
         "SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME",
       ],
       "cmakeConfig" : {
-        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
+        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.13",
         "CMAKE_C_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang>",
         "CMAKE_CXX_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang++>",
         "GRAALVM_LLVM_INCLUDE_DIR" : "<path:com.oracle.truffle.llvm.libraries.graalvm.llvm>/include",
@@ -704,7 +704,7 @@
         "com.oracle.truffle.llvm.libraries.graalvm.llvm",
       ],
       "cmakeConfig" : {
-        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
+        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.13",
         "CMAKE_C_COMPILER" : "<path:SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME>/bin/<cmd:clang>",
         "GRAALVM_LLVM_INCLUDE_DIR" : "<path:com.oracle.truffle.llvm.libraries.graalvm.llvm>/include",
         "LLVM_LINK" : "<path:LLVM_TOOLCHAIN>/bin/<exe:llvm-link>",
@@ -729,7 +729,7 @@
         "sdk:LLVM_TOOLCHAIN",
       ],
       "cmakeConfig" : {
-        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.12",
+        "CMAKE_OSX_DEPLOYMENT_TARGET" : "10.13",
         "CMAKE_C_COMPILER" : "<path:LLVM_TOOLCHAIN>/bin/<exe:clang>",
         "TRUFFLE_NFI_NATIVE_INCLUDE" : "<path:truffle:TRUFFLE_NFI_NATIVE>/include",
         "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS" : "YES",
diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index 745a324a577a..c9cf45498857 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -19,7 +19,7 @@ common_vm_darwin: ${common_vm} ${darwin} {
   environment: {
     LANG: en_US.UTF-8
     # for compatibility with macOS Sierra
-    MACOSX_DEPLOYMENT_TARGET: "10.12"
+    MACOSX_DEPLOYMENT_TARGET: "10.13"
   }
   setup: ${common_vm.setup}
 }
diff --git a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/commands/license.ruby/jre/languages/ruby/README.md b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/commands/license.ruby/jre/languages/ruby/README.md
index b9a13a49f91a..9cec298cd331 100644
--- a/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/commands/license.ruby/jre/languages/ruby/README.md
+++ b/vm/src/org.graalvm.component.installer.test/src/org/graalvm/component/installer/commands/license.ruby/jre/languages/ruby/README.md
@@ -46,7 +46,7 @@ TruffleRuby is actively tested on these systems:
 
 * Ubuntu 16.04 LTS
 * Fedora 26
-* macOS 10.12
+* macOS 10.13
 
 You need to [install LLVM](doc/user/installing-llvm.md) to build and run C
 extensions and [`libssl`](doc/user/installing-libssl.md) to use `openssl`. You

From 68c13d95c1c9dafc70f62c7f0bf5ce0e8b73dae2 Mon Sep 17 00:00:00 2001
From: "thomas.garcia" <thomas.garcia@oracle.com>
Date: Tue, 12 Oct 2021 17:06:06 +0200
Subject: [PATCH 440/681] Fix comment

---
 .../src/com/oracle/truffle/espresso/threads/ThreadsAccess.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
index 9dd1a643052e..395e5d29592a 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/threads/ThreadsAccess.java
@@ -443,7 +443,7 @@ void handleStop(Meta meta) {
                         } else if (s == KILL) {
                             throw new EspressoExitException(meta.getContext().getExitStatus());
                         }
-                        // Stop status has been
+                        // Stop status has been cleared somewhere else.
                         assert s == NORMAL || s == EXITING;
                         return;
                     }

From 87401b8f5c2d6015e395ed66b47af550d245588e Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Tue, 12 Oct 2021 19:08:48 +0200
Subject: [PATCH 441/681] Fix link

---
 .../graalvm-enterprise/get-started-graalvm-enterprise.md        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
index f7ea8016c2fd..90b61d5e0258 100644
--- a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
+++ b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -196,7 +196,7 @@ ruby [options] program.rb
 ```
 
 GraalVM Ruby runtime environment uses the
-[same options as the standard implementation of Ruby](../../reference-manual/ruby/Options.md),
+[same options as the standard implementation of Ruby](../../reference-manual/ruby/options.md),
 with some additions. For example:
 ```shell
 gem install chunky_png

From df04e9d641403289010fb66e290ca80199eda0a4 Mon Sep 17 00:00:00 2001
From: David Kozak <david.kozak@oracle.com>
Date: Mon, 11 Oct 2021 16:39:41 +0200
Subject: [PATCH 442/681] move localization related code from
 com.oracle.svm.core to com.oracle.svm.hosted

---
 substratevm/mx.substratevm/suite.py           |  11 +-
 .../Target_java_util_ResourceBundle.java      |   2 +-
 .../Target_sun_util_resources_Bundles.java    |   2 +-
 ...ContentSubstitutedLocalizationSupport.java |  10 +-
 .../jdk/localization/LocalizationFeature.java | 533 +----------------
 .../jdk/localization/LocalizationSupport.java |  15 +-
 .../OptimizedLocalizationSupport.java         |  10 +-
 .../substitutions/modes/JvmLocaleMode.java    |   3 +-
 .../modes/OptimizedLocaleMode.java            |   3 +-
 .../modes/SubstituteLoadLookup.java           |   5 +-
 .../LocalizationFeatureJDK11OrLater.java      |   4 +-
 .../hosted}/jdk8/LocalizationFeatureJDK8.java |   4 +-
 .../svm/hosted/NativeImageGenerator.java      |   2 +-
 .../oracle/svm/hosted/ResourcesFeature.java   |   2 +-
 .../CharsetSubstitutionsFeature.java          |   2 +-
 .../jdk/localization/LocalizationFeature.java | 560 ++++++++++++++++++
 16 files changed, 619 insertions(+), 549 deletions(-)
 rename substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/{ => localization}/substitutions/Target_java_util_ResourceBundle.java (97%)
 rename substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/{ => substitutions}/Target_sun_util_resources_Bundles.java (97%)
 rename substratevm/src/{com.oracle.svm.core.jdk11/src/com/oracle/svm/core => com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted}/jdk11/localization/LocalizationFeatureJDK11OrLater.java (95%)
 rename substratevm/src/{com.oracle.svm.core.jdk8/src/com/oracle/svm/core => com.oracle.svm.hosted.jdk8/src/com/oracle/svm/hosted}/jdk8/LocalizationFeatureJDK8.java (93%)
 rename substratevm/src/{com.oracle.svm.core/src/com/oracle/svm/core => com.oracle.svm.hosted/src/com/oracle/svm/hosted}/jdk/localization/CharsetSubstitutionsFeature.java (97%)
 create mode 100644 substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index a5d6c42463ab..c1b7e79a15bf 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -405,8 +405,11 @@
                 "com.oracle.svm.core",
                 "com.oracle.graal.pointsto",
             ],
+            "requiresConcealed": {
+                "java.base": ["sun.util.resources"],
+            },
             "javaCompliance": "8+",
-            "checkstyleVersion" : "8.36.1",
+            "checkstyleVersion": "8.36.1",
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
@@ -438,7 +441,11 @@
             "requires" : ["java.instrument"],
             "requiresConcealed" : {
                 "jdk.internal.vm.ci": ["jdk.vm.ci.meta"],
-                "java.base" : ["jdk.internal.module"],
+                "java.base": [
+                    "jdk.internal.module",
+                    "sun.text.spi",
+                    "sun.util.resources"
+                ],
             },
             "javaCompliance": "11+",
             "checkstyle" : "com.oracle.svm.hosted",
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_java_util_ResourceBundle.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_java_util_ResourceBundle.java
index 12a6b1459b19..a6b5f95b2b17 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/substitutions/Target_java_util_ResourceBundle.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_java_util_ResourceBundle.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk11.substitutions;
+package com.oracle.svm.core.jdk11.localization.substitutions;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/Target_sun_util_resources_Bundles.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_sun_util_resources_Bundles.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/Target_sun_util_resources_Bundles.java
rename to substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_sun_util_resources_Bundles.java
index e51e8a004f10..a30c9a5b4524 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/Target_sun_util_resources_Bundles.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/substitutions/Target_sun_util_resources_Bundles.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk11.localization;
+package com.oracle.svm.core.jdk11.localization.substitutions;
 
 import java.util.Locale;
 import java.util.ResourceBundle;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
index ea7742149315..b46692dd9afd 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
@@ -42,6 +42,7 @@
 import com.oracle.svm.core.jdk.localization.bundles.StoredBundle;
 import com.oracle.svm.core.jdk.localization.compression.GzipBundleCompression;
 import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.core.jdk.localization.compression.utils.BundleSerializationUtils;
 import org.graalvm.compiler.debug.GraalError;
 
 // Checkstyle: stop
@@ -51,8 +52,6 @@
 import sun.util.resources.ParallelListResourceBundle;
 // Checkstyle: resume
 
-import static com.oracle.svm.core.jdk.localization.compression.utils.BundleSerializationUtils.extractContent;
-
 public class BundleContentSubstitutedLocalizationSupport extends LocalizationSupport {
 
     @Platforms(Platform.HOSTED_ONLY.class)//
@@ -72,6 +71,11 @@ public BundleContentSubstitutedLocalizationSupport(Locale defaultLocale, Set<Loc
         this.compressBundlesPatterns = parseCompressBundlePatterns(requestedPatterns);
     }
 
+    @Override
+    public boolean substituteLoadLookup() {
+        return true;
+    }
+
     @Override
     @Platforms(Platform.HOSTED_ONLY.class)
     protected void onBundlePrepared(ResourceBundle bundle) {
@@ -96,7 +100,7 @@ private StoredBundle processBundle(ResourceBundle bundle) {
         if (!isInDefaultLocale && shouldCompressBundle(bundle) && GzipBundleCompression.canCompress(bundle)) {
             return GzipBundleCompression.compress(bundle);
         }
-        Map<String, Object> content = extractContent(bundle);
+        Map<String, Object> content = BundleSerializationUtils.extractContent(bundle);
         return new ExtractedBundle(content);
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
index 2243cc09d93e..bf793b3bf4e9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, 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
@@ -24,533 +24,26 @@
  */
 package com.oracle.svm.core.jdk.localization;
 
-// Checkstyle: stop
-
-import java.lang.reflect.Field;
-import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.StandardCharsets;
-import java.nio.charset.UnsupportedCharsetException;
-import java.text.spi.BreakIteratorProvider;
-import java.text.spi.CollatorProvider;
-import java.text.spi.DateFormatProvider;
-import java.text.spi.DateFormatSymbolsProvider;
-import java.text.spi.DecimalFormatSymbolsProvider;
-import java.text.spi.NumberFormatProvider;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.IllformedLocaleException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.concurrent.ForkJoinPool;
-import java.util.function.Function;
-import java.util.spi.CalendarDataProvider;
-import java.util.spi.CalendarNameProvider;
-import java.util.spi.CurrencyNameProvider;
-import java.util.spi.LocaleNameProvider;
-import java.util.spi.LocaleServiceProvider;
-import java.util.spi.TimeZoneNameProvider;
-
-import org.graalvm.collections.Pair;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.configure.ResourcesRegistry;
 import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
-
-import com.oracle.svm.core.ClassLoaderSupport;
-import com.oracle.svm.core.annotate.Substitute;
-import com.oracle.svm.core.jdk.localization.compression.GzipBundleCompression;
-import com.oracle.svm.core.jdk.localization.substitutions.Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode;
-import com.oracle.svm.core.option.HostedOptionKey;
-import com.oracle.svm.core.option.LocatableMultiOptionValue;
-import com.oracle.svm.core.option.OptionUtils;
-import com.oracle.svm.core.util.UserError;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.util.ReflectionUtil;
-
-import jdk.vm.ci.meta.ResolvedJavaField;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.vm.ci.meta.ResolvedJavaType;
-import sun.util.locale.provider.LocaleProviderAdapter;
-import sun.util.locale.provider.ResourceBundleBasedAdapter;
-import sun.util.resources.LocaleData;
-// Checkstyle: resume
+import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 /**
- * LocalizationFeature is the core class of SVM localization support. It contains all the options
- * that can be used to configure how localization in the resulting image should work. One can
- * specify what charsets, locales and resource bundles should be accessible. The runtime data for
- * localization is stored in an image singleton of type {@link LocalizationSupport} or one of its
- * subtypes.
- *
- * In case of ResourceBundles, one can also specify how bundles should be handled, because currently
- * there are two different modes.
- *
- * The first approach is using a simple in memory map instead of the original JDK lookup. This
- * simpler implementation leads to image size savings for smaller images such as hello world, but
- * could cause compatibility issues and maintenance overhead. It is implemented in
- * {@link OptimizedLocalizationSupport}.
- * 
- * The second approach relies on the original JVM implementation instead. This approach is
- * consistent by design, which solves compatibility issues and reduces maintenance overhead.
- * Unfortunately, the default way of storing bundle data in getContents methods, see
- * {@link sun.text.resources.FormatData} for example, is not very AOT friendly. Compiling these
- * methods is time consuming and results in a bloated image (183 MB HelloWorld with all locales).
- * Therefore, the bundle content itself is again stored in the image heap by default and furthermore
- * is compressed to reduce the image size, see {@link BundleContentSubstitutedLocalizationSupport}
- * and {@link GzipBundleCompression}.
- *
- * @author d-kozak
- * @see LocalizationSupport
- * @see OptimizedLocalizationSupport
- * @see BundleContentSubstitutedLocalizationSupport
+ * This class is just a delegate. The real LocalizationFeature is now in
+ * com.oracle.svm.hosted.jdk.localization. It was created in order to ensure backwards compatibility
+ * for code depending on the location of the feature.
  */
-public abstract class LocalizationFeature implements Feature {
-
-    protected final boolean optimizedMode = LocalizationSupport.optimizedMode();
-
-    private final boolean substituteLoadLookup = Options.LocalizationSubstituteLoadLookup.getValue();
-
-    protected final boolean trace = Options.TraceLocalizationFeature.getValue();
-
-    private final ForkJoinPool compressionPool = Options.LocalizationCompressInParallel.getValue() ? new ForkJoinPool(Runtime.getRuntime().availableProcessors()) : null;
-
-    /**
-     * The Locale that the native image is built for. Currently, switching the Locale at run time is
-     * not supported because the resource bundles are only included for one Locale. We use the
-     * Locale that is set for the image generator.
-     */
-    protected Locale defaultLocale = Locale.getDefault();
-
-    private Charset defaultCharset;
-
-    protected Set<Locale> allLocales;
-
-    protected LocalizationSupport support;
-
-    private Function<String, Class<?>> findClassByName;
-
-    public static class Options {
-        @Option(help = "Comma separated list of bundles to be included into the image.", type = OptionType.User)//
-        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> IncludeResourceBundles = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
-
-        @Option(help = "Make all hosted charsets available at run time")//
-        public static final HostedOptionKey<Boolean> AddAllCharsets = new HostedOptionKey<>(false);
-
-        @Option(help = "Default locale of the image, by the default it is the same as the default locale of the image builder.", type = OptionType.User)//
-        public static final HostedOptionKey<String> DefaultLocale = new HostedOptionKey<>(Locale.getDefault().toLanguageTag());
-
-        @Option(help = "Default charset of the image, by the default it is the same as the default charset of the image builder.", type = OptionType.User)//
-        public static final HostedOptionKey<String> DefaultCharset = new HostedOptionKey<>(Charset.defaultCharset().name());
-
-        @Option(help = "Comma separated list of locales to be included into the image. The default locale is included in the list automatically if not present.", type = OptionType.User)//
-        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> IncludeLocales = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
-
-        @Option(help = "Make all hosted locales available at run time.", type = OptionType.User)//
-        public static final HostedOptionKey<Boolean> IncludeAllLocales = new HostedOptionKey<>(false);
-
-        @Option(help = "Optimize the resource bundle lookup using a simple map.", type = OptionType.User)//
-        public static final HostedOptionKey<Boolean> LocalizationOptimizedMode = new HostedOptionKey<>(JavaVersionUtil.JAVA_SPEC == 8);
-
-        @Option(help = "Store the resource bundle content more efficiently in the fallback mode.", type = OptionType.User)//
-        public static final HostedOptionKey<Boolean> LocalizationSubstituteLoadLookup = new HostedOptionKey<>(true);
-
-        @Option(help = "Regular expressions matching which bundles should be compressed.", type = OptionType.User)//
-        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> LocalizationCompressBundles = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
-
-        @Option(help = "Compress the bundles in parallel.", type = OptionType.Expert)//
-        public static final HostedOptionKey<Boolean> LocalizationCompressInParallel = new HostedOptionKey<>(true);
-
-        @Option(help = "When enabled, localization feature details are printed.", type = OptionType.Debug)//
-        public static final HostedOptionKey<Boolean> TraceLocalizationFeature = new HostedOptionKey<>(false);
-    }
+@AutomaticFeature
+public class LocalizationFeature implements Feature {
 
     /**
-     * Many subclasses of {@link Charset} initialize encoding and decoding tables lazily. They all
-     * follow the same pattern: the methods "initc2b" and/or "initb2c" perform the initialization,
-     * and then set a field "c2bInitialized" or "b2cInitialized" to true. We run the initialization
-     * eagerly by creating an encoder and decoder during image generation in
-     * {@link LocalizationFeature#addCharset}. So we know that the "init*" methods do nothing, and
-     * we replace calls to them with nothing, i.e,, remove calls to them.
-     *
-     * We could do all this with individual {@link Substitute method substitutions}, but it would
-     * require a lot of substitution methods that all look the same.
+     * @deprecated Use {@link ResourcesRegistry#addResourceBundles(ConfigurationCondition, String)}
+     *             instead.
      */
-    public static final class CharsetNodePlugin implements NodePlugin {
-
-        @Override
-        public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
-            if ((method.getName().equals("initc2b") || method.getName().equals("initb2c")) &&
-                            b.getMetaAccess().lookupJavaType(Charset.class).isAssignableFrom(method.getDeclaringClass())) {
-
-                /*
-                 * Verify that the "*Initialized" field corresponding with the method was set to
-                 * true, i.e., that initialization was done eagerly.
-                 */
-                ResolvedJavaType charsetType = method.getDeclaringClass();
-                ResolvedJavaField initializedField = findStaticField(charsetType, method.getName().substring(4, 7) + "Initialized");
-                if (!b.getConstantReflection().readFieldValue(initializedField, null).asBoolean()) {
-                    String charsetName = charsetType.getUnqualifiedName();
-                    try {
-                        Charset charset = Charset.forName(charsetName);
-                        addCharset(charset);
-                    } catch (UnsupportedCharsetException e) {
-                        throw VMError.shouldNotReachHere("Could not find non-initialized charset " + charsetType.getSourceFileName(), e);
-                    }
-                }
-
-                /* We "handled" the method invocation by doing nothing. */
-                return true;
-            }
-            return false;
-        }
-
-        private static ResolvedJavaField findStaticField(ResolvedJavaType declaringClass, String name) {
-            for (ResolvedJavaField field : declaringClass.getStaticFields()) {
-                if (field.getName().equals(name)) {
-                    return field;
-                }
-            }
-            throw VMError.shouldNotReachHere();
-        }
-    }
-
-    @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        findClassByName = access::findClassByName;
-        allLocales = processLocalesOption();
-        defaultLocale = parseLocaleFromTag(Options.DefaultLocale.getValue());
-        UserError.guarantee(defaultLocale != null, "Invalid default locale %s", Options.DefaultLocale.getValue());
-        try {
-            defaultCharset = Charset.forName(Options.DefaultCharset.getValue());
-            VMError.guarantee(defaultCharset.name().equals(Options.DefaultCharset.getValue()),
-                            "Failed to locate charset " + Options.DefaultCharset.getValue() + ", instead " + defaultCharset.name() + " was provided");
-        } catch (IllegalCharsetNameException | UnsupportedCharsetException ex) {
-            throw UserError.abort(ex, "Invalid default charset %s", Options.DefaultCharset.getValue());
-        }
-        allLocales.add(defaultLocale);
-        support = selectLocalizationSupport();
-        ImageSingletons.add(LocalizationSupport.class, support);
-        ImageSingletons.add(LocalizationFeature.class, this);
-
-        addCharsets();
-        if (optimizedMode) {
-            /*
-             * Providers are only preprocessed in the optimized mode.
-             */
-            addProviders();
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private LocalizationSupport selectLocalizationSupport() {
-        if (optimizedMode) {
-            return new OptimizedLocalizationSupport(defaultLocale, allLocales, defaultCharset);
-        } else if (substituteLoadLookup) {
-            List<String> requestedPatterns = Options.LocalizationCompressBundles.getValue().values();
-            return new BundleContentSubstitutedLocalizationSupport(defaultLocale, allLocales, defaultCharset, requestedPatterns, compressionPool);
-        }
-        return new LocalizationSupport(defaultLocale, allLocales, defaultCharset);
-    }
-
-    @Override
-    public void beforeAnalysis(BeforeAnalysisAccess access) {
-        addResourceBundles();
-    }
-
-    @Override
-    public void afterAnalysis(AfterAnalysisAccess access) {
-        if (compressionPool != null) {
-            compressionPool.shutdown();
-        }
-    }
-
-    /**
-     * @return locale for given tag or null for invalid ones
-     */
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private static Locale parseLocaleFromTag(String tag) {
-        try {
-            return new Locale.Builder().setLanguageTag(tag).build();
-        } catch (IllformedLocaleException ex) {
-            /*- Custom made locales consisting of at most three parts separated by '-' are also supported */
-            String[] parts = tag.split("-");
-            switch (parts.length) {
-                case 1:
-                    return new Locale(parts[0]);
-                case 2:
-                    return new Locale(parts[0], parts[1]);
-                case 3:
-                    return new Locale(parts[0], parts[1], parts[2]);
-                default:
-                    return null;
-            }
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private static Set<Locale> processLocalesOption() {
-        Set<Locale> locales = new HashSet<>();
-        if (Options.IncludeAllLocales.getValue()) {
-            Collections.addAll(locales, Locale.getAvailableLocales());
-            /*- Fallthrough to also allow adding custom locales */
-        }
-        List<String> invalid = new ArrayList<>();
-        for (String tag : OptionUtils.flatten(",", Options.IncludeLocales.getValue().values())) {
-            Locale locale = parseLocaleFromTag(tag);
-            if (locale != null) {
-                locales.add(locale);
-            } else {
-                invalid.add(tag);
-            }
-        }
-        if (!invalid.isEmpty()) {
-            throw UserError.abort("Invalid locales specified: %s", invalid);
-        }
-        return locales;
-    }
-
-    /**
-     * The JDK performs dynamic lookup of charsets by name, which leads to dynamic class loading. We
-     * cannot do that, because we need to know all classes ahead of time to perform our static
-     * analysis. Therefore, we load and register all standard charsets here. Features that require
-     * more than this can add additional charsets.
-     */
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private void addCharsets() {
-        if (Options.AddAllCharsets.getValue()) {
-            for (Charset c : Charset.availableCharsets().values()) {
-                addCharset(c);
-            }
-        } else {
-            addCharset(defaultCharset);
-            addCharset(StandardCharsets.US_ASCII);
-            addCharset(StandardCharsets.ISO_8859_1);
-            addCharset(StandardCharsets.UTF_8);
-            addCharset(StandardCharsets.UTF_16BE);
-            addCharset(StandardCharsets.UTF_16LE);
-            addCharset(StandardCharsets.UTF_16);
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    public static void addCharset(Charset charset) {
-        Map<String, Charset> charsets = ImageSingletons.lookup(LocalizationSupport.class).charsets;
-        charsets.put(charset.name().toLowerCase(), charset);
-        for (String name : charset.aliases()) {
-            charsets.put(name.toLowerCase(), charset);
-        }
-
-        /* Eagerly initialize all the tables necessary for decoding / encoding. */
-        charset.newDecoder();
-        if (charset.canEncode()) {
-            charset.newEncoder();
-        }
-    }
-
-    /*
-     * LocaleServiceProviderPool.spiClasses does not contain all the classes we need, so we list
-     * them manually here.
-     */
-    private static final List<Class<? extends LocaleServiceProvider>> spiClasses = Arrays.asList(
-                    BreakIteratorProvider.class,
-                    CollatorProvider.class,
-                    DateFormatProvider.class,
-                    DateFormatSymbolsProvider.class,
-                    DecimalFormatSymbolsProvider.class,
-                    NumberFormatProvider.class,
-                    CurrencyNameProvider.class,
-                    LocaleNameProvider.class,
-                    TimeZoneNameProvider.class,
-                    CalendarDataProvider.class,
-                    CalendarNameProvider.class);
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected List<Class<? extends LocaleServiceProvider>> getSpiClasses() {
-        return spiClasses;
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private void addProviders() {
-        OptimizedLocalizationSupport optimizedLocalizationSupport = support.asOptimizedSupport();
-        for (Class<? extends LocaleServiceProvider> providerClass : getSpiClasses()) {
-            LocaleProviderAdapter adapter = Objects.requireNonNull(LocaleProviderAdapter.getAdapter(providerClass, defaultLocale));
-            LocaleServiceProvider provider = Objects.requireNonNull(adapter.getLocaleServiceProvider(providerClass));
-            optimizedLocalizationSupport.providerPools.put(providerClass, new Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode(provider));
-        }
-
-        for (Locale locale : allLocales) {
-            for (Locale candidateLocale : optimizedLocalizationSupport.control.getCandidateLocales("", locale)) {
-                for (Class<? extends LocaleServiceProvider> providerClass : getSpiClasses()) {
-                    LocaleProviderAdapter adapter = Objects.requireNonNull(LocaleProviderAdapter.getAdapter(providerClass, candidateLocale));
-
-                    optimizedLocalizationSupport.adaptersByClass.put(Pair.create(providerClass, candidateLocale), adapter);
-                    LocaleProviderAdapter existing = optimizedLocalizationSupport.adaptersByType.put(adapter.getAdapterType(), adapter);
-                    assert existing == null || existing == adapter : "Overwriting adapter type with a different adapter";
-
-                }
-            }
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected void addResourceBundles() {
-        for (Locale locale : allLocales) {
-            prepareBundle(localeData(java.util.spi.CalendarDataProvider.class, locale).getCalendarData(locale), locale);
-            prepareBundle(localeData(java.util.spi.CurrencyNameProvider.class, locale).getCurrencyNames(locale), locale);
-            prepareBundle(localeData(java.util.spi.LocaleNameProvider.class, locale).getLocaleNames(locale), locale);
-            prepareBundle(localeData(java.util.spi.TimeZoneNameProvider.class, locale).getTimeZoneNames(locale), locale);
-            prepareBundle(localeData(java.text.spi.BreakIteratorProvider.class, locale).getBreakIteratorInfo(locale), locale);
-            prepareBundle(localeData(java.text.spi.BreakIteratorProvider.class, locale).getCollationData(locale), locale);
-            prepareBundle(localeData(java.text.spi.DateFormatProvider.class, locale).getDateFormatData(locale), locale);
-            prepareBundle(localeData(java.text.spi.NumberFormatProvider.class, locale).getNumberFormatData(locale), locale);
-            /* Note that JDK 11 support overrides this method to register more bundles. */
-        }
-
-        final String[] alwaysRegisteredResourceBundles = new String[]{
-                        "sun.util.logging.resources.logging",
-                        "sun.util.resources.TimeZoneNames"
-        };
-        for (String bundleName : alwaysRegisteredResourceBundles) {
-            prepareBundle(bundleName);
-        }
-
-        for (String bundleName : OptionUtils.flatten(",", Options.IncludeResourceBundles.getValue())) {
-            processRequestedBundle(bundleName);
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected LocaleData localeData(Class<? extends LocaleServiceProvider> providerClass, Locale locale) {
-        return ((ResourceBundleBasedAdapter) LocaleProviderAdapter.getAdapter(providerClass, locale)).getLocaleData();
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private void processRequestedBundle(String input) {
-        int splitIndex = input.indexOf('_');
-        boolean specificLocaleRequested = splitIndex != -1;
-        if (!specificLocaleRequested) {
-            prepareBundle(input, allLocales);
-            return;
-        }
-        Locale locale = splitIndex + 1 < input.length() ? parseLocaleFromTag(input.substring(splitIndex + 1)) : Locale.ROOT;
-        if (locale == null) {
-            trace("Cannot parse wanted locale " + input.substring(splitIndex + 1) + ", default will be used instead.");
-            locale = defaultLocale;
-        }
-        /*- Get rid of locale specific suffix. */
-        String baseName = input.substring(0, splitIndex);
-        prepareBundle(baseName, Collections.singletonList(locale));
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
+    @Deprecated
     public void prepareBundle(String baseName) {
-        prepareBundle(baseName, allLocales);
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    public void prepareBundle(String baseName, Collection<Locale> wantedLocales) {
-        if (baseName.isEmpty()) {
-            return;
-        }
-
-        boolean somethingFound = false;
-        for (Locale locale : wantedLocales) {
-            List<ResourceBundle> resourceBundle;
-            try {
-                resourceBundle = ImageSingletons.lookup(ClassLoaderSupport.class).getResourceBundle(baseName, locale);
-            } catch (MissingResourceException mre) {
-                continue;
-            }
-            somethingFound = !resourceBundle.isEmpty();
-            for (ResourceBundle bundle : resourceBundle) {
-                prepareBundle(baseName, bundle, locale);
-            }
-        }
-
-        if (!somethingFound) {
-            /*
-             * Try non-compliant class-based bundles. These bundles can't be looked up by the normal
-             * ResourceBundle lookup process, e.g. because they don't have default constructors.
-             */
-            Class<?> clazz = findClassByName.apply(baseName);
-            if (clazz != null && ResourceBundle.class.isAssignableFrom(clazz)) {
-                trace("Found non-compliant class-based bundle " + clazz);
-                somethingFound = true;
-                support.prepareNonCompliant(clazz);
-            }
-        }
-
-        if (!somethingFound) {
-            String errorMessage = "The bundle named: " + baseName + ", has not been found. " +
-                            "If the bundle is part of a module, verify the bundle name is a fully qualified class name. Otherwise " +
-                            "verify the bundle path is accessible in the classpath.";
-            // Checkstyle: stop
-            System.out.println(errorMessage);
-            // Checkstyle: resume
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected void prepareBundle(ResourceBundle bundle, Locale locale) {
-        prepareBundle(bundle.getBaseBundleName(), bundle, locale);
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private void prepareBundle(String bundleName, ResourceBundle bundle, Locale locale) {
-        trace("Adding bundle " + bundleName + ", locale " + locale);
-        /*
-         * Ensure that the bundle contents are loaded. We need to walk the whole bundle parent chain
-         * down to the root.
-         */
-        for (ResourceBundle cur = bundle; cur != null; cur = getParent(cur)) {
-            /* Register all bundles with their corresponding locales */
-            support.prepareBundle(bundleName, cur, cur.getLocale());
-        }
-
-        /*
-         * Finally, register the requested bundle with requested locale (Requested might be more
-         * specific than the actual bundle locale
-         */
-        support.prepareBundle(bundleName, bundle, locale);
-    }
-
-    /*
-     * The field ResourceBundle.parent is not public. There is a backdoor to access it via
-     * SharedSecrets, but the package of SharedSecrets changed from JDK 8 to JDK 11 so it is
-     * inconvenient to use it. Reflective access is easier.
-     */
-    private static final Field PARENT_FIELD = ReflectionUtil.lookupField(ResourceBundle.class, "parent");
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    private static ResourceBundle getParent(ResourceBundle bundle) {
-        try {
-            return (ResourceBundle) PARENT_FIELD.get(bundle);
-        } catch (ReflectiveOperationException ex) {
-            throw VMError.shouldNotReachHere(ex);
-        }
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected void trace(String msg) {
-        if (trace) {
-            // Checkstyle: stop
-            System.out.println(msg);
-            // Checkstyle: resume
-        }
+        ImageSingletons.lookup(ResourcesRegistry.class).addResourceBundles(ConfigurationCondition.alwaysTrue(), baseName);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
index f5a95b1cd59d..cca533de556c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
@@ -34,7 +34,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -49,7 +48,7 @@
  * Holder for localization information that is computed during image generation and used at run
  * time.
  *
- * @see LocalizationFeature
+ * For more details, see LocalizationFeature
  */
 public class LocalizationSupport {
 
@@ -72,16 +71,18 @@ public LocalizationSupport(Locale defaultLocale, Set<Locale> locales, Charset de
         this.supportedLanguageTags = locales.stream().map(Locale::toString).collect(Collectors.toSet());
     }
 
-    @Fold
-    public static boolean optimizedMode() {
-        return LocalizationFeature.Options.LocalizationOptimizedMode.getValue();
+    public boolean optimizedMode() {
+        return false;
     }
 
-    @Fold
-    public static boolean jvmMode() {
+    public boolean jvmMode() {
         return !optimizedMode();
     }
 
+    public boolean substituteLoadLookup() {
+        return false;
+    }
+
     public OptimizedLocalizationSupport asOptimizedSupport() {
         GraalError.guarantee(optimizedMode(), "Optimized support only available in optimized localization mode.");
         return ((OptimizedLocalizationSupport) this);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
index d064ac0cf0c3..68474bb2e938 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/OptimizedLocalizationSupport.java
@@ -24,7 +24,6 @@
  */
 package com.oracle.svm.core.jdk.localization;
 
-import com.oracle.svm.core.option.SubstrateOptionsParser;
 import org.graalvm.collections.Pair;
 
 import java.nio.charset.Charset;
@@ -49,12 +48,15 @@ public class OptimizedLocalizationSupport extends LocalizationSupport {
 
     final Map<Pair<String, Locale>, ResourceBundle> resourceBundles = new HashMap<>();
 
-    private final String includeResourceBundlesOption = SubstrateOptionsParser.commandArgument(LocalizationFeature.Options.IncludeResourceBundles, "");
-
     public OptimizedLocalizationSupport(Locale defaultLocale, Set<Locale> locales, Charset defaultCharset) {
         super(defaultLocale, locales, defaultCharset);
     }
 
+    @Override
+    public boolean optimizedMode() {
+        return true;
+    }
+
     /**
      * Get cached resource bundle.
      *
@@ -69,7 +71,7 @@ public ResourceBundle getCached(String baseName, Locale locale) throws MissingRe
             }
         }
         String errorMessage = "Resource bundle not found " + baseName + ", locale " + locale + ". " +
-                        "Register the resource bundle using the option " + includeResourceBundlesOption + baseName + ".";
+                        "Register the resource bundle using the option -H:IncludeResourceBundles=" + baseName + ".";
         throw new MissingResourceException(errorMessage, this.getClass().getName(), baseName);
 
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/JvmLocaleMode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/JvmLocaleMode.java
index 47946f6de718..98db7778ed07 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/JvmLocaleMode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/JvmLocaleMode.java
@@ -26,6 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
+import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -35,6 +36,6 @@
 public class JvmLocaleMode implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
-        return LocalizationSupport.jvmMode();
+        return ImageSingletons.lookup(LocalizationSupport.class).jvmMode();
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/OptimizedLocaleMode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/OptimizedLocaleMode.java
index 4a824d4549e9..1ef9e78fef70 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/OptimizedLocaleMode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/OptimizedLocaleMode.java
@@ -27,10 +27,11 @@
 import java.util.function.BooleanSupplier;
 
 import com.oracle.svm.core.jdk.localization.LocalizationSupport;
+import org.graalvm.nativeimage.ImageSingletons;
 
 public class OptimizedLocaleMode implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
-        return LocalizationSupport.optimizedMode();
+        return ImageSingletons.lookup(LocalizationSupport.class).optimizedMode();
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/SubstituteLoadLookup.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/SubstituteLoadLookup.java
index 06ae2a19cdaf..a29d643342e0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/SubstituteLoadLookup.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/modes/SubstituteLoadLookup.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Predicate;
 
+import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
-import com.oracle.svm.core.jdk.localization.LocalizationFeature;
 import com.oracle.svm.core.jdk.localization.LocalizationSupport;
 
 @Platforms(Platform.HOSTED_ONLY.class)
@@ -37,7 +37,8 @@ public class SubstituteLoadLookup implements Predicate<String> {
 
     @Override
     public boolean test(String className) {
-        return LocalizationSupport.optimizedMode() || LocalizationFeature.Options.LocalizationSubstituteLoadLookup.getValue();
+        LocalizationSupport support = ImageSingletons.lookup(LocalizationSupport.class);
+        return support.optimizedMode() || support.substituteLoadLookup();
     }
 
 }
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/LocalizationFeatureJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/localization/LocalizationFeatureJDK11OrLater.java
similarity index 95%
rename from substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/LocalizationFeatureJDK11OrLater.java
rename to substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/localization/LocalizationFeatureJDK11OrLater.java
index a61cd2cff607..82b5f01b8582 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/localization/LocalizationFeatureJDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/localization/LocalizationFeatureJDK11OrLater.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.core.jdk11.localization;
+package com.oracle.svm.hosted.jdk11.localization;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,7 +34,7 @@
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.jdk.localization.LocalizationFeature;
+import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 
 //Checkstyle: stop
 import sun.text.spi.JavaTimeDateTimePatternProvider;
diff --git a/substratevm/src/com.oracle.svm.core.jdk8/src/com/oracle/svm/core/jdk8/LocalizationFeatureJDK8.java b/substratevm/src/com.oracle.svm.hosted.jdk8/src/com/oracle/svm/hosted/jdk8/LocalizationFeatureJDK8.java
similarity index 93%
rename from substratevm/src/com.oracle.svm.core.jdk8/src/com/oracle/svm/core/jdk8/LocalizationFeatureJDK8.java
rename to substratevm/src/com.oracle.svm.hosted.jdk8/src/com/oracle/svm/hosted/jdk8/LocalizationFeatureJDK8.java
index b5645bbb0204..b242c230d693 100644
--- a/substratevm/src/com.oracle.svm.core.jdk8/src/com/oracle/svm/core/jdk8/LocalizationFeatureJDK8.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk8/src/com/oracle/svm/hosted/jdk8/LocalizationFeatureJDK8.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package com.oracle.svm.core.jdk8;
+package com.oracle.svm.hosted.jdk8;
 
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.jdk.localization.LocalizationFeature;
+import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 
 @AutomaticFeature
 final class LocalizationFeatureJDK8 extends LocalizationFeature {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index b01843f59fa6..0ddee26f57a1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -200,7 +200,7 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.LayoutEncoding;
 import com.oracle.svm.core.image.ImageHeapLayouter;
-import com.oracle.svm.core.jdk.localization.LocalizationFeature;
+import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.core.option.OptionUtils;
 import com.oracle.svm.core.option.RuntimeOptionValues;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
index 4ad543dc9683..767adf4bba53 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -64,7 +64,7 @@
 import com.oracle.svm.core.configure.ResourceConfigurationParser;
 import com.oracle.svm.core.configure.ResourcesRegistry;
 import com.oracle.svm.core.jdk.Resources;
-import com.oracle.svm.core.jdk.localization.LocalizationFeature;
+import com.oracle.svm.hosted.jdk.localization.LocalizationFeature;
 import com.oracle.svm.core.jdk.resources.NativeImageResourceFileAttributes;
 import com.oracle.svm.core.jdk.resources.NativeImageResourceFileAttributesView;
 import com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystem;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/CharsetSubstitutionsFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/CharsetSubstitutionsFeature.java
similarity index 97%
rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/CharsetSubstitutionsFeature.java
rename to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/CharsetSubstitutionsFeature.java
index 686e9aa10f63..15d2773d6202 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/CharsetSubstitutionsFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/CharsetSubstitutionsFeature.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk.localization;
+package com.oracle.svm.hosted.jdk.localization;
 
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
new file mode 100644
index 000000000000..3d38100016f8
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
@@ -0,0 +1,560 @@
+/*
+ * Copyright (c) 2015, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.hosted.jdk.localization;
+
+// Checkstyle: stop
+
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
+import java.text.spi.BreakIteratorProvider;
+import java.text.spi.CollatorProvider;
+import java.text.spi.DateFormatProvider;
+import java.text.spi.DateFormatSymbolsProvider;
+import java.text.spi.DecimalFormatSymbolsProvider;
+import java.text.spi.NumberFormatProvider;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.IllformedLocaleException;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.Objects;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.concurrent.ForkJoinPool;
+import java.util.function.Function;
+import java.util.spi.CalendarDataProvider;
+import java.util.spi.CalendarNameProvider;
+import java.util.spi.CurrencyNameProvider;
+import java.util.spi.LocaleNameProvider;
+import java.util.spi.LocaleServiceProvider;
+import java.util.spi.TimeZoneNameProvider;
+
+import com.oracle.svm.core.jdk.localization.BundleContentSubstitutedLocalizationSupport;
+import com.oracle.svm.core.jdk.localization.LocalizationSupport;
+import com.oracle.svm.core.jdk.localization.OptimizedLocalizationSupport;
+import com.oracle.svm.hosted.NativeImageOptions;
+import com.oracle.svm.core.jdk.localization.compression.GzipBundleCompression;
+import com.oracle.svm.core.jdk.localization.substitutions.Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode;
+import org.graalvm.collections.Pair;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionType;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.hosted.Feature;
+
+import com.oracle.svm.core.ClassLoaderSupport;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.option.HostedOptionKey;
+import com.oracle.svm.core.option.LocatableMultiOptionValue;
+import com.oracle.svm.core.option.OptionUtils;
+import com.oracle.svm.core.util.UserError;
+import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.ReflectionUtil;
+
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import sun.util.locale.provider.LocaleProviderAdapter;
+import sun.util.locale.provider.ResourceBundleBasedAdapter;
+import sun.util.resources.LocaleData;
+// Checkstyle: resume
+
+/**
+ * LocalizationFeature is the core class of SVM localization support. It contains all the options
+ * that can be used to configure how localization in the resulting image should work. One can
+ * specify what charsets, locales and resource bundles should be accessible. The runtime data for
+ * localization is stored in an image singleton of type {@link LocalizationSupport} or one of its
+ * subtypes.
+ *
+ * In case of ResourceBundles, one can also specify how bundles should be handled, because currently
+ * there are two different modes.
+ *
+ * The first approach is using a simple in memory map instead of the original JDK lookup. This
+ * simpler implementation leads to image size savings for smaller images such as hello world, but
+ * could cause compatibility issues and maintenance overhead. It is implemented in
+ * {@link OptimizedLocalizationSupport}.
+ * 
+ * The second approach relies on the original JVM implementation instead. This approach is
+ * consistent by design, which solves compatibility issues and reduces maintenance overhead.
+ * Unfortunately, the default way of storing bundle data in getContents methods, see
+ * {@link sun.text.resources.FormatData} for example, is not very AOT friendly. Compiling these
+ * methods is time consuming and results in a bloated image (183 MB HelloWorld with all locales).
+ * Therefore, the bundle content itself is again stored in the image heap by default and furthermore
+ * is compressed to reduce the image size, see {@link BundleContentSubstitutedLocalizationSupport}
+ * and {@link GzipBundleCompression}.
+ *
+ * @author d-kozak
+ * @see LocalizationSupport
+ * @see OptimizedLocalizationSupport
+ * @see BundleContentSubstitutedLocalizationSupport
+ */
+public abstract class LocalizationFeature implements Feature {
+
+    protected final boolean optimizedMode = Options.LocalizationOptimizedMode.getValue();
+
+    private final boolean substituteLoadLookup = Options.LocalizationSubstituteLoadLookup.getValue();
+
+    protected final boolean trace = Options.TraceLocalizationFeature.getValue();
+
+    private final ForkJoinPool compressionPool = Options.LocalizationCompressInParallel.getValue() ? new ForkJoinPool(NativeImageOptions.NumberOfThreads.getValue()) : null;
+
+    /**
+     * The Locale that the native image is built for. Currently, switching the Locale at run time is
+     * not supported because the resource bundles are only included for one Locale. We use the
+     * Locale that is set for the image generator.
+     */
+    protected Locale defaultLocale = Locale.getDefault();
+
+    private Charset defaultCharset;
+
+    protected Set<Locale> allLocales;
+
+    protected LocalizationSupport support;
+
+    private Function<String, Class<?>> findClassByName;
+
+    public static class Options {
+        @Option(help = "Comma separated list of bundles to be included into the image.", type = OptionType.User)//
+        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> IncludeResourceBundles = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
+
+        @Option(help = "Make all hosted charsets available at run time")//
+        public static final HostedOptionKey<Boolean> AddAllCharsets = new HostedOptionKey<>(false);
+
+        @Option(help = "Default locale of the image, by the default it is the same as the default locale of the image builder.", type = OptionType.User)//
+        public static final HostedOptionKey<String> DefaultLocale = new HostedOptionKey<>(Locale.getDefault().toLanguageTag());
+
+        @Option(help = "Default charset of the image, by the default it is the same as the default charset of the image builder.", type = OptionType.User)//
+        public static final HostedOptionKey<String> DefaultCharset = new HostedOptionKey<>(Charset.defaultCharset().name());
+
+        @Option(help = "Comma separated list of locales to be included into the image. The default locale is included in the list automatically if not present.", type = OptionType.User)//
+        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> IncludeLocales = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
+
+        @Option(help = "Make all hosted locales available at run time.", type = OptionType.User)//
+        public static final HostedOptionKey<Boolean> IncludeAllLocales = new HostedOptionKey<>(false);
+
+        @Option(help = "Optimize the resource bundle lookup using a simple map.", type = OptionType.User)//
+        public static final HostedOptionKey<Boolean> LocalizationOptimizedMode = new HostedOptionKey<>(JavaVersionUtil.JAVA_SPEC == 8);
+
+        @Option(help = "Store the resource bundle content more efficiently in the fallback mode.", type = OptionType.User)//
+        public static final HostedOptionKey<Boolean> LocalizationSubstituteLoadLookup = new HostedOptionKey<>(true);
+
+        @Option(help = "Regular expressions matching which bundles should be compressed.", type = OptionType.User)//
+        public static final HostedOptionKey<LocatableMultiOptionValue.Strings> LocalizationCompressBundles = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
+
+        @Option(help = "Compress the bundles in parallel.", type = OptionType.Expert)//
+        public static final HostedOptionKey<Boolean> LocalizationCompressInParallel = new HostedOptionKey<>(true);
+
+        @Option(help = "When enabled, localization feature details are printed.", type = OptionType.Debug)//
+        public static final HostedOptionKey<Boolean> TraceLocalizationFeature = new HostedOptionKey<>(false);
+    }
+
+    /**
+     * Many subclasses of {@link Charset} initialize encoding and decoding tables lazily. They all
+     * follow the same pattern: the methods "initc2b" and/or "initb2c" perform the initialization,
+     * and then set a field "c2bInitialized" or "b2cInitialized" to true. We run the initialization
+     * eagerly by creating an encoder and decoder during image generation in
+     * {@link LocalizationFeature#addCharset}. So we know that the "init*" methods do nothing, and
+     * we replace calls to them with nothing, i.e,, remove calls to them.
+     *
+     * We could do all this with individual {@link Substitute method substitutions}, but it would
+     * require a lot of substitution methods that all look the same.
+     */
+    public static final class CharsetNodePlugin implements NodePlugin {
+
+        @Override
+        public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
+            if ((method.getName().equals("initc2b") || method.getName().equals("initb2c")) &&
+                            b.getMetaAccess().lookupJavaType(Charset.class).isAssignableFrom(method.getDeclaringClass())) {
+
+                /*
+                 * Verify that the "*Initialized" field corresponding with the method was set to
+                 * true, i.e., that initialization was done eagerly.
+                 */
+                ResolvedJavaType charsetType = method.getDeclaringClass();
+                ResolvedJavaField initializedField = findStaticField(charsetType, method.getName().substring(4, 7) + "Initialized");
+                if (!b.getConstantReflection().readFieldValue(initializedField, null).asBoolean()) {
+                    String charsetName = charsetType.getUnqualifiedName();
+                    try {
+                        Charset charset = Charset.forName(charsetName);
+                        addCharset(charset);
+                    } catch (UnsupportedCharsetException e) {
+                        throw VMError.shouldNotReachHere("Could not find non-initialized charset " + charsetType.getSourceFileName(), e);
+                    }
+                }
+
+                /* We "handled" the method invocation by doing nothing. */
+                return true;
+            }
+            return false;
+        }
+
+        private static ResolvedJavaField findStaticField(ResolvedJavaType declaringClass, String name) {
+            for (ResolvedJavaField field : declaringClass.getStaticFields()) {
+                if (field.getName().equals(name)) {
+                    return field;
+                }
+            }
+            throw VMError.shouldNotReachHere();
+        }
+    }
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        findClassByName = access::findClassByName;
+        allLocales = processLocalesOption();
+        defaultLocale = parseLocaleFromTag(Options.DefaultLocale.getValue());
+        UserError.guarantee(defaultLocale != null, "Invalid default locale %s", Options.DefaultLocale.getValue());
+        try {
+            defaultCharset = Charset.forName(Options.DefaultCharset.getValue());
+            VMError.guarantee(defaultCharset.name().equals(Options.DefaultCharset.getValue()),
+                            "Failed to locate charset " + Options.DefaultCharset.getValue() + ", instead " + defaultCharset.name() + " was provided");
+        } catch (IllegalCharsetNameException | UnsupportedCharsetException ex) {
+            throw UserError.abort(ex, "Invalid default charset %s", Options.DefaultCharset.getValue());
+        }
+        allLocales.add(defaultLocale);
+        support = selectLocalizationSupport();
+        ImageSingletons.add(LocalizationSupport.class, support);
+        ImageSingletons.add(LocalizationFeature.class, this);
+
+        addCharsets();
+        if (optimizedMode) {
+            /*
+             * Providers are only preprocessed in the optimized mode.
+             */
+            addProviders();
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private LocalizationSupport selectLocalizationSupport() {
+        if (optimizedMode) {
+            return new OptimizedLocalizationSupport(defaultLocale, allLocales, defaultCharset);
+        } else if (substituteLoadLookup) {
+            List<String> requestedPatterns = Options.LocalizationCompressBundles.getValue().values();
+            return new BundleContentSubstitutedLocalizationSupport(defaultLocale, allLocales, defaultCharset, requestedPatterns, compressionPool);
+        }
+        return new LocalizationSupport(defaultLocale, allLocales, defaultCharset);
+    }
+
+    @Override
+    public void beforeAnalysis(BeforeAnalysisAccess access) {
+        addResourceBundles();
+    }
+
+    @Override
+    public void afterAnalysis(AfterAnalysisAccess access) {
+        if (compressionPool != null) {
+            compressionPool.shutdown();
+        }
+    }
+
+    /**
+     * @return locale for given tag or null for invalid ones
+     */
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private static Locale parseLocaleFromTag(String tag) {
+        try {
+            return new Locale.Builder().setLanguageTag(tag).build();
+        } catch (IllformedLocaleException ex) {
+            /*- Custom made locales consisting of at most three parts separated by '-' are also supported */
+            String[] parts = tag.split("-");
+            switch (parts.length) {
+                case 1:
+                    return new Locale(parts[0]);
+                case 2:
+                    return new Locale(parts[0], parts[1]);
+                case 3:
+                    return new Locale(parts[0], parts[1], parts[2]);
+                default:
+                    return null;
+            }
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private static Set<Locale> processLocalesOption() {
+        Set<Locale> locales = new HashSet<>();
+        if (Options.IncludeAllLocales.getValue()) {
+            Collections.addAll(locales, Locale.getAvailableLocales());
+            /*- Fallthrough to also allow adding custom locales */
+        }
+        List<String> invalid = new ArrayList<>();
+        for (String tag : OptionUtils.flatten(",", Options.IncludeLocales.getValue().values())) {
+            Locale locale = parseLocaleFromTag(tag);
+            if (locale != null) {
+                locales.add(locale);
+            } else {
+                invalid.add(tag);
+            }
+        }
+        if (!invalid.isEmpty()) {
+            throw UserError.abort("Invalid locales specified: %s", invalid);
+        }
+        return locales;
+    }
+
+    /**
+     * The JDK performs dynamic lookup of charsets by name, which leads to dynamic class loading. We
+     * cannot do that, because we need to know all classes ahead of time to perform our static
+     * analysis. Therefore, we load and register all standard charsets here. Features that require
+     * more than this can add additional charsets.
+     */
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private void addCharsets() {
+        if (Options.AddAllCharsets.getValue()) {
+            for (Charset c : Charset.availableCharsets().values()) {
+                addCharset(c);
+            }
+        } else {
+            addCharset(defaultCharset);
+            addCharset(StandardCharsets.US_ASCII);
+            addCharset(StandardCharsets.ISO_8859_1);
+            addCharset(StandardCharsets.UTF_8);
+            addCharset(StandardCharsets.UTF_16BE);
+            addCharset(StandardCharsets.UTF_16LE);
+            addCharset(StandardCharsets.UTF_16);
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static void addCharset(Charset charset) {
+        Map<String, Charset> charsets = ImageSingletons.lookup(LocalizationSupport.class).charsets;
+        charsets.put(charset.name().toLowerCase(), charset);
+        for (String name : charset.aliases()) {
+            charsets.put(name.toLowerCase(), charset);
+        }
+
+        /* Eagerly initialize all the tables necessary for decoding / encoding. */
+        charset.newDecoder();
+        if (charset.canEncode()) {
+            charset.newEncoder();
+        }
+    }
+
+    /*
+     * LocaleServiceProviderPool.spiClasses does not contain all the classes we need, so we list
+     * them manually here.
+     */
+    private static final List<Class<? extends LocaleServiceProvider>> spiClasses = Arrays.asList(
+                    BreakIteratorProvider.class,
+                    CollatorProvider.class,
+                    DateFormatProvider.class,
+                    DateFormatSymbolsProvider.class,
+                    DecimalFormatSymbolsProvider.class,
+                    NumberFormatProvider.class,
+                    CurrencyNameProvider.class,
+                    LocaleNameProvider.class,
+                    TimeZoneNameProvider.class,
+                    CalendarDataProvider.class,
+                    CalendarNameProvider.class);
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    protected List<Class<? extends LocaleServiceProvider>> getSpiClasses() {
+        return spiClasses;
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private void addProviders() {
+        OptimizedLocalizationSupport optimizedLocalizationSupport = support.asOptimizedSupport();
+        for (Class<? extends LocaleServiceProvider> providerClass : getSpiClasses()) {
+            LocaleProviderAdapter adapter = Objects.requireNonNull(LocaleProviderAdapter.getAdapter(providerClass, defaultLocale));
+            LocaleServiceProvider provider = Objects.requireNonNull(adapter.getLocaleServiceProvider(providerClass));
+            optimizedLocalizationSupport.providerPools.put(providerClass, new Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode(provider));
+        }
+
+        for (Locale locale : allLocales) {
+            for (Locale candidateLocale : optimizedLocalizationSupport.control.getCandidateLocales("", locale)) {
+                for (Class<? extends LocaleServiceProvider> providerClass : getSpiClasses()) {
+                    LocaleProviderAdapter adapter = Objects.requireNonNull(LocaleProviderAdapter.getAdapter(providerClass, candidateLocale));
+
+                    optimizedLocalizationSupport.adaptersByClass.put(Pair.create(providerClass, candidateLocale), adapter);
+                    LocaleProviderAdapter existing = optimizedLocalizationSupport.adaptersByType.put(adapter.getAdapterType(), adapter);
+                    assert existing == null || existing == adapter : "Overwriting adapter type with a different adapter";
+
+                }
+            }
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    protected void addResourceBundles() {
+        for (Locale locale : allLocales) {
+            prepareBundle(localeData(java.util.spi.CalendarDataProvider.class, locale).getCalendarData(locale), locale);
+            prepareBundle(localeData(java.util.spi.CurrencyNameProvider.class, locale).getCurrencyNames(locale), locale);
+            prepareBundle(localeData(java.util.spi.LocaleNameProvider.class, locale).getLocaleNames(locale), locale);
+            prepareBundle(localeData(java.util.spi.TimeZoneNameProvider.class, locale).getTimeZoneNames(locale), locale);
+            prepareBundle(localeData(java.text.spi.BreakIteratorProvider.class, locale).getBreakIteratorInfo(locale), locale);
+            prepareBundle(localeData(java.text.spi.BreakIteratorProvider.class, locale).getCollationData(locale), locale);
+            prepareBundle(localeData(java.text.spi.DateFormatProvider.class, locale).getDateFormatData(locale), locale);
+            prepareBundle(localeData(java.text.spi.NumberFormatProvider.class, locale).getNumberFormatData(locale), locale);
+            /* Note that JDK 11 support overrides this method to register more bundles. */
+        }
+
+        final String[] alwaysRegisteredResourceBundles = new String[]{
+                        "sun.util.logging.resources.logging",
+                        "sun.util.resources.TimeZoneNames"
+        };
+        for (String bundleName : alwaysRegisteredResourceBundles) {
+            prepareBundle(bundleName);
+        }
+
+        for (String bundleName : OptionUtils.flatten(",", Options.IncludeResourceBundles.getValue())) {
+            processRequestedBundle(bundleName);
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    protected LocaleData localeData(Class<? extends LocaleServiceProvider> providerClass, Locale locale) {
+        return ((ResourceBundleBasedAdapter) LocaleProviderAdapter.getAdapter(providerClass, locale)).getLocaleData();
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private void processRequestedBundle(String input) {
+        int splitIndex = input.indexOf('_');
+        boolean specificLocaleRequested = splitIndex != -1;
+        if (!specificLocaleRequested) {
+            prepareBundle(input, allLocales);
+            return;
+        }
+        Locale locale = splitIndex + 1 < input.length() ? parseLocaleFromTag(input.substring(splitIndex + 1)) : Locale.ROOT;
+        if (locale == null) {
+            trace("Cannot parse wanted locale " + input.substring(splitIndex + 1) + ", default will be used instead.");
+            locale = defaultLocale;
+        }
+        /*- Get rid of locale specific suffix. */
+        String baseName = input.substring(0, splitIndex);
+        prepareBundle(baseName, Collections.singletonList(locale));
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public void prepareBundle(String baseName) {
+        prepareBundle(baseName, allLocales);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public void prepareBundle(String baseName, Collection<Locale> wantedLocales) {
+        if (baseName.isEmpty()) {
+            return;
+        }
+
+        boolean somethingFound = false;
+        for (Locale locale : wantedLocales) {
+            List<ResourceBundle> resourceBundle;
+            try {
+                resourceBundle = ImageSingletons.lookup(ClassLoaderSupport.class).getResourceBundle(baseName, locale);
+            } catch (MissingResourceException mre) {
+                continue;
+            }
+            somethingFound = !resourceBundle.isEmpty();
+            for (ResourceBundle bundle : resourceBundle) {
+                prepareBundle(baseName, bundle, locale);
+            }
+        }
+
+        if (!somethingFound) {
+            /*
+             * Try non-compliant class-based bundles. These bundles can't be looked up by the normal
+             * ResourceBundle lookup process, e.g. because they don't have default constructors.
+             */
+            Class<?> clazz = findClassByName.apply(baseName);
+            if (clazz != null && ResourceBundle.class.isAssignableFrom(clazz)) {
+                trace("Found non-compliant class-based bundle " + clazz);
+                somethingFound = true;
+                support.prepareNonCompliant(clazz);
+            }
+        }
+
+        if (!somethingFound) {
+            String errorMessage = "The bundle named: " + baseName + ", has not been found. " +
+                            "If the bundle is part of a module, verify the bundle name is a fully qualified class name. Otherwise " +
+                            "verify the bundle path is accessible in the classpath.";
+            // Checkstyle: stop
+            System.out.println(errorMessage);
+            // Checkstyle: resume
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    protected void prepareBundle(ResourceBundle bundle, Locale locale) {
+        prepareBundle(bundle.getBaseBundleName(), bundle, locale);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private void prepareBundle(String bundleName, ResourceBundle bundle, Locale locale) {
+        trace("Adding bundle " + bundleName + ", locale " + locale);
+        /*
+         * Ensure that the bundle contents are loaded. We need to walk the whole bundle parent chain
+         * down to the root.
+         */
+        for (ResourceBundle cur = bundle; cur != null; cur = getParent(cur)) {
+            /* Register all bundles with their corresponding locales */
+            support.prepareBundle(bundleName, cur, cur.getLocale());
+        }
+
+        /*
+         * Finally, register the requested bundle with requested locale (Requested might be more
+         * specific than the actual bundle locale
+         */
+        support.prepareBundle(bundleName, bundle, locale);
+    }
+
+    /*
+     * The field ResourceBundle.parent is not public. There is a backdoor to access it via
+     * SharedSecrets, but the package of SharedSecrets changed from JDK 8 to JDK 11 so it is
+     * inconvenient to use it. Reflective access is easier.
+     */
+    private static final Field PARENT_FIELD = ReflectionUtil.lookupField(ResourceBundle.class, "parent");
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    private static ResourceBundle getParent(ResourceBundle bundle) {
+        try {
+            return (ResourceBundle) PARENT_FIELD.get(bundle);
+        } catch (ReflectiveOperationException ex) {
+            throw VMError.shouldNotReachHere(ex);
+        }
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    protected void trace(String msg) {
+        if (trace) {
+            // Checkstyle: stop
+            System.out.println(msg);
+            // Checkstyle: resume
+        }
+    }
+}

From 6869fe3e00f4f67a61aee9d42bca421c19da5c3a Mon Sep 17 00:00:00 2001
From: Pavel Marek <pavel.m.marek@oracle.com>
Date: Wed, 13 Oct 2021 02:30:09 +0000
Subject: [PATCH 443/681] [GR-19768] Update Truffle import.

PullRequest: fastr/2667
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 18842643c9a6..ffa902906316 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -66,7 +66,7 @@
             },
             {
                 "name": "fastr",
-                "version": "0292d0263e2abe0508505e19351d7e85282ab831",
+                "version": "e80a7bc4bec3cfb18754b578212cf0d5e8122058",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/fastr.git", "kind": "git"},

From 6a0febe77c5c661b9e6b15523200c3b8d9da53fb Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Wed, 13 Oct 2021 05:13:52 +0000
Subject: [PATCH 444/681] [GR-34241] ContextifyScript::EvalMachine() should
 pause the execution when break_on_first_line only.

PullRequest: js/2190
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index ffa902906316..0d8060ac5c01 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "43f5bc397a09a45f6f6c34ed5b283e58eca1e7ae",
+                "version": "70dbd4073a01b5482bdfb0075fa99ff8afd1954f",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "43f5bc397a09a45f6f6c34ed5b283e58eca1e7ae",
+                "version": "70dbd4073a01b5482bdfb0075fa99ff8afd1954f",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From db5edf9ee41d6cd662c409951d83fd5903b5d509 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Wed, 13 Oct 2021 11:25:20 +0200
Subject: [PATCH 445/681] Remove useless cast.

---
 .../truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
index b3e341250f1b..6b2295933c72 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalTruffleRuntimeListenerDispatcher.java
@@ -170,6 +170,6 @@ public void onFailure(CompilableTruffleAST compilable, String reason, boolean ba
     @Override
     public void onCompilationRetry(CompilableTruffleAST compilable, TruffleCompilationTask task) {
         onCompilationQueued((OptimizedCallTarget) compilable, task.tier());
-        onCompilationStarted((OptimizedCallTarget) compilable, (CompilationTask) task);
+        onCompilationStarted((OptimizedCallTarget) compilable, task);
     }
 }

From d090dccdaa41801f80a02b1d2e615650a4992a42 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 29 Sep 2021 16:33:15 +0200
Subject: [PATCH 446/681] compiler: Node#updatePredecessor should also notify
 the new successor about changed edges

---
 .../src/org/graalvm/compiler/graph/Node.java                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index d2bbcf3cbf9c..8f1622c8e2ed 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -631,6 +631,7 @@ protected void updatePredecessor(Node oldSuccessor, Node newSuccessor) {
             if (newSuccessor != null) {
                 assert assertTrue(newSuccessor.predecessor == null, "unexpected non-null predecessor in new successor (%s): %s, this=%s", newSuccessor, newSuccessor.predecessor, this);
                 newSuccessor.predecessor = this;
+                maybeNotifyInputChanged(newSuccessor);
             }
             maybeNotifyInputChanged(this);
         }

From 04e88ef64a5b00a5a8bb7bc1d84dc66b8818be39 Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Wed, 13 Oct 2021 14:28:19 +0200
Subject: [PATCH 447/681] Update changelog and docs.

---
 truffle/CHANGELOG.md       |  1 +
 truffle/docs/Optimizing.md | 53 ++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index 962c7f6eac5f..3a93002f468d 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -11,6 +11,7 @@ This changelog summarizes major changes between Truffle versions relevant to lan
 No active inner context is allowed after `TruffleLanguage.finalizeContext(Object)` returns. Not complying with this requirement will result in an internal error. Please note that inactive inner contexts are still closed implicitly by the parent context.
 * Added `TruffleContext.closeExited(Node, int)` to hard exit an entered truffle context. See [the documentation](https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md).
 * Added `TruffleLanguage.exitContext(Object, ExitMode, int)` to allow languages perform actions before natural/hard context exit. Languages are encouraged to run all their shutdown hooks in exitContext instead of finalizeContext.
+* Improved the output format for `engine.TraceCompilation` and `engine.TraceCompilationDetails`. See [Optimizing.md](https://github.com/oracle/graal/blob/master/truffle/docs/Optimizing.md) for details.
 
 ## Version 21.3.0
 * Added a `@GenerateWrapper.Ignore` annotation to prevent methods from being instrumented in wrapper classes.
diff --git a/truffle/docs/Optimizing.md b/truffle/docs/Optimizing.md
index 071700057d5d..abbe72835a63 100644
--- a/truffle/docs/Optimizing.md
+++ b/truffle/docs/Optimizing.md
@@ -43,24 +43,55 @@ Note: Most options also require the additional `--experimental-options` flag set
 The `--engine.TraceCompilation` command prints a line each time a method is compiled:
 
 ```shell
-[engine] opt done     EqualityConstraint.execute                                  |AST   17|Tier      2|Time  152( 143+9   )ms|Inlined   2Y   0N|IR   266/  300|CodeSize   1010|Addr 0x7f60068c82d0|Src octane-deltablue.js:528
+[engine] opt done   id=244   EqualityConstraint.execute                         |Tier 1|Time   268( 220+47  )ms|AST   17|Inlined   0Y   2N|IR    238/   437|CodeSize    1874|Timestamp 758868036671903|Src octane-deltablue.js:528
 ```
 
-The `--engine.TraceCompilationDetails` command prints a line when compilation is queued, started, or completed:
+Here is a quick overview of the information provided in these logs:
+- `id` - Unique identifier of the call target.
+- `Tier` - For which compilation tier was the targed scheduled.
+- `Time` - How long did the compilation last, with separation between the Truffle tier (mainly partial evaluation) and the Graal Tiers.
+- `AST` - The targets non-trivial node count.
+- `Inlined` - How many calls were inlined and how many remained calls after inlining.
+- `IR` - Graal node count after partial evaluation and after compilation.
+- `CodeSize` - The size of the code generated for the call target.
+- `Timestamp` - The time when the event happened as reported by `System.nanoTime()`.
+- `Src` - Abbreviated source section of the call target.
+
+The `--engine.TraceCompilationDetails` command prints a line when compilation is queued, unqueued, started, or completed:
 
 ```shell
-[engine] opt queued   id=237   BinaryConstraint.output                            | Tier 1 | Count/Thres        25/      25 | Queue: Size    1 Change +1  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:416 | Time 317044280158387 
-[engine] opt start    id=237   BinaryConstraint.output                            | Tier 1 | Weight       25 | Rate 0.00000 | Queue: Size    0 Change +0  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:416 | Time 317044278139824 
-[engine] opt queued   id=239   OrderedCollection.size                             | Tier 1 | Count/Thres        25/      25 | Queue: Size    1 Change +1  Scale  0.06 Elapsed    0us | Src octane-deltablue.js:71 | Time 317044313989575 
-[engine] opt queued   id=52    Array.prototype.push                               | Tier 1 | Count/Thres        25/      50 | Queue: Size    2 Change +1  Scale  0.13 Elapsed    0us | Src <builtin>:1 | Time 317044336408392 
-[engine] opt start    id=239   OrderedCollection.size                             | Tier 1 | Weight    88875 | Rate 0.00000 | Queue: Size    6 Change -1  Scale  0.31 Elapsed  328us | Src octane-deltablue.js:71 | Time 317045054478062 
+[engine] opt queued id=237   BinaryConstraint.output                            |Tier 1|Count/Thres         25/       25|Queue: Size    1 Change +1  Load  0.06 Time     0us|Timestamp 758865671350686|Src octane-deltablue.js:416
+[engine] opt start  id=237   BinaryConstraint.output                            |Tier 1|Priority        25|Rate 0.000000|Queue: Size    0 Change +0  Load  0.06 Time     0us|Timestamp 758865708273384|Src octane-deltablue.js:416
+[engine] opt queued id=239   OrderedCollection.size                             |Tier 1|Count/Thres         25/       25|Queue: Size    1 Change +1  Load  0.06 Time     0us|Timestamp 758865727664193|Src octane-deltablue.js:71
+[engine] opt queued id=52    Array.prototype.push                               |Tier 1|Count/Thres         25/       50|Queue: Size    2 Change +1  Load  0.13 Time     0us|Timestamp 758865744191674|Src <builtin>:1
+... more log ...
+[engine] opt start  id=239   OrderedCollection.size                             |Tier 1|Priority    181875|Rate 0.000001|Queue: Size   11 Change -1  Load  0.63 Time   575us|Timestamp 758866381654116|Src octane-deltablue.js:71
+[engine] opt done   id=237   BinaryConstraint.output                            |Tier 1|Time   717( 654+64  )ms|AST   19|Inlined   0Y   0N|IR    143/   220|CodeSize     882|Timestamp 758866435391354|Src octane-deltablue.js:416
+[engine] opt start  id=236   BinaryConstraint.input                             |Tier 1|Priority    144000|Rate 0.000001|Queue: Size   10 Change -1  Load  0.56 Time    48us|Timestamp 758866452554530|Src octane-deltablue.js:409
+... more log ...
+[engine] opt queued id=239   OrderedCollection.size                             |Tier 2|Count/Thres       8750/     8125|Queue: Size   18 Change +1  Load  0.81 Time     0us|Timestamp 758867756295139|Src octane-deltablue.js:71
+[engine] opt queued id=237   BinaryConstraint.output                            |Tier 2|Count/Thres       8499/     8750|Queue: Size   19 Change +1  Load  0.88 Time     0us|Timestamp 758867758263099|Src octane-deltablue.js:416
+[engine] opt start  id=244   EqualityConstraint.execute                         |Tier 1|Priority   2618289|Rate 0.000015|Queue: Size   19 Change -1  Load  0.88 Time   180us|Timestamp 758867767116908|Src octane-deltablue.js:528
 ... more log ...
-[engine] opt start    id=237   BinaryConstraint.output                            | Tier 2 | Weight   256510 | Rate 0.00007 | Queue: Size   21 Change -1  Scale  1.00 Elapsed   17us | Src octane-deltablue.js:416 | Time 317056014011223 
-[engine] opt done     id=293   change                                             | Tier 1 | Elapsed       271( 186+86  )ms | Src octane-deltablue.js:867 | Time 317056063627727 
-[engine] opt start    id=271   Plan.size                                          | Tier 2 | Weight   233921 | Rate 0.00008 | Queue: Size   20 Change -1  Scale  1.00 Elapsed   26us | Src octane-deltablue.js:770 | Time 317056067292754 
-[engine] opt done     id=237   BinaryConstraint.output                            | Tier 2 | Elapsed       140( 124+17  )ms | Src octane-deltablue.js:416 | Time 317056154362876 
+[engine] opt done   id=246   OrderedCollection.at                               |Tier 2|Time    89(  80+9   )ms|AST   15|Inlined   0Y   0N|IR     50/   110|CodeSize     582|Timestamp 758873628915755|Src octane-deltablue.js:67
+[engine] opt start  id=237   BinaryConstraint.output                            |Tier 2|Priority    173536|Rate 0.000054|Queue: Size   18 Change -1  Load  0.94 Time    18us|Timestamp 758873629411012|Src octane-deltablue.js:416
+[engine] opt queued id=238   Planner.addPropagate                               |Tier 2|Count/Thres       9375/     8750|Queue: Size   19 Change +1  Load  0.88 Time     0us|Timestamp 758873663196884|Src octane-deltablue.js:696
+[engine] opt queued id=226   Variable.addConstraint                             |Tier 2|Count/Thres       8771/     9375|Queue: Size   20 Change +1  Load  0.94 Time     0us|Timestamp 758873665823697|Src octane-deltablue.js:556
+[engine] opt done   id=293   change                                             |Tier 1|Time   167( 130+37  )ms|AST   60|Inlined   0Y   6N|IR    576/  1220|CodeSize    5554|Timestamp 758873669483749|Src octane-deltablue.js:867
+[engine] opt start  id=270   Plan.execute                                       |Tier 2|Priority    157871|Rate 0.000072|Queue: Size   19 Change -1  Load  1.00 Time    17us|Timestamp 758873669912101|Src octane-deltablue.js:778
+[engine] opt done   id=237   BinaryConstraint.output                            |Tier 2|Time    58(  52+6   )ms|AST   19|Inlined   0Y   0N|IR    103/   181|CodeSize     734|Timestamp 758873687678394|Src octane-deltablue.js:416
+... more log ...
+[engine] opt unque. id=304   Date.prototype.valueOf                             |Tier 2|Count/Thres      80234/     3125|Queue: Size    4 Change  0  Load  0.31 Time     0us|Timestamp 758899904132076|Src <builtin>:1|Reason Target inlined into only caller
 ```
 
+Here is a quick overview of the information added in these logs:
+- `Count/Thres` - What is the call and loop count of the target and what is the threshold needed to add the compilation to the queue.
+- `Queue: Size` - How many compilations are in the compilation queue.
+- `Queue: Change` - How did this event impact the compilation queue (e.g. certain events can prune the queue of unneeded compilation tasks).
+- `Queue: Load` - A metric of whether the queue is over/under loaded. Normal load is represented with 1, less then 1 is underloaded and greater than 1 is overloaded.
+- `Queue: Time` - How long did the event take.
+- `Reason` - The runtime reported reason for the event.
+
 The `--engine.TraceCompilationAST` command prints the Truffle AST for each compilation:
 
 ```shell

From 25b5ca4d1bbd516c2504ce9b5fa110afb9468971 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Wed, 13 Oct 2021 14:52:47 +0200
Subject: [PATCH 448/681] Fix db-shootout not found on JDK11

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 4a68c7e4b5bb..dca79cad7239 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -1850,16 +1850,16 @@ def renaissanceIterations(self):
             del benchmarks["naive-bayes"]
             del benchmarks["page-rank"]
 
-        if mx.get_arch() != "amd64" or mx.get_jdk().javaCompliance >= '11':
+        if mx.get_arch() != "amd64" or mx.get_jdk().javaCompliance > '11':
             # GR-33879
             # JNA libraries needed are currently limited to amd64: renaissance-benchmarks/renaissance #153
             del benchmarks["db-shootout"]
 
         if self.version() in ["0.9.0", "0.10.0", "0.11.0"]:
-            if mx.get_jdk().javaCompliance >= '11':
+            if mx.get_jdk().javaCompliance > '11':
                 del benchmarks["neo4j-analytics"]
         else:
-            if mx.get_jdk().javaCompliance < '11' or mx.get_jdk().javaCompliance >= '15':
+            if mx.get_jdk().javaCompliance < '11' or mx.get_jdk().javaCompliance > '15':
                 del benchmarks["neo4j-analytics"]
         return benchmarks
 

From 3835a8cf14ba965ce8464e9732f11af5908356fc Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 13 Oct 2021 15:29:39 +0200
Subject: [PATCH 449/681] Ignore push events for mirrored PRs.

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8ae3f6512a89..502bdf800d84 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,6 +2,8 @@ name: GraalVM Gate
 
 on:
   push:
+    branches-ignore:
+      - 'github/**'
     paths-ignore:
       - '.travis.yml'
       - '.github/workflows/quarkus.yml'

From 83e31860ae8c8287b01f3edcbd62bcab015ac116 Mon Sep 17 00:00:00 2001
From: Marjana Solajic <marjana.m.solajic@oracle.com>
Date: Sun, 10 Oct 2021 19:57:49 +0200
Subject: [PATCH 450/681] Collect information about call edges and print it
 with other analysis results statistics.

---
 .../reports/AnalysisReportsOptions.java       | 14 +++++++++++++
 .../pointsto/reports/StatisticsPrinter.java   | 20 +++++++++++++++++++
 vm/mx.vm/mx_vm_benchmark.py                   | 12 +++++++++++
 3 files changed, 46 insertions(+)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
index 62b9e9d5780f..7bf1b7268946 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
@@ -24,9 +24,12 @@
  */
 package com.oracle.graal.pointsto.reports;
 
+import org.graalvm.collections.EconomicMap;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
 
+import static com.oracle.graal.pointsto.api.PointstoOptions.TrackAccessChain;
+
 public class AnalysisReportsOptions {
 
     @Option(help = "Print analysis results statistics.")//
@@ -38,6 +41,17 @@ public class AnalysisReportsOptions {
     @Option(help = "Print analysis call tree, a breadth-first tree reduction of the call graph.")//
     public static final OptionKey<Boolean> PrintAnalysisCallTree = new OptionKey<>(false);
 
+    @Option(help = "Print call edges with other analysis results statistics.")//
+    public static final OptionKey<Boolean> PrintCallEdges = new OptionKey<Boolean>(false) {
+        @Override
+        protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean oldValue, Boolean newValue) {
+            if (newValue) {
+                PrintAnalysisStatistics.update(values, true);
+                TrackAccessChain.update(values, true);
+            }
+        }
+    };
+
     @Option(help = "Print image object hierarchy.")//
     public static final OptionKey<Boolean> PrintImageObjectTree = new OptionKey<>(false);
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/StatisticsPrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/StatisticsPrinter.java
index 65ef2eb74e12..b9f6c3c4bd8c 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/StatisticsPrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/StatisticsPrinter.java
@@ -70,6 +70,11 @@ private void printStats(PrintWriter out) {
 
         beginObject(out);
 
+        if (AnalysisReportsOptions.PrintCallEdges.getValue(bb.getOptions())) {
+            int[] callEdges = getNumCallEdges(bb);
+            print(out, "total_call_edges", callEdges[0]);
+            print(out, "app_call_edges", callEdges[1]);
+        }
         print(out, "total_reachable_types", reachableTypes[0]);
         print(out, "app_reachable_types", reachableTypes[1]);
         print(out, "total_reachable_methods", reachableMethods[0]);
@@ -108,6 +113,21 @@ public static void printLast(PrintWriter out, String key, long value) {
         out.format("%s\"%s\": %d%n", INDENT, key, value);
     }
 
+    private static int[] getNumCallEdges(BigBang bb) {
+        int callEdges = 0;
+        int appCallEdges = 0;
+        for (AnalysisMethod method : bb.getUniverse().getMethods()) {
+            if (method.isImplementationInvoked()) {
+                int callers = method.getCallers().size();
+                callEdges += callers;
+                if (!isRuntimeLibraryType(method.getDeclaringClass())) {
+                    appCallEdges += callers;
+                }
+            }
+        }
+        return new int[]{callEdges, appCallEdges};
+    }
+
     private static int[] getNumReachableTypes(BigBang bb) {
         int reachable = 0;
         int appReachable = 0;
diff --git a/vm/mx.vm/mx_vm_benchmark.py b/vm/mx.vm/mx_vm_benchmark.py
index 5482415a82d4..8756fcc9e073 100644
--- a/vm/mx.vm/mx_vm_benchmark.py
+++ b/vm/mx.vm/mx_vm_benchmark.py
@@ -161,6 +161,7 @@ def __init__(self, vm, bm_suite, args):
             self.base_image_build_args += ['-H:Path=' + self.output_dir]
             self.base_image_build_args += ['-H:ConfigurationFileDirectories=' + self.config_dir]
             self.base_image_build_args += ['-H:+PrintAnalysisStatistics', '-H:AnalysisStatisticsFile=' + self.analysis_report_path]
+            self.base_image_build_args += ['-H:+PrintCallEdges']
             self.base_image_build_args += ['-H:+CollectImageBuildStatistics', '-H:ImageBuildStatisticsFile=' + self.image_build_report_path]
             self.base_image_build_args += ['-H:+ConfigureReflectionMetadata']
             if vm.is_llvm:
@@ -581,6 +582,17 @@ def __call__(self, *args, **kwargs):
                 "metric.iteration": 0,
                 "metric.object": ("<section>", str),
             }),
+            mx_benchmark.JsonStdOutFileRule(r'^# Printing analysis results stats to: (?P<path>\S+?)$', 'path', {
+                "benchmark": benchmarks[0],
+                "metric.name": "analysis-stats",
+                "metric.type": "numeric",
+                "metric.unit": "#",
+                "metric.value": ("<total_call_edges>", int),
+                "metric.score-function": "id",
+                "metric.better": "lower",
+                "metric.iteration": 0,
+                "metric.object": "call-edges",
+            }, ['total_call_edges']),
             mx_benchmark.JsonStdOutFileRule(r'^# Printing analysis results stats to: (?P<path>\S+?)$', 'path', {
                 "benchmark": benchmarks[0],
                 "metric.name": "analysis-stats",

From e18ca33c1212acc27ab32b29c5cfdeb72554e4bb Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Thu, 23 Sep 2021 18:27:30 +0200
Subject: [PATCH 451/681] Cleanup shift constant folding and isNarrowable
 criteria.

---
 .../asm/aarch64/AArch64ASIMDAssembler.java    | 25 +++++++---------
 .../core/common/type/IntegerStamp.java        | 30 ++++++++++++-------
 .../compiler/nodes/calc/RightShiftNode.java   | 11 +++++--
 .../compiler/nodes/calc/ShiftNode.java        |  4 +--
 .../nodes/calc/UnsignedRightShiftNode.java    | 13 ++++++--
 5 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java
index aa7caaa48bd3..25870750d06a 100644
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java
@@ -2417,9 +2417,8 @@ public void scvtfVV(ASIMDSize size, ElementSize eSize, Register dst, Register sr
      * <code>for i in 0..n-1 do dst[i] = src[i] << imm</code>
      *
      * @param size register size.
-     * @param eSize element size. Must be ElementSize.Word or ElementSize.DoubleWord. Note
-     *            ElementSize.DoubleWord is only applicable when size is 128 (i.e. the operation is
-     *            performed on more than one element).
+     * @param eSize element size. ElementSize.DoubleWord is only applicable when size is 128 (i.e.
+     *            the operation is performed on more than one element).
      * @param dst SIMD register.
      * @param src SIMD register.
      * @param shiftAmt shift amount.
@@ -2554,9 +2553,8 @@ public void smovGX(ElementSize dstESize, ElementSize srcESize, Register dst, Reg
      * dst[i] = (src1[i] >> byte(src2[i])</code>
      *
      * @param size register size.
-     * @param eSize element size. Must be ElementSize.Word or ElementSize.DoubleWord. Note
-     *            ElementSize.DoubleWord is only applicable when size is 128 (i.e. the operation is
-     *            performed on more than one element).
+     * @param eSize element size. ElementSize.DoubleWord is only applicable when size is 128 (i.e.
+     *            the operation is performed on more than one element).
      * @param dst SIMD register.
      * @param src1 SIMD register.
      * @param src2 SIMD register.
@@ -2604,9 +2602,8 @@ public void sshllVVI(ElementSize srcESize, Register dst, Register src, int shift
      * <code>for i in 0..n-1 do dst[i] = src[i] >> imm</code>
      *
      * @param size register size.
-     * @param eSize element size. Must be ElementSize.Word or ElementSize.DoubleWord. Note
-     *            ElementSize.DoubleWord is only applicable when size is 128 (i.e. the operation is
-     *            performed on more than one element).
+     * @param eSize element size. ElementSize.DoubleWord is only applicable when size is 128 (i.e.
+     *            the operation is performed on more than one element).
      * @param dst SIMD register.
      * @param src SIMD register.
      * @param shiftAmt shift right amount.
@@ -2984,9 +2981,8 @@ public void umovGX(ElementSize eSize, Register dst, Register src, int index) {
      * dst[i] = (src1[i] >>> byte(src2[i])</code>
      *
      * @param size register size.
-     * @param eSize element size. Must be ElementSize.Word or ElementSize.DoubleWord. Note
-     *            ElementSize.DoubleWord is only applicable when size is 128 (i.e. the operation is
-     *            performed on more than one element).
+     * @param eSize element size. ElementSize.DoubleWord is only applicable when size is 128 (i.e.
+     *            the operation is performed on more than one element).
      * @param dst SIMD register.
      * @param src1 SIMD register.
      * @param src2 SIMD register.
@@ -3057,9 +3053,8 @@ public void ushrSSI(ElementSize eSize, Register dst, Register src, int shiftAmt)
      * <code>dst = src >>> imm</code>
      *
      * @param size register size.
-     * @param eSize element size. Must be ElementSize.Word or ElementSize.DoubleWord. Note
-     *            ElementSize.DoubleWord is only applicable when size is 128 (i.e. the operation is
-     *            performed on more than one element).
+     * @param eSize element size. ElementSize.DoubleWord is only applicable when size is 128 (i.e.
+     *            the operation is performed on more than one element).
      * @param dst SIMD register.
      * @param src SIMD register.
      * @param shiftAmt shift right amount.
diff --git a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
index abc5b5b156d6..9dcc2cad9222 100644
--- a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
+++ b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/IntegerStamp.java
@@ -1313,8 +1313,12 @@ public Constant getZero(Stamp s) {
                         public Constant foldConstant(Constant value, int amount) {
                             PrimitiveConstant c = (PrimitiveConstant) value;
                             switch (c.getJavaKind()) {
+                                case Byte:
+                                    return JavaConstant.forByte((byte) (c.asInt() << amount));
+                                case Char:
+                                    return JavaConstant.forChar((char) (c.asInt() << amount));
                                 case Short:
-                                    return JavaConstant.forShort((short) (c.asLong() << amount));
+                                    return JavaConstant.forShort((short) (c.asInt() << amount));
                                 case Int:
                                     return JavaConstant.forInt(c.asInt() << amount);
                                 case Long:
@@ -1381,9 +1385,7 @@ public Stamp foldStamp(Stamp stamp, IntegerStamp shift) {
 
                         @Override
                         public int getShiftAmountMask(Stamp s) {
-                            IntegerStamp stamp = (IntegerStamp) s;
-                            assert CodeUtil.isPowerOf2(stamp.getBits());
-                            return stamp.getBits() - 1;
+                            return s.getStackKind().getBitCount() - 1;
                         }
                     },
 
@@ -1393,8 +1395,12 @@ public int getShiftAmountMask(Stamp s) {
                         public Constant foldConstant(Constant value, int amount) {
                             PrimitiveConstant c = (PrimitiveConstant) value;
                             switch (c.getJavaKind()) {
+                                case Byte:
+                                    return JavaConstant.forByte((byte) (c.asInt() >> amount));
+                                case Char:
+                                    return JavaConstant.forChar((char) (c.asInt() >> amount));
                                 case Short:
-                                    return JavaConstant.forShort((short) (c.asLong() >> amount));
+                                    return JavaConstant.forShort((short) (c.asInt() >> amount));
                                 case Int:
                                     return JavaConstant.forInt(c.asInt() >> amount);
                                 case Long:
@@ -1431,9 +1437,7 @@ public Stamp foldStamp(Stamp stamp, IntegerStamp shift) {
 
                         @Override
                         public int getShiftAmountMask(Stamp s) {
-                            IntegerStamp stamp = (IntegerStamp) s;
-                            assert CodeUtil.isPowerOf2(stamp.getBits());
-                            return stamp.getBits() - 1;
+                            return s.getStackKind().getBitCount() - 1;
                         }
                     },
 
@@ -1443,6 +1447,12 @@ public int getShiftAmountMask(Stamp s) {
                         public Constant foldConstant(Constant value, int amount) {
                             PrimitiveConstant c = (PrimitiveConstant) value;
                             switch (c.getJavaKind()) {
+                                case Byte:
+                                    return JavaConstant.forByte((byte) (c.asInt() >>> amount));
+                                case Char:
+                                    return JavaConstant.forChar((char) (c.asInt() >>> amount));
+                                case Short:
+                                    return JavaConstant.forShort((short) (c.asInt() >>> amount));
                                 case Int:
                                     return JavaConstant.forInt(c.asInt() >>> amount);
                                 case Long:
@@ -1482,9 +1492,7 @@ public Stamp foldStamp(Stamp stamp, IntegerStamp shift) {
 
                         @Override
                         public int getShiftAmountMask(Stamp s) {
-                            IntegerStamp stamp = (IntegerStamp) s;
-                            assert CodeUtil.isPowerOf2(stamp.getBits());
-                            return stamp.getBits() - 1;
+                            return s.getStackKind().getBitCount() - 1;
                         }
                     },
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java
index 572b30db7277..9294d4e03166 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java
@@ -32,12 +32,12 @@
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
@@ -163,7 +163,14 @@ public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool
 
     @Override
     public boolean isNarrowable(int resultBits) {
-        if (super.isNarrowable(resultBits)) {
+        /*
+         * Note that inserting a narrow before this node can change the input's stamp, as it can
+         * cause a preceding (Zero|Sign)ExtendNode to be canonicalized away.
+         *
+         * Therefore, since the scalar shift on the underlying hardware will be on either a 32 or 64
+         * bit operation, if resultBits < Integer.SIZE, the input to the shift cannot be narrowed.
+         */
+        if (resultBits >= Integer.SIZE && super.isNarrowable(resultBits)) {
             /*
              * For signed right shifts, the narrow can be done before the shift if the cut off bits
              * are all equal to the sign bit of the input. That's equivalent to the condition that
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java
index a4642bda8761..90ee93522cb1 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ShiftNode.java
@@ -33,13 +33,13 @@
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ArithmeticOperation;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
@@ -107,7 +107,7 @@ public int getShiftAmountMask() {
     @Override
     public boolean isNarrowable(int resultBits) {
         assert CodeUtil.isPowerOf2(resultBits);
-        int narrowMask = resultBits - 1;
+        int narrowMask = resultBits <= 32 ? Integer.SIZE - 1 : Long.SIZE - 1;
         int wideMask = getShiftAmountMask();
         assert (wideMask & narrowMask) == narrowMask : String.format("wideMask %x should be wider than narrowMask %x", wideMask, narrowMask);
 
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java
index 7e2e0456945f..df0d7f921e88 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java
@@ -32,12 +32,12 @@
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
@@ -146,13 +146,20 @@ public void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool
 
     @Override
     public boolean isNarrowable(int resultBits) {
-        if (super.isNarrowable(resultBits)) {
+        /*
+         * Note that inserting a narrow before this node can change the input's stamp, as it can
+         * cause a preceding (Zero|Sign)ExtendNode to be canonicalized away.
+         *
+         * Therefore, since the scalar shift on the underlying hardware will be on either a 32 or 64
+         * bit operation, if resultBits < Integer.SIZE, the input to the shift cannot be narrowed.
+         */
+        if (resultBits >= Integer.SIZE && super.isNarrowable(resultBits)) {
             /*
              * For unsigned right shifts, the narrow can be done before the shift if the cut off
              * bits are all zero.
              */
             IntegerStamp inputStamp = (IntegerStamp) getX().stamp(NodeView.DEFAULT);
-            return (inputStamp.upMask() & ~(resultBits - 1)) == 0;
+            return (inputStamp.upMask() & ~(CodeUtil.mask(resultBits))) == 0;
         } else {
             return false;
         }

From 263f8ade98619ee273daeca9804d7ee20daaf31c Mon Sep 17 00:00:00 2001
From: Aleksandar Gradinac <aleksandar.gradinac@oracle.com>
Date: Mon, 11 Oct 2021 12:35:00 +0200
Subject: [PATCH 452/681] Use toolchains for musl cross-compilation and improve
 docs for building static native-images.

---
 .../native-image/StaticImages.md              | 55 ++++++++-----------
 substratevm/ci_includes/gate.hocon            |  7 +--
 substratevm/mx.substratevm/mx_substratevm.py  | 17 +-----
 .../svm/core/posix/linux/libc/MuslLibC.java   |  2 +-
 4 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index 73bfbb34e228..fe152f33a0b3 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -7,19 +7,32 @@ permalink: /reference-manual/native-image/StaticImages/
 # Static Native Images
 
 Static native images are statically linked binaries which can be used without any additional library dependencies.
-This makes them suitable for use in a Docker container.
+This makes them suitable for use in a Docker container. Static native images are created by statically linking against [musl-libc](https://www.musl-libc.org/), an alternative libc implementation.
 
 ## Prerequisites
  - Right now, this only works on Linux AMD64 on Java 11.
- - You will need `gcc`, `make`, and `configure`.
- - Create a directory that will hold the libraries you build. You will refer to this directory as `${RESULT_DIR}`.
- - Download the latest `musl` release [here](https://musl.libc.org/). This document will use `musl-1.2.0`.
- - Download the latest `zlib` release [here](https://zlib.net/). This document will use `zlib-1.2.11`.
-
- ## Build a Static Native Image
+ - You will need a 64-bit `musl` toolchain, `make`, and `configure`.
+ - You can download the musl toolchain from [musl.cc](musl.cc), specifically [this one](http://musl.cc/x86_64-linux-musl-native.tgz)
+ - Download the latest `zlib` release sources [here](https://zlib.net/). This document will use `zlib-1.2.11`.
+
+## Preparing The Toolchain And Compiling Zlib
+ - Extract the toolchain to a directory of your choice. We will refer to this directory as `$TOOLCHAIN_DIR`.
+ - Extract the zlib sources.
+ - Set the following environment variable: `CC=$TOOLCHAIN_DIR/bin/gcc`.
+ - Move into the zlib directory, and then run the following to compile and install zlib into the toolchain:
+```
+./configure --prefix=$TOOLCHAIN_DIR --static
+make
+make install
+```
+## Build a Static Native Image
 
-If you have `musl-gcc` on the path, you can build a native image statically linked against `muslc` with the following options: `--static --libc=musl`.
-To verify that `musl-gcc` is on the path, run `musl-gcc -v`.
+First, ensure `$TOOLCHAIN_DIR/bin` is present on your `PATH` variable. To verify this, try running:
+```
+$ x86_64-linux-musl-gcc
+x86_64-linux-musl-gcc: fatal error: no input files
+compilation terminated.
+```
 
 To build a static native image, use:
 ```shell
@@ -36,26 +49,4 @@ To build a mostly-static native image native image, use:
 native-image -H:+StaticExecutableWithDynamicLibC [other arguments] Class
 ```
 
-#### Building musl
- - Extract the musl release `tarball` and `cd` into the extracted directory.
- - Run `./configure --disable-shared --prefix=${RESULT_DIR}`.
- - Run `make`.
- - Run `make install`.
-Other than building `musl` libraries, the build also creates a `gcc` wrapper called `musl-gcc` in the `${RESULT_DIR}/bin` directory.
-You should now put this wrapper on your `PATH` by running `export PATH=$PATH:${RESULT_DIR}/bin`.
-
-#### Building zlib
- - Extract the zlib release `tarball` and `cd` into the extracted directory.
- - You need to compile zlib and link it against musl so set `CC` to `musl-gcc`: `export CC=musl-gcc`.
- - Run `./configure --static --prefix=${RESULT_DIR}`.
- - Run `make`.
- - Run `make install`.
-
-#### Getting libstdc++
-`libstdc++` is obtained by building gcc. There are multiple approaches to obtaining it:
- 1. Build gcc with `musl-gcc`.
- 2. Use `libstdc++.a` from your distribution. If you choose this path, check the [FAQs](https://www.musl-libc.org/faq.html) page, "How do I use the musl-gcc wrapper?":
-  >  The existing libstdc++ is actually compatible with musl in most cases and could be used by copying it into the musl library path, but the C++ header files are usually not compatible.
-  > Since you do not need C++ header files, this approach should work. If you run into issues, make sure they are not caused by your ditribution's `libstdc++.a`.
- 3. Take `libstdc++.a` from Alpine.
-In each case, `libstdc++.a` must be placed in `${RESULT_DIR}/lib`.
+Note that this currently only works for `glibc`.
diff --git a/substratevm/ci_includes/gate.hocon b/substratevm/ci_includes/gate.hocon
index e5cd60e10be3..74c9522d1c5d 100644
--- a/substratevm/ci_includes/gate.hocon
+++ b/substratevm/ci_includes/gate.hocon
@@ -28,17 +28,16 @@ builds += [
   ${labsjdk-ce-11} ${svm-common-linux-gate} ${linux-deploy} {
     name: "gate-svm-build-ce-11"
     downloads: {
-      "MUSL_LIBS": {
-        "name": "musl-libs",
+      "MUSL_TOOLCHAIN": {
+        "name": "musl-toolchain",
         "version": "1.0",
         "platformspecific": true
       }
     }
     environment : {
-      PATH : "$MUSL_LIBS/bin:$PATH"
+      PATH : "$PATH:$MUSL_TOOLCHAIN/bin"
     }
     run: [
-      ["$MUSL_LIBS/fix_paths.sh"]
       ${svm-cmd-gate} ["build,helloworld,test,nativeimagehelp,muslcbuild"]
     ]
   }
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 37dd06192c7a..2d468388df9e 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -116,16 +116,6 @@ def svmbuild_dir(suite=None):
     return join(suite.dir, 'svmbuild')
 
 
-def is_musl_gcc_wrapper_on_path():
-    mx.logv('Probing if musl-gcc exists on path.')
-    throwaway_capture = mx.LinesOutputCapture()
-    try:
-        ret_code = mx.run(['musl-gcc', '-v'], nonZeroIsFatal=False, out=throwaway_capture, err=throwaway_capture)
-        return ret_code == 0
-    except OSError as _:
-        return False
-
-
 def is_musl_supported():
     jdk = mx.get_jdk(tag='default')
     if mx.is_linux() and mx.get_arch() == "amd64" and mx.get_jdk(tag='default').javaCompliance == '11':
@@ -243,10 +233,7 @@ def vm_executable_path(executable, config=None):
 
 def run_musl_basic_tests():
     if is_musl_supported():
-        if is_musl_gcc_wrapper_on_path():
-            helloworld(['--output-path', svmbuild_dir(), '--static', '--libc=musl'])
-        else:
-            mx.abort('Attempted to run musl tests without a musl-gcc wrapper.')
+        helloworld(['--output-path', svmbuild_dir(), '--static', '--libc=musl'])
 
 
 @contextmanager
@@ -1578,7 +1565,5 @@ def javac_image(args):
     doc_string = "Runs a musl based Hello World static native-image with custom build arguments."
     @mx.command(suite.name, command_name='muslhelloworld', usage_msg='[options]', doc_function=lambda: doc_string)
     def musl_helloworld(args, config=None):
-        if not is_musl_gcc_wrapper_on_path():
-            mx.abort('musl-gcc wrapper not detected on path. Cannot run musl helloworld. Please consult substratevm/StaticImages.md')
         final_args = ['--static', '--libc=musl'] + args
         run_helloworld_command(final_args, config, 'muslhelloworld')
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
index 3d6dd56c86a1..34921859d4b1 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/libc/MuslLibC.java
@@ -49,7 +49,7 @@ public List<String> getAdditionalQueryCodeCompilerOptions() {
 
     @Override
     public String getTargetCompiler() {
-        return "musl-gcc";
+        return "x86_64-linux-musl-gcc";
     }
 
     @Override

From 63cc1fbc25ac714f8bb8eee17b75cab4fbbbebef Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 12 Oct 2021 12:33:17 +0300
Subject: [PATCH 453/681] Review the Static Native Images guide

---
 .../native-image/StaticImages.md              | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index fe152f33a0b3..b23b3bf5a742 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -6,47 +6,63 @@ permalink: /reference-manual/native-image/StaticImages/
 ---
 # Static Native Images
 
-Static native images are statically linked binaries which can be used without any additional library dependencies.
-This makes them suitable for use in a Docker container. Static native images are created by statically linking against [musl-libc](https://www.musl-libc.org/), an alternative libc implementation.
+Static native images are statically linked binaries which can be used without any additional library dependencies, which makes them suitable for use in containers.
+They are created by statically linking against [musl-libc](https://musl.libc.org/), an alternative `libc` implementation.
+
+<!-- Note: Currently, you can build static native images on Linux AMD64 on Java 11 only. -->
 
 ## Prerequisites
- - Right now, this only works on Linux AMD64 on Java 11.
- - You will need a 64-bit `musl` toolchain, `make`, and `configure`.
- - You can download the musl toolchain from [musl.cc](musl.cc), specifically [this one](http://musl.cc/x86_64-linux-musl-native.tgz)
- - Download the latest `zlib` release sources [here](https://zlib.net/). This document will use `zlib-1.2.11`.
-
-## Preparing The Toolchain And Compiling Zlib
- - Extract the toolchain to a directory of your choice. We will refer to this directory as `$TOOLCHAIN_DIR`.
- - Extract the zlib sources.
- - Set the following environment variable: `CC=$TOOLCHAIN_DIR/bin/gcc`.
- - Move into the zlib directory, and then run the following to compile and install zlib into the toolchain:
-```
-./configure --prefix=$TOOLCHAIN_DIR --static
-make
-make install
-```
+
+- Linux AMD64 operating system
+- GraalVM distribution for Java 11 with [Native Image support](README.md#install-native-image)
+- A 64-bit `musl` toolchain, `make`, and `configure`
+- The latest `zlib` library
+
+## Preparation
+
+You should get the `musl` toolchain first, and then compile and install `zlib` into the toolchain.
+
+1. Download the `musl` toolchain from [musl.cc](musl.cc). [This one](http://musl.cc/x86_64-linux-musl-native.tgz) is recommended. Extract the toolchain to a directory of your choice. This directory will be referred as `$TOOLCHAIN_DIR`.
+2. Download the latest `zlib` library sources from [here](https://zlib.net/) and extract them. This guide uses `zlib-1.2.11`.
+3. Set the following environment variable:
+    ```bash
+    CC=$TOOLCHAIN_DIR/bin/gcc
+    ```
+4. Change into the `zlib` directory, and then run the following commands to compile and install `zlib` into the toolchain:
+    ```bash
+    ./configure --prefix=$TOOLCHAIN_DIR --static
+    make
+    make install
+    ```
+
 ## Build a Static Native Image
 
-First, ensure `$TOOLCHAIN_DIR/bin` is present on your `PATH` variable. To verify this, try running:
+First, ensure `$TOOLCHAIN_DIR/bin` is present on your `PATH` variable.
+To verify this, run:
+
+```bash
+x86_64-linux-musl-gcc
 ```
-$ x86_64-linux-musl-gcc
+You should get a similar output printed:
+```bash
 x86_64-linux-musl-gcc: fatal error: no input files
 compilation terminated.
 ```
 
-To build a static native image, use:
+To build a static native image, use this command:
 ```shell
 native-image --static --libc=musl [other arguments] Class
 ```
 
 ## Build a Mostly Static Native Image
 
-As of GraalVM version 20.2, you can build a “mostly static” native image which link statically everything except `libc`. Native images built this way are convenient to run in Docker containers, for example, based on
+As of GraalVM version 20.2, you can build a “mostly static” native image which link statically everything except `libc`.
+Native images built this way are convenient to run in Docker containers, for example, based on
 [distroless minimal Linux, glibc-based systems](https://github.com/GoogleContainerTools/distroless/blob/master/base/README.md).
 
-To build a mostly-static native image native image, use:
+To build a mostly-static native image native image, use this command:
 ```shell
 native-image -H:+StaticExecutableWithDynamicLibC [other arguments] Class
 ```
 
-Note that this currently only works for `glibc`.
+> Note: This currently only works for `glibc`.

From d7d9812d4cd23944b63d68796a6c13a33cfd1fa4 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 12 Oct 2021 12:38:01 +0300
Subject: [PATCH 454/681] Review the Reflection Use in Native Images guide

---
 .../native-image/Reflection.md                | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/docs/reference-manual/native-image/Reflection.md b/docs/reference-manual/native-image/Reflection.md
index 86176c7e3a16..dbd09af22744 100644
--- a/docs/reference-manual/native-image/Reflection.md
+++ b/docs/reference-manual/native-image/Reflection.md
@@ -4,6 +4,12 @@ toc_group: native-image
 link_title: Reflection on Native Image
 permalink: /reference-manual/native-image/Reflection/
 ---
+
+* [Automatic Detection](#automatic-detection)
+* [Manual Configuration](#manual-configuration)
+* [Conditional Configuration](#conditional-configuration)
+* [Configuration with Features](#configuration-with-features)
+
 # Reflection Use in Native Images
 
 Java reflection support (the `java.lang.reflect.*` API) enables Java code to examine its own classes, methods, fields and their properties at run time.
@@ -128,7 +134,9 @@ Also, `-H:ReflectionConfigurationResources` can be specified to load one or seve
 
 ### Conditional Configuration
 
-With conditional configuraiton, a class configuration entry is applied only if a provided `condition` is satisfied. The only currently supported condition is `typeReachable`, which enables the configuration entry if the specified type is reachable through other code. For example, to support reflective access to `sun.misc.Unsafe.theUnsafe` only when `io.netty.util.internal.PlatformDependent0` is reachable, the configuration should look like:
+With conditional configuration, a class configuration entry is applied only if a provided `condition` is satisfied.
+The only currently supported condition is `typeReachable`, which enables the configuration entry if the specified type is reachable through other code.
+For example, to support reflective access to `sun.misc.Unsafe.theUnsafe` only when `io.netty.util.internal.PlatformDependent0` is reachable, the configuration should look like:
 
 ```json
 {
@@ -140,11 +148,14 @@ With conditional configuraiton, a class configuration entry is applied only if a
 }
 ```
 
-Conditional configuration is the *preferred* way to specify reflection configuration: if code doing a reflective access is not reachable, it is unnecessary to include its corresponding reflection entry. The consistent usage of `condition` results in *smaller binaries* and *better build times* as the image builder can selectively include reflectively accessed code.
+Conditional configuration is the **preferred** way to specify reflection configuration: if code doing a reflective access is not reachable, it is unnecessary to include its corresponding reflection entry.
+The consistent usage of `condition` results in *smaller binaries* and *better build times* as the image builder can selectively include reflectively accessed code.
 
-If a `condition` is omitted, the element is always included. When the same `condition` is used for two distinct elements in two configuration entries, both elements will be included when the condition is satisfied. When a configuration entry should be enabled if one of several types are reachable, it is necessary to add two configuration entries: one entry for each condition.
+If a `condition` is omitted, the element is always included.
+When the same `condition` is used for two distinct elements in two configuration entries, both elements will be included when the condition is satisfied.
+When a configuration entry should be enabled if one of several types are reachable, it is necessary to add two configuration entries: one entry for each condition.
 
-When used with [assisted configuration](BuildConfiguration.md#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries as agent-collected entries.
+When used with [assisted configuration](BuildConfiguration.md#assisted-configuration-of-native-image-builds), conditional entries of existing configuration will not be fused with agent-collected entries.
 
 ### Configuration with Features
 
@@ -173,4 +184,6 @@ Reflection can be used without restrictions during a native image generation, fo
 At this point, code can collect information about methods and fields and store them in their own data structures, which are then reflection-free at run time.
 
 ### Unsafe Accesses
-The `Unsafe` class, although its use is discouraged, provides direct access to the memory of Java objects. The `Unsafe.objectFieldOffset()` method provides the offset of a field within a Java object. Note that the offsets that are queried during native image generation can be different from the offsets at run time.
+The `Unsafe` class, although its use is discouraged, provides direct access to the memory of Java objects.
+The `Unsafe.objectFieldOffset()` method provides the offset of a field within a Java object.
+Note that the offsets that are queried during native image generation can be different from the offsets at run time.

From 3ca5b5c169a0fb89989ae22dbc041a39fe29c8c5 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 12 Oct 2021 14:29:40 +0300
Subject: [PATCH 455/681] Include FAQ

---
 docs/reference-manual/native-image/StaticImages.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index b23b3bf5a742..23fd0db94bfe 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -66,3 +66,16 @@ native-image -H:+StaticExecutableWithDynamicLibC [other arguments] Class
 ```
 
 > Note: This currently only works for `glibc`.
+
+## Frequently Asked Questions
+
+### What Docker image type is recommended to build a static native image?
+There are different docker images types you can convert a Java application into:
+* Slim
+* Distroless
+* Alpine
+* Scratch
+
+Whatever base image you choose is determined by what you want to run in container.
+Basically, with a static native image statically linked against `muslc`, you can dockerize into anything: from scratch, Alpine, Ubuntu, Oracle Linux, etc.
+With mostly static native image (distroless) linking statically everything except `libc`, you can dockerize into a distribution with the matching `libc` (currently `glibc` only), so Ubuntu, Oracle Linux,etc.

From 43290c11e031ea2048d53465cde99b511ad9f541 Mon Sep 17 00:00:00 2001
From: Aleksandar Gradinac <aleksandar.gradinac@oracle.com>
Date: Tue, 12 Oct 2021 14:22:48 +0200
Subject: [PATCH 456/681] Add a comment explaining why the toolchain has to be
 added at the end of the PATH

---
 .../native-image/StaticImages.md              | 27 +++++++++----------
 substratevm/ci_includes/gate.hocon            |  3 +++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index 23fd0db94bfe..21d43db3f845 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -6,8 +6,13 @@ permalink: /reference-manual/native-image/StaticImages/
 ---
 # Static Native Images
 
-Static native images are statically linked binaries which can be used without any additional library dependencies, which makes them suitable for use in containers.
-They are created by statically linking against [musl-libc](https://musl.libc.org/), an alternative `libc` implementation.
+Static native images are statically linked binaries which can be used without any additional library dependencies, which makes them easier to distribute and to deploy on slim or distroless container images.
+They are created by statically linking against [musl-libc](https://musl.libc.org/), a lightweight, fast and simple `libc` implementation.
+
+# Mostly Static Native Images
+
+Mostly static native images statically link against all libraries except libc. This approach is ideal for deploying such a native-image
+on distroless container images. Note that this currently only works when linking against `glibc`.
 
 <!-- Note: Currently, you can build static native images on Linux AMD64 on Java 11 only. -->
 
@@ -56,9 +61,8 @@ native-image --static --libc=musl [other arguments] Class
 
 ## Build a Mostly Static Native Image
 
-As of GraalVM version 20.2, you can build a “mostly static” native image which link statically everything except `libc`.
-Native images built this way are convenient to run in Docker containers, for example, based on
-[distroless minimal Linux, glibc-based systems](https://github.com/GoogleContainerTools/distroless/blob/master/base/README.md).
+As of GraalVM version 20.2, you can build a “mostly static” native image which statically links everything except `libc`.
+Statically linking all your libraries except glibc ensures your application has all the libraries it needs to run on any Linux glibc-based distro.
 
 To build a mostly-static native image native image, use this command:
 ```shell
@@ -69,13 +73,8 @@ native-image -H:+StaticExecutableWithDynamicLibC [other arguments] Class
 
 ## Frequently Asked Questions
 
-### What Docker image type is recommended to build a static native image?
-There are different docker images types you can convert a Java application into:
-* Slim
-* Distroless
-* Alpine
-* Scratch
+### What is the recommended base Docker image for deploying a static/mostly static native image?
 
-Whatever base image you choose is determined by what you want to run in container.
-Basically, with a static native image statically linked against `muslc`, you can dockerize into anything: from scratch, Alpine, Ubuntu, Oracle Linux, etc.
-With mostly static native image (distroless) linking statically everything except `libc`, you can dockerize into a distribution with the matching `libc` (currently `glibc` only), so Ubuntu, Oracle Linux,etc.
+A fully static native-image gives you the most flexibility to choose a base image - it can run on anything including a `FROM scratch` image.
+A mostly static native-image requires a container image that provides glibc, but has no additional requirements.
+In both cases, choosing the base image mostly depends on what your particular native-image needs without having to worry about runtime library dependencies.
diff --git a/substratevm/ci_includes/gate.hocon b/substratevm/ci_includes/gate.hocon
index 74c9522d1c5d..4635d21048e2 100644
--- a/substratevm/ci_includes/gate.hocon
+++ b/substratevm/ci_includes/gate.hocon
@@ -35,6 +35,9 @@ builds += [
       }
     }
     environment : {
+      # Note that we must add the toolchain to the end of the PATH so that the system gcc still remains the first choice
+      # for building the rest of GraalVM. The musl toolchain also provides a gcc executable that would shadow the system one
+      # if it were added at the start of the PATH.
       PATH : "$PATH:$MUSL_TOOLCHAIN/bin"
     }
     run: [

From 46eb9678aca66d79194765cdb49fb0ac2be18b85 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 13 Oct 2021 18:29:00 +0300
Subject: [PATCH 457/681] Proofread Certificate Management in Native Image doc

---
 .../embedding/embed-languages.md              |  4 +-
 .../native-image/CertificateManagement.md     | 68 +++++++------------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/docs/reference-manual/embedding/embed-languages.md b/docs/reference-manual/embedding/embed-languages.md
index af23ca87db09..78391fc3e7e3 100644
--- a/docs/reference-manual/embedding/embed-languages.md
+++ b/docs/reference-manual/embedding/embed-languages.md
@@ -19,7 +19,7 @@ permalink: /reference-manual/embed-languages/
 * [Embed languages in Guest Languages](#embed-languages-in-guest-languages)
 * [Build a Shell for Many Languages](#build-a-shell-for-many-languages)
 * [Step Through with Execution Listeners](#step-through-with-execution-listeners)
-* [Configure Sandbox Resource Limits](#configure-sandbox-resource-limits)
+* [Enterprise Sandbox Resource Limits](#enterprise-sandbox-resource-limits)
 
 The GraalVM Polyglot API lets you embed and run code from guest languages in JVM-based host applications.
 
@@ -632,5 +632,5 @@ In this code:
 - The `context.eval()` call evaluates a specified snippet of guest language code.
 - The `listener.close()` closes a listener earlier, however execution listeners are automatically closed with the engine.
 
-<!-- Configure Sandbox Resource Limits -->
+<!-- Enterprise Sandbox Resource Limits -->
 {% include_relative sandbox-options.md %}
diff --git a/docs/reference-manual/native-image/CertificateManagement.md b/docs/reference-manual/native-image/CertificateManagement.md
index bf75632ad19e..e5cfd436e51a 100644
--- a/docs/reference-manual/native-image/CertificateManagement.md
+++ b/docs/reference-manual/native-image/CertificateManagement.md
@@ -6,60 +6,40 @@ permalink: /reference-manual/native-image/CertificateManagement/
 ---
 # Certificate Management in Native Image
 
-Native-image provides multiple ways to specify the certificate file used to
-define the default TrustStore. In the following sections we describe the
-available buildtime and runtime options. Note the default behavior for
-native-image is to capture and use the default TrustStore from the buildtime
-host environment.
+Native Image provides multiple ways to specify the certificate file used to define the default TrustStore.
+In the following sections we describe the available build-time and run-time options.
+Note: The default behavior for `native-image` is to capture and use the default TrustStore from the build-time host environment.
 
-## Buildtime Options
+## Build-time Options
 
-During the image building process, native-image captures the host environment's
-default TrustStore and embeds it into the native image. This TrustStore is
-by default created from the root certificate file provided within the JDK, but
-can be changed to use a different certificate file by setting the buildtime
-system property "javax.net.ssl.trustStore" (see [Properties](Properties.md) for
-how to do so).
+During the image building process, the `native-image` builder captures the host environment's default TrustStore and embeds it into the native executable.
+This TrustStore is by default created from the root certificate file provided within the JDK, but can be changed to use a different certificate file by setting the build-time system property `javax.net.ssl.trustStore` (see [Properties](Properties.md) for how to do it).
 
-Since the contents of the buildtime certificate file is embedded into the image
-executable, the file itself does not need to present in the target environment.
+Since the contents of the build-time certificate file is embedded into the native executable, the file itself does not need to be present in the target environment.
 
-## Runtime Options
+## Run-time Options
 
-The certificate file can also be changed dynamically at runtime via setting
-the "javax.net.ssl.trustStore\*" system properties.
+The certificate file can also be changed dynamically at run time via setting the `javax.net.ssl.trustStore\*` system properties.
 
-If any of the following system properties are set during image execution,
-native-image also requires "javax.net.ssl.trustStore" to be set and for it
-to point to an accessible certificate file:
-- javax.net.ssl.trustStore
-- javax.net.ssl.trustStoreType
-- javax.net.ssl.trustStoreProvider
-- javax.net.ssl.trustStorePassword
+If any of the following system properties are set during the image execution, `native-image` also requires `javax.net.ssl.trustStore` to be set, and for it to point to an accessible certificate file:
+- `javax.net.ssl.trustStore`
+- `javax.net.ssl.trustStoreType`
+- `javax.net.ssl.trustStoreProvider`
+- `javax.net.ssl.trustStorePassword`
 
-If any of these properties are set and "javax.net.ssl.trustStore" does not point
-to an accessible file, then an UnsupportedFeatureError will be thrown.
+If any of these properties are set and `javax.net.ssl.trustStore` does not point to an accessible file, then an `UnsupportedFeatureError` will be thrown.
 
-Note that this behavior is different than OpenJDK. When the
-"javax.net.ssl.trustStore" system property is unset/invalid, OpenJDK will
-fallback to using a certificate file shipped within the JDK; however, such
-files will not be present alongside the image executable and hence cannot be
-used as a fallback.
+Note that this behavior is different than OpenJDK.
+When the `javax.net.ssl.trustStore` system property is unset or invalid, OpenJDK will fallback to using a certificate file shipped within the JDK.
+However, such files will not be present alongside the image executable and hence cannot be used as a fallback.
 
-During the execution, it also possible to dynamically change the
-"javax.net.ssl.trustStore\*" properties and for the default TrustStore to be
-updated accordingly.
+During the execution, it also possible to dynamically change the `javax.net.ssl.trustStore\*` properties and for the default TrustStore to be updated accordingly.
 
-Finally, whenever all of the "javax.net.ssl.trustStore\*" system properties
-listed above are unset, the default TrustStore will be the one captured during
-buildtime, as described in the [prior section](#buildtime-options).
+Finally, whenever all of the `javax.net.ssl.trustStore\*` system properties listed above are unset, the default TrustStore will be the one captured during the build time, as described in the [prior section](#build-time-options).
 
 ## Untrusted Certificates
 
-During the image building process, a list of untrusted certificates is loaded
-from the file <java.home>/lib/security/blacklisted.certs. This file is used
-when validating certificates at both buildtime and runtime.  In other words,
-when a new certificate file is specified at runtime via setting the
-"javax.net.ssl.trustStore\*" system properties, the new certificates will still
-be checked against the <java.home>/lib/security/blacklisted.certs loaded at
-image buildtime.
+During the image building process, a list of untrusted certificates is loaded from the file `<java.home>/lib/security/blacklisted.certs`.
+This file is used when validating certificates at both build time and run time.
+In other words, when a new certificate file is specified at run time via setting the `javax.net.ssl.trustStore\*` system properties, the new certificates will still be checked against the `<java.home>/lib/security/blacklisted.certs` loaded at
+image build time.

From 852ceca8f612fa6dfce096a77ee80b1ff88083cc Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Wed, 13 Oct 2021 18:56:47 +0300
Subject: [PATCH 458/681] Proofread StaticImages.md guide

---
 .../native-image/StaticImages.md              | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index 21d43db3f845..c97ae1447308 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -4,17 +4,17 @@ toc_group: native-image
 link_title: Static Native Images
 permalink: /reference-manual/native-image/StaticImages/
 ---
-# Static Native Images
+# Static and Mostly Static Images
 
-Static native images are statically linked binaries which can be used without any additional library dependencies, which makes them easier to distribute and to deploy on slim or distroless container images.
-They are created by statically linking against [musl-libc](https://musl.libc.org/), a lightweight, fast and simple `libc` implementation.
-
-# Mostly Static Native Images
+With GraalVM Native Image you can create static or mostly static images, depending on the purposes.
 
-Mostly static native images statically link against all libraries except libc. This approach is ideal for deploying such a native-image
-on distroless container images. Note that this currently only works when linking against `glibc`.
+**Static native images** are statically linked binaries which can be used without any additional library dependencies.
+This makes them easier to distribute and to deploy on slim or distroless container images.
+They are created by statically linking against [musl-libc](https://musl.libc.org/), a lightweight, fast and simple `libc` implementation.
 
-<!-- Note: Currently, you can build static native images on Linux AMD64 on Java 11 only. -->
+**Mostly static native images** statically link against all libraries except `libc`.
+This approach is ideal for deploying such native images on distroless container images.
+Note that it currently only works when linking against `glibc`.
 
 ## Prerequisites
 
@@ -40,29 +40,28 @@ You should get the `musl` toolchain first, and then compile and install `zlib` i
     make install
     ```
 
-## Build a Static Native Image
-
-First, ensure `$TOOLCHAIN_DIR/bin` is present on your `PATH` variable.
-To verify this, run:
+## Build Static Native Image
 
-```bash
-x86_64-linux-musl-gcc
-```
-You should get a similar output printed:
-```bash
-x86_64-linux-musl-gcc: fatal error: no input files
-compilation terminated.
-```
+1. First, ensure `$TOOLCHAIN_DIR/bin` is present on your `PATH` variable.
+    To verify this, run:
+    ```bash
+    x86_64-linux-musl-gcc
+    ```
+    You should get a similar output printed:
+    ```bash
+    x86_64-linux-musl-gcc: fatal error: no input files
+    compilation terminated.
+    ```
 
-To build a static native image, use this command:
-```shell
-native-image --static --libc=musl [other arguments] Class
-```
+2. Build a static native image by using this command:
+    ```shell
+    native-image --static --libc=musl [other arguments] Class
+    ```
 
-## Build a Mostly Static Native Image
+## Build Mostly Static Native Image
 
 As of GraalVM version 20.2, you can build a “mostly static” native image which statically links everything except `libc`.
-Statically linking all your libraries except glibc ensures your application has all the libraries it needs to run on any Linux glibc-based distro.
+Statically linking all your libraries except `glibc` ensures your application has all the libraries it needs to run on any Linux `glibc`-based distribution.
 
 To build a mostly-static native image native image, use this command:
 ```shell
@@ -73,8 +72,8 @@ native-image -H:+StaticExecutableWithDynamicLibC [other arguments] Class
 
 ## Frequently Asked Questions
 
-### What is the recommended base Docker image for deploying a static/mostly static native image?
+### What is the recommended base Docker image for deploying a static or mostly static native image?
 
-A fully static native-image gives you the most flexibility to choose a base image - it can run on anything including a `FROM scratch` image.
-A mostly static native-image requires a container image that provides glibc, but has no additional requirements.
-In both cases, choosing the base image mostly depends on what your particular native-image needs without having to worry about runtime library dependencies.
+A fully static native image gives you the most flexibility to choose a base image - it can run on anything including a `FROM scratch` image.
+A mostly static native image requires a container image that provides `glibc`, but has no additional requirements.
+In both cases, choosing the base image mostly depends on what your particular native image needs without having to worry about run-time library dependencies.

From d94afac581417e942a4532306badd1db30b037de Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 13 Oct 2021 20:35:35 +0200
Subject: [PATCH 459/681] Fix fetch-jdk invocation.

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 502bdf800d84..665791851b83 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -125,7 +125,7 @@ jobs:
       env: ${{ matrix.env }}
       run: |
         mkdir jdk-dl
-        ${MX_PATH}/mx fetch-jdk --jdk-id ${JDK} --to jdk-dl --alias ${JAVA_HOME}
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id ${JDK} --to jdk-dl --alias ${JAVA_HOME}
     - name: Update dependency cache
       if: ${{ contains(matrix.env.GATE, 'debug') || contains(matrix.env.GATE, 'style') }}
       run: sudo apt update

From 410c10dae6db0243370455aaafdf1a79ebe0f020 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 13 Oct 2021 23:05:30 +0200
Subject: [PATCH 460/681] added OnShutdownCallback option to libgraal

---
 .../hotspot/test/CompileTheWorld.java         |  2 +-
 .../org/graalvm/libgraal/LibGraalScope.java   | 11 ++++++++++
 .../org/graalvm/nativebridge/jni/JNIUtil.java | 22 +++++++++++++++++++
 .../hotspot/libgraal/LibGraalEntryPoints.java |  9 ++++++--
 .../hotspot/libgraal/LibGraalFeature.java     | 21 +++++++++++++++++-
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
index fa0691b85692..c962fdf8f8d6 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java
@@ -1081,7 +1081,7 @@ private void addCompilation(HotSpotResolvedJavaMethod method, Map<HotSpotResolve
      * Implemented by
      * {@code com.oracle.svm.graal.hotspot.libgraal.LibGraalEntryPoints.compileMethod}.
      */
-    static native long compileMethodInLibgraal(long isolateThread,
+    public static native long compileMethodInLibgraal(long isolateThread,
                     long methodHandle,
                     boolean useProfilingInfo,
                     boolean installAsDefault,
diff --git a/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java b/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
index 017136977664..1729e451ae00 100644
--- a/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
+++ b/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
@@ -26,6 +26,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Scope for calling CEntryPoints in libgraal. {@linkplain #LibGraalScope() Opening} a scope ensures
@@ -54,6 +55,9 @@ static class Shared {
     private final LibGraalScope parent;
     private final Shared shared;
 
+    private static final AtomicInteger nextId = new AtomicInteger(1);
+    private final int id;
+
     /**
      * Gets the current scope.
      *
@@ -128,6 +132,7 @@ public LibGraalScope(DetachAction detachAction) {
         if (LibGraal.inLibGraal() || !LibGraal.isAvailable()) {
             throw new IllegalStateException();
         }
+        id = nextId.getAndIncrement();
         parent = currentScope.get();
         if (parent == null) {
             long[] isolateBox = {0};
@@ -143,6 +148,11 @@ public LibGraalScope(DetachAction detachAction) {
         currentScope.set(this);
     }
 
+    @Override
+    public String toString() {
+        return String.format("LibGraalScope@%d[isolate=%s, isolateThread=0x%x, parent=%s]", id, shared.isolate, shared.isolateThread, parent);
+    }
+
     /**
      * Enters a scope for making calls into an existing libgraal isolate. If there is no existing
      * libgraal scope for the current thread, the current thread is attached to libgraal. When the
@@ -159,6 +169,7 @@ public LibGraalScope(long isolateAddress) {
         if (LibGraal.inLibGraal() || !LibGraal.isAvailable()) {
             throw new IllegalStateException();
         }
+        id = nextId.getAndIncrement();
         parent = currentScope.get();
         if (parent == null) {
             long isolateThread = getIsolateThreadIn(isolateAddress);
diff --git a/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIUtil.java b/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIUtil.java
index 0bc1118c03d2..90806131490d 100644
--- a/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIUtil.java
+++ b/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIUtil.java
@@ -79,6 +79,10 @@ public final class JNIUtil {
                     "getPlatformClassLoader",
                     "()Ljava/lang/ClassLoader;"
     };
+    private static final String[] METHOD_GET_SYSTEM_CLASS_LOADER = {
+                    "getSystemClassLoader",
+                    "()Ljava/lang/ClassLoader;"
+    };
     private static final String[] METHOD_LOAD_CLASS = {
                     "loadClass",
                     "(Ljava/lang/String;)Ljava/lang/Class;"
@@ -513,6 +517,24 @@ public static JObject getJVMCIClassLoader(JNIEnv env) {
         }
     }
 
+    /**
+     * Returns the {@link ClassLoader#getSystemClassLoader()}.
+     */
+    public static JObject getSystemClassLoader(JNIEnv env) {
+        JClass clazz;
+        try (CCharPointerHolder className = CTypeConversion.toCString(JNIUtil.getBinaryName(ClassLoader.class.getName()))) {
+            clazz = JNIUtil.FindClass(env, className.get());
+        }
+        if (clazz.isNull()) {
+            throw new InternalError("No such class " + ClassLoader.class.getName());
+        }
+        JMethodID getClassLoaderId = findMethod(env, clazz, true, true, METHOD_GET_SYSTEM_CLASS_LOADER[0], METHOD_GET_SYSTEM_CLASS_LOADER[1]);
+        if (getClassLoaderId.isNull()) {
+            throw new InternalError(String.format("Cannot find method %s in class %s.", METHOD_GET_SYSTEM_CLASS_LOADER[0], ClassLoader.class.getName()));
+        }
+        return env.getFunctions().getCallStaticObjectMethodA().call(env, clazz, getClassLoaderId, nullPointer());
+    }
+
     public static JMethodID findMethod(JNIEnv env, JClass clazz, boolean staticMethod, String methodName, String methodSignature) {
         return findMethod(env, clazz, staticMethod, false, methodName, methodSignature);
     }
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
index 549fafd4f2c7..90d9a658186a 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
@@ -175,7 +175,9 @@ public static long getIsolateId(PointerBase jniEnv,
      * {@code org.graalvm.compiler.hotspot.test.CompileTheWorld.compileMethodInLibgraal()}.
      *
      * @param methodHandle the method to be compiled. This is a handle to a
-     *            {@link HotSpotResolvedJavaMethod} in HotSpot's heap.
+     *            {@link HotSpotResolvedJavaMethod} in HotSpot's heap. A value of 0L can be passed
+     *            to use this method for the side effect of initializing a
+     *            {@link HotSpotGraalCompiler} instance without doing any compilation.
      * @param useProfilingInfo specifies if profiling info should be used during the compilation
      * @param installAsDefault specifies if the compiled code should be installed for the
      *            {@code Method*} associated with {@code methodHandle}
@@ -216,11 +218,14 @@ private static long compileMethod(PointerBase jniEnv,
                     int stackTraceCapacity) {
         try {
             HotSpotJVMCIRuntime runtime = runtime();
+            HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) runtime.getCompiler();
+            if (methodHandle == 0L) {
+                return 0L;
+            }
             HotSpotResolvedJavaMethod method = LibGraal.unhand(HotSpotResolvedJavaMethod.class, methodHandle);
 
             int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI;
             HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, entryBCI, 0L);
-            HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) runtime.getCompiler();
             try (CompilationContext scope = HotSpotGraalServices.openLocalCompilationContext(request)) {
 
                 OptionValues options = decodeOptions(optionsAddress, optionsSize, optionsHash);
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
index 4bbca94734b4..689854403737 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
@@ -166,6 +166,10 @@ class LibGraalOptions {
             "if a non-null pointer was passed in the _fatal option to JNI_CreateJavaVM. " +
             "This option exists for the purpose of testing fatal error handling in libgraal.")
     static final RuntimeOptionKey<Boolean> CrashAtIsFatal = new RuntimeOptionKey<>(false);
+    @Option(help = "The fully qualified name of a no-arg, void, static method to be invoked " +
+            "in HotSpot from libgraal when the libgraal isolate is being shutdown." +
+            "This option exists for the purpose of testing callbacks in this context.")
+            static final RuntimeOptionKey<String> OnShutdownCallback = new RuntimeOptionKey<>(null);
     // @formatter:on
 }
 
@@ -678,7 +682,7 @@ public Object compute(MetaAccessProvider metaAccess, ResolvedJavaField original,
     @Substitute
     private static void shutdownLibGraal(HotSpotGraalRuntime runtime) {
         try {
-            // Unregister this isolate if it was create as a peer
+            // Unregister this isolate if it was created as a peer
             if (LibGraalEntryPoints.hasLibGraalIsolatePeer()) {
                 long offset = runtime.getVMConfig().jniEnvironmentOffset;
                 long javaThreadAddr = HotSpotJVMCIRuntime.runtime().getCurrentJavaThread();
@@ -690,6 +694,21 @@ private static void shutdownLibGraal(HotSpotGraalRuntime runtime) {
                 args.setLong(IsolateUtil.getIsolateID());
                 env.getFunctions().getCallStaticVoidMethodA().call(env, libGraalIsolateClass, unregisterMethod, args);
                 JNIExceptionWrapper.wrapAndThrowPendingJNIException(env);
+
+                String callback = LibGraalOptions.OnShutdownCallback.getValue();
+                if (callback != null) {
+                    int lastDot = callback.lastIndexOf('.');
+                    if (lastDot < 1 || lastDot == callback.length() - 1) {
+                        throw new IllegalArgumentException(LibGraalOptions.OnShutdownCallback.getName() + " value does not have <classname>.<method name> format: " + callback);
+                    }
+                    String cbClassName = callback.substring(0, lastDot);
+                    String cbMethodName = callback.substring(lastDot + 1);
+                    JNI.JClass cbClass = JNIUtil.findClass(env, JNIUtil.getSystemClassLoader(env),
+                                    JNIUtil.getBinaryName(cbClassName), true);
+                    JNI.JMethodID cbMethod = JNIUtil.findMethod(env, cbClass, true, cbMethodName, "()V");
+                    env.getFunctions().getCallStaticVoidMethodA().call(env, cbClass, cbMethod, StackValue.get(0));
+                    JNIExceptionWrapper.wrapAndThrowPendingJNIException(env);
+                }
             }
         } catch (Throwable t) {
             t.printStackTrace(TTY.out);

From 7a627ee14fe1404ca63b065e4caa7662ec739697 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 12 Oct 2021 21:19:57 -0700
Subject: [PATCH 461/681] Add BuildPhaseProvider.

---
 .../oracle/svm/core/BuildPhaseProvider.java   | 63 +++++++++++++++++++
 .../oracle/svm/core/util/ImageHeapMap.java    | 11 +---
 .../svm/hosted/NativeImageGenerator.java      |  6 ++
 .../methodhandles/MethodHandleFeature.java    |  9 +--
 4 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/BuildPhaseProvider.java

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/BuildPhaseProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/BuildPhaseProvider.java
new file mode 100644
index 000000000000..ab4441065e87
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/BuildPhaseProvider.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021, 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
+@Platforms(Platform.HOSTED_ONLY.class)
+public final class BuildPhaseProvider {
+
+    private boolean analysisFinished;
+    private boolean hostedUniverseBuilt;
+
+    public static void init() {
+        ImageSingletons.add(BuildPhaseProvider.class, new BuildPhaseProvider());
+    }
+
+    static BuildPhaseProvider singleton() {
+        return ImageSingletons.lookup(BuildPhaseProvider.class);
+    }
+
+    BuildPhaseProvider() {
+    }
+
+    public static void markAnalysisFinished() {
+        singleton().analysisFinished = true;
+    }
+
+    public static boolean isAnalysisFinished() {
+        return singleton().analysisFinished;
+    }
+
+    public static void markHostedUniverseBuilt() {
+        singleton().hostedUniverseBuilt = true;
+    }
+
+    public static boolean isHostedUniverseBuilt() {
+        return singleton().hostedUniverseBuilt;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
index ff398062c114..948c228a3224 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
@@ -34,6 +34,7 @@
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
 
+import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 
 /**
@@ -60,6 +61,7 @@ private ImageHeapMap() {
      */
     @Platforms(Platform.HOSTED_ONLY.class) //
     public static <K, V> EconomicMap<K, V> create() {
+        VMError.guarantee(!BuildPhaseProvider.isAnalysisFinished(), "Trying to create an ImageHeapMap after analysis.");
         return new HostedImageHeapMap<>();
     }
 }
@@ -78,8 +80,6 @@ final class HostedImageHeapMap<K, V> extends EconomicMapWrap<K, V> {
 @AutomaticFeature
 final class ImageHeapMapFeature implements Feature {
 
-    private boolean afterAnalysis;
-
     private final Set<HostedImageHeapMap<?, ?>> allInstances = ConcurrentHashMap.newKeySet();
 
     @Override
@@ -90,7 +90,7 @@ public void duringSetup(DuringSetupAccess config) {
     private Object imageHeapMapTransformer(Object obj) {
         if (obj instanceof HostedImageHeapMap) {
             HostedImageHeapMap<?, ?> hostedImageHeapMap = (HostedImageHeapMap<?, ?>) obj;
-            if (afterAnalysis) {
+            if (BuildPhaseProvider.isAnalysisFinished()) {
                 VMError.guarantee(allInstances.contains(hostedImageHeapMap), "ImageHeapMap reachable after analysis that was not seen during analysis");
             } else {
                 allInstances.add(hostedImageHeapMap);
@@ -110,11 +110,6 @@ public void duringAnalysis(DuringAnalysisAccess access) {
         }
     }
 
-    @Override
-    public void afterAnalysis(AfterAnalysisAccess access) {
-        afterAnalysis = true;
-    }
-
     @Override
     public void afterImageWrite(AfterImageWriteAccess access) {
         for (HostedImageHeapMap<?, ?> hostedImageHeapMap : allInstances) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 0ddee26f57a1..218aa4bb2da5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -154,6 +154,7 @@
 import com.oracle.graal.pointsto.util.Timer.StopTimer;
 import com.oracle.svm.core.BuildArtifacts;
 import com.oracle.svm.core.BuildArtifacts.ArtifactType;
+import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.JavaMainWrapper.JavaMainSupport;
 import com.oracle.svm.core.LinkerInvocation;
@@ -547,6 +548,7 @@ private void doRun(Map<Method, CEntryPointData> entryPoints,
                 new UniverseBuilder(aUniverse, bb.getMetaAccess(), hUniverse, hMetaAccess, HostedConfiguration.instance().createStaticAnalysisResultsBuilder(bb, hUniverse),
                                 bb.getUnsupportedFeatures()).build(debug);
 
+                BuildPhaseProvider.markHostedUniverseBuilt();
                 ClassInitializationSupport classInitializationSupport = bb.getHostVM().getClassInitializationSupport();
                 runtime = new HostedRuntimeConfigurationBuilder(options, bb.getHostVM(), hUniverse, hMetaAccess, bb.getProviders(), nativeLibraries, classInitializationSupport,
                                 GraalAccess.getOriginalProviders().getLoopsDataProvider()).build();
@@ -748,6 +750,7 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
                  */
                 nativeLibraries.processAnnotated();
 
+                BuildPhaseProvider.markAnalysisFinished();
                 AfterAnalysisAccessImpl postConfig = new AfterAnalysisAccessImpl(featureHandler, loader, bb, debug);
                 featureHandler.forEachFeature(feature -> feature.afterAnalysis(postConfig));
 
@@ -823,6 +826,9 @@ private void setupNativeImage(String imageName, OptionValues options, Map<Method
                     ImageSingletons.add(ImageBuildStatistics.class, new ImageBuildStatistics());
                 }
 
+                /* Init the BuildPhaseProvider before any features need it. */
+                BuildPhaseProvider.init();
+
                 featureHandler.registerFeatures(loader, debug);
                 AfterRegistrationAccessImpl access = new AfterRegistrationAccessImpl(featureHandler, loader, originalMetaAccess, mainEntryPoint, debug);
                 featureHandler.forEachFeature(feature -> feature.afterRegistration(access));
diff --git a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
index ffd3d1f857cb..f2537e0e2ffc 100644
--- a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
+++ b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
@@ -41,6 +41,7 @@
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 
+import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.invoke.MethodHandleIntrinsic;
@@ -81,7 +82,6 @@
 @SuppressWarnings("unused")
 public class MethodHandleFeature implements Feature {
 
-    private boolean analysisFinished = false;
     private Set<MethodHandle> seenMethodHandles;
     private Class<?> directMethodHandleClass;
     private Class<?> boundMethodHandleClass;
@@ -176,11 +176,6 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
                         access.findClassByName("java.lang.invoke.VarHandle"));
     }
 
-    @Override
-    public void afterAnalysis(AfterAnalysisAccess access) {
-        analysisFinished = true;
-    }
-
     private static void registerMHImplFunctionsForReflection(DuringAnalysisAccess access) {
         Class<?> mhImplClazz = access.findClassByName("java.lang.invoke.MethodHandleImpl");
         RuntimeReflection.register(ReflectionUtil.lookupMethod(mhImplClazz, "checkSpreadArgument", Object.class, int.class));
@@ -283,7 +278,7 @@ private static void registerVarHandleMethodsForReflection(DuringAnalysisAccess a
     }
 
     private Object registerMethodHandle(Object obj) {
-        if (!analysisFinished) {
+        if (!BuildPhaseProvider.isAnalysisFinished()) {
             registerMethodHandleRecurse(obj);
         }
         return obj;

From f82773c13ddae19cc7ffc322e53cd1b4290f8bb4 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 13 Oct 2021 16:10:10 -0700
Subject: [PATCH 462/681] Expand the use of ImageHeapMap.

---
 .../org.graalvm.collections/snapshot.sigtest  |  1 +
 .../org/graalvm/collections/EconomicMap.java  | 28 +++++++++
 .../c/CGlobalDataNonConstantRegistry.java     | 13 +++--
 .../oracle/svm/core/util/ImageHeapMap.java    | 13 ++++-
 .../oracle/svm/jni/JNILibraryInitializer.java | 36 ++++++------
 .../svm/jni/access/JNIAccessibleClass.java    | 39 +++++++------
 .../jni/access/JNIReflectionDictionary.java   | 57 ++++++++++---------
 7 files changed, 120 insertions(+), 67 deletions(-)

diff --git a/sdk/src/org.graalvm.collections/snapshot.sigtest b/sdk/src/org.graalvm.collections/snapshot.sigtest
index 3c22fbe84336..6067a5fb781c 100644
--- a/sdk/src/org.graalvm.collections/snapshot.sigtest
+++ b/sdk/src/org.graalvm.collections/snapshot.sigtest
@@ -34,6 +34,7 @@ meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> or
 meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.graalvm.collections.EconomicMap<{%%0},{%%1}> create(org.graalvm.collections.Equivalence,org.graalvm.collections.UnmodifiableEconomicMap<{%%0},{%%1}>)
 meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.graalvm.collections.EconomicMap<{%%0},{%%1}> create(org.graalvm.collections.UnmodifiableEconomicMap<{%%0},{%%1}>)
 meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.graalvm.collections.EconomicMap<{%%0},{%%1}> wrapMap(java.util.Map<{%%0},{%%1}>)
+meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.graalvm.collections.MapCursor<{%%0},{%%1}> emptyCursor()
 meth public void putAll(org.graalvm.collections.EconomicMap<{org.graalvm.collections.EconomicMap%0},{org.graalvm.collections.EconomicMap%1}>)
 meth public void putAll(org.graalvm.collections.UnmodifiableEconomicMap<? extends {org.graalvm.collections.EconomicMap%0},? extends {org.graalvm.collections.EconomicMap%1}>)
 meth public {org.graalvm.collections.EconomicMap%1} putIfAbsent({org.graalvm.collections.EconomicMap%0},{org.graalvm.collections.EconomicMap%1})
diff --git a/sdk/src/org.graalvm.collections/src/org/graalvm/collections/EconomicMap.java b/sdk/src/org.graalvm.collections/src/org/graalvm/collections/EconomicMap.java
index 2f4290aa395e..baac845ede4a 100644
--- a/sdk/src/org.graalvm.collections/src/org/graalvm/collections/EconomicMap.java
+++ b/sdk/src/org.graalvm.collections/src/org/graalvm/collections/EconomicMap.java
@@ -230,4 +230,32 @@ static <K, V> EconomicMap<K, V> create(Equivalence strategy, int initialCapacity
     static <K, V> EconomicMap<K, V> wrapMap(Map<K, V> map) {
         return new EconomicMapWrap<>(map);
     }
+
+    /**
+     * Return an empty {@link MapCursor}.
+     *
+     * @since 22.0
+     */
+    static <K, V> MapCursor<K, V> emptyCursor() {
+        return new MapCursor<K, V>() {
+            @Override
+            public void remove() {
+            }
+
+            @Override
+            public boolean advance() {
+                return false;
+            }
+
+            @Override
+            public K getKey() {
+                return null;
+            }
+
+            @Override
+            public V getValue() {
+                return null;
+            }
+        };
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java
index c6879b5258db..97f95d797859 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CGlobalDataNonConstantRegistry.java
@@ -24,14 +24,16 @@
  */
 package com.oracle.svm.core.c;
 
-import com.oracle.svm.core.graal.code.CGlobalDataInfo;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import com.oracle.svm.core.graal.code.CGlobalDataInfo;
+import com.oracle.svm.core.util.ImageHeapMap;
 
 /*
  * The following class is a helper registry, that contains only CGlobalDataInfo for
@@ -40,11 +42,14 @@
  */
 public class CGlobalDataNonConstantRegistry {
 
-    private final EconomicMap<CGlobalDataImpl<?>, CGlobalDataInfo> cGlobalDataInfos = EconomicMap.create(Equivalence.IDENTITY);
+    private final EconomicMap<CGlobalDataImpl<?>, CGlobalDataInfo> cGlobalDataInfos = ImageHeapMap.create(Equivalence.IDENTITY);
 
     @Platforms(Platform.HOSTED_ONLY.class) //
     private final Lock lock = new ReentrantLock();
 
+    /**
+     * Invoked at runtime via com.oracle.svm.hosted.c.CGlobalDataFeature#getCGlobalDataInfoMethod.
+     */
     public CGlobalDataInfo getCGlobalDataInfo(CGlobalDataImpl<?> cGlobalData) {
         return cGlobalDataInfos.get(cGlobalData);
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
index 948c228a3224..654b0206a3c0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ImageHeapMap.java
@@ -29,6 +29,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicMapWrap;
+import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -62,7 +63,13 @@ private ImageHeapMap() {
     @Platforms(Platform.HOSTED_ONLY.class) //
     public static <K, V> EconomicMap<K, V> create() {
         VMError.guarantee(!BuildPhaseProvider.isAnalysisFinished(), "Trying to create an ImageHeapMap after analysis.");
-        return new HostedImageHeapMap<>();
+        return new HostedImageHeapMap<>(Equivalence.DEFAULT);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class) //
+    public static <K, V> EconomicMap<K, V> create(Equivalence strategy) {
+        VMError.guarantee(!BuildPhaseProvider.isAnalysisFinished(), "Trying to create an ImageHeapMap after analysis.");
+        return new HostedImageHeapMap<>(strategy);
     }
 }
 
@@ -71,9 +78,9 @@ final class HostedImageHeapMap<K, V> extends EconomicMapWrap<K, V> {
 
     final EconomicMap<Object, Object> runtimeMap;
 
-    HostedImageHeapMap() {
+    HostedImageHeapMap(Equivalence strategy) {
         super(new ConcurrentHashMap<>());
-        this.runtimeMap = EconomicMap.create();
+        this.runtimeMap = EconomicMap.create(strategy);
     }
 }
 
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNILibraryInitializer.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNILibraryInitializer.java
index 2e01394009ab..9ba751fe7934 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNILibraryInitializer.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNILibraryInitializer.java
@@ -24,12 +24,17 @@
  */
 package com.oracle.svm.jni;
 
-import com.oracle.svm.core.c.CGlobalData;
-import com.oracle.svm.core.c.CGlobalDataFactory;
-import com.oracle.svm.core.jdk.NativeLibrarySupport;
-import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
-import com.oracle.svm.jni.functions.JNIFunctionTables;
-import com.oracle.svm.jni.nativeapi.JNIJavaVM;
+import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_1;
+import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_2;
+import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_4;
+import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_6;
+import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_8;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
@@ -38,16 +43,13 @@
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordFactory;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_1;
-import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_2;
-import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_4;
-import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_6;
-import static com.oracle.svm.jni.nativeapi.JNIVersion.JNI_VERSION_1_8;
+import com.oracle.svm.core.c.CGlobalData;
+import com.oracle.svm.core.c.CGlobalDataFactory;
+import com.oracle.svm.core.jdk.NativeLibrarySupport;
+import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
+import com.oracle.svm.core.util.ImageHeapMap;
+import com.oracle.svm.jni.functions.JNIFunctionTables;
+import com.oracle.svm.jni.nativeapi.JNIJavaVM;
 
 interface JNIOnLoadFunctionPointer extends CFunctionPointer {
     @InvokeCFunctionPointer
@@ -56,7 +58,7 @@ interface JNIOnLoadFunctionPointer extends CFunctionPointer {
 
 public class JNILibraryInitializer implements NativeLibrarySupport.LibraryInitializer {
 
-    private final EconomicMap<String, CGlobalData<PointerBase>> onLoadCGlobalDataMap = EconomicMap.create(Equivalence.IDENTITY);
+    private final EconomicMap<String, CGlobalData<PointerBase>> onLoadCGlobalDataMap = ImageHeapMap.create(Equivalence.IDENTITY);
 
     public static String getOnLoadName(String libName, boolean isBuiltIn) {
         String name = "JNI_OnLoad";
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleClass.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleClass.java
index d7ceb27e6b96..ff87a61be8c0 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleClass.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIAccessibleClass.java
@@ -24,15 +24,16 @@
  */
 package com.oracle.svm.jni.access;
 
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Function;
 
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
 
+import com.oracle.svm.core.util.ImageHeapMap;
+
 import jdk.vm.ci.meta.MetaUtil;
 
 /**
@@ -40,8 +41,8 @@
  */
 public final class JNIAccessibleClass {
     private final Class<?> classObject;
-    private Map<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> methods;
-    private Map<String, JNIAccessibleField> fields;
+    private EconomicMap<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> methods;
+    private EconomicMap<String, JNIAccessibleField> fields;
 
     JNIAccessibleClass(Class<?> clazz) {
         this.classObject = clazz;
@@ -51,12 +52,12 @@ public Class<?> getClassObject() {
         return classObject;
     }
 
-    public Collection<JNIAccessibleField> getFields() {
-        return (fields != null) ? fields.values() : Collections.emptySet();
+    public Iterable<JNIAccessibleField> getFields() {
+        return (fields != null) ? fields.getValues() : Collections::emptyIterator;
     }
 
-    Map<String, JNIAccessibleField> getFieldsByName() {
-        return (fields != null) ? fields : Collections.emptyMap();
+    MapCursor<String, JNIAccessibleField> getFieldsByName() {
+        return (fields != null) ? fields.getEntries() : EconomicMap.emptyCursor();
     }
 
     public JNIAccessibleField getField(String name) {
@@ -66,25 +67,29 @@ public JNIAccessibleField getField(String name) {
     @Platforms(HOSTED_ONLY.class)
     void addFieldIfAbsent(String name, Function<String, JNIAccessibleField> mappingFunction) {
         if (fields == null) {
-            fields = new HashMap<>();
+            fields = ImageHeapMap.create();
+        }
+        if (!fields.containsKey(name)) {
+            fields.put(name, mappingFunction.apply(name));
         }
-        fields.computeIfAbsent(name, mappingFunction);
     }
 
     @Platforms(HOSTED_ONLY.class)
     void addMethodIfAbsent(JNIAccessibleMethodDescriptor descriptor, Function<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> mappingFunction) {
         if (methods == null) {
-            methods = new HashMap<>();
+            methods = ImageHeapMap.create();
+        }
+        if (!methods.containsKey(descriptor)) {
+            methods.put(descriptor, mappingFunction.apply(descriptor));
         }
-        methods.computeIfAbsent(descriptor, mappingFunction);
     }
 
-    public Collection<JNIAccessibleMethod> getMethods() {
-        return (methods != null) ? methods.values() : Collections.emptySet();
+    public Iterable<JNIAccessibleMethod> getMethods() {
+        return (methods != null) ? methods.getValues() : Collections::emptyIterator;
     }
 
-    public Map<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> getMethodsByDescriptor() {
-        return (methods != null) ? methods : Collections.emptyMap();
+    public MapCursor<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> getMethodsByDescriptor() {
+        return (methods != null) ? methods.getEntries() : EconomicMap.emptyCursor();
     }
 
     public JNIAccessibleMethod getMethod(JNIAccessibleMethodDescriptor descriptor) {
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIReflectionDictionary.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIReflectionDictionary.java
index 596a54a85f47..e09288ec28dd 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIReflectionDictionary.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/access/JNIReflectionDictionary.java
@@ -27,13 +27,11 @@
 import static com.oracle.svm.core.SubstrateOptions.JNIVerboseLookupErrors;
 
 import java.io.PrintStream;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.function.Function;
 
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.collections.MapCursor;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -47,6 +45,7 @@
 import com.oracle.svm.core.Isolates;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.log.Log;
+import com.oracle.svm.core.util.ImageHeapMap;
 import com.oracle.svm.jni.nativeapi.JNIFieldId;
 import com.oracle.svm.jni.nativeapi.JNIMethodId;
 
@@ -68,9 +67,9 @@ public static JNIReflectionDictionary singleton() {
         return ImageSingletons.lookup(JNIReflectionDictionary.class);
     }
 
-    private final Map<String, JNIAccessibleClass> classesByName = new HashMap<>();
-    private final Map<Class<?>, JNIAccessibleClass> classesByClassObject = new HashMap<>();
-    private final Map<JNINativeLinkage, JNINativeLinkage> nativeLinkages = new HashMap<>();
+    private final EconomicMap<String, JNIAccessibleClass> classesByName = ImageHeapMap.create();
+    private final EconomicMap<Class<?>, JNIAccessibleClass> classesByClassObject = ImageHeapMap.create();
+    private final EconomicMap<JNINativeLinkage, JNINativeLinkage> nativeLinkages = ImageHeapMap.create();
 
     private JNIReflectionDictionary() {
     }
@@ -80,26 +79,30 @@ private void dump(boolean condition, String label) {
             PrintStream ps = Log.logStream();
             ps.println(label);
             ps.println(" classesByName:");
-            for (Map.Entry<String, JNIAccessibleClass> e : classesByName.entrySet()) {
+            MapCursor<String, JNIAccessibleClass> nameCursor = classesByName.getEntries();
+            while (nameCursor.advance()) {
                 ps.print("  ");
-                ps.println(e.getKey());
-                JNIAccessibleClass clazz = e.getValue();
+                ps.println(nameCursor.getKey());
+                JNIAccessibleClass clazz = nameCursor.getValue();
                 ps.println("   methods:");
-                for (Map.Entry<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> m : clazz.getMethodsByDescriptor().entrySet()) {
+                MapCursor<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> methodsCursor = clazz.getMethodsByDescriptor();
+                while (methodsCursor.advance()) {
                     ps.print("      ");
-                    ps.println(m.getKey().getNameAndSignature());
+                    ps.println(methodsCursor.getKey().getNameAndSignature());
                 }
                 ps.println("   fields:");
-                for (Map.Entry<String, JNIAccessibleField> f : clazz.getFieldsByName().entrySet()) {
+                MapCursor<String, JNIAccessibleField> fieldsCursor = clazz.getFieldsByName();
+                while (fieldsCursor.advance()) {
                     ps.print("      ");
-                    ps.println(f.getKey());
+                    ps.println(fieldsCursor.getKey());
                 }
             }
 
             ps.println(" classesByClassObject:");
-            for (Map.Entry<Class<?>, JNIAccessibleClass> e : classesByClassObject.entrySet()) {
+            MapCursor<Class<?>, JNIAccessibleClass> cursor = classesByClassObject.getEntries();
+            while (cursor.advance()) {
                 ps.print("  ");
-                ps.println(e.getKey());
+                ps.println(cursor.getKey());
             }
         }
     }
@@ -116,11 +119,11 @@ JNIAccessibleClass addClassIfAbsent(Class<?> classObj, Function<Class<?>, JNIAcc
 
     @Platforms(HOSTED_ONLY.class)
     void addLinkages(Map<JNINativeLinkage, JNINativeLinkage> linkages) {
-        nativeLinkages.putAll(linkages);
+        nativeLinkages.putAll(EconomicMap.wrapMap(linkages));
     }
 
-    public Collection<JNIAccessibleClass> getClasses() {
-        return Collections.unmodifiableCollection(classesByClassObject.values());
+    public Iterable<JNIAccessibleClass> getClasses() {
+        return classesByClassObject.getValues();
     }
 
     public Class<?> getClassObjectByName(String name) {
@@ -145,7 +148,7 @@ public JNINativeLinkage getLinkage(String declaringClass, String name, String de
     }
 
     public void unsetEntryPoints(String declaringClass) {
-        for (JNINativeLinkage linkage : nativeLinkages.keySet()) {
+        for (JNINativeLinkage linkage : nativeLinkages.getKeys()) {
             if (declaringClass.equals(linkage.getDeclaringClassName())) {
                 linkage.unsetEntryPoint();
             }
@@ -276,10 +279,11 @@ public JNIFieldId getFieldID(Class<?> clazz, String name, boolean isStatic) {
     public String getFieldNameByID(Class<?> classObject, JNIFieldId id) {
         JNIAccessibleClass clazz = classesByClassObject.get(classObject);
         if (clazz != null) {
-            for (Entry<String, JNIAccessibleField> entry : clazz.getFieldsByName().entrySet()) {
-                JNIAccessibleField field = entry.getValue();
+            MapCursor<String, JNIAccessibleField> fieldsCursor = clazz.getFieldsByName();
+            while (fieldsCursor.advance()) {
+                JNIAccessibleField field = fieldsCursor.getValue();
                 if (id.equal(field.getId())) {
-                    return entry.getKey();
+                    return fieldsCursor.getKey();
                 }
             }
         }
@@ -289,9 +293,10 @@ public String getFieldNameByID(Class<?> classObject, JNIFieldId id) {
     public static JNIAccessibleMethodDescriptor getMethodDescriptor(JNIAccessibleMethod method) {
         if (method != null) {
             JNIAccessibleClass clazz = method.getDeclaringClass();
-            for (Entry<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> entry : clazz.getMethodsByDescriptor().entrySet()) {
-                if (entry.getValue() == method) {
-                    return entry.getKey();
+            MapCursor<JNIAccessibleMethodDescriptor, JNIAccessibleMethod> methodsCursor = clazz.getMethodsByDescriptor();
+            while (methodsCursor.advance()) {
+                if (methodsCursor.getValue() == method) {
+                    return methodsCursor.getKey();
                 }
             }
         }

From e0049bc2b1538100b664d1d571a6d3e88d46c4ed Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 12 Oct 2021 16:56:15 -0700
Subject: [PATCH 463/681] Clean-up error and assert messages.

---
 .../src/com/oracle/graal/pointsto/PointsToAnalysis.java       | 1 +
 .../src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java  | 3 ++-
 .../svm/hosted/analysis/NativeImagePointsToAnalysis.java      | 2 +-
 .../src/com/oracle/svm/hosted/image/NativeImageHeap.java      | 1 +
 .../src/com/oracle/svm/hosted/meta/HostedField.java           | 1 +
 .../src/com/oracle/svm/hosted/meta/HostedUniverse.java        | 3 ++-
 .../com/oracle/svm/hosted/substitute/ComputedValueField.java  | 4 +++-
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
index d73228a53fc1..a902c2c5936e 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
@@ -435,6 +435,7 @@ public AnalysisMethod addRootMethod(Executable method) {
     @Override
     @SuppressWarnings("try")
     public AnalysisMethod addRootMethod(AnalysisMethod aMethod) {
+        assert !universe.sealed() : "Cannot register root methods after analysis universe is sealed.";
         if (aMethod.isRootMethod()) {
             return aMethod;
         }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
index 49637e572588..2e5fb0c12ade 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
@@ -397,7 +397,8 @@ public AnalysisMethod lookup(JavaMethod method) {
         } else if (result instanceof ResolvedJavaMethod) {
             return (AnalysisMethod) result;
         }
-        throw new UnsupportedFeatureException("Unresolved method found. Probably there are some compilation or classpath problems. " + method.format("%H.%n(%p)"));
+        throw new UnsupportedFeatureException("Unresolved method found: " + (method != null ? method.format("%H.%n(%p)") : "null") +
+                        ". Probably there are some compilation or classpath problems. ");
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
index 5aa4d03db3d4..2278867cf597 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
@@ -210,7 +210,7 @@ private List<AnalysisType> extractAnnotationTypes(AnalysisField field, UnknownOb
                             " | annotation type: " + annotationType;
             assert declaredType.isAssignableFrom(aAnnotationType) : "Annotation type must be a subtype of the declared type: field: " + field + " | declared type: " + declaredType +
                             " | annotation type: " + annotationType;
-            assert aAnnotationType.isArray() || (aAnnotationType.isInstanceClass() && !Modifier.isAbstract(aAnnotationType.getModifiers())) : "Annotation type failure: field: " + field +
+            assert aAnnotationType.isArray() || (aAnnotationType.isInstanceClass() && !Modifier.isAbstract(aAnnotationType.getModifiers())) : "Annotation type cannot be abstract: field: " + field +
                             " | annotation type " + aAnnotationType;
 
             aAnnotationTypes.add(aAnnotationType);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
index 22afc4b3ebf1..ef5e14f0e7bc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
@@ -418,6 +418,7 @@ private void addObjectToImageHeap(final Object object, boolean immutableFromPare
                     written = true;
                 }
 
+                assert hybridArray != null : "Cannot read value for field " + hybridArrayField.format("%H.%n");
                 size = hybridLayout.getTotalSize(Array.getLength(hybridArray));
             } else {
                 size = LayoutEncoding.getInstanceSize(hub.getLayoutEncoding()).rawValue();
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedField.java
index 6b9e2e9d8ae0..e0d9f51c1cb7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedField.java
@@ -151,6 +151,7 @@ public JavaConstant readValue(JavaConstant receiver) {
 
     public JavaConstant readStorageValue(JavaConstant receiver) {
         JavaConstant result = readValue(receiver);
+        assert result != null : "Cannot read value for field " + this.format("%H.%n");
         assert result.getJavaKind() == getType().getStorageKind() : this;
         return result;
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
index 13c3f3f4b0c0..2551b7cba9b4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
@@ -163,7 +163,8 @@ public HostedMethod lookup(JavaMethod method) {
         if (result instanceof ResolvedJavaMethod) {
             return (HostedMethod) result;
         }
-        throw new UnsupportedFeatureException("Unresolved method found. Probably there are some compilation or classpath problems. " + method.format("%H.%n(%p)"));
+        throw new UnsupportedFeatureException("Unresolved method found: " + (method != null ? method.format("%H.%n(%p)") : "null") +
+                        ". Probably there are some compilation or classpath problems. ");
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
index fa3b5f9fc3f3..dd582a5032c2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
@@ -296,7 +296,9 @@ public JavaConstant readValue(MetaAccessProvider metaAccess, JavaConstant receiv
                 }
                 break;
             default:
-                throw shouldNotReachHere("Field recomputation of kind " + kind + " specified by alias " + annotated.format("%H.%n") + " not yet supported");
+                throw shouldNotReachHere("Field recomputation of kind " + kind + " for field " + original.format("%H.%n") +
+                                (annotated != null ? " specified by alias " + annotated.format("%H.%n") : "") +
+                                " not yet supported");
         }
         putCached(receiver, result);
         return result;

From e560f2919602b4cd56d4c3bd6b935eb58dd4d317 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 12 Oct 2021 17:14:45 -0700
Subject: [PATCH 464/681] Move GraalAccess to the points-to project.

It is needed by the heap scanning refactoring.
---
 .../graal/pointsto/util}/GraalAccess.java     | 11 ++++++----
 .../oracle/svm/graal/hosted/GraalFeature.java |  2 +-
 .../svm/hosted/NativeImageGenerator.java      |  2 +-
 .../hosted/NativeImageGeneratorRunner.java    |  2 +-
 .../src/com/oracle/svm/hosted/SVMHost.java    |  2 +-
 .../svm/hosted/SubstitutionReportFeature.java | 20 ++++++++++---------
 ...stantAnnotationMarkerSubstitutionType.java |  2 +-
 .../annotation/CustomSubstitutionMethod.java  |  2 +-
 .../annotation/CustomSubstitutionType.java    |  2 +-
 .../svm/hosted/c/info/InfoTreeBuilder.java    |  2 +-
 .../ConfigurableClassInitialization.java      |  2 +-
 .../EarlyClassInitializerAnalysis.java        |  2 +-
 ...bdaProxyRenamingSubstitutionProcessor.java |  7 ++++---
 .../hosted/lambda/LambdaSubstitutionType.java |  2 +-
 ...trinsifyMethodHandlesInvocationPlugin.java |  4 ++--
 .../hosted/snippets/ReflectionPlugins.java    |  2 +-
 .../svm/hosted/substitute/AnnotatedField.java |  2 +-
 .../hosted/substitute/AnnotatedMethod.java    |  2 +-
 .../hosted/substitute/ComputedValueField.java |  2 +-
 .../substitute/InjectedAccessorsField.java    |  2 +-
 .../hosted/substitute/InjectedFieldsType.java |  2 +-
 .../hosted/substitute/SubstitutionField.java  |  2 +-
 .../hosted/substitute/SubstitutionMethod.java |  2 +-
 .../hosted/substitute/SubstitutionType.java   |  2 +-
 .../UnsafeAutomaticSubstitutionProcessor.java |  2 +-
 .../oracle/svm/jfr/JfrEventSubstitution.java  |  2 +-
 .../svm/truffle/TruffleBaseFeature.java       |  6 +++---
 .../truffle/api/SubstrateTruffleRuntime.java  |  2 +-
 28 files changed, 50 insertions(+), 44 deletions(-)
 rename substratevm/src/{com.oracle.svm.hosted/src/com/oracle/svm/hosted/c => com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util}/GraalAccess.java (89%)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/GraalAccess.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
similarity index 89%
rename from substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/GraalAccess.java
rename to substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
index 295871bc5191..5cf94bbe3c41 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/GraalAccess.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, 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,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.c;
+package com.oracle.graal.pointsto.util;
 
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
@@ -32,7 +32,10 @@
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.runtime.JVMCI;
 
-public class GraalAccess {
+public final class GraalAccess {
+
+    private GraalAccess() {
+    }
 
     public static TargetDescription getOriginalTarget() {
         return getGraalCapability(RuntimeProvider.class).getHostBackend().getTarget();
@@ -46,7 +49,7 @@ public static SnippetReflectionProvider getOriginalSnippetReflection() {
         return getGraalCapability(SnippetReflectionProvider.class);
     }
 
-    private static <T> T getGraalCapability(Class<T> clazz) {
+    public static <T> T getGraalCapability(Class<T> clazz) {
         GraalJVMCICompiler compiler = (GraalJVMCICompiler) JVMCI.getRuntime().getCompiler();
         return compiler.getGraalRuntime().getCapability(clazz);
     }
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
index 31f4833af6b5..d046c5c7f9f1 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalFeature.java
@@ -89,6 +89,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.HostedProviders;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
@@ -120,7 +121,6 @@
 import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
 import com.oracle.svm.hosted.NativeImageGenerator;
 import com.oracle.svm.hosted.analysis.Inflation;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.code.CompilationInfoSupport;
 import com.oracle.svm.hosted.code.SharedRuntimeConfigurationBuilder;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 218aa4bb2da5..ba1b940e062e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -150,6 +150,7 @@
 import com.oracle.graal.pointsto.reports.AnalysisReporter;
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.graal.pointsto.util.Timer;
 import com.oracle.graal.pointsto.util.Timer.StopTimer;
 import com.oracle.svm.core.BuildArtifacts;
@@ -230,7 +231,6 @@
 import com.oracle.svm.hosted.annotation.AnnotationSupport;
 import com.oracle.svm.hosted.c.CAnnotationProcessorCache;
 import com.oracle.svm.hosted.c.CConstantValueSupportImpl;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.c.OffsetOfSupportImpl;
 import com.oracle.svm.hosted.c.SizeOfSupportImpl;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 4c7f6f0e60cd..67096fe11c59 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -53,6 +53,7 @@
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
 import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.graal.pointsto.util.AnalysisError.ParsingError;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.graal.pointsto.util.ParallelExecutionException;
 import com.oracle.graal.pointsto.util.Timer;
 import com.oracle.graal.pointsto.util.Timer.StopTimer;
@@ -67,7 +68,6 @@
 import com.oracle.svm.core.util.UserError.UserException;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.analysis.NativeImagePointsToAnalysis;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.code.CEntryPointData;
 import com.oracle.svm.hosted.image.AbstractImage.NativeImageKind;
 import com.oracle.svm.hosted.option.HostedOptionParser;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
index c7416f4be096..734a7a3c45ce 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
@@ -79,6 +79,7 @@
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.graal.pointsto.phases.InlineBeforeAnalysisPolicy;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.RuntimeAssertionsSupport;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
@@ -102,7 +103,6 @@
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.HostedStringDeduplication;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.code.InliningUtilities;
 import com.oracle.svm.hosted.meta.HostedType;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
index 26b4d8b89c50..0fcfc866c73c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
@@ -24,29 +24,31 @@
  */
 package com.oracle.svm.hosted;
 
+import java.security.CodeSource;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Function;
+
+import org.graalvm.compiler.options.Option;
+import org.graalvm.nativeimage.hosted.Feature;
+
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.reports.ReportUtils;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.option.HostedOptionKey;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.substitute.SubstitutionField;
 import com.oracle.svm.hosted.substitute.SubstitutionMethod;
 import com.oracle.svm.hosted.substitute.SubstitutionType;
+
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.nativeimage.hosted.Feature;
-
-import java.security.CodeSource;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.function.Function;
 
 @AutomaticFeature
 public class SubstitutionReportFeature implements Feature {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/ConstantAnnotationMarkerSubstitutionType.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/ConstantAnnotationMarkerSubstitutionType.java
index 33f9dd3579dc..a684606fa4d9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/ConstantAnnotationMarkerSubstitutionType.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/ConstantAnnotationMarkerSubstitutionType.java
@@ -28,7 +28,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionMethod.java
index 7f3dd9c347cd..3a1691dc10fa 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionMethod.java
@@ -32,7 +32,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.infrastructure.OriginalMethodProvider;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantPool;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionType.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionType.java
index 6cbee9e255ac..fcff66ac0f29 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionType.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/CustomSubstitutionType.java
@@ -31,7 +31,7 @@
 import java.util.Map;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
index 2e4518a42d8d..f4665899d460 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
@@ -56,10 +56,10 @@
 import com.oracle.graal.pointsto.infrastructure.WrappedElement;
 import com.oracle.graal.pointsto.infrastructure.WrappedJavaType;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.c.CTypedef;
 import com.oracle.svm.core.c.struct.PinnedObjectField;
 import com.oracle.svm.hosted.c.BuiltinDirectives;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.c.NativeCodeContext;
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.c.info.AccessorInfo.AccessorKind;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ConfigurableClassInitialization.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ConfigurableClassInitialization.java
index 9572bdbd759d..96d6211b6298 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ConfigurableClassInitialization.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ConfigurableClassInitialization.java
@@ -46,13 +46,13 @@
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.reports.ReportUtils;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.NativeImageOptions;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
index 85aca69ae2a8..4e69489f4c9a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
@@ -55,12 +55,12 @@
 import org.graalvm.compiler.phases.util.Providers;
 
 import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.graal.thread.VMThreadLocalAccess;
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.phases.EarlyConstantFoldLoadFieldPlugin;
 import com.oracle.svm.hosted.snippets.ReflectionPlugins;
 import com.oracle.svm.hosted.snippets.SubstrateGraphBuilderPlugins;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
index fe47e4c1bc1d..7f0fcb1f9566 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
@@ -24,22 +24,23 @@
  */
 package com.oracle.svm.hosted.lambda;
 
-import org.graalvm.compiler.java.LambdaUtils;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.DebugContext.Builder;
+import org.graalvm.compiler.java.LambdaUtils;
 import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
 import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
+
 import jdk.vm.ci.meta.ResolvedJavaType;
-import org.graalvm.compiler.phases.util.Providers;
 
 /**
  * This substitution replaces all lambda proxy types with types that have a stable names. The name
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaSubstitutionType.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaSubstitutionType.java
index 3e30f126d84c..84942e4bbbf6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaSubstitutionType.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaSubstitutionType.java
@@ -27,8 +27,8 @@
 import java.lang.annotation.Annotation;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.jdk.LambdaFormHiddenMethod;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
index d796dce91fbd..131fceac2399 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
@@ -37,7 +37,6 @@
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
-import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
@@ -105,6 +104,8 @@
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
+import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateOptions;
@@ -118,7 +119,6 @@
 import com.oracle.svm.hosted.NativeImageOptions;
 import com.oracle.svm.hosted.NativeImageUtil;
 import com.oracle.svm.hosted.SVMHost;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.meta.HostedType;
 import com.oracle.svm.hosted.meta.HostedUniverse;
 import com.oracle.svm.hosted.snippets.IntrinsificationPluginRegistry;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
index 154209e821ea..1a8bd9e723a7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
@@ -60,6 +60,7 @@
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.TypeResult;
@@ -69,7 +70,6 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ExceptionSynthesizer;
 import com.oracle.svm.hosted.ImageClassLoader;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 import com.oracle.svm.hosted.substitute.DeletedElementException;
 import com.oracle.svm.util.ModuleSupport;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedField.java
index 7c5d68a4b897..37a1af797f1b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedField.java
@@ -29,10 +29,10 @@
 import java.util.Arrays;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.InjectAccessors;
 import com.oracle.svm.core.meta.ReadableJavaField;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.util.ClassUtil;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
index efb3761b19f9..873cb69b7c4f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
@@ -38,9 +38,9 @@
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.infrastructure.OriginalMethodProvider;
 import com.oracle.graal.pointsto.meta.HostedProviders;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.annotate.AnnotateOriginal;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantPool;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
index dd582a5032c2..c5d75b307b96 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
@@ -44,6 +44,7 @@
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.CustomFieldValueComputer;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.CustomFieldValueTransformer;
@@ -51,7 +52,6 @@
 import com.oracle.svm.core.meta.ReadableJavaField;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.meta.HostedField;
 import com.oracle.svm.hosted.meta.HostedMetaAccess;
 import com.oracle.svm.util.ReflectionUtil;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedAccessorsField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedAccessorsField.java
index 3ed62d84f6fa..281c1d33877d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedAccessorsField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedAccessorsField.java
@@ -29,10 +29,10 @@
 import java.util.Arrays;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.annotate.InjectAccessors;
 import com.oracle.svm.core.meta.ReadableJavaField;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaType;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedFieldsType.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedFieldsType.java
index 4af972e84e4e..4620cb2bf8a4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedFieldsType.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/InjectedFieldsType.java
@@ -28,7 +28,7 @@
 import java.util.Arrays;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionField.java
index 23a7b1beca8b..54c2d365a718 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionField.java
@@ -28,8 +28,8 @@
 import java.lang.reflect.Field;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.meta.ReadableJavaField;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaType;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
index b28fc46cb0df..d66751657378 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
@@ -37,7 +37,7 @@
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.infrastructure.OriginalMethodProvider;
 import com.oracle.graal.pointsto.meta.HostedProviders;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantPool;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionType.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionType.java
index 4c70180a5e66..a3f3d336b96e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionType.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionType.java
@@ -29,7 +29,7 @@
 import java.util.Arrays;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
-import com.oracle.svm.hosted.c.GraalAccess;
+import com.oracle.graal.pointsto.util.GraalAccess;
 
 import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
index 7dd4c5130974..903a2575b465 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
@@ -75,6 +75,7 @@
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.phases.NoClassInitializationPlugin;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.AutomaticFeature;
@@ -86,7 +87,6 @@
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.SVMHost;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.classinitialization.ClassInitializerGraphBuilderPhase;
 import com.oracle.svm.hosted.snippets.ReflectionPlugins;
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java
index b44f203846d1..776913eeab95 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEventSubstitution.java
@@ -37,8 +37,8 @@
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.c.GraalAccess;
 
 import jdk.jfr.Event;
 import jdk.jfr.internal.EventWriter;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
index a98dac8449c5..40cb4b3c19be 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
@@ -44,8 +44,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BooleanSupplier;
 
-import com.oracle.svm.core.config.ConfigurationValues;
-import com.oracle.truffle.api.staticobject.StaticProperty;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.ValueNode;
@@ -62,6 +60,7 @@
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.AnnotateOriginal;
@@ -71,6 +70,7 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
@@ -82,7 +82,6 @@
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.hosted.meta.HostedMetaAccess;
 import com.oracle.svm.hosted.snippets.SubstrateGraphBuilderPlugins;
 import com.oracle.svm.truffle.api.SubstrateTruffleRuntime;
@@ -103,6 +102,7 @@
 import com.oracle.truffle.api.nodes.NodeClass;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.Profile;
+import com.oracle.truffle.api.staticobject.StaticProperty;
 import com.oracle.truffle.api.staticobject.StaticShape;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
index f3782dbac6ff..0a82b746a8ca 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
@@ -50,6 +50,7 @@
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
 
+import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.deopt.Deoptimizer;
@@ -60,7 +61,6 @@
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.RuntimeOptionValues;
 import com.oracle.svm.core.stack.SubstrateStackIntrospection;
-import com.oracle.svm.hosted.c.GraalAccess;
 import com.oracle.svm.truffle.TruffleSupport;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.impl.AbstractFastThreadLocal;

From ee87ab35f595452f7df9624c49299e03f48ac7b6 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 12 Oct 2021 18:55:47 -0700
Subject: [PATCH 465/681] Various additions.

---
 .../AnalysisObjectScanningObserver.java       |  4 +--
 .../graal/pointsto/util/AnalysisFuture.java   | 25 +++++++++----------
 .../src/com/oracle/svm/hosted/SVMHost.java    |  6 +++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
index f07d0707c0f4..3dca19404a31 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisObjectScanningObserver.java
@@ -33,11 +33,11 @@
 
 import jdk.vm.ci.meta.JavaConstant;
 
-class AnalysisObjectScanningObserver implements ObjectScanningObserver {
+public class AnalysisObjectScanningObserver implements ObjectScanningObserver {
 
     private final BigBang bb;
 
-    AnalysisObjectScanningObserver(BigBang bb) {
+    public AnalysisObjectScanningObserver(BigBang bb) {
         this.bb = bb;
     }
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
index 3d6ebb5b3e93..cceb2af8e7b0 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
@@ -49,23 +49,22 @@ protected void setException(Throwable t) {
         throw new GraalError(t);
     }
 
-    /** Run the task and wait for it to complete, if necessary. */
-    public void ensureDone() {
+    /** Run the task, wait for it to complete if necessary, then retrieve its result. */
+    public V ensureDone() {
         try {
             /*
-             * If the task is not done yet trigger its execution and call get(), which waits for the
-             * computation to complete, if necessary.
-             * 
-             * A task is "done" even if it failed with an exception. The exception is only reported
-             * when get() is invoked. That's why, to support this execution pattern without miss any
-             * exceptions, we report the error eagerly as a GraalError as soon as it is encountered.
+             * Trigger the task execution and call get(), which waits for the computation to
+             * complete, if necessary.
+             *
+             * A task is done even if it failed with an exception. The exception is only reported
+             * when get() is invoked. We report any error eagerly as a GraalError as soon as it is
+             * encountered.
              */
-            if (!isDone()) {
-                run();
-                get();
-            }
+            run();
+            return get();
         } catch (InterruptedException | ExecutionException e) {
-            AnalysisError.shouldNotReachHere(e);
+            throw AnalysisError.shouldNotReachHere(e);
         }
     }
+
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
index 734a7a3c45ce..357e0d28d858 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
@@ -742,6 +742,12 @@ public boolean platformSupported(AnalysisUniverse universe, AnnotatedElement ele
                 return false;
             }
         }
+        if (element instanceof Class) {
+            Package p = ((Class<?>) element).getPackage();
+            if (p != null && !platformSupported(universe, p)) {
+                return false;
+            }
+        }
 
         Platforms platformsAnnotation = GuardedAnnotationAccess.getAnnotation(element, Platforms.class);
         if (platform == null || platformsAnnotation == null) {

From ce35fa37a41010480416cdbdd30b2808ed64754d Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 13 Oct 2021 21:42:17 +0200
Subject: [PATCH 466/681] prevent inner LibGraalScope from using detached and
 destroyed isolate thread of an outer LibGraalScope that is in the process of
 closing

---
 .../org/graalvm/libgraal/LibGraalScope.java   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java b/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
index 1729e451ae00..11472e02566b 100644
--- a/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
+++ b/compiler/src/org.graalvm.libgraal/src/org/graalvm/libgraal/LibGraalScope.java
@@ -43,13 +43,31 @@ public final class LibGraalScope implements AutoCloseable {
     static class Shared {
         final DetachAction detachAction;
         final LibGraalIsolate isolate;
-        final long isolateThread;
+        private long isolateThread;
 
         Shared(DetachAction detachAction, LibGraalIsolate isolate, long isolateThread) {
             this.detachAction = detachAction;
             this.isolate = isolate;
             this.isolateThread = isolateThread;
         }
+
+        public long getIsolateThread() {
+            if (isolateThread == 0L) {
+                throw new IllegalStateException(Thread.currentThread() + " is no longer attached to " + isolate);
+            }
+            return isolateThread;
+        }
+
+        public long detach() {
+            long res = getIsolateThread();
+            isolateThread = 0L;
+            return res;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("isolate=%s, isolateThread=0x%x, detachAction=%s", isolate, isolateThread, detachAction);
+        }
     }
 
     private final LibGraalScope parent;
@@ -82,7 +100,7 @@ public static LibGraalScope current() {
      * @throws IllegalStateException if the current thread is not attached to libgraal
      */
     public static long getIsolateThread() {
-        return current().shared.isolateThread;
+        return current().shared.getIsolateThread();
     }
 
     /**
@@ -150,7 +168,7 @@ public LibGraalScope(DetachAction detachAction) {
 
     @Override
     public String toString() {
-        return String.format("LibGraalScope@%d[isolate=%s, isolateThread=0x%x, parent=%s]", id, shared.isolate, shared.isolateThread, parent);
+        return String.format("LibGraalScope@%d[%s, parent=%s]", id, shared, parent);
     }
 
     /**
@@ -234,19 +252,26 @@ public LibGraalIsolate getIsolate() {
      * Gets the address of the isolate thread associated with this scope.
      */
     public long getIsolateThreadAddress() {
-        return shared.isolateThread;
+        return shared.getIsolateThread();
     }
 
     @Override
     public void close() {
+        // Reset the currentScope thread local before detaching. Detaching may trigger HotSpot to
+        // shutdown the libgraal isolate. That involves re-attaching the current thread to the
+        // libgraal isolate with a *new* isolate thread for calling
+        // HotSpotJVMCIRuntime.shutdown(). In the scope of the latter call, if a new LibGraalScope
+        // is opened, it must not see this LibGraalScope as its parent otherwise it will use the
+        // closed and discarded isolate thread (i.e. this.shared.isolateThread).
+        currentScope.set(parent);
         if (parent == null && shared.detachAction != null) {
+            long isolateThread = shared.detach();
             if (shared.detachAction == DetachAction.DETACH) {
-                detachThreadFrom(shared.isolateThread);
+                detachThreadFrom(isolateThread);
             } else {
                 LibGraal.detachCurrentThread(shared.detachAction == DetachAction.DETACH_RUNTIME_AND_RELEASE);
             }
         }
-        currentScope.set(parent);
     }
 
     // Shared support for the LibGraal overlays

From 723c29316b4e2a605281512e4bef6fa154a6f933 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 14 Oct 2021 10:08:28 +0200
Subject: [PATCH 467/681] Disallow Java heap allocation if safepoint checks are
 disabled.

---
 .../src/com/oracle/svm/core/genscavenge/HeapImpl.java         | 3 ++-
 .../src/com/oracle/svm/core/heap/NoAllocationVerifier.java    | 4 ----
 .../src/com/oracle/svm/core/thread/VMThreads.java             | 4 +++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
index 129d35bcd0e8..c99c23ecebb1 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
@@ -172,6 +172,7 @@ public boolean isInPrimaryImageHeap(Pointer objPointer) {
     }
 
     @Override
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public void suspendAllocation() {
         ThreadLocalAllocation.suspendInCurrentThread();
     }
@@ -237,7 +238,7 @@ GCImpl getGCImpl() {
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean isAllocationDisallowed() {
-        return NoAllocationVerifier.isActive() || gcImpl.isCollectionInProgress();
+        return NoAllocationVerifier.isActive() || !VMThreads.SafepointBehavior.safepointChecksEnabled() || gcImpl.isCollectionInProgress();
     }
 
     /** A guard to place before an allocation, giving the call site and the allocation type. */
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
index 047ca080dbc2..cc558b6f1cd5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/NoAllocationVerifier.java
@@ -37,10 +37,6 @@
  * Design: There shouldn't be tests for a locked heap on the allocation fast-path, so the key is
  * that creating one of these sets top to end in the young space, so allocation attempts fail over
  * to the slow-path, and there can be a test for a locked heap on the slow path.
- *
- * TODO: When SVM becomes multi-threaded, this should only prevent allocation on a particular
- * thread. That could be done by setting the thread's TLAB to null, which should force it on to the
- * slow-path to allocation a new TLAB.
  */
 public class NoAllocationVerifier implements AutoCloseable {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 95f2eda2fd57..02f16bbbeeef 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -871,6 +871,7 @@ public static int getSafepointBehavior(IsolateThread vmThread) {
         public static void setPreventVMFromReachingSafepoint() {
             assert safepointChecksEnabled();
             safepointBehaviorTL.setVolatile(PREVENT_VM_FROM_REACHING_SAFEPOINT);
+            Heap.getHeap().suspendAllocation();
         }
 
         /**
@@ -888,13 +889,14 @@ public static void setPreventVMFromReachingSafepoint() {
         static void setIgnoreThreadInSafepointHandling() {
             assert safepointChecksEnabled();
             safepointBehaviorTL.setVolatile(IGNORE_THREAD_IN_SAFEPOINT_HANDLING);
+            Heap.getHeap().suspendAllocation();
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static String toString(int safepointBehavior) {
             switch (safepointBehavior) {
                 case ALLOW_SAFEPOINT:
-                    return "";
+                    return "ALLOW_SAFEPOINT";
                 case PREVENT_VM_FROM_REACHING_SAFEPOINT:
                     return "PREVENT_VM_FROM_REACHING_SAFEPOINT";
                 case IGNORE_THREAD_IN_SAFEPOINT_HANDLING:

From 7b40f7d1d47313ed17f56656ebdc677b7e977edc Mon Sep 17 00:00:00 2001
From: Jakub Chaloupka <jakub.chaloupka@oracle.com>
Date: Wed, 13 Oct 2021 13:40:49 +0200
Subject: [PATCH 468/681] Make updating context locals and context thread
 locals work for inner contexts.

---
 .../api/test/polyglot/ContextLocalTest.java   | 104 +++++++++++++++++-
 .../truffle/polyglot/PolyglotContextImpl.java |  54 +++++++--
 .../truffle/polyglot/PolyglotEngineImpl.java  |  14 +--
 .../truffle/polyglot/PolyglotInstrument.java  |  15 +--
 4 files changed, 152 insertions(+), 35 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextLocalTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextLocalTest.java
index a4dcd0a0678d..e9c47e83e179 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextLocalTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/ContextLocalTest.java
@@ -61,12 +61,16 @@
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.Instrument;
+import org.graalvm.polyglot.PolyglotAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.oracle.truffle.api.CallTarget;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.ContextLocal;
 import com.oracle.truffle.api.ContextThreadLocal;
+import com.oracle.truffle.api.InstrumentInfo;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
@@ -74,8 +78,13 @@
 import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventListener;
 import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
+import com.oracle.truffle.api.instrumentation.ThreadsActivationListener;
 import com.oracle.truffle.api.instrumentation.TruffleInstrument;
+import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.LanguageInfo;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.nodes.RootNode;
+import com.oracle.truffle.api.source.Source;
 
 public class ContextLocalTest extends AbstractPolyglotTest {
 
@@ -687,8 +696,11 @@ public void testUnstableContextThreadLocalValue() {
         }
     }
 
-    public void testInstrumentCreatedBeforeContextsInitialized() {
-
+    @Test
+    public void testInnerContextLocals() {
+        try (Context ctx = Context.newBuilder().allowPolyglotAccess(PolyglotAccess.ALL).build()) {
+            Assert.assertEquals(0, ctx.eval(VALID_SHARED_LANGUAGE, "").asInt());
+        }
     }
 
     @TruffleLanguage.Registration(id = VALID_EXCLUSIVE_LANGUAGE, name = VALID_EXCLUSIVE_LANGUAGE)
@@ -710,6 +722,17 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
             return true;
         }
 
+        @Override
+        protected CallTarget parse(ParsingRequest request) throws Exception {
+            RootNode rootNode = new RootNode(this) {
+                @Override
+                public Object execute(VirtualFrame frame) {
+                    return 0;
+                }
+            };
+            return rootNode.getCallTarget();
+        }
+
         static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ValidExclusiveLanguage.class);
         static final LanguageReference<ValidExclusiveLanguage> REFERENCE = LanguageReference.create(ValidExclusiveLanguage.class);
 
@@ -782,11 +805,71 @@ public ContextThreadLocal<String> createContextThreadLocal0(String value) {
             return createContextThreadLocal((e, t) -> value);
         }
 
+        @Override
+        protected CallTarget parse(ParsingRequest request) throws Exception {
+            return (new VSLRootNode(this)).getCallTarget();
+        }
+
         static final ContextReference<Env> CONTEXT_REF = ContextReference.create(ValidSharedLanguage.class);
         static final LanguageReference<ValidSharedLanguage> REFERENCE = LanguageReference.create(ValidSharedLanguage.class);
 
     }
 
+    public static class VSLRootNode extends RootNode {
+
+        @Node.Child private VSLNode node = new VSLNode();
+
+        public VSLRootNode(ValidSharedLanguage language) {
+            super(language);
+        }
+
+        @Override
+        public Object execute(VirtualFrame virtualFrame) {
+            return node.execute(virtualFrame);
+        }
+
+    }
+
+    public static class VSLNode extends Node {
+
+        private final Source source = Source.newBuilder(VALID_EXCLUSIVE_LANGUAGE, "", "").build();
+
+        private final IndirectCallNode callNode = IndirectCallNode.create();
+
+        @SuppressWarnings("unused")
+        public Object execute(VirtualFrame virtualFrame) {
+            Env outerLanguageOuterEnv = ValidSharedLanguage.CONTEXT_REF.get(this);
+            TruffleContext innerTruffleContext = createInnerContext(outerLanguageOuterEnv);
+            Object outerTruffleContext = innerTruffleContext.enter(this);
+            try {
+                Env outerLanguageInnerEnv = ValidSharedLanguage.CONTEXT_REF.get(this);
+                createInstrument(outerLanguageInnerEnv);
+                CallTarget callTarget = parse(outerLanguageInnerEnv);
+                return callNode.call(callTarget);
+            } finally {
+                innerTruffleContext.leave(this, outerTruffleContext);
+                innerTruffleContext.close();
+            }
+        }
+
+        @CompilerDirectives.TruffleBoundary
+        private CallTarget parse(Env env) {
+            return env.parsePublic(source);
+        }
+
+        @CompilerDirectives.TruffleBoundary
+        private static TruffleContext createInnerContext(Env env) {
+            return env.newContextBuilder().build();
+        }
+
+        @CompilerDirectives.TruffleBoundary
+        private static void createInstrument(Env env) {
+            InstrumentInfo instrumentInfo = env.getInstruments().get(VALID_INSTRUMENT);
+            env.lookup(instrumentInfo, ValidInstrument.class);
+        }
+
+    }
+
     @TruffleInstrument.Registration(id = VALID_INSTRUMENT, name = VALID_INSTRUMENT, services = ValidInstrument.class)
     public static class ValidInstrument extends TruffleInstrument {
 
@@ -804,6 +887,23 @@ public static class ValidInstrument extends TruffleInstrument {
         protected void onCreate(Env env) {
             this.environment = env;
             env.registerService(this);
+            env.getInstrumenter().attachThreadsActivationListener(new ThreadsActivationListener() {
+                @Override
+                public void onEnterThread(TruffleContext c) {
+                    if (threadLocalDynamicValue != null && contextLocalDynamicValue != null) {
+                        local0.get(c);
+                        threadLocal0.get(c);
+                    }
+                }
+
+                @Override
+                public void onLeaveThread(TruffleContext c) {
+                    if (threadLocalDynamicValue != null && contextLocalDynamicValue != null) {
+                        local0.get(c);
+                        threadLocal0.get(c);
+                    }
+                }
+            });
         }
 
         InstrumentThreadLocalValue newInstrumentThreadLocal(TruffleContext context, Thread t) {
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
index 45a108f6df0a..6123f27f52eb 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -2624,13 +2624,39 @@ void initializeInstrumentContextThreadLocals() {
         }
     }
 
-    /**
-     * Updates the current thread locals from {@link PolyglotThreadInfo#contextThreadLocals}.
-     */
-    synchronized Object[] updateThreadLocals() {
-        assert Thread.holdsLock(this);
-        Object[] newThreadLocals = getThreadLocals(Thread.currentThread());
-        return newThreadLocals;
+    void invokeLocalsFactories(LocalLocation[] contextLocalLocations, LocalLocation[] contextThreadLocalLocations) {
+        PolyglotContextImpl[] localChildContexts;
+        synchronized (this) {
+            if (localsCleared) {
+                return;
+            }
+            /*
+             * contextLocals might not be initialized yet, in which case the context local factory
+             * for this instrument will be invoked during contextLocals initialization.
+             */
+            if (contextLocals != null) {
+                invokeContextLocalsFactory(contextLocals, contextLocalLocations);
+                invokeContextThreadLocalFactory(contextThreadLocalLocations);
+            }
+            localChildContexts = PolyglotContextImpl.this.childContexts.toArray(new PolyglotContextImpl[0]);
+        }
+        for (PolyglotContextImpl childCtx : localChildContexts) {
+            childCtx.invokeLocalsFactories(contextLocalLocations, contextThreadLocalLocations);
+        }
+    }
+
+    void resizeThreadLocals(StableLocalLocations locations) {
+        PolyglotContextImpl[] localChildContexts;
+        synchronized (this) {
+            if (localsCleared) {
+                return;
+            }
+            resizeContextThreadLocals(locations);
+            localChildContexts = PolyglotContextImpl.this.childContexts.toArray(new PolyglotContextImpl[0]);
+        }
+        for (PolyglotContextImpl childCtx : localChildContexts) {
+            childCtx.resizeThreadLocals(locations);
+        }
     }
 
     void resizeContextThreadLocals(StableLocalLocations locations) {
@@ -2643,6 +2669,20 @@ void resizeContextThreadLocals(StableLocalLocations locations) {
         }
     }
 
+    void resizeLocals(StableLocalLocations locations) {
+        PolyglotContextImpl[] localChildContexts;
+        synchronized (this) {
+            if (localsCleared) {
+                return;
+            }
+            resizeContextLocals(locations);
+            localChildContexts = PolyglotContextImpl.this.childContexts.toArray(new PolyglotContextImpl[0]);
+        }
+        for (PolyglotContextImpl childCtx : localChildContexts) {
+            childCtx.resizeLocals(locations);
+        }
+    }
+
     void resizeContextLocals(StableLocalLocations locations) {
         assert Thread.holdsLock(this);
         Object[] oldLocals = this.contextLocals;
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
index c067870b1239..fc90dbea4417 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotEngineImpl.java
@@ -1982,12 +1982,7 @@ LocalLocation[] addContextLocals(List<? extends AbstractContextLocal<?>> newLoca
             newLocations = Arrays.copyOfRange(locationsCopy, stableLocations.locations.length, index);
         }
         for (PolyglotContextImpl context : aliveContexts) {
-            synchronized (context) {
-                if (context.localsCleared) {
-                    continue;
-                }
-                context.resizeContextLocals(newStableLocations);
-            }
+            context.resizeLocals(newStableLocations);
         }
         return newLocations;
     }
@@ -2015,12 +2010,7 @@ LocalLocation[] addContextThreadLocals(List<? extends AbstractContextThreadLocal
             newLocations = Arrays.copyOfRange(locationsCopy, stableLocations.locations.length, index);
         }
         for (PolyglotContextImpl context : aliveContexts) {
-            synchronized (context) {
-                if (context.localsCleared) {
-                    continue;
-                }
-                context.resizeContextThreadLocals(newStableLocations);
-            }
+            context.resizeThreadLocals(newStableLocations);
         }
         return newLocations;
     }
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotInstrument.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotInstrument.java
index f005245cd7c7..e8f2a437650c 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotInstrument.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotInstrument.java
@@ -184,20 +184,7 @@ void ensureCreated() {
             }
             if (contexts != null) {
                 for (PolyglotContextImpl context : contexts) {
-                    synchronized (context) {
-                        if (context.localsCleared) {
-                            continue;
-                        }
-                        /*
-                         * contextLocals might not be initialized yet, in which case the context
-                         * local factory for this instrument will be invoked during contextLocals
-                         * initialization.
-                         */
-                        if (context.contextLocals != null) {
-                            context.invokeContextLocalsFactory(context.contextLocals, contextLocalLocations);
-                            context.invokeContextThreadLocalFactory(contextThreadLocalLocations);
-                        }
-                    }
+                    context.invokeLocalsFactories(contextLocalLocations, contextThreadLocalLocations);
                 }
             }
         }

From 50730a8dfff1a688e0d348a0d919022c9445dbc4 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 7 Sep 2021 14:48:04 +0200
Subject: [PATCH 469/681] compiler: PlaceholderWithExceptionNode must be a
 memory kill

---
 .../org/graalvm/compiler/replacements/SnippetTemplate.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index f553c5da39b3..c1209f60104f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -2216,7 +2216,7 @@ public void setMayRemoveLocation(boolean mayRemoveLocation) {
  * CFG edges for select snippet lowerings.
  */
 @NodeInfo(size = NodeSize.SIZE_0, cycles = NodeCycles.CYCLES_0, cyclesRationale = "This node is immediately removed on next simplification pass")
-final class PlaceholderWithExceptionNode extends WithExceptionNode implements Simplifiable {
+final class PlaceholderWithExceptionNode extends WithExceptionNode implements Simplifiable, SingleMemoryKill {
     static final NodeClass<PlaceholderWithExceptionNode> TYPE = NodeClass.create(PlaceholderWithExceptionNode.class);
 
     protected PlaceholderWithExceptionNode() {
@@ -2230,6 +2230,11 @@ public void simplify(SimplifierTool tool) {
         }
         graph().removeSplit(this, next());
     }
+
+    @Override
+    public LocationIdentity getKilledLocationIdentity() {
+        return LocationIdentity.any();
+    }
 }
 
 @NodeInfo(size = NodeSize.SIZE_0, cycles = NodeCycles.CYCLES_0, cyclesRationale = "This node is immediately removed on next simplification pass")

From 4f7fdf83174c1cb242eb4dd518dfc3cda4d827dd Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 8 Sep 2021 16:33:23 +0200
Subject: [PATCH 470/681] compiler: verify that WithExceptionNodes do not have
 memory usages in SnippetTemplate

---
 .../src/org/graalvm/compiler/graph/Node.java   | 18 ++++++++++++++++++
 .../compiler/replacements/SnippetTemplate.java | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index 8f1622c8e2ed..2c0855746db9 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -456,6 +456,24 @@ public final boolean hasOnlyUsagesOfType(InputType type) {
         return true;
     }
 
+    /**
+     * Checks whether this node has usages of that type.
+     *
+     * @param type the type of usages to look for
+     */
+    public final boolean hasUsagesOfType(InputType type) {
+        for (Node usage : usages()) {
+            for (Position pos : usage.inputPositions()) {
+                if (pos.get(usage) == this) {
+                    if (pos.getInputType() == type) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Adds a given node to this node's {@linkplain #usages() usages}.
      *
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index c1209f60104f..822c1bd5ba71 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -1546,6 +1546,7 @@ public Collection<LocationIdentity> getLocations() {
     }
 
     private void rewireMemoryGraph(ValueNode replacee, UnmodifiableEconomicMap<Node, Node> duplicates) {
+        verifyWithExceptionNode(replacee);
         if (replacee.graph().isAfterStage(StageFlag.FLOATING_READS)) {
             // rewire outgoing memory edges
             replaceMemoryUsages(replacee, new MemoryOutputMap(replacee, duplicates));
@@ -1578,6 +1579,19 @@ private void rewireMemoryGraph(ValueNode replacee, UnmodifiableEconomicMap<Node,
         }
     }
 
+    /**
+     * Verifies that a {@link WithExceptionNode} does not have memory usages. It shouldn't because
+     * if it is a memory kill, its {@link WithExceptionNode#next()} and
+     * {@link WithExceptionNode#exceptionEdge()} edges should start with a memory kill as well
+     * ({@link org.graalvm.compiler.nodes.KillingBeginNode}, {@link ExceptionObjectNode}) or be
+     * {@linkplain UnreachableBeginNode unreachable}.
+     */
+    private static void verifyWithExceptionNode(ValueNode node) {
+        if (node instanceof WithExceptionNode) {
+            GraalError.guarantee(node.hasNoUsages() || !node.hasUsagesOfType(InputType.Memory), "%s should not have any memory usages", node);
+        }
+    }
+
     private static LocationIdentity getLocationIdentity(Node node) {
         if (node instanceof MemoryAccess) {
             return ((MemoryAccess) node).getLocationIdentity();

From ce702c97b30885b601701d00183120abbc5c26c6 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 28 Sep 2021 17:36:14 +0200
Subject: [PATCH 471/681] compiler: canonicalize KillingBeginNode to BeginNode

... if the predecessor is no longer a WithExceptionNode and it has no memory edges.
---
 .../compiler/nodes/KillingBeginNode.java      | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
index f02b7a832908..f804e2b8cdb8 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/KillingBeginNode.java
@@ -29,12 +29,12 @@
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
@@ -44,7 +44,7 @@
  * @see WithExceptionNode for more details
  */
 @NodeInfo(allowedUsageTypes = {Memory}, cycles = CYCLES_0, size = SIZE_0)
-public final class KillingBeginNode extends AbstractBeginNode implements SingleMemoryKill, Simplifiable {
+public final class KillingBeginNode extends AbstractBeginNode implements SingleMemoryKill, Canonicalizable {
 
     public static final NodeClass<KillingBeginNode> TYPE = NodeClass.create(KillingBeginNode.class);
     protected LocationIdentity locationIdentity;
@@ -73,28 +73,23 @@ public LocationIdentity getKilledLocationIdentity() {
     }
 
     @Override
-    public void simplify(SimplifierTool tool) {
-        if (predecessor() instanceof FixedWithNextNode && predecessor() instanceof SingleMemoryKill) {
-            SingleMemoryKill predecessor = (SingleMemoryKill) predecessor();
-            if (getKilledLocationIdentity().equals(predecessor.getKilledLocationIdentity())) {
-                // This killing begin node can be removed.
-                tool.addToWorkList(next());
-                graph().removeFixed(this);
-            }
-        }
+    public void prepareDelete() {
+        GraalError.guarantee(graph().isBeforeStage(StructuredGraph.StageFlag.FLOATING_READS) || !hasUsagesOfType(Memory), "Cannot delete %s with memory usages %s", this, usages().snapshot());
+        super.prepareDelete();
     }
 
     @Override
-    public void prepareDelete() {
-        GraalError.guarantee(predecessor() instanceof SingleMemoryKill, "Cannot delete %s as its predecessor %s is not a SingleMemoryKill", this, predecessor());
-        GraalError.guarantee(getKilledLocationIdentity().equals(((SingleMemoryKill) predecessor()).getKilledLocationIdentity()),
-                        "Cannot delete %s as its predecessor %s kills a different location (%s vs. %s)", this, predecessor(), getKilledLocationIdentity(),
-                        ((SingleMemoryKill) predecessor()).getKilledLocationIdentity());
-        if (hasUsages()) {
-            // Memory edges are moved to the predecessor.
-            replaceAtUsages(predecessor(), InputType.Memory);
+    public Node canonical(CanonicalizerTool tool) {
+        if (graph().isBeforeStage(StructuredGraph.StageFlag.FLOATING_READS)) {
+            if (!(predecessor() instanceof WithExceptionNode)) {
+                return new BeginNode();
+            }
+        } else {
+            // after floating read - we need to check the memory graph
+            if (tool.allUsagesAvailable() && !(predecessor() instanceof WithExceptionNode) && !hasUsagesOfType(Memory)) {
+                return new BeginNode();
+            }
         }
-        // The guards are moved up to the preceding begin node.
-        super.prepareDelete();
+        return this;
     }
 }

From ef1eac1956f90aed2795163cead274a976308f2a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 29 Sep 2021 16:36:01 +0200
Subject: [PATCH 472/681] compiler: InvokeWithExceptionNode should
 killKillingBegin() when replaceWithInvoke()

---
 .../nodes/InvokeWithExceptionNode.java        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
index 141f756bfac4..93067d8447e6 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
@@ -178,9 +178,12 @@ public Map<Object, Object> getDebugProperties(Map<Object, Object> map) {
         return debugProperties;
     }
 
-    @SuppressWarnings("try")
     public AbstractBeginNode killKillingBegin() {
-        AbstractBeginNode begin = next();
+        return killKillingBegin(next());
+    }
+
+    @SuppressWarnings("try")
+    public AbstractBeginNode killKillingBegin(AbstractBeginNode begin) {
         if (begin instanceof KillingBeginNode) {
             try (DebugCloseable position = begin.withNodeSourcePosition()) {
                 AbstractBeginNode newBegin = new BeginNode();
@@ -256,7 +259,19 @@ public InvokeNode replaceWithNonThrowing() {
     @Override
     public void simplify(SimplifierTool tool) {
         if (exceptionEdge() instanceof UnreachableBeginNode) {
-            replaceWithInvoke();
+            AbstractBeginNode storedNext = next();
+            InvokeNode replacement = replaceWithInvoke();
+            if (graph().isAfterStage(StructuredGraph.StageFlag.FLOATING_READS)) {
+                if (!tool.allUsagesAvailable()) {
+                    // we don't know about the usages - do nothing
+                    return;
+                }
+                storedNext.replaceAtUsages(replacement, Memory);
+            }
+            // kill the killing begin
+            AbstractBeginNode newBegin = killKillingBegin(storedNext);
+            tool.addToWorkList(newBegin.next());
+            tool.addToWorkList(newBegin);
         }
     }
 }

From 26f35306258c687a1e7697180610a9ceb8ef2d6e Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 9 Sep 2021 11:57:25 +0200
Subject: [PATCH 473/681] compiler: support WithExceptionNode in node intrinsic
 plugins

---
 .../graalvm/compiler/java/BytecodeParser.java | 18 +++++
 .../PluginReplacementWithExceptionNode.java   | 75 +++++++++++++++++++
 .../graphbuilderconf/GraphBuilderContext.java | 13 ++++
 .../processor/GeneratedFoldPlugin.java        |  2 +-
 .../GeneratedNodeIntrinsicPlugin.java         | 16 +++-
 .../processor/GeneratedPlugin.java            | 13 +++-
 .../processor/PluginGenerator.java            |  6 +-
 .../compiler/replacements/PEGraphDecoder.java | 31 +++++++-
 8 files changed, 166 insertions(+), 8 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java

diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index 2abb4da4d865..82fc408977ed 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -349,6 +349,7 @@
 import org.graalvm.compiler.nodes.ParameterNode;
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.PluginReplacementNode;
+import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode;
 import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
@@ -2156,6 +2157,23 @@ public void replacePlugin(GeneratedInvocationPlugin plugin, ResolvedJavaMethod t
         }
     }
 
+    @Override
+    public void replacePluginWithException(GeneratedInvocationPlugin plugin, ResolvedJavaMethod targetMethod, ValueNode[] args,
+                    PluginReplacementWithExceptionNode.ReplacementWithExceptionFunction replacementFunction) {
+        assert replacementFunction != null;
+        JavaType returnType = maybeEagerlyResolve(targetMethod.getSignature().getReturnType(method.getDeclaringClass()), targetMethod.getDeclaringClass());
+        StampPair returnStamp = getReplacements().getGraphBuilderPlugins().getOverridingStamp(this, returnType, false);
+        if (returnStamp == null) {
+            returnStamp = StampFactory.forDeclaredType(getAssumptions(), returnType, false);
+        }
+        WithExceptionNode node = new PluginReplacementWithExceptionNode(returnStamp.getTrustedStamp(), args, replacementFunction, plugin.getClass().getSimpleName());
+        if (returnType.getJavaKind() == JavaKind.Void) {
+            add(node);
+        } else {
+            addPush(returnType.getJavaKind(), node);
+        }
+    }
+
     protected boolean tryInvocationPlugin(InvokeKind invokeKind, ValueNode[] args, ResolvedJavaMethod targetMethod, JavaKind resultType) {
         InvocationPlugin plugin = graphBuilderConfig.getPlugins().getInvocationPlugins().lookupInvocation(targetMethod, true);
         if (plugin != null) {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
new file mode 100644
index 000000000000..6a675ea84c0e
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.nodes;
+
+import java.util.Map;
+
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.graph.NodeInputList;
+import org.graalvm.compiler.nodeinfo.NodeCycles;
+import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodeinfo.NodeSize;
+import org.graalvm.compiler.nodeinfo.Verbosity;
+import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+
+@NodeInfo(nameTemplate = "PluginReplacementWithException/{p#pluginName}", cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
+public final class PluginReplacementWithExceptionNode extends WithExceptionNode {
+    public static final NodeClass<PluginReplacementWithExceptionNode> TYPE = NodeClass.create(PluginReplacementWithExceptionNode.class);
+
+    @Input protected NodeInputList<ValueNode> args;
+    private final ReplacementWithExceptionFunction function;
+    private final String pluginName;
+
+    public PluginReplacementWithExceptionNode(Stamp stamp, ValueNode[] args, ReplacementWithExceptionFunction function, String pluginName) {
+        super(TYPE, stamp);
+        this.args = new NodeInputList<>(this, args);
+        this.function = function;
+        this.pluginName = pluginName;
+    }
+
+    public boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection) {
+        return function.replace(b, injection, stamp, args);
+    }
+
+    public interface ReplacementWithExceptionFunction {
+        boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection, Stamp stamp, NodeInputList<ValueNode> args);
+    }
+
+    @Override
+    public String toString(Verbosity verbosity) {
+        if (verbosity == Verbosity.Short) {
+            return super.toString(verbosity) + "/" + pluginName;
+        }
+        return super.toString(verbosity);
+    }
+
+    @Override
+    public Map<Object, Object> getDebugProperties(Map<Object, Object> map) {
+        map.put("name", pluginName);
+        return super.getDebugProperties(map);
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index d1f3122b2188..98e78541206b 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -51,6 +51,7 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.PluginReplacementNode;
+import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode;
 import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.StructuredGraph;
@@ -475,6 +476,18 @@ default AbstractBeginNode genExplicitExceptionEdge(BytecodeExceptionKind excepti
     default void replacePlugin(GeneratedInvocationPlugin plugin, ResolvedJavaMethod targetMethod, ValueNode[] args, PluginReplacementNode.ReplacementFunction replacementFunction) {
         throw GraalError.unimplemented();
     }
+
+    /**
+     *
+     * @param plugin
+     * @param targetMethod
+     * @param args
+     * @param replacementFunction
+     */
+    default void replacePluginWithException(GeneratedInvocationPlugin plugin, ResolvedJavaMethod targetMethod, ValueNode[] args,
+                    PluginReplacementWithExceptionNode.ReplacementWithExceptionFunction replacementFunction) {
+        throw GraalError.unimplemented();
+    }
 }
 
 class GraphBuilderContextUtil {
diff --git a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
index 1a3c1f8e21c8..595574be3f41 100644
--- a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
+++ b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java
@@ -74,7 +74,7 @@ protected void createExecute(AbstractProcessor processor, PrintWriter out, Injec
         List<? extends VariableElement> params = intrinsicMethod.getParameters();
 
         out.printf("        if (b.shouldDeferPlugin(this)) {\n");
-        out.printf("            b.replacePlugin(this, targetMethod, args, %s.FUNCTION);\n", getReplacementName());
+        out.printf("            b.replacePlugin%s(this, targetMethod, args, %s.FUNCTION);\n", getReplacementFunctionSuffix(processor), getReplacementName());
         out.printf("            return true;\n");
         out.printf("        }\n");
 
diff --git a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
index 8d1690f72393..bb43edba67d1 100644
--- a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
+++ b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java
@@ -186,7 +186,7 @@ protected void factoryCall(AbstractProcessor processor, PrintWriter out, Injecte
             out.printf("        }\n");
             if (needsReplacement(processor) && !inReplacement) {
                 out.printf("        if (b.canDeferPlugin(this)) {\n");
-                out.printf("            b.replacePlugin(this, targetMethod, args, %s.FUNCTION);\n", getReplacementName());
+                out.printf("            b.replacePlugin%s(this, targetMethod, args, %s.FUNCTION);\n", getReplacementFunctionSuffix(processor), getReplacementName());
                 out.printf("            return true;\n");
                 out.printf("        }\n");
                 out.printf("        throw GraalError.shouldNotReachHere(\"Can't inline plugin \" + b.getClass().toString());\n");
@@ -206,7 +206,19 @@ protected void verifyConstantArgument(PrintWriter out, String argName, TypeMirro
     @Override
     protected void createOtherClasses(AbstractProcessor processor, PrintWriter out) {
         if (needsReplacement(processor)) {
-            super.createOtherClasses(processor, out);
+            if (isWithExceptionReplacement(processor)) {
+                /*
+                 * We need a WithExceptionNode replacement.
+                 */
+                String name = getReplacementName();
+                out.printf("final class %s implements PluginReplacementWithExceptionNode.ReplacementWithExceptionFunction {\n", name);
+                out.printf("    static PluginReplacementWithExceptionNode.ReplacementWithExceptionFunction FUNCTION = new %s();\n", name);
+                InjectedDependencies deps = new InjectedDependencies(false, intrinsicMethod);
+                createHelpers(processor, out, deps);
+                out.printf("}\n");
+            } else {
+                super.createOtherClasses(processor, out);
+            }
         }
     }
 
diff --git a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
index 0649c60ac9e1..b691ea63db8c 100644
--- a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
+++ b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java
@@ -28,6 +28,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -215,6 +216,12 @@ protected boolean needsReplacement(AbstractProcessor processor) {
         return true;
     }
 
+    protected boolean isWithExceptionReplacement(AbstractProcessor processor) {
+        Element nodeElement = intrinsicMethod.getEnclosingElement();
+        TypeMirror withExceptionNodeType = processor.getType("org.graalvm.compiler.nodes.WithExceptionNode");
+        return processor.env().getTypeUtils().isAssignable(nodeElement.asType(), withExceptionNodeType);
+    }
+
     protected static String getReturnKind(ExecutableElement method) {
         switch (method.getReturnType().getKind()) {
             case BOOLEAN:
@@ -304,7 +311,7 @@ protected String constantArgument(AbstractProcessor processor,
         out.printf("        } else {\n");
         if (!isReplacement) {
             out.printf("            if (b.shouldDeferPlugin(this)) {\n");
-            out.printf("                b.replacePlugin(this, targetMethod, args, %s.FUNCTION);\n", getReplacementName());
+            out.printf("                b.replacePlugin%s(this, targetMethod, args, %s.FUNCTION);\n", getReplacementFunctionSuffix(processor), getReplacementName());
             out.printf("                return true;\n");
             out.printf("            }\n");
             out.printf("            assert b.canDeferPlugin(this) : b.getClass().toString() + \" \" + %s;\n", argFormatter.apply(nodeIdx));
@@ -314,4 +321,8 @@ protected String constantArgument(AbstractProcessor processor,
         out.printf("        }\n");
         return argName;
     }
+
+    protected String getReplacementFunctionSuffix(AbstractProcessor processor) {
+        return isWithExceptionReplacement(processor) ? "WithException" : "";
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
index d93dd69ef7d2..4cc14fa9327b 100644
--- a/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
+++ b/compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java
@@ -158,7 +158,11 @@ protected static void createImports(PrintWriter out, AbstractProcessor processor
             extra.add("org.graalvm.compiler.nodes.graphbuilderconf." + plugin.pluginSuperclass());
             if (plugin.needsReplacement(processor)) {
                 extra.add("org.graalvm.compiler.graph.NodeInputList");
-                extra.add("org.graalvm.compiler.nodes.PluginReplacementNode");
+                if (plugin.isWithExceptionReplacement(processor)) {
+                    extra.add("org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode");
+                } else {
+                    extra.add("org.graalvm.compiler.nodes.PluginReplacementNode");
+                }
             }
         }
         Pattern packageClassBoundary = Pattern.compile("\\.([A-Z])");
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 5c726a6b1de4..c44119aec9a2 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -85,6 +85,7 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ParameterNode;
 import org.graalvm.compiler.nodes.PluginReplacementNode;
+import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.SimplifyingGraphDecoder;
 import org.graalvm.compiler.nodes.StateSplit;
@@ -120,6 +121,7 @@
 import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
 import org.graalvm.compiler.nodes.java.StoreFieldNode;
 import org.graalvm.compiler.nodes.java.StoreIndexedNode;
+import org.graalvm.compiler.nodes.memory.MemoryKill;
 import org.graalvm.compiler.nodes.spi.Canonicalizable;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
@@ -633,10 +635,10 @@ public GraphBuilderContext getNonIntrinsicAncestor() {
     }
 
     protected class PEPluginGraphBuilderContext extends PENonAppendGraphBuilderContext {
-        protected FixedWithNextNode insertBefore;
+        protected final FixedNode insertBefore;
         protected ValueNode pushedNode;
 
-        public PEPluginGraphBuilderContext(PEMethodScope inlineScope, FixedWithNextNode insertBefore) {
+        public PEPluginGraphBuilderContext(PEMethodScope inlineScope, FixedNode insertBefore) {
             super(inlineScope, inlineScope.invokeData != null ? inlineScope.invokeData.invoke : null);
             this.insertBefore = insertBefore;
         }
@@ -685,9 +687,22 @@ private <T extends ValueNode> void updateLastInstruction(T value) {
             if (value instanceof FixedWithNextNode) {
                 FixedWithNextNode fixed = (FixedWithNextNode) value;
                 graph.addBeforeFixed(insertBefore, fixed);
+            } else if (value instanceof WithExceptionNode) {
+                WithExceptionNode withExceptionNode = (WithExceptionNode) value;
+                GraalError.guarantee(insertBefore instanceof WithExceptionNode, "Cannot replace %s with %s which is a %s", insertBefore, value, WithExceptionNode.class.getSimpleName());
+                WithExceptionNode replacee = (WithExceptionNode) insertBefore;
+                graph.replaceWithExceptionSplit(replacee, withExceptionNode);
+                AbstractBeginNode next = withExceptionNode.next();
+                if (withExceptionNode instanceof MemoryKill) {
+                    /* Insert the correct memory killing begin node at the next edge. */
+                    GraalError.guarantee(next instanceof BeginNode, "Not a BeginNode %s", next);
+                    AbstractBeginNode beginNode = graph.add(withExceptionNode.createNextBegin());
+                    withExceptionNode.setNext(beginNode);
+                    beginNode.setNext(next);
+                }
             } else if (value instanceof FixedNode) {
                 // Block terminating fixed nodes shouldn't be inserted
-                throw GraalError.shouldNotReachHere();
+                throw GraalError.shouldNotReachHere(String.format("value: %s, insertBefore: %s", value, insertBefore));
             }
         }
     }
@@ -1492,6 +1507,16 @@ protected Node canonicalizeFixedNode(MethodScope s, Node node) {
             } else if (pluginReplacementMustSucceed()) {
                 throw new GraalError("Plugin failed:" + node);
             }
+        } else if (node instanceof PluginReplacementWithExceptionNode) {
+            PluginReplacementWithExceptionNode pluginReplacementNode = (PluginReplacementWithExceptionNode) node;
+            PEPluginGraphBuilderContext graphBuilderContext = new PEPluginGraphBuilderContext(methodScope,
+                            pluginReplacementNode);
+            boolean success = pluginReplacementNode.replace(graphBuilderContext, providers.getReplacements());
+            if (success) {
+                replacedNode = graphBuilderContext.pushedNode;
+            } else if (pluginReplacementMustSucceed()) {
+                throw new GraalError("Plugin failed:" + node);
+            }
         }
 
         return super.canonicalizeFixedNode(methodScope, replacedNode);

From 203d062d43892b9ae5c689f36c4904e666fa1541 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 2 Sep 2021 15:54:18 +0200
Subject: [PATCH 474/681] compiler: make BasicArrayCopyNode a WithExceptionNode

---
 .../nodes/BasicArrayCopyNode.java             | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 2f82eca0aa12..3e6d5680eafc 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, 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
@@ -32,12 +32,14 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
+import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
+import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
@@ -49,7 +51,7 @@
  * Base class for nodes that intrinsify {@link System#arraycopy}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_64)
-public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements ArrayCopy {
+public class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit {
 
     public static final NodeClass<BasicArrayCopyNode> TYPE = NodeClass.create(BasicArrayCopyNode.class);
 
@@ -59,18 +61,20 @@ public class BasicArrayCopyNode extends AbstractMemoryCheckpoint implements Arra
 
     @OptionalInput(Memory) protected MemoryKill lastLocationAccess;
 
+    @OptionalInput(InputType.State) protected FrameState stateAfter;
+
     protected JavaKind elementKind;
 
     protected int bci;
 
-    public BasicArrayCopyNode(NodeClass<? extends AbstractMemoryCheckpoint> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
+    public BasicArrayCopyNode(NodeClass<? extends BasicArrayCopyNode> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
         super(type, StampFactory.forKind(JavaKind.Void));
         this.bci = bci;
         this.args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
         this.elementKind = elementKind != JavaKind.Illegal ? elementKind : null;
     }
 
-    public BasicArrayCopyNode(NodeClass<? extends AbstractMemoryCheckpoint> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind) {
+    public BasicArrayCopyNode(NodeClass<? extends BasicArrayCopyNode> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind) {
         this(type, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
     }
 
@@ -123,4 +127,21 @@ public void setStateDuring(FrameState stateDuring) {
         updateUsages(this.stateDuring, stateDuring);
         this.stateDuring = stateDuring;
     }
+
+    @Override
+    public FrameState stateAfter() {
+        return stateAfter;
+    }
+
+    @Override
+    public void setStateAfter(FrameState x) {
+        assert x == null || x.isAlive() : "frame state must be in a graph";
+        updateUsages(stateAfter, x);
+        stateAfter = x;
+    }
+
+    @Override
+    public boolean hasSideEffect() {
+        return true;
+    }
 }

From 635ec249a22e2971552773538497e01f066a31a6 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 2 Sep 2021 15:54:35 +0200
Subject: [PATCH 475/681] compiler: allow lowering of Unwind nodes after
 floating read phase (for WithExceptionNodes)

---
 .../org/graalvm/compiler/replacements/SnippetTemplate.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 822c1bd5ba71..918c21df08fc 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -1732,8 +1732,8 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
                 }
             }
             if (unwindPath != null) {
-                GraalError.guarantee(replacee.graph().isBeforeStage(StageFlag.FLOATING_READS),
-                                "Using a snippet with an UnwindNode after floating reads would require support for the memory graph");
+                GraalError.guarantee(replacee.graph().isBeforeStage(StageFlag.FLOATING_READS) || replacee instanceof WithExceptionNode,
+                                "Using a snippet with an UnwindNode after floating reads would require support for the memory graph (unless the replacee has an exception edge)");
                 GraalError.guarantee(replacee instanceof WithExceptionNode, "Snippet has an UnwindNode, but replacee is not a node with an exception handler");
 
                 FixedWithNextNode unwindPathDuplicate = (FixedWithNextNode) duplicates.get(unwindPath);
@@ -1751,8 +1751,6 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
                  * because lowering should not remove edges from the original CFG.
                  */
                 if (replacee instanceof WithExceptionNode) {
-                    GraalError.guarantee(replacee.graph().isBeforeStage(StageFlag.FLOATING_READS),
-                                    "Using a snippet with an UnwindNode after floating reads would require support for the memory graph");
                     GraalError.guarantee(originalWithExceptionNextNode != null, "Need to have next node to link placeholder to.");
 
                     WithExceptionNode newExceptionNode = replacee.graph().add(new PlaceholderWithExceptionNode());

From 279a960c4a5f83f175b8246a184637e3c4751127 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 21 Sep 2021 11:42:43 +0200
Subject: [PATCH 476/681] compiler: SnippetTemplate diagnostics

---
 .../src/org/graalvm/compiler/replacements/SnippetTemplate.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 918c21df08fc..c3db6134268f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -1751,7 +1751,7 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
                  * because lowering should not remove edges from the original CFG.
                  */
                 if (replacee instanceof WithExceptionNode) {
-                    GraalError.guarantee(originalWithExceptionNextNode != null, "Need to have next node to link placeholder to.");
+                    GraalError.guarantee(originalWithExceptionNextNode != null, "Need to have next node to link placeholder to: %s", replacee);
 
                     WithExceptionNode newExceptionNode = replacee.graph().add(new PlaceholderWithExceptionNode());
 

From 9aa5c25c53d84dbbaa63900aa4bcbba58d6c5419 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 11 Oct 2021 13:37:54 +0200
Subject: [PATCH 477/681] compiler: introduce PluginReplacementInterface

---
 .../nodes/PluginReplacementInterface.java     | 32 +++++++++++++++++++
 .../compiler/nodes/PluginReplacementNode.java |  3 +-
 .../PluginReplacementWithExceptionNode.java   |  3 +-
 .../compiler/replacements/PEGraphDecoder.java | 19 +++--------
 4 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
new file mode 100644
index 000000000000..4ec77200478b
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.nodes;
+
+import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+
+public interface PluginReplacementInterface extends FixedNodeInterface {
+    boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection);
+}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementNode.java
index d861cbb6519d..72789b34b98a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementNode.java
@@ -37,7 +37,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 @NodeInfo(nameTemplate = "PluginReplacement/{p#pluginName}", cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
-public final class PluginReplacementNode extends FixedWithNextNode {
+public final class PluginReplacementNode extends FixedWithNextNode implements PluginReplacementInterface {
     public static final NodeClass<PluginReplacementNode> TYPE = NodeClass.create(PluginReplacementNode.class);
 
     @Input protected NodeInputList<ValueNode> args;
@@ -51,6 +51,7 @@ public PluginReplacementNode(Stamp stamp, ValueNode[] args, ReplacementFunction
         this.pluginName = pluginName;
     }
 
+    @Override
     public boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection) {
         return function.replace(b, injection, stamp, args);
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
index 6a675ea84c0e..f08352c41b92 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
@@ -37,7 +37,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 @NodeInfo(nameTemplate = "PluginReplacementWithException/{p#pluginName}", cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
-public final class PluginReplacementWithExceptionNode extends WithExceptionNode {
+public final class PluginReplacementWithExceptionNode extends WithExceptionNode implements PluginReplacementInterface {
     public static final NodeClass<PluginReplacementWithExceptionNode> TYPE = NodeClass.create(PluginReplacementWithExceptionNode.class);
 
     @Input protected NodeInputList<ValueNode> args;
@@ -51,6 +51,7 @@ public PluginReplacementWithExceptionNode(Stamp stamp, ValueNode[] args, Replace
         this.pluginName = pluginName;
     }
 
+    @Override
     public boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection) {
         return function.replace(b, injection, stamp, args);
     }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index c44119aec9a2..9bf4c2381dcf 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -84,8 +84,7 @@
 import org.graalvm.compiler.nodes.MergeNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PluginReplacementNode;
-import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode;
+import org.graalvm.compiler.nodes.PluginReplacementInterface;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.SimplifyingGraphDecoder;
 import org.graalvm.compiler.nodes.StateSplit;
@@ -1497,20 +1496,10 @@ protected Node canonicalizeFixedNode(MethodScope s, Node node) {
                 }
             }
         }
-        if (node instanceof PluginReplacementNode) {
-            PluginReplacementNode pluginReplacementNode = (PluginReplacementNode) node;
+        if (node instanceof PluginReplacementInterface) {
+            PluginReplacementInterface pluginReplacementNode = (PluginReplacementInterface) node;
             PEPluginGraphBuilderContext graphBuilderContext = new PEPluginGraphBuilderContext(methodScope,
-                            pluginReplacementNode);
-            boolean success = pluginReplacementNode.replace(graphBuilderContext, providers.getReplacements());
-            if (success) {
-                replacedNode = graphBuilderContext.pushedNode;
-            } else if (pluginReplacementMustSucceed()) {
-                throw new GraalError("Plugin failed:" + node);
-            }
-        } else if (node instanceof PluginReplacementWithExceptionNode) {
-            PluginReplacementWithExceptionNode pluginReplacementNode = (PluginReplacementWithExceptionNode) node;
-            PEPluginGraphBuilderContext graphBuilderContext = new PEPluginGraphBuilderContext(methodScope,
-                            pluginReplacementNode);
+                            pluginReplacementNode.asFixedNode());
             boolean success = pluginReplacementNode.replace(graphBuilderContext, providers.getReplacements());
             if (success) {
                 replacedNode = graphBuilderContext.pushedNode;

From d774ff3a7491b229b381f1b847f76d242e8b9d5d Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 13 Oct 2021 11:00:53 +0200
Subject: [PATCH 478/681] compiler: WithExceptionNode#killExceptionEdge should
 check for null edge

---
 .../src/org/graalvm/compiler/nodes/WithExceptionNode.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java
index eee80b7218c2..7a9b94683406 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/WithExceptionNode.java
@@ -90,8 +90,10 @@ public void setExceptionEdge(AbstractBeginNode x) {
 
     public void killExceptionEdge() {
         AbstractBeginNode edge = exceptionEdge();
-        setExceptionEdge(null);
-        GraphUtil.killCFG(edge);
+        if (edge != null) {
+            setExceptionEdge(null);
+            GraphUtil.killCFG(edge);
+        }
     }
 
     @Override

From 3adbc2f016f84ca2430ac182d2fe2a06fe9ecba8 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 14 Oct 2021 10:46:40 +0200
Subject: [PATCH 479/681] compiler: document GraphBuilderContext#replace*Plugin

---
 .../graphbuilderconf/GraphBuilderContext.java | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 98e78541206b..674c9d515032 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -467,22 +467,31 @@ default AbstractBeginNode genExplicitExceptionEdge(BytecodeExceptionKind excepti
     }
 
     /**
+     * Replaces an invocation of a given method by inserting a {@link PluginReplacementNode} that
+     * {@linkplain GraphBuilderContext#shouldDeferPlugin defers} the application of an
+     * {@link InvocationPlugin}.
      *
-     * @param plugin
-     * @param targetMethod
-     * @param args
-     * @param replacementFunction
+     * @param plugin the {@link InvocationPlugin} that is deferred
+     * @param targetMethod the target of the replacement invocation
+     * @param args the arguments to the replacement invocation
+     * @param replacementFunction the replacement function for deferred application of the
+     *            {@code plugin}
      */
     default void replacePlugin(GeneratedInvocationPlugin plugin, ResolvedJavaMethod targetMethod, ValueNode[] args, PluginReplacementNode.ReplacementFunction replacementFunction) {
         throw GraalError.unimplemented();
     }
 
     /**
+     * Replaces an invocation of a given method by inserting a
+     * {@link PluginReplacementWithExceptionNode} that
+     * {@linkplain GraphBuilderContext#shouldDeferPlugin defers} the application of an
+     * {@link InvocationPlugin}.
      *
-     * @param plugin
-     * @param targetMethod
-     * @param args
-     * @param replacementFunction
+     * @param plugin the {@link InvocationPlugin} that is deferred
+     * @param targetMethod the target of the replacement invocation
+     * @param args the arguments to the replacement invocation
+     * @param replacementFunction the replacement function for deferred application of the
+     *            {@code plugin}
      */
     default void replacePluginWithException(GeneratedInvocationPlugin plugin, ResolvedJavaMethod targetMethod, ValueNode[] args,
                     PluginReplacementWithExceptionNode.ReplacementWithExceptionFunction replacementFunction) {

From a9e0bcccd452aa1f61a05b3a89de9448ce834803 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 14 Oct 2021 10:55:23 +0200
Subject: [PATCH 480/681] compiler: document PluginReplacementInterface

---
 .../compiler/nodes/PluginReplacementInterface.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
index 4ec77200478b..78b9a1c0f502 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
@@ -27,6 +27,14 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
+/**
+ * Interface for nodes responsible for {@linkplain GraphBuilderContext#shouldDeferPlugin deferring}
+ * {@linkplain org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin invocation plugin}
+ * application.
+ */
 public interface PluginReplacementInterface extends FixedNodeInterface {
+    /**
+     * Replaces this node by applying the stored plugin.
+     */
     boolean replace(GraphBuilderContext b, GeneratedPluginInjectionProvider injection);
 }

From 94e4d4a28f10cde4e6b3235846b49a5857ced58b Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 14 Oct 2021 11:04:27 +0200
Subject: [PATCH 481/681] compiler: improve javadoc for
 SnippetTemplate#verifyWithExceptionNode

---
 .../graalvm/compiler/replacements/SnippetTemplate.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index c3db6134268f..6b95b1cc30b8 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -1584,7 +1584,13 @@ private void rewireMemoryGraph(ValueNode replacee, UnmodifiableEconomicMap<Node,
      * if it is a memory kill, its {@link WithExceptionNode#next()} and
      * {@link WithExceptionNode#exceptionEdge()} edges should start with a memory kill as well
      * ({@link org.graalvm.compiler.nodes.KillingBeginNode}, {@link ExceptionObjectNode}) or be
-     * {@linkplain UnreachableBeginNode unreachable}.
+     * {@linkplain org.graalvm.compiler.nodes.UnreachableBeginNode unreachable}.
+     *
+     * Knowing that there are no memory usages simplifies the handling of {@link WithExceptionNode}
+     * after {@link FloatingReadPhase} because we can simply ignore the memory graph. If this
+     * changes in the future, we need to rewire the memory graph on the exception edge, just as we
+     * do for the return path of the snippet for replacees other than {@link WithExceptionNode}.
+     * This guarantee ensures that we do not forget that.
      */
     private static void verifyWithExceptionNode(ValueNode node) {
         if (node instanceof WithExceptionNode) {

From bba7af6705439cba605e8419d3a72b5bd29073da Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 14 Oct 2021 11:09:06 +0200
Subject: [PATCH 482/681] compiler: improve javadoc of Node#has*UsagesOfType

---
 .../src/org/graalvm/compiler/graph/Node.java                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index 2c0855746db9..c11b1531a2c9 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -439,7 +439,7 @@ public final boolean hasExactlyOneUsage() {
     }
 
     /**
-     * Checks whether this node has only usages of that type.
+     * Checks whether this node has only usages of a given {@link InputType}.
      *
      * @param type the type of usages to look for
      */
@@ -457,7 +457,7 @@ public final boolean hasOnlyUsagesOfType(InputType type) {
     }
 
     /**
-     * Checks whether this node has usages of that type.
+     * Checks whether this node has usages of a given {@link InputType}.
      *
      * @param type the type of usages to look for
      */

From 98249172ba586a8ff174cc2c82099c51863671ca Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 14 Oct 2021 11:29:28 +0200
Subject: [PATCH 483/681] fix debugger not displaying frame variables as
 strings when the debugger does not request the specific STRING tag for the
 variables

---
 .../src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index c51f0ee87f58..6a4020703150 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -3067,7 +3067,12 @@ private static Object readValue(PacketStream input, JDWPContext context) {
 
     public static void writeValue(byte tag, Object value, PacketStream reply, boolean tagged, JDWPContext context) {
         if (tagged) {
-            reply.writeByte(tag);
+            if (tag == TagConstants.OBJECT) {
+                // get specific tag type for things like strings and classloaders etc.
+                reply.writeByte(context.getTag(value));
+            } else {
+                reply.writeByte(tag);
+            }
         }
         switch (tag) {
             case BOOLEAN:

From 3033eaf3c3d7617ee33d521b23da7b2ecf637042 Mon Sep 17 00:00:00 2001
From: Allan Gregersen <allan.gregersen@oracle.com>
Date: Thu, 14 Oct 2021 13:08:16 +0200
Subject: [PATCH 484/681] let callsite handle tag conversion for object type
 tags

---
 .../truffle/espresso/jdwp/impl/JDWP.java      | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
index 6a4020703150..5218f9db540c 100644
--- a/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
+++ b/espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java
@@ -22,9 +22,6 @@
  */
 package com.oracle.truffle.espresso.jdwp.impl;
 
-import static com.oracle.truffle.espresso.jdwp.api.TagConstants.BOOLEAN;
-import static com.oracle.truffle.espresso.jdwp.api.TagConstants.VOID;
-
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -2641,7 +2638,7 @@ static CommandResult createReply(Packet packet, JDWPContext context) {
             private static void setArrayValues(JDWPContext context, PacketStream input, int index, int values, Object array, byte tag) {
                 for (int i = index; i < index + values; i++) {
                     switch (tag) {
-                        case BOOLEAN:
+                        case TagConstants.BOOLEAN:
                             boolean bool = input.readBoolean();
                             byte[] boolArray = context.getUnboxedArray(array);
                             boolArray[i] = bool ? (byte) 1 : (byte) 0;
@@ -2776,6 +2773,9 @@ static CommandResult createReply(Packet packet, JDWPContext context) {
                         }
 
                         byte sigbyte = input.readByte();
+                        if (sigbyte == TagConstants.OBJECT) {
+                            sigbyte = context.getTag(value);
+                        }
 
                         writeValue(sigbyte, value, reply, true, context);
                     }
@@ -3034,9 +3034,9 @@ private static Object readValue(byte valueKind, PacketStream input, JDWPContext
     private static Object readValue(PacketStream input, JDWPContext context) {
         byte valueKind = input.readByte();
         switch (valueKind) {
-            case VOID:
+            case TagConstants.VOID:
                 return Void.TYPE;
-            case BOOLEAN:
+            case TagConstants.BOOLEAN:
                 return input.readBoolean();
             case TagConstants.BYTE:
                 return input.readByte();
@@ -3067,15 +3067,10 @@ private static Object readValue(PacketStream input, JDWPContext context) {
 
     public static void writeValue(byte tag, Object value, PacketStream reply, boolean tagged, JDWPContext context) {
         if (tagged) {
-            if (tag == TagConstants.OBJECT) {
-                // get specific tag type for things like strings and classloaders etc.
-                reply.writeByte(context.getTag(value));
-            } else {
-                reply.writeByte(tag);
-            }
+            reply.writeByte(tag);
         }
         switch (tag) {
-            case BOOLEAN:
+            case TagConstants.BOOLEAN:
                 if (value.getClass() == Long.class) {
                     long unboxed = (long) value;
                     reply.writeBoolean(unboxed > 0 ? true : false);

From e5fe19b5143862fd62ab0e1a0cbe31960b447879 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 14 Oct 2021 13:09:33 +0200
Subject: [PATCH 485/681] Link libsulong to stdlib if on Darwin

---
 .../com.oracle.truffle.llvm.libraries.bitcode/CMakeLists.txt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/CMakeLists.txt b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/CMakeLists.txt
index 418bd5d509c4..dab618129eb3 100644
--- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/CMakeLists.txt
+++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/CMakeLists.txt
@@ -101,7 +101,9 @@ else()
 endif()
 
 target_include_directories(sulong PRIVATE ${GRAALVM_LLVM_INCLUDE_DIR})
-target_link_options(sulong PRIVATE -nostdlib)
+if(NOT MX_OS STREQUAL "darwin")
+    target_link_options(sulong PRIVATE -nostdlib)
+endif()
 install(TARGETS sulong DESTINATION bin)
 
 if(NOT WIN32)

From 8cec100616d0101352df2aea2f6dba01bc046ad1 Mon Sep 17 00:00:00 2001
From: Brandon Fish <brandon.j.fish@oracle.com>
Date: Fri, 8 Oct 2021 13:07:17 -0500
Subject: [PATCH 486/681] Update truffleruby import in vm

---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 0d8060ac5c01..4b38cb8f6dfa 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -57,7 +57,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "bbd2a3362f8e84b9bcda5eda6cd3ad36f15d1966",
+                "version": "b5454b64b6aa113ef2c091f50a4e1211e5ecdcea",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

From c0f35240b0b4e4b6bca570f2c21b7261ff674125 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Sun, 10 Oct 2021 21:31:51 -0700
Subject: [PATCH 487/681] c1visualizer launcher requires JDK 8

---
 compiler/mx.compiler/mx_graal_tools.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
index 7fc38543e848..3dd5c7bd7b27 100644
--- a/compiler/mx.compiler/mx_graal_tools.py
+++ b/compiler/mx.compiler/mx_graal_tools.py
@@ -73,9 +73,9 @@ def run_netbeans_app(app_name, env=None, args=None):
 def netbeans_jdk(appName):
     v8u20 = mx.VersionSpec("1.8.0_20")
     v8u40 = mx.VersionSpec("1.8.0_40")
-    def _igvJdkVersionCheck(version):
-        return version < v8u20 or version >= v8u40
-    return mx.get_jdk(_igvJdkVersionCheck, versionDescription='(< 1.8.0u20 or >= 1.8.0u40)', purpose="running " + appName).home
+    def _c1vJdkVersionCheck(version):
+        return version >= v8u40 and str(version).startswith('1.8.0')
+    return mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running " + appName).home
 
 def igv(args):
     """(obsolete) informs about IGV"""
@@ -165,7 +165,7 @@ def hsdis(args, copyToDir=None):
             except IOError as e:
                 mx.warn('Could not copy {} to {}: {}'.format(path, dest, str(e)))
 
-def hcfdis(args):
+def hcfdis(args, library='HCFDIS'):
     """disassemble HexCodeFiles embedded in text files
 
     Run a tool over the input files to convert all embedded HexCodeFiles
@@ -177,7 +177,7 @@ def hcfdis(args):
 
     args = parser.parse_args(args)
 
-    path = mx.library('HCFDIS').get_path(resolve=True)
+    path = mx.library(library).get_path(resolve=True)
     mx.run_java(['-cp', path, 'com.oracle.max.hcfdis.HexCodeFileDis'] + args.files)
 
     if args.map is not None:

From 1bcf79613becfc607992ef59776d6a45e76cc4aa Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Thu, 14 Oct 2021 11:11:46 -0700
Subject: [PATCH 488/681] Fix SubstrateGraphBuilderPlugins.extractClassArray().

Ignore stores to a different array.
---
 .../SubstrateGraphBuilderPlugins.java         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
index 7653a2be1f22..40fac0f35a43 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
@@ -378,20 +378,21 @@ static Class<?>[] extractClassArray(AnnotationSubstitutionProcessor annotationSu
             }
             while (successor instanceof StoreIndexedNode) {
                 StoreIndexedNode store = (StoreIndexedNode) successor;
-                assert getDeoptProxyOriginalValue(store.array()).equals(newArray);
-                ValueNode valueNode = store.value();
-                if (valueNode.isConstant() && !valueNode.isNullConstant()) {
-                    Class<?> clazz = snippetReflection.asObject(Class.class, valueNode.asJavaConstant());
-                    /*
-                     * It is possible that the returned class is a substitution class, e.g.,
-                     * DynamicHub returned for a Class.class constant. Get the target class of the
-                     * substitution class.
-                     */
-                    classList.add(annotationSubstitutions == null ? clazz : annotationSubstitutions.getTargetClass(clazz));
-                } else {
-                    /* If not all classes are non-null constants we bail out. */
-                    classList = null;
-                    break;
+                if (getDeoptProxyOriginalValue(store.array()).equals(newArray)) {
+                    ValueNode valueNode = store.value();
+                    if (valueNode.isConstant() && !valueNode.isNullConstant()) {
+                        Class<?> clazz = snippetReflection.asObject(Class.class, valueNode.asJavaConstant());
+                        /*
+                         * It is possible that the returned class is a substitution class, e.g.,
+                         * DynamicHub returned for a Class.class constant. Get the target class of
+                         * the substitution class.
+                         */
+                        classList.add(annotationSubstitutions == null ? clazz : annotationSubstitutions.getTargetClass(clazz));
+                    } else {
+                        /* If not all classes are non-null constants we bail out. */
+                        classList = null;
+                        break;
+                    }
                 }
                 successor = unwrapNode(store.next());
             }

From 3f4eefd51048f46be84aae74d0ba75f76d1b7ded Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 14 Oct 2021 22:03:30 +0200
Subject: [PATCH 489/681] change c1visualizer and hcfdis methods for downstream
 usage

---
 compiler/mx.compiler/mx_graal_tools.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
index 3dd5c7bd7b27..be37f3389d38 100644
--- a/compiler/mx.compiler/mx_graal_tools.py
+++ b/compiler/mx.compiler/mx_graal_tools.py
@@ -71,7 +71,6 @@ def run_netbeans_app(app_name, env=None, args=None):
     mx.run(launch+args, env=env)
 
 def netbeans_jdk(appName):
-    v8u20 = mx.VersionSpec("1.8.0_20")
     v8u40 = mx.VersionSpec("1.8.0_40")
     def _c1vJdkVersionCheck(version):
         return version >= v8u40 and str(version).startswith('1.8.0')
@@ -91,7 +90,7 @@ def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
     env = dict(os.environ)
     env['jdkhome'] = netbeans_jdk("C1 Visualizer")
-    run_netbeans_app('C1Visualizer', env, args)
+    run_netbeans_app('C1Visualizer', env, args() if callable(args) else args)
 
 def hsdis(args, copyToDir=None):
     """download the hsdis library
@@ -165,7 +164,7 @@ def hsdis(args, copyToDir=None):
             except IOError as e:
                 mx.warn('Could not copy {} to {}: {}'.format(path, dest, str(e)))
 
-def hcfdis(args, library='HCFDIS'):
+def hcfdis(args, cp=None):
     """disassemble HexCodeFiles embedded in text files
 
     Run a tool over the input files to convert all embedded HexCodeFiles
@@ -177,7 +176,7 @@ def hcfdis(args, library='HCFDIS'):
 
     args = parser.parse_args(args)
 
-    path = mx.library(library).get_path(resolve=True)
+    path = cp or mx.library('HCFDIS').get_path(resolve=True)
     mx.run_java(['-cp', path, 'com.oracle.max.hcfdis.HexCodeFileDis'] + args.files)
 
     if args.map is not None:

From 8ca4d20dd038aba47eacdbb32291e7349b8ffc13 Mon Sep 17 00:00:00 2001
From: Andrew Craik <andrew.craik@oracle.com>
Date: Wed, 13 Oct 2021 12:42:37 +1000
Subject: [PATCH 490/681] Always validate loop fragments as acyclic.

This change converts an assert in LoopFragment into a guarantee since
the check is very cheap and a cyclic graph will not be compiled
correctly - failing early with a good error is preferred.
---
 .../compiler/nodes/loop/LoopFragment.java     | 59 +++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragment.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragment.java
index 99988f4b7a1b..ef350b98ed63 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragment.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/LoopFragment.java
@@ -31,6 +31,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Graph;
 import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
 import org.graalvm.compiler.graph.Node;
@@ -248,7 +249,7 @@ protected static void computeNodes(NodeBitMap nodes, Graph graph, LoopEx loop, I
         }
 
         final NodeBitMap nonLoopNodes = graph.createNodeBitMap();
-        Deque<WorkListEntry> worklist = new ArrayDeque<>();
+        WorkQueue worklist = new WorkQueue(graph);
         for (AbstractBeginNode b : blocks) {
             if (b.isDeleted()) {
                 continue;
@@ -307,6 +308,56 @@ public int hashCode() {
         }
     }
 
+    static class WorkQueue implements Iterable<WorkListEntry> {
+        Deque<WorkListEntry> worklist;
+        NodeBitMap contents;
+
+        WorkQueue(Graph graph) {
+            worklist = new ArrayDeque<>();
+            contents = new NodeBitMap(graph);
+        }
+
+        public void addFirst(WorkListEntry e) {
+            worklist.addFirst(e);
+            GraalError.guarantee(!contents.isMarked(e.n), "Trying to addFirst an entry that is already in the work queue!");
+            contents.mark(e.n);
+        }
+
+        public void push(WorkListEntry e) {
+            worklist.push(e);
+            GraalError.guarantee(!contents.isMarked(e.n), "Trying to push an entry that is already in the work queue!");
+            contents.mark(e.n);
+        }
+
+        public WorkListEntry peek() {
+            return worklist.peek();
+        }
+
+        public WorkListEntry pop() {
+            WorkListEntry e = worklist.pop();
+            contents.clear(e.n);
+            return e;
+        }
+
+        public boolean isEmpty() {
+            return worklist.isEmpty();
+        }
+
+        public boolean contains(WorkListEntry e) {
+            return contents.contains(e.n);
+        }
+
+        public void clear() {
+            worklist.clear();
+            contents.clearAll();
+        }
+
+        @Override
+        public Iterator<WorkListEntry> iterator() {
+            return worklist.iterator();
+        }
+    }
+
     static TriState isLoopNode(Node n, NodeBitMap loopNodes, NodeBitMap nonLoopNodes) {
         if (loopNodes.isMarked(n)) {
             return TriState.TRUE;
@@ -321,13 +372,13 @@ static TriState isLoopNode(Node n, NodeBitMap loopNodes, NodeBitMap nonLoopNodes
         return TriState.UNKNOWN;
     }
 
-    private static void pushWorkList(Deque<WorkListEntry> workList, Node node, NodeBitMap loopNodes) {
+    private static void pushWorkList(WorkQueue workList, Node node, NodeBitMap loopNodes) {
         WorkListEntry entry = new WorkListEntry(node, loopNodes);
-        assert !workList.contains(entry) : "node " + node + " added to worklist twice";
+        GraalError.guarantee(!workList.contains(entry), "node %s added to worklist twice", node);
         workList.push(entry);
     }
 
-    private static void markFloating(Deque<WorkListEntry> workList, LoopEx loop, Node start, NodeBitMap loopNodes, NodeBitMap nonLoopNodes) {
+    private static void markFloating(WorkQueue workList, LoopEx loop, Node start, NodeBitMap loopNodes, NodeBitMap nonLoopNodes) {
         if (isLoopNode(start, loopNodes, nonLoopNodes).isKnown()) {
             return;
         }

From f012ece17e8ad33f9236de0882fe581e4a25db8f Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Fri, 8 Oct 2021 16:46:53 +0200
Subject: [PATCH 491/681] resort to loop frequencies computed based on loop
 exit frequencies and not loop end ones (this effectively assumes a deopt is
 never contributing to a loop frequency because a deopt from compiled code
 never results in a loop exit node being executed)

---
 .../compiler/nodes/cfg/ControlFlowGraph.java  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index bc751a9c5e68..b24ec6bfa5f7 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -685,16 +685,9 @@ private void finishLocalLoopFrequency(LoopBeginNode lb) {
             Block lexBlock = blockFor(lex);
             assert lexBlock != null;
             final double lexFrequency = lexBlock.getRelativeFrequency();
-            final double localLoopFrequency = localLoopFrequencyData.get(lb).getLoopFrequency();
-            /*
-             * While the local loop frequency is calculated without the predecessor frequency, the
-             * exit frequency needs to be adjusted already to compute any outer loop local
-             * frequencies correctly.
-             */
             final double loopPredFrequency = blockFor(lb.forwardEnd()).relativeFrequency;
-            final double virginExitFrequency = multiplyRelativeFrequencies(lexFrequency, localLoopFrequency, loopPredFrequency);
-            // exit path, we set the exit probability
-            lexBlock.setRelativeFrequency(virginExitFrequency);
+            final double loopExitFrequencyScaled = multiplyRelativeFrequencies(lexFrequency, loopPredFrequency);
+            lexBlock.setRelativeFrequency(loopExitFrequencyScaled);
         }
     }
 
@@ -709,29 +702,36 @@ private void computeLocalLoopFrequencies() {
     private double calculateLocalLoopFrequency(LoopBeginNode lb) {
         Block header = blockFor(lb);
         assert header != null;
-        double loopEndFrequency = 0D;
+        /*
+         * Ideally we would like to take the loop end frequency sum here because it respects control
+         * flow sinks (unwinds and deopts) inside the loop. However, semantically, if we ever exit a
+         * loop in compiled code it means we did not do so by an unwind or deopt but a loop exit,
+         * thus we ignore the end (and sink) frequencies and compute loop frequency purely based on
+         * the exit frequencies.
+         */
+        double loopExitFrequencySum = 0D;
         ProfileSource source = ProfileSource.UNKNOWN;
-        for (LoopEndNode len : lb.loopEnds()) {
-            Block endBlock = blockFor(len);
-            assert endBlock != null;
-            assert endBlock.relativeFrequency >= 0D;
-            loopEndFrequency += endBlock.relativeFrequency;
-            source = source.combine(endBlock.frequencySource);
+
+        for (LoopExitNode lex : lb.loopExits()) {
+            Block lexBlock = blockFor(lex);
+            assert lexBlock != null;
+            assert lexBlock.relativeFrequency >= 0D;
+            loopExitFrequencySum += lexBlock.relativeFrequency;
+            source = source.combine(lexBlock.frequencySource);
         }
 
-        loopEndFrequency = Math.min(1, loopEndFrequency);
-        loopEndFrequency = Math.max(ControlFlowGraph.MIN_RELATIVE_FREQUENCY, loopEndFrequency);
+        loopExitFrequencySum = Math.min(1, loopExitFrequencySum);
+        loopExitFrequencySum = Math.max(ControlFlowGraph.MIN_RELATIVE_FREQUENCY, loopExitFrequencySum);
 
         double loopFrequency = -1;
-        if (loopEndFrequency == 1D) {
-            // endless loop, loop with exit and deopt unconditionally after the exit
+        if (loopExitFrequencySum == 0D) {
+            // loop without loop exit nodes (deopt or throw exited)
             loopFrequency = MAX_RELATIVE_FREQUENCY;
         } else {
-            double exitFrequency = 1D - loopEndFrequency;
-            loopFrequency = 1D / exitFrequency;
+            loopFrequency = 1D / loopExitFrequencySum;
 
-            assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " endFrequency=" + loopEndFrequency;
-            assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " endFrequency=" + loopEndFrequency;
+            assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
+            assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
         }
         localLoopFrequencyData.put(lb, LoopFrequencyData.create(loopFrequency, source));
         return loopFrequency;

From 1d2fd73b0f19ce09388147b8294048e64c5fbebc Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Tue, 12 Oct 2021 11:40:34 +0200
Subject: [PATCH 492/681] cfg: weigh loop exit frequencies properly and add
 debug capabilites for end vs exit frequencies to the CFG

---
 .../compiler/nodes/cfg/ControlFlowGraph.java  | 122 +++++++++++++++++-
 1 file changed, 118 insertions(+), 4 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index b24ec6bfa5f7..a003542748ab 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -25,6 +25,7 @@
 package org.graalvm.compiler.nodes.cfg;
 
 import static org.graalvm.compiler.core.common.cfg.AbstractBlockBase.BLOCK_ID_COMPARATOR;
+import static org.graalvm.compiler.options.OptionType.Expert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -43,6 +44,7 @@
 import org.graalvm.compiler.graph.NodeMap;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
+import org.graalvm.compiler.nodes.ControlSinkNode;
 import org.graalvm.compiler.nodes.ControlSplitNode;
 import org.graalvm.compiler.nodes.DeoptimizeNode;
 import org.graalvm.compiler.nodes.FixedNode;
@@ -54,8 +56,22 @@
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
 
 public final class ControlFlowGraph implements AbstractControlFlowGraph<Block> {
+
+    public static class CFGOptions {
+        //@formatter:off
+        @Option(help = "Debug flag to dump loop frequency differences computed based on loop end or exit nodes."
+                        + "If the frequencies diverge a lot, this may indicate missing profiles on control flow"
+                        + "inside the loop body.", type = Expert)
+        public static final OptionKey<Boolean> ForceDumpEndVsExitLoopFrequencies = new OptionKey<>(false);
+        @Option(help = "Scaling factor of frequency difference computed based on loop ends or exits", type = Expert)
+        public static final OptionKey<Double> LoopExitVsLoopEndFrequencyDiff = new OptionKey<>(1000D);
+        //@formatter:on
+    }
+
     /**
      * Don't allow relative frequency values to be become too small or too high as this makes
      * frequency calculations over- or underflow the range of a double. This commonly happens with
@@ -89,12 +105,20 @@ public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlo
 
         cfg.identifyBlocks();
 
+        boolean loopInfoComputed = false;
+        if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(graph.getOptions())) {
+            // additional loop info for sink frequencies inside the loop body
+            cfg.computeLoopInformation();
+            cfg.computeDominators();
+            loopInfoComputed = true;
+        }
+
         cfg.computeFrequencies();
 
-        if (computeLoops) {
+        if (computeLoops && !loopInfoComputed) {
             cfg.computeLoopInformation();
         }
-        if (computeDominators) {
+        if (computeDominators && !loopInfoComputed) {
             cfg.computeDominators();
             assert cfg.verifyRPOInnerLoopsFirst();
         }
@@ -681,13 +705,22 @@ private void identifyBlock(Block block) {
 
     private void finishLocalLoopFrequency(LoopBeginNode lb) {
         calculateLocalLoopFrequency(lb);
+
+        double sumAllLexFrequency = 0;
+        for (LoopExitNode lex : lb.loopExits()) {
+            sumAllLexFrequency += blockFor(lex).relativeFrequency;
+        }
+
         for (LoopExitNode lex : lb.loopExits()) {
             Block lexBlock = blockFor(lex);
             assert lexBlock != null;
             final double lexFrequency = lexBlock.getRelativeFrequency();
+            final double scaleLexFrequency = lexFrequency / sumAllLexFrequency;
             final double loopPredFrequency = blockFor(lb.forwardEnd()).relativeFrequency;
-            final double loopExitFrequencyScaled = multiplyRelativeFrequencies(lexFrequency, loopPredFrequency);
-            lexBlock.setRelativeFrequency(loopExitFrequencyScaled);
+            final double exitFrequency = multiplyRelativeFrequencies(scaleLexFrequency, loopPredFrequency);
+            // exit path, we set the exit probability
+            lexBlock.setRelativeFrequency(exitFrequency);
+            GraalError.guarantee(blockFor(lex).relativeFrequency <= loopPredFrequency, "Lex frequency %f must be below pred frequency %f", loopPredFrequency, exitFrequency);
         }
     }
 
@@ -730,6 +763,86 @@ private double calculateLocalLoopFrequency(LoopBeginNode lb) {
         } else {
             loopFrequency = 1D / loopExitFrequencySum;
 
+            if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(lb.getOptions())) {
+
+                // verify integrity of the CFG so far
+
+                outer: for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                    for (Block succ : loopBlock.getSuccessors()) {
+                        if (isDominatorTreeLoopExit(succ)) {
+                            // loop exit successor frequency is weighted differently
+                            continue outer;
+                        }
+                        if (succ.isLoopHeader()) {
+                            // header frequency is set to 1 artificially to compute local
+                            // frequencies
+                            continue outer;
+                        }
+                    }
+                    if (loopBlock.isLoopHeader()) {
+                        // loop exit successor frequency is weighted differently
+                        continue;
+                    }
+                    final double selfFrequency = loopBlock.relativeFrequency;
+                    double succFrequency = 0D;
+                    for (Block succ : loopBlock.getSuccessors()) {
+                        succFrequency += succ.relativeFrequency;
+                    }
+                    if (loopBlock.getSuccessorCount() == 0) {
+                        GraalError.guarantee(loopBlock.getEndNode() instanceof ControlSinkNode, "Must sink if there is no successor");
+                        // frequency "lost"
+                        continue;
+                    }
+                    String message = String.format("Successors must add up for block %s with begin %s, selfF=%f succF=%f", loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency);
+                    GraalError.guarantee(succFrequency >= selfFrequency - 0.01D, message);
+                }
+
+                double loopEndFrequencySum = 0D;
+                for (LoopEndNode len : lb.loopEnds()) {
+                    Block lenBlock = blockFor(len);
+                    loopEndFrequencySum += lenBlock.relativeFrequency;
+                }
+                final double endBasedFrequency = 1 / (1 - loopEndFrequencySum);
+                /*
+                 * For loops without loop exit nodes we may only have deopt loop exit paths, they
+                 * are however not part of the loop data structure of a Loop<HIR>, thus it might be
+                 * that the reverse post order did not yet visit all sinks
+                 */
+                @SuppressWarnings("unused") // use for debugging only
+                boolean sinkingImplicitExitsFullyVisited = true;
+                double loopSinkFrequencySum = 0D;
+                for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                    FixedNode blockEndNode = loopBlock.getEndNode();
+                    if (blockEndNode instanceof ControlSinkNode) {
+                        double sinkBlockFrequency = blockFor(blockEndNode).relativeFrequency;
+                        loopSinkFrequencySum += sinkBlockFrequency;
+                        if (sinkBlockFrequency == -1D) {
+                            sinkingImplicitExitsFullyVisited = false;
+                        }
+                    }
+                }
+                for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                    if (loopBlock.isLoopHeader() && loopBlock.getBeginNode() != lb) {
+                        LoopBeginNode otherLoop = (LoopBeginNode) loopBlock.getBeginNode();
+                        double otherLoopExitFrequencySum = 0D;
+                        for (LoopExitNode lex : otherLoop.loopExits()) {
+                            otherLoopExitFrequencySum += blockFor(lex).relativeFrequency;
+                        }
+                        // forward end
+                        final double predFrequency = loopBlock.getFirstPredecessor().relativeFrequency;
+                        GraalError.guarantee(Math.abs(predFrequency - otherLoopExitFrequencySum) <= 0.01D, "Frequencies diverge too much");
+                    }
+                }
+
+                if (Math.abs(endBasedFrequency - loopFrequency) > CFGOptions.LoopExitVsLoopEndFrequencyDiff.getValue(lb.getOptions())) {
+                    String message = String.format("Frequency divergence for loop %s,exitBasedFrequency=%.4f endBasedFrequency=%.4f, exitFSum=%.2f / endFSum=%.2f/ sinkSum=%.2f [allSum=%f]", lb,
+                                    loopFrequency, endBasedFrequency, loopExitFrequencySum, loopEndFrequencySum,
+                                    loopSinkFrequencySum,
+                                    (loopExitFrequencySum + loopEndFrequencySum + loopSinkFrequencySum));
+                    graph.getDebug().forceDump(graph, message);
+                }
+
+            }
             assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
             assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
         }
@@ -794,6 +907,7 @@ private void perBasicBlockFrequencyAction(Block b, boolean computingLocalLoopFre
         } else if (relativeFrequency > MAX_RELATIVE_FREQUENCY) {
             relativeFrequency = MAX_RELATIVE_FREQUENCY;
         }
+
         b.setRelativeFrequency(relativeFrequency);
         if (computingLocalLoopFrequencies) {
             b.setFrequencySource(source);

From 5a6cb2661af809817af671d38d27a7c48209aa4a Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 13 Oct 2021 10:27:24 +0200
Subject: [PATCH 493/681] cfg:add dumping options to dump loop end vs loop exit
 derived frequenies

---
 .../phases/ConvertDeoptimizeToGuardPhase.java |   5 +
 .../compiler/nodes/StructuredGraph.java       |   1 +
 .../compiler/nodes/cfg/ControlFlowGraph.java  | 108 ++++++++++--------
 3 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
index ead822210245..be62206c5710 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -110,6 +110,11 @@ protected void run(final StructuredGraph graph, final CoreProviders context) {
         }
 
         new DeadCodeEliminationPhase(Optional).apply(graph);
+
+        if (!graph.isAfterStage(StageFlag.DEOPT_TO_GUARD)) {
+            // ran multiple times, we just wanna set it the first time
+            graph.setAfterStage(StageFlag.DEOPT_TO_GUARD);
+        }
     }
 
     private static void trySplitFixedGuard(FixedGuardNode fixedGuard, CoreProviders context, LazyValue<LoopsData> lazyLoops) {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 4e0905ba1a90..54b0d0bbfb0e 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -157,6 +157,7 @@ public static AllowAssumptions ifNonNull(Assumptions assumptions) {
      * Different stages of the compilation regarding the status of various graph properties.
      */
     public enum StageFlag {
+        DEOPT_TO_GUARD,
         PARTIAL_ESCAPE,
         HIGH_TIER,
         FLOATING_READS,
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index a003542748ab..fe093becfce3 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -54,6 +54,7 @@
 import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
+import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.options.Option;
@@ -705,12 +706,14 @@ private void identifyBlock(Block block) {
 
     private void finishLocalLoopFrequency(LoopBeginNode lb) {
         calculateLocalLoopFrequency(lb);
-
         double sumAllLexFrequency = 0;
+        /*
+         * Take the sum of all exit frequencies and scale each exit with the importance in relation
+         * to the other exits. This factor is multiplied with the real predecessor frequency.
+         */
         for (LoopExitNode lex : lb.loopExits()) {
             sumAllLexFrequency += blockFor(lex).relativeFrequency;
         }
-
         for (LoopExitNode lex : lb.loopExits()) {
             Block lexBlock = blockFor(lex);
             assert lexBlock != null;
@@ -718,7 +721,6 @@ private void finishLocalLoopFrequency(LoopBeginNode lb) {
             final double scaleLexFrequency = lexFrequency / sumAllLexFrequency;
             final double loopPredFrequency = blockFor(lb.forwardEnd()).relativeFrequency;
             final double exitFrequency = multiplyRelativeFrequencies(scaleLexFrequency, loopPredFrequency);
-            // exit path, we set the exit probability
             lexBlock.setRelativeFrequency(exitFrequency);
             GraalError.guarantee(blockFor(lex).relativeFrequency <= loopPredFrequency, "Lex frequency %f must be below pred frequency %f", loopPredFrequency, exitFrequency);
         }
@@ -763,52 +765,17 @@ private double calculateLocalLoopFrequency(LoopBeginNode lb) {
         } else {
             loopFrequency = 1D / loopExitFrequencySum;
 
-            if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(lb.getOptions())) {
-
-                // verify integrity of the CFG so far
-
-                outer: for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
-                    for (Block succ : loopBlock.getSuccessors()) {
-                        if (isDominatorTreeLoopExit(succ)) {
-                            // loop exit successor frequency is weighted differently
-                            continue outer;
-                        }
-                        if (succ.isLoopHeader()) {
-                            // header frequency is set to 1 artificially to compute local
-                            // frequencies
-                            continue outer;
-                        }
-                    }
-                    if (loopBlock.isLoopHeader()) {
-                        // loop exit successor frequency is weighted differently
-                        continue;
-                    }
-                    final double selfFrequency = loopBlock.relativeFrequency;
-                    double succFrequency = 0D;
-                    for (Block succ : loopBlock.getSuccessors()) {
-                        succFrequency += succ.relativeFrequency;
-                    }
-                    if (loopBlock.getSuccessorCount() == 0) {
-                        GraalError.guarantee(loopBlock.getEndNode() instanceof ControlSinkNode, "Must sink if there is no successor");
-                        // frequency "lost"
-                        continue;
-                    }
-                    String message = String.format("Successors must add up for block %s with begin %s, selfF=%f succF=%f", loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency);
-                    GraalError.guarantee(succFrequency >= selfFrequency - 0.01D, message);
-                }
+            /*
+             * Wait until deopt to guard ran to "complain" about frequency mismatches to avoid false
+             * positives for loop optimizations
+             */
+            if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(lb.getOptions()) && lb.graph().isAfterStage(StageFlag.DEOPT_TO_GUARD)) {
 
-                double loopEndFrequencySum = 0D;
-                for (LoopEndNode len : lb.loopEnds()) {
-                    Block lenBlock = blockFor(len);
-                    loopEndFrequencySum += lenBlock.relativeFrequency;
-                }
-                final double endBasedFrequency = 1 / (1 - loopEndFrequencySum);
                 /*
                  * For loops without loop exit nodes we may only have deopt loop exit paths, they
                  * are however not part of the loop data structure of a Loop<HIR>, thus it might be
                  * that the reverse post order did not yet visit all sinks
                  */
-                @SuppressWarnings("unused") // use for debugging only
                 boolean sinkingImplicitExitsFullyVisited = true;
                 double loopSinkFrequencySum = 0D;
                 for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
@@ -816,11 +783,53 @@ private double calculateLocalLoopFrequency(LoopBeginNode lb) {
                     if (blockEndNode instanceof ControlSinkNode) {
                         double sinkBlockFrequency = blockFor(blockEndNode).relativeFrequency;
                         loopSinkFrequencySum += sinkBlockFrequency;
-                        if (sinkBlockFrequency == -1D) {
-                            sinkingImplicitExitsFullyVisited = false;
+                    }
+                    if (blockFor(blockEndNode).relativeFrequency == -1D) {
+                        sinkingImplicitExitsFullyVisited = false;
+                    }
+                }
+                if (sinkingImplicitExitsFullyVisited) {
+                    // verify integrity of the CFG so far
+                    outer: for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                        for (Block succ : loopBlock.getSuccessors()) {
+                            if (isDominatorTreeLoopExit(succ)) {
+                                // loop exit successor frequency is weighted differently
+                                continue outer;
+                            }
+                            if (succ.isLoopHeader()) {
+                                // header frequency is set to 1 artificially to compute local
+                                // frequencies
+                                continue outer;
+                            }
+                        }
+                        if (loopBlock.isLoopHeader()) {
+                            // loop exit successor frequency is weighted differently
+                            continue;
+                        }
+                        final double selfFrequency = loopBlock.relativeFrequency;
+                        double succFrequency = 0D;
+                        for (Block succ : loopBlock.getSuccessors()) {
+                            succFrequency += succ.relativeFrequency;
+                        }
+                        if (loopBlock.getSuccessorCount() == 0) {
+                            GraalError.guarantee(loopBlock.getEndNode() instanceof ControlSinkNode, "Must sink if there is no successor");
+                            // frequency "lost"
+                            continue;
+                        }
+                        String message = String.format("Successors must add up for block %s with begin %s, selfF=%f succF=%f", loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency);
+                        if (succFrequency < selfFrequency - 0.001D/* delta */) {
+                            graph.getDebug().forceDump(graph, message);
+                            throw GraalError.shouldNotReachHere(message);
                         }
                     }
                 }
+                double loopEndFrequencySum = 0D;
+                for (LoopEndNode len : lb.loopEnds()) {
+                    Block lenBlock = blockFor(len);
+                    loopEndFrequencySum += lenBlock.relativeFrequency;
+                }
+                final double endBasedFrequency = 1 / (1 - loopEndFrequencySum);
+                // verify inner loop frequency calculations used sane loop exit frequencies
                 for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
                     if (loopBlock.isLoopHeader() && loopBlock.getBeginNode() != lb) {
                         LoopBeginNode otherLoop = (LoopBeginNode) loopBlock.getBeginNode();
@@ -833,8 +842,13 @@ private double calculateLocalLoopFrequency(LoopBeginNode lb) {
                         GraalError.guarantee(Math.abs(predFrequency - otherLoopExitFrequencySum) <= 0.01D, "Frequencies diverge too much");
                     }
                 }
-
-                if (Math.abs(endBasedFrequency - loopFrequency) > CFGOptions.LoopExitVsLoopEndFrequencyDiff.getValue(lb.getOptions())) {
+                /*
+                 * "Endless" looking loops, i.e., loops without exit nodes (only deopt exits) look
+                 * like inifinite loops if we take an exit frequency of "0", which results in max
+                 * frequency
+                 */
+                final boolean hasLoopExits = lb.loopExits().count() > 0;
+                if (Math.abs(endBasedFrequency - loopFrequency) > CFGOptions.LoopExitVsLoopEndFrequencyDiff.getValue(lb.getOptions()) && hasLoopExits) {
                     String message = String.format("Frequency divergence for loop %s,exitBasedFrequency=%.4f endBasedFrequency=%.4f, exitFSum=%.2f / endFSum=%.2f/ sinkSum=%.2f [allSum=%f]", lb,
                                     loopFrequency, endBasedFrequency, loopExitFrequencySum, loopEndFrequencySum,
                                     loopSinkFrequencySum,

From 2ef8ca7ea49730302785b0fd71be1707b6f22808 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 15 Oct 2021 11:16:05 +0300
Subject: [PATCH 494/681] Fix a merge conflict in docs/tools/profiling.md

---
 docs/tools/profiling.md | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/docs/tools/profiling.md b/docs/tools/profiling.md
index 14d9a3ceaee9..1b07d5bd0528 100644
--- a/docs/tools/profiling.md
+++ b/docs/tools/profiling.md
@@ -86,42 +86,21 @@ algorithm.
       Total Time: Time spent somewhere on the stack.
     ----------------------------------------------------------------------------------------------
     Thread[main,5,main]
-<<<<<<< HEAD
      Name       ||             Total Time    ||              Self Time    || Location
     ----------------------------------------------------------------------------------------------
      accept     ||             2150ms  86.0% ||             2150ms  86.0% || primes.js~13-22:191-419
      next       ||             2470ms  98.8% ||              320ms  12.8% || primes.js~31-37:537-737
      :program   ||             2500ms 100.0% ||               30ms   1.2% || primes.js~1-46:0-982
     ----------------------------------------------------------------------------------------------
-=======
-     Name              |             Total Time    ||              Self Time    || Location
-    ----------------------------------------------------------------------------------------------------
-     accept            |             7330ms  88.8% ||             7330ms  88.8% || primes.js~13-22:191-419
-     :program          |             8250ms 100.0% ||              420ms   5.1% || primes.js~1-46:0-982
-     next              |             7820ms  94.8% ||              250ms   3.0% || primes.js~31-37:537-737
-     DivisibleByFilter |              440ms   5.3% ||              240ms   2.9% || primes.js~7-23:66-421
-     AcceptFilter      |               20ms   0.2% ||               10ms   0.1% || primes.js~1-5:0-63
-     Primes            |               20ms   0.2% ||                0ms   0.0% || primes.js~25-38:424-739
-    ----------------------------------------------------------------------------------------------------
->>>>>>> 7bc06f81a03378c93f5528526281564089dc89d8
     ```
 
     By default the sampler prints an execution time histogram for each JavaScript function.
-<<<<<<< HEAD
-    You can produce a flame graph in SVG format by specifying that with the `--cpusampler.Output=flamegraph` option:
 
+    You can produce a flame graph in SVG format by requesting that with the `--cpusampler.Output=flamegraph` option:
     ```shell
     js primes.js --cpusampler --cpusampler.Output=flamegraph --cpusampler.OutputFile=primes.svg
     ```
-
     It should produce something like this:
-=======
-    You can produce a flame graph in SVG format by doing
-    ```shell
-    js primes.js --cpusampler --cpusampler.Output=flamegraph --cpusampler.OutputFile=primes.svg
-    ```
-    which should produce something like this
->>>>>>> 7bc06f81a03378c93f5528526281564089dc89d8
 
     ![](img/profiler_flamegraph.png)
 
@@ -144,12 +123,7 @@ algorithm.
     ```
     Now use the CPU Tracer to collect execution counts of each statement:
 
-<<<<<<< HEAD
-4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=accept`
-to collect execution counts for all statements in methods ending with `accept`:
-=======
 4. Run `js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=*accept` to collect execution counts for all statements in methods ending with `accept`:
->>>>>>> 7bc06f81a03378c93f5528526281564089dc89d8
     ```shell
     js primes.js --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=accept
     Computed 5000 prime numbers. The last 5 are 48563,48571,48589,48593,48611.

From b22011d80b60ee31b71b912f8961646da6d6b30c Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Fri, 15 Oct 2021 11:50:59 +0200
Subject: [PATCH 495/681] only apply JDK version check when launching
 C1Visualizer

---
 compiler/mx.compiler/mx_graal_tools.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/compiler/mx.compiler/mx_graal_tools.py b/compiler/mx.compiler/mx_graal_tools.py
index be37f3389d38..f4e36ea9955a 100644
--- a/compiler/mx.compiler/mx_graal_tools.py
+++ b/compiler/mx.compiler/mx_graal_tools.py
@@ -70,12 +70,6 @@ def run_netbeans_app(app_name, env=None, args=None):
         launch.append('-J-Dnetbeans.logger.console=false')
     mx.run(launch+args, env=env)
 
-def netbeans_jdk(appName):
-    v8u40 = mx.VersionSpec("1.8.0_40")
-    def _c1vJdkVersionCheck(version):
-        return version >= v8u40 and str(version).startswith('1.8.0')
-    return mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running " + appName).home
-
 def igv(args):
     """(obsolete) informs about IGV"""
     mx.warn(
@@ -88,8 +82,11 @@ def igv(args):
 
 def c1visualizer(args):
     """run the C1 Compiler Visualizer"""
+    v8u40 = mx.VersionSpec("1.8.0_40")
+    def _c1vJdkVersionCheck(version):
+        return version >= v8u40 and str(version).startswith('1.8.0')
     env = dict(os.environ)
-    env['jdkhome'] = netbeans_jdk("C1 Visualizer")
+    env['jdkhome'] = mx.get_jdk(_c1vJdkVersionCheck, versionDescription='(1.8 JDK that is >= 1.8.0u40 )', purpose="running C1 Visualizer").home
     run_netbeans_app('C1Visualizer', env, args() if callable(args) else args)
 
 def hsdis(args, copyToDir=None):

From d9e24688c089d89cbf05ff38ac4b2503b5b79dd8 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Fri, 15 Oct 2021 13:15:37 +0300
Subject: [PATCH 496/681] Follow Gilles D. comments

---
 docs/getting-started/graalvm-community/linux-aarch64.md         | 1 -
 .../graalvm-enterprise/installation-linux-aarch64.md            | 1 -
 docs/reference-manual/polyglot-programming.md                   | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/getting-started/graalvm-community/linux-aarch64.md b/docs/getting-started/graalvm-community/linux-aarch64.md
index ccfd9e44186b..21a1123332a6 100644
--- a/docs/getting-started/graalvm-community/linux-aarch64.md
+++ b/docs/getting-started/graalvm-community/linux-aarch64.md
@@ -10,7 +10,6 @@ permalink: /docs/getting-started/linux-aarch64/
 As of version 21.0, we provide GraalVM Community Edition for Linux on ARM 64-bit system, based on OpenJDK 11 and OpenJDK 17 for AArch64 architecture.
 This distribution can be installed on Linux systems for AArch64 CPU architecture.
 
-<!-- Note: The base GraalVM Community distribution including all components is **experimental** on Linux ARM 64-bit systems. -->
 You can install the GraalVM distribution for Linux ARM64 systems from an archive file (_.tar.gz_).
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
diff --git a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
index 26f0978d7a76..9e21e0b69611 100644
--- a/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
+++ b/docs/getting-started/graalvm-enterprise/installation-linux-aarch64.md
@@ -8,7 +8,6 @@ permalink: /getting-started/installation-linux-aarch64/
 As of version 21.0, Oracle provides GraalVM Enterprise distributions based on Oracle JDK11 and Oracle JDK17 for AArch64 architecture.
 
This distribution can be installed on Oracle Linux and Red Hat Enterprise Linux(RHEL) systems for AArch64 CPU architecture.
 
-<!-- Note: The core GraalVM Enterprise distribution including all components is **experimental** on Linux ARM 64-bit systems. -->
 You can install the GraalVM distribution for Linux ARM64 systems from an archive file (_.tar.gz_).
 This allows you to install GraalVM for the current user into any location, without affecting other JDK installations.
 
diff --git a/docs/reference-manual/polyglot-programming.md b/docs/reference-manual/polyglot-programming.md
index c0a21c2383ec..1d4bb3455a75 100644
--- a/docs/reference-manual/polyglot-programming.md
+++ b/docs/reference-manual/polyglot-programming.md
@@ -233,7 +233,7 @@ You can configure a language engine for better throughput or startup.
 ## Passing Options for Language Launchers
 
 Every language launcher has been extended with a set of so called _polyglot options_.
-Polyglot options allow users of any language launcher to access theoptions of other languages supported by GraalVM (implemented with the Truffle language implementation framework).
+Polyglot options allow users of any language launcher to access the options of other languages supported by GraalVM (implemented with the Truffle language implementation framework).
 The format is: `--<languageID>.<property>=<value>`.
 For example, the `R` launcher also supports the `--js.atomics=true` JavaScript option.
 

From 70b6c9f7404585227484da50c96f8523638ff6de Mon Sep 17 00:00:00 2001
From: Katja Goltsova <katja.goltsova@oracle.com>
Date: Fri, 15 Oct 2021 12:29:19 +0200
Subject: [PATCH 497/681] Refactor handleRemovedMethod by only taking
 receiver's klass

---
 .../espresso/nodes/bytecodes/InvokeInterface.java        | 2 +-
 .../truffle/espresso/nodes/bytecodes/InvokeSpecial.java  | 2 +-
 .../truffle/espresso/nodes/bytecodes/InvokeStatic.java   | 2 +-
 .../truffle/espresso/nodes/bytecodes/InvokeVirtual.java  | 2 +-
 .../espresso/nodes/interop/InvokeEspressoNode.java       | 2 +-
 .../espresso/nodes/methodhandle/MHLinkToNode.java        | 2 +-
 .../truffle/espresso/redefinition/ClassRedefinition.java | 9 ++++++---
 .../Target_sun_reflect_NativeMethodAccessorImpl.java     | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
index 4c1129951d7e..db1cd7bf015d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
@@ -125,7 +125,7 @@ static Method.MethodVersion methodLookup(Method resolutionSeed, StaticObject rec
              * Accept a slow path once the method has been removed put method behind a boundary to
              * avoid a deopt loop
              */
-            return ClassRedefinition.handleRemovedMethod(resolutionSeed, receiver.getKlass(), receiver).getMethodVersion();
+            return ClassRedefinition.handleRemovedMethod(resolutionSeed, receiver.getKlass()).getMethodVersion();
         }
 
         int iTableIndex = resolutionSeed.getITableIndex();
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
index 212e29c84733..9063ece5b3d4 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
@@ -74,7 +74,7 @@ static Method.MethodVersion methodLookup(Method method, StaticObject receiver) {
              * Accept a slow path once the method has been removed put method behind a boundary to
              * avoid a deopt loop.
              */
-            return ClassRedefinition.handleRemovedMethod(method, receiver.getKlass(), receiver).getMethodVersion();
+            return ClassRedefinition.handleRemovedMethod(method, receiver.getKlass()).getMethodVersion();
         }
         return method.getMethodVersion();
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
index 7ff6fa79257f..8777af830f12 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
@@ -104,7 +104,7 @@ static Method.MethodVersion methodLookup(Method staticMethod) {
              * Accept a slow path once the method has been removed put method behind a boundary to
              * avoid a deopt loop.
              */
-            return ClassRedefinition.handleRemovedMethod(staticMethod, staticMethod.getDeclaringKlass(), null).getMethodVersion();
+            return ClassRedefinition.handleRemovedMethod(staticMethod, staticMethod.getDeclaringKlass()).getMethodVersion();
         }
         return staticMethod.getMethodVersion();
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
index 508d74fea763..cf864a902c1f 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
@@ -162,7 +162,7 @@ static Method.MethodVersion methodLookup(Method resolutionSeed, StaticObject rec
              * Accept a slow path once the method has been removed put method behind a boundary to
              * avoid a deopt loop.
              */
-            return ClassRedefinition.handleRemovedMethod(resolutionSeed, receiver.getKlass(), receiver).getMethodVersion();
+            return ClassRedefinition.handleRemovedMethod(resolutionSeed, receiver.getKlass()).getMethodVersion();
         }
         /*
          * Surprisingly, INVOKEVIRTUAL can try to invoke interface methods, even non-default ones.
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/InvokeEspressoNode.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/InvokeEspressoNode.java
index 3cd008142326..8d7f0bbb86a7 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/InvokeEspressoNode.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/InvokeEspressoNode.java
@@ -47,7 +47,7 @@ public abstract class InvokeEspressoNode extends Node {
     public final Object execute(Method method, Object receiver, Object[] arguments) throws ArityException, UnsupportedTypeException {
         Method resolutionSeed = method;
         if (resolutionSeed.isRemovedByRedefition()) {
-            resolutionSeed = ClassRedefinition.handleRemovedMethod(method, method.isStatic() ? method.getDeclaringKlass() : ((StaticObject) receiver).getKlass(), (StaticObject) receiver);
+            resolutionSeed = ClassRedefinition.handleRemovedMethod(method, method.isStatic() ? method.getDeclaringKlass() : ((StaticObject) receiver).getKlass());
         }
         Object result = executeMethod(resolutionSeed.getMethodVersion(), receiver, arguments);
         /*
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/methodhandle/MHLinkToNode.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/methodhandle/MHLinkToNode.java
index 84cf7c747181..a8b2e3afc941 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/methodhandle/MHLinkToNode.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/methodhandle/MHLinkToNode.java
@@ -83,7 +83,7 @@ public Object call(Object[] args) {
         // method might have been redefined or removed by redefinition
         if (resolutionSeed.isRemovedByRedefition()) {
             Klass receiverKlass = hasReceiver ? ((StaticObject) basicArgs[0]).getKlass() : resolutionSeed.getDeclaringKlass();
-            resolutionSeed = ClassRedefinition.handleRemovedMethod(resolutionSeed, receiverKlass, hasReceiver ? ((StaticObject) basicArgs[0]) : null);
+            resolutionSeed = ClassRedefinition.handleRemovedMethod(resolutionSeed, receiverKlass);
         }
 
         Method target = linker.linkTo(resolutionSeed, args);
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java
index e782be2555ab..02866d682172 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java
@@ -594,12 +594,15 @@ private void doRedefineClass(ChangePacket packet, List<ObjectKlass> refreshSubCl
         }
     }
 
+    /**
+     * @param accessingKlass the receiver's klass when the method is not static, resolutionSeed's
+     *            declaring klass otherwise
+     */
     @TruffleBoundary
-    public static Method handleRemovedMethod(Method resolutionSeed, Klass accessingKlass, StaticObject receiver) {
+    public static Method handleRemovedMethod(Method resolutionSeed, Klass accessingKlass) {
         // wait for potential ongoing redefinition to complete
         check();
-        Klass lookupKlass = receiver != null ? receiver.getKlass() : resolutionSeed.getDeclaringKlass();
-        Method replacementMethod = lookupKlass.lookupMethod(resolutionSeed.getName(), resolutionSeed.getRawSignature(), accessingKlass);
+        Method replacementMethod = accessingKlass.lookupMethod(resolutionSeed.getName(), resolutionSeed.getRawSignature(), accessingKlass);
         Meta meta = resolutionSeed.getMeta();
         if (replacementMethod == null) {
             throw meta.throwExceptionWithMessage(meta.java_lang_NoSuchMethodError,
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_reflect_NativeMethodAccessorImpl.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_reflect_NativeMethodAccessorImpl.java
index 4919e1404fd2..c243dd436f6d 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_reflect_NativeMethodAccessorImpl.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_sun_reflect_NativeMethodAccessorImpl.java
@@ -253,7 +253,7 @@ public static Object checkAndWiden(Meta meta, StaticObject arg, Klass targetKlas
 
         Method reflectedMethod = m;
         if (reflectedMethod.isRemovedByRedefition()) {
-            reflectedMethod = ClassRedefinition.handleRemovedMethod(reflectedMethod, reflectedMethod.isStatic() ? reflectedMethod.getDeclaringKlass() : receiver.getKlass(), receiver);
+            reflectedMethod = ClassRedefinition.handleRemovedMethod(reflectedMethod, reflectedMethod.isStatic() ? reflectedMethod.getDeclaringKlass() : receiver.getKlass());
         }
 
         Method method;      // actual method to invoke

From 874f7fd35ca8f697301c06b68c2d07dcb1c69ffd Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Thu, 14 Oct 2021 12:00:01 +0200
Subject: [PATCH 498/681] refactor cfg debug with regular dump

---
 .../graalvm/compiler/debug/DebugContext.java  |  24 +++
 .../phases/ConvertDeoptimizeToGuardPhase.java |   7 -
 .../compiler/nodes/StructuredGraph.java       |   1 -
 .../compiler/nodes/cfg/ControlFlowGraph.java  | 191 +++++++++---------
 4 files changed, 119 insertions(+), 104 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
index fab940ca425f..d884bef2a8b7 100644
--- a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
+++ b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
@@ -1375,6 +1375,30 @@ public void dump(int dumpLevel, Object object, String format, Object arg1, Objec
         }
     }
 
+    public void dump(int dumpLevel, Object object, String format, Object arg1, Object arg2, Object arg3, Object arg4) {
+        if (currentScope != null && currentScope.isDumpEnabled(dumpLevel)) {
+            currentScope.dump(dumpLevel, object, format, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    public void dump(int dumpLevel, Object object, String format, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5) {
+        if (currentScope != null && currentScope.isDumpEnabled(dumpLevel)) {
+            currentScope.dump(dumpLevel, object, format, arg1, arg2, arg3, arg4, arg5);
+        }
+    }
+
+    public void dump(int dumpLevel, Object object, String format, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6) {
+        if (currentScope != null && currentScope.isDumpEnabled(dumpLevel)) {
+            currentScope.dump(dumpLevel, object, format, arg1, arg2, arg3, arg4, arg5, arg6);
+        }
+    }
+
+    public void dump(int dumpLevel, Object object, String format, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7) {
+        if (currentScope != null && currentScope.isDumpEnabled(dumpLevel)) {
+            currentScope.dump(dumpLevel, object, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+        }
+    }
+
     /**
      * This override exists to catch cases when {@link #dump(int, Object, String, Object)} is called
      * with one argument bound to a varargs method parameter. It will bind to this method instead of
diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
index be62206c5710..45ae54366be8 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -100,7 +100,6 @@ protected void run(final StructuredGraph graph, final CoreProviders context) {
                 propagateFixed(d, d, context, lazyLoops);
             }
         }
-
         if (context != null) {
             for (FixedGuardNode fixedGuard : graph.getNodes(FixedGuardNode.TYPE)) {
                 try (DebugCloseable closable = fixedGuard.withNodeSourcePosition()) {
@@ -108,13 +107,7 @@ protected void run(final StructuredGraph graph, final CoreProviders context) {
                 }
             }
         }
-
         new DeadCodeEliminationPhase(Optional).apply(graph);
-
-        if (!graph.isAfterStage(StageFlag.DEOPT_TO_GUARD)) {
-            // ran multiple times, we just wanna set it the first time
-            graph.setAfterStage(StageFlag.DEOPT_TO_GUARD);
-        }
     }
 
     private static void trySplitFixedGuard(FixedGuardNode fixedGuard, CoreProviders context, LazyValue<LoopsData> lazyLoops) {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
index 54b0d0bbfb0e..4e0905ba1a90 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/StructuredGraph.java
@@ -157,7 +157,6 @@ public static AllowAssumptions ifNonNull(Assumptions assumptions) {
      * Different stages of the compilation regarding the status of various graph properties.
      */
     public enum StageFlag {
-        DEOPT_TO_GUARD,
         PARTIAL_ESCAPE,
         HIGH_TIER,
         FLOATING_READS,
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
index fe093becfce3..ce69e5e45147 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.nodes.cfg;
 
 import static org.graalvm.compiler.core.common.cfg.AbstractBlockBase.BLOCK_ID_COMPARATOR;
-import static org.graalvm.compiler.options.OptionType.Expert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,11 +53,11 @@
 import org.graalvm.compiler.nodes.LoopExitNode;
 import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
 import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph.StageFlag;
 import org.graalvm.compiler.nodes.ReturnNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionType;
 
 public final class ControlFlowGraph implements AbstractControlFlowGraph<Block> {
 
@@ -66,9 +65,9 @@ public static class CFGOptions {
         //@formatter:off
         @Option(help = "Debug flag to dump loop frequency differences computed based on loop end or exit nodes."
                         + "If the frequencies diverge a lot, this may indicate missing profiles on control flow"
-                        + "inside the loop body.", type = Expert)
-        public static final OptionKey<Boolean> ForceDumpEndVsExitLoopFrequencies = new OptionKey<>(false);
-        @Option(help = "Scaling factor of frequency difference computed based on loop ends or exits", type = Expert)
+                        + "inside the loop body.", type = OptionType.Debug)
+        public static final OptionKey<Boolean> DumpEndVersusExitLoopFrequencies = new OptionKey<>(false);
+        @Option(help = "Scaling factor of frequency difference computed based on loop ends or exits", type = OptionType.Debug)
         public static final OptionKey<Double> LoopExitVsLoopEndFrequencyDiff = new OptionKey<>(1000D);
         //@formatter:on
     }
@@ -107,7 +106,7 @@ public static ControlFlowGraph compute(StructuredGraph graph, boolean connectBlo
         cfg.identifyBlocks();
 
         boolean loopInfoComputed = false;
-        if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(graph.getOptions())) {
+        if (CFGOptions.DumpEndVersusExitLoopFrequencies.getValue(graph.getOptions())) {
             // additional loop info for sink frequencies inside the loop body
             cfg.computeLoopInformation();
             cfg.computeDominators();
@@ -759,109 +758,109 @@ private double calculateLocalLoopFrequency(LoopBeginNode lb) {
         loopExitFrequencySum = Math.max(ControlFlowGraph.MIN_RELATIVE_FREQUENCY, loopExitFrequencySum);
 
         double loopFrequency = -1;
-        if (loopExitFrequencySum == 0D) {
-            // loop without loop exit nodes (deopt or throw exited)
-            loopFrequency = MAX_RELATIVE_FREQUENCY;
-        } else {
-            loopFrequency = 1D / loopExitFrequencySum;
+        loopFrequency = 1D / loopExitFrequencySum;
+        assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
+        assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
 
+        if (CFGOptions.DumpEndVersusExitLoopFrequencies.getValue(lb.getOptions())) {
+            debugLocalLoopFrequencies(lb, loopFrequency, loopExitFrequencySum);
+        }
+        localLoopFrequencyData.put(lb, LoopFrequencyData.create(loopFrequency, source));
+        return loopFrequency;
+    }
+
+    @SuppressWarnings("try")
+    private void debugLocalLoopFrequencies(LoopBeginNode lb, final double loopFrequency, final double loopExitFrequencySum) {
+        try (DebugContext.Scope s = lb.getDebug().scope("CFGFrequencyInfo")) {
             /*
-             * Wait until deopt to guard ran to "complain" about frequency mismatches to avoid false
-             * positives for loop optimizations
+             * For loops without loop exit nodes we may only have deopt loop exit paths, they are
+             * however not part of the loop data structure of a Loop<HIR>, thus it might be that the
+             * reverse post order did not yet visit all sinks
              */
-            if (CFGOptions.ForceDumpEndVsExitLoopFrequencies.getValue(lb.getOptions()) && lb.graph().isAfterStage(StageFlag.DEOPT_TO_GUARD)) {
-
-                /*
-                 * For loops without loop exit nodes we may only have deopt loop exit paths, they
-                 * are however not part of the loop data structure of a Loop<HIR>, thus it might be
-                 * that the reverse post order did not yet visit all sinks
-                 */
-                boolean sinkingImplicitExitsFullyVisited = true;
-                double loopSinkFrequencySum = 0D;
-                for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
-                    FixedNode blockEndNode = loopBlock.getEndNode();
-                    if (blockEndNode instanceof ControlSinkNode) {
-                        double sinkBlockFrequency = blockFor(blockEndNode).relativeFrequency;
-                        loopSinkFrequencySum += sinkBlockFrequency;
-                    }
-                    if (blockFor(blockEndNode).relativeFrequency == -1D) {
-                        sinkingImplicitExitsFullyVisited = false;
-                    }
+            boolean sinkingImplicitExitsFullyVisited = true;
+            double loopSinkFrequencySum = 0D;
+            for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                FixedNode blockEndNode = loopBlock.getEndNode();
+                if (blockEndNode instanceof ControlSinkNode) {
+                    double sinkBlockFrequency = blockFor(blockEndNode).relativeFrequency;
+                    loopSinkFrequencySum += sinkBlockFrequency;
                 }
-                if (sinkingImplicitExitsFullyVisited) {
-                    // verify integrity of the CFG so far
-                    outer: for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
-                        for (Block succ : loopBlock.getSuccessors()) {
-                            if (isDominatorTreeLoopExit(succ)) {
-                                // loop exit successor frequency is weighted differently
-                                continue outer;
-                            }
-                            if (succ.isLoopHeader()) {
-                                // header frequency is set to 1 artificially to compute local
-                                // frequencies
-                                continue outer;
-                            }
-                        }
-                        if (loopBlock.isLoopHeader()) {
+                if (blockFor(blockEndNode).relativeFrequency == -1D) {
+                    sinkingImplicitExitsFullyVisited = false;
+                }
+            }
+            final double delta = 0.001D;
+            if (sinkingImplicitExitsFullyVisited) {
+                // verify integrity of the CFG so far
+                outer: for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                    if (loopBlock.isLoopHeader()) {
+                        // loop exit successor frequency is weighted differently
+                        continue;
+                    }
+                    for (Block succ : loopBlock.getSuccessors()) {
+                        if (isDominatorTreeLoopExit(succ)) {
                             // loop exit successor frequency is weighted differently
-                            continue;
-                        }
-                        final double selfFrequency = loopBlock.relativeFrequency;
-                        double succFrequency = 0D;
-                        for (Block succ : loopBlock.getSuccessors()) {
-                            succFrequency += succ.relativeFrequency;
-                        }
-                        if (loopBlock.getSuccessorCount() == 0) {
-                            GraalError.guarantee(loopBlock.getEndNode() instanceof ControlSinkNode, "Must sink if there is no successor");
-                            // frequency "lost"
-                            continue;
+                            continue outer;
                         }
-                        String message = String.format("Successors must add up for block %s with begin %s, selfF=%f succF=%f", loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency);
-                        if (succFrequency < selfFrequency - 0.001D/* delta */) {
-                            graph.getDebug().forceDump(graph, message);
-                            throw GraalError.shouldNotReachHere(message);
+                        if (succ.isLoopHeader()) {
+                            // header frequency is set to 1 artificially to compute local
+                            // frequencies
+                            continue outer;
                         }
                     }
-                }
-                double loopEndFrequencySum = 0D;
-                for (LoopEndNode len : lb.loopEnds()) {
-                    Block lenBlock = blockFor(len);
-                    loopEndFrequencySum += lenBlock.relativeFrequency;
-                }
-                final double endBasedFrequency = 1 / (1 - loopEndFrequencySum);
-                // verify inner loop frequency calculations used sane loop exit frequencies
-                for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
-                    if (loopBlock.isLoopHeader() && loopBlock.getBeginNode() != lb) {
-                        LoopBeginNode otherLoop = (LoopBeginNode) loopBlock.getBeginNode();
-                        double otherLoopExitFrequencySum = 0D;
-                        for (LoopExitNode lex : otherLoop.loopExits()) {
-                            otherLoopExitFrequencySum += blockFor(lex).relativeFrequency;
-                        }
-                        // forward end
-                        final double predFrequency = loopBlock.getFirstPredecessor().relativeFrequency;
-                        GraalError.guarantee(Math.abs(predFrequency - otherLoopExitFrequencySum) <= 0.01D, "Frequencies diverge too much");
+                    final double selfFrequency = loopBlock.relativeFrequency;
+                    double succFrequency = 0D;
+                    for (Block succ : loopBlock.getSuccessors()) {
+                        succFrequency += succ.relativeFrequency;
+                    }
+                    if (loopBlock.getSuccessorCount() == 0) {
+                        GraalError.guarantee(loopBlock.getEndNode() instanceof ControlSinkNode, "Must sink if there is no successor");
+                        // frequency "lost"
+                        continue;
+                    }
+                    if (succFrequency < selfFrequency - delta) {
+                        String format = "Successors must add up for block %s with begin %s, selfF=%f succF=%f";
+                        graph.getDebug().dump(DebugContext.VERBOSE_LEVEL, graph, format, loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency);
+                        throw GraalError.shouldNotReachHere(String.format(format, loopBlock, loopBlock.getBeginNode(), selfFrequency, succFrequency));
                     }
                 }
-                /*
-                 * "Endless" looking loops, i.e., loops without exit nodes (only deopt exits) look
-                 * like inifinite loops if we take an exit frequency of "0", which results in max
-                 * frequency
-                 */
-                final boolean hasLoopExits = lb.loopExits().count() > 0;
-                if (Math.abs(endBasedFrequency - loopFrequency) > CFGOptions.LoopExitVsLoopEndFrequencyDiff.getValue(lb.getOptions()) && hasLoopExits) {
-                    String message = String.format("Frequency divergence for loop %s,exitBasedFrequency=%.4f endBasedFrequency=%.4f, exitFSum=%.2f / endFSum=%.2f/ sinkSum=%.2f [allSum=%f]", lb,
-                                    loopFrequency, endBasedFrequency, loopExitFrequencySum, loopEndFrequencySum,
-                                    loopSinkFrequencySum,
-                                    (loopExitFrequencySum + loopEndFrequencySum + loopSinkFrequencySum));
-                    graph.getDebug().forceDump(graph, message);
+            }
+            double loopEndFrequencySum = 0D;
+            for (LoopEndNode len : lb.loopEnds()) {
+                Block lenBlock = blockFor(len);
+                loopEndFrequencySum += lenBlock.relativeFrequency;
+            }
+            double endBasedFrequency = 1 / (1 - loopEndFrequencySum);
+            if (loopEndFrequencySum == 1D) {
+                // loop without any loop exits (and no sinks)
+                endBasedFrequency = MAX_RELATIVE_FREQUENCY;
+            }
+            // verify inner loop frequency calculations used sane loop exit frequencies
+            for (Block loopBlock : blockFor(lb).getLoop().getBlocks()) {
+                if (loopBlock.isLoopHeader() && loopBlock.getBeginNode() != lb) {
+                    LoopBeginNode otherLoop = (LoopBeginNode) loopBlock.getBeginNode();
+                    double otherLoopExitFrequencySum = 0D;
+                    for (LoopExitNode lex : otherLoop.loopExits()) {
+                        otherLoopExitFrequencySum += blockFor(lex).relativeFrequency;
+                    }
+                    // forward end
+                    final double predFrequency = loopBlock.getFirstPredecessor().relativeFrequency;
+                    GraalError.guarantee(Math.abs(predFrequency - otherLoopExitFrequencySum) <= delta, "Frequencies diverge too much");
                 }
-
             }
-            assert Double.isFinite(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
-            assert !Double.isNaN(loopFrequency) : "Loop=" + lb + " Loop Frequency=" + loopFrequency + " lexFrequencySum=" + loopExitFrequencySum;
+            /*
+             * "Endless" looking loops, i.e., loops without exit nodes (only deopt exits) look like
+             * inifinite loops if we take an exit frequency of "0", which results in max frequency
+             */
+            final boolean hasLoopExits = lb.loopExits().count() > 0;
+            if (Math.abs(endBasedFrequency - loopFrequency) > CFGOptions.LoopExitVsLoopEndFrequencyDiff.getValue(lb.getOptions()) && hasLoopExits) {
+                graph.getDebug().dump(DebugContext.VERBOSE_LEVEL, graph,
+                                "Frequency divergence for loop %s,exitBasedFrequency=%.4f endBasedFrequency=%.4f, exitFSum=%.2f / endFSum=%.2f/ sinkSum=%.2f [allSum=%f]", lb,
+                                loopFrequency, endBasedFrequency, loopExitFrequencySum, loopEndFrequencySum,
+                                loopSinkFrequencySum,
+                                (loopExitFrequencySum + loopEndFrequencySum + loopSinkFrequencySum));
+            }
         }
-        localLoopFrequencyData.put(lb, LoopFrequencyData.create(loopFrequency, source));
-        return loopFrequency;
     }
 
     private void resetBlockFrequencies() {

From ce25b6a9b81bdc918f4263004f0ebe652824ebad Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Fri, 15 Oct 2021 16:15:40 +0200
Subject: [PATCH 499/681] Make the code that detaches a thread fully
 uninterruptible.

---
 .../oracle/svm/core/genscavenge/HeapImpl.java |  1 +
 .../graal/snippets/CEntryPointSnippets.java   |  1 -
 .../src/com/oracle/svm/core/heap/Heap.java    |  1 +
 .../oracle/svm/core/thread/JavaThreads.java   | 15 ++----
 .../com/oracle/svm/core/thread/ParkEvent.java |  8 ++++
 .../com/oracle/svm/core/thread/VMThreads.java | 48 ++++++-------------
 6 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
index c99c23ecebb1..c957d1a1f0de 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
@@ -385,6 +385,7 @@ public void attachThread(IsolateThread isolateThread) {
     }
 
     @Override
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     public void detachThread(IsolateThread isolateThread) {
         ThreadLocalAllocation.disableAndFlushForThread(isolateThread);
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index 08bfdf6ca930..ba44d90ffdc4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -426,7 +426,6 @@ public static int detachThreadSnippet() {
 
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     @Uninterruptible(reason = "Thread state going away.")
-    @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not (thread-local) allocate while detaching a thread.")
     private static int detachThreadMT(IsolateThread currentThread) {
         try {
             VMThreads.singleton().detachThread(currentThread);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
index b7a938af6eca..477a52857046 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
@@ -69,6 +69,7 @@ protected Heap() {
      * heap-specific resources, e.g., the TLAB. This method is called for every thread except the
      * main thread (i.e., the one that maps the image heap).
      */
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     public abstract void detachThread(IsolateThread isolateThread);
 
     public abstract void suspendAllocation();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index 7a5f25aa3ffe..65a1751c30ac 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -184,10 +184,12 @@ public static boolean isInterrupted(Thread thread) {
         return toTarget(thread).interrupted;
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected static AtomicReference<ParkEvent> getUnsafeParkEvent(Thread thread) {
         return toTarget(thread).unsafeParkEvent;
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected static AtomicReference<ParkEvent> getSleepParkEvent(Thread thread) {
         return toTarget(thread).sleepParkEvent;
     }
@@ -416,18 +418,9 @@ public boolean tearDown() {
         return tearDownJavaThreads();
     }
 
-    /**
-     * Detach the provided Java thread.
-     *
-     * When this method is being executed, we expect that the current thread owns
-     * {@linkplain VMThreads#THREAD_MUTEX}. This is fine even though this method is not
-     * {@linkplain Uninterruptible} because this method is either executed as part of a VM operation
-     * or {@linkplain SafepointBehavior#setIgnoreThreadInSafepointHandling()} was called.
-     */
-    @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while detaching a thread.")
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     public static void detachThread(IsolateThread vmThread) {
-        VMThreads.THREAD_MUTEX.assertIsOwner("Must hold the VMThreads mutex");
-        assert SafepointBehavior.isIgnoredBySafepointHandling(vmThread) || VMOperation.isInProgress();
+        VMThreads.THREAD_MUTEX.assertIsOwner("Must hold the THREAD_MUTEX.");
 
         Thread thread = currentThread.get(vmThread);
         ParkEvent.detach(getUnsafeParkEvent(thread));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java
index 8e8088306f67..24ddca3b3b97 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ParkEvent.java
@@ -24,8 +24,10 @@
  */
 package com.oracle.svm.core.thread;
 
+import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
+import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.jdk.UninterruptibleUtils.AtomicReference;
 import com.oracle.svm.core.util.VMError;
 
@@ -80,6 +82,7 @@ protected ParkEvent() {
     protected abstract void unpark();
 
     /** Use up the cons-cell for this ParkEvent. */
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     ParkEventConsCell consumeConsCell() {
         assert consCell != null : "Consuming null cons cell.";
         ParkEventConsCell result = consCell;
@@ -129,6 +132,7 @@ private static ParkEvent acquire() {
         return result;
     }
 
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     static void detach(AtomicReference<ParkEvent> ref) {
         /*
          * We must not reset the AtomicReference back to null, because a racing thread could
@@ -141,6 +145,7 @@ static void detach(AtomicReference<ParkEvent> ref) {
         }
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     private static void release(ParkEvent event) {
         ParkEventList.getSingleton().push(event);
     }
@@ -190,6 +195,7 @@ final class ParkEventList {
 
     private static final ParkEventList SINGLETON = new ParkEventList();
 
+    @Fold
     public static ParkEventList getSingleton() {
         return SINGLETON;
     }
@@ -203,6 +209,7 @@ private ParkEventList() {
     }
 
     /** Push an element on to the free-list. */
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected void push(ParkEvent element) {
         ParkEventConsCell sampleHead;
         /* Use up the cons-cell for each attempted push to avoid the ABA problem on pops. */
@@ -250,6 +257,7 @@ protected ParkEventConsCell getNext() {
         return next;
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected void setNext(ParkEventConsCell next) {
         this.next = next;
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 02f16bbbeeef..1e5ee537db6e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -337,7 +337,10 @@ public void detachThread(IsolateThread thread) {
 
         cleanupBeforeDetach(thread);
 
-        setIgnoreThreadInSafepointHandlingAndLock();
+        // From this point on, all code must be fully uninterruptible because this thread either
+        // holds the THREAD_MUTEX (see the JavaDoc on THREAD_MUTEX) or because the IsolateThread was
+        // already freed.
+        THREAD_MUTEX.lockNoTransition();
         OSThreadHandle threadToCleanup;
         try {
             detachThreadInSafeContext(thread);
@@ -363,25 +366,7 @@ public void detachThread(IsolateThread thread) {
         cleanupExitedOsThread(threadToCleanup);
     }
 
-    /*
-     * Make me immune to safepoints and make the safepoint mechanism ignore me. We are calling
-     * functions that are not marked as @Uninterruptible during the detach process. We hold the
-     * THREAD_MUTEX, so we know that we are not going to be interrupted by a safepoint. But a
-     * safepoint can already be requested, or our safepoint counter can reach 0 - so it is still
-     * possible that we enter the safepoint slow path.
-     *
-     * Between setting the status and acquiring the TREAD_MUTEX, we must not access the heap.
-     * Otherwise, we risk a race with the GC as this thread will continue executing even though the
-     * VM is at a safepoint.
-     */
-    @Uninterruptible(reason = "Called from uninterruptible code.")
-    @NeverInline("Prevent that anything floats between setting the status and acquiring the mutex.")
-    private static void setIgnoreThreadInSafepointHandlingAndLock() {
-        SafepointBehavior.setIgnoreThreadInSafepointHandling();
-        THREAD_MUTEX.lockNoTransition();
-    }
-
-    @Uninterruptible(reason = "Isolate thread will be freed.", calleeMustBe = false)
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     private static void releaseThread(IsolateThread thread) {
         THREAD_MUTEX.guaranteeIsOwner("This mutex must be locked to prevent that a GC is triggered while detaching a thread from the heap");
         Heap.getHeap().detachThread(thread);
@@ -407,15 +392,15 @@ private void cleanupExitedOsThread(OSThreadHandle threadToCleanup) {
         }
     }
 
-    @Uninterruptible(reason = "Manipulates the threads list; broadcasts on changes.")
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     private static void detachThreadInSafeContext(IsolateThread thread) {
-        detachJavaThread(thread);
+        JavaThreads.detachThread(thread);
         removeFromThreadList(thread);
         // Signal that the VMThreads list has changed.
         THREAD_LIST_CONDITION.broadcast();
     }
 
-    @Uninterruptible(reason = "Called from uninterruptible code.")
+    @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     private static void removeFromThreadList(IsolateThread thread) {
         IsolateThread previous = WordFactory.nullPointer();
         IsolateThread current = head;
@@ -457,13 +442,7 @@ private void waitUntilLastOsThreadExited() {
         cleanupExitedOsThreads();
     }
 
-    @Uninterruptible(reason = "For calling interruptible code from uninterruptible code.", calleeMustBe = false)
-    private static void detachJavaThread(IsolateThread thread) {
-        JavaThreads.detachThread(thread);
-    }
-
     @Uninterruptible(reason = "Called from uninterruptible code, but still safe at this point.", calleeMustBe = false, mayBeInlined = true)
-    @RestrictHeapAccess(access = RestrictHeapAccess.Access.UNRESTRICTED, overridesCallers = true, reason = "Still safe at this point.")
     private static void cleanupBeforeDetach(IsolateThread thread) {
         JavaThreads.cleanupBeforeDetach(thread);
     }
@@ -801,7 +780,7 @@ public static void assertStatusVM() {
         // This method will be removed in GR-34435.
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setStatusIgnoreSafepoints() {
-            SafepointBehavior.setPreventVMFromReachingSafepoint();
+            SafepointBehavior.setIgnoreThreadInSafepointHandling();
         }
 
         public static boolean isValidStatus(int status) {
@@ -867,11 +846,14 @@ public static int getSafepointBehavior(IsolateThread vmThread) {
             return safepointBehaviorTL.getVolatile(vmThread);
         }
 
+        /**
+         * Changes the safepoint behavior so that this thread won't freeze at a safepoint. The
+         * thread will also actively prevent the VM from reaching a safepoint (regardless of its
+         * thread status).
+         */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setPreventVMFromReachingSafepoint() {
-            assert safepointChecksEnabled();
             safepointBehaviorTL.setVolatile(PREVENT_VM_FROM_REACHING_SAFEPOINT);
-            Heap.getHeap().suspendAllocation();
         }
 
         /**
@@ -887,9 +869,7 @@ public static void setPreventVMFromReachingSafepoint() {
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         static void setIgnoreThreadInSafepointHandling() {
-            assert safepointChecksEnabled();
             safepointBehaviorTL.setVolatile(IGNORE_THREAD_IN_SAFEPOINT_HANDLING);
-            Heap.getHeap().suspendAllocation();
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)

From c8ac0e4075b41a5ee58d02193535250406a8e2c0 Mon Sep 17 00:00:00 2001
From: Martin Entlicher <martin.entlicher@oracle.com>
Date: Fri, 15 Oct 2021 16:50:55 +0200
Subject: [PATCH 500/681] Prevent from attaching a disposed breakpoint.
 [GR-34454]

---
 .../src/com/oracle/truffle/api/debug/Breakpoint.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/truffle/src/com.oracle.truffle.api.debug/src/com/oracle/truffle/api/debug/Breakpoint.java b/truffle/src/com.oracle.truffle.api.debug/src/com/oracle/truffle/api/debug/Breakpoint.java
index d4436b32034d..49ff0986580b 100644
--- a/truffle/src/com.oracle.truffle.api.debug/src/com/oracle/truffle/api/debug/Breakpoint.java
+++ b/truffle/src/com.oracle.truffle.api.debug/src/com/oracle/truffle/api/debug/Breakpoint.java
@@ -596,8 +596,13 @@ private void assignBinding(SourceSectionFilter locationFilter) {
         boolean attaching = breakpointBindingAttaching.getAndSet(true);
         if (!attaching) {
             EventBinding<? extends ExecutionEventNodeFactory> newBinding = null;
+            Debugger dbg = debugger;
+            if (dbg == null) {
+                // Disposed
+                return;
+            }
             try {
-                breakpointBinding = newBinding = debugger.getInstrumenter().attachExecutionEventFactory(locationFilter, new BreakpointNodeFactory());
+                breakpointBinding = newBinding = dbg.getInstrumenter().attachExecutionEventFactory(locationFilter, new BreakpointNodeFactory());
             } finally {
                 breakpointBindingAttaching.set(false);
                 synchronized (this) {

From 84c12108432677eabc0eeaa7b3b1d86b56247ad2 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Fri, 8 Oct 2021 11:11:09 +0200
Subject: [PATCH 501/681] Delete legacy GC compatibility classes.

---
 .../svm/core/genscavenge/HeapPolicy.java      | 63 -------------------
 .../core/genscavenge/HeapPolicyOptions.java   | 37 -----------
 2 files changed, 100 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicy.java
 delete mode 100644 substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicyOptions.java

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicy.java
deleted file mode 100644
index 6e6f97503b87..000000000000
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2013, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.genscavenge;
-
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.word.UnsignedWord;
-
-/**
- * Only for compatibility with legacy code, replaced by {@link CollectionPolicy} and
- * {@link HeapParameters}.
- */
-public final class HeapPolicy {
-    public static UnsignedWord getMaximumHeapSize() {
-        return GCImpl.getPolicy().getMaximumHeapSize();
-    }
-
-    public static UnsignedWord getMinimumHeapSize() {
-        return GCImpl.getPolicy().getMinimumHeapSize();
-    }
-
-    public static void setMaximumHeapSize(UnsignedWord value) {
-        HeapParameters.setMaximumHeapSize(value);
-    }
-
-    public static void setMinimumHeapSize(UnsignedWord value) {
-        HeapParameters.setMinimumHeapSize(value);
-    }
-
-    @Fold
-    public static UnsignedWord getAlignedHeapChunkSize() {
-        return HeapParameters.getAlignedHeapChunkSize();
-    }
-
-    @Fold
-    public static UnsignedWord getLargeArrayThreshold() {
-        return HeapParameters.getLargeArrayThreshold();
-    }
-
-    private HeapPolicy() {
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicyOptions.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicyOptions.java
deleted file mode 100644
index 8801d8d1cf23..000000000000
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapPolicyOptions.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.genscavenge;
-
-import com.oracle.svm.core.option.HostedOptionKey;
-
-/**
- * Only for compatibility with legacy code, replaced by {@link HeapParameters.Options}.
- */
-public final class HeapPolicyOptions {
-    public static final HostedOptionKey<Long> AlignedHeapChunkSize = HeapParameters.Options.AlignedHeapChunkSize;
-
-    private HeapPolicyOptions() {
-    }
-}

From f5c444ddd75d0b2f301e190c3511858f027108dd Mon Sep 17 00:00:00 2001
From: ol-automation_ww <ol-automation_ww@oracle.com>
Date: Fri, 15 Oct 2021 21:06:32 +0000
Subject: [PATCH 502/681] Update truffleruby import.

---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 4b38cb8f6dfa..f96ef6286e63 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -57,7 +57,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "b5454b64b6aa113ef2c091f50a4e1211e5ecdcea",
+                "version": "d4945821ec84d8b498a9a4bb30825f7087886b3d",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

From fce53c9d78a87543399fb7ed7357daa85d141224 Mon Sep 17 00:00:00 2001
From: Martin Entlicher <martin.entlicher@oracle.com>
Date: Sat, 16 Oct 2021 01:11:14 +0200
Subject: [PATCH 503/681] In TruffleLogger use null parameters instead of
 Object[]{null} when parameters are not specified. [GR-34556]

---
 .../api/test/polyglot/LoggingTest.java        | 57 +++++++++++++++++++
 .../com/oracle/truffle/api/TruffleLogger.java | 18 ++----
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
index 33c8e09915dd..088317f22518 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
@@ -364,6 +364,63 @@ public void testLogRecordImmutable() {
         }
     }
 
+    @Test
+    public void testNoParameters() {
+        String message = "Test{0}";
+        AbstractLoggingLanguage.action = new BiPredicate<LoggingContext, TruffleLogger[]>() {
+            @Override
+            public boolean test(final LoggingContext context, final TruffleLogger[] loggers) {
+                for (TruffleLogger logger : loggers) {
+                    logger.log(Level.WARNING, message);
+                    logger.log(Level.WARNING, () -> message);
+                    logger.logp(Level.WARNING, "C", "M", message);
+                    logger.logp(Level.WARNING, "C", "M", () -> message);
+                }
+                return false;
+            }
+        };
+        final TestHandler handler = new TestHandler();
+        try (Context ctx1 = newContextBuilder().logHandler(handler).build()) {
+            ctx1.eval(LoggingLanguageFirst.ID, "");
+            int loggedCount = 0;
+            for (LogRecord r : handler.getRawLog()) {
+                loggedCount++;
+                Assert.assertEquals(message, r.getMessage());
+                Assert.assertNull(r.getParameters());
+            }
+            Assert.assertEquals(4 * AbstractLoggingLanguage.LOGGER_NAMES.length, loggedCount);
+        }
+    }
+
+    @Test
+    public void testParametersOutput() {
+        String message = "Test{0} {1}";
+        assertLoggerOutput(message, logger -> logger.log(Level.WARNING, message));
+        assertLoggerOutput(message, logger -> logger.log(Level.WARNING, () -> message));
+        assertLoggerOutput(message, logger -> logger.logp(Level.WARNING, "C", "M", message));
+        assertLoggerOutput(message, logger -> logger.logp(Level.WARNING, "C", "M", () -> message));
+        assertLoggerOutput("TestA {1}", logger -> logger.log(Level.WARNING, message, "A"));
+        assertLoggerOutput("TestA {1}", logger -> logger.logp(Level.WARNING, "C", "M", message, "A"));
+        assertLoggerOutput("TestA B", logger -> logger.log(Level.WARNING, message, new String[]{"A", "B"}));
+        assertLoggerOutput("TestA B", logger -> logger.logp(Level.WARNING, "C", "M", message, new String[]{"A", "B"}));
+    }
+
+    private static void assertLoggerOutput(String expected, Consumer<TruffleLogger> log) {
+        AbstractLoggingLanguage.action = new BiPredicate<LoggingContext, TruffleLogger[]>() {
+            @Override
+            public boolean test(final LoggingContext context, final TruffleLogger[] loggers) {
+                log.accept(loggers[0]);
+                return false;
+            }
+        };
+        final ByteArrayOutputStream err = new ByteArrayOutputStream();
+        try (Context ctx1 = Context.newBuilder().err(err).build()) {
+            ctx1.eval(LoggingLanguageFirst.ID, "");
+            final String output = new String(err.toByteArray());
+            Assert.assertTrue(output, output.indexOf(expected) > 0);
+        }
+    }
+
     @Test
     public void testParametersPrimitive() {
         final Object[] expected = new Object[]{1, 1L, null, 1.1, 1.1d, "test", 't', null, true};
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLogger.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLogger.java
index 9bd8d98369c6..c75c40120644 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLogger.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleLogger.java
@@ -472,7 +472,7 @@ public void log(final Level level, final String message) {
         if (!isLoggable(level)) {
             return;
         }
-        doLog(level, message, null, null, (Object) null);
+        doLog(level, message, null, null, (Object[]) null);
     }
 
     /**
@@ -490,7 +490,7 @@ public void log(final Level level, final Supplier<String> messageSupplier) {
         if (!isLoggable(level)) {
             return;
         }
-        doLog(level, messageSupplier, null, null, (Object) null);
+        doLog(level, messageSupplier, null, null, null);
     }
 
     /**
@@ -582,7 +582,7 @@ public void logp(final Level level, final String sourceClass, final String sourc
         if (!isLoggable(level)) {
             return;
         }
-        doLog(level, message, sourceClass, sourceMethod, (Object) null);
+        doLog(level, message, sourceClass, sourceMethod, (Object[]) null);
     }
 
     /**
@@ -602,7 +602,7 @@ public void logp(final Level level, final String sourceClass, final String sourc
         if (!isLoggable(level)) {
             return;
         }
-        doLog(level, messageSupplier, sourceClass, sourceMethod, (Object) null);
+        doLog(level, messageSupplier, sourceClass, sourceMethod, null);
     }
 
     /**
@@ -775,16 +775,6 @@ private void doLog(
         callHandlers(logRecord);
     }
 
-    @CompilerDirectives.TruffleBoundary
-    private void doLog(
-                    final Level level,
-                    final Supplier<String> messageSupplier,
-                    final String className,
-                    final String methodName,
-                    final Object param) {
-        doLog(level, messageSupplier.get(), className, methodName, new Object[]{param});
-    }
-
     @CompilerDirectives.TruffleBoundary
     private void doLog(
                     final Level level,

From 211ce3b70ceb09a79b2e8c1b6e63b9cb03494aa0 Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Sat, 16 Oct 2021 22:48:01 +0000
Subject: [PATCH 504/681] [GR-23997] Periodic update of the graal import
 (2021-10-15).

PullRequest: js/2195
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index f96ef6286e63..49694328a713 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "70dbd4073a01b5482bdfb0075fa99ff8afd1954f",
+                "version": "c69f662f3e3cdce492999c328532cbf20c425dd1",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "70dbd4073a01b5482bdfb0075fa99ff8afd1954f",
+                "version": "c69f662f3e3cdce492999c328532cbf20c425dd1",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From aadd1cda98ec1dad01bfa6ca1802e5d1c68debb8 Mon Sep 17 00:00:00 2001
From: "cengfeng.lzy" <cengfeng.lzy@alibaba-inc.com>
Date: Wed, 11 Aug 2021 15:18:47 +0800
Subject: [PATCH 505/681] Parse pointsto options for standalone pointsto

The standalone pointsto need to take the input options. The options and
parsing should follow the same way as native image's hosted options.
So we extract the commom part of SubstrateOptionsParser to a new project
where both pointsto and svm can share.
---
 compiler/mx.compiler/suite.py                 |   2 +-
 substratevm/mx.substratevm/mx_substratevm.py  |   1 +
 substratevm/mx.substratevm/suite.py           |  47 +-
 .../graal/pointsto/util/AnalysisError.java    |  12 +
 .../pointsto/util/PointsToOptionParser.java   | 140 +++++
 .../svm/common/option/CommonOptionParser.java | 522 ++++++++++++++++++
 .../svm/common/option/CommonOptions.java      |  39 ++
 .../svm/common}/option/LocatableOption.java   |   3 +-
 .../svm/common}/option/MultiOptionValue.java  |   7 +-
 .../common/option/OptionParsingException.java |  35 ++
 .../UnsupportedOptionClassException.java      |  35 ++
 .../com/oracle/svm/core/SubstrateOptions.java |   6 -
 .../com/oracle/svm/core/SubstrateUtil.java    |  28 +-
 .../svm/core/option/HostedOptionKey.java      |   2 +
 .../option/LocatableMultiOptionValue.java     |   2 +
 .../svm/core/option/RuntimeOptionParser.java  |   7 +-
 .../core/option/SubstrateOptionsParser.java   | 500 ++---------------
 .../com/oracle/svm/driver/NativeImage.java    |   5 +-
 .../config/ConfigurationParserUtils.java      |   2 +-
 .../svm/hosted/option/HostedOptionParser.java |  40 +-
 .../src/com/oracle/svm/util/StringUtil.java   |  72 +++
 21 files changed, 970 insertions(+), 537 deletions(-)
 create mode 100644 substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
 create mode 100644 substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
 create mode 100644 substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
 rename substratevm/src/{com.oracle.svm.core/src/com/oracle/svm/core => com.oracle.svm.common/src/com/oracle/svm/common}/option/LocatableOption.java (96%)
 rename substratevm/src/{com.oracle.svm.core/src/com/oracle/svm/core => com.oracle.svm.common/src/com/oracle/svm/common}/option/MultiOptionValue.java (84%)
 create mode 100644 substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/OptionParsingException.java
 create mode 100644 substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/UnsupportedOptionClassException.java
 create mode 100644 substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/StringUtil.java

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index 44c8551c3b11..c528d0471775 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -2168,7 +2168,7 @@
           "jdk.unsupported" # sun.misc.Unsafe
         ],
         "exports" : [
-          "* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise",
+          "* to com.oracle.graal.graal_enterprise,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder,org.graalvm.nativeimage.llvm,com.oracle.svm.svm_enterprise,org.graalvm.nativeimage.base",
           "org.graalvm.compiler.core.common            to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.agent.tracing",
           "org.graalvm.compiler.debug                  to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.objectfile",
           "org.graalvm.compiler.hotspot                to jdk.internal.vm.compiler.management",
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 2d468388df9e..061b9a99ad02 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -769,6 +769,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
         'substratevm:SVM',
         'substratevm:OBJECTFILE',
         'substratevm:POINTSTO',
+        'substratevm:NATIVE_IMAGE_BASE',
     ],
     support_distributions=['substratevm:SVM_GRAALVM_SUPPORT'],
     stability="earlyadopter",
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index c1b7e79a15bf..f8b4f7afa75e 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -147,6 +147,19 @@
             "checkstyle": "com.oracle.svm.core",
             "workingSets": "SVM",
         },
+        "com.oracle.svm.common": {
+            "subDir": "src",
+            "sourceDirs": ["src"],
+            "dependencies": [
+                "com.oracle.svm.util"
+            ],
+            "javaCompliance": "8+",
+            "annotationProcessors": [
+                "compiler:GRAAL_PROCESSOR",
+            ],
+            "checkstyle": "com.oracle.svm.core",
+            "workingSets": "SVM",
+        },
         "com.oracle.svm.util.jdk11": {
             "subDir": "src",
             "sourceDirs": ["src"],
@@ -174,7 +187,7 @@
                 "headers",
             ],
             "dependencies": [
-                "com.oracle.svm.util",
+                "com.oracle.svm.common",
             ],
             "javaCompliance": "8+",
             "checkstyleVersion" : "8.36.1",
@@ -387,7 +400,7 @@
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
-                "com.oracle.svm.util",
+                "com.oracle.svm.common",
             ],
             "checkstyle": "com.oracle.graal.pointsto",
             "javaCompliance": "8+",
@@ -1106,6 +1119,7 @@
                 "OBJECTFILE",
                 "POINTSTO",
                 "compiler:GRAAL",
+                "NATIVE_IMAGE_BASE",
             ],
             "moduleInfo" : {
                 "name" : "org.graalvm.nativeimage.builder",
@@ -1119,7 +1133,7 @@
                     "com.oracle.svm.hosted                        to java.base",
                     "com.oracle.svm.hosted.agent                  to java.instrument",
                     "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
-                    "* to jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
+                    "* to org.graalvm.nativeimage.base,jdk.internal.vm.compiler,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.junitsupport,org.graalvm.nativeimage.llvm,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.agent.diagnostics,com.oracle.svm.svm_enterprise",
                 ],
                 "opens" : [
                     "com.oracle.svm.core                          to jdk.internal.vm.compiler",
@@ -1254,6 +1268,9 @@
                     "static junit",
                     "static hamcrest",
                 ],
+                "exports" : [
+                    "* to org.graalvm.nativeimage.base,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder",
+                ],
             },
         },
 
@@ -1421,6 +1438,26 @@
             },
         },
 
+        "NATIVE_IMAGE_BASE": {
+            "subDir": "src",
+            "description" : "Native Image base that can be shared by native image building and pointsto.",
+            "dependencies": [
+                "com.oracle.svm.common",
+                "com.oracle.svm.util",
+            ],
+            "distDependencies": [
+                "compiler:GRAAL",
+            ],
+            "exclude": [
+            ],
+            "moduleInfo" : {
+                "name" : "org.graalvm.nativeimage.base",
+                "exports" : [
+                    "com.oracle.svm.util",
+                    "com.oracle.svm.common.option",
+                ],
+            }
+        },
 
         "POINTSTO": {
             "subDir": "src",
@@ -1431,13 +1468,13 @@
             ],
             "distDependencies": [
                 "compiler:GRAAL",
+                "NATIVE_IMAGE_BASE",
             ],
             "exclude": [
             ],
             "moduleInfo" : {
               "name" : "org.graalvm.nativeimage.pointsto",
               "exports" : [
-                "com.oracle.svm.util",
                 "com.oracle.graal.pointsto",
                 "com.oracle.graal.pointsto.api",
                 "com.oracle.graal.pointsto.reports",
@@ -1614,7 +1651,7 @@
             "moduleInfo" : {
                 "name" : "org.graalvm.nativeimage.llvm",
                 "exports" : [
-                    "* to org.graalvm.nativeimage.builder",
+                    "* to org.graalvm.nativeimage.builder,org.graalvm.nativeimage.base",
                 ],
             },
             "maven" : False,
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisError.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisError.java
index b9f58533b894..8d59e33cd5a3 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisError.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisError.java
@@ -125,6 +125,14 @@ private static String message(PointsToAnalysis bb, TypeFlow<?> objectFlow, Bytec
         }
     }
 
+    public static class InterruptAnalysis extends AnalysisError {
+        private static final long serialVersionUID = 7126612141948542452L;
+
+        InterruptAnalysis(String msg) {
+            super(msg);
+        }
+    }
+
     public static TypeNotFoundError typeNotFound(ResolvedJavaType type) {
         throw new TypeNotFoundError(type);
     }
@@ -166,4 +174,8 @@ public static void guarantee(boolean condition, String format, Object... args) {
             // Checkstyle: resume
         }
     }
+
+    public static RuntimeException interruptAnalysis(String msg) {
+        throw new InterruptAnalysis(msg);
+    }
 }
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
new file mode 100644
index 000000000000..b2a93a85768d
--- /dev/null
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.graal.pointsto.util;
+
+import com.oracle.svm.common.option.CommonOptionParser;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionValues;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat.PLUS_MINUS;
+
+public final class PointsToOptionParser {
+
+    private static PointsToOptionParser instance = new PointsToOptionParser();
+
+    private OptionValues optionValues = null;
+    private EconomicMap<OptionKey<?>, Object> analysisValues = OptionValues.newOptionMap();
+    private EconomicMap<String, OptionDescriptor> allAnalysisOptions = EconomicMap.create();
+
+    public static PointsToOptionParser getInstance() {
+        return instance;
+    }
+
+    @SuppressWarnings("unchecked")
+    private PointsToOptionParser() {
+        ClassLoader appClassLoader = PointsToOptionParser.class.getClassLoader();
+        CommonOptionParser.collectOptions(ServiceLoader.load(OptionDescriptors.class, appClassLoader), descriptor -> {
+            String name = descriptor.getName();
+            if (descriptor.getOptionKey() instanceof OptionKey) {
+                OptionDescriptor existing = allAnalysisOptions.put(name, descriptor);
+                if (existing != null) {
+                    AnalysisError.shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
+                }
+            }
+        });
+    }
+
+    public void setOptionValue(OptionKey<?> optionKey, Object value) {
+        if (optionValues == null) {
+            parse(new String[0]);
+        }
+        optionKey.update((EconomicMap<OptionKey<?>, Object>) optionValues.getMap(), value);
+    }
+
+    public OptionValues parse(String[] args) {
+        List<String> remainingArgs = new ArrayList<>();
+        Set<String> errors = new HashSet<>();
+        for (String arg : args) {
+            boolean isAnalysisOption = false;
+            isAnalysisOption |= parseOption(CommonOptionParser.HOSTED_OPTION_PREFIX, allAnalysisOptions, analysisValues, PLUS_MINUS, errors, arg, System.out);
+            if (!isAnalysisOption) {
+                remainingArgs.add(arg);
+            }
+        }
+        optionValues = new OptionValues(analysisValues);
+        if (!remainingArgs.isEmpty()) {
+            AnalysisError.interruptAnalysis(String.format("Unknown options: %s", Arrays.toString(remainingArgs.toArray(new String[0]))));
+        }
+        if (!errors.isEmpty()) {
+            StringBuilder errMsg = new StringBuilder("Option format error:\n");
+            for (String err : errors) {
+                errMsg.append(err).append("\n");
+            }
+            AnalysisError.interruptAnalysis(errMsg.toString());
+        }
+        return optionValues;
+    }
+
+    private static boolean parseOption(String optionPrefix, EconomicMap<String, OptionDescriptor> options, EconomicMap<OptionKey<?>, Object> valuesMap,
+                    BooleanOptionFormat booleanOptionFormat, Set<String> errors, String arg, PrintStream out) {
+        if (!arg.startsWith(optionPrefix)) {
+            return false;
+        }
+        try {
+            Predicate<OptionKey<?>> optionKeyPredicate = optionKey -> {
+                Class<?> clazz = optionKey.getClass();
+                // All classes from com.oracle.graal.pointsto.api.PointstoOptions are taken as non-hosted options.
+                if (clazz.getName().startsWith("com.oracle.graal.pointsto.api.PointstoOptions")) {
+                    return false;
+                }
+                if (!clazz.equals(OptionKey.class) && OptionKey.class.isAssignableFrom(clazz)) {
+                    return true;
+                } else {
+                    return false;
+                }
+            };
+            OptionParseResult optionParseResult = CommonOptionParser.parseOption(options, optionKeyPredicate, arg.substring(optionPrefix.length()), valuesMap,
+                            optionPrefix, booleanOptionFormat);
+            if (optionParseResult.printFlags() || optionParseResult.printFlagsWithExtraHelp()) {
+                CommonOptionParser.printFlags(d -> optionParseResult.matchesFlags(d, () -> true), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
+                System.out.println("Abort analysis due to print flags are requested");
+                System.exit(1);
+            }
+            if (!optionParseResult.isValid()) {
+                errors.add(optionParseResult.getError());
+            }
+        } catch (UnsupportedOptionClassException e) {
+            AnalysisError.shouldNotReachHere(e);
+        }
+        return true;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
new file mode 100644
index 000000000000..823a67bee2c9
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
@@ -0,0 +1,522 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.common.option;
+
+// Checkstyle: allow reflection
+
+import com.oracle.svm.util.ClassUtil;
+import com.oracle.svm.util.StringUtil;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionType;
+import org.graalvm.compiler.options.OptionsParser;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+public class CommonOptionParser {
+    public static final String HOSTED_OPTION_PREFIX = "-H:";
+    public static final String RUNTIME_OPTION_PREFIX = "-R:";
+
+    public static final int PRINT_OPTION_INDENTATION = 2;
+    public static final int PRINT_OPTION_WIDTH = 45;
+    public static final int PRINT_OPTION_WRAP_WIDTH = 120;
+
+    /**
+     * The result of {@link CommonOptionParser#parseOption}.
+     */
+    public static final class OptionParseResult {
+        private final EnumSet<OptionType> printFlags;
+        private final Set<String> optionNameFilter;
+        private final String error;
+        private final OptionKey<?> optionKey;
+        private static final String EXTRA_HELP_OPTIONS_WILDCARD = "*";
+
+        OptionParseResult(EnumSet<OptionType> printFlags, String error, Set<String> optionNameFilter, OptionKey<?> optionKey) {
+            this.printFlags = printFlags;
+            this.error = error;
+            this.optionNameFilter = optionNameFilter;
+            this.optionKey = optionKey;
+        }
+
+        private OptionParseResult(EnumSet<OptionType> printFlags, String error, OptionKey<?> optionKey) {
+            this(printFlags, error, new HashSet<>(), optionKey);
+        }
+
+        static OptionParseResult error(String message) {
+            return new OptionParseResult(EnumSet.noneOf(OptionType.class), message, null);
+        }
+
+        static OptionParseResult correct(OptionKey<?> optionKey) {
+            return new OptionParseResult(EnumSet.noneOf(OptionType.class), null, optionKey);
+        }
+
+        static OptionParseResult printFlags(EnumSet<OptionType> selectedOptionTypes) {
+            return new OptionParseResult(selectedOptionTypes, null, null);
+        }
+
+        static OptionParseResult printFlagsWithExtraHelp(Set<String> optionNameFilter) {
+            Set<String> optionNames = optionNameFilter;
+            if (optionNames.contains(EXTRA_HELP_OPTIONS_WILDCARD)) {
+                optionNames = new HashSet<>();
+                optionNames.add(EXTRA_HELP_OPTIONS_WILDCARD);
+            }
+            return new OptionParseResult(EnumSet.noneOf(OptionType.class), null, optionNames, null);
+        }
+
+        public boolean printFlags() {
+            return !printFlags.isEmpty();
+        }
+
+        public boolean printFlagsWithExtraHelp() {
+            return !optionNameFilter.isEmpty();
+        }
+
+        public boolean isValid() {
+            boolean result = optionKey != null;
+            assert result == (printFlags.isEmpty() && optionNameFilter.isEmpty() && error == null);
+            return result;
+        }
+
+        public String getError() {
+            return error;
+        }
+
+        public OptionKey<?> getOptionKey() {
+            return optionKey;
+        }
+
+        public boolean matchesFlags(OptionDescriptor d, BooleanSupplier svmOption) {
+            if (!printFlags.isEmpty()) {
+                boolean showAll = printFlags.equals(EnumSet.allOf(OptionType.class));
+                return showAll || svmOption.getAsBoolean() && printFlags.contains(d.getOptionType());
+            }
+            if (!optionNameFilter.isEmpty()) {
+                if (optionNameFilter.contains(EXTRA_HELP_OPTIONS_WILDCARD) && !d.getExtraHelp().isEmpty()) {
+                    return true;
+                }
+                return optionNameFilter.contains(d.getName());
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Constants denoting supported boolean option formats.
+     */
+    public enum BooleanOptionFormat {
+        NAME_VALUE("<name>=<value>"),
+        PLUS_MINUS("+/-<name>");
+
+        BooleanOptionFormat(String help) {
+            this.help = help;
+        }
+
+        private final String help;
+
+        @Override
+        public String toString() {
+            return help;
+        }
+    }
+
+    public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescriptors, Consumer<OptionDescriptor> optionDescriptorConsumer) {
+        for (OptionDescriptors optionDescriptor : optionDescriptors) {
+            for (OptionDescriptor descriptor : optionDescriptor) {
+                optionDescriptorConsumer.accept(descriptor);
+            }
+        }
+    }
+
+    public static OptionParseResult parseOption(EconomicMap<String, OptionDescriptor> options, Predicate<OptionKey<?>> isHosted, String option, EconomicMap<OptionKey<?>, Object> valuesMap,
+                    String optionPrefix, BooleanOptionFormat booleanOptionFormat) throws UnsupportedOptionClassException {
+        if (option.length() == 0) {
+            return OptionParseResult.error("Option name must be specified");
+        }
+
+        String optionName;
+        Object value = null;
+        String valueString = null;
+
+        char first = option.charAt(0);
+        int eqIndex = option.indexOf('=');
+        if (first == '+' || first == '-') {
+            if (eqIndex != -1) {
+                return OptionParseResult.error("Cannot mix +/- with <name>=<value> format: '" + optionPrefix + option + "'");
+            }
+            optionName = option.substring(1);
+            if (booleanOptionFormat == BooleanOptionFormat.NAME_VALUE) {
+                return OptionParseResult.error("Option " + LocatableOption.from(optionName) + " must use <name>=<value> format, not +/- prefix");
+            }
+            value = (first == '+');
+        } else {
+            if (eqIndex == -1) {
+                optionName = option;
+                valueString = null;
+            } else {
+                optionName = option.substring(0, eqIndex);
+                valueString = option.substring(eqIndex + 1);
+            }
+        }
+
+        LocatableOption current = LocatableOption.from(optionName);
+        OptionDescriptor desc = options.get(current.name);
+        if (desc == null && value != null) {
+            if (eqIndex != -1) {
+                optionName = option.substring(1, eqIndex);
+                current = LocatableOption.from(optionName);
+                desc = options.get(current.name);
+            }
+        }
+
+        optionName = current.name;
+
+        if (desc == null) {
+            List<OptionDescriptor> matches = new ArrayList<>();
+            OptionsParser.collectFuzzyMatches(options.getValues(), optionName, matches);
+            StringBuilder msg = new StringBuilder("Could not find option ").append(current);
+            if (!matches.isEmpty()) {
+                msg.append(". Did you mean one of these:");
+                for (OptionDescriptor match : matches) {
+                    msg.append(' ').append(match.getName());
+                }
+            }
+            msg.append(". Use ").append(optionPrefix).append(CommonOptions.PrintFlags.getName()).append("= to list all available options.");
+            return OptionParseResult.error(msg.toString());
+        }
+
+        OptionKey<?> optionKey = desc.getOptionKey();
+        boolean hostedOption = isHosted.test(optionKey);
+        Class<?> optionValueType = getMultiOptionValueElementType(optionKey);
+        Class<?> optionType = hostedOption && optionValueType != null ? optionValueType : desc.getOptionValueType();
+
+        if (value == null) {
+            if (optionType == Boolean.class && booleanOptionFormat == BooleanOptionFormat.PLUS_MINUS) {
+                return OptionParseResult.error("Boolean option " + current + " must have +/- prefix");
+            }
+            if (valueString == null) {
+                return OptionParseResult.error("Missing value for option " + current);
+            }
+            try {
+                value = parseValue(optionType, current, valueString);
+                if (value instanceof OptionParseResult) {
+                    return (OptionParseResult) value;
+                }
+            } catch (NumberFormatException ex) {
+                return OptionParseResult.error("Invalid value for option " + current + ": '" + valueString + "' is not a valid number");
+            }
+        } else {
+            if (optionType != Boolean.class) {
+                return OptionParseResult.error("Non-boolean option " + current + " can not use +/- prefix. Use '" + current.name + "=<value>' format");
+            }
+        }
+
+        optionKey.update(valuesMap, hostedOption ? LocatableOption.value(value, current.origin) : value);
+
+        if (CommonOptions.PrintFlags.getName().equals(optionName)) {
+            String optionValue = (String) value;
+            EnumSet<OptionType> selectedOptionTypes;
+            if (optionValue.isEmpty()) {
+                selectedOptionTypes = EnumSet.allOf(OptionType.class);
+            } else {
+                selectedOptionTypes = EnumSet.noneOf(OptionType.class);
+                String enumString = null;
+                try {
+                    String[] enumStrings = StringUtil.split(optionValue, ",");
+
+                    for (String string : enumStrings) {
+                        enumString = string;
+                        selectedOptionTypes.add(OptionType.valueOf(enumString));
+                    }
+                } catch (IllegalArgumentException e) {
+                    StringBuilder sb = new StringBuilder();
+                    boolean firstValue = true;
+                    for (OptionType ot : OptionType.values()) {
+                        if (firstValue) {
+                            firstValue = false;
+                        } else {
+                            sb.append(", ");
+                        }
+                        sb.append(ot.name());
+                    }
+                    String possibleValues = sb.toString();
+                    return OptionParseResult.error("Invalid value for option " + current + ". '" + enumString + "' is not one of: " + possibleValues);
+                }
+            }
+            return OptionParseResult.printFlags(selectedOptionTypes);
+        }
+
+        if (CommonOptions.PrintFlagsWithExtraHelp.getName().equals(optionName)) {
+            String optionValue = (String) value;
+            String[] optionNames = StringUtil.split(optionValue, ",");
+            HashSet<String> selectedOptionNames = new HashSet<>(Arrays.asList(optionNames));
+            return OptionParseResult.printFlagsWithExtraHelp(selectedOptionNames);
+        }
+        return OptionParseResult.correct(optionKey);
+    }
+
+    @SuppressWarnings("unchecked")
+    static Object parseValue(Class<?> optionType, LocatableOption option, String valueString) throws NumberFormatException, UnsupportedOptionClassException {
+        Object value;
+        if (optionType == Integer.class) {
+            long longValue = parseLong(valueString);
+            if ((int) longValue != longValue) {
+                return OptionParseResult.error("Wrong value for option " + option + ": '" + valueString + "' is not a valid number");
+            }
+            value = (int) longValue;
+        } else if (optionType == Long.class) {
+            value = parseLong(valueString);
+        } else if (optionType == String.class) {
+            value = valueString;
+        } else if (optionType == Double.class) {
+            value = parseDouble(valueString);
+        } else if (optionType == Boolean.class) {
+            if (valueString.equals("true")) {
+                value = true;
+            } else if (valueString.equals("false")) {
+                value = false;
+            } else {
+                return OptionParseResult.error("Boolean option " + option + " must have value 'true' or 'false'");
+            }
+        } else if (optionType.isEnum()) {
+            value = Enum.valueOf(optionType.asSubclass(Enum.class), valueString);
+        } else {
+            throw new UnsupportedOptionClassException(option + " uses unsupported option value class: " + ClassUtil.getUnqualifiedName(optionType));
+        }
+        return value;
+    }
+
+    private static Class<?> getMultiOptionValueElementType(OptionKey<?> optionKey) {
+        Object defaultValue = optionKey.getDefaultValue();
+        if (defaultValue instanceof MultiOptionValue) {
+            return ((MultiOptionValue<?>) defaultValue).getValueType();
+        }
+        return null;
+    }
+
+    public static long parseLong(String v) {
+        String valueString = v.trim().toLowerCase();
+        long scale = 1;
+        if (valueString.endsWith("k")) {
+            scale = 1024L;
+        } else if (valueString.endsWith("m")) {
+            scale = 1024L * 1024L;
+        } else if (valueString.endsWith("g")) {
+            scale = 1024L * 1024L * 1024L;
+        } else if (valueString.endsWith("t")) {
+            scale = 1024L * 1024L * 1024L * 1024L;
+        }
+
+        if (scale != 1) {
+            /* Remove trailing scale character. */
+            valueString = valueString.substring(0, valueString.length() - 1);
+        }
+
+        return Long.parseLong(valueString) * scale;
+    }
+
+    /**
+     * Parses the provide string to a double number, avoiding the JDK dependencies (which pull in a
+     * lot of classes, including the regular expression library). Only simple numbers are supported,
+     * without fancy exponent styles.
+     */
+    public static double parseDouble(String v) {
+        String valueString = v.trim();
+
+        int dotPos = valueString.indexOf('.');
+        if (dotPos == -1) {
+            return parseLong(valueString);
+        }
+
+        String beforeDot = valueString.substring(0, dotPos);
+        String afterDot = valueString.substring(dotPos + 1);
+
+        double sign = 1;
+        if (beforeDot.startsWith("-")) {
+            sign = -1;
+            beforeDot = beforeDot.substring(1);
+        } else if (beforeDot.startsWith("+")) {
+            beforeDot = beforeDot.substring(1);
+        }
+
+        if (beforeDot.startsWith("-") || beforeDot.startsWith("+") || afterDot.startsWith("-") || afterDot.startsWith("+") ||
+                        (beforeDot.length() == 0 && afterDot.length() == 0)) {
+            throw new NumberFormatException(v);
+        }
+
+        double integral = 0;
+        if (beforeDot.length() > 0) {
+            integral = Long.parseLong(beforeDot);
+        }
+
+        double fraction = 0;
+        if (afterDot.length() > 0) {
+            fraction = Long.parseLong(afterDot) * Math.pow(10, -afterDot.length());
+        }
+
+        return sign * (integral + fraction);
+    }
+
+    private static String spaces(int length) {
+        return new String(new char[length]).replace('\0', ' ');
+    }
+
+    private static String wrap(String s, int width) {
+        StringBuilder sb = new StringBuilder(s);
+        int cursor = 0;
+        while (cursor + width < sb.length()) {
+            int i = sb.lastIndexOf(" ", cursor + width);
+            if (i == -1 || i < cursor) {
+                i = sb.indexOf(" ", cursor + width);
+            }
+            if (i != -1) {
+                sb.replace(i, i + 1, System.lineSeparator());
+                cursor = i;
+            } else {
+                break;
+            }
+        }
+        return sb.toString();
+    }
+
+    private static void printOption(PrintStream out, String option, String description, int wrap) {
+        printOption(out::println, option, description, PRINT_OPTION_INDENTATION, PRINT_OPTION_WIDTH, wrap);
+    }
+
+    public static void printOption(Consumer<String> println, String option, String description, int indentation, int optionWidth, int wrapWidth) {
+        String indent = spaces(indentation);
+        String desc = description != null ? description : "";
+        desc = wrapWidth > 0 ? wrap(desc, wrapWidth) : desc;
+        String nl = System.lineSeparator();
+        String[] descLines = StringUtil.split(desc, nl);
+        if (option.length() >= optionWidth && description != null) {
+            println.accept(indent + option + nl + indent + spaces(optionWidth) + descLines[0]);
+        } else {
+            println.accept(indent + option + spaces(optionWidth - option.length()) + descLines[0]);
+        }
+        for (int i = 1; i < descLines.length; i++) {
+            println.accept(indent + spaces(optionWidth) + descLines[i]);
+        }
+    }
+
+    public static void printFlags(Predicate<OptionDescriptor> filter, EconomicMap<String, OptionDescriptor> options, String prefix, PrintStream out, boolean verbose) {
+        List<OptionDescriptor> sortedDescriptors = new ArrayList<>();
+        for (OptionDescriptor option : options.getValues()) {
+            if (filter.test(option)) {
+                sortedDescriptors.add(option);
+            }
+        }
+        sortedDescriptors.sort(Comparator.comparing(OptionDescriptor::getName));
+
+        for (OptionDescriptor descriptor : sortedDescriptors) {
+            String helpMsg = verbose && !descriptor.getExtraHelp().isEmpty() ? "" : descriptor.getHelp();
+            int helpLen = helpMsg.length();
+            if (helpLen > 0 && helpMsg.charAt(helpLen - 1) != '.') {
+                helpMsg += '.';
+            }
+            boolean stringifiedArrayValue = false;
+            Object defaultValue = descriptor.getOptionKey().getDefaultValue();
+            if (defaultValue != null && defaultValue.getClass().isArray()) {
+                Object[] defaultValues = (Object[]) defaultValue;
+                if (defaultValues.length == 1) {
+                    defaultValue = defaultValues[0];
+                } else {
+                    List<String> stringList = new ArrayList<>();
+                    String optionPrefix = prefix + descriptor.getName() + "=";
+                    for (Object rawValue : defaultValues) {
+                        String value;
+                        if (rawValue instanceof String) {
+                            value = '"' + String.valueOf(rawValue) + '"';
+                        } else {
+                            value = String.valueOf(rawValue);
+                        }
+                        stringList.add(optionPrefix + value);
+                    }
+                    if (helpLen != 0) {
+                        helpMsg += ' ';
+                    }
+                    helpMsg += "Default: ";
+                    if (stringList.isEmpty()) {
+                        helpMsg += "None";
+                    } else {
+                        helpMsg += String.join(" ", stringList);
+                    }
+                    stringifiedArrayValue = true;
+                }
+            }
+            String verboseHelp = "";
+            if (verbose) {
+                verboseHelp = System.lineSeparator() + descriptor.getHelp() + System.lineSeparator() + String.join(System.lineSeparator(), descriptor.getExtraHelp());
+            } else if (!descriptor.getExtraHelp().isEmpty()) {
+                verboseHelp = " [Extra help available]";
+            }
+            int wrapWidth = verbose ? 0 : PRINT_OPTION_WRAP_WIDTH;
+            if (descriptor.getOptionValueType() == Boolean.class) {
+                Boolean val = (Boolean) defaultValue;
+                if (helpLen != 0) {
+                    helpMsg += ' ';
+                }
+                if (val != null) {
+                    if (val) {
+                        helpMsg += "Default: + (enabled).";
+                    } else {
+                        helpMsg += "Default: - (disabled).";
+                    }
+                }
+                printOption(out, prefix + "\u00b1" + descriptor.getName(), helpMsg + verboseHelp, wrapWidth);
+            } else {
+                if (defaultValue == null) {
+                    if (helpLen != 0) {
+                        helpMsg += ' ';
+                    }
+                    helpMsg += "Default: None";
+                }
+                helpMsg += verboseHelp;
+                if (stringifiedArrayValue || defaultValue == null) {
+                    printOption(out, prefix + descriptor.getName() + "=...", helpMsg, wrapWidth);
+                } else {
+                    if (defaultValue instanceof String) {
+                        defaultValue = '"' + String.valueOf(defaultValue) + '"';
+                    }
+                    printOption(out, prefix + descriptor.getName() + "=" + defaultValue, helpMsg, wrapWidth);
+                }
+            }
+        }
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
new file mode 100644
index 000000000000..6b2f9e88b5d6
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.common.option;
+
+import org.graalvm.compiler.options.Option;
+import org.graalvm.compiler.options.OptionKey;
+
+public class CommonOptions {
+
+    @Option(help = "Show available options based on comma-separated option-types (allowed categories: User, Expert, Debug).")//
+    public static final OptionKey<String> PrintFlags = new OptionKey<>(null);
+
+    @Option(help = "Print extra help, if available, based on comma-separated option names. Pass * to show all options that contain extra help.")//
+    public static final OptionKey<String> PrintFlagsWithExtraHelp = new OptionKey<>(null);
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableOption.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/LocatableOption.java
similarity index 96%
rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableOption.java
rename to substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/LocatableOption.java
index d675521de43d..62927c9a3a31 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableOption.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/LocatableOption.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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,7 +23,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.option;
+package com.oracle.svm.common.option;
 
 public final class LocatableOption {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/MultiOptionValue.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
similarity index 84%
rename from substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/MultiOptionValue.java
rename to substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
index ad6207f9036e..0f678439903c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/MultiOptionValue.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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,11 +23,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.option;
+package com.oracle.svm.common.option;
 
 import java.util.List;
 
-interface MultiOptionValue<T> {
+public interface MultiOptionValue<T> {
 
     Class<T> getValueType();
 
@@ -34,7 +35,7 @@ interface MultiOptionValue<T> {
      * @return a list of option values, one for each place where the option is used
      * @implSpec Note that it DOES NOT perform any splitting of string values based on a delimiter.
      *           If you want to perform this split, use a utility
-     *           {@link OptionUtils#flatten(String, LocatableMultiOptionValue.Strings)}
+     *           {@link com.oracle.svm.core.option.OptionUtils#flatten(String, com.oracle.svm.core.option.LocatableMultiOptionValue.Strings)}
      */
     List<T> values();
 
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/OptionParsingException.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/OptionParsingException.java
new file mode 100644
index 000000000000..87e2d281bdd8
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/OptionParsingException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.common.option;
+
+public class OptionParsingException extends Exception {
+    private static final long serialVersionUID = 1413275434484971842L;
+
+    public OptionParsingException(Exception e) {
+        super(e);
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/UnsupportedOptionClassException.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/UnsupportedOptionClassException.java
new file mode 100644
index 000000000000..c92195df9443
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/UnsupportedOptionClassException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.common.option;
+
+public class UnsupportedOptionClassException extends Exception {
+    private static final long serialVersionUID = -3105370072461246590L;
+
+    public UnsupportedOptionClassException(String msg) {
+        super(msg);
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index 399eb506bfe0..0ceb845846fa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -125,12 +125,6 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
     private static ValueUpdateHandler optimizeValueUpdateHandler;
     private static ValueUpdateHandler debugInfoValueUpdateHandler = SubstrateOptions::defaultDebugInfoValueUpdateHandler;
 
-    @Option(help = "Show available options based on comma-separated option-types (allowed categories: User, Expert, Debug).")//
-    public static final OptionKey<String> PrintFlags = new OptionKey<>(null);
-
-    @Option(help = "Print extra help, if available, based on comma-separated option names. Pass * to show all options that contain extra help.")//
-    public static final OptionKey<String> PrintFlagsWithExtraHelp = new OptionKey<>(null);
-
     @Option(help = "Control native-image code optimizations: 0 - no optimizations, 1 - basic optimizations, 2 - aggressive optimizations.", type = OptionType.User)//
     public static final HostedOptionKey<Integer> Optimize = new HostedOptionKey<Integer>(2) {
         @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
index 0cb5e35fdeb1..fc52b1c7a2d7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
@@ -34,11 +34,11 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.oracle.svm.util.StringUtil;
 import org.graalvm.compiler.graph.Node.NodeIntrinsic;
 import org.graalvm.compiler.java.LambdaUtils;
 import org.graalvm.compiler.nodes.BreakpointNode;
@@ -270,31 +270,7 @@ public static String[] split(String value, String separator) {
      * regular expression. This avoids making regular expression code reachable.
      */
     public static String[] split(String value, String separator, int limit) {
-        int offset = 0;
-        int next;
-        ArrayList<String> list = null;
-        while ((next = value.indexOf(separator, offset)) != -1) {
-            if (list == null) {
-                list = new ArrayList<>();
-            }
-            boolean limited = limit > 0;
-            if (!limited || list.size() < limit - 1) {
-                list.add(value.substring(offset, next));
-                offset = next + separator.length();
-            } else {
-                break;
-            }
-        }
-
-        if (offset == 0) {
-            /* No match found. */
-            return new String[]{value};
-        }
-
-        /* Add remaining segment. */
-        list.add(value.substring(offset));
-
-        return list.toArray(new String[list.size()]);
+        return StringUtil.split(value, separator, limit);
     }
 
     public static String toHex(byte[] data) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
index 70c23993eec9..4816367709d2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.option;
 
+import com.oracle.svm.common.option.LocatableOption;
+import com.oracle.svm.common.option.MultiOptionValue;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.options.Option;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java
index bf43136b21d2..176087b6115f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/LocatableMultiOptionValue.java
@@ -29,6 +29,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.oracle.svm.common.option.LocatableOption;
+import com.oracle.svm.common.option.MultiOptionValue;
 import org.graalvm.collections.Pair;
 
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
index ff5a104b6fe2..9dc6007070c4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
@@ -41,8 +41,8 @@
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.log.Log;
-import com.oracle.svm.core.option.SubstrateOptionsParser.BooleanOptionFormat;
-import com.oracle.svm.core.option.SubstrateOptionsParser.OptionParseResult;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
 import com.oracle.svm.core.properties.RuntimePropertyParser;
 import com.oracle.svm.core.util.ImageHeapMap;
 
@@ -163,7 +163,8 @@ private void parseOptionAtRuntime(String arg, String optionPrefix, BooleanOption
         Predicate<OptionKey<?>> isHosted = optionKey -> false;
         OptionParseResult parseResult = SubstrateOptionsParser.parseOption(options, isHosted, arg.substring(optionPrefix.length()), values, optionPrefix, booleanOptionFormat);
         if (parseResult.printFlags() || parseResult.printFlagsWithExtraHelp()) {
-            SubstrateOptionsParser.printFlags(parseResult::matchesFlagsRuntime, options, optionPrefix, Log.logStream(), parseResult.printFlagsWithExtraHelp());
+            SubstrateOptionsParser.printFlags(d -> parseResult.matchesFlags(d, () -> d.getOptionKey() instanceof RuntimeOptionKey),
+                            options, optionPrefix, Log.logStream(), parseResult.printFlagsWithExtraHelp());
             System.exit(0);
         }
         if (!parseResult.isValid()) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index f049bd43c7e9..81436ccd784c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -26,31 +26,28 @@
 
 // Checkstyle: allow reflection
 
+import com.oracle.svm.core.util.InterruptImageBuilding;
+import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.common.option.CommonOptionParser;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
 import java.io.PrintStream;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
+import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionsParser;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
-import com.oracle.svm.core.SubstrateOptions;
-import com.oracle.svm.core.SubstrateUtil;
-import com.oracle.svm.core.util.InterruptImageBuilding;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.util.ClassUtil;
+import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
 /**
  * This class contains methods for parsing options and matching them against
@@ -58,283 +55,17 @@
  */
 public class SubstrateOptionsParser {
 
-    public static final String HOSTED_OPTION_PREFIX = "-H:";
-    public static final String RUNTIME_OPTION_PREFIX = "-R:";
-    public static final int PRINT_OPTION_INDENTATION = 2;
-    public static final int PRINT_OPTION_WIDTH = 45;
-    public static final int PRINT_OPTION_WRAP_WIDTH = 120;
-
-    /**
-     * The result of {@link SubstrateOptionsParser#parseOption}.
-     */
-    static final class OptionParseResult {
-        private final EnumSet<OptionType> printFlags;
-        private final Set<String> optionNameFilter;
-        private final String error;
-        private final OptionKey<?> optionKey;
-        private static final String EXTRA_HELP_OPTIONS_WILDCARD = "*";
-
-        private OptionParseResult(EnumSet<OptionType> printFlags, String error, Set<String> optionNameFilter, OptionKey<?> optionKey) {
-            this.printFlags = printFlags;
-            this.error = error;
-            this.optionNameFilter = optionNameFilter;
-            this.optionKey = optionKey;
-        }
-
-        private OptionParseResult(EnumSet<OptionType> printFlags, String error, OptionKey<?> optionKey) {
-            this(printFlags, error, new HashSet<>(), optionKey);
-        }
-
-        static OptionParseResult error(String message) {
-            return new OptionParseResult(EnumSet.noneOf(OptionType.class), message, null);
-        }
-
-        static OptionParseResult correct(OptionKey<?> optionKey) {
-            return new OptionParseResult(EnumSet.noneOf(OptionType.class), null, optionKey);
-        }
-
-        static OptionParseResult printFlags(EnumSet<OptionType> selectedOptionTypes) {
-            return new OptionParseResult(selectedOptionTypes, null, null);
-        }
-
-        static OptionParseResult printFlagsWithExtraHelp(Set<String> optionNameFilter) {
-            Set<String> optionNames = optionNameFilter;
-            if (optionNames.contains(EXTRA_HELP_OPTIONS_WILDCARD)) {
-                optionNames = new HashSet<>();
-                optionNames.add(EXTRA_HELP_OPTIONS_WILDCARD);
-            }
-            return new OptionParseResult(EnumSet.noneOf(OptionType.class), null, optionNames, null);
-        }
-
-        boolean printFlags() {
-            return !printFlags.isEmpty();
-        }
-
-        boolean printFlagsWithExtraHelp() {
-            return !optionNameFilter.isEmpty();
-        }
-
-        public boolean isValid() {
-            boolean result = optionKey != null;
-            assert result == (printFlags.isEmpty() && optionNameFilter.isEmpty() && error == null);
-            return result;
-        }
-
-        public String getError() {
-            return error;
-        }
-
-        public OptionKey<?> getOptionKey() {
-            return optionKey;
-        }
-
-        private boolean matchesFlags(OptionDescriptor d, boolean svmOption) {
-            if (!printFlags.isEmpty()) {
-                boolean showAll = printFlags.equals(EnumSet.allOf(OptionType.class));
-                return showAll || svmOption && printFlags.contains(d.getOptionType());
-            }
-            if (!optionNameFilter.isEmpty()) {
-                if (optionNameFilter.contains(EXTRA_HELP_OPTIONS_WILDCARD) && !d.getExtraHelp().isEmpty()) {
-                    return true;
-                }
-                return optionNameFilter.contains(d.getName());
-            }
-            return false;
-        }
-
-        boolean matchesFlagsRuntime(OptionDescriptor d) {
-            return matchesFlags(d, d.getOptionKey() instanceof RuntimeOptionKey);
-        }
-
-        boolean matchesFlagsHosted(OptionDescriptor d) {
-            OptionKey<?> key = d.getOptionKey();
-            return matchesFlags(d, key instanceof RuntimeOptionKey || key instanceof HostedOptionKey);
-        }
-    }
-
-    /**
-     * Constants denoting supported boolean option formats.
-     */
-    public enum BooleanOptionFormat {
-        NAME_VALUE("<name>=<value>"),
-        PLUS_MINUS("+/-<name>");
-
-        BooleanOptionFormat(String help) {
-            this.help = help;
-        }
-
-        private final String help;
-
-        @Override
-        public String toString() {
-            return help;
-        }
-    }
+    public static final String HOSTED_OPTION_PREFIX = CommonOptionParser.HOSTED_OPTION_PREFIX;
+    public static final String RUNTIME_OPTION_PREFIX = CommonOptionParser.RUNTIME_OPTION_PREFIX;
 
     static OptionParseResult parseOption(EconomicMap<String, OptionDescriptor> options, Predicate<OptionKey<?>> isHosted, String option, EconomicMap<OptionKey<?>, Object> valuesMap,
                     String optionPrefix, BooleanOptionFormat booleanOptionFormat) {
-        if (option.length() == 0) {
-            return OptionParseResult.error("Option name must be specified");
-        }
-
-        String optionName;
-        Object value = null;
-        String valueString = null;
-
-        char first = option.charAt(0);
-        int eqIndex = option.indexOf('=');
-        if (first == '+' || first == '-') {
-            if (eqIndex != -1) {
-                return OptionParseResult.error("Cannot mix +/- with <name>=<value> format: '" + optionPrefix + option + "'");
-            }
-            optionName = option.substring(1);
-            if (booleanOptionFormat == BooleanOptionFormat.NAME_VALUE) {
-                return OptionParseResult.error("Option " + LocatableOption.from(optionName) + " must use <name>=<value> format, not +/- prefix");
-            }
-            value = (first == '+');
-        } else {
-            if (eqIndex == -1) {
-                optionName = option;
-                valueString = null;
-            } else {
-                optionName = option.substring(0, eqIndex);
-                valueString = option.substring(eqIndex + 1);
-            }
-        }
-
-        LocatableOption current = LocatableOption.from(optionName);
-        OptionDescriptor desc = options.get(current.name);
-        if (desc == null && value != null) {
-            if (eqIndex != -1) {
-                optionName = option.substring(1, eqIndex);
-                current = LocatableOption.from(optionName);
-                desc = options.get(current.name);
-            }
-        }
-
-        optionName = current.name;
-
-        if (desc == null) {
-            List<OptionDescriptor> matches = new ArrayList<>();
-            OptionsParser.collectFuzzyMatches(options.getValues(), optionName, matches);
-            StringBuilder msg = new StringBuilder("Could not find option ").append(current);
-            if (!matches.isEmpty()) {
-                msg.append(". Did you mean one of these:");
-                for (OptionDescriptor match : matches) {
-                    msg.append(' ').append(match.getName());
-                }
-            }
-            msg.append(". Use ").append(optionPrefix).append(SubstrateOptions.PrintFlags.getName()).append("= to list all available options.");
-            return OptionParseResult.error(msg.toString());
-        }
-
-        OptionKey<?> optionKey = desc.getOptionKey();
-        boolean hostedOption = isHosted.test(optionKey);
-        Class<?> optionValueType = getMultiOptionValueElementType(optionKey);
-        Class<?> optionType = hostedOption && optionValueType != null ? optionValueType : desc.getOptionValueType();
-
-        if (value == null) {
-            if (optionType == Boolean.class && booleanOptionFormat == BooleanOptionFormat.PLUS_MINUS) {
-                return OptionParseResult.error("Boolean option " + current + " must have +/- prefix");
-            }
-            if (valueString == null) {
-                return OptionParseResult.error("Missing value for option " + current);
-            }
-            try {
-                value = parseValue(optionType, current, valueString);
-                if (value instanceof OptionParseResult) {
-                    return (OptionParseResult) value;
-                }
-            } catch (NumberFormatException ex) {
-                return OptionParseResult.error("Invalid value for option " + current + ": '" + valueString + "' is not a valid number");
-            }
-        } else {
-            if (optionType != Boolean.class) {
-                return OptionParseResult.error("Non-boolean option " + current + " can not use +/- prefix. Use '" + current.name + "=<value>' format");
-            }
-        }
-
-        optionKey.update(valuesMap, hostedOption ? LocatableOption.value(value, current.origin) : value);
-
-        if (SubstrateOptions.PrintFlags.getName().equals(optionName)) {
-            String optionValue = (String) value;
-            EnumSet<OptionType> selectedOptionTypes;
-            if (optionValue.isEmpty()) {
-                selectedOptionTypes = EnumSet.allOf(OptionType.class);
-            } else {
-                selectedOptionTypes = EnumSet.noneOf(OptionType.class);
-                String enumString = null;
-                try {
-                    String[] enumStrings = SubstrateUtil.split(optionValue, ",");
-
-                    for (String string : enumStrings) {
-                        enumString = string;
-                        selectedOptionTypes.add(OptionType.valueOf(enumString));
-                    }
-                } catch (IllegalArgumentException e) {
-                    StringBuilder sb = new StringBuilder();
-                    boolean firstValue = true;
-                    for (OptionType ot : OptionType.values()) {
-                        if (firstValue) {
-                            firstValue = false;
-                        } else {
-                            sb.append(", ");
-                        }
-                        sb.append(ot.name());
-                    }
-                    String possibleValues = sb.toString();
-                    return OptionParseResult.error("Invalid value for option " + current + ". '" + enumString + "' is not one of: " + possibleValues);
-                }
-            }
-            return OptionParseResult.printFlags(selectedOptionTypes);
-        }
-        if (SubstrateOptions.PrintFlagsWithExtraHelp.getName().equals(optionName)) {
-            String optionValue = (String) value;
-            String[] optionNames = SubstrateUtil.split(optionValue, ",");
-            HashSet<String> selectedOptionNames = new HashSet<>(Arrays.asList(optionNames));
-            return OptionParseResult.printFlagsWithExtraHelp(selectedOptionNames);
-        }
-
-        return OptionParseResult.correct(optionKey);
-    }
-
-    private static Class<?> getMultiOptionValueElementType(OptionKey<?> optionKey) {
-        Object defaultValue = optionKey.getDefaultValue();
-        if (defaultValue instanceof MultiOptionValue) {
-            return ((MultiOptionValue<?>) defaultValue).getValueType();
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    static Object parseValue(Class<?> optionType, LocatableOption option, String valueString) throws NumberFormatException {
-        Object value;
-        if (optionType == Integer.class) {
-            long longValue = parseLong(valueString);
-            if ((int) longValue != longValue) {
-                return OptionParseResult.error("Wrong value for option " + option + ": '" + valueString + "' is not a valid number");
-            }
-            value = (int) longValue;
-        } else if (optionType == Long.class) {
-            value = parseLong(valueString);
-        } else if (optionType == String.class) {
-            value = valueString;
-        } else if (optionType == Double.class) {
-            value = parseDouble(valueString);
-        } else if (optionType == Boolean.class) {
-            if (valueString.equals("true")) {
-                value = true;
-            } else if (valueString.equals("false")) {
-                value = false;
-            } else {
-                return OptionParseResult.error("Boolean option " + option + " must have value 'true' or 'false'");
-            }
-        } else if (optionType.isEnum()) {
-            value = Enum.valueOf(optionType.asSubclass(Enum.class), valueString);
-        } else {
-            throw VMError.shouldNotReachHere(option + " uses unsupported option value class: " + ClassUtil.getUnqualifiedName(optionType));
+        try {
+            return CommonOptionParser.parseOption(options, isHosted, option, valuesMap, optionPrefix, booleanOptionFormat);
+        } catch (UnsupportedOptionClassException e) {
+            VMError.shouldNotReachHere(e.getMessage());
+            return null;
         }
-        return value;
     }
 
     /**
@@ -359,7 +90,10 @@ public static boolean parseHostedOption(String optionPrefix, EconomicMap<String,
         OptionParseResult optionParseResult = SubstrateOptionsParser.parseOption(options, isHosted, arg.substring(optionPrefix.length()), valuesMap,
                         optionPrefix, booleanOptionFormat);
         if (optionParseResult.printFlags() || optionParseResult.printFlagsWithExtraHelp()) {
-            SubstrateOptionsParser.printFlags(optionParseResult::matchesFlagsHosted, options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
+            SubstrateOptionsParser.printFlags(d -> optionParseResult.matchesFlags(d, () -> {
+                OptionKey<?> key = d.getOptionKey();
+                return key instanceof RuntimeOptionKey || key instanceof HostedOptionKey;
+            }), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
             throw new InterruptImageBuilding("");
         }
         if (!optionParseResult.isValid()) {
@@ -383,46 +117,12 @@ public static boolean parseHostedOption(String optionPrefix, EconomicMap<String,
         return true;
     }
 
-    private static String spaces(int length) {
-        return new String(new char[length]).replace('\0', ' ');
-    }
-
-    private static String wrap(String s, int width) {
-        StringBuilder sb = new StringBuilder(s);
-        int cursor = 0;
-        while (cursor + width < sb.length()) {
-            int i = sb.lastIndexOf(" ", cursor + width);
-            if (i == -1 || i < cursor) {
-                i = sb.indexOf(" ", cursor + width);
-            }
-            if (i != -1) {
-                sb.replace(i, i + 1, System.lineSeparator());
-                cursor = i;
-            } else {
-                break;
-            }
-        }
-        return sb.toString();
-    }
-
-    private static void printOption(PrintStream out, String option, String description, int wrap) {
-        printOption(out::println, option, description, PRINT_OPTION_INDENTATION, PRINT_OPTION_WIDTH, wrap);
+    public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescriptors, Consumer<OptionDescriptor> optionDescriptorConsumer) {
+        CommonOptionParser.collectOptions(optionDescriptors, optionDescriptorConsumer);
     }
 
     public static void printOption(Consumer<String> println, String option, String description, int indentation, int optionWidth, int wrapWidth) {
-        String indent = spaces(indentation);
-        String desc = description != null ? description : "";
-        desc = wrapWidth > 0 ? wrap(desc, wrapWidth) : desc;
-        String nl = System.lineSeparator();
-        String[] descLines = SubstrateUtil.split(desc, nl);
-        if (option.length() >= optionWidth && description != null) {
-            println.accept(indent + option + nl + indent + spaces(optionWidth) + descLines[0]);
-        } else {
-            println.accept(indent + option + spaces(optionWidth - option.length()) + descLines[0]);
-        }
-        for (int i = 1; i < descLines.length; i++) {
-            println.accept(indent + spaces(optionWidth) + descLines[i]);
-        }
+        CommonOptionParser.printOption(println, option, description, indentation, optionWidth, wrapWidth);
     }
 
     /**
@@ -441,151 +141,15 @@ public static void printOption(Consumer<String> println, String option, String d
      * between space and execution efficiency is acceptable.
      */
     static void printFlags(Predicate<OptionDescriptor> filter, EconomicMap<String, OptionDescriptor> options, String prefix, PrintStream out, boolean verbose) {
-        List<OptionDescriptor> sortedDescriptors = new ArrayList<>();
-        for (OptionDescriptor option : options.getValues()) {
-            if (filter.test(option)) {
-                sortedDescriptors.add(option);
-            }
-        }
-        sortedDescriptors.sort(Comparator.comparing(OptionDescriptor::getName));
-
-        for (OptionDescriptor descriptor : sortedDescriptors) {
-            String helpMsg = verbose && !descriptor.getExtraHelp().isEmpty() ? "" : descriptor.getHelp();
-            int helpLen = helpMsg.length();
-            if (helpLen > 0 && helpMsg.charAt(helpLen - 1) != '.') {
-                helpMsg += '.';
-            }
-            boolean stringifiedArrayValue = false;
-            Object defaultValue = descriptor.getOptionKey().getDefaultValue();
-            if (defaultValue != null && defaultValue.getClass().isArray()) {
-                Object[] defaultValues = (Object[]) defaultValue;
-                if (defaultValues.length == 1) {
-                    defaultValue = defaultValues[0];
-                } else {
-                    List<String> stringList = new ArrayList<>();
-                    String optionPrefix = prefix + descriptor.getName() + "=";
-                    for (Object rawValue : defaultValues) {
-                        String value;
-                        if (rawValue instanceof String) {
-                            value = '"' + String.valueOf(rawValue) + '"';
-                        } else {
-                            value = String.valueOf(rawValue);
-                        }
-                        stringList.add(optionPrefix + value);
-                    }
-                    if (helpLen != 0) {
-                        helpMsg += ' ';
-                    }
-                    helpMsg += "Default: ";
-                    if (stringList.isEmpty()) {
-                        helpMsg += "None";
-                    } else {
-                        helpMsg += String.join(" ", stringList);
-                    }
-                    stringifiedArrayValue = true;
-                }
-            }
-            String verboseHelp = "";
-            if (verbose) {
-                verboseHelp = System.lineSeparator() + descriptor.getHelp() + System.lineSeparator() + String.join(System.lineSeparator(), descriptor.getExtraHelp());
-            } else if (!descriptor.getExtraHelp().isEmpty()) {
-                verboseHelp = " [Extra help available]";
-            }
-            int wrapWidth = verbose ? 0 : PRINT_OPTION_WRAP_WIDTH;
-            if (descriptor.getOptionValueType() == Boolean.class) {
-                Boolean val = (Boolean) defaultValue;
-                if (helpLen != 0) {
-                    helpMsg += ' ';
-                }
-                if (val != null) {
-                    if (val) {
-                        helpMsg += "Default: + (enabled).";
-                    } else {
-                        helpMsg += "Default: - (disabled).";
-                    }
-                }
-                printOption(out, prefix + "\u00b1" + descriptor.getName(), helpMsg + verboseHelp, wrapWidth);
-            } else {
-                if (defaultValue == null) {
-                    if (helpLen != 0) {
-                        helpMsg += ' ';
-                    }
-                    helpMsg += "Default: None";
-                }
-                helpMsg += verboseHelp;
-                if (stringifiedArrayValue || defaultValue == null) {
-                    printOption(out, prefix + descriptor.getName() + "=...", helpMsg, wrapWidth);
-                } else {
-                    if (defaultValue instanceof String) {
-                        defaultValue = '"' + String.valueOf(defaultValue) + '"';
-                    }
-                    printOption(out, prefix + descriptor.getName() + "=" + defaultValue, helpMsg, wrapWidth);
-                }
-            }
-        }
+        CommonOptionParser.printFlags(filter, options, prefix, out, verbose);
     }
 
     public static long parseLong(String v) {
-        String valueString = v.trim().toLowerCase();
-        long scale = 1;
-        if (valueString.endsWith("k")) {
-            scale = 1024L;
-        } else if (valueString.endsWith("m")) {
-            scale = 1024L * 1024L;
-        } else if (valueString.endsWith("g")) {
-            scale = 1024L * 1024L * 1024L;
-        } else if (valueString.endsWith("t")) {
-            scale = 1024L * 1024L * 1024L * 1024L;
-        }
-
-        if (scale != 1) {
-            /* Remove trailing scale character. */
-            valueString = valueString.substring(0, valueString.length() - 1);
-        }
-
-        return Long.parseLong(valueString) * scale;
+        return CommonOptionParser.parseLong(v);
     }
 
-    /**
-     * Parses the provide string to a double number, avoiding the JDK dependencies (which pull in a
-     * lot of classes, including the regular expression library). Only simple numbers are supported,
-     * without fancy exponent styles.
-     */
     public static double parseDouble(String v) {
-        String valueString = v.trim();
-
-        int dotPos = valueString.indexOf('.');
-        if (dotPos == -1) {
-            return parseLong(valueString);
-        }
-
-        String beforeDot = valueString.substring(0, dotPos);
-        String afterDot = valueString.substring(dotPos + 1);
-
-        double sign = 1;
-        if (beforeDot.startsWith("-")) {
-            sign = -1;
-            beforeDot = beforeDot.substring(1);
-        } else if (beforeDot.startsWith("+")) {
-            beforeDot = beforeDot.substring(1);
-        }
-
-        if (beforeDot.startsWith("-") || beforeDot.startsWith("+") || afterDot.startsWith("-") || afterDot.startsWith("+") ||
-                        (beforeDot.length() == 0 && afterDot.length() == 0)) {
-            throw new NumberFormatException(v);
-        }
-
-        double integral = 0;
-        if (beforeDot.length() > 0) {
-            integral = Long.parseLong(beforeDot);
-        }
-
-        double fraction = 0;
-        if (afterDot.length() > 0) {
-            fraction = Long.parseLong(afterDot) * Math.pow(10, -afterDot.length());
-        }
-
-        return sign * (integral + fraction);
+        return CommonOptionParser.parseDouble(v);
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index 1373baa0d0c9..c7c7e5b08aa8 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -64,6 +64,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.oracle.svm.common.option.CommonOptions;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
@@ -188,8 +189,8 @@ void addFallbackBuildArgs(@SuppressWarnings("unused") List<String> buildArgs) {
     public static final String oH = "-H:";
     static final String oR = "-R:";
 
-    final String enablePrintFlags = SubstrateOptions.PrintFlags.getName();
-    final String enablePrintFlagsWithExtraHelp = SubstrateOptions.PrintFlagsWithExtraHelp.getName();
+    final String enablePrintFlags = CommonOptions.PrintFlags.getName();
+    final String enablePrintFlagsWithExtraHelp = CommonOptions.PrintFlagsWithExtraHelp.getName();
 
     private static <T> String oH(OptionKey<T> option) {
         return oH + option.getName() + "=";
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
index f5e2a1b5d56f..193c309a935a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.config;
 
-import static com.oracle.svm.core.SubstrateOptions.PrintFlags;
+import static com.oracle.svm.common.option.CommonOptions.PrintFlags;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
index 657da655ed43..e9a795dc44a3 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.option;
 
-import static com.oracle.svm.core.option.SubstrateOptionsParser.BooleanOptionFormat.PLUS_MINUS;
+import static com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat.PLUS_MINUS;
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
 import java.util.ArrayList;
@@ -59,30 +59,28 @@ public HostedOptionParser(ClassLoader imageClassLoader) {
     }
 
     public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescriptors, EconomicMap<String, OptionDescriptor> allHostedOptions,
-                    EconomicMap<String, OptionDescriptor> allRuntimeOptions) {
-        for (OptionDescriptors optionDescriptor : optionDescriptors) {
-            for (OptionDescriptor descriptor : optionDescriptor) {
-                String name = descriptor.getName();
-
-                if (descriptor.getDeclaringClass().getAnnotation(Platforms.class) != null) {
-                    throw UserError.abort("Options must not be declared in a class that has a @%s annotation: option %s declared in %s",
-                                    Platforms.class.getSimpleName(), name, descriptor.getDeclaringClass().getTypeName());
-                }
+                                      EconomicMap<String, OptionDescriptor> allRuntimeOptions) {
+        SubstrateOptionsParser.collectOptions(optionDescriptors, descriptor -> {
+            String name = descriptor.getName();
+
+            if (descriptor.getDeclaringClass().getAnnotation(Platforms.class) != null) {
+                throw UserError.abort("Options must not be declared in a class that has a @%s annotation: option %s declared in %s",
+                        Platforms.class.getSimpleName(), name, descriptor.getDeclaringClass().getTypeName());
+            }
 
-                if (!(descriptor.getOptionKey() instanceof RuntimeOptionKey)) {
-                    OptionDescriptor existing = allHostedOptions.put(name, descriptor);
-                    if (existing != null) {
-                        throw shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
-                    }
+            if (!(descriptor.getOptionKey() instanceof RuntimeOptionKey)) {
+                OptionDescriptor existing = allHostedOptions.put(name, descriptor);
+                if (existing != null) {
+                    throw shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
                 }
-                if (!(descriptor.getOptionKey() instanceof HostedOptionKey)) {
-                    OptionDescriptor existing = allRuntimeOptions.put(name, descriptor);
-                    if (existing != null) {
-                        throw shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
-                    }
+            }
+            if (!(descriptor.getOptionKey() instanceof HostedOptionKey)) {
+                OptionDescriptor existing = allRuntimeOptions.put(name, descriptor);
+                if (existing != null) {
+                    throw shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
                 }
             }
-        }
+        });
     }
 
     public List<String> parse(List<String> args) {
diff --git a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/StringUtil.java b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/StringUtil.java
new file mode 100644
index 000000000000..602484d32ab5
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/StringUtil.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2021, Alibaba Group Holding Limited. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.svm.util;
+
+import java.util.ArrayList;
+
+public class StringUtil {
+
+    /**
+     * Similar to {@link String#split(String)} but with a fixed separator string instead of a
+     * regular expression. This avoids making regular expression code reachable.
+     */
+    public static String[] split(String value, String separator) {
+        return split(value, separator, 0);
+    }
+
+    /**
+     * Similar to {@link String#split(String, int)} but with a fixed separator string instead of a
+     * regular expression. This avoids making regular expression code reachable.
+     */
+    public static String[] split(String value, String separator, int limit) {
+        int offset = 0;
+        int next;
+        ArrayList<String> list = null;
+        while ((next = value.indexOf(separator, offset)) != -1) {
+            if (list == null) {
+                list = new ArrayList<>();
+            }
+            boolean limited = limit > 0;
+            if (!limited || list.size() < limit - 1) {
+                list.add(value.substring(offset, next));
+                offset = next + separator.length();
+            } else {
+                break;
+            }
+        }
+
+        if (offset == 0) {
+            /* No match found. */
+            return new String[]{value};
+        }
+
+        /* Add remaining segment. */
+        list.add(value.substring(offset));
+
+        return list.toArray(new String[list.size()]);
+    }
+}

From f4fb25aac09632ea7c695e1c533a55aba239ddcf Mon Sep 17 00:00:00 2001
From: Boris Spasojevic <boris.spasojevic@oracle.com>
Date: Mon, 11 Oct 2021 13:45:53 +0200
Subject: [PATCH 506/681] Remove the warmup estimator tool.

---
 tools/mx.tools/suite.py                       |  32 ---
 .../warmup/test/WarmupEstimatorTest.java      | 125 --------
 .../impl/WarmupEstimatorInstrument.java       | 271 ------------------
 3 files changed, 428 deletions(-)
 delete mode 100644 tools/src/com.oracle.truffle.tools.warmup.test/src/com/oracle/truffle/tools/warmup/test/WarmupEstimatorTest.java
 delete mode 100644 tools/src/com.oracle.truffle.tools.warmup/src/com/oracle/truffle/tools/warmup/impl/WarmupEstimatorInstrument.java

diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
index c1194e2f16f7..636bd906fee3 100644
--- a/tools/mx.tools/suite.py
+++ b/tools/mx.tools/suite.py
@@ -588,38 +588,6 @@
                 "native-image.properties" : "file:mx.tools/tools-dap.properties",
             },
         },
-        "TRUFFLE_WARMUP_ESTIMATOR": {
-            "subDir": "src",
-            "dependencies": [
-                "com.oracle.truffle.tools.warmup",
-            ],
-            "distDependencies" : [
-                "truffle:TRUFFLE_API",
-            ],
-            "maven" : {
-              "artifactId" : "warmup",
-            },
-            "description" : "Truffle warmup estimation tool.",
-        },
-        "TRUFFLE_WARMUP_ESTIMATOR_TEST": {
-            "subDir": "src",
-            "dependencies": [
-                "com.oracle.truffle.tools.warmup.test",
-            ],
-            "distDependencies" : [
-                "truffle:TRUFFLE_TEST",
-                "TRUFFLE_WARMUP_ESTIMATOR",
-            ],
-            "description" : "Tests for the truffle warmup estimator tool.",
-            "maven" : False,
-        },
-        "TRUFFLE_WARMUP_ESTIMATOR_GRAALVM_SUPPORT" : {
-            "native" : True,
-            "description" : "Truffle Profiler support distribution for the GraalVM",
-            "layout" : {
-                "native-image.properties" : "file:mx.tools/tools-profiler.properties",
-            },
-        },
         "VISUALVM_GRAALVM_SUPPORT": {
             "native": True,
             "platformDependent": True,
diff --git a/tools/src/com.oracle.truffle.tools.warmup.test/src/com/oracle/truffle/tools/warmup/test/WarmupEstimatorTest.java b/tools/src/com.oracle.truffle.tools.warmup.test/src/com/oracle/truffle/tools/warmup/test/WarmupEstimatorTest.java
deleted file mode 100644
index e3e6ce25444f..000000000000
--- a/tools/src/com.oracle.truffle.tools.warmup.test/src/com/oracle/truffle/tools/warmup/test/WarmupEstimatorTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.tools.warmup.test;
-
-import java.io.ByteArrayOutputStream;
-
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Source;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.oracle.truffle.api.instrumentation.test.InstrumentationTestLanguage;
-import com.oracle.truffle.tools.warmup.impl.WarmupEstimatorInstrument;
-
-public class WarmupEstimatorTest {
-    private static final String defaultSourceString = "ROOT(\n" +
-                    "DEFINE(foo,ROOT(STATEMENT)),\n" +
-                    "DEFINE(bar,ROOT(BLOCK(STATEMENT,LOOP(10, CALL(foo))))),\n" +
-                    "DEFINE(neverCalled,ROOT(BLOCK(STATEMENT,LOOP(10, CALL(bar))))),\n" +
-                    "CALL(bar)\n" +
-                    ")";
-    private static final Source defaultSource = makeSource(defaultSourceString);
-    private ByteArrayOutputStream out;
-    private ByteArrayOutputStream err;
-
-    private static Source makeSource(String s) {
-        return Source.newBuilder(InstrumentationTestLanguage.ID, s, "test").buildLiteral();
-    }
-
-    @Before
-    public void setUp() {
-        out = new ByteArrayOutputStream();
-        err = new ByteArrayOutputStream();
-    }
-
-    @Test
-    public void testBasic() {
-        try (Context context = defaultContext().option(WarmupEstimatorInstrument.ID + ".Root", "foo").build()) {
-            context.eval(defaultSource);
-        }
-        final String output = out.toString();
-        assertContains(output, "Best time       |");
-        assertContains(output, "Best iter       |");
-        assertContains(output, "Epsilon         | 1.05");
-        assertContains(output, "Peak Start Iter |");
-        assertContains(output, "Peak Start Time |");
-        assertContains(output, "Warmup time     |");
-        assertContains(output, "Warmup cost     |");
-        assertContains(output, "Iterations      | 10");
-    }
-
-    @Test
-    public void testMultiRootName() {
-        try (Context context = defaultContext().option(WarmupEstimatorInstrument.ID + ".Root", "foo,bar").build()) {
-            context.eval(defaultSource);
-        }
-        final String output = out.toString();
-        assertContains(output, "foo");
-        assertContains(output, "bar");
-    }
-
-    @Test
-    public void testMultiRootLine() {
-        try (Context context = defaultContext().option(WarmupEstimatorInstrument.ID + ".Root", "::2,::3").build()) {
-            context.eval(defaultSource);
-        }
-        final String output = out.toString();
-        assertContains(output, "::2");
-        assertContains(output, "::3");
-    }
-
-    @Test
-    public void testMultiRootNameLine() {
-        try (Context context = defaultContext().option(WarmupEstimatorInstrument.ID + ".Root", "foo::2,bar::3").build()) {
-            context.eval(defaultSource);
-        }
-        final String output = out.toString();
-        assertContains(output, "foo::2");
-        assertContains(output, "bar::3");
-    }
-
-    @Test
-    public void testRawOutput() {
-        try (Context context = defaultContext().option(WarmupEstimatorInstrument.ID + ".Root", "foo").option(WarmupEstimatorInstrument.ID + ".Output", "raw").build()) {
-            context.eval(defaultSource);
-        }
-        final String output = out.toString();
-        Assert.assertTrue(output.startsWith("["));
-        Assert.assertTrue(output.endsWith("]"));
-        assertContains(output, "{");
-        assertContains(output, "}");
-        Assert.assertEquals(11, output.split(",").length);
-    }
-
-    private static void assertContains(String output, String expected) {
-        Assert.assertTrue(output.contains(expected));
-    }
-
-    private Context.Builder defaultContext() {
-        return Context.newBuilder().in(System.in).out(out).err(err).option(WarmupEstimatorInstrument.ID, "true").allowExperimentalOptions(true);
-    }
-}
diff --git a/tools/src/com.oracle.truffle.tools.warmup/src/com/oracle/truffle/tools/warmup/impl/WarmupEstimatorInstrument.java b/tools/src/com.oracle.truffle.tools.warmup/src/com/oracle/truffle/tools/warmup/impl/WarmupEstimatorInstrument.java
deleted file mode 100644
index 19a9cb14ad7e..000000000000
--- a/tools/src/com.oracle.truffle.tools.warmup/src/com/oracle/truffle/tools/warmup/impl/WarmupEstimatorInstrument.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.tools.warmup.impl;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.logging.Level;
-
-import org.graalvm.options.OptionCategory;
-import org.graalvm.options.OptionDescriptors;
-import org.graalvm.options.OptionKey;
-import org.graalvm.options.OptionStability;
-import org.graalvm.options.OptionType;
-import org.graalvm.options.OptionValues;
-
-import com.oracle.truffle.api.Option;
-import com.oracle.truffle.api.TruffleLogger;
-import com.oracle.truffle.api.instrumentation.EventContext;
-import com.oracle.truffle.api.instrumentation.ExecutionEventNode;
-import com.oracle.truffle.api.instrumentation.Instrumenter;
-import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
-import com.oracle.truffle.api.instrumentation.StandardTags;
-import com.oracle.truffle.api.instrumentation.TruffleInstrument;
-
-@TruffleInstrument.Registration(id = WarmupEstimatorInstrument.ID, name = "Warmup Estimator", version = WarmupEstimatorInstrument.VERSION)
-public class WarmupEstimatorInstrument extends TruffleInstrument {
-
-    public static final String ID = "warmup";
-    public static final String VERSION = "0.0.1";
-
-    static final OptionType<Output> CLI_OUTPUT_TYPE = new OptionType<>("Output", optionString -> {
-        try {
-            return Output.valueOf(optionString.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            StringBuilder message = new StringBuilder("Wrong output specified. Output can be one of:");
-            for (Output output : Output.values()) {
-                message.append(" ");
-                message.append(output.toString().toLowerCase());
-            }
-            message.append(". For example: --warmup.Output=" + Output.SIMPLE.toString());
-            throw new IllegalArgumentException(message.toString());
-        }
-    });
-
-    static final OptionType<List<Location>> LOCATION_OPTION_TYPE = new OptionType<>("Location", optionString -> {
-        if (optionString.isEmpty()) {
-            throw new IllegalArgumentException("Root option must be set. " +
-                            "If no root is set nothing can be instrumented. " +
-                            "Root must be specified as 'rootName:fileName:lineNumber' e.g. --" + ID + "Root=foo:foo.js:14");
-        }
-        final String[] split = optionString.split(",");
-        final List<Location> locations = new ArrayList<>();
-        for (String locationString : split) {
-            locations.add(Location.parseLocation(locationString));
-        }
-        return Collections.unmodifiableList(locations);
-    });
-
-    @Option(name = "", help = "Enable the Warmup Estimator (default: false).", category = OptionCategory.USER) //
-    static final OptionKey<Boolean> ENABLED = new OptionKey<>(false);
-    @Option(help = "Specifies the root representing a benchmark iteration as 'rootName:fileName:lineNumber' where any of the parts are optional. " +
-                    "Multiple entries can be specified separated by commas. (e.g. 'main::,foo:foo.js:,fact:factorial.js:14').", category = OptionCategory.USER) //
-    static final OptionKey<List<Location>> Root = new OptionKey<>(Collections.emptyList(), LOCATION_OPTION_TYPE);
-    @Option(name = "OutputFile", help = "Save output to the given file. Output is printed to stdout by default.", category = OptionCategory.USER) //
-    static final OptionKey<String> OUTPUT_FILE = new OptionKey<>("");
-    @Option(name = "Output", help = "Can be: 'raw' for json array of raw samples; 'json' for included post processing of samples; 'simple' for just the human-readable post-processed result (default: simple)", //
-                    category = OptionCategory.USER) //
-    static final OptionKey<Output> OUTPUT = new OptionKey<>(Output.SIMPLE, CLI_OUTPUT_TYPE);
-    @Option(name = "Epsilon", help = "Sets the epsilon value which specifies the tolerance for peak performance detection. It's inferred if the value is 0. (default: 1.05)", category = OptionCategory.USER, stability = OptionStability.EXPERIMENTAL) //
-    static final OptionKey<Double> EPSILON = new OptionKey<>(1.05);
-    private final Map<Location, List<Long>> locationsToTimes = new HashMap<>();
-    private boolean enabled;
-
-    private static int parseInt(String string) {
-        try {
-            return Integer.parseInt(string);
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException("Unable to parse line number from given input: " + string);
-        }
-    }
-
-    private static SourceSectionFilter filter(Location location) {
-        final SourceSectionFilter.Builder builder = SourceSectionFilter.newBuilder().//
-                        includeInternal(false).//
-                        tagIs(StandardTags.RootTag.class);
-        if (!Objects.equals(location.rootName, "")) {
-            builder.rootNameIs(location.rootName::equals);
-        }
-        if (!Objects.equals(location.fileName, "")) {
-            builder.sourceIs(s -> location.fileName.equals(s.getName()));
-        }
-        if (location.line != null) {
-            builder.lineStartsIn(SourceSectionFilter.IndexRange.byLength(location.line, 1));
-        }
-        return builder.build();
-    }
-
-    private static PrintStream outputStream(Env env, OptionValues options) {
-        final String outputPath = OUTPUT_FILE.getValue(options);
-        if ("".equals(outputPath)) {
-            return new PrintStream(env.out());
-        }
-        final File file = new File(outputPath);
-        if (file.exists()) {
-            throw new IllegalArgumentException("Cannot redirect output to an existing file!");
-        }
-        try {
-            return new PrintStream(new FileOutputStream(file));
-        } catch (FileNotFoundException e) {
-            throw new IllegalArgumentException("File not found for argument " + outputPath, e);
-        }
-    }
-
-    @Override
-    protected OptionDescriptors getOptionDescriptors() {
-        return new WarmupEstimatorInstrumentOptionDescriptors();
-    }
-
-    @Override
-    protected void onCreate(Env env) {
-        final OptionValues options = env.getOptions();
-        enabled = options.get(WarmupEstimatorInstrument.ENABLED);
-        if (enabled) {
-            final List<Location> locations = options.get(Root);
-            if (locations.size() == 0) {
-                throw new IllegalArgumentException("Locations must be set");
-            }
-            final Instrumenter instrumenter = env.getInstrumenter();
-            for (Location location : locations) {
-                instrumenter.attachExecutionEventFactory(filter(location), context -> createNode(env, context, location));
-            }
-        }
-    }
-
-    private synchronized ExecutionEventNode createNode(Env env, EventContext context, Location location) {
-        final TruffleLogger logger = env.getLogger(this.getClass());
-        List<Long> times = locationsToTimes.get(location);
-        if (times == null) {
-            logger.log(Level.INFO, "Instrumenting root like " + location + " on " + context.getInstrumentedSourceSection());
-            times = new ArrayList<>();
-            locationsToTimes.put(location, times);
-            return new WarmupEstimatorNode(times);
-        }
-        logger.log(Level.WARNING, "Ignoring multiple roots like " + location + " on " + context.getInstrumentedSourceSection());
-        return null;
-    }
-
-    @Override
-    protected void onDispose(Env env) {
-        if (locationsToTimes.isEmpty()) {
-            env.getLogger(this.getClass()).log(Level.WARNING, "No roots like " + Root.getValue(env.getOptions()) + " found during execution.");
-        }
-        final OptionValues options = env.getOptions();
-        final List<Results> results = results(EPSILON.getValue(options));
-        try (PrintStream stream = outputStream(env, options)) {
-            final ResultsPrinter printer = new ResultsPrinter(results, stream);
-            switch (OUTPUT.getValue(options)) {
-                case SIMPLE:
-                    printer.printSimpleResults();
-                    break;
-                case JSON:
-                    printer.printJsonResults();
-                    break;
-                case RAW:
-                    printer.printRawResults();
-                    break;
-            }
-        }
-        super.onDispose(env);
-    }
-
-    private List<Results> results(Double epsilon) {
-        final List<Results> results = new ArrayList<>();
-        for (Location location : locationsToTimes.keySet()) {
-            final List<Long> times = locationsToTimes.get(location);
-            results.add(new Results(location.toString(), times, epsilon));
-        }
-        return results;
-    }
-
-    enum Output {
-        SIMPLE,
-        JSON,
-        RAW,
-    }
-
-    static final class Location {
-        final String rootName;
-        final String fileName;
-        final Integer line;
-
-        Location(String rootName, String fileName, Integer line) {
-            this.rootName = rootName;
-            this.fileName = fileName;
-            this.line = line;
-        }
-
-        private static Location parseLocation(String locationString) {
-            final String[] strings = locationString.split(":");
-            final String rootName = strings[0];
-            final String fileName = strings.length > 1 ? strings[1] : "";
-            final Integer line = strings.length == 3 && !Objects.equals(strings[2], "") ? parseInt(strings[2]) : null;
-            return new Location(rootName, fileName, line);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || o instanceof Location) {
-                return false;
-            }
-            Location location = (Location) o;
-            return Objects.equals(rootName, location.rootName) &&
-                            Objects.equals(fileName, location.fileName) &&
-                            Objects.equals(line, location.line);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(rootName, fileName, line);
-        }
-
-        @Override
-        public String toString() {
-            StringBuilder builder = new StringBuilder(rootName);
-            if (!Objects.equals(fileName, "")) {
-                builder.append(':');
-                builder.append(fileName);
-            } else if (line != null) {
-                builder.append(':');
-            }
-            if (line != null) {
-                builder.append(':');
-                builder.append(line);
-            }
-            return builder.toString();
-        }
-    }
-}

From 9fd855baf09b4788ff471a97acae2440112c3202 Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Mon, 18 Oct 2021 10:47:03 +0300
Subject: [PATCH 507/681] Fix fetch-jdk invocation

Co-authored-by: Fabio Niephaus <fabio.niephaus@oracle.com>
---
 .github/workflows/quarkus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/quarkus.yml b/.github/workflows/quarkus.yml
index f4ceb8ea570d..2f6668d51798 100644
--- a/.github/workflows/quarkus.yml
+++ b/.github/workflows/quarkus.yml
@@ -63,7 +63,7 @@ jobs:
     - name: Get JDK
       run: |
         mkdir jdk-dl
-        ${MX_PATH}/mx fetch-jdk --jdk-id labsjdk-ce-11 --to jdk-dl --alias ${JAVA_HOME}
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-11 --to jdk-dl --alias ${JAVA_HOME}
     - name: Build graalvm native-image
       run: |
         cd substratevm

From 8521def98638634a137a2431d55dfc267c8a603d Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Thu, 14 Oct 2021 13:12:02 +0200
Subject: [PATCH 508/681] speculative guard movement: force hoist guards in
 inverted loops if the anchor is actually inside the loop

---
 .../loop/phases/SpeculativeGuardMovementPhase.java        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
index b162697cc935..fa934c5b800f 100644
--- a/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
+++ b/compiler/src/org.graalvm.compiler.loop.phases/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
@@ -182,6 +182,7 @@ private Block earliestBlock(Node node) {
             if (node instanceof GuardNode) {
                 GuardNode guard = (GuardNode) node;
                 LogicNode condition = guard.getCondition();
+
                 Loop<Block> forcedHoisting = null;
                 if (condition instanceof IntegerLessThanNode || condition instanceof IntegerBelowNode) {
                     forcedHoisting = tryOptimizeCompare(guard, (CompareNode) condition);
@@ -253,17 +254,12 @@ private Loop<Block> tryOptimizeCompare(GuardNode guard, CompareNode compare) {
                 bound = compare.getY();
                 mirrored = false;
             }
+
             if (tryOptimizeCompare(compare, iv, bound, mirrored, guard)) {
-                if (isInverted(iv.getLoop())) {
-                    return null;
-                }
                 return iv.getLoop().loop();
             }
             if (otherIV != null) {
                 if (tryOptimizeCompare(compare, otherIV, iv.valueNode(), !mirrored, guard)) {
-                    if (isInverted(iv.getLoop())) {
-                        return null;
-                    }
                     return otherIV.getLoop().loop();
                 }
             }

From f7cd09e82f2a0b32193d6ec2a81f99e322f84ac5 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Mon, 18 Oct 2021 17:31:05 +0300
Subject: [PATCH 509/681] Update documentation for VS Code extensions required
 for 21.3 release

---
 docs/tools/vscode/graalvm/README.md           |  56 ++++--
 .../vscode/graalvm/visualvm-integration.md    |   2 +-
 docs/tools/vscode/micronaut/README.md         |  21 ++-
 docs/tools/vscode/micronaut/k8s-support.md    | 177 ++++++++++++++++++
 4 files changed, 227 insertions(+), 29 deletions(-)
 create mode 100644 docs/tools/vscode/micronaut/k8s-support.md

diff --git a/docs/tools/vscode/graalvm/README.md b/docs/tools/vscode/graalvm/README.md
index 7e547ea330c0..f2c752c46310 100644
--- a/docs/tools/vscode/graalvm/README.md
+++ b/docs/tools/vscode/graalvm/README.md
@@ -16,7 +16,7 @@ The extension is Technology Preview.
 - [Installation and Setup](#installation-and-setup)
 - [Java Development and Debugging](#java-development-and-debugging)
 - [Native Image Agent](#native-image-agent)
-- [Native Image Debugger](#native-image-debugger)
+- [Native Image Debugging](#native-image-debugging)
 - [Integration with VisualVM](#integration-with-visualvm)
 - [JavaScript and Node.js Debugging](#javascript-and-nodejs-debugging)
 - [Python Debugging](#python-debugging)
@@ -125,7 +125,7 @@ The "Download & Install GraalVM" action is a preferable way, as it eliminates th
 
 ## Java Development and Debugging
 
-To start developing or debugging Java applications, ensure GraalVM is used as your Java runtime in VS Code.
+To start developing Java applications, ensure GraalVM is used as your Java runtime in VS Code.
 If the current path is not pointing to the GraalVM folder, go to the User Settings window and use the `netbeans.jdkhome` value in the _settings.json_ file.
 This configuration is then used to launch the Java Language Server.
 
@@ -192,32 +192,48 @@ Open the _launch.json_ file and click the Add Configuration... button in the bot
 5&#46; Generate load to the running process to invoke more code and generate the best configuration.
 Once all possible execution paths have been executed, terminate the process. At this point the Native Image agent dumps the collected configuration to the selected output directory.
 
-Once the configuration for Native Image has been generated, follow the documentation on how to [generate a native image for a project](https://www.graalvm.org/reference-manual/native-image#build-a-native-image) from the command line, or how to [build native images right from VS Code](../micronaut/README.md#generate-native-images-of-micronaut-projects).
+Once the configuration for Native Image has been generated, follow the documentation on how to [generate a native image for a project](https://www.graalvm.org/reference-manual/native-image/#build-a-native-image) from the command line, or how to [build native images right from VS Code](../micronaut/README.md#generate-native-images-of-micronaut-projects).
 
-## Native Image Debugger
+## Native Image Debugging
 
 GraalVM Extension Pack for Java provides Java like debugging of platform native executables produced by [GraalVM Native Image](https://www.graalvm.org/reference-manual/native-image/).
 It is provided using the GNU Debugger (GDB) and via a new Run configuration named __Launch Native Image__.
 GraalVM Enterprise Edition is required as it produces full debug information for a native image.
 
-> Note: This feature is experimental. It currently works only on Linux with GDB 7.11 or GDB 10.1+ due to known issue [#26139](https://sourceware.org/bugzilla/show_bug.cgi?id=26139) in GDB 8 and 9.
+![Native Image debugging](images/ni_debugging.png)
+
+> Note: Native Image debugging requires `gdb` debugger (GDB 7.11 or GDB 10.1+), it currently works only on Linux. The feature is experimental.
 
 In order to debug native images of Java applications, it is necessary to build such images with debug information available.
 It can be done by providing following switches for the `native-image` builder:
 - `-g -O0` or
 - `-H:Debug=2 -H:Optimize=0`.
 
-The resulting images will contain debug records in a format GDB understands.
+The resulting images will contain debug records in a format `gdb` debugger understands.
+
+### Debug Native Image “Real” Code
+
+Since recently you can attach the debugger to a Native Image process and step over the image “real” code.
+
+Attaching of debugger to a Native Image process is done via adding a configuration into the _launch.json_ file.
+
+1. Select **Native Image: Attach to Process** from the configurations autocompletion in _launch.json_. It generates the **Attach to Native Image** configuration. When that configuration is selected and executed, a list of running processes opens.
+2. Select the running process that corresponds to the Native Image you intend to debug.
+3. when the source file opens, start debugging:
+   ![Native Image debugging source code](images/NativeImageExecutableLocations.png)
+
+The step over the image “real” code” is mostly about UI differentiation of code which is compiled in the native image and which is not used.
+The shaded code is not a part of the Native Image.
 
 ## Integration with VisualVM
 
-As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with [VisualVM](https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
+As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with VisualVM (https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
 This brings the visual Java tooling to VS Code.
 
 ![VisualVM and VS Code Integration](images/vscode_visualvm.png)
 
-To get started, you need to get the latest stable GraalVM release using the **Download & Install GraalVM** action from the **Gr** activity view, as described in the [Installation and Setup](#installation-and-setup) section.
-Make sure the GraalVM is set as **active**.
+To get started, you need to get the latest stable GraalVM release using the **Download & Install GraalVM** action from the **Gr** activity view, as described in the [Installation and Setup](README.md#installation-and-setup) section.
+Make sure the GraalVM is set as the **active**.
 
 Once a GraalVM installation is set as active, the Command Palette contains the following commands related to VisualVM:
 
@@ -236,7 +252,7 @@ Follow these steps to start VisualVM automatically from within the VS Code:
 
 4. Select the **Launch VisualVM & Java 8+ Application** launch configuration in the Run and Debug activity. Use the Start Debugging or Run Without Debugging action to start the current project.
 
-While the project is starting, the Process node in VisualVM pane displays a project name with a "pid pending" label.
+While the project is starting, the Process node in VisualVM pane displays project name with a "pid pending" label.
 Once the project process starts, the Process node is updated to show its process ID (PID) and the action defined in step 3 is performed.
 
 > Note: This feature was introduced with the GraalVM 21.2.0 release. Please make sure to get the latest GraalVM Tools for Java extension from the VS Code Marketplace, preferably by downloading the [GraalVM Extension Pack for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack).
@@ -461,7 +477,7 @@ For example, to connect to the Chrome Dev Tools protocol port, the content of th
 
 Alternatively, to pass the `--polyglot` option to any of the existing application launchers, add the `runtimeArgs` attribute containing the `--polyglot` value to their respective debug configurations.
 
-> Note: In some cases (polyglot application calls Java or R, or native launcher accesses languages installed with `gu` without [rebuilding images](https://www.graalvm.org/reference-manual/graalvm-updater#component-uninstallation)), also passing the `--jvm` option is necessary.
+> Note: In some cases (polyglot application calls Java or R, or native launcher accesses languages installed with `gu` without [rebuilding images](https://www.graalvm.org/reference-manual/graalvm-updater/#component-uninstallation)), also passing the `--jvm` option is necessary.
 
 ![Image Debug Configuration for Python](images/polyglot-debug-config.png)
 
@@ -502,14 +518,14 @@ GraalVM supports smart editing features of development tools used to create gues
 This allows you to attach compatible development tools such as VS Code to GraalVM and to get features like auto complete, go to declaration, or documentation on hover.
 
 Currently, [GraalVM's Language Server Protocol](https://www.graalvm.org/tools/lsp/) implementation supports the following services:
-* [Text Document Synchronization](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_synchronization)
-* [Hover Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_hover)
-* [Completion Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_completion)
-* [Signature Help Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_signatureHelp)
-* [Document Highlight Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_documentHighlight)
-* [Code Action Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_codeAction)
-* [Code Lens Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#textDocument_codeLens)
-* [Execute Command Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current#workspace_executeCommand)
+* [Text Document Synchronization](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_synchronization)
+* [Hover Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover)
+* [Completion Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion)
+* [Signature Help Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp)
+* [Document Highlight Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight)
+* [Code Action Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction)
+* [Code Lens Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeLens)
+* [Execute Command Provider](https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_executeCommand)
 
 > Note: The Language Server Protocol is offered as a technology preview and requires to pass the `--experimental-options` option for its activation.
 
@@ -552,7 +568,7 @@ Once the `solargraph` gem is installed, the Ruby Language Server is automaticall
 
 ### Additional Editor Features
 
-Since the easy writing of [polyglot applications](https://www.graalvm.org/reference-manual/polyglot-programming/) is one of the defining features of GraalVM, the code completion invoked inside JavaScript sources provides items for `Polyglot.eval(...)`, `Polyglot.evalFile(...)`, and `Java.type(...)` calls.
+Since the easy writing of [polyglot](https://www.graalvm.org/docs/reference-manual/polyglot) applications is one of the defining features of GraalVM, the code completion invoked inside JavaScript sources provides items for `Polyglot.eval(...)`, `Polyglot.evalFile(...)`, and `Java.type(...)` calls.
 
 ![Image Code Completion](images/code-completion-js.png)
 
diff --git a/docs/tools/vscode/graalvm/visualvm-integration.md b/docs/tools/vscode/graalvm/visualvm-integration.md
index 9e1a2abd036b..456c96edf047 100644
--- a/docs/tools/vscode/graalvm/visualvm-integration.md
+++ b/docs/tools/vscode/graalvm/visualvm-integration.md
@@ -2,7 +2,7 @@
 layout: docs
 toc_group: vscode
 link_title: VisualVM and VS Code Integration
-permalink: /tools/vscode/visualvm-integration/
+permalink: /tools/vscode/graalvm/visualvm-integration/
 ---
 
 # VisualVM and VS Code Integration
diff --git a/docs/tools/vscode/micronaut/README.md b/docs/tools/vscode/micronaut/README.md
index 8f7a736296ce..3a8afcaac37b 100644
--- a/docs/tools/vscode/micronaut/README.md
+++ b/docs/tools/vscode/micronaut/README.md
@@ -22,10 +22,9 @@ In combination with the [GraalVM Tools for Java extension](https://marketplace.v
   - [Extension Settings](#extension-settings)
 - [Create Micronaut Project](#create-micronaut-project)
 - [Generate Native Images of Micronaut Projects](#generate-native-images-of-micronaut-projects)
-- [Deploy Micronaut Projects](#deploy-micronaut-projects)
-- [Feedback](#feedback)
-- [Privacy Policy](#privacy-policy)
-- [Known Issues](#known-issues)
+- [Deploy Micronaut Projects to Docker Registry](#deploy-micronaut-projects-to-docker-registry)
+- [Deploy Micronaut Applications to Oracle Container Engine for Kubernetes](#deploy-micronaut-applications-to-oracle-container-engine-for-kubernetes)
+- [Debug Micronaut Applications in Remote Kubernetes](#debug-micronaut-applications-in-remote-kubernetes)
 
 ## Installation and Setup
 
@@ -107,12 +106,18 @@ That will run the `mvnw package -Dpackaging=native-image` job.
 
 For more details, continue reading to the [Micronaut documentation](https://guides.micronaut.io/micronaut-creating-first-graal-app/guide/index.html#creatingGraalImage).
 
-## Deploy Micronaut Projects
+## Deploy Micronaut Projects to Docker Registry
 
-The Micronaut support in VSCode also allows to build and deploy Docker image to a Docker Registry.
-Use action View > Command Palette > Micronaut: Deploy... and select **dockerPush** to deploy dockerized Micronaut application or **dockerPushNative** to build and push docker with a native executable of Micronaut application.
+The Micronaut support in VS Code allows to build and deploy Docker images to Docker registry.
+Use action **View** > **Command Palette** > **Micronaut: Deploy...** and select **dockerPush** to deploy a dockerized Micronaut application or **dockerPushNative** to build and push docker with a native executable of Micronaut application.
 
-Besides that, you can also push a Micronaut application or a native executable to a Docker Registry from the VS Code terminal window. A particular Docker Registry can be configured in the build, see the [Micronaut Deploying Application](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/examples/deploy.html) documentation.
+![Micronaut Deploy Commands](images/micronaut-deploy-commands.png)
+
+Besides that, you can also push a Micronaut application or a native executable to the Docker Registry from the VS Code Terminal window.
+A particular Docker Registry can be configured in the build, see the [Micronaut Deploying Application](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/examples/deploy.html) documentation.
+
+<!-- Deploy Micronaut Applications to Oracle Container Engine for Kubernetes -->
+{% include_relative k8s-support.md %}
 
 ### Feedback
 
diff --git a/docs/tools/vscode/micronaut/k8s-support.md b/docs/tools/vscode/micronaut/k8s-support.md
new file mode 100644
index 000000000000..283533a0c6a0
--- /dev/null
+++ b/docs/tools/vscode/micronaut/k8s-support.md
@@ -0,0 +1,177 @@
+---
+layout: docs
+toc_group: vscode
+link_title: Deploy Micronaut Applications to Oracle Container Engine for Kubernetes
+permalink: /tools/vscode/micronaut/kubernetes-support/
+---
+
+# Deploy Micronaut Applications to Oracle Container Engine for Kubernetes
+
+GraalVM Tools for Micronaut Extension added support for working with Kubernetes clusters based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
+
+It is now possible to deploy and debug a Micronaut project to Kubernetes on Oracle Cloud with Oracle Container Engine for Kubernetes (OKE)](https://www.oracle.com/uk/cloud-native/container-engine-kubernetes/) environment.
+OKE is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to the cloud.
+
+This guide will walk you through the process of deploying a Micronaut application to OKE from VS Code and debugging it.
+
+### Prerequisites
+- [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools)
+- [Docker](https://docs.docker.com/engine/reference/run/)
+- [Oracle Cloud Account](https://www.oracle.com/uk/cloud/free/)
+- [Access to Oracle Container Engine for Kubernetes (OKE)](https://oracle.github.io/learning-library/oci-library/oci-hol/OKE/workshops/freetier/index.html?lab=intro)
+
+## Preparation
+
+### Visual Studio Code Kubernetes Tools
+Micronaut's extension support for Kubernetes is based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools). It has to be installed.
+
+Open Extensions tab, search for "Kubernetes" and install the one from Microsoft.
+Once installed, you should see the Kubernetes icon in the left sidebar:
+![Kubernetes extension installed](images/kubernetes_icon.png)
+
+### Oracle Cloud Account
+
+If you have not got an active Oracle Cloud account, create one by following this [link](https://docs.oracle.com/en/cloud/get-started/subscriptions-cloud/csgsg/get-oracle-com-account.html).
+
+### Access to Oracle Container Engine for Kubernetes (OKE)
+
+Supposedly, you have signed in to your Oracle Cloud account.
+To be able to deploy Docker images to Oracle Container Registry, you need to setup the access to Oracle Container Engine for Kubernetes (OKE).
+
+#### Step 1: Create a Kubernetes cluster in OCI
+
+Using the Oracle Cloud Console, create a Kubernetes cluster with default settings using the *Quick Create* workflow:
+
+1. In the Oracle Cloud Console, open the navigation menu and click **Developer Services**.
+2. Under Containers, click **Kubernetes Clusters (OKE)**.
+3. Then click **Create Cluster**.
+
+For more information, check this [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengcreatingclusterusingoke_topic-Using_the_Console_to_create_a_Quick_Cluster_with_Default_Settings.htm).
+
+#### Step 2: Set up access to Kubernetes cluster
+
+You can access your Kubernetes cluster and manage it using `kubectl`.
+The `kubectl` command-line tool must be configured to communicate with your cluster.
+To do that you have to set up a Kubernetes configuration file, _kubeconfig_.
+The kubeconfig file (by default stored and can be found in the _$HOME/.kube/config_) provides the necessary details to access the cluster.
+
+See the [Setting Up Local Access to Clusters](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengdownloadkubeconfigfile.htm#localdownload) guide for step-by-step instructions.
+
+### Log in to Docker
+
+To be able to dockerize your Micronaut project, push and pull images on a local machine, and deploy to Oracle Container Registry, you will need [Docker](https://docs.docker.com/engine/reference/run/).
+To check whether [Docker](https://docs.docker.com/engine/reference/run/) is started and running on your computer, go to VS Code Terminal and type: `docker --help`.
+
+Next you need to login with Docker to your Oracle Container Registry.
+Prepare following Oracle Cloud account credentials:
+
+- Oracle Cloud Infrastructure (OCI) tenancy name
+- User email address used for your OCI account
+- OCI authentification token
+- OCI region key
+
+From VS Code Terminal window, log in using the following command:
+```bash
+docker login -u <tenancy-namespace>/<oci-user-email> -p <auth token> <region-key>.ocir.io
+```
+For example, if your OCI region is US East (Ashburn), then the key will be `iad`, and the region endpoint will be `https://iad.ocir.io`.
+The list of available regions and their keys is available [here](https://docs.oracle.com/en-us/iaas/Content/Registry/Concepts/registryprerequisites.htm).
+
+> NOTE: If the Docker registry is private you will need a Docker registry secret.
+
+This [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengpullingimagesfromocir.htm) describes how to create a Docker registry secret and describes how to specify the image to pull from Oracle Cloud Infrastructure Registry (along with the Docker secret to use) during application deployment to a cluster you've created using OKE.
+
+### Specify the Location for Docker Image in Oracle Container Registry
+
+The location where to push your Docker image in Oracle Container Registry should be specified in the project configuration file.
+
+If you used Gradle to build your Micronaut project, open the _gradle.build_ file and update image location:
+  ```xml
+  dockerBuild {
+  images = ["<region-key>.ocir.io/<tenancy-namespace>/<repo-name>/<image-name>:<tag>"]
+  }
+  ```
+
+See, for example, this example project configuration:
+![Docker image location](images/docker_image_location.png)
+
+<!-- If you used Maven to build your Micronaut project, open _pom.xml_, find the `dockerBuild` task and update the image location: -->
+
+## Deploy a Micronaut Application to OKE
+
+To deploy, run and debug a Micronaut application in Oracle Container Engine for Kubernetes (OKE), the following quick actions for Micronaut are available:
+
+![Kubernetes quick actions](images/k8s_quick_actions.png)
+
+You should start by creating a Kubernetes deployment file that will be applied at the deployment stage.
+
+1. Go to View > Command Palette, search for "Kubernetes" and invoke the **Micronaut: Create Kubernetes Deployment Resource** action. It will start the "Create Kubernetes Deployment File" process.
+
+2. Pick the Docker repository. Since you are using Oracle Container Registry, select **OCIR + region name**. For example:
+
+   ![Pick Docker repository](images/pick_docker_repository.png)
+
+3. Provide your Docker image name and version:
+
+   ![Provide Docker image name and version](images/provide_image_name_version.png)
+
+   Currently, available images are not automatically detected, so you need to type it manually.
+   Grab the image location from _gradle.build_ or _pom.xml_ you specified in the **Specify the Location for Docker Image in Oracle Container Registry** step.
+
+4. Then you are prompted to select the namespace. Choose default:
+
+   ![Select namespace](images/select_namespace.png)
+
+5. Lastly, select a secret for your container registry in OCI (needed only if the Docker registry is private, described in the **Preparation** > **Log in to Docker** section):
+
+    ![Select a secret for Docker registry](images/select_secret.png)
+
+    The `Deploy.yaml` will be created. It will look similar to the following:
+
+    ![Deploy.yaml](images/deploy_yaml.png)
+
+Now you are ready to deploy your Micronaut application to OKE.
+
+1. Go to View > Command Palette, search for **Micronaut: Deploy to Kubernetes** action and invoke it.
+   You could have skipped steps 1-3 from above, but if no Kubernetes deployment file exists, VS Code will suggest you to create one at this step.
+
+2. Once you invoke the action, the Output window will open and the "Starting deploy of project" message will be printed.
+
+When you hit this action, the project is packaged with Gradle/Maven to a runnable JAR file, built into a Docker image.
+Then Docker pushes this image to the OKE repository (Oracle Container Registry), by applying the _deploy.yaml_ script.
+The Kubernetes extension starts port forwarding to connect to the server running in a Kubernetes cluster (`kubectl port-forward` forwards a local port to a port on the Pod).
+A direct URL to access your Micronaut REST application from a browser is printed.
+Read more on Kubernetes port forwarding [here](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/).
+
+All this can be tracked in the Output window.
+If the deployment succeeds, you should see a similar status bar:
+
+![Kubernetes deploy status](images/k8s_deply_output.png)
+
+To otherwise check the deployment's status, run:
+```bash
+kubectl get deployment
+```
+
+You can work on other projects, deploy them to another Kubernetes clusters, and they will all be deployed and running from Oracle Container Registry.
+
+## Debug Micronaut Applications in Remote Kubernetes Cluster
+
+In addition to being able to deploy and run Micronaut applications in Kubernetes, you can also debug your Java application in a cluster directly from VS.
+
+> Note: To allow complete Java debugging experience, you need to ensure the [GraalVM Extension Pack for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm) is installed. It is not needed if you have installed [GraalVM Tools for Java Extension pack](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack), it already includes a full-fledged support for the Java and Micronaut.
+
+With the connection made to a local port (thanks to [Kubernetes port forwarding feature](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)), you can use your local workstation to debug the application that is running in the Pod.
+Having set some breakpoints in your applciation, do the following to start debugging:
+
+1. Go to View > Command Palette, search for **Micronaut: Debug in Kubernetes** action and invoke it.
+2. Confirm port forwarding. First time you start debugging your application deployed in Kubernetes, a popup window will open in the right bottom corner asking to confirm port forwarding. This will setup a `JAVA_TOOLS_OPTIONS` environment variable in the deployment script file.
+3. Then you will be prompted to choose a port forwarding session:
+
+   ![Choose a port forwarding session](images/k8s_port_forwarding.png)
+
+4. Connect the Kubernetes extension to your Kubernetes cluster using **Set Kubeconfig** action.
+5. Click on Kubernetes icon in the left sidebar and select the node you are developing.
+6. Right-click invoke action Debug (**Attach using Java 8+**):
+
+![Attach a remote debugger](images/attach-remote-debugger.png)

From 6a64550a82d62d93a27c50208eeb542fb49d0e38 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Mon, 18 Oct 2021 14:38:00 +0200
Subject: [PATCH 510/681] Various improvements for the error handling. Fixed a
 race that could happen in the safepoint handling.

---
 .../posix/pthread/PthreadVMLockSupport.java   |   5 +-
 .../core/windows/WindowsVMLockSupport.java    |   5 +-
 .../svm/core/InvalidMethodPointerHandler.java |   4 +-
 .../oracle/svm/core/SubstrateDiagnostics.java |   2 +-
 .../svm/core/SubstrateSegfaultHandler.java    |   2 +-
 .../graal/snippets/CEntryPointSnippets.java   |   4 +-
 .../svm/core/jdk/VMErrorSubstitutions.java    |   4 +-
 .../oracle/svm/core/thread/JavaThreads.java   |   2 -
 .../com/oracle/svm/core/thread/Safepoint.java |  20 ++-
 .../com/oracle/svm/core/thread/VMThreads.java | 116 ++++++------------
 .../svm/jni/functions/JNIFunctions.java       |   6 +-
 11 files changed, 73 insertions(+), 97 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
index f19e589eef9d..f473152e3073 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.posix.pthread;
 
+import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.word.Word;
@@ -166,7 +167,9 @@ protected static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+            VMThreads.SafepointBehavior.preventSafepoints();
+            StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
+
             Log.log().string(functionName).string(" returned ").signed(result).newline();
             ImageSingletons.lookup(LogHandler.class).fatalError();
         }
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 44ddefc253e6..868f3f6f12c8 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.windows;
 
+import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.word.Word;
@@ -161,7 +162,9 @@ static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+            VMThreads.SafepointBehavior.preventSafepoints();
+            StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
+
             int lastError = WinBase.GetLastError();
             Log.log().string(functionName).string(" failed with error ").hex(lastError).newline();
             ImageSingletons.lookup(LogHandler.class).fatalError();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index d6061d66f714..7db44647c79d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -28,6 +28,7 @@
 
 import java.lang.reflect.Method;
 
+import com.oracle.svm.core.annotate.Uninterruptible;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.c.function.CodePointer;
@@ -69,8 +70,9 @@ private static void methodPointerNotCompiledHandler() {
         failFatally(callerSP, callerIP, METHOD_POINTER_NOT_COMPILED_MSG);
     }
 
+    @Uninterruptible(reason = "Prevent safepoints until everything is set up for printing the fatal error.", calleeMustBe = false)
     private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
-        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+        VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         /*
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
index ff6ef10c845e..fcfae79277ce 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
@@ -617,7 +617,7 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
                 log.string("Threads:").indent(true);
                 for (IsolateThread thread = VMThreads.firstThreadUnsafe(); thread.isNonNull(); thread = VMThreads.nextThread(thread)) {
                     log.zhex(thread).spaces(1).string(VMThreads.StatusSupport.getStatusString(thread));
-                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(thread);
+                    int safepointBehavior = SafepointBehavior.getSafepointBehaviorVolatile(thread);
                     if (safepointBehavior != SafepointBehavior.ALLOW_SAFEPOINT) {
                         log.string(" (").string(SafepointBehavior.toString(safepointBehavior)).string(")");
                     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
index 94ac2f378480..369354fc0388 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
@@ -153,7 +153,7 @@ protected static boolean tryEnterIsolate(RegisterDumper.Context context) {
     @Uninterruptible(reason = "Must be uninterruptible until we get immune to safepoints.", calleeMustBe = false)
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in segfault handler.", overridesCallers = true)
     protected static void dump(PointerBase signalInfo, RegisterDumper.Context context) {
-        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+        VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         dumpInterruptibly(signalInfo, context);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index ba44d90ffdc4..ad7c1d3dda11 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -71,7 +71,6 @@
 import com.oracle.svm.core.RuntimeAssertionsSupport;
 import com.oracle.svm.core.SubstrateDiagnostics;
 import com.oracle.svm.core.SubstrateUtil;
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.c.CGlobalData;
 import com.oracle.svm.core.c.CGlobalDataFactory;
@@ -564,10 +563,11 @@ public static int reportExceptionSnippet(Throwable exception) {
     @Uninterruptible(reason = "Avoid StackOverflowError and safepoints until they are disabled permanently", calleeMustBe = false)
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     private static int reportException(Throwable exception) {
-        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+        VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         logException(exception);
+
         ImageSingletons.lookup(LogHandler.class).fatalError();
         return CEntryPointErrors.UNSPECIFIED; // unreachable
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
index a6957ee1ee75..6604c9d85498 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
@@ -99,8 +99,10 @@ public class VMErrorSubstitutions {
     @Uninterruptible(reason = "Allow VMError to be used in uninterruptible code.")
     static RuntimeException shouldNotReachHere(CodePointer callerIP, String msg, Throwable ex) {
         ThreadStackPrinter.printBacktrace();
-        VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
+
+        VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
+
         VMErrorSubstitutions.shutdown(callerIP, msg, ex);
         throw UnreachableNode.unreachable();
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index 65a1751c30ac..cf0e80f7bb46 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
@@ -57,7 +56,6 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.NeverInline;
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.ReferenceHandler;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index 30bb4e0273b8..074076393a4e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -713,14 +713,22 @@ private static void waitForSafepoints(String reason) {
                         continue;
                     }
 
-                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(vmThread);
+                    /*-
+                     * The status must be read before the safepoint behavior to prevent races
+                     * like the following:
+                     * - thread A reads the safepoint behavior of thread B.
+                     * - thread B sets the safepoint behavior to PREVENT_VM_FROM_REACHING_SAFEPOINT.
+                     * - thread B sets the status to STATUS_IN_NATIVE.
+                     * - thread A reads the status and the VM reaches a safepoint.
+                     */
+                    int status = StatusSupport.getStatusVolatile(vmThread);
+                    int safepointBehavior = SafepointBehavior.getSafepointBehaviorVolatile(vmThread);
                     if (safepointBehavior == SafepointBehavior.PREVENT_VM_FROM_REACHING_SAFEPOINT) {
                         notAtSafepoint++;
-                    } else if (safepointBehavior == SafepointBehavior.IGNORE_THREAD_IN_SAFEPOINT_HANDLING) {
+                    } else if (safepointBehavior == SafepointBehavior.THREAD_CRASHED) {
                         ignoreSafepoints++;
                     } else {
                         assert safepointBehavior == SafepointBehavior.ALLOW_SAFEPOINT;
-                        int status = StatusSupport.getStatusVolatile(vmThread);
                         switch (status) {
                             case StatusSupport.STATUS_IN_JAVA:
                             case StatusSupport.STATUS_IN_VM: {
@@ -864,15 +872,15 @@ public static int countingVMOperation() {
                 int notAtSafepoint = 0;
 
                 for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
-                    int safepointBehavior = SafepointBehavior.getSafepointBehavior(vmThread);
+                    int safepointBehavior = SafepointBehavior.getSafepointBehaviorVolatile(vmThread);
+                    int status = StatusSupport.getStatusVolatile(vmThread);
                     if (safepointBehavior == SafepointBehavior.PREVENT_VM_FROM_REACHING_SAFEPOINT) {
                         notAtSafepoint++;
-                    } else if (safepointBehavior == SafepointBehavior.IGNORE_THREAD_IN_SAFEPOINT_HANDLING) {
+                    } else if (safepointBehavior == SafepointBehavior.THREAD_CRASHED) {
                         ignoreSafepoints += 1;
                     } else {
                         assert safepointBehavior == SafepointBehavior.ALLOW_SAFEPOINT;
                         // Check if the thread is at a safepoint or in native code.
-                        int status = StatusSupport.getStatusVolatile(vmThread);
                         switch (status) {
                             case StatusSupport.STATUS_IN_SAFEPOINT:
                                 atSafepoint += 1;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 1e5ee537db6e..e78ccd36a33c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -44,8 +44,6 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.SubstrateOptions;
-import com.oracle.svm.core.annotate.NeverInline;
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.c.function.CEntryPointErrors;
 import com.oracle.svm.core.c.function.CFunctionOptions;
@@ -86,8 +84,6 @@ public static VMThreads singleton() {
      * already acquired for safepoint reasons.</li>
      * <li>Acquire the mutex outside of a VM operation but only execute uninterruptible code. This
      * is safe as the uninterruptible code cannot trigger a safepoint.</li>
-     * <li>Acquire the mutex from a thread that previously called
-     * {@link SafepointBehavior#setIgnoreThreadInSafepointHandling()}.</li>
      * </ol>
      *
      * Deadlock example 1:
@@ -120,9 +116,7 @@ public static VMThreads singleton() {
      */
     protected static final VMCondition THREAD_LIST_CONDITION = new VMCondition(THREAD_MUTEX);
 
-    /**
-     * The first element in the linked list of {@link IsolateThread}s.
-     */
+    /** The first element in the linked list of {@link IsolateThread}s. */
     private static IsolateThread head;
     /**
      * This field is used to guarantee that all isolate threads that were started by SVM have exited
@@ -144,9 +138,7 @@ public static VMThreads singleton() {
     private static final FastThreadLocalWord<OSThreadId> OSThreadIdTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadIdTL");
     protected static final FastThreadLocalWord<OSThreadHandle> OSThreadHandleTL = FastThreadLocalFactory.createWord("VMThreads.OSThreadHandleTL");
     public static final FastThreadLocalWord<Isolate> IsolateTL = FastThreadLocalFactory.createWord("VMThreads.IsolateTL");
-    /**
-     * The highest stack address.
-     */
+    /** The highest stack address. */
     public static final FastThreadLocalWord<UnsignedWord> StackBase = FastThreadLocalFactory.createWord("VMThreads.StackBase");
     /**
      * The lowest stack address. Note that this value does not necessarily match the value that is
@@ -165,17 +157,13 @@ public static boolean isInitialized() {
         return initializationState.get() >= STATE_INITIALIZED;
     }
 
-    /**
-     * Is threading being torn down?
-     */
+    /** Is threading being torn down? */
     @Uninterruptible(reason = "Called from uninterruptible code during tear down.")
     public static boolean isTearingDown() {
         return initializationState.get() >= STATE_TEARING_DOWN;
     }
 
-    /**
-     * Note that threading is being torn down.
-     */
+    /** Note that threading is being torn down. */
     static void setTearingDown() {
         initializationState.set(STATE_TEARING_DOWN);
     }
@@ -594,40 +582,26 @@ public static boolean printLocationInfo(Log log, UnsignedWord value, boolean all
      * Access to platform-specific implementations.
      */
 
-    /**
-     * A thread-local enum giving the thread status of a VMThread. And supporting methods.
-     */
+    /** A thread-local enum giving the thread status of a VMThread. And supporting methods. */
     public static class StatusSupport {
 
-        /**
-         * The status of a {@link IsolateThread}.
-         */
+        /** The status of a {@link IsolateThread}. */
         public static final FastThreadLocalInt statusTL = FastThreadLocalFactory.createInt("StatusSupport.statusTL").setMaxOffset(FastThreadLocal.FIRST_CACHE_LINE);
 
-        /**
-         * An illegal thread state for places where we need to pass a value.
-         */
+        /** An illegal thread state for places where we need to pass a value. */
         public static final int STATUS_ILLEGAL = -1;
         /**
          * {@link IsolateThread} memory has been allocated for the thread, but the thread is not on
          * the VMThreads list yet.
          */
         public static final int STATUS_CREATED = 0;
-        /**
-         * The thread is running in Java code.
-         */
+        /** The thread is running in Java code. */
         public static final int STATUS_IN_JAVA = STATUS_CREATED + 1;
-        /**
-         * The thread has been requested to stop at a safepoint.
-         */
+        /** The thread has been requested to stop at a safepoint. */
         public static final int STATUS_IN_SAFEPOINT = STATUS_IN_JAVA + 1;
-        /**
-         * The thread is running in native code.
-         */
+        /** The thread is running in native code. */
         public static final int STATUS_IN_NATIVE = STATUS_IN_SAFEPOINT + 1;
-        /**
-         * The thread is running in trusted native code that was linked into the image.
-         */
+        /** The thread is running in trusted native code that was linked into the image. */
         public static final int STATUS_IN_VM = STATUS_IN_NATIVE + 1;
         private static final int MAX_STATUS = STATUS_IN_VM;
 
@@ -651,9 +625,7 @@ private static String statusToString(int status) {
 
         /* Access methods to treat VMThreads.statusTL as a volatile int. */
 
-        /**
-         * For debugging.
-         */
+        /** For debugging. */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static String getStatusString(IsolateThread vmThread) {
             return statusToString(statusTL.getVolatile(vmThread));
@@ -679,16 +651,12 @@ public static void setStatusNative(IsolateThread vmThread) {
             statusTL.setVolatile(vmThread, STATUS_IN_NATIVE);
         }
 
-        /**
-         * There is no unguarded change to safepoint.
-         */
+        /** There is no unguarded change to safepoint. */
         public static boolean compareAndSetNativeToSafepoint(IsolateThread vmThread) {
             return statusTL.compareAndSet(vmThread, STATUS_IN_NATIVE, STATUS_IN_SAFEPOINT);
         }
 
-        /**
-         * An <em>unguarded</em> transition to Java.
-         */
+        /** An <em>unguarded</em> transition to Java. */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setStatusJavaUnguarded() {
             statusTL.setVolatile(STATUS_IN_JAVA);
@@ -698,9 +666,7 @@ public static void setStatusVM() {
             statusTL.setVolatile(STATUS_IN_VM);
         }
 
-        /**
-         * A guarded transition from native to another status.
-         */
+        /** A guarded transition from native to another status. */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static boolean compareAndSetNativeToNewStatus(int newStatus) {
             return statusTL.compareAndSet(STATUS_IN_NATIVE, newStatus);
@@ -780,7 +746,7 @@ public static void assertStatusVM() {
         // This method will be removed in GR-34435.
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void setStatusIgnoreSafepoints() {
-            SafepointBehavior.setIgnoreThreadInSafepointHandling();
+            SafepointBehavior.markThreadAsCrashed();
         }
 
         public static boolean isValidStatus(int status) {
@@ -825,11 +791,7 @@ public static class SafepointBehavior {
          * The thread won't freeze at a safepoint and the safepoint handling will ignore the thread.
          * So, the VM will be able to reach a safepoint regardless of the status of this thread.
          */
-        static final int IGNORE_THREAD_IN_SAFEPOINT_HANDLING = 2;
-
-        public static boolean isIgnoredBySafepointHandling(IsolateThread vmThread) {
-            return safepointBehaviorTL.getVolatile(vmThread) == IGNORE_THREAD_IN_SAFEPOINT_HANDLING;
-        }
+        static final int THREAD_CRASHED = 2;
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static boolean safepointChecksEnabled() {
@@ -842,7 +804,7 @@ public static boolean safepointChecksEnabled(IsolateThread vmThread) {
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static int getSafepointBehavior(IsolateThread vmThread) {
+        public static int getSafepointBehaviorVolatile(IsolateThread vmThread) {
             return safepointBehaviorTL.getVolatile(vmThread);
         }
 
@@ -852,24 +814,26 @@ public static int getSafepointBehavior(IsolateThread vmThread) {
          * thread status).
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static void setPreventVMFromReachingSafepoint() {
+        public static void preventSafepoints() {
             safepointBehaviorTL.setVolatile(PREVENT_VM_FROM_REACHING_SAFEPOINT);
         }
 
         /**
-         * Changes the safepoint behavior so that this thread won't freeze at a safepoint and the
-         * safepoint handling will ignore the thread. So, the VM will be able to reach a safepoint
-         * regardless of the status of this thread.
+         * Marks the thread as crashed. This method may only be used in places where it is no longer
+         * possible to safely detach a thread.
+         * 
+         * Calling this method changes the safepoint behavior so that this thread won't freeze at a
+         * safepoint. The safepoint handling will ignore the thread so that the VM can reach a
+         * safepoint regardless of the status of this thread.
          *
          * Be careful with this. If a thread is ignored by the safepoint handling, it means that it
-         * can continue executing while a safepoint (and therefore a GC) is in progress. So, either
-         * prevent that a safepoint can be initiated (by holding the {@link #THREAD_MUTEX}) or make
-         * sure that this thread does not access any movable heap objects (even executing write
-         * barriers can already cause issues).
+         * can continue executing while a safepoint (and therefore a GC) is in progress. So, make
+         * sure that this thread does not allocate or access any movable heap objects (even
+         * executing write barriers can already cause issues).
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        static void setIgnoreThreadInSafepointHandling() {
-            safepointBehaviorTL.setVolatile(IGNORE_THREAD_IN_SAFEPOINT_HANDLING);
+        public static void markThreadAsCrashed() {
+            safepointBehaviorTL.setVolatile(THREAD_CRASHED);
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@@ -879,8 +843,8 @@ public static String toString(int safepointBehavior) {
                     return "ALLOW_SAFEPOINT";
                 case PREVENT_VM_FROM_REACHING_SAFEPOINT:
                     return "PREVENT_VM_FROM_REACHING_SAFEPOINT";
-                case IGNORE_THREAD_IN_SAFEPOINT_HANDLING:
-                    return "IGNORE_THREAD_IN_SAFEPOINT_HANDLING";
+                case THREAD_CRASHED:
+                    return "THREAD_CRASHED";
                 default:
                     return "Invalid safepoint behavior";
             }
@@ -892,18 +856,12 @@ public static String toString(int safepointBehavior) {
      */
     public static class ActionOnTransitionToJavaSupport {
 
-        /**
-         * The actions to be performed.
-         */
+        /** The actions to be performed. */
         private static final FastThreadLocalInt actionTL = FastThreadLocalFactory.createInt("ActionOnTransitionToJavaSupport.actionTL");
 
-        /**
-         * The thread does not need to take any action.
-         */
+        /** The thread does not need to take any action. */
         private static final int NO_ACTION = 0;
-        /**
-         * Code synchronization should be performed due to newly installed code.
-         */
+        /** Code synchronization should be performed due to newly installed code. */
         private static final int SYNCHRONIZE_CODE = NO_ACTION + 1;
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
@@ -951,9 +909,7 @@ public static class ActionOnExitSafepointSupport {
          */
         private static final int SWITCH_STACK = NO_ACTION + 1;
 
-        /**
-         * Target of stack switching.
-         */
+        /** Target of stack switching. */
         private static final FastThreadLocalWord<Pointer> returnSP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnSP");
         private static final FastThreadLocalWord<CodePointer> returnIP = FastThreadLocalFactory.createWord("ActionOnExitSafepointSupport.returnIP");
 
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
index d6df15bb1676..f341108a898b 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
@@ -36,6 +36,7 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
+import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -825,14 +826,17 @@ static int ThrowNew(JNIEnvironment env, JNIObjectHandle clazzHandle, CCharPointe
     @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
     @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     @NeverInline("Access of caller frame.")
+    @Uninterruptible(reason = "Prevent safepoints until everything is set up for the fatal error printing.", calleeMustBe = false)
     static void FatalError(JNIEnvironment env, CCharPointer message) {
+        VMThreads.SafepointBehavior.preventSafepoints();
+        StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
+
         CodePointer callerIP = KnownIntrinsics.readReturnAddress();
         LogHandler logHandler = ImageSingletons.lookup(LogHandler.class);
         Log log = Log.enterFatalContext(logHandler, callerIP, CTypeConversion.toJavaString(message), null);
         if (log != null) {
             try {
                 log.string("Fatal error reported via JNI: ").string(message).newline();
-                VMThreads.SafepointBehavior.setPreventVMFromReachingSafepoint();
                 SubstrateDiagnostics.printFatalError(log, KnownIntrinsics.readCallerStackPointer(), callerIP);
             } catch (Throwable ignored) {
                 /*

From 1d83777fc68b0343be5dd036a708e08a106f24cd Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Mon, 18 Oct 2021 19:04:21 +0200
Subject: [PATCH 511/681] [GR-34556] Fixed libgraal gate.

---
 .../com/oracle/truffle/api/test/polyglot/LoggingTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
index 088317f22518..d5d2559e2a82 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/LoggingTest.java
@@ -413,10 +413,10 @@ public boolean test(final LoggingContext context, final TruffleLogger[] loggers)
                 return false;
             }
         };
-        final ByteArrayOutputStream err = new ByteArrayOutputStream();
-        try (Context ctx1 = Context.newBuilder().err(err).build()) {
+        final ByteArrayOutputStream logStream = new ByteArrayOutputStream();
+        try (Context ctx1 = Context.newBuilder().logHandler(logStream).build()) {
             ctx1.eval(LoggingLanguageFirst.ID, "");
-            final String output = new String(err.toByteArray());
+            final String output = new String(logStream.toByteArray());
             Assert.assertTrue(output, output.indexOf(expected) > 0);
         }
     }

From cd0c592cc6bc1a95039ab5034d402cdad9d4a6e2 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Thu, 14 Oct 2021 17:00:32 +0200
Subject: [PATCH 512/681] Fold extended loads into AArch64Move.LoadOp and pass
 around access size in more places.

---
 .../AArch64ArithmeticLIRGenerator.java        |  24 +--
 .../core/aarch64/AArch64MoveFactory.java      |   5 +-
 .../lir/aarch64/AArch64ControlFlow.java       |   2 +-
 .../compiler/lir/aarch64/AArch64Move.java     | 204 ++++++++++--------
 .../aarch64/AArch64RestoreRegistersOp.java    |   3 +-
 .../lir/aarch64/AArch64SaveRegistersOp.java   |   3 +-
 .../compiler/lir/aarch64/AArch64Unary.java    | 107 ---------
 .../lir/aarch64/AArch64ZapRegistersOp.java    |   4 +-
 .../lir/aarch64/AArch64ZapStackOp.java        |   4 +-
 .../aarch64/SubstrateAArch64Backend.java      |  16 +-
 .../graal/amd64/SubstrateAMD64Backend.java    |  16 +-
 .../JNIPrimitiveArrayOperationMethod.java     |   4 +-
 12 files changed, 172 insertions(+), 220 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java

diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
index 4843f0724b70..a9f8c5d91238 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java
@@ -56,7 +56,6 @@
 import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreConstantOp;
 import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp;
 import org.graalvm.compiler.lir.aarch64.AArch64ReinterpretOp;
-import org.graalvm.compiler.lir.aarch64.AArch64Unary;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 
@@ -117,23 +116,16 @@ protected Variable emitSub(LIRKind resultKind, Value a, Value b, boolean setFlag
         }
     }
 
-    public Value emitExtendMemory(boolean isSigned, AArch64Kind memoryKind, int resultBits, AArch64AddressValue address, LIRFrameState state) {
-        // Issue a zero extending load of the proper bit size and set the result to
-        // the proper kind.
+    public Value emitExtendMemory(boolean isSigned, AArch64Kind accessKind, int resultBits, AArch64AddressValue address, LIRFrameState state) {
+        /*
+         * Issue an extending load of the proper bit size and set the result to the proper kind.
+         */
+        GraalError.guarantee(accessKind.isInteger(), "can only extend integer kinds");
         Variable result = getLIRGen().newVariable(LIRKind.value(resultBits == 32 ? AArch64Kind.DWORD : AArch64Kind.QWORD));
 
-        int targetSize = resultBits <= 32 ? 32 : 64;
-        switch (memoryKind) {
-            case BYTE:
-            case WORD:
-            case DWORD:
-            case QWORD:
-                getLIRGen().append(new AArch64Unary.MemoryOp(isSigned, targetSize,
-                                memoryKind.getSizeInBytes() * Byte.SIZE, result, address, state));
-                break;
-            default:
-                throw GraalError.shouldNotReachHere();
-        }
+        int dstBitSize = resultBits <= 32 ? 32 : 64;
+        AArch64Move.ExtendKind extend = isSigned ? AArch64Move.ExtendKind.SIGN_EXTEND : AArch64Move.ExtendKind.ZERO_EXTEND;
+        getLIRGen().append(new AArch64Move.LoadOp(accessKind, dstBitSize, extend, result, address, state));
         return result;
     }
 
diff --git a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java
index 2fc3878e3145..11c042c55f27 100644
--- a/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java
+++ b/compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java
@@ -39,6 +39,7 @@
 import org.graalvm.compiler.lir.aarch64.AArch64Move.LoadAddressOp;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool.MoveFactory;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
@@ -59,14 +60,14 @@ public LIRInstruction createMove(AllocatableValue dst, Value src) {
             if (srcIsSlot && dstIsSlot) {
                 throw GraalError.shouldNotReachHere(src.getClass() + " " + dst.getClass());
             } else {
-                return new AArch64Move.Move(dst, (AllocatableValue) src);
+                return new AArch64Move.Move((AArch64Kind) dst.getPlatformKind(), dst, (AllocatableValue) src);
             }
         }
     }
 
     @Override
     public LIRInstruction createStackMove(AllocatableValue result, AllocatableValue input) {
-        return new AArch64Move.Move(result, input);
+        return new AArch64Move.Move((AArch64Kind) result.getPlatformKind(), result, input);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
index 105d18685613..360253ba167c 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
@@ -370,7 +370,7 @@ private static void emitCompareHelper(CompilationResultBuilder crb, AArch64Macro
             } else {
                 try (ScratchRegister scratch = masm.getScratchRegister()) {
                     Register scratchReg = scratch.getRegister();
-                    AArch64Move.const2reg(crb, masm, scratchReg, jc);
+                    AArch64Move.const2reg((AArch64Kind) key.getPlatformKind(), crb, masm, scratchReg, jc);
                     masm.cmp(cmpSize, asRegister(key), scratchReg);
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
index d68cc6521533..e75a5e0b09c5 100755
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java
@@ -28,7 +28,6 @@
 import static jdk.vm.ci.aarch64.AArch64.SIMD;
 import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.aarch64.AArch64.zr;
-import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
@@ -71,7 +70,7 @@
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.PlatformKind;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
 
 public class AArch64Move {
@@ -90,11 +89,11 @@ public LoadInlineConstant(JavaConstant constant, AllocatableValue result) {
 
         @Override
         public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
+            AArch64Kind moveKind = (AArch64Kind) result.getPlatformKind();
             if (isRegister(result)) {
-                const2reg(crb, masm, asRegister(result), constant);
+                const2reg(moveKind, crb, masm, asRegister(result), constant);
             } else if (isStackSlot(result)) {
-                StackSlot slot = asStackSlot(result);
-                const2stack(crb, masm, slot, constant);
+                const2stack(moveKind, crb, masm, asStackSlot(result), constant);
             }
         }
 
@@ -116,16 +115,22 @@ public static class Move extends AArch64LIRInstruction implements ValueMoveOp {
         @Def({REG, STACK, HINT}) protected AllocatableValue result;
         @Use({REG, STACK}) protected AllocatableValue input;
 
-        public Move(AllocatableValue result, AllocatableValue input) {
+        private AArch64Kind moveKind;
+
+        public Move(AArch64Kind moveKind, AllocatableValue result, AllocatableValue input) {
             super(TYPE);
             this.result = result;
             this.input = input;
+            this.moveKind = moveKind;
+            int resultSize = result.getPlatformKind().getSizeInBytes();
+            int inputSize = input.getPlatformKind().getSizeInBytes();
+            assert resultSize == moveKind.getSizeInBytes() && resultSize <= inputSize;
             assert !(isStackSlot(result) && isStackSlot(input));
         }
 
         @Override
         public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            move(crb, masm, getResult(), getInput());
+            move(moveKind, crb, masm, getResult(), getInput());
         }
 
         @Override
@@ -230,17 +235,17 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
 
     abstract static class MemOp extends AArch64LIRInstruction implements StandardOp.ImplicitNullCheck {
 
-        protected final AArch64Kind kind;
+        protected final AArch64Kind accessKind;
         @Use({COMPOSITE}) protected AArch64AddressValue addressValue;
         @State protected LIRFrameState state;
 
-        MemOp(LIRInstructionClass<? extends MemOp> c, AArch64Kind kind, AArch64AddressValue address, LIRFrameState state) {
+        MemOp(LIRInstructionClass<? extends MemOp> c, AArch64Kind accessKind, AArch64AddressValue address, LIRFrameState state) {
             super(c);
 
             int size = address.getBitMemoryTransferSize();
-            assert size == AArch64Address.ANY_SIZE || size == kind.getSizeInBytes() * Byte.SIZE;
+            assert size == AArch64Address.ANY_SIZE || size == accessKind.getSizeInBytes() * Byte.SIZE;
 
-            this.kind = kind;
+            this.accessKind = accessKind;
             this.addressValue = address;
             this.state = state;
         }
@@ -275,28 +280,68 @@ public boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int i
         }
     }
 
-    public static final class LoadOp extends MemOp {
-        public static final LIRInstructionClass<LoadOp> TYPE = LIRInstructionClass.create(LoadOp.class);
+    public enum ExtendKind {
+        NONE,
+        ZERO_EXTEND,
+        SIGN_EXTEND;
+    }
 
-        @Def protected AllocatableValue result;
+    abstract static class ExtendableLoadOp extends MemOp {
 
-        public LoadOp(AArch64Kind kind, AllocatableValue result, AArch64AddressValue address, LIRFrameState state) {
-            super(TYPE, kind, address, state);
+        @Def({REG}) protected AllocatableValue result;
+
+        protected int dstBitSize;
+        protected ExtendKind extend;
+
+        ExtendableLoadOp(LIRInstructionClass<? extends ExtendableLoadOp> c, AArch64Kind kind, int dstBitSize, ExtendKind extend, AllocatableValue result, AArch64AddressValue address,
+                        LIRFrameState state) {
+            super(c, kind, address, state);
+            this.dstBitSize = dstBitSize;
+            this.extend = extend;
             this.result = result;
         }
+    }
+
+    public static final class LoadOp extends ExtendableLoadOp {
+        public static final LIRInstructionClass<LoadOp> TYPE = LIRInstructionClass.create(LoadOp.class);
+
+        public LoadOp(AArch64Kind accessKind, AllocatableValue result, AArch64AddressValue address, LIRFrameState state) {
+            this(accessKind, accessKind.getSizeInBytes() * Byte.SIZE, ExtendKind.NONE, result, address, state);
+        }
+
+        public LoadOp(AArch64Kind accessKind, int dstBitSize, ExtendKind extend, AllocatableValue result, AArch64AddressValue address, LIRFrameState state) {
+            super(TYPE, accessKind, dstBitSize, extend, result, address, state);
+        }
 
         @Override
         protected void emitMemAccess(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
             AArch64Address address = addressValue.toAddress();
             Register dst = asRegister(result);
 
-            int destSize = result.getPlatformKind().getSizeInBytes() * Byte.SIZE;
-            int srcSize = kind.getSizeInBytes() * Byte.SIZE;
-            if (kind.isInteger()) {
-                masm.ldr(srcSize, dst, address);
+            int srcBitSize = accessKind.getSizeInBytes() * Byte.SIZE;
+            if (accessKind.isInteger()) {
+                switch (extend) {
+                    case NONE:
+                        assert dstBitSize == srcBitSize;
+                        masm.ldr(srcBitSize, dst, address);
+                        break;
+                    case ZERO_EXTEND:
+                        assert dstBitSize >= srcBitSize;
+                        // ldr zeros out remaining bits
+                        masm.ldr(srcBitSize, dst, address);
+                        break;
+                    case SIGN_EXTEND:
+                        assert dstBitSize >= srcBitSize;
+                        // ldrs will sign extend value to required length
+                        masm.ldrs(dstBitSize, srcBitSize, dst, address);
+                        break;
+                    default:
+                        throw GraalError.shouldNotReachHere();
+                }
             } else {
-                assert srcSize == destSize;
-                masm.fldr(srcSize, dst, address);
+                assert extend == ExtendKind.NONE;
+                assert srcBitSize == dstBitSize && dstBitSize == result.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+                masm.fldr(srcBitSize, dst, address);
             }
         }
     }
@@ -351,7 +396,7 @@ public StoreOp(AArch64Kind kind, AArch64AddressValue address, AllocatableValue i
 
         @Override
         protected void emitMemAccess(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            emitStore(crb, masm, kind, addressValue.toAddress(), input);
+            emitStore(crb, masm, accessKind, addressValue.toAddress(), input);
         }
     }
 
@@ -370,7 +415,7 @@ public StoreConstantOp(AArch64Kind kind, AArch64AddressValue address, JavaConsta
 
         @Override
         public void emitMemAccess(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            emitStore(crb, masm, kind, addressValue.toAddress(), zr.asValue(LIRKind.combine(addressValue)));
+            emitStore(crb, masm, accessKind, addressValue.toAddress(), zr.asValue(LIRKind.combine(addressValue)));
         }
     }
 
@@ -458,26 +503,28 @@ private static void emitStore(@SuppressWarnings("unused") CompilationResultBuild
         }
     }
 
-    private static void move(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, Value input) {
+    private static void move(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, Value input) {
         if (isRegister(input)) {
+            Register src = asRegister(input);
             if (isRegister(result)) {
-                reg2reg(crb, masm, result, asAllocatableValue(input));
+                reg2reg(moveKind, masm, asRegister(result), src);
             } else if (isStackSlot(result)) {
-                reg2stack(crb, masm, asStackSlot(result), asRegister(input));
+                reg2stack(moveKind, crb, masm, asStackSlot(result), src);
             } else {
                 throw GraalError.shouldNotReachHere();
             }
         } else if (isStackSlot(input)) {
+            StackSlot src = asStackSlot(input);
             if (isRegister(result)) {
-                stack2reg(crb, masm, result, asStackSlot(input));
+                stack2reg(moveKind, crb, masm, asRegister(result), src);
             } else if (isStackSlot(result)) {
-                emitStackMove(crb, masm, result, input);
+                stack2stack(moveKind, crb, masm, asStackSlot(result), src);
             } else {
                 throw GraalError.shouldNotReachHere();
             }
         } else if (isJavaConstant(input)) {
             if (isRegister(result)) {
-                const2reg(crb, masm, asRegister(result), asJavaConstant(input));
+                const2reg(moveKind, crb, masm, asRegister(result), asJavaConstant(input));
             } else {
                 throw GraalError.shouldNotReachHere();
             }
@@ -486,51 +533,43 @@ private static void move(CompilationResultBuilder crb, AArch64MacroAssembler mas
         }
     }
 
-    private static void emitStackMove(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, Value input) {
+    private static void stack2stack(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, StackSlot input) {
         try (ScratchRegister r1 = masm.getScratchRegister()) {
             try (ScratchRegister r2 = masm.getScratchRegister()) {
                 Register rscratch1 = r1.getRegister();
                 Register rscratch2 = r2.getRegister();
-                // use the slot kind to define the operand size
-                PlatformKind kind = input.getPlatformKind();
-                final int size = kind.getSizeInBytes() * Byte.SIZE;
 
+                final int size = moveKind.getSizeInBytes() * Byte.SIZE;
                 // Always perform stack -> stack copies through integer registers
                 crb.blockComment("[stack -> stack copy]");
-                AArch64Address src = loadStackSlotAddress(crb, masm, asStackSlot(input), rscratch2);
+                AArch64Address src = loadStackSlotAddress(size, crb, masm, input, rscratch2);
                 masm.ldr(size, rscratch1, src);
-                AArch64Address dst = loadStackSlotAddress(crb, masm, asStackSlot(result), rscratch2);
+                AArch64Address dst = loadStackSlotAddress(size, crb, masm, result, rscratch2);
                 masm.str(size, rscratch1, dst);
             }
         }
     }
 
-    private static void reg2reg(@SuppressWarnings("unused") CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, AllocatableValue input) {
-        Register dst = asRegister(result);
-        Register src = asRegister(input);
-
-        if (src.equals(dst)) {
+    private static void reg2reg(AArch64Kind moveKind, AArch64MacroAssembler masm, Register result, Register input) {
+        if (input.equals(result)) {
             return;
         }
-        AArch64Kind inputKind = (AArch64Kind) input.getPlatformKind();
-        AArch64Kind resultKind = (AArch64Kind) result.getPlatformKind();
-        final int size = Math.max(Math.min(inputKind.getSizeInBytes(), resultKind.getSizeInBytes()) * Byte.SIZE, 32);
-        if (dst.getRegisterCategory().equals(CPU) && src.getRegisterCategory().equals(CPU)) {
-            masm.mov(size, dst, src);
+        final int size = moveKind.getSizeInBytes() * Byte.SIZE;
+        assert size == 32 || size == 64 || size == 128;
+        if (result.getRegisterCategory().equals(CPU) && input.getRegisterCategory().equals(CPU)) {
+            masm.mov(size, result, input);
         } else if (size == 128) {
-            assert dst.getRegisterCategory().equals(SIMD) && src.getRegisterCategory().equals(SIMD);
-            masm.neon.moveVV(AArch64ASIMDAssembler.ASIMDSize.FullReg, dst, src);
+            assert result.getRegisterCategory().equals(SIMD) && input.getRegisterCategory().equals(SIMD);
+            masm.neon.moveVV(AArch64ASIMDAssembler.ASIMDSize.FullReg, result, input);
         } else {
-            masm.fmov(size, dst, src);
+            masm.fmov(size, result, input);
         }
     }
 
-    static void reg2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, Register input) {
+    static void reg2stack(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, Register input) {
         try (ScratchRegister scratch = masm.getScratchRegister()) {
-            AArch64Address dest = loadStackSlotAddress(crb, masm, result, scratch.getRegister());
-            // use the slot kind to define the operand size
-            AArch64Kind kind = (AArch64Kind) result.getPlatformKind();
-            final int size = kind.getSizeInBytes() * Byte.SIZE;
+            final int size = moveKind.getSizeInBytes() * Byte.SIZE;
+            AArch64Address dest = loadStackSlotAddress(size, crb, masm, result, scratch.getRegister());
             if (input.getRegisterCategory().equals(CPU)) {
                 masm.str(size, input, dest);
             } else {
@@ -540,25 +579,31 @@ static void reg2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm,
         }
     }
 
-    static void stack2reg(CompilationResultBuilder crb, AArch64MacroAssembler masm, AllocatableValue result, StackSlot input) {
-        AArch64Kind kind = (AArch64Kind) input.getPlatformKind();
-        // use the slot kind to define the operand size
-        final int size = kind.getSizeInBytes() * Byte.SIZE;
-        Register dst = asRegister(result);
-        if (dst.getRegisterCategory().equals(CPU)) {
-            AArch64Address src = loadStackSlotAddress(crb, masm, input, result);
-            masm.ldr(size, dst, src);
+    static void stack2reg(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, StackSlot input) {
+        /*
+         * Since AArch64ArithmeticLIRGenerator.emitNarrow creates a move from a QWORD to DWORD, it
+         * is possible that the stack slot is an aligned QWORD while the moveKind is a DWORD. When
+         * this happens, it is better treat the move as a QWORD, as this allows an immediate
+         * addressing mode to be used more often.
+         */
+        final int size = input.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+        assert moveKind.getSizeInBytes() * Byte.SIZE <= size;
+        if (result.getRegisterCategory().equals(CPU)) {
+            AArch64Address src = loadStackSlotAddress(size, crb, masm, input, result);
+            masm.ldr(size, result, src);
         } else {
-            assert dst.getRegisterCategory().equals(SIMD);
+            assert result.getRegisterCategory().equals(SIMD);
             try (ScratchRegister sc = masm.getScratchRegister()) {
-                AArch64Address src = loadStackSlotAddress(crb, masm, input, sc.getRegister());
-                masm.fldr(size, dst, src);
+                AArch64Address src = loadStackSlotAddress(size, crb, masm, input, sc.getRegister());
+                masm.fldr(size, result, src);
             }
         }
     }
 
-    static void const2reg(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, JavaConstant input) {
-        switch (input.getJavaKind().getStackKind()) {
+    static void const2reg(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, JavaConstant input) {
+        JavaKind stackKind = input.getJavaKind().getStackKind();
+        assert stackKind.isObject() || moveKind.getSizeInBytes() <= stackKind.getByteCount();
+        switch (stackKind) {
             case Int:
                 masm.mov(result, input.asInt());
                 break;
@@ -611,14 +656,14 @@ static void const2reg(CompilationResultBuilder crb, AArch64MacroAssembler masm,
         }
     }
 
-    static void const2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm, Value result, JavaConstant constant) {
+    static void const2stack(AArch64Kind moveKind, CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, JavaConstant constant) {
         if (constant.isNull() && !crb.mustReplaceWithUncompressedNullRegister(constant)) {
-            reg2stack(crb, masm, asStackSlot(result), zr);
+            reg2stack(moveKind, crb, masm, result, zr);
         } else {
             try (ScratchRegister sc = masm.getScratchRegister()) {
                 Register scratch = sc.getRegister();
-                const2reg(crb, masm, scratch, constant);
-                reg2stack(crb, masm, asStackSlot(result), scratch);
+                const2reg(moveKind, crb, masm, scratch, constant);
+                reg2stack(moveKind, crb, masm, result, scratch);
             }
         }
     }
@@ -632,19 +677,12 @@ static void const2stack(CompilationResultBuilder crb, AArch64MacroAssembler masm
      * transfersize, which gives us a 15-bit address range (for longs/doubles) respectively a 14-bit
      * range (for everything else).
      *
-     * @param scratch Scratch register that can be used to load address. If Value.ILLEGAL this
-     *            instruction fails if we try to access a StackSlot that is too large to be loaded
-     *            directly.
+     * @param scratchReg Scratch register that can be used to load address.
      * @return AArch64Address of given StackSlot. Uses scratch register if necessary to do so.
      */
-    private static AArch64Address loadStackSlotAddress(CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot slot, AllocatableValue scratch) {
-        Register scratchReg = Value.ILLEGAL.equals(scratch) ? zr : asRegister(scratch);
-        return loadStackSlotAddress(crb, masm, slot, scratchReg);
-    }
-
-    private static AArch64Address loadStackSlotAddress(CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot slot, Register scratchReg) {
+    private static AArch64Address loadStackSlotAddress(int size, CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot slot, Register scratchReg) {
         int displacement = crb.frameMap.offsetForStackSlot(slot);
-        int size = slot.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+        assert size == slot.getPlatformKind().getSizeInBytes() * Byte.SIZE;
         return masm.makeAddress(size, sp, displacement, scratchReg);
     }
 
@@ -693,10 +731,6 @@ protected final Register getBaseRegister() {
         protected final int getShift() {
             return encoding.getShift();
         }
-
-        protected final void move(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            AArch64Move.move(crb, masm, result, input);
-        }
     }
 
     public static class CompressPointerOp extends PointerCompressionOp {
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java
index edc9b5ba39aa..b0c44ef3bea2 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java
@@ -31,6 +31,7 @@
 
 import java.util.Arrays;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.LIRValueUtil;
@@ -75,7 +76,7 @@ protected Register[] getSavedRegisters() {
     }
 
     protected void restoreRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, Register result, StackSlot input) {
-        AArch64Move.stack2reg(crb, masm, result.asValue(), input);
+        AArch64Move.stack2reg((AArch64Kind) input.getPlatformKind(), crb, masm, result, input);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java
index ea22ff8a131d..a81c4fd6a5a3 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java
@@ -27,6 +27,7 @@
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.lir.LIRInstructionClass;
@@ -56,7 +57,7 @@ public AArch64SaveRegistersOp(Register[] savedRegisters, AllocatableValue[] save
     }
 
     protected void saveRegister(CompilationResultBuilder crb, AArch64MacroAssembler masm, StackSlot result, Register input) {
-        AArch64Move.reg2stack(crb, masm, result, input);
+        AArch64Move.reg2stack((AArch64Kind) result.getPlatformKind(), crb, masm, result, input);
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java
deleted file mode 100644
index 1b95d3875941..000000000000
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Unary.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2015, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.lir.aarch64;
-
-import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-
-import jdk.vm.ci.code.Register;
-import jdk.vm.ci.meta.AllocatableValue;
-import jdk.vm.ci.meta.Value;
-
-/**
- * AARCH64 LIR instructions that have one input and one output.
- */
-public class AArch64Unary {
-
-    /**
-     * Instruction with a {@link AArch64AddressValue memory} operand.
-     */
-    public static class MemoryOp extends AArch64LIRInstruction implements ImplicitNullCheck {
-        public static final LIRInstructionClass<MemoryOp> TYPE = LIRInstructionClass.create(MemoryOp.class);
-
-        private final boolean isSigned;
-
-        @Def({REG}) protected AllocatableValue result;
-        @Use({COMPOSITE}) protected AArch64AddressValue input;
-
-        @State protected LIRFrameState state;
-
-        private int targetSize;
-        private int srcSize;
-
-        public MemoryOp(boolean isSigned, int targetSize, int srcSize, AllocatableValue result, AArch64AddressValue input, LIRFrameState state) {
-            super(TYPE);
-            this.targetSize = targetSize;
-            this.srcSize = srcSize;
-            this.isSigned = isSigned;
-            this.result = result;
-            this.input = input;
-            this.state = state;
-        }
-
-        @Override
-        public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
-            int prePosition = masm.position();
-            AArch64Address address = input.toAddress();
-            Register dst = asRegister(result);
-            if (isSigned) {
-                masm.ldrs(targetSize, srcSize, dst, address);
-            } else {
-                masm.ldr(srcSize, dst, address);
-            }
-
-            if (state != null) {
-                int implicitExceptionPosition = prePosition;
-                // Adjust implicit exception position if this ldr/str has been merged to ldp/stp.
-                if (prePosition == masm.position() && masm.isImmLoadStoreMerged()) {
-                    implicitExceptionPosition = prePosition - 4;
-                    if (crb.isImplicitExceptionExist(implicitExceptionPosition)) {
-                        return;
-                    }
-                }
-                crb.recordImplicitException(implicitExceptionPosition, state);
-            }
-        }
-
-        @Override
-        public boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int implicitNullCheckLimit) {
-            int displacement = input.getDisplacement();
-            if (state == null && value.equals(input.getBase()) && input.getOffset().equals(Value.ILLEGAL) && displacement >= 0 && displacement < implicitNullCheckLimit) {
-                state = nullCheckState;
-                return true;
-            }
-            return false;
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java
index 296ada715090..7418ec28cd49 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.lir.aarch64;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.lir.LIRInstructionClass;
 import org.graalvm.compiler.lir.Opcode;
@@ -60,7 +61,8 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         for (int i = 0; i < zappedRegisters.length; i++) {
             Register reg = zappedRegisters[i];
             if (reg != null) {
-                AArch64Move.const2reg(crb, masm, reg, zapValues[i]);
+                AArch64Kind moveKind = (AArch64Kind) crb.target.arch.getPlatformKind(zapValues[i].getJavaKind());
+                AArch64Move.const2reg(moveKind, crb, masm, reg, zapValues[i]);
             }
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java
index 5e267a5a63ed..4a5534f916bd 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java
@@ -29,6 +29,7 @@
 import org.graalvm.compiler.lir.Opcode;
 import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
 
+import jdk.vm.ci.aarch64.AArch64Kind;
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.meta.JavaConstant;
 
@@ -59,7 +60,8 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         for (int i = 0; i < zappedStack.length; i++) {
             StackSlot slot = zappedStack[i];
             if (slot != null) {
-                AArch64Move.const2stack(crb, masm, slot, zapValues[i]);
+                AArch64Kind moveKind = (AArch64Kind) crb.target.arch.getPlatformKind(zapValues[i].getJavaKind());
+                AArch64Move.const2stack(moveKind, crb, masm, slot, zapValues[i]);
             }
         }
     }
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
index f710a2bccc67..6dc8e9d46846 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -821,10 +821,22 @@ public boolean allowConstantToStackMove(Constant constant) {
             return super.allowConstantToStackMove(constant);
         }
 
+        private static JavaConstant getZeroConstant(AllocatableValue dst) {
+            int size = dst.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+            switch (size) {
+                case 32:
+                    return JavaConstant.INT_0;
+                case 64:
+                    return JavaConstant.LONG_0;
+                default:
+                    throw VMError.shouldNotReachHere();
+            }
+        }
+
         @Override
         public AArch64LIRInstruction createLoad(AllocatableValue dst, Constant src) {
             if (CompressedNullConstant.COMPRESSED_NULL.equals(src)) {
-                return super.createLoad(dst, JavaConstant.INT_0);
+                return super.createLoad(dst, getZeroConstant(dst));
             } else if (src instanceof SubstrateObjectConstant) {
                 return loadObjectConstant(dst, (SubstrateObjectConstant) src);
             }
@@ -834,7 +846,7 @@ public AArch64LIRInstruction createLoad(AllocatableValue dst, Constant src) {
         @Override
         public LIRInstruction createStackLoad(AllocatableValue dst, Constant src) {
             if (CompressedNullConstant.COMPRESSED_NULL.equals(src)) {
-                return super.createStackLoad(dst, JavaConstant.INT_0);
+                return super.createStackLoad(dst, getZeroConstant(dst));
             } else if (src instanceof SubstrateObjectConstant) {
                 return loadObjectConstant(dst, (SubstrateObjectConstant) src);
             }
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
index 2d87bba507d3..635736397285 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -901,10 +901,22 @@ public boolean allowConstantToStackMove(Constant constant) {
             return super.allowConstantToStackMove(constant);
         }
 
+        private static JavaConstant getZeroConstant(AllocatableValue dst) {
+            int size = dst.getPlatformKind().getSizeInBytes() * Byte.SIZE;
+            switch (size) {
+                case 32:
+                    return JavaConstant.INT_0;
+                case 64:
+                    return JavaConstant.LONG_0;
+                default:
+                    throw VMError.shouldNotReachHere();
+            }
+        }
+
         @Override
         public AMD64LIRInstruction createLoad(AllocatableValue dst, Constant src) {
             if (CompressedNullConstant.COMPRESSED_NULL.equals(src)) {
-                return super.createLoad(dst, JavaConstant.INT_0);
+                return super.createLoad(dst, getZeroConstant(dst));
             } else if (src instanceof SubstrateObjectConstant) {
                 return loadObjectConstant(dst, (SubstrateObjectConstant) src);
             }
@@ -914,7 +926,7 @@ public AMD64LIRInstruction createLoad(AllocatableValue dst, Constant src) {
         @Override
         public LIRInstruction createStackLoad(AllocatableValue dst, Constant src) {
             if (CompressedNullConstant.COMPRESSED_NULL.equals(src)) {
-                return super.createStackLoad(dst, JavaConstant.INT_0);
+                return super.createStackLoad(dst, getZeroConstant(dst));
             } else if (src instanceof SubstrateObjectConstant) {
                 return loadObjectConstant(dst, (SubstrateObjectConstant) src);
             }
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
index f0ecdba39d55..37a78674568e 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
@@ -262,7 +262,9 @@ private ValueNode newArray(HostedProviders providers, JNIGraphKit kit, List<Valu
         ConstantNode zero = kit.createInt(0);
         kit.startIf(new IntegerLessThanNode(length, zero), BranchProbabilityNode.VERY_SLOW_PATH_PROFILE);
         kit.thenPart();
-        ValueNode nullHandle = kit.createConstant(JavaConstant.INT_0, providers.getWordTypes().getWordKind());
+        JavaKind wordKind = providers.getWordTypes().getWordKind();
+        assert wordKind == JavaKind.Long || wordKind == JavaKind.Int;
+        ValueNode nullHandle = kit.createConstant(wordKind == JavaKind.Long ? JavaConstant.LONG_0 : JavaConstant.INT_0, wordKind);
         kit.elsePart();
         ValueNode array = kit.append(new NewArrayNode(elementType, length, true));
         ValueNode arrayHandle = kit.boxObjectInLocalHandle(array);

From cf932cb70ff8c66e86eb0754dbf9d251aadb0646 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Mon, 18 Oct 2021 21:10:36 +0300
Subject: [PATCH 513/681] Follow Gilles D. comments; Sync up with
 vscode-extensions repo

---
 docs/enterprise-overview/architecture-overview.md |  2 +-
 docs/tools/vscode/graalvm/README.md               |  5 +++--
 docs/tools/vscode/graalvm/visualvm-integration.md |  2 +-
 docs/tools/vscode/micronaut/README.md             | 12 ++++++------
 docs/tools/vscode/micronaut/k8s-support.md        | 11 +++++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docs/enterprise-overview/architecture-overview.md b/docs/enterprise-overview/architecture-overview.md
index a5227e09ad76..86be95af91ad 100644
--- a/docs/enterprise-overview/architecture-overview.md
+++ b/docs/enterprise-overview/architecture-overview.md
@@ -15,7 +15,7 @@ The conceptual overview and advantages of GraalVM Enterprise are described on th
 * [GraalVM Enterprise Architecture](#graalvm-enterprise-architecture)
 * [Runtime Modes](#runtime-modes)
 * [Available Distributions](#available-distributions)
-* [Supported Platforms](#supported-platforms)
+* [Certified Platforms](#certified-platforms)
 * [Distribution Components List](#distribution-components-list)
 * [Licensing and Support](#licensing-and-support)
 * [Experimental and Early Adopter Features](#experimental-and-early-adopter-features)
diff --git a/docs/tools/vscode/graalvm/README.md b/docs/tools/vscode/graalvm/README.md
index f2c752c46310..28dc70cc90e9 100644
--- a/docs/tools/vscode/graalvm/README.md
+++ b/docs/tools/vscode/graalvm/README.md
@@ -209,6 +209,7 @@ It can be done by providing following switches for the `native-image` builder:
 - `-g -O0` or
 - `-H:Debug=2 -H:Optimize=0`.
 
+
 The resulting images will contain debug records in a format `gdb` debugger understands.
 
 ### Debug Native Image “Real” Code
@@ -233,7 +234,7 @@ This brings the visual Java tooling to VS Code.
 ![VisualVM and VS Code Integration](images/vscode_visualvm.png)
 
 To get started, you need to get the latest stable GraalVM release using the **Download & Install GraalVM** action from the **Gr** activity view, as described in the [Installation and Setup](README.md#installation-and-setup) section.
-Make sure the GraalVM is set as the **active**.
+Make sure the GraalVM is set as the **active** installation.
 
 Once a GraalVM installation is set as active, the Command Palette contains the following commands related to VisualVM:
 
@@ -252,7 +253,7 @@ Follow these steps to start VisualVM automatically from within the VS Code:
 
 4. Select the **Launch VisualVM & Java 8+ Application** launch configuration in the Run and Debug activity. Use the Start Debugging or Run Without Debugging action to start the current project.
 
-While the project is starting, the Process node in VisualVM pane displays project name with a "pid pending" label.
+While the project is starting, the Process node in VisualVM pane displays the project name with a "pid pending" label.
 Once the project process starts, the Process node is updated to show its process ID (PID) and the action defined in step 3 is performed.
 
 > Note: This feature was introduced with the GraalVM 21.2.0 release. Please make sure to get the latest GraalVM Tools for Java extension from the VS Code Marketplace, preferably by downloading the [GraalVM Extension Pack for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack).
diff --git a/docs/tools/vscode/graalvm/visualvm-integration.md b/docs/tools/vscode/graalvm/visualvm-integration.md
index 456c96edf047..501d645fc309 100644
--- a/docs/tools/vscode/graalvm/visualvm-integration.md
+++ b/docs/tools/vscode/graalvm/visualvm-integration.md
@@ -5,7 +5,7 @@ link_title: VisualVM and VS Code Integration
 permalink: /tools/vscode/graalvm/visualvm-integration/
 ---
 
-# VisualVM and VS Code Integration
+## VisualVM and VS Code Integration
 
 As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with VisualVM (https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
 This brings the visual Java tooling to VS Code.
diff --git a/docs/tools/vscode/micronaut/README.md b/docs/tools/vscode/micronaut/README.md
index 3a8afcaac37b..883beb4b0e24 100644
--- a/docs/tools/vscode/micronaut/README.md
+++ b/docs/tools/vscode/micronaut/README.md
@@ -11,9 +11,9 @@ permalink: /tools/vscode/micronaut-extension/
 The extension is Technology Preview.
 
 The extension also enables the [Micronaut Launch](https://micronaut.io/launch/) application that allows you to create Micronaut projects through an interface inside VS Code, in addition to using the console CLI.
-There are, of course, other ways to create a new Micronaut application. If you provide a path to the [Micronaut CLI installation](https://micronaut-projects.github.io/micronaut-starter/latest/guide#installation), you can create a project using the `mn` executable. If you prefer not to install the Micronaut CLI, and you are running on Linux or macOS, you can `curl` the project. Lastly, you can navigate to Micronaut Launch in a browser, create a new project, download it and open in VS Code.
+There are, of course, other ways to create a new Micronaut application. If you provide a path to the [Micronaut CLI installation](https://micronaut-projects.github.io/micronaut-starter/latest/guide/#installation), you can create a project using the `mn` executable. If you prefer not to install the Micronaut CLI, and you are running on Linux or macOS, you can `curl` the project. Lastly, you can navigate to Micronaut Launch in a browser, create a new project, download it and open in VS Code.
 
-In combination with the [GraalVM Tools for Java extension](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm), you can run Micronaut projects on GraalVM, and debug them directly from the VS Code development environment with different debugging protocols enabled with the extension. This extension for Micronaut was also developed to help developers build native images directly from VS Code.
+In combination with the [GraalVM Tools for Java extension](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm), you can run Micronaut projects on GraalVM, and debug them directly from the VS Code development environment with different debugging protocols enabled with the extension. This extension for Micronaut was also developed to help developers build native images right from VS Code.
 
 #### Table of contents
 - [Installation and Setup](#installation-and-setup)
@@ -51,7 +51,7 @@ The GraalVM Tools for Micronaut extension provides:
 * code completion and navigation for Micronaut configuration (YAML) files and Java (available with [Apache NetBeans Language Server extension](https://marketplace.visualstudio.com/items?itemName=asf.apache-netbeans-java)).
 * ability to build Micronaut projects ahead-of-time into native images with GraalVM
 * __Run main with Continuous Mode__ CodeLens runs Micronaut project and reloads it automatically when source code is changed. It is not available as Debugger.
-    * __Launch Java: Continuous Mode__ is the name of the launch configuration.
+* __Launch Java: Continuous Mode__ is the name of the launch configuration.
 
 ### Micronaut VS Code Commands
 
@@ -106,14 +106,14 @@ That will run the `mvnw package -Dpackaging=native-image` job.
 
 For more details, continue reading to the [Micronaut documentation](https://guides.micronaut.io/micronaut-creating-first-graal-app/guide/index.html#creatingGraalImage).
 
-## Deploy Micronaut Projects to Docker Registry
+## Deploy Micronaut Projects to a Docker Registry
 
-The Micronaut support in VS Code allows to build and deploy Docker images to Docker registry.
+The Micronaut support in VS Code allows to build and deploy Docker images to a Docker registry.
 Use action **View** > **Command Palette** > **Micronaut: Deploy...** and select **dockerPush** to deploy a dockerized Micronaut application or **dockerPushNative** to build and push docker with a native executable of Micronaut application.
 
 ![Micronaut Deploy Commands](images/micronaut-deploy-commands.png)
 
-Besides that, you can also push a Micronaut application or a native executable to the Docker Registry from the VS Code Terminal window.
+Besides that, you can also push a Micronaut application or a native executable to a Docker Registry from the VS Code Terminal window.
 A particular Docker Registry can be configured in the build, see the [Micronaut Deploying Application](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/examples/deploy.html) documentation.
 
 <!-- Deploy Micronaut Applications to Oracle Container Engine for Kubernetes -->
diff --git a/docs/tools/vscode/micronaut/k8s-support.md b/docs/tools/vscode/micronaut/k8s-support.md
index 283533a0c6a0..aa641c0659ca 100644
--- a/docs/tools/vscode/micronaut/k8s-support.md
+++ b/docs/tools/vscode/micronaut/k8s-support.md
@@ -5,12 +5,13 @@ link_title: Deploy Micronaut Applications to Oracle Container Engine for Kuberne
 permalink: /tools/vscode/micronaut/kubernetes-support/
 ---
 
-# Deploy Micronaut Applications to Oracle Container Engine for Kubernetes
+## Deploy, Run and Debug Micronaut Applications in Kubernetes Cluster
 
 GraalVM Tools for Micronaut Extension added support for working with Kubernetes clusters based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
+It is now possible to deploy, run and debug a Micronaut application in a Kubernetes cluster from VS Code.
 
-It is now possible to deploy and debug a Micronaut project to Kubernetes on Oracle Cloud with Oracle Container Engine for Kubernetes (OKE)](https://www.oracle.com/uk/cloud-native/container-engine-kubernetes/) environment.
-OKE is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to the cloud.
+This guide is focused on and tested with Oracle Container Engine for Kubernetes (OKE)](https://www.oracle.com/uk/cloud-native/container-engine-kubernetes/) and Oracle Container Registry, but Kubernetes features should work in other environments.
+OKE is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to Oracle Cloud.
 
 This guide will walk you through the process of deploying a Micronaut application to OKE from VS Code and debugging it.
 
@@ -23,7 +24,9 @@ This guide will walk you through the process of deploying a Micronaut applicatio
 ## Preparation
 
 ### Visual Studio Code Kubernetes Tools
-Micronaut's extension support for Kubernetes is based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools). It has to be installed.
+
+GraalVM Tools for Micronaut Extension uses `kubectl` provided by Microsoft's [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
+It has to be installed.
 
 Open Extensions tab, search for "Kubernetes" and install the one from Microsoft.
 Once installed, you should see the Kubernetes icon in the left sidebar:

From 659b5fb2961e97d1a617432657a0ad7902d04ed9 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Mon, 18 Oct 2021 11:41:39 -0700
Subject: [PATCH 514/681] Style fix.

---
 substratevm/mx.substratevm/suite.py           |  7 ++---
 .../pointsto/util/PointsToOptionParser.java   | 27 ++++++++++---------
 .../svm/common/option/CommonOptionParser.java | 21 ++++++++-------
 .../svm/common/option/MultiOptionValue.java   |  5 +---
 .../core/option/SubstrateOptionsParser.java   | 27 +++++++++----------
 .../svm/hosted/option/HostedOptionParser.java |  4 +--
 6 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index f8b4f7afa75e..c3669be6eb91 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1261,16 +1261,13 @@
             "moduleInfo" : {
                 "name" : "org.graalvm.nativeimage.junitsupport",
                 "exports" : [
-                    "* to org.graalvm.nativeimage.builder",
+                    "* to org.graalvm.nativeimage.builder,org.graalvm.nativeimage.base,org.graalvm.nativeimage.pointsto"
                 ],
                 "requires" : [
                     "static com.oracle.mxtool.junit",
                     "static junit",
                     "static hamcrest",
-                ],
-                "exports" : [
-                    "* to org.graalvm.nativeimage.base,org.graalvm.nativeimage.pointsto,org.graalvm.nativeimage.builder",
-                ],
+                ]
             },
         },
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
index b2a93a85768d..3a1997d13be2 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
@@ -26,15 +26,7 @@
 
 package com.oracle.graal.pointsto.util;
 
-import com.oracle.svm.common.option.CommonOptionParser;
-import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
-import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
-import com.oracle.svm.common.option.UnsupportedOptionClassException;
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+import static com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat.PLUS_MINUS;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -45,7 +37,16 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import static com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat.PLUS_MINUS;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionValues;
+
+import com.oracle.svm.common.option.CommonOptionParser;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
 
 public final class PointsToOptionParser {
 
@@ -59,12 +60,11 @@ public static PointsToOptionParser getInstance() {
         return instance;
     }
 
-    @SuppressWarnings("unchecked")
     private PointsToOptionParser() {
         ClassLoader appClassLoader = PointsToOptionParser.class.getClassLoader();
         CommonOptionParser.collectOptions(ServiceLoader.load(OptionDescriptors.class, appClassLoader), descriptor -> {
             String name = descriptor.getName();
-            if (descriptor.getOptionKey() instanceof OptionKey) {
+            if (descriptor.getOptionKey() != null) {
                 OptionDescriptor existing = allAnalysisOptions.put(name, descriptor);
                 if (existing != null) {
                     AnalysisError.shouldNotReachHere("Option name \"" + name + "\" has multiple definitions: " + existing.getLocation() + " and " + descriptor.getLocation());
@@ -112,7 +112,8 @@ private static boolean parseOption(String optionPrefix, EconomicMap<String, Opti
         try {
             Predicate<OptionKey<?>> optionKeyPredicate = optionKey -> {
                 Class<?> clazz = optionKey.getClass();
-                // All classes from com.oracle.graal.pointsto.api.PointstoOptions are taken as non-hosted options.
+                // All classes from com.oracle.graal.pointsto.api.PointstoOptions are taken as
+                // non-hosted options.
                 if (clazz.getName().startsWith("com.oracle.graal.pointsto.api.PointstoOptions")) {
                     return false;
                 }
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
index 823a67bee2c9..fcd6a9c53bd6 100644
--- a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
@@ -28,15 +28,6 @@
 
 // Checkstyle: allow reflection
 
-import com.oracle.svm.util.ClassUtil;
-import com.oracle.svm.util.StringUtil;
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionsParser;
-
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,6 +41,16 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.compiler.options.OptionType;
+import org.graalvm.compiler.options.OptionsParser;
+
+import com.oracle.svm.util.ClassUtil;
+import com.oracle.svm.util.StringUtil;
+
 public class CommonOptionParser {
     public static final String HOSTED_OPTION_PREFIX = "-H:";
     public static final String RUNTIME_OPTION_PREFIX = "-R:";
@@ -352,7 +353,7 @@ public static long parseLong(String v) {
     }
 
     /**
-     * Parses the provide string to a double number, avoiding the JDK dependencies (which pull in a
+     * Parses the provided string to a double number, avoiding the JDK dependencies (which pull in a
      * lot of classes, including the regular expression library). Only simple numbers are supported,
      * without fancy exponent styles.
      */
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
index 0f678439903c..2c44d2ce4997 100644
--- a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/MultiOptionValue.java
@@ -32,10 +32,7 @@ public interface MultiOptionValue<T> {
     Class<T> getValueType();
 
     /**
-     * @return a list of option values, one for each place where the option is used
-     * @implSpec Note that it DOES NOT perform any splitting of string values based on a delimiter.
-     *           If you want to perform this split, use a utility
-     *           {@link com.oracle.svm.core.option.OptionUtils#flatten(String, com.oracle.svm.core.option.LocatableMultiOptionValue.Strings)}
+     * @return a list of option values, one for each place where the option is used.
      */
     List<T> values();
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index 81436ccd784c..8d70ac470839 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -26,19 +26,6 @@
 
 // Checkstyle: allow reflection
 
-import com.oracle.svm.core.util.InterruptImageBuilding;
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.common.option.CommonOptionParser;
-import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
-import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
-import com.oracle.svm.common.option.UnsupportedOptionClassException;
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-
 import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -47,7 +34,19 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.compiler.options.OptionDescriptor;
+import org.graalvm.compiler.options.OptionDescriptors;
+import org.graalvm.compiler.options.OptionKey;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
+import com.oracle.svm.common.option.CommonOptionParser;
+import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
+import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
+import com.oracle.svm.core.util.InterruptImageBuilding;
+import com.oracle.svm.core.util.VMError;
 
 /**
  * This class contains methods for parsing options and matching them against
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
index e9a795dc44a3..46fa77d41fa6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
@@ -59,13 +59,13 @@ public HostedOptionParser(ClassLoader imageClassLoader) {
     }
 
     public static void collectOptions(ServiceLoader<OptionDescriptors> optionDescriptors, EconomicMap<String, OptionDescriptor> allHostedOptions,
-                                      EconomicMap<String, OptionDescriptor> allRuntimeOptions) {
+                    EconomicMap<String, OptionDescriptor> allRuntimeOptions) {
         SubstrateOptionsParser.collectOptions(optionDescriptors, descriptor -> {
             String name = descriptor.getName();
 
             if (descriptor.getDeclaringClass().getAnnotation(Platforms.class) != null) {
                 throw UserError.abort("Options must not be declared in a class that has a @%s annotation: option %s declared in %s",
-                        Platforms.class.getSimpleName(), name, descriptor.getDeclaringClass().getTypeName());
+                                Platforms.class.getSimpleName(), name, descriptor.getDeclaringClass().getTypeName());
             }
 
             if (!(descriptor.getOptionKey() instanceof RuntimeOptionKey)) {

From dfd8388896004441ced75759b98b99b41abe06f3 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 13 Oct 2021 18:49:11 +0200
Subject: [PATCH 515/681] Set java compliance of com.oracle.svm.truffle.tck to
 8+.

---
 substratevm/mx.substratevm/suite.py                             | 2 +-
 .../src/com/oracle/svm/truffle/tck/PermissionsFeature.java      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index c1b7e79a15bf..2dacbcf44a78 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1062,7 +1062,7 @@
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
-            "javaCompliance": "1.8",
+            "javaCompliance": "8+",
         },
     },
 
diff --git a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
index 86ca19b15d05..603181d4d98d 100644
--- a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
+++ b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
@@ -881,6 +881,7 @@ private void checkPermission(Permission perm) {
 }
 
 final class SecurityManagerHolder {
+    @SuppressWarnings("deprecation") // SecurityManager deprecated since 17.
     static final SecurityManager SECURITY_MANAGER = new SecurityManager();
 }
 

From 12dc6d97ca48f11070940ceb8af1ef694e6337af Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Mon, 18 Oct 2021 12:45:22 -0700
Subject: [PATCH 516/681] Refactor comments.

---
 .../graal/pointsto/PointsToAnalysis.java      | 41 ++++++++++---------
 .../svm/hosted/NativeImageGenerator.java      | 13 +++---
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
index 78c3cc170897..d642bb662760 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
@@ -45,7 +45,6 @@
 import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.function.Function;
 
-import com.oracle.graal.pointsto.util.AnalysisError;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
@@ -57,6 +56,7 @@
 import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.ObjectScanner.ReusableSet;
 import com.oracle.graal.pointsto.api.HostVM;
@@ -80,6 +80,7 @@
 import com.oracle.graal.pointsto.reports.StatisticsPrinter;
 import com.oracle.graal.pointsto.typestate.PointsToStats;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
 import com.oracle.graal.pointsto.util.CompletionExecutor.DebugContextRunnable;
 import com.oracle.graal.pointsto.util.Timer;
@@ -708,21 +709,22 @@ public HostVM getHostVM() {
     /**
      * Iterate until analysis reaches a fixpoint.
      *
-     *
      * @param debugContext debug context
-     * @param duringAnalysisAction  The action handler taken during analysis, return true if no more iteration is required.
-     *                              It could be the {@link org.graalvm.nativeimage.hosted.Feature#duringAnalysis}
-     *                              for Native Image generation, but also can be other similar actions for standalone pointsto
-     *                              analysis that does not dependent on {@link com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl}
-     *                              and {@link com.oracle.svm.hosted.NativeImageGenerator.AnalysisFeatureHandler}.
-     *
-     * @return The error message during the analysis. If the analysis ends successfully, an empty String is returned, otherwise
-     * the actual error message is returned.
-     * @throws InterruptedException
+     * @param analysisEndCondition hook for actions to be taken during analysis. It also dictates
+     *            when the analysis should end, i.e., it returns true if no more iterations are
+     *            required.
+     * 
+     *            When the analysis is used for Native Image generation the actions could for
+     *            example be specified via
+     *            {@link org.graalvm.nativeimage.hosted.Feature#duringAnalysis(Feature.DuringAnalysisAccess)}.
+     *            The ending condition could be provided by
+     *            {@link org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess#requireAnalysisIteration()}.
+     * 
+     * @throws AnalysisError if the analysis fails
      */
     @SuppressWarnings("try")
     @Override
-    public void runAnalysis(DebugContext debugContext, Function<AnalysisUniverse, Boolean> duringAnalysisAction) throws InterruptedException {
+    public void runAnalysis(DebugContext debugContext, Function<AnalysisUniverse, Boolean> analysisEndCondition) throws InterruptedException {
         int numIterations = 0;
         while (true) {
             try (Indent indent2 = debugContext.logAndIndent("new analysis iteration")) {
@@ -734,13 +736,13 @@ public void runAnalysis(DebugContext debugContext, Function<AnalysisUniverse, Bo
                 numIterations++;
                 if (numIterations > 1000) {
                     /*
-                     * Usually there are < 10 iterations. If we have so many iterations, we
-                     * probably have an endless loop (but at least we have a performance
-                     * problem because we re-start the analysis so often).
+                     * Usually there are < 10 iterations. If we have so many iterations, we probably
+                     * have an endless loop (but at least we have a performance problem because we
+                     * re-start the analysis so often).
                      */
-                    AnalysisError.shouldNotReachHere(String.format("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
+                    throw AnalysisError.shouldNotReachHere(String.format("Static analysis did not reach a fix point after %d iterations because a Feature keeps requesting new analysis iterations. " +
                                     "The analysis itself %s find a change in type states in the last iteration.",
-                            numIterations, analysisChanged ? "DID" : "DID NOT"));
+                                    numIterations, analysisChanged ? "DID" : "DID NOT"));
                 }
 
                 /*
@@ -750,9 +752,10 @@ public void runAnalysis(DebugContext debugContext, Function<AnalysisUniverse, Bo
                     int numTypes = universe.getTypes().size();
                     int numMethods = universe.getMethods().size();
                     int numFields = universe.getFields().size();
-                    if (duringAnalysisAction.apply(universe)) {
+                    if (analysisEndCondition.apply(universe)) {
                         if (numTypes != universe.getTypes().size() || numMethods != universe.getMethods().size() || numFields != universe.getFields().size()) {
-                            AnalysisError.shouldNotReachHere("When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()");
+                            throw AnalysisError.shouldNotReachHere(
+                                            "When a feature makes more types, methods, or fields reachable, it must require another analysis iteration via DuringAnalysisAccess.requireAnalysisIteration()");
                         }
                         return;
                     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 130b39dc9b34..3f4c371b64ca 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -59,7 +59,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import com.oracle.graal.pointsto.util.AnalysisError;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -151,6 +150,7 @@
 import com.oracle.graal.pointsto.reports.AnalysisReporter;
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.graal.pointsto.typestate.TypeState;
+import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.graal.pointsto.util.Timer;
 import com.oracle.graal.pointsto.util.Timer.StopTimer;
 import com.oracle.svm.core.BuildArtifacts;
@@ -696,12 +696,11 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
             try (StopTimer t = bb.getAnalysisTimer().start()) {
                 DuringAnalysisAccessImpl config = new DuringAnalysisAccessImpl(featureHandler, loader, bb, nativeLibraries, debug);
                 try {
-                    bb.runAnalysis(debug,
-                            (aUniverse) -> {
-                                bb.getHostVM().notifyClassReachabilityListener(aUniverse, config);
-                                featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
-                                return !config.getAndResetRequireAnalysisIteration();
-                            });
+                    bb.runAnalysis(debug, (universe) -> {
+                        bb.getHostVM().notifyClassReachabilityListener(universe, config);
+                        featureHandler.forEachFeature(feature -> feature.duringAnalysis(config));
+                        return !config.getAndResetRequireAnalysisIteration();
+                    });
                 } catch (AnalysisError e) {
                     throw UserError.abort(e, "Analysis step failed. Reason: %s.", e.getMessage());
                 }

From d2d17c1f2bc5fa36a387963aa113ec96cba05c27 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Fri, 8 Oct 2021 18:39:36 +0200
Subject: [PATCH 517/681] Update documentation for GC changes.

---
 .../native-image/MemoryManagement.md          | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/docs/reference-manual/native-image/MemoryManagement.md b/docs/reference-manual/native-image/MemoryManagement.md
index f39af9332cd5..17d0f4dc3945 100644
--- a/docs/reference-manual/native-image/MemoryManagement.md
+++ b/docs/reference-manual/native-image/MemoryManagement.md
@@ -62,19 +62,24 @@ It divides the Java heap into a young and an old generation.
 Each generation consists of a set of equally sized chunks, each a contiguous range of virtual memory.
 Those chunks are the GC-internal unit for memory allocation and memory reclamation.
 
-The young generation is reserved for the allocation of new objects and when this part becomes full, a young collection is triggered.
-Objects that are alive in the young generation, will be moved to the old generation, thus freeing up the young generation for subsequent object allocations.
-When the old generation becomes full, a full collection is triggered.
-Typically, a young collection is much faster than an full collection, however doing full collections is important for keeping the memory footprint low.
-By default, the GC tries to balance the time that is spent in young and full collections.
-
-If no maximum Java heap size is specified, a native image that uses the Serial GC will set its maximum Java heap size to 80% of the physical memory size.
-For example, on a machine with 4GB of RAM, the maximum Java heap size will be set to 3.2GB.
-If the same image is executed on a machine that has 32GB of RAM, the maximum Java heap size will be set to 25.6GB.
+The young generation contains recently created objects and is divided into the _eden_ and _survivor_ regions.
+New objects are allocated in the eden region, and when this region is full, a young collection is triggered.
+Objects that are alive in the eden region will be moved to the survivor region, and alive objects in the survivor region stay in that region until they reach a certain age (have survived a certain number of collections), at which time they are moved to the old generation.
+When the old generation becomes full, a full collection is triggered that reclaims the space of unused objects in both the young and old generations.
+Typically, a young collection is much faster than a full collection, however doing full collections is important for keeping the memory footprint low.
+By default, the Serial GC tries to find a size for the generations that provides good throughput, but to not increase sizes further when doing so gives diminishing returns.
+It also tries to maintain a ratio between the time spent in young collections and in full collections to keep the footprint small.
+
+If no maximum Java heap size is specified, a native image that uses the Serial GC will set its maximum Java heap size to 25% of the physical memory size (or 50% for physical memory below 384 MB), but always to at least 96MB.
+For example, on a machine with 4GB of RAM, the maximum Java heap size will be set to 1GB.
+If the same image is executed on a machine that has 32GB of RAM, the maximum Java heap size will be set to 8GB.
 Note that this is just the maximum value.
 Depending on the application, the amount of actually used Java heap memory can be much lower.
 To override this default behavior, either specify a value for `-XX:MaximumHeapSizePercent` or explicitly set the maximum [Java heap size](#java-heap-size).
 
+Note that GraalVM releases up to (and including) 21.3 use a different default configuration for the Serial GC without survivor regions, a maximum Java heap size of 80% of physical memory, and a default collection policy that balances the time that is spent in young collections and old collections.
+This configuration can be enabled with `-H:InitialCollectionPolicy=BySpaceAndTime`.
+
 Be mindful that the GC needs some extra memory when performing a garbage collection (2x of the maximum heap size is the worst case, usually, it is significantly less).
 Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (such as a container).
 
@@ -83,28 +88,32 @@ Therefore, the resident set size, RSS, can increase temporarily during a garbage
 For tuning the GC performance and the memory footprint, the following options can be used:
 * `-XX:MaximumHeapSizePercent` - the percentage of the physical memory size that is used as the maximum Java heap size if the maximum Java heap size is not specified otherwise.
 * `-XX:MaximumYoungGenerationSizePercent` - the maximum size of the young generation as a percentage of the maximum Java heap size.
-* `-XX:PercentTimeInIncrementalCollection` - determines how much time the GC should spend doing young collections.
-With the default value of 50, the GC tries to balance the time spent on young and full collections.
-Increasing this value will reduce the number of full GCs, which can improve performance but may worsen the memory footprint.
-Decreasing this value will increase the number of full GCs, which can improve the memory footprint but may decrease performance.
 * `-XX:±CollectYoungGenerationSeparately` (since GraalVM 21.0) - determines if a full GC collects the young generation separately or together with the old generation.
 If enabled, this may reduce the memory footprint during full GCs.
 However, full GCs may take more time.
+* `-XX:MaxHeapFree` (since GraalVM 21.3) - maximum total size (in bytes) of free memory chunks that remain reserved for allocations after a collection and are therefore not returned to the operating system.
 * `-H:AlignedHeapChunkSize` (can only be specified at image build time) - the size of a heap chunk in bytes.
-* `-H:MaxSurvivorSpaces` (since GraalVM 21.1, can only be specified at image build time) - the number of survivor spaces that are used for the young generation.
+* `-H:MaxSurvivorSpaces` (since GraalVM 21.1, can only be specified at image build time) - the number of survivor spaces that are used for the young generation, that is, the maximum age at which an object will be promoted to the old generation.
 With a value of 0, objects that survive a young collection are directly promoted to the old generation.
 * `-H:LargeArrayThreshold` (can only be specified at image build time) - the size at or above which an array will be allocated in its own heap chunk.
 Arrays that are considered as large are more expensive to allocate but they are never copied by the GC, which can reduce the GC overhead.
 
 ```shell
-# Build and execute a native image that uses the serial GC but does less full GCs
-native-image --gc=serial -R:PercentTimeInIncrementalCollection=70 HelloWorld
+# Build and execute a native image that uses a maximum heap size of 75% of the physical memory
+native-image --gc=serial -R:MaximumHeapSizePercent=75 HelloWorld
 ./helloworld
 
-# Execute the native image from above but force more full GCs
-./helloworld -XX:PercentTimeInIncrementalCollection=40
+# Execute the native image from above but reduce the maximum heap size to 40% of the physical memory
+./helloworld -XX:MaximumHeapSizePercent=40
 ```
 
+The following options are available with `-H:InitialCollectionPolicy=BySpaceAndTime` only:
+
+* `-XX:PercentTimeInIncrementalCollection` - determines how much time the GC should spend doing young collections.
+  With the default value of 50, the GC tries to balance the time spent on young and full collections.
+  Increasing this value will reduce the number of full GCs, which can improve performance but may worsen the memory footprint.
+  Decreasing this value will increase the number of full GCs, which can improve the memory footprint but may decrease performance.
+
 ## G1 Garbage Collector
 
 GraalVM Enterprise Edition also provides the Garbage-First (G1) garbage collector, which is based on the G1 GC from the Java HotSpot VM.

From 82ced0b17ed84d0a71eaad7cad0d0730c48322c5 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Wed, 13 Oct 2021 13:16:50 +0200
Subject: [PATCH 518/681] Avoid unnecessary SizeParameters allocations.

---
 .../genscavenge/AbstractCollectionPolicy.java | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
index 307a0ccc992a..c2b82ac5a737 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -141,7 +141,7 @@ protected void guaranteeSizeParametersInitialized() {
     public void updateSizeParameters() {
         PhysicalMemory.tryInitialize();
 
-        SizeParameters params = computeSizeParameters();
+        SizeParameters params = computeSizeParameters(sizes);
         SizeParameters previous = sizes;
         if (previous != null && params.equal(previous)) {
             return; // nothing to do
@@ -246,7 +246,7 @@ public UnsignedWord getMinimumHeapSize() {
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected abstract long gcCount();
 
-    protected SizeParameters computeSizeParameters() {
+    protected SizeParameters computeSizeParameters(SizeParameters existing) {
         UnsignedWord addressSpaceSize = ReferenceAccess.singleton().getAddressSpaceSize();
         UnsignedWord minYoungSpaces = minSpaceSize(); // eden
         if (HeapParameters.getMaxSurvivorSpaces() > 0) {
@@ -328,7 +328,7 @@ protected SizeParameters computeSizeParameters() {
         UnsignedWord initialEden = initialYoung.subtract(initialSurvivor.multiply(2));
         initialEden = minSpaceSize(alignDown(initialEden));
 
-        return new SizeParameters(maxHeap, maxYoung, initialHeap, initialEden, initialSurvivor, minHeap);
+        return SizeParameters.get(existing, maxHeap, maxYoung, initialHeap, initialEden, initialSurvivor, minHeap);
     }
 
     protected static final class SizeParameters {
@@ -339,7 +339,15 @@ protected static final class SizeParameters {
         final UnsignedWord initialSurvivorSize;
         final UnsignedWord minHeapSize;
 
-        SizeParameters(UnsignedWord maxHeapSize, UnsignedWord maxYoungSize, UnsignedWord initialHeapSize,
+        static SizeParameters get(SizeParameters existing, UnsignedWord maxHeap, UnsignedWord maxYoung, UnsignedWord initialHeap,
+                        UnsignedWord initialEden, UnsignedWord initialSurvivor, UnsignedWord minHeap) {
+            if (existing != null && existing.matches(maxHeap, maxYoung, initialHeap, initialEden, initialSurvivor, minHeap)) {
+                return existing;
+            }
+            return new SizeParameters(maxHeap, maxYoung, initialHeap, initialEden, initialSurvivor, minHeap);
+        }
+
+        private SizeParameters(UnsignedWord maxHeapSize, UnsignedWord maxYoungSize, UnsignedWord initialHeapSize,
                         UnsignedWord initialEdenSize, UnsignedWord initialSurvivorSize, UnsignedWord minHeapSize) {
             this.maxHeapSize = maxHeapSize;
             this.maxYoungSize = maxYoungSize;
@@ -385,8 +393,13 @@ UnsignedWord maxOldSize() {
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         boolean equal(SizeParameters other) {
-            return maxHeapSize.equal(other.maxHeapSize) && maxYoungSize.equal(other.maxYoungSize) && initialHeapSize.equal(other.initialHeapSize) &&
-                            initialEdenSize.equal(other.initialEdenSize) && initialSurvivorSize.equal(other.initialSurvivorSize) && minHeapSize.equal(other.minHeapSize);
+            return other == this || other.matches(maxHeapSize, maxYoungSize, initialHeapSize, initialEdenSize, initialSurvivorSize, minHeapSize);
+        }
+
+        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        boolean matches(UnsignedWord maxHeap, UnsignedWord maxYoung, UnsignedWord initialHeap, UnsignedWord initialEden, UnsignedWord initialSurvivor, UnsignedWord minHeap) {
+            return maxHeapSize.equal(maxHeap) && maxYoungSize.equal(maxYoung) && initialHeapSize.equal(initialHeap) &&
+                            initialEdenSize.equal(initialEden) && initialSurvivorSize.equal(initialSurvivor) && minHeapSize.equal(minHeap);
         }
     }
 }

From 316eeee50980e1243975a7a255dc1f318c710f39 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Fri, 15 Oct 2021 13:59:07 +0200
Subject: [PATCH 519/681] Do not use survivor spaces during full collections.

---
 .../oracle/svm/core/genscavenge/GCImpl.java   | 73 +++++++++----------
 .../svm/core/genscavenge/YoungGeneration.java |  9 ---
 .../remset/CardTableBasedRememberedSet.java   | 10 +--
 3 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 83f506087d87..7a3918bd50b2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -260,7 +260,7 @@ private boolean doCollectOnce(GCCause cause, long requestingNanoTime, boolean co
             if (!followsIncremental) { // we would have verified the heap after the incremental GC
                 verifyBeforeGC();
             }
-            scavenge(!complete, followsIncremental);
+            scavenge(!complete);
             verifyAfterGC();
         } finally {
             collectionTimer.close();
@@ -495,7 +495,7 @@ public boolean isCompleteCollection() {
     }
 
     /** Scavenge, either from dirty roots or from all roots, and process discovered references. */
-    private void scavenge(boolean incremental, boolean followingIncremental) {
+    private void scavenge(boolean incremental) {
         GreyToBlackObjRefVisitor.Counters counters = greyToBlackObjRefVisitor.openCounters();
         try {
             Timer rootScanTimer = timers.rootScan.open();
@@ -503,7 +503,7 @@ private void scavenge(boolean incremental, boolean followingIncremental) {
                 if (incremental) {
                     cheneyScanFromDirtyRoots();
                 } else {
-                    cheneyScanFromRoots(followingIncremental);
+                    cheneyScanFromRoots();
                 }
             } finally {
                 rootScanTimer.close();
@@ -576,7 +576,7 @@ private void cleanRuntimeCodeCache() {
         }
     }
 
-    private void cheneyScanFromRoots(boolean followingIncremental) {
+    private void cheneyScanFromRoots() {
         Timer cheneyScanFromRootsTimer = timers.cheneyScanFromRoots.open();
         try {
             /* Take a snapshot of the heap so that I can visit all the promoted Objects. */
@@ -585,22 +585,7 @@ private void cheneyScanFromRoots(boolean followingIncremental) {
              * Objects into each of the blackening methods, or even put them around individual
              * Object reference visits.
              */
-            prepareForPromotion();
-
-            if (followingIncremental) {
-                /*
-                 * We just finished an incremental collection, so we could get away with not
-                 * scavenging the young generation again.
-                 *
-                 * However, we don't do this because if objects in the young generation are
-                 * reachable only from garbage objects in the old generation, the young objects
-                 * cannot be reclaimed during this collection. Even worse, if there is a cycle in
-                 * which the young objects in turn keep the old objects alive, none of the objects
-                 * can be reclaimed until these young objects are eventually tenured, or until a
-                 * single complete collection is done before we would run out of memory.
-                 */
-                // HeapImpl.getHeapImpl().getYoungGeneration().emptyFromSpacesIntoToSpaces();
-            }
+            prepareForPromotion(false);
 
             /*
              * Make sure all chunks with pinned objects are in toSpace, and any formerly pinned
@@ -624,14 +609,14 @@ private void cheneyScanFromRoots(boolean followingIncremental) {
             blackenImageHeapRoots();
 
             /* Visit all the Objects promoted since the snapshot. */
-            scanGreyObjects();
+            scanGreyObjects(false);
 
             if (DeoptimizationSupport.enabled()) {
                 /* Visit the runtime compiled code, now that we know all the reachable objects. */
                 walkRuntimeCodeCache();
 
                 /* Visit all objects that became reachable because of the compiled code. */
-                scanGreyObjects();
+                scanGreyObjects(false);
             }
 
             greyToBlackObjectVisitor.reset();
@@ -657,7 +642,7 @@ private void cheneyScanFromDirtyRoots() {
              * Objects into each of the blackening methods, or even put them around individual
              * Object reference visits.
              */
-            prepareForPromotion();
+            prepareForPromotion(true);
 
             /*
              * Make sure any released objects are in toSpace (because this is an incremental
@@ -690,14 +675,14 @@ private void cheneyScanFromDirtyRoots() {
             blackenDirtyImageHeapRoots();
 
             /* Visit all the Objects promoted since the snapshot, transitively. */
-            scanGreyObjects();
+            scanGreyObjects(true);
 
             if (DeoptimizationSupport.enabled()) {
                 /* Visit the runtime compiled code, now that we know all the reachable objects. */
                 walkRuntimeCodeCache();
 
                 /* Visit all objects that became reachable because of the compiled code. */
-                scanGreyObjects();
+                scanGreyObjects(true);
             }
 
             greyToBlackObjectVisitor.reset();
@@ -956,28 +941,38 @@ private void blackenDirtyCardRoots() {
         }
     }
 
-    private static void prepareForPromotion() {
+    private static void prepareForPromotion(boolean isIncremental) {
         HeapImpl heap = HeapImpl.getHeapImpl();
         heap.getOldGeneration().prepareForPromotion();
-        heap.getYoungGeneration().prepareForPromotion();
+        if (isIncremental) {
+            heap.getYoungGeneration().prepareForPromotion();
+        }
     }
 
-    private void scanGreyObjects() {
-        HeapImpl heap = HeapImpl.getHeapImpl();
-        YoungGeneration youngGen = heap.getYoungGeneration();
-        OldGeneration oldGen = heap.getOldGeneration();
+    private void scanGreyObjects(boolean isIncremental) {
         Timer scanGreyObjectsTimer = timers.scanGreyObjects.open();
         try {
-            boolean hasGrey;
-            do {
-                hasGrey = youngGen.scanGreyObjects();
-                hasGrey |= oldGen.scanGreyObjects();
-            } while (hasGrey);
+            if (isIncremental) {
+                scanGreyObjectsLoop();
+            } else {
+                HeapImpl.getHeapImpl().getOldGeneration().scanGreyObjects();
+            }
         } finally {
             scanGreyObjectsTimer.close();
         }
     }
 
+    private static void scanGreyObjectsLoop() {
+        HeapImpl heap = HeapImpl.getHeapImpl();
+        YoungGeneration youngGen = heap.getYoungGeneration();
+        OldGeneration oldGen = heap.getOldGeneration();
+        boolean hasGrey;
+        do {
+            hasGrey = youngGen.scanGreyObjects();
+            hasGrey |= oldGen.scanGreyObjects();
+        } while (hasGrey);
+    }
+
     @AlwaysInline("GC performance")
     @SuppressWarnings("static-method")
     Object promoteObject(Object original, UnsignedWord header) {
@@ -991,7 +986,7 @@ Object promoteObject(Object original, UnsignedWord header) {
 
         Object result = null;
         boolean survivorOverflow = false;
-        if (originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
+        if (!completeCollection && originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
             if (isAligned) {
                 result = heap.getYoungGeneration().promoteAlignedObject(original, (AlignedHeader) originalChunk, originalSpace);
             } else {
@@ -999,7 +994,7 @@ Object promoteObject(Object original, UnsignedWord header) {
             }
             survivorOverflow = (result == null);
         }
-        if (result == null) { // tenuring age reached or survivor space full
+        if (result == null) { // complete collection, tenuring age reached, or survivor space full
             if (isAligned) {
                 result = heap.getOldGeneration().promoteAlignedObject(original, (AlignedHeader) originalChunk, originalSpace);
             } else {
@@ -1031,7 +1026,7 @@ private void promotePinnedObject(PinnedObjectImpl pinned) {
             Space originalSpace = HeapChunk.getSpace(originalChunk);
             if (originalSpace.isFromSpace()) {
                 boolean promoted = false;
-                if (originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
+                if (!completeCollection && originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
                     promoted = heap.getYoungGeneration().promoteChunk(originalChunk, isAligned, originalSpace);
                 }
                 if (!promoted) {
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java
index bfc13bd95599..209fbad2731d 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/YoungGeneration.java
@@ -151,15 +151,6 @@ void swapSpaces() {
         assert survivorsToSpacesAccounting.getChunkBytes().equal(0);
     }
 
-    void emptyFromSpacesIntoToSpaces() {
-        assert getEden().isEmpty() && getEden().getChunkBytes().equal(0) : "Eden must be empty.";
-        assert survivorsToSpacesAccounting.getChunkBytes().equal(0) : "Survivor to-spaces must be empty";
-        for (int i = 0; i < maxSurvivorSpaces; i++) {
-            assert getSurvivorToSpaceAt(i).isEmpty() && getSurvivorToSpaceAt(i).getChunkBytes().equal(0) : "Survivor to-space must be empty.";
-            getSurvivorToSpaceAt(i).absorb(getSurvivorFromSpaceAt(i));
-        }
-    }
-
     boolean walkHeapChunks(MemoryWalker.Visitor visitor) {
         if (getEden().walkHeapChunks(visitor)) {
             for (int i = 0; i < maxSurvivorSpaces; i++) {
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
index a3e2b060212b..c9f990d84358 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
@@ -136,12 +136,12 @@ public void dirtyCardIfNecessary(Object holderObject, Object object) {
             return;
         }
         // We dirty the cards of ...
-        if (HeapParameters.getMaxSurvivorSpaces() != 0 && HeapImpl.getHeapImpl().getYoungGeneration().contains(object)) {
+        if (HeapParameters.getMaxSurvivorSpaces() != 0 && !GCImpl.getGCImpl().isCompleteCollection() && HeapImpl.getHeapImpl().getYoungGeneration().contains(object)) {
             /*
-             * ...references from the old generation to the young generation, unless we do not use
-             * survivor spaces, in which case there will be no such references because all young
-             * objects are promoted to the old generation. (We avoid an extra old generation check
-             * and might remark a few image heap cards, too)
+             * ...references from the old generation to the young generation, unless there cannot be
+             * any such references if we do not use survivor spaces, or if we do but are doing a
+             * complete collection: in both cases, all objects are promoted to the old generation.
+             * (We avoid an extra old generation check and might remark a few image heap cards, too)
              */
         } else if (HeapImpl.usesImageHeapCardMarking() && GCImpl.getGCImpl().isCompleteCollection() && HeapImpl.getHeapImpl().isInImageHeap(holderObject)) {
             // ...references from the image heap to the runtime heap, but we clean and remark those

From 2b564ff7858f900a6f99b18d73628784852175f2 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Fri, 15 Oct 2021 16:20:46 +0200
Subject: [PATCH 520/681] Fix Adaptive GC policy accounting.

---
 .../genscavenge/AdaptiveCollectionPolicy.java | 59 +++++++++++--------
 .../svm/core/genscavenge/GCAccounting.java    | 29 ++++-----
 .../oracle/svm/core/genscavenge/GCImpl.java   | 10 ++--
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
index 9e76c13cff97..224262dbdf3a 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
@@ -188,16 +188,14 @@ public boolean shouldCollectCompletely(boolean followingIncrementalCollection) {
         return promotionEstimate.aboveThan(oldFree);
     }
 
-    private void updateAverages(UnsignedWord survivedChunkBytes, UnsignedWord survivorOverflowObjectBytes, UnsignedWord promotedObjectBytes) {
-        /*
-         * Adding the object bytes of overflowed survivor objects does not consider the overhead of
-         * partially filled chunks in the many survivor spaces, so it underestimates the necessary
-         * survivors capacity. However, this should self-correct as we expand the survivor space and
-         * reduce the tenuring age to avoid overflowing survivor objects in the first place.
-         */
-        avgSurvived.sample(survivedChunkBytes.add(survivorOverflowObjectBytes));
+    private void updateAverages(boolean isSurvivorOverflow, UnsignedWord survivedChunkBytes, UnsignedWord promotedChunkBytes) {
+        UnsignedWord survived = survivedChunkBytes;
+        if (isSurvivorOverflow) {
+            survived = survived.add(promotedChunkBytes); // guess
+        }
+        avgSurvived.sample(survived);
 
-        avgPromoted.sample(promotedObjectBytes);
+        avgPromoted.sample(promotedChunkBytes);
     }
 
     private void computeSurvivorSpaceSizeAndThreshold(boolean isSurvivorOverflow, UnsignedWord survivorLimit) {
@@ -424,24 +422,29 @@ public void onCollectionEnd(boolean completeCollection, GCCause cause) { // {maj
         UnsignedWord oldLive = accounting.getOldGenerationAfterChunkBytes();
         oldSizeExceededInPreviousCollection = oldLive.aboveThan(oldSize);
 
-        /*
-         * Update the averages that survivor space and tenured space sizes are derived from. Note
-         * that we use chunk bytes (not object bytes) for the survivors. This is because they are
-         * kept in many spaces (one for each age), which potentially results in significant overhead
-         * from chunks that may only be partially filled, especially when the heap is small. Using
-         * chunk bytes here ensures that the needed survivor capacity is not underestimated.
-         */
-        UnsignedWord survivedChunkBytes = HeapImpl.getHeapImpl().getYoungGeneration().getSurvivorChunkBytes();
-        UnsignedWord survivorOverflowObjectBytes = accounting.getSurvivorOverflowObjectBytes();
-        UnsignedWord tenuredObjBytes = accounting.getTenuredObjectBytes(); // includes overflowed
-        updateAverages(survivedChunkBytes, survivorOverflowObjectBytes, tenuredObjBytes);
+        if (!completeCollection) {
+            /*
+             * Update the averages that survivor space and tenured space sizes are derived from.
+             * Note that we use chunk bytes (not object bytes) for the survivors. This is because
+             * they are kept in many spaces (one for each age), which potentially results in
+             * significant overhead from chunks that may only be partially filled, especially when
+             * the heap is small. Using chunk bytes here ensures that the needed survivor capacity
+             * is not underestimated.
+             */
+            boolean survivorOverflow = accounting.hasLastIncrementalCollectionOverflowedSurvivors();
+            UnsignedWord survivedChunkBytes = HeapImpl.getHeapImpl().getYoungGeneration().getSurvivorChunkBytes();
+            UnsignedWord tenuredChunkBytes = accounting.getLastIncrementalCollectionPromotedChunkBytes();
+            updateAverages(survivorOverflow, survivedChunkBytes, tenuredChunkBytes);
 
-        computeSurvivorSpaceSizeAndThreshold(survivorOverflowObjectBytes.aboveThan(0), sizes.maxSurvivorSize());
-        computeEdenSpaceSize();
-        if (completeCollection) {
-            computeOldGenSpaceSize(oldLive);
+            computeSurvivorSpaceSizeAndThreshold(survivorOverflow, sizes.maxSurvivorSize());
+        }
+        if (shouldUpdateStats(cause)) {
+            computeEdenSpaceSize();
+            if (completeCollection) {
+                computeOldGenSpaceSize(oldLive);
+            }
+            decaySupplementalGrowth(completeCollection);
         }
-        decaySupplementalGrowth(completeCollection);
     }
 
     private void computeOldGenSpaceSize(UnsignedWord oldLive) { // compute_old_gen_free_space
@@ -531,9 +534,13 @@ private void decaySupplementalGrowth(boolean completeCollection) {
         }
     }
 
+    private static boolean shouldUpdateStats(GCCause cause) { // should_update_{eden,promo}_stats
+        return cause == GenScavengeGCCause.OnAllocation || USE_ADAPTIVE_SIZE_POLICY_WITH_SYSTEM_GC;
+    }
+
     private static void updateCollectionEndAverages(AdaptiveWeightedAverage costAverage, AdaptivePaddedAverage pauseAverage, ReciprocalLeastSquareFit costEstimator,
                     AdaptiveWeightedAverage intervalSeconds, GCCause cause, long mutatorNanos, long pauseNanos, UnsignedWord sizeBytes) {
-        if (cause == GenScavengeGCCause.OnAllocation || USE_ADAPTIVE_SIZE_POLICY_WITH_SYSTEM_GC) {
+        if (shouldUpdateStats(cause)) {
             double cost = 0;
             double mutatorInSeconds = TimeUtils.nanosToSecondsDouble(mutatorNanos);
             double pauseInSeconds = TimeUtils.nanosToSecondsDouble(pauseNanos);
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
index e18aaad24b3b..7b312f0fc325 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCAccounting.java
@@ -30,7 +30,6 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.annotate.AlwaysInline;
-import com.oracle.svm.core.hub.LayoutEncoding;
 import com.oracle.svm.core.log.Log;
 
 /**
@@ -47,8 +46,8 @@ public final class GCAccounting {
     private long completeCollectionTotalNanos = 0;
     private UnsignedWord collectedTotalChunkBytes = WordFactory.zero();
     private UnsignedWord allocatedChunkBytes = WordFactory.zero();
-    private UnsignedWord tenuredObjectBytes = WordFactory.zero();
-    private UnsignedWord survivorOverflowObjectBytes = WordFactory.zero();
+    private UnsignedWord lastIncrementalCollectionPromotedChunkBytes = WordFactory.zero();
+    private boolean lastIncrementalCollectionOverflowedSurvivors = false;
 
     /* Before and after measures. */
     private UnsignedWord youngChunkBytesBefore = WordFactory.zero();
@@ -113,15 +112,15 @@ UnsignedWord getYoungChunkBytesAfter() {
         return youngChunkBytesAfter;
     }
 
-    UnsignedWord getTenuredObjectBytes() {
-        return tenuredObjectBytes;
+    UnsignedWord getLastIncrementalCollectionPromotedChunkBytes() {
+        return lastIncrementalCollectionPromotedChunkBytes;
     }
 
-    UnsignedWord getSurvivorOverflowObjectBytes() {
-        return survivorOverflowObjectBytes;
+    public boolean hasLastIncrementalCollectionOverflowedSurvivors() {
+        return lastIncrementalCollectionOverflowedSurvivors;
     }
 
-    void beforeCollection() {
+    void beforeCollection(boolean completeCollection) {
         Log trace = Log.noopLog().string("[GCImpl.Accounting.beforeCollection:").newline();
         /* Gather some space statistics. */
         HeapImpl heap = HeapImpl.getHeapImpl();
@@ -138,8 +137,9 @@ void beforeCollection() {
             oldObjectBytesBefore = oldSpace.computeObjectBytes();
             allocatedObjectBytes = allocatedObjectBytes.add(edenObjectBytesBefore);
         }
-        tenuredObjectBytes = WordFactory.zero();
-        survivorOverflowObjectBytes = WordFactory.zero();
+        if (!completeCollection) {
+            lastIncrementalCollectionOverflowedSurvivors = false;
+        }
         trace.string("  youngChunkBytesBefore: ").unsigned(youngChunkBytesBefore)
                         .string("  oldChunkBytesBefore: ").unsigned(oldChunkBytesBefore);
         trace.string("]").newline();
@@ -147,12 +147,8 @@ void beforeCollection() {
 
     /** Called after an object has been promoted from the young generation to the old generation. */
     @AlwaysInline("GC performance")
-    void onObjectTenured(Object result, boolean survivorOverflow) {
-        UnsignedWord size = LayoutEncoding.getSizeFromObjectInline(result);
-        tenuredObjectBytes = tenuredObjectBytes.add(size);
-        if (survivorOverflow) {
-            survivorOverflowObjectBytes = survivorOverflowObjectBytes.add(size);
-        }
+    void onSurvivorOverflowed() {
+        lastIncrementalCollectionOverflowedSurvivors = true;
     }
 
     void afterCollection(boolean completeCollection, Timer collectionTimer) {
@@ -172,6 +168,7 @@ private void afterIncrementalCollection(Timer collectionTimer) {
          */
         incrementalCollectionCount += 1;
         afterCollectionCommon();
+        lastIncrementalCollectionPromotedChunkBytes = oldChunkBytesAfter.subtract(oldChunkBytesBefore);
         incrementalCollectionTotalNanos += collectionTimer.getMeasuredNanos();
         trace.string("  incrementalCollectionCount: ").signed(incrementalCollectionCount)
                         .string("  oldChunkBytesAfter: ").unsigned(oldChunkBytesAfter)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 7a3918bd50b2..19ab1b5ae95d 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -252,7 +252,7 @@ private boolean doCollectOnce(GCCause cause, long requestingNanoTime, boolean co
         assert !followsIncremental || complete : "An incremental collection cannot be followed by another incremental collection";
         completeCollection = complete;
 
-        accounting.beforeCollection();
+        accounting.beforeCollection(completeCollection);
         policy.onCollectionBegin(completeCollection, requestingNanoTime);
 
         Timer collectionTimer = timers.collection.open();
@@ -985,14 +985,15 @@ Object promoteObject(Object original, UnsignedWord header) {
         }
 
         Object result = null;
-        boolean survivorOverflow = false;
         if (!completeCollection && originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
             if (isAligned) {
                 result = heap.getYoungGeneration().promoteAlignedObject(original, (AlignedHeader) originalChunk, originalSpace);
             } else {
                 result = heap.getYoungGeneration().promoteUnalignedObject(original, (UnalignedHeader) originalChunk, originalSpace);
             }
-            survivorOverflow = (result == null);
+            if (result == null) {
+                accounting.onSurvivorOverflowed();
+            }
         }
         if (result == null) { // complete collection, tenuring age reached, or survivor space full
             if (isAligned) {
@@ -1001,9 +1002,6 @@ Object promoteObject(Object original, UnsignedWord header) {
                 result = heap.getOldGeneration().promoteUnalignedObject(original, (UnalignedHeader) originalChunk, originalSpace);
             }
             assert result != null : "promotion failure in old generation must have been handled";
-            if (result != original) {
-                accounting.onObjectTenured(result, survivorOverflow);
-            }
         }
 
         return result;

From cdf17541324e1600c21d1f2be896001dd432fb33 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Sat, 16 Oct 2021 12:09:24 +0200
Subject: [PATCH 521/681] Use a maximum heap size of 80% of physical memory
 also with the Adaptive policy.

---
 .../native-image/MemoryManagement.md           | 18 +++++++++---------
 .../genscavenge/AbstractCollectionPolicy.java  | 17 +----------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/docs/reference-manual/native-image/MemoryManagement.md b/docs/reference-manual/native-image/MemoryManagement.md
index 17d0f4dc3945..f89dbf37e673 100644
--- a/docs/reference-manual/native-image/MemoryManagement.md
+++ b/docs/reference-manual/native-image/MemoryManagement.md
@@ -70,15 +70,15 @@ Typically, a young collection is much faster than a full collection, however doi
 By default, the Serial GC tries to find a size for the generations that provides good throughput, but to not increase sizes further when doing so gives diminishing returns.
 It also tries to maintain a ratio between the time spent in young collections and in full collections to keep the footprint small.
 
-If no maximum Java heap size is specified, a native image that uses the Serial GC will set its maximum Java heap size to 25% of the physical memory size (or 50% for physical memory below 384 MB), but always to at least 96MB.
-For example, on a machine with 4GB of RAM, the maximum Java heap size will be set to 1GB.
-If the same image is executed on a machine that has 32GB of RAM, the maximum Java heap size will be set to 8GB.
+If no maximum Java heap size is specified, a native image that uses the Serial GC will set its maximum Java heap size to 80% of the physical memory size.
+For example, on a machine with 4GB of RAM, the maximum Java heap size will be set to 3.2GB.
+If the same image is executed on a machine that has 32GB of RAM, the maximum Java heap size will be set to 25.6GB.
 Note that this is just the maximum value.
 Depending on the application, the amount of actually used Java heap memory can be much lower.
 To override this default behavior, either specify a value for `-XX:MaximumHeapSizePercent` or explicitly set the maximum [Java heap size](#java-heap-size).
 
-Note that GraalVM releases up to (and including) 21.3 use a different default configuration for the Serial GC without survivor regions, a maximum Java heap size of 80% of physical memory, and a default collection policy that balances the time that is spent in young collections and old collections.
-This configuration can be enabled with `-H:InitialCollectionPolicy=BySpaceAndTime`.
+Note that GraalVM releases up to (and including) 21.3 use a different default configuration for the Serial GC with no survivor regions, a young generation that is limited to 256 MB, and a default collection policy that balances the time that is spent in young collections and old collections.
+This configuration can be enabled with: `-H:InitialCollectionPolicy=BySpaceAndTime`
 
 Be mindful that the GC needs some extra memory when performing a garbage collection (2x of the maximum heap size is the worst case, usually, it is significantly less).
 Therefore, the resident set size, RSS, can increase temporarily during a garbage collection which can be an issue in any environment with memory constraints (such as a container).
@@ -99,12 +99,12 @@ With a value of 0, objects that survive a young collection are directly promoted
 Arrays that are considered as large are more expensive to allocate but they are never copied by the GC, which can reduce the GC overhead.
 
 ```shell
-# Build and execute a native image that uses a maximum heap size of 75% of the physical memory
-native-image --gc=serial -R:MaximumHeapSizePercent=75 HelloWorld
+# Build and execute a native image that uses a maximum heap size of 25% of the physical memory
+native-image --gc=serial -R:MaximumHeapSizePercent=25 HelloWorld
 ./helloworld
 
-# Execute the native image from above but reduce the maximum heap size to 40% of the physical memory
-./helloworld -XX:MaximumHeapSizePercent=40
+# Execute the native image from above but increase the maximum heap size to 75% of the physical memory
+./helloworld -XX:MaximumHeapSizePercent=75
 ```
 
 The following options are available with `-H:InitialCollectionPolicy=BySpaceAndTime` only:
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
index c2b82ac5a737..35d426993af2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -68,8 +68,6 @@ static int getMaxSurvivorSpaces(Integer userValue) {
     /** HotSpot: -XX:MaxHeapSize default without ergonomics. */
     protected static final UnsignedWord SMALL_HEAP_SIZE = WordFactory.unsigned(96 * 1024 * 1024);
     protected static final int NEW_RATIO = 2; // HotSpot: -XX:NewRatio
-    protected static final int LARGE_MEMORY_MAX_HEAP_PERCENT = 25; // -XX:MaxRAMPercentage
-    protected static final int SMALL_MEMORY_MAX_HEAP_PERCENT = 50; // -XX:MinRAMPercentage
 
     protected final AdaptiveWeightedAverage avgYoungGenAlignedChunkFraction = new AdaptiveWeightedAverage(DEFAULT_TIME_WEIGHT);
 
@@ -261,20 +259,7 @@ protected SizeParameters computeSizeParameters(SizeParameters existing) {
         } else if (!PhysicalMemory.isInitialized()) {
             maxHeap = addressSpaceSize;
         } else {
-            UnsignedWord physicalMemorySize = PhysicalMemory.getCachedSize();
-            if (HeapParameters.Options.MaximumHeapSizePercent.hasBeenSet(RuntimeOptionValues.singleton())) {
-                maxHeap = physicalMemorySize.unsignedDivide(100).multiply(HeapParameters.getMaximumHeapSizePercent());
-            } else {
-                UnsignedWord reasonableMax = physicalMemorySize.unsignedDivide(100).multiply(AbstractCollectionPolicy.LARGE_MEMORY_MAX_HEAP_PERCENT);
-                UnsignedWord reasonableMin = physicalMemorySize.unsignedDivide(100).multiply(AbstractCollectionPolicy.SMALL_MEMORY_MAX_HEAP_PERCENT);
-                if (reasonableMin.belowThan(AbstractCollectionPolicy.SMALL_HEAP_SIZE)) {
-                    // small physical memory, use a small fraction for the heap
-                    reasonableMax = reasonableMin;
-                } else {
-                    reasonableMax = UnsignedUtils.max(reasonableMax, AbstractCollectionPolicy.SMALL_HEAP_SIZE);
-                }
-                maxHeap = reasonableMax;
-            }
+            maxHeap = PhysicalMemory.getCachedSize().unsignedDivide(100).multiply(HeapParameters.getMaximumHeapSizePercent());
         }
         UnsignedWord unadjustedMaxHeap = maxHeap;
         maxHeap = UnsignedUtils.clamp(alignDown(maxHeap), minAllSpaces, alignDown(addressSpaceSize));

From 63c898181ab92f407184373ab653ff652e3abc2e Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Sat, 16 Oct 2021 12:37:51 +0200
Subject: [PATCH 522/681] Increase initial heap size and its fraction for the
 young generation.

---
 .../core/genscavenge/AbstractCollectionPolicy.java  | 13 +++++++------
 .../core/genscavenge/AdaptiveCollectionPolicy.java  |  4 +++-
 .../core/genscavenge/ProportionateSpacesPolicy.java |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
index 35d426993af2..53791cba5714 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -65,12 +65,12 @@ static int getMaxSurvivorSpaces(Integer userValue) {
     protected static final int DEFAULT_TIME_WEIGHT = 25; // -XX:AdaptiveTimeWeight
 
     /* Constants to compute defaults for values which can be set through existing options. */
-    /** HotSpot: -XX:MaxHeapSize default without ergonomics. */
-    protected static final UnsignedWord SMALL_HEAP_SIZE = WordFactory.unsigned(96 * 1024 * 1024);
+    protected static final UnsignedWord INITIAL_HEAP_SIZE = WordFactory.unsigned(128 * 1024 * 1024);
     protected static final int NEW_RATIO = 2; // HotSpot: -XX:NewRatio
 
     protected final AdaptiveWeightedAverage avgYoungGenAlignedChunkFraction = new AdaptiveWeightedAverage(DEFAULT_TIME_WEIGHT);
 
+    private final int initialNewRatio;
     protected UnsignedWord survivorSize;
     protected UnsignedWord edenSize;
     protected UnsignedWord promoSize;
@@ -80,8 +80,9 @@ static int getMaxSurvivorSpaces(Integer userValue) {
     protected volatile SizeParameters sizes;
     private final ReentrantLock sizesUpdateLock = new ReentrantLock();
 
-    protected AbstractCollectionPolicy(int initialTenuringThreshold) {
-        tenuringThreshold = UninterruptibleUtils.Math.clamp(initialTenuringThreshold, 1, HeapParameters.getMaxSurvivorSpaces() + 1);
+    protected AbstractCollectionPolicy(int initialNewRatio, int initialTenuringThreshold) {
+        this.initialNewRatio = initialNewRatio;
+        this.tenuringThreshold = UninterruptibleUtils.Math.clamp(initialTenuringThreshold, 1, HeapParameters.getMaxSurvivorSpaces() + 1);
     }
 
     @Override
@@ -287,14 +288,14 @@ protected SizeParameters computeSizeParameters(SizeParameters existing) {
         }
         minHeap = UnsignedUtils.clamp(alignUp(minHeap), minAllSpaces, maxHeap);
 
-        UnsignedWord initialHeap = AbstractCollectionPolicy.SMALL_HEAP_SIZE;
+        UnsignedWord initialHeap = AbstractCollectionPolicy.INITIAL_HEAP_SIZE;
         initialHeap = UnsignedUtils.clamp(alignUp(initialHeap), minHeap, maxHeap);
 
         UnsignedWord initialYoung;
         if (initialHeap.equal(maxHeap)) {
             initialYoung = maxYoung;
         } else {
-            initialYoung = initialHeap.unsignedDivide(AbstractCollectionPolicy.NEW_RATIO + 1);
+            initialYoung = initialHeap.unsignedDivide(initialNewRatio + 1);
             initialYoung = UnsignedUtils.clamp(alignUp(initialYoung), minYoungSpaces, maxYoung);
         }
         UnsignedWord initialSurvivor = WordFactory.zero();
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
index 224262dbdf3a..cdbe856d09dc 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AdaptiveCollectionPolicy.java
@@ -107,6 +107,8 @@ final class AdaptiveCollectionPolicy extends AbstractCollectionPolicy {
      */
     private static final double ADAPTIVE_SIZE_COST_ESTIMATOR_GC_COST_LIMIT = 0.5;
 
+    private static final int INITIAL_NEW_RATIO = 1; // same size for young and old generation
+
     /* Constants derived from other constants. */
     private static final double THROUGHPUT_GOAL = 1.0 - 1.0 / (1.0 + GC_TIME_RATIO);
     private static final double THRESHOLD_TOLERANCE_PERCENT = 1.0 + THRESHOLD_TOLERANCE / 100.0;
@@ -137,7 +139,7 @@ final class AdaptiveCollectionPolicy extends AbstractCollectionPolicy {
     private long oldGenChangeForMajorThroughput;
 
     AdaptiveCollectionPolicy() {
-        super(INITIAL_TENURING_THRESHOLD);
+        super(INITIAL_NEW_RATIO, INITIAL_TENURING_THRESHOLD);
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java
index 53e0354e0773..261013c9164e 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ProportionateSpacesPolicy.java
@@ -55,7 +55,7 @@ final class ProportionateSpacesPolicy extends AbstractCollectionPolicy {
     private int shrinkFactor;
 
     ProportionateSpacesPolicy() {
-        super(MAX_TENURING_THRESHOLD);
+        super(NEW_RATIO, MAX_TENURING_THRESHOLD);
     }
 
     @Override

From 55b16bef0995b137c2af933d4e3532c3e36e238c Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Mon, 18 Oct 2021 19:09:10 +0200
Subject: [PATCH 523/681] Further improvements and bugfixes.

---
 .../posix/pthread/PthreadVMLockSupport.java   |  4 ++
 .../core/windows/WindowsVMLockSupport.java    |  4 ++
 .../svm/core/InvalidMethodPointerHandler.java |  4 ++
 .../graal/snippets/CEntryPointSnippets.java   |  4 ++
 .../svm/core/jdk/VMErrorSubstitutions.java    |  3 ++
 .../com/oracle/svm/core/thread/VMThreads.java | 37 +++++++++++++---
 .../svm/jni/functions/JNIFunctions.java       | 44 ++++++++++++-------
 7 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
index f473152e3073..8e339ff2ec11 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.posix.pthread;
 
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
@@ -56,6 +57,8 @@
 
 import jdk.vm.ci.meta.JavaKind;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 /**
  * Support of {@link VMMutex} and {@link VMCondition} in multi-threaded environments. Locking is
  * implemented via pthreads.
@@ -161,6 +164,7 @@ public static boolean initialize() {
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", calleeMustBe = false)
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     protected static void checkResult(int result, String functionName) {
         if (result != 0) {
             /*
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 868f3f6f12c8..4101b79d2dd1 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.windows;
 
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
@@ -55,6 +56,8 @@
 
 import jdk.vm.ci.meta.JavaKind;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 //Checkstyle: stop
 
 /**
@@ -156,6 +159,7 @@ public static void initialize() {
     }
 
     @Uninterruptible(reason = "Called from uninterruptible code.", calleeMustBe = false)
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     static void checkResult(int result, String functionName) {
         if (result == 0) {
             /*
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index 7db44647c79d..9c1c59ec3fef 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -28,6 +28,7 @@
 
 import java.lang.reflect.Method;
 
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
@@ -43,6 +44,8 @@
 import com.oracle.svm.core.thread.VMThreads;
 import com.oracle.svm.util.ReflectionUtil;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 /**
  * Provides stub methods that can be used for uninitialized method pointers. Instead of a segfault,
  * the stubs provide full diagnostic output with a stack trace.
@@ -71,6 +74,7 @@ private static void methodPointerNotCompiledHandler() {
     }
 
     @Uninterruptible(reason = "Prevent safepoints until everything is set up for printing the fatal error.", calleeMustBe = false)
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
         VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index ad7c1d3dda11..574441ffb58e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -27,12 +27,14 @@
 import static com.oracle.svm.core.SubstrateOptions.MultiThreaded;
 import static com.oracle.svm.core.SubstrateOptions.SpawnIsolates;
 import static com.oracle.svm.core.SubstrateOptions.UseDedicatedVMOperationThread;
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
 import static com.oracle.svm.core.graal.nodes.WriteCurrentVMThreadNode.writeCurrentVMThread;
 import static com.oracle.svm.core.graal.nodes.WriteHeapBaseNode.writeCurrentVMHeapBase;
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
 import java.util.Map;
 
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
@@ -562,6 +564,7 @@ public static int reportExceptionSnippet(Throwable exception) {
 
     @Uninterruptible(reason = "Avoid StackOverflowError and safepoints until they are disabled permanently", calleeMustBe = false)
     @SubstrateForeignCallTarget(stubCallingConvention = false)
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     private static int reportException(Throwable exception) {
         VMThreads.SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
@@ -572,6 +575,7 @@ private static int reportException(Throwable exception) {
         return CEntryPointErrors.UNSPECIFIED; // unreachable
     }
 
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     private static void logException(Throwable exception) {
         try {
             Log.log().exception(exception);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
index 6604c9d85498..ee1162c1afb3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
@@ -41,6 +41,8 @@
 import com.oracle.svm.core.stack.ThreadStackPrinter;
 import com.oracle.svm.core.thread.VMThreads;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 @TargetClass(com.oracle.svm.core.util.VMError.class)
 final class Target_com_oracle_svm_core_util_VMError {
 
@@ -97,6 +99,7 @@ public class VMErrorSubstitutions {
      * uninterruptible
      */
     @Uninterruptible(reason = "Allow VMError to be used in uninterruptible code.")
+    @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     static RuntimeException shouldNotReachHere(CodePointer callerIP, String msg, Throwable ex) {
         ThreadStackPrinter.printBacktrace();
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index e78ccd36a33c..720dd6ec0441 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -26,6 +26,9 @@
 
 import static com.oracle.svm.core.SubstrateOptions.UseDedicatedVMOperationThread;
 
+import com.oracle.svm.core.annotate.NeverInline;
+import com.oracle.svm.core.nodes.CFunctionEpilogueNode;
+import com.oracle.svm.core.nodes.CFunctionPrologueNode;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.replacements.ReplacementsUtil;
@@ -82,8 +85,9 @@ public static VMThreads singleton() {
      * the mutexes are acquired (VMOperation queue mutex first, {@link #THREAD_MUTEX} second). If
      * the VM operation causes a safepoint, then it is possible that the {@link #THREAD_MUTEX} was
      * already acquired for safepoint reasons.</li>
-     * <li>Acquire the mutex outside of a VM operation but only execute uninterruptible code. This
-     * is safe as the uninterruptible code cannot trigger a safepoint.</li>
+     * <li>Acquire the mutex from a thread that is either not yet attached
+     * {@link StatusSupport#STATUS_CREATED} or currently in native code
+     * ({@link StatusSupport#STATUS_IN_NATIVE}).</li>
      * </ol>
      *
      * Deadlock example 1:
@@ -328,7 +332,7 @@ public void detachThread(IsolateThread thread) {
         // From this point on, all code must be fully uninterruptible because this thread either
         // holds the THREAD_MUTEX (see the JavaDoc on THREAD_MUTEX) or because the IsolateThread was
         // already freed.
-        THREAD_MUTEX.lockNoTransition();
+        lockVMMutexInNativeCode();
         OSThreadHandle threadToCleanup;
         try {
             detachThreadInSafeContext(thread);
@@ -354,6 +358,20 @@ public void detachThread(IsolateThread thread) {
         cleanupExitedOsThread(threadToCleanup);
     }
 
+    @Uninterruptible(reason = "Called from uninterruptible code.")
+    @NeverInline("Must not be inlined in a caller that has an exception handler: We only support InvokeNode and not InvokeWithExceptionNode between a CFunctionPrologueNode and CFunctionEpilogueNode.")
+    private static void lockVMMutexInNativeCode() {
+        CFunctionPrologueNode.cFunctionPrologue(StatusSupport.STATUS_IN_NATIVE);
+        lockVMMutexInNativeCode0();
+        CFunctionEpilogueNode.cFunctionEpilogue(StatusSupport.STATUS_IN_NATIVE);
+    }
+
+    @Uninterruptible(reason = "Must not stop while in native.")
+    @NeverInline("Provide a return address for the Java frame anchor.")
+    private static void lockVMMutexInNativeCode0() {
+        VMThreads.THREAD_MUTEX.lockNoTransition();
+    }
+
     @Uninterruptible(reason = "Thread is detaching and holds the THREAD_MUTEX.")
     private static void releaseThread(IsolateThread thread) {
         THREAD_MUTEX.guaranteeIsOwner("This mutex must be locked to prevent that a GC is triggered while detaching a thread from the heap");
@@ -812,9 +830,13 @@ public static int getSafepointBehaviorVolatile(IsolateThread vmThread) {
          * Changes the safepoint behavior so that this thread won't freeze at a safepoint. The
          * thread will also actively prevent the VM from reaching a safepoint (regardless of its
          * thread status).
+         * 
+         * NOTE: Be careful with this and make sure that this thread does not allocate any Java
+         * objects as this could result deadlocks.
          */
-        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
+        @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
         public static void preventSafepoints() {
+            // It would be nice if we could retire the TLAB here but that wouldn't work reliably.
             safepointBehaviorTL.setVolatile(PREVENT_VM_FROM_REACHING_SAFEPOINT);
         }
 
@@ -826,13 +848,14 @@ public static void preventSafepoints() {
          * safepoint. The safepoint handling will ignore the thread so that the VM can reach a
          * safepoint regardless of the status of this thread.
          *
-         * Be careful with this. If a thread is ignored by the safepoint handling, it means that it
-         * can continue executing while a safepoint (and therefore a GC) is in progress. So, make
-         * sure that this thread does not allocate or access any movable heap objects (even
+         * NOTE: Be careful with this. If a thread is ignored by the safepoint handling, it means
+         * that it can continue executing while a safepoint (and therefore a GC) is in progress. So,
+         * make sure that this thread does not allocate or access any movable heap objects (even
          * executing write barriers can already cause issues).
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
         public static void markThreadAsCrashed() {
+            // It would be nice if we could retire the TLAB here but that wouldn't work reliably.
             safepointBehaviorTL.setVolatile(THREAD_CRASHED);
         }
 
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
index f341108a898b..f2bf0cd4b88e 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
@@ -36,6 +36,7 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
@@ -113,6 +114,8 @@
 import jdk.vm.ci.meta.MetaUtil;
 import sun.misc.Unsafe;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 /**
  * Implementations of the functions defined by the Java Native Interface.
  *
@@ -826,25 +829,10 @@ static int ThrowNew(JNIEnvironment env, JNIObjectHandle clazzHandle, CCharPointe
     @CEntryPoint(exceptionHandler = JNIExceptionHandlerVoid.class, include = CEntryPoint.NotIncludedAutomatically.class)
     @CEntryPointOptions(prologue = JNIEnvEnterFatalOnFailurePrologue.class, publishAs = Publish.NotPublished)
     @NeverInline("Access of caller frame.")
-    @Uninterruptible(reason = "Prevent safepoints until everything is set up for the fatal error printing.", calleeMustBe = false)
     static void FatalError(JNIEnvironment env, CCharPointer message) {
-        VMThreads.SafepointBehavior.preventSafepoints();
-        StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
-
         CodePointer callerIP = KnownIntrinsics.readReturnAddress();
-        LogHandler logHandler = ImageSingletons.lookup(LogHandler.class);
-        Log log = Log.enterFatalContext(logHandler, callerIP, CTypeConversion.toJavaString(message), null);
-        if (log != null) {
-            try {
-                log.string("Fatal error reported via JNI: ").string(message).newline();
-                SubstrateDiagnostics.printFatalError(log, KnownIntrinsics.readCallerStackPointer(), callerIP);
-            } catch (Throwable ignored) {
-                /*
-                 * Ignore exceptions reported during error reporting, we are going to exit anyway.
-                 */
-            }
-        }
-        logHandler.fatalError();
+        Pointer callerSP = KnownIntrinsics.readCallerStackPointer();
+        Support.fatalError(callerIP, callerSP, CTypeConversion.toJavaString(message));
     }
 
     /*
@@ -1165,6 +1153,28 @@ static void handleException(Throwable t) {
              */
             JNIThreadLocalPendingException.set(t);
         }
+
+        @Uninterruptible(reason = "Prevent safepoints until everything is set up for the fatal error printing.", calleeMustBe = false)
+        @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
+        static void fatalError(CodePointer callerIP, Pointer callerSP, String message) {
+            VMThreads.SafepointBehavior.preventSafepoints();
+            StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
+
+            LogHandler logHandler = ImageSingletons.lookup(LogHandler.class);
+            Log log = Log.enterFatalContext(logHandler, callerIP, message, null);
+            if (log != null) {
+                try {
+                    log.string("Fatal error reported via JNI: ").string(message).newline();
+                    SubstrateDiagnostics.printFatalError(log, callerSP, callerIP);
+                } catch (Throwable ignored) {
+                    /*
+                     * Ignore exceptions reported during error reporting, we are going to exit
+                     * anyway.
+                     */
+                }
+            }
+            logHandler.fatalError();
+        }
     }
 
     static final CGlobalData<CCharPointer> UNIMPLEMENTED_UNATTACHED_ERROR_MESSAGE = CGlobalDataFactory.createCString(

From 06df879002b609897537a80bac82b50807388367 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 11:14:38 +0200
Subject: [PATCH 524/681] svm: SubstrateArraycopyWithExceptionNode and use
 ArrayCopyNode instead

---
 .../replacements/arraycopy/ArrayCopyNode.java |   4 -
 .../core/graal/jdk/JDKIntrinsicsFeature.java  |   3 +-
 .../graal/jdk/SubstrateArraycopySnippets.java |   7 +-
 .../SubstrateArraycopyWithExceptionNode.java  | 149 ------------------
 4 files changed, 6 insertions(+), 157 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
index 3515086552b5..ba78296a2f00 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
@@ -63,10 +63,6 @@ public ArrayCopyNode(int bci, ValueNode src, ValueNode srcPos, ValueNode dst, Va
         }
     }
 
-    public ArrayCopyNode(ArrayCopy arraycopy) {
-        this(arraycopy.getBci(), arraycopy.getSource(), arraycopy.getSourcePosition(), arraycopy.getDestination(), arraycopy.getDestinationPosition(), arraycopy.getLength());
-    }
-
     @Override
     public LocationIdentity getKilledLocationIdentity() {
         if (!forceAnyLocation && elementKind == null) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
index bf6d5ae3ce13..ec05a5642d48 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
@@ -37,6 +37,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
 
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.annotate.AutomaticFeature;
@@ -82,7 +83,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                  */
                 ValueNode nonNullSrc = b.nullCheckedValue(src);
                 ValueNode nonNullDst = b.nullCheckedValue(dst);
-                b.add(new SubstrateArraycopyWithExceptionNode(nonNullSrc, srcPos, nonNullDst, dstPos, length, null, b.bci()));
+                b.add(new ArrayCopyNode(b.bci(), nonNullSrc, srcPos, nonNullDst, dstPos, length));
                 return true;
             }
         });
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
index 0f181adf717d..5272b023ee37 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
@@ -36,6 +36,7 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.util.Providers;
 import org.graalvm.compiler.replacements.Snippets;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.JavaMemoryUtil;
@@ -60,7 +61,7 @@ public static void registerForeignCalls(SubstrateForeignCallsProvider foreignCal
     protected SubstrateArraycopySnippets(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection,
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {
         super(options, factories, providers, snippetReflection);
-        lowerings.put(SubstrateArraycopyWithExceptionNode.class, new SubstrateArraycopyWithExceptionLowering());
+        lowerings.put(ArrayCopyNode.class, new SubstrateArraycopyWithExceptionLowering());
     }
 
     /**
@@ -110,9 +111,9 @@ private static void boundsCheck(Object fromArray, int fromIndex, Object toArray,
         }
     }
 
-    static final class SubstrateArraycopyWithExceptionLowering implements NodeLoweringProvider<SubstrateArraycopyWithExceptionNode> {
+    static final class SubstrateArraycopyWithExceptionLowering implements NodeLoweringProvider<ArrayCopyNode> {
         @Override
-        public void lower(SubstrateArraycopyWithExceptionNode node, LoweringTool tool) {
+        public void lower(ArrayCopyNode node, LoweringTool tool) {
             StructuredGraph graph = node.graph();
             ForeignCallWithExceptionNode call = graph.add(new ForeignCallWithExceptionNode(ARRAYCOPY, node.getSource(), node.getSourcePosition(), node.getDestination(),
                             node.getDestinationPosition(), node.getLength()));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
deleted file mode 100644
index 4fc947a627cc..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopyWithExceptionNode.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.graal.jdk;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
-import org.graalvm.word.LocationIdentity;
-
-import jdk.vm.ci.meta.JavaKind;
-
-/**
- * Substrate specific intrinisfication for {@link System#arraycopy} with an exception edge.
- *
- * Lowering is implemented in the platform/VM specific
- * {@link org.graalvm.compiler.nodes.spi.LoweringProvider LoweringProvider}. Most of them eventually
- * go through {@link SubstrateArraycopySnippets}.
- */
-@NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, cyclesRationale = "may be replaced with non-throwing counterpart", size = SIZE_64)
-public class SubstrateArraycopyWithExceptionNode extends WithExceptionNode implements ArrayCopy, Simplifiable {
-
-    public static final NodeClass<SubstrateArraycopyWithExceptionNode> TYPE = NodeClass.create(SubstrateArraycopyWithExceptionNode.class);
-
-    @Input NodeInputList<ValueNode> args;
-    @OptionalInput(State) FrameState stateDuring;
-    @OptionalInput(State) protected FrameState stateAfter;
-    @OptionalInput(Memory) protected MemoryKill lastLocationAccess;
-
-    protected JavaKind elementKind;
-
-    protected int bci;
-
-    public SubstrateArraycopyWithExceptionNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
-        super(TYPE, StampFactory.forVoid());
-        this.bci = bci;
-        this.args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
-        this.elementKind = elementKind != JavaKind.Illegal ? elementKind : null;
-        if (this.elementKind == null) {
-            this.elementKind = ArrayCopy.selectComponentKind(this);
-        }
-    }
-
-    @Override
-    public NodeInputList<ValueNode> args() {
-        return args;
-    }
-
-    @Override
-    public LocationIdentity getKilledLocationIdentity() {
-        return getLocationIdentity();
-    }
-
-    @Override
-    public LocationIdentity getLocationIdentity() {
-        if (elementKind != null) {
-            return NamedLocationIdentity.getArrayLocation(elementKind);
-        }
-        return LocationIdentity.any();
-    }
-
-    @Override
-    public MemoryKill getLastLocationAccess() {
-        return lastLocationAccess;
-    }
-
-    @Override
-    public void setLastLocationAccess(MemoryKill lla) {
-        updateUsagesInterface(lastLocationAccess, lla);
-        lastLocationAccess = lla;
-    }
-
-    @Override
-    public FrameState stateDuring() {
-        return stateDuring;
-    }
-
-    @Override
-    public void setStateDuring(FrameState stateDuring) {
-        updateUsages(this.stateDuring, stateDuring);
-        this.stateDuring = stateDuring;
-    }
-
-    @Override
-    public FrameState stateAfter() {
-        return stateAfter;
-    }
-
-    @Override
-    public void setStateAfter(FrameState stateAfter) {
-        updateUsages(this.stateAfter, stateAfter);
-        this.stateAfter = stateAfter;
-    }
-
-    @Override
-    public int getBci() {
-        return bci;
-    }
-
-    @Override
-    public JavaKind getElementKind() {
-        return elementKind;
-    }
-
-    @Override
-    public void simplify(SimplifierTool tool) {
-        if (this.elementKind == null) {
-            this.elementKind = ArrayCopy.selectComponentKind(this);
-            if (this.elementKind != null) {
-                tool.addToWorkList(usages());
-            }
-        }
-    }
-}

From c7e533c67c78c1d3f6beff77a79b1754153e7bd2 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 13:59:55 +0200
Subject: [PATCH 525/681] svm: rename SubstrateArraycopyWithExceptionLowering
 to SubstrateArrayCopyLowering

---
 .../oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
index 5272b023ee37..7d4555124dab 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
@@ -61,7 +61,7 @@ public static void registerForeignCalls(SubstrateForeignCallsProvider foreignCal
     protected SubstrateArraycopySnippets(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection,
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {
         super(options, factories, providers, snippetReflection);
-        lowerings.put(ArrayCopyNode.class, new SubstrateArraycopyWithExceptionLowering());
+        lowerings.put(ArrayCopyNode.class, new SubstrateArrayCopyLowering());
     }
 
     /**
@@ -111,7 +111,7 @@ private static void boundsCheck(Object fromArray, int fromIndex, Object toArray,
         }
     }
 
-    static final class SubstrateArraycopyWithExceptionLowering implements NodeLoweringProvider<ArrayCopyNode> {
+    static final class SubstrateArrayCopyLowering implements NodeLoweringProvider<ArrayCopyNode> {
         @Override
         public void lower(ArrayCopyNode node, LoweringTool tool) {
             StructuredGraph graph = node.graph();

From 37edd340333e703ac5a9a532d58ffad42e4cd474 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:02:16 +0200
Subject: [PATCH 526/681] svm: PointstoGraphBuilderPlugins should use
 ArrayCopyNode

---
 .../graal/pointsto/plugins/PointstoGraphBuilderPlugins.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
index 1453aec85c53..5d61d9141561 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
@@ -30,7 +30,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
 import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
 
 import com.oracle.graal.pointsto.nodes.AnalysisObjectCloneNode;
@@ -45,7 +45,7 @@ public static void registerSystemPlugins(InvocationPlugins plugins) {
         r.register5("arraycopy", Object.class, int.class, Object.class, int.class, int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length) {
-                b.add(new BasicArrayCopyNode(BasicArrayCopyNode.TYPE, src, srcPos, dest, destPos, length, null, b.bci()));
+                b.add(new ArrayCopyNode(b.bci(), src, srcPos, dest, destPos, length));
                 return true;
             }
         });

From 55dd2bfd8556edf0c3856a8f4cda74dfb932f1e0 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:17:27 +0200
Subject: [PATCH 527/681] svm: use BasicArrayCopyNode instead of ArrayCopy

---
 .../oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java    | 9 ++++-----
 .../graal/pointsto/flow/MethodTypeFlowBuilder.java       | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
index e9f63856c75c..ed5eef62397c 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
@@ -25,7 +25,6 @@
 package com.oracle.graal.pointsto.flow;
 
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
@@ -36,10 +35,10 @@
 import jdk.vm.ci.code.BytecodePosition;
 
 /**
- * Models the flow transfer of an {@link ArrayCopy} node which intrinsifies calls to
- * System.arraycopy(). This flow registers itself as an observer for both the source and the
- * destination. When either the source or the destination elements change the element flows from
- * source are passed to destination.
+ * Models the flow transfer of an {@link org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode}
+ * node which intrinsifies calls to System.arraycopy(). This flow registers itself as an observer
+ * for both the source and the destination. When either the source or the destination elements
+ * change the element flows from source are passed to destination.
  */
 public class ArrayCopyTypeFlow extends TypeFlow<BytecodePosition> {
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index 6513291c0751..77c1ccd86672 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -93,7 +93,7 @@
 import org.graalvm.compiler.phases.common.CanonicalizerPhase;
 import org.graalvm.compiler.phases.graph.MergeableState;
 import org.graalvm.compiler.phases.graph.PostOrderNodeIterator;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
+import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.MacroInvokable;
 import org.graalvm.compiler.replacements.nodes.ObjectClone;
@@ -1118,8 +1118,8 @@ protected void node(FixedNode n) {
                 AtomicReadAndWriteNode node = (AtomicReadAndWriteNode) n;
                 modelUnsafeReadAndWriteFlow(node, node.object(), node.newValue(), node.offset());
 
-            } else if (n instanceof ArrayCopy) {
-                ArrayCopy node = (ArrayCopy) n;
+            } else if (n instanceof BasicArrayCopyNode) {
+                BasicArrayCopyNode node = (BasicArrayCopyNode) n;
 
                 TypeFlowBuilder<?> srcBuilder = state.lookup(node.getSource());
                 TypeFlowBuilder<?> dstBuilder = state.lookup(node.getDestination());

From 5e86ec22fd0a40bd06dc9f3da8413da6b1bbba4d Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:04:11 +0200
Subject: [PATCH 528/681] compiler: make BasicArrayCopyNode abstract

---
 .../graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 3e6d5680eafc..0c7ad161c459 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -51,7 +51,7 @@
  * Base class for nodes that intrinsify {@link System#arraycopy}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_64)
-public class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit {
+public abstract class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit {
 
     public static final NodeClass<BasicArrayCopyNode> TYPE = NodeClass.create(BasicArrayCopyNode.class);
 

From 8943401b5c4f85b8e7a9ce93b27a586eff125f89 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:17:39 +0200
Subject: [PATCH 529/681] compiler: use BasicArrayCopyNode instead of ArrayCopy

---
 .../replacements/arraycopy/ArrayCopy.java     | 15 -------------
 .../replacements/arraycopy/ArrayCopyNode.java |  4 ++--
 .../arraycopy/ArrayCopySnippets.java          | 21 +++++++++++--------
 .../nodes/BasicArrayCopyNode.java             | 19 +++++++++++++++++
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
index 8abf55d6c0a9..ec0f1cf9ac89 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
@@ -208,19 +208,4 @@ default void computeStateDuring(FrameState currentStateAfter) {
         setStateDuring(newStateDuring);
     }
 
-    static JavaKind selectComponentKind(ArrayCopy arraycopy) {
-        ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT));
-        ResolvedJavaType destType = StampTool.typeOrNull(arraycopy.getDestination().stamp(NodeView.DEFAULT));
-
-        if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) {
-            return null;
-        }
-        if (!destType.getComponentType().isAssignableFrom(srcType.getComponentType())) {
-            return null;
-        }
-        if (!arraycopy.isExact()) {
-            return null;
-        }
-        return srcType.getComponentType().getJavaKind();
-    }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
index ba78296a2f00..a39208936b28 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
@@ -57,7 +57,7 @@ public ArrayCopyNode(int bci, ValueNode src, ValueNode srcPos, ValueNode dst, Va
         super(TYPE, src, srcPos, dst, dstPos, length, null, bci);
         this.forceAnyLocation = forceAnyLocation;
         if (!forceAnyLocation) {
-            elementKind = ArrayCopy.selectComponentKind(this);
+            elementKind = selectComponentKind(this);
         } else {
             assert elementKind == null;
         }
@@ -66,7 +66,7 @@ public ArrayCopyNode(int bci, ValueNode src, ValueNode srcPos, ValueNode dst, Va
     @Override
     public LocationIdentity getKilledLocationIdentity() {
         if (!forceAnyLocation && elementKind == null) {
-            elementKind = ArrayCopy.selectComponentKind(this);
+            elementKind = selectComponentKind(this);
         }
         if (elementKind != null) {
             return NamedLocationIdentity.getArrayLocation(elementKind);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 52c8b0d31684..36810e648eea 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -83,7 +83,7 @@
  * object array and the other one a primitive array.</li>
  * <li>{@link #arraycopyExactStubCallSnippet}: this snippet is used for array copies that do not
  * require a store check. This is the case if the array copy is either
- * {@linkplain ArrayCopy#isExact() exact}, i.e., we can prove that the source array type is
+ * {@linkplain BasicArrayCopyNode#isExact() exact}, i.e., we can prove that the source array type is
  * assignable to the destination array type, or if one of the objects is a primitive array (and the
  * other is unknown). In the latter case, it is sufficient to dynamically check that the array types
  * are the same. No store check is needed.</li>
@@ -146,10 +146,11 @@ protected boolean useOriginalArraycopy() {
     }
 
     /**
-     * Snippet that performs an {@linkplain ArrayCopy#isExact() exact} array copy. Used when the
-     * array copy might be {@linkplain Templates#lower(ArrayCopyNode, boolean, LoweringTool)
-     * expanded}. Lowering is delayed using an {@link ArrayCopyWithDelayedLoweringNode} which will
-     * dispatch to {@link #exactArraycopyWithExpandedLoopSnippet}.
+     * Snippet that performs an {@linkplain BasicArrayCopyNode#isExact() exact} array copy. Used
+     * when the array copy might be
+     * {@linkplain Templates#lower(ArrayCopyNode, boolean, LoweringTool) expanded}. Lowering is
+     * delayed using an {@link ArrayCopyWithDelayedLoweringNode} which will dispatch to
+     * {@link #exactArraycopyWithExpandedLoopSnippet}.
      *
      * @see Templates#lower(ArrayCopyNode, boolean, LoweringTool)
      * @see #exactArraycopyWithExpandedLoopSnippet
@@ -174,7 +175,8 @@ public void delayedExactArraycopyWithExpandedLoopSnippet(Object src, int srcPos,
     }
 
     /**
-     * Snippet that performs a stub call for an {@linkplain ArrayCopy#isExact() exact} array copy.
+     * Snippet that performs a stub call for an {@linkplain BasicArrayCopyNode#isExact() exact}
+     * array copy.
      */
     @Snippet
     public void arraycopyExactStubCallSnippet(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter ArrayCopyTypeCheck arrayTypeCheck,
@@ -250,8 +252,9 @@ public static void arraycopyNativeExceptionSnippet(Object src, int srcPos, Objec
     }
 
     /**
-     * Inlines a loop that performs an {@linkplain ArrayCopy#isExact() exact} element-by-element
-     * array copy. The explict loop allows subsequent phases to optimize the code.
+     * Inlines a loop that performs an {@linkplain BasicArrayCopyNode#isExact() exact}
+     * element-by-element array copy. The explict loop allows subsequent phases to optimize the
+     * code.
      */
     @SuppressWarnings("unused")
     @Snippet(allowPartialIntrinsicArgumentMismatch = true)
@@ -492,7 +495,7 @@ public void lower(ArrayCopyNode arraycopy, LoweringTool tool) {
          * @see ArrayCopySnippets
          */
         public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, LoweringTool tool) {
-            JavaKind elementKind = ArrayCopy.selectComponentKind(arraycopy);
+            JavaKind elementKind = BasicArrayCopyNode.selectComponentKind(arraycopy);
             SnippetInfo snippetInfo;
             final ArrayCopyTypeCheck arrayTypeCheck;
 
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 0c7ad161c459..0ba9eab929d4 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -29,6 +29,7 @@
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
 import static org.graalvm.word.LocationIdentity.any;
 
+import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
@@ -37,10 +38,12 @@
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
+import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
+import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
 
@@ -144,4 +147,20 @@ public void setStateAfter(FrameState x) {
     public boolean hasSideEffect() {
         return true;
     }
+
+    public static JavaKind selectComponentKind(BasicArrayCopyNode arraycopy) {
+        ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT));
+        ResolvedJavaType destType = StampTool.typeOrNull(arraycopy.getDestination().stamp(NodeView.DEFAULT));
+
+        if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) {
+            return null;
+        }
+        if (!destType.getComponentType().isAssignableFrom(srcType.getComponentType())) {
+            return null;
+        }
+        if (!arraycopy.isExact()) {
+            return null;
+        }
+        return srcType.getComponentType().getJavaKind();
+    }
 }

From 577f1943c58230d83cf2645284dea9bc358a0103 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:21:04 +0200
Subject: [PATCH 530/681] compiler: move members from ArrayCopy to
 BasicArrayCopyNode

---
 .../replacements/arraycopy/ArrayCopy.java     | 158 -----------------
 .../nodes/BasicArrayCopyNode.java             | 162 +++++++++++++++++-
 2 files changed, 158 insertions(+), 162 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
index ec0f1cf9ac89..d0cd867547ed 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
@@ -50,162 +50,4 @@
  */
 public interface ArrayCopy extends Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
 
-    int SRC_ARG = 0;
-    int SRC_POS_ARG = 1;
-    int DEST_ARG = 2;
-    int DEST_POS_ARG = 3;
-    int LENGTH_ARG = 4;
-
-    NodeInputList<ValueNode> args();
-
-    default ValueNode getSource() {
-        return args().get(SRC_ARG);
-    }
-
-    default ValueNode getSourcePosition() {
-        return args().get(SRC_POS_ARG);
-    }
-
-    default ValueNode getDestination() {
-        return args().get(DEST_ARG);
-    }
-
-    default ValueNode getDestinationPosition() {
-        return args().get(DEST_POS_ARG);
-    }
-
-    default ValueNode getLength() {
-        return args().get(LENGTH_ARG);
-    }
-
-    int getBci();
-
-    JavaKind getElementKind();
-
-    default boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) {
-        assert length >= 0;
-        return position >= 0 && position <= virtualObject.entryCount() - length;
-    }
-
-    default boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) {
-        if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject()) {
-            for (int i = 0; i < length; i++) {
-                ValueNode entry = tool.getEntry(src, srcPos + i);
-                ResolvedJavaType type = StampTool.typeOrNull(entry);
-                if (type == null || !destComponentType.isAssignableFrom(type)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /*
-     * Returns true if this copy doesn't require store checks. Trivially true for primitive arrays.
-     */
-    default boolean isExact() {
-        ResolvedJavaType srcType = StampTool.typeOrNull(getSource().stamp(NodeView.DEFAULT));
-        ResolvedJavaType destType = StampTool.typeOrNull(getDestination().stamp(NodeView.DEFAULT));
-        if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) {
-            return false;
-        }
-        if ((srcType.getComponentType().getJavaKind().isPrimitive() && destType.getComponentType().equals(srcType.getComponentType())) || getSource() == getDestination()) {
-            return true;
-        }
-
-        if (StampTool.isExactType(getDestination().stamp(NodeView.DEFAULT))) {
-            if (destType != null && destType.isAssignableFrom(srcType)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    default void virtualize(VirtualizerTool tool) {
-        ValueNode sourcePosition = tool.getAlias(getSourcePosition());
-        ValueNode destinationPosition = tool.getAlias(getDestinationPosition());
-        ValueNode replacedLength = tool.getAlias(getLength());
-
-        if (sourcePosition.isConstant() && destinationPosition.isConstant() && replacedLength.isConstant()) {
-            int srcPosInt = sourcePosition.asJavaConstant().asInt();
-            int destPosInt = destinationPosition.asJavaConstant().asInt();
-            int len = replacedLength.asJavaConstant().asInt();
-            ValueNode destAlias = tool.getAlias(getDestination());
-
-            if (destAlias instanceof VirtualArrayNode) {
-                VirtualArrayNode destVirtual = (VirtualArrayNode) destAlias;
-                if (len < 0 || !checkBounds(destPosInt, len, destVirtual)) {
-                    return;
-                }
-                ValueNode srcAlias = tool.getAlias(getSource());
-
-                if (srcAlias instanceof VirtualObjectNode) {
-                    if (!(srcAlias instanceof VirtualArrayNode)) {
-                        return;
-                    }
-                    VirtualArrayNode srcVirtual = (VirtualArrayNode) srcAlias;
-                    if (destVirtual.componentType().getJavaKind() != srcVirtual.componentType().getJavaKind()) {
-                        return;
-                    }
-                    if (!checkBounds(srcPosInt, len, srcVirtual)) {
-                        return;
-                    }
-                    if (!checkEntryTypes(srcPosInt, len, srcVirtual, destVirtual.type().getComponentType(), tool)) {
-                        return;
-                    }
-                    if (srcVirtual == destVirtual && srcPosInt < destPosInt) {
-                        // must copy backwards to avoid losing elements
-                        for (int i = len - 1; i >= 0; i--) {
-                            tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i));
-                        }
-                    } else {
-                        for (int i = 0; i < len; i++) {
-                            tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i));
-                        }
-                    }
-                    tool.delete();
-                    DebugContext debug = this.asNode().getDebug();
-                    if (debug.isLogEnabled()) {
-                        debug.log("virtualized arraycopy(%s, %d, %s, %d, %d)", getSource(), srcPosInt, getDestination(), destPosInt, len);
-                    }
-                } else {
-                    ResolvedJavaType sourceType = StampTool.typeOrNull(srcAlias);
-                    if (sourceType == null || !sourceType.isArray()) {
-                        return;
-                    }
-                    ResolvedJavaType sourceComponentType = sourceType.getComponentType();
-                    ResolvedJavaType destComponentType = destVirtual.type().getComponentType();
-                    if (!sourceComponentType.equals(destComponentType)) {
-                        return;
-                    }
-                    for (int i = 0; i < len; i++) {
-                        LoadIndexedNode load = new LoadIndexedNode(this.asNode().graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, this.asNode().graph()), null,
-                                        destComponentType.getJavaKind());
-                        load.setNodeSourcePosition(this.asNode().getNodeSourcePosition());
-                        tool.addNode(load);
-                        tool.setVirtualEntry(destVirtual, destPosInt + i, load);
-                    }
-                    tool.delete();
-                }
-            }
-        }
-    }
-
-    @Override
-    default boolean canDeoptimize() {
-        return true;
-    }
-
-    @Override
-    default boolean hasSideEffect() {
-        return !getKilledLocationIdentity().isInit();
-    }
-
-    @Override
-    default void computeStateDuring(FrameState currentStateAfter) {
-        FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(getBci(), asNode().getStackKind());
-        setStateDuring(newStateDuring);
-    }
-
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 0ba9eab929d4..bfcbcd7de379 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -31,19 +31,30 @@
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.DeoptimizingNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.NamedLocationIdentity;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.WithExceptionNode;
+import org.graalvm.compiler.nodes.java.LoadIndexedNode;
+import org.graalvm.compiler.nodes.memory.MemoryAccess;
 import org.graalvm.compiler.nodes.memory.MemoryKill;
+import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+import org.graalvm.compiler.nodes.spi.Lowerable;
+import org.graalvm.compiler.nodes.spi.Virtualizable;
+import org.graalvm.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.compiler.nodes.type.StampTool;
+import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
+import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
 
@@ -54,9 +65,14 @@
  * Base class for nodes that intrinsify {@link System#arraycopy}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_64)
-public abstract class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit {
+public abstract class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit, Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
 
     public static final NodeClass<BasicArrayCopyNode> TYPE = NodeClass.create(BasicArrayCopyNode.class);
+    public static final int SRC_ARG = 0;
+    public static final int SRC_POS_ARG = 1;
+    public static final int DEST_ARG = 2;
+    public static final int DEST_POS_ARG = 3;
+    public static final int LENGTH_ARG = 4;
 
     @Input NodeInputList<ValueNode> args;
 
@@ -81,17 +97,14 @@ public BasicArrayCopyNode(NodeClass<? extends BasicArrayCopyNode> type, ValueNod
         this(type, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
     }
 
-    @Override
     public NodeInputList<ValueNode> args() {
         return args;
     }
 
-    @Override
     public int getBci() {
         return bci;
     }
 
-    @Override
     public JavaKind getElementKind() {
         return elementKind;
     }
@@ -163,4 +176,145 @@ public static JavaKind selectComponentKind(BasicArrayCopyNode arraycopy) {
         }
         return srcType.getComponentType().getJavaKind();
     }
+
+    public ValueNode getSource() {
+        return args().get(SRC_ARG);
+    }
+
+    public ValueNode getSourcePosition() {
+        return args().get(SRC_POS_ARG);
+    }
+
+    public ValueNode getDestination() {
+        return args().get(DEST_ARG);
+    }
+
+    public ValueNode getDestinationPosition() {
+        return args().get(DEST_POS_ARG);
+    }
+
+    public ValueNode getLength() {
+        return args().get(LENGTH_ARG);
+    }
+
+    public boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) {
+        assert length >= 0;
+        return position >= 0 && position <= virtualObject.entryCount() - length;
+    }
+
+    public boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) {
+        if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject()) {
+            for (int i = 0; i < length; i++) {
+                ValueNode entry = tool.getEntry(src, srcPos + i);
+                ResolvedJavaType type = StampTool.typeOrNull(entry);
+                if (type == null || !destComponentType.isAssignableFrom(type)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /*
+     * Returns true if this copy doesn't require store checks. Trivially true for primitive arrays.
+     */
+    public boolean isExact() {
+        ResolvedJavaType srcType = StampTool.typeOrNull(getSource().stamp(NodeView.DEFAULT));
+        ResolvedJavaType destType = StampTool.typeOrNull(getDestination().stamp(NodeView.DEFAULT));
+        if (srcType == null || !srcType.isArray() || destType == null || !destType.isArray()) {
+            return false;
+        }
+        if ((srcType.getComponentType().getJavaKind().isPrimitive() && destType.getComponentType().equals(srcType.getComponentType())) || getSource() == getDestination()) {
+            return true;
+        }
+
+        if (StampTool.isExactType(getDestination().stamp(NodeView.DEFAULT))) {
+            if (destType != null && destType.isAssignableFrom(srcType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void virtualize(VirtualizerTool tool) {
+        ValueNode sourcePosition = tool.getAlias(getSourcePosition());
+        ValueNode destinationPosition = tool.getAlias(getDestinationPosition());
+        ValueNode replacedLength = tool.getAlias(getLength());
+
+        if (sourcePosition.isConstant() && destinationPosition.isConstant() && replacedLength.isConstant()) {
+            int srcPosInt = sourcePosition.asJavaConstant().asInt();
+            int destPosInt = destinationPosition.asJavaConstant().asInt();
+            int len = replacedLength.asJavaConstant().asInt();
+            ValueNode destAlias = tool.getAlias(getDestination());
+
+            if (destAlias instanceof VirtualArrayNode) {
+                VirtualArrayNode destVirtual = (VirtualArrayNode) destAlias;
+                if (len < 0 || !checkBounds(destPosInt, len, destVirtual)) {
+                    return;
+                }
+                ValueNode srcAlias = tool.getAlias(getSource());
+
+                if (srcAlias instanceof VirtualObjectNode) {
+                    if (!(srcAlias instanceof VirtualArrayNode)) {
+                        return;
+                    }
+                    VirtualArrayNode srcVirtual = (VirtualArrayNode) srcAlias;
+                    if (destVirtual.componentType().getJavaKind() != srcVirtual.componentType().getJavaKind()) {
+                        return;
+                    }
+                    if (!checkBounds(srcPosInt, len, srcVirtual)) {
+                        return;
+                    }
+                    if (!checkEntryTypes(srcPosInt, len, srcVirtual, destVirtual.type().getComponentType(), tool)) {
+                        return;
+                    }
+                    if (srcVirtual == destVirtual && srcPosInt < destPosInt) {
+                        // must copy backwards to avoid losing elements
+                        for (int i = len - 1; i >= 0; i--) {
+                            tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i));
+                        }
+                    } else {
+                        for (int i = 0; i < len; i++) {
+                            tool.setVirtualEntry(destVirtual, destPosInt + i, tool.getEntry(srcVirtual, srcPosInt + i));
+                        }
+                    }
+                    tool.delete();
+                    DebugContext debug = this.asNode().getDebug();
+                    if (debug.isLogEnabled()) {
+                        debug.log("virtualized arraycopy(%s, %d, %s, %d, %d)", getSource(), srcPosInt, getDestination(), destPosInt, len);
+                    }
+                } else {
+                    ResolvedJavaType sourceType = StampTool.typeOrNull(srcAlias);
+                    if (sourceType == null || !sourceType.isArray()) {
+                        return;
+                    }
+                    ResolvedJavaType sourceComponentType = sourceType.getComponentType();
+                    ResolvedJavaType destComponentType = destVirtual.type().getComponentType();
+                    if (!sourceComponentType.equals(destComponentType)) {
+                        return;
+                    }
+                    for (int i = 0; i < len; i++) {
+                        LoadIndexedNode load = new LoadIndexedNode(this.asNode().graph().getAssumptions(), srcAlias, ConstantNode.forInt(i + srcPosInt, this.asNode().graph()), null,
+                                        destComponentType.getJavaKind());
+                        load.setNodeSourcePosition(this.asNode().getNodeSourcePosition());
+                        tool.addNode(load);
+                        tool.setVirtualEntry(destVirtual, destPosInt + i, load);
+                    }
+                    tool.delete();
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean canDeoptimize() {
+        return true;
+    }
+
+    @Override
+    public void computeStateDuring(FrameState currentStateAfter) {
+        FrameState newStateDuring = currentStateAfter.duplicateModifiedDuringCall(getBci(), asNode().getStackKind());
+        setStateDuring(newStateDuring);
+    }
 }

From 378f6767909dff98cae08000ea1bfb0cf1ff094d Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:27:39 +0200
Subject: [PATCH 531/681] compiler: use explicit @Input instead of
 NodeInputList

---
 .../nodes/BasicArrayCopyNode.java             | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index bfcbcd7de379..5cc2f821df14 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -29,11 +29,9 @@
 import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
 import static org.graalvm.word.LocationIdentity.any;
 
-import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeCycles;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -60,6 +58,7 @@
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * Base class for nodes that intrinsify {@link System#arraycopy}.
@@ -68,13 +67,12 @@
 public abstract class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit, Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
 
     public static final NodeClass<BasicArrayCopyNode> TYPE = NodeClass.create(BasicArrayCopyNode.class);
-    public static final int SRC_ARG = 0;
-    public static final int SRC_POS_ARG = 1;
-    public static final int DEST_ARG = 2;
-    public static final int DEST_POS_ARG = 3;
-    public static final int LENGTH_ARG = 4;
 
-    @Input NodeInputList<ValueNode> args;
+    @Input ValueNode src;
+    @Input ValueNode srcPos;
+    @Input ValueNode dest;
+    @Input ValueNode destPos;
+    @Input ValueNode length;
 
     @OptionalInput(State) FrameState stateDuring;
 
@@ -89,7 +87,11 @@ public abstract class BasicArrayCopyNode extends WithExceptionNode implements Ar
     public BasicArrayCopyNode(NodeClass<? extends BasicArrayCopyNode> type, ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, JavaKind elementKind, int bci) {
         super(type, StampFactory.forKind(JavaKind.Void));
         this.bci = bci;
-        this.args = new NodeInputList<>(this, new ValueNode[]{src, srcPos, dest, destPos, length});
+        this.src = src;
+        this.srcPos = srcPos;
+        this.dest = dest;
+        this.destPos = destPos;
+        this.length = length;
         this.elementKind = elementKind != JavaKind.Illegal ? elementKind : null;
     }
 
@@ -97,10 +99,6 @@ public BasicArrayCopyNode(NodeClass<? extends BasicArrayCopyNode> type, ValueNod
         this(type, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
     }
 
-    public NodeInputList<ValueNode> args() {
-        return args;
-    }
-
     public int getBci() {
         return bci;
     }
@@ -178,31 +176,31 @@ public static JavaKind selectComponentKind(BasicArrayCopyNode arraycopy) {
     }
 
     public ValueNode getSource() {
-        return args().get(SRC_ARG);
+        return src;
     }
 
     public ValueNode getSourcePosition() {
-        return args().get(SRC_POS_ARG);
+        return srcPos;
     }
 
     public ValueNode getDestination() {
-        return args().get(DEST_ARG);
+        return dest;
     }
 
     public ValueNode getDestinationPosition() {
-        return args().get(DEST_POS_ARG);
+        return destPos;
     }
 
     public ValueNode getLength() {
-        return args().get(LENGTH_ARG);
+        return length;
     }
 
-    public boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) {
+    public static boolean checkBounds(int position, int length, VirtualObjectNode virtualObject) {
         assert length >= 0;
         return position >= 0 && position <= virtualObject.entryCount() - length;
     }
 
-    public boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) {
+    public static boolean checkEntryTypes(int srcPos, int length, VirtualObjectNode src, ResolvedJavaType destComponentType, VirtualizerTool tool) {
         if (destComponentType.getJavaKind() == JavaKind.Object && !destComponentType.isJavaLangObject()) {
             for (int i = 0; i < length; i++) {
                 ValueNode entry = tool.getEntry(src, srcPos + i);

From 5f929d65e3b477638a529837368f45df7263140c Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 6 Oct 2021 15:36:51 +0200
Subject: [PATCH 532/681] compiler: remove ArrayCopy

---
 .../replacements/arraycopy/ArrayCopy.java     | 53 -------------------
 .../nodes/BasicArrayCopyNode.java             |  3 +-
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
deleted file mode 100644
index d0cd867547ed..000000000000
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.replacements.arraycopy;
-
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-/**
- * Interface for all nodes that implement the {@link System#arraycopy} operation. Provides
- * implementations for most operations concerning arraycopy.
- */
-public interface ArrayCopy extends Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
-
-}
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
index 5cc2f821df14..4f7b02166950 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -53,7 +53,6 @@
 import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
 import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopy;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
@@ -64,7 +63,7 @@
  * Base class for nodes that intrinsify {@link System#arraycopy}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, size = SIZE_64)
-public abstract class BasicArrayCopyNode extends WithExceptionNode implements ArrayCopy, StateSplit, Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
+public abstract class BasicArrayCopyNode extends WithExceptionNode implements StateSplit, Virtualizable, SingleMemoryKill, MemoryAccess, Lowerable, DeoptimizingNode.DeoptDuring {
 
     public static final NodeClass<BasicArrayCopyNode> TYPE = NodeClass.create(BasicArrayCopyNode.class);
 

From f8918bb23d05904a9c5324c5f29399cc5dfe61a6 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Wed, 22 Sep 2021 15:31:47 +0200
Subject: [PATCH 533/681] Running LLVM unit tests on OL infrastructure

---
 sulong/mx.sulong/mx_sulong.py            |   3 +-
 sulong/mx.sulong/mx_sulong_benchmarks.py | 114 +++++++++++++++++++++++
 vm/mx.vm/ce-llvm                         |   4 +
 3 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 vm/mx.vm/ce-llvm

diff --git a/sulong/mx.sulong/mx_sulong.py b/sulong/mx.sulong/mx_sulong.py
index 94e2fbacd41f..634185973afb 100644
--- a/sulong/mx.sulong/mx_sulong.py
+++ b/sulong/mx.sulong/mx_sulong.py
@@ -309,7 +309,8 @@ def _open_for_reading(path):
 mx_benchmark.add_bm_suite(mx_sulong_benchmarks.SulongBenchmarkSuite(False))
 # Polybench bm suite
 mx_benchmark.add_bm_suite(mx_sulong_benchmarks.SulongBenchmarkSuite(True))
-
+# LLVM unit tests suite
+mx_benchmark.add_bm_suite(mx_sulong_benchmarks.LLVMUnitTestsSuite())
 
 _toolchains = {}
 
diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 3e48d867d96d..1936abeb94b5 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -597,6 +597,117 @@ def launcher_args(self, args):
     def hosting_registry(self):
         return java_vm_registry
 
+class LLVMUnitTestsSuite(VmBenchmarkSuite):
+    def __init__(self, *args, **kwargs):
+        super(LLVMUnitTestsSuite, self).__init__(*args, **kwargs)
+        self.bench_to_exec = {}
+
+    def group(self):
+        return 'Graal'
+
+    def subgroup(self):
+        return 'sulong'
+
+    def name(self):
+        return 'llvm-unit-tests'
+
+    def benchmarkList(self, bmSuiteArgs):
+        return ['llvm-test-suite']
+
+    def failurePatterns(self):
+        return []
+
+    def successPatterns(self):
+        return [re.compile(r'Testing Time')]
+
+    def rules(self, out, benchmarks, bmSuiteArgs):
+        return [
+            mx_benchmark.StdOutRule(
+		r'Passed:(\s+)(?P<count>[\d]+)',
+		{
+                "benchmark": ("llvm-unit-tests", str),
+                # TODO: it's a borrowed metric name, a new one should be registered
+                "metric.name": "jck-passed",
+                "metric.type": "numeric",
+                "metric.value": ("<count>", int),
+                "metric.score-function": "id",
+                "metric.better": "higher",
+                "metric.unit": "#"
+            }),
+            mx_benchmark.StdOutRule(
+		r'Failed:(\s+)(?P<count>[\d]+)',
+		{
+                "benchmark": ("llvm-unit-tests", str),
+                # TODO: it's a borrowed metric name, a new one should be registered
+                "metric.name": "jck-failed",
+                "metric.type": "numeric",
+                "metric.value": ("<count>", int),
+                "metric.score-function": "id",
+                "metric.better": "lower",
+                "metric.unit": "#"
+            }),
+            mx_benchmark.StdOutRule(
+		r'Testing Time:(\s+)(?P<time>\d+(?:\.\d+)?)+s',
+		{
+                "benchmark": ("llvm-unit-tests", str),
+                "metric.name": "time",
+                "metric.type": "numeric",
+                "metric.value": ("<time>", float),
+                "metric.score-function": "id",
+                "metric.better": "lower",
+                "metric.unit": "s"
+            })
+        ]
+
+    def workingDirectory(self, benchmarks, bmSuiteArgs):
+        # TODO
+        return None
+
+    def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
+        # TODO
+        return []
+
+    def get_vm_registry(self):
+        return lit_vm_registry
+
+class LitVm(mx_benchmark.OutputCapturingVm):
+
+    def __init__(self, config_name, options):
+        super(LitVm, self).__init__()
+        self._config_name = config_name
+        self._options = options
+
+    def config_name(self):
+        return self._config_name
+
+    def name(self):
+        # TODO: register "lit" as a new VM and return it here
+        return "sulong"
+
+    def post_process_command_line_args(self, suiteArgs):
+        """Adapts command-line arguments to run the specific VM configuration."""
+        return suiteArgs
+
+    def dimensions(self, cwd, args, code, out):
+        """Returns a dict of additional dimensions to put into every datapoint.
+        :rtype: dict
+        """
+        return {}
+
+    def run_vm(self, args, out=None, err=None, cwd=None, nonZeroIsFatal=False):
+        env = os.environ.copy()
+        mx.run(["lit", "-v", "-j", "4", "-o", "results.json", "."], nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, env=env)
+        return 0
+
+    def prepare_env(self, env):
+        return env
+
+    def opt_phases(self):
+        return []
+
+    def hosting_registry(self):
+        return java_vm_registry
+
 _suite = mx.suite("sulong")
 
 native_vm_registry = VmRegistry("Native", known_host_registries=[java_vm_registry])
@@ -629,3 +740,6 @@ def hosting_registry(self):
     ['--multi-context-runs=3', '--shared-engine=false', '-w', '10', '-i', '10']), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-shared-engine',
     ['--multi-context-runs=3', '--shared-engine=true', '-w', '10', '-i', '10']), _suite, 10)
+
+lit_vm_registry = VmRegistry("Lit", known_host_registries=[java_vm_registry])
+lit_vm_registry.add_vm(LitVm('sulong-native', []), _suite, 10)
diff --git a/vm/mx.vm/ce-llvm b/vm/mx.vm/ce-llvm
new file mode 100644
index 000000000000..47eda134c2b0
--- /dev/null
+++ b/vm/mx.vm/ce-llvm
@@ -0,0 +1,4 @@
+DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
+EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,dis,pbm,pmh,llmulrl
+FORCE_BASH_LAUNCHERS=polyglot,polybench
+SKIP_LIBRARIES=polyglot

From 090bf9606d3db6a6f3cfd12a0f4094e8d8fc8826 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Tue, 19 Oct 2021 09:53:35 +0200
Subject: [PATCH 534/681] Time limit specified for a new benchmark

---
 vm/ci_includes/vm-bench-sulong.hocon | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vm/ci_includes/vm-bench-sulong.hocon b/vm/ci_includes/vm-bench-sulong.hocon
index fcce4015ad98..26d13344b834 100644
--- a/vm/ci_includes/vm-bench-sulong.hocon
+++ b/vm/ci_includes/vm-bench-sulong.hocon
@@ -106,6 +106,7 @@ bench-llvm-sulong-3-runs-shared-engine-ce: ${bench_vm_ce_linux_base} ${bench-llv
     [cat, ${bench_vm_ce_linux_base.resultFile}]
     [bench-uploader.py, ${bench_vm_ce_linux_base.resultFile}]
   ]
+  timelimit: "10:00:01"
 }
 
 bench-llvm-native: ${bench-llvm-common} ${bench-llvm-linux} ${sulong-weekly-notifications} {

From 3ac9ea903763e71594682f479a844420a3ddc1fa Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Thu, 14 Oct 2021 11:00:51 +0200
Subject: [PATCH 535/681] Add PiNode.piCastPositive functionality

---
 .../hotspot/replacements/ClassGetHubNode.java |  6 +-
 .../org/graalvm/compiler/nodes/PiNode.java    | 67 +++++++++++++++++--
 2 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
index 61a1e808dbf9..ae4f0d314426 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
@@ -128,8 +128,12 @@ public Node canonical(CanonicalizerTool tool) {
     @NodeIntrinsic
     public static native KlassPointer readClass(Class<?> clazzNonNull);
 
+    public static KlassPointer piCastNonNull(KlassPointer object, GuardingNode anchor) {
+        return intrinsifiedPiNode(object, anchor, PiNode.INTRINSIFY_OP_NON_NULL);
+    }
+
     @NodeIntrinsic(PiNode.class)
-    public static native KlassPointer piCastNonNull(Object object, GuardingNode anchor);
+    private static native KlassPointer intrinsifiedPiNode(KlassPointer object, GuardingNode anchor, @ConstantNodeParameter int intrinsifyOp);
 
     @Override
     public ValueNode getValue() {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
index 036ba0df7646..a7996e6e030a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
@@ -33,6 +33,7 @@
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
 import org.graalvm.compiler.graph.NodeClass;
@@ -125,13 +126,29 @@ public static ValueNode create(ValueNode object, ValueNode guard) {
         return new PiNode(object, stamp, guard);
     }
 
-    public static boolean intrinsify(GraphBuilderContext b, ValueNode object, ValueNode guard) {
-        Stamp stamp = AbstractPointerStamp.pointerNonNull(object.stamp(NodeView.DEFAULT));
-        ValueNode value = canonical(object, stamp, (GuardingNode) guard, null);
+    public static final int INTRINSIFY_OP_NON_NULL = 1;
+    public static final int INTRINSIFY_OP_POSITIVE_INT = 2;
+
+    public static boolean intrinsify(GraphBuilderContext b, ValueNode input, ValueNode guard, int intrinsifyOp) {
+        Stamp piStamp;
+        JavaKind pushKind;
+        switch (intrinsifyOp) {
+            case INTRINSIFY_OP_NON_NULL:
+                piStamp = AbstractPointerStamp.pointerNonNull(input.stamp(NodeView.DEFAULT));
+                pushKind = JavaKind.Object;
+                break;
+            case INTRINSIFY_OP_POSITIVE_INT:
+                piStamp = StampFactory.positiveInt();
+                pushKind = JavaKind.Int;
+                break;
+            default:
+                throw GraalError.shouldNotReachHere();
+        }
+        ValueNode value = canonical(input, piStamp, (GuardingNode) guard, null);
         if (value == null) {
-            value = new PiNode(object, stamp, guard);
+            value = new PiNode(input, piStamp, guard);
         }
-        b.push(JavaKind.Object, b.append(value));
+        b.push(pushKind, b.append(value));
         return true;
     }
 
@@ -146,6 +163,17 @@ public static boolean intrinsify(GraphBuilderContext b, ValueNode object, Resolv
         return true;
     }
 
+    /**
+     * A stamp expressing the property that is proved by the {@linkplain #getGuard() guard}, but not
+     * more.
+     * </p>
+     *
+     * For example, if the guard proves a property {@code x >= 0} on an {@code int} value, then the
+     * {@link #piStamp()} should be {@link StampFactory#positiveInt()}. If the input value's stamp
+     * is constrained, e.g., {@code [-100 - 100]}, then this pi's overall {@link #stamp(NodeView)}
+     * will be {@code [0 - 100]}, computed as the join of the {@link #piStamp()} and the input's
+     * stamp.
+     */
     public final Stamp piStamp() {
         return piStamp;
     }
@@ -278,19 +306,44 @@ public static Class<?> asNonNullObject(Object object) {
     @NodeIntrinsic(PiNode.Placeholder.class)
     public static native Object piCastToSnippetReplaceeStamp(Object object);
 
+    /**
+     * Changes the stamp of a primitive value and ensures the newly stamped value is positive and
+     * does not float above a given guard.
+     *
+     * @param value an arbitrary {@code int} value
+     * @param guard a node proving that {@code value >= 0} holds at some point in the graph
+     *
+     * @return the {@code value} with its stamp clamped to exclude negative values, guarded by
+     *         {@code guard}
+     */
+    public static int piCastPositive(int value, GuardingNode guard) {
+        return intrinsified(value, guard, INTRINSIFY_OP_POSITIVE_INT);
+    }
+
+    @NodeIntrinsic
+    private static native int intrinsified(int value, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
+    public static Object piCastNonNull(Object object, GuardingNode guard) {
+        return intrinsified(object, guard, INTRINSIFY_OP_NON_NULL);
+    }
+
     @NodeIntrinsic
-    public static native Object piCastNonNull(Object object, GuardingNode guard);
+    private static native Object intrinsified(Object object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
 
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
+    public static Class<?> piCastNonNullClass(Class<?> type, GuardingNode guard) {
+        return intrinsified(type, guard, INTRINSIFY_OP_NON_NULL);
+    }
+
     @NodeIntrinsic
-    public static native Class<?> piCastNonNullClass(Class<?> type, GuardingNode guard);
+    private static native Class<?> intrinsified(Class<?> object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
 
     /**
      * Changes the stamp of an object to represent a given type and to indicate that the object is

From 4f8b73cc151c3ed0568db63a18424b2f96f2deb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gergo.barany@oracle.com>
Date: Wed, 13 Oct 2021 13:28:25 +0200
Subject: [PATCH 536/681] Try to use PiNodes when clamping counted loop max
 trip counts

---
 .../compiler/nodes/loop/CountedLoopInfo.java  | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java
index 9b043b955739..083103a2bc72 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java
@@ -29,11 +29,14 @@
 import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.sub;
 import static org.graalvm.compiler.nodes.loop.MathUtil.unsignedDivBefore;
 
+import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
 import org.graalvm.compiler.core.common.type.IntegerStamp;
 import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.util.UnsignedLong;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.GuardNode;
@@ -41,11 +44,14 @@
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.LoopBeginNode;
 import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.CompareNode;
 import org.graalvm.compiler.nodes.calc.ConditionalNode;
 import org.graalvm.compiler.nodes.calc.NegateNode;
+import org.graalvm.compiler.nodes.cfg.Block;
+import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
 import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.loop.InductionVariable.Direction;
 import org.graalvm.compiler.nodes.util.IntegerHelper;
@@ -252,10 +258,44 @@ protected ValueNode maxTripCountNode(boolean assumeLoopEntered, IntegerHelper in
         // This check is "wide": it looks like min <= max
         // That's OK even if the loop is strict (`!isLimitIncluded()`)
         // because in this case, `div` will be zero when min == max
-        LogicNode noEntryCheck = integerHelper.createCompareNode(max, min, NodeView.DEFAULT);
+        LogicNode noEntryCheck = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(max, min, NodeView.DEFAULT));
+        ValueNode pi = findOrCreatePositivePi(noEntryCheck, div, graph, loop.loopsData().getCFG());
+        if (pi != null) {
+            return pi;
+        }
         return graph.addOrUniqueWithInputs(ConditionalNode.create(noEntryCheck, zero, div, NodeView.DEFAULT));
     }
 
+    /**
+     * Before creating a {@code ConditionalNode(noEntryCheck, zero, div)} node, check if the graph
+     * already contains a {@code !noEntryCheck} path dominating this loop, and build or reuse a
+     * {@link PiNode} there.
+     *
+     * @return a new or existing {@link PiNode} already added to the graph or {@code null}
+     */
+    private ValueNode findOrCreatePositivePi(LogicNode noEntryCheck, ValueNode div, StructuredGraph graph, ControlFlowGraph cfg) {
+        Stamp positiveIntStamp = StampFactory.positiveInt();
+        if (!positiveIntStamp.isCompatible(div.stamp(NodeView.DEFAULT))) {
+            return null;
+        }
+        if (cfg.getNodeToBlock().isNew(loop.loopBegin())) {
+            return null;
+        }
+        Block loopBlock = cfg.blockFor(loop.loopBegin());
+        for (Node checkUsage : noEntryCheck.usages()) {
+            if (checkUsage instanceof IfNode) {
+                IfNode ifCheck = (IfNode) checkUsage;
+                if (cfg.getNodeToBlock().isNew(ifCheck.falseSuccessor())) {
+                    continue;
+                }
+                if (AbstractControlFlowGraph.dominates(cfg.blockFor(ifCheck.falseSuccessor()), loopBlock)) {
+                    return graph.addOrUniqueWithInputs(PiNode.create(div, positiveIntStamp.improveWith(div.stamp(NodeView.DEFAULT)), ifCheck.falseSuccessor()));
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Determine if the loop might be entered. Returns {@code false} if we can tell statically that
      * the loop cannot be entered; returns {@code true} if the loop might possibly be entered,

From 7e53aeac0c35fddd1626bfc6ffabbbe4cbabdd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C3=B6=20Barany?= <gergo.barany@oracle.com>
Date: Mon, 18 Oct 2021 16:16:45 +0200
Subject: [PATCH 537/681] Add test for reuse of dominating Pis for loop max
 trip counts

---
 .../test/CountedLoopMaxTripCountPiTest.java   | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java
new file mode 100644
index 000000000000..4f7b9f8e2335
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.core.test;
+
+import org.graalvm.compiler.api.directives.GraalDirectives;
+import org.graalvm.compiler.core.common.GraalOptions;
+import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.nodes.BeginNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.PiNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import org.graalvm.compiler.nodes.loop.LoopEx;
+import org.graalvm.compiler.nodes.loop.LoopsData;
+import org.graalvm.compiler.options.OptionValues;
+import org.junit.Assert;
+import org.junit.Test;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+/**
+ * Test to verify that loop max trip count nodes reuse existing {@link PiNode}s if possible.
+ */
+public class CountedLoopMaxTripCountPiTest extends GraalCompilerTest {
+
+    public static int guardLoopEntered(boolean condition, int guardedValue) {
+        if (condition) {
+            GraalDirectives.deoptimize();
+        }
+        return positivePi(guardedValue);
+    }
+
+    // intrinsified below
+    public static int positivePi(int n) {
+        return n;
+    }
+
+    @Override
+    protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
+        super.registerInvocationPlugins(invocationPlugins);
+        Registration r = new Registration(invocationPlugins, CountedLoopMaxTripCountPiTest.class);
+
+        r.register1("positivePi", int.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod method, Receiver receiver, ValueNode n) {
+                BeginNode begin = b.add(new BeginNode());
+                b.addPush(JavaKind.Int, PiNode.create(n, StampFactory.positiveInt().improveWith(n.stamp(NodeView.DEFAULT)), begin));
+                return true;
+            }
+        });
+    }
+
+    int ascendingSnippet(int start, int limit) {
+        int maxTripCount = guardLoopEntered(limit < start, limit - start);
+        int sum = 0;
+        for (int i = start; GraalDirectives.injectIterationCount(101, i < limit); i++) {
+            GraalDirectives.sideEffect(i);
+            sum += i;
+        }
+        return sum + maxTripCount;
+    }
+
+    int descendingSnippet(int start, int limit) {
+        int maxTripCount = guardLoopEntered(start < limit, start - limit + 1);
+        int sum = 0;
+        for (int i = start; GraalDirectives.injectIterationCount(102, i >= limit); i--) {
+            GraalDirectives.sideEffect(i);
+            sum += i;
+        }
+        return sum + maxTripCount;
+    }
+
+    /**
+     * In the high and mid tiers, make sure that all max trip count nodes are the unique pi node in
+     * the graph (i.e., exactly the one proved by the guard). We don't check the low tier because pi
+     * nodes are eliminated by FixReads.
+     */
+    void checkGraph(StructuredGraph graph, LoopsData loops) {
+        loops.detectedCountedLoops();
+        for (LoopEx loop : loops.loops()) {
+            Assert.assertTrue("expect all loops to be counted", loop.isCounted());
+            ValueNode maxTripCountNode = loop.counted().maxTripCountNode();
+            Assert.assertTrue("expect a PiNode for the guarded maxTripCount, got: " + maxTripCountNode, maxTripCountNode instanceof PiNode);
+        }
+        PiNode[] pis = graph.getNodes().filter(PiNode.class).snapshot().toArray(new PiNode[0]);
+        Assert.assertEquals("number of PiNodes in the graph", 1, pis.length);
+    }
+
+    @Override
+    protected void checkHighTierGraph(StructuredGraph graph) {
+        super.checkHighTierGraph(graph);
+        checkGraph(graph, getDefaultHighTierContext().getLoopsDataProvider().getLoopsData(graph));
+    }
+
+    @Override
+    protected void checkMidTierGraph(StructuredGraph graph) {
+        super.checkMidTierGraph(graph);
+        checkGraph(graph, getDefaultMidTierContext().getLoopsDataProvider().getLoopsData(graph));
+    }
+
+    protected void testLoop(String snippetName, Object... args) {
+        OptionValues options = new OptionValues(getInitialOptions(), GraalOptions.PartialUnroll, false, GraalOptions.LoopPeeling, false);
+        test(options, snippetName, args);
+    }
+
+    @Test
+    public void testAscending() {
+        testLoop("ascendingSnippet", 0, 100);
+    }
+
+    @Test
+    public void testDescending() {
+        testLoop("descendingSnippet", 100, 0);
+    }
+}

From e254751f09f5b1a7f4594193f55c213a07ce2130 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Mon, 18 Oct 2021 12:50:17 +0200
Subject: [PATCH 538/681] compiler: on PiNodes guard() might be another PiNodes
 object()

---
 .../src/org/graalvm/compiler/nodes/PiNode.java           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
index 036ba0df7646..6eedfdd0f3a3 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
@@ -205,7 +205,14 @@ public static ValueNode canonical(ValueNode object, Stamp piStamp, GuardingNode
             for (Node n : guard.asNode().usages()) {
                 if (n instanceof PiNode && n != self) {
                     PiNode otherPi = (PiNode) n;
-                    assert otherPi.guard == guard;
+                    if (otherPi.guard != guard) {
+                        assert otherPi.object() == guard;
+                        /*
+                         * The otherPi is unrelated because it uses this.guard as object but not as
+                         * guard.
+                         */
+                        continue;
+                    }
                     if (otherPi.object() == self || otherPi.object() == object) {
                         // Check if other pi's stamp is more precise
                         Stamp joinedStamp = piStamp.improveWith(otherPi.piStamp());

From 70ff72b69059d549a99a22c9e15224ddb4415051 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Fri, 15 Oct 2021 08:25:16 +0200
Subject: [PATCH 539/681] compiler: make ExceptionObjectNode and
 LoadExceptionObjectNode DeoptAfter

---
 .../compiler/nodes/java/ExceptionObjectNode.java      | 11 ++++++++++-
 .../compiler/nodes/java/LoadExceptionObjectNode.java  |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
index da95b4564547..df01f94a6c91 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
@@ -29,6 +29,7 @@
 
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.InputType;
@@ -36,6 +37,7 @@
 import org.graalvm.compiler.nodes.AbstractBeginNode;
 import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.BeginStateSplitNode;
+import org.graalvm.compiler.nodes.DeoptimizingNode;
 import org.graalvm.compiler.nodes.KillingBeginNode;
 import org.graalvm.compiler.nodes.MultiKillingBeginNode;
 import org.graalvm.compiler.nodes.NodeView;
@@ -56,7 +58,7 @@
  * throw instruction or implicit exception).
  */
 @NodeInfo(allowedUsageTypes = Memory, cycles = CYCLES_8, size = SIZE_8)
-public final class ExceptionObjectNode extends BeginStateSplitNode implements Lowerable, SingleMemoryKill {
+public final class ExceptionObjectNode extends BeginStateSplitNode implements Lowerable, SingleMemoryKill, DeoptimizingNode.DeoptAfter {
     public static final NodeClass<ExceptionObjectNode> TYPE = NodeClass.create(ExceptionObjectNode.class);
 
     public ExceptionObjectNode(MetaAccessProvider metaAccess) {
@@ -98,6 +100,8 @@ public void lower(LoweringTool tool) {
 
             LoadExceptionObjectNode loadException = graph().add(new LoadExceptionObjectNode(stamp(NodeView.DEFAULT)));
 
+            GraalError.guarantee(graph().getGuardsStage().areFrameStatesAtDeopts(), "Should be after FSA %s", this);
+            GraalError.guarantee(stateAfter() != null, "StateAfter must not be null for %s", this);
             loadException.setStateAfter(stateAfter());
             replaceAtUsages(loadException, InputType.Value);
             graph().replaceFixedWithFixed(this, entry);
@@ -115,4 +119,9 @@ public boolean verify() {
                         "an exception handler's frame state must have only the exception on the stack");
         return super.verify();
     }
+
+    @Override
+    public boolean canDeoptimize() {
+        return true;
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java
index 0dfe859184a8..bc958dfabff7 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java
@@ -31,10 +31,11 @@
 import org.graalvm.compiler.graph.NodeClass;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.AbstractStateSplit;
+import org.graalvm.compiler.nodes.DeoptimizingNode;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_8)
-public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable {
+public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable, DeoptimizingNode.DeoptAfter {
 
     public static final NodeClass<LoadExceptionObjectNode> TYPE = NodeClass.create(LoadExceptionObjectNode.class);
 
@@ -42,4 +43,8 @@ public LoadExceptionObjectNode(Stamp stamp) {
         super(TYPE, stamp);
     }
 
+    @Override
+    public boolean canDeoptimize() {
+        return true;
+    }
 }

From 3544e7fdced93cbd450509ecbbddc45905b9e191 Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Tue, 19 Oct 2021 10:29:27 +0200
Subject: [PATCH 540/681] Cleanups.

---
 .../com/oracle/svm/core/genscavenge/GCImpl.java    |  3 ++-
 .../com/oracle/svm/core/genscavenge/HeapImpl.java  |  3 ++-
 .../core/posix/pthread/PthreadVMLockSupport.java   | 12 ++++++------
 .../svm/core/windows/WindowsVMLockSupport.java     | 12 ++++++------
 .../svm/core/InvalidMethodPointerHandler.java      | 12 ++++++------
 .../oracle/svm/core/SubstrateSegfaultHandler.java  |  3 ++-
 .../core/graal/snippets/CEntryPointSnippets.java   |  3 ++-
 .../svm/core/graal/snippets/DeoptTester.java       |  4 ++--
 .../oracle/svm/core/jdk/VMErrorSubstitutions.java  |  8 ++++----
 .../src/com/oracle/svm/core/thread/Safepoint.java  |  4 ++--
 .../oracle/svm/core/thread/VMOperationControl.java |  2 ++
 .../src/com/oracle/svm/core/thread/VMThreads.java  | 14 ++++++++------
 .../com/oracle/svm/jni/functions/JNIFunctions.java | 12 ++++++------
 13 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 8dc6e9965bdb..a04d5b732f9b 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -29,6 +29,7 @@
 
 import java.lang.ref.Reference;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
@@ -783,7 +784,7 @@ private void blackenStackRoots() {
                          */
                         continue;
                     }
-                    if (!VMThreads.SafepointBehavior.safepointChecksEnabled(vmThread)) {
+                    if (!SafepointBehavior.safepointChecksEnabled(vmThread)) {
                         /*
                          * When a thread is ignoring safepoints, then the thread is not paused and
                          * we cannot safely walk its stack (we don't even know where it starts).
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
index c957d1a1f0de..2ff6daf36e4c 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
@@ -30,6 +30,7 @@
 
 import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
 import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
@@ -238,7 +239,7 @@ GCImpl getGCImpl() {
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean isAllocationDisallowed() {
-        return NoAllocationVerifier.isActive() || !VMThreads.SafepointBehavior.safepointChecksEnabled() || gcImpl.isCollectionInProgress();
+        return NoAllocationVerifier.isActive() || !SafepointBehavior.safepointChecksEnabled() || gcImpl.isCollectionInProgress();
     }
 
     /** A guard to place before an allocation, giving the call site and the allocation type. */
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
index 8e339ff2ec11..c443fb18b871 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.posix.pthread;
 
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
-import com.oracle.svm.core.stack.StackOverflowCheck;
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.word.Word;
@@ -41,6 +41,7 @@
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.annotate.UnknownObjectField;
 import com.oracle.svm.core.config.ConfigurationValues;
@@ -53,12 +54,11 @@
 import com.oracle.svm.core.posix.headers.Errno;
 import com.oracle.svm.core.posix.headers.Pthread;
 import com.oracle.svm.core.posix.headers.Time;
-import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.stack.StackOverflowCheck;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 
 import jdk.vm.ci.meta.JavaKind;
 
-import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
-
 /**
  * Support of {@link VMMutex} and {@link VMCondition} in multi-threaded environments. Locking is
  * implemented via pthreads.
@@ -171,7 +171,7 @@ protected static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.SafepointBehavior.preventSafepoints();
+            SafepointBehavior.preventSafepoints();
             StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
             Log.log().string(functionName).string(" returned ").signed(result).newline();
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 4101b79d2dd1..86222b54b30e 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.windows;
 
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
-import com.oracle.svm.core.stack.StackOverflowCheck;
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.word.Word;
@@ -40,6 +40,7 @@
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.annotate.UnknownObjectField;
 import com.oracle.svm.core.config.ConfigurationValues;
@@ -49,15 +50,14 @@
 import com.oracle.svm.core.locks.VMLockSupport;
 import com.oracle.svm.core.locks.VMMutex;
 import com.oracle.svm.core.log.Log;
-import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.stack.StackOverflowCheck;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.core.windows.headers.Process;
 import com.oracle.svm.core.windows.headers.SynchAPI;
 import com.oracle.svm.core.windows.headers.WinBase;
 
 import jdk.vm.ci.meta.JavaKind;
 
-import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
-
 //Checkstyle: stop
 
 /**
@@ -166,7 +166,7 @@ static void checkResult(int result, String functionName) {
              * Functions are called very early and late during our execution, so there is not much
              * we can do when they fail.
              */
-            VMThreads.SafepointBehavior.preventSafepoints();
+            SafepointBehavior.preventSafepoints();
             StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
             int lastError = WinBase.GetLastError();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
index 9c1c59ec3fef..aaec92b0e0a7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/InvalidMethodPointerHandler.java
@@ -26,10 +26,10 @@
 
 // Checkstyle: allow reflection
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 import java.lang.reflect.Method;
 
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
-import com.oracle.svm.core.annotate.Uninterruptible;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.c.function.CodePointer;
@@ -37,15 +37,15 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.annotate.NeverInline;
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.StubCallingConvention;
+import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.stack.StackOverflowCheck;
-import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.util.ReflectionUtil;
 
-import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
-
 /**
  * Provides stub methods that can be used for uninitialized method pointers. Instead of a segfault,
  * the stubs provide full diagnostic output with a stack trace.
@@ -76,7 +76,7 @@ private static void methodPointerNotCompiledHandler() {
     @Uninterruptible(reason = "Prevent safepoints until everything is set up for printing the fatal error.", calleeMustBe = false)
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     private static void failFatally(Pointer callerSP, CodePointer callerIP, String message) {
-        VMThreads.SafepointBehavior.preventSafepoints();
+        SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         /*
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
index 369354fc0388..36f45f6415e4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
@@ -26,6 +26,7 @@
 
 import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.options.Option;
 import org.graalvm.nativeimage.CurrentIsolate;
@@ -153,7 +154,7 @@ protected static boolean tryEnterIsolate(RegisterDumper.Context context) {
     @Uninterruptible(reason = "Must be uninterruptible until we get immune to safepoints.", calleeMustBe = false)
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in segfault handler.", overridesCallers = true)
     protected static void dump(PointerBase signalInfo, RegisterDumper.Context context) {
-        VMThreads.SafepointBehavior.preventSafepoints();
+        SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         dumpInterruptibly(signalInfo, context);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index 574441ffb58e..64dbc2d36a57 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 
 import com.oracle.svm.core.annotate.RestrictHeapAccess;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
@@ -566,7 +567,7 @@ public static int reportExceptionSnippet(Throwable exception) {
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
     private static int reportException(Throwable exception) {
-        VMThreads.SafepointBehavior.preventSafepoints();
+        SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         logException(exception);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
index eb20a6b52c3d..2b4042960e34 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
@@ -51,7 +51,7 @@
 import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.ThreadingSupportImpl;
 import com.oracle.svm.core.thread.VMOperation;
-import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.core.threadlocal.FastThreadLocalFactory;
 import com.oracle.svm.core.threadlocal.FastThreadLocalInt;
 import com.oracle.svm.core.util.VMError;
@@ -111,7 +111,7 @@ public static void deoptTest() {
                             !CEntryPointSnippets.isIsolateInitialized() ||
                             ThreadingSupportImpl.isRecurringCallbackPaused() ||
                             VMOperation.isInProgress() ||
-                            !VMThreads.SafepointBehavior.safepointChecksEnabled() ||
+                            !SafepointBehavior.safepointChecksEnabled() ||
                             !JavaThreads.currentJavaThreadInitialized()) {
                 return; // Thread or VM is not in a safe (or sane) state for deoptimization
             }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
index ee1162c1afb3..331f4970b361 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.jdk;
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
@@ -39,9 +41,7 @@
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.stack.StackOverflowCheck;
 import com.oracle.svm.core.stack.ThreadStackPrinter;
-import com.oracle.svm.core.thread.VMThreads;
-
-import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 
 @TargetClass(com.oracle.svm.core.util.VMError.class)
 final class Target_com_oracle_svm_core_util_VMError {
@@ -103,7 +103,7 @@ public class VMErrorSubstitutions {
     static RuntimeException shouldNotReachHere(CodePointer callerIP, String msg, Throwable ex) {
         ThreadStackPrinter.printBacktrace();
 
-        VMThreads.SafepointBehavior.preventSafepoints();
+        SafepointBehavior.preventSafepoints();
         StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
         VMErrorSubstitutions.shutdown(callerIP, msg, ex);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index 074076393a4e..721333f49bec 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -520,7 +520,7 @@ public static void transitionVMToNative() {
     private static void enterSlowPathTransitionFromNativeToNewStatus(int newStatus) {
         VMError.guarantee(StatusSupport.isStatusNativeOrSafepoint(), "Must either be at a safepoint or in native mode");
         VMError.guarantee(SafepointBehavior.safepointChecksEnabled(),
-                        "When safepoint checks are disabled, the thread can only be in Native mode, so the fast path transition must succeed and this slow path must not be called");
+                        "The safepoint handling doesn't change the status of threads where the safepoint checks are disabled. So, the fast path transition must succeed and this slow path must not be called");
 
         Statistics.incSlowPathFrozen();
         try {
@@ -719,7 +719,7 @@ private static void waitForSafepoints(String reason) {
                      * - thread A reads the safepoint behavior of thread B.
                      * - thread B sets the safepoint behavior to PREVENT_VM_FROM_REACHING_SAFEPOINT.
                      * - thread B sets the status to STATUS_IN_NATIVE.
-                     * - thread A reads the status and the VM reaches a safepoint.
+                     * - thread A reads the status of thread B and the VM reaches a safepoint.
                      */
                     int status = StatusSupport.getStatusVolatile(vmThread);
                     int safepointBehavior = SafepointBehavior.getSafepointBehaviorVolatile(vmThread);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
index c1b7e49f5701..16f00e270ee7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
@@ -30,6 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
@@ -261,6 +262,7 @@ void enqueueFromNonJavaThread(NativeVMOperationData data) {
     private void enqueue(VMOperation operation, NativeVMOperationData data) {
         StackOverflowCheck.singleton().makeYellowZoneAvailable();
         try {
+            VMError.guarantee(SafepointBehavior.safepointChecksEnabled(), "could cause deadlocks otherwise");
             log().string("[VMOperationControl.enqueue:").string("  operation: ").string(operation.getName());
             if (!MultiThreaded.getValue()) {
                 // no safepoint is needed, so we can always directly execute the operation
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index 720dd6ec0441..b4cab32f452a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -831,8 +831,10 @@ public static int getSafepointBehaviorVolatile(IsolateThread vmThread) {
          * thread will also actively prevent the VM from reaching a safepoint (regardless of its
          * thread status).
          * 
-         * NOTE: Be careful with this and make sure that this thread does not allocate any Java
-         * objects as this could result deadlocks.
+         * NOTE: Be careful with this method and make sure that this thread does not allocate any
+         * Java objects as this could result deadlocks. This method will only work prevent
+         * safepoints reliably if it is called from a thread with
+         * {@link StatusSupport#STATUS_IN_JAVA}.
          */
         @Uninterruptible(reason = "Called from uninterruptible code.", callerMustBe = true)
         public static void preventSafepoints() {
@@ -841,12 +843,12 @@ public static void preventSafepoints() {
         }
 
         /**
-         * Marks the thread as crashed. This method may only be used in places where it is no longer
+         * Marks the thread as crashed. This method may only be used in places where it is not
          * possible to safely detach a thread.
          * 
-         * Calling this method changes the safepoint behavior so that this thread won't freeze at a
-         * safepoint. The safepoint handling will ignore the thread so that the VM can reach a
-         * safepoint regardless of the status of this thread.
+         * Changes the safepoint behavior so that this thread won't freeze at a safepoint. The
+         * safepoint handling will ignore the thread so that the VM can reach a safepoint regardless
+         * of the status of this thread.
          *
          * NOTE: Be careful with this. If a thread is ignored by the safepoint handling, it means
          * that it can continue executing while a safepoint (and therefore a GC) is in progress. So,
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
index f2bf0cd4b88e..49c9afb150b9 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/functions/JNIFunctions.java
@@ -26,6 +26,8 @@
 
 // Checkstyle: allow reflection
 
+import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
@@ -36,8 +38,6 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import com.oracle.svm.core.annotate.RestrictHeapAccess;
-import com.oracle.svm.core.stack.StackOverflowCheck;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -61,6 +61,7 @@
 import com.oracle.svm.core.SubstrateDiagnostics;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.NeverInline;
+import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.c.CGlobalData;
@@ -74,7 +75,8 @@
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.monitor.MonitorSupport;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
-import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.stack.StackOverflowCheck;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.core.util.Utf8;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.jni.JNIObjectHandles;
@@ -114,8 +116,6 @@
 import jdk.vm.ci.meta.MetaUtil;
 import sun.misc.Unsafe;
 
-import static com.oracle.svm.core.annotate.RestrictHeapAccess.Access.NO_ALLOCATION;
-
 /**
  * Implementations of the functions defined by the Java Native Interface.
  *
@@ -1157,7 +1157,7 @@ static void handleException(Throwable t) {
         @Uninterruptible(reason = "Prevent safepoints until everything is set up for the fatal error printing.", calleeMustBe = false)
         @RestrictHeapAccess(access = NO_ALLOCATION, reason = "Must not allocate in fatal error handling.", overridesCallers = true)
         static void fatalError(CodePointer callerIP, Pointer callerSP, String message) {
-            VMThreads.SafepointBehavior.preventSafepoints();
+            SafepointBehavior.preventSafepoints();
             StackOverflowCheck.singleton().disableStackOverflowChecksForFatalError();
 
             LogHandler logHandler = ImageSingletons.lookup(LogHandler.class);

From fa763b64577ca5f6476074fc6adef3a3ea1b4459 Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Tue, 19 Oct 2021 10:11:53 +0200
Subject: [PATCH 541/681] compiler: lower ExceptionObjectNode in LOW_TIER

---
 .../hotspot/replacements/LoadExceptionObjectSnippets.java      | 1 +
 .../org/graalvm/compiler/nodes/java/ExceptionObjectNode.java   | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java
index 978eb479e6d4..6a9fb0338252 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java
@@ -99,6 +99,7 @@ public void lower(LoadExceptionObjectNode loadExceptionObject, HotSpotRegistersP
                 graph.addBeforeFixed(loadExceptionObject, thread);
                 ForeignCallNode loadExceptionC = graph.add(new ForeignCallNode(LOAD_AND_CLEAR_EXCEPTION, thread));
                 loadExceptionC.setStateAfter(loadExceptionObject.stateAfter());
+                loadExceptionC.computeStateDuring(loadExceptionObject.stateAfter());
                 graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC);
             } else {
                 Arguments args = new Arguments(loadException, loadExceptionObject.graph().getGuardsStage(), tool.getLoweringStage());
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
index df01f94a6c91..0c0fdc7f665a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
@@ -41,7 +41,6 @@
 import org.graalvm.compiler.nodes.KillingBeginNode;
 import org.graalvm.compiler.nodes.MultiKillingBeginNode;
 import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.StructuredGraph.FrameStateVerification;
 import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
 import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
@@ -81,7 +80,7 @@ public boolean hasSideEffect() {
 
     @Override
     public void lower(LoweringTool tool) {
-        if (graph().getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS) {
+        if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.LOW_TIER) {
             /*
              * Now the lowering to BeginNode+LoadExceptionNode can be performed, since no more
              * deopts can float in between the begin node and the load exception node.

From 2b5a37241d8ae943225bb9e98459948af219f2ef Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Wed, 13 Oct 2021 18:03:02 +0200
Subject: [PATCH 542/681] svm: lower ExceptionObjectNode in LOW_TIER

---
 .../LLVMLoadExceptionObjectLowering.java      | 10 ++--
 .../core/graal/nodes/ExceptionStateNode.java  | 55 -------------------
 .../graal/snippets/ExceptionSnippets.java     |  9 +--
 3 files changed, 7 insertions(+), 67 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ExceptionStateNode.java

diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
index 5f37e72d6f15..091091ab13a4 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
@@ -25,13 +25,13 @@
 package com.oracle.svm.core.graal.llvm.lowering;
 
 import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
 import org.graalvm.compiler.nodes.spi.LoweringTool;
 
-import com.oracle.svm.core.graal.nodes.ExceptionStateNode;
 import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
 import com.oracle.svm.core.nodes.CFunctionEpilogueNode;
@@ -42,9 +42,10 @@ public class LLVMLoadExceptionObjectLowering implements NodeLoweringProvider<Loa
     @Override
     public void lower(LoadExceptionObjectNode node, LoweringTool tool) {
         FrameState exceptionState = node.stateAfter();
-        assert exceptionState != null;
+        GraalError.guarantee(exceptionState != null, "StateAfter must not be null for %s", node);
 
         StructuredGraph graph = node.graph();
+        GraalError.guarantee(graph.getGuardsStage().areFrameStatesAtDeopts(), "Should be after FSA %s", node);
         FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(StampFactory.objectNonNull()));
         graph.replaceFixedWithFixed(node, readRegNode);
 
@@ -56,9 +57,10 @@ public void lower(LoadExceptionObjectNode node, LoweringTool tool) {
         CFunctionEpilogueNode cFunctionEpilogueNode = new CFunctionEpilogueNode(VMThreads.StatusSupport.STATUS_IN_NATIVE);
         graph.add(cFunctionEpilogueNode);
         graph.addAfterFixed(readRegNode, cFunctionEpilogueNode);
+        GraalError.guarantee(exceptionState.rethrowException() && exceptionState.stackSize() == 1 && exceptionState.stackAt(0) == readRegNode,
+                        "Unexpected state for node %s: %s", cFunctionEpilogueNode, exceptionState);
+        cFunctionEpilogueNode.setStateBefore(exceptionState);
         cFunctionEpilogueNode.setStateAfter(exceptionState);
         cFunctionEpilogueNode.lower(tool);
-
-        graph.addAfterFixed(readRegNode, graph.add(new ExceptionStateNode(exceptionState)));
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ExceptionStateNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ExceptionStateNode.java
deleted file mode 100644
index 1e58d8b6c5f1..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ExceptionStateNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2019, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.graal.nodes;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.FrameState;
-
-@NodeInfo(cycles = NodeCycles.CYCLES_0, size = NodeSize.SIZE_0)
-public final class ExceptionStateNode extends AbstractStateSplit implements Canonicalizable {
-    public static final NodeClass<ExceptionStateNode> TYPE = NodeClass.create(ExceptionStateNode.class);
-
-    public ExceptionStateNode(FrameState stateAfter) {
-        super(TYPE, StampFactory.forVoid(), stateAfter);
-        assert stateAfter != null;
-    }
-
-    @Override
-    public Node canonical(CanonicalizerTool tool) {
-        if (stateAfter == null) {
-            /* After the FrameStateAssignmentPhase, the node is unnecessary. */
-            return null;
-        }
-        return this;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
index d1fd20b42ae3..a60d039e5563 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import static org.graalvm.compiler.nodes.UnreachableNode.unreachable;
 import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.runtimeCall;
 import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer;
+import static org.graalvm.compiler.nodes.UnreachableNode.unreachable;
 
 import java.util.Map;
 
@@ -37,7 +37,6 @@
 import org.graalvm.compiler.debug.DebugHandlersFactory;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.UnwindNode;
 import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
@@ -51,7 +50,6 @@
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.annotate.NeverInline;
-import com.oracle.svm.core.graal.nodes.ExceptionStateNode;
 import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.snippets.ExceptionUnwind;
@@ -102,14 +100,9 @@ public static class LoadExceptionObjectLowering implements NodeLoweringProvider<
 
         @Override
         public void lower(LoadExceptionObjectNode node, LoweringTool tool) {
-            FrameState exceptionState = node.stateAfter();
-            assert exceptionState != null;
-
             StructuredGraph graph = node.graph();
             FixedWithNextNode readRegNode = graph.add(new ReadExceptionObjectNode(StampFactory.objectNonNull()));
             graph.replaceFixedWithFixed(node, readRegNode);
-
-            graph.addAfterFixed(readRegNode, graph.add(new ExceptionStateNode(exceptionState)));
         }
     }
 }

From 4848bcfd0267477f56c2fa85d3dd28112ec3535f Mon Sep 17 00:00:00 2001
From: Jaroslav Tulach <jaroslav.tulach@oracle.com>
Date: Tue, 19 Oct 2021 09:07:13 +0200
Subject: [PATCH 543/681] Each source object in the heap has to have a name

---
 .../insight/heap/instrument/HeapGenerator.java | 18 +++++++++++++-----
 .../test/heap/HeapObjectStreamTest.java        |  2 +-
 .../insight/test/heap/HeapObjectTest.java      |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tools/src/org.graalvm.tools.insight.heap/src/org/graalvm/tools/insight/heap/instrument/HeapGenerator.java b/tools/src/org.graalvm.tools.insight.heap/src/org/graalvm/tools/insight/heap/instrument/HeapGenerator.java
index d7c9cbd06edc..340170eab9eb 100644
--- a/tools/src/org.graalvm.tools.insight.heap/src/org/graalvm/tools/insight/heap/instrument/HeapGenerator.java
+++ b/tools/src/org.graalvm.tools.insight.heap/src/org/graalvm/tools/insight/heap/instrument/HeapGenerator.java
@@ -166,14 +166,22 @@ private static Integer asIntOrNull(InteropLibrary iop, Object from, String key)
     }
 
     private static Object readMember(InteropLibrary iop, Object obj, String member) {
+        return readMember(iop, obj, member, (id) -> id);
+    }
+
+    private interface Convert<T> {
+        T convert(Object obj) throws UnsupportedTypeException, UnsupportedMessageException;
+    }
+
+    private static <T> T readMember(InteropLibrary iop, Object obj, String member, Convert<T> convert) {
         String errMsg;
         try {
             Object value = iop.readMember(obj, member);
             if (!iop.isNull(value)) {
-                return value;
+                return convert.convert(value);
             }
             errMsg = "'" + member + "' should be defined";
-        } catch (UnsupportedMessageException | UnknownIdentifierException ex) {
+        } catch (UnsupportedTypeException | UnsupportedMessageException | UnknownIdentifierException ex) {
             errMsg = "Cannot find '" + member + "'";
         }
         StringBuilder sb = new StringBuilder(errMsg);
@@ -321,7 +329,7 @@ ClassInstance findClass(InteropLibrary iop, HeapDump seg, String metaHint, Objec
 
     /**
      * Dumps source section so it looks like {@link SourceSection} in a regular Java Heap Dump.
-     * 
+     *
      * @param seg segment to write heap data to
      * @param sourceId object id of the source the section belongs to
      * @param charIndex 0-based index of initial character of the section in the source
@@ -346,7 +354,7 @@ private ObjectInstance dumpSourceSection(HeapDump seg, ObjectInstance sourceId,
 
     /**
      * Dumps source so it looks like {@link Source} in a regular Java Heap Dump.
-     * 
+     *
      * @param iop interop library to use
      * @param seg segment to write heap data to
      * @param source object representing the {@code SourceInfo} object defined by {@link Insight}
@@ -357,7 +365,7 @@ private ObjectInstance dumpSourceSection(HeapDump seg, ObjectInstance sourceId,
      *             represented
      */
     private ObjectInstance dumpSource(InteropLibrary iop, HeapDump seg, Object source) throws IOException, UnsupportedMessageException {
-        String srcName = asStringOrNull(iop, source, "name");
+        String srcName = readMember(iop, source, "name", iop::asString);
         String mimeType = asStringOrNull(iop, source, "mimeType");
         String uri = asStringOrNull(iop, source, "uri");
         String characters = asStringOrNull(iop, source, "characters");
diff --git a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectStreamTest.java b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectStreamTest.java
index 81072f099adc..2bd837a89657 100644
--- a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectStreamTest.java
+++ b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectStreamTest.java
@@ -90,7 +90,7 @@ public void cannotSetNullStream() {
 
     @Test
     public void dumpToStream() throws Exception {
-        Source nullSource = new Source(null, null, null, null, null);
+        Source nullSource = new Source("no.src", null, null, null, null);
         invokeDump(heap, 1, new Event[]{
                         new StackEvent(new StackElement[]{new StackElement(new At(null, nullSource, 1, 0, 5), new HashMap<>())})
         });
diff --git a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectTest.java b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectTest.java
index 24097d3d49b6..4e8377c8cfe8 100644
--- a/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectTest.java
+++ b/tools/src/org.graalvm.tools.insight.test/src/org/graalvm/tools/insight/test/heap/HeapObjectTest.java
@@ -149,7 +149,7 @@ public void nonNullAt() throws Exception {
 
     @Test
     public void everythingIsOK() throws Exception {
-        Source nullSource = new Source(null, null, null, null, null);
+        Source nullSource = new Source("no.source", null, null, null, null);
         invokeDump(heap, 1, new Event[]{
                         new StackEvent(new StackElement[]{new StackElement(new At(null, nullSource, 1, 0, 5), new HashMap<>())})
         });

From 588a8def71532af28a09c4a8a2f25446378a69ca Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 19 Oct 2021 13:31:39 +0300
Subject: [PATCH 544/681] Backport images

---
 .../images/NativeImageExecutableLocations.png | Bin 0 -> 145084 bytes
 .../vscode/graalvm/images/ni_debugging.png    | Bin 0 -> 166648 bytes
 .../images/attach-remote-debugger.png         | Bin 0 -> 15097 bytes
 .../images/create_k8s_deployment.png          | Bin 0 -> 24677 bytes
 .../vscode/micronaut/images/deploy_yaml.png   | Bin 0 -> 68969 bytes
 .../images/docker_image_location.png          | Bin 0 -> 48699 bytes
 .../micronaut/images/k8s_deply_output.png     | Bin 0 -> 111883 bytes
 .../micronaut/images/k8s_port_forwarding.png  | Bin 0 -> 49924 bytes
 .../micronaut/images/k8s_quick_actions.png    | Bin 0 -> 24418 bytes
 .../micronaut/images/kubernetes_icon.png      | Bin 0 -> 21584 bytes
 .../images/micronaut-deploy-commands.png      | Bin 0 -> 22092 bytes
 .../images/micronaut-vs-code-commands.png     | Bin 52307 -> 33287 bytes
 .../vscode/micronaut/images/micronaut.png     | Bin 0 -> 3335 bytes
 .../images/pick_docker_repository.png         | Bin 0 -> 12010 bytes
 .../images/provide_image_name_version.png     | Bin 0 -> 15522 bytes
 .../micronaut/images/select_namespace.png     | Bin 0 -> 15092 bytes
 .../vscode/micronaut/images/select_secret.png | Bin 0 -> 3986 bytes
 17 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/tools/vscode/graalvm/images/NativeImageExecutableLocations.png
 create mode 100644 docs/tools/vscode/graalvm/images/ni_debugging.png
 create mode 100644 docs/tools/vscode/micronaut/images/attach-remote-debugger.png
 create mode 100644 docs/tools/vscode/micronaut/images/create_k8s_deployment.png
 create mode 100644 docs/tools/vscode/micronaut/images/deploy_yaml.png
 create mode 100644 docs/tools/vscode/micronaut/images/docker_image_location.png
 create mode 100644 docs/tools/vscode/micronaut/images/k8s_deply_output.png
 create mode 100644 docs/tools/vscode/micronaut/images/k8s_port_forwarding.png
 create mode 100644 docs/tools/vscode/micronaut/images/k8s_quick_actions.png
 create mode 100644 docs/tools/vscode/micronaut/images/kubernetes_icon.png
 create mode 100644 docs/tools/vscode/micronaut/images/micronaut-deploy-commands.png
 create mode 100644 docs/tools/vscode/micronaut/images/micronaut.png
 create mode 100644 docs/tools/vscode/micronaut/images/pick_docker_repository.png
 create mode 100644 docs/tools/vscode/micronaut/images/provide_image_name_version.png
 create mode 100644 docs/tools/vscode/micronaut/images/select_namespace.png
 create mode 100644 docs/tools/vscode/micronaut/images/select_secret.png

diff --git a/docs/tools/vscode/graalvm/images/NativeImageExecutableLocations.png b/docs/tools/vscode/graalvm/images/NativeImageExecutableLocations.png
new file mode 100644
index 0000000000000000000000000000000000000000..e92439ccf895b92ede02d948d6ea9a8ba645ee85
GIT binary patch
literal 145084
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/graalvm/images/ni_debugging.png b/docs/tools/vscode/graalvm/images/ni_debugging.png
new file mode 100644
index 0000000000000000000000000000000000000000..50081069b88e39c4999a6b56255de13f77e849f9
GIT binary patch
literal 166648
zcmeFYWl&vBw=PP6Kp<FxdvJGm3-0dj?ry;yf(3VX3+^7=-GaNjt}}V}_w9Y|tvXd_
z|F}PH)#k@yuGKxedyMWL;~7tn4wI7+g@?t01p@<v7Z>}k00ssLJVTIwf&zXKF$K>8
z{zZ5wsW~a=yMD8Cur)EaGXCb|ZfE?>*v;Go49sm=IeHDgm;O`WMoKOb4j&Y^3<`+?
z>%l|6%Pi|gul+YC{=sL?Ll!*@^@y9Z=$;nmrD0+;*y<mmG}^1m&FM;>_xZJv_i&50
zQ*el>9#5EPn`5pU1=G878N;xtnnYG@(;!+~HTkD>$#GD}B=m~~4eG1HLMIp)>?d<z
zSZdNzoQAg6wE9N22FA2*)^@;n!N9or-0buXEsdSN85o<I+wc&cw{{YKGdJQPRArH-
zm$nl!HZvFVa4=T%kWn)9ur%Z_BIM(R<#yu)8n8BY(*NdWZDr%g>Bd9&PrIDJ^ZU<q
zgx~(D;$+D~s3tA<O~}^4_!~1VGc7%hu$#FHBOx#BH*N<b6HbNiBL8Xv_{KwM=Hz6@
zNk`}E>PqX%L~H9{O2@##!9hpQNXN)X1Js~#bhmNRccZa!BzkY+Kic?i>}cp<Zs%lf
zYxC{BO??AfXD1#)LZJNHzZ!p^g8yvY#_?ZD0MtSEUP8w}OHcQ|S9dZu`9D;DFZr+P
z?=N%8nY$TVseL!MHnwpDhQLF}K+nYdPiy~Gtp2|hv(vNxQ~KT%r?|Dgsj;fLk(1f~
z_TGP$h#8xkngO!>Ki-jbFgFIY@GdX#5+U8YF6sWIOki&4{&RBPHT3`e-~V*--_r5_
zsOx{!_21IKf2;EUtgio2*MCa`|E<dZv%3EOr7qb2f_KI?0H$*Vz}uAjVKV^yARPt8
zl|BJ~UZ0FY!N9(OiGLSRa$7!Gb9GZve(JhBzqwf#BO)g7lPhQpT+fHi4b5I8ue5eW
zU8pa2J`Jw~XHESSu8=QwF8%e}EHgL({PZ(%O3LWyc?`dl*pF(+d+4^T{S-2K*S%H8
z2@WR53C{@*)u|lG1XO}RB*9PreDG5UfBW~BP)TCB|N4UUmHgk82)@HRyW9Ut@JGr;
zz{XyqNz^Ty(>Omb2<bOyen_7!d#~3wCa0njE|>$xpCdQ>=z7}ONSQId7hR@^DgQ07
zsbUu4s}>&re>BK;{vx@```*`2eA<6TF_pisyERYh2Tl<9A_nvRQ)rsY8_B*=BVIj<
zAJUc!B9vN%ip^z-{XfHQ?0ZZWlxeZ~%$Upn$zBtrCl0Ckk2s;nj@m@9ZSC#(eSNqD
zTwJ2Cn+OWr_RT2%{|r%?9ptv*+*#zIR1`_yggP_}K@bSm<HAi6^pDt6Kl0yn#RyjQ
zjgI{OQ*;ZlZ2tdH6)-H8|CfS_MFS!_(P^>NorJWqemrj&OyveqYyAF+NEWnqxvO6`
z%lKzJR#aOn<?N)-jSKgzadOb&?qq4YIOw1DAz|OBqQ@cOVEg(nWluhsF`Ho>{Iz6e
z%lut=n&<WM$QSCQ%F0NU3bIGl@ma+p!~^*oUuWi2$oS*3wVr6gd4|QTd!>(O-a$UK
ze7)XPlmfkcyUXcjUkRc=C`o!eUdu5%D|V2dT9^uu_2zc(nhRUMb8&LC+p$qa<h{7u
zllL6Mtq(7ak4L7ZrM<HM(nupJDoOzf2wER_@uyK!4Ri$Nq=4aSlilU$gw7dtC^lOr
z|NHo4)<_5?HO3<=@%Yz;Al(Az#EO$|>UpPc*jdZ6=hb!xV$$W(j*71Z8N=2k-NR)&
zL(@yrt9_BaZQa$NtXpyYsd0Dsp;zM-vdCj`Wvrmkp!HVI=IIHCT{4d0%qpKwj(M-*
z##@i+eb67WLYbd`-A$ruNb1QWQ_g+<>{R2##Z%D}lf|Rbr#ABX1mh*5S7Sc1>EPHG
zL4Hnvb8y)wAj5@67?v+RJl*Pcg0|l7H1vov-5Y&AIJpE_f+dLL=?^DRJUl*X-#U9g
z-Q*aL{PLB^R4Q%Rz;s=6M$Z$8ii<g}xH^=ll&4Jel~`$-c3kjA_<J~%K%r<ujt{Ir
z8#eXy#g-uH=Lx+B{Jow5x@5hyU@i+-ZF+*Y1_fm{COI%YmO~248Ui;9;@7NC?VD2{
zVWqJ}qF}n!OhjX*ATCPd)6t?D{BG)feKyTm*g6y|gfNib9>F2J-bUh!planXTH`n(
z?qUrSp?t23FX3)`+>Ab6^QQD)XI1P^Rz~4aG8@wH{;8t!F+6;xyS{7ewELzke2rIe
z*#-gS)?}H{ywKqz)@MY$S@Jn3y`&aQf|G-DN_j36e2TS5@+UG>0L13$E9hn$lg$Q)
z$#mRkAQF@N<)Swdg8|$ZbmWyRMY^@MMNUa+5$7$P$(^Fp?lI^2mJ@<U$jp3`dXCRz
z0#~8gSb4qrc)icz{p1v%DC*|M9#1CwD+VNe^oQ@V51GyQMtq@C8<X8mFJu4Z<;CqF
zC**C`(5g5JmLRYR_mJae8``Ub=GHeES~Pe}V>l)vGbgX&s`i@zbf#8yf-zlGpE%_)
zWqU@UoU+u*^Ps*PH0PbA^lX_={tL=TNiT`oTg1*P;o!_5fuHck4*g-35XPDX{Ki0<
zg)?5uRSc>n82Q@s2gG()sL8MFZ$$G^(CmZ$WLbuZ?&MXS3@Ht~(PkqKp?pn&OLeY4
z&FjIj1cS$RhG2NiH%~tWiI>0KkGw#VGYhQVZz6JU9f1W=;Ak+!OsHfDZt&|kZz`(S
zx=@0J@Op+WG%8J7EN*i%<dD&{Ib%%A)|@^!d$oeR0tPLpx%#{72)Hk=lo;Q5v+|)t
zJ~Y8UaN)}wM>PhZ8S2AA`@Ezt9m^WFU{Ex@G$A^_{*;9xySz_{fblrA%xriK8`RMh
zibX|9wHeiTA#AwL`g=>0_#5w*I40&)>a#8GQ-azr-$zVKWQj^0KJU!EThW%y^P_MT
z%lvN)sXV3$zmHcDKoNs4BdalL_H7uGlg4{R++0l@l^Vze&JBJ&1w@E^9EpC~f_8JM
z<W!@ZCk<7P3q3^1U<<7Smq{hAGpt?k6>m7LXujj=H2d`0zsNL2MWqS~l(Y*<xHu`v
zX;@gMM2q~BA0rMg&t4-fWBX*u=C9YnBv&NZ8|-nxDtR(@-+rZ(yLm(G+dg+ih5NX`
z#}L!&_Zw9xgGtZ?oYwaxXz`4npv*^`gfrjuFHW~wYW6rC5@VL5H{KeHCF$Yd)SFRJ
zQH=8p=0H4)4KsmZfpgyHw8s#^W_%6mNY-VuYCj{Yt*bLUUvDQSBg>mP{Pg*=;m)7f
zm#Y!Fo!wpghl@>8n(k;^E(Il}?^;@`x4tQ5$G#b+rl#>388n?vjdIn0O$y57$lnsY
zwQaFc1wYwyIT-e&&v7T;5h8E!i6x%ft-n~I5w${YT2OEA)S6;|24vvar;lS1-JDH)
z3EL8l2Ca?HG^=X$e0gED+1_d{a0lvP`bL(5hqvl*)Shg0+<ZSbM{yR>?k=d$TxwpR
z>e4Y^UG!duR{hSMtlzr)sC!v$fjN_@D-fnMFO7f#hE^8#!opz1w<8)tVGWas73O+R
zjNqLmC4YE(^YaCRy^UueFRRY;{v$X(#`oEaOzQBBSJC}Rw**-{p9r2rw5~uHzAmxl
zWj1$xA8wH@qf+oOd7p<1_MjywoaOb2@=lrUO`@6?PgR2GwXDrsbL&vu7Z}|W*^jEK
zQYnc@kSdA@&-*@o;X4wk!o0)Rh&*Et@v?R7%|2u^KbwB0(7j6Jpwg$<oxHi~WX=a~
zZ?sPoF$hB<c&3|Xg2)DvboK1Lgxl{mrJGOEUwMSj+s4a_WUgO|TAN>#gUD3qp9@Ix
z(Mw_4?=jyV7m<l^e8TG0ncY^$T6H{3Imn`kbCZ{28xW2cH7x{I8o2aZjC^>tA~mzn
zANGj^a8jSK&hclajxSA9I4vnDm_WVay@|)8Q(PE){S50_kGK@6zgDk%s6|{kMw9Av
zcf|aVUo&6G;xn6)HnLJ=3+MV$qORSntx1C(7<Mkvlb?1V5hh-u9q0K;+g@OW5?ddx
zvhd@TvU3+4@fk_7JzBzg96!;Gw;;|%)43gHI5r`sbzd`Okr7>TsN~Nfz_?9s=U{&C
zquDFNErEypY-Pq^fE5pcz~H&=BVpTA|2%p7HuXKYKEEJ>jF$)Efr12PVI1*#E7FHq
z(WnM=Jn=xu`MGMZV=<@j*qiBs$MI*BrGd@%55Lqd5jybF>=cy%tX^e*E}Ou{t9-^=
zwy((6pUxP6Uf7w&MXTy|FL1VOn@O2$Bi1BX;F|lW67xXa6&TE+O~Yk7+xMn={?H!0
zu3l_<TM#v7#wsZ;&d$yCKR7U3uD1+{i9vLCcjtb4*tS}%_8T3QLV^9L-Re>xoyKa$
zj5R$ovsA4wl<^xJ92|qu=#%AqIRP76<9dfo2B$Ev*M>$$h{(u_eE#+gg)tZo=$V>|
zy1R4K)YPPNyVsg{Dk-7J%gd`#qwS5QiH0EHnoZ??EK{vA0X%PCU*FH4Kf(AT&}c%#
z!vV-7T&zUd;(9JK@{2~E9EF&a^y>M%)39Ery(Sum<10W!I&tC}8yoix4kDwV1Qr#M
zK?V5nc;4CFov3Gfz={BlN1`CEyqvnhb|YFx7uRR*(CNE~$XB4QU`}><dE|yKC?g>O
z1x%yfLbymKqq@GHgo!C05EU4qe3ex&9Hu`2fq*vr{lRnd@`nEW0V^%i|Ni~Eo~>=n
zkdeVq97*z+NsIHb$omM(=F+)bqrIQ+^qH~BAbvJ9+#Jq?WM_Y)M*A!pjYGi7istF*
zNk~L=d3~K%TN{_0j1d<X_v1(&9q6!seI2h|XJUd66xpqp?Rvf*7!;H<W%g%u)ado;
z7XH^^Ul{TSF<DvD)8+cb<>jxKm|>lre1N!3P3#7ShS*-`50~5auC9YdjP`)^F6Zmo
ziXj991l*51@nGdz&9!?Ev^=gCe+3ZmdA;U5t}ZUVQBsx``ZQWCDJZJMlS=nYO~uB=
zeRVlq?ti?7haRM}&66m&3U@~O`c-hF!&|+<O1=FF4KRUalT-I4zVs^1VMA-3#2*n~
zGGOV!#s)ek+I)W-%#<m*9aV>oGx7c%o8TpOon@X!_dxo(*<TVv>M(KlwXKzJ%=El%
zr2Igrt-8Hh-m?KKnqfb-1OuJgXlg;FkheWTCyVAU%v^42m)`?2_{XH=2~&riSFLGL
z*KEU1mGA9GBPk?P>746L`0mDwa!|iZcP_9)rqXV#Rx$?uw1yxZHYA;XOd23drpJ;_
zmijd^aWDnA{XOXvVp0_llj*qxg3N*Bpq}lb@iz-M#Mzqb2P<c(TQR=~vfY*l+>^*U
zik+S0A?>>0MTV+r%2k-SYwR<zWU1tGuyHs{?ToYZThS>9%!vK1jYlRCg!8W2hYj-s
zkA|8Tl+U~me$}p7e}@E2A0B#)qqy&J$Y}2<5a?D!rZ2)EpAWtr!wzaocAs~~-}Iq)
zGysmt2cp9BcQ1)KvM4O>0Y@9t(W1Lo>n^j0-q^G@9N_gcz-QB?ItCJ5^D<A;2_4F(
z%9p%@35afthzsKlt7}ax!I6s|rv%Hs&FB@-?-I}9?+eabg&MBvdS5P3HcfhA2nk&+
zvRdMK#!LSQUR5xZE`y82k{JmXda<11Re)0&r_mf(FJ?QK8VW!)SFdM`ABldHw0|8D
zlG?x0^K0Q0n`Dgb*TpyU|Mr2Lc`OVIPiBej+Wq)?CY_EId^6Iw7+1V5YuEakr|s?J
z^*7fY2bqsY?BK%FWNj~fA@_1jQ&b3tZBwQ_>xW41ZB&s1*2{UxGO;=hKQPkQXVfRE
z`-^!=zMm%bxs!p{lbyQxvb&UTx68{QX?npNesA3P6z1?UXjGK39vH{z_*yE&NXoAY
z)Ns~w2=~aIe;RdQe<vzvXh={Lq^~-IEj;Ijn%M|xC^$c}qzqHcAJ_a!%u!ljL{+NS
zkOnLPXGXNYzrV*yE3jL|#6G35TIV)3VPIpYajx+2@L+Pg(Q7tXnbV7b*=_cGgoTBD
zH*F(HbXA9e+PMqI>YYA3ySuy0w(IF{ug~$neu;>SJ9B#h<}RJnxwQNDL<Uz#XQ!`p
zHo!q-7ZR=4TdIOXKs??q=*pKU0od8Ur>7@%L5IO;Z@YIqgNwuWjr+@&FE=Mk@idwZ
zKNAy$%Ty{3HahuAN=g8WB9qSE9ZMuCS2hQS$DMq()>`NN>;e`Hj~(1^px+;k3V`rn
z1Y8X!NWO31e*F0(#%i_5FCg#%0vaJ-wMxforJ>@?JX9tmDG8nL<pM&bEOByDP9zee
z8!#_YK)tb479t*=48Q;Z_LDR|4CnwE2WJ#8$P8FfH>WE}fQWVGGo)ZZC*gpZ1A0_a
ze!Z+<bUKiekdRPou)^f!<$WJodOFUH2hZ#Cz3KJdSbkB__RdaVx865;`kxmUb}AJb
z!hq#>adA<lo{@a4SEFVzHl)W;t1<Y9fPesp#T;5%N(qQ6f8NgJdY0eThC@b11`Ja`
zMFlMk-4}8qlLs)Xnx(!)V<vzy0UxDzxz#_{{TA`us=%|fxJd7DV<wZyJv3jT2^iml
zTaWbgQfO<N<=-#?-TW&J)|kK)0w$ivq^?;94=`weoozS3P5AXIE;BQF$mpG$s3^<N
zhvW_j{Zvh|`A2=r;R81YM+bi5F=&8l#E>4$RM$NMueDQu8p(Ga1gV$L&XyP%3C_sK
zYxqhebTGpM*?@0x(@_x&+2L(OIbVf#wVg>;!p#{Hg8wGr4;gisw2^KUwe#i@_pn_+
zZk2I)x--9632_>7+eLRzz9N&Lnzd@RGQjct2}<};+m#k)C3-t?qGNY3kxIS!$}kve
zQA<m19GOn_V-QC(ybM|KOp}zyjj;+dR;$R#)JM9Ik(n_9vX$`m<GCs`tci-PI^iO7
z(4thZ$MI2u_@8RihlAGsmnH`ist(Tt`V6$$s8$C{8qPlr$P&xK&VqR`d9tRWU++&y
z29Nxc0uTnze0PhSkJTD&a4kEM#Xe_1RMIXq-udg;f=AuO^grErL~77ze9XSgJ0EpT
zetwMs97|k~?`d>zKMN^}PGwWv;1Zl;fOYrW1YU+J-@0baFX!X=8kf0exa*qk^?E;!
zHdIr!$6W<lC!f&6*EHQomSS@TJ*@ZuWVM@J6NM2Fy6z_|W|w6yLjs|)lsHahbCL<A
zpdkyA3AK-~!Wn=0YnqQJ^I*P_bAKAFRr-28`XhEW0Yzdh4f)J72%(cAt5$)E(=~*Y
zr@X`anbCTgxllSy1i%=J9p0V+s**&6grU*VdoPdIz*@Pw27RJ#X=<{&UvsT9oxq!(
zo~~@^L?)B@nUo}|q@?u9U%vFdSrQWy0pOt^FYlMOg1=FP7V)ueX;lxJhJ+-jtE(%O
z;6Ok?AU{7pTaMgpp%Qm$Y6=AvH8v|t*1&)eD2bxX3J-@J9vR^P)~d5zZT64pX@zJ!
zo^Y9>-le7HmX3%B3Oc%?{QSU&2e;L=wGVcVj=d8TF}PeVa%yT~>gwtlVB&xTp)oOJ
zL_~Qee5xaw_Vx@UBqTT-4uJqPBP1j|+NsaY%{9>uW3^sJ!o`(#abXP#3OZSDPy6{3
z$;#T=9%yo5A?b9bQBh8gUtAmpc-zg>bNlpk3{Vp}9o_!PQr*tp-d7Ba(0+rQ(o$G9
zHa2QBNoj0)47lRCqtq?|{msOxK&?`~vbpfIG;F|r819c}prE72r=$!4hRSTFP&(jz
zY+|Aa0FfsrRsck_9LDIfsApYdwKzYwxJALjk^oErpq+$-1UWgmAKiMzb?3FUi~t;o
z%*fD|Zr44#V)dx!{4+G94{Um8f97{Kg#{{l)ZLHGW%=r$ab@Xsg-z;w4(_ARgFEFP
zjx_bUzd3V1yO*>+>vU(r=POE>h~EZ%xZH1|K!#H8@Nsg>r}@BZadRo&SINFnd{1$5
zZlE?{LXN}ZW-Ol+F=1gZXI6uNBRE-gJp?XgHfgaLW6T_-7kETQXFilqM)oCvJ7iyX
zT_CtS>6!N_(gzGBR?(z?ZUou0$)x&kc!p>Em&sWT+3Fmp_KPc(Y}xiZq?F%Lj*pcy
zA>6F>9CF_M@|zrSWLXCihcAt8R^DHC?}Xe8FB8geT-#?%5Nvq54P|eMN=3i8a`e^d
zxzhd>lS%ROZwGDG+`BjmEm+dF9>L7!@1s0oOx!77_jZDMQnw!$oj_cUI=?$H`X=)R
z@m1+a^3{(D<ka#9f7WCsWu}Y96@1BfiRkv1pTRR|vEWFffxyI%9nE#u6k}r1{@G<A
zVSFDPe-qjk(#iAHfA6nV=Ib5?RR>Sc%nYwV17XDL=RLa~JrccHOE0@B=#-%$V%rVb
z)JqT5Q!&%q&ceE<+WlW|j+~OmI~1|Pblk(apu>f*uy$0^7VRf+Hq~18s-NGf^y<G_
z?ThG*fd`uyj6|u*NUWr*(4@;R{?;EQ@^uP#I`{;OXyCh-5-b?NZq_ZQF`qArij3TQ
zI8(%c0jJtlTQX$^0P%vRrl#)Gx3@R)#Njd*B+Hc=Lug=gmN$mx064$h^L}7$4L73S
zU!~0YM(bL#JL<;|FgPd(tf=6~NVwk`G{8f50Q7<r8Y*l*swj_^xUw=T;0N}8)sV)Q
zkj8+mwYri~Q^RG*ge+NAVoIC=j%&&+zr1|Yqpq=WaATuWCPcSHDOaVeYRQk9oV@E6
zRzM?4Bp@nEI)k(I#ulJMPfkwgQ>1Q#+g4Uq^5n>m%5SRV$k_qMZc>+0Z@DmCXDYkg
zXge_!PZkyy22jpvfcu$hb+vuEITUhoa>_$X0Y3Z8m=$z%bjV`h*P<_`ZvZKNq;ipI
zr6Sn#RI11(iBxLcYIYgrmX?;Tho*uG5sX>@0(up%oCN0OWf?`q3uQD}b^r40M3rOZ
zT-Rt%qnT?F5tob}3^s$WJ5$18d=ETRRZ3R172B=it)LP$#=HKf`EZa_WO=4X^?{|E
zTWTcbLp;Ps4eob*&4+JQHY}#?@M9YqyE8k-@Lu0(wxIUu7I7*0c2F5{u+`*Z{Kf{(
zqCWW%a|uPA>nlq&i}>?xQ;UinVa<<GaENv5=V_jAX;NHt%pakc(PiaWusoUPk9=+m
z#;?y;WaxKGV7NI5vvdu{4QuZO^J2EW@?z$`yNG-V7tqF>_rb@$wzeZlguq5%y0o1;
zq>Z5HF<sn_g#BZ<(6$|Q5V>D_n<nf8da%8j+*4+=vA&Ihk2ITHw49u6X4X~$H95-6
zQ=Lx-ST1qh!e=I{2&>;%A^g&?NbDxgY-<f<2^r5@X!&ccI~vxPR`Za8X1z9QD78A?
z?cW{gex;+(u__SE85+&Y`KNUecfBFa(eP|PY!F$kjUd`807})CW{GS<!KmG#TJLlr
z0)xexGoGgP!DAhbQCj+y<frhc>}U3!^(@tm>jLJ=mN}G6wc)f0+KTJpbi+XowkD2F
zpG%5PbPbzlx&%d3W8y_~vjS!R;a^4VO2inWW(gL8PQJ6gH93(Rlw+z=gQVo?CgGpI
zS1k!B4B_AIPq`EK`uCbwaz)_DEwT~)q04Y2QCVHN$!?Y=c%FvS!lE`l--@Vm<Oo88
zrW|nql^Igf(RCV-HMs2mF=E_2IRQM@^UhE_5KoIlVF7rKs&Z+Q5d-dIwK@I+1k|j0
zpiS404=j!g6)IFfFj%@|!kSjqqL$uoKtMqe27oXFdJHicnE{J>;DH`1%4(@LXm%D`
zGvh(R5(^R<8u`nY?o#D4fEEV)k^kN43dGzD1+WV_Gb+bXk5bR8rWFAH%5L|!%Xxor
zYU(oF*_1J*xV*ev(KM;jKPe$WuU=!yjG5(FV0JtPz_{K1AK{^*0rF10-Gc?#AMXen
zaGYD)+u~AE#0(6v0K9}kz!9^tvB}^v0muZvU1fC1s;gsaR5ZxorDtSN&{Xh+9Zk1<
zl1!rQ*Q1|p9`OS<I=Y-ial2MoW-6QQda*;J8ucxjtd&{TLMd?GgVgv{SETKNd2O6#
zGYZvtLH+7{5?a^$D-1_Lde}ra`!Wn!n&5l|d)ExeC$`ad!gO69Im5JVcy0KVyORSV
zv}qHE!U@;St6LR)fw&j}u1_{A+@M<!jYfgq`bZV0qFQWDTOeMVXVUF?a<l*K2J0k<
z<&pV$eR*gqV8L}E;E&&Fb>`|QU5FyUGZecMTj}<8gX?<0o&TV8q={fnC;OXopUejG
z&div^r3(s6HjW5WzTN6?-ne|kp20jw>!#Z%C#Bnh;eC4(Re8O^A9zHGk5%+0OznIn
zT37oSInjjv==SEt>w9k-X>;nOJ*ZV}ipfXH?r`6^M-RGQaBEUU`sm5GpHa1afq74O
zz31Dr;i<87JC#NqPG`Fs=5mJ6p^YK5)ZdD)#>jSgIz0m^<rPoDS7EUGf*FXKK_+Ai
ziN$`_^>hzWpDI&h@5-sM!0l4Sp@m%Cqy*)+T{fckwqM2IXoqnpz1SsjN4?kD%Q?{T
z#==*j(VvUnYA`k`9D`bRi1L~5Ax^PWVD#yPYp?zJll2-3%O#HF9_6~bCvLwr-ey$u
z27~YVej9f^-`ldKRBN%A;i)Ozbrr~}14h7KauxID;XC+vrO{i5)(ONjy@!)3H_F_K
zhjiw^j?SCfv`QWQa(sx%O=r_7t7*wjM9*~U7aXj_UoI{UziX#vSK)J3)dqa8ZdKKd
z=l!zn_{z~`><R1gJ>dN#VjM$a9M_M8%FyOcwTc{x+Rn*IrLlx{HymWF)`nB2H8wb1
zI-CyJLUUp>Y@c!l2M1@`Jzaq#j%vWCjEt0x-@P+Vzkf3Wq1=42JQxt|0YTG3Goxq8
zb%9EmWhK@^Abdo)*?JoX5Fr5=jcrjrA|ir_ojtj_x|-8fMNCXATQmlb*>WC^i;Ih!
zhbPU+Y@?u!93|XiFcZM7`uYR_bG5j#vc0(}zaQ@I<;88i{F{K77!shKfL&p^*Uv@_
ze1nFD1_IJgu&|{mc^f|g4hi6}f*TvzDl03$3k$z9NR(7mLt|qkWMm<LefWEJ799`(
z0qiyaCdL8a7WDS|jw%7t3Lih~2w$n-tFEptGZwr@dnN#Pt*opp*2|{MEDDLt=&)f-
z>NO}RC<vIDQGjlNF%L~lkWo=Z_`E&=hAA>D3qOO?*}@JNHb_uju_GzTUS9so`uciP
zbMxlWQFulMZhwD&@tlRmZ!^EVJR;ycQnjLJXUFK|^z?8l4_Zb>20#jb|Jr%acwt%O
zsg^<5+S&#q;=l1V3k3kD#m6rd3oS@Ecv51aTpDi}7gqeD2aCQJOI6PtF4U=6rXJPT
z88K?Aa{WQ56Aat!kjuOvo|Q(r{l|u(HqgoE@)3)03e)Jw$G=pWax{j^vwR|mN>%Fg
z8Nz!Zk574*4xW8wbLJzz^rOzi-90_$JjbuQ{ceu*129pC!xg4ga5^gGA-7}-yZblr
zp$!RwJnTN7jrUH-^xLdazcq8d`li;MoTOXst@(D<wQ+Yx3x$k29c%@OD2|V_=@`2|
zf~|YmQjf!Om79}w@*0->I~U;3J<Q<VJ)N89rTwsNY-&wSbB#={Movyv08zlHlUs4(
zk3@&~STk?T&LgU{9TjH0j6sHJ5OrsHbcK5Uv_-v+SF!n&FLU?Dl|?sl^s+gRxqi3^
zGFmdLK}F}xG#*b@Amkt<CEW|p7+ZGbkt<PR`HZ!^vI4{pT>ytLy5_neZDT{rz`y`Z
z%vtL>uY!WYkv2gVw>u*M@tuPsR)FB#e3}@bA*CH07&|&T0NNEeHuRsf5UyINbKI9<
zWMZ;+a4?w67I1TO1M&j~QdulN!N8O>A9s@&4nztRD9n|6A<pjbu(LOr)W40Tu`OWZ
z+M5f5NF;yFa{2r)pDC;{8N;frEk(!9U@(LN7-UjltpZ$#prGKSMLh-_6wt*|n>!P~
zH1yQWO#IcA1F${;u}Tk-8g1560UxyutUiFOASEqary&M7pcHz2@RXDkmO~s~ucpE?
ziv=O+{FklpXMKHrz;6Pq%^<*wSc<SNE-g(J$>Ias8X#zZ*s#{~-sXKZ0+3Q#F1xrm
z6qQN^V7&(qrt$z8dyE)kGc(75W2Os$_qE;V0O(sFniK%GCZMa^Wko%`Z?Unlz@Cjy
zOza2LU~%>L{5)pLjF^@-nn*Ny*0T!O0|2$tx3YqrC?RZYOafSd-NhP1U{LQq5O`l%
zS^3?QJMNE9H9MLDs53^Pq&$VxzTV^N>M9ptlK~~`v8FAxy3zrWp;R)xABW=}^FwoS
zMGmWmj*d@1XOq)HK!IeEg1R~dUy9(TOTL6z(C2jDw)5~6Nr`ZPd_Ta!wYOmXxzL#z
zbjlW=a;K<~!GDwG!F!AzY3l=Pik)nbJ^2y&#NCexGb(MbaAs-M-r1+u4?Jng`+#XN
zW%z-q&nHXFr)2aNDQYggrmC~&;qI&nn5fT8>>c}L9giktDf1v}t`?W<Y)-XFgGF7p
zYGWL}aXzt#P9OfFc95RTu235vacmMVm-M-4(IkZ>Nfvdhvp=Nt7xJbPODGnVR1c0?
zJ|ejbAg5($@J7~-0?f|*L#KXkFtAcmIX?^Pj1=$-oFe>_l=3#p?-!jp;X5+8?e!-{
zd!UT&t!qeP1Vk-2nQ+#}-wj_SFZbJoP7`5Sf0#B2*utFeK$whHv-n)afY5l`YJFYp
zm2c#b5HI76L>B_nl1)y_D|my~J7eSQ!Ncb1+Xw#j%|vQ$xOuACu@q~*c&o&&-HL3}
ziA*59AV;BuoR-!Epw$;piT}wz0YQuSfFAUpymE_EzLME!vvKG0hpxzPi=eD_q`G|X
z9#i)G(9S1<qE@3u?fj;59tz~c058f{)F>j-`hqd${zWTDFroXu$k&NF))>8z$!eqt
zZ1N_#1qs3m{6`K;>fcJ}cXq#Zd5im>R2som^Z#?U3sBNz6U>Szhl=68cCKhFV(93V
zgOdHP+?W@>_k^83T%w|WyMK~K1VcqaFU+)58R$$ZQ0A@0z&~!a9LmrLxmu*4^jViT
zH9h<qu9~x`xWB&&iI1;SD*vaUCL1WBU0m1ET9N<Dq?><r{|U%Sf<Xc3149cdD-;Dd
zKr9*+%e4@|8*rsU!U90A0<9O%(4w;%TS6$uUVnAN#9seQO+y#WQSL8)(q^9e)ge{7
z<}+;s^y2JNr3?J_Mpj$z6#8<m`S%t|X-}VrTg7nJvC3=mbgoFWs6S=Hyb0(ahVWLN
zR9g10tWG$(>nr|$$GzR!B0OL5za+B7@H~S}tQEALF)L4hw>^Q@+8^;o_ME(IX!VVa
zn_P!*s|<k#)5!?F*d5J;WDyv~I+uBQevE~?dH~_^E6q5remB`bekk&ifpWDLewk)t
zzwJGSJ45lGvjQ&@<^_06d+7KTB3M9RHiz(vLgN^Mwl_6fk7u)*A@LS!vA;b{=%601
zF{Vd{$Cx%3>VTV`;Z$n~(#ReB`|p$EQ_(%;0|l0>{S1cFk_W%%^gkAOvuF9xBg9nL
z8!;0O(r)Gi?i5@(>&$4uE0wl|Srw4Fc$3Olx6I7P`NPsLctrK5Pdqt4SC27jnWi2(
zPk#Xkzb>{+lFkNLvB=Fm$haMU2sqIF+M6yE1hS18>tFf20n0-9jqdW(23nd}=QuM;
z6XVXCO!1xdeq-d(#CK&K@QC?LGO}~fGwL;E^!bYDM|C!kqe1=Eqa(8W%O*5njz*tt
z2r347LZ$~`f+QedF%wAwkz9A&gMpkdLFUn=mDtZ^=#2XIlt~*r3$BwG>*nskhjnOI
zSs6p=H06Ctb;?3NTv07~ALEjuRdhsKloO7qhN!4Xs;d1}3`6L@xuP=xN4OHt5*dVC
zEe($Qt5YbcrO!o{coLrd?k+%*L%mSEGielxw_+iMjRo223^HGm=02yNaF*yv%GU82
zJ(W@e^S%9`<n>@l^qiKAfdN`jW0(DL-3&*n^^@Y=+-PqQK)(ZLikJ6yT?+CFJf%P`
zSs$*X$osmb9MoZQ*Vkj%Xm5{HDnq@{JJ8J{y_rlJ<v1DtGn99*+=Ci5^nIY?(X06o
zC%e1#SdA3UEFvocTv48z&*u`^-UIcmeSpzLPt(gf=fw+rMWw>PS47x(u&W*SKJrwy
zI*F$+&g$w`0?V1=4HoyWQ0H48L3V#~PLlI5E(T8%3+>(Ri|Hmb<k2WG9$!~^%tCEh
zS9qcpn$IOs_Fgwblx!nwl&h)ELDBa9{e9eY=xXVz(7{sqk5ej%vJh3it?{dv1|-Fg
zceqg3##LWU#(2cs<+$D$YiV*=VI!5BsdaxR^6b7zdFPYyXgmFg4JcE+u=WqSaQUD%
zak5#Cx%`2);^{&hTQeP1gi&^o(N&o{#YB}9WQ-BL;$vdtj|*{z-}iuaXC|l5f{xT~
z&$f|C-jXb7oWY#PiTD(C(49=LdIC0Te4<(ZOL$0Cc95wJdnP30i-l!QF?q-sw(GTK
z_?MNRHf@}gD6-h7SV1YHj_NyHo=8UqA<J4_Z}ltc$#TKq*vp8a1`eKxT2|TgOwqQ#
z@ON*F0|;@j$jh{YRJeOvFAx4A3F6MG!JCh!v_|CK2|Y+Au+dsn?`7;H+8Wk091i_{
z6L{b#u0b=sye>UG8D-3yb*Fc;!aqZ>>yxo2-dz;fvtbtv^G1r1J{4CLWhw4X1`T>*
z4Uh0rk<a2u`B=clTOW1k_`z3rh+dk>+G@?3z%nVSwcLS;Mt~{(KH!Mtz#YS=i@6%O
zw~snwU*L72&zs;L?(B>q(nTL0P0<dkmd|5IvbQ@%=!l|eQ6tlLTP6o%;wULnZy^m<
z^r&p9V0}gic>Jx3S2Y?%f{v|md)A+j>El)^kcHKYJrZ|;L7(2~;vkZzk~1N-GqO9C
zUIHGp9P5L8UX%vo5N)%0DwNswq(r~Mr!iPLJWx+EE0^q%+s&F=i}=?MhUaiM2PzUr
zz44bVGTcF%kh_}^8E4CpTv|lvdUMFf8eubk&g<z#dN1o)wJ~>U&5Vh)?KO24Pl#tK
zfz#<<s-}=NuMr#Mcy9QLG@cL7%Th{b0#bM@QJI;X^hq__Ni5WoQ_Q8fx|$GqRHc!6
z47#hNM1XY{1pg@bX{v8HZtD-`au7WoNy(B43N4NKVVtOe0xwN4w+y;A9LU|0s+p9G
z`&1HaQh0Ubw>%zk<x@0C7>St{%fT%g4&m8;tUg}48gCK_rV04d+Q>r*GWpYm=N24q
zWGW*T=$h-neoj1mHq+^tE%0xeos@($)AFOG_~I*146V$LzYu*@`xD0JtY-e!1w(R6
zfA3Wm(s0`5XLr&<`=ldpjrweLldsStV9!*0>ErF^J+GrCCRTrXausr!HRW5_r&sgR
zN$_b*7y1bhB(%Z21<OL;4!QRta6ftv=<DcaO4UTMA<E#5j=s6K)z;tr0YmM;<CLk?
z8AuPLY~zIcdz+JSh|w99r<^_eI47Yf-k1F*<s`YgCc9ui{<p9A@E+;R?bb<#^E>@(
zCK^gPC~;8c;PQ|;G-*)O;Vr^C-NkO87inUo&XB?mX8W9}#c=6&9GM~2#W_!UBXpyw
zWslGB%8ikR8%5o|4Qcam*oS!0%f25{Cf0x2P1H-YX-|D|nPd`jC(Wy|5`J6m1(Vuy
zG0mG8K+T?gX=7iFS|k~9CmWH7_|WTaZiF4}?HRY%`@}Tq7OKiCk+aGhnj-6D_;Lt`
zwzssouQ41KGhfp>9gJWoa=G*O7tR}Rm<;@m@Fw_tDfh2Y&B3$U<tkbJnL;wzd!-t$
zAqAJ+qXPyLNZIJ{zy0UPU`!Oytk+lbtH)gWO(%=a`rau#vmd#>4gMTOuZu4W2+;R-
zdp<+>%~2EKh%oMkA#-_kqITs}d4tcDU^;l{e)-HEsk-{huAjRJ*w8aP&eXcK2^s1p
zR!$O>HF8bfJhC>>LBnD4h%sB;GM8<b@bje#E|pr{Jt)`xh8I?U-743AT{+=#vpYi~
zx=8Nc@;D1oo>?z5h-Gx?@^Q)#NGMT$hULcKYCv|G(sbi&Kx)m#Yh$gUTH9{48(oUp
z3x+fqizW#<Dq-(N)pxQiF$BRtjCa2=k4SF2VKP_2NVPajw0nQz=#1#}PLfHH2tZ(}
zw9dtviUx71l+}AgftM+7K>~p8J%ifJW4=u>ef&^XO%%VuYPc`Q7@Ip{;zBVRGqD6G
zC<D3!LBqi@e24~o(oQwYuH0Ty9WPBKLyY4G4bM}cVbpWV99bFJD|*FSRA^|)&5@aG
zPY~X3mp>-gPaEQNOosJnv0Cg0g^;lP0WzAx_99rOx60YFTM@Su+*fi`oR)@*#%(pT
z%BgyI2fG3{sYFp&(%D^!>(-}XD_MdhvzqLeh-h)!b#@q&@tB2*RvZaZ3i7>tkO(<B
zziDN+*CP2U$y0|Z$r%EKv&IS+!J!&#gGZE2qW8&+?0l4{yl_!*XnxO&E0$d4nifYl
zor;PvXtmQRaAhQ*`30h7Z6_iZB>R0HlyP9LrE7ngORv1ebCgHB43g+60jJ){7$IPr
z{)kxr)wzl8j#ecz6;n++&4NUwoe4pJppB`XM(4-osLwjLa%XvZ!0{P=Kv=NJ<q{hr
z@#p}2XV^U>3V#K-5JRShEGIO_X2I#e%7k;-dS}!x6m;C3xu;b*aRmoFIJ@3gjawDx
z$Kyn|z-I&Qx_BOSlkx;dvklAvo~iVCRv5J^2MPL%O>ypZ!H7i025YIJ*XnteU4~<&
zZ#hpIg9ypAg@w+D##hA+PIgltDARFa?K|3TF=3bL?%{gz%w;T{aRw`!Xg+MCf@^oz
zM}N+q)@x?>$VEp!zv>dM;5W?6Iq`pG;bXh&j<S?Q6Z#OsG<>*u>Mtbcmce>;a_6Lw
zw|sfR13NEDW=~uPp6JQM$y(RjzJbJhsEPYfn+J!Ubflv5yhy#Lbw`Zt)=)vmN=7?b
zlfktwbC&m$5Bwvgt1qV;TFqgIlf;KnQcC&hJJ?e-;WPLuOFNI_uk$CIqetz792iNk
zu)F;s-{JpltckDKJt#wTP6;nowZ#5tzoGP7e_Mbp*X?l_6AR|PWz2KjUTUyGeOAP=
zYfzPQD?GTGd5V}==+IF4Zj*y*i*AZS;$lXg)3&uor(nW@8mD4b5Y@@1l+}_qS6Y)=
zT5RQiQ{QcUaQdsC4f+ZTz2V|>L4+X!-z=7+mEf9Q*SG6GCYiFgB(<i{Z;W|7HJ#=9
z;_JJ9(AZ~32a;2V@SxXG_#c!^q)OSPS%p`fQv00ifm24pj+Z=pl-K=8h{Y_~eC<h{
zuW>HwA(Sbmx}f%X(DqT{T<NhnS-<JSU%qD!)z-4IE7CYh8EfsakQ(Q~&@ydW$u6Vr
z{8HYtf!URU1u7+9NTkZTp2Y?;h7}9G+vko{-xgQcKuWBGKFb4+a<0>e`-|ZoW=gH)
zt0Tn^@JU0;S4P&~eNa;+{d$*AJ8@$~mTSy6VH-@;4;jyR&n&l)GfE>)i?&wJlj^^?
z8QMT;pIh|)fj%?tn;L7wF6-7%?m7yxe5|NGyN_*mef_IFoWq173sX?nNF$&5(Mm_&
zV~H$(b24i${PbbK&E0*f&D{}5i0es1j2>Vk57c$VGr2v>!;z4JC@AH0BNqS|^rng-
zgJ9r-2JOBXbu-@SA;x?xt<Phhi0K^U7r;6FA*=EpKeDn7mc|p6H0Ib9p{mSGx=+19
zIj(5(@R;`)|0t{a@hR7!{OPMy)8>iSb>}>_*58F!bx2|O&9HfyrU%!*kDlOvcyUI)
zY)2KH&y;d}Xg=)QVIw`rA^vTM<g!2Ruw{_YqoBl(SLtNAuU2JiZD|`p0OC$tIMo~b
z$VKR%eq3aRFJ{C~@f^*{?WleHwQsS~#)vetsJMoYHL1XyVIMh3S$HJ6;!@R5&@{r7
z$iwMrmN_mX0Ap?Z3#vq_vzer*G{Q4eDVDaUI1GoG&<fM6uI5_o?9$dEKT>W^?R1ez
z+!0P+wF^QqSdhe$-iu&Xs(7j+l3}ZxmRAORbj#5;?=PEd=@^;cH6TO2g>XOS!gUMI
zRW<fBH#}=MPeN}cawQk1LtKAH6Uxg(IeGJenHgMB{)!o9&Nqd)lwS9Hurq{uh^}sd
zki9K6Bo@lZ#DS6Li@DSO0T@|Nx#E+9Nupv-d}Y-Qm5+-nX2)}DOMy5i8p`<SKO_pi
zm&xb!O9kbeoxYUs!G@PvUEbS+CoCQ$NU#1XU8(RkCV;*_+f5@Pf&A#6M<qejF`4M|
z>Tjp4>?@LSQpG)9M9Jm1)~plRUPLp#|CQZqX_drL9_uoQ7A_2~>vGFfr@+FC>&-U5
zu<&Y(ZG+xomV6)zXFO=T)qOw52j}H3%L(qP&F%Sn*-H})L7%nMd$g09-c!k9cz!Om
zIgh`Tq7zhqfb^^w%y`$KuSRD@*pmJ9l$2rWs3nd5hnkX<tN>}*Vp2}vWW5d!k1zcB
z>?s8|j6|=hJ0WRgs67lWll@1H_4QJUK56#G+HaNg-J(1X>fl!#+EkgH#W$3SFw%Od
zu=pr&N}F*8JkX}-+nx&@$O8n=tCV2x1meU?j_-=9Larob?t_Pw{ka;N9iXr)o+T%o
zu>zk8zyDw#z$XijH~8`eh+;&-6=oQ6a(c64xo4N5=nY3DclYz$f0$-4udM_kCA&t`
zS*{7nWT{3HI)Gg-gJFnsIRBWq+y77*#aa4fuJWbb2A=@A<#Ga@Gq;4%K!K`~V=kAH
zFS<&FgUR~=qXWByUpJxu2^E@M!#%M8lUC8r3Q@O7l)-)Lb+zb&p)$cpr|!f&wPl8f
zS#f#k)%BxA1w;%2-iRv^Dn{9rT8AE!`|Xu`xO*9no6`mT9%5N#fMVJ_1DDD~>@AlX
zYXh0Dy9XuKC`Lql%ImEk6<%v@?5&FCW(kDXE^hx$iJ}`4QP2{_sJe2ynf~Lss95r3
z6rIkYgt`wQz7OtLvxrt4t1<rW@kV+ws|)u=@mPYY|GXAdGJ6x#FWUPX({(<S<kBvU
z^heRju7MD9rXnS}rliCkwz4gX9RqKcrZI`R8l~{_!`_)wm5VWB=lcRr6yTDGK`GQt
zbC}ofzw9Gh&(~cyL)>b{P@_gCEP4e$Pdz6l^&c?M?wAx4s*}{YQX6R88^U&W3Dy@s
z6b=ir+DaAnX^mg$BIt3|QsKAFqL+@Mke=-pC{w6@I!UMlO}Y=rUg!<BINpkor~~l^
zh$J;c^lm3!^+_Nxc2W8`8G9w!#S1lw^J(GWLKhax>w1hW5|b&|ovvMEfdcg1{5Vjs
z<X0>ZT-di}PBdC!k`m|>e8+|Aje^fsb-URuDas>%*fsQFmtWJCYiLVK!jJl9f9Ofg
zC%*=PfOkoZ=z`cK15tQ&oxb|=c?3}hjG4ui?V@hRfRb<Gu4=!UNz;9<74I*OAZRnd
z{CwX()nPc|^B?x#v8Yq~0FO*s)PJ#3S!osEc|B!DQU|IFnUSV{Q}aU>!p9XZ+Ae#%
zC-9Enxs))cRKiLyK{nw({yMA}<4Sxyh)O;7GphiUl~Amt$Epd&@<mAWB3+em!Yj+J
zpMtIaT<xbL?n>VnOPeS*ug{SVknHW7)gD-2%NLZCq?)&$79SrVRK!r6-X>>u3S4vR
zv!?FJvtLNKHkb!!|46}{;(M^8SJXzR_xpTi4)bl=FZ;T!N8F|yub*w(mF}HQ7bZ3<
zZs7~`2n|6KUNxZokxVw-&Busm8VQr<TB8Q_3N=d}oBe3bwCE296DK=X$kGZb&1_`D
zWj}6Vo=8V_6Q^%ZSF_Y1+G@(ck&TIQS0^N3zP^C0tts&f#}6bC2O}CqMn{aMj`B&>
zlZ0N}2ZWt>Hexo$cA!atw5$i8p}1pEbQPmseX{(YQ{*6|tp<|!K=F3<Ak?3ahu)q6
zL+<%}H)h58JHQ@k#ds2~T%REmHQDw+e*OB@Y_1fQO0|-hkT6&Nd}3&*yK+r#wz7lV
z8mH_$7`VVlGZgC2l@|FQS0bB)%2(YX%WC|0`9NC8)EI0w=_ru^@5uSD>w)$ma^#8S
z%Z@mXiLqI}k3r9*Qr~!abznsR&JveVN9vu6-IB?X%ayZKcl?%#&Zj#dJCZa59IcDA
z&kYWS_~#m+z>?Imz9)gK8v(=Jir!4D6?i9ci*-hfCu&dIl#~0ec1KbejbR6)aa*^J
z*VfkD&)e_S?s^fMcCz?Ye+6pL6vYazj^mh56))_H%ZvZ(8sq8{F!MmJdlWXCK9HqZ
zt@i;qw;@l2M`Wd;q%@c-ool;aZw1o9s5)eTVZQUI?+KJNc+|jA1es>TO(Bpt7SS&#
z<eJ!iqfxIBrBU%~ZUnf__#TeGi{*lVX2z_cMCm+cZBli&yxhox{I9qKXvjXTdG=D3
zGI0S8a0!7;O#i-H3HB8ZD3zB68VS{mAI|*Iuy(l2fU%Hk=A-2usX+0s3#&HC)aq1$
zO}p$+q6|L6#88c{LdG3So{qUIH;4~=?L!aqt&=8_aytPpuVYK2+RRBsEgZ8;rPZHJ
zr?GV}mymI>QYxW3@er@3Lv(A+mK4y&ypxK~Y=R17Ih4&b8C?bfoE&Ugs$9-_5t$6#
z$TPn{V9d_v`KdlI=p8wUG&cN0?IwV9?af>fnedN7Op&$Z?v9w#eJXGY<NzInY9_p|
zkX47sU;~HfmjT-%*iX0&VK!{W`Q=a(E<$d9{ic53&*;16_(i`d+S1SQh1FAa7|AP;
z_V@3ytPlpTO+e(eel<JimlrXdan5x{r<-0F)1NwId?6}gv>s+2=<oa^OHpXKr-r_a
z2FfL7Mb}I%hVwE*E+sJb#A>K`-m>Lf>$0o`4tkMGSHq8GX1vmVi*8ijPgWX0r^%qL
zO%KYu?15>*j!;yun@LcvzG@=<^!{X&9`imql5t<&^&d@ejo}$>s-WMn-q)UNcX3^y
z_q^X$cS1cd(!hD=7AWe!_3)y5y@=$P+P38&RUh!7!{pBU7V7gBWhK#?R|Aj%Bk7W{
z_424>pklKV*$uBtr%iNaDOuJq_D5VSzb#CH{}f%Im^EtqaG<PhSV~}k!vTJtRO(tK
zx2IX1sqKWN@hvC8G&Wt{VFl9eef`-(?E5JI;q6p)Le$1j@FsX{-z79M54fWr8Qv7K
zKFwgVQDKpR8xLpKbHoP~{JgDu6VS{zm@Yhr^ShHB$bQOU)Y2_33%Z*aGJ&cHq6-PR
zcBf+rLpCRAt<g-%D$M$M$?HT(1sfolFjvz7xO4xcDDcsxlP7%^`$GQURlZ~-bnICS
zF^$e-Y16V#R@mVT?hxqZNTIMv7u`~ph9S7hJ7njkuY21l$vmN{oOpw4pVfU;ghHn7
zr$;6})MFJ>68j8#G?1dqIh9%#g$)NF1VGL3jN;<{$O%No_R%wKp|KX-kTh}(Il`w9
zqP=WwtR*7AXVTkfW9x<b-M=6Jp(LN`^Aokq@L0R`?u;px;Z$p~B<IA78hb(5v0JZw
z*k`PGjSz#o99>|XwRkLu_*7@2Fpx08$2)~Pmu0-=C~K_t8hYvBn1EJE89&Lj@pAM8
zQW+iLs`qG7<fG**@9i<6&dPDPv+9l}7osvsQGczsAu}cvRk7CrqZLvHIPRoADVIIh
zaYI%P4zxxTh9pQ2eU^W!<QB&PQ|3N*j(XJxPwor%4Fi-0TkVAwbfN2*@f4`Wbz@T=
z$9)U5AtZ~G7wW)|34_$r^9@P7Rsfv17M^t+X63|V%;&!6Y~4HSd2MaoduGkiv$3(Y
zVZjZTVPIf!0P2fz+=uvhe(>EN4qyebB1{#JuMC3ZQQ)7dYWS-5r-ma;N?Xf#mDiND
zwc8KbD_&1DRU+UU|3HgLrv503K)?!Tuk}PsnM0d|j;(h3pctSvsUe*_HKjpf9SSTg
z0tmorUFLn^SIYLQwe=nJwHYgvM;|imd_(2a)g0P*dt3R^oM-z<y+^kqLuxz(G|aXD
z?VHeL-2=&8WgNF)5-=6bTY$tu^kLzJ&TZT7BROoig^;0>ail3kh>mX>wdDRN7)iSL
zCfZd8`T3K}O8vH16VK=P^{jlBGBw7cxTuiUb0Dob6H4N)P1wT^bN|4YJ3d{^W*s5C
zf>my5gf-#cxd4JK1tmy~wjaX`X|IQZV@epf;xBGKLpC3Pk#Y0DC*->pA~T05Bhr!8
z96}&yXZ@))W?(*j4P0=vp{HbwLXYRRpXOJr5{Fk7<u&R30*1bY?;YG1wq(Vz!Pw<8
zNbfmh<y6#oC2|K3Cvfe)wdwvH-6n5x3BK{ybz9>myL334xGZ;ffa2AnSIZZ<63$0V
zY}r}3yufF=&o>ZWy+Fl=wCBG9CvnQ<TJr;3nsl2ywlFogArBW(+!|3|sJ$6e`q~Wc
z64*D7x2@>naq8L=3`)hL5xW%?W!lHG><L&U?v(r$SG(-Dup~8V`I@uZdzV@eUJCho
zh_1=vL6;w2_GvcX<cl75ZXIX01z++enB=j5o5V<hP=Jrx8WhZ%$tl29G^eO1{cIOR
z$LJvLW5h_17wuTEJ&qSf|DARd|LuR#c9ubLK7E(Q2@oI&?jg9ly9al7cMtCF?ry<?
z2X}{HGq}6^po7Db|5MNIzOuDncE3#3T{Sh;)zfnKxz72u9m2lt+XxY=+Q%(C!U0)_
z(p^!)GyfejJeARFYV4ODsMKXS$9)@m47wM;bt>A_x)R}7wF=!0TWibTsDTaYPGE10
zyA7<+1gJ1=77Pq0U81nGq|j|M?Hbk>9ISKEkpkx+{-#MK*KFlMM^e#8rw(?+?h+mF
z{<<KnxTZbWmP7-b6ow7@33;u`?_-Qga7UJe&4GzUKnX`sl>+de+Hz&9E(m_&HkR=Y
zPD48*FoTwDX}=jIZcKfS#5D5m@E?No1aHwk9rf!zH5~lJ8;O9ls8aw>h`XZH(RyMS
z9)R$4_+3Me;v^W=v<DX*P<b1!-H-P?z_NHBRa#x}Tx!=J<(=0}sSo5SrmsmCTy_v<
z(3A9*Q52zvBa|J`A;pP!)%hfN{R{Ig@q$W+!W@aYrBF>3YoHpYr@x^x{@vl3|JH~Q
z_{J_x*GR`6DB|sZ0&#f5ZG(xF$|Iw_!<MH0W(ND-&4BLW17s?`m^;#Mx}#h=lMk!i
zCCHP7H!~+Te;xyoiwg$G#|@T{>i;Z(iNlUP{iNjYe;Q=g_@25O^5kHuob){W%sk4@
z*s#xBwtHD8Rz~lMF23_EhqZazv0qwGp>TG$i^ap@_l&D|ArPh2lKv88zfdyov|Tij
zZF|lYC2}x#?W|UTA?|!KfgI|~tW9@XCl8T9(dL(*_uIlz#}ztne1(#$B>`B!;`vex
zTA{Q#d(femB=t=saw+P!1g?l>#1Psq95Tqo78zK#49wr5D9w<(y+pue|FrzOboerw
zFo_TkbecC%KpGD-yV`sr^hCz(q<|C>f_d=rk;qArip`_%ciX4l4{O~#^%1a6>@VYT
z4t(axl+8CD-LXzrc;xb1*8a#%z@1|^xj+Ip6x*+mESoUbWvea1w_xilD%N&$W`1%z
zsWKiC&G67Pp0Vi=*9DFG_?<k2)!{+vt>T`h`ZMYJftZWoQ9M!oVU`)P*dAseD5_T(
z5*;f$C0AG9oPz{0|29KLCp^Sj%q4vcvGtrOA^6kNH3pn{>8nIXqgH-U6T5YdA>{B%
zBU_5&St!;WS!{pVq6BBO_{&#`l4&F6oztTrLWSgl?wh*q-`HiR5DlIjtH`(ptXnff
zTRO_)Y}UvgWSD{G<0du-{vk%Qs27hTu1>&RCQo5RXOiU>_Y$Y?PiFKJMMJhw_2eEa
zGio=B^`)U5eeA*|K+>N41hC}$z`BQw$9aGK@QR&T)TGVAG6AhF*(}=ZxPPVlqDptL
z8OAfhv2y;%kM8}7i^n@(w@<XbOQuT_V$Q$Y&2GM7`0I5QiyJPj4tNoUntSxPus`Fs
zo3cUZ%-H@lTvE~V3jD)sEnn+TK__gbjBl>~PuKikYMGIdmi1Jk<6fD`76ckXwtsdu
zA8>n`B_aVk6kGaP69Bs!O`8gPK>=sj6ADN*G*$Jxx*bvEO}?KbCs`#@fB?SxQh@OU
zjq{||M0z7Gb*rW;q8^LdwN&BfN?CNGjlr!%SDS1KpF9R>C4GZVp+TEa#ncm@Ci4p3
zk%ZHfajz|NUV}zdOqCofJd^em{8#EA*mB8A-R@5+G_vX}i!B`XJ;pSAUV)=~s8^#5
z`-aus15GjTXHje@yfTx1nq_k+qt(~e^oF#)Tjtov2EPD?3$f1WwTcd#G_myG4VT6Q
zB%&f44L4tEQ*-u&t!Zbny7raw7A(Qt_Dv;LuBQ$Zbe709<1-Luh+rR?#}slY6z>rZ
zDkKf?74Q^ERBHkqJ-xW@%ll|QSIjIcv&b?D`c%kM-+Gq2{N6qD2W}uD4vsq_6U`%G
ztgG#Bi{SZn;vaHheIfV5d1T+bNVEYQv6Fh--<1^=R4_0mTjWdzlUT}MwxMHHVvfM%
zAzeALVvwq^lW44Wp9!x7fT2}sI9Etm1a@~%FFKv{o|+5V2$?@K-W%YU77`YQdgT0W
zY+_|+&!4h*e1`Dxjq(Z_e}CZ)_evFZu)(hK;1Rco?|ID}w5Xv5=;O3jmld(D8K>5p
z*?mG(Q;<#0Ss5Pb<vx-6G$PMn`fP!$MpriXaJrVlb|VzHvR3_fRu9C5|NX@qVwQiM
ze0*0;#CzkiXw4}9IS9Rfgwy}C0=|Fu|M!E|$h*C!b2y@>WobMey${<Q*-DuY);!kX
z#tQkDN$lU|zS|*0&EC&a=Ukzat)v?V!gColON~AZrPPh0<a9>!8ZWwwnRqPoFFf`y
z-K8I9Z(dg{`o84t+Q06(bzHvUb#V6=59_lHUGiRLaXf(1wnG!D1)S$!(Cj<j2tjWT
z&Ci~LCecc}d`CgwbrM9&)UL7C!h*x}-{Z>anr|~<;p`TkDLydQserGWJgZ_G<zpIO
z4qiHG=&OJxYW&Tyw<r30bHgP&%TFMo8I4TrfGgdz_%8#|WRfszG4~Jr110wX2u82Y
zCmQ^hc6kWsg=rn*(w2q-@!r>8*-bwub&5;MybCc0_WyLnkdC*19KVtxPbsR3N?xA;
zWr)85LyH=du=dmziwAL>Kv(ut;74ql$D_mUN4#9TtbQ<1Z|5bO85dVZ*Dp#^w|{4>
z6m9#oFUDF#p2KJY=<Xp!0(z^_cbv0@Jn_3yo}YV_e?2)wrn=9{aX7<<>VGbKLIMx2
z8lz?KKYq#56Oi-qo6-0P2@~d}RA|v-b#gmA1q0OW9W9gM_XT}rV}BBBQ~$vnMHt<q
z3)xtZ9>n9CG-H8xCDtV^2*F?V2-37X%1BQSmw0g1+t6MHMH5i~9lizGP)^=~JpH!Q
z=nr1!J3AUH%2=!^>J9Xuw)6m$^W;*1bJO7n>jqRd-;c&0hz=yK^(gU<-J%s~rI5Z}
zU-u_3b#2rkeByi|CT}J*02brv=9ILMNm7=&IyAM3;3jxUksYvr^Jg2@_s+`D^H%%$
z8&BaA?Ex@hVFn}f@l;HXD~L!)#fY!rBhl|8j_+{(Ye3H2Yxfz+!)5?%TE5`%-COQk
zXKTJZ#emEHH7`->An5H#{**gK+BOJ5`mWbsFr~=;HPo$MD=fhdCZc{=sbPl%e4wW6
zYKD}jqYxn-nWhQ5!E(+INVgt+A|k~u>pvnG`+bm0OgCCIjG$qh{e4uJ$VtE}i(}nA
zY;CTKHk&BuH5W)lVw}x3i>`|LRQI*{Fod_x6(_0Fg>v=Sqk=spGD-j9k?1vxql>!F
zXC8W>bz^S~Cy1dd;GC1{u1^LM_Rb%|JI95OTQ(rT*ZtU}q`%X>tKvOe9<$`S&}>po
zRZ_N2tx3;B4D<ExTo-@<e6EABJZaTY;3z!8Jok+f?qP9J1<`+GQQl_c=C~ZS25lGB
zJDiQmt-rpoS2ryBbE9-#qvRXg9Z$~8VM8Oh*cW%SlvpbiaMr+KN_=9L>Q6y|$AXRI
zaHK-|9uDq<Ft8(aULZ$FjU{(|u=*mRdm7W(8hYA~gWsYQhG?Nvq*==uaoHsY4oKaH
z>Uy=n;u7h&zsTvzOu2l;Zt$NIU78~~UC9$c%SX-x&Wsf~PFoc`;7Ux-j8vZYSYHXJ
zjw27^D4YOmUB;+zUrOq}(GluXAeX7)FE_-{N^@Gu(;8$~bk-YJ(`>Iqe`Ky$IrS(;
zCVd#pOQ?jk7WphOeHX83-fMj<LM#8FPYfwF6V2v<G;1@A(6}iNO{*&7*Vxliod6LU
zz07w_aiwG)#P<lxU7e%fXUf-s(h^3t0a$2iRdsvct~`LoxRWogWk{$^lO2CBmld&e
zQqkpHVEIyXz$pL5?+mMv)obFXXvvP`Sw1dkxR{hCb{d2JSp!%sJHH9!!K{{96*CF<
z{Km|(Q2{`8rzR^hHp8($(-!6fgry|f#g8eW_vX5Si0j+Bc?HBet5!@yw?$_Q4<0O;
z8}>o_ot>(|0xij~NzhCNB}<ip#zJ`_jJn;UTd1gp((aL_YmXiCqqKk@uWk~uu(C~z
zALVc@u!sDSeaC&Q2u9AeEXsCuhU{XK*`etN_*Oaev>?TZdbiW&4F^TRv9kEIsvol3
z!jpp)RvRbPJkw>pc<_hz6>iJa)63gx^K8SeExR?%)5w|DR}d;5xM7Ex|Fo#g$!AmE
zPiPFvmj*U&!(=t725pO<_A`7o4QZ>_PrzwN48~h=xA)`9H{b4O_@WP{dOuxxOFWg|
ztPsww+`!1|_jNqIIB*C$KXAE%I3+`t=2`fwVzQr{(1ux^J*-AVSCO^QD`(TtXEq5%
z^V?aptm&3;^b-<RU^t}~TD5t~{ad5^oRIl@eOs{e%MUq^c;u94I^QZ`62Q~U+~BUU
zTqu^d$&ii~jWKn<WyuU#V$Tt7GY+3#uduAg7>XqR<PdAjPe)t9m@HgJL=FJ!jG*Tm
z@}pMO7DC^+8z=(DF?AN6Kd@DpwR#j!g4{Ujrz{fLA_wu@0;z&n1O~<BH!yj&Jmxib
zBA<R+&|TAcdD#1v?=<z8*=P0ZxL6z!?05#2GJGTBN5`tl*uTO@Ipvp8j6#li!za||
z$6*M<tTgq0IcIl@M$?Sv&SG?<XgGFpLMg33kOD0^(~Hm(z3(^EO6F+$1^rg+L5d>h
z6Wkl}r}$JL!i3lz<G#d{@u&+yq}7&ZG9t5(8?ICv-Q=Kjx1;Nqm?vq_1^x;j`MA?(
zN|V1D>7(&QR&QbJ>ndk+(zVORoKh&HC@e1J6WHzfVBQATC4m=wqJMeanDTrE>OLz~
z<`Qk2I;@?Z_N^#dUp5jpW-Xk7e9=Rt3?A1O+D;$y{=H>vH4Y%<eSs39=k7s}mxm@h
zvQN-67~--(sUXyoGn#?Nr*$?R8il=2DZbvP5YtGGsPuH9rsqcf=$PL#GLr+Y(En}d
zM-^!egQQ+u$GXLxB|mFGw*qXpKW%o?*ykT2sV^E?b`8RD9#TqqMe&ka7E<gfVRRIS
zs(#SF7}`QqKu4bo9kLjh=*+Fr-;hcb3j@vWRcbZ*4>h|g7=h@VF4pKwnvOn5dSvch
z8@06ELIL=57pr|oh}v|+=lovH=?(JuyS6iyWI8nl6t~ma>SBWM_{oQDL=^4z_r4hM
zpj>X@c{JdXXgr!QM|cdLQXToE$rgjR(>fMf31Uvr3H7l>T^^sjRThJZe-H!dIc_Fc
zmC3}&C&j?Hf)=COE2kPtxjG?!)e-)TEKl8|T@wL;fOLn>aSA*+1!E+W*US`J*)qfH
zh)2lnK}Q*jo22j3V2ZnXH%{$^fQ=gocav9>D*^r$``o)(8N0_SB(1dcFb&+bq1-!t
zl2S)>Ayoc8tGBL=-}C6s$RC{CvpoZo%r<pha`{yIC(6ZtyV~u4SB1A@it=ze;-y|+
z66$KrKzbRBLbURN<k?sj@;xXbl}kX<OvvAxOywB)Ri96ZNDvx<V(eTNC;p>GU2B1=
z(w9AANj-{FgDrFbaOL6U{P~Q3Mx)b=DPloj(;#D+g1<t}cfM+d2*!#et*Ki?{J=cN
zi28eM+|auM@=^xT=dDe}rzo(C-*NqN11jZ%C_NPWDO+j&^t4jO$b)uwf%cO$x%RSl
zPpvHv-B1Y~T~#c?wZCeQ7i7yRSMT_(Lht(!_?D+5!M4xm*eW-JCkDv_-ZIiD`@G6^
zT52*#zK**gJ#PImIa9IVCtrKArecP7%32kq8qEm9nSpCM7JBjy9-)7IeT)M`$Zsv8
zJ}7OfWliL=m*J$56sBBce9sr#-?U(N#0aP4JU%A^xA$@E#l3R#KLsnPn<R}U+R&2D
zybDhNvbb2urBNcq`^t(7jxk3awiOENwB?^&Vt0$XR7{A{!1b$_vxv~TfsvlEy8z51
zX{_>I+SI2d`E2%O{gf~(;^|D`_-$|SArpv(3M6TB(5~sVDkV+@Vkf4OZYf=0*xS(#
z8fE{9G~ahE*;=zdz4@~QxeZttUdlb-0%K2#$sZkP;16~v=Ycll2u?g=Q!-%w5sHj9
zg`nPGQfV^<hxa~$v)|6w-Sel8CZ}V|8<Mq>U|agIa9T+Pm^0!PhY2<wh@y)zkhHRI
zn@iy1T-l9SRE-?nMW(|Xx8#!Xxj7D52U36UWK+kI5Km*t8h_pCwBow6tb0K*@Ebl7
z$V<!3jKnjbS_bwiI%|9~f;i^teDG=8fL6;wyx%t>u%-w#=2Z+L|AA7DD!Q}x6Lv7X
zU<wC1WEaCVKCvU+!yM@JsDvOZ=%EK&M5NK9v_b{Qo+vIXzI$y@_5o{0n$a2y=L<{H
zEgl|vKmW{$>~mt3TyME^`}FsP<2oJpH~@u_ld1uiZE-Y`vg`9$(3p|~pL6JVpQnm9
zHr9DSm@A=tCok~TB`AQJ1B+bXku?e*pU0or9iLxTeNoq>+s4M;rU1F$p%AAiD-_Se
zBf0s0YiD;NxGvXZZVsi6m%jlu{{|1uG@Dm{aQUf^DOUl1C~Amp+E4~Nu;>Hh<7VqI
z*ES?Ntn3Q*&<((uEZbDTC;d_mmr>vJ1aAY3Gw|UfYJQakJXZ|3H!YN#<sP;9_aTDE
z#phHQwc6{XE;pIZQh^a=RG9oh;fDtuosxkc`z!o<E9FK-DUY5{r!hm7_2^`D#@Tto
zz8MnTm(zEtmBN359V#DqMvk-T@_$j|;t!j}*xuicE~|(dihL2u<z_8W=;Iz6hEZ_N
zttUemkHsI`<r-@rJP1=kCWfEzNNZvDqi5>ca8N-D^^?HyYF{(#e0pjv&I1b)lTu?B
zdBKn6#+;8^@fFe9S?KC|mQ?&IyYUX4H={0YkQ0eF(hn=B`x&~=W!FNbHN^Q{y`Xv+
zLfXZU?Q9EC3!_%AsLT%i(hgwpeDGr|&ZonpE--{e#9?q?(cjg{85t(5wSf4GpDd1k
zS_R5VUaxpk`@w-=h$S`kZW})e0|l}wvEn`3-fxb(P(J<2=8Y26S<J}_+b)b9L}PLo
zw+b}OD>*&G`TD8oIo+R=xt(jvSqgnVIZWjIePa<|Zqs}Ox8@J2Rhmcn$T<1lIziYc
zies%wIVUOUxJ(tzO>;c1LqDuZM!S{<a6m%aMIa5wIO8LMeV>By>9;%3A-?ukEdPJz
zP~YdBMJ`%hY_YMWwNq~O%bYIEDYNq8ra^Isa8w5Zh#bAJ38P*oilfX?Dm!dh(K1vW
zYUm%qp^t)ROj2;z-jhyv%Cjy$)h>_c@_WAQ&%>{FZ%(O5YwyKZZ9oCBS?a<Cq{XsB
zP8Mi*zq2OA1O{kkAZ2#XJ>stNFJ-dW^A5foFFw4YT-A3Oh*(nAA+TtG`)Hk-eEt+{
z@roI#)^T$dv<?@?AF7W~fV`z*=CU4uRlkYaw1!?|h#V}RNx$s#18yvb7aJO(=xmem
zSN|L=+47;a-GmV$8QpTZs$kFe2-a+eXAj!keQWY{%*DmqRiWD*6l3|&)>3bM*%2@%
zLTofTDgS(2Yb@M5?+{U?8^z!{7Dc$E@CPjLntImUcFOm*z9%=2uJ9rAiBY=Gdhub3
zKk^CZYXx6p#753B7!`-dUN;-hn4sj8Q4e2_+2tb-dzgAnWtkctboZCSoN>Cf9c9C9
z*8GJmP8EMUYud$Sq?Yt7Q70Y7kP^lQv9PiRpR^~0<XbybSIEiKwBD8WE6;(#A(!P(
zM*aNm`Ex(c!>!H|#QlzhfgB-aY8XGH;+SEI<$Wz~$f>aaU%3~hepY8kBf+VW1~bi5
zeH1xDptcPfobeA}34VsjvTC{$z<AmuNUvKI&zB|YdoZLt1LYs^Hm0Hx+3wpo*LboD
z;%%3ChgO*56@2P6vAAR^T=>%L6N|CkP8@}UNPONY6gWw$MxPzrb^L8<;eBj}e10zu
zVi7L@*cjoNr{?l)`?!%&kxsN9Sbz6YDTz|FKaOz4b8aGK0J(wRE`C@zoI$iFJ-I8P
ziB{vVbut6J>i?^tY*qNehsmAVe|wq+wSlu8N3m9*8wbm1OG}ZU>5-XQyCWit36n1$
zJEpnLAvZ9ozQU(KtW$uc<X$mPJzNr!j@qog5qNOxX+br%?eIt(DgJ<VUYdXS9~4&9
zrx4Df%bQs!L^~#Bgqh?7j#a9CM9N<gP5cY$o;QzbziM*L7P_Q=zyxnqRFTyT2wy~J
zM4z3SP>H|9(+f=$x2m*?Gg)`Qk4~JS7<0_AV`L984wXTouXe6ZYRQP?R-;gB2$@e7
zDTwG9;t?x@hKKVZeI~1Z<9yYFi$rj?BxJKgOJ^HtzrMf0wzn=8OG%_DwjkNbIIU=}
z(kjGZN!lG@kM&NS0)6ehIK0f^j$)L>Q6E(uzBIDS_erLK)C0S#pr<6RDrJ8w{k${h
zfj_!t>un=Dh(71RV(LoiDR{yXQchfjzPE5YvV)m~V=hnR#YK%cDXg7ED6hW&&~5BC
zF1(oa7*CKS9gZ%%a5@VA*n;9C@MMje-%$&-*5ba+ofjivFIw}X#H&BIy6*Z(1n4wp
z*w*ZmeKx2=?`WpA{6Z<Vq>`q$pQ+7j$s~@*koE&*oYTrrJh!zn{)7-s@&gXCfA7*!
z69{g7{h?Qnq9NhVZ9ZZuI*SRi*_un|#QdgjUS+5ePj5Ai6UErP$ddIK#CcvqCI;4g
zcDq<?t-r_i9FLpiYFa4$m>_+B(ycwl8V9h;p%29HyQR@f-<o5)LhC%mdVU;)S>5}h
z^zk2^aMih^zt3R`O6Zalez|t(RN$9Z|A>6|xBAO-AOq$7GaI{mrSXJ7$B1;BI3m#d
zkDo1|>-vX)M@%#C{N=2`GfGi$VC9+p#lC-yxXK7uE&SW8N2P};idF?qy_yJFQ#BHD
z4Nipz+0=)5^2j*Qwu2;(!bkzZ@OSNobQec(NM1wcR!#LLt1AkyIxh~A#>HbJ-nR`-
zh12yOR~oa*luxbF|7cmY@}9+QLW$hNqE@TmVHqJdbt(M2$A6Hhu^dRu2DQ#PaPteI
zo!>Pk`=$b%A)2qa^xplg7p%Ej0*%hc=4csec(|Yu-seBG-nCF?$vLai33HL2|3Mnw
z`m(}K__L3FF=U&p$=;2^<rP;?(*VS&g-1VCf>K4Yq6kKAXHoXJ$Z#QrZcuUh0legQ
z1Hmh~9#QY_mH!m)mVOLicpzs>nPV6(YRoJj73gUK9Ly06NA0B7vgMc$qqt2c&R>l3
zA{&$#Yz+U@x5RZFZ`cEEjiE(-*KCZ1Z-h|8t=7YLqL}02#nv|$AoRX6wc`)aaRak7
zeRTZHpEW0H97Hi9@PIS2h-J)kX$m)}hQ}F>l|>bXhGit_bAxd{EZW;8`%{0!Aj_Vb
zDz3VoK}REPWZu@rt!}P-Pven4TUlA-4vC_&<Rsa<KFWUd5rrZpmrrQ#3f^N6>zZ+4
z#rXa?LPw2UV1mKS#bM{zj{ST>qzbs}KEgWP!Lp=S?K}Lmr0-==thqM94pdQ6>-?UG
zsp3o~A@G!4@6w3>bPNF~r>fKi!Kkso!n4=8h1+}C0GyJ~&j`(VTFoQBdk^H%U|9*B
zZ5kQEPxU_NP}&mJzO>RnOWqzxZXApy&SGiUD==jlChtAkqK0k&9t!BpQF&I=;;#<n
zCFh%FbaE$Rb+MR)1X!r3xt>+wkd%@%+I@-3)H18h7I&`Lch0kHpB%KFzgjQ2Re!Uo
z-nGb@AWV80kbA_K`7k&<d9oj#ZR|DSH2D-wVwKI&N?*k3Tm&5h2y;~2aiIADdF(%R
zAB{K63G~ipoBS$`A5J{|ULHWY<pZ%NW7f)f`Ag%HjgRl$tE2N1WL%LO{kVx=Qm?2Q
zFIUns1OMjtxpYW%aW!<<MrR=kkwf8J-AYrScKazo3Grc<FgQFfJGzedaaxpFf8)KV
zWm?P1W#PJ`Ot=>vCU3ZYV`9%Zop*|D;&aPgh3mm1wrAizf1k+f!BXul^I3CBY6GmF
zrQ0>W7sr36`e%EMJI#+H3-==aiumpP#L0Dt?!%{8F3-YX#Hvv>sV2RDzUK7#z9<$e
zB7z9jZ(pD@@RI&)R(Bo9jzfA68T|z&;rT{sC~n?hE>J56xUQ?Yy3S{7iS!ORiv&MR
zp=P{W-TtcVp;Bh(&li8*UC;lB{_h`$-~KuW{t|%y&kuzuwC{!@YgYQp3EGB#djS;3
z_0i>P+iAE51CKnB2h-%7cq<ZJM+pDbp7ZeSy}estBC>G!xysxlpMC4i;j&eW=fk(O
z`bZ0Gg7Mv_VV1T>M6wvGZha=~Y&&OTyK#-Xn&)d0-|UCSZ?b%^?3uL#Y?VHabU@zb
zz>6!9Y}$HM)fO3zzK!R{w2qrTYD_tV{PSte>I@r*=nODv_jA^5rH?O$w7IOw4;S_{
z8g0l)c+!h!2EP%SlUzepDc-FnX8QekBb>fms~g2iZz^Qtb5rW^rq3f*-L1f@o1d7G
zx60{f3!*}e<qH&n>2IrOGVJEgjq}WvtiZiF=Tfio%e=nnBjXk|)&^c&%fDLHy#qEG
z79vxOpr@{Bx?j%bE|r3Yu(CuA&|PjP;vn%WMb<HKN<GqLT=#$seUk1PUm9<?tOrDQ
zsPHds`x;X3Qu-aC4Ns>EnHCw}@W%32bbVT<c&z@o6i_yQAZ!IlqEky$WSDVu0=u_E
zOflVg%!06ho8!yvj$HE&W@kKGTuB0}HQY{)RO|cUHJFp82bU$T77Rt5d4BqVRmj<W
z8<OG5nYz3Fk?;9&js?{Si;k>;E$qq=|7k5e&&Y>2A^>?;J>yk4Wkj*vIjxD^;>p=<
z<vf9lVy(03vHd;B|6VG`$Jd{~d$3dJAI8I1m9o3L`q(|^;wfCTzjJKl|2a!Jzu){y
zn9$Fg>kbx&QSFAs|Kix*-OdJOMZhcO&Uw_rg3(3qW)0YuSJQKQzw-RjJ;!`>)V)pN
zcMY@W*Bzk*gxBo$McJ2sOUeV$^|D-&`Q9Fn%|2gkEcx-p&z&qVwK}1_-EVWGKVw~7
zcRz74%)TQM_p70NFB@#Eu|+(tQvx|ubHP^`+|nWkKZGI*{vHi!JAu6NUGE{n<ji@)
z(sGnLsB!GU!UhOt0Rb7!gT};py7bx}+~m(ElyC_RPLN5@I*bOz)rZ(eJPb-3AOLmn
zaOhNKcTVQ#HrEqsk$U*Cp@*pstWi&&p?Qat{wL}(dweY}Yn@@VGsU5!)pgTd83*?d
zsW!+N%^XHy|Bx0>h|KG5(+wB2Ta@cUuS)k%&7=r>vnT*HH*fn)%$QzeB0q-6FfTgm
z4_`S~lfH;StF463a^1$pndS2m_PHi25T+9etu25qgkmkR9oZxO?+tXM8yvzU3S7Vg
zGr9z=k9;uwRr;Mgo?VdqhfZN0r*6c);_}}95Yk}%YI-gkH}S7$z5v*uW&yY6v-8L$
z9?rjit5*05iS=JxXFF;EMIqbM-Wa|5JN2{7VxY9b*V`vQ;M=;+r1^dCf1xbpC+7iU
z4JPL^ItJGi6jU`66gxpRl(%_8QVl2~vp%9)&VT;2NCgdwZoLAzeEA}mF7+%{DHxe*
zGnCs=mDi^MG0&Yg-T7bAu!HO-UkE0G7a@Mt=n&MklPu?B4;@LjXmC$%MoGOiezOX7
zKd`m1<Zep`4{}TrQ0&pKCs@>MDGgz=KX1i7->vA+peO%X{T>t~6rx}hsNL$+Y8A}x
zTk#RTqd_gJHC3H|*9jb%<-gKsb2Z`iAeUU8*kK(5{UfezIFjWb60>_g9X=PwkAHBf
z&{V|KvTf5MXDE4cM*}!-GMuj=vU^_5Xval;$w7j%^*c9P@j>0q_|!a8@*VTN-^6h9
zU<ftY5!}Rj&8$l{|L7rRiGu+qTj$M`Fucm@w~tYH|0i7YAsTT&&C5R#kknaKo$i!G
z6F^MgpifsSp7p2lzRrY*Zt(a#7R3Se20|HOk6e8_@!Z&LN)xxi4jVEj3`;!UF#p+s
zKt9@@?V#IAn8gf5USMxzio-SDzOf)mZ>TMU&AZ`}GsbsDBLOq6CJAnq8pU>5Je4f?
ze;3YcOM9fgpK>l=yDAz6eM09QV%Xf16pz*@AL9{!T#uTqSSRIcMqKCzCFtdo*gaU8
z!MEnmLCv3-5PhfE8J$@ABo)W%Q(9wY+93c(XTYZDdi&uCe86aRY|P71=kLaz^Ao`#
z;}IJuc5rd7r*QL`*4L6iO~wSYIG`waf(BGR*_ncx*rQl{*|VgsWM{3OqSeS8aJQ$Z
z+&@9bAN#tagh5RYeQM5gdkc=TsY-&RBe&9i^g|z}qK&PSZS~e&2pHR)tISd9!6V8m
zCitLv!yIMP?qO|@qnCvB+r*9%;IHKuTBR-LxMq(M$B-ADCWJK4+~w<rx74O>`iF9I
zb9l9MKH;=FBvcAudb<DJk_Fe8Hm-{`VSJ%Eu^55kECM#T^>`9$KJ;7c&v(9azF(Wd
z!L*}8$)^*HXyHSil=?3IqY|jq<3!^+8TO>Ne!hp0r^^U$@65NL<Qjfmqi8id&md|$
zG_B0i>wn6Moe9qEDUbRt`C(8O$+kFbsi7+SzFGqkox_O8H-eI8Hit)QCYkHUsZSao
zteJwaq?aXeY7Qt-k-0&lpdpuu_Ir+OdOModEjL%#%#!n<%uOPNyTR<|^$p(?ls9;H
z&j;*SyT`<Ac7|;w%=k}dA&@kx8@@xO>g}c2qRY}zb*J88(aabzOsQ-PvfJBP+JCI-
zx8C=T;*qI)tKM0gA;G-~y$`)JX^bFWfmP&59pBhB9yydP$FIY;BE6!Pb{L`Y1|1)@
zDv`zTmz$C*hhlSYKd`7`f$Ps4x_lh!y$JJOqUk8C;Htycy6hn*ACsP+xd{b}cYDZV
zPY4gu#=tx+Ydhl@jGq#(J_@j5PibXQ@;9cfmDWt5+)wyKV<ho0T6pcp46$XxMkQf`
zPGIK60Y0q}Xlr47g){C~LeLWYuaSw9VFa_yU&79$W)y&QBGvjYgYGVISJ^Gz1edCL
zzc1e%F|yOn)((7N^J(XC=mFFgF@8a<X&7GJACn3L32R<|@P9mZO*c>EHU#I%O&6YF
zU_m#=)QzbpVIK!#!j7Awr&?bifcpm_WW|OhHykr@D~cXni}GB}4=uSPk!#9P>v)Mj
zV9{w<$<-EjJNF(A>Yf1)1CB*&n%WmW2n(2M3C{M%F|7a*s^(?p_FhgG^Wu)o_`zuP
zu>eUCAj`0A<4)6gs17zF&bzha1BCVqm#bZCWT9K1*D2}tm(<^)%|SOvY^yIAm{8$}
ztP0>W&^@qfiS_uK$LT`%_JK9c!^(zVlwv8gvUM|$5~d91#X?+3kqKUn&uM>K>1#-{
z{@kR}jQ`+p#K{5eB5jDx^NZSijqb4hhFd_Y7Vd?pz7fHVrbIIW+C@jIq+S-XI8Rr6
zbY_CT^($6~V+#~ItXN|KQycS8eSk<!w`^*0JxftA3)QOdI@X@<hF!aBHfpoE;q+5d
zgBgbOzRK@QhdU%Xiq&`9=cz~34HOGtYRsLSD`B;R0A1TQKltYR%zsCXh|KqtSiJBJ
z0i}Ozrat5EOX?baCSMVq1w*-ZnS#cbc}fkc1STl(;*<qOvwl+KZuU}n*zi}yw>Uxi
znjUp@wuZarSyt-Rrw^PEIn>(3zYOI4ELCTklb0UbTRWva0THI;mMuaYR}(g%nsL(N
z_?eC4NUJ{boKjiBi$UTY{#E#SfL?g9ZY~C^6mB#kB!VQGJRHtHe?d2=5AwGDAjANj
z=I48rid+9BRU$R^WMhRSq<faBz^JX`c_c7Oz#Hke+u~C?%Vwg5L{c5ZuI-7KVvTnu
zcsaf*RHW<Z+JCm+MNK$BuQ@nsYTHqNo7fNH6eF+yCNx$+XP>BQE~JRAGIaACzx=28
z3@pb<De6A)%|izQ9lZbtEwsBN@nugWr|WFul&pR#XMGfJiGvYl;vgdI;InQ^Otue>
zD1UoAY#lD`rJ@Sab9i>DV(`z(ua4uU{7V;1Z2O9ok%&Y21uo>erL{i{Kg}J1t`!Z@
zLMKCb+gJIo2dF$hTcVvTy}q(jj{^qyo?)mE$h_SFajJ0>1Es?$X%XWL9F9MA2x@(?
z-_2B~BDvYG*Kh!Ky!4i5OTu(Csrl+Y!n~O_Im6p}$?-0&f!<&19^UnW1oov*cc^Ru
z6Iy@;zxCxM`gf$8)Kw>w#|f=a&eNI#1n5ibu!PK6Pk;aAn-`tv`YYCZJd^~2en8;y
zV+30Ll9QfaMVGHqu;jZ(D@Ab%Jgd{cpLCUvSNeXueP3`OkF$1MO|K&|w@|;MDs+qA
z;_dLe;S1m{XiO)*jJ%u@0OnmbIbJ>!W(Z_F$Bjk!dBZ00wgEpWmh&{m(3M(0CexHP
z=&X(LctuU#ghw$!H@#POfRmcu_}1C;f5K8{$1PnMww>F(F5#A$1OwtE|HhHvwB>7y
z@oZlp?8~4akh=hE*$!{ttU~Yo7g74{8V<75XL#0ylQbIR4^<X9PfuRk<TovQ_528q
z|C@|gSh2Kg(obG5tLWK%{t#tEzUfn!Dz&o4r)l+ryP?6Dnyz@>1hV=<Oq_lsPKMlM
z)=>r%30uM~3pT&M3|iWY#-PCA?&NvR&P%JP1M}MN_2LuT12}4NpXTU!L%+n$jw;an
z?MeT8SsAtoZY8`U+A0-Sf;kAE8^HR1HyDE?yvWRf>W*(dhS**|w7r=BcZ0EjrRz$4
z2~=0B#_)2)Ry2Qtn4Aj~T9MAkIDS9p2Dua}Dr257Y!tGB^+=5c@z5|*Oa+gjUSsxC
z!(tbZ?SM-=vFG%=K4tyKmOO=#t(Y3eS+>C46wAu*WuTdnN$jEsgvy=i+}`u;*(CKv
zA*m~){T#lrBWbc`dbzoPu}N{7+gr6BapQT-$i!48fP6vz{8ZC&IVG(`(r!#UoR!Td
zd>$0rsfA=sTZ?~#1u#$hJ6J$%BwELS<7n|dMVujuGpIcO9VEmR5|6N@aqX5k$5k(+
zIw!=T;MDbDA`v^VVURTp-k^+gxX})1?IrJ*SW5UoFe>CX3A{zDevdl^a(d10+kU72
z1vPvaCxhFg;Ep4gnpyI&2=zzH##Y=ZhGFhm=vN~WMGm-$LKGC|0*>Y6LpL4oS#=HF
z5;|E|@U$)Z4Ftet2GQpPv|dg12Ze_?rjEucGagM{F6)l)ZvKx`zE#PdS*T$6JZ-A(
z`EcT8WS<(KW>zGn&G&DAl;KtTH{{|#9LRjB?ZcYpQVpz`r-sT&BO!@Pq`@9Sk_5fV
zNs`fcQBf%9L9z2v=B(8Ld?yvZ3XS~u)lRrVFvgZgUY|t(^T_rdE$3&Em!h)fJipAZ
zicU1p|6;=W()2R1yB#=<Nbu#doXdw>X~XeaV{gh!=+I3{sAzuoYR_1A2r;1<_E4tG
zdi?cg^7pDY0+<ziL`Q1XxXOp0R>V_|`>dAxF&d~1I>i;&D7V+Lr&>a}tL@FS1uhxg
zGYw8S*z+%A0SkO5!Q6r?XZdSN9TCzQ!?OygKm2<o3+Bp%c5sgw%?NUmLNm>w8|Q-d
zI{#(-?v%TT)QhX?%wa!&jhOyl)Mt$!J%7QlUZWObu656%B<z#XWV~fl!6hQu<f5pd
zB<QwM0<D=lBz{QR+p`s<;Q#J(A$^>8KGgv9Kx3^Zh5w*Ba1c6J<CVqBFYcCj!2A7Q
z*iPGe-ZUCNRr-Df5sx0WRB4FNdaR-H1UU95^8hOy$Bgy<^aElEFuM0H6c4iGOYD64
zCeyv;m{nt+MQCHZ3h?E0X@t{j4^Cbju24X6#yAJD8KLf8#Vl#V=;Ra=G7^)nGi}C(
z%nj(33?E~@-0;AgrZ5b+b5mf}z*z^Y)<xc$(Nh)3;4TQAgQtn3eYs*YRu-7<7e$(p
zwZ;I63tf>^pL110+Ld!PmyKzQ!L#JPZogIp@Vozjv)V!2$XQxr5pnF!O|2kTJ}4hW
zT)Z9uD18zBg>f)1uJ^qWx>R>YArxHLhV|Ik=9#Vs-}J)!xoAR}<?@tEW{#^!5U196
zvDQfJ2vKp)sQ8Vtxlqei*Y7xIIB20icf<TcUA8?kj#IW}M`;rCa10Vr=kR-c;u~fa
znPn{ln|h-Cm9el9ep+*G;Sjfi4_=vW>)aM_^(u@os*m8$bKA;SgVV|5g-^yhOcr4{
z0*Fna(l$OIgPIWVv!tgdY?6-WknvhMaM7u43uV;B|E2j?zOpC&+k`0oe6!FpfrKTB
z0DI_i$dSis=gN8SGTmJZ`j;2#hus|c@;XnJw^mgV4VJPu=jpS3%?;<&ohG^P1k!(T
zB11@2zahB$?UTKbI6q1z7G=qg^@`rF%*Y!f{+?vR@@ZQ<&KTGIIu78jJhl<T*=#N$
z->{f{mJNp~%;6pDk}rn@lA|n^FzUIaB&FAOF@SKlLlw+-`=>9v_E=p^7N_%daLvrt
zIl;&&Tla3Be)Qhs0_gg3FW>+T=3j<;#e+4xe;e+>Ir$a;5eLO}VO{^raKF^c68G-G
ziMaDn)YahLh3$TnSMD8In&ThS0|BF{d}j}q^i}6l{Sv+VO_Y-QEITtzyYJaJCizEG
zAQ-BA94!2!^t6?k#9Y>8G6*6GCm&@Dt-jNUJ-9%F%GP1!7XU~KodQfdycT8Epg9~z
z!#;P0QHBFog6`ImT(x(bXy*?f`p5sou0CpocEa0vmjb@YC=aDv6>K!lh75i(qu+8m
zaI@PVY54iwE7uKJ18D>&SmD;cmJcb8#&3%cU>nq_U-Yu!4(d{W6DcNbMlbziIj}k&
z#~(8HZwe$pBS=R9oc+vf&Xm+S+R7U}H*G6xs?)wT=o7KSNDcPpz&*QLY2<g-@a|3#
z$>QHWIX0Na6fb)B^(V6Tm9EFd2{~I6sd)LeW3vkK%^`b2kw>37AFS(SN~c((*AID3
zwzdLz6{r|01v%(*IX3|6zmH=MG2WrUK@!L703M(3yR_WOZIRQ?=W~4zXqxe(y^F11
z|0u+gLAWfX=*tEc6XLe8t_Ne6)UjbG|LE7#kKus#;}IEJ)*ETo7TEeRtfE#jXn<ea
zg}hoFjW5AuHyDW-Bm}8)OoQuyO0;p}m=v%LKVIxH+ahZ)PYMEbAJv69k%e(|Ez$VC
z4y4Yo^;0jb*x`j~Y`{gq55K&=8W-vJb7C=mU#Yr{FkAj9coRFS0x8BeWp+kEL@;og
zv%lnTdkb;okM(Y#j_lUrt+r--kAFlxujw-oi*7u43fI8+Ub*?nTD71Ff7GHQd)Jxo
za1ZKczGr+6)<eRqk0@DIqBp}Qt#5eXSqTdS>Kg|QbI(8bXLbCv{&_JT_Pk*BR8eMA
zg4XfiW&ihl@g_Snljs&G@M6e9#{P5-qVc=-bGMK|8*DXyIP~)Yysm0HdmHDya`<ws
zL}Xsk;QL(b-#=^gemy~hVWN_fU(dCx;ZjE8YH0RP83A5L&7!EhmyuFrvSkkm_mEHe
zQUy&@hU|gQs}Fq-9^bf3x~Q2jGjCp?ZJOiA&ub05O@gS1_*L<=IMph+5I<U(#|oJ}
z1lU@-y*{h?HvSZPGn1qIJjWbM&<(gA(L&MtbvC|$FQ*eub~~lsLWBnU#9p_sg`A=l
zTMX*wVheHUcIdNelN;e^zb~=be2T*bUeaptqv;1>hN%6zj!pD!InX7XNaq~#N_Otp
zRFjxjd!Tz_PW!zXq5fT5tTB^{XAbc{lQT_Xr%mPtO<7iU_r&L<yo6|<&y8sMW(qcq
z1yiV1%2<E*lV{ttbE)~Oi6$RTI^X!l6J;KT78<T)GrX^6c6$0@b@w58hOGYO++n&r
z07IxzdfmYe-jvxxx1|-^6I(7En`>FJy(t$`>t3yQ>@<<q?z0VdAiw*Y`N7hcsUiqZ
z-L2lyo^V2QBT?X*N%$I-3!BxE*WK;D;v?oy@;cWSVTCGI-3f!8b*+-(foX3W7EL-j
z3lx0v{S5dFETuoW&`0?C@qNc>J5x^A*J3*K+2Y&%lF4?we~O{u5ww4YtNU&R|N5nY
z=WJ0ISatSgrMW$c+Yh;hwpKq;`!B^?wg4>uH{6P#znaLc#GcSk(UD^1h#}QBnBj=P
z+?I7#J3{;F%L(N8!aLy1u^&~j$=>}AmfG*UU?Hqs<_T6UUG_iuPt2=r&i)pzwE1l4
zV5#`$km|()ti-KtysIh9Ezyp|pLU(W$YfI)`X%B0kQy$+j^tsz7!gHPm1`FOn|2)=
zS1ghCjK_b?qLh4&%v-U>3sc)be6n;4<-AuoqGW%3IIRW1LN~AJ?Ub_c{7Ss4bfSKw
znW@@vpy!P#otHn$9-S5~nKJ_p2N;24uWbCAmJPW*%CHfTV@O9ggJOAU{iQ7^cM7vF
zr>rS0n+q;K5VJC)XT?E<IPp=zm9r=+PF)E`eJX_iSH?yAAQNWI?=SgseiKSfq5nb5
zKp$vpe^zYtuDHHODE(5yPh;LAl$^p|OMaQeQS;0jztir(Y2cM9<jf~*q-cqymSzi>
zbt(a;=Y9S$5#!kFd2j{EZ+#N|(EKThy6rv9WZTzxWf!;khtmi4pmuM?ZQO~gIc3Uw
z8=8z5fmF*zw<3TK#|q8}Cmt1aGtCzPx5igr)SWH6rZs_3UcA_$AvjiC**v0rpuMC0
z-vHGIN1)P&SmYu$`{6$>jJod{x$58p4aou-zFsEc=crsG#Q_T~8o7FNiOV~yc!=i=
zRzUd)hT6t3GYn&Nl<Dd1sjuGK?aR;0?7pH3^KD7AR(RLva5#i>xtyo!Cg+;Li~-=<
z?Mv*t)4#nKC4xxk>DyoXeCOZjz+W83q{3XZ876_rg8pwlCW`fs?D8)-_5b=|aBS=(
zj|?yP(^~njTX;7axS%BT%D+@@K-YkfEwdab%2Lu4yG)LU8v_?34n29`<_2If{;qi{
zcbnlkp7U0c$D1n#6#LA)9y4Wyw@|TsbO<JRNsgfPHH6wh6T!~I4t7>0OK~B1IZcVJ
zt0-ag%H@&ObZO8C^-uutlfGW@cZ^b(cdRoxlyZMfA4oICmPRXH7!M-l&0JJB`?ND9
zswlK_*Cf;UW&S;;lrh#K#`|o**p^yh^LEIX!k%Rk`A=i-a#^;N*DQEbB#oQ>Y=Kn!
z8q##RQ(eKOazg^&@`_e|wZVN^W^w*QsnW9)b$=iX|6M<*S1b%Lh!7+Py*g+uN<jce
zLC20tSL7etUKe5DXS5H$b;5y5pr-W;my$PL!cg+yLwGxdvRcRvhz~cXDX3}L?3X--
z(}ND${Q42?hrR_b)}m#t@(Fr!XMMV=9KVH-u=x0Wia5e|)m=Ap>hrkV2SHog?kH_X
z<DoXcgQ~YX^nf+EKDHtFhv7JWqwD=F0np`1Yc&MS`wg;oZ@$+Dzz)xD76{`KzLB>(
zB0P7$Yp?ektzUE5lsi0am4_Dx-g-eBZxZ|MD4iMehea9>Nfa5!EU5z+lEGGNes#a6
zLg;t*4w5b(P+Wy}xMC=L+d@a|L?&q7r`;P4>M(A1KfWWe>r}rCs>=CD8(24$!hd7c
z{6TV=)7xl2>C1`F(`9~~L2u^6%RFohQ=o^m`KSCNzm-vaQg-<8{1Md48FRvCz^DP`
z9?SI9DUS<|^md2DvwOF^2SxCqt6c=5L8UT_M@C7mA7is)QGRUT+7kYnUJyTd^x>o(
zUF@&v<w-f~eghVRm65j#*7nyYUNR2u^W(a*5LoY*75k;`iu3A^Uo2LA!u@!m4vwwy
z{oX!433LccW+g1nP2F?3u-mC2HI_zkUSGnZbf$^P;lLCRGE!~NuR_GwL$DCW^|ZDn
zvJmNQ-qeX_gW|{y0}iSJ0-DUEQ1<_c>2ylTUsS&3bv}KJJC;K8d1E+3RH8~&0BAxX
z1bqL7ga#8H9l$;`G_=+r%QM;hUOmvP1bD>aTxwndy5Vwr1h~kr*jgC3zsKycjRQxx
zGz?_EP#$F0OHr$)9D7p|lM*A03<c!g-SOTURQ#IP^D16GS+fT51^I(lbSROH?RH7t
z9{Rjizp>kBjNA(nJVw3>A@XGcSl8Xp?tW&T3Lu!(^A&3U265Q%m$eEU>0e5}nyJAa
z{EjK(J*aazp_L(e%grNV7$P|md);qLD|@JUOPWDeYj~Z}czV{t6n)B{!i=UIZYy&S
z#I5IA-v>l8>K}JC2N{K2+%qm;qbObf3A#HcrOgVu+9R%3Um07QPab?g!<gkj1(j;<
zac5%RF<0;P1eZ23bM%DHA!^9XrW{<(4PKkf@g0xZ>s(yki6<4oRSNte#E8Eq-B|`Y
zoXYLQ-<E@8jn}iwMPczKA=QlOEX~1=?C|8gw==|JGc=c$?BiF*R8Y#wWJmh=J4SNS
zHD?b@>{24VM@HF3d0+ozvlPA@t`VwK+qpk^D6uN&Pd=dGp9|F$LPebg*lKr&HE|`+
zcQ9~H8T@?p(r3Mu9kn=g?0>&D0OWecvAO|&vK6N6D*RlE2>q${TP%VhJ2TisLBrN(
z^QEUe_lMc8!VHu9ftfHX|G&Ker+;cnKkKi0|4=Z&2hYDO$eE5>oOOOq#_R4Dv#dEQ
z3+$I%-;@~&n{y`%`?OhFTu~R2Et0W|kp<5O{-}iq98jQfb6qRQAB`NHiR02PbU1kx
zU5WW2M^p~-+YK<(!8SH?-#RJ|LP64vMTy=mgoY<_Tb(^K(J3pbn}cgea%&7ILq2ce
z{8e^bE2NE7+zj$7ZIue~>(jV-M^upL&xwH!)pR?j1<X%~fmfK^YqzAbh&>=-=sg1V
zag1AZ^*_b%!r{Zo%M1xihUDkosp85Si_NvLEc5}8vw6Nbeu_1FMEhW`l_i2wSCW{0
zx$%8p0S7adq4WHJQD;JV3NNSYn76bBcD&e~AvDX8{o5o>)(l(LoOOxgL_d>#ba}bF
zGI7(3K80tTZk|u0sogQSLcTfJXdro)eX3=Ihg@UMf&tj(qzA{j=J*yCNXV{qwoWtO
zc{M3#?Xa9c^FHiVshR|HCxb$$J@dD|+^mUw7YbhDjAZlq9q^Q0SLOMm{A>~W$Jf_;
z70b{{`4ns3lX+nA3HY57<w-=T3W3hTdKV!%i+sO(Py@JaLMYsw{V>%U?q#$_9+O*D
z(DA?3c>S(Mi6)WK9`8+*W3AISR`+ZSOBfpUw10ZC$P!^zOSFE5jPBehi|&egA;>56
z{c1`v;8$40>Wvj=Xybr&L}aR<a=i&EA01A+5M&V>#tq|z24OQHs?*N0$DG1JtA^P*
zT>V5O<IVPv&Vd^#!P`-{rsT@#z2v14su=!~_eE-=X_Y@scooU!z9!P#yXGsTe^qtl
ztib$^KN=G-cF@^>;*es1(KvxdmBOh-!$#QDfx^`V=I%VV_zKnV+_|@fxAw6rDwScH
z%c~@z`WP;gmOr=@M#-%<+AKRFb0_52@5s>rHEBxRjxR5c_O{z{zFxq(LjC;Id4>}&
zdKQO|sN}vKNM&^HkK77+CTFTq?{zsACoDTMGSP#$uCY0e$D<LST-lW!e(=EhON=hV
zAIQP+0dNH{?YuKDvVYK*u9q~;fP3Pk#(!ams=VJGlO+rBBQ;IANX}>|`71MhiUAY$
zBt$5LTRyJxzTs;!0tzuC$!Nu>3#%jl+$!%R6iU7leC=jw&2K^E)DmHOLVj_r9GuB7
z*)8e2R0S<%vJI)`&ijWRh$}Ytq}9f^=mI~i6d08fl|$%BvE_4crIm>fz<zR`&gyQs
zW9b}ISV1USWA+X=ld9A*;1{=#(qGHS!jxTfIbryFhfM3Re^{Z@&SGIrnS3Da*^FLR
zk{%j?&K|cEDvmLGD1n73pDVK@e;S93HDxcn${Gw!*}0f4?^PNqcdHKE7Jtsfif9sC
zyOqD^oJcFxizYjZ>HJyIr+GCl+^54<cGL}m&>IkIeV0`~(Y%lk=ER_Td-yB!Gt^p`
z(KdrOij^;orKFgXgmoqji>Xgo!{pLFwe6S6Sg!)xOUEEX!UwZ74R}VuJ1IfQvTy9C
zV!~30EF`On+R-X|#ZJ5K+;lCUx}69l3+TZ_7Rtyt2l7tj^(fYPcj$~MiVD?zJd0RZ
z1P$mVPWO{+R<!xxaAU(!nZA#)WmU)~c>?2g<3s$nkds=zAw_w*MSVu7nD=tJV`E7@
zN{%7APxc0<%6Zg*Sipe_Ff$L}z%b8ElW9JgX%pYZ{|aBB;&aj5JX-CCh`2(QyAK%b
zAB1{+ZiMx4D<tAV+E&N#{|9Mr85Kv{ZHpoSf|KALLV(~7javwA!QI{6JwR}m#$AFp
z?he7-8@J%@b~<_AZ|{4?+4qb)#{Jn0s`{zwRZq<|*IaY)`=ohTevs193cJ4~hRBw3
zrv_?X`l`V`mgx9shMr3zUpr))`sfVq1Ms|N^sLx(@<4J``M33+w+KuM&WCJ|<9m~c
zcVj-O%3I*clE>NeZ0k#?dh9f@1(Sy;s?-#0D~Ym=HtmvH?;amG4H!y#N_UOV@a%fb
z3eL|TJS&vC{j6Vfyl?5ro!7lGHSq)UG*HV6w0ONzYAqZ)TugFG?%<1}bqZ!?T+_P@
z^63sgQpuW5Px)RQ)pgK^;UW$q197%O(U6sOy}C0kk3W^Urvlrfif1W*p4<$Xc6i*?
z>OVZ!2IIjZoRWgDgnn!cyk)x^3ID)9B6%~gh&8K*&={J7l=X$Qwof@>4w6Nl$x7&5
zxS6t95Jom!4vvthXJ-!^6|TGqE3y1BE2lyeRT!US{Tj>Av?2|T_W%<qv)$_KWY4X4
z&;^Ias<3##As$(!q;f+ej3oI7CQq{R?Kj4bMG~&i-W+7t^~_;@u2N2peQ+7|yM6Q9
zqOOvsihb6>xhNG;F8I9n^_?F+eG<r^{jTbJ{VK&FX*YN;z)pb&Dnp4#qNugRQ`d>x
ziGgD&jT;J;e~?+4pfc}382@Jw^zU@y#)j>2caQWx{$tUkm3NB~liQBl7Jaw%KbDnz
zVpm$E?9qQ1buZ~wnXG8PT*-A%)v3;C6=d~Z;74hBZn4#^7&@t*`@G!caB6bA1UKj^
zPO40QhYSn|Cfv16AZ=haJo_v|-p~W@(fMs~(e)-~E{E*XJ(tQ@IJxC1J<&(p8n3Wa
zN6*!dZL%^~o2F{*`LV>Fwj00ovsn*W>oXXHaGQU~$a&Zuk1sc_{v>zVapYyDO}HY5
z1N76GNLcY9tS!q04FbQjkH_$qr)2EWLeWp2zswkC6u?aYS~lif;$0gGrhY~nAIstB
z@ze!!vPR%hmT%oJ#y2H;CZ&!Mq1iMrGS3Gw7))=LyfGmzS{jA;K0e+aV}=R}myd$E
z%(6Z#4KLpM086hM@ejCe`*o&9y>Htv<?kaYzG-%!Z^{a?P8=l#1Q5*B1fD4w=K>od
z?kXHxUriW}AKoSjwD{$NT>;7JqXE=pZpA|-4fpS`4f5{Pb})<$4|&Kk8p1x!w|Lba
zBeB;*?N;iJUYN5VwHx&Gh=`qU921RkZV&;&>nv5`W-f5YlDKX>#)a3xk!8sAn}Nrq
zidz^%aWccecNzWuD5@q5X`#DII;$gQUvL3grgJ0Yg?a*TZ3lUx=LTb}<4mr?3@w%H
zuqr<*e7eVI+1o@6+76}@0i<FFEJ%1SgNv&>?#T?D%vNNKZM^7pV{jSGkx!VWB`2Yn
z-<deT(kDebeAG?}g%>YfP7xXcyJfn=Aoau}UV#h#T!)O#3sHY1QlDsaB#onEtAYyE
zx~mnJ)0b?QjLv2m#}uIQuSFVKWn2NHWl<>HLf&g$iE8|#CPb7a4jyVe`?L}~UX=&b
zM`i6^7!{dmd;4+C{8=DkdJ7Pngki<nF`GlTx7uJB*4T)eXOzb_vmOCxA}|_l(jU|Q
z%78Xz)3|cj5XN&pJO}a+9e~}6*d*x6t&>vYFZW+jJwRC2^z_AdPL8hk7LOc+7OhS`
zE%)}_#mSx$t2wv_N;hl&>RUoM6vA{AU>_js7re}V&J*%+3&O)eNXPtmhW<_Q!kki+
zJ&>qiAB;#?UI>~;MIue_rY#<l0yMRJzp*{mtBmhI&>7IhA=Cz}XP>mlRj?YIqdR4v
zwWU1=yy;ml8yIa1FU%!VNmehfov#x(qQhtKhX-pln~hWyjrIg~3JT<I9yIyn)tM>>
zmp4buG|<@F&1?{yh#hsGk2tgr7ci!J@NenaQN2**+^G{box5-=6O%~mF1T7+b2|Jn
zLv(8`1`n`!f{@**qI@b%-L0H~=>my}o&M<L3s=i)Rr=<1C8sL_mfRK(Uj21z+q$;b
znJPePzyrLmYprM1jn<Iu>)9uEclNapoF|_mnB~1F=K1mAt(+DsF^l5E0vwbaTbYWn
zzD6SU$K7)6JDYS$pUg^|ScQ>^JGPA1Ib;-2%q+K7ua%c&TuhlbG256aybVSBYWv%u
zuka+#Rx~_t5j6;@`HHz0ZpMC3Z7a~&gf1svRy5n-wZwv<BF8z2&?YQQqsS}{SBB!(
zG$JaJhd1`vZPL2;G3@u%M>KYhw^7l;+HPSW{W@aX-0l^7)p5fusmr65pVJCEg?$O$
z$wT*{Up%x5gjiFVl;4F&m3^lpF0)E~C^!^9Zz7yYu@b~rwN<Hh_X0f7-h2BN4}ZG{
zefBqx<(D@(aeS++EiYr*7_fw-CP`i9s27&TN;3~>>Pnxadj63dcZ7h;t-;iI#gk_U
zX++751lY>q>BSa!=PtMKqptWKd)`ploz&3H=xnZR)%E;LjOxa;TFwf>hTH30EYrUH
zbV;zfWn@nkrGNegAGvYHk-juBsvgHvFSjP{kh3%ez>mUbOm2hPy#BdWlZ8ve3>}iR
zHcWOs3w8xApEw^ad=nR%CW7H(lP|#FHHVf!6lydRoHRG9bn<btV|F#N?x(WnALreO
zCSWzjbpg4?G#&hUOe9!I(W7%8@GP&b=B*tK-0^2|K+6yv!en;i{wXw>XX)}4A;t4n
z(~{hk(KN1+Y}4Pqe<^M}XxZ5+3RO(NEIZrRw|Z%Sqc8mXw!1Wvvl#4eBJ8DW^p=G$
zWJW)jtMn#b{<z==7lqfiS~R!zoB=n5CN~J+o5cs+a|KAsueF9qpL_(hiA_ezGg8Xd
zUis_tlc)FbL)TCkFK$!}2)Y`SEfACh=P?@izukv0y$+C}IEC*dF`n4nNRy}jwkxD#
zk#D)>-~{nN1;r%*-X}+p6>f3^6SZ#x(PUK24)V)?2FbeOnovA!BrSc(8;ocY5f%If
zP{ws=JQIbb6x`YRj)`LdF`a5p8+i}WBk}57`NZB?T;0*RM@{;TnjHE>8tg}tGh=7!
z-<EjMtr-`NP;AeprW~IH@2(25$o5hM>yPjX>&)xLf1`RoM}axz6%u{w^Neh!tYa7o
zsiS(me3(bkEK|c<tTW-DQ<L{Nv9MuZwhfqOT^!~cTo!X6P3a-*@7>Y{3h68hK3er5
z6)UgotI@Bl%`=(ku=vww)f~nPk5phTR8f0Pw5mfV=<9f|dafnP_kVScb*wV_!Dxnv
ze%t@eJCvKSct88@NcP6~s$)l<#5FuVg=H?8yU32)F<RavFhyv%|1_49r?d}=pkTax
zwUj)qE{T@(XxGDXO`@%EtuG!jXFJ_vwyeUosrkBO9LM5-M;rxN*t5K3Z(UA-XS29C
zL^(6>Vb(}<QPqf@5@TcQO&<n7N6K6oIzq>O`d3sHsoMr(`Gi<-P$yCw3@rM#<1cH?
zDh;b_zaiS#ZFL*)!@73Gyz{$iH&(~sNe=4_a%)!gr^n<r7e14-X9Dw%Z+RwFA+D&a
zyN}5VZyl2&dc16KmsvC>dU*$FLv>A`yzb2SCg=rG5eGlrt6WS*MVC~&F~0`Y@mYTV
z%Jvn7-RtUrRA59i2I(AjW<hXikGrrEk&Jn9C^7!}`5~Hh19Qc!J&8m7M>7ww#ytHg
z=SWeTUe~+K_$K(R2_3WJx%f&|G^=%ahLal6#B${&=+)+-ach#+&9<~+{X&!dS%t+Z
zgj(ZRA8}q@m54{<^XUF>{C$g#vK;4cZ)`}Al+f4;ODBFSEpT&JugR8Xq|zY2G+Ugw
zARt0%eFWR@n~}Gb*%Dm1eIe^LETDg7^Mn|G$IJ2WyJrkqz#B5-qIvhn(o(E-L1zS4
z4NixmUiS|VXEo;Is*x;<o|J2yWL=`_YZWKuE{pQoDfoYlR{i}csr@Fpm0NLiC!^)=
z=k?(lfbj!AlD0m45IUcfO#z_jjq~=GO<s0COa;Y(b(K_^68FYZ*0Ka#rR>mD;Q+bY
zS!WGC4Y<xA<~%;?j<g=}9ukW>m?T-x6;yS9YbPhO^RsG!ux|>%uYMddYDD^l1}91A
zAn0<QjnH8=jLH7Q;YFu!A~w~)^^$4CgG@nM59{0f=J@nV2YZ6}k)t1IHonUDF`#Na
zp-9;xDE4g}Ckz(zkE`6+X0Sl+uH*->r_{qNpk-eHs_qu>UU(z{XAV{1*Yvlq=6O_G
z@wpSUP)HtaH#yf!CTtr=8<F)zT95NZi2<~_lSdGAX`aJpj{Xn<Y3{2LfNS_w5^-Zz
zl$(p4$PrgfCIcR|B4Xm|V-Ltb&s4%q(96#}prn5>44B}j<M6}5%|KF=KvS-m9Kk!5
zeJvBPT7D*=oe&iZDbO|aR$C@APrKiRKT*B0<_@O7*eZmn1@NpPXQQm{l71!^4I-eW
zobC)6wkRir&p@*K=;eSl#xA<D6%mkEQ~EptoU2q_ZU}&5<F@XgR2H$ZN7%T17;Xb8
z3sw{CS49{_xM3M)V{GOK)rUD$WR-}pG6Yahqj*!M2lBtKMi=|YDPwp~n|DsMeqN6@
zrjd@KaRo1?1jx2`=^f1O8(hpW4JhL<Yk4jFDik!9-7}aiddohb>L|gi8a0y*#2c-}
zZ@ZD0Txi%T5y^u`$bdHuM578^dcn73-4QhbV~U({6i<fSu^#V#aB3T1C<Wd$yDa@A
z@v3vp+Oeg!>^n01K-oun3S|lw=KUd!)~Uz*ZQ5IFYkfb=^#`p@`&eU$8%8S8@ZF>Z
z4Wo+7+CZoD;yumMGfYY?m~<S<)Qj>9i*Xd;wJw(8tT)j<)_RnwUrpJcoz;X}v!wLU
zGb1^062@ubo1$FXaSLF<k=&}^VGiPPvx2{55!Q6Se|QA&e7%59B>N8KjjTTVTq$vB
zcn#^}r4p-?PjJjYe{m-*a@1%S(t*JzET_0#I3rP>i}j8W2{!&DaLs}|lL6rd?0)|`
zekXIJIUNmJBM;iH6EKb<C@Yj?@CHQ_Y9mItFjBF1cz=J?qujcH`>3dLHl%`$gFKNG
zZQl9QYI`@4NQKcYN_XUUF7x5%Q(dAl4y?z;iPq;fl0~yVgSz)Dw*yZG3~J?HQ^PI+
zuaoaiTy$$ve0QOeaVTpx3$pV1!wUA%9$hmFy5W;RhhU3ns_Gpq*VN`<y0k-Q)a})B
z1LX^(e(Y1S;}KIWaS8nuDMfirX{DVE{ntc-PGtGB^yVnlxGO#LoX^*9_rk>-LhdEU
zNCAW030zjI&2P(aG(fVTOShAlHJT=$prJ&^znyclYx=Kbm$297rO#o}H_p{(p+Q!e
z8&(3-78W^29*0#!(@Q48>|{Zz^-GMwZ0yQ$zE-5TLuG(y!f;({_$<y9^i<~=&YX<)
zuyRA_@YtVam_!HdA>A3QrihyLDUiD6k6DYpsdSk%I1e#2tA61V9BE4PQ6fo~%$;>1
zSnA99%OT;%CR3?tV(v1IbVE|`O}2l^P^s34+GuN5>kuZ6XI1vWaFl-CXlxzO_F*Qn
z>rvVA0Wk``OmDTO5`>3InVvm?q=sO9NuT$a7+d#acuz{b-i=kWS`Rv+K>c<c)bzdj
zimEbq-oKhVjXcEWDuOjisAi$onV*|(W=CiJjNLOMX=SjxmL(`5#TBq>>5%2S%T$6K
zfBYPDa^rOa!`Yo&Wq+7|67NKxuWki9*Ao)dLkP=$flS*=KAoxXi(ZaTG2S3$B6IAT
z&65#1{XoKWcOv@BcZM<?WRr00L#P4gc4|xyz6T5xDav(ZHIO4$eM1~WI(`eae~gal
z@fL?18Co%)LnNb(lUKPnOX1E%ViEcDUZnmvO@etFLVF@y(Tgda;cIXnkQAYI&Ta!;
zoo%Tsfn=z^iaV@VwaB2{y70F={0?jXdycqweB@cQW7-iJ1j3tNP{Ru1lR%UwtyywH
zw~FZL-GM2*Yt!v_6?vG3%9u@_whA%6uLg*g5@fnwOMQ*`dWDgy)3Zymvp}b*cB_3Z
zos0B$qj!_sN|Te!?}f32uk=}*c~$P~oL_%jy)?WIkB*+Hs;j0>h(0+nAFcVMhn>2!
z-Db3fQi&CSp7rL?ZGaV$grh%`P2}qzz1zzk$pmgD!nqjB`mUc^Ao=Gr)lWIxLaT)@
zU;1Sq^RPP<*Y@f=7?HvpPBna83(K_SoL(}?Y?e4dEC-jp0Y0ZebgLs?m-efC+8+h#
zg`cp^ZES=KzVV&Gc)U2DAsU<@w_|lU#<wmpP}h<I)c^GTMW1*1*m>a{H-)s{et^DX
z<`}AetPT|5{acV=0Vq=;Pzv-uC^bb<_Sb}^0qNK7Gkvm_U)qaXDXU(@Lh+#3RSqO8
z>^4mT6JjwomowZBxJv*)vDi0=B++X~f4<_koXQ^?bcm(k2EkZZfah!2Kp=QT{y%Mn
z7<~WQ$^ZQq5{Kx23apS%y30p<nDT6Bp9$ccZ-<4-vp>@iVIe4?c{7R$RtU!kLVV-@
zId6v!?yG~;iNcxcR|dX+{|ND*NB=W7^Pk>DjNFiaJ>LI(o)r1l#{JLnzyD5?`uC`-
z7>E{=jD&|Kn)=CX<r5ehV*mKe67Tu|E4v5G_xtB$ckq96K3?@yaRK|Vt9ph`5+<fP
zCm&=&2g8FT-AjWz>z57HQ$?GaSLK4N;n%xMsoopj{i66ZU+~Z=L;aPP;vx2UTwQ4j
zKN;5RQr=TT$C_9Z>Q@<`q<IcrA*E~_M|B*k)wO;x&O>=~$_rncR|-WZZ&Fet+NI%f
z-@0gxWzH2`*Uk8%oM!ugT5jS=$GweI?})>lxzn;GFUs-{lMiqqwzHcoClZ-y3!SSO
zrX}~mkA)X0Bf-}S`Nt0_wYv=aq<?STA87uxXIM~Oo%xW&V8x*+SG7Jlxz1<vj*z3w
z$SWJoTeKszB%VaZl)$$2#`BxZO=!uY)rq?<E+|6xb>*Xm;_YR!?=!jRP9&an_C@-@
zTzL(X_miiOPb*$@KJI<myiV?J$BUdSCwTo@Rp*PNE#ZT`)yt>}n8EA%ZNM9-zxI4%
z^0C3JFZx}LIHmrlH1gT&o2SvPEjWJvmXLgUA9rQDL0q48Nj5#4U9*d+!!N05ijzP5
zjeuTG%3H`){D219Bcf!#Tpd0QpLmg|m98H}DYnFZb)+(>X_AY93Q&KnDM;aeChm9~
z#%Bp5V0P&!4=0h!r$~#Zsxf0Bqz1G_&jg#9$e!2Q&YJa_u^F(XBI-6}N;o4dp1V)#
zn!Y2X9i+E@A<#!Mg@N%ppSaR+*S9WUYaq&F)A}2`w$gtBon(4)I1otaBbmGS#Z-#C
zfJ-;lBQNDftT8koZ<!j3_uCx*S>{~!fcn-zccdI<X8hRB%<_!Ol3XOM;VvtmG;;VW
z&*`%f*37np`<jbOI(<$}YdV4Rd)C4?vGyfz!n^$7ncg(Q&hqV-qD-qXi)@4oWS%sE
z_2vJYSM8jUUW(ODr?1YvAsL8E0Df<>tV)s2R*jv$6eT8uNT5Kn(MwaplgR^I9_6)i
z@?ZW>I(`%5?hRpbpTR^4G_p(|C&2rPrhsx8<Mev8p3($P^Sz~;ttt(@8DdIp%C>n9
z-pqu8LnegP-r{~VSBZ2KD+->wASB{*N<_lUZhY6VE1F9$@A{0%FMGLDf@>(@X~?*5
zLO7OFBMubshr*>TER?Ls;2pZYi1Kj{oP#L1o{tEyani1+|31Ed9%B;K`ob2k_9CbZ
z7!CxnR^crmlQA=Ovj~xRdFKW3cGv$4TUv-LA_x^+XtnwnE#R0l^8NG*_x@DCJ23&Q
z>saL`;QKU@Mo;M5vs_tXR%+gTbS&P3>X>!aqo~5veDSHHb@ry}Gc?(yN-Wy}1F7|6
z3_(2Wbmk+XKLbH$8rSgddYrFcgG-X$+yLm{ezC3Hvf$)EhremjZ^#qoaE?)5_S!R@
zuAP*o%6Zq$u7$5Q8(F)zuul<jgj=?*hR}wX)7@2*hW<a)83NDEYB%q1PgnRA<bhvs
zWvPX`;LHZ`O4hv3NGhFf=OXpmZ|wAk6vyMS(z-I!{OW)_2(EUZk#-WHg4;GyuwA5S
zUl<-i)bS=d7rk3Q{Z5H8viXwF4+B$9@Y2c7XgJq6Zx0x;>8O3~1F_WKo$=2gih-oM
zjJbXnjh5Gjie{Mb<(f}$!3Ofm^0&n4MD?@A4lhcSPzd}HdegSPJ;4Rl`R%T_kt%_s
zT4D<J<hu-n1-MZT-YaXd7>E5`QyxfB?Okicbwyk2O$lo+8xj^579Is8T>(J;ZIWh|
z2v1BmOze|?7@-FrwH*TS7*Bf63YW_FOdN&>HDhbSnl+Q{R~?j*ntiN5oL$5|?6#>N
zWbTtn0lXO#+1c}|8)Ygh;jB)t%fD8JfuC%Cd=Pg`3lLgs;St9WBQuf)B(;u9RMsF!
zm#NTZQ@BmR#Jvx&oAk?_p3vEUnrNPc6Wdyj8$1Vp^?VfXkX<d?`4aRQ>(*SXZd<wb
z-QF?czmqyPNt(nU<47v~;LCM_3ToiCZmR>pTEaTzh;1!|1lc9kh~Zt3aWFrrd@WE@
zMxR;tzH~Pm38$Xgy_`Ik9uf-|vM$LF)m0t@*WKHmx_sB@ACaQ0+WFX0Z*BT`qV%(4
zc89>*_Dk`F<R|weLLkDb@p3&e(Qv!3ekit}g7+4^1|5!k;KvN{|NfCu!a0Rr`0w02
zHji<~zPk?tcNf2&)bVn+=XHKr*xv6A_So9lk<*$&ri(uQc&ox-(&_Zb+pwIget-3)
z^$OlVrA!aRkv80r+T2kwK<o5gO7~GrC!=KdVocj>*26dMhy*uCRhxewwWlf27d2?d
zBw%1*BL^xBd2FRdM^oxukh6|-CT8dhS;=phqIkR|S$!SnwGZDlprwku4OSTma^{-#
zCrY5Gx~aq<UfEyFU73v5Z|U@)BW0Iu4gTiK1HT4)-CYDOg%kwK;hTT|uDV)wBP1r)
z;PujK5m@46|C==$ibpsgV1YL&-<2>>HH^@Bi~YF;26)>>q(6E8qXn3Pg{1jnTljJp
z0cN!pOlcZsWi%U8U8P3zE?#0>cK<`(W7*-=Y0}yiHGd0ozQlPswx-`rrIURc;9y{L
zg7ztU8Cbj6F2;c*jh9^lr&~_4Qdu*w!fiP>EOk8|;Jm~m)`2rf+rWdWNltwVQ;D*Y
z0jxz+)$5xmsXdUprQ|JLbDR`0M|NPL2QuQYjuEY2iT@ERLeqpP%Zfz*4)T}6vh~Dr
z8akY8`m9V^BCT$<hj`V=!%nq~(O3~qrhw=3sK8cL7b@iGA*^o(s~c{W^v*_EMjdiU
zgL2mT{seT+=0_{f6p$&-%%@b97vK9x=!zdeux9^9Le-j;RKA0T5bXx?>Z*DAC>m5<
zl3*DU6=w>%=JojYH<(alv5ASv8$59S8>z|_d%iBe?(CY}9hNhR3RP=V!_dsDsqpb+
zEXlog_x-dzMe$gp!a;fE`?DKAUH=!RB)L=NB{33(yo7moQS52e1$Z#vkkuj+RsdbI
zH0u8jaBnC1g8|+A{$#3uR?tI1i}dpFYZL`CNapW~{;z24zc3!eq~kwRbp9OmzhlNf
zAm*QQ{a-;Jy(nZMywnk4DZRao@=ttPb~B%qw4YO88wd)_{sZm)T+b$RK84;xJTI3k
z%0nStJHR<*{N{Me>+5tw6+LI6&3%^D>wM&!;*-DdZq4@$y2W+Pvu${7%;ng9&3J^x
z=enc*eD%cDeJe}Hr1>_mr(9AXHS494*z4?8is|ZUHd<Zt#h-J{Gx_%A$@b~^r~U5`
zpkg9N>a2igl0>i=XYJ$IYVUZ`mknahtZlbSX#RJ<o^b1{SX2Zy*%HNK1QOTYK)MA*
zU-|03$o&4O^KcH+svJ$(mdQ<o-8*CK_*O|ErE18KWxTaD)83}1+!T^RxFxcm!zRa>
zf<NL=xeZob{P4=SxB}J&7_Y1;AdDGUOM-9b3Q6aZHgPM-m<6G+43gS<!=<`OWQMjf
zAp*5Meo*_BHNN{RCghC~|Ce@fQ6j+v@~wu(O=mfLY`{(%g`c=QB~OLf{NKPMFJOPt
zsqnntvV&@N2F?$H9nqkqjfTfnH&P!sIv%v?4YM8@pN?KVf-iKBa~r9mGkL3>X{W{1
z_pO?;Y<eG5-OYtrPoFQ>Vs`3d$^|@u^mVV1ucuQzs*=BRHxVsHcHI=`$!TB(`oEfg
z253hp9$~%#I>O&cQ*g?Wh?JO<+NaLN&b9ET_DMZSEW2icP7IV<;4pFIFU14Updf5n
zjR%>bxAug7PQ@8Zh(L$Tvma3TZ8UlwAH?W7x_JM3CTB1MTcN#{Bn0G>Rn2Z}|MCUy
zdbFq1H1W{P06g57#A-*(g@CYSI~L==^A6wLou={baciZbZa%py<b&L0p5=5jKz@De
zG?G#bHRW@&M+D{^C^mWn_G;%}c)NPjQ?V9%BS7}uO-llx1W|;XM<NbPBn)4-&e_`2
znrOkm77ILczk+zO#t=+kPXKj<=4`G89BG~q{LB!K%cSERzCx;9(8>`V@5?0^x~3Fo
z$i|n2DCr(rq$OK({KdHP3%PhI{+Ep$bU=op%%ZC2-S4Et?_7$(_AZm5%;zskrY8Dc
zUnsKwQRf`Tjgj#i7qr(x@XqnOLaqh6C4?*}*r=ffx1s8qU>>U5s$=xmuGiNaY7Ln9
z6yg%XPsJFLT6R1@*HV(n{?qx57=2tz+JdH?o(j|P@63&fCNZX<!F4hcYDJlMLDxxQ
z)5(#E+esYJ0KdBoLjAunmG}>pRom#<l-nI?FEzJ*x)C<kCG2QT*3d3aQ8f1St6u59
zWHFBV6I*5Hh8z7wh~pA_4hPm2Jja;Te!rot>P$bMWTq@0gnj00evh#Uqkat$;+=0L
zTA)3xWhpXS8_1>7cthm`y9|X}cm!aJHnCT+1z;dx1GNL?u9PbBLN7~pcl~jc@=PEo
z0iB`E{ReM2s>}#dy>#V9U`7esqpZnn9Q7RlG7qq?N&8WPGo;GwS@`1$v4Y{p$1`0(
zk}cUM{;)AHxzfUiH*mL;$nNH4Bz!mr4vda>ch(2xIwS7-^c8z+J9h2C-xCj0@P7wr
zpsEr40yw6`18-GCK6_7HNoWlmQ2YFz@#_;;pA(f$AM4kjnr_8N8;{afHHX%s<Qqk1
zUTk$F!m@rNr3(&#BgYSMu}75ml+)juqb~OUF91zQGmnSEkkw<xC`MNZf5Diwy`4c*
z)`${2E_-lzEQC^*hsOTZVi`X3Ef<80or&uyX=c#sFE_kg@LGL3<IWKLwVAAD^+zIO
z>=vcj3tG$pz|K8XF0|}P5qOza>+b+~oh_;o><==Yjm%Ew$<VU9lNSjasyefS3ngvR
zd58MqRFodvGCi1+YB_J>Dv(SES&<PPXS3nyWP%`Sk%-z%pLJ2K1Z0Xm<m!Mn>7+6J
z+GujM)TZ-AhA;&?(w2zifu9P7xd(IRH(BF(n7I9Pnxn06U1tQhR>l|Ho5R+7`##Ab
z_K8~O*72sXij6BSnDmgHA#yN;_hl>Q>E*OH{-6~301a<Clcd2SOR{bxi=0gXu*bio
zd@z_0vb;x)B59WFgY`$DhmOaI=cUIAB&bR$ZuW`cQ>A&V&)|1AIrEtR3TC8*lb#Jq
zNCP9jwG)%0+G&WYe)W2n;kQH{6-3R7$O_1<=ZNusVH#k0tUR#Sm%c#S{X!^THI?cd
zkWqxJKXLJ<;TM$}izx~T1A!UM_U5EvzOpM{oV|S&=o`Y=UQ;47;OFdw#!z2Rh(sv|
z`qHb0-mhB^Wc60y{q9z)XY(5@#`kf!EcE@D#5h0O@4oZRFG;9fvaxy-E0oG8t?-TJ
zOuN^z3hKIO3?=mvtS%=?A}<LoFUmWw?Lp1k`c+qqa)=YBoTp!XqAh~k%!PLx#f~x(
z12xYBw(%}M31sMWA$V%4yH&mdtpOopAB}x@p&<($-Rm49$6E9P#>I`~W8gZel?;JS
z8{XhTI3wlk4<A2jNeaE46#Lqb?v4+FFNZO6PC>G@W2qx4oeNx`W|h#`7Q7tTD`E3}
zG?kUv!Ch=?!MgPmr!0Ghvz%Mmk$b)J{ASraVacXvb?Pi{)^7$cP>#9YJF+*w>2&TK
zrQ(VKHl0tO(90>m^m$ocjwrtJU?b>cbMpcBM|9<}MS{@?0jM|BLBC6;?M5FHILB2X
z(|pvdi?1poF3dK;gtqZMl}8D7{lRI2&$X?4%ftmGt-eged2`WRhw~sS6$+m5+sti%
z!P$g@mlaRQr3_%8Z2cZiVtbn;_m=@IMZR2W6bU?c4Zq>?{(G$Xw>ah6-52JlUMZO(
zqa&ZY(>p$u%ZS*eAUMMX;aOL!@m$_}weUf~WQRgaJ+t#K0VUf4aUC<=gPSlN7QJQ2
z%&&#LhS4r>PK3GJsA_DUzr_)}bT5KJwlM{Ec^i@>+AWq&NOmq+4*f7|e!KY|fX0>r
z@dM`~NEJ=t6r9}<2EuqCZrAVxoansVHWw%LGns?Q`dXFTGq7y&FZVVKD$W}?4GE^n
z<9P-HWEY+YKW03@DA(zK6KzyT%3tlEL!|C$yGS+aV;DM<WY^k=dDg5;Ns4WtgoRa_
z*lDk_1d6KJawDUeM=V=r3jwMJrI$PO4lFO~$S&UW@8LBC>?qEpFJI#9J6q)93iMo1
zL>?`8BG*9jSnC^ai`fCt4Ha@##!^=r{#TUvx$~!^LGTctl+=|$QtzDOS=+NxN;)KH
zQ3j{O7Tw!Vulb^4k=58`2KxAHV^vHk?M_To+!}c&TxPs4cr7M81m-77%bHQ7-4D1Z
z3D7TYNRbrW$2WndMVP*A-w(@4MzlCEN9)>Jfs;QN?D)safMU{JJ|IsxRwW(8ksrtF
zNA>7~9E<WE71(%<yyN(W>Y&c(bU7EhwhH96Uefct`>kJ(XLFn+(ZMvdQj6xR?w4%Y
z>pYL<K5VSPSI@2p$G$C<Gbrb)>xNRlT9rRVHV=y}^XK<(`{gb?j{X&}+zg|t@Cn3A
zG$1z_8F#jO`TF9ZFO9)hdLH%+aL?Zf9jtSYt&%K&__xrDq>io+Cq;Y8Jhx(C$tG9X
zunVXBOe>+Rd1+O8C+&{NS0R0gKR<s~K@g5hez)cvb-OlFpiSC!VTv1*pb635gcIpO
zD3B~cAs-+Aga8OWHRv;dbM(ehokp&L;m{;cu6TG~%a&q?jzCk|{%k2`{XgnY`ph^2
zR}uLpW{ANPmYv|mD3R@WUi|o;ljA0IN(-BT2m;gN=bc8`F%PSL$q^BT1UoAI2>(sm
zrklYH3}e+yP5)_3WObXzxXOw>`ALqmJ>s5CL>3&olBK1~l|PD#v%LRORCs5ZTk7_A
z!w}RWLIe+=E$UEXOe)jswjDQIh|>&v?3?3cU9Q;-^0XzS2t^a*Aa8)QV2k%D)_!$K
ztzjISt$Yei1aB|PcKQcIZ+Pdy+aBj^CSM-}f$qP&gemr1Ut*;y-qESGeOI17SoAI^
z9CuZEz}tj5XmmW%zl|!UYRC@XhLZxiK6B5XV66$zS`s&-S=TD++Cp2g73mh)jUnZF
zVP9AxEUQpq!|fFBy6MXcMWP05<;mk_=8hPM><}z9NSDoJ(xuR^ysrF50AhC<h9p%v
zxc*1kkrl6F3O}-~Giuadh!?=tu<y;L&zdCvt>~kC^=;qoCV_@&(?(%2J~na0>O^0d
z%nGZ>Ul~qT?>+D3cL9r$1nq@B?8<*MB2jp5amM?Jrisi>kkEH6cTF?T&&>r=SKI_8
zCOv$!;NCoADwZ!1M!dEEnsr64BMI4vqi|4c-j%6!q)tZBFd0|7E<1-2Yyn$7;?GyM
ze=N`T`E@bl{&lPJw%_m=SsGd%ONlrSk3F5%Ji$(-wYAW6d7z@X`h&Tf@eUDpcmkEd
znUhjruGsuhgw2naqSN`g$97d-arm}SB-i{qaOBBwOqp7_Qzc8vK)$>yo8Op1j&|jy
ze*xliAeu;RO_b2VD($v8$4zZkh8M&cZ4Zz4iMwjnG*+1><F}pa6bmmtF<7>1)#5ky
z=ZQZYj6=v)Q{>G<y+-w>m{KFp$$`6-mwBdlv=jGFaBX0{K4eao5Ij=;Tgba687-9{
z(oDG3Ue#E^_4G|+E)<UR+JJpZ)Av>l%$k*z38)>eo#OW*ZzoH{Sr_HqgWqS{=43Y}
zR#79qX-2plKA!fVz!*$>J?Lfhbq>#^r1~h_wjqn3O~y7uXu+t+J7bLSub{-|c2iRs
zA=@Nd>OO5sz*tk_^Z9fkXp@Td*Xk?(-ob;fq}1Jlo<<En(Nn(x0lQiVgH_tBkpP`a
zFtG4m$D<tFq%O311@IzRIpf4}EEz*OL4REYsnM<X{;+v7&za>-B|gte=+40cb)1;W
zFO|0PuR0~|_@!1_AurfRDtmd5>xN;+KM%<3&d(@ax^;Prrtnn7{nSjSLU$`EfoN={
zgv*5>^)(JkB|OsBhl=m<i+cHi>@SObOx*one`PO^+R>SP9lq|qAiNrBR3~ps_j)zK
z(dVb@v4~NP;Y4&7$F{n)o7b&1z`~&~vg=C_Pu>8F^$q-cDqWNLRl>l%a;dI4r;xVO
z%wyL}sh}SrIHu4DkJdcLLv}+n-?^mv_4ymZt?}v23^KP9dqb`}-nGvk`hk4kPQ=7W
z$JtVl9^a)9gyUZ7s)g^yk_4<Wt}QXTURwx2p+`BFpr{~VTnH|egWD8E4ZN^2GyLDM
zn>y6bNv;w0e-2C#Md&ki1u^D{_<({iqUoD}IT)MOikX?Bd4^bWpG3E;nbuDPg4L(V
z73Q~N*3PuSNKzvIBm0$oU5X5@r>N3@{shzdQNqUuu`5xP3usOGn%8066Kv|C<9jJY
zQW%lZ`sDifxnakC!+|;{oRdjlDWub0uG%N8yIgTTxV4`BU(v^kl$*88HQRz$Xq1<o
zP;2h2u++N-S)YDfV@Um?MF7uj;wuYBerO92Hj7?Wi(H)GRKi(ku&T0&7$5^DW~%yV
z-!K<lg6UN<PT%>~X<M5@jx#EOYope*U^x)Ekdm8N>-<&;R<g2S6;}F1GwgHOr9t<I
ze68P-CrrHX67@(aA$OhzF2rz#CGVP?VJM^U;K3)}7q>s+CjZGscKjvH;=ug&E!C9b
zbVu!kMNT<g#%0L3!tZsl#>$Hc?jzF1b0AwFlQKSVr^j|JwF=NJ-3LB?i7GGn(f!pE
z_`Bt@Fv85i`hSqM>{l_~R)5ox_ouW#LgbHHX(?*Zm1XPPBkFno!(I_uBR#_z9sR*;
z#p5*oD}F&_W`taraOJ|VMCCl18l#3a&#d}9z+n?j`$hk*7(tgrk7lr--x`Ir-(#^T
zISj`Wq*CSgwW#iO#efl044a&08hTh#A*Vmgyz}kB`m^oXEkxLrH+@}MMc@$5^EQj^
zooxo+R#>hdOxUcr*y||zVlt^H520HbVJjN^T#|G6x7#;Kqe%G&H!BD@!YPstCHBN3
z1__?79!N+KjZ7M1CU-`*r*Y2wi(r-kghmRC$Ns~BN0q-2h{={pq;f~@<YiO=HHsPT
z;_^!N*}SPZU0nYsK2aBB$*QwaKHs*`?2i08{+`~tN%d};)aBNLZFBuX;DLO3rJ?G4
z{xxb<OX#7C)7|oy7&$x(hlbQiwN5l)EsouZ8-FS8Q;KfBlYX6s88uyQPay{LDc9pP
zE}fqB(9Y2)L1&R%*jV1crfOQ(UK>fxg2LK&mj{~qC^)*WKS8o~za>$bTKD?U6Da)*
zC+HxOFI!(M{S!De-9w!lEBY-53s?c2?A@b`r4xtI-Jx=~Z<!uJp?HG=)!|!#nRXRB
z7aN#>qE9tDxKU~ms93sy?jTUk_(Cb~*BZMWCof3f#!|^xTkpoD_xP{UuM|v6ZRs;l
zkK>e8%06A8wL5fPyVy8-eHP3LH^w~c14q}x_=gqU2L5wXv|2PZg4+|$W;J-`HWzwb
z<2uIBH)&Wp_eY;ZaR_OSs|qD<u!-CsJu|q<cP{){|1842lw3`EJ8MyN>8*y3*bOrp
zep2ky%rKq2>y$=jR}OgtGfb*};bf{$!ZQi=r^;t)#~D3#WrzKEZ>`G1gWD!dB2=}m
zR#RPLW=d&*&_)jog~&{cPot;$;5{srdJ0R(s3xvI<dL0|a3MKuff3$ek75@{_2<ON
zjt7+vP}eTJC1QiJj~59+p##=rs_vFRVct{mZ`+w58@qy-%B9IDc8U2J+eGTE-<9Ix
zfS%npn1-EVKp-6ZdoSu?99t7w96G;hwo+5*r|f6jiCZj(Q<Z8Ocet&v+liU~QcI}c
zPGQYBB`+=_gWu|Q_m{^vC$H4Tm{jxCGNR9p1>;lV*_GAQDWPj1z|N_g^6T!7>5Diq
z7qKiOR7{h@Cylr#seV(^`?-A-@+i*Z=qH67uYNu?u3*?V<rMPFGyaVXo#dS`@7F&{
z1QshqvIiz0N##yl{RyJmsqbS47>weZ=v;uP-7AON^Kv{uIw@3)tjJ;Y@uMM?rwxZd
zt`=IlNfu8bx?MIY;L#lCfU)}0Z3F!v*1Wxj^L)Elsh)Ji<I}yzmGfH~YqnCIRH4O_
z+k4Q7z4vNMKrXmtZY6`-avn3IBV=Wsz$nJ&jWN5@D`B%O5?OCxYFe6ni4uCNAHoZE
zG{V2KgY6Fh{)ii}NVHABKBS9roW{nao)@GQ1)&Ch^bx8PZG7?UV~--HdGO~`U5Tz%
zh~kSTd?K48^JAdN%nnA8<*OHhk$0ETdyan33}sO^lc=@PD}(r6TpbYt9%Owq{}8#k
z0)M{@LJkK@sbD=_$EHC{`~P8j|Gz5&{{M2&8exKO&)v@TmZIlknTB3`Inv7ajO$eF
z^>2khksQ>N|17AT@^6`wRR+xG8pBc!vj7VRRiVHNJeikFyH~Isk1Wyj84cfPxDU~7
zlWRg16p<bZx6<PFm$$_=qubn_ymdRQk&f^iawJI8)fw3SEeJNx<32@dSpy4M$jm<*
zvHN_gP#2NhR1;p2x?k^jikha^F1~WSC-wCSRhw-?cX7Ck*1TWoOA6Ulf|P@2<qE$&
zO>)h!l7HrL@n?}*%MOJQ%7k-bvGs?BQ>iT^5~<`{U#`IJjV7d99!<)rHGe7iKO&3G
zG|-fWwvc6I#{v;dO4jz5;}y*WO_Es)7}V7*oNE0Z$$o@`3Dql~acO5+8qe2b!!QDD
z7*pQSIT^;P&4<eS;@*JrrXQtZYa5pWiIe+8g9r4L)%W*K?GFvZDbR^NY~#-ldl98P
zUG2n=5{zXzgJxN^rRi5@+|zDbb!+h!px03=5}hj%Tx>acLyiHNld>Nd1=oOt>&J-l
zf0P5HUt{zd&7&gz)f_<oD-`)#VQ7aVF~mevP_^Tzd3jf8(NDqT_b^>~$#_ur)B|om
z<=E9OdMCIQY+Hm%aQNBcIMXYQw#mEv{lt11`*bL<KTKm}1^P$zxV65=&g0X?H6s&0
zQ?$!K$%=Sh6K0M3Cn0pI{@zE$4EHb>VffdSy2L5)oLE}n-@Er$((<HdCXxae3*Q}q
z#Y!PLZbL+hvMGW(6IbV1e{84r9q+IufMv74E?<jTvU{a#lf)dK<Mio6!No4j9lxI+
zckp;=cMD_uc~j*6+*WQjQn#JH)|cg?lQRde5lCVhNs7$LFXJZ5ovdi9xO{*1{0*Y)
z87oRnL(u4iR=Q*H+`_?uRP&VvBjd%I)TY8DNyil#`{Qo<by&Q2tL)Y3;4_|!vg@9Z
z!~|Ntir)T=cpY8M2oY1>K_q?Ev7whRrbzs5WkiOok1D(%f${!E6b?(M4=#3YF7u??
zwD}R3>F(KVy1EbCH`dV<&FO=K6aA7ve}oa^t@|Ey`q-}gt>ov-qnLsCFN0jc@XJSD
zIX?fNp5uJZV@(Yw_bZO$$Cjz<(lc=bK$c(7k^Rzxkv&J;>HZS9Uygce@bqV(Ojyuu
zOmqqSGRYh>cd#Sj%alKnE{=Ak%}yo#Ejazv8m+B#{;GasaRKnCJIb_e`LxkcCdu~x
z-6Nf4)-#tJ&I>Ck#7yB`m1f1|QmX0Q2Q#|iIsSoC0qWhoSNj<5aVD?2KCRU=Qx0t!
zA;k2q(hjdoQf%XMTLejF+)TaUBrou@Fn-Nd5uLhAV1v(X(by%SQx7}K`{*aje9px#
zD0!)=O#1ZC=3UNrUYTluz}(1|Uq@9@2iswmJ;tk=zNy@^@e7Hx?sn4Lnq#Whw4*4F
ze5&=YiL`zOZ})PP74baT(}w-y-32`pQ4hxqghl({8=*KH(AtKROH9%~;#AWx1lL|^
zZ>t%<m;AH2{5XYm=gq~~d?`RSc*2uA_{O+)KKaJmm|5A5T%Yd|gur6#(R-ZrEyFR`
zRR9pe?truf{}W=!JBqc7r4Ldw`vvH3|3s*-pl=54*(dWJo#Je#kn`?%+;`yJC7#L%
z=?!X=9Tm+~BskwGb$JzH^kZCrU8Rub6l>KYpdUDs8DEtcuQ216mR$X6{xkE-sC$B`
zu3Aqj6{%5GAf_yQP%xNnNNeEYtThzndd?{&wli#W>48zv1xJ}%H3BWH*7WZV`R5t!
zb=|^d&-_sEgH~0tWB&dK;54kG_=Vo)?w-50qiEK=C97&8PV8$FeqamjlFpPWuNcOG
z*00Es-O~iQ(pe+|`A1-(rV=l6;Lt*yJ?!DU?^xu)Ty|vJ6HMCLeTrkjNrYx|FgB)l
zOPOT@uv+-=>pw-xzq^{|G^+m5ng2|I&ZlXoN-<14d}1D;zL1Wa2mE{XTdv(V^Nu@8
z7M61`RPS+#qq2&qeDvepEN0z^SQ+f=mV(=MX^N(lbCdan^II@s$w`ejm{?Wc$5%mA
z3gG;DCvSX`OBCdgx)>jdjMYrfbxsx(Zx@!u6||N44L%o^E=g$4$8$ipPeDn51?!|y
zn>RCY^RC4d!;#_bJx!~K*QCTS_MaN)-D*4+WDmZjsH`?b{1y)ID!8*fi{ax8?q$%I
zZ4@|ZHX%S_0W_U=EIPG0`@m3jDD+mQchWGLI-#-~QJn7Fo*or~(d4_jI$DEHX-n_!
zU(=%JzV+^uS5}{YgVp=w1{uH^jo7(@NHFBk^mK1&#k;ipg!~fmc0RV9v7wFVNCmTw
zouv2q_dqZ7T&mTWmwgOTDRF@u-}OtuVB(e*5^x~CGNQoQO^|rL%q6{Nw~B?~?JUy5
zP@}_#L=&R?^S|$BuW{;)jdv`b2^hJUHBI~NLzOEwrxy^%nbOi_bP!OhW$!;)fQnk7
z8h0PGqlK!hkB_&UGJitl$!>OTF8i}&GVa7qWut(TKyD|-uWd7gxc7=B`%X82?~Q$1
z=PUsIV!q)*#)?~RA{9tvt>m+~88Jofx18vOyx8PZ|3wKWR4Y-RC&b2fC;f={xl*RA
zKXeN0GE;I88$324Q45jz_!)iqM}_#C7GL44XZqMExZOu*CIS1JNuv{605W2(+k*OU
z-TY5|dK2MmjobdWS`AqEFhJ8Y2L33?8+U2|YI@(4K74JVmMrC`xMi?Mf$ZeN<{@MY
z1|`WNHX+CuIXJz|gr`pl1GxTX;w;t7|Nfua`H#n6eula}{Wq}l%<2Rs)e8z>m~*8t
zuH>qWasHPS<ZI|JV(zt-*>?{c8j7+Cm*qS-S2?UHJd1%(z2l3u=9mLge0U`M@{+3m
zme0R8uED^u<JetXiYV%QX(D!N*8wD%#x3h1(9NVsJEdPvOpg;QDv%Z4xJE=oT@+n)
zzpF?DPC`hRgK~M5xeo=j|Dr2luqj)1-~3tzC_*^f+9#lU%lZ-%5AkAJ!R7o=0$Ka~
z+9CHyBSZqF&c+QNiwH7F>zpY&C-~^Hr73m#)Boc%w*D}E7~(OSn99bZ<^IsOlt_%J
zLY78uBTmAEwpE<V56((ZRMzB4!8n59ILJ8RLGV)S6h$`>u@|^GK?Mo&)BdxfMn+gT
zsX_$Bl?4<H!NXvc!(V5jau_y03+eXWdybnbOt-tya|O|lq(8ptN+PiNbhN4AOtL3;
z{|@)@a}O%SRwIET>%)d*Xu{w5*?-PypQX^<Lw@uPMfgY5$nN9e99hfC>dxsgqpB)r
ziQ1p9{n3(LUk@*;(A?_B;M@1C?}znIu>5)1w-?5Kgp9oKbwUYCANgKQ=EiMaohGA%
zoo{z@#f5ZW6qE255@4(aML^UIU{|8xUKZOhbkt<@v%a}<FZbWPbtHK}d{&eYo_2Os
zNLhuE<LO1>X-RCv{5<RGO~=D2r<?Dv$*S%xX)CWloaSXCH;cif+<i~8>*B=={L5Mg
z@A#+6iV)2{ri8s$Px7=^W0DNp2)j>!T|}Md<JYQ_XXjSlt|mDyWv30^r#vdWLzg|Y
z<G@0`(dgZv4R$Zeb8@~G_3kX-c$x7zlSs$3(y0TFJ<0W3#tIJ%M!41i1_PmlJ#<5a
z2~_>L3*Z~`1Y6}7KE+VAGZ@QVIN#IoY{Qj55Bug={5wbz{uniBi?I|eUGWK5-W<Wx
znO(I;>>bv&e+^8etC74vPNhPPdbI&_-t#qH7&iiXu&8Hz!=cQoTq)IuU3?w41GuD5
zuK{u(x<+Xa|13VE?anOS9bJ$U@7c^+&BJWS;Pb2t((<K=(F1KIlX-UJZu2q>CgUsZ
z_?vvtWeumBK%HMIfnt_J89Jeapfk;*rN)W8#3R#3X{oslEus(^s?NB%QI<X}{zmk=
zvg$SSr4zk0d6bP2;NEcEaVS=8qP=%NHJTEzxVH4o{ln&L@uN_!ujpx5a&#=w&T@ip
z$jy7UjG%X-M}U|m6<iL7v6C&o@^w#L_=W?Os1Qgz^sam$|FdytT(k<Og1dpd{iI@o
zh7m?y#r{9RbU#nj2D$=jI!F^kbhp+TjHbZ*HArafFQ)vwE`i<ML}S)+A9{}bvl>YJ
zvWuD6@CO#$^WMjoq{J_yeLG^!O!3pKUi52XJWILMpCkQzk^macH+AO#gwDT=Yaa0>
ze|3*Ul*+m|6yFxtm9#C?YZjr%J|~q;VMs1@A8n&E&SMcsW2t#YE4-)w-FANC*dugo
z7rLk<?csAwj4JN+dR6(vGu7<zPS5Ft4b-ERB;rzV{rFn<syb5+iQ@AH^1qix>?r%u
zGrE_B)dV^^nnQmYE&F2W-FsPF@MM&TN;f<RD!NI^Q+v$)N)4u*+Dg{?I5&AGAtwS~
z&gvKbdr+#KqXTRP&&gNpi?YxC_`EG@J;@!5B9pxc-1*x>`FEdDWSv{D`di%0>9^Ow
zJv^1i>n0+n#6o?>pL^P*nx2e_hdN7muk#Uf%a=uiXQMa_-dR#5R=ZD|TOdSk<+x9}
z@qE^!-B=Lg5eL0t@w}%KULl^)qjbJSI2x{f4`7Mdy=uc+B*VbI&8czI{|*hSLNg@?
z@_bdMvCiz}ufa<0y<NyCp|Ch-DZJy!n}nL9iHknkT^~KD*ZP?;bw$z<5t8RUVF@*o
zpv5&3)r*qqFEmZEm!oj<n_XVlE%dv#DK*O@v+bxCohOGwRcEjP-rxm0dE>*4N*uH@
z=l6TdIfK407ZuTWL-zcZ1IgzvVtd^4^TozxB(a0d(Tr0lZ^qpHxo+NY95HqREI5!0
z;WpkZ&@fh6A2zk?)~WD?hGq5jz9sj7a-^TX@#&r9)kI$#2#pO-euoK}wqj_-K+bjk
zLCi))ucv8XoI4tKU+u*NEBUR-XtZ&01FV{5(^a2Xx=P{Y%qD~_At)Z->pfY~qP0d9
zF!wI3dgw#c8#aFJZ&TaMG%Pe0I3*sll(E#O6X7GSN-h1x>mCz0FIBbignA9u`M{S@
z6xFqb%e3V$)VR-+EVdmG0%YzbMwRzA<lI}?W3Ki<I3;FyqZB-%E|bpZe+$Z6I=EqT
z{(VNs6LJ?S)M%bf%@`Z)qE)bH2&mbWC0iJUjw}zG>0LQGj1&8_@BYc-&U>=C4T+9I
z9i>p+7mWe%DE$B<Hhp{wE!wt*XqOoThIP|YvDk-=Q-IFwQV=ayZKiAB9B4ahb<?~&
z^nd^vzE3!*4-LR#Jo}AEuJx<1Ic6YF!LC$eR%U?WYfn}^g<>h{&bjUrxq!O%$ha=g
z?4daH{4a6di^|wlBZL7G<ft=5O#8vRbmvgf?4QLPJYiiy{v_-~o|nXNbk=PK?BCy!
z;Y<lITIse>zp{~@NO$L7lDXVNZ1?F+6b%M!N?~nCJREMV^;`?_i++ffg@u#Rd*gDc
z@D%%JOgWv|<#FvG&ykLaY_S9z%MGwlP^9Hia7fB}jXYpNjeQZQ4@=P>v}yx;YA>X+
zF4p9*17NZvf7@C=FzH)BQM7P^7#r}Fuphi~bSUilMS4+MyQmHY3P+B5dy6uA*3^-&
zuDqSx+<p(Ptf=U`D5^IbF*7@p+SPXE42(z3-XtK%8IWZ5We2RZUP^FK{x7!PGOVqw
zYZpcel;ZAC3KVyDEfk01?(PKlLUDJO;_mM5?(QzZ-M+N@dERfI^Pb;Xxst4`Ip-L+
z4W(~&OO<v>&I<(4iqO*TX<`K;QMEhJU<uo?tuvSm;2%%v%4nBZ+`|o)t{!_8>-NhQ
z+};AN9D<U1TJ_>jJ-lJQ8Ixxxl#+Vs)1{))y0~-J<)@lkTaolg28SZ{3RC7z1BF$y
z(pNqEHjy1m=KT9FCq)nj>f5D%_(LfvRc(o%`cj%s*cfQpv%0+}mufQk1(g!yrtEn^
z{dpYzsGNz^<G?a6uagK>Ww%Y-8`TzkJv#;ZM>8iL8iV7!QodL1tvh_U`3?7QOOK_y
zeo3y)zpRG}Dak0d@um{dzV@V(n3Q?_bS-0uwTzA2947W<da;_gP0}qyIW)jn3N$q~
zm8Mggk3UItH7DmIzHLe>Ew3lNbM}|DLEcyy=E>_9Yqn1_p|)v!q5gLO&Bi2AdExsJ
z?hlcqopF6CdG&XWskq1Lei&nYnys4MkU4&gQA<1XQcG%zN7)Qq6uYx4E#lXh7Fuj-
ztW^*0roTmuE*3fTvmtEfeTx^SRZks|%xhzAN-?*0_L+CKzm4lm<n7#`giJ`y^KfFS
zbjEll<v`{$QOhAI+IvYtKnmdx@;Vizu7El4dSs5X$FrcP?Q6=QqY1bD&N=|8jE?#4
zLnM*A`t9jFQ)bj<+3?spDNU&W1!B4mlRoAGIw!MS+rP22rm0#+`&NUcj=tJ79IFMM
zykI5GXn)mcp_Gm9yy(JSRad=n&>$6?W9-}xk@%)z&=_CO`3l{~Jb-p=mq2wU=Npgj
zbigX?5(p-3_;EgrmsF{Cf5f=vcjE_??XzFR`|{dBW?C|`1lHr9{t<uv0Z6t3`@wbi
zRZfjm#7it%QmjgLjqRb3dK<U4vg9nAo}1*tW?UZU0vXO9=-&X&ZWGrZO#>?pFKth8
zGVOm4i(Z^kysW`oUn8J#)1VJGZ*X5->!jzlc8zZe&}S7pI;LZ`^i7}eK!qH96iSB^
zAGK_uD`f%4owfb~#wwm!!$%(!jYeL1*ff+2e26l@a5!2F2*Z~093J3BYFRMvoPTaR
zbxLijn<%&=lcr`XAyAa#89?Koi>FTA*wOz6C%j+!wVqd#5ll&`eMVN@B7?<rv%ZNO
zSA6B3(Em*shu!+?gjA{S#B<A_>51xcC{oQEQXn^tcQp0c`<)(}gZqi3&Bg%`j?`(L
zf@XkE-_xF8IY`XK>?M7zyUeZL*6Kv3asIN$cVz@X4<>yC<7#5_WVJVUTZDeM4{yEO
zkIbu&j1fW1QgEKvDHBK@=24cH>JbkxzQ&}RZy3~50F}#!<jEj+mR+V<c5ODe(IiDa
z5>Z%UAj~>=v=q)+cwO_am;m=F%1I{UKKn1%_1E)n_><;S=5^^@^y+?iT{$LKFBRTh
z_=zlhi;bDMpRZ$eD)sw@?-uy2$2-$ngR#7u(uLd^3ns8OdCe%9{nG8OJbd=-y5h7r
zgheGMR0Ll|1Ab4)d~LB>Y-r1mp?dz@E!@JVEI)UYMHfg7)3K@e6U|R}wZ+NO@pstA
z(k)S>dq4@Da1f4FE(>+V1RA-QLQ4AcGj5iD{?`*Lt#b(p3x@|$=*hiDsD0cNn8r<u
zSuiT|0u%b>&QI!Xh!_lsO4ElZLWP%i!2A#y7z8MBQXrq`9T<@i^zAKigpnbZIyR3R
z2O(7!*G{h2%)J?cHAfS!9C-KwMK%QOu8GRcTXGre#dhgAK10>QUX<3^P!gpe_Huh<
zvBIQok0lUymN9j-w()5*PhQ<dxQVwcWWLtHr{4nJ01|I#yzp?qYg)@yNKYAMxzaSd
zb%oHlm^tgDDk)XGB`U(ekY^?U1ojDCT4k;bN{{pqJK*<pl*=mhX{!i$)kRM+>S52$
zw_?L{aeDlzr9Dai7FsxXP~>;^qip_#b~P@Gf_?hsIbZHS1<L5Oi$zLa>p4scq(LfQ
zCL$@<b!d3MIch)ch?fSyJkF&~AggMKEYHzDoMoals;xDEiSFOAtDd(f>~(mhvM#Gv
z(|HVLHjv&|2k?`0JLaCBTr>)5U=G}wT-mPHyf|3Hv8Bd0pW>&SQVARLeDnB)S*lwi
zesH+Q)Y+mCA|ouesgN<6ff%V~SzIc}enhN|1Fk9^my55vkj&KF@@X|4IDH!2_CP}(
zLuA|!;5Tlrs{?4+m&2OwK1Jtzpik<N<ag{euF)%#&g=T*WI<(89%cwMpuYtB%7o<6
z`-YfG)tKSyda1cD+ByQ9Rlskok5Z%7`GSbYR+8)s2=_snNuW3U)#5w%>Gsj&p}2GT
zz$w|ykcbapQu&fsWLj!GitDd`+U7xoA;&1A+AqlnT{#~OaH9`y8apF61M=0xj)j-n
z_0j~B+05J`x>6kMCW_gn;7uH>;CGsTy&e=xlNvSYN}Fr-#h}(5mhJkaT0LP`??x=C
z{l=Iy@?d^l5a%pqaSxuh-(PcAfT$|1v`e@#a_PJ8bw<7xZ_-BllYkHqtn<WEg<F{%
z`gmM(rg=&Xtw-B97~dZqR>9qSYrQP1a4hKLGC}rMRo83Qscsi;r4bSRuqS9d7H)J)
zUDIWpN4NJm^{!wf7WGdD$|ncvQFo1biABhb0W+TQI{(w7HV_$VnfV!Czu+%c>G6Ma
z-ZceE-Gmh2#Iy#NC0d-z(VdH?YzUvl!uW18g#~6Li98+<*=FY!l$#xpW8S<n|7qQx
z^Zwo6{vJSqYVI_nNdb0+r?*&Z!OkEOTVJ}g!pmTrPgEa;o_M;oH!KulL!6A;5w`#i
zdMs8Uw!3*JxzvW%o8ou!P!F(#g1l~|aCn%K`fs$HDZWoWCG~wYfK9ZSU#rqw4`=C!
zTn(T%eq`}hEY)R}w><(gk=%8b{?p>$XA+8`AM%JXnYqA;55!V*Si!z04J0i(1f3l`
z*;iyoA4wACzFiz>9vUB(>0=LP=l#@t+x^@$#?&YX!bfrbGXnETLKHLt^M)fktLcR+
zIC#x-J0vqvXes%a&q}}!u2(@tP#x($&z$$wwu~}c)Az$4$n8&`-n+pkSNU&fCpm&7
ziQ9%WLml!iJIBMN@|w9Cql~^?CVrLTWc6~vRg}r>#kLjxle*u}{nY0ruksJ+6-3Zw
zaIuLz5nZ}@r^j}v<#DwY2ZX!+MHEHXqf6=}^0DM-`|QYm^FogOIH)qldeKj)|NVSm
zG5A3HOV}Aqxj{9{4}&U$il*`PNd6s%pUElR*>uzt?Ou)ZaSF3~AAH80zl3g+n0{ZM
zFv;{B^7q9oF0lZ+xCInE?W456oEq@0#{Qf+ocd6Y#BE15DEYgzvb6^@EKG+bQjRRR
zjmT!ZhrS}`R{#o!KtS<-!4+g@UO71faB_Zrmc4HT`(GHg59UPl^cIp6cwbi;F)*C4
z!8auo9T-3(y#T~5gcn^CB?;9+%(|q5ZNVU0IgL+SJ#_3^#NCOQiUsc_i=y13o`Wx+
z1532Tr{Lh^BwJDnnvcTLID54A7QX+$A|Uvs!Au~uqJ!HA$N$WR%DUZ!3d3-2b)D0>
zZ($_3+JfLK<E-2Ek+P(@jD?&a<I|QI?S8<}x{()zr!I2;a>(7|N9czq$0vReF3pV{
zCZ)CuscK3gwWlk@#ri|#zxTCw4GEnhK)`o3rI5-3cu|f>gDJI2NHMvcYt=hF31K>=
z-vyz{uxTxqrRE0;dyimMp=j`1Uw|99a`<$%Nyw70cuBa6&p)?*v|x^)OKU-po&`lS
zxjHEYkmnje%&(;@n9HskH2ojT^R~9!0!`*^YJLJZNF*q4Xnqo<k!p*G)3XbkbD{7_
zoZie*V^tzlgJTLU2Zzst;qHY+LOOod3^F(ab8PbB^Q!u2tt!>va8WlcMa%`UaBv9j
zxbD624^$+(-w*R=@U*n*FJciU-H<)70M_UX1^=R2RQC%PW2w-uR8%2bep*H2!+D~F
z-)MVz4QkZ9Z8yX#oTEbiBFl|%qsBEngqJX)ut<?nBez09D~NZ}_ex%8PVR{v4IP?V
zYq|P=fk~k6@-i+g`b#H#6bRz_?+RI9`SAe+^F&4nM#m;IuzipP1vx7~ajM8%%+2Yi
z<k|jRM<C|*4@1*<4v){72!)0}#OE1Q@d<a*JyQ27ZmE~mduTm%&e_GHTuSxXV*Z!r
z-uuh3@TW5{^%rv9{^C4^Ab9MLbDU`_k9;=gO~L*Z{NBEE)cMHAWj#Nlx_=@qTo3Ji
z>KuI7ldZbxqVQeCD2DsN@dU*4u+PB+0|8-u7Mc3MB;rPmVez&~zlIG?Aw9sxIqEeb
zcjQ(+8h)GF!VXi&0EaRS($2D2rhQrco<_WsPCbB}BEvwHq4;Ny*fbYU%Du)P$ZPty
zp;wAPfD*77?aw_p3|@5u{jdoaM$0&)F*S0|gg7xHX)^yJ9XqxjUs=PC*3PGQ?6lfB
zm>03{&l{}_eRu^czA!!6Z9^-!Upw4xRa)(8gBfMpI%ANnPJYfgV^+MF(!^_c4}_L@
zb!SePCEs2F!T^Lm+n9r<?_75sw-v2V$LC8*`xC+yJl}G)!E3|3fkv3knwyc{_wW<%
zBg#}?GPn1Px?TqxLKr{)>auQ=T{o=|C%){oV`?{w%BomtLSrHHgS}(U_FC}q>-Pz4
zV17D(rHuiK(5jBA+B^nh{`p~l$dPO$2W$sjHderi9tGR5goT`@r>)AlBK_pQAggsJ
zNnt1$op)v;!WKb2J;Z~0@+iH#&Iyf;6yXkA9z13aCqAOsyo6o91Ih)L&4XOsil$y}
zZ@0i6m1;_wR`KqPky#Gh%Na_aXa;`rPxNVIZOzF6-OOp?%pmJy@SO}+PFcpwP4~Hz
zzxFDb%)=u>w=i`qA4m;=ylo?F4ax;rHK7`$u45o|U=faqh*C58=6LsIash=!`mlDA
z?d_d=L}F0@bCc28tYU;Sl29^>)qkw0Y|R?*WX8lYQL|kXtY|6zRd>m+F&}?l@#t*A
zbq<w{4}Tz=d9~CAoT@QOu|JKoBq{X?b6`v%iMcgH!DjXF6*My|xzQHW;5B_pRXS;E
zT6Ov^`B?a7)ukVrD`!Add|1zkU_5JzA!cA6erGv#<$E;;O5LtqKD@m^4x@s7jw6mj
zX2Z@zE9-UD>C#{q1YU?9>BvIZ=JAS#xH+ue`moxsrrH3mQH-TDE|(~ayjS<?fPMp(
z5$&*kX{7vYbi^~>@1kV{;qOuz>i9qXL?Le<(-zxOE%Go00yh>pdu8Ffr6HwVgFR~B
z=MQ1~3`ivtA`0FP+3xb1*5_WFGY2pOXtgCBh6*gX6rf#DpGWOAW!~b~ihPcT2gxix
zHVF0gO)R?Q2XyTmAQKV%s_B>V)T0tZMIEw^(xCXera>`fz3*<)xrF?qSr6FTDm)8M
z55khXWJ*qzDV1vHR@OH^;U1Qb<#W9rxFb~RoJ7u8O%`vKq`Ydj&E8yNNPx?q5MLhA
z_wL38eSMM=ACBUn`QFAd>YI>ga;-Odk1i{!PtV`eF@Qi8a+|FRv+%ZE0i(e%C?1AQ
z{LEI@V2QL~uT!;vI!{av18@?Jh|8^J2V4YU)dvxL#v{&C`tu~w|3$B&?bY*H7np?f
z`;=&q1+K4(#(WFCU+kmN;tE|xXc;`3-~qo~!e8|8@u-0m-skCmc|@wb+zCzkgm?{X
z?(rGUGK;)EjQbelv?_pyJ0Oh4iof#2CXRursFe3@BSoW+HO)Wts~%@nxTl$;&xzJp
zN8Jj~`l%<G2JM1#Jv1E{z7SRw!_&!m4zb6$1m<{&@lHK86P3uHz4Wiy(cKd<nA`qA
z;vgtzJfLWNw9_uKlA$o<*quW>ozDTh<82ROl>4psL@ac9g9!P7f?xZ15bOPh*=hd-
zyXtVD^`$0L;Q^_G`1kBQE@{%E^UI6`d&Jvghxp+8({U}e!u(s%VA$=;Zk>XvCwcYL
z`NCD`+_x8xwMRlx3>Os4Lb7vJ)Oa=@QCwWh20l2u0WD@fa-F29<+X(qO1nA10fC>#
z;)*Zu{m@N0P&bHF;m`y*gzg!fKi#rot~F36ZyVFw&GT=zDXYn8zD&!KkvGs5=LA$9
z_L0Fm%5|o7x7U>S_B~{G33XjcTb4jr0BBi_xhKER`#az&e?ZA<6ZyG;zAqEmd6)%0
z=hHq9%S#0wO{~g%7o|9*ZqAm9042wO`n+gaJmJ}$uzSoM<K1WS)gl8wlv;O)Z*&S=
zA$d;Q`Wzs`T$IXl7bu~-yNS3lAoR49D&@uH3wEaTgO;gS;J^1eXntG=Kyo|gV}P7P
zqFE%vEx5;f%uLyD)(Sd$lAK?#-kZ4F6v+8F*l;&mb4d5u!KGIho6<|Jy~GuN{rok}
zl_thJ#$V2IHJACG^J)eI7UG0mB@g-ismFi5r1zW2!|o*h8;b>c`!JOK*_t;e_2%S`
zV0-XtPU>RDs%v4Ze&el8L!pa4G{*H%zbs{q8`E`io@v!Toql^960`eKL^ycihLhJv
z4NPvGcM@*yR>!l^GH(kKw?atw&sEo=dYpGCC$T4!qCDM_JKS_rYa-!aucm3?3Aw|!
zigco8*^+mhhdSCG7*5`88+*91nx@~*1@>PHpLv$Slq!yX^MEVu|FzimZUjgfQ~YXt
zKTKo94R?8lM&`4pf=d|h>|jhrOB@EuL)V6>RizEKp0(ET!_=zRs#`t(@-yNzQiUvF
zaPIvKVm^r(nQ`_N#hnDv7=GoI<jd8a5b%jxS!&6yH0Oha_Ik;XJtqCgySY6>0CWKP
zvjOF3?&`Y2hupB6(ytH$vfT|M4sS-e2cV{04;9=hvj|#ip#Y{ZYgvlr)@?=9W~C^%
zRy5GY5Ud%<b;Gf}^&4DKGcb}&mGX02Ze|Wj`*`i~co1bY2Zm9M2@C?;sIf(&wUf0v
zA>!{HY-`IBj5=0u?r=lGwedu8=<S65hWHV!(T?Jqq=DgV+*P4~?Kv{#NdbjeL?oNU
zyV8UFz2C5&S!d52sBFZj3onXSMl63BJ|M)OhNAJ@6f(bxg%7!;F1r8t)2DKx{lhxV
zW8jh%C{F<qHwe&4^>)=&eCK>J(J?OR%_F{cdD{wXNFdjF1A$4@EOC4Gz%};83?o6t
z0F?c6fyJwhtF9{z%Jszurgx{$k+j}Rzw~Z}U#?S2?6L!1QiEIX#xJ#j!VS^xyKoT$
z6Z%td{MH21)~vC~X3&;~gpV;5#(g!1{+U@_0d@Oa+-wAS*wXGBE&IcEbpE3|Ln{6C
zh_YD`7FxsA4QDL&uY>ZwSfg8cnOwRxOO^Ba)4Kli84c7uMCxOZ(7dzgwq`02IQ#7j
z@nydgK+&NYu4K5CKXj5tBid9LmrnohR+y!L&@k{`bDKy*G7Y*EV_~sAC!4m<_>+v~
zLD0PdO&UR0e>$Zz{d;{H;kByQ9&!N;{qALAj+_;n<vtbNoW@Ucx=it%t;T|fqg~8m
z1=Ph_Z=#k}%*(`&1pn0nAipn$_L`*>(My4Z>?KV6|NIr8ICvf*I#7-P7h`HFu;gWV
zrM%wx#r=6?Zcdu29y0vhGDD-(M8}&P<McdIs-S>+)tjIF-u(?!$_Bar{#SqNX<tqO
za*!jxrygQAJ>VFBP#Y3|iSa0L@cLWzikL8E3w)gVOV|F{J3PrqK6$wqG710FA%c#=
z+Sq?d375q|B*lMUI{Pb2`lnP5a{9NOo%=u1v_F?-r~f;{NakM|MyBL{=6?RC)~=oT
zjsoJBy&YTvL>cu~DWH*P_By#+hH96&Y4t9`^{?XOKQwdc+mz>1yy6eY8vUU6C;$82
zUgvDw@cxbOjG%i}y;SO5V`UK*-AkV`689UjiiH{*A8)8NPE={6%m_Ww6qDW!OnAyQ
zBBN12xebjtX8>hePDI^{mv$|;WP#gb1iy(%4>VwSEXS|W_K?aE%=9v|);IATC|2qU
z6ekRh{MxDAnOAGC4%SB-^Jw8UN=?r*Qk(}DL|~Omb42y+E4TUXOzUH!&c$wZ9?i)`
zh-15WcYO8uis$3~%ho{7(7JobmlgH{#VP;mixgLE`{IwOtk7g6i75#k(!Az>aE%yU
z`wBz7=8=^jJpENy$*SL_^Jgv3dvM1^DpY$&t)n!}o7}CIys09k9Er)>;79H)iJU?7
zb;-d~6oB=)d|~3Xyp0yCkr9v$_qY_VbzIZ2_jucWtXOQ)Kb+)MyVm0Ia*NxyJwT|Z
zJZhL77M}~BG<+@TN7<YtxO3mg>%4y6&*&XSg43kLA<m7poxzwoMiDZ-2j%cc4Mh6$
ztX#f+`jM1UG|oMCfHhMU>Gg{Y(nd!}?67gGab9z4hJ?Kk<}^>t)WN}IYBKtRCe7F9
zh%{S^OI+4e3~Ef~Wu3_1g@6lP)mnDfmi67&S~m#&j4l5HZC&vz`Ulbx-*IP}=wVmB
zhY1AqrNHW&__-HTB~0)80fQuK>;1X8%=J&YzxamvU$saNWQ?4aod&ZruTHT|Ql6s?
zJQu%16e}!kY>sDd3M#&gc||G-i9*jLRmE0wuix8|n+wt$H)(0oScUs8TKxFVBPU{H
zwUPZLWJK=EDjY}Vyo)m=w)Of4Y}&$&p4U>o9dwvtDaG}vCp*%YE`KRJ<6dyQ+s6a(
zMfc$9mF)<(4f)X&#%SamwBovm)zIf9$FJ|o8VireZMKX^EI^Z<_0#gRm(=<9<`)Fv
zq}xfU07Uyv_2jXtHTUnuhwb5w0po^89`xfjtHX8B?hRH=Zn`X8UPgtvo(ET!8!B+t
zKkTzAC#>#U&Ju`e-0V<(r(jyLRi;=_jx`St^-`lJpZP@SF)}t{0e8n<T^GR|=I|Fc
zgsKRjJt9{CVu*yqzn)g)&(*nYxFrJVw#BNx@_C)hJ=+0K?(02&bl)6oUrd4F(&BcS
z*MTXeZB+Z^Cr?~&e#Sd%2`EdeV6)lMEVwJu4+}CF_Y<~N=u(dDnbLyIonP({CV01{
z2(aBBz1~~C6Zv#{U#PvoEfT$!eDUBqioG8w2$fnCvP+U_UpcUWCf3h$$Ak2=RJ8<F
zk{r?vPnY(cG_O14Z#fvmSIus0f2VlT(blZh?bqdpU)U5q<CXf8SQkPez|99lm_&jb
zVyy+oTEmUMc_|Wlg?lg1?7j0WUj9`P9NfKQfCL2A>!A;>C&VMZkNd`N4%a8La7&KX
zbOvIG{aWC$YraD_x3?Tb#uZ5suMb3v8Ez+}!bA@Y^rO|4XXzC#rgbWr+-A`vo|GWV
zyePzbeS9ID{==rIwU@d*7OHdigbgyLRUk#spB}A!!$ChRq?h%b2Zz5B?ZAr>Bi1XB
zzRFyfh?FlkfB>&v-jE%&#h#P7->~}DL;65BYfW@&X<{i=`)9xRS8Aeknb|Sgv=Xx}
zR(&?O9pA~7+CtYgv1T`oj-59Kd!XhE)!p@70u8hbh>ARr$#S_q8c!FU3k*gYGb&Am
zFgG~2T5>5EzMgM4ubwlI=ulyoGMg;9O?$ual!;rB(|U2$?bl2wW2yF>(fd>i4b4Rv
zr$wLV38nzxJhG}v0iPa!F2Cd=>hK}}dxufE4tj>2Kl^S*tzwd073F^8S+8AwmPf)9
z_OPU#YvmdU!1(m@l3JAqz_G+_eS<3Sme2JDPH=s*?(*EUl|^NX)RD-h4-M!k!*_c}
zh%qlKq|0bbPIU{N{4M|c;t;0nwhTZ{N|n(>ow)NfggG8x|M_pry^Sd6Fpdq+hI?`h
zM(#`AkHW1e3+yvg@Au!{EQE0WDv=pq`IDy80649k2q5H55U}`^s?fqsa;tY^OK%=S
z@7UA~WCEh>yO3YMy|=kqP*ku*<?*LT9Ff0|2Twop%r4m5;SAfJ|Df|$gMk#7dO*2<
zi430csr#CW)^cxG)(vrp&Eti5IVH$pF*=KtZ%;}beG1LJzLR)qTZ`m|P?$6*Ni9gk
zft{o62YQbIH>fyYnNH}3Fy>+S$j&>9rTs;3Vd;)q8L><L!)%^iVYWZ`+l;Gy7sKie
zu41X;{=VGKeq?4U8m<NB5KPCet~x;oU7Ek_07}+W*6)N_5}oREW7d!fMP(X7fB6b<
z3-G{oUbtdvlEhNt)lV2${5vxielC_{4CQT2;iP20T&Yb^PN$tPDrTHvE(~3gm|cUH
z7Qy<+eATWEaE{m9EJEt|Vue%hW6Y5Z@2=E-HFIZmNgV@`I1Dp}6+%gDCrz{XGSOO`
z0cEqk{ock6=NnwI@cQd1uC=G$iJr;Eow3OiG<}!5?x$8svjta2S375nX=;E1<kNkh
ze&uiG+tzn$rEmSsO^($qL3KMLF7G)rv(74aX4bs>t~$c^ds)W>lXZ%E^-Epr0%c1P
zvh3s+^V_6!wXZFCr9oWo3~n$`=ADZ1Lfe4@m9ic&-<E+ZZZ;<yTrwY+9c+2o`9^b-
zF(oFne|u=6|1LKvI>nZ&oKvv1Lt6OMruMQOM7MIhn84`!zoCIP1y?o)(`&F>f0OSI
z+dSW_jHc{#l;BBLR;;U0=PTS6V+j_|_-0h<n<2)}*TV+@ktp2zJR0K`0*;?O#%o%!
zVZw1>J>pQiu9>YY-OrI53Qlpk(p{^fT{tX$gB}*xXRe0l_2nY#?-S2Of4V}NucFvf
z26?-)CYHQ90Sc3f`{Ve2nKcLiX~qMjueMc{u(qVTUH+rEdx3<^x5gOe%q_Lo>&JNm
zJDnR$NrlH#)XFI-r9K1-;TUOM^O2;@^Ht2(^P>aRCL}O$mJ|WeG&;<_B{nu>MPyNn
zfhLUIh2W!xgsY?NEPzPI#oNVJzuf%#tK)h^3%7?eoX*NVi(tCPIBAn%Fj@UfwTO|S
zj%sct$=PiqsY_?k9Ps}r$m^ZTj{_LI$J9%czOUb+4A8`K?Hyet=1Hk;52&0pM4Q*=
zxXA2*CMJ-UuYBuofTt^T<1HQ&@mrc#?%z|qBmcQ?UOnzPM0{?N#A}4D0s;ou&2dV^
z46A`Vp)8O;0ou9|ygw11se{9GL@XQesMwAb5G#*t>(f4d`cndmRA@q@wHQ+UtY?X^
z;untK3|iU|I(KFJKd_TEFQd+QSc~@zC`i=D*M!^^;0Y^giwn=~z<cM>lg0@`h`X<u
zH0;aB5L2n}QwGxiuUCQ8rQJVl(P)~_C1ZG_#GJsE8Lp>>|Crv>ZTcUbMZg6owHil7
zO883o=H`|tU>K{EKP`~Ylued@yX&!|{6N1gLoYN_|7rGf%$@NTGGm}?57pA+8)C?)
zj0mlo_)D)Q8yO}zSGU;Hk7)ZiE`gK(k-NL~FeLC{1-?#-&Xc9u;<bb+&Gg%my;2yB
znVqgqa^-3ev7{CpNOkfX@#mEjy0FxhZ!Bxwkq;`5+@_b2H-m-fO_m{M|AlG>{y;T(
z*UmQ3=$R<Lj;|IoSKu3&x3<*asTRjpG7Syn1FLTKsyHk#;xMtG-DYi1$DF@cdw2@D
z{x9{)yf1L0!?8X?R#Y2qrUzQkm@Y&N8JsRJZQM*0;n?8Ofve!waQOeBJK2T4Rc2qS
zan`sCbQ`UiTYbH^lHeT4EA*$)0S=CtJNw3mo;GW*NS4eoayUU`kR>juOsgl(SL0uS
zgHrmR%1<_yi9s>sxMrq!`Bn{cQ@T!FJyu}p<iJ95{uaV-CZ}w#GFCWQe5sJBNKrOU
zx`Sy0N&N5NY+fE!Gwo$grq_<e<W<xvSDQ%=^=TEyUOKM{x4P$gnMVr@mKr!m{?Z~3
zPgy^}XJhN1d7VsBG`N=qQFuRm6=R|w53HSFv#-kb7u+G*n@Y|Ze0b0gYyxw$E-*8f
zeLiyZFy;{%?Zoq_elr*zg_Kjm3mN&2NgI-7z9IHPR))B9@yK&GNn_4-noX)t2S<{!
zc>ji%JCE4;-X*5CKO+rOG2m8p?}BgpF=eE<F>Aa*gJrMUWJdc_#|(X7LMM#MrG(VU
zJB@3w<*HrX%y)2iE!2V-G1T|oA0E?E574QcFGltq5KvktjR#ZI<0RzQK6g}j^XYxR
zLPE+GxJHldEv@OzAX<uq11G=nzT9b^lU*Y=x`H%J4L{eC|80zbsNa{mvuvC@0%f~o
zkP|`Ag%dM<7c(!$S?KKIz#xk~$L^~hAm5rR!ZO@m#v-!Y#|x>U+(X9-q}`3i%J_2f
zgh7|qA?T&$O)tX|8?O{#tPUo+2kpqK1$Ggpe^vQ4qWnEcv4%kD+sD64cOpGSbksPW
z7)grsd|HsNMbT%-S`6nfK(I<~&9ueDbt;f<bD=}i$8{jn<@NB4fRRK&=Z$sZ1Nr50
zho^uj;GpInyd5nVmTK!oN5Li?-BhgFFe5tFhV+MZ0nt4~3mV3eC@}eEew;zK;FeIy
zG@qgbnQR`7{hN{Qu5Kv~s7S5^!<?R2H@uob`CwWxZFgY^@FI+Ns;HM@`H`d(%GZrS
zK=pIWkFl|?^6;o$=2x+SPaj777j<|P`1_L0r}lCcwzGVmD=PGtx%minD{Guv1uZ)z
zjA4SF;7s11U^yh}itqubX)IR46CIB6PA@<?<G?PGo=HQZ>`rqrJ6NN_sx-;W{n|tg
zn>62iCTF(~qA&=B&^L85hv0dE_co4%R)$&=B-S#d?Gkheli%T8%NqFL4}~8aj{+FX
z#z_7F1?!REU@x7zk*_J}duub2PKtWQ)MgCUTp}}vhL74!E9GoG&{m4MoSwckQ$8mU
zUau-}vK%8cnoAjy9mum!;*^O|2)EJe-+RZAb6dKPBufa0ZTdx4cUA=PW@;W^iZnHR
z7JOeg*Af2FY&J5#uWml-loeeHcf?Zq@r!_aa48|XnvAGCWKUa|fKtQraYI=kFi|Co
zwleQw)Nm};zz&LL3C891nwuS3ho1vq#}A88GLslrKuJCYnn?~k_Vwf(ZC03DDXXgB
zbvCpT8OA<RD|^%u#&XeelYt{m(2;#9b6p(^LmX=;sX3}rfWSP6UV5qJdzsZ)>6~Ix
z*FkCuNZ})|x$4G)$dU&%@-&y#dOhzJ0xk$ob(DK&Cbv#jwb$?I+A0;w$QD%UA!{RM
zh(NnUDax;#rE@C{AT*i9N#jrST%*%zHcCkpmECil+9e*BBPt2GznnEq9q^=7*Az~F
z({qp;Je#rB9u2>7BP1XUpkod1)J2k*sbN@{tG4Rd1D@Qbmb0^9MK#`5XkH)~tv15a
zsPjgz{wh0tb7P6b?aszZtR<@8*K)pD$vjsyidEo^fx+tAvEPDNsHSRiHsScI&$Qbp
z`dra16x1UvqeW-Rzu`c{gMGh`Iv&4~`uvK%!=mkVOALarL*G}^y;e-YX;DVJhnc&~
zT5oO6ZOfW1GFr2<FN+$xie5DMpCN_F8JAa(?!8~B;kam?ukYXd*%w|Sc5c_a+4}$=
zevkW;8sFI-6xTUUm%ia&oT*l2*TYa-Vp0<bWBsF%a!ZWGY#5Ao!61*F(mlU}ABQ%L
zt9P)RufMGm84nuhutp;CObG8Yf~U?vJZftxxU<XekJ!*c&=*mKGvmJIN<X?k>!pqY
zsje&WpM!3P98F0GxAHE*1bJJ%H5xv@Q{mh_hGCyd19C~!bn4ch7_yM|3>u88u5bCP
zYubc45nIaAm{S{UtJ<%3O;C8}r9Zs`%7x*=8|SuwMW-zj0Nu!q1se&P_PxMG7d||^
zg`paru^hB+&bpl(nH6Y^cQZ*<<RASRV=#k9_ZL9EQXLKPbY66F6)37xiefk!H?+Q2
z7x*BH3ah4bP&6t>J&>1{7g+LI21C%(u9sPbMP&R+gy>9Be_<Um9jeO@Lq!*_f3m>h
zPj#1a0;=jvE6@_0He>`DZ(1|W+m$SBI~ytzwId)AQ9@nVfc2NO^_q8<tCAUWVRM3!
zzk7JEiUlWp66{Ae@)cY(Jk5j;82e~btul4;M-hw2K!%<14=)u!Ga}aMcP=(v12A*;
z0a^D)D7KDR!G}Un1=Ji+1uEcoax+fkEKb`1QxzJdU`p>}9daOP-EF^6-T7M5G_^{h
zhZ||MD4cLB_4jp^z-^|0fsC|YVh0Q#7TO<zVm*sh@DRQgkpd;i%$Cu3813K*DaAAn
z_?ymL5XRR=8*)iVd*LjOR1_Ci)GLYwA=3{sD=}<cW?(dlxO{_Wlo`BM#rc-+tRPB+
zJh&nMM3HPz7o)AWgMaw&VRJ7V2LFN(UqHZz9>@h{`enxh8i7!L)Wh}zpSCtUA)8;a
z0n87tGhEku!yhEH2Ff(#Og7v$XA|IMm}SZ<UjE{Y<C{gU&=F<tQ6&iGCnoAv1-Cr`
zk9xz6;?b|lURLby!=cp5)!ApayA}8H^R~hKJl89PejmWRK-;PbdF*TW#+oPywoaLZ
z!M2`-i1;NP)XT~r?;)u(GA8;TE!i^g;G2m+L45}DH$>JSE+l0ekzZy^6)V{qGBoep
z0+#**W6$qTM^+^*Z*F}^1vJSoHiNqxf%hR~h)91FfGLEAY$jaE^M%GUuDQK?`*D9R
ze4>cM1&Jte0=v;?h_;0^PW&UbuaD-s!P@h#8RDuWJS+mXC#&ALTX)h^c+DfU`kZcp
zHy%>gsyf^Gx?38`wzo$qa?TR?BYn72yf?fWuwCQliG+ISfz3#Vid5Hds}!b(#NbxR
ze7A4;<0=h@(fT8oVk^1GmRg3OsFh?vt=qh?#+w_#Tsn%v7dxuq(}DJx=l10ax5EX#
z8R1x`OLDg^2vJp=7?&m_0G@;C#D1&8uqH_|Pj^k-cSQo|H7mzS1MV|voTDb`UtykL
z^lj7ak*U|y6n4Re9!cC;+gu(rzf**!;Zla$k^{f8q{y#t0CBx-27czxrk85mD<3R8
z@$Rag)uQLc+92s|#|gkw6@ui41P5Z$%69~=!@gxh(1?&YrgC5y>^ao9p+!2f-AC#J
z@p1Eq7vb=SZlyCvldLMSPI^QwpbSic?a=xON0*ZImI`6F$Fr&*YKndugOe-PP!G`m
zBUdz!?72E~6i=J5H(2#8dWhQ~&FPA012Sc<YFC`_ZHoLp!#h#h*^;dcY%g2m-r3p*
zQ%3Uyou8|)I2}HX#0Y7e$r8-EbS1e{B){Zx>LmpP3oLS3_ITWpGz<FJv2DVAL0*Gm
zofqFd63vwafZ=HDdndhem~}_$kn603*W*aM2-ncg$G!&gKkC8_>JS48#?Y@jMXOwT
zktw{H6s5Um?@>K!#-)8aRoA-ANTOoQ=XwNA3Q%fTch_@s)$VbUM4$t|ms1zR`%zcv
zx#jji=OB+iLj-|HI%_?#(%ZA7XV6EJ?Y*aBDcJ_f<0Hr=_Np{R;6m8+kIZo7OhM;2
zrQ;vG|Nq4JUym0T$jK^u4CpQ;Gs%@9*#L|>p7rUHwDRzd^t%qm-bCD{#E-jnLI-r)
zc`E3o%2~v*z~`trO}^Ov9y{5~nIT%m0@91EV7_!FG$wt9TO4jKO>o-%#q!wEROZY&
zdG%6bX575Mn94m{CdN!Cfb#Vx<x(F?ekcpsbIAFZliX#K>x)uLw$q9H?QM+W{=TWJ
zx$^Ue#X)`44xYi%rm9jeBeuoT**tv1nYSCllYRYfvOn|pwMW_|Gu$8B$xQC;mUrH3
zoHw@QHO;c$JER?v%hCWs;6F)4`bkkfeD?vvvox@TM>N28KW$sTTwhCf=VhK4KYas^
z0&mAxFT>Cb`jd8jtSm`M?E6VWOVa=XLRERn&L!U7wa771zu*`9Gw!c>+&&y17b}n}
z&bgk<7P*#cvUe#jm@|oUM|qE6o(V%<R^J=np`9dkg`atJixt3Fcl7XxF?*)aAB5N+
zek446w)zl}ISe^Arb#=tGu+PN5qnVcW`wZ+^aU~BOS-M@zWEqt5G($q%yDUYStRyV
zB*V?@i*A12m)LYID>1-;mC_o9`$NE<ZR#G(@ev*^qLk+A7qlu}MizPb2UhNSt<wxs
zyGfh-;t8zp;&#S*FA~~GIS^s!r_VmKG!_+1*o7HRh^Rp{9C5=%kJm0PYa+9&591h4
zXHMjtTd>+PKlDs#b~GhY&c?_d-5*{YzFaGpn$$1XXNE5&KH*d`+q&ak*=4EBQ0kr^
zkc+2e_BIbi=vrofap%`bD{Lh<Ngls4$kme3ze~9#1*=uI)1N3>!RNMC>9^A4bV!Qo
z3vRurCIHRw0w^Gs8QTU)?Oy)UMQ7G6+S_i&=Q72qgm=eVFIj!2@A)~w8xRV^fsr(7
zK;Qpcl}0sefpdfD0r0LYj95V5A9ZsG7uF-t)n0abcKVK;_&m43bFoV*A&Wp9<e6$e
z=N@Lbd`jkW<mdw>EY0^k4c#(g(`8wO%<^oeoq>QE`m;aABf_gOwL~k{TfL-Re`C*Z
zpZ^U4R<$xIJTB8pcn@XdN-Tdn80RqSWmH=uYHBGm>cTcGqq*Gb@Dd4@d@*L-lcxF}
z=_?O5PaRdY`g_F21ql$C!t>?J5A#UmY^<HEil?S`)fV9J{ma_@z|hd6n3{6RCe#Zl
zij(!C<lemp%Y8;wLZGH>m7dC-=RJO&1YTFQqXOkdd)`9JFvhno{nXJeHsaMUtnO^5
z`HL?Ge5_8=LWcl<=jN}j=o?;Iz>2csSFDTC9|Z1fxi5n!tDfs$-smDBz4;xw;9NWs
zqT|NIfK1=1p=V}igCz2r_h1_L8XokbKo-G|myo~<sQzD*35i#2FtDA0hqf)i1;lk{
ztdK3n51JFTZTsb^2|>B!$;|p3Nn?{<;Ui{d{J`;_sKebRm?-7V{Y7!`u&5p;j!iZi
zbEq{pl=~l2DfynDjHZcS310~aVcujG!?n9p)ZQl5`!8pOQAv@v@nZg%6Ey~d{^8dc
z6`8U(2gJTIqyJaeCc^%2hA#Er44w497`nr+|6=GI{!Iin|C<P0`!^A2{cj?Wz0MHi
zeR#|1BcX{HLeqzJDAU_$DMC*wYr~R1g$+yY&aEP`wc_Z3;ijLa!TArNr}dAuGGv)I
z1S+yzzwh*WfWeV7&H&0~smqn!ex#jnmB$LDz5dnHyJ63{@=ihXB|E|!5>FTX+X=np
za(lS6%^Q)nCc1zAi9$R8JyiRJ)%)qh-EyP$=lgw0LDHt{wQY%ggx*+*_hv=v`c8%S
z6Gq8E^ZjB5(#*np3Ojq-Kz>Jie+NzIH~!wZ;#w4*hZ%D0bB}YxvvubAs~P{ThX|eS
zZ4M*>V*5+33=M1upXbA-(a_6>42y6`G?mw|Jw{K!uz!+kaBnkG0#V!jflT2INfIcw
zP-kxKJou{%_(_ILXU#<O>>Jwm3{D86Nt<Wp`=VPKg1nCFJNDeOReE6i>Ho-(kbL?k
z1%;0&`BtvL#o#oaweouwze_(QT5cprD97GvNCZPqEcU(hyx;4TrtbTDW^Q&B25ZOV
zw|3EMKSFtPu8uE~FI4f&Vp2_l#w1ICf*QTwJ01!)tVuRJ3Hh~{Yf5^~$6FJ%_4g}t
zTJJ)2E&@Hj8h1P}@4GEE8<Qx%g*h4^c)XmykG{Jx6D;f=sPV5EeW#rFA3&ar5>_@i
z;2nk}%I;xB*QPaTtf0>Ts&@)qCi9+hYeD;X>QaDf_jD|9<=Eqk=Sp&_*snZ!=*#Mw
zBCk97-EO*{PY_H!qGBJ1Yd5WY|0!fD_0j4PXZEgW-pTs+ug8|vd`O)>|5x{i;;gd>
z1%}$QRd%sZZKDH_3Ln)#^DlG!=h5Y7ny-f#_lTDcx7+*;(SH?+-=Zj!+V@18-}}q2
zgXk9Kz1Q24J}YOz#PRg~nrP8}mkI-;FYT2j+#?6iOPfpMsk;7hqoTl`uEF=JRX8_|
z7L?N;6#6NkNtT$n)t^M;$6#sU?r}LSehXoDs~KPCM`KVVFNF~v48Vfo{fUIH)s&dd
zYa3Y<1D>3!KQX1$68@e7X7()yb|JyGsP=vx&mxqvn0<rYv7eXjQ$e-VRk*V<5is?2
z3YwV<wRH96zgmFG@Y0ew=T*CMdg|<X)7KVG?Nu6XC=(r>)>Bq{<UfK|V4q_aXh{j(
zR4`aU`uk{1hX^JDu$ePH1K3vVpH8x$8H{Vm!;=q+>U`Nqv5}N8T=&=^h?RDgRFhFK
z!<6~MbPw35LM&SRF#25UDosBK_9z-UBCdifaz+@|svuysn~LsnrIV|)*lmxYUyUiV
zL`$l^3(&5xWo8e#LyTa`^p40tC74H8u89Xw20>9DpzZ4i;*xL{o!1m}O36ua5V*D!
z)piFFu6&a4NNCD$Yjv(fm$Sv;%ygV`yGbe<;TAt$mz>oA>kAAPzs4ro^+AN2TY?ei
zOp5$^2MP;a>>VG2DZ<Abj;X6LU3mw8hNJx;qduBux6W~rmAB1fMrl&WqAt%V%H%E2
zL(+EIx!U_U(O}=&4dKGTwfb{9=bI{6oe2$GY(C0%c9$iKul6@<mFDzr<0=NePwX%V
zESPpYR!E5!Qf+r)XZ(reiK6-i%EFR30}2XFng-2e9qC`NqSBCq6LH~bMI98EhV`Oa
zZ7x##j{9<K=ZnCZ!^sXflbiyo%Ol#fzT<<BHQ^VYd<a0};!b|7@;YRg)>q6b+7uPh
z^YO4Je=EY^AoPr!g&<jHCNxkhh2wHOZ#~7+#Wm$dtU|iBbO5*Uijsjrj%$n%vB1T<
zn@6j;(KCkTUZndHRtHk^O#Ciw)*!^h-S-A$VvNovqR$+jMrPLVnqRXr-FtVvt?rk5
zN*J#9>f+Ces#Do>#5u)fD_c}Jg4HUfeLcGdD5jM04wpm7U1YTS9t`+3U9o65XNY0&
zq~|snTmmX}Elamo-&m%pm*pR&Oy;IlR~^k65&@ew+(V`f!-BFP@y6e1pH*J1N&UCW
zB~|<Smjr`_XT(Qm(AJv?^61EWHSj{BWtpB%B}pYUE>SWjNtxo`X378VlCl^Wn^;yy
z_$U9E!<H*8JKL7JMM}E`1KI;sfLQ+u9sintXDlZ^i-H1^nyQVY+&UcJbw`UyN^3<~
zC>W77`d+Qi>N>0K6kWr~NO$rHG}Im{v_Pfm(Ud?CfQdHa`is_Pe=46y@Cprfbd=h7
zVvhwekWYMjRbqTex{voAEER60GE}p>TmJTRxi(fJhu3a|$YebZm5qp%@w)5LC9&WN
z82Akv9jZ_NB&OIS8+In4x*-?xg4oNB2N6o=;%@(k)RR1o26GN|6lzcR2O@j^rSEQ9
z<m<77ThUEbyWUaj7CNJQFpn##Fjnc~IFXlwwcnYXw9n?il{q8GTz~Sj7NssKFNV>%
zfLkOUTc^r~w4uqIVY!^AE3i=0_0ni}`AIG>HST<Yt`+Hh_>t(DWZbFefI1X?cDi(f
zWuFqT#s7>#cvn?6K*wa)>2X~2^Z)~jPw)I099gcnUns@bJUPof$U5i*Z5)`I8WA&#
zkc)|3b)PvNvL~6m^uiZ7LfZfYlvrhI+~lZUN<qv+;<+-<_*_2(sxcctU|l25@O+8h
z4K|PPxM9O_H2;E1MDD5wiRY}@J8M8N76Nk_$v=Kt<!Z_A+$P&hqnP>lYplScWyE7I
z=6m`1((p;sSYxDiZ_dd6Oe3*BDmnYAb(}wb|DRLqPi@i53y1oPc7M)WE6nb|`}&|K
z-jmPK<SDe`O7T0i_tX9TP{-6Gd!7C?N0uOzRu@E@s9#YJSiWA8oIyp~W9hT4JFl`Z
z#@88LN;_h@;pCVZR|haieoC9)Un*j@YW8C-c}EtGniT8rI$E{9!-EG1$;_(iPLj{l
z);6%M5IP?get8vQ-Rb|8WrDr+o363&pwev(U!y?2AZJ+|4tsFfJ1E*BA!gAo+DZr0
zK#-W`3vwHPTykF2>6WPuo|*Hvlf&oUSKI@Bx_YYt{Ucx_O#iPOIxc~xrI6vNOt3_Y
zG=2qRcg5bx-f(hNho2}9$GmnLm*{BV=uk>6)a9N|>wGR;;x%9F8WjEn)EY*npKE5g
z=<~?<6qyp88~@r_O8cfBT^71DH7mj0{97pn54M5D_SO(HRyq8$03cXXnl$J2xUsqb
zT<!wyHm{AsKke%Z2}-!5=tUKjyD#)0xqmYu-ZUx)-_K+_aE`yDolB|*45m?)C$7GQ
z2VWUzJT4n#oxy8aJW`Hh4lt69!Xb4u@y>T76YxG=DGO8PIa0k~Xb6-Q<t8K?$#77b
zYvw>O9(aq3ro%EsJAVx=vLJz-)Xc6_dD9~4sE(h?0CwJXt(fS3SRYe69kT$-q9aLv
zIU4!}Lm78N1NTSA_1EnRgo=NL*Y+^N=}&(jI#;+pT#H;lZn`qc_%yUv=Ixz0g1|0@
z>wt~{7)udo?C37?mFWz$<;SQa4>@8uq_D;x57L!w{DElt5%KPq1vw?oX%%FoX*WI<
zhx#OIqE9h_+|0(RTR2YUrHmN^qr%sk-Q=R()79?i=5|Rl*l@&LvS-NSjw4gca9o=G
zax^J!vOxB0GvjC4P)ZrE#^Myy`A3xf^8D)M1hF&MXIE!u?M&_mw5N>(R4E4+@}?Gv
zz$gYNiyaK7R_BL=U<g0A7iup(ntT!sSMnMh>0RMg2H4Vg7}tY$!d4s+99{_MPw?<D
z_kMOEAzd|8u`lx(!FVpXzu&H4dE91$#Ya<ty?s{a(b@|`LA@ryFy-lM!$cG7qp^d1
zkTwJGS%vb#nVekE^X{)%!KVadRbb{yDw{+4?K$nuOO^p!kiRM%s5m+Pm;vs6{z_Oo
zDDGSyp^=f1eF}0AD|@IJe0;!kG_6<7h=2h$0$||aZ;hr(g|*fXPtQB&I}vNnG2amk
zRLV$;Zxq&-HQ;d(aKrcaPf*qlE_Q`@#nzX)^OXDUlKbz>OxDa0cR3j>9GP-nJc6~W
zQ<BTSo${+eq1&Ds;&cU<B;jrOd!Oc%rWM*=b~Xu;Q{05YimAkjM=#9})w0b4){dn`
zl6uOPO6G(Bj9B;H<0^Z19|G37BwHo$L>=TvRBCXWxm}V3b7l~^>ILlZyG9v-v*-!>
zSqZJEXg_0#K4+C&=O4DTS0ET$|M-C6UVpK5X{-+d;7fqH*_Ei$4<g&G%@Xn@VkJIx
zO-b3%Nc}Q!z?4~e&|D@orW9lYSQTo^HE9a~<2Oe_sUV~lqbo53Gr~F<d8zQb$~?iT
z?1j5Ea13)A>~KF>OH-P$yk$n;B9fMM#H`iRTEv8VF!M6BaV`vov`N^l#RW_S<7#sA
zTy6{%K+Euwkhn7Cab<9?+iiN<1d}e`?RpgMVQ$;nXlKJX%nBm5#fcdJj%>880~TU#
zk^4x#atsay%P_mN5Qw-E>mRfFV^(hm`>Y&10F93mRQ=%(OU)Bk<jm>zu8*P7f)bxp
zIKMGcu0qM#;__xNIDU(K6#TP^G9v#~<5m;~1Tq4K6nUC$;JJ_+bW!Y*hSpmA{rp8w
zA@ZvYBRa|qjO+C40+=oIurVc}0vkMB2WmEu(vb{&wd_8s_MDto9KBhLH1S_|Tae3t
z=||4JCVSaf*SEVbAhUeVtf($2jd-o-@IRNdaM`O9%VG=dIe+o@W33;T><aYO^BZwf
z?syWr$(LYq0(pAKaiPUS`KM6SukPYjPZ8BWaaK3@z@TO9@8!zSU^0(=>#Nnk5FK@m
zagD}h@XKS2?7=bzuh6!rCBg}xsFP|xy-ex5qF%yI{2Gn^$WC{!THn@=at1l#LW#?O
zS2(^dCb7W04HekF+56&3qjrx}Sfy*-+C4rtfQ`wYy4h@CNoAVj=jp*}j&PlCRQYI%
z%e@wp)UZw7ThgUpy4_2j8KdnS9;<`j&1Xh9(QXK1Oac{HAB%_cUGi<5kmN(To#g@F
zDdyPzQesTATZ>YfX@kC1yMROpGu)2KRX09{Zm#YIOs?^*i_qGS(V-k88X1p-L<R$B
zc%!8o1U%K$ib{(_W^n-MS`Q8K<y9Adr%;Si$i3I_WBl%H6R!Ymn1B>~r-HPCF-Key
zEh>(=ow|Utf1x|Lol*vOWHbVj{Q{4(B;iUX92t+F0U3`tHKX;qg11W=Vovb&1Qv5D
zr!8rtF9SNC!Qn7#qOWS$rwcdv9`&@7ieLcDeFaW{+T5K84Mq2H!XIf^%;!@F;&RTD
zKcdBlfs)uhzuO10SYBC_Bu%cnM*s}-I(i5DJ*UfOGWOkQt!cU4ldAnqaV%Hi%DZbH
zK`lkERrwIfmoG*sI>aLMq6W`MRBg&7w+S1b-f3xR-f>2Gu-cunsCowhZHnu$IZdDj
zx6DXne_!KkdrO6k_VUMsvQ&x3JKD6elh&43PX`1PsFmkr{By!YrCro{*<z!a`E|5I
z*9p}T;qrpTO6uow!c-MA64kp=cwDD7uA<Ghy{VJ4PoOU%qM$%R6@Q#Sw3+b#5%-os
zaYS9aXh?#42yRJmcb6d$+}+*X-Q6L$yC%2{?(XjH?lL&sNnX3>yx*<5b^e^H{zFgg
z?mf)z)oVYp*7{cPccDL71acz34tP`ON^wUnqT@cQm+#JkS$%fixZ(I0Jvnhp*uXz4
z8K=&4BgSZMl4xsLx!^esMV{PrTCH$y*)D&|4_3YPfkt!{=J+CT{73R^TR$K0SM!|o
zr$p5sg|fgO&9le<Tl4&X1a<uXLsSYAssC|TFf!zye}6G#e|Zq?IcQx`=TVfV)EKoT
zJudZyui$<5<JEVsRHe1^YKZN<t2FGW^tFUOutvw4LJ)_)+rzd^sV}f^3?gajF=Eph
zSy=bw5vIaJk>-zW2{{lWx{{q#I)r2b802|gD5p~gx?e$RZ!ndJLh70Y_Xcdt^s9)r
z|JIBVZjkwBHa+Wz^D#szr3#ncc53a{mg*J8*Tc?Y6I%oN(WLZlKMhYaPHcd<Q6;TV
z_fGF2DLqlfx!Ggp;^`VD7FaL*nl>924l6m2C*J)n2Ycphc1ONPD)Dt@as;^d+WgYA
zflVAS8RxwBt_X+AHqy;!@G{h)&a3CLI?6r$8yRVZcfvkD-Q}^iMNSu7cITU~uxgDS
zjx0p^gv`jIW}3^>aH$rwT7nmG$?NXE1ckf*Th(UnX>{rrBc7U6lDKad^~#fKnWJqq
z=NFrSoO}WXQ}(4=%!xYE&?e-2{7a;3uiWt6GEzw3waUYk5_`HVN=O{`Ea~!RO-7O3
z=d*`2=q4?A@2X{yJf}P<Fd`MPT?-a&;+ENWpS3h2ofLcYRlCH;_y;pGcp%>@qP6%G
z?W^6Nw0@XTJMV;j6~gv%`FLB48h_3q)Yy0zrf7wx0%S}dRtN0aP0I`|`i7RweR6oP
z_Hf%hvll%D_~xU|FM5{py|)M0Xl-LMF4?4atBwL%>;sLd2g8d{4~je0+*2h9(+gC?
z6hhhsqKKt0ayYk9FeT>Bb)PbrnSt-k)M)&z0Z$@0CDPwZs;=F~fl*u2rQSUF5rtm<
zAO9e5E6&tGNH}8Bm#S_Aa}3B;E4Ooo5xv0+b)$X-B}sCs_85e3uJ=&Q0;;>MNAI_=
zn|%~Z5*hongWIZ|FLY*p(22>f>Bw8bLoj9Ot;QXzWIoV&sF=J@$I7UURTL*fH8|%J
zP>rrgHKTZ>jI4KR{cah|#SmS#Z#-VUvGumVr&JW0x*~t#0<M#b`}w(uw@)1GQWbqH
z@lY{qvkd$5^fK>M)?aF6_;`dM&C9q{25jaTq3R5s8mCawo~--JErTNGA0)X_C_O)h
z!h1G8AIc6jkM)`r@$o;K$(|`f&OD;MZFuCi;!o%nmLCxR($>mtTkoL^_ye`JA7_4q
zbxX*Z3?$iHt33&9`+!vzxrn!_Eb2KuF{HZ79xIY$H?~{18ppiU82D+=TF@6_SO$|j
zd}lz+>1;Sgr^{2kljlo($B{j~2<Ec&lt51%zTS93&=dKon$T!^sCX~!+JZWzqeRG)
zUuv<fz6<?G93QeUo`Mq2G1a2${rmnSYprhfd!ehE2Zo5dI^pH(rSc7`%x7X`G@WzY
zzDEx5Stovds{(pJoHMdf%(B(#el1Td2SKFAqpM~`yL)u{K)C#S7)R$GEz3<ePsD!Y
zEIoZM@%cN_>$yB6j|*8?hMHW<WyYCG<F`=j+7X$CzA;1n*tbad?^52E9PPtxx9KNa
zxPwggLJVumu<o1<Uaj%<yxhGhby9rY4JpVM2Kkt;R&KR>NM^sq?sd*NkY-aXOf^|P
zDJ#woCGw6Kvz6nP8(&{LkINYVkuGInx%wnizx;_WFTG1j9VrzSZy-GO^a*_8%Bl>X
z5&XL=yUBl}ZN<tL$BR6G68*QVw~3ebA?axmm3wY5)JD#{=!f8iA=UC?jVJPmh<vMN
zjoX_vWtjtGO!iLAoT||XnDLBrHEsHCf_-yUH!z4ZOg(7oE1r}>1RaYi^x0yDBk;|n
z3rKQ8dCJFRwozS7N7a<)=yk1Ci>c)`wm?Bi?=9|($Z6JC{YE4;gL^O|Txl`--YCHE
zT2Klg@DbP<fn-5+ynW<edzogqAT;r1vKC|LD#*)s3*1Xoev#t}%u#1xM8=UpoQ?WJ
zq4gjWC2yP@hbsg3c*T<ll-<#R%4Ydqu(s=1P?nK+0QEi=f9&wFz=s;r%aJamt9s4C
zE;GRb<PE|k>2J9V(ar#>-i^;aSEidTbDEpC-37_-63mI)HBiG3k87UQ&3K@Mtur;)
zL$zt@E~bh&m~S`}Op_TIup~Rd^!F_<PVs12eo@i2sV5U6DVJWM<W@?-H2Kpp1ZWMb
z>i7M{iJh<%A)t5Mxek@X9;1Rf^9M*f+NNuQ<Hpcx+pSM@4wFiUu&<qW@(nU!&Ks}Y
zlNip@mGu0KJa47+Ylky?nM!kXf9+h16LC@)DG|OJX6&An?n|tb9jj(`%Mth6<Cr2d
z=zGgm4|_S`%5Yyx-I@7PYWeZVGJujHVnNmZVV)uEF9PcUBGS81p0@{PpJkTU{}0$C
z!m4io5iZ+%93$e}<w(7;b_;`56-c$3g&V@BhPmyY{frx`*9KNNlbw;}_RX2w<*X2e
zC?f1r#qL15RM|$U{lQtQbQh*Tj~aAIa9#nB8Lk^GGP%m^s18KCtd{pJNF`Etj@5<J
z>l}IrXk5tY6OlT4I-#IP`-~<fyk<pNh7#a6Jn&E&K9|=op}8h1cc+!Rw)Op4p2~*%
zk>D33&K7vhGkZhNn00t$j0pTX88<uN9lX^jn$Hh*waG>1WYJ-j$@EP3gto_GePzhR
zQS9g|Gd6+3>jU)3$8bDb(vdHrQoC947$F!GTI_zz2Bi-iC6VSrsZmPBfgU(0N0k(!
zVn(E+jPrx>jkX=(q|S`r63nRC5n{)Xj*czCeeE)kSfI**AV6w2Epe33o(9s4;}*&j
z{kRb3#UAvb!@KXH$0D_bRl3$3XI1bj+(cOJ9dd6hT)dpaj^~G^YB=G|QiywYNY9pJ
zDXD3O1N1VRqY<;mqBcqb`sn+2MYb)qkO{m&!dbYzyKGKBbKnd&x36JsXR@J2A_eiJ
zSG#wca6iEEVBw$f9Zr6uzOT7x6ijYg8F;mWr}RXi$_n3`S|*IyB^dvMh1Q`%{Syjh
z%tObLIyf=d>wnDY773U2E%Ynz7}v<uzzNMzL!>dpla}1Ii?m$E$ui}BdN!zxuXNtF
z3d;~;0GQ%@9djzCnIGgx9m*_ibN+=NqWVbB<c}|t=Tnv51&5yLyT*Qy-FWc%7sY-t
z3v$b;)-4>-EGBaGwFxi2&s{{n3dXUY6e11!zNk2dKtWYWIdzzEeo_X_!Gc_euVwQf
zgPJW|T5s1q`3fHMgi6n4EssVy!zS<R*F>qy{_lu|OVb`Vo2o~_DB;+9fD&P?yYd=x
zf*ukQ2Fn0=vl`!{XZe%0G~3~q*UqH|H@&yh--}KpL-9Kg5qHjfmaIBI1k{z&OWs<l
zfa>RiR4!iJ$yCxcj{B}NA9e;O*b&^)E0Hs$rdF!%IaKIbm29oNaSqW>Jq4n&7f@sF
zna9ca)V*-dPs_g8$bGveh1$+$osx^`&Z*7&3{-=l@!Cd9VI#pZW~oggFgzaPG(wyp
zVC3|-APQfZ^@;I&Szd@+CR1S-QAJdOhW-r?XLKYUX6gXyA73N@KH#K0wd;6WF;QB6
z95hFRktva#{xOzAXJIMK<rf$|PPQ_MF~Bf~emVR4qET*|1pncZ=im!f$-4xx+1u%!
zIe6cZlyk94Awj`l^vGbsnC`TN>&f|(GL{eM%uSCM);VfsO=GRwq>-fgyy01ylvR+B
zIO_M;q3_lt5sX$YxRGuT(o53$Rq>VvFQvr}xVXN%dKul}JNo1bG>(LZ809zHG0E^j
z?;{gzwO6o0$hcFd?JU@iAk5h2K1IFBBsL<7bFoNfGuBVNS$^XBR3yB$__LRai&k!J
z_Sg6!ODZtq`VgC^8(AS8UQa3)_bU$iE<UMQszmV!eyti!vYI-D^%0$Cy{iI0W>4OB
zIt6=^`rmSTtQmI(pN#J(Y+l7_XFTuj5*@yWKlB^x4=!G*M`;os{q#l)_Ig7o;_*v<
zUU18N-M^iA9iM+_GT-5IT(VZNpUD`wFH(KG0aP_@C0Pt&d!+lwD}1&xOd2$=@4E0!
zlnY7bhU|YHceyqpA%_d=4HG*LDN!d9UUNx`z#YG%$oUbRI`CAwwMX&$zj1Bj3bc$G
zFpkTED?&rBN7xv^0?RZwDxR}o0ZCFk&w09%emL-&?u?X}%O0iE85T$^-8cq~-8dr!
zPuBBFoutn4F{nXSStX#86HZ(hLffj+G3p(2j7~YAKR8WV7BJ#}-%n@^THvnBl23lv
z@Msy9cXf70#m_`@aoPQ5q~)E}y<0Cz#@hpE^t)U$Q>!SvG<5a86%+pvLFc#_Y}pwB
zA>J1}IQ^kmYIPtp7D?uFrC;A5Vm%1H<!<cPnN+sDMKmM0v0u#Pu2Yn<^A@uksx<L<
zj-5UnBo9}F8IRQ1EuO1BG&U*X_v=i9!}Ljm^9B*<?5j{x3H711*iK;^a*!1Jsz~$}
z|Hu|PcSC+gBo{5C#s2_^dyZ>({cLY_otR5Wzr>1`2q)IxS5&8|;2dn$^hLY);&sW)
zyzg{jWb}dat&zLU11TnuYmfnySv)f;DJ*&fB?mupKdv>}-Pvoge8B+h_ET+OP5FhI
z^zdz(eWT8OjtaP~LZF2^UVHKlNm;#^_Z8wCuijCKjJGK$C6Dpppo^Z=c{ZUQK;4xe
zq1PL}Z97pcW16R$ydiK#hAUce+~Yn)#LdW-_>4SNb?4BX`od8`Nc|$zkI=gYTQrC3
zx>_^Fipp$^&4gcZwaHcV3;4+3yz5Ua{mby_aOrD>ceWGo#es)tkJ@OZvc}`S&-KVw
zXDd(IetS*n&2<`1rI_~`Hm!Lo+b&{r65`6hBrgTZ%A2G+Pqmsj_Sn7d%FT-DED!VY
zp!$IsWOB_0{F(OW1y_gEqPg%Xmh3mj)#S3l%&$-pkMx~DM6hZ-W~}mKqGaP`3ap@P
z<pz@tIgt_NHgnR##U3^SIeC4Ax(pOeN$1f9pJR?7APjw+Scj)FhK&i4J=!~&g^ARL
z;hY|b-*~d5<9;KK+2R8Xjk_FQ6Bkr|0!+-lw)W8(_J%z$TQ=BIqir?s9^j9J!G4Xn
zvFQ>l`mS#beZ*O-*}W+_|C@q25C#7%%F~jij8nQ0dU4XNHB+qweFAN(On4uyf0?fT
z*34ebk%!i)J6kyWi=77hS47AbEhqDAx$T{CeS5v+lT)7(DMT|!cSSNoGsWnFrGfGm
z*PUvd)M88d?fqQnrM6B+XHi?SK4pQ2l-RQ`-@P^7e{(f*V<%e0uT)mZp7U#J;_^O+
zObF(BJ;Fdrtos9KUw%OPbT6T6tM@rW`L1Ta%lWPEgXV&s*2{b^mh&r{H}A9Lz7V}`
zL*jT$JwUe$7eK<RHa=fujYP(VebkT&LUJ#Bjp?oVwis)#`_r)z1#?$o@Q_=5-=<@i
zT46_#(PPddw#@i}lP76t?lq|%KJ;sc%s?oP_?`2zdYUD^ZxrPeodT1U1k9t>>f9QF
zV4%i)-=<YjZbR?VIH!AlX`_#R(vgdk0(rNz@lScCKv~o%jkXi924$uKVO(s3dU{oe
zVU{Z@b?no_sG-RelsohEw}yqpy(RekBne%$WX$+9C`mE}TZe0H_Dy!b0BFo=3$Yg(
ze3k^>*hw!(jYa$B{kr2psuKgPu5Ww!MfPW6gQLyeiJij}Vz{@rMjc}ELY#t^;xKng
z<PEG7b)3c2rF`h;zBO=WWhhu^QB4OOG-%(D;-l-<5jA*Hdh->DU?wyIWwe*V<pxZv
zBTG$6ne6hS4GF=tq-spV@~`icdFIu^^Xq}Z`t&(kpaWyxuBMc_a9;dTcCJXB!69gD
z)1vqKtXyl)zm@&W;LHzT6lK)k*<%Yjb|)VgAY%pBTH4#A21Z`qH=AaweYNp;&$RvC
zX2K_TdP2!CdT25_M$@st`e_nUXrtt=$Ff&m;v=}t;AuHq7R2eDA6-1jINkYL5sz`Y
zNb+Gg4%%)%Yt6RXxMqv0@poaDVtf+eF?sXa_q*whGNU#6{8e<JyP;%#+aHs|K$l7W
z0$f8k7Rry)aGT$8#G(xxMjI!E%u5QmE@rjYI?9+rkQ2#*%FXr|4q=tXkCyhggH2M{
zy?q$ZR$qUAAiA*na(a^UFD<~Bo^@uK=B#0U9Dpa~VuN0YPJ?xWlkY1zC5ruPlEF;M
zJ2Y40>f|QYDW%{%es>QjjNuLA@VQtGvm%MD&Opkx*T?sZEO1rP<zx&Z&@=W{?l|30
z<W!zn`hw$}2dFm-qaKIyn598-V#f;iRCQ7^@}e{}(-}5$3L3Zsoh^`Yur`EIP>`){
zIPSosM38peE4pA@63T9ojD}uf_{Yl(xyFDCk1q0{1cR%2`P*6tl?g$KO<+J86RJvN
z*-RaR{#C%oI_`J)W+vprn?N2&O<`O}_YM`0Oyw!DM~UirQFHldx3c@6+(W)4{a4nf
z8dRCwZwD5nz`cvdvAEB`<PHwI4&67l_M&XXk^_3xGpiJ?Sq>Fwug~qCF4To1H7#`&
zVL?tzOEJ?fo@=dVW9#X+qJLlW#GV}vv6w$5QZxI`t`pW>fAa0}`eSOV27#H#tEU-m
z3Fn$>un%5&7gaJ@08$vf=?tf234%ookde|CG44{toSaM%r+PJ_VCQ7DIY0v@4F16^
z`TGXTna}88Kl9I+F)SHH%LFw@O-J4WZFc!d;s~%JmHpA$f<8&jsCMjvifC#U5xO6Q
z;&4Gy#^+K>Zb~1d10HgCG?&dAvgH*JG8I#H>X)4QK%OjS2TY}vkt;msvYUWdShT&X
znRw2&m3aQa)1eEg6q;n~o!Eb|Q|=C}!8zp4cE`FZ0B?BG|Bae5t@LQ?JG5LDJ?Gl*
z%hJ|YzVqgG8y(YOQ0L3LSpukkheWhpHljA7BG0}`?rAxc(pUiz96Dx1h<GI46P%7S
zc0k4fFX6b>z?BdJ5<ZN5)1@#_uJH65E^=qi7_indF8fP;twkUeuaJU8n$T9tb#7+!
z=L`luEr(G^#X<38Y#Ln634qMg%V7B=DC%wBCGB$r@}syS0{_u1h8?O4-zERsrFjc?
zwycl^3JJAKyzOa#?vrqZeWN=p;T}?}tkZmF+rv~dtxDxPvjn@mE9Y5JL|Oa2&Glyz
zbpS=z4tt`axxnr>z7=PUR_;qBwu{L{MmR|&1xoZ+vGbr)6pqxxCOEG<5JNfAbPh}X
z^wROhvY2cfYFRWqt);34{tgY4f9ogN-6QdU@RaLdI<O^z^+@E{0G=N~=y+Q^q>s<7
zY_mM^p^sWJp2hJK=1JgiN)zuj{elZ56iW85ZRue6fkQWQexKYM`*PsB?up`ao8-=0
zPBR!H#)-Cdrgjv55AV<JEgm0WU|>3?WuX@qk)j~l8XO|arl9+;H~dU$XOjk6%8BTS
z12#5v{9ZgOmD|F9m|-=Wk;oQgUCpiOO_)rWFbf==m)sDg;1CK|2165g$&RSC`!Vbx
zv^AN%Tfs&HB*=DVy10BqO}aq{{YnG&jvG%nKK2IWQ4Qr6AD34Ft1^$3tiN?x;iFWT
z04Fp?dS9}x6&rbcb7<=eW&g>@J+`ZtgHy>pEN3$~@nCLSy|-h9${Od|$m;n=de>66
zTh~A=AJ8+?&as|o7;*s(S2u<RJ?j+12&%R-OLjJb+}zxrUf2;g78eZ`O*RN`_&%F8
z?8=%cI&cnxP53sl1VSjdc|t{gz3BR!Z$`wKvV70!yuGR}leJ!^YlWrWff?LHkY;?t
z<Onq^=mA{rZlw<43CgOaPnzV1qLfnagn(Y^&&dER@rI?B3^y|z;Jpy!O{(c56mSmK
zI0Fv6>kP0t0V}JRQYZ!~1@T#9ROlqvH3cFe^DgInVkUL+rw5^>fpDJ#bw_vOSsIv(
zjM&|JL58hb?wI|svp&lNKh+Q&rq-;^&@n3KlH_NPzONXlw~@PfI=^CxUl%)u>6z6A
zml2kjG^QCKmnXJ#Ir;TPcgq*OFY~Tooh<P}p8E3yXdY+Xyldl}{domNU5gX3(CoT&
zB_!K6%gvCuCwGd~n{R{3*J*m=(lvv=ldxXCrcORc1D<Tu<Qa|*`(|984drmv?B<Hx
zNf)VuXV58XcIT46Qg~gS?@GnpPq#Bpt(-Q`L~J+JRd_St`#mJ}!J9!i^ln>wdFOrQ
zkl*PoW+_{;9(PM>5w)8g_af5oS65PaETP(ym)zCNfVn<%DTAn50ZoYg>#GSe^_x89
zS)3f6<;iOOHm{qV?1fK_8|Ozq41DP9`8D0BowpN0RA1UZO-_jUs|xHKeEHU@k;1qK
z;dLkTS?hOOhA}>oe=Cfm(--D1=~-k!d357@HCh!*ZKI4~_^(o+`{tu6Wd#!lx8=8t
z+SS9^gVRgr>OUJ&8aN#H<+s)wwsPpyMfWB=`wJ{Dpv~vF7md)HTf?(^nB3sysg)&@
zY;<Fzh)a^0>F}OK*k_|cX8`on@#oo+kWA)8j_+0hZcR+I6Awl|cUTXBIAS8BmSj$S
z2!CnP_J7f&3T#}4w(uCJ!6_@P>g*~eJw(JGp;<NnF&_a`N+qZLdcSr@`n7Eu50~3S
zu5=|TsgNMdU0z;TR=q7b?u@luPIor);L~4{6L0AAG97y}mCVBFY7Xzbw-v<6Hbz43
zcZr4Ww{uUkf!tYfxNqU3%23TWH)Ndr;%k`%6}YvZ?F_6Tz*6PWVbKf~YNOQfFw=U<
zh~#VH>u)SNP~!Ro!E`h4wOZ#)0E{?U<|!VF+brRyw~;1<;KIF=K8t*gAYM7C`S%0@
zLshSHusWFZ89+L4$M7)vbF5$cO+lw>LmaM0oYG{)93H)_b8BV;n>W2!u>_vJwpio~
z^$D#Xkfxja24_4M$VT;FhMkfT=P5Yq()4%z*Q=BpBMn}spf9F=$(rPmo`3u$><;iR
zw~N%z7l$l@v*JxNDSHg_Oo~f+yN4&%>C|JD^QuF<(Cr&C$kkK;E0g7%QqgveU~pRy
z%8WipMp_X+-xw3?q~%}S>_1Vks>>q&k}q5kve`L5v7N7vqzXntt7ebE)T-;&1CzKz
zIqu~`!6+C!*GxB@^fNn^T)Qo0({b&=<I-T0QLmd(3B(Aqk#?6J#oo>&BL*4ouy``V
zhoEYU5uaZN)W$fms;^t)9V)}2mW1{<;V&c7Vf%|o7(Trc_8>3T^U>y-Nj`rI_l^zO
zS?nld-hp&uuRiLUG64<GI{b#QnD{tq35}jdc0{8*RN&AAx=qu6bG|Iz@croUB*DD<
zD&WGS6=@+$7WtfSC|plzSvno8R%vwl*-naf2li2;Y2&eufEu1cT~;|69Xw*||0Y}4
z)iVEb#r0f+u+kTHv2X(V*!yx*K{tI-pmd&mb~>ZAyz#i~vuv>0AbvH;!jat=z||U?
ze0SjXX-22Kc_ivo7|H?}DJGOV6D2|qiW;b~k~B@Ga*sH4RGtEEOc7C;PttM`d&<sl
z4#8H_6FNDZX_&4B9l4uMs0Rk8$3H-#bDRv+?Z;fkJ*=ln9aSh+I(pNZe_CxyG94J*
z<A27B#h}sAjplU^&Iv>2<>)e2#CM3#+D^)Htn_+>$<)RUZ(ZUyH^((xH0IDUX<oDe
zM+U-^6TrPS%jfFLY&JT{tbz0S-wj&oW92;i#hQ%e<FQT=X$)x;*Pl7n(gp^l_miOQ
zepMlPV$V-b-`n4nAVbVU-`f-Gknha0N!tMBdp}%bUSAKSA@>K8QX6>ipDXh#8RKmy
z{l4U8GGwmcW|#y$b}xNf8?EJuSdg>HtRGvx9*N+1zC$1~Gz_#@Ssh@4e`*tMi9wzo
z+vETQWtAfcga;lAVm=tEqLnEfqfD7^sSJ7D*pudkg@nZCg`(s-(@))Zr!p+MZ70z2
zc-_6&+S$FzCMJOO*Z|Rh3|x?$t8~;J*yaIDL`_M1IN+b=5i@){M);?Yb^hGI2JRKC
z<ZOHWn0AM;s$9W${U2KakLY|Woq!CO*simp++D7>sXGJ3S(trGs`QehNvq4uO=$;&
z<vIZB%i*;;mITc}77H)_=_pngP9$CuZmkf##7Wm%PqQ;K3)_*<Y~DWQ>)j!eDkIjp
zYObd*MCk`^2%~Eh0a*ZsjGwXk&&)srm}on*<VFjM<Awog!1%E-DVXkhl-?^-%sg3Y
z2p&Hgb#57nPWi)ehY(ub1$88&EM3W+X+lri633j)YBU5pOSCU?q6-n1liK#!EK!bE
zkrmwYx=T0xA<s1{a9aSwD14X%0v)#!U?5tIsqtm^8>*-@qj8T7eOk^7PSW(0!JNz2
zfQJ5g>ddk3&K1AbG&HRYD9#zDj{*0a1x)f<bL>42nJ1M>2A4|TH}Roidr&IY|Fj;<
zrTY`J{}9hXM<60Na8ZTvxa)q##c}NOO*49Dn-@3yeL5|J?T4lF+HE=_xIgv+uoU&5
zE`_#zK3}nd*oa4nn0kVL7bDC4zhGim&H9b^Ejf)nhR;}-ISjV@RxPX|eN#aQ9Y5Cf
zud?7DJza=6$s2_k*mU7?qKwK})E_nb%uEY!uCS}q(il=%Tz*LEUER1kuzG^|aCdx4
z8?d-m*_HO@Q~PT#24yJ^U>b$~8uImlZ0yA2a-CygW%2fI^9P;k_;mQz#eCYYLBJ@8
zjm_?NT}{8TXL79vhiF_btP_R)GT=4Se-ti8biB%KQpJx4KRYKG-V{uxUsEHj+qHp{
z%VeH;|I!&I1-0|_#~iz~j^7EJ8f%XXNokz6VHzF&urcf<IrkGnwD%QyF(7taCqw<1
zJ>tJV+h3JI)<0bd;^W<%dtVcqK{Yb!=o}nuZ|d?zB<y;$QAnH(#`<u~E`78*v%d=>
zF6VP9PF{Y^Im1!Sm45l!1s_>gId2?=T)It|)L3(lTyastPqUr*%rV|}^@XJUJ|2z=
z?3!@Bn)UutXGNH0wIV7cOA{F+l^ys0MJ&HMF=_3K>lEXXgu#u>LHNO<64T!7UKI&b
zyh-`N()Q3q33H_JyG7Cr=vj{J9khuZrEz|THJV#Noxxuic;cv&32V{=JS9-Ve)_wv
zRv=UI_+V_ctLo5g_DU?wA_Pv3D7r7hqq_3S(pRqL+><|{A-#Id5I&>5Rkdy;Uic3!
ze%Oy4e|Rx>|HT42V}b4u%o_uAm6zONAt<J=RAo_SiH;!1e89=g(is1ssD6KI&h<c<
z=LgolJ~bmg9BNRO7fkAOto(!b<UEh=nsnXV-H*t~eT-r?iO$Mmvq~jcuBnwtRQ83C
zImD})*DR{cFMHCr_hfJd3Ym)hU3JcXr88bX6*A>r3`Cj7!u)2Jz%@x*KeMhcBRT3W
zLBT=P=cCtq7>$VSmQiD2>^Kh_1ABqReNx|eZ<tL3PuZ8b{O2Gsogo!xO+Jyi<(auh
z04&{LBM)&Jh3l{8_NFzC!`NKNUcvz7k?(Ohu0hu9j-Hh-a#%nI9<&mG(e<HPhyQ(%
z(w56rMgE@2KUp0MXm@>@6yZC2@)9KYjn9ofI{_jsGdd;=xp}|MGmv^{ydzB4oQh|K
zepe6>@9OYc`sCtw=I+nw_wgAGDIq0M{+AKp1dSWa+l0@C3vZUzWH|kYX_Mg&5f{^2
zg29|I`Y`)Yw9v}tZ}hG=G<kO%RX3>VM*9A~nk|}_Eo|8O<O>?#sX*8CaY|rdtbjVl
z{xu9TBA`>f`I_%iS8s~D51J#po8Pg{5`eIzgHf6;og9vD7O|7xHlFz&miF%|`HK?z
z8<hdZlL!s-OinLgLP)K|7{gg8^0i8PpLvSP9y_?6X<T@Q-|o~)XR%C7m~)g<$eC4T
zT?4jDer<IH0V*FnSbk@7v|LpHHj5GhpP$-rmhYy$x>NJce)IuGAB)~XXVKdY#K$s5
z<aGW=vA1xlo~YJ_wB!+K9Xe~?pI1ylQ~5d2=5o5-4t04OYIsgU|GD6sluE~xY)2BV
z+`zdTcPFhKD!lM)jrp_`Wh4mv|4(<77hCYCy{p0bBULZ^r&OJw2k^>X)4x~sqJj3^
zK9OPil9I5^K2@!R&|aBW<SJgRE(?lUQezPq^RioqN=n)4eD0=GzR{uW{8P8OpnrMa
z=pBj4n4TVIbmi_S_tFiKh}SpY6xZI9*1dm{BlS=2{|J|V(Hl;2Xd0S2==V5Blne_1
z{;dOYZd%Q}p+_F)R|!QtucvkP=epDOD5keiz*|pdE*w0&nGX_W7!^Y@^-u2*9_(RP
zURu1-HXJMN03F5|Tb5INki-j7xUpb0$$pn6Sqbp@vvK%#@~6GtU*?-Gti~})GYEXb
z@>Hh|kZ_-oxAsPLJu2aG_>7At3YB%6d)G^zq-B15aod+lER8&Qj7!udC2Jua-Mv(8
zD`t@OvS8vWzoTw8-%+k(T$;w8KqW8}9*nuxjJAol-{WT)kAfBSZhEE#&Ba~FU~0_R
ztF&50(U@}L&q}E^kdA^2e1Ze&->=O9DOl3GH2IzDZV_K^6ef`lKa%B5zpc%xb4gVc
zjp^bV=x?^14u?|)CEt8FrcdgVE5F`Z@9^Tag~t}1vZm<KaH(%LN-*MS2ATR@3in^?
zX4sE458I0biztgvTt+q6LH>*Z3U<Nv--=C(b}o!~M=j28ofEXwBL2$2bpD9odOYX$
z>-&e<e8AdbZZKzuujLD_9&o>v3v|Rn$0U63(RyL$+&@j0Jc&%qz|<pl8Cb%+MrQjy
zaxLX2gZ;x`$s2#JKJB^nia3#uWlN8;D;%0K_mB8+o^sh}FxWTHn}?ljV=VEkAOz{Y
zwTb#eV~UA5sMhAPB>j8y)NMi}dvH{b{HnL};+kmm`(hsbP<TdJC57NB<|MOzn8GNB
zD#y75f($3f&*8qHws9LQ+(WFrkcws;8JW-U=z$3)U1Xp34UN@>z*=FCxb)v76_pv;
zm)jRJzxa;FcdFKA_R;mS6F^QhR$5VY1{6bV>eiv59fQay*~h=x+-SmT>HqvBA<KU)
zluu!1E?7)S61{m(q}3n(mwhF#&iiZ9r#wafL6htUHHst<;hvr8@JkiA+Trt7WD$(n
zZ{oYD{pUSoQv;Tj<e!!QQrX@Yz171+{)&Ysd<l)*SBJ0`>Y*cJ=pw|lgf82CNME_v
zwrFF#fBra6OR%A!!x-I)6%5`$F=*|3gf}+NpZ{+v&<|9~3&7!&{6;EQ-8Rb>pT<kL
zQw*v|%;=Z5lT~LAh53w&xAEDGT-uy9cuE-2FK$WXpT0C9E?`+i;F3Cx^gVGe5<iJ&
zt{SjCxy5=`H~(@%U_B#USm+aa|HHZv&iCEzntR1Gb2~r?CIS1aEP~V6)9sWveQKk<
zbnCvydF#F%iwpL+MV6mwXE3YPK_nKJePc3#<W^h-V~P}9w1<S<-d9i~act!o$<}9`
z35Dy?eeIuf^izQ(i1C^CVN9W+rQWVMaIHb9erPAnD$pIka93`O_LO<!yNPuBkmxbS
zty7H5`&4TTvdW`fZ$4iL&tXZBr%Sc<pwM@ekKm)T%Y~JiTBCG_7^dqTj^v%QnRjHX
z`KOyVp8NjE$;0zX;?)p$D}1D)bt2W$BRUwrFECvnrk0lch(!gwe7=H}&rr6<zF+>F
z|Ht9kgAVEU1>tKs`QPh*M-dX!kiB>z`uE>|?wS(~^Z7qR{3e7y!u>h@&*OmTJ@^v;
z{`>~j_x*o9M0pJ1`(N(&Bb)EvBT)i)zsdY(Bn&?x>c6J(kK6JafX7A?pj&-q7)j=Y
zcw+$Kxss*uw@#jLoeCsXJNW{JqVPc8cBy80vIbfIywb`CTfslWJ_nkA6wh24XoB2a
z(7^(=#*V7&jokE26nOf$?+ip(z73A8bNfd#-&>14>v{JOuD@YoaHt@<tUAxxKMxZ+
zUA&&%xjZ?)jRc97w|d(fJ_gM{jHaDeyWhFDJT!Y73B+$_pDv+%eqshUgYX(pJ8vH}
zXF3tCEsCX#==Zu{mS1@Z(L@u@=65sMEk@Aj8XoW8ex*6_+hI(Qtgz7W+ZI7K1xYO5
z3(N^E^DZ=<a3wj0#w_sqosM{QZMR&V_*oZtw1qz|O<@6yN<+HmCDd^&3D%bOW_(QZ
zN-L0a2tgS`Lkm>{Mz4DehS>1m@CXjC+$V0AS?o|@C#}}av~k!kCrxW!o>qh#v(P?n
z5=29Oga7#5B_4|t$eg6PF<k2rfktS2iY0!ounBNy<<*?$kSFNz`}xGn-R;@+iPcJD
z^oKS}ouYr+sypd%rlzn*GPIcDq))r5E1l63a-mGy_4>nV0fygv+Zdn?^!}mZ4b#-_
z9h&Dd`}4eZjHdDE&S=Hu4QMp~?EtZwMMz#}3#fgWu1)&{c!NLRSDKib;>hJu3KrU)
zPaobyGFF0gow}HSif8Pc{O*8$Qgqg)y|F1V62`tWESf(HdZ%MCxOo#piKFf=#5&-J
zCEQ>S`O8%k*@^yi$2Y5F?8M+$*PM=hJf=_zhp+>ZJ?d+?O8rX4jAoWyUfw!paZ7TY
z9ZOs@Qq8pvxI(Mcf*;8U?zw*)4yU<2M~XwhiqbUeOq;!{MK3Y;4Ajz)oT!voffT^y
zeSHM_b>EgjiBBS2If3M!MaqMnQp1mGi&g&o8tZGv#6A!8DfSx5nK)3ljBT{*Lj7o%
zg;|tBR6`pt!W?a9z&%cku1tec-z**0TdG3#Y0T;yv}!xV$+Q3E^sZ-#r>SUL3{fO9
zt)%nvzL;0u@jh|VFN-zq=rj5At3%*i+dL1Z#U|{&!rDp_L-v@eTkG3vuca48{S3ZG
z%q-6Zu!QS=tI*FBH_O=WT9=m>Y)r}f<+$TkCrN8K-=B1Vq|qf_(r;rsj+sAu<hH)q
z8(U`nGpbcsET_<V1+{I9L+L58(tTc+^0C|@KBW?*xOazVJl}@!NLa<Q&okOLfCD<=
z76V(NOmVf1e2aYB%7-WVfOKp729EDav{VH{a-sbpZc@R}VY&U81E(U6Z9)E*zYzhe
z8LrV`?Z*0UlasFEa0GtJ=DGy8_9G;Z56`6T`LV$ECE$uM%<=iyuQQI1EnTdAt6m$r
z`m`wLgFg(fZi6HGg{>J!1}BlKu>3D=jPU4;o`lqrmg{xpr!{r^4IC=(6aQ$jZ|eFz
zx^vgugz<xfUawBp8#?(GAt9hb)+a2@kK8N#3Xq=;*9AewEXaBxQPI(4oQCb>AvqaW
z&mdImP8M*z`YQ#v*Gy>bjM*LMwSCJWtr3m5fzM>HJHB!D{TC#q5y(F*Wxge;hUs9_
z*X`OL_|yG5a?+b>lB7=67U_KTK(M11SCY&=o`HU*P$o56g;MI7y;!@fhEO-5ZRVSD
z4>p-m+vGT>$W&tv9YG#LPSsdMY0)7G?_c)k|9-n#S0KB)d1~o|vvi0j=!s4c^Y~Kv
zG&PnP9ACKkq_J!AfpD5kcXcLgdgrjAh|v9Ar-6MuyC98`q&`)aRw*N)jm#6;oys>F
zLNeJ2U9TeIV39(|gJPBdMy4$U?Uj=g^YuC>u~MFW#%{LgIP}62Jd)+h9;qw-uRuL2
z@#NeOoMO^#fG;9?LpYFTjTtl1Yx@?h5R08jgYamo?Slz)yxePa<X>U_hH3f{mF^7e
zs?CFH`G%!zeTfPGhtymFE{gXWpXL!C(nz^d+Kv1bea0u+ceS(mE<fS2jpyq+V|X27
zZY0~MUju`_`X@~s>Mkf~5;wO(+ZZVEBh)!rwmc>|+bSQCkMnkLd9MgN^<VgZ9Mr{&
zApmMTH6fPr$=##8O(BOW`?M7#*9=mum`p%WJ{QrE=&F4I!6BX|G^VpVq;4S*5lqit
zFEG>1!2LYTr>=l<^Z}HcK|UtxNu6@>8G&oTuqsvBRFg@WnN+k4<>ZTd8uOI;>s^=+
zZ>tC(E45v_8uhxQ&%hbnFefHXZ0&?c$Kk_y@~8^8@0n=ff+Ko@`qrg9xy*#vS!jjm
zpq0>7>TusInvEhApLS=JGo9~=$jwq&z+ukUQ+wX#&A~YJe*5jnRs*q4>gC$xFVG}#
zP(}D1kpnXBLsFRf?}&qKFzBN7(}P*wJ%ae7JnepJ=)V(Zr6%oJ#DT=Iivw&V8_}jI
z2kV!~@VRps$Hg_umI!P%51bs=ADe#}uA|M{zi4hXE?iN$S>d!8YwhohQY9M7`U-8G
zB!WRU_H|$oCom^;WqL5*fNj0X;?Yd&p0ZA|V*4eUZo-Q8{5qZb%w8<`!J}hBN^l9n
zO2Mu2F`?M^x~>pU%G&{Md&F49(AH>D@HOGMzVLZw)=Y-IMDpnv(^p&i>r?e|2TY2x
zSZFwWzdB{!Z|x}rOG##sl*kO+goDGBCEg<s%|p_ndwEJFqV%?FQC$Gpb>^Z_OWb?4
z-;HiJD8|D}&^x-q?QTdDTCOny+68j6Tn&~lyTSj`0-U!?4zfNvdCo4P)_^GXT-5Sp
zOo|8DrKT<!-_N)8jO=-~IJbQIiQRl7xD^@f@|3@1!G(R9J+7yDikK;J@jWugDH5S9
zur*Fm+o)V)<g>Q>=SL}K^22JB54G^=;#;|*_Y1fawF+_I$(Saret3kKn3i)(*bb(Z
zEoVTIH$DwfZO!Cp1Cf9BX$vhy8^jy6f>Qiq8%;wxqzGX`&ix2W;hGAq-VQD4lF?7I
zw@a>WF**IyJ8GwU-jrEoXq!NTj9Rz1h418@z&1L_%PmD{d*EpbI*l~tvZS7&Y>$bz
zMFqM6^=<_UZ>&|)j<y@rnAcd&UyW#NXT$a@E2GQu6wW9hgM>r*ng#*KAzq79dVJ>x
z#@uUUo}f`VquJ<=$0Qa;MXJPfCUcFl)xAVyXZbyXcD%ISc6?}qfyRMn7LU}N<>y@>
z8iPA`5~y$*_I@PUSKJk8*VpMr=>?UkR`F+Qdc-ii^d~k7aGxL=y%Vy(Sz1>{gWxz3
zzv@7zxT3R4@5Uy5oyJc0IOgSWr20Le#==I4)n><gOx_v~i})hkGhu$;;i6ufAbSdC
zLozu!HSD^5zx~c=@;AcfudLSqZ<nf6!naHA?hFaLh>(tgXQ+o&p-RY`*>sOPc`FAh
zSdoR1qrjM*6Ulx`0}84l3ijJWbpuv%81<&mgyGahARE3pCRr_qcGb2E_E86kh3iV-
zOuh5ZxpJfDqtTHpT#>!bZ>8Ny)fOH^PwVT(I3pFSKe|Tbc)2wpi($e+g<toHEq$iO
zQ2V3ITk5yppVn=w-tlwy={LJDm7o<-9J@NLDNJ2U%N334ze!F1l*exfpb<CTNV88?
z6UNkNlFVY0O!9<fuC=p&qm5F+a)ZvQFLI0R!VoSJl4`9=l34AiHHR3a3PVxE4i*Rc
zFfkFRM;Hq-TAxw~kwqJ?n#)%zi;3_cMcA5d&fuQ^{MD>z)9-pWy6qFO-%{kFC&ixf
z#5kdx?EL}?sYv&$CfEyh<JYB#760Oe1k@m({01FG?+rDB&$d^Z?9b>(XKloi2h!{*
z1j578EeV@$*cj^Pw55(d>0{ifRxo5~eK?KBtS9=V5$qA%Rvuv2;hc{Kmt<ljeDl-u
z3-Sk@ZIj^NdFh}vkBNGRDXViofBsxCHk%*TgpFaN;(fZt<ooxT5;doVRV`RH1gh$}
z2_qkxIn<~9^>^$twHkl^))b8gWf|R;>|0jj+NQBq>B#Xm%coIWTqinBwY#J_@Kqz~
zkJi{H+r6O4)tHB7VfchAh~`a(PrM^4pqRx1s@0t4>jjYE(#$HR4g63Fa*n%t)gG_}
zb~$&VmEJK*e(9&x=rkx9K5^Zqj9g$k9o)yZW>vu+{jIpkT;MU1b+u#@sWBF3jxk-$
z6e`ChjAsqhUraebKX$QDWNQYma{Vg6<mOIpA+sUbU?9#(m-3~B2es>iDD#hTqv|V8
zuJx85WQ<qz!hTQ6?a)WG?H$5TOos}tsP($|RC`L-n}=%ft}7!Ejb1av=idqx;HwdY
zgyxgH;7zN!&4DZXAY=Tt2;=P!&}%^xnnS+G$a1-CTR1F`=Z|S8*5t+#N^H^+5gn{-
z8P>b}p@kM8LI=a?se%CS=UE@n@-inmPfUdFDL6ZryBs|H-uaaynF3X5$5Zu(e%z0T
zXGn>g#*sm|4+E^lvp8n7=|%Rp{6;QoI||b(g~A7okAfIlTK1JSaoNibC&(%n)XVzr
z0$7fi5BJtdqw53u#bDEVnvFG`ff~W!Wz;{iuV{opjxbmGQwnyw;&Y4DygteeSg(e$
zpbD?o=o30+RNzr?3n&^;c$MWfn4{)TAyRoD{Ol2jM)tP<W?Q`Cpk0u!kjp1-tcrb`
z!TBYPE_x63t>@$WQre%Z`V_5WJwMoG-5A!Hv7sW8&+I?aC<-Qs*jllRGU|VOp2Woa
zQu7`9V4yvI^n_;fo}yxU)jE9XiV-LBELq4yQz5ZF7s>fYpafqspiYXXbm`L?myeuo
zf&GudFoI>9Z=N^}DU3JNMO8Hs)ljh7iw;@l=BD_k_V~8(BuAEAA}Wj@0Lr-W0}D%Y
zI?m=0jm-r3x6)iQ*qs2*&w`f>ls7`e!6<!=bN072v27l>QJNbXpZ0^d&C1>_VmOxI
zoAFg&Jf7+n`sSt?_RvLks8b4Je)6?UIh=zoLEVXtGo!Al;~ir+hh^qCc`1(7LFTg1
z&)V2knKqD;#FYZUg&S@&c%r85x##f-_og5(F3))TVOo)%yHlUl6nJ3W>S!Yw%~F{^
zP2Dc0iN+s9l52cZZM0(L*>B(ZVS3JAAl4fqOm~{{<jTYZnMFaRQbQY)s41G)FxsP`
zew14!i;QJDDv`%-g`SgHof6ttwpCt~{o7x}Svh;~gw=ZA7ncDRKIPLv#3vc`VTVOA
zlPjiTE#?fABynbnepKRwpBjZg8KqA*P~yZDf)<`ea8W+x_v~b4d)4fGh|IA~PoA_?
zMky3r*jYN(P2q6^mMj@p7N!$Em_A%N5Mo18hEpc=w~+YwP)zHN0nUv5TZ@UKn;!DZ
z)&mlGI%i`1AKb2wl(<-#<7{cu4srXpibmdrzle7GSe#PR=8B^GmjHj5ni4oN6<sed
zhEge)$H<#E#<|enF7r7Hrya6bvY5`BC37>tsGHH;Knw0*-u^^sPY*OT&0nJ~I3;+T
z3Z64M&*r-O!evJjbf1D{D1F#yQOjrfD2Y=fgtqD6Uz?cOe8vW9b9L$=oQ=oZwmFk8
zRbvgMvl{`f8kG}gkRB|4#K6eH!up8K7TPiPjrSLe4l{;btI1b!QYibvZ&?J3IKa}J
zg4Tc&bG5l~7?OH7My=Ujc*UnW5uG?($LciN!iR&%L2GXGdX%KxjgbW}OSgk?sQf5@
zu?q<G3KZ^yIv48Y5%vxfX3%Sd?!)z0lQ8MZCzVZ;@{8tkzpcVeO{duD-Bms|?5FmP
z$LcIpG^^p9CDs!%i%qgLjfXw&S2}k_D`bp_CbuK5h<oUUJ1Kg;UvhdghZBgH+_vH0
zdfH;A12HmRv)O3UnNyM0LkM{6)>FRvOCi6Ep*ijo?q>Ku2<%-*p-wg^8>=?-Py0Z~
zh_o&<9Jm82i1l>ew^>5p-(TxFAjK^-kSuJqVZYl!EuUEcoZ5Yn&EeTOJ#Veh<Va=z
z@y>RbG@I*|fvb8+CI~QAG7a&briJ%s`7<YE-|mkG_w2~ZoCDnHGGry90m8hTkQeaG
zL3fg$3iX(0>@VY1^MQASI>Q0#)M<EL-VdO+_|1CgjKr(8XI|(C@>U{7a!no1k~RxX
zJf$Sim7<%cHV!i)jmarqRZ{jS3>=sG$+Eg>4Hor`T#8rZ6$k9cW>s1GF5esc<tdoM
zTenIEU~;Bz-QnjrzEWcrcPCGwj5UW}4WH=E;0MSf4b|ew5Lr7-u94+*6&PNTPJ2{5
z)A8H6*3J`{r=Dgv4FOo?CnJEs@5m}?$3#$`Nsc=U%~?9BWi=nND0P@kBwm^j`W~q~
zuB0Gz(To^9SCtC$J;%<%6^+Og*Tr6xC_AzV3jqhjbh|v1p8X7tN8d8j7CU_Jkk<^g
zA9bb--WdS5G9NXLFBG{60S8TA1t_4M@bkOuzvWoXEzqtGfeKoA5~pxD`XXzmfp-(u
z3mb)Oxpnda+6~J{=H?%8%4|i%D97@DHk#tYqK(ws>KkJ~M+aXyY-ubR{$kTG6!=j~
zI7i#Y{i5ce?OkH@{_D~ED+M!!o9sz`fk%?xMSV4W(gJgs4<^_G^<!|jx0(`-2F`vS
zrKSyP%N1TGjhBa64PS%&yXyJ431m?Mgu^X@gX;;syu2E?iXqIopI<JnulrO<CS_gH
zTix%j9`>{DUeX6l1IOgXh&_8d!wr#Nu3DO6Id35BMIx?#{Hi5kcS7Ah#i1xafa<G0
zTjXFSY3<Hjp^X<K0ds5NVkM0~)qML)9jW1}`^PL9aku=7o9$x!2!@S+c;*VoVj9bO
z^ixqI#P22Kz@$jzmwc-H>LBznYPT`|Sjeq!md{WYeQ3h8=Vom_dI%!{K}WiWU73>U
zO31TNEa&I<3YLV`O2~!p&h>DZ$kW@42Ch5fpJku~Kjl-9<W1c`_VvO2=2{6!*$jsJ
zX=y2|TAK6;4#9-kpI?S?PrIF^TW(R01|kS<s+tp4y)qs~5Y<%B*;~83s?6`oNSU-R
zNRKMbscTNjF}S)hyoIfPJn?F?O$N2j=4&}gFw{p_3AAjBp|U<ko-POj<J>~1X{A{4
z1lc|o2S&6P$!HXyBlfg<5M$I=R2T741=c&Cq445gs0}M$>4L1qDY*+rNJV~sX|~&G
z9jRQ7|IX?#RYr(&Fwh(uE&1d9b)S>{i`Xss@*w#UJ(O6@uuOo2zF+?aB=OMz-4UtI
zBX!GcxAbQgL)RJhAM`vki}7zU@-VUrvFo_`vc-6|a^gOSo$>-zB~&>YMeQY=;bMVe
z%Mxn|pJV0IE?_`)3r^?CFG>x;Oe{mj19t;R`k@&IVwSSl85mC=uoK`oDH%C3Ji_#-
z==^vZkK1luiw61h72%~iw{4Uos>e^~#~t_2_D9*?I4_L*A;fN!K1#s#Qf`~S-V_1u
zURpBbBE$!Nw45Kp@@RhEXWL@^8f9B<_EYg*BISFCBZ(`Cksm~m+ZcXRXxD15-bD-1
z9l7!E(~GJ&H~*TLA8yQc&#P>Yr*B&2&QB=#Mjzm~KJ&OC2!WsQ#`M*owlkb0GXy?1
z9RK$~xA@W7&LmSRC6t2ky&K@>{MQ(ZJXcT=;PkH85SNtaTKd^xyQhsS0~}?yi~-9(
z0y11k%jv_aQU<_)GyzGhBuo{!OXr+3bq$%(pq<`Cobx?V6ee(bg5IXrrbLQoLQ-9m
zD6%iun~Q%r1^;=`7<aq{giBzbcu-8Wd)4f{8U77F)|@=2Z7#s-o{e|G=7|ZrS!;V<
z7>D9{i|)i`tuIKsrB}(2N>G`1%iGBq@!GQON8qmkX$t(wmK-j&K;j~FV(tgHOE{X-
z1XW`E7T({Xp6>rm8Q1{Hf^5eUG|2Hz^`RXNGPndpwkWk$X>;a3;0GqRtF@$<V_v&Z
zdofjvpXG3Xd%8v*49TZ#kb5t|gKnGG+f(I5_f_f~IF|L|4_I(M#|Ea;$J?Aaa8M<-
z4LIE#_>NuS-6U#3-|Vstve0f;_4b}{Ye)#FaZ1W>A3l&C5-2~G@7>G`tEOZ1hc74j
ze3w=qljY@3x3037!lBk&D#2$x4?el3KWuf@3b^OmD3#dRRgdOkiMMl^{|<K}h_~kL
z-><|yd<^?()DTmILlbFX6JW?%v$QloUh+i;WQGyt$VcN}SdfY<3O#s2ueXakxWciP
zkFh^x!ax^PN0QeTH-~|_<$WQr#Xu9~dRdYOPNIl3PFFRa6mB%rrenQ=N;-#KjGp4x
z0>_pbCUIpZl=EZO&_{3T^j9nn8}(IJIr@wnPii44JREH)V2|sn_;gcWfIAxfKE6|E
z+P0*+3?*8xU(MdN26gdAro5Yz{FAL4K2Nt~l20zmNtsQ3g=21YH6-l0!t@HUJkO&;
zCe>uQ<-#~F-OXPJrZtrJ_)<+kKNI6cjCuN@e7$_Tkcq4`b!bGa30GZaRIM9C&bKZq
zIffcbI|re1--3C~T1q^$Sc`nRi}_H<FWtOp^*99`SNQuzU*kf1P`;w~3oZf{v!sUQ
z{Cd?m{>pd?PkBinBg2Bo>;J>sTSdpU1Z$cWShCn+W|k~wmTZ9q7Ff(o7Be$5Gcz+Y
zGc&8i%v54^`J8)iPv7o`Su?XHU-rwc4OzJ}BjSrcatQ+B3I8*;!g!Wgd{-#0w}T1z
znzl?cem8e(nANv-&zBGgS+6JBNKQKa_d>#I2?YEG^85=P;mUx)oT|3&nmgIW7d1qF
z142Hbco|+D*WZzn9vCYSmNCUdq*ZD6Gsw&A#Wjm&(?C&68fnk*Nlzcnh(XxXPFmP_
z$ZyV>OPK5LZWB*@XVMFKOdzK$Whprj?1wRJf{60+i}-VfRbBlxF%>IX#7l*VKV7F#
z4kXU(^D{LMK=3<6k0$wsjg5iOky)Fr?sjhD7hgti(Yd#bRc(DM>+Fxq9)ZY6X~0<R
zZz%fhf`V$R!)>s#E&=$=+s3QMWVo~StlMF_R<e>_mD?M08b`1GeNR*o)kLOb3_C_T
z*hUSZQR%r}b%1sUT&l~4f!HNURIi_@<UwP}m1Zwo*+TxA)N|%io#)fE)xbNuT-RkT
z1G<Hh^Ibz@Ba!%QG@;J0)pnbZh8zeQUEyb5J&8fjBxK!9`$2ArC=@#Y^q~paPNq#>
zQ)@Zdx6ErptNSOu;h90W^4Txh?M~-h0{4C)8m+*M!6cltM8{K8;33u1A#4_g9xY7O
zFv`k|99L0ePKjXNyODX6nAG_a@sjO?f@Yz>ugd>P(n!fGsUF{v!?0ohCp`QAkF5PS
zphsLQ2r>|&V4I?`jHEKWKa$lV+vB8iHkX0QBZfFK<ypQgI;=QuUiN5sAO5?aabi6F
z<DspQ43w3Zv_s87lu*D==wrH5eH%xpw^aBb9M?~pR@ZD!WP5=()zz{~toE9iW<9Yt
z9wJ?Oij0;vth^jg;&gQeXWUA;qOo&~&(>hD(d#ft#@Tj%*<lsx^;d}YnWN|1rQ{4A
z&ySczwDBvz)n)sASVg&ZS0!MIxg9RbrlcqBN!@GsL0N0-DI%)Q{K47$Pu+0w#YvMU
zuCE@))s7^?&6%CqmrCA&0@!nWpu+Ef>*Ynm<wREGR%evoLezA8NJV%FK9bI+7GDdF
zMeO;vE@L$cYmZwvhbMBC^znKq&r%v~XzPZF%9MaxC$*Ov1X-to;-2`eV&xHQGS2Ck
zs2x--TCd$>hiw;1nw6I+{e=a<SmUM>P3oJy0!YXG-z!EUkD(Ri2o^+iUD!**BIEbw
zdDV+I9L|$#y$8jJl?NPp?O`6lTCKIfHn9&=1%1_aPv*e%9k&y8%YqzXwh%6(xzn-S
zLv|*iI1%X%ONF&|`OffqtCLfiTjpY%M(q~G%77zMOq6`O{6Dgrn;wJ<!N40zu>_>v
zx2h_@sv})3v3U<lox`bI?u<z^ndvYR<6hI%2GL)}yFCN@+y0L!eOq^u=@S+u|KutY
z20+}-jx@r84=bV&;;;e$G<EfU@h3N5Z%z&A{9|4Q6@l7r3^M;5`h#4u70?kL)mJb-
z2E$$wn*3nOJjZ1Ylx%34Q0@89vIP3Ifn7owiwQ?Xjn{pcOEK?x83sVCUp^sAo&$EC
zEoUFE4DDI!LXu;{h2;NyZFXGi+vBA~GB^aQ*D4g8+`*N;Z}S^KrU(`$+MQ?y$`~ax
zoE&U*TTYMs(80x+h-I=M8-E_<=+vcq9SAIGg2$GVXu=-HMJ?-0(q9>@n@cw}pm&!z
zh;SOffjHkU!Q*yLXce*%YXCxGFr<rDm*LlTM$Fdtk!gM_Vn8dr(OVr|kh<U=pY$8}
zar%_O??wAzF;we3K{Du~mS^?tK;Z_A8FzdMc_><>T>V1&q*A73MweARN%AHF&$Ru8
zw@ves?6t5ZZ(RNpjs$&yb-yf_cZL_EXKTA|;|^$IiOt<Dz`9^o+1~azZ4>MIEPfu`
zmPAWFd$d;4!nz!uWkuYvpuv;stHCkL&OPgn?E;uz%G%VWaBkD6xXL_;`f)tn-tod;
z>i>K&v)9+r01%hy><1?#g@VXlnwC}VPN*vyF`d5EWW9NQHZfmf=4tmEU!oKG`WMN+
zTmBc23u>k0KJ)M};e8i-|4|d^rOD`waug_kto-_LD%kkOYCkRJV1FWI>_xT|z?-l&
z+Q8wt!~=GmyXTrp?Z376MNmu={k}s8F-Udl)?Jpu>+xyLz)X~dw1${uHEs1w-yZqO
z8cq)VXTBHaO4b5zG+5lf<PACXzmYfA!7f1HqUx`AkIr~O>{@UCEsTfrb;*R8gyvtk
zDx4+JGV<zB?Nd6evJS_RhzA_mSD*kW<pFA3N7@)2A7>zguAw{8A3v0q@mDJM<|&{R
z(o9ImBP-rP#fC_D3J^_(Y%=>f4i19yxfYXUiHvzb9K6Nsv2}gLPR7NtZPQ1)Yl+Q)
z94*Rz`T$qFxHSIFa8<0`H^sEbXf_+q>i8B4XDm$Y)q->~2^sjS>1A$G?v7FmBhIeL
zBc7m->SlX$n987-_X#XZ%j|OkOAiwandPeYZsvwY<vAz^;-74WN5nfV`tg-VlsN~S
zdW(tpL(T2ph2Iy4E=m6<c4jS4*}GJ(XMQiV*}TZSbsr$GF)$Wqa5Q}I_QCnR1Gzg!
z6^3bfwc+|idviduB#-yy)8(rT;R=4A%pdX~8)4UZ+w)WQYH;!GAFq-EWLjV#0yare
zWSu7jU3`_*8SiiEvrNlcuY6#;Gi@5m6YeafJ*7X_E=wy|7+2elGY_h%Sc-n69?I2l
z`6;D>uVYQ6r*|Zivm~eEh9)SM{$4ZF3?I!;Tb*DC$F=$<V~T}#a5rCxD6god-XDWf
z+dchE_ULqk`<YGbb~Rc-w|pHXD(kzCuad2d`!5Mcme?f?_R37}GBvPg*vJky7z44~
zB};NCBm~o}+Z6<v%ysTeT&pv3d03;B!U0GwDmg~Z^G}w-fvfV4tymC5T>f>=E_l1V
zQcZ<NYj9i-BSN+jVBc1%lfN39p_vT-diT~(Z86uvk8Jo3cD|qfOZq^x0x{r{q^=4;
z;00Z4e#-2M*d-~E17)p0V|QB31tfsxF^Zt_3RL>|KVvhU|1&m=URW%4O`XOH*E!2p
z)bE!RsNXy(V`-Uvxy)>(Sq&E|t{^w@nf#wHt$<Z~Dd@#r+fDW}(_~jhcogi+?2q#T
z`;(%<uRG2mgYRIUfAFB2LO07D_nau_2D&SMwDJ;71<sFo?5##N$x`^8Zgh|3gM$os
zk`3KW9xbS0&M5WqF}cR&+#=!+ypf=)ITOZTd*Hc0W)2ARM~A&1LObI^)9diKGR<1~
zBpgX8m}0o}GvtnVN~oK=d-_r!EHh%)4{p{)2|HJ6k~AV}fFJbfo-85X(-`Z{NvwW$
zp-%23*o52FiB_5BUaiYTZk97;+~Unk3v{S(kRgC!%$<s^+nri-z7dQBNa!h58An#}
z!G6xRA~_Xi7JIpI++q)!>*5t#&q6HoYT^F$2OK4HAH9JN)&rM33CWJC0WZViPV+(T
z?N-PSL_<_qdaxUIl-4>!Z$p!kSK6b1k;>rA`bnKX+poX!AaS7lHxlR@17OdyC_K7Z
z!n<{jB)1!k>tuj9XS^SE7~L(;JPzvsw+BVX?WYV`!R*8}&?2HbP^RaU9Al<{n)uFe
zS!beBy?RE0ZMjg>^|rfPL+Rh@i1h~azu}#RgPTk~hDJ@QrSVC7cdXPu5F&B@atS>g
z#H<AgChNf#x1(-n%W3$Zt|<7+7Ey6cqQJ3P(a{tonqS=XssbB#;K(Qo5L=i_yK?qz
zLuew9K&)2GNe5Gm7XD}BjQKLoz<m=xd7W`HcXqGw=x-DwsGWT8i`qH&_9_%v7RTdT
zb7iXWda!?IY{*aHbl7;0^<Ns`MQP2}!ShmBEvQ3I$T~Y^2l8xV@(p+b66z|%J$9X~
zh_*2BDLr4nF*m@Iujkn_KStP3-j8K8Oo0^RV!sBS0Ji|QIupgft9co(UV(O%iKq`}
z&t<SoePKxYeU9Nvc3-;es)M~YP_B%+xL~i55<@tdu@$!xv7{>3ubvVa07;#Y(DLlB
za*f6D%8p}|HqM-hr%?Q%F<EGO-LYNz{LT))dPlZhWh<libwOq%3|;)rc*9-Xm5+D+
zQdY<Q^8Ytzj#c=7M{@}D|Dw4r(<{SK<Eb^5%Iblck{J2Fvj+#`xticjD2cG*;P!92
zt?}?7j9t~3ado%QnGp~JTtz!eK=~a7p|7FFc|XWwaAJwRX|w5Z%Sp8RH&G)QRr;V4
z{tg`!HR8jjE6OepddkU^RSDfg3C{XKhbd7%>_a+ExZ6E4l8$aCTX?ZQQEoKf8Ma*S
zNW3lbLWO`=Y5uLAvd+b8e24#(?O<*#!!D$ZiFT#BC-BV3*f*aw*0K>%-c0dvXrjB~
z0Ee2buy%eaK^E~bvN!<Y?e!dL+t+ViM9l2cLOhV2n-#H{Q<dqeaK~{pY%NBi(x^!w
zn;uBWi%^ne+0UojDP_wxD0FY>ys?k@XyQeYLBp`aUami|{s)9X;cP$2^>E*Gm9zeG
zeQ8i$(fua5NT<I)PT{C+PNuVsqleGDT(?W&AWDc~;T)d8a=PqMqusKEDLcy^5-f<`
z(t?8r@mf<hnk#i_P@@T-NjCJ*d6}^>V6stE>)B_km&U(k@R_kVBb6cmVoryv<85ph
zhZ2*mfSN~~eqIN&Gt_uje`HK1SJ;ZR?U&?zftL&O?7Mw4zvs^u9Fykyq^T-4;uaab
zw?M=Gg-(!i<DxbSr}#iQcgFoca{<l(%QhI@nWi%Ql4p<KIwvd1J=H$Z|0a(RW%v#e
z9$%;cq4vMR$ByK>`@9x=O-VU9{7@IqW{DLly2Uc?vvp0z1NVWf$fWy+u^Dp}bn&%q
zzV?{4aK&L}tx&rjHQ%+Sm9fHBZVEp>o_EoV!N`;}?d~Nl7?s^^OJf?~`dS!T8jrLB
z*4jkjeVV5kZWG4g3@b-GQQO%1Q8fwCct+w594k&mh@+f*YI_{0-f$;ermlw$OxD?J
zICq&~qJ`?nSv9VEhM`N2f!#hRuS@r2g3+OyhAfkf#R@;qVYqf3SA$j7_Dr*Ll5GwO
zQs|!)OUsCXRuij>oyCB3ga*YU{49z^j<1v@p@Cw1&0I!{Boy|VyBx;{g^%3ar*NG2
zi-%GkyU_h2E3t`%!aj+Uwah0x4ub631QVq1Auy0Cnn#*_-FU`&B<WNg$yPWf;G(Wl
zz?9sA(qa_qNd!u9BPoA@XI}^d_M=buPf4{Y9prcd`wp!yNJwL2CakUctv#J#qc=+P
z+mXf5Fkfzm7E6K@)qCBBTxrVfBZn1c^l_#0Wgs}@12c~q9TVjiiMDCeD8MQT9O|bW
z`sEUfn_x(FN8n#IKnYd)X6k+!-&@%pIwjxc5J82$qYy>p+{0lzkVlC9Z7T0I-pcbC
z0D=0LoJsvp+s$gUf{h{@e}ZtL|HeF0!68IA#)7qRe3}$O>B+#?nCA*c{{jli1r;L;
zk93<w6cgL!7di4C0>|Y+{+_X#!k)%d_VhD!jIlxeXA<@apr}t|C<|e2Qwbn@fp}eN
z6R5IoEcrBD&^RDBBQB?eZJ~cA*XqwWNs5qniOM^7+2*8e4ygbNiTI-PE8;EN-AAHw
z*u{0uczN2Ri{lj1BW<SdeKpCEBAdp7o^Rth*9WmKYO3N2igPuDI7%p8Njg5EnMVhV
z>tE;7_E@X1Ty`Bkm_yL|ZgLc?%c-;S$|ZAHKCtwfW!nQGJ<D3(&VeO=m~YlxNSM(S
zEeXJc=;seGbL_t0%C$w~fy115Xj2Mqu+2&sGgJ0M(2RQxy8guZR?sx9hv<NTIg=mS
zv!IrnzhPpO=A@d5@jSN;Pp8a>Uy)H*D(B>PH_J5+ZyWI3cA6ImIat__in|-sfnv}Q
zTlt5F6_feDv&3^g`L1YcpGhjPh6br5i>}#tKh^uu)lSd-Iu4ml;)aX9`Lb5xOC{)l
z?Ulr#?RF!0Z&2~lHP#<qMV%791j@Ij=NwHO><7{E0%6rU(3S=*%#&SVxg8CRTd;%>
z4I&LDeuijJg4)tHe&};}=UCM>$nj$v_(cYT!jM27QNJFYqp@K1Qz;}%2;YCnHU_oa
zio{Wag*`v>kQ6RS5%f%oN3<`&ZiXX(HF{=29-!MV(2dVHu@_H6E}CJvtawY_MD_iQ
zmP^w_SEY<2o6s=GN;rz3#fq5!FHcL{Kb;g9<$=BplIln&$+fAP%<Vp_K!Jky{(iC%
zDFk?NAxDNoy|Uox9?HVZvrFzDr0eOE0fKlM$-;l}GzQ%0OVTucsIN`t;H~n6b);no
zhL5}L-1tP(y{CS?-}jfO8R;oU0T34c2qJ)FOOI+Cp?53<5zrPbUNv1-)x79=IhkQu
zXA~73A1TTy)?tQmeU}WtGFuQ&Yx$R_sYq2#rE|8QM%B<ZU_o$D&sl7TVC$v>fY;ua
zP}l$$GgV}bAs?AYS>}@l649%tMbXu8;$<$0X&vEM{Azip-+ZCuqxeA;V@9jtE6hyt
zm!b;|)Ql5|3Xoz?bD6gsV`0=MqF!{07Ovb8>bW7-3rvf7KIQT3QcGTdmsryuYsX(^
zr;|3fZ&dYDc}7Xs52(g&Bj1kSsFq?L<RBi*xMA$@#Xt7=W^r7x{^n+V%4_rvpH(Ro
zahcUY4QKx#LKn3T6(?G(OXX|h&y%)lbuj7P;Prb(ujZ(uj}G0^ak^^&g!6x581sh8
zxSm9fiCJJ9^H{*2gB9e#<}gbpzz;23#Ozu$mriYI?ak)!{!Jju4_`-CQDDo|07knP
zgI5-am**xr0|mL=Q-h)kN_{64Y3%D;LlO`WSjV6DW+Qm_e0*}*EkEJgT5a1sJogDI
zqrK4Tky2}pO{v7+E5d;1q<y#k%t$ONGIAda7Uw?Vh*!6(_r>0>Z-UbIX>E~7E^Fi|
zTsk`yt_0nATx}?q$n9*MqK=q9xRn+&2!Z`kI4GBXGS?Z>m{#(36ohdoW))$UzjBj;
z(o8i*9Z2y%;}m}@{f^BYk-YhmB)5_q`wL<s*rrm!XfNXV+6FcN-nGKCoAa!=#_z%s
zot^-(Lw_bFDn4E)2GUewq?pyir>4gD1d&6}=rIS}KwVt{<FvpZ90Di8^D2Ge^;Cx&
zwXk+T4ICal-_QZ2QHL5ilw>xP)k(81+yXtGqm7w~9Zh|u9<{NtlqY^dbFZVtqcI-I
zyHh=Cbp)Ss1&zwiMj>y>BoM8L)d=GnH9Y<8^=Q}+l7=C-P;`p~3Fv~oG(949*ECd2
zM^QAMSzMwoN4(2K3f1%s4y)z{Wj<CrvtT%8$XvhaL%;_+f3giH>WC$ICanA?Z1m`N
zz*qF??}OfMv4-X6c-7|<S=e#BrsE8`aojgytuV>V*iH?QGyqR8+{cZ<MycOn>B+5n
z^jh~TX!ck^R+vz8{u5esy5_Vw%{>v~cHnYgut0Gsn4{e0>>hKTgz>^2cUQ4hFZhjv
zbM8;<kiXKuN9P$d@}ggCOGVrWv2C#!J<oaG?>`uiC!7lY0jNqLoq>M(Q2A0Ugn)jO
z)21#^obzYo{|e+Bv;kze+{c}3Zr2KvkTTjrugi$^nPVb6<{dZ^@^Zp)x6VdT%gHx=
zldV=H?mUF2RF(7F0!*{>1cq*Bdu>N$-wGPEJw6`|ix;hP1)|$|l(b|rjnbw(FBHA6
zHK@=>%r_QaMPAjpYt&eWHzKC2x`lV5TVrPea+RM39z-7R5M#(L1I#}J1c(-ai^gx_
z&gYco>RWV!$-PH|M*pVr|70ibuS|_dvv=zzs59VVIvU}5MIH)crP9n34@UY?@F}A(
z;vki|bHyuU{aK7siiqp;mj0Tk^m%qdWrlllTyy3%Lu5}R;)#Ui)w>m7|NEuta4*Aq
zFXEwv`Qw1PxnkpQ`+d@PW2Z$%z@DT+a_DP(3?F^P|09+a8_QignL$iugI;BsG=1t5
z`F(tfIIYEzDQakk<M#QCAk_}>dS(S#BwNau;Qt$vMTo09aa<Ku%gGdp*~9?mm)V$}
z=kCl2&|Aq@)oB04W4?*Ba;Q72ZbuyeM-OA}>{41%xnN{-q|y^@RS)+t)HfOTS*B~8
z*V1FEV&G!D&Nj;60?+DqnB5GN+Os?6ySx!gSw%#6t-B=wmp^cHz}!tUq_ZY@cSPBQ
z6>(iDFTg!!FuajoohFWi<-RiHH5_M=tX%K=anak7PJUa>=Y?`M^C<AUjQKr0;$uC0
zN7RE|#jF7zA!T8emkGnM2a)2xnWcey3i1Sr|C@m5R8y+@!wGOS9qaTCTgNU_bk<uT
zUcc|Cd-jbY&xEGNY?tcgitI2pN+&6~yK$*v#))0d^?=Bjrrz7}C(m0g&7Z$E1LnGD
z{HfzEl-1mUBYtsAGOIDW65mt2f)v*8%>UwA?7S~0zm}rk>%BZmj$Wh?5Pys|q$P^-
zG0`^G;tS3RUxd7+moO$TMzoaimufSXKBE}d5$JEj2^e&4vQk&Hm~$T-)6V|93^j6H
zW3qfW5RrVwu7qOPO*xl$WdK<14p#RVK)Cw(cz>R{eFkU5;x?tG+q%p2Gq|Il{L`Y9
zvH}=1BO|=l5!rz=SH_(->6TbxrMjdY;fwKA-ucen&W#zM<tIuk7h$8|kx)>NSXt$;
z`knr8sD`OLUVkNzM_QbwtMggGz3#)2!G_%|BE|N2=O82wvO;CFtV&&<5o@~XU{<$P
z&?H&^PVT{lEcR-TeNL|*fn&LiN5A<B#S#Rzpd7cU#1(KNiZ{T&z`^H@Oop;xMaN6~
z2Lv!TTENSaL#6f(pL(dMG&i@1eDw!oO})6Bf5&knq+9*~ZV`%!6<r#tQbQzN&Hi3)
zy1l|ze)XK@J+#=qX2M)<5jc!-o2|=-)t?xvD_MR+PI~!;XsCM82CeYd@f}0YKjVGm
z(<Ul)LjGQrc6OvG_^Vl7v$Ku2PT^8?2qesCVq`!4F{gj(ir}u+yCDy9$>-b=#0fJ`
z(y}){9Ci5-fJS?3c%}f>+4sBm_|uFg>c3d6mp2vY)ja~+=Tub`bF4`#7I4{4>AZf5
z!}DMSZ!S<9Zq9heA7I35mYFH?mPBaXI7q~udzrkrh(RWfa{~eYMCZ;CO#4>~*4c;3
z|8YdrdJ{+B8vUs~7`EZU?QAPg6dxx-TYfQnD7WN`<obAT4SV*|4<|kjMEqw@XqY{n
z#E$B8*^*2+@f4DujIpimNG?X5n-R9)$BdEIOE{H=O&d!JYGRc;D^H!%a+522sBe>c
zfDgxOqFKfpi^zH_92YNFfzf;EHT$&A%!s;mlSzSznoFJNPb*1}6SUaIq&dpoIgQ?Z
z&_RuaMZ*i`$%kR#1n?OO8hpLv$Ydbk<=dPK;$Fo6XyE<|*m{44(86|l_3H)t61iIi
zLqz{8DZ@&G0ZRWj&D-K%c;Y50T=V%Kv0G;blk&$Jg8wD|KjJgMn722lEX+TUEZ8Q+
z+UalVn15FoMErk<)CTo>hlACTKz#>I^RHTNJ9AK7Z~Xp^<ga!HwEd!jXddWY98Lk}
z=N2AOGVS-z9XHq4IkmMnF+ZD@G5@{m#C2i|kx$DI3G6=#jjLg3#0yGV+A^^NBB}?G
zzd}3zAats)K4AZZqMh?0!2SFn{Jg?Oo&d(#-G(b!E6tl3ryrLtvu_`M6EdG;uV0Kg
zUGnMxZG&6<F6@hn)bWbAoe(c>0?pU!gQ`-N6ML9Jsj79JpvpV8j|=a-I1?K7yI8C#
zS>q1mmph*~r>s6EA22iJZXchda3={k2Z)D8UR^U;Fy$j}Z33k23qf6y2alEvhmj0N
z_OGnOI!d8Apr29y1oCxg-gYm;0QTO`n2uS0P+C_);p-+n;&QRU3BAW?(o$*=Bpg(m
zwh)ABB4LVO)^gIeX#)z48DF5~v>BPgA{2b84^Uo>Yq0KWNFe(jSVUcQ?7RmAzB6Vg
zp{v~AO>g9h8OPUL91HpRw^Y^EH4Uw7A~Lw`_fhMwL~_+pRFf@3FsNf|8uN%0w7A<=
z#{YR6wxXQH3NKDjItmwMb(N*9=%%`;LWdM;UeodU0{?H)yx)1e2B`{~K%5RV-@OG?
zm=9!@YMCmA;SUQf?!zjjxkW?4xkc{1Pm3QkelOT$pKLHb+Nv3v?o8}|{(<?`g!rQg
z%1`b4Tmdd?wOqEWI_Vga*N0eb7m!vKq!p`S_D(R!hWH!{b{Fg4VpTfAJ2e$*V2@;=
zeW6m9{1ta-vF6;}@%0-v9h5nr-wGZ_#yMZc>rUD;vQ>$?mEdojnG>>UppGo)*uSL&
z8nRlxpGlv({&l3BI4q9mXEhvs80K!6q}|gS^vChyH7HmZ1_NjHwQUWi_ov=K!vz8o
z_~Ly}RdGf8VCeijdWxoXpPe%oT=UK?qMTN2bu1K179aQSNBC++(%4iu_yNGya}_Wy
zU+!yL^OE%2Rm)tywmbXXSZk)ddhTbkJhl9sHAeMzzDuSp%W}$*g_`nmna)B_$?k|l
z|DaaN@EY*u^&Bp$Y1N?sg>pSEfZ9d{h3OXZ5K61@an;3XS7R;wvX<4?fB3X;T4OTx
z>f`0ckud{E&Ms(fhe|p?yo>d@8O5=z2Nml@YreU;g$rr8{9xTD_>Dwy9rSv!`9Yh)
z=!S#)ef^3+-%p|{ud*?nL0V(iJP&b%!rN<;8FeU)@^NKlEzV^`AN=Fqfa)m-@kZ2>
zV_09M#elhHGqQQ5B)csxc2<L*J5wxY^2;*v@u8rYA=HpW+6-9zo{jEzPTKS{IdO!$
zE*m2INxgUSd>?Ih`-EAcu%r|9lV-VDaTjAGsFKWb6utpaZSd^B14;%A0yHK4<#hfp
zqsxlJ1-FG>ZR*ZZ#?FkB6Hj=wCQZ)OIIjv2lF(&tF3&y*2@9lgR(jfj##Am@Z(YZ4
zGD85)tF$$*Im1^DLd%a&0k<?tZ-5B<_Kt);WvM0ttOkU7ET2Tub*T^Sa;-;5Fhb1&
z1vAL`M{=^Qb<fDXdWvpb@y0&0{VLVijwHV>PhZzHhw|4a8I`&cZzn((cr(iTiMA?w
zOi#{-duA;KbUW&YkD<U5#Ozeoj=kd$KCnq32?iOGn=2<GvRk!P`mp%4E|M0IekgJI
zVVN#46#?dDwX@3y{dBWvBD6pB;mQr=BIp)dbMj}W|LJ?FTEmfoG}(C8pyXHsnx}il
zXeEtwqNxiVum7|i!X7aBfr)vR(8_}CGQq^M;diV0=p%DkNFXAF#Nj89v@U><&g4)`
zjK)WrnTE&3-JLb9Z}pL}3L&Z*E7AFMM5@I2>I6JC0Uef>woX|T3pdPVSMbs+RT6Y4
zIdTV0;TOzA)(n@Z|77@X^UH0Y9eDebq9#@h3@sqzt_Z6CfLWT%qHNOQ*!tv9B-q`7
zH{7rKD(0mvDh&83DMG4*&xVB#TYvvluTYOrN_vh)mXXWi2qRzk5m{>&@pH6AD)heK
z{I2WwqT5PqLV14C3CqLlNz?ovQ1*Gg*4l8Z%b3j@V+2OiP>AMUcZAm)I)_y%xMs!W
zYs{9*C5z37!Q`GhOQ|Nq+nLjAEi1VGg<&bdaQFC6V`XDN0&HvrK?E7G`aOd_!qS}G
zvqxddi5b{8wKIw6(NLO-Oj?dI6C|K+PF1L{E#0u?H+ZMqoGluTyN;KQx&E5lUrikH
z014Y8mG`C~I07ZbdF%*-OumV%{S|Y~hS+9lI>$c<#!;C&6|a-TrcJfA--**6<l&V;
zy+%+W_#ZJDU<yhCeDS<VXqD}q9x7A<oE(duYPFQm+6Ah@aYP?M^~FAouh_i~)x*AL
z_4ioAZ|9v4gGC0)<;FXs1I1J4LaB|hUz?aG3ES*x_kY%g=P*}r{M1Pm=0H={WgCMq
zE)aG*B3rlMy?VZPDSQAlOZc!)dEB*?mmMCg)B%i+Z$LY=A70BT0zZbd<3^+sQv|<b
zfQx?-|4C#H=3o6~n1l$HL}37-;Rr~%nyYy7TOGZjLanUf4|@4*t3rhmn1~^&EXFU{
zFQXVlZs4lJ{BZ`2<CjtX(cX>zu_$+M?z}h721b+XT(>P_>$fe3>8HE9ep4_^u#wU`
zgCOebP^ZU))4dcPWd-9ov7i2=>aH30^JMF%7Tx&J*NvcgdiF(6xB7|B3|42xr9$Dk
zx-dec?mer)qW<OCX$}=%Yz*}9tcv)GCoQPE2!rKmvcNsB0Y`PxA4TKaOMVdQbS&XT
z7bi=1R+@-NbQ^=2q6{P?x%u8yazrEoR0Qh;)`|wPog6`h$B1Ri>5G2LsvY8AZnuZM
znj1D!GK&NSmIcD&pdp~(p$OpvFUvlf&K~!0Mc3`IAzCX2+3vw#nLh?M&1K5ggr3sp
z^Lm$1ynD`j&)IcYAGgeg^<VM?Na?E19ZzZqFYau3FwzQD*t`y>J$Y~9h?^g*4pZ*Q
z6}Z-u<3w-I3;;?s#RhLaH1s&>-LhSMj|d^X8n)36`$PJeOxAc&Qm`ZzeMzr;RTyn+
zK|YvT{Zp-2-8$Xg2`hDjww=IFUC%G{H|tvC$Jgt8PH1pNiZ*L6&?|Kod``w#OxQ%O
z{hXc{iUV`BT?ONC^i6&wRnq1n!ot!4QQwJ34ilkD%T5>_5Gb1$o;qhtAlEt9|0I{u
z7mb|vZ|(jNjQ#*(lxVc2e^-Y6aj@RImE(iv@eISZsZ;{h7vdxpoD1~UYKH49m_Hp*
zlobw;f!B>8_#<Jr`nqx+`LMKtHVG=MA%61E^~_~;F$y@L6}<~39@OX&%i6cDo)uNq
zgn-fp#I?R2dZtNQ>Nru54>1uBM)|efQr{8?;A1DFMYfPcaX2N#s>{o$W<cAW?mq@F
zvG$H{|M<Me2E?&d+P^XNfiU|?#peOveDY_6Pi>&5mIiT+4+{q$kG||cM-{y#;T}}!
zkcfnYL;@{%xTV{KI9H5yW@g48`U&h^xL+6*f5T75PQGsUYEy~^;@P^VS(wDv59VSf
z%0~ZLhh}0=2UMCXer~71SYFMX<f7J1TpU|MrT3>R5@D!z8FR!#)N-cQud1xqc+Nh@
z&dq2i+cmxe_h$+qC8rS?HQamu=QrA6=iMK8-bGgy%*;6At;bySnOq4MOe6l};rUbk
zSzmEy-?R3XRe`sU9l)DMt4flcZ~Mk)3l7W2qfdTrUoi=K>S5wsoXvr8yXtX$h2U7+
zMqeNh$jkXu*0^iq6?vE-#aP(*<C~AP#<N%=vIf(lFl`iK)mMJHOTgBl_KAmnG2HXM
zZ6=}j9^L8NbL@`xosNNXb{wf&=VMdj2@Vc^EjBsw3AU#R^oAUq!26{lnKvXcIv*z9
zGttvvRZTqP)3ig&|1_UuQ$m`OVh$!oSI}Zw{;bEKh~xRKD2<9J!=cM9wp)AL_(0z7
zYCwFV^3Y}fG=o#Eu}lro<BrQAuByB47@yf9g3`PjYP`lS`E6eD5%*8YxQzbTj&?0u
zUT%vZqG{OSZpSXcZ!6b8g)#w4V}u6sV{=!N&n^k)Wp;)_hyf2&?JZo(A7X2rD?#i{
zy7h*a2Bv`lPx_QMcPh{U0iYdL9N2D)vYf5vpxBM@wp&$emLCqHwU*c&0iM_7gaMIz
zxm=hmbvc0$(2lq6Y9s<td=CSqE^i%Ej2g+k<Jfb}n@ipsS|SIX6})dQJ>ngoX>M&*
z%&H1P=a9nLD15X!o};awzP&fRf3{`q@&R?5%H#+tYTR8JC5Z(m9s+DHbucJphlfYq
z;ke&{>-IHR^$Lt*!uIx>E-5w>&<ZVyrl0i|&Q#EJ8wBut?c+85g4-L5ySs8drTC4`
z`u$2KR_aHK*-D;NsrJYeW_!8t-+P!8i-8WqUVj+Xo{<y2{%Ar5k=h%ry)F+v?Zc0&
zpcbrFVH@%En03;H<p|9bcH)?=QeJknH!RVYv?G3VG>;0)hpN?VGSEf-&U_>!6{+FW
zO)Qr&A*_jK`hYNwnuCt>S1O}E##AilO~%TTKRw?e0s>rk@2jdfA0ez*ak0944P~rj
z?itrMU6Z@o(+V;Kg@rv8SnmXdrE_zji$pixc)T=)rK4cN2EykomoiX<h4;k7`Cx@X
zZPi-0iB<%3UjeOFzFg2)``hYeb3vE*r>Xt>P@v}`p^K;biu_ND!2o@$|F)lS<o{d;
zbaH+G%4ZUi8$V2bC-ShRA{LL}glMkIT4xU^7WoPRUn>I9C?@5&ullc($_RyFEw&;U
zNc?YJk7<KUhZ)}p+%FDQCY|}Dq|)rz#xB!;maYspt18#NPL8Bo@q6OveGxxs(bgKe
zX*;ZWy>R)~LRE@7w2+metlf87x5N0hW*hVEd8MJ<>lbs+ptYs8HQnVD?oWTAm;B&h
zd&^E((C5Q%)Qj@_C!f_<CgOr}w|&yujm?9lR;HWKG3?p%w#oXj$FuwWv#MJf|5;JL
z4Y2uX9kYI2yH5?Q%bt&GAu?CwQeJ!fG?-N+W!VpV;FW54($+j?Hf^9Sw6v@jW~~R!
zc5)_n!HS@Z+K`<(pm`&jd50vOX<1yhKuS+Yn}vk9;}1U-2<bBdYi^BYKIt<=22PD-
zhhP+B<iB0GY9kAKK9oN~8Ukl)SHF0RPhPrmyAp(!vZh6R9?KeOBiFE;9-5OrZc#Q6
zf!;RZv!?U|0`ZJJ2>b^E0y~4HI)de&>a}i*vSaTl(|)bX{!?o`=vVxS54R4BQH6zN
zFzvHULJ7&$fQ{{eg)J}*h1Q<qtL(n`e}~;HVkS4G;%Dtz_aWkTKVufky?m5qi6|Yj
zw|J&dI7&#_MmNd;OU=@_IIi2d<tDaR6m`<f9o7dcy29oiXOdBlcU=r#f#mb14;aAd
zg^|=BuU8GOGmj@NCC^8;Aql9v7q9VV3w{`n-fIVR8_qXHepe%Ga=N5ozay?)4yiPj
zgkmktZqN8qScb{-uDt@x#x4ES35Tp#<RwC}o5hp7Pmd~=TZ0KextEui_O_go7|Sm$
z(brDvzyACo{1&J-`cP>+$AVN{l-*e{sTueYD{0x8zO1$Vn3gf0WKeyb<C0HktB><e
z>3RKFpki|3GG}&8|2q|MNaq|uev2u;^O->e&GG}Us~3EWO3V?YnCf+xmYxw|dZ`&|
z=BCIp?9v!N(Q|5B5)#)UKEALWZP$7Yg%bys<&3X&zAb#6P2(wgFxC-P{{HG=vs$*?
zqR%5a8(MM$K8Qu|I`H|iQhU;`?d+G;&FMs5n}sp>f93)R5Jq?`z!FTA58)+@#?n@_
zziIJ9P{JD-IKfq(kd|xJC2-uFsN*Yt3&-aOZ+XiLX~eQ#J;!@Ifg||IU}1;DX5FuH
z5EV?kIt9uLlg@l53(HNsT<G>m2lu7@W4%p6+2n1nPELOw3o@-h)75av?V@qqyU5(f
zcF|*|C4_v)J>U3X$3ASfJEhEnWIIsy7GkZe-1&$HC+C23kne#E9oK8B)~t)%;DSZN
z0VJ2)ct&+pVATtM_tF49{^C@6%k1K7NgIr=k!nBGvUKjA)V^@T<@w6KD^l4-7u&(G
zIRcGMp4_J08xL5Qa5MVBnEX5Cc|Pk{{R(qawK?#Q6&`gH-{`)KK*;%Oz#dn}Bc%3#
zVbu7L*PMR){oc|tOfL><WLZ1%r=?23^-@-+KeYjST~=n$`GAXi`sTd#19#N#jahzy
z(M-(4x}qn!gRt9?*GX;>CMte3GucmmZl9}Ln;SPyv#D-r2?QFi#xsUKtdR18X3IUk
zttd&V`XvQ#LbUAr!l}qUfkhcFHtBQ4th4s@CjLrmCLfz<mMpxPqxSo$-k9MRp+yvJ
zT31*{)S8Kq#!**4j40GYmb%7%U2)x~f@Yh%q*PTjzM2#uKc(-f#T0eHl{ji2(`d?K
zIuYe)xj8O<9{KN|@DrM4h}m40lkG(*_FUEq{K@K3uI~D<{ka!|S8$<pimK~XBKH}x
zmUKhpRgnWF^Pbtu(}mp8+xHv4iv_IHx(hap(B+lIx%Hq1TWG2x$4yU=dMeKHXQB8t
zjCxu*9j*_Iz(C90x3#2bV>8Iw<(nYq*v<9`-4dmn#`&E&y39%=%7HfaxTJ)&`Ms$>
z4PTe!N?{{+<kLcNiy21pOS2#9Np~FzZtpyz7)#x_wDXrT8`$>v)VguSKpV<aza-{R
z&)i+Eps&VJb&pKS2<*0u7ZTu^Ibqsul<Vw(yK|ZVbs|ru)}5DMw<$8m%r8=8)kZE*
zPvzBz^*`1JGhG?B3{G7-ux9dT&uUDa{$u`|Otc*73%;K)))y`DCH^SL+cRHXnLXc>
zf8=HO<pra`o=qs{LBa@Z3F8syEL(6Je@tb*Mq=7RW%R#@VUKjLJMEHC@<)>H2F!-h
z0#@vLks1lv%Lrw|cwXq(tx`tA+XS{Fv9s!|=4c!%v?N11b`LbG_w#G`55HBB=zonH
zM9>xe4vFm3>5UxMg_JP(uqm3IIbPeki{R-*x;1CZP#jF4>(4p15_@|YhxAa}hgU3+
zm~GyF3>8;pX$o3E|1OE?d<QC`@GwOO-ma)W#jLk%8Z4Z7x?DpGyjBI*ke{W^$q9lH
zxqk?h8nq`7-d<>W<u0!{wpkW)I&$#^g%8XP<G928D4GBj5T(SjyTv#6IO1L`!2A$g
z3JS4dp*PUAXRGq44Y|v6Xg*pccKXTq!eI>0y9x(d&xc0Dh`+|zDLRjSam7W9%h`mS
z-43N<u<S;Q^Y$`CTp(Ymc!$0Iv^i>iHc8~$Cf3kSYyF6~LmH*6`>@k}4yj$IJ!S_s
zGGcF$kX}4W-;atSQ%rp6KQ%JA{U>d>`0c=h-^-R?va%zFA@a_sKfR>Bh480cZXe(T
zs4dow!x4L(=c>zPc1n~yPv8@8aG~$w$R)ydAJ5%APr)-6JcfW3m9?qT*B8uKe@WwI
zYKkD;^)>K;)pQOMIfjt@p6YAN<bVk=2?=B!aw{Yon<a@}u1)LuvP4)3w`0Hp-c<Gb
zMln})=o$AtMRcUnm=91{?)EN0<K3FA44~CF6AC3od~J`!-Fs2NbG1CTk~Y&#uKX4n
z^ThCb<&B0yTL4D@7w>fM!okpv6EHSRy)@@>JJuZgK`8JvP+)-rSWpM-bl-a!?DR2g
zxwv2l-IOt@^unC(PsKQxl|1;$yprcX0CSqN<6YAr?8ebt9a(f<D2gUTtgHCaV)ame
z7y-maW4vSySo9HWZ1>7C>W!m)d*VlXhX@TcWbxB5rVf$tnPhxsvZ%t4!+li3p`<*0
zgdJ)=(My=6H=AV7ZyO5R;~hFx<*nijgu_8GG7ksE>W^J1{8pJ6p6|3FyV#J?G!Vd$
zmLY4-$OAK1bz5;}O$?*Qk22e}Y{YZWgMrOyYDwRJq2bYa3Dtk-12Rs0&}MpBW4A5*
zkPsIBYq^;&5W)P^Ss$PAZ%AKO7f*3zqHgADen4Q~V`a1I4MNCky3}Piz>~YwdCIbO
zzx`UpuQFDD%Ao(C{}I%+BL2e=y8xF^AE@L_;>c@<gxuxgO&#@ype%%=p81NfsIE<x
zV@Un-v=czyzivm@)ak}||Jl^s<wkDQ>rGHn#(Qvd|6A8oRG4Mj)T8!?-?0&;r5i#*
zP~vSBsE484%S+%pPJVwUZQBY1b27wOF}vLL>#{VJH)c34e>o@o@;cyd#LtGSoj!l&
znyK8mDektKtEG(mQa6T;E#J*CaF34yh<?|1e$Opdk_q2=BFm-^0<<?L@I^Fy(|$wm
zC@Qjkxrb>k9b2h+lhl&I>zhyHSg3LLkWUf#h8NsXo4jDw1rozjtuAnM%lE{3d4_sO
z!0J=V=oEH=wQWcrB&n-zA`kJ&GkWamAEB@M(b7L+wk;`{1)(Cx)VWD#CMW0DHw4#P
zeC5JH^OyfhNGRjz*myD<a%#KiWgx!4!?8)`xE9fV)r;|2xKsJDK<4JeSGbYSg|BNv
zCC?k=K&TdQ{bNW^lK7EF)*LzvskdY}Xdf?zl91Rwn1bBDzvs-}=K`)z&LN5?*2m|%
zp5aUzB49za(bFCNvB&MdG90_xYZ89`-l=?F)OENjbH1z@8UQkY3I4U$)9L7W97TkL
zg}JdO{_!>b@0<01&m@`s9s>Ta2Y_sv^N;tl6)>eavU7hdMW{z^FxmD^E30Q*q3lGG
zEX>o9?ovBWs+uW%4O3(6<rWG>ms3o+o+%I-Q*(%v8pGo5u$^$Zk($Id@>=nWaQ-b5
zYGU;F6BoZ=7;3`}TEdv~henqUx2~Cd#4u8lVI({U1$=(NRm@|wMOSowF7f}>LT@i+
z_-}@_x`zTVM_z?FCr04ikW@V*LLl^f;48a7IR_$lj+|PLSyj2NOF$dy;<E7UmhLzq
zwxmWiAuDM6+0or|1Rn9K6K@BjaDy4&k#K~&>L<Sh-V9YQrN&>#$Z{ax$nzU?!L+AT
zDsOBv5r>!=A3$|bz>{}w3W@w9%%Pmq9NLWR$54dvi7=0qM|GNOfSmMJ<HF8h=*9ua
zK+ge#c1-(mKk&a;;#;pVRt%e?Z@lk+2nrAC$n5T936j4~o1Wsvvc^JF2G#1%VI&@`
zFgk?jOvcBoJJ>)pbu|RdvaC0=4-K-gPKy_8MCH7ZFc}_f&4N1hud(-2?0TN7gyu1J
zp9gUppEr$*m@*0Gd<DObE=}_#lnMy0sCYJt{r$T;l@L_%5;`T94~syAhdL>B4ciX2
zwEoAUUMOuOdG0@M@-3A4P6d)*iuIe69x1~7g<BRn5}%-w$Q-(=A9Vs#S7(s!8|u+&
z1>ABNXZkx0AzxiMN*m?}6NB{-C=fD+HJqOkGT-inX=Z-ga`UXa+_W)8+okCP(Tz6c
zokplTTd(V{hA@wjUvs+;sL?&`kuSfr(G1)ejRXGbui1w2Y}hk9JCBrtfVPGGQd!&+
z5SG3UK5LP1Zhn`7#chdp8%q*=f)TuOo?p+I)dUh^4c-)z4@7k&3m_KnZFYH%^b8i_
z+fVPM@Zu@=YgV0+EuE5ko(;TqIuXm9v9dTx@p|}ql<>w5#G<c>H#M}<5MYh8Q&WeZ
zFGPINhH!L4$6c&6R=v2U$RES%AD0|t;h{zgYfH>fZ@iwLtd;-J%7n5V#fjtyhrknD
z6ZRp_=WvofpXv^-^nZNWsaLMC8*)s{N0;CKZ1#$k_(~R9?<BC-vc5YOO28j*IEd|h
zy)UDxewyP3*nV|4V718+QgP=~P>QcLoJ;yPR-18y6C4RcTK&LyX^cm_bQ%zflSufJ
zqCp$87XeD5V^b;OHRf9zb9hryrIBL9A?pJLVc`9#kj^z&BHEqa%+@A6+hNS+`da^g
z`WVvu5DZw|)fbwK3kkJGZ;OeS^R<;tX(=rHnfW@}XJWQ4h6_pN7RO*V6n{rNmu707
zpfESOl?VH=w!!a{$9L4_yw5=;NYVy((Ny3jCjrr`l+mH<<%Rt|!y)ILXGzYNIby?g
zF4qQKqoF|r#4rApuLt}~cKZm#XOA1Kna$Upu-^}uPaDG+8{@C~RI4))WHx)Wt)5`2
z-c3;lk%270k3j+}UeQS-^C~2l)0C=X_FE=;-0RODkLNhxLmDCgB0{2YPp5CYweu4E
zUPrc>Psb7E(oNCNr<f_rfZ57taC_YOB&@Q8WS_S$?CFzR7MP}K?6>P2``%$0X&kqA
zlQ)j^eP14ImAo1g#I!XBIxY+AhS0|7SfEiBCb^#ikPK!_XmR;f1{@>>^rO58EnA2%
z<RyKmFf>_Gu(uJFsy2r^K2-Yb)a^z}tQ^{{`?_x#bON=BCEr^j3!vBGGonZ9zwV}N
z6o(T?)IHP~3~*mOzYOtqbOh$tU{({AQ0M53@%(hHNFk=?i(JYgqM!)UADc2Vvx}nE
zZpy&talD!rP_|hDaMZq<5V0`e_swU^S6N9*Q#%mXth1I<_CQtpQ(7B((H5va;hFIE
zL5t`kQ4BuC*%e3My#-OTi7`@7UiveGd>P|UXD_jBiIsaT8Z0af*ga1^{1!|1pEZ|j
zjM$pKZ3wpJV8Ss-Te7Y1N|~pD7Ms?2(4RfY71=)ZWYFhK5s}ryM(yDI8m{2^LS5E~
zz9Z+n$Lf;NrqXnz<cRL({oB!K{g<sCtWw{Qf?Ln&>iB~)JE7N)MgGoo#-J4#YL(@1
z=&J_2{W45IK5MgpWmsHC)oaFVAdhvlf7gIFlMdo8#pmkXckLQ8<++806U?l9;FA@z
z$q6I-#m0Ii_hIJ~&&7oJU|Nc34A9(g1PA0>Ta^tZ;Jue(q82&iHH`?y)ZyRX#9yzv
zrKzePgPklVTOGb;_6TFaqq%hSNBz__*P&*3w_q`gLij~PCvZGI=y*hX@kSIz!+>QD
zox*KGC7#nM>v9nJbu;gCyG^~Ke#e=5AP8u587mK$L(5>BJuEOX6>yXs@HTSeGWie0
ztZs}<q6g4*2!z%?)U@AoZ#YMXgg_kO{^5Pc|A0_`NaDS^rn*RFjw$HFwSK~--l&Oq
zVMoijroCERR)K<CRq-gsF&5!>Gk?RHVStrC$WhALH#iK8;O!`a@~)jo8OLIcw_)-$
z=VQ<EDe`RsyoD<!5M&2(%)+KPi^KmYf021|3kweZ8*UrIuJ9l9N8T&RB?40UFxB{z
z=SRmY_EyG14Twoc(FMiE?rN@YNOzwtodhw5YuQ~K_?F}y5v-tVLp-X16T!J7Y=Nym
z;Dv_qeTBC)Mix<Z_`2|C?wrM+(GF|Ft1IJH&8u<6dk$yuox5%H@!__%j-Ykxi0mK>
z5Y(BY^i34vF}0@&(vF9R%Nd{Dwlt~=B54SsGw^`+h62S6YL~CIZvW3Kkb2bO<Q-5i
zMM+<UWVDNYA#4h-H``1+{xg_}WEzuE?*^DN>-;K7_;~O&fE0>_nkl-%&72G&n7s7i
zi)3xo6o>8!%77v&bnNPeL~s_vBTfw#4)vXd*i|@2tZUHM?Gi&^4(zv%ypYqh@$m8A
zn^fgP45qwRQ=t~OiD{NCfoZ9~72AQpD3`o51q#zU-J@&*NF|JDr3;@y+u2*(<Ymgh
zoP)E(ZD?7UgP7Lc(}v2xT32mXDCqCE-<Y+;*itGM8#)H16PV&n%8>p>ME_Y|d8Q^q
z@R%}SI?UZ4HiyotEFkqc0w<G4KslsT9%iIs>o{IS##+nan9c781ZN)CVDE{UG7!=3
zr(Mm>LnRD-(2TJ^o_Ey6$IRBSY}Z03N1CyEV_oiUKmf|(u*6|NfvuSdh~H<2`J8#}
z0f3*Tw&d2)TMvg*#nPNG%Q7c<Gr^~Cwf!4d1aM!=r3|g+_Gs`B1#Z2OOG#dQ*FA82
zz{5q<fj?ZNrDW{&^gdKFCtW)5trTB(vS2=6DTRv2==Sx8(sK83khg-@S3c0>3dkDA
z>A6T^kBb4aIlaB9OF<FYG9pQz_67o*Y6=>WP4e#)F86fKdX`PRB<ezkE$+az94`fY
zJp|$7c3yvebhZ&<MI?J5aB6-~fa%=zKyo^~V*Fz<<-ffi&(y(f)>?6@thuv|%J+13
zh>2&QNtt;2khY5CrrQYhhaX4D^q}x-HiZ0P5JZD2({4-L8D+>%5Ak<&lF!JrgIX=y
zhR4YW*9T%CDx_zqV~T?CkOj@*%C8kXYt{wgRp;Kv=Ri^T&ItsMPvFP+ILnhVf3k~9
z5r62BL5!zVRBAc#h7BOqwV7hPQ}pCNe90%fl}t3|K=QacUA0Z}-#uBbElWNv9AIXz
zq5T2==h1rU`WiMcnt%+dZKdTHcUCgZ6+5{NtET=oIeD4(i`6w)BLS}3c8SqbCG3F)
zim*m>OgJnLm*Foz{BbY@?}S+p>#Db7{$chV4+7ky8a}n3$8WWhJ=^86$B9YoA-kz0
z65r4P&~{c#u<g%j#woi|+!yihcTLHt799Mg$K0P@$de8Mxo9k+qCT0%7@}a`5#9sJ
zM(9J$F=<{%kkc>7en_(=ij+OWKtjw~udKMoxZ7Y7w=<z5k`qePfrm5*RExWWVL<*7
zgNLPZKQ}GwQ15+w3H!72xaOD0kiiBsE)c+3^VBzfOQk%Z+#YuKQ@?P%4F^C~DT?|A
z2kXSDO>pQ`mE;!pgmttc^6+8vG()$v(8of->s?G=2%1W+^oHV``NT*`o=I4Og=cVP
zw#bPVTWHfcUJR2JeYkvUw}q^-8l!01l>FKB1w6{Awq|eKL78I+@t_it(v&MfA>~I3
zQzLX^Z<Tn}Z9N&C1iqH2@Q{rskh`=(ZoFCN6RDp&6_>7Rf@;vPb>v~GxaKw8%EaQR
zlJe#0nL^7ivinPs-xG4*NnV(Nubd?CTFh%Pf+KV#eT><JP4E@^7BL9mKT_Cf!2btp
z?-(9g)BOtvlVmcnZD(TJ6Wg|J+fF97ZA|QmZF6GVJe|3p=bXRJx!w=&{*v_7y}S2b
zRkdpUP_<2rSlY_DOf0d`)7Ee#q<|-@o`ds}#1Nxyak%}SYNdMN7}DxUZ=<5{Clo;W
ze~x9YgmmZGsA;>tP9THxeh2k%$v-cNh)p5hkAWfJwCXh@_LVGHyQFJ^ak-q%{^*7X
zaSYJ>OXlxF48q5DH>c)9T3}>ZkQg2J7i{fst*|b|?&O$`l389y6702?j=|pcpOqB0
z;|DP7oX%;%6$G%c-HrrUMtJ)EjCqTozbCwA?d-dL*tc7by{94z`4!?F{t)dU+Hr&-
zU-{mg$vl@-P=Az*va8fst(*w9jJ)K&JwDvC@pHA)hHX*DODw&(uE}#Ok9MRMAjJ(!
zL){EY?;h2{euHvQy%z&Wad=%#rHq^bB%6^&@BNIf0UQhu=i8;!S8K^Lo#Gxb=Q}+<
z?vFl5@h#rU@;7H+Mwe^$@iTf#CAFBHLjilL-}uwDVGRwh_U~i^j0GM*|2Lo=&yq=0
z!LBM}E{@O1Ginh(cD1lqV=3r@n#G$zW=$unrrZ}|(V1ttKjl2v_!B4F+E8rA);JP(
zG#^zb1I9W0`u=Ju*ha%z#O<{WrS4BTrTy{hGX6t^q5cKXx6b9!fxK`Q+P$JZ22LJ7
zF*|R=C7@Rf4rdS|TBhw^i?;X{5OALEHCBY9v>DlBttls7+)L%<OSMi!5>3e&11oj#
z7<eL*0xDH0%n34CD@7XQ;h`B}4%dBs#F@$wqN_LRA*5fpP_C}73{6bRX)>E>2(P=0
zqQ#Ad=l^&%Tf&TXnVbha)}q}E0w=D$EYiw|8)m>7tZ`|3zMF%vaP_qpH(HPYAUZG)
zK!XAt8S#=m(Ac~wx+(<OK6NTr@CfXJpHdy*m|*9Tb8x*cOb;VpA8+NQ+OPIF1Hk(s
z41kJ9XpacP&BlCuzWH<l5bF#{sZeWHnZE-l{nR2{Kpg-m++gkXRLDROe!}Md!zBD~
zN$&IA|Bl`N>UaNL>Eji(^Lk;-PwoN%uyHfepTxlsoc7~dA^_V@+!81Y?6;3@-(ieN
zHaIUG{Frb{)~V8*OqjFAsq-|rCA8Mc?%%#!27Gq>tSjY}D9q-6WC9+m>fWKTSwiRF
zXCG+Bv9r3h7RR=uI1g%ff8%b-{qF15GjM(WsM^hTnKXFHRJk0gX*^+aKO|0~&giG^
zc$0Q_8Ojl(>hjRO*;HCvWZh!wtPeAD*axVE-(Anck%LveI*Z5Vsk$5pOO1(kjJ1ZZ
zImsM4)r#E!VRH9G0YNzO9Q&-4+&A#`1;o`JMnnwTI;^xWHf)$md$&WsUiT`fNWWK6
zTRs(`7yFZK=JuQenVZ%yZ`ZK<s$*Jiz&<naf)M_$Q5X2ym~}pXO71@1l0M8Rj4=Nl
zTStXDF=S@xc5HGfac@B35wTjU4LhDa>nesi_aTO~^S|*F2^7TPCuBvo-j=Kao-puk
z^rO!gdq108;!mu!imS#l>Em)?JlyUZ1hGr%GH=Zm9ud}9*~7=AbZUsp!IQJ`{G6Dr
zMpRoLk+$*pLi@k4t+Xq*xL`HyV)Vpydo7Y?@4GnH{>e`~JxA?t$H-S@Y6*V&?qJ(M
zvGZT$%9RIz?*zc`JP}|g2)xjnU5jq}uVGido!76$`k~Pq7y_~Dc#eekIz9e?Hau;P
zNIBN-DeF-BmY31@Uqnd}2(Pq&3=*`fCEhn%#f6N4mtN7%54=}HdHkpH_knN~SiPIz
zX@frU*Gg|+tdf3h`3OIJ><K&tPpu^!ZA}>5?jMC%8L*RAUvhPbn<g{6eUBxzb>#Yf
zsnPFxX7pI&K`3R!Hq!;i&drZcjK7G|ew?=s^#6cYO&vVZLCK0WWTUyMpVxdKS;C1T
z>pC>c`2`Mb{o<3@=g5vp&Jowo`SN_N+GU#u-9k23jNs9MRNWhfbLqnLadBsUfc8%g
zUppvukXO1S8Fj(_&FRYGARtYJAbp)9ioKkDxx4|w1*D|$SSP}Sb|-`Hy1A%$w5BS(
z1u#r(E{KX-M!AO1E_F4eY=;*KCB*E3Tf4e&ykrd<99l6#4n0F%bfS#?c+iw+8bN9A
zxLgFtUg(mgkxzHr&?nh^i`H7*+I@d+Rh|x0jS`r2W?<8<U?aTg+e!3lEbJ&po8}tl
zdIy=(Pn0)A=HuaHy?O}c6<)RuM*ehLJX~#f===eG4f%+}i1#1%aHgsDiCw<lShKQe
zIN{6|_aXp50Po&k>}XTmbx@sE>gG4eH~0P`<mT3fn35FGZ9BjNk!La`^LR}ik>Qmw
zwYPBJFEa!@HBJ~#m9yGy2%}+SF3U*(n_WGmS#I%31NWdXH{1S<*WhcdtlK+oWoJmr
z<-fChKg430e=vw{i(YRDSw6OW&0@?E);z!9)lG>Mw&j#=cHbm6oFY!rLY|N77Jbnr
z0SIr|0}B{KOOT~wXPW`05q=|eM3&3#nMP`454N@}OkQyDz|vzL3A-q9=QPD*C;ipU
zv5sAsBY!Ok0Qr13q+26f>KScN9%Qp$G6w_ONjjQUkSifcQSWdzz*-no$vP8TLL=)h
zHL(xTsG@c?6-M%G*E4Tap?M3PpWPPq-6yH%S%-VXxA<I7_1Iw7sub+i7PZ2pS7g%u
zS01>-7&gsw|J&GG7bw@um@$y~;@WU_<I5i;dlVIJ-U|<Nq=BtAJQAOI!FI>~rob_;
z;1g@_l$%CvaratUdZYm))s~=16}(5<t~;Nq>W>tW=KV%~?8h4~&)A<agNV|q1;82-
z-vJLRXnIe@Ac|0X+x3LqQ!)4!Mm9%_CeyaPTCkea*{52`27XVpRI|fW<=Q5?`YZL<
zz6d9)jj_pziiJ736A6Q(DOCq!Wgyd>+%xweDCoe2cc%oR%(x86grntlKo8f)XphuK
z>siJ7B4rXP+vHRY2oh1Tl(C*9N_E9^U?im|X3~hi1X=GYUj6A1B*nKFh{#Ru3qHAh
z6)tb8>V%e?#}B|{0+<zs;B?r*3TY4#!I8RLh?X0yBNuG-J;42|k?K>6vX%+Ybm?B~
zT%TqQ_sJNc8JR7z_tPt?h}qsQZL+u~{!J4o{0Ev~&CzL1NyrKEkuCbVqqlclw)WWj
z{pxqItMAIgqMZG>mCzkz;5JR*U3j-fdqn=k2hATR$~%})=)p~=gx^}(3i7gWr#px5
zjfpVP(4ea<_D#id=eGhqJmE6+(k(Xc(H;(QSH?vRx2kOM?TM*eO*DZoMUlHlo!})D
z_#A670VFVF3AY4gGH`j&EG)@QS_&I!*tk9o=tw-!*ggbJfoRu5FE44;6Ri5xX1GGO
z;K3;9t+)Elb+j7FmL^u-3OEw1h0{%w(DD#MHK(F->DPrQ%uAp|=!@Td16rI`?EXov
zKS^P*m)iZ#(V`7Tm|52(>3;p&3&701*C;1%1mwbvn@mVtJl*Y>B<ERzEDD~1Y+?i|
zn6AUkV&RS6vA;GBrXVuSUH82c{IcN-AL^sGh{~l;vHeHYPS}@ZP&n_$G#K9}k1B`k
z=nu`!vM7mV`khJ5c1I*ZMjn%gm4~6FYm)n<x00j|o37zY5$o**7X|j_Jx1qhuZZ<F
zSUdHb-Il*lA67FyYWH+`fI8%!&SU|3zkdLrp>U_hw`30T@(BH0jUX^5m#9ML3(SrF
z1%svLF{4RNBmO-dWU6BW>fC*V(t?AyR_|LF{)!=q^*#1LBRl6!kDBqo7pq`ywj1Zm
zwTWS>)@`ye$K=b?nLEo0i#b@Te`HiwD>u(h!kEf^AdoTKV=L*_sOF62&O}AiB|pd5
z8Vp+7w{h;Jmu=8jYVK@s{HFyUJG&UhCkm0$D${N{{8ZV1KV4~&=ZeQCm70?fH^p^c
zzoCOAGkQ|mK6(PvdH<{jH96$ul>#3>?mx79p1s_rI>QK(Y7UJRTN_^A54zsHCsSNh
zw58`qQ#QdZXIJmJX%NCm;`K~Mj6Ny3gKccDb6v-HJ{J|(k3QyR_}C(8Oe!0!nsy7p
zU?th;yY)kA<zmB-jYsKzl`wvf1#+(bNbuQLk}v!8csata>#7J%sNtG$v!url_^Qf3
zJLfVy$R1cV53$pPrqI7#Q9P1mSFH%SiLu-xLV%ZVV!UUlf9o3QMq)_%iDd90a!0*A
zR8;7BJtdjdc?BshSj6b8E}xF5{o)PV`GJ42;SD_bp@*~&@S#yH&%B$b{>EVP<`P@y
zc)sn;E~(NUDKj5hu1|(e_Y1Z58;5{J`(d<ax#sMP4InRmWOP`NR*i^@ccA9A3YbN8
zoMrFq@?as*uZNZJ{`P2#j#ZHJ!Hnns)SNK?i)j1AoQ*BA<JeN0h^nx6>krt&I~Gsa
z0jNi><A{?uY^t@x^VO+zn+&HftTGQg8#tcb=27{cV;kLZ{wxxE8&0j#TTyVkR{f1G
zC{XVUNb3U$+d%Z9vd|sH24$`Jc)Vrm6)DoWH;zJA*VT9x2&SZ7AQ@bt-K_r1{k&d{
z5cB%5uj%X9mIVwE6Dda14S8c616Q%?W-L7`;)#lonjHpgG2Xhous-u*oQAEXD<85Q
zV-dV+oRrcJ7+3}L+TMJCF-cB-?H%L&KSSa88ODqy#vq|sb0_;6j?hCsG?tj4pG4qv
zed?1Ff+DM=yj-~N=|9Db_@EFvef#|}h)5%XN@#eR*I*JB+@wn*n;2r0o<LP?dsI=M
zPxYm=sh#s_5!Nf%prDovKB_cm%FzC0{o`f$m%nqV7ILsQj^R#U-qykP49jxJPB$EP
zbWcIwuI;3xx@_z6{Lb=~6fa%mDn5F9Yw9~(9rZP^FwZ^hz*5A}<|E?hX8NF!V07Y@
z!PGh)-FN1iJ*{;cuaE+bo)#+v8LsBngd+OOR_CkbJd2W+Cs<)=)gdE?R^K=B&${*c
zC#dh1*`)2D)d7x=!ma^T2Ea6c@_IJ%W7k8bvNK5=jlp_?uGRUb7mcg|4CD0WMyg_2
zenWFWvgwZsqn#+Uayf6ac?s9ARHuixBpb?=P2EbWp`z{uBpYeid)ULboy9^l6)i-W
zz<xN!?y+I$3UZ@fi0tc0K^T+Ecu#cZJ;ZZyjtxN~>ubkgDR7Z{v@wqh_$mcTg~7DM
z6FM36iOAZW6vtdz=_Vu(BYK-^D#MsoXaGoA<{*=il$00ILNHq;wr3*$T8z)blXZG(
zIbVph_`|z^j8*R7YJ|!sOT8|NJ8IJ*&ERxAA4;KA^A1=BkApSZZMv6syOaQB?PbK-
zzJtRHAnZox|3y-}5dAar;<{2+H`Fj)A;ocP<~qUA=tAbE_&oy?FJ6+~??QK>2IsM|
z8Ae7p_7LC*2tOD8fpp%omL9x2WgQ=-ip<s3;`t}HepG3jF(a8LYBleoCXz^WM{#OY
zp;iSobn(SJ<AN@JDF3(t0TQimJyk@p&gk)OgJbRfn@^o^xrC6=d&s}AA^_a|KdhNU
z7=;={fI%9XvHJhXv^fI|l6tk|;n}{8N9A@)8tgPX3E-gscI@9O09VOGzo_hmUL;R7
zEq4GlI=51S@rCXVz>v>XnU>2fkIroj-w{B)Rk1C);LNj`6eR_GN_?z(vzoq)l071G
zp*hsiguUH5$kSWc{fRjp-CO&J2s6Wb(uM*d!_c9c>fd+ZmSW|kWUq;f;4Zw|0Ub%Q
z%av`N(z$NGcdufcyf=+2=*YlbU-2s^Omat@zs=(1g2_|LPF(0cJvsR&xIF;+Oh(fE
z7ORtk)p&h7X6HP%1sT4FSm;<tQOuQJu#6EWPGlC#pf{GAi%TK+kH9gh)>9aD>1uWG
z2v+|n;d3GsuR|I$k_HI?0=t`$1Ax>sN56<6)0kPf#b)c*Lyyj7l$^Ck=>obBe`ah}
zV?7E_F)D^MOo*BNRm49XoD)ETwuHk7QP>k>g}8Jnm0!T!OR6iusQRMP`V-Oai<}3w
z#XCqrK<4Gj>M5wn`*1Uczyf|FLw_pjpXa|v5cBg<Ar(dT$=5|md6choq9gY{vL`dL
zT$877c*MZGMA%UpX3Bf5K)t$Urc=apj0}GF9^9o#6Z^dC0>;@wR)nK=F@KEsFz3^)
z9p)E}U<}vHJ2q@##Na4mpF#KchWe7yV*VywDsZxSCu^|kczRN;@o_Zgz4R`s{c)`j
z^3tn+0-BlPjvOj_Ac3g5lj^x_n0Gw$beRu5vR+9>Mpc}%7S!a<t7FJS0tqCbum9B!
zSwVKC1jv~I;q4hgF0+R-+mfuU2Bb~kvuQq=@}W{PNW_-MI;b#a<Qj{ZsI8QZ+w=AG
z4FF;Pl@18T&?_;B+VN{VDRhpA&=>mQ_-0#I))D73!pTZbT*p=?a~9yL3omZR-Ab;e
zTlVu*%u3y`&yEDrd39wM?jQQA)@HM_-bFTC6n{k@Xd8o(x^vv(N4mC&k}=NtcBN<Y
z#BkuB-WJzJ-nqp1dM{>;PKtTJ-Y9AY+hJj1`0v+h?QH<dIA-GMXG^e`hxwnLVgp<f
z955>P=1DYfGKE}o#y-O#%Q}?02SD{;wj5neGW_o&tjk;{a-?P);()V$O7jcC0op(?
zg^HjLI&DA+?Y1Y?!T0yYDTQv{OO4!ZL+kR#5%?YHr-S<Fi{m0F;17_W<jeTzTGA=O
z$Ep%nt>X>AlMM~6`=^eqdB{D*%7%MPXJcG`3DCAe9KeG5`f)Uyp`uu@A_4xk-?n#l
zh9@SJwWQPkadm&ND&Tw$_@R$9K+6HFBHO>MRl+}MrGolt?7svNpfUcFfdfD)5!wr{
zJFi-O)Q&;Xw&(EujjH@#$_L|N?faz9g$0z&a|;OZ=c!@;m{2~4@PA~DK367$I+AxS
zMW{Nya7{$O7CNtYc%CUq{=IBQK*uhKr$?OgK+m5%k(ktl5|%+JT;^PAzQbpcInhVe
z2ahIpGQ|@ppLKI^17`uNo~55kcZ;w#Q60B`cLnUpO-s4odNN2s_t}>|uPj5qcjj;A
zXnwFVd27U!TvtHnwnv=BVQx=X2H}%^buEg%5UDBlSC7$OC|xw+<MJXpemrhydLnF6
z2L5c}PXkARS9{}|=j$^+SJpms_fLC}JR4n0Nv4Hgh?c&ya#BapF^{e?U}20^1_{O*
zM}1?yNX4^-vY+?<ss7lztH*sA$4t-KU8;}H)3T%ixm2m);H(EM*a3vJYTAhn;b;!J
zCyZEx$)1fd**$0ndq-kyNKOa~w!TaDALIQ*W<49A+l;`&j|Nf@)h1XP^lwmt?P@;T
z9r=78#cfSEPpG@QfCDTrCXN5>H0&y$3k@7Mh<hT3g#hyKaN1jIeh>SA*Cq9N*8^_W
z##(o%g^gjm5-;oj4wZFWH|FH-C@GRs@<a%pk?i?BCHVoS3QADRX5IOnlHtp}o@+bl
z_kX_r?-G+bVtzt29hRR%1K2YUOJAdpr09UGkHy2uD<1^-Slt7`_4{IU>wyDgSlxw1
z6b?#@UqxH?84e{gXfl9Ek*0E7{~e;4i2!*akZDv<_{kKrD=Y2qE4Liw3@4W{xZ{QK
zc^VyYLwyp6e)=r0Z=kRobD#iE65#mcp7?Ezs*R6kd~}NbY>7~Dm#Ai9W%y#$59j=i
zeg+ZK=W+{2bbuFuz0eOjn>%^Bg9wtIg7ovIGc!LW(HXt=-Rltt+PYpBkcW?>i`S!I
zWH12u0(8XLsn2mI8y$dm{qh5^kxSckmhGRnkQ8G6v$g5-MnZp0eV)L+gSv6+0QPx}
zyV!-FzNZYi{{H^<kN1~vfq+j9v5S8W{=dgRiy%HP=06X%&$C|tN4L}oWZ~~a`h9am
z{m27RugO4B)VEXhjV{tuT?4iz+UBH(0~q4pQwW<QLYe}!!H#ba#kl)JJzQ@$-`&g|
zAEIIE01Vm3?YAT?dSCK@Tm_phKpmt1wC>PMG7uBXAFt~DfI@X@wGd5BNQfgGj}b0P
zW<Xr>Kqs8Nn4Hyv8kt2YUhh(4cfxO(WnlDrl*$l12i)-$hGDz3693?Y+H#nxHy>!k
z#k7Xg7ZcMmip>%>CkZ^gNeUx-OCsfc$V-t%`-d{WRdMx2>Yu)I;Nsq(^_{-+OaI=W
z4p5#E_@#)aWSGIuV^D^&lMg9S9$#G_-gd1wI^ZhU@Y)_z!X^Cy{a?DryQ|gff4;od
zwqcbzGy}s)<D3Gb`Pm(6=~R(Y=?D-WI?pOLl><sWzU7NZ>$m0yyUdEGtsvAIq;j#v
z3La(0DesUFyD{aHNrtpGJymp<;*W@}HL9<v)~;eVTQM_jbz3`>bT-#;wl`yP`9_Gd
zvf<!P>}&6iN$eyYIQ#a_>xqE?*=PaBv_Hb4a*)#7lg_heu%$01E}s65hVl^1ceebO
z^$Yv|WR6iIkrBwyPQP0EY1LWr8sO;msP?C#kR-ywqua<-;mKw?a<&Tmk>RMxSEhTb
zsDi$Q&|<czH;o92D$^BT$=;7XTHG#VD5>>H59*B{BeiF>Tg*vgI+ALO<;~~gn|fMK
z%(U&X-mfCRHhZZ&y-`~t$m%^Kcnz|(Mz`J`Zc<%P<4L0lnTCe{P|I9x;BDlr&97lH
z_cLzoi=;4Fq30@tHh`I(dOo>WF1cSO9IvV;>or~PdLh|ay87!-KVf>b5zYRWwE}xr
z;H?0Uo==weUMo`>A_OCSCl;y;HD{CMPHCpm_?{#*4r{oZ7=n-!RNtwyyn4puszsN+
zK?{_FBBeytxx`TI##^%X#I?ay<=AeON@M)V-RIJs<@5=nRyTCM;U+BAn%0uSqJ>9#
zswXjIvkUJbhZY#>NfEg0-wr#_?T^>R6_s~DevtqJ&DuM6Xd`+F73c4y@l~}XBMWa4
zR%;!)%rJf_LHu^3Hnm4{@E;rdcRP#eA~t8e(aiIa>1!cd*EX*15kF6iq48UJLI&S|
z4&WxE35wdBXRKuVA!tEfJ@lJZ>mNj)QHgyoI#%88G1WWmlN&oj<9FmcQK(Yi@Yo^R
zVB6*hdiJm1{%QtcF;sfDb&abx$PWQw`8flL4$=n)2h%8{3l%WO40<`ogKaD%KSTzS
z!VoOTiVnQ%r<v~;N+IBVzY2)I{JuQ6LHP1fkwrj2ps1|u9PYG`dK{OLG1lqz!l43E
zc5QKQ^&DwV=K9^G)@Rm4kwu5ahUz7)BfDz%Wbz~|i^Z3SR=f9v_BE4MrE@shf+v4X
zIi!goW}vSeBg>q`Wlz0~8_2s)`{rvYLi*EgOQNEO{~`06@jI`F3$CnE=7-O#TMN_>
zm>RMs&<}Xg9xyb~eq_no8A<ax`E(2m;gj_71gTliVk>)N^P*ZCh4DkCqgP767Kh19
z51ImsviypQvdh)oMlH525a%OrZ@?hdK`=?P?RY-xdutxN2M$RuPwf*28H|>i-#|4n
zEZvMC+wL3Txi9Rt+w0llyl@Z4rDVMM)IA|NwcXOJEE;v^WJve^cuehkirY2pSd6Z!
zb(!6`>MHWyu6%R0V()3lrknQ9ZBD2tGtLPbnURN8bmpM$?u`+H48TB|hqJnp(^m5d
zg%<I_Z8icD_a*>SX3fdhv7x2>_U)1D1bOw^;tC6U^fY}Ad#Ex`o8ErQ6?j$pJ2b{Z
zNS@Z}<9hUtC69eLwc7!}z-|g$vtYN?r`Cu~F-T?)&%dwFl6jUw)CQm~G?|F*?ktC^
zZQh_e$I=jGRL3Ec@GATLlKSS%UOi<QEgB6kr3Wy?J)pNB;`6U)DToJWK$h6-uCZ6`
zrR7e!W50BSQMV-GI2B)!8J+45JT%tXd+~q{L~Sk5v0AY1=EcMq@r|p&&b7!sJt7`e
z8La+PsNnPrHjwfz*gzc2SrNFOZ#*y6w@w|oA@Z;VG|2pNA-a<{G^FFtPAlFMaZEY&
zR(b85;Xc1vCB;Ud1$Wqts_rev(d<NcfzT6SVdSp_)~1vn<iTH>Y~OY1RXEGl@aQ9D
zrEuI1%nN?^H8{-4>L>?@7=TFUv`}V0k5<V|iT13VrNkF8QWC_*c{P;$66+(o>-ptD
zO>!SCou2OqQ|@zzsN~FgNeWSaey{=QGG(zxa2zm`k}?x;`tb(XS+!Cm5-X`o{4o#?
zgT)HDO{PdkVLF2M6{m{|)1Q;Kekb(N$&@1H`o7*V1{h3s4@I8I40^hQN!K1&*}hK3
z`Pnz@CIlij15>nFIjHBn+tfM7enoDL20PrpXU(&JDsQ6#2ore`Wxro(yivh8P9!is
z=Q}~~hJV=uKH~Gzu$s<>dSe!73b#;i=UvE>_6o;wcQaXhN)MxGD2%aE5U?q~nY^s8
z`=FBatx7osmvdx=I$lxpyr~SXflDGpZwBt8Tch^rjF!T{v2<HT-tkUf%vU2*AKoDw
z@b=L2i<nBL2qOq6J0LY9Tp`{h-;Mdu>7#Rfw;*_duaMsY;q!=y59wov6_BP?&P?8h
zpTA4*EVKSRYP#)D=tw=qY-vqy_C6it*)}}lj!dCPne?)djmqQ~(nWY_!fR)9A?KV!
zMFd(ZVON0->$sXNGsWhL+i2ameR?Ahc6pDL4q7jMVExKo#{O<}=alVY@WboH48}Sc
zDr6Njvvubj>^*myDupg3MVsevo^tAtPa&u(-G)@w_LOSRAS51fPf9o|=y1s|kV&~F
zujcL<X2n-mpn(TEEmL^rM<ov2>3nOI4)(NBzwA2nBM=SrJZjDXiJm_#1(FB@5krcu
z4NQ*k$)2B>mtN5sG8WbqHnzCG4?V^mbzom0LrMQ{<@^qh(eHuq0;00`fsfUYkj9b(
zb4la-R>ifNB*ZE7USH3VIG5uL5;$=~Pe!C@L|FFd?#Wybu$sXJe~BGRR}x;VsbrVs
zPkZ>SN6${X%jh%zFzk5zno5FJT`N86vp;R1bU{GXVL}|O5Te?cALm|<q&4Qc(cbWq
zj&7|0xeC*piiH*YaYQK}a$CUl0q;g_)f1^6gv!{qaHglVPBPkWd^RB6loZBjZDeN(
zdSSIJs4Rs9``Uc5K>=-*T?D3(iSlDHM8w;kH-;0~ggaH|^kB#Qph;7k0B~3SAOw9r
z?xI^rJqfAtM-~(MI}1p2It0L%u$kSFbL44tO|>M&0s<gc7Y@I06YsCD0?RYbbehf-
z#PK|{ewsnmM&IUH&L1#&?uCB9gTun~%RLh)S+h>e*qe(Lso;^psQp-<(t*)mY9?5c
zKF!ZLZ)<7RvQ;I|T~XgyQV{j4Y=F)+zuU|7OoqDTD}Qnc#$c+YZHjX%1r-awHZX)^
z#B$&q_~4WzjXbv%c<l!GhpSb#WdwL_%C6z+s%jeVNMv|_p*57fisGzC)J0alQm#gJ
z6=Uwjak6`Q?4byJB_Jk;7kCv3`69RGt-|1?5k53hzlDby%?l)*RtAlpzU~Uw9@J)y
z<1eyD5S_vW2?b~KRx>Ls^#cr545p8DOZi)A*&KuYJ!53aBT&GP5E<Xh@LqP!W_rDd
zYxa;j?}3aqpUBy){uM2f<cIa%xKIpv$;AF-KgKNm>nRTVcNc>bmjoZ7iRl(epGRuz
zgGp?5^<arbq>ma|?3NR9dMynTpREd=n-H++rE8V?%V9WrZ-~Vv1<W+rLz$UNZ)7yi
z&}f{2j7J{dt8GXt((n^SNgU3&-GNzT*7C~-dwJP~DR=dNl?eC_%()G~5c!q05qLWX
z3L9zc;Q_Jgcupm9)?}*_j+a)3WSGJc-Pa~XVo4cgG+jW9>akl_S%C1Pl7MXr!ov;2
zO&ltRq`4TD+WghSly65&))zN}=6HNutKA_GC4YQ;X^LO+a8@Wl<|`v<f85~-ztRhn
z`L7a4*b5oY!m>Nm$STxhtTA+}a|?2t#XE7&Kr}Sy!qZva%fYj~IyoqUz}OtVuUFj5
z6ksBVWh%f3kup)uhupnc56cOgLKl~|p3HoQs@5=PTtBEGc-1AU)U2^cJNae#P&vI{
zMB05ieN#t`^LwJ%AE=dahkF(_fNge9i#o_Dc)J^346dtfBRI}{m&deOAZV3{ie@Bd
zbW{Zfrdu0bB8EKw3^x1RGeN?2Nc+d2Nw=jAlu_Nc*JQ<6wA%%hR>U$$_^kZ^WQ*ww
z-$J?&6n1x1Vv-y6xTx!ELS-v6-5x98WXa|3K@B)0Cg$iL4usQxek*2-I_w!EH>LaL
z?zmaFiw^Drv)(8(O)2)(k1}#d)7B`}oJlf5615L+XxNLf&Ga?Ga860#_C^+j6|9x@
zod3#Cp;W8S&EP7$Qw%%sW@>+9iG=Tmg8Kms<N5pncmmg2VvDum`a*BuCX4?dUS!|2
zti*k8Ksz3Dmf6|tT<x19_3)1Hji=$kBnLTXQvb~=RH=)Pms@p^jOrIXy`MsBj1e-<
z?}>S+EsXwvxzk1%1qFrrgHRweV#!juG>`@W@N#NuWJm17e*I!vsM31j);i7#q<)SJ
zF=k(Gzm%>M=Y-RNBshxdh-BrN!1HNSV~PE^2UngH)mD%7b=jxM;+37}G1pg}G1L~9
zt-rR>ST;Q0_#;DU#U)dvE-ropj;nDS{RIp#1Uu<5<nRH>##0MI(g%s)r{0(7H-gd!
z=p4uK0Bnjx2hBc}%X6_B;h^Ewh<9)966faW6A#9^7&z;Czr6i(+^2%V$&&Q2D?5Al
zSsF;le<fph0Zo||gc!z;LPPa3X*=^LLCcrhSWP|!PeAzyxv{o4-2T(x@r>NY(N~LJ
zK~cH;`>IUr!C_}~d$=lU^)u+K*F^nC{^n(}%)~GVV6MBmcxxIeg%Ajp7%qj-A}Yq!
zTz+_&10}E)QonV_asKgBgYp|e;2|nQ9^Y3$>fGi{1O4$c6!5>$!&NLL;0r$U=~se2
zFhoF+^7miB+?n||0ROx)CFA$|-yd5M1I#D?dKK#Y-%sg$@ZY!G>d#bLW0?u@{UzgS
zcOYj>`uK`A=4SI8)s;O&cZag6WM*@)ad+VQ-jKajm?^r#J9+h*9+P`<Z*M9l)t2of
zLmZ!@z-YJ7QQ@Kg4aspc2V;9VzHbTsH*;C}hx#NwDKu<5?2Vlt8smkJ?}G`9z)Rxn
zozd{en9&)i;H3)0)ni^uMJAp|jd-IN;Feffq7?n$w+HeDSUr(<ga@ZKbz)YOVruEq
z*D*|LnpZejdE^QTq6x;j$g(iWq>9YNWen}M3`v|z`Ru@y`@vIc)zxd%Ecu9(BLKV9
zZQ{PW*scP&Gj}_rgAq*H?C$B%aad^&BIyvA^mUkM;fi%_L^LTHv?Z;jOlr1ttu6DO
zKdtvRGeOWh!>e9uYMNrTHzPW>vrCXvkl*#L*pb3t+B7Gek<pf{V3Ct?`uD-pLHns!
z3jk66TgQwl^2kYMVF%sJ5jdZ-=ASY8+l5iA88hC98KVGMs}LCt)(_cO_MOj6dx(PU
zkV*#(FrQM#m+)y$n3?s3!G-q+&*~3^!}RONhxbGRmOYu#@AO6L0~hyu;&>N>6)s1w
z8jAq8TUy1eZ$9AGgZA$a=s5wyN=nzPY9g8fy3S|%Bd7{mwND$r$nM!Q=ag5KlZctZ
zi$g{YmoY{`_1zc$_Kkzbpkkh$+?cYnGYenJ)(-4`MpD}7ws2&|znmd{79&w{!3jHR
zLFhI3hYifZ)XqnU@dhn=HXX8z2m;yW6A2az?w{WY+}6(&jJR5SyIc57u%HL^8+$j4
zDsuDQp-ai{j9DbiR+t2!?*8(EUYS@gxy7z8)i0M*6UG}!ynh}Q2=S~cfx87i1igR#
z!NBy%9wKW~=R7L&)o9r>>B1+_qjOgxnkRFqJGeU-`fg!O>o7?#V>bv`nrX`iug$?Z
zt|YSj_S>^=f@3=RiP!smqzXUq=-*y|%tJGr9iFXzO<~QYfsqY^et)!5`v5G^y^zkn
z`gZ7&T*3zl>4aqaC%b2O<E~eRhmgd&<5IL`^`rKEBUvSR>7@E3^Cqmx5&Jr>aYYx{
zZ*zVH<LDChp?E#+GBuRQDB1dZ3$qz^&0(UgnMOPA4KnXT`EZw_t2?dn9&U#YM2r_Q
z2K<LXvsBxzC#B7egEV!l)h1@zNI4|l+v8&~u%yIOSediYwRH*1s{lv!!gMK@dmL%B
z{=}55z#ZjjxIoVzP_AU7_7V&fR+ca@gWj)qj`9iFy>-+FbiXE(6aDiTUQfo@Y-JTS
zg_HUN1zA4F&FARuYcPX@T>15@a|i_jqugVP*ZM2}_?}?`g}mGL$cf^gRnKRERix3j
z3ZFmMW{R!+lAcdW$Ic&FN)9ndbO%o79=B@YjOV0nRbWnsGN}(Ef=euKSw8LV{z<;X
zaoO)Ayq?m3XeTT9f!!xnCjw&b_ja$z9#2hCT6tXP?v_QGlgbH7enCoV+?(i+y#MA!
zv&rw_4n>He*~?ng?q_hJCvj%QeSff9lz_TixnaQTaQ_0P<N4d)cCHa<Yv>Kf=i_SC
z6x5jUrQu06Y0|_&`Q-jj<KooR25&Wi%@fG=O4c5&4&OV<DDv-`Q0>RZd)-H0T+2#J
zK(px%@s52*>*V4s-mxPS*Fvy}PAyT+I0X5f%Id@<QIw+gYo2d8SBuM8GRou;U0eE2
zZ|B(2`Fo`YSjhOd=A{Nb&}B?!dZgk@)vj;a>K^{)CMRQ*;<G`S;N%UK>mI>3##qjo
zyt4|3YHYLOJ#8YZ98Vhs6RlA{a>q}_We#k>!93r>X0+D&AHvZ4<9u)0o1DnzdFZLK
zSkk~q5~;@Pe@XqpcaY&owVJe_nH~N)E(b{8pK1H*Lhea~p13*a1|q`j{MB8SkhhsJ
z8Yl|9MmD80^Y;L1DczOLWncRX{l?n~k0#$+QODed11&*7$MA$byxnHZSB?i*A8!-T
zZ+y$_jqR+7+1z$$KRZ8mU3bt2HeDF^rFggNqh8b(XBl+NsUxZ=$fsmfMLnzED!e?w
zNRm*uuwUNM`ENsF7$|!};=H0<zX)#?*DIu^OAohfFVK9nNb78u<aSno#|(VQ;B!#o
zxigB|Y&KqtrqcG<C$T<P81<_dI8k`3;%F>fbmC%Vso`PpFAf0ts*FLmQh{!nQ_lvB
zCS32&-@?YDn1+muKXnXV9AzFqb9DF)_7}RkTW`Pq0VXa6N32rPt7)4Kf;N)=Qed;z
zoBm`4Trk}iCUH_&n~}`BA){T7RTEF|4rK81#P9KUX8XiT@atHJx9CH=rD2EV_x10F
zZ~ZX0t=KF+88HL(5FNeS=*;KR#%|Vzg3$=cikXkX=Hx5!vz_nFBb(c2s~g}UV9jB%
zJw1ouyu(Q8*{8P{IG9#E+Q5`t?vVvDI#4Ks_8*lsgr=^<+RwmiFO%&O?={@DkFFq5
zY*4&}UYktDuli8D=~pDh_m+e%C(dOFCobz?5^|)R5mhE{7GbzN{!c`LkXJWC5T+fD
zvZd$uI@fSf#yx>OeYe;A)yjUt5NVW-RxU(e&ll5yJg8s7)4Hxb5{_?>nRLDqs@HJx
zm;cnj1ay{v61$Elox!)<MoShO&T*r`15IZtR8H07((1~b<pUn$J{XcmQ)U$FmV)L(
zSQgFb2+ocB-qFX^kF)J<#@jR1GEMm7RVkk`j<uq3&+FX}IkPTTt;U7<U)+@2hY_V2
zSl$p<rHrAOHxL87uZ#@ZDTC1!BOgO6=Zuzw62*^kPyN8ki79f}xP4L`QG@QzH=TtK
z@JSnth=ZkqRI74g9rIx{##}ZVE48<d+Ez_g33LDM=5_&rUw9BCQ`u8H_o-N{x%uA~
zSr+C?oH*8;vBpJ3@v9&}8xoa&$^CRqRo1W3>CAFV`6hST`S<_{EDgHFO&S&2S$6+k
zgoP!|Y3i7DmVH8R_|==wK!Z(AM>YCn;;Vb9_)xXIw^8i0t0lD#u7*S_i=Ua#OKh##
z>{8;Lw#Y{#_2H#CR@mjmB}T$f2@eW3yQ=tu4oqLbQptv?#kHDO`?q|oZm7y<@qEZN
zU(9tCSSDLP;fVWh7hghx5X&m}qPT;Qm(*oczIE)nL<%!HPwH;JSPWCfw;BAqaXNQm
z@xxay#EWbs5Y*gIUweOFL3E2LBmx`MV>S5bJl~o2SiAU50G^m&7m2%DWO`wDOhN{~
z_=5<{f>qD^O#A#v3RGj!GQVgdoCV*XrxPV(XlS6&(C)e<k@NfoC9H6i{;nm40xr6D
z76gqZ|G*j9zH?4$dk*3#{v9@&fOqdado!$amX_JjQ>Z7vhwzEjr~ht(aw3T(X9i;0
z!xs&OvvGC{JSLP=6#barDD|gt1dP^_;xj~94fgleL;Pk9ih?rv(V^u@y1Z>rXjB{?
zU}s9$16%5KokSMD{%WpCp-s~J_GVvR=NG4M>Lu1S`QKoS)P>kFShy)5uOuVpdPqQt
zv6-2X*$GqF*@LeGz%l2t9$ToenOPcS6cmkr)0^YpAbo#ot^s!3FvTh#vH-A3rUJRV
zV!bbNny2_2&gc%?FF-ghj5QgY!{=#!l3h2b*ljX3)dSHRtiHBd)F;xZRlU#5q03!v
zX^Pdo?RT$~(o2RSq<|t9Kr#d#F8xoiFObKPsfjdryA-&%GHhVQKH7S7+^*%suQ}Rs
zP<w0r087m4k_J!+AhkO>R}`5?w(0B(f&2QME@qQHE+3>kU-Q}~7}Z_On_RgWvj05W
zv`+)|(c)j4b#U8_hcKfVHQX$hD1Ezg&}1uG*H<5GHQ`EqKLoLUx`S9Ns^3u@OPQ$J
z(E)@W$n}vJ-e)uO_IMQuhBBkb0omFoc=EmTB9EbMSbxywBlKYsjm}}&l4*(lptFC3
zh+R`cXYP#7wzVdyuZAI7iA5**ncI5{Ki!>#f&0waSbZEBIb&-)K#q&$a@)Uk+{Dd7
z1SlpdW+w<Q8oW3&FW-aq+czq(<#snyY{2@JEjT3RrOIzFjh@ol0WcDJu;1-(sYJ#1
z8;G&?_I^~X%yj#&f^c~EDGi3lbn&Hf_!m&brydmw$RS_D8P@<Fg4rg1A|ok;4(fil
z0}=n;A9e;)*8@oq_$XbPmzPJ<h$^7DMo_0#h}a5{a{Yh*7N8g<nVFeUZF8=y!1oRR
zVy*K=0Q&F|+V$>~tr*%|mcyyDxBf%!)aQ=hyKR*Ug%E&uIQIyY{z8_kb-5#mpG>WA
z*0Ti8*hw1S0k!SpIRG^Mg+QAKT}NFz>w^YnV=@N~I&VQ^fQb?rPz7zWe^%iD7Pn6d
zHG2|^3WcDm>`%ld;{y~}KY<hA1KR@x{{W;um;PM*WIX_TW0(Ka;{Ojc^$*he2Y`iM
zbmXvOx!ReaHbvbM;GZFBuel|pLh{IKKiBR0?AP7<5j>U$xOz@&E=<G_sXCpFhi!T1
zN`Ae04>$V-9gf{C+I6yYD;sk48t2x|B(Mpib5EVnq~TQAo_j@6q0SW%^e3y%pgFiz
z>VJS>Gm)qQo<3#;fJm^SGI##TM`z^-et&nLt8$MFT0Wg%3+Q)xn(LICZQ(S+&ysrb
zY;>nZv2Ie#ZH`o`1vaioLbXK2nhKrYPP*0?vGZHs=d)Xuv$U>Zm!)~5aMDSlN)w1{
zinyI*xm5SQAwfD6%k+jqqP&ljTX5{xk#~dB?a?xjW$_xA4&KM|&U|7SDUV3$esK}m
zqG2D)laZFY0Kdd1Im7in<>>Q=`N7uO(*B&K{l)bTpRXFsa#L&_99lwe{x)`0+a(zr
zAjZh#uGv}yM35#!ozk36pk|EI*fwn04tFYj{o9nDoKX(h<fJmuzuk`EIUmxe?=gCs
z`;e{cQ=f?IkGIV{gy?u`d8<g%6*C^ir6q`@J!Pp_GEf<nEy+>S6VM>S$D?|WL9kOY
zbemdgbXIb4(D~b&aN@VcUZuRI_gy+bzjtOGbfeD*OxBg1J};WTZ&Z$PehshO<4o64
z;3t()Ht%-8kGQ~!=H7vNcW#6{1+4iK1)B1ou^hCj&j-?OY#c<Cg!)SnhT4SuA7G}a
z@E?I$QgjuR-p&BROvY$(Fu!D2Tq}}_3GMi<qOeXG6?HQuBYUQtn9+Jruisz(<f+!<
z(KMeo9xr3KyOR=ArqbvQYSON%szI=DhLrAoQHIgnl-S#ko1fm6=R}Lg#|uR%9IN`u
zXU~MULVs|YP2N~oPy2;<l?tl)p+}DV<s&(<OKa2pRT+!_w3qg097nh|4<+U(!?4?d
z%jpQ)Z2z_MA^S0cwihYJY8CHgIf_UpKiQ}_zZ}N9lQA|MIVBCzsD3N)mrLC_skh52
zD%~H;KuOSWWZEhMNgahwB_ESy2p7}NRRR~t3ovb$EgZ`4R^L~>MC!NS(Lrc3CTtJ5
zE81#0(y!g@_Xxt*tz{wNSPZC!3B13YaQBqSDtd+|YREVYOqUAouO~k#h{Q7C$LdCX
z`%!ALc%NB8c^=A&ZLVXyVFy*8?~&`m5?61-J8ECnhHQN(fY_?6-5!d^nf7D=D7UA#
zOiK>>YBiM&F;|4a9hp(ec7%dhham%0HMDJmCe6dLT^Vok10W%9g%5riR8Sd>-}jzY
zIXSkpqv7?t#6B&9YacN&^pWXveLsgKxQUNySF^P8;dUHT+{h@=f8x}s>6iv{jb~!_
zV;6iuC{xiZtJ2kZCQ#0-cl64#`u1bqw-}=z=A4xA$2^WjH4Wfv200%^#DH!FzR3DG
z@|I%~y4uTsz4w>QTK0@~XDtEw?WVsXyY2t>^>Rj6<#>3Qr!RbLB-;J<eDw7wUlbQz
z)VFAsomuL~tFarnh{oC$PTy;(fmrlcVjze;l){SjY4t8N#l(d8y^6w>vw`}$3@RDM
z`A@L;$ytZm$asiO6&2q7;OHtl;!G;wXNk696YkC7mp9ukUo8FI^mH54NS5TH_VF8q
zBQyYScLT4e{;sLC!VJ52OhwyhAs^%QsVRMRfm`O(h;#Yw32SaHbvme!{_WsnG$R}N
za^U2sQcqxWnHa`3Dn>iI@AbniwQZtv5TdJc-_PWNXyAb{ni<@Fc2e0+<<yR)!xoOj
zsWWiQH9WOTJNl(m?Ubh!5PKlMUj45(S3RgMNbhB*HnxGY{QFss469jt1;z0WN5se8
z#BkSn<ZT%hgfIj20b&@tV#?l(&Cu;v4^D^k+^KFV-waObT)iKj?x~wLPJdVJUXHE0
zncjh_GO*&#R-ILFtggMk3`iR(ABU?tj0rVt3!%YJw3p_qG4zk+RR%Xok_D2$Ns<DC
zS~Q-MR`>Ap$>O!AbDrU3z_aQh<_5=CJhEYB>lvuBvHQ(!S6VW7y{X!H7^#e$^wfw^
za4~9*cXqs}%9#<lZprS;r1d$J;ZU*5dP(U?J^#TJFdm@Gw?QcXPD7oKnV{Zy&fV))
z57Rc0eMAvPm0?!6wVsbo*{0l86#t^8ng{MhJUNDAuSP*dVlrfo-8Y2rHifE#PQNX2
z9g9y@sAkC23Pc@Ns-TLkJUJqz!KMy3osX#Mcz~>0pQ?ni&PphN0^gHSq?u%Gt$*}O
z2z7DyW`yJW<XAMmw+ljBx;o$4Z`X6=@As_oR!&IRxP!mN;#CcwE2zI*ky<Sf&w!jf
zIvylv)V{=W>9K`zM^>!4Mlw=Y0?!LN6va;20%+XFxEpJoIMR)=ZI1yx^~8zk#@LZq
zpA?nr)o;n!vsbGB?s?fGyx{~r)ET_0k}tKiPVkUO2DTY1;?7Y4e8Z4JthTET%eA`*
z_TRO9e`e%&>59&M^;AqZvkh4NIgy)qgoDTC5*`pgn}Wj*!hO^X6xA8rJIdR4$ctRO
zF)^I@0hfPgvJ^TXQ7y1e6ct9nJ@me*^D}+b{Y#_XQ+c4wW31k+aP5oXGjn3gWAEnG
zXdXfH4I{l~aeg`vC<Nk(mEOrR_^DIju9~&}sT6_f&E$4YkbAuVH!gXz-BKD|3N6Os
zmc1?$r!4y!xiuQ>j~?C5-|V;l6AEr6&_Dee*B(XnA>zI|ZPl&np*A{Te^1x-T5(oV
zzXv@V+>f*_0jl-&TdSh>B=8#6g~*>|4c8l0ZXmD$=roY?-Q_>ieZ~v1i!*n7xd~au
zE>gs$kf3T!xtDeL1Y|FU#RsGlc({D_=J<cqQNTS^P8P$bp(%^)mrF@1FI4K!5>j^&
z{tzFE57ji~9CL>T@;KWsB<BN_{XgX1+|>onN)^VVBNK{+qgs!~*p6yn#&LS`bL~TJ
zrKvA~?KzYe9X*Rmp4qO51Ta=M;jYv9*CU#BsRw7_>YiN<EYSDAZoRd=<!bW-dlH7k
zohtNS!$~{LZGfn%HZjH&WDmqM$PP}|+ncBVQ@J<S3i#uKrgAYOc+Gn+WLMbubhv0D
z3jR7+%24vtln{5sl0Z;W!a1<wJoBBXpT#q>0WWy-7n`*%lF{L10!X$V-Rx5(-C%5q
zgp}X4w&0}OfO}g=4;{x@?zVp3F5DGOUck|}-q@TdE_u1@c%<UYV}H~=b0~*HT=hQx
zv7#iZUjU<SFicbz!^IYEud2Db4LCo+MCA7Taw8IqxP1@?JLP_qBftLct?1*k#>{Rd
z(o{VmyGDPzW>vpq>ye}2vWar6)Zu}US6fqFabx>}dL4dZ8+l1m5CY*g(r}uIxtyRT
zevCsed7>rIOLFlXB3!TgTUX!xDMzK8FCSD2g+u9q=FH!~gaVH<BZ1t8;hIWl5SF;0
z)*mIPGSkS4k1kgo4}4sj=qPWY0OH;pNBywTLWQj&3VE)94}QzMp!*PLQ-W0fC62+4
zn2|65@_qrx{FgRv%A6I-PFZouM9;4w;6QB7u%08a-?7?<X~%$di&`#%&tN$Z*9TW0
zEir?%E5!4vx0s#fP&|NQ`;(lqYlzhyKo+oCw%l-TeOviL`Joyo{9@}os7#q*?_KhE
zf17osg6r9gN0!Vx$Xh2~3nGa7gx2)XmSoLZLP2=aFET{c(oA&p3*EXsRr!I4Vh(DD
z9YB{`caMk7qLA0>;S}RJ#`E-&);WgLrs`npDurS6|KVSoTXn54@z9$BX0r(mZxNrH
z#zgl-D)Ns%O}E8jL==1?E0fOc`yYviHz~HJ(!jIeKVwlay&sM!rGoDASw1BOj)DI{
z&4&7I{FX#(TWYi&siB6w((R#fAFDJQ2+Dij=JHLDa~mAm7_Al9uKm96t8JMb6Q-+8
zFT(YTG{uyeZxQ0gBYxYRVxaVCI3Xv`zrxh}U&sxw;`aoXP0?r5jw6ScfHlYIVt2a(
z83S8npPshWi4jrI>2Xg;EMDZ8Iuy@ZGdLJ)UwB2HMQ2)f5i|A%;@R?;_~42>>%;G0
z^p<PzmSp!0xL#+*JU;_M@9z0{se*i9+a5cX?q}hEG`GHVs5{K(j{v+30BKuJi(Vis
z>Nu*AG<$xqoURqPeX5MpWvCMUI9>L~9f@-C=6F6vRc(8bdZZ8{PEp8l@V#3oES!)9
zhYbHLD}@FQ9$po`n?1Bx1161TDgzr;f~*y_%_&7e&Y3hAKtg9;uu)<D@6!4G|B=pL
zwOsPv#10Rnl-~IlP#QD6w~s;^6-Jfk9e^0YmzVFaP?a%ybawLI<J!0ruux9(Um+J%
zhfC~6s-*v!7uHe;_>r476D2p32<xt?9z%k5;C$nYC_x8)YrU2~Z%?T4ttl2kmzX@<
z3(ir(AR>mIbVnCXM2egu3&#v^6<ERdo_l2U{nWOtI@#Q&{0Pm+cSwD|)L5IyX1D(Z
zom@rsu9wSZzbL2Q+6cSft=6><2bEX5S8e<!9<R}<rY$1rk-%#zebm)pmLB>{L}R`$
zGJVY7FH?rMCQfBuXhq6yEXLZ{B?`w&2Bzp*9U4veeMu5|u{4FlnRqy=n8I55&&6Ir
zP6cofY8lpPiGW}#s+@GNl#I9l*DRrv?6O>5#;Ip`aJ2DNhk=`q4?+L9H3&$+Rn@SG
zixR8NlaA6xkvtDCV+L7#oT}+K;D<7O{p_f)s|ZX+j~d$uH92R8cMOT8iP-x<CHPM)
z#08PQy@_FN#BA$BOxO0NAZ<d>Id`=CE@;TqfKQ!F=L(lEBF)T#hRlZ7mgb*J9!%KJ
zc|$!EKIWEk@CTRX-<+}})|4_O{Q&&j>Ce%|IAP?5;4MD9(><eI3N1|^?mOt?Qo)mD
zq>gW=z}`X-C$>w-fGtb3DyY8;r>EEE2Bb_Chk<9q8%u_hOfLr9V;z;v=N$Fqq<Ht0
zV%BmJphFC(OLzcTQ4SrL&KRDzeTN*Z;<`Sz%DK<;p@j>-DX+R(!BZE0y=3L$7#KM4
zc_+%wv`W${{uiH<lqqjZoa+v#SRUs>BQ_XM-Lj>gP|Yo9J7JPV;*n}*Oe^x0tyM^>
zps-9-cmQ0=<j=?JF7#@2^7S{C6Q0aTEu!i@kMRGiHjg;V>`XQKjiUZ`P)jjzX1%=A
zL?^D-L)Q6}xDCb$twSk8ZR|93NV*vBS8NAsKm$)0@g{v#Y8vXP6iUV8;6`+gFE|fi
z=lGmbJE}CKFj%yrZB4+_Rq~tHv3YG{r8*E(vz$2@D~-Q>lfK;VA;-m9qBl5CQ{eij
zjmRd2`_rQ~eaK8B>C|w#;tbx(P54@N&GEljd*|><zHVDM>8N9y-LY*a-5uMuZ6_Vu
zwmP<L+qTUeW9O!S?|Gkd?)RO0KRoxps{Pces$IMGnq!PP=3Js%^{7|-;IoC2#;wUP
z1BN7C06OJN79T*iqY~f-nHbgjVhtGgzi<#N$!eps%XIjY=W`1!3MyC|%%fGK6X*hq
zOt^pfE>kT#7p4XvZyH|Fwvc$5>#qgjACpDv{hIwDZ@r-FvMMK;SiT}Ft&ItV4gQ1t
zcJ)pg^9qYQkUs*#Wkm1r1E7d0qi6cRunT1RMQ#-IsWCXC*cotp&6mWqSg=>^r*#`|
z%UE<83XXoAH7>Y~DTHWSh^pbrW``-=PHUv*^&*Bu#yA;5G#;okS^?TTJHma6czmVB
z#inLTu;1t|QC7<3p|w6e_JVqPxd{g-W@cvPT5Zb8NZ<NhM*qdZzQ4!gzg09tgH#j|
zGMh-5Xit65(sVn<jRrR3+~+*g_?&sWpS$}$k0Fc*eVTNJ;*kHk1wMr!kD)D@XaaOD
z8y%rLS_*4c&>pYQi-I1<&ZN^z0^h=W^2?;1C+^Xenu9+yApe@^KZgmei;hMc)#R!0
zFq6sbvUZSjX;Q%7?;jBwo+Jl49vxuu3eCFiT?9k3W$6wP>g->UA4Ea_D>wZ2vduNk
zILnO=h-=Q;AKB)Nmix(%)<5L-OTmRguAu&ru09WXYT}SJMEXpEd-MyJ{^JAq=Z-P|
z$#(p+DfHiE^Z%><^!FQn9{C>zfRL*KLB`KcLEREm|J=l{f2;sco3LqhzL+k?c59-9
zUuOAs1~NrbQ@4rH0r18C$=AcA_m39~HabafQ<{r>4B$RaNYV6ZW2?`0;ANF86_|GU
zL9s|V9j8qve&5}0ebvgn_4%l+FCKLoN#0fOuGg<@I~)F`WK~&*1q~Keo8Qo21bK`O
zE^Y95#9`qIHUDzDFPLWzf%XTR(HYYJL9#Kq8n_p7E30*sse&~{pE@K#d{=v3)%Q?%
z8?~QUba=h5yP`~Amfm^uc2NSQ`aZX&#?y|uS|-h$ZM5e%4FP{NQFM6o%YN&sejP{6
zQ78nr9M{k0iDED^Dz~ePprMSwK##4Bc~aM|;X)E@=-Qt!f^0i)ij(q9pOt%Z^$*N|
zQF$0VgF!>RZr$?lU*#B&J|6VGPg{g~%6^YVS6IrM16%xD&R~mG_yZ8mpLu^Hk(!pC
zLxGb!h1K6k1d;?j0lvQAri#;#&dTt-BN7(Uvggh^^Kx0t#IdetVw<j4G!XX~E3%yv
zL3NKH80)N%Msp^3R;Hb&j{hluwfcNip7Lg}d$VN7E|6v_YH-qj7}2X$CS6@HP5&2H
z!kp89nKcf#FR30W4WEgSoe%q~q*6E1rmLyrD^sloIvhIsIhSpO6y#5~LTks4Ciac)
zAIclJ8w5Nn=&+FazL6)K=au%JHfIZ3sbln8bl;5?zl0a9OS(OOCT2M4SB_L`_6DsT
zwyV|bKrRcf8m0g01?#GjBL7RRtyF<dR%Y{oo?~Ht#<qrawcyJDIwx%;$BkgkvaR~K
zYE7;xa7~yLcSt8&B$eJZ$~BCTe>J%rGmEUL7Q(^^2(R9SfR>IMya2($z}aK%Fw=S9
z@o;d%86RpjeDr<~DQ^-eSN}{w&SN?6AVw~NFHoNypK+&PxFFu`nm@YLmgoj0SfiDV
zP-fn={ckTo+nQsTiZVw2+^0wx+Y3G>mvl)xv{SDD<VAo60yu_&`j};78OI(k@f`Xb
z076kx_YF2}Zfd<ApV5cK(ecHG6U$PIZ{1bwluiABCp`Z8kL7`fUrUem#u~-!OYx~$
zBBvo5A!kKxLbAFdplO!Q>ulU%xa*5ojat;7I`eMOZexZq;MK&oWfe$6WqyMEA{^H%
zbTd+(x0jL~{_?_Qj$81JyfdqVC0+sBtE9GmyL5ct@fT^L6DAJH|3&HhC8|T8CgU|(
zxWy~tZFDvxE!A(Mdbenczzg&-J$(1Offl}TM6<ii)T!0mLssvi4Hyp2GEzS!afc|i
zO@pCSeI;-7s!yMkQoGvWC%xZk>4!rYkXQ&QaU|DB;*s(#aPm@ySRbY3e}#aC_Ma)k
zDdB60=dI!w(N-IZUCJ`Z+Kmdn(%b$`^qD6~D~qaq4SY7tbaHmXDY~Ix{dIk60Qsea
zKUqTQU;v&q@qsLe?~SF2WJ@wzfIcG(`}Zx~l1*?{KEcj{NnFjv3s{%BU4VtnrUoSi
zRbSU+1Q^uM0V6{-NllK!yff|?*Dd2&e*VF%!*o#xHoLqh9_)vtvijfZwj5RV35pfu
zX1f%JaPXvxRlSuIXn1_x4r+sq(EqK<SM1{d|Ddu}C#1gpQ0OM`f^&c@U2bCZ_glW9
z3Ax_yugs*GU<Fm*CEpx>JJuEY(lNt%fkiE$R`<@(W}$J!^Zmrxn^1d_(B5$zn@}*K
z3sPZ#Q@Nb~N76xWy9Wb>Ga4)k6w1aJZn^XIZMUN5NrVRyvop-p#<|qtgI0U$)^dq-
zuPd+yT#}oqBpOHB{s)n}2{GsELmf>~s}-lGlbh2w=<;U%px>}i*H`VqP8XREo}aNT
zME}zes7G0zMlic6HvVP_R<-X^{=tX5r)KB!H8tCEe?s5l^(@z*@b>Tr`q<WUUd7yw
z)a*X^;U}Ig)($Lb_47IjR&}bp*y=y%*0l$*Mk~TSmqNqFU0tH&=~H_d)~#(~Ww0C7
zeY1$ZS><B|826*BYW9y28pa*j=EHnF3N;fBg?%9ImhjgqAt!%DqGqBl>8cKMdo%*x
z$&u(_UDyjMAa|){^~_*AE+scn|NrvO6t`Y1aBR9$RlawzdjQ;%4p~8`$&KNnNrRY*
zlj+?fVHGlCy*v=K<u@gkI*cPohtygb3HJh9?OIMyk*EBdexPhfgv)zJq2qE_b<v%k
z;ZT$|3O9tJ9+fg|e(L5jQAQUn!dCf#t+FoCm<SE@B_*gS%=PT<MZKZ^sqN0iC=jcQ
zQ$%c)ryRRw;aF3zE{}!>Vfa>O2~hs}L$$VV0+7!hd1ov|MP19oRkddtkAx%a%twW~
zLLQEn)~vTDr&DTLJI6w9{;IX6Fq<c9%LG_M?Z~+S=9y@jJiXLwu-vDY7WG$z2q&U#
zq<*G8@ZvuisoC*K@;e*6yR1Fhy1R5(VB>-rN@Zm3mKjq=Rc~$tYtyRcF#u#nixo5k
zrbit<m-<=-9UXI)EUAns8Ca6{`wMQ<A4Sk4KV9p1n`)dArrKp2D>(hE?<kCaJPKV|
z5*>}b(~MPEt+92vf2<wcx<fJgoT|nVe}V26bo)tZ;o^9%0b0*1?0UTzC1>tjCN!DM
z?MAw^e#4zBteSu#thwf#!!mz+vP!S2;vj~#ZJ*1r;i^;eZowSuQV1?lfp2MSKbf>!
zX_fTXg+{j--AXs2r{PjbSAugR^*^i02Xmi}i{TFbas8<?z|)_4!lt*wsrC18PvGtR
zmYJ!AYq6t$%F}Jx`~{G=?2v$5ck*og@wg7nWL?TRGpi@sr`t;bt#<2~^GuoziNoz%
z3F3QV%lOenG(yt@chE;ru=X=3L5s!mQ?IkRRVO$+{J^4fzea(S?rJSRs=@;%u*DS@
z{!%c))sgbC{edc}C7iOR?dG~Gx=maC_fl5!^YH>P#nUb-MnHaJe$8T{S*P|_yDlJ<
z%OFPe(LF>4UBfQ>L(#aq;~VP|y}))gR<EaL^}t3z7u72+oRM=(3wh>vqY3B9$-bla
zlI7rW$ag+(qMc_xaMg4MZPKr@xxlck8#1RwD;gLpV-<HUA7+Z}Gns_Rnavw)Hp)Pg
zpt6-F7eZ<(D{w@-(KoSpSLp_SQmE3kFWFxYSq^F)9Z)5TNNbzPvQ-w<+>D*UZ`#6(
zL0^6#5(BT3+l{3SZ|Xw>_Dycr`iP(Js~P;FQyE$pa^`EDuCOQ5t(KjDk}_h3JCf88
zR|Eso%E4KJb~M;7S&w{c{j-N47#rNFf$<Uhp4tIm$IO;Y5;pgw9#f!Mlr=dQ*rRXQ
z`CnT-C5Sv_iQMV&YxMZ0IVnJLpu|e{C`LziTMm?-;L?XB;!#CuH%H0hVV}}&l@I^#
zYI~<=q!qw`t0g;-)O=dxc6|L?a^kGKeNg$JU<BR_qLrPT#!*l5{x?BY@w#DCM^JSX
zg`#SX@~p)4M%#LVJQ33B<4MZu&*j#sTDi*EW7<%y+Ha<W|L`(|krycefU9tE-nPso
zU=G9F7GMpqdo2p(%Uhxi3sSbOc(CMB`mrZ<jR?u?W_4t-7^*`>++F(-8^Qa~ePZW&
zh6jTN8D@4a25y2S)cO;Qs0(4JS^^w^!YJbrH0JO|918CG@S&)Z8#uzgu@XK@&CE&b
zf_uV6y}B=S&Q{9;jlZPE`zd)AtNfA|vvOLkG~^QsqoM*7zHxJ>H#kMkbGL`!@+U#K
zL>0C37W;-UD!6j4Wc!_KCRtS!ZVJmdR)sf7Bwh(%NLi40ZSnE3K{1#NQea4z5*-2L
zGgLDA$R09_jeG8hcERR9b%$0}7ju0w$?x?{*@+*cKhZh;e#Q^g<+uZW`p&7$z~hZM
zGzBX7Fh#RFvu~qv1w0#g7>x4`m%c%Q=*N-O7^WnRgQb>N+M)7#VwuI_%r@ccdNcrV
zk{Z%d#1y_(@QvL*E-B1-aL`W>jQQ<`Q9JKf4Kh<ik;YR!JDw>gEqFL=m5<PLcK9+A
z9_TsxygxwZz=oQfAX*EVa14z4BpTS7LtiX`1yWxabcnX@DPtfsvye1@DT1Z5+A;GK
zlSmI?{P-%dRoQPcPLd^sEn&Zd(8%7}R{!z7dRq$SW;%(6f)jN!2&H4cc_A^|pRVRP
z#UWWX%Xw-G);XS$*l+0ajhb&$#*P{M>3Mr&z6QRyy-&@4O7yM>;bwHvT+$l8hqt4K
zMW<t-v}4vuP}8Zs>)X4K;m|6)j`xuj`CrDx&XVYZChVud;ZvOw4n$$?NV)Eo5p`Ux
zW@ppoa0me7EMSpH47C~cPQ&j~|KV)L95Zy;0EK<ufAIsdoTTki=x7xca5?1qSoLZP
zdY}Fv?=jU80QYcc+JhgFO%S1Hgp<ym1(|cZE`|rX=1Oz{Dzu2#vwbP^*7rDFckZS9
zb~QHN*q}nit%V@KulMby<Du^120cMl{kOyUs{!~7A>U{*IHC9h>n<{uZ}z0Lku?|T
zQ5a}3r_0T`qfuH_K0-(IpFac{o;PAlOy;1)O__b}VzSdp1BAdR9Sr!M%<PrTo(pMf
z1wNb0uiL35q3sy?UmUP=1+y|rTI<2K1&6o21Bz+>EVWin6A_GNd==el4rT|e4f0}1
zWtiGHA#QKF^22nk_ofe>f>JOTPovqAPa#B;vDF1J|6VLhy}PSJJG)!v)fnDX=}tYw
zLUW<N%c3#|sp#-y4K6do+7YO#t!C?pyTzg|#iD;xq>8Yn=3F7?PMqw2?gJB*h9}W1
z>(#X>6H#Hk@=BX@j)yhXcPZ%&00P0w6tUJp$EDAM51!~Y$4g8v6qm3WRQIZo&{S6%
z&7hJ%xx%KDwQ3GbN7tric_GmR5>-TJ{xJS{oc%ol;i=_@k2QgyD9s(V7AP#okWy8B
z<gCV+CU~IOtdH6E|FRCQ6#?tf5QW(l61t|Ryp+MwPFPmK^&CsBfltz|Y$l6m@RABK
zh?DmkU<seG&T3R%dGaJGcW<{V62Mg7MYzxI-->D1qaIa6Xn23KcuhKl{Aq-E74Der
zIB;61q3x*LYpL<Qk45IeM-!+X{XJtmpbM5c0Nu=xh7LD6u;x2EuU;rnhMU1wDm9AU
zq}JD>a6v2t66TWqjgu-VMf-FyM*zP!qhD8&)5G-yR#+p)ATQ^w_BgoW%(=F;7eO(H
z8mqVN-2=ItYVU2K7pczAkH5zqQE{@mav>Aa@~4Qa^~TB~@vTvCD6S{2fz2uWz=2lj
z=5)0-I18?7BWrX!275*YIfo@#d`AWvwRLy+F%Y;cUZ?6@jRX~=bSQXd0DY_#iIsV2
zp}uJC07_rQEnPDQ4{tJDLO4DR?5sFbN}jvrTJ)@Kq8(?h<EqQp=kCQiacFho^xAj`
z!Yo0}gD&Nti1RsUtb&C=S6S6|k4fS39YA(o^t@g8=G$q4RMIqvGN(C`J?ThbP&g=G
z9euRAh`msQ0%x$cNbT`awefM-;OcGV=JmfxGqH7t%XUB(l&9q%oymdtmjL55TgZWF
z7!e19A5)uN!9VRP5b-|fjFRboqJa-UvZ0ZN!Jm_c4aWVDnpwAaCUr-hvn~xi>2R^h
z8<CRKX9-33z{JG>@BcFUM^tC@@{5M9j}Hhn#g|6S`1b6h8@Kh$6=svk4D7>phe_;R
zK&c0|;Q^+$UbKXmQabe2JVv$xv|+0CMN1sXr+>BC$shc|8xD7aaA@7XoY(87*OHEN
zpfItdxV-FxsKIh8eobhQvBw*%3{g8K3u<>2Cv~-M-&oU97RP~UW(9J4#|ZIs6*uLJ
z{9{J-e9h?i)U*5glJ30zMiYBQ0wxDRx+1v}yqX=Q;^w7)aJ(NZx?ug8r3mm;Dv3zY
zi;Bm?sdusle@;2Gbsw=2rXn6@T31|6a39Dh>1xg#ExkOH%8T4@z4EK_a#!{BuzU{9
z=<(7urrUQp4_9G$&{O(ytSeNcCTv~-%8lU!O@TbpxKKv}W752DJ|Mrn<1>XFj~ysO
zn6$p(uN=md=X_ypD``o6mDG$4vy#1f9od{$0L90q?rdawX7#F=hGP)J%=e(20TzLd
zgR-Es4XtP{I?n6|AiXL1&T96H+4^_qpBR?C171E&ug`MTW@as(4BL9;-;pSm_Hv7E
z6h?~{Vzez!8U{wB%M{fRXb7}sSLWYo^HYp@<LML}w$BqWkBl%if+AC>sTtEMWYsma
zl)P;M`kP6ZUhnk-y1<~M&7hBWf}_dONhuec))y<#I~%1PQ<xH`-O1z8gFHzar`vCf
z%ZaGF@NB<Ojf^gRp-X0o%D_fmOoz@?pBepJTw-u>GVJ?VT4p5;nUa;EWRdeze<s=3
zpYMOtp+=clOISB@Y*f8#NOM$>m_1&1=ki)D+AA_q?8|MQuuaZ(`yzIH1L~c7rHsJX
z7CER&hs)jcORw+pI=nb%pr0cTH#7^$N+%7S2gUshfNa!+Dss+hBP&j=7Z#$ltjvQ0
zH7jeQZL$%S*-*I`c$|ra12c2U1O&#l(hCS`j4???f(t9jNJ}gTXev8%1IY+V>W%x@
zm0VqJBWeqRUqI$*UacWC58kkiy`Z6;DiK@d@dp+Op19Nm9S$L?ABd*clFErsq`=)O
zj;GlpfL7(p_hV7i;Lw_>tVaaKO4(RwMn!-H8#z3RvQo@y9;Kqml<>*xaS>=)wZPt@
zle4RmutLDu-bGM;CN=B_tAC)=$0cR?4A-hGZ>qsJWGLnnUb2XfC&zDG-y*fh<3mfB
zyMDJ2g|eEg0=A!^J=e&?i|foR!)3@D@^UYdkZV2#SL1-|=e?f&tmQFb?%HN0u}|({
zcLoVf7SXRlI8j((Qo_zvSBqz5*K*L-+ippvF|Pk(4WXHePBRyjtY2wSP*F91$k4Q0
zucBzSxT=L$o|Re(w|m{xKr6Jx6t#=*2AMPHC9y?F>vfnZF(r8@Zk;-V&wzZ|;DsA5
z?Ue#byEXel#J*BLlgt_=Vd0q-8)!(L*cqW8k52j8c+;|&jX89`x04~1#ho{pfjU*j
zUob~X5dal@r+3}Lo4lUmH(Oaa<1z4Raz@QERcfPZW6Eo}61jAF8hJA=$G4m%Y!?V^
zlq~4Uc1mTvV_7cuC5T_wz7scY>yXVmY_g8F4D<2cH2iEubI{r08}p9oy@ED~1w>;)
zt;IwZqzP7+9UycKg-s7F`YGwU?~oUdlA=!()>sl(>@i$Qr&gR=t`T;>Z^*yfFj6jl
z0P!r!Vbs+Cu-0mVRTb$-W`6XolUFBf()8!{u^rF3y+7jb268|Ve10}v?9?IwiIhbE
z2IzfTrN-Pj<kNz^gG*1Wy?i)z4?uma@<o$Pk?jN7UogL5cs;3_QlUBXG*k&yTIA+A
z6h$JxK~&3EdL``{aH*FI&47;D03f0UNG*AlN3!qoG&c5PFlb(&UX&K942w$^F4LyO
zcweZ-yH)zOpoy<E06~z=iCg7q-Chn8y)L||D-U1RM7<N)1XkSm-YHv+k7Y6q%IDNj
zL_^oc{LQi=zMlRl_Mz8?IT7v!ZnV2nG#zpz)>s&T-^_FdJebOub_uQ%VDu-kazDwa
zuNbwQ^Z#K7O(WUVafxyWOw)LgDFOdPicQ*J6D7pN<OqFbcVBTE`xVyrw~#av5MU&O
z<VQ(FiL7Iiyk579B@R5@0oMAZvs1F87f;SMuwo^wTU>ifO{k058Y2tJdTd3qDF%gJ
zTR@IVj<s$>Z}%_-rjqu2VuCOL$$lCRyu9hIavi-jYi#4Ui07%PyL7G~EfMeHxlXG|
zE*0h2_~@jp=EjB~64abtT1ODtV*XS;z?wqV9o{m$*BkJZ{DM6apO1EYKbwk_b%%vf
z&l|jj8|3tK<m?u<#g-wK(bwy%wNamM{fkV;?X5UtvHDC=B&`S&&eu~k^f(dnFRNTa
z-d20vVZR?Pmoc=6YR(5QG|Cz~pH?w$PqNTZER4TDHgvX<_Zep<>F3i{(mBs}-b$XF
zi2R;IC%7q7XK424J&Loh;uz|?KU~sO<E7N}H*iX?h<LBzT<2emmi@rEYos?4J|6&n
z4CZ~m9ly9S19dZFcQE!;5o*UDmf{#sOAwO4UR`V%Q*N#|5P|~JP_aH-<FRch`STQ)
zdQe5xwKy4pH6Qs9C`Q9yQ8`y#pBL;SVF`=!bYo~OMLdD926+~NUHxmt)TtC4cP(h^
z_3|*Xt1J}NW0xaNMWITwoVKd7j87$OgxQI>dkLEf#zr@$H<PkMBX=t7+b@mKnM0iD
zh6ZZiEG5IADl%cEIj!1U>N+%22v(Z1dDWf>mq*bigV2X>S>RM>rz-V}67>)UHUOf%
zZj7vOx&bAlNNJn$rKhePCqUSJt{&fJRx`G^7>(IsLuqZo_$-y*oBEFXpX$v3-((2+
zF!?9Xim;~3(=k{BDpzZZLDB<-pT^#dCFXMt7ZwhcU5AB$^wgq0r1Q`IurLT{ELoTa
zW_%jNfE66KjBUmyfPNR<UC3xz>hF5@?AzKowam=P(+%1bX6lTYZ=G)`Nv<QEZ791|
z5~sO!c+IvJP|*LN4hVm6U_>?#UR9}LRL1P?Y9ntYND9T+#P_OoIO(h>E@}oWD#4X6
z+15?S>+&MKhYn04zRk|k_@-M;?C6~6^<Q7046e*29!@bu%?{`8M%x$gRz8s8k35I5
z-pTt(6ZiPe1$#x79bP&<;w&IT4xUc?!1*6&9(gZ@H!FrH8QZp3Hj-yUKJ2wE3irEV
zP)s_eu2nk!*q=0!6eQ=^-u*G+=B{nB$?u0##_xkZvHmIji{L<=ceF9zY_C!PH`yE-
zgvA8EZL!172}+3@Q$TD?`u*CztUJXasW%TsvIhB2@m0>%IJel-6NPjiCgVYt^O9!2
zcRa?;<T=P4H2>{3DnGl&;-&G>w{>;oUBhk7Q07jAU-gMmcUMdPo6-jvqEyZ0x$Xt&
zW>&Xm&X`YjulT|Ymr*7@zMvu|?5otUY7T{89n`pRr|x${r)3GsLyTQ~LD{<m2+ocA
zLMKebnA6WD0=#)0NsW$8g-z*gW@jV7?~X_A_$qwc56R_I`+yNJ1aJr>BnMb#()ezM
zdHj`$EDQuIQ8hbF09kU<7INq7>8SJccpWcfGjoXi*L&mULmIOK7|jbw661s%FiU(q
zGb1n#uDpI64G|Gf&2ok`s$uFjtV1es>F<LK0ocUqy79PEzIj|)e&Lg-v77$EK|!}6
zN;Dc%7Sn2L)1w>E!p4wAj!L>#!O?B_Q847|mT1eRc*oPD@cAu%?QgfnovHbLJRPat
zo%mSmtq~~Xgk*3Rf<7kHG<7_x8vc>I_^qy}#nZYBg47ZF=;pLN*Tx4;K^l+VJRIFn
zq*?n$*5C5#XJ>Us=oxda?~NpfBoU7Bv5{wk88Z`X#YDav2!fUjMoHo=29EcsC8(B}
z%9W6kUF|AN&qsWZ=<yyu&+Z#dK#}FrEgLyd6hluqp<r7<neM;`Er4itbJBa+MyQuh
zDe>wlZK26*2<3G%7ND3)GYA!>1WhEq(CCRh9xrQ#RNXthl>Xfb!|q}e^oW?#rSOg4
zQnXxpk7{&sp^TN6>6W6=xzI<IUugKiKjpgwG0Pa5fGxev_lKjswS0b=I|ry!#4h<(
zH{@AmsiYDVs-EJdSatpC{RIpQ^#&W^Y&-}qW?8kLc4Cxn?f@miv%_Y4ui};_c~0cz
z&CJ>_#MV||Dfp+q#OLXv=G&1APXJPVjm0#BL67=398aWV!TNRhotx78Sz^12EiKw0
z;^}UFOHG`&i%){>s;xznbB||B8D};Qw;Bm40+PoJ#*zpF&1YyuVfVULBDjduvncju
z!8EE(x<7Jo)f<xZJCGA-zur^}>!gW!Uyux0^98)B#uqHgYU&NnRKQ<cprM%@<1~A#
z`m<t5E%AvijyizLbaB8>Iq=`S9L1t-^g|h<{7v<#&x|Q&UOOp*;A68i8gv+`c_g96
z$_7=45as`Z$f*U5*A}+ZCW}4G6Qzl9$qhgID$fat{4i=0p^QT@#oL!^<goJcI#VW^
z`+J!k7<!*i&twQphO?K?841~$_js&xvREBx_<jiBrDt$HrMV;kkg)xN|0#yMf+XjV
zu2UbxI#t^2)nge%^Ac(&4o0R$`BTi|$?BC&9E7?E>1Dhb43QqwQdXBroXlvguKdIJ
zV<0`0Y)NkBVummk&Hm=6)VHcP$*(aDmP}jaA$^wXBS}kLyOTxPMnD;7(>V6p_Z63~
zFP1l~iFR_oV6a!&QWO-*Y_e<^5+%5e16=+j8ca}+kwuZnW)4-}bE~B)&b$RsEzqd7
zpl%!!35g&W<Yj)zlosjT0b@mN!VZmC_U*eyDvZJ#yl{qb{OR_?dUc?wNW$ir&rCtO
zdOv`;PB<8#SDZCIuGqPu*?Vqhtr8m+tEKUP%22~EGueh}AV<*Fc(F5VmH)NNQVR_8
zcH#IfLu`C{qyH_b+J20YM+EA2`c9gn<PQaH5+<|6Oe#7Y7XBnEC}uFg5sNcwJ2pp#
zvwwUmo{o*{ZpD&UMOrilY{p|sXZD)L;H>q6BKY1&$P|nC*NQF!_B8sz^;oN<^ohU@
zMt2?JUGL|L!2Qie3|Blza4(XZFZ%Q%X$?y_i<X?fUhM>FG8Ui>#J<glAl9w>AQ_y3
z(>fPD>N|Jkf<Kf26yl?bwc6ac8;jMR8^8_inZy<v2Swrqdr7Mbx!sN#kO|&fyiQ%o
zloR4ou%=9c-`$q0fMO<eQoDc)YaSkom}G)xcu7ckgNH>}G*i_4=ksF$;|JVvZap?E
zD#!D!_E-f{_i>{V&$cqwXt>KUZbS--(JB4DMT32rbA_r){LR)(#8JQ0Rq_DLzEYi~
zltjFx@!Ey}P-p_qG+nBh6P7=PS%-=K(ESN1X<p?eG{!!jWT>n6Mt1b*;tCL{sU@D*
z3K0iRZilswof`{5<Us+qTGgrT^(37ewn-<bJhZ+k$IF0ym#e{EZ14Ls?+3L_;5$~)
z=z=A;#_+XoQ%$qNJAi@s@@sfgfvlx9u*O>XcV+C0te4&0{-oGms*yry<)4&eu(s!^
znN@})rMk(c^|{#g;;+WeAD29CI$NhI*@s0n=Mi6UTmgcYC;shwd_gM0!Pk~*7iZcw
z0f$;X>El&=;g3EmL+8kXl9?<?oNP*1RB-zT<kx2U*7tNP9LQK`KSF|Gqu6wdr(+Wn
zhu3hWwKHD3d;F2X+IAHHrIP-YDNl7!ZdO}?=?+!9i@ueat23nlt$=suko%RwbeB(~
z3Lz1`Qy|j)@jbfy*NN#G0}*+7c@p~M6fP&KGL<SID!v%H6`}gnd9`WM=Es{<YNXCv
zk04?8nkw5!6k-xyJBRkW{Njb%MJ!U-_eFqSoF<@u;$YqmN#gR3<aX&I$!@H%6hkt@
zk^8aj&uxEgKC6t-K*dCAD)SI?;rA?)rHsndhRv|W%$J+f1ZhKS?XffL&2}zs@Ze%C
z8omULcg2;}sI1&RSJwVCqmP!i&=08&{;&8`ue@Qdhv|LEkpq}M3>Ji09<E>6xEF6$
zOKL47`+aGH7E}K11=y*gIV$m{q)ENUJA<{>&gmA9O8IM&0gB^kaO}vIe(S0UQZYg{
zBW1fgS&BzOgwm`iSnr?MTkS;_L8HLWxUsA6Tj)Xl?3d>5x-6TZv+Syc-ZZ-qs7%N9
zn>On*s=4&s^x*JUG{R-GvbpF4^KXCH3QIIB{BzT}UIG;;ZqId%*|rAM!`X0~79<~X
z<>uDrX&+e^cU7~{DOODfap}&UJDV~g2T%6cz{2!23vBnlm2e?lXcs3P;~X3F>ZCN$
zA$bGM0$CXwiFp=S(eytYj0W-bLPb8KGVW+_6jg$v3#g1J$GF9-{InSIyV(Bq#h@tx
z9$I(T)tTA`{)VEUwliDTo3|h9GZ|6VlygaQmy3=zqI2;{l(x9}ukSWC;ayKjus5I9
za+uxBS1>yoS`zmo!S9tNn7?WLvw^-p{Yyo;-tg(YI}ZvcWk8tj1isFIV7pKAFx}<o
z`E=&~t2(cVO+$n|p*4@6rkaBHZ#mvSZln;66gd^gzD<G|yiX|kA0K}GM)Mbq{(BD=
z`acWtdWF9H%c=Eucy)}x|8~gJ7$BoFD%k~3Pt%5cy%0D$#;u=%wd<(RSYUfDe#D4s
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/attach-remote-debugger.png b/docs/tools/vscode/micronaut/images/attach-remote-debugger.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac87b17a31f58fec5af434c2d83e0cf67f92350b
GIT binary patch
literal 15097
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
bS}^}Vi~&!)N1>h|00000NkvXXu0mjfTh+JY

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/create_k8s_deployment.png b/docs/tools/vscode/micronaut/images/create_k8s_deployment.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ab68066f6979555116c480b6fa814c5cc44876a
GIT binary patch
literal 24677
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%0DB30P7@#o)^1T
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/deploy_yaml.png b/docs/tools/vscode/micronaut/images/deploy_yaml.png
new file mode 100644
index 0000000000000000000000000000000000000000..b45e2adc0f441ae3cc4650bb5c313805983f119a
GIT binary patch
literal 68969
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
LL!T8sHSqmEHzAdP

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/docker_image_location.png b/docs/tools/vscode/micronaut/images/docker_image_location.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7845fa01b07740608b601802f69225f20a26341
GIT binary patch
literal 48699
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/k8s_deply_output.png b/docs/tools/vscode/micronaut/images/k8s_deply_output.png
new file mode 100644
index 0000000000000000000000000000000000000000..054303a63f9cd1c71ced4be49cc7db32a92009e2
GIT binary patch
literal 111883
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/k8s_port_forwarding.png b/docs/tools/vscode/micronaut/images/k8s_port_forwarding.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a50ac97811c5811462ca13321d27198d982177d
GIT binary patch
literal 49924
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/k8s_quick_actions.png b/docs/tools/vscode/micronaut/images/k8s_quick_actions.png
new file mode 100644
index 0000000000000000000000000000000000000000..95f025983e7c9b2812731c0370fffd8243eeb3da
GIT binary patch
literal 24418
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
F{{fiQgqZ*U

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/kubernetes_icon.png b/docs/tools/vscode/micronaut/images/kubernetes_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8882ca67fd9ba8c59b127f6eea76174410f9992
GIT binary patch
literal 21584
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

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/micronaut-deploy-commands.png b/docs/tools/vscode/micronaut/images/micronaut-deploy-commands.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4a66b7334eaf8f19746bee257c6cac66211c646
GIT binary patch
literal 22092
zcma&ObzD?y7dA|Xv<Qea2q*|ccehFzba!{RG)OAaB_JT(-QA2xcXtdOGYq`jbDneb
zyx;f7>u(0OJMP@~TGzGiYZ0!jD2wyp$pZug1e}+0Qg0CukbVNki5O_WPd@!-Z3Kh|
zYZj7{$}c4)sg)h=Of9TU5D?_T;}g-}ztec~0phhwLn9`E@-1iyWfvv(p(g_BE;SPk
z=F>0ugaH8*q~slM#HCP%5TdzIWo5-=2rBfYE3&e2`@eoI4n!qmf_<PL9?n=4hP62@
z!$&jk?=~~MobJ#O_`~Rk^E+Q5d<*Azn&q1jxs#-hW{dw75f%T#69n?o_rnh`F_FTC
zhyCKOt`NBRmur*GFCcCAYHwCga<vh@@&ysPzqNhRdD!pXL-d*hL5xEB9Lmhu9p{a1
zkb?3Oe>Ll+V#*dME{(0nJokC(u`(zK2cbQVkNo9Bgs03>;QkE;8ecgY46Sf?34%^C
zeAo2{d_qB=>h*OsHK9*qsI3ELA`q#^@l6?S2h4uz-7@yWo%milW|UgJI$n|};ERvD
z@UtDcPpE!BE00ZQ9E<YsUfDR04(29GFRVP89VFes`C>z1R;fa4i;BHVyFl##`;2eN
z|FotcBEXdI&CXB)Y(PI0%%-<T$kX-tT-l>oDxAbBg#YtwedQO72HkeEA-EY<XO1b~
zyT=XYA-T^D{Hu6$9b2S`nZTK#)3dawedaP@1!%r!u=ULxws?J8v+Jn!oi~BiR6dtx
z23ZW`kkg8grjEqSeb6ZUo#e*l?R(J%-4s#=y;Ohl(b*cBQ(^fnl%Qd@V>A(J43Edu
zC^JZc`pCtIm7JuvDx`5e?zs_FPdlHAqXh;p@QDPntZ9xK&8W|+BeQw<<;Qf-|0wXn
z9Gf?F*+u`9b4%I48C=yEWQdS*hM?@lSHwAkhd@vAArH4y{xg4xq*5!}hp=1DA0GsM
zph4SF)TtZz5lB}2jmZ%L#QDMyhY(0G#Gb@{h}XxN!8jE|oI!N;=dee3@BhReg&cWg
z<q;niYe3NoLp_$KIMrhmP{%WOyj~iNPI2R~2L+M>u{6fGvtsi7IH&#rUzMMseGL6f
zP4F~uN-Xs&(svA|K&G#nJ7zmiorxQ<T_o|o`kFuXMD_`J!-kpHp;=BKL}l9ff)5`z
zG_mvL@dG}x(crp{Tzh)&$F>3BPPNr0d#c-ql#+;FkUmELl-Br~^bGW#jfpru?DN;D
ztkXC2-(S5)E+m=^Z;aZLjQT2)RbkGQ;$JJ)^c6lvV9x4^>Pg|r+=#6cXe*H^yDW2+
zBRjUtW*o`TOTHdyV3f`NGATYuNFH+we+y*`X^Yhq|BN!C=VwK)x@@s14_a!ZPSoPZ
z#Za5>TBD{4<QaBy-27<HzJ|2`2XbvRR=hfNx5sX1ZdklwurRgu{S}+z)@$`<jLbk#
z$Mov_aosWaWF3V*fTklEUw(z45@Q|{9kV2eEJ(bQ?@h9~yfb|WVO%&_cy2e^8tNL|
znieW5sxT^JaL)sYV4MfJ4`hj0pPw^((-y=I%jtgO`y5#v^<Ke}QJA`gK5jt97|-zq
ze_(Tz_G=MYUx~Z#aw^sDjhRm$O*1Dj^E_XA>n%;AjQ#w@Ajd17+#ts^$3Tv3DP@kg
zr*GGumAqq86DXL-;mVU&sa3^QReZNpsGaYv;UR~bZ}@F3r}N!_O2J$Hd=4?`Hx~uE
z?^#_4FQ_k&Tw+6VNylfZjWrPuF-jtM3JbF>^PdznzN*o_sJ5h{kmk*<+ATOgJU2S`
zItM#dZ<TKyZ(Apivu#hM;aNIO3Qb&F-dILix=o4{aZdP5yqmz9Or4~%`pP}bMQl|(
zF;nIsZe+}AQ#z!5v~b(dw<R(W#67|#$*pFkYN0z$KK^s+bo`;!;g~=^cecXx<qyRv
z)+yU@%Bifq`dti{k1nG-&HCRt)Fa=^JYN?wdaw3wT2C!cD{DSiu+*%WBr7pz`uml7
z=6CRf(gbJ<@`H-|2fMm?dGFVyl`NW$Sc_+D3pO(r*B$*c&j!t_-c*gnR-~}c^Uc>U
zU4O!y?OrqvewjN!@viv!I9HEz=B@(g%<z)DzN)Qj7dej`8%YX;6Os{{yv?P=RpzK0
zgE|mk^2y?j-I(3WI_%2f3hP>L?qz-7gWJxV^s_dNS*=`6it4=@)e7A5(F)rdUn3*a
zuA1j{4MwkPFKTq`<_%$UqYKe?b<0Ps!jryPa8npAtPD3A_hBensDUhUpL<_Rw6OdW
z&Y*^Pj{(f}jos>{-7n*eX6W14+eV{)_3HKC>L(hoS=e;j_3Z6CJ``mz_tkXPfTLE4
zA(uH?nN6jFeJwxX1);6z;Pu!(r-bLs$u3D3gX4qm);v1T0u!sIHOpM>zSL#9wYnw7
zd{hcjN(K|^2`@ig_FR4=>eV*sdwBQwUhH1tp0buWb*R)N28|D`7>AEa?g2K|3oP#^
z#>7uCEp;$J*y{C8t2xpk5mFH;f#Pg}?q<j9`0KGmG;OTCthgH5t=AggU3OA_jIvqI
zoR&A1U#(`W&Ubmy$<rDWP<;B*U*A91kN0Njjr1Fzv9p|M8NH~nFoNFd?lnU?BfOqy
zmJ^Lis{#EqA8p-*mfYUgYAh|y@<tkamE%LthxmtL`i$0c*7n!h>;w4Y(<)G0JC}mq
zl#;mdUeSXC)rQHonoc9G!Gt=55f4K@Ysa}V;9xDF(gzS^C6>!y3(Sh%h@FOhS^2W}
zC4A!hL@$@OruW>-PamI2JB#QD`lxu;&1k1F9%-#M8%}?G^YZIP?4!@D@wLW3Vr6zy
zhNUjki$%v-s)Wwg2m9mu)Sj0;ENM(INvNUU_o%hIR4N)PYA6z%+9{o_&+}ukvgr{p
z*XeAGzJTsKP2<@f&ns7bs%JM@zaTG4%T9Ak&E~1uvfQ-or??)4G(m-WgkI``O%q4Z
zTV?$~x2;wYhY7-3t(#}3WslT}zC7}t9bEL>MBk@+<(D**P+wxz)O86LEEkj#JR)i&
znR@h`#DoOrK)b%GAn8q--mUHQsZQeSgIBl*3`YrvN6a`(HnT?MW_=kTlYq*m&5X?`
zFYYVbS(pKp-Es+>5=Mq=PVtQI_(pa$=8E~2DTOJD>2+bbO0o(VSBCQ7HvHz@Ax)Gd
zYG|u!L?O&l!fJF{U}|d0V#=m0bl>EnD|8)qS!m7YTW&{oR`#bQb^Ax;@f1EMPPgEz
zXjIC5zEPp2<A_y|my)v52Cuk+hC<Frz*cKQQo>OjBBP+Dj;7MB<&D+F^Tl_Y`6^0w
zc67CywF+qiBAipKwp9G7&aPjLJY*paJ5Fw+AdzJkn&Zygh*lD?OQir<+p)!Yukvg&
zPAy3-rA$EErqR^zu-gT;&)7)bm}1MfWZtmrTvg*G?l#YIrDbO4wcP3+>a)GKDDBn+
zkzQz8CY&C3%XIVG5#I}(#^a=lzOr=>^7wMEzUweRIKmj;mV7rgv;D)Zak=S!ZoE9d
z1$n_gvF)|rJx3BO^0s)RVf1W{CN=9_S8Erq-U|=*>$kU#-cKP^gZDGA!Hr3fpZl$Y
z4VS0$am~g>cWQ~<<g#j8mDe;oF~{YG&m8Oo?}lnpbjsV%ckh<`;^yXh5L6G!)l+Dz
z^~JiqG^e#Olo<YGpQnlVh-0N&3SsFz9ozvMVIma)KT-Z_`W=#jAE7+KwUW?cpi($8
zf{HLgP#GHajsSw!U~B^MiIR9Lmc+BLCDiuX+S3!zCx*E>c^GX2UCF?Dcz7KH!pZ~0
zYfV0Oc3p1vlbQ!FYe_y_7VozDzWsuWto+7kbDv~lz8BpuaW~^$iTln6Esk`?zYTnk
zqEk+;6)1e(3V>c!6ZMy-3JM5Jz%d2_VyFcI3UGu7e4hYc1O(*IAqeQe?}xxw>MPPe
zSCM{xMgHd)A@SFZ;_oD1z65^1GjcRBv2`-HbH=2WGy;m6vUsoVtgaw0U}R^*YG7<<
zXu|4lWB=<B1R-|;;Lygz*?`*J#@g0Nz+IU3uR8>Q<6oyiwA6py;%p^MtFE9-EotXy
zLe0&}#mYu2@_?F}TFBAZRN$?Y%>Nz-{wGXp?(A$Y00OzWxv{!&vf4SCf!O)^`9W+P
zAPx=|;0_ii4_jvgcNSYGy1xtgryMC0CnHA-duIzfTk2os8W`HSI1AI#{;KHTe}A{r
z#NFa|O}0+|>lV;K(61{Xc2+jfzhwiD3jI1Oplso8Vy!M^VFL^gP=^RF2ZzvK_y2#c
z{I2ouCsmwG93|~+fCrsLevj|}9{%&<|NY=!RcidMlAW9V&no}8^1mmAK)-ta$4LA=
z%zvE)##!Wn5a{1I6M1lPsdtHhAcpW#O8mV$;$b>^+9PRbh^V9D=cj%2X0g=#&tx7U
zZ>52@Z$(=KLCXdCZW*529((DA5(LO-QuK7Bhy&t|qx`q~1r;F~2Ci-ii<`z*@aqvp
zB{vtB$?=v0Exk6KcTeeZX4&6`eZcthvk@jXMjo$fK!A_<=SN9QLX#xmKX;~~AY$&u
zeaO?15<~g@`RXo!L98c8n{LQNheS*L`-2)H*6WmLGMiW(#KnF7#K|pz$Rg)I1wML&
zw2m&4V54Sy*iZcF!Jn-PYY#_x`c26=oBPiqX=7P{CRh^`{I?5fa$*utDF)5|)<65O
zKR(uXCo8m4_``q8788FO%S@w#@Bdxtzop{>r8_?>i2P40pAz&F(&$tgzqFe8{wdvM
zN@MEVOG0LyM(3XfmG^x1D`NYLO>UQ{N^iokK+QiIT@O?8Ws5Yb@^m~l<6V16%{DAr
z?jr^jRrH?l+FJ82*axZ<sUCiDsgj9$g1RM?&S5SP`@i}gNg!GH(Y!XbPT{sP4O^j=
z{@5KsF6cTe0^OlY74`G=)^WwU*q^QoM8`8#dm%e-p>;S{bJ&F^Iy~n4s8p-2lwGWU
z===ME&njiQi-QR)R$6toBSVEs9y+rZx#|^$Jo@bjTJ`o>C7LyR-{$*V-egIjN-o$g
zHQ#*O9~g*^XI5in+kVanSJn9EP4G`6=&y;T<T8(?5OD5a^10FhicBXF0$Nb(3y01E
z4Ylrzrr@`FLz%!JxKwV?75DI`$4sPzhD!KD`WJL`U6%*5am+L$AFP3cTATS=iGeri
z#Q(f$*QXDG;`6NH7?o;)+M&9ox-D}{p8G6<kmfUQ9zKlSZ0QK-3lMQEFvRnp>0eh8
z%`S}E%~cnCTKsk!f<yLDE<}Kg%Y3Eh_9GFqH5_`;Di6CnY@zrd&z}&d)8sm9mg$pF
z?sqK)SI5|!EHay~v#V=x+73~`glN=+`WjehRGWXQv6-JLd|zOg>37#Kme&=E$2dU<
z7n>rh(92h($aK(Y^={afOja$?ylG{u3xy6W#T_aT88;JD025hLV>RvRN+IZa4iS%)
znLS)?TjsNM>?L8BZ|fg*q8#Tpt43E`z@gTE;5Xxhi&1$xp;h?)xu5o&`}xkBHkKRo
zS%Xr4B~kdq<>CCcM*Q=4y?S;dsl0VScc5oP9Jg%iY2Z{|P*$Pq;T$P^;})Oa0(sMF
zvT&2%KHYAiehjHCO&dIs^Y7Yy#)on$B}ZpY{6Za{B+@u9({rzYk6x;8Qcce$j24A3
zv&m)O6d2rS7M(^eUDn1Qb#{7Ii;Xn~gf#fQ<VFWG6?dF2+AfnSy5(=tP9_T8F@g$v
zqsX=s1JzP5FiPG_JRyieCpjVA6L*#=VIpU1x}=^cr*eiYE#iAlOjeq_2Hj=&T+Z^5
zEnkCt^)>1*=d4=Par=51@3vCyJhQ^uw`#0sIWlKWcrUZCvw7lUWxCh8^57G*+0s~G
zq{{_<F*#YVEFY_3;xHr#lhAuV`+}U`vAgaQ2c2y6xf^Bcj>I7E0aut0k|<xFDSl8a
zF8OS4#q+)fkJVt3TeB(IKt!}Y>2}(04Y;F1XYx4;7(UPem(CBth~&-g>})elZe?W;
z$X=D{wls&y$Zc2SU{A2tuORv1nvSHzw}Te<`R5o}BK|QikFb#%h<`3L%8D)d!Vd3<
zMUe1TNk%#^A<N4V1t;r$^J)A}-dmR`R;3kAVBzVz8?c|JKS|Ha1W;JcSdJ`A0fRK?
zxeHw(lz$&XL$7=J+siob^h9mPa1v8v5W(qore7<GN{r~8do?u3<aRO49OYrMOXasj
zJ>LdDJk)UuJQD&}V`2VFe`NG#goA~Ks;gK|bGhg&$xu)KCqbM6b~EJ$y4Aur8*w~N
zTk^|yJT`MPU!K3aJ+h}Uw<~<iVH~Ch?<KRlJ`-1keq=6{d-i0sFOrngdT*jYwb|XF
z>HO#G7P-x6ByWPU^Ua!R-LtjSP^{ITxvxpcxGmpH_zY0-^<hkD*|kh&W`+|oLTS})
z%tc8Tr}g|6_2_`5Rm+aCJDwkNHOV*~zsDI!6?EnWY1sw~k`pu);|=%AE2Z*`KyXEo
zO!;k)DQ!xHkFv3;L>Balv^lYHf3{@6J1!*u@g!f{3HmRJDei$GY<8!Slw-gLpWD<e
zZdHBtC$774J6hP4=Gw<M4`Z$jU*J%}wZ=4NCdf3tb#J-9gS9^HqsHemem3y6GW~#V
z_ASTM8v+QH*-2m|<HZlkJp)pLCsEFGgoAV(1%ZwDZPgLjHjdPdLx~`}2olg`XZ+y|
z;|`v-IZ3k53-S&Iand;nc-YtmH8MCtpbObotJeAiImldN6#dX}MNE)i2ER{TJFITm
zcODNTfXH|}Pr;W84a7(mrjA4~!p_fQ_(dFjo0IXR1D)y`zKf2`m^4<_9@+GiraVL$
zcmI{*oLFj73q4bI0cZZSlX>Wp^grJ80kOZf**Ah8#z7vR-q0I`&vdPcxe_AE^d?>p
zs<k>I33H^2p9e=>s}ab!ExM?w6ZzrIe~*La_^Wr`eX_O3wtgH|X1)?9(;te_H(V^7
zMGh;s<HE1R07Vl;v3-yu?#^Pd?#uW<5gcjL;JA5vq%O!YB-8a-u9Wk-cUDGFpCr0V
z0Lfvr0o%o%JnvpoJ+1=xQ1*R>bvuC<Cau7eunYTz9q4d^1>;2!#**z31HL~g+_)X7
zDK>rdC7FQp&dNTW6IC?Hbp_4h{;XOy)xW+KHCn7Rm<w+R)j&$dWjKjlgwAtJn&hUK
zYYLkqh6XuBo=xLNMLITp_Ls)bfkx#x>_kF8226g!<%O$pvL53Ib&K;=iZopY`OJp;
z6mX)fMT5zipBz&MTw~2kWOlk1Gh^)PD}B{Al}ITT70(lV61Il#uj80Gt2n>Q>@OXJ
zeuIA|#P!k($}gy38_<|zgXz*i&FDtZ>6_ewZaO2_`6y)7e<ZCMQID6>&YDp>-@T!W
zJ1%aYzsl9J<sT@}zN<hzJ%!smHc$tXoZ?_AAGoC*JRUujNLsOo`Z)UGGd5H9mjl~p
zV9D?=cma>ZqxvytZ7+L<h67z^XeE^KU?#*u2(rTB?QdBvb61=M4ztJ!Y91*wQf{(o
zNf%2UFeY0<9~Pq-kl~>}95xm&2l?bGH1{u|eLBRF@-2@ND4@eIfr51c%&F_+V3B=E
zmE?&|J&ULbq!{eTXodoV&ouQ^hsOMow#h3fg+<duqvO*Cz=fj+wWy|PSVz&Z6%6Z&
z8{cr$oyxHYuDb%CZF_HQcwQ3ig#Ob(F@HMcVayg-<^JSUt(pdWGrZN{(%_>Yib0ZN
z<ou30;_*v5-DF|pH&I`E^FMy4IqP?}6fzGx-dtsyVt<FGVagGTLBvsxAsa-K4M}qv
zJwYO1A9ba4G!`_(M4b8Ik?(bRuxq#Oq>Um_cYe~qfsC3gcljDOS|QbfOkA)cSDDeK
zk0Dmk3%|_R-U5B?6VI9QlQqJ7ZbRHRBNa(D$n38@tf`JaP;ja%<Mm<Tk^E$slYo6s
z3`MROGA2IG#+e8f4hp^LSAK_Xm?Vz)qVq;<hBiBSGQj7AvMV83v7gdO(VW*Q(8+t0
zo^*Mm^=Tb?sXE<?7)6*?DG?>lMl;QMvQHq$M*J&>o--5sNMLbw4CpFL=QvArJYOk>
z>S1*8_T0*26!<3JMAYH4;!rPFo3Klq)sgmKL_BTM_fj_|uEKp}`KbRwr}5A2g}o#i
zlMNu_*-I%U$pq<lb{qa;K~CrU)dY&h90W8d8YUbu!zcs?h(h-L&L+)-VfFYJFDd0D
zg|2qSy2|ntDZ7niFp<X2Px`1}7UvSAmC+NVx5d}F$*eetK}o(_$!52$V^m)Z(9jMD
zF&vQCsYYJpk5gXeM4iVQg@CWE-YGQoxk@nyd`3jgCP6chiFk%L_joQrL+9?p5jql~
zL*GhBC^<oF*n3kp%#N-w<M;e#{uF^|qZ<7gRl{P>t^2kR)KL5y#h3ZfZ1R1Nm||B=
z@O!KoP_n;VmZ(>B`YGNKY{oXT+&EQR>-P#k$pV~`$9bsN48qyW+B?Kpn)dn0l_0;(
zK%&^E$Vk&ZB5MY?w)Y{%KKIrUVXesd56R0CJD;I4Mz5Eb?88U)600Cp>J|L7j>}IP
z4ds-pz090~$eZ}wVSU4U#(o?V<h(^+@yHpA9FuE83$FUhIVLG*-7E9LYMld(=y-Ar
z*$#$ywi-?GJKlR}ppx40Nl|qhBXluOHZP{(%>;MIIxfyuD6nSUCJ(a>e+J|1uRKC~
zI{-`n2=*8YNz(=AXX^=s{JScSFe9n1lT3u%G!lq51?VU&8RJMRlMQqVuU1qPYFH)(
zP;^acL0`bHjNdUd!6k)vt3}f<sk@zMv-y2Z`+Aqjx1w>+*h4S#Jo`TTQ_x<goY2Lk
z%Y4lrgqpgER2rog;*7bF^J+*{2~$Lmd7c{agXUr>+HTG3_8$F<k{$8;IceaVJEQld
zMC#8vyUaaiA8-s9M^=ai@uyc6QoTmg1B@Xq5;^<u!i<K=Tvg$_`QHRh3`G&3J63(+
zlNM3`bn7pGlXi#lv%+=56WTOR73cW}a|33KpOKm--N|(BU;q4<ladEGq5pr&`2XdE
z)Q1{^Y}(9!wgEUcMERLgBU%1`oqdSeKliC$GV?#DsacR7{<JW7OY_fa`fDuYo&t^f
zf4vnyv&P6|HZNT3{N+Cw<8Mbx{SIkR&g`QM*?((v0%}aI8YBKsjs0If1UcuKSBw9r
z2##Na!%t>I@XrkWg5Un~m~#K`#fr6J>_&LGRg(C@6pB1#a^>;T#&PO!cJ086_ZMkL
z2{t#5xvw?qcoYbAYl_qcT-(x!pJ`;*w;ZS1&0TC?4epjQfqqkM+GF~s_?fZ-p!uol
zqh!@O8I>aC(ny<`MmnX!qnYL`?qU^TrM-`;KP#l^U|rK?QKhFt=y(*hq9THWOKEIp
zK{kw4+3ppFs%54sR%7L(0|%u(e~wP8G0Lg5oZkR6N!2NjMcvene@wej3X{xT)k;$T
zek0+v%}8DekJZ><^`7#dQ|8|(Nv#y*91&7uW8PM(THsCUW#qkwZA+h+PU-E6E?8t@
zq*ZO14n8kktY-1&O85v2No}O3+1vtsk@be`xHask1=A#(s#G996nrYey+=1+X_V*?
zdB!JG#K7Zq@@hJPwAN;uvhB5W-Qj2!@*%gH**wEVv0Esy@6AqykuNMee&721+pMq0
zM&J0sRs<A!ns@=(3qGF?#i?z0En0_{502r@(%V*@qRH_W=DIz+ZX7~)t|~1_osmfl
z_q*s)vYt(eI<Yaxsxq=S07uuFE&F;oZp^%ZJ-!@k`eP}yCq@7u=UhS2erXeh$zeGB
zrwE0Xz)7QERw9n2N|l-4iAvX!SaQZ;>O2d{RTV75eRe6Gqc2ff{qB4!%Qu<Btj=m{
zXaU~jH)qB?#W2x_K3EAJmS%1a>*YCF*7F&mTHhI)xx?5dgZNA&lr5T1GO4jiovctE
z;^=WzSi((HFJ~Rw(r%3=>PdCwcnh?~?HZvARV5>plb8}vM>VQ!fK4a*UD+71ePH<}
zbz&Iu{qBm4YL>7pI$UkJLPL`5M{dow@;5mGy{*K1Z+h0Xb<~<aZNhObLu^qfj+IK0
zwVSR$J67NR9i(guHVQj{lr@{FFeNDMoUe<vc427;If3UPHDnO430w*h!>c8S1~9E!
z+1s)CXZT;Ob288~{f6AdAo+FO-7eJ<FGzHyK-va+aCqBoUZ0<1C=tusiPn>RKdmys
zqZ&Km<4BlxH|5RJ$e2!v{J>{d2q9>8whk`D`hoC)_ldtXZ^aLj!trom!aND!cN0n_
z%ZqK*OKuBh%+oftuc6K_XIdPCD=*Lb^iIirkNcf`=eYyD7`}|5|FO>fL8AWJCf^1`
z;#8!C;x6bje5}%Nj+U05Oc$(*CW7A0m8;0RQEtTg=$_tq!lu9D`7kskR;hnsRpHRZ
zn-5D|%Cr`AJ*?rd)#CE?KFf7|Q>Mt%W%9Z0vM>LZA^J^&w+7683#n^gUOv69dsa|Y
zBh(b9`RgTfoBI9ImxfiN+m;q)xBXb(B|3%P<~N6XGN!PeE5@E7<C=0OrQv{|jSdu6
zs%;5%W!h&|p-M9*1A91^cM~%wePHOYmRQO}xJirBvtpuu9W8L6r-{_?@aJK=Xj0Pc
z?phG8Z>^(^ww#+?>T2DHQ*D^JJlr{)<fl5_tHc+py!6wAL2k~Xc~f)&=>ePe*g^1a
zM!$i=AoKa^*2B3baM}85$NRBH2c2~yB)dz{-HGEXt(VUTefoR@>LDAHZ*Q+!uC8Ce
z8P5{u?C#*23;7B+lVr70ZdEm@b!4O-!GA83U1@4H2>~GtcbVYRrC$8TQAs}<9-H}H
z66VH82d+W^Fh_+;pDnWr6T`P6wbCSIrD|_=T*HeBszuvG@2i+vvwOt(W?|RJo1y6$
z!8jv4?2yyuxXn_HnzzoAm_zQ_C!B;r^<g7V`9G4pcJBOQKNV*lOJlc3`GtHA@?w7#
z4d1v{4|-T<^Fs|1LlPl8_xS$%zmV;h6(9d1md!D2z=&Vd{o~H8=W4^h6W4Zh8{a9h
z^rNu;4kcw|FFvmzI=jOWZ7QGFCp}7@XIrngB*(I)v6r1H`$#LG3p<#qwazbLec+>W
z*oXtC_wfhXOWYSUt36#o#!Xigd^<xX7e><=KDD-IJom5Yv+=0-EpbMR6O^TM=Gb8m
zn3Eee2E`YBdXsPRL9h;F8JQGU!wcm<qoa>rAca4lB)`N_IxTI1*(guf>Xx%QkI$Xp
z>n9Nf?j4gVIq={fkPI($h_Easem+hfhP>e24{6|H8EO&WszYz{$zf5i=uOg$2I-Ru
z+ALv~K=)rm)aN6izE7Gmmwg-9_ffOs(eE;D+nTghJ)>*PmFGvDIGx$x6s?B~y-=2U
z_<OJW>)mu7k0Zn7?FS~W`-*H9>oa^{DOd*&c;EHC8@<;V2=^=o$wpJw&=*Y$iiGPz
zuA?>ojZ*;!d@Pt7Omqrcm!r!<t36D3IH%l8L__gWqVgnR-rHGbHYtRSIE%>M@?L#v
zj($hYozqRpBKUK|o8DdEd($Fb+Y=`?&QQ)-JxcQ1wmx0#$*0YJizay$3DgN54%m5}
zbTC*+5%_AqpN-RpauxRzM|8cslfcO#dS*on49}D5!Y1+js&(r-1U8A6KbNE=;<CKs
z9zt`}wmT<A4D<54iGdgi^eL16X(+}+|AMf(hNUm&xztKbw;~-)UYWq+SB9^eP1jXH
z8Sg0AyyIPyP@k$KA51x5x26ciOVc&^RLzeD`d1Tt%Fxiiq3&uOpOt>}=W0cb6U)Hd
z4G5QQdH5elF@fS}aww;hJN5COh}5sQK&%76A3De23eRVMK!8|0AYgumSXlTkZUn~o
z*)?zy>yBR)@82i`;MY(60aPO*rV{_3He>=PJ4E~Tvi?}EVj}plv7_kU3*Y_$fWEE}
z#>TQ<Z>tOcSyeweQje3C*}4FCG2mTJEH4iPciQ#@TWMp6uc0S_p?LFEc2Pq)PtNjF
z<|d2OgDZ2_;~@)GqC<A#kt9L`!N1)8k2{^i;46l?L6=me%7k-QtG(zNz`fs>MC~4C
zz5U%<WqZsGO}S;CS^ntg`-Bs|T%)7)b8y0J1VkyiZ0Jy;Yi{zey+g90gkkxr?Iycb
zwZVHfXr0_etoC5WhOSq!Cbx+9srArdXo?E6R?Vx;lD7@rMq9N@?_tXxyJA{xCaJ>5
z3t9y{R_VXT;t|uYSm2Mj2D8i-ZifW)>0)0NtHt_K7mL{$SI8ojo?g;-+B7{%&K|cL
zc}8c0P8dZZZh2elwQZ~M0T!X&h05<CY{mW+rG+f|wVQg^E?k9P6~;5o;Mq0L2-KQy
z1fS0yrf3X2>^bb(JzMuF^^l?8pKWc3a@nsvTsWMrvsUk$<F(T7`AA%2ft4`V8Na`_
z*(FgkNOW*eJ5nssz;W48?ZG(1Fqpt<k*>v68woX=JFQ8zp1aMh9m0g-TSFGJawkhX
zLRj>w#_~qBECHLeOgR{QMJqi#$5Q~AuUR(f-e%P`$t=+(<H`4Cq!YF2s0^}UtFN{r
zX@Z@KUskoX;V;X035@BQrK&esr24EuTP97)a^BQBKi~faH|>;%cx)FfGV4WtVNlJd
z1`R4X0#lt8X)W%#;169@Ix;?1fN!yJn~HpXmhkjIwBE}LeA1pJX^Sw?&0{-n08vOz
zRW>^fMXM>)$lr=OSR8OVIJg`s_8qaTHJ=n9<K5>h+8G^bSe(DPk}jH>cdui80zi{G
z){-Y$$#3a>U<{)gj~1<SUnLwPR}kY^%`;3dyX6m8EKz99Y}qtfZ)FpmR7P1&A7A`v
zOU6pfZ`NH4{uAwZ$p6Bvj;X-=vUxi!yQaI^ny#tQz>)hfh|72W$R=g3lAEkKmeN%b
zZ+|U_cUC*Qh0xb3t^9WAxNd!tuDR6>F0ERP0hXgYGcgr3fGv-$`;bbxT6+=Xq!8m+
z&g(PoP<r3l%$J)qrLVrgUv4_0W!5eJPT_cHb;QxLePM2g*LJKp_`<=0amUwlUzvFm
z4RIp$yU38qTpw81yv$EXc&XHx7(XIx70pbwiiv1&wpPch*faj)<>Ef8Gu(kli@<6(
zXuZ8kbN&n>ABoj#p7~5N6Y6YjQRZ_VPLHKLHwIw7CR2N*d9RfZQ5jtGc&~iDhjLZN
zZfYf|JYCFf=|pb38NfORsY_)}%yoxJ+npaTqE%ca8Wq+(r*dpUNVYc@8|d+&7?+;h
zMZI8xLmSPyJUA>W#yi<g*Qa&TLBtW-$!|UXEu#sSBTZ*Rp-p%&jUz4R=!j1`g4iK2
zjKYDHSNq32gsiA9?Yo`%Sz=i@Ri9ek@30|lY|Jm(an`Q$@(N)M=-;@dCjsMA!KQ<)
z%SErlx_jRdtkxp1@cdi@HWQ`36kCU6)H@NKHEDgE#Id`%_-#!x#%>AkNgvj=JNSAH
zp7qK0eoOA!<!iK=^wGB`MU1k1pXPcadh(ZVXSP_h4p9%?(qdb_nxT8GO|oaDTzlQK
zmbBngaNCA}t5qG7r>K?y%;d{Y^z(h=#u<*TT%D^8!)sWLL10T5ZfApP4bx>*(de0k
z`)XlLt=qkLjuM8=?Ur%F0Lrq{4Zo`cWRzzYi-!D3q;lKVLIwb2d|~TVcJ*+)nG#8;
z2Z8WboX6$p#;nNeTR0hO?GV(ZMgvRjv4(3vM^Dgf#K8zA=fUx(oUB3X<rqp~%loVA
z*Q!%Ej;;G>{Me6F?G`L!n)&8Nzdt6MiPd1}mvUk>?D$xtd+eBq1iT?7#@LT}?3PXH
zbbc=5X&Y{P6p}^8vv<3lBaT*Sa-Yz8ZbC;cXP6<d##JeX41Xyut3%$se?x;GFgB3=
zg_7?|n+XNCovrru-1K<*BgE$fENs_UV8wGv42|B&KbK_08&)BT)tN#9Laf;uq3vEh
z!sW7;j~o=xDwBrZJ4R&6n*#Brq&CASlCdv+mgU}uGN4X5Xh<j#fgyQB@$tRzrQs`r
zkvluVWnP>1Qn3SP;!pAWJRW1aas9qFP|+#dxjig8atk}sE6p`Z5$sO8#Vs3FLZQBR
ze$x`|Ufy$y<f^YIMHrk;LL!EdBt2uZZ}E!;Xj1~Y`KlVLO39BmZz40{@PZkhXnvTi
z{7R)S#6OVdblrmg;n+baFJ)=D_I2>4N%xG>t$vswVW!>88afhof-0ZuvA5+!=pA|G
z@_Sx3+LZcY?hbv!Of4!waK)v_Dw@oge!Cb$3gS2c<A%o@#<9HJ6aRR<tUq65C6v>r
zbR#8jr^ebSUck_Gv933=bqo?LCmA9dMEZGt7(&qV^99*KX39-MN!}G{PqCwrPMK57
z3koQ4i>y;W&}u5)plbECsZP?fRWAx5jLn3;;7uL^uv+q=pnX4>^>phxSvQg%BGv0G
zmpQ7tV8kr$y~XgPKJrCHXZY$5-5^u0<3~ok9k>oN3RkkR9#Lq4$hu=ItBP~zSM8W5
zntAUr^<EIg^}1Nj6-zV2T`94Jlc^)fX|dnC9`gG#(pJ-d>5vJ~OVg0a4kVZxj1VNX
z;yJ|bfeQvQxP^D;gj99^n1(?piS<Z`-M_!1`3+3+1H>{gb`=!m;Z7Us%evj~E8Ptx
zhta*8UyoTcSyfQT+b<bWighz<H$h348c*i^V$Nqr*S+#|=PJB1mp`xp_7Q79yq1Kl
z3x4m(ZHj2G`moy?<kmdLiUpksOOmE;q`LgfV~h3~XWmud^?>30Rx#tE7O#uOcpRbC
z$O3X~_pM2$V1#6Gbds2;@5IMVLnmd3W3o|Yv(!z0^F-fk237~$W8JfrmCuv=@U)-U
z%J^Sli;_V?kCMoZyOd1yo9b5%a7ADv$T4ITYL#a?ixfx!myTuuq0BkrrXoy@q~AY%
zVhGG2Pt{I;@Ea@g5&d%URQ!%lMb2ajW#~$a-ap%iH>hJ_<ON~*-`D8KAlvnbDWC1F
zRwhU;z91Q%ijAfsokv(JOe?|?rwl+}!QUK~>!|h~#^@NPoskIBTkyzbmvt#z5wD|@
zjhW57Ka=r36HDY4O@0h88&OnB&af39+(Vn)%5`G0z-!AUfh<KfPPqdtRd<YvXz&y*
zSNPBZNx6Qo`$q8C9jEA$10Jy<Sif|;DFnAtuL-e>GO=U1!7a0{R^IJyZzXh#Mz(n~
zbP+i*pToWX({<AsH~O+59*#^PA^|c|^U5lgDXYstcE<t3WO{x|^6LaXkWj}WGRNYo
z!KAsz?=93YF<*Q@KasA}g&$>1=@Dz&NLXR)T)`Sdt>qJ5rOY<omr7^~CFO=TB#VSK
zycWUhsq~gLUJGZ~A9Cn_HC^Hmk~xAHbF9v*LOE+29TAqco)=;?$ivZ@TAM#=XzN0{
znxg1Tdx`I&qsem`=>LLjjpt`3GrG%FPoe4yh)<jPi~esS=eJtE!iSsw65UX@(w27N
z+xp%*l2x!ivL4q-!H{kokr~fte%p|Td51<+gD3_ESdCO+gJW@~9#;Ll3&@^rUY_6T
zhTAXEd2vth_&y&>+jE$ZuR-6VVJD9v!*G{&dXKdAd%}CeD&8H`(jea=$M5sn)p3-z
zVC;V{39-QQz>l|UGXBv`fe-Dj_Uc+reN>`2^c&5_+M%3o7<3(IUhRdxYY|4u8ejG>
z9*_a+cxqEa?6Z$ucsbG5qF<bs`!5#1z2Ugb@OsAT?jO@QZ0~xqv2WCZU@{d;(<10W
z&@wradb=|Of$C(E33t>X8+ewa(ne$Ns`7?jh{jQxV)fmC=hs_eQl8JT?oEyr^1UHP
zv3(YItN8OV8PfR1NoS~czejp9eUKeW<fsMwTUD2SnLgUXycVmYypLVk9q;XFV7HN}
z1}MwUD!eY4p!J!td~+UwIW#GT%?9KT`qJjUTt@zW_5=_Ys>Idp)#m$V;n9ebomPGg
z+{1_?!ck=|W^$IRsqSQ3%N7b>d&devQFZqK9L6t3N5`v2`=b@+?ZLBB8GdFG5_zPl
zqnvg=*654vL3cku2cYYNF7K@|R|}2bF#0s`Z#H&c{DQ3N(MF%RMEVTVHPpJfLYyzy
zW;Ol!)<<HeciTQE^ehHGip$B0HchF%kn*bZr|1DKc|);hn+yfDjEQC;F%Rj@-wju#
zH4B48#&t~_t~*;kRldqYT38Em6|hlMLA1u>r&ND^m)POb{`Dg|QCu1FR=R1covAnG
zi=_BX$}4FeZ2UWZ4hJ+mj)UPdirbC*A>ZAZf2TM&qWwA1&tR+)PcIG>R<}Ed?NNlM
zdwU!xvIA>z*5s042;4C2oMf_Lyf-EC?^Cp~i71NUKvb8kxbXoGqUl<@L?9g9j<*9j
zb6AaqK&Kqs;>q|wLz_>AX!1>|jx+D_Ppats93$;>C{EiWVHLVR<GE7QctEgvn?_!R
z{<oo~Rd&aalOxG+D#`e>j13w<6eSc?Q21v75AcAKold2b?|xf6e1D-|@%d0TmH6MR
zDNJmY1|X~MqcxsPe^eD4`irdM=N10Rcb^HNtSwv5=tDktj$2*4|2@w@&5kd{NO!f7
zCXRlO4mDD696(uDg&=!1e^$u)t7{Lxx{~}srJtq!;=$V<YGr@&V4zS5fkcFwKjXM!
zt3W4o_`pq`EPuB5HPQ|3H`o=#3{T|x1EBk1NgNSug>5G4+4@1psbb3db8<OM2Gs%a
z(L-Hs%ZdJ+xfr!~*;1Hb<Nnx)m@@f_iAEQzBE2@>k1VEU86J5xwu?-gwa#i&r8@JJ
zUI!4@-Q2{yrij7tKZyP}>R&Pap4vFwV0@|bcowb8Z~Jmf6(&Oos`-lP8<P!p3xz7o
zu%)Y3FA3pLT#8D@%-ckt^D$XQYr$lqo{vOl@=v%e(>9Mp;k!z=msIebzFN!4!l25!
zMc1Mli}7CD<`ae-pIOv3IJ)R{tIu(VdMcO2XVB93H*`gSip*tiVocZTu;!rfhwGoy
zERV4f5j(n}uD3Ut=?g9JxjpGq&6aw(KbF%(Qx0j|SDY_52n0kxX8F~J(jOmHWZrJ{
zUB;JrPexM;d;aV*r4Bq^s<rXbmQzY%>rgGzJ=9~=sc`)>mQXH4@H2{xw^BTCwBiBL
z;Cv`m-snmKNN>sW>S!}~5fDfD<hiZ)Mq%b7yhg2!MZ<YA0|>=z0BJ$3)pThP#~2=o
zwtef+=~N{Foy-g%t%@=_-yNT)GFt5nZe<a4JveUq0@51|!D$*?^1Ju3nkr6q+5I`o
z5>sK+7kzWctXf>|u-*&X1SY#Z1eaoOP|spJ!z-HPC!l;uw;Km!QR@mjb2UXZ=3|{1
z9$U%RjlbkSbG0_V6n7_m(A%>~V9NjzCbQh?W3$}aa(Oybmi9w-PHO5p!|SM`4Sr~6
zQ1=BgS)^76NPFA``vJ+#VY=H=4Ip!axpsUuAIol7^xQAGJZgf>ZH=Vr-1zgD3_hB#
zGK;}^%+~Gz{gJ?;wKa5_<8ih%Rb{5+wI0PA=_JL|0#rZM;>BBcPfR9wiTrx9%pLWQ
zn47<Z81=Nold?k<HJr2W_#XfbV+FM?vZ!~1-*p$Hg*rzbc&`pBheGD`?xDPNlCP*=
zKw4p}ZSu*{6oOEWt3|g=LXROhbO#UEn+QO~0`?|e1%y5slO;}shvJZ#ir%iqcwg4M
zif3{i<qs@YE6WH0rKmT#rUQyLkfx2d2Ouxgm76Y71D7?e1Yo_OGYXdu=AtEgLmqUl
zcXt}g{<z)s4WLV6>;%`S>G@3RdY|OFx3Fl{9tV68`RtK5oD(DRgyiH=_fH2vS9x6<
zO~yOAHJnViEZS&)F{w67pQyd27A&IYJSP2XM|pm(#%li(vRSvPB5U2X*Y1y;fn1A+
zM$Klh;s|NE>Md&BOh|<{0&1(-Gw+R0p*X(eIl#!f-ra0_%wq*U{3CAtNEJ!iY22YQ
z%h-k>dinki?*O`QSH9X63bVGXUIN-qq8m$-R@QPU0J6oS60z2U@2Pncla7T&1$g4O
zPMn>OgZWaWF&RrC(W;w?kVa;P>}{}~e%tM4*{wjdKO6j_%+F|A$E^i^S=V-!3D}fO
zh66o7Dd@HFscnvXTAPfd9TT<n+8$^dEO&EA?c1DpCm=PQ^B{;KA;shL0Y<q5d@X~e
zR;)fo>3dB8URCmgRxLXNsyLa5>rEKsz6PA&w=KBLGndAMhD&ao%41WhW!o@mTfZuk
z*#XjNtj3}AE+v7eONO1SGrBW$FjDLpE(2q)4hWo@#Y}~f3DEHNr_1Wn1>NS{+F%r*
zY*PI8iwv*UHI7}Fb_gs%=%PK8XIJO9*;XX^wFhCAKG_qY(#_eb#gRZK+nQlNPnBs4
z=#RX&c#Sg$>RV3-G1~05N7H?X$q3|yf&HOh!nw$coiWJM^5(Nq!4kc;*3#CS%ObrV
zDXzZn%2@#;N$g$60))m66>jfKwV$&-)DU$$(oW@bppC%vmtH>|0#y~2wa%G<@AXOa
zyvIlm-37C>O{rWV(HhDrJT{g%WIX3E->ar&CuD!Ghpt(E;y)BKMHaDUV=tnKzb)*S
zwH-;HU$x!Cck-@JDclwemaltxZSL>jckZC(<Lu?BdWSgo<OAZ~$eZ@F-KCZ$(8t5T
zVoqWLBr<Hb#}cX(SR-KsWl*Q-Rv#}t8PVT<^D7%5Nv=T#v9McB9iX@Z0yHO$kw#w~
ze680BFJ3+i{L%9;fIAzoyuMnF!s70-ZU^_l5Z;;RGsMyUB^x)}nGwWSL!_jnwQdl~
zw&AY80wly?W|SrC+kpaW`YieLbjL8*REbuD^|hV1E5+DdH{rcpd1J9&rn`4#r}4(S
zp5s-JyB&wi<?i@)5G^}wFn)<D>KbRY_o+o6Ao4R&)Aa}j8*;WkX8YPkvUy!l5GRiR
z>7y0k?bZVWs`0)D{C2*|Vi+5*<U-LAJ=k!`BrzzVSQRe&s%?*T`W^_?bw^XomlzKu
zxgd&@mh_RxK?%C|K)w!{nUhGV9e@bf`#EK8S8pu2v0IT!QA)GG>e);Mm8U2t^FX5^
z=ga7|o(THlPS1x?Fi6{Sgr;}j;k?_i?r|uk=MOEA1b_1we>kwde9fdiW{#TAaJ5=*
z>(!baHwS&^L@KY0Ye`r%4@w?iEjVQpF%+$@Cg&|ND5SVE<IJ9*Vu_p?rog{b^$I;o
zCZ~aAHtS~o#sgp3@cA-&g~FF;Eir?PFobG{Z^#W#)_RuqUte-Pfy1t@sLV!EOgPO(
z&xf|t-E^BVW|g~7!M+JQ4l>0YsVKTDK&uj4Zvjtq%U<rLkBM34vOfj2<~3w*nyE6Y
zyCRFDQKZj~A?G&~;v$XOX`UL^mVgboi{5OsrERW}Ey+j-R(Pgav*F)Nw`H6zZJPIz
z`?7h$4(ks6(J9a6-`1qACom^ocrWG1M4euYo9;!9f=0duh_G?%uM94t9MP^gsr}w1
z5;LHWEs8v^wiv&CWGU=<Zm+TVx%ZKy5A-|={1NdzM+ye$*ACIi0ONQu;OwTdB)u|k
z=wUCZX9V1ij76biF=^?B1?)BC5-x*Z*2hO~0*?Cp?qO+XM?7w2*opCXA2TnI$WZZa
z;n3-;rs8w=^$4XTTRcBV|EIE09VKYG#d;Dc%1Jcp=0TNLw+-I=xoV4$Md$G-z2OP=
zPOsV%opC>owPXHS{U>6kWLd5FRc7E*JWmdv#ibV50&)fsyrRo>X;*OV39EZs0i%k1
zhER`#&_+H=w;ja@SIm=(5Xdw#-t8>ruG>Oa*5<9lV>ST$^c5723;YHv&mN&T#($Fe
z2EX0D^6co94D^oTb$S^Zx{K7Y3_rTkO{0kfIgKx!#4qemm0WT9P;+^}SI|YzIi=Zb
z$ej4%;L<;YZ;!jOQi9w##?@cr4>kMV!$hxl7yIv)+}ERgDP}ieN3h^!5T`6^@|JUe
zh8TXbad27vnj^$28rqut!1m|20Y&TS^R>GWGF!I2tqy5uVw{}G{a3%SVSx<mgJ(kK
z;nQi>d`^;m?v!;gY>YhFSD#;pTzANShs{)U^8_~`O%UKz{#Zc7=raf*fL<iF2_2w|
zj#X;@E278u@09u~CnHm}UdT)$ENgy3>y)YzJGuE<go7|KtW~qda&s^BiVtnP(ZtlH
zztCsarmIhZj9@oeda=<Zy?<e=^)dbB2P4zXQ$t}@Y&42$MyBc<mv<qdXo2~{jVz2q
z=kS$|z&k8G$I8sX-^}1w5`~#WBX#GS|4X{ViPTW(YOGo?^{<TjuT3lQUz=7xz~#_?
zD9bNn5)1mp15k^Yi2elYJHNm>lvMTpx9J2nt%3ot->R>Y``ZXnBcY}PC&fj(_A>uu
z0Ik0^tw@Rs|D+IKzy8{^+A&jy6aG<EKM4{LCn)jMv$ZT$D=TdfC<egGol2wguJ_HB
zV5@JlMin-YF=1evk_v%MeSg#C<Ks>=4`dKv_5~=kcwSgTmRjztYL%YFZhZv2X-^85
z#ai1#;Sn9j_r-5>U){|=?BZw9YxOQ|BVsQ?J68Dg3wjfQbUUYtHR4ppwCw;&&`R|D
zZMWZ|S1Gd~4s$=mijnAHt3@?{V}XnVZm<skAqzfk-ZTQ~BC|wl+P3@CcI80P8Y3y(
za2M}`nQ*<WSM!BxWwrpUEw_hLiFnWW#hDd`1TSv_h7`8E{obTn@h_(g?Atxdm}k{>
znVc;B*exo5o1P--mjOVIods2@<u=<zf#kb45hT!uFR&>*3sk-<cL0eeMzD=IrH7gm
zfV7{C&;COc=@}rE<>xfeGNl6S#6i!MRawhc#FrNuKk>AgREv{lSsQeh0Z0nuD44tz
zmbM0GEb{n3u~P+HEPvK6_(;jAm1@t93RRgNF}*T^7<7d+lvOMn-``!0TYO<vmsael
zA*7#bbYUhFaxXt2x}bqx9<H~I`d%NCaKK-|lzHkP-nqilM9AW3<v`X&IiBckf1X0B
ztHdOLo=V92iR#cP-G6jmv;oLizAO&F4`9IMuSr2YVPL;IF9{#bzeAJCd>FtEVxR>$
zL--O<S9%%ZJmGTo(@)U^?7$+l<>Vq5dHX~caFl(-AYJ46ItX9u>C=Q1Uc0TzE|)bg
zN+I_jcPBA^Gk_F-ZU5BDV6FS5NR@7@H$RXhRAD8{vOk_*M<MLVmHT+0%=P<HGmSk{
zS-ODB-i*g~I^>D(uqim>P}iwgyTNg)NKGk|v~@Qx^&p%vqdzq|_stNHC(s;gyWF~n
zIc*Ch>i~bn;UU1>m?BJz2HrXy0`DB-D#pT?`Oj|-odQ08@2LX}7l=1H6}bZ0JQ>sw
zV}IK=I8WxJl)l@+%-DU_M^g^K*X~U#r9;Ep(g#NYc2!HvqWPF~@K^E)K&^Z`H9Bm6
zWJ#jmquZWtJQryqV(Dg?=CRS#3Pi)PzSx^A&G69O3FWYc{LHNy^3B+-11EFx4rx{0
zjt%$smjisH9(zvQj^*WKsj}ZeOIQ^iIcMd?uiS>Uyl+Yij<(}@QG|s!HbV&|JZ?wi
ziR_DOuP=@k=PQcW5@Kfgx3L}5T%p$X*0Gg+oKFD!vEP@1k}8|bVbZLxQE6<EW&ju~
zxI;fKt9m(g>k`$oI4VH9AAJ_gy^W1HQKqM-Rbd!xwQbtQxQ!(f=4;K2MeMybD^nDe
z@G_KcJNc~IVIA0P_|9A;Lj8lsc3}hkahjjHVj3U&To7SG12MoWO{z>sE~h1BWZr?3
ztP(mTVkj3Ep_;V@U1)x81_1aw5vYeRm+A->y~$}T(W+ZA9ZveBPZF-ftFY)YK8Q;t
zVjRbyaEbKUS9(5PC36iOW=ONROgH)tc1aQ0M4To$di9A;)|+K@PJH1P>4!(xRstC$
zTJyCw!pp#hSg&7V*U9+d>t|q?Ng|F*8?q^o@N#N{F@L?-u$xEL5`|O|6(7n&qn^mB
zv(;leTWPZBTL#m4)&-H>{h6Eg1AZGM$gcsv3o<$#b!o7f=P?r%?3z>&Sk-m`l5<El
z$?0VQOL92EyZlOh5lHZ`!+WJ(fcLj84gUNqL~rZ}WJkFLY?Xt>Dh`XQMmf55-pfsw
zEw{rf?CgL{l{u{4Gq5Q5UL1#%MrsyFzB&Z5tD@8ZmSWL#F{QOY#coSP<<wcyKv)}L
zJ@NfbD>f~CZA;kDi)6z5sI;#KCcv8(N#X<Kd2tA3hc$ME#;A9N;J{sNM;s$~_^;`F
zfEBDU@R{D*2LoB^N%n3aUM~YljGu_(MmgBl;T9mu0?d6$*R?xHw0nC+MpKWW3SPj9
zGA?U{76LqFn1vJJ`K~MfmNeO&!s9hwfJ(=J&uc6v=fbn5FeRQWl`mF5XK)5J7>AKG
znwBE7mfKKk@+m4J`HR{vxM#-O0zm+?2SY&S*?NSN0=)0G;uk}+Yat?}{?f1>Jr8HO
zR40q}hz@I}PRc&ir*=IX;q`dk4&?mp@S04cC$+~K5ro}-*S}zn^QB%|`SNLO7)Zfe
zukD=!yGV=TJ4*qbZT{g6glFJpXnerid@-~tAgTQ;dFMoY{$g5hJGct8;Y<A;k9-D#
z{v`{@*?WFKwlsbt+^OhrcSCZmQ;$24hWmu8pVDK40F;+AjT@MWOR?iOetna3+wLED
zuo_B*8(QNGeF!=r?ms$h>bmITSBwUT^oS?~zxgjBhV!$qX}M=f*BgDzuM3BlFNAyH
zsNzh*Yv38WmZEE$=s=%I`$U_c=+*rj5<iO2!?a}})34z^LIkhqR&XtK|5l1-akk1>
zx$u8R=l@i3=J8OkZ5S_P9eXt-dy>djCp$wNk|imTWyn}Uc3Fq)MA>B@FBQqr%#bl*
zEMs4jF!r4^_MI8#{W+cYbG-ll{+Q=8znSNG?)!UP*FE-+KpV@^oO{Fi@e}WMKS5gG
zm63VZy<<F60q}C_DeSYmPHjQJG1>+6>b5}RjoV{@0$9n4CL(-2Q|+r%?Kb)^3+#7>
z{HRr%LU9)YQhcRPo8mfNy|=DG{4(_C2oU@WYFSM;cinAVZw5md2bw0?c>%uVgX>@&
zUzu96q8FlPhng`wyFSGQC5=3W55kYh2a?WMNh>$g`l}5qyC;1h(}8KA)E=My->d;?
z8MyMt#K^{?8bx6_ef`aSb*>ak3!sUfi~{o*-5pHQ6Q+uIuAcfpG%VH=Cho-%ck#w%
zjbB?Tm!fwu*amhy8Mvk*_w(8_AkbOs*58pP9`u59QeO3u>_DM*!tVTM?1Iyz<SNKz
z{OcbR5d`Z+d#QqrzGRdhhBf9V_f31nkVEYakW0;s#Kn$Ou@yRV(3y=6&u+oe<Kw;7
zv6n>T8tY76rR<bOkf-m|QW0X8+kN$7Vs1;gQZSiD?b~!iCGeLgZ1uA4J?92uUUfvs
zhin~;q1i2^`K#nwAd>0htC6?PdgS@0SIG_8yK0!3JTl6H0mzflWY0aR+9p4N6uLm5
zRmw4eCi67<=)Jp?gU+M#IDqTM+pfN8qz#-;V^<B-yPDOdSVu?i)^y-AWVzVOOl^<u
z96ma}GU&G2gO`|fWi<1njnD)d5;BFsBD-A%e(3GnT7UsKf-!yBS&8cwYoI6pSe+uX
zA$ji}0(-*YBsmsh3Ez2S<@Yj8&0>i*gxr2c=#U-_0f5_m3(fL3dIQyKxJ50YnE>E$
zvvN<$6rzq2c*-l3Wjeh~M^GvTqk`9`&erj<;}wtdg-wiO9T`tx5Jr&P*UI!pK+Eqw
z)I{AJ8hmi!@mvN%K>(&(NK)P#+fv;E)6j9FsOebbm9*bGq9oqld6D8GqP|e45xJ>a
z9hK3N%s~sTh#iVyN9o;qDpnLqxPrXR_Qff8X*3@4!4)099T#KwLd>|6sb6j~sQ+!K
z64lmhLaYCOelb<^TWAB%?uEtJn}3DZ2mBoXvyD*f_lH)xU@^!krPf9b>l-scUaG)G
zAPzO73m4GUAv>x*wCd6<1t1>!hC7ZlmmN8G045^Nu%e4G#1&j7PnlX|k10%N+2%K`
z8QBYEm5AzP{Osj9VxZOx){gN$oMHMiSekUM0U|_0wM~Rlo-{HgU1APqZKvV{<vYp^
zU5|e@I);^zF|P|&fnF`DQ?o$)=)~89mSf5+ZR_Oxic@SCy38hK`hiPr|7w#`ogsNL
z|M&I=h<>|{mpS>QfqRzRoh@S<5SAv4lWC?3xrUPPCJv5Afw1zDsqEc-dageTb^q9R
zV88M{cQL7pqk;c;4Zc<#tZ*0(0<-oCuC}!V&x`N*CEaqHP*wx(R9H&51mWdb>Yx`a
z<_rb$q7D4d0Y-t8!tKvg)wB9Ye}Vvat|cupk5eV*mFZCo#+%xvI&jZ*jlqFmf>x7_
zR!?82c9OgxM+R`D>}Lh$)!S?!7@G^ox{){hK6qt1$Fo{BwW01ZbJMNG9Dz9fAAj)#
z7AJ?ETh@3t8eJP`==$W35e^|_t0E_rIxlk#*)$3$qSHMgk)LykVm~hIzRwew`o3aJ
zkQ?7a*{XT_GDz;M;IE?s_aqS_4%Ufg5uuky@z}W$(eF!fQd|e@J(g7_1WkK{k^xP*
zZQ}Ij2k+68F4nTQFsm{4MlefxlZUelTcB*68t59AACT`Ep9l$whc5JRSALwEy6m~g
z7)WR4UPcVqaq>L!21ZB>oXi6FMWXm7e~z7l@BEg%^4(9w)b8hlrn>`Vemty!siQ!P
z^JW!U=5@>d1}FKse^3KZ+Ig^g46I{@Q30Bf2HuFDvLSQynrDy4<_HzfQrvhj#LRGR
zC7PQ?Q+F3k3G~UcVN8<igY0}3vxAZ=^@ZHBuI=;2@Rq2sb&aVMp9I?BKs55x<B(PK
zqBxxPyiIPufNcjPs!Iy9*{(aIBHA_wT<H@IPASCKPp&6p>~<CO;=uOukTW8Pd%Ml8
zJ-lZsw`Ocm%VB4^p1xWZ@s-!8RQXIwv{XWmy!m`diD}WZJ^B4H%Q>@$%Ey9j9bT=%
z3S8b1^24fjdx1@s8PR-)aUlY7cz;CZF0(To8K0Z>Ey{bMf9am5iUkjiuegT5w{T2m
zv<_*92*wCS%J%t|*`n*n(6HP%=d@5LP+-k88!YTaNAqHPfV}!@LNCOvCuev=F$J8_
z!Xc<1xI`UhHT)B%dnj?D_(Z;i<e4h9jV1O?r|D`67gu%1(=#+ss|v1P7IJKt5H3de
zFL1xT5isetkl?Dw-WhgbgDNWeES@PT0m?J|y+W*i^ULOLf>GhbdL?57&+xB@>gha&
zL}Nph`JxScNwTiM`w_XXEN<xjWRFqC(KfWv5J32AVi3yyXaxHem_s2c#V87D&z=p&
z#Pn*Il$tiEl3Z+R93?n|y5e5e!&b+zR%F^b*BbZROzXt&^AeM9-9fa{1ZDYXL2JG2
z%<eG47iUa$u9b`{oel3z8R_zS$W5ec^Q-v@->&d{5U9~Is%DwGwOt=zLxXW*3;lcw
zp6?Ld;Y77de(<G`&sHk4pE6%xz5dSdgW>QIpNI5n@RWyro@XhCA0pOzV4dG{T{sta
z<#B6$EHO;NwdxK>hdXby&qvyt|5yMZmn=kWQM0$7Rv3=T0qW5wwrj9VRA>^)_l~MB
zOOeRMn4lR-1#sA48{CE0UN2JOmK|1NALeWQO>IJ{^aW&Y<QQ6N%_Zx9ZBU7%EER2$
zQ*Fp7R&^7{`j^MSA6WU$&)$~C_{3_(83g@OTL!}y6Xb^FX%tzjH?*_paBcaXoe1-<
zuxbUM=RmpXTnUe}vmLFRWv$jC&LubwlsIsei<g>}50VTD!(^V^{$#fdhM}GwcbMLd
zpnYEU<V)5X>G+6F;wm4<iZCqQKXJX}Q<Q?oE%AALD2OAY;4k%Xu6}Fcln%YOtWyx4
zM<Xkg1=G3II_g%J`>4EDT2wf8Eo=EHmu5VdOe2%Xi#)|0PKwA)%tS!k7P80ZX;D0X
z={Jn^c)m(F9m2V*Nj(#&Zw_Q(f8E)Yy%n*`3?!tx&wJEjuDNRq$-(J&76z1txTvs}
z)s>QgxJenYMSj`%!Gzw7Oh|?avv^-$Va{U7aZt3UXn)aia6)mmbG&mvM=Ie*BJhrP
zqvM%x;rseS42z^bI^n59vPqS?vRJ<jpm$Ok>jaGH5_ohKzv93#8Ry|Zb?=A8;%i`#
zL|)w|&W;Zx5@(0@q^Lp86a_kE76we75b+x-oNtsJl44c6$=0Fk9laUwTV(~LTfpFy
z%PUzELl9<j1FBn}rx=^Y3RALC(`Y-08|WdoF$D+0(M6fj=VHClMati_{7X-u>Q;zE
zrsXuiw)cE$Hd?ZAykncVp9M^{?&DamXv91opvMgr0kHhGtj&s$=2vMmD|fG7qWs(j
zj-ZEENfG{#gf5X`KUt(H&3clM#+}62Lgtufgb1Al0Bj=m^|$4mA{)MIES#^V%Y@X_
z(m$nf&mbxN;GT#Jnr>{kH_@U}(V~>8NobVMN)q0Rb;Qr=AEg%6!tP*sAOd*`Z()?5
z;&v?9C3c{eu!G(nfp*yT+H};PjHOWTYu^qHKqp8kUJ}a~ODBAoT@0`6&Lw>We?r3C
zTdWg|FYel{Z;W~M9yB~Y*i<H%^f){$G|5U?GJa8~U6B^O#kNn*^LU*y(0copeHYz^
zRg|-6g&a;0cmK*UDct}%Q>}H8E5cLMeyA)rcrX(OC+(l5Gqa<`_I(5!e+kFdpdLsk
zt}Hgm4+)T(g<hzlNk?}dNs-(pal$qN`&#ceFz!du7nG6hI~@uvFA9-2%55W7{`Z3s
zXkJxy4SS>|_QIPhU+$bS${pqxa2*yJ*}s#MJyj_iCVNn+<nus{Tf_c>&KH$~Dtbdc
zT*ve5WFj*H^=IOvKPzAtVR$wO{Y(mT>CK$*;%}<MUmvWrVhiE)OI=|&v`X5!Yvu3)
z;#M_lpRL`OF3a;}f@QIDUSZLEZn77{>a(0z%_k2(sP%RovcJyR70aCzE(6mRb{*wr
zw>^VC;ElrxN1${B-gt3rrx9PNo7qzw-ffXmQfx~~|6zUa?oFjKE_w63_Y`th<SYjG
zUHOc~JRQjIBlnr4NQV!vBALKnrPu;yE0(O(e|0{iwq*W|8Ree?MhC?0B3)*cT>9<R
z@lF!C-GY-ql`fS4$LiQ;4oEpu7#~1!rSSujzfYxpz-h3(<UjGl>0h?Y7D|x`HQq!{
zQ>qdaYfkY;z%Hq9;+fDcVf<HJfY2~fpLizR(+9Lqe}?i&mT*z$(f_&bZ3F;T%GHBD
z{6B;L;t4Cg{PFr}rTiM`gq7mWO!!YPwV4B8(LCWtk*8T{<caIwM!xgc=^;FjJOGRK
zc)csR|F3SR2`C`|D+M{2!A~#Mc9M|vfAjFdzYO>#{drp8VdS*Lr-ai>`5OSnir%CW
hjnm(>5i&(N`_Uy}_ME}8&B@TJyIKaCWg6CD{{=3^2Z#Uw

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/micronaut-vs-code-commands.png b/docs/tools/vscode/micronaut/images/micronaut-vs-code-commands.png
index 85d3f35e2fa6acbc0d5fc48ad2864b8faab03481..c7f8f9b26f7863d0b3f295dbfa9eb13c0985d2da 100644
GIT binary patch
literal 33287
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%0D7NjCJDn(+etLv}eVst2G$a
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
K1xxwAdjB6p&h-KS

literal 52307
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

diff --git a/docs/tools/vscode/micronaut/images/micronaut.png b/docs/tools/vscode/micronaut/images/micronaut.png
new file mode 100644
index 0000000000000000000000000000000000000000..eee5204515504360a0f15f6a48652b846f787aff
GIT binary patch
literal 3335
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
JY(;n`{tp}VR@eXl

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/pick_docker_repository.png b/docs/tools/vscode/micronaut/images/pick_docker_repository.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4365343dc46f6c619551e750ce90a9bc83f0396
GIT binary patch
literal 12010
zcmbVyWmuF^*DfhT$<Pf$Hv@<uFmx+OH-bplP$D7C2uO#BNTbr--6aw#DLF_fog#f6
z-dDlvJKuGF9IhF7*w600*1hhv)_$q}P!S)83I_!R1z%Z7P7?(MO&fUj2i*dGb2u0u
zqM)Ek*~-eQE6d74)LosdY#l67P}t+lA3r8i;%4tNGkg5FZ;*=v$JIkKEG$y<v44MC
zciV7VFQhy3?HglbBn23WuHAw1PNTin9xoDdQo-BD{Zp^C|B0&vjpHx%l%oq|1k;-}
z4HUimb}j<37wBEeA2H=w@bDtBrD|Nglu^TG(JUfJP-!tOhEd8#7&h)go)IB@QHofZ
z`zZTb&@6D7t(kLBzNrN`q%kw^K4lgfH31_*`~n|G?+QYY+FzxW?c}k;o()0sxcgOx
z*)^OoLevX_tW7G?ql4lC;~3D<*_#*&=IJm)nchVT%5Z-P4{S$rtCvwSye|CIRwni`
zP`ZzVAt!FQ4dN3QXy&gh{X~Ot1~qbCKYS!I3gXaCD^&{reR;{mr&52!$9E=raCuou
zetCJB*45UAS7kn|g<|LM_*<JT7z@}^T}ypsD^*n#PT(1Yf*NXzf&o0C0$(cNi-Lk4
zAA)jKj|lk6WupCki>954{`VQh|Ei+2maMWe@K?*+)zT8~X5;j9y2>3m8q{%HZT+YE
zsw$%9PL8~07EVtrc|9GSubQC1JVk*=N6V*X5Kl)3xSOb_IOBh6hyu@7#ZX4bf2usS
z7iZL0RfotrxmrSmc=>qw7$tBZ5D3iG!b((APT@~;;6HIjo2O5mMWIj+4-a0CJG@S=
z)=+*C5fLb#08~JL2dKg0<^_Lh=E(zhWBP9=fBTWMbTfCgb$)8=1czMpYxcy+{i!%3
z<JCadKmVPlrKj!9NN~45%K{b%y?O)X=jDT5_YE|KU6qQe+j?3$7|7W=0^0+OA;B*o
z4Es<0|Le`oi2t<IziD|_MCjj^|GfF1Ep^;1U1gmdfgztt+?>px#{a(j(+~!|TKPXa
z@!xI!Pbsj^5;!pE^_fZFNPa5AMnU0XP?nR{_C(!G!}1|n9`8~6(Oio`L<9*82q1wr
z%QXam$S`;(f-?QQKZGIW!$~l4(Qtw?!?feF*_)LU=OPZ~(7&cg?G3thh&_x~t-ubn
zSP+r)@K{N!9rPz#{pL0#w#)gb;c4AW^^WuN5t7{m45fg-pEgWXC=}W#sFS0Tyh#g>
zMZv!QbY)0|{}wjGC4!({f7noQIN9*w3D?!6&_L?yEGSed*Ue%B5>PM`6K>TiUk?I7
z#bD1PLWxrSXI$lgpnm1xX=W+3Kc83>G>-GLGYJ(bF(HOP3wenD#hGTQ$)n?m)(aNf
zk(@+gwuj7x$H^Z@^E70)X6l)ecpnMKYnDI3#0If5D@N0le=>FybeL49610KXj~BVP
z|IXq-f0vmF;V`Z%TN>VGBIh-ZO%ZltojMkGpz-zf{UGxKryqA<V7))_lV*j5ve$ZX
zt;PAtVSkxg#vBn96{qzOq9?_AZ8ZObQSIf&a`WEhv*Z0K37rCM%}OiP_DW9`%G-jD
zCy@xm=%`D%X^}p^*WO1khjw0>akIA$uW3u<6Wf`(IPGFXc_GKCqEjCxR5jMv{sgw+
z`UDhE(=S8nW*5YZ7a!;SFL^BcUui7tezVS4zic8-&>Tt?`QWzdVc8Ytw6wF(xw}Or
z{FanUw{JARx5^P1924!y#Tll{ujR!>9#0nX^)K%li;QYbR)*42^0d&HC`zouNjR43
zSJM-yh2fx*)o+#7+g?RWJ^Ura1sd-fMoS(Uc^~}vSz(vRsq<d*LpbMX8fnR+MyteG
zvQ_kyN~=N6Z<VXgx^B-KEkBXP^P4M(I3ojU0%M<_Zq_mb!c^gV`mB)#>r)~Z8=G4C
zsQ1b|+X}jdZsRka^;1dJ*HBYl|FiOb(b6r>x@VhH9}bTd(9-V%N3K;$vs#P+QP|<~
z*_^5tFzb-x3C{HX`QfrJ0xFcW-9nv~_uhHGFP0&=WvkkJfEGI7J6>dPG&PIvlp+57
z*~jENX2Pp=tkevmxyt>oIF@&N>63Je4euxMZYyuk`4T;1?!BAzUgGvp@}1rb6sxe|
zhiP-}B4cBP#J%rcu9w-3anin1&yv|261&tXC6S9CK~{J8kaO#2X8b;?_uPGw%)h92
zXmPl8o;6x*q=-3I@3vYM!>XE22FSfU{5c~a|7uNksg<gk-iLPH!FQkFU;#(V+}_?E
z4>dI@4mItYo0~gXr)d2QNF+z2$MzR$G(XGEXj(B=*$^L&TBrHf+y)i;X7QH^O<qh>
zOiKsLNv6u_Ft4S<iD_G3A38}t<7U<$jgJ~@#-W!RuIuAG-|AcvRNe|IuXi7Wq~O8$
z--ITM^{h`-N8r)HCUGul$8xrt_M_(zA$XM8r=a4eYop3%XFg-WmFB(CO4+;J<fc_k
z=$41ZP?M&-bU{xXWOsn@Mq6Mo5rw{-ki%r=H2dlPu;g-iFP#=a@5-Q&#Y~;cuPXDk
zZJ<=Ee7}oWEf49n-OL+A%>l0{dDAh1VFg+?qh=V^c&G4f)s}$55`95qfb?(yKVP@F
zV3{z5d|iLVSlD6G=0!lpXF8YSTliE(6T<!A*B-g?A?Zk8X&aZrwJ`zTli|I7E~wE$
zCF9rT=N^s9!|CFq4}`1+2)>q@nnuj>t~ctc4BLKsUF^F19n(H~?BFfK2Fw{r-hWp}
z$f~8Jq!XB6?!@hh^9bmz0uN$0w+S#>F9ELJ6E2DQ>F?bU>mnt_$Dy~Q{Fwk9cm=4h
z!R0N9C_!4ETC?>Dr_Vd59WQV#hf+aM)+Wo}N3X;@;EnhQ?e1{WO<#CyKrYc^&4yeP
zks%{&i%+jrZ_|pBMD=vNBrc}@4B_dG63{C#c3m5_ZAPVmc`8lS`YYm)uxAPn{T#_%
z|K)#qS~DIRCS|kTOYi@RLo27C&HH#cX$jdLEZ{gLSbXRCF9%9Vzo5BEG557Rw3Sf$
z9y>o`*X*_NVrs{SIVc@?j06m^rL7lJB!yCeimW;X{(igG18>@KDlN*^+hjw0XFg99
z8?k-3pBQhQZkydpEtprDMGrz7!1OhPmp%RYb<Nmqxt}9}?eaZ?f>sFi`q6w$dDkqQ
z!?Y!}LMmnQgj&L<4yU2{`H?}kBSt}QzhGB?t~A}Cnxtx6mTai)`FOF>dajt$^P{aX
zXLuZ=e3iGu#Bi$K&#xb}Cx_C-d;7clOBqGh^k3kT$FB^UmdSk;p%nM7lFIC`*B|M}
zHLSEMUN-w^f&E#^@im(o{M<weDUA$(c5%pI%AGC7B<Z?@oXba$t-t9b2&%thsyAV_
z&>>&pI4y)f9k~C!yVc&mWDZFxP^ywFU`x70{3Kli9}W7SV-0q{4bCYWOc7r9Qrsjz
zMWUF68|SxPoILP5b<DY-z{bXot8tt*l)QCjG1uhvObf&rw&8QU_swz!f~v+WMUcp5
za(Cz(YXEhynAhFk^i5h#NdGm^i;bCjty4~8&j@eBGIRnmJmGgm29^3Ip%H7vGW1~c
zvUiFxw$Vy2iMm---wN(+*3Pe~QodXUi;!}jeInx7uZEA-X3Iy|5uSujc1HC+>V%%D
zNgQi;W5VrFQBg&=P5qJ?61nuq5bA*b7tE?A3&@-J9_nxr-fP>UGoeZVUrw5{RMDVe
zVRzTLbmD4O+v$)dlpogmU!pd*o76d*l;KB2*#atF{V<wF1Q19b{uOlF4-|7H#`TOg
z1QCwhBWKf2t;8UHiY9-{ei;1rw+vuB4YPYTpCRJ(p2=tD=k8f;0jL@5)*#datwLSL
zL!shFjYGGOWr`L=k*WQ!dAPXrO0-=t12GA)8L-@}TlgPg8EZ|ZixaM9i)qY3l#u*)
zLbjDdZxcS5dL<$mL53ebaYQC*9GmeYdO_@EmwWEQyj-!N+S(hiL2pb(89|C8B1SDu
z)H2B}7y}jskb>Mt{6oS-sKCycw$u?<GlWDYn|AClOaE>|x&%lgU$JY*fb9a+JEE|A
zcYgNcka8AvJGC6=_);7$HXK9RsXlJ*5FKnz55uV^ZpnlXwWy`TEMKfMA_zP9_?VAH
z2PY<m=k7k~=PeT&SmRz=$h@qw9r>{^c_QYF%&f$nZUhsLh`6ofl@)5`)~pOaP9%p}
zf?c+#R)WE{#uLK_060rj+P)woC_KVv9JigDJI0V1^zxOJ9lqZlL^uF>9h-o~rBm=e
zakWxR^AV!-u}#dxSmDG|dMBi<Z{<w7lgdQ<7T;_9$l20)#b@}d$CEFjqkj82wc{^L
z)Zum9p0NG-6{O*`X1;)CvXkk)G1<PS-E6ho<v!LqQEECd97)O4WS4_4soXXKkSeb!
z(nTL8!nV?*02Kd2RuOq(UFP-_vyKNt3f4oZUsC1=lJ8(LB<9`X$1EM4FeR9X#e}1P
zMnncdd`l+n-uhf+1Dej(;(F8ivxsLSIjXg~W#U{QUk0a-Gi7{EmGL+X602Ses1(A*
zVJX%6Sp%sxp}0@5v$ztRmT9Qx0)HDioF}*7h1R{vz5sJ6;=3tE<99gd-}_v@|2(Hq
zU($XwuY}<Nf@PKxH|_X@tjw*dsoD2casta5k`PU!)G?aon<JFY)ju{Av0F}IwlyPS
zLk4y8XxUv8yl)9&_kdOB82Gf-{)Tr_(<CkQf?9~LFu6d<BDAlkK%e5opvIwog@Car
z+P}5W9ziLcF9xtD0_HXvPJ$+z)ICXzvNI}1^p7(;qf(I&ES%xxz&dA3FcU~@6fhps
zZHs}w&QJY|##}~vRZ*eLcz}ujyw&5$tR8Lp9YmSkdYg92$c)xhnjP~T5-7?WTqeUP
zu=m<|M8fx^3a8ooaLqO^&uWk=NIhbNj|~K)r>8$WfDjB6MRypZp`G2W3QExdbg)=%
z1IpdLqlQ*iSz1@KxJK|D<5(U^POcS}t0s9acUJ67B}dpKqd?N|R&gk`{;3(NYpjX?
zxjR=@OL9o?YaS!ARs9^vrFF=RL5Z=!p<DwF8-p6oJpE|5mmqvbpEzgGEpA7=9e0sQ
z(4GwU4gbt>WQ3}*uhdgyL$LhG!O!mnTjRTcgfWaG%iR-WmTADpT05EFv9R&ndeI1%
z@V?Kp!u&lQ&|q2jZpns$SJqB`pti&Xgo49P*+N58LAl2^L{j>zz4UDBI6^ZdX1}YW
zX<mO!V4I(fVIN6rbVA4S%lfpVN<D+&_j>_LJRIRRqhFqlYr-_6K9Z|e+Uu<K;t2G8
zus1iDcTuszIYr2EY1V`3b@8HA5W?NVVX05!YpxpogR`nK*SKGwwp%aZ%X5eyGiBd*
z_LjNg8Un+lJNPjmL&PFR#B2&h?5To36;<E%%w+hT*owE<d|~trd#7{vZ9S(f3o&na
zvE-;x`I8S2#L>m+qr0YTLOFM=hctIzEIClX^A>xeCLHygl!AJ2Z>@mv8C~WEcxuX3
z{CDuGo#stETvS_5?D9k`j?m2lF>GP0*b^k@PO}X<JG6WuiH@EqEOgP7V*@@aUZcJd
zIdtKUEiR8jbqaMqX{m`@zR1eZb8*sradC%LCW1dX0@rB}d;Z;TA14MF!$JAfu+E$D
zRAIW@0G$s#(RAVk%0Ka`B|fApzgkRwV(NRCn4ew9tg%uOIsxy)CsMM)Xe!XoUt2RZ
z7D!>ul|^$Q4$!-`5G)&dyL;{2`4?gaj2Ih$+PUG;p`K-jyb%z_b;HZpvCE{%?xjH7
zZX(og_JH0ZFnG33h_^!CRM-+55tNdBC!>Ef!hS0!y)mQw5Gw}LWXP+li)69AGe{@$
zrThNVyJQ_H;8&Z|9-nucnl$U&Rgw6DbV_X0`#*vRB!0j{_0oD5D>v<0wrYeIO!ej!
zJx-l<hG(}OTm8-tpx}Gt9`{Z=k1*)Ig!$zA>+U9t{yxH9AaN(W1xo_g=-1!B@@lT^
zs;T&pI1wr+c2Z91eZPkX<o-^$U7c<BI5~`41K+Hui!ZEVvZsfl96P>lg>GJ?XPh49
z$$IqZfSOo~1{f;jFk0`szJs|LB5Zet`cvYYwXwon9D5iiLjl;ibfT~N`&*}_skkGE
z!d7VgX>)hM7d;a%1KHUUGU3OEoN}b;>D&FrzPW^=ityLFtc`ZP0z^9`XlF)#>8>B{
zsR1r*EeL59lj!Yo?kMLW3TSWPAv;2{2urI+l5#ffLOlPr>)BA+>4WYjE+{ubxTB~q
z&TXQsfNVjo>RntwF7e~O;gM3vs@k=~x`a{J5B&&5WxMuakv{=P7j};0dU5U7DnASe
z;{2bLH2En%k3bpz>1!0@N7nr{uD0E4uNjsOSj=8ine-c9Ta!35^Z%=oR8{M8ZSC^Y
z7)g$s?ohC2)X)NnQ{>kq-ez`uDTtU0(|##-J#pZH5JPvAiVz=D*6&Mf*|j$xfbm@s
zSd(9qe#+k{LI6fKVP<A{2m<q_Iam^nM0<C!d+MJefCT6WGIQSq6as%=wWEiQvtGv-
z0&OsiC4?9Zc?vU)>s{knRjB~KEc?n$27t+ZdenETesyWG+`IyCz_gb3Dz)=9zb`H_
zxvdVld(9Y7kdQFvYs#za0$?+K;WSgXP~@sM?Y=e|S7|-mpQD<xm7kFp)t;{u$M|e_
zbGmjJVDzrb{iKcD972F%GJ5T=B>o&ZE-HVI9OnP;S<soF!Ep-!Ho}e>77UR2@T8=q
zR1r4?ry;QZmLb5#m`z)J;5z<$AKBb#4l)?!ab{cm&Km&c%A(QrvT@(pz9Rbmw+hRI
zw|DLP)5JWOVX&DM0F@+?CH-68tpv|^`8=k)V?`2%ocB9by*ODf#gZh9R{A4m1ca!y
zn51%pCx`2Ym@ZlkPi^zH^W$G}8)()zd}Gwgeb@}u2gtg0j6tRpYQAY}OVdsVu7KZ}
zXW#^<2sMJf3#Z9ptUxCLiF|D74www)<X`=XT$?WZY+;<9BR1EEbEMGbD7{Q`>pPBF
z#oqF#h|<#1aKy@B%BMIcMGK&VHC4OMnSoL$(mvAK18?tgz173+1s2456`27J2DizS
zpRz~pvh{2)!dn-7d#1&=QMVK@7FVS1wBF~q0&sifuJEz9!fLR95igzJ(;D!p-kUHU
ztX2W<`YMMd3eCDPamm6eXN!$$pK=oqIef`}VO-}dEt>>p?hGaHct+|-y?O|^RC$>)
zb;LoOB^QL@2rM4Al>yhysk;U(KJ^>(t){06MmvM);*H+zx9KH{RuTKbtKjtJwl*ot
z81UxCx5}#^4(A$pPu5g5MQE%g-D`ysU-4?&4KMR^)8m1+_L6mQz_yI;;*#?goj>7r
z*q$tx4JYMd1wbR=QR6dPQ(&6f<ABW>5&9x^tr>KhXxI<$1B|!Y+eF1g9oTH0&jDKR
z6r!|kcpf!qI~`C8Sd=*-Lzp^3z-C}P$;&ghq9^@T?Q9*9!cKGA{K3AS{Z}-6y2dd9
z5QsdR&fj2Ku*0zAWz+iyNe|^QVS<1!q4`b$U$7eA-PC7Sp41PR;pj6^=mHG`yO7gd
zk-1b=yK~9K#RVrbgWL>%7<h7bv3GWjKIlhVAiDQMAY>Nb;J!Y!ia|iTax1IqNjDA<
zt%`-v<LOq}X!tTz*))ZK_4%CJW`@(m*uYVIAVy<0ePEqB7_zZLDZ*;v`gIC?k)h;r
zG||%PvPJE(ws_NEf6p&}0((deMr2JW&UcI;wDdGU0lq0u^gLKX+#<kg66tY6b;9kB
z%z}a_JUv(+rsko2q;Xp%X1winzYK8J3zZBSpA~P(YFFD&Je0o$lcqrLK%--!=tA5X
zz?8;{A#O4Sv-5d|An(fh5%$PXgJ>c#hw(N5kD4lcG>u{oqK-@pik0?9qDcSP+@!U>
z%*x7oBJ*^oe<2mp|1eGTL&r*PhF=9arWBa*8-0k&<2r?%uc~kOq>s{^-Vm>#1(V}+
zfNpJ5!Xkm7&A9JUVSBKR{yVVGU`GHTjrWz5!iKPXJDBPLQt0?e_)kF8^A)I$Cl3Wv
zM7Yj{sS3j^AeGb2T<9}c^bYoV4xX@s+lT@s#w`;t=Z;YK1YZcYzce^`hwda084T`A
z6RU-rmnf(#+|!*F8D!3pZKL><z!n2%#IV6zT}oXaE7TjzqL3_KBb=l1i~<WGKtc5*
ztqEL1*o>?|?BQ8<V*=aC?HGEP($1)KnVGyPprn{{#oZC)ielS&2|^QtA5kYJMNA#2
z`CmAKpq{7TlTNRoIKtF>51IZ8wt<Q-0;Yp-gxwQf(NWVZ@kw_fS7LU^@Jte};H@El
zIQfp^en4zdR4SbZemWxvD~yx^5j7GVB!H+!dIhq#tI}oT?gzD}1S1^6L@2r@(#4-I
zy<|&Qj|-z=sCp4aCoUQv_O-*aiGe$$<+g#BQJ(>)R!(F{|IAPNth>3=0gMDV`#mBI
zk#;ineFU9{fi}SlaU^-@F<Qlj)$h$ZLj>$b*{wZ(39YpcxOdjAG-R1l^dO|7>?nwv
zkoD+_p2P8{GJ$!kZN7hwLkSNJdnha1);WyBQzVu>nvWhq;_4TRZh<F*!f*%iGu9&*
zWB&~v8pwnh(FnO6%Z0FhERE5=!;U5?DcPL=4h|51K}GCi#k^2Oa>&6gmjDcJ#L<ol
zk2%;1R4k1L`9kfRN!!&iq9$1^BD=%heDL)_+)#U!$13sp!V5(;DZGXe$sx))sR1l5
zYC=|b_lNg9mSQOhF-k`ZOIr$N2>0ari14zhFu-_oEMa$zg+ZSIEG`5GLwf4KwhBH9
zo9L(DsJb4|5yM2J!XE<=!-!fduI<v^j{l8f&ms2t$a`gC9+@|N$xV)H9gCO?C|QV<
z`rVl~eml1DMdkR={-HFnyKz*fd`lY;W1VJicT!p~iW0Z5FMxKcn53>Xk12YY&FtG}
zg$GLA*T);aIt{$xKk?yVu9XdFN74$U3*NbGRDI`LCmLO5RH$1lND}(q31)mJ=i&<k
z2Av!S22mGn{BTs6G?8S}!+UIzn5g!9tq|w4VuV+iK85ESb3^AN{B&lJAgmuXh_H}*
z(7m%?k^)hx?9e*RJ%zRM@>qIDnt9|JF_@906ch(BL=~V7N0CPbyxvS2`jDy+>djyr
zbcRuD7*s<I#Y~a;VdLJoT=Dvhq8R8F@k2Md2a%3?=bfEZ9@{3Q&O@I~Mt47x?RT7I
zQ^Cw0Zx5V?8)BX2p}YMG^x<xrsfXuH<fu{~Qpm7>{X4E1TUquv2s?F>`>QSM+fYu;
zQh>2OrhDJboWmDdhmcp<SFve)a}r@lr+3M!#%U+E(K|l=2=xbvrWIb;Lk|R7lhID5
z^s8j+r^yn(mH(a<QQ#?O9vw^UORo};!CU5&t_|VxQyG0y2EC<n5xq;6U-vd*{*b14
zF;tua3(prjD%@&(%*~7P*IJn-m0h~`d^B+H?3xVHi34ORX727P<#p<XSpaA+cdLKv
z&x!&tfJ(e>d1W-Qe?{lYxFhKTZHBX4ODXN+u8AZHHU%2qF(uI%^9}35AOg50<et!<
zSzNu41>*IwNVc1d5OXZR-_Y92DQ}7>fO&;rNM27=2@-gf>j6a%UQbJ@4V;-Nz<j+)
zz^t&DrKA(3oE`p|Xb8Y|8QQOC`d?)R2s`FjnVIYdhi?_wG(F8$1W)jetU3&@DGM`F
z0;r;M#lSqajJJ+b1KtumiNsKe_$SW<(Y+#X`p*}nZ+iAbV86fLSD*VZ%@A<(IRI-J
z50Ex&eEh^1i4&!vRP3=W85z6#fU#%M%2Bxr!5dWB#GUPQ>Why9IPdlAn>CB$6c7;w
z;)_5AqYI%D?0B<UhyhqBHnafXcbqw_swWx>(KIZ{cdX-3(Qp00Cgm~Io~m&yWVHXB
z*<RtYsBp#Dw1F&Fh2<w!9>c0w@#nw#tuuT}GNP#N#>2c^*>EXRF>bb-86njqu5Dss
z@_luc4WKCT29;Jn->eR2BpuCf7cdqAxfa*eA=+bP@D>pr9k2aFNg`nH3)&i-7lM}S
z?O1*=J^!^K;J&8Kp^=>n`=zgJ(B$bNvob7nv#GI57~gsF_EwKHq^qol>7MV2d2Eet
z0`zhBkOu+~2u*%V&VdX`Q{j;h57>a|sxM$_V76n*PW~%)>GvUX_gA`JCU7Fo&T*$!
z0TyRAJ6G$Jk$TUi0|(WrCdLe1=F{}F5tWbwJ3wmo28HL93Ux1E*Un!!z4xAB_$vih
zF<Y<`fsVfZn^Xy3g|~vXjG?z_<3A;pDuv$OyxZ=xJ=YvB;p=@xil46klB5)SRs`hR
zbk-R;#DSDrKPWoC$!q_9Z!|3|j&fDyukR*>76<BjpgtS*SviJI{JsBW%<`<q{MgV{
z3at3#RK2zqKFcY2E+`LBTsxL@|D3rZAmaRKrrwRkyeCrE)%&j3{-AKx*48YcS?A6U
z-)wIRWhXE4);}lZhGr5NC{6fM1^W#<oo|35JK)W9Tdo7YKLSam4Py>1YzFBiweHcO
z(Zzps%o8o}Igxg{b5JVNO=mMsXuA*Zx6Ttkxx6_jr0tcnxf$-#a$WW@8c@)RM&?xT
z-?jm{fP=MH#np2h|5yE)#Q>fCxE1d#bKNdo0Z{dk5{lIae>W(0<0`M)_@D#(8a6zs
zu99DkPg0?OJC~|p0`z!;7n@D)Z@d3>QUTNcH1*QKCqb>VSdGs%8;Tw^>hc=b#oDj|
zNj6~-?}M;NYGH{lCl-p=Gh*I>Tv02-T6pn3HZE=g35RAMS7{SB5GW-FWdUx_{Jt?R
z*#R-M^!Zi@?M?Ez4V?{K8asb>jJq^{3Fj#`x>O9gP0O0EmHYbQ{PY2k<)-`HB?9@o
z0u*d!ay0n!yj0>Ax7Fw(<NB{S$7xAhvyBe`!)ZBH^^>#g4@9hW<NN~<D=jT8Uq5_$
z9)HLBVPLL3AcT9nz30n-BQ~`4K`QVJ2z!}+YxU0<yD-Pb&gbAUs?lC}2Dq8YK!giW
zx$+uHA%{FfNP2Y-H@ofE_vLHV;iKdpHz0!aBMwUn<y^CPwlT>8I0vtg$nV~H|G^Z9
z=f8-;?^)>#1M;x~KEFX%xl0bis=TK^K1*oUf*<X8zX(Y$m%vhb{5Z49aauQ;UXnNX
z7Jh|<TAzJsbzDFIienOk>@92@oL4LlUiSl3n(45c_8*)CV-PK6xjx(g{K0r2JH~bS
z@xj^InZ?S0fq?xucd_fmnU~k)c?oBQ>r!8q@+Q6Cq|ud2*L$=*PtRc-CYs?RASJHX
z?CqQ94rI38WtjS(AI=V&ai+@1$Xw;Z3~K;@0X&^Z_<qz)D1lBe@Hv?_0BnhXfBxX&
zOoFoj0*~AT@-xE0!NDv>H4Xr@!6P_mChJ_@<ric~NJyM`E%gyL!r0lBPTjpTAalTk
z?I%S1C3bbGr_x-5Z~C5Lc2)~2@H;<wD_jjEn?zi`zsF%+5-2upH3@|R*982wrfbzI
ztcP<tK-oWm(12m|4xLOu--jTxF^HTlkg>KLPH(R8Id(mivHTd{ZK(6RV0?l4A88Us
z+wITlPZ5rJ#rwz*xH-TBxQlT~CMPj8V$Y0$?0l~BO0HT)9INVErQ^NjjWc%UR9Qa2
zm>9$k%r&24X}(t?yn?bsro(bUr;DIL3<jwpIt0=iKpR0s-P4}}q>uWl_kR5vFYk?^
zw~pGcnvJHuQJUCS7)@yC!5y>7ZNTJ5J1y22J?xIQW_2Y-z@+!tdl!iz@j$fW!x(^b
ztmh}b7OSGbrGf#&<q3H}Vsm@TPf8VI=v;q(WjS6+A$0w{LufxX-#fm0AmA{`XAg^e
zwrP?C#8B=79wD<%0VtG8=H(A^hORH~6aizIV%Zl9tyXKf28`IYU{+*JX83T|j+}eZ
zS|`(OV@erMecCWRAH0v-o}$l3d%3%E3C3Bj!9K8y)!7t7=ZRYU`AsiUuB_lvnt~-C
z#?*gzniQZv?-_?(uBitd6@Y65gCCY&Uc&+N|5hnq(}-aF{Z0P>2Be~hYhzpYzP{PX
zOaNPd%U_cbNZ@mTvbe{fd`rC%CZGoG|GNg`#gsGb9tl29e1T3um>v$);JBB5Z#ARQ
zxQ6#p!7J?&Z4LNL9f$oyaRTi)y`Ye8i?PTR+C`-Zy=-l5edWEu@213S(!fqF1P|Zc
zM#=VzAU7#H6+4<RtuX7nRqt}NjYdXr`?c^?bwYHS*tCDux2-b?xOS<os-d92bi?5f
z4uBi9#xRxJ|5fY2rT+wamX}#FZvTLK?Jvbm*E+3xX_p%6TvTAF<{mZVNy(T2mq#pi
z+5+QwjC9Wzdu_-yD?=RSD&$)zU~<!U{TIBj8{L4*5eW=;KUf{EJ<G_~{17ix+6087
z)RIj7Q}Pefobu>tj8)LkBW(EBLR-fb6nySz>J}R?0ryZQ%K2l&#wiHCc64^qFFDgh
z{M}JVGT7Nj-QD3bIy|4>ytn`ReA17Dg?u~fm&r$So6H$Lzv^F`Q9rSp+##&6+BD<|
zmMYL_eyd%eE-fEJCOWsJKUbhPT{997Sm}>g+pW-HA;&dM^{n_xzbqNlJ(JvrU&r5K
zVd!Xnt62Vo38nh0wQcVdfzX!@Z~^FBi+LzdPJmr^e`3(iqvYNP(@S92=_boUo*ZXn
z<8~{#|78#n2?<5+4{UsKu6=UeSLDTI=@}UrG$O8DThn7bf#_J43*WoHzIQSIn8=m%
z2vepMNIl1Q?8O35rgm~j57~iy0B9$sQG1ZznkugN^Kqi!4D6m4q<tBtqV5|I5x1pS
zqgwb!y9e)m#ZI1!3oS(iy6%l~>_YX`0S$#(%g9<Dyy2(%g{bp6Tu#!aXxW)@(`+?)
z^z-yfuj|fd2K=}huVqWhd!A(u^DVNc->)^Mty8wG`2ABSCnsgw7oT-YU+&x!QS%>L
z8w)Bk2}qoNHQ%dPJ5g-9T9iF4?(NGi8A(lF46{Q$;nb@s3eNzt-wNUzuJg50s64Ge
zIMx@&&Ziy{^IHK^BeQxo(@$J{yb?gK&qN-Qs%duE&HV8!ZdN}h8f)off0yaSY;iWU
z)J*YK!yfiU1?dNW7><<=iXct!+9&VRUpKC>{=|9-|0eML&0&{URj6vRkZQ?%T~-HP
z2d<2LDa#sr4hg~hAKQq`VnV(S#i65|Twn@)hkDOvA{c{UbTGw#efM2&v|=H-5o*_z
zUNDwzqRQ*G_KPM=Ty5=oyU@jA!y5H%t+Hjp;8-yWuOOs`fRM!x^}r(>>|HhebWY}x
z;bbwjGaujL;rfQChO3)mLusNoFkP_HRe-bI)X&l@W2i4M80&o#%T|GIG2<N|R@*4y
zypwqbGY^52b87ePN$89_u2RFy&?U~bUr;p}_AQ^BMTG6UjV}sa%UY*&8;^9g{SjPz
zI+HQb^|$j9*jR%r5^K7CU(M(<35T%~W;C7iB0ieMdd;RGF&d`1%A0!}<FChxz|<Qd
z%h(-uvc#|NL;-<RE1@x?SE4$0yX7#)oq)~R+Ifjzt0iGN;oae6iNM_jJFldn?Wtak
z%avJD1Ut-QE7f=7;OEG%XQTL$t+xAQ97ZcH$)b)8XXhS>$w<SP(`)ccR|Dqwq8H_{
zrD-u+#w*MSGI`N;(Q149_}@S8SXa@^y`dT}XnqkvrdTks+G+CEUeI=LNojc!yAoq8
zZ@Xn=&l#J%h>lzHeOcn^LClVekc{RDwNvvZx2rw%u^QOP&#z_t9i@<6iVQ01N&RIT
zDwh*yF1&Rl>)qk+kO%NXO05qx<93~2KRn3qa~RFb8mMV{V&!h3;;8@dnr0?r%=Bk<
z<e%@Ymjcm$p3C*G^2kByXw8WuQG1Xhz)*gD8-6RUh-3J1DNXe0XFe(!Tl!xcSubad
zY8@-ryQ_9PCtWyU7u!+7PYU9ZuCP;_mrGI9LRBzD%LAG@zx7M)1F0s*a=J~F^6~Rv
zcu;B?QFp|roh;LzBE24;FPrCeu1siJV++)F<UL_g{Ea<<rDDwNsV|J~s<0!vWb8&`
z;ji@r+86gu<5>hYS2Nt{ojm<W(lK9zdP~5)Y##3zMo~+)`%&bQ&H3UIM4WA~E=iwT
zVOQl03&wFKa@pU5)|?EPmpgXuW3JEEW*k&ES<=oOmu|@(9Gus+!WS1ZGYHOPri^;M
zkJj=ncZPiL*u8=qZSkC08|iz#X?8qOY_A-AyT-(NVsM^)4!z?ywl7`Lyc_uqzh3%!
zH+M0b!jrg{V?kSK1o3TVy=tjp)u>IdKHBg?lcKbl++bVoQbH3T>gXaOW5p#xM^{{^
zSK0s@lKE>@P>J|3h?w(K%>Az248REM`*VbVZ%Azb#uktO8f)G)zqUrGM46%C^Vjwt
rm8eb+?Ld8&OS*>bZ=vTB_L<}}JoPx!!PS$iOV7&k59LZ^9tZs&PIPCd

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/provide_image_name_version.png b/docs/tools/vscode/micronaut/images/provide_image_name_version.png
new file mode 100644
index 0000000000000000000000000000000000000000..47fc1d2b472667b3d43b7536ff1eddd876bc320f
GIT binary patch
literal 15522
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
bbdS`AVabyIlicRv$Eu3*YI5Z=CPDuXogjj}

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/select_namespace.png b/docs/tools/vscode/micronaut/images/select_namespace.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f3496b5f911e7a456e18be268e4a73c20ef7df1
GIT binary patch
literal 15092
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
WL%ob=j=y>RQCvj&dA^X2@Babc;#xug

literal 0
HcmV?d00001

diff --git a/docs/tools/vscode/micronaut/images/select_secret.png b/docs/tools/vscode/micronaut/images/select_secret.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e5279f2b50d856db4e0aa97a31155a9ad73b31a
GIT binary patch
literal 3986
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

literal 0
HcmV?d00001


From 5aa29f73a15236b5046ac3f1f7a8d02398b8811a Mon Sep 17 00:00:00 2001
From: Roland Schatz <roland.schatz@oracle.com>
Date: Tue, 19 Oct 2021 13:47:15 +0200
Subject: [PATCH 545/681] Switch sulong gate jobs to JDK17.

---
 sulong/ci.jsonnet | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/sulong/ci.jsonnet b/sulong/ci.jsonnet
index 525991f5a778..9a5bd504fae1 100644
--- a/sulong/ci.jsonnet
+++ b/sulong/ci.jsonnet
@@ -70,33 +70,33 @@ local sc = (import "ci_common/sulong-common.jsonnet");
   },
 
   builds: [ sc.defBuild(b) for b in [
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + common.eclipse + sc.gateTags("style") + { name: "gate-sulong-style-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + common.eclipse + common.jdt + sc.gateTags("fullbuild") + { name: "gate-sulong-fullbuild-jdk8-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + common.eclipse + sc.gateTags("style") + { name: "gate-sulong-style-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + common.eclipse + common.jdt + sc.gateTags("fullbuild") + { name: "gate-sulong-fullbuild-jdk17-linux-amd64" },
     sc.Description("Recreate generated sources (parsers, etc.) and check for modification") +
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + $.sulong_gate_generated_sources { name: "gate-sulong-generated-sources-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongMisc") + $.sulong_test_toolchain + { name: "gate-sulong-misc-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,parser") + { name: "gate-sulong-parser-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk8-linux-amd64", timelimit: "45:00" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk8-linux-amd64", timelimit: "45:00" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,gcc_fortran") + { name: "gate-sulong-gcc_fortran-jdk8-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + $.sulong_gate_generated_sources { name: "gate-sulong-generated-sources-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongMisc") + $.sulong_test_toolchain + { name: "gate-sulong-misc-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,parser") + { name: "gate-sulong-parser-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk17-linux-amd64", timelimit: "45:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk17-linux-amd64", timelimit: "45:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags("build,gcc_fortran") + { name: "gate-sulong-gcc_fortran-jdk17-linux-amd64" },
     # No more testing on llvm 3.8 [GR-21735]
-    # sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvm38 + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongBasic,nwcc,llvm") + { name: "gate-sulong-basic_v38"},
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvm4 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v40-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvm6 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v60-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvm8 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v80-jdk8-linux-amd64" },
+    # sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvm38 + sc.requireGMP + sc.requireGCC + sc.gateTags("build,sulongBasic,nwcc,llvm") + { name: "gate-sulong-basic_v38"},
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvm4 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v40-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvm6 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v60-jdk17-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvm8 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v80-jdk17-linux-amd64" },
 
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk8-linux-amd64" },
-    sc.gate + $.sulong + sc.jdk8 + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v40-jdk8-darwin-amd64", timelimit: "0:45:00" },
-    sc.gate + $.sulong + sc.jdk8 + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk8-darwin-amd64", timelimit: "0:45:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-v40-jdk17-darwin-amd64", timelimit: "0:45:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk17-darwin-amd64", timelimit: "0:45:00" },
 
+    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk8-linux-amd64" },
     sc.gate + $.sulong + sc.labsjdk_ce_11 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk11-linux-amd64" },
     sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk17-linux-amd64" },
 
     sc.Description("Run ruby downstream tests") +
-    sc.gate + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + $.sulong_ruby_downstream_test + { name: "gate-sulong-ruby-downstream-jdk8-linux-amd64" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + $.sulong_ruby_downstream_test + { name: "gate-sulong-ruby-downstream-jdk17-linux-amd64" },
 
-    sc.gate + $.sulong + sc.labsjdk_ce_11 + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk11-linux-aarch64", timelimit: "30:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-linux-aarch64", timelimit: "30:00" },
 
-    sc.weekly + $.sulong + sc.jdk8 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.sulong_weekly_notifications + $.sulong_coverage { name: "weekly-sulong-coverage-jdk8-linux-amd64" },
+    sc.weekly + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.sulong_weekly_notifications + $.sulong_coverage { name: "weekly-sulong-coverage-jdk17-linux-amd64" },
   ]],
 }

From 2b7050b7b7a795c00c16db9dda3fe530ff82c006 Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 19 Oct 2021 16:31:47 +0300
Subject: [PATCH 546/681] Fix link to musl.cc

---
 docs/reference-manual/native-image/StaticImages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference-manual/native-image/StaticImages.md b/docs/reference-manual/native-image/StaticImages.md
index c97ae1447308..cb3985df24d2 100644
--- a/docs/reference-manual/native-image/StaticImages.md
+++ b/docs/reference-manual/native-image/StaticImages.md
@@ -27,7 +27,7 @@ Note that it currently only works when linking against `glibc`.
 
 You should get the `musl` toolchain first, and then compile and install `zlib` into the toolchain.
 
-1. Download the `musl` toolchain from [musl.cc](musl.cc). [This one](http://musl.cc/x86_64-linux-musl-native.tgz) is recommended. Extract the toolchain to a directory of your choice. This directory will be referred as `$TOOLCHAIN_DIR`.
+1. Download the `musl` toolchain from [musl.cc](https://musl.cc/). [This one](http://musl.cc/x86_64-linux-musl-native.tgz) is recommended. Extract the toolchain to a directory of your choice. This directory will be referred as `$TOOLCHAIN_DIR`.
 2. Download the latest `zlib` library sources from [here](https://zlib.net/) and extract them. This guide uses `zlib-1.2.11`.
 3. Set the following environment variable:
     ```bash

From f531d909abdb6bad6ca6d55cdaadb284ea550eaf Mon Sep 17 00:00:00 2001
From: Olga Gupalo <olga.gupalo@oracle.com>
Date: Tue, 19 Oct 2021 19:07:52 +0300
Subject: [PATCH 547/681] Fix the formatting and cross linking in the Micronaut
 extension documentation

---
 docs/tools/vscode/graalvm/README.md           |   2 +-
 .../vscode/graalvm/visualvm-integration.md    |   2 +-
 docs/tools/vscode/micronaut/README.md         | 181 +++++++++++++++++-
 docs/tools/vscode/micronaut/k8s-support.md    | 180 -----------------
 4 files changed, 178 insertions(+), 187 deletions(-)
 delete mode 100644 docs/tools/vscode/micronaut/k8s-support.md

diff --git a/docs/tools/vscode/graalvm/README.md b/docs/tools/vscode/graalvm/README.md
index 28dc70cc90e9..486e7545d575 100644
--- a/docs/tools/vscode/graalvm/README.md
+++ b/docs/tools/vscode/graalvm/README.md
@@ -228,7 +228,7 @@ The shaded code is not a part of the Native Image.
 
 ## Integration with VisualVM
 
-As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with VisualVM (https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
+As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with [VisualVM](https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
 This brings the visual Java tooling to VS Code.
 
 ![VisualVM and VS Code Integration](images/vscode_visualvm.png)
diff --git a/docs/tools/vscode/graalvm/visualvm-integration.md b/docs/tools/vscode/graalvm/visualvm-integration.md
index 501d645fc309..e94d3e8319c1 100644
--- a/docs/tools/vscode/graalvm/visualvm-integration.md
+++ b/docs/tools/vscode/graalvm/visualvm-integration.md
@@ -7,7 +7,7 @@ permalink: /tools/vscode/graalvm/visualvm-integration/
 
 ## VisualVM and VS Code Integration
 
-As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with VisualVM (https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
+As of GraalVM 21.2.0, the GraalVM Tools for Java extension introduced a new feature in this version - the integration with [VisualVM](https://visualvm.github.io), which is the all-in-one Java (and polyglot) monitoring and troubleshooting tool.
 This brings the visual Java tooling to VS Code.
 
 ![VisualVM and VS Code Integration](images/vscode_visualvm.png)
diff --git a/docs/tools/vscode/micronaut/README.md b/docs/tools/vscode/micronaut/README.md
index 883beb4b0e24..d527c8835051 100644
--- a/docs/tools/vscode/micronaut/README.md
+++ b/docs/tools/vscode/micronaut/README.md
@@ -22,9 +22,11 @@ In combination with the [GraalVM Tools for Java extension](https://marketplace.v
   - [Extension Settings](#extension-settings)
 - [Create Micronaut Project](#create-micronaut-project)
 - [Generate Native Images of Micronaut Projects](#generate-native-images-of-micronaut-projects)
-- [Deploy Micronaut Projects to Docker Registry](#deploy-micronaut-projects-to-docker-registry)
-- [Deploy Micronaut Applications to Oracle Container Engine for Kubernetes](#deploy-micronaut-applications-to-oracle-container-engine-for-kubernetes)
-- [Debug Micronaut Applications in Remote Kubernetes](#debug-micronaut-applications-in-remote-kubernetes)
+- [Deploy Micronaut Projects to a Docker Registry](#deploy-micronaut-projects-to-a-docker-registry)
+- [Deploy and Run Micronaut Applications in a Kubernetes Cluster](#deploy-and-run-micronaut-applications-in-a-kubernetes-cluster)
+- [Preparation to Access a Kubernetes Cluster in Oracle Container Registry](#preparation-to-access-a-kubernetes-cluster-in-oracle-container-registry)
+- [Deploy a Micronaut Application to OKE](#deploy-a-micronaut-application-to-oke)
+- [Debug Micronaut Applications in a Kubernetes Cluster](#debug-micronaut-applications-in-a-kubernetes-cluster)
 
 ## Installation and Setup
 
@@ -116,8 +118,177 @@ Use action **View** > **Command Palette** > **Micronaut: Deploy...** and select
 Besides that, you can also push a Micronaut application or a native executable to a Docker Registry from the VS Code Terminal window.
 A particular Docker Registry can be configured in the build, see the [Micronaut Deploying Application](https://micronaut-projects.github.io/micronaut-maven-plugin/latest/examples/deploy.html) documentation.
 
-<!-- Deploy Micronaut Applications to Oracle Container Engine for Kubernetes -->
-{% include_relative k8s-support.md %}
+## Deploy and Run Micronaut Applications in a Kubernetes Cluster
+
+GraalVM Tools for Micronaut Extension added support for working with Kubernetes clusters based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
+It is now possible to deploy, run and debug a Micronaut application in a Kubernetes cluster from VS Code.
+
+This guide is focused on and tested with Oracle Container Engine for Kubernetes (OKE)](https://www.oracle.com/uk/cloud-native/container-engine-kubernetes/) and Oracle Container Registry, but Kubernetes features should work in other environments.
+OKE is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to Oracle Cloud.
+
+This guide will walk you through the process of deploying a Micronaut application to OKE from VS Code and debugging it.
+
+### Prerequisites
+- [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools)
+- [Docker](https://docs.docker.com/engine/reference/run/)
+- [Oracle Cloud Account](https://www.oracle.com/uk/cloud/free/)
+- [Access to Oracle Container Engine for Kubernetes (OKE)](https://oracle.github.io/learning-library/oci-library/oci-hol/OKE/workshops/freetier/index.html?lab=intro)
+
+## Preparation to Access a Kubernetes Cluster in Oracle Container Registry
+
+### Visual Studio Code Kubernetes Tools
+
+GraalVM Tools for Micronaut Extension uses `kubectl` provided by Microsoft's [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
+It has to be installed.
+
+Open Extensions tab, search for "Kubernetes" and install the one from Microsoft.
+Once installed, you should see the Kubernetes icon in the left sidebar:
+![Kubernetes extension installed](images/kubernetes_icon.png)
+
+### Oracle Cloud Account
+
+If you have not got an active Oracle Cloud account, create one by following this [link](https://docs.oracle.com/en/cloud/get-started/subscriptions-cloud/csgsg/get-oracle-com-account.html).
+
+### Access to Oracle Container Engine for Kubernetes (OKE)
+
+Supposedly, you have signed in to your Oracle Cloud account.
+To be able to deploy Docker images to Oracle Container Registry, you need to setup the access to Oracle Container Engine for Kubernetes (OKE).
+
+**Step 1: Create a Kubernetes cluster in OCI**
+
+Using the Oracle Cloud Console, create a Kubernetes cluster with default settings using the *Quick Create* workflow:
+
+1. In the Oracle Cloud Console, open the navigation menu and click **Developer Services**.
+2. Under Containers, click **Kubernetes Clusters (OKE)**.
+3. Then click **Create Cluster**.
+
+For more information, check this [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengcreatingclusterusingoke_topic-Using_the_Console_to_create_a_Quick_Cluster_with_Default_Settings.htm).
+
+**Step 2: Set up access to Kubernetes cluster**
+
+You can access your Kubernetes cluster and manage it using `kubectl`.
+The `kubectl` command-line tool must be configured to communicate with your cluster.
+To do that you have to set up a Kubernetes configuration file, _kubeconfig_.
+The kubeconfig file (by default stored and can be found in the _$HOME/.kube/config_) provides the necessary details to access the cluster.
+
+See the [Setting Up Local Access to Clusters](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengdownloadkubeconfigfile.htm#localdownload) guide for step-by-step instructions.
+
+### Log in to Docker
+
+To be able to dockerize your Micronaut project, push and pull images on a local machine, and deploy to Oracle Container Registry, you will need [Docker](https://docs.docker.com/engine/reference/run/).
+To check whether [Docker](https://docs.docker.com/engine/reference/run/) is started and running on your computer, go to VS Code Terminal and type: `docker --help`.
+
+Next you need to login with Docker to your Oracle Container Registry.
+Prepare following Oracle Cloud account credentials:
+
+- Oracle Cloud Infrastructure (OCI) tenancy name
+- User email address used for your OCI account
+- OCI authentification token
+- OCI region key
+
+From VS Code Terminal window, log in using the following command:
+```bash
+docker login -u <tenancy-namespace>/<oci-user-email> -p <auth token> <region-key>.ocir.io
+```
+For example, if your OCI region is US East (Ashburn), then the key will be `iad`, and the region endpoint will be `https://iad.ocir.io`.
+The list of available regions and their keys is available [here](https://docs.oracle.com/en-us/iaas/Content/Registry/Concepts/registryprerequisites.htm).
+
+> NOTE: If the Docker registry is private you will need a Docker registry secret.
+
+This [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengpullingimagesfromocir.htm) describes how to create a Docker registry secret and describes how to specify the image to pull from Oracle Cloud Infrastructure Registry (along with the Docker secret to use) during application deployment to a cluster you've created using OKE.
+
+### Specify the Location for Docker Image in Oracle Container Registry
+
+The location where to push your Docker image in Oracle Container Registry should be specified in the project configuration file.
+
+If you used Gradle to build your Micronaut project, open the _gradle.build_ file and update image location:
+  ```xml
+  dockerBuild {
+  images = ["<region-key>.ocir.io/<tenancy-namespace>/<repo-name>/<image-name>:<tag>"]
+  }
+  ```
+
+See, for example, this example project configuration:
+![Docker image location](images/docker_image_location.png)
+
+## Deploy a Micronaut Application to OKE
+
+To deploy, run and debug a Micronaut application in Oracle Container Engine for Kubernetes (OKE), the following quick actions for Micronaut are available:
+
+![Kubernetes quick actions](images/k8s_quick_actions.png)
+
+You should start by creating a Kubernetes deployment file that will be applied at the deployment stage.
+
+1. Go to View > Command Palette, search for "Kubernetes" and invoke the **Micronaut: Create Kubernetes Deployment Resource** action. It will start the "Create Kubernetes Deployment File" process.
+
+2. Pick the Docker repository. Since you are using Oracle Container Registry, select **OCIR + region name**. For example:
+
+   ![Pick Docker repository](images/pick_docker_repository.png)
+
+3. Provide your Docker image name and version:
+
+   ![Provide Docker image name and version](images/provide_image_name_version.png)
+
+   Currently, available images are not automatically detected, so you need to type it manually.
+   Grab the image location from _gradle.build_ or _pom.xml_ you specified in the **Specify the Location for Docker Image in Oracle Container Registry** step.
+
+4. Then you are prompted to select the namespace. Choose default:
+
+   ![Select namespace](images/select_namespace.png)
+
+5. Lastly, select a secret for your container registry in OCI (needed only if the Docker registry is private, described in the **Preparation** > **Log in to Docker** section):
+
+    ![Select a secret for Docker registry](images/select_secret.png)
+
+    The `Deploy.yaml` will be created. It will look similar to the following:
+
+    ![Deploy.yaml](images/deploy_yaml.png)
+
+Now you are ready to deploy your Micronaut application to OKE.
+
+1. Go to View > Command Palette, search for **Micronaut: Deploy to Kubernetes** action and invoke it.
+   You could have skipped steps 1-3 from above, but if no Kubernetes deployment file exists, VS Code will suggest you to create one at this step.
+
+2. Once you invoke the action, the Output window will open and the "Starting deploy of project" message will be printed.
+
+When you hit this action, the project is packaged with Gradle/Maven to a runnable JAR file, built into a Docker image.
+Then Docker pushes this image to the OKE repository (Oracle Container Registry), by applying the _deploy.yaml_ script.
+The Kubernetes extension starts port forwarding to connect to the server running in a Kubernetes cluster (`kubectl port-forward` forwards a local port to a port on the Pod).
+A direct URL to access your Micronaut REST application from a browser is printed.
+Read more on Kubernetes port forwarding [here](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/).
+
+All this can be tracked in the Output window.
+If the deployment succeeds, you should see a similar status bar:
+
+![Kubernetes deploy status](images/k8s_deply_output.png)
+
+To otherwise check the deployment's status, run:
+```bash
+kubectl get deployment
+```
+
+You can work on other projects, deploy them to another Kubernetes clusters, and they will all be deployed and running from Oracle Container Registry.
+
+## Debug Micronaut Applications in a Kubernetes Cluster
+
+In addition to being able to deploy and run Micronaut applications in Kubernetes, you can also debug your Java application in a cluster directly from VS Code.
+
+> Note: To allow complete Java debugging experience, you need to ensure the [GraalVM Extension Pack for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm) is installed. It is not needed if you have installed [GraalVM Tools for Java Extension pack](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack), it already includes a full-fledged support for the Java and Micronaut.
+
+With the connection made to a local port (thanks to [Kubernetes port forwarding feature](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)), you can use your local workstation to debug the application that is running in the Pod.
+Having set some breakpoints in your applciation, do the following to start debugging:
+
+1. Go to View > Command Palette, search for **Micronaut: Debug in Kubernetes** action and invoke it.
+2. Confirm port forwarding. First time you start debugging your application deployed in Kubernetes, a popup window will open in the right bottom corner asking to confirm port forwarding. This will setup a `JAVA_TOOLS_OPTIONS` environment variable in the deployment script file.
+3. Then you will be prompted to choose a port forwarding session:
+
+   ![Choose a port forwarding session](images/k8s_port_forwarding.png)
+
+4. Connect the Kubernetes extension to your Kubernetes cluster using **Set Kubeconfig** action.
+5. Click on Kubernetes icon in the left sidebar and select the node you are developing.
+6. Right-click invoke action Debug (**Attach using Java 8+**):
+
+![Attach a remote debugger](images/attach-remote-debugger.png)
 
 ### Feedback
 
diff --git a/docs/tools/vscode/micronaut/k8s-support.md b/docs/tools/vscode/micronaut/k8s-support.md
deleted file mode 100644
index aa641c0659ca..000000000000
--- a/docs/tools/vscode/micronaut/k8s-support.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-layout: docs
-toc_group: vscode
-link_title: Deploy Micronaut Applications to Oracle Container Engine for Kubernetes
-permalink: /tools/vscode/micronaut/kubernetes-support/
----
-
-## Deploy, Run and Debug Micronaut Applications in Kubernetes Cluster
-
-GraalVM Tools for Micronaut Extension added support for working with Kubernetes clusters based on Microsofts’s [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
-It is now possible to deploy, run and debug a Micronaut application in a Kubernetes cluster from VS Code.
-
-This guide is focused on and tested with Oracle Container Engine for Kubernetes (OKE)](https://www.oracle.com/uk/cloud-native/container-engine-kubernetes/) and Oracle Container Registry, but Kubernetes features should work in other environments.
-OKE is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to Oracle Cloud.
-
-This guide will walk you through the process of deploying a Micronaut application to OKE from VS Code and debugging it.
-
-### Prerequisites
-- [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools)
-- [Docker](https://docs.docker.com/engine/reference/run/)
-- [Oracle Cloud Account](https://www.oracle.com/uk/cloud/free/)
-- [Access to Oracle Container Engine for Kubernetes (OKE)](https://oracle.github.io/learning-library/oci-library/oci-hol/OKE/workshops/freetier/index.html?lab=intro)
-
-## Preparation
-
-### Visual Studio Code Kubernetes Tools
-
-GraalVM Tools for Micronaut Extension uses `kubectl` provided by Microsoft's [Visual Studio Code Kubernetes Tools](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools).
-It has to be installed.
-
-Open Extensions tab, search for "Kubernetes" and install the one from Microsoft.
-Once installed, you should see the Kubernetes icon in the left sidebar:
-![Kubernetes extension installed](images/kubernetes_icon.png)
-
-### Oracle Cloud Account
-
-If you have not got an active Oracle Cloud account, create one by following this [link](https://docs.oracle.com/en/cloud/get-started/subscriptions-cloud/csgsg/get-oracle-com-account.html).
-
-### Access to Oracle Container Engine for Kubernetes (OKE)
-
-Supposedly, you have signed in to your Oracle Cloud account.
-To be able to deploy Docker images to Oracle Container Registry, you need to setup the access to Oracle Container Engine for Kubernetes (OKE).
-
-#### Step 1: Create a Kubernetes cluster in OCI
-
-Using the Oracle Cloud Console, create a Kubernetes cluster with default settings using the *Quick Create* workflow:
-
-1. In the Oracle Cloud Console, open the navigation menu and click **Developer Services**.
-2. Under Containers, click **Kubernetes Clusters (OKE)**.
-3. Then click **Create Cluster**.
-
-For more information, check this [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengcreatingclusterusingoke_topic-Using_the_Console_to_create_a_Quick_Cluster_with_Default_Settings.htm).
-
-#### Step 2: Set up access to Kubernetes cluster
-
-You can access your Kubernetes cluster and manage it using `kubectl`.
-The `kubectl` command-line tool must be configured to communicate with your cluster.
-To do that you have to set up a Kubernetes configuration file, _kubeconfig_.
-The kubeconfig file (by default stored and can be found in the _$HOME/.kube/config_) provides the necessary details to access the cluster.
-
-See the [Setting Up Local Access to Clusters](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengdownloadkubeconfigfile.htm#localdownload) guide for step-by-step instructions.
-
-### Log in to Docker
-
-To be able to dockerize your Micronaut project, push and pull images on a local machine, and deploy to Oracle Container Registry, you will need [Docker](https://docs.docker.com/engine/reference/run/).
-To check whether [Docker](https://docs.docker.com/engine/reference/run/) is started and running on your computer, go to VS Code Terminal and type: `docker --help`.
-
-Next you need to login with Docker to your Oracle Container Registry.
-Prepare following Oracle Cloud account credentials:
-
-- Oracle Cloud Infrastructure (OCI) tenancy name
-- User email address used for your OCI account
-- OCI authentification token
-- OCI region key
-
-From VS Code Terminal window, log in using the following command:
-```bash
-docker login -u <tenancy-namespace>/<oci-user-email> -p <auth token> <region-key>.ocir.io
-```
-For example, if your OCI region is US East (Ashburn), then the key will be `iad`, and the region endpoint will be `https://iad.ocir.io`.
-The list of available regions and their keys is available [here](https://docs.oracle.com/en-us/iaas/Content/Registry/Concepts/registryprerequisites.htm).
-
-> NOTE: If the Docker registry is private you will need a Docker registry secret.
-
-This [guide](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengpullingimagesfromocir.htm) describes how to create a Docker registry secret and describes how to specify the image to pull from Oracle Cloud Infrastructure Registry (along with the Docker secret to use) during application deployment to a cluster you've created using OKE.
-
-### Specify the Location for Docker Image in Oracle Container Registry
-
-The location where to push your Docker image in Oracle Container Registry should be specified in the project configuration file.
-
-If you used Gradle to build your Micronaut project, open the _gradle.build_ file and update image location:
-  ```xml
-  dockerBuild {
-  images = ["<region-key>.ocir.io/<tenancy-namespace>/<repo-name>/<image-name>:<tag>"]
-  }
-  ```
-
-See, for example, this example project configuration:
-![Docker image location](images/docker_image_location.png)
-
-<!-- If you used Maven to build your Micronaut project, open _pom.xml_, find the `dockerBuild` task and update the image location: -->
-
-## Deploy a Micronaut Application to OKE
-
-To deploy, run and debug a Micronaut application in Oracle Container Engine for Kubernetes (OKE), the following quick actions for Micronaut are available:
-
-![Kubernetes quick actions](images/k8s_quick_actions.png)
-
-You should start by creating a Kubernetes deployment file that will be applied at the deployment stage.
-
-1. Go to View > Command Palette, search for "Kubernetes" and invoke the **Micronaut: Create Kubernetes Deployment Resource** action. It will start the "Create Kubernetes Deployment File" process.
-
-2. Pick the Docker repository. Since you are using Oracle Container Registry, select **OCIR + region name**. For example:
-
-   ![Pick Docker repository](images/pick_docker_repository.png)
-
-3. Provide your Docker image name and version:
-
-   ![Provide Docker image name and version](images/provide_image_name_version.png)
-
-   Currently, available images are not automatically detected, so you need to type it manually.
-   Grab the image location from _gradle.build_ or _pom.xml_ you specified in the **Specify the Location for Docker Image in Oracle Container Registry** step.
-
-4. Then you are prompted to select the namespace. Choose default:
-
-   ![Select namespace](images/select_namespace.png)
-
-5. Lastly, select a secret for your container registry in OCI (needed only if the Docker registry is private, described in the **Preparation** > **Log in to Docker** section):
-
-    ![Select a secret for Docker registry](images/select_secret.png)
-
-    The `Deploy.yaml` will be created. It will look similar to the following:
-
-    ![Deploy.yaml](images/deploy_yaml.png)
-
-Now you are ready to deploy your Micronaut application to OKE.
-
-1. Go to View > Command Palette, search for **Micronaut: Deploy to Kubernetes** action and invoke it.
-   You could have skipped steps 1-3 from above, but if no Kubernetes deployment file exists, VS Code will suggest you to create one at this step.
-
-2. Once you invoke the action, the Output window will open and the "Starting deploy of project" message will be printed.
-
-When you hit this action, the project is packaged with Gradle/Maven to a runnable JAR file, built into a Docker image.
-Then Docker pushes this image to the OKE repository (Oracle Container Registry), by applying the _deploy.yaml_ script.
-The Kubernetes extension starts port forwarding to connect to the server running in a Kubernetes cluster (`kubectl port-forward` forwards a local port to a port on the Pod).
-A direct URL to access your Micronaut REST application from a browser is printed.
-Read more on Kubernetes port forwarding [here](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/).
-
-All this can be tracked in the Output window.
-If the deployment succeeds, you should see a similar status bar:
-
-![Kubernetes deploy status](images/k8s_deply_output.png)
-
-To otherwise check the deployment's status, run:
-```bash
-kubectl get deployment
-```
-
-You can work on other projects, deploy them to another Kubernetes clusters, and they will all be deployed and running from Oracle Container Registry.
-
-## Debug Micronaut Applications in Remote Kubernetes Cluster
-
-In addition to being able to deploy and run Micronaut applications in Kubernetes, you can also debug your Java application in a cluster directly from VS.
-
-> Note: To allow complete Java debugging experience, you need to ensure the [GraalVM Extension Pack for Java](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm) is installed. It is not needed if you have installed [GraalVM Tools for Java Extension pack](https://marketplace.visualstudio.com/items?itemName=oracle-labs-graalvm.graalvm-pack), it already includes a full-fledged support for the Java and Micronaut.
-
-With the connection made to a local port (thanks to [Kubernetes port forwarding feature](https://kubernetes.io/docs/tasks/access-application-cluster/port-forward-access-application-cluster/)), you can use your local workstation to debug the application that is running in the Pod.
-Having set some breakpoints in your applciation, do the following to start debugging:
-
-1. Go to View > Command Palette, search for **Micronaut: Debug in Kubernetes** action and invoke it.
-2. Confirm port forwarding. First time you start debugging your application deployed in Kubernetes, a popup window will open in the right bottom corner asking to confirm port forwarding. This will setup a `JAVA_TOOLS_OPTIONS` environment variable in the deployment script file.
-3. Then you will be prompted to choose a port forwarding session:
-
-   ![Choose a port forwarding session](images/k8s_port_forwarding.png)
-
-4. Connect the Kubernetes extension to your Kubernetes cluster using **Set Kubeconfig** action.
-5. Click on Kubernetes icon in the left sidebar and select the node you are developing.
-6. Right-click invoke action Debug (**Attach using Java 8+**):
-
-![Attach a remote debugger](images/attach-remote-debugger.png)

From 3f9ab52ceafa578c600f6ecf1ee4981d3aae546f Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Fri, 15 Oct 2021 09:48:06 +0200
Subject: [PATCH 548/681] [GR-32840] Gate for polybench interpreter.

---
 vm/ci_common/common-bench.hocon | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index b777644da9fb..9e1f83bdf58d 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -35,17 +35,31 @@ vm_bench_polybench_linux_common: ${svm-common-linux-amd64} ${truffleruby_linux}
   targets: [bench, daily]
 }
 
-vm_bench_polybench_linux_interpreter: ${vm_bench_polybench_linux_common} ${vm_java_8} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}"]
+vm_polybench_linux_interpreter_common: ${vm_bench_polybench_linux_common} {
+  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_polybench_linux_interpreter_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}"]
+}
+
+vm_bench_polybench_linux_interpreter: ${vm_polybench_linux_interpreter_common} ${vm_java_8} {
   run: [
-    ${vm_bench_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
+    ${vm_polybench_linux_interpreter_common.bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
     ${vm_bench_common.upload}
-    ${vm_bench_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=native-interpreter"]
+    ${vm_polybench_linux_interpreter_common.bench_cmd} ["--polybench-vm-config=native-interpreter"]
     ${vm_bench_common.upload}
   ]
   timelimit: "2:30:00"
 }
 
+vm_gate_polybench_linux_interpreter: ${vm_polybench_linux_interpreter_common} ${vm_java_8} ${gate_vm_linux} {
+  bench_cmd: ${vm_polybench_linux_interpreter_common.bench_cmd} ["-w", "1", "-i", "1"]
+  run: [
+    ${vm_gate_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
+    ${vm_gate_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=native-interpreter"]
+  ]
+  targets: ${gate_vm_linux.targets}
+  capabilities: ${gate_vm_linux.capabilities}
+  notify_emails: []
+}
+
 vm_bench_polybench_linux_compiler: ${vm_bench_polybench_linux_common} ${vm_java_11} {
   bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_compiler.result_file}, --, "-w", "0", "-i", "10", "--polybench-vm=graalvm-${VM_ENV}-java11"]
   run: [
@@ -127,4 +141,6 @@ builds += [
     timelimit: "45:00"
     name: bench-vm-${vm_setup.short_name}-agentscript-js-java8-linux-amd64
   }
+
+  ${common_vm_linux} ${vm_gate_polybench_linux_interpreter} {name: gate-vm-${vm_setup.short_name}-polybench-linux}
 ]

From 3363f4d4cc3c29b6a9170d0fda31111952b69303 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Fri, 15 Oct 2021 13:36:00 +0200
Subject: [PATCH 549/681] [GR-32840] Gate for polybench compiler and warmup.

---
 vm/ci_common/common-bench.hocon | 42 +++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index 9e1f83bdf58d..1cc8db2fe93c 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -60,8 +60,12 @@ vm_gate_polybench_linux_interpreter: ${vm_polybench_linux_interpreter_common} ${
   notify_emails: []
 }
 
-vm_bench_polybench_linux_compiler: ${vm_bench_polybench_linux_common} ${vm_java_11} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_compiler.result_file}, --, "-w", "0", "-i", "10", "--polybench-vm=graalvm-${VM_ENV}-java11"]
+vm_polybench_linux_compiler_common: ${vm_bench_polybench_linux_common} {
+  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_polybench_linux_compiler_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java11"]
+}
+
+vm_bench_polybench_linux_compiler: ${vm_polybench_linux_compiler_common} ${vm_java_11} {
+  bench_cmd: ${vm_polybench_linux_compiler_common.bench_cmd} ["-w", "0", "-i", "10"]
   run: [
     ${vm_bench_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
     ${vm_bench_common.upload}
@@ -74,6 +78,19 @@ vm_bench_polybench_linux_compiler: ${vm_bench_polybench_linux_common} ${vm_java_
   ]
 }
 
+vm_gate_polybench_linux_compiler: ${vm_polybench_linux_compiler_common} ${vm_java_11} ${gate_vm_linux} {
+  bench_cmd: ${vm_polybench_linux_compiler_common.bench_cmd} ["-w", "0", "-i", "1"]
+  run: [
+    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
+    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=compilation-time"]
+    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=partial-evaluation-time"]
+    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=partial-evaluation-time"]
+  ]
+  targets: ${gate_vm_linux.targets}
+  capabilities: ${gate_vm_linux.capabilities}
+  notify_emails: []
+}
+
 vm_bench_polybench_linux_context_init: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json", "polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]", --results-file, ${vm_bench_polybench_linux_context_init.result_file}, --, "-w", "0", "-i", "0", "--polybench-vm=graalvm-${VM_ENV}-java8"]
   run: [
@@ -84,14 +101,27 @@ vm_bench_polybench_linux_context_init: ${vm_bench_polybench_linux_common} ${vm_j
   ]
 }
 
-vm_bench_polybench_linux_warmup: ${vm_bench_polybench_linux_common} ${vm_java_8} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_warmup.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+vm_polybench_linux_warmup_common: ${vm_bench_polybench_linux_common} {
+  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_polybench_linux_warmup_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+}
+
+vm_bench_polybench_linux_warmup: ${vm_polybench_linux_warmup_common} ${vm_java_8} {
   run: [
-    ${vm_bench_polybench_linux_warmup.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
+    ${vm_polybench_linux_warmup_common.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
     ${vm_bench_common.upload}
   ]
 }
 
+vm_gate_polybench_linux_warmup: ${vm_polybench_linux_warmup_common} ${vm_java_8} ${gate_vm_linux} {
+  bench_cmd: ${vm_polybench_linux_warmup_common.bench_cmd} ["-w", "1", "-i", "1"]
+  run: [
+    ${vm_gate_polybench_linux_warmup.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
+  ]
+  targets: ${gate_vm_linux.targets}
+  capabilities: ${gate_vm_linux.capabilities}
+  notify_emails: []
+}
+
 vm_bench_polybench_nfi: ${sulong-weekly-notifications} {
   base_cmd: [mx, --env, "polybench-nfi-${VM_ENV}"]
   bench_cmd: ${vm_bench_polybench_nfi.base_cmd} [benchmark, "polybench:r[nfi/.*]", --results-file, ${vm_bench_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}"]
@@ -143,4 +173,6 @@ builds += [
   }
 
   ${common_vm_linux} ${vm_gate_polybench_linux_interpreter} {name: gate-vm-${vm_setup.short_name}-polybench-linux}
+  ${common_vm_linux} ${vm_gate_polybench_linux_compiler} {name: gate-vm-${vm_setup.short_name}-polybench-compiler-linux}
+  ${common_vm_linux} ${vm_gate_polybench_linux_warmup} {name: gate-vm-${vm_setup.short_name}-polybench-warmup-linux}
 ]

From 3c8dcb8c36fdb7735ff36fdb7fcd46112f63a469 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Tue, 19 Oct 2021 13:05:34 +0200
Subject: [PATCH 550/681] [GR-32840] Workaround for hocon issues.

---
 vm/ci_common/common-bench.hocon | 77 ++++++++++++---------------------
 1 file changed, 28 insertions(+), 49 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index 1cc8db2fe93c..8659829634dc 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -35,62 +35,36 @@ vm_bench_polybench_linux_common: ${svm-common-linux-amd64} ${truffleruby_linux}
   targets: [bench, daily]
 }
 
-vm_polybench_linux_interpreter_common: ${vm_bench_polybench_linux_common} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_polybench_linux_interpreter_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}"]
+vm_polybench_linux_commands: {
+  interpreter_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  compiler_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  warmup_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
 }
 
-vm_bench_polybench_linux_interpreter: ${vm_polybench_linux_interpreter_common} ${vm_java_8} {
+vm_bench_polybench_linux_interpreter: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   run: [
-    ${vm_polybench_linux_interpreter_common.bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
+    ${vm_polybench_linux_commands.interpreter_bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
     ${vm_bench_common.upload}
-    ${vm_polybench_linux_interpreter_common.bench_cmd} ["--polybench-vm-config=native-interpreter"]
+    ${vm_polybench_linux_commands.interpreter_bench_cmd} ["--polybench-vm-config=native-interpreter"]
     ${vm_bench_common.upload}
   ]
   timelimit: "2:30:00"
 }
 
-vm_gate_polybench_linux_interpreter: ${vm_polybench_linux_interpreter_common} ${vm_java_8} ${gate_vm_linux} {
-  bench_cmd: ${vm_polybench_linux_interpreter_common.bench_cmd} ["-w", "1", "-i", "1"]
+vm_bench_polybench_linux_compiler: ${vm_bench_polybench_linux_common} ${vm_java_8} {
+  compiler_bench_cmd: ${vm_polybench_linux_commands.compiler_bench_cmd} ["-w", "0", "-i", "10"]
   run: [
-    ${vm_gate_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
-    ${vm_gate_polybench_linux_interpreter.bench_cmd} ["--polybench-vm-config=native-interpreter"]
-  ]
-  targets: ${gate_vm_linux.targets}
-  capabilities: ${gate_vm_linux.capabilities}
-  notify_emails: []
-}
-
-vm_polybench_linux_compiler_common: ${vm_bench_polybench_linux_common} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_polybench_linux_compiler_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java11"]
-}
-
-vm_bench_polybench_linux_compiler: ${vm_polybench_linux_compiler_common} ${vm_java_11} {
-  bench_cmd: ${vm_polybench_linux_compiler_common.bench_cmd} ["-w", "0", "-i", "10"]
-  run: [
-    ${vm_bench_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
+    ${vm_bench_polybench_linux_compiler.compiler_bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
     ${vm_bench_common.upload}
-    ${vm_bench_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=compilation-time"]
+    ${vm_bench_polybench_linux_compiler.compiler_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=compilation-time"]
     ${vm_bench_common.upload}
-    ${vm_bench_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=partial-evaluation-time"]
+    ${vm_bench_polybench_linux_compiler.compiler_bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=partial-evaluation-time"]
     ${vm_bench_common.upload}
-    ${vm_bench_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=partial-evaluation-time"]
+    ${vm_bench_polybench_linux_compiler.compiler_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=partial-evaluation-time"]
     ${vm_bench_common.upload}
   ]
 }
 
-vm_gate_polybench_linux_compiler: ${vm_polybench_linux_compiler_common} ${vm_java_11} ${gate_vm_linux} {
-  bench_cmd: ${vm_polybench_linux_compiler_common.bench_cmd} ["-w", "0", "-i", "1"]
-  run: [
-    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
-    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=compilation-time"]
-    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=partial-evaluation-time"]
-    ${vm_gate_polybench_linux_compiler.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=partial-evaluation-time"]
-  ]
-  targets: ${gate_vm_linux.targets}
-  capabilities: ${gate_vm_linux.capabilities}
-  notify_emails: []
-}
-
 vm_bench_polybench_linux_context_init: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json", "polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]", --results-file, ${vm_bench_polybench_linux_context_init.result_file}, --, "-w", "0", "-i", "0", "--polybench-vm=graalvm-${VM_ENV}-java8"]
   run: [
@@ -105,20 +79,27 @@ vm_polybench_linux_warmup_common: ${vm_bench_polybench_linux_common} {
   bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_polybench_linux_warmup_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
 }
 
-vm_bench_polybench_linux_warmup: ${vm_polybench_linux_warmup_common} ${vm_java_8} {
+vm_bench_polybench_linux_warmup: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   run: [
-    ${vm_polybench_linux_warmup_common.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
+    ${vm_polybench_linux_commands.warmup_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
     ${vm_bench_common.upload}
   ]
 }
 
-vm_gate_polybench_linux_warmup: ${vm_polybench_linux_warmup_common} ${vm_java_8} ${gate_vm_linux} {
-  bench_cmd: ${vm_polybench_linux_warmup_common.bench_cmd} ["-w", "1", "-i", "1"]
+vm_gate_polybench_linux: ${vm_bench_polybench_linux_common} ${vm_java_8} {
+  interpreter_bench_cmd: ${vm_polybench_linux_commands.interpreter_bench_cmd} ["-w", "1", "-i", "1"]
+  compiler_bench_cmd: ${vm_polybench_linux_commands.compiler_bench_cmd} ["-w", "0", "-i", "1"]
+  warmup_bench_cmd: ${vm_polybench_linux_commands.warmup_bench_cmd} ["-w", "1", "-i", "1"]
   run: [
-    ${vm_gate_polybench_linux_warmup.bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
+    ${vm_gate_polybench_linux.interpreter_bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
+    ${vm_gate_polybench_linux.interpreter_bench_cmd} ["--polybench-vm-config=native-interpreter"]
+    ${vm_gate_polybench_linux.compiler_bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=compilation-time"]
+    ${vm_gate_polybench_linux.compiler_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=partial-evaluation-time"]
+    ${vm_gate_polybench_linux.warmup_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]
   ]
-  targets: ${gate_vm_linux.targets}
-  capabilities: ${gate_vm_linux.capabilities}
+  timelimit: "0:45:00"
+  targets: [gate]
+  capabilities: ${vm_linux.capabilities}
   notify_emails: []
 }
 
@@ -172,7 +153,5 @@ builds += [
     name: bench-vm-${vm_setup.short_name}-agentscript-js-java8-linux-amd64
   }
 
-  ${common_vm_linux} ${vm_gate_polybench_linux_interpreter} {name: gate-vm-${vm_setup.short_name}-polybench-linux}
-  ${common_vm_linux} ${vm_gate_polybench_linux_compiler} {name: gate-vm-${vm_setup.short_name}-polybench-compiler-linux}
-  ${common_vm_linux} ${vm_gate_polybench_linux_warmup} {name: gate-vm-${vm_setup.short_name}-polybench-warmup-linux}
+  ${common_vm_linux} ${vm_gate_polybench_linux} {name: gate-vm-${vm_setup.short_name}-polybench-linux}
 ]

From 6fdb4e006470a0fa24d43184f9328a6b8082cb07 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Tue, 19 Oct 2021 11:34:07 -0700
Subject: [PATCH 551/681] Refactor OptionParseResult#matchesFlags.

---
 .../oracle/graal/pointsto/util/PointsToOptionParser.java    | 4 ++--
 .../com/oracle/svm/common/option/CommonOptionParser.java    | 5 ++---
 .../src/com/oracle/svm/core/option/RuntimeOptionParser.java | 6 +++---
 .../com/oracle/svm/core/option/SubstrateOptionsParser.java  | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
index 3a1997d13be2..fc7269d7251e 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
@@ -44,9 +44,9 @@
 import org.graalvm.compiler.options.OptionValues;
 
 import com.oracle.svm.common.option.CommonOptionParser;
-import com.oracle.svm.common.option.UnsupportedOptionClassException;
 import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
 import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.common.option.UnsupportedOptionClassException;
 
 public final class PointsToOptionParser {
 
@@ -126,7 +126,7 @@ private static boolean parseOption(String optionPrefix, EconomicMap<String, Opti
             OptionParseResult optionParseResult = CommonOptionParser.parseOption(options, optionKeyPredicate, arg.substring(optionPrefix.length()), valuesMap,
                             optionPrefix, booleanOptionFormat);
             if (optionParseResult.printFlags() || optionParseResult.printFlagsWithExtraHelp()) {
-                CommonOptionParser.printFlags(d -> optionParseResult.matchesFlags(d, () -> true), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
+                CommonOptionParser.printFlags(d -> optionParseResult.matchesFlags(d, true), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
                 System.out.println("Abort analysis due to print flags are requested");
                 System.exit(1);
             }
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
index fcd6a9c53bd6..896a9f3aedf4 100644
--- a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -123,10 +122,10 @@ public OptionKey<?> getOptionKey() {
             return optionKey;
         }
 
-        public boolean matchesFlags(OptionDescriptor d, BooleanSupplier svmOption) {
+        public boolean matchesFlags(OptionDescriptor d, boolean svmOption) {
             if (!printFlags.isEmpty()) {
                 boolean showAll = printFlags.equals(EnumSet.allOf(OptionType.class));
-                return showAll || svmOption.getAsBoolean() && printFlags.contains(d.getOptionType());
+                return showAll || svmOption && printFlags.contains(d.getOptionType());
             }
             if (!optionNameFilter.isEmpty()) {
                 if (optionNameFilter.contains(EXTRA_HELP_OPTIONS_WILDCARD) && !d.getExtraHelp().isEmpty()) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
index 9dc6007070c4..aa4ec3eab602 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
@@ -39,10 +39,10 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
-import com.oracle.svm.core.SubstrateOptions;
-import com.oracle.svm.core.log.Log;
 import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
 import com.oracle.svm.common.option.CommonOptionParser.OptionParseResult;
+import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.properties.RuntimePropertyParser;
 import com.oracle.svm.core.util.ImageHeapMap;
 
@@ -163,7 +163,7 @@ private void parseOptionAtRuntime(String arg, String optionPrefix, BooleanOption
         Predicate<OptionKey<?>> isHosted = optionKey -> false;
         OptionParseResult parseResult = SubstrateOptionsParser.parseOption(options, isHosted, arg.substring(optionPrefix.length()), values, optionPrefix, booleanOptionFormat);
         if (parseResult.printFlags() || parseResult.printFlagsWithExtraHelp()) {
-            SubstrateOptionsParser.printFlags(d -> parseResult.matchesFlags(d, () -> d.getOptionKey() instanceof RuntimeOptionKey),
+            SubstrateOptionsParser.printFlags(d -> parseResult.matchesFlags(d, d.getOptionKey() instanceof RuntimeOptionKey),
                             options, optionPrefix, Log.logStream(), parseResult.printFlagsWithExtraHelp());
             System.exit(0);
         }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index 8d70ac470839..f6144bfd437b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -89,10 +89,10 @@ public static boolean parseHostedOption(String optionPrefix, EconomicMap<String,
         OptionParseResult optionParseResult = SubstrateOptionsParser.parseOption(options, isHosted, arg.substring(optionPrefix.length()), valuesMap,
                         optionPrefix, booleanOptionFormat);
         if (optionParseResult.printFlags() || optionParseResult.printFlagsWithExtraHelp()) {
-            SubstrateOptionsParser.printFlags(d -> optionParseResult.matchesFlags(d, () -> {
+            SubstrateOptionsParser.printFlags(d -> {
                 OptionKey<?> key = d.getOptionKey();
-                return key instanceof RuntimeOptionKey || key instanceof HostedOptionKey;
-            }), options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
+                return optionParseResult.matchesFlags(d, key instanceof RuntimeOptionKey || key instanceof HostedOptionKey);
+            }, options, optionPrefix, out, optionParseResult.printFlagsWithExtraHelp());
             throw new InterruptImageBuilding("");
         }
         if (!optionParseResult.isValid()) {

From db545613e36d161737874fc7cf0e64d069f8d7ba Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Fri, 15 Oct 2021 17:34:54 +0200
Subject: [PATCH 552/681] Ensure native-image code installation applies all
 patches.

---
 .../aarch64/test/TestProtectedAssembler.java  |  4 +--
 .../asm/aarch64/AArch64Assembler.java         | 34 ++++++++-----------
 .../asm/aarch64/AArch64MacroAssembler.java    |  7 ++--
 .../AArch64HotSpotConstantRetrievalOp.java    |  3 +-
 .../compiler/lir/aarch64/AArch64Call.java     |  4 +--
 .../svm/graal/meta/RuntimeCodeInstaller.java  | 17 ++++++++--
 .../hosted/image/LIRNativeImageCodeCache.java | 13 ++++++-
 7 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java
index bbd6e1dc1d01..ea515df376b1 100644
--- a/compiler/src/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java
@@ -76,8 +76,8 @@ protected void cbz(int size, Register reg, int imm21) {
     }
 
     @Override
-    protected void b(int imm28) {
-        super.b(imm28);
+    protected void b() {
+        super.b();
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
index a32dbc2c1181..941e23cd4767 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java
@@ -991,48 +991,46 @@ private static int getConditionalBranchImm(int imm21) {
     }
 
     /* Unconditional Branch (immediate) (5.2.2) */
+    protected void b() {
+        unconditionalBranchImmInstruction(0, Instruction.B, -1, true);
+    }
 
     /**
+     * Unconditional Branch (immediate) (5.2.2).
+     *
      * @param imm28 Signed 28-bit offset, has to be word aligned.
      */
     protected void b(int imm28) {
-        unconditionalBranchImmInstruction(imm28, Instruction.B, -1);
+        unconditionalBranchImmInstruction(imm28, Instruction.B, -1, false);
     }
 
     /**
+     * Unconditional Branch (immediate) (5.2.2).
      *
      * @param imm28 Signed 28-bit offset, has to be word aligned.
      * @param pos Position where instruction is inserted into code buffer.
      */
     protected void b(int imm28, int pos) {
-        unconditionalBranchImmInstruction(imm28, Instruction.B, pos);
+        unconditionalBranchImmInstruction(imm28, Instruction.B, pos, false);
     }
 
     /**
      * Branch and link return address to register X30.
-     *
-     * @param imm28 Signed 28-bit offset, has to be word aligned.
      */
-    public void bl(int imm28) {
-        /*
-         * Currently within Graal all bl instructions will be patched later.
-         *
-         * Hence, for now imm28 should always be 0. If at a later time the imm28 can be a meaningful
-         * value, then this assert can be reevaluated.
-         */
-        assert imm28 == 0;
-        unconditionalBranchImmInstruction(imm28, Instruction.BL, -1);
+    public void bl() {
+        unconditionalBranchImmInstruction(0, Instruction.BL, -1, true);
     }
 
-    private void unconditionalBranchImmInstruction(int imm28, Instruction instr, int pos) {
+    private void unconditionalBranchImmInstruction(int imm28, Instruction instr, int pos, boolean needsImmAnnotation) {
         assert NumUtil.isSignedNbit(28, imm28) && (imm28 & 0x3) == 0 : "Immediate has to be 28bit signed number and word aligned";
         int imm = (imm28 & NumUtil.getNbitNumberInt(28)) >> 2;
         int instrEncoding = instr.encoding | UnconditionalBranchImmOp;
+        if (needsImmAnnotation) {
+            annotatePatchingImmediate(pos == -1 ? position() : pos, instr, 26, 0, 2);
+        }
         if (pos == -1) {
-            annotatePatchingImmediate(position(), instr, 26, 0, 2);
             emitInt(instrEncoding | imm);
         } else {
-            annotatePatchingImmediate(pos, instr, 26, 0, 2);
             emitInt(instrEncoding | imm, pos);
         }
     }
@@ -1267,11 +1265,9 @@ private void loadStoreInstruction(Instruction instr, Register reg, AArch64Addres
         int memOp = extraEncoding | transferSizeEncoding | instr.encoding | floatFlag | rt(reg);
         switch (address.getAddressingMode()) {
             case IMMEDIATE_UNSIGNED_SCALED:
-                annotatePatchingImmediate(position(), instr, 12, LoadStoreScaledImmOffset, log2TransferSize);
                 emitInt(memOp | LoadStoreScaledOp | address.getImmediate() << LoadStoreScaledImmOffset | rs1(address.getBase()));
                 break;
             case IMMEDIATE_SIGNED_UNSCALED:
-                annotatePatchingImmediate(position(), instr, 9, LoadStoreUnscaledImmOffset, 0);
                 emitInt(memOp | LoadStoreUnscaledOp | address.getImmediate() << LoadStoreUnscaledImmOffset | rs1(address.getBase()));
                 break;
             case BASE_REGISTER_ONLY:
@@ -1289,11 +1285,9 @@ private void loadStoreInstruction(Instruction instr, Register reg, AArch64Addres
                 emitInt(transferSizeEncoding | floatFlag | LoadLiteralOp | rd(reg) | address.getImmediate() << LoadLiteralImmOffset);
                 break;
             case IMMEDIATE_POST_INDEXED:
-                annotatePatchingImmediate(position(), instr, 9, LoadStoreIndexedImmOffset, 0);
                 emitInt(memOp | LoadStorePostIndexedOp | rs1(address.getBase()) | address.getImmediate() << LoadStoreIndexedImmOffset);
                 break;
             case IMMEDIATE_PRE_INDEXED:
-                annotatePatchingImmediate(position(), instr, 9, LoadStoreIndexedImmOffset, 0);
                 emitInt(memOp | LoadStorePreIndexedOp | rs1(address.getBase()) | address.getImmediate() << LoadStoreIndexedImmOffset);
                 break;
             default:
diff --git a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
index 957c5b8eba53..12fe044278f2 100755
--- a/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
+++ b/compiler/src/org.graalvm.compiler.asm.aarch64/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java
@@ -1794,7 +1794,7 @@ public void branchConditionally(ConditionFlag condition, Label label) {
     }
 
     /**
-     * Branches if condition is true. Address of jump is patched up by HotSpot c++ code.
+     * Branches if condition is true. Address of jump is patched up by the runtime.
      *
      * @param condition any condition value allowed. Non null.
      */
@@ -1833,11 +1833,10 @@ public void jmp(Register dest) {
     }
 
     /**
-     * Immediate jump instruction fixed up by HotSpot c++ code.
+     * Immediate jump instruction fixed up by the runtime.
      */
     public void jmp() {
-        // Offset has to be fixed up by c++ code.
-        super.b(0);
+        super.b();
     }
 
     /**
diff --git a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java
index 715df8e1ccc9..407c7a2a6698 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotConstantRetrievalOp.java
@@ -116,7 +116,8 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
         }
 
         final int before = masm.position();
-        masm.bl(0);
+        // address is fixed up by HotSpot.
+        masm.bl();
         final int after = masm.position();
         crb.recordDirectCall(before, after, callLinkage, frameState);
     }
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
index 2a9f6634db14..3097dd8baa0f 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java
@@ -214,8 +214,8 @@ public static void directCall(CompilationResultBuilder crb, AArch64MacroAssemble
             masm.movNativeAddress(scratch, 0L, true);
             masm.blr(scratch);
         } else {
-            // Address is fixed up by HotSpot.
-            masm.bl(0);
+            // Address is fixed up by the runtime.
+            masm.bl();
         }
         if (label != null) {
             // We need this label to be the return address.
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
index d1d104b8e68d..c4c4dfa4e42f 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
@@ -26,6 +26,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 import org.graalvm.compiler.code.CompilationResult;
@@ -192,10 +193,12 @@ protected void doPrepareInstall(ReferenceAdjuster adjuster, CodeInfo codeInfo) {
         Map<Integer, NativeImagePatcher> patches = new HashMap<>();
         for (CodeAnnotation codeAnnotation : compilation.getCodeAnnotations()) {
             if (codeAnnotation instanceof NativeImagePatcher) {
-                patches.put(codeAnnotation.getPosition(), (NativeImagePatcher) codeAnnotation);
+                NativeImagePatcher priorValue = patches.put(codeAnnotation.getPosition(), (NativeImagePatcher) codeAnnotation);
+                VMError.guarantee(priorValue == null, "Registering two patchers for same position.");
             }
         }
-        patchData(patches, objectConstants);
+        int numPatchesHandled = patchData(patches, objectConstants);
+        VMError.guarantee(numPatchesHandled == patches.size(), "Not all patches applied.");
 
         // Store the compiled code
         for (int index = 0; index < codeSize; index++) {
@@ -252,9 +255,14 @@ private void createCodeChunkInfos(CodeInfo runtimeMethodInfo, ReferenceAdjuster
         sourcePositionEncoder.encodeAndInstall(compilation.getDeoptimizationSourcePositions(), runtimeMethodInfo, adjuster);
     }
 
-    private void patchData(Map<Integer, NativeImagePatcher> patcher, @SuppressWarnings("unused") ObjectConstantsHolder objectConstants) {
+    private int patchData(Map<Integer, NativeImagePatcher> patcher, ObjectConstantsHolder objectConstants) {
+        int patchesHandled = 0;
+        HashSet<Integer> patchedOffsets = new HashSet<>();
         for (DataPatch dataPatch : compilation.getDataPatches()) {
             NativeImagePatcher patch = patcher.get(dataPatch.pcOffset);
+            boolean noPriorMatch = patchedOffsets.add(dataPatch.pcOffset);
+            VMError.guarantee(noPriorMatch, "Patching same offset twice.");
+            patchesHandled++;
             if (dataPatch.reference instanceof DataSectionReference) {
                 DataSectionReference ref = (DataSectionReference) dataPatch.reference;
                 int pcDisplacement = dataOffset + ref.getOffset() - dataPatch.pcOffset;
@@ -263,7 +271,10 @@ private void patchData(Map<Integer, NativeImagePatcher> patcher, @SuppressWarnin
                 ConstantReference ref = (ConstantReference) dataPatch.reference;
                 SubstrateObjectConstant refConst = (SubstrateObjectConstant) ref.getConstant();
                 objectConstants.add(patch.getOffset(), patch.getLength(), refConst);
+            } else {
+                throw VMError.shouldNotReachHere("Unhandled data patch.");
             }
         }
+        return patchesHandled;
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
index 19e985859367..d0e9d6cbb00a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
@@ -26,6 +26,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -157,7 +158,8 @@ public void patchMethods(DebugContext debug, RelocatableBuffer relocs, ObjectFil
             ByteBuffer targetCode = null;
             for (CodeAnnotation codeAnnotation : compilation.getCodeAnnotations()) {
                 if (codeAnnotation instanceof HostedPatcher) {
-                    patches.put(codeAnnotation.getPosition(), (HostedPatcher) codeAnnotation);
+                    HostedPatcher priorValue = patches.put(codeAnnotation.getPosition(), (HostedPatcher) codeAnnotation);
+                    VMError.guarantee(priorValue == null, "Registering two patchers for same position.");
 
                 } else if (codeAnnotation instanceof HostedImageHeapConstantPatch) {
                     HostedImageHeapConstantPatch patch = (HostedImageHeapConstantPatch) codeAnnotation;
@@ -174,6 +176,8 @@ public void patchMethods(DebugContext debug, RelocatableBuffer relocs, ObjectFil
                     targetCode.putInt(patch.getPosition(), (int) newValue);
                 }
             }
+            int patchesHandled = 0;
+            HashSet<Integer> patchedOffsets = new HashSet<>();
             // ... patch direct call sites.
             for (Infopoint infopoint : compilation.getInfopoints()) {
                 if (infopoint instanceof Call && ((Call) infopoint).direct) {
@@ -189,6 +193,9 @@ public void patchMethods(DebugContext debug, RelocatableBuffer relocs, ObjectFil
                     // This code handles the case of section-local calls only.
                     int pcDisplacement = callTargetStart - (compStart + call.pcOffset);
                     patches.get(call.pcOffset).patch(compStart, pcDisplacement, compilation.getTargetCode());
+                    boolean noPriorMatch = patchedOffsets.add(call.pcOffset);
+                    VMError.guarantee(noPriorMatch, "Patching same offset twice.");
+                    patchesHandled++;
                 }
             }
             for (DataPatch dataPatch : compilation.getDataPatches()) {
@@ -198,7 +205,11 @@ public void patchMethods(DebugContext debug, RelocatableBuffer relocs, ObjectFil
                  * read-only (.rodata) section.
                  */
                 patches.get(dataPatch.pcOffset).relocate(ref, relocs, compStart);
+                boolean noPriorMatch = patchedOffsets.add(dataPatch.pcOffset);
+                VMError.guarantee(noPriorMatch, "Patching same offset twice.");
+                patchesHandled++;
             }
+            VMError.guarantee(patchesHandled == patches.size(), "Not all patches applied.");
             try (DebugContext.Scope ds = debug.scope("After Patching", method.asJavaMethod())) {
                 debug.dump(DebugContext.BASIC_LEVEL, compilation, "After patching");
             } catch (Throwable e) {

From 0e012906db0b7c1ce284e774732a0083352bcc86 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Tue, 19 Oct 2021 20:33:51 +0200
Subject: [PATCH 553/681] Compare performance of
 `Class.isAssignableFrom(Object.getClass())` and `Class.isInstance(Object)`.

---
 .../micro/benchmarks/TypecheckBenchmark.java  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
index 2a548c8f152e..66b3bf41aa03 100644
--- a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
@@ -306,4 +306,45 @@ public int repetitiveInstanceOfDynamic(ThreadState state) {
         return res;
     }
 
+    @Benchmark
+    public boolean isAssignableFromShouldFold(ThreadState state) {
+        return AA.class.isAssignableFrom(state.aa1.getClass());
+    }
+
+    @Benchmark
+    public boolean isInstanceShouldFold(ThreadState state) {
+        return AA.class.isInstance(state.aa1);
+    }
+
+    @Benchmark
+    public int isAssignableFrom(ThreadState state) {
+        int res = 0;
+        Object[] objects = state.object;
+        for (int i = 0; i < objects.length; i++) {
+            if (isAssignableFrom(objects[i])) {
+                res++;
+            }
+        }
+        return res;
+    }
+
+    boolean isAssignableFrom(Object obj) {
+        return AA1.class.isAssignableFrom(obj.getClass());
+    }
+
+    @Benchmark
+    public int isInstance(ThreadState state) {
+        int res = 0;
+        Object[] objects = state.object;
+        for (int i = 0; i < objects.length; i++) {
+            if (isInstance(objects[i])) {
+                res++;
+            }
+        }
+        return res;
+    }
+
+    boolean isInstance(Object obj) {
+        return AA1.class.isInstance(obj);
+    }
 }

From 2cf30abbb91fe601bb55a94e6b10443f7e4f7934 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Wed, 20 Oct 2021 10:14:30 +0200
Subject: [PATCH 554/681] Canonicalize
 `Class.isAssignableFrom(Object.getClass())` to `Class.isInstanceOf(Object)`.

---
 .../compiler/nodes/java/ClassIsAssignableFromNode.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java
index 8bf1ef165636..bfcb40546ce0 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java
@@ -30,6 +30,7 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
+import org.graalvm.compiler.nodes.extended.GetClassNode;
 import org.graalvm.compiler.nodes.spi.Canonicalizable;
 import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -74,6 +75,14 @@ public ValueNode getOtherClass() {
 
     @Override
     public Node canonical(CanonicalizerTool tool, ValueNode forX, ValueNode forY) {
+        if (forY instanceof GetClassNode) {
+            // Canonicalize `Class.isAssignableFrom(Object.getClass())` to
+            // `Class.isInstance(Object)`.
+            // For non-leaf types, `Object.getClass()` cannot only return a ValueNode stamped
+            // java.lang.Class, which prevents folding to a isNull check when the Object argument is
+            // constant and complicates ClassIsAssignableFrom in the other cases.
+            return InstanceOfDynamicNode.create(tool.getAssumptions(), tool.getConstantReflection(), forX, ((GetClassNode) forY).getObject(), false);
+        }
         if (forX.isConstant() && forY.isConstant()) {
             ConstantReflectionProvider constantReflection = tool.getConstantReflection();
             ResolvedJavaType thisType = constantReflection.asJavaType(forX.asJavaConstant());

From ba6f6ab9fc0a95381020c363a49410a755a90995 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Wed, 20 Oct 2021 17:30:55 +0200
Subject: [PATCH 555/681] Remove unnecessary snippet.

---
 vm/ci_common/common-bench.hocon | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index 8659829634dc..174c58d11f8b 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -75,10 +75,6 @@ vm_bench_polybench_linux_context_init: ${vm_bench_polybench_linux_common} ${vm_j
   ]
 }
 
-vm_polybench_linux_warmup_common: ${vm_bench_polybench_linux_common} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_polybench_linux_warmup_common.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-}
-
 vm_bench_polybench_linux_warmup: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   run: [
     ${vm_polybench_linux_commands.warmup_bench_cmd} ["--polybench-vm-config=native-standard", "--metric=one-shot"]

From 2a25ba06817f665955a64be6a2fe24d6f61d58c7 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Wed, 20 Oct 2021 17:31:26 +0200
Subject: [PATCH 556/681] Move base polybench cmd to the snippet with all
 commands.

---
 vm/ci_common/common-bench.hocon | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index 174c58d11f8b..e671ee56233a 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -22,25 +22,25 @@ vm_bench_js_linux: ${vm_java_8} ${svm-common-linux-amd64} ${sulong_linux} ${cust
   ]
 }
 
-vm_bench_polybench_linux_common: ${svm-common-linux-amd64} ${truffleruby_linux} ${custom_vm_linux} ${vm_bench_common} {
+vm_polybench_linux_commands: {
   base_cmd: [mx, --env, "polybench-${VM_ENV}"]
+  interpreter_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  compiler_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  warmup_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+}
+
+vm_bench_polybench_linux_common: ${svm-common-linux-amd64} ${truffleruby_linux} ${custom_vm_linux} ${vm_bench_common} {
   downloads: {
     WABT_DIR: {name: wabt, version: "1.0.12", platformspecific: true},
   }
   setup: ${common_vm.setup} [
-    ${vm_bench_polybench_linux_common.base_cmd} [build]
-    ${vm_bench_polybench_linux_common.base_cmd} [build, "--dependencies=POLYBENCH_BENCHMARKS"]
+    ${vm_polybench_linux_commands.base_cmd} [build]
+    ${vm_polybench_linux_commands.base_cmd} [build, "--dependencies=POLYBENCH_BENCHMARKS"]
   ]
   notify_emails: [ "aleksandar.prokopec@oracle.com" ]
   targets: [bench, daily]
 }
 
-vm_polybench_linux_commands: {
-  interpreter_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-  compiler_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-  warmup_bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-}
-
 vm_bench_polybench_linux_interpreter: ${vm_bench_polybench_linux_common} ${vm_java_8} {
   run: [
     ${vm_polybench_linux_commands.interpreter_bench_cmd} ["--polybench-vm-config=jvm-interpreter"]
@@ -66,7 +66,7 @@ vm_bench_polybench_linux_compiler: ${vm_bench_polybench_linux_common} ${vm_java_
 }
 
 vm_bench_polybench_linux_context_init: ${vm_bench_polybench_linux_common} ${vm_java_8} {
-  bench_cmd: ${vm_bench_polybench_linux_common.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json", "polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]", --results-file, ${vm_bench_polybench_linux_context_init.result_file}, --, "-w", "0", "-i", "0", "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json", "polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]", --results-file, ${vm_bench_polybench_linux_context_init.result_file}, --, "-w", "0", "-i", "0", "--polybench-vm=graalvm-${VM_ENV}-java8"]
   run: [
     ${vm_bench_polybench_linux_context_init.bench_cmd} ["--polybench-vm-config=jvm-standard", "--metric=none"]
     ${vm_bench_common.upload}

From 261e5aa337fb8056a2ab9aa07903074ab065bfc3 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 11 Oct 2021 14:27:34 +0200
Subject: [PATCH 557/681] Expose Array#length and #clone() as interop members.

Closes #1657.
---
 truffle/CHANGELOG.md                          |  1 +
 .../api/test/host/TestMemberAccess.java       | 19 +++++-
 .../api/test/polyglot/HostAccessTest.java     |  2 +-
 .../oracle/truffle/host/HostClassDesc.java    |  8 +++
 .../oracle/truffle/host/HostFieldDesc.java    | 30 +++++++-
 .../oracle/truffle/host/HostMethodDesc.java   | 68 +++++++++++++------
 6 files changed, 102 insertions(+), 26 deletions(-)

diff --git a/truffle/CHANGELOG.md b/truffle/CHANGELOG.md
index 3a93002f468d..c6f2f009033f 100644
--- a/truffle/CHANGELOG.md
+++ b/truffle/CHANGELOG.md
@@ -12,6 +12,7 @@ No active inner context is allowed after `TruffleLanguage.finalizeContext(Object
 * Added `TruffleContext.closeExited(Node, int)` to hard exit an entered truffle context. See [the documentation](https://github.com/oracle/graal/blob/master/truffle/docs/Exit.md).
 * Added `TruffleLanguage.exitContext(Object, ExitMode, int)` to allow languages perform actions before natural/hard context exit. Languages are encouraged to run all their shutdown hooks in exitContext instead of finalizeContext.
 * Improved the output format for `engine.TraceCompilation` and `engine.TraceCompilationDetails`. See [Optimizing.md](https://github.com/oracle/graal/blob/master/truffle/docs/Optimizing.md) for details.
+* Extended `HostObject` so that it exposes the `length` field and the `clone()` method of Java arrays as interop members. This can be disabled with `HostAccess.Builder.allowArrayAccess(false)`.
 
 ## Version 21.3.0
 * Added a `@GenerateWrapper.Ignore` annotation to prevent methods from being instrumented in wrapper classes.
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/TestMemberAccess.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/TestMemberAccess.java
index b656f9576c1b..078ca918366f 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/TestMemberAccess.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/host/TestMemberAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -41,6 +41,7 @@
 package com.oracle.truffle.api.test.host;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -353,11 +354,23 @@ public void testClassAsArg() throws InteropException {
     }
 
     @Test
-    public void testNewArray() throws InteropException {
+    public void testArray() throws InteropException {
         TruffleObject arrayClass = asTruffleHostSymbol(Array.class);
         TruffleObject newInstanceMethod = (TruffleObject) INTEROP.readMember(arrayClass, "newInstance");
-        TruffleObject stringArray = (TruffleObject) INTEROP.execute(newInstanceMethod, asTruffleHostSymbol(String.class), 2);
+        int arrayLength = 2;
+        TruffleObject stringArray = (TruffleObject) INTEROP.execute(newInstanceMethod, asTruffleHostSymbol(String.class), arrayLength);
         assertTrue(INTEROP.hasArrayElements(stringArray));
+        INTEROP.writeArrayElement(stringArray, 0, "foo");
+        INTEROP.writeArrayElement(stringArray, 1, "bar");
+        assertEquals(INTEROP.readMember(stringArray, "length"), arrayLength);
+        TruffleObject stringArrayCopy1 = (TruffleObject) INTEROP.invokeMember(stringArray, "clone");
+        TruffleObject stringArrayCopy2 = (TruffleObject) INTEROP.execute(INTEROP.readMember(stringArray, "clone"));
+        for (int i = 0; i < arrayLength; i++) {
+            assertEquals(INTEROP.readArrayElement(stringArray, i), INTEROP.readArrayElement(stringArrayCopy1, i));
+            assertEquals(INTEROP.readArrayElement(stringArray, i), INTEROP.readArrayElement(stringArrayCopy2, i));
+        }
+        INTEROP.writeArrayElement(stringArrayCopy1, 1, "waz"); // Mutate copy
+        assertNotEquals(INTEROP.readArrayElement(stringArray, 1), INTEROP.readArrayElement(stringArrayCopy1, 1));
     }
 
     @Test
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
index 79337beeb3c2..8a6d14deda9c 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/polyglot/HostAccessTest.java
@@ -352,7 +352,7 @@ public void testArrayAccessEnabled() {
             fail();
         } catch (UnsupportedOperationException e) {
         }
-        assertEquals(0, value.getMemberKeys().size());
+        assertEquals(2 /* arr.length and arr.clone(). */, value.getMemberKeys().size());
         ValueAssert.assertValue(value, false, Trait.ARRAY_ELEMENTS, Trait.ITERABLE, Trait.MEMBERS, Trait.HOST_OBJECT);
     }
 
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassDesc.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassDesc.java
index 4a50e02c084d..67b797bbb067 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassDesc.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostClassDesc.java
@@ -227,6 +227,10 @@ private static void collectPublicMethods(HostClassCache hostAccess, Class<?> typ
                         putMethod(hostAccess, m, methodMap, staticMethodMap);
                     }
                 }
+                if (hostAccess.isArrayAccess() && type.isArray()) {
+                    SingleMethod arrayCloneMethod = SingleMethod.SyntheticArrayCloneMethod.SINGLETON;
+                    methodMap.put(arrayCloneMethod.getName(), arrayCloneMethod);
+                }
             }
             /*
              * Look for inherited public methods if the class/interface is not public or if we have
@@ -331,6 +335,10 @@ private static void collectPublicFields(HostClassCache hostAccess, Class<?> type
                 if (inheritedPublicInstanceFields) {
                     collectPublicInstanceFields(hostAccess, type, fieldMap, inheritedPublicInaccessibleFields);
                 }
+                if (hostAccess.isArrayAccess() && type.isArray()) {
+                    HostFieldDesc arrayLengthField = HostFieldDesc.SyntheticArrayLengthField.SINGLETON;
+                    fieldMap.put(arrayLengthField.getName(), arrayLengthField);
+                }
             } else {
                 if (!Modifier.isInterface(type.getModifiers())) {
                     collectPublicInstanceFields(hostAccess, type, fieldMap, true);
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostFieldDesc.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostFieldDesc.java
index 9dbba1c3aaaa..650541bad4fd 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostFieldDesc.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostFieldDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -45,6 +45,7 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
@@ -223,4 +224,31 @@ public String toString() {
             return "Field[" + field.toString() + "]";
         }
     }
+
+    static final class SyntheticArrayLengthField extends HostFieldDesc {
+        static final SyntheticArrayLengthField SINGLETON = new SyntheticArrayLengthField();
+
+        private SyntheticArrayLengthField() {
+            super(int.class, int.class, "length", true /* disallow writes */);
+        }
+
+        @Override
+        public Object get(Object receiver) {
+            try {
+                return Array.getLength(receiver);
+            } catch (IllegalArgumentException e) {
+                throw shouldNotReachHere(e);
+            }
+        }
+
+        @Override
+        public void set(Object receiver, Object value) {
+            shouldNotReachHere();
+        }
+
+        @Override
+        public String toString() {
+            return "Field[length]";
+        }
+    }
 }
diff --git a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostMethodDesc.java b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostMethodDesc.java
index 29e0f509980d..1230af313007 100644
--- a/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostMethodDesc.java
+++ b/truffle/src/com.oracle.truffle.host/src/com/oracle/truffle/host/HostMethodDesc.java
@@ -43,6 +43,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.InvocationTargetException;
@@ -110,6 +111,14 @@ protected SingleMethod(Executable executable, boolean parametersScoped) {
             }
         }
 
+        private SingleMethod(boolean varArgs, Class<?>[] parameterTypes, Type[] genericParameterTypes, int[] scopedStaticParameters, int scopedStaticParameterCount) {
+            this.varArgs = varArgs;
+            this.parameterTypes = parameterTypes;
+            this.genericParameterTypes = genericParameterTypes;
+            this.scopedStaticParameters = scopedStaticParameters;
+            this.scopedStaticParameterCount = scopedStaticParameterCount;
+        }
+
         private static boolean isScoped(Class<?> c) {
             if (c.isPrimitive()) {
                 return false;
@@ -128,8 +137,6 @@ public final boolean isVarArgs() {
             return varArgs;
         }
 
-        public abstract Class<?> getReturnType();
-
         public final Class<?>[] getParameterTypes() {
             return parameterTypes;
         }
@@ -262,11 +269,6 @@ private static Object reflectInvoke(Method reflectionMethod, Object receiver, Ob
                 return reflectionMethod.invoke(receiver, arguments);
             }
 
-            @Override
-            public Class<?> getReturnType() {
-                return getReflectionMethod().getReturnType();
-            }
-
             @Override
             public boolean isInternal() {
                 return getReflectionMethod().getDeclaringClass() == Object.class;
@@ -304,10 +306,6 @@ private static Object reflectNewInstance(Constructor<?> reflectionConstructor, O
                 return reflectionConstructor.newInstance(arguments);
             }
 
-            @Override
-            public Class<?> getReturnType() {
-                return getReflectionMethod().getDeclaringClass();
-            }
         }
 
         abstract static class MHBase extends SingleMethod {
@@ -380,11 +378,6 @@ public Method getReflectionMethod() {
                 return reflectionMethod;
             }
 
-            @Override
-            public Class<?> getReturnType() {
-                return getReflectionMethod().getReturnType();
-            }
-
             @Override
             public boolean isInternal() {
                 return getReflectionMethod().getDeclaringClass() == Object.class;
@@ -417,11 +410,6 @@ public Constructor<?> getReflectionMethod() {
                 return reflectionConstructor;
             }
 
-            @Override
-            public Class<?> getReturnType() {
-                return getReflectionMethod().getDeclaringClass();
-            }
-
             @Override
             @TruffleBoundary
             protected MethodHandle makeMethodHandle() {
@@ -434,6 +422,44 @@ protected MethodHandle makeMethodHandle() {
                 }
             }
         }
+
+        static final class SyntheticArrayCloneMethod extends SingleMethod {
+            static final SyntheticArrayCloneMethod SINGLETON = new SyntheticArrayCloneMethod();
+
+            private SyntheticArrayCloneMethod() {
+                super(false, new Class<?>[0], new Type[0], EMTPY_SCOPED_PARAMETERS, 0);
+            }
+
+            @Override
+            public String getName() {
+                return "clone";
+            }
+
+            @Override
+            public String toString() {
+                return "Method[clone]";
+            }
+
+            @Override
+            public Executable getReflectionMethod() {
+                throw CompilerDirectives.shouldNotReachHere();
+            }
+
+            @Override
+            public Object invoke(Object receiver, Object[] arguments) {
+                assert receiver != null && receiver.getClass().isArray() && arguments.length == 0;
+                // Object#clone() is protected so clone the array via reflection.
+                int length = Array.getLength(receiver);
+                Object copy = Array.newInstance(receiver.getClass().getComponentType(), length);
+                System.arraycopy(receiver, 0, copy, 0, length);
+                return copy;
+            }
+
+            @Override
+            public Object invokeGuestToHost(Object receiver, Object[] arguments, GuestToHostCodeCache cache, HostContext context, Node node) {
+                return HostObject.forObject(invoke(receiver, arguments), context);
+            }
+        }
     }
 
     static final class OverloadedMethod extends HostMethodDesc {

From 8b1082876d07592c76730f5f8cb2e0ab187f7eba Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 19 Oct 2021 14:43:35 +0200
Subject: [PATCH 558/681] Ignore changes to .github/** files in internal gates.

---
 ci.jsonnet | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci.jsonnet b/ci.jsonnet
index c551f8554803..25ce9f3c4898 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -14,10 +14,10 @@ local sulong = import 'sulong/ci.jsonnet';
 local javadoc = import "ci_includes/publish-javadoc.jsonnet";
 
 # Add a guard to `build` that prevents it from running in the gate
-# for a PR that only touches *.md flles.
-local add_markdown_guard(build) = build + {
+# for a PR that only touches *.md files, the docs, are config files for GitHub.
+local add_excludes_guard(build) = build + {
   guard+: {
-    excludes+: ["**.md", "docs/**"]
+    excludes+: ["**.md", "docs/**", ".github/**"]
   }
 };
 
@@ -26,7 +26,7 @@ local add_markdown_guard(build) = build + {
   _checkCommon: (import 'common.jsonnet'),
   ci_resources:: (import 'ci-resources.libsonnet'),
   specVersion: "2",
-  builds: [add_markdown_guard(b) for b in (
+  builds: [add_excludes_guard(b) for b in (
     compiler.builds +
     wasm.builds +
     espresso.builds +

From 2665054365089a86fa45021f923e934c96a6b233 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 12 Oct 2021 19:25:24 +0200
Subject: [PATCH 559/681] Extract TraceSplittingSummary branches into separate
 methods.

---
 .../runtime/TruffleSplittingStrategy.java     | 74 ++++++++++++-------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TruffleSplittingStrategy.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TruffleSplittingStrategy.java
index 2c8f3d5465e3..778fa7ee718a 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TruffleSplittingStrategy.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/TruffleSplittingStrategy.java
@@ -52,31 +52,43 @@ final class TruffleSplittingStrategy {
     static void beforeCall(OptimizedDirectCallNode call, OptimizedCallTarget currentTarget) {
         final EngineData engineData = currentTarget.engine;
         if (engineData.traceSplittingSummary) {
-            if (currentTarget.getCallCount() == 0) {
-                synchronized (engineData.splittingStatistics) {
-                    engineData.splittingStatistics.totalExecutedNodeCount += currentTarget.getUninitializedNodeCount();
-                }
-            }
+            traceSplittingPreShouldSplit(engineData, currentTarget);
         }
         if (shouldSplit(engineData, call)) {
-            engineData.splitCount += call.getCallTarget().getUninitializedNodeCount();
             doSplit(engineData, call);
         }
     }
 
-    private static void doSplit(EngineData engineData, OptimizedDirectCallNode call) {
-        if (engineData.traceSplittingSummary) {
+    private static void traceSplittingPreShouldSplit(final EngineData engineData, OptimizedCallTarget currentTarget) {
+        if (currentTarget.getCallCount() == 0) {
             synchronized (engineData.splittingStatistics) {
-                calculateSplitWasteImpl(call.getCurrentCallTarget());
+                engineData.splittingStatistics.totalExecutedNodeCount += currentTarget.getUninitializedNodeCount();
             }
         }
+    }
+
+    private static void doSplit(EngineData engineData, OptimizedDirectCallNode call) {
+        engineData.splitCount += call.getCallTarget().getUninitializedNodeCount();
+        if (engineData.traceSplittingSummary) {
+            traceSplittingPreSplit(engineData, call);
+        }
         call.split();
         if (engineData.traceSplittingSummary) {
-            synchronized (engineData.splittingStatistics) {
-                engineData.splittingStatistics.splitNodeCount += call.getCurrentCallTarget().getUninitializedNodeCount();
-                engineData.splittingStatistics.splitCount++;
-                engineData.splittingStatistics.splitTargets.put(call.getCallTarget(), engineData.splittingStatistics.splitTargets.getOrDefault(call.getCallTarget(), 0) + 1);
-            }
+            traceSplittingPostSplit(engineData, call);
+        }
+    }
+
+    private static void traceSplittingPreSplit(EngineData engineData, OptimizedDirectCallNode call) {
+        synchronized (engineData.splittingStatistics) {
+            calculateSplitWasteImpl(call.getCurrentCallTarget());
+        }
+    }
+
+    private static void traceSplittingPostSplit(EngineData engineData, OptimizedDirectCallNode call) {
+        synchronized (engineData.splittingStatistics) {
+            engineData.splittingStatistics.splitNodeCount += call.getCurrentCallTarget().getUninitializedNodeCount();
+            engineData.splittingStatistics.splitCount++;
+            engineData.splittingStatistics.splitTargets.put(call.getCallTarget(), engineData.splittingStatistics.splitTargets.getOrDefault(call.getCallTarget(), 0) + 1);
         }
     }
 
@@ -137,13 +149,17 @@ static void forceSplitting(OptimizedDirectCallNode call) {
             engineData.splitCount += call.getCurrentCallTarget().getUninitializedNodeCount();
             doSplit(engineData, call);
             if (engineData.traceSplittingSummary) {
-                synchronized (engineData.splittingStatistics) {
-                    engineData.splittingStatistics.forcedSplitCount++;
-                }
+                traceSplittingForcedSplit(engineData);
             }
         }
     }
 
+    private static void traceSplittingForcedSplit(final EngineData engineData) {
+        synchronized (engineData.splittingStatistics) {
+            engineData.splittingStatistics.forcedSplitCount++;
+        }
+    }
+
     private static boolean canSplit(EngineData engine, OptimizedDirectCallNode call) {
         if (call.isCallTargetCloned()) {
             return false;
@@ -200,9 +216,13 @@ static void newTargetCreated(RootCallTarget target) {
             engineData.splitLimit = (int) (engineData.splitLimit + engineData.splittingGrowthLimit * callTarget.getUninitializedNodeCount());
         }
         if (engineData.traceSplittingSummary) {
-            synchronized (engineData.splittingStatistics) {
-                engineData.splittingStatistics.totalCreatedNodeCount += callTarget.getUninitializedNodeCount();
-            }
+            traceSplittingNewCallTarget(callTarget, engineData);
+        }
+    }
+
+    private static void traceSplittingNewCallTarget(OptimizedCallTarget callTarget, EngineData engineData) {
+        synchronized (engineData.splittingStatistics) {
+            engineData.splittingStatistics.totalCreatedNodeCount += callTarget.getUninitializedNodeCount();
         }
     }
 
@@ -222,11 +242,15 @@ private static void calculateSplitWasteImpl(OptimizedCallTarget callTarget) {
 
     static void newPolymorphicSpecialize(Node node, EngineData engineData) {
         if (engineData.traceSplittingSummary) {
-            synchronized (engineData.splittingStatistics) {
-                final Map<Class<? extends Node>, Integer> polymorphicNodes = engineData.splittingStatistics.polymorphicNodes;
-                final Class<? extends Node> aClass = node.getClass();
-                polymorphicNodes.put(aClass, polymorphicNodes.getOrDefault(aClass, 0) + 1);
-            }
+            traceSplittingNewPolymorphicSpecialize(node, engineData);
+        }
+    }
+
+    private static void traceSplittingNewPolymorphicSpecialize(Node node, EngineData engineData) {
+        synchronized (engineData.splittingStatistics) {
+            final Map<Class<? extends Node>, Integer> polymorphicNodes = engineData.splittingStatistics.polymorphicNodes;
+            final Class<? extends Node> aClass = node.getClass();
+            polymorphicNodes.put(aClass, polymorphicNodes.getOrDefault(aClass, 0) + 1);
         }
     }
 

From e58286359f9815afadb37e23e33696325b542c4b Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 20 Oct 2021 05:20:38 +0200
Subject: [PATCH 560/681] Extract initialization method.

---
 .../truffle/runtime/OptimizedBlockNode.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
index 50f81a9eceb2..32c8313229fd 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/OptimizedBlockNode.java
@@ -86,11 +86,7 @@ private int profileArg(int arg) {
         if (a == null) {
             if (CompilerDirectives.inInterpreter()) {
                 // no need to deoptimize if the block was never executed
-                if (arg == NO_ARGUMENT) {
-                    alwaysNoArgument = Truffle.getRuntime().createAssumption("Always zero block node argument.");
-                } else {
-                    alwaysNoArgument = NeverValidAssumption.INSTANCE;
-                }
+                alwaysNoArgument = makeAlwaysZeroAssumption(arg == NO_ARGUMENT);
             }
         } else if (a.isValid()) {
             if (arg == NO_ARGUMENT) {
@@ -103,6 +99,14 @@ private int profileArg(int arg) {
         return arg;
     }
 
+    private static Assumption makeAlwaysZeroAssumption(boolean valid) {
+        if (valid) {
+            return Truffle.getRuntime().createAssumption("Always zero block node argument.");
+        } else {
+            return NeverValidAssumption.INSTANCE;
+        }
+    }
+
     @Override
     @ExplodeLoop
     public void executeVoid(VirtualFrame frame, int argument) {

From 1c7351997251c8eb1881aeec976a413b50b00767 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 12 Oct 2021 20:16:49 +0200
Subject: [PATCH 561/681] Move frame resizing into
 ArrayIndexOutOfBoundsException branches.

---
 .../truffle/runtime/FrameWithoutBoxing.java   | 80 ++++++++++++-------
 .../oracle/truffle/api/frame/FrameUtil.java   | 20 +++--
 2 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
index c9338a7d6dbb..571da786d918 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
@@ -27,6 +27,7 @@
 import java.lang.reflect.Field;
 import java.util.Arrays;
 
+import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.FrameDescriptor;
@@ -306,26 +307,50 @@ public FrameDescriptor getFrameDescriptor() {
     }
 
     private void verifySet(int slotIndex, byte tag) {
-        checkSlotIndex(slotIndex);
-        getTags()[slotIndex] = tag;
+        try {
+            getTags()[slotIndex] = tag;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            resizeAndGetTagsOrThrow(slotIndex)[slotIndex] = tag;
+        }
     }
 
-    private boolean verifyGet(int slotIndex, byte tag) throws FrameSlotTypeException {
-        checkSlotIndex(slotIndex);
-        boolean condition = getTags()[slotIndex] == tag;
+    private boolean verifyGet(int slotIndex, byte expectedTag) throws FrameSlotTypeException {
+        byte actualTag = getTagChecked(slotIndex);
+        boolean condition = actualTag == expectedTag;
         if (!condition) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new FrameSlotTypeException();
+            throw frameSlotTypeException();
         }
         return condition;
     }
 
-    private void checkSlotIndex(int slotIndex) {
-        if (CompilerDirectives.inInterpreter() && slotIndex >= getTags().length) {
-            if (!resize()) {
-                throw new IllegalArgumentException(String.format("The frame slot '%s' is not known by the frame descriptor.", slotIndex));
+    private byte getTagChecked(int slotIndex) {
+        try {
+            return getTags()[slotIndex];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return resizeAndGetTagsOrThrow(slotIndex)[slotIndex];
+        }
+    }
+
+    private static FrameSlotTypeException frameSlotTypeException() throws FrameSlotTypeException {
+        CompilerAsserts.neverPartOfCompilation();
+        throw new FrameSlotTypeException();
+    }
+
+    private byte[] resizeAndGetTagsOrThrow(int slotIndex) {
+        CompilerDirectives.transferToInterpreterAndInvalidate();
+        if (resize()) {
+            byte[] newTags = getTags();
+            if (Integer.compareUnsigned(slotIndex, newTags.length) < 0) {
+                return newTags;
             }
         }
+        throw outOfBoundsException(slotIndex);
+    }
+
+    private static IllegalArgumentException outOfBoundsException(int slotIndex) {
+        CompilerAsserts.neverPartOfCompilation();
+        throw new IllegalArgumentException(String.format("The frame slot '%s' is not known by the frame descriptor.", slotIndex));
     }
 
     private static long getPrimitiveOffset(int slotIndex) {
@@ -335,11 +360,7 @@ private static long getPrimitiveOffset(int slotIndex) {
     @Override
     public Object getValue(FrameSlot slot) {
         int slotIndex = getFrameSlotIndex(slot);
-        if (CompilerDirectives.inInterpreter() && slotIndex >= getTags().length) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            resize();
-        }
-        byte tag = getTags()[slotIndex];
+        byte tag = getTag(slotIndex);
         boolean condition = (tag == BOOLEAN_TAG);
         if (condition) {
             return getBooleanUnsafe(slotIndex, slot, condition);
@@ -371,6 +392,7 @@ public Object getValue(FrameSlot slot) {
     }
 
     boolean resize() {
+        CompilerAsserts.neverPartOfCompilation();
         int oldSize = tags.length;
         int newSize = descriptor.getSize();
         if (newSize > oldSize) {
@@ -383,51 +405,53 @@ boolean resize() {
         return false;
     }
 
-    byte getTag(FrameSlot slot) {
-        int slotIndex = getFrameSlotIndex(slot);
-        byte[] cachedTags = getTags();
-        if (slotIndex < cachedTags.length) {
-            return cachedTags[slotIndex];
+    private byte getTag(int slotIndex) {
+        try {
+            return getTags()[slotIndex];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return resizeAndGetTags()[slotIndex];
         }
+    }
 
+    private byte[] resizeAndGetTags() {
         CompilerDirectives.transferToInterpreterAndInvalidate();
         resize();
-        return getTags()[slotIndex];
+        return getTags();
     }
 
     @Override
     public boolean isObject(FrameSlot slot) {
-        return getTag(slot) == OBJECT_TAG;
+        return getTag(getFrameSlotIndex(slot)) == OBJECT_TAG;
     }
 
     @Override
     public boolean isByte(FrameSlot slot) {
-        return getTag(slot) == BYTE_TAG;
+        return getTag(getFrameSlotIndex(slot)) == BYTE_TAG;
     }
 
     @Override
     public boolean isBoolean(FrameSlot slot) {
-        return getTag(slot) == BOOLEAN_TAG;
+        return getTag(getFrameSlotIndex(slot)) == BOOLEAN_TAG;
     }
 
     @Override
     public boolean isInt(FrameSlot slot) {
-        return getTag(slot) == INT_TAG;
+        return getTag(getFrameSlotIndex(slot)) == INT_TAG;
     }
 
     @Override
     public boolean isLong(FrameSlot slot) {
-        return getTag(slot) == LONG_TAG;
+        return getTag(getFrameSlotIndex(slot)) == LONG_TAG;
     }
 
     @Override
     public boolean isFloat(FrameSlot slot) {
-        return getTag(slot) == FLOAT_TAG;
+        return getTag(getFrameSlotIndex(slot)) == FLOAT_TAG;
     }
 
     @Override
     public boolean isDouble(FrameSlot slot) {
-        return getTag(slot) == DOUBLE_TAG;
+        return getTag(getFrameSlotIndex(slot)) == DOUBLE_TAG;
     }
 
     @Override
diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameUtil.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameUtil.java
index 96b8c0048bb6..45e847858122 100644
--- a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameUtil.java
+++ b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -58,7 +58,7 @@ public static Object getObjectSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getObject(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -75,7 +75,7 @@ public static byte getByteSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getByte(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -92,7 +92,7 @@ public static boolean getBooleanSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getBoolean(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -109,7 +109,7 @@ public static int getIntSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getInt(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -126,7 +126,7 @@ public static long getLongSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getLong(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -143,7 +143,7 @@ public static double getDoubleSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getDouble(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
 
@@ -160,7 +160,11 @@ public static float getFloatSafe(Frame frame, FrameSlot frameSlot) {
         try {
             return frame.getFloat(frameSlot);
         } catch (FrameSlotTypeException e) {
-            throw new IllegalStateException();
+            throw unexpectedFrameSlotTypeException();
         }
     }
+
+    private static IllegalStateException unexpectedFrameSlotTypeException() {
+        throw new IllegalStateException();
+    }
 }

From ee72517f3e768fa36f570f101f24be90c07dfb2e Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 15 Oct 2021 02:38:45 +0200
Subject: [PATCH 562/681] Avoid String.format in FrameWithoutBoxing.

---
 .../graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
index 571da786d918..4ccf6327019c 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
@@ -350,7 +350,7 @@ private byte[] resizeAndGetTagsOrThrow(int slotIndex) {
 
     private static IllegalArgumentException outOfBoundsException(int slotIndex) {
         CompilerAsserts.neverPartOfCompilation();
-        throw new IllegalArgumentException(String.format("The frame slot '%s' is not known by the frame descriptor.", slotIndex));
+        throw new IllegalArgumentException("The frame slot '" + slotIndex + "' is not known by the frame descriptor.");
     }
 
     private static long getPrimitiveOffset(int slotIndex) {

From 27de3e7adeb236a86f87b20121a8e11924b858f8 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 21 Oct 2021 02:57:05 +0200
Subject: [PATCH 563/681] Restructure FrameWithoutBoxing constructor to allow
 write barrier elimination.

---
 .../truffle/runtime/FrameWithoutBoxing.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
index 4ccf6327019c..5c1f90868564 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/FrameWithoutBoxing.java
@@ -94,22 +94,28 @@ private static Unsafe initUnsafe() {
     }
 
     public FrameWithoutBoxing(FrameDescriptor descriptor, Object[] arguments) {
-        this.descriptor = descriptor;
-        this.arguments = arguments;
-        int size = descriptor.getSize();
+        final int size = descriptor.getSize();
+        final Object[] localsArray;
+        final long[] primitiveLocalsArray;
+        final byte[] tagsArray;
         if (size == 0) {
-            this.locals = EMPTY_OBJECT_ARRAY;
-            this.primitiveLocals = EMPTY_LONG_ARRAY;
-            this.tags = EMPTY_BYTE_ARRAY;
+            localsArray = EMPTY_OBJECT_ARRAY;
+            primitiveLocalsArray = EMPTY_LONG_ARRAY;
+            tagsArray = EMPTY_BYTE_ARRAY;
         } else {
-            this.locals = new Object[size];
+            localsArray = new Object[size];
             Object defaultValue = descriptor.getDefaultValue();
             if (defaultValue != null) {
-                Arrays.fill(locals, defaultValue);
+                Arrays.fill(localsArray, defaultValue);
             }
-            this.primitiveLocals = new long[size];
-            this.tags = new byte[size];
+            primitiveLocalsArray = new long[size];
+            tagsArray = new byte[size];
         }
+        this.descriptor = descriptor;
+        this.arguments = arguments;
+        this.locals = localsArray;
+        this.primitiveLocals = primitiveLocalsArray;
+        this.tags = tagsArray;
     }
 
     @Override

From 5542ecab1eb716f8e0741402ccee9bb857ffb1c1 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Wed, 20 Oct 2021 14:24:55 +0200
Subject: [PATCH 564/681] do not have a special case for db-shootout on ARM

---
 compiler/ci_common/benchmark-suites.libsonnet | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/compiler/ci_common/benchmark-suites.libsonnet b/compiler/ci_common/benchmark-suites.libsonnet
index 3a5141d387de..ad9d8580b6e7 100644
--- a/compiler/ci_common/benchmark-suites.libsonnet
+++ b/compiler/ci_common/benchmark-suites.libsonnet
@@ -121,10 +121,7 @@
       "SPARK_LOCAL_IP": "127.0.0.1"
     },
     run+: [
-      if self.arch == "aarch64" then
-        self.benchmark_cmd + ["renaissance:~db-shootout", "--bench-suite-version=$RENAISSANCE_VERSION", "--"] + self.extra_vm_args
-      else
-        self.benchmark_cmd + ["renaissance:*", "--bench-suite-version=$RENAISSANCE_VERSION", "--"] + self.extra_vm_args
+      self.benchmark_cmd + ["renaissance:*", "--bench-suite-version=$RENAISSANCE_VERSION", "--"] + self.extra_vm_args
     ],
     timelimit: "3:00:00",
     forks_batches:: 4,

From 3490160fb0543b5d8b6db604b0638321d05536a7 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Wed, 20 Oct 2021 18:12:47 +0200
Subject: [PATCH 565/681] Distinguish dacapo and renaissance benchmark lists
 from the supported benchmark lists

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index dca79cad7239..1c48b4ec323e 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -571,6 +571,9 @@ def daCapoIterations(self):
     def daCapoSizes(self):
         raise NotImplementedError()
 
+    def completeBenchmarkList(self, bmSuiteArgs):
+        return sorted([bench for bench in _daCapoIterations.keys() if self.workloadSize() in self.daCapoSizes().get(bench, [])])
+
     def existingSizes(self):
         return list(dict.fromkeys([s for bench, sizes in self.daCapoSizes().items() for s in sizes]))
 
@@ -1863,6 +1866,9 @@ def renaissanceIterations(self):
                 del benchmarks["neo4j-analytics"]
         return benchmarks
 
+    def completeBenchmarkList(self, bmSuiteArgs):
+        return sorted([bench for bench in _renaissanceConfig.keys()])
+
     def defaultSuiteVersion(self):
         #  return self.availableSuiteVersions()[-1]
         return "0.11.0"  # stick to 0.11.0 for both JIT and AOT until Native Image is compatible with 0.13.0 (GR-34147)

From 6abe8f6bfebb20e00fd37f86a03cccfdf82af524 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 21 Oct 2021 10:47:44 +0200
Subject: [PATCH 566/681] Pick correct benchmark list for dacapo based suites

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 1c48b4ec323e..66506adb0387 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -572,7 +572,7 @@ def daCapoSizes(self):
         raise NotImplementedError()
 
     def completeBenchmarkList(self, bmSuiteArgs):
-        return sorted([bench for bench in _daCapoIterations.keys() if self.workloadSize() in self.daCapoSizes().get(bench, [])])
+        return sorted([bench for bench in self.daCapoIterations().keys() if self.workloadSize() in self.daCapoSizes().get(bench, [])])
 
     def existingSizes(self):
         return list(dict.fromkeys([s for bench, sizes in self.daCapoSizes().items() for s in sizes]))

From 16d6a730a94e8b03e5fa0bd85cdedfe69b3a14f4 Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Thu, 21 Oct 2021 14:28:01 +0200
Subject: [PATCH 567/681] Fixed result_file.

---
 vm/ci_common/common-bench.hocon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/ci_common/common-bench.hocon b/vm/ci_common/common-bench.hocon
index e671ee56233a..cd6167a83e47 100644
--- a/vm/ci_common/common-bench.hocon
+++ b/vm/ci_common/common-bench.hocon
@@ -25,8 +25,8 @@ vm_bench_js_linux: ${vm_java_8} ${svm-common-linux-amd64} ${sulong_linux} ${cust
 vm_polybench_linux_commands: {
   base_cmd: [mx, --env, "polybench-${VM_ENV}"]
   interpreter_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "polybench:~[compiler/dispatch.js,warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-  compiler_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
-  warmup_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_interpreter.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  compiler_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "polybench:*[compiler/dispatch.js]", --results-file, ${vm_bench_polybench_linux_compiler.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
+  warmup_bench_cmd: ${vm_polybench_linux_commands.base_cmd} [benchmark, "--fork-count-file", "ci_common/benchmark-forks.json",  "polybench:*[warmup/specjbb2005.js]", --results-file, ${vm_bench_polybench_linux_warmup.result_file}, --, "--polybench-vm=graalvm-${VM_ENV}-java8"]
 }
 
 vm_bench_polybench_linux_common: ${svm-common-linux-amd64} ${truffleruby_linux} ${custom_vm_linux} ${vm_bench_common} {

From ba7d43f6570d45a174cbe8479344825d8162f773 Mon Sep 17 00:00:00 2001
From: Soufiane Nassih <soufiane.nassih@oracle.com>
Date: Thu, 21 Oct 2021 13:37:24 +0100
Subject: [PATCH 568/681] Update visualvm to build #1072

---
 tools/mx.tools/suite.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/mx.tools/suite.py b/tools/mx.tools/suite.py
index 636bd906fee3..8db72ebd269c 100644
--- a/tools/mx.tools/suite.py
+++ b/tools/mx.tools/suite.py
@@ -315,31 +315,31 @@
           "sourceSha1" : "298db2b3c573f9e76a5a7a60a49c7ceb5ddd35f7",
         },
         "VISUALVM_COMMON" : {
-            "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1071.tar.gz"],
-            "sha1" : "2a351659ef8604351ad212c16e24918357338fc3",
+            "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1072.tar.gz"],
+            "sha1" : "4e5b87aab697b2961b25c1a6eaaa30a5952bde58",
         },
         "VISUALVM_PLATFORM_SPECIFIC" : {
             "os_arch" : {
                 "linux" : {
                     "amd64" : {
-                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1071-linux-amd64.tar.gz"],
-                        "sha1" : "215cb6990ce88ebf6b2891fc9ca249ec358ed54c",
+                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1072-linux-amd64.tar.gz"],
+                        "sha1" : "d93d9d0cc752f9acf2ae0a93741078a41e74450c",
                     },
                     "aarch64" : {
-                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1071-linux-aarch64.tar.gz"],
-                        "sha1" : "de59d5a642fe861ca4a9a475fa17dcd7f18137ab",
+                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1072-linux-aarch64.tar.gz"],
+                        "sha1" : "2a676fca5e4bec1afa8eeef83a6cd27e53e4835e",
                     }
                 },
                 "darwin" : {
                     "amd64" : {
-                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1071-macosx-x86_64.tar.gz"],
-                        "sha1" : "0191b79501cba23771257c7e988a8dda0771af17",
+                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1072-macosx-x86_64.tar.gz"],
+                        "sha1" : "6bd0c10ba7128bbc9903a1dee089bbe572971cc9",
                     }
                 },
                 "windows" : {
                     "amd64" : {
-                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1071-windows-amd64.tar.gz"],
-                        "sha1" : "656dfd0e813d2d82eff934084aeceac23027a47b",
+                        "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-1072-windows-amd64.tar.gz"],
+                        "sha1" : "7fa3b6581f7ba0bf8a28635f95271ecb2c1c4adb",
                     }
                 },
             }

From 8db163e21456d670f4bb3fc9c66743fea8119fe8 Mon Sep 17 00:00:00 2001
From: David Leopoldseder <david.leopoldseder@oracle.com>
Date: Wed, 20 Oct 2021 11:37:01 +0200
Subject: [PATCH 569/681] snippet lowering: always use (and VERIFY) snippet
 framestates with the snippet framestate assignment API

---
 .../common/SnippetFrameStateAssignment.java   |   3 +-
 .../replacements/SnippetTemplate.java         | 109 ++++++------------
 .../arraycopy/ArrayCopySnippets.java          |   2 -
 3 files changed, 40 insertions(+), 74 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java
index 5d237887cd3d..9f13d8716fb6 100644
--- a/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java
+++ b/compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java
@@ -43,8 +43,8 @@
 import org.graalvm.compiler.nodes.StateSplit;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
 import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
+import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
 import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
 
 /**
@@ -155,6 +155,7 @@ protected NodeStateAssignment processNode(FixedNode node, NodeStateAssignment st
                     }
                     nextStateAssignment = NodeStateAssignment.INVALID;
                 }
+                stateMapping.put(node, nextStateAssignment);
             }
             return nextStateAssignment;
         }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
index 6b95b1cc30b8..85372b2d8d8f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java
@@ -972,16 +972,7 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
             ArrayList<DeoptimizingNode> curDeoptNodes = new ArrayList<>();
             ArrayList<ValueNode> curPlaceholderStampedNodes = new ArrayList<>();
 
-            boolean containsMerge = false;
-            boolean containsLoopExit = false;
-
             for (Node node : snippetCopy.getNodes()) {
-                if (node instanceof AbstractMergeNode) {
-                    containsMerge = true;
-                }
-                if (node instanceof LoopExitNode) {
-                    containsLoopExit = true;
-                }
                 if (node instanceof ValueNode) {
                     ValueNode valueNode = (ValueNode) node;
                     if (valueNode.stamp(NodeView.DEFAULT) == PlaceholderStamp.singleton()) {
@@ -1093,7 +1084,6 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
                         memMaps.add(memoryMapNode);
                     }
                 }
-                containsMerge = true;
                 ValueNode returnValue = InliningUtil.mergeReturns(merge, returnNodes);
                 this.returnNode = snippet.add(new ReturnNode(returnValue));
                 if (!memMaps.isEmpty()) {
@@ -1112,7 +1102,7 @@ protected SnippetTemplate(OptionValues options, DebugContext debug, final Provid
             debug.dump(DebugContext.INFO_LEVEL, snippet, "After fixing returns");
             canonicalizer.apply(snippet, providers);
 
-            boolean needsMergeStateMap = !guardsStage.areFrameStatesAtDeopts() && (containsMerge || containsLoopExit);
+            boolean needsMergeStateMap = !guardsStage.areFrameStatesAtDeopts();
 
             if (needsMergeStateMap) {
                 frameStateAssignment = new SnippetFrameStateAssignmentClosure(snippetCopy);
@@ -1978,50 +1968,6 @@ private boolean requiresFrameStateProcessingBeforeFSA(ValueNode replacee) {
     }
 
     private void rewireFrameStatesBeforeFSA(ValueNode replacee, UnmodifiableEconomicMap<Node, Node> duplicates, FixedNode replaceeGraphCFGPredecessor) {
-        if (replacee instanceof StateSplit && ((StateSplit) replacee).hasSideEffect() && ((StateSplit) replacee).stateAfter() != null) {
-            /*
-             * We have a side-effecting node that is lowered to a snippet that also contains
-             * side-effecting nodes. Either of 2 cases applies: either there is a frame state merge
-             * assignment meaning there are merges in the snippet that require states, then those
-             * will be assigned based on a reverse post order iteration of the snippet examining
-             * effects and trying to find a proper state, or no merges are in the graph, i.e., there
-             * is no complex control flow so every side-effecting node in the snippet can have the
-             * state after of the original node with the correct values replaced (i.e. the replacee
-             * itself in the snippet)
-             */
-            for (StateSplit sideEffectNode : sideEffectNodes) {
-                assert ((StateSplit) replacee).hasSideEffect();
-                Node sideEffectDup = duplicates.get(sideEffectNode.asNode());
-                assert sideEffectDup != null : sideEffectNode;
-                FrameState stateAfter = ((StateSplit) replacee).stateAfter();
-                assert stateAfter != null : "Replacee " + replacee + " has no state after";
-
-                if (sideEffectDup instanceof DeoptBciSupplier) {
-                    if (replacee instanceof DeoptBciSupplier) {
-                        ((DeoptBciSupplier) sideEffectDup).setBci(((DeoptBciSupplier) replacee).bci());
-                    }
-                }
-                if (stateAfter.values().contains(replacee)) {
-                    FrameState duplicated = stateAfter.duplicate();
-                    ValueNode valueInReplacement = (ValueNode) duplicates.get(returnNode.result());
-                    if (valueInReplacement instanceof ValuePhiNode) {
-                        valueInReplacement = (ValueNode) sideEffectDup;
-                    }
-                    ValueNode replacement = valueInReplacement;
-                    duplicated.applyToNonVirtual(new NodePositionClosure<Node>() {
-                        @Override
-                        public void apply(Node from, Position p) {
-                            if (p.get(from) == replacee) {
-                                p.set(from, replacement);
-                            }
-                        }
-                    });
-                    ((StateSplit) sideEffectDup).setStateAfter(duplicated);
-                } else {
-                    ((StateSplit) sideEffectDup).setStateAfter(((StateSplit) replacee).stateAfter());
-                }
-            }
-        }
         if (frameStateAssignment != null) {
             assignNecessaryFrameStates(replacee, duplicates, replaceeGraphCFGPredecessor);
         }
@@ -2031,7 +1977,7 @@ private void assignNecessaryFrameStates(ValueNode replacee, UnmodifiableEconomic
         FrameState stateAfter = null;
         if (replacee instanceof StateSplit && ((StateSplit) replacee).hasSideEffect()) {
             stateAfter = ((StateSplit) replacee).stateAfter();
-            assert stateAfter != null : "Statesplit with side-effect needs a framestate " + replacee;
+            GraalError.guarantee(stateAfter != null, "Statesplit with side-effect %s needs a framestate", replacee);
         } else {
             /*
              * We dont have a state split as a replacee, thus we take the prev state as the state
@@ -2043,22 +1989,17 @@ private void assignNecessaryFrameStates(ValueNode replacee, UnmodifiableEconomic
         MapCursor<Node, NodeStateAssignment> stateAssignments = assignedStateMappings.getEntries();
         while (stateAssignments.advance()) {
             Node nodeRequiringState = stateAssignments.getKey();
+
+            if (nodeRequiringState instanceof DeoptBciSupplier) {
+                if (replacee instanceof DeoptBciSupplier) {
+                    ((DeoptBciSupplier) duplicates.get(nodeRequiringState)).setBci(((DeoptBciSupplier) replacee).bci());
+                }
+            }
+
             NodeStateAssignment assignment = stateAssignments.getValue();
             switch (assignment) {
                 case AFTER_BCI:
-                    FrameState newState = stateAfter.duplicate();
-                    if (stateAfter.values().contains(replacee)) {
-                        ValueNode valueInReplacement = (ValueNode) duplicates.get(returnNode.result());
-                        newState.applyToNonVirtual(new NodePositionClosure<Node>() {
-                            @Override
-                            public void apply(Node from, Position p) {
-                                if (p.get(from) == replacee) {
-                                    p.set(from, valueInReplacement);
-                                }
-                            }
-                        });
-                    }
-                    ((StateSplit) duplicates.get(nodeRequiringState)).setStateAfter(newState);
+                    setReplaceeGraphStateAfter(nodeRequiringState, replacee, duplicates, stateAfter);
                     break;
                 case BEFORE_BCI:
                     FrameState stateBeforeSnippet = findLastFrameState(replaceeGraphCFGPredecessor);
@@ -2073,9 +2014,35 @@ public void apply(Node from, Position p) {
                 default:
                     throw GraalError.shouldNotReachHere("Unknown StateAssigment:" + assignment);
             }
-            replacee.graph().getDebug().dump(DebugContext.VERY_DETAILED_LEVEL,
-                            replacee.graph(), "After duplicating after state for node %s in snippet", duplicates.get(nodeRequiringState));
+            replacee.graph().getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, replacee.graph(), "After duplicating after state for node %s in snippet", duplicates.get(nodeRequiringState));
+        }
+    }
+
+    private void setReplaceeGraphStateAfter(Node nodeRequiringState, Node replacee, UnmodifiableEconomicMap<Node, Node> duplicates, FrameState stateAfter) {
+        FrameState newState = stateAfter.duplicate();
+        if (stateAfter.values().contains(replacee)) {
+            ValueNode valueInReplacement = (ValueNode) duplicates.get(returnNode.result());
+            if (!(nodeRequiringState instanceof AbstractMergeNode || nodeRequiringState instanceof LoopExitNode)) {
+                // merges and loop exit cannot have "this node" on stack
+                if (valueInReplacement instanceof ValuePhiNode) {
+                    Node sideEffectDup = duplicates.get(nodeRequiringState);
+                    valueInReplacement = (ValueNode) sideEffectDup;
+                }
+            }
+            propagateValInState(newState, replacee, valueInReplacement);
         }
+        ((StateSplit) duplicates.get(nodeRequiringState)).setStateAfter(newState);
+    }
+
+    private static void propagateValInState(FrameState newState, Node replacee, Node replacement) {
+        newState.applyToNonVirtual(new NodePositionClosure<Node>() {
+            @Override
+            public void apply(Node from, Position p) {
+                if (p.get(from) == replacee) {
+                    p.set(from, replacement);
+                }
+            }
+        });
     }
 
     private void rewireFrameStatesAfterFSA(ValueNode replacee, UnmodifiableEconomicMap<Node, Node> duplicates) {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 36810e648eea..f35b5f6765cb 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -643,8 +643,6 @@ private void instantiate(Arguments args, BasicArrayCopyNode arraycopy) {
                 } else if (originalNode instanceof ArrayCopyWithDelayedLoweringNode) {
                     ArrayCopyWithDelayedLoweringNode slowPath = (ArrayCopyWithDelayedLoweringNode) replacements.get(originalNode);
                     assert arraycopy.stateAfter() != null : arraycopy;
-                    assert slowPath.stateAfter() == arraycopy.stateAfter() : "States do not match for slowpath=" + slowPath + " and array copy=" + arraycopy + " slowPathState=" +
-                                    slowPath.stateAfter() + " and arraycopyState=" + arraycopy.stateAfter();
                     slowPath.setBci(arraycopy.getBci());
                 }
             }

From d9a28bd585976e98c5f972f534b5f1f8515e7e3d Mon Sep 17 00:00:00 2001
From: Tomas Hurka <tomas.hurka@oracle.com>
Date: Thu, 21 Oct 2021 15:40:14 +0200
Subject: [PATCH 570/681] classpath fixed

---
 vm/tests/all/agentscript/agent-dumpheap.test  | 2 +-
 vm/tests/all/agentscript/agent-ruby-dump.test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/tests/all/agentscript/agent-dumpheap.test b/vm/tests/all/agentscript/agent-dumpheap.test
index 7eda4512fcb5..7cd4a14c1c58 100644
--- a/vm/tests/all/agentscript/agent-dumpheap.test
+++ b/vm/tests/all/agentscript/agent-dumpheap.test
@@ -1,4 +1,4 @@
-> export CP=${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-jfluid.jar:${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-profiler-oql.jar:.
+> export CP=${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-jfluid-heap.jar:${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-profiler-oql.jar:.
 >[0] javac -cp $CP HeapQuery.java
 #> export TMP_DIR=/tmp
 >[??] rm -rf ${TMP_DIR}/sample.hprof*
diff --git a/vm/tests/all/agentscript/agent-ruby-dump.test b/vm/tests/all/agentscript/agent-ruby-dump.test
index adaf2e3c875c..a1936ea7e2d7 100644
--- a/vm/tests/all/agentscript/agent-ruby-dump.test
+++ b/vm/tests/all/agentscript/agent-ruby-dump.test
@@ -1,4 +1,4 @@
-> export CP=${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-jfluid.jar:${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-profiler-oql.jar:.
+> export CP=${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-jfluid-heap.jar:${JAVA_HOME}/lib/visualvm/visualvm/modules/org-graalvm-visualvm-lib-profiler-oql.jar:.
 >[0] javac -cp $CP HeapQuery.java
 #> export TMP_DIR=/tmp
 > rm -rf /tmp/ruby*hprof*

From c7ced24582734f21cac49c651f2b619eb8f7c1f4 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Wed, 20 Oct 2021 17:03:22 +0200
Subject: [PATCH 571/681] Template options can be specified in Sulong
 benchmarks VMs

---
 sulong/mx.sulong/mx_sulong_benchmarks.py | 27 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/sulong/mx.sulong/mx_sulong_benchmarks.py b/sulong/mx.sulong/mx_sulong_benchmarks.py
index 1936abeb94b5..92c743601aa3 100644
--- a/sulong/mx.sulong/mx_sulong_benchmarks.py
+++ b/sulong/mx.sulong/mx_sulong_benchmarks.py
@@ -297,6 +297,9 @@ def workingDirectory(self, benchmarks, bmSuiteArgs):
     def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
         if len(benchmarks) != 1:
             mx.abort("Please run a specific benchmark (mx benchmark csuite:<benchmark-name>) or all the benchmarks (mx benchmark csuite:*)")
+        vm = self.get_vm_registry().get_vm_from_suite_args(bmSuiteArgs)
+        assert isinstance(vm, CExecutionEnvironmentMixin)
+        bmSuiteArgs = [a.replace("${benchmark}", benchmarks[0]) for a in vm.templateOptions() + bmSuiteArgs]
         vmArgs = self.vmArgs(bmSuiteArgs)
         runArgs = self.runArgs(bmSuiteArgs)
         try:
@@ -322,6 +325,8 @@ def bin_dir(self):
     def prepare_env(self, env):
         return env
 
+    def templateOptions(self):
+        return []
 
 def add_run_numbers(out):
     # Prepending the summary lines by the run number
@@ -516,13 +521,14 @@ def hosting_registry(self):
 
 class PolybenchVm(CExecutionEnvironmentMixin, GuestVm):
 
-    def __init__(self, config_name, options, host_vm=None):
+    def __init__(self, config_name, options, templateOptions, host_vm=None):
         super(PolybenchVm, self).__init__(host_vm)
         self._config_name = config_name
         self._options = options
+        self._templateOptions = templateOptions
 
     def with_host_vm(self, host_vm):
-        return PolybenchVm(self._config_name, self._options, host_vm)
+        return PolybenchVm(self._config_name, self._options, self._templateOptions, host_vm)
 
     def config_name(self):
         return self._config_name
@@ -583,6 +589,9 @@ def out_file(self):
     def opt_phases(self):
         return []
 
+    def templateOptions(self):
+        return self._templateOptions
+
     def launcher_vm_args(self):
         return mx_sulong.getClasspathOptions(['POLYBENCH'])
 
@@ -727,19 +736,19 @@ def hosting_registry(self):
      '--llvm.AOTCacheStore.0=true', '--llvm.AOTCacheLoad.0=false', '--engine.DebugCacheCompile.0=aot', '--engine.DebugCacheStore.0=true',
      '--llvm.AOTCacheStore.1=false', '--llvm.AOTCacheLoad.1=true', '--engine.DebugCacheStore.1=false', '--engine.DebugCacheLoad.1=true',
      '--engine.MultiTier=false', '--engine.CompileAOTOnCreate=false', '--engine.DebugCachePreinitializeContext=false',
-     '--engine.DebugTraceCache=true', '--multi-context-runs=2', '-w', '0', '-i', '10']), _suite, 10)
+     '--engine.DebugTraceCache=true', '--multi-context-runs=2', '-w', '0', '-i', '10'], []), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('store-aux-engine-cache',
-    ['--experimental-options', '--multi-context-runs=1', '--eval-source-only=true', '--engine.CacheStore=' + os.path.join(os.getcwd(), 'test.image'),
+    ['--experimental-options', '--multi-context-runs=1', '--eval-source-only=true',
      '--llvm.AOTCacheStore=true', '--engine.CacheCompile=aot', '--engine.CachePreinitializeContext=false',
-     '--engine.TraceCache=true']), _suite, 10)
+     '--engine.TraceCache=true'], ['--engine.CacheStore=' + os.path.join(os.getcwd(), 'test-${benchmark}.image')]), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('load-aux-engine-cache',
-    ['--experimental-options', '--multi-context-runs=1', '--engine.CacheLoad=' + os.path.join(os.getcwd(), 'test.image'),
+    ['--experimental-options', '--multi-context-runs=1',
      '--llvm.AOTCacheLoad=true', '--engine.CachePreinitializeContext=false', '--engine.TraceCache=true',
-     '-w', '0', '-i', '10']), _suite, 10)
+     '-w', '0', '-i', '10'], ['--engine.CacheLoad=' + os.path.join(os.getcwd(), 'test-${benchmark}.image')]), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-exclusive-engine',
-    ['--multi-context-runs=3', '--shared-engine=false', '-w', '10', '-i', '10']), _suite, 10)
+    ['--multi-context-runs=3', '--shared-engine=false', '-w', '10', '-i', '10'], []), _suite, 10)
 native_polybench_vm_registry.add_vm(PolybenchVm('3-runs-shared-engine',
-    ['--multi-context-runs=3', '--shared-engine=true', '-w', '10', '-i', '10']), _suite, 10)
+    ['--multi-context-runs=3', '--shared-engine=true', '-w', '10', '-i', '10'], []), _suite, 10)
 
 lit_vm_registry = VmRegistry("Lit", known_host_registries=[java_vm_registry])
 lit_vm_registry.add_vm(LitVm('sulong-native', []), _suite, 10)

From bb71de5115a2d8b7ea9396a3f0b2f9ba95a6a3db Mon Sep 17 00:00:00 2001
From: Christian Haeubl <christian.haeubl@oracle.com>
Date: Thu, 21 Oct 2021 08:32:22 +0200
Subject: [PATCH 572/681] Code review feedback.

---
 .../src/com/oracle/svm/core/genscavenge/GCImpl.java   |  8 --------
 .../src/com/oracle/svm/core/genscavenge/HeapImpl.java |  2 +-
 .../src/com/oracle/svm/core/SubstrateDiagnostics.java | 11 ++++++-----
 .../oracle/svm/core/graal/snippets/DeoptTester.java   |  2 +-
 .../src/com/oracle/svm/core/thread/Safepoint.java     | 10 +++++-----
 .../oracle/svm/core/thread/VMOperationControl.java    |  2 +-
 .../src/com/oracle/svm/core/thread/VMThreads.java     |  8 ++++----
 7 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index a04d5b732f9b..40481fdd9fd2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -29,7 +29,6 @@
 
 import java.lang.ref.Reference;
 
-import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
@@ -784,13 +783,6 @@ private void blackenStackRoots() {
                          */
                         continue;
                     }
-                    if (!SafepointBehavior.safepointChecksEnabled(vmThread)) {
-                        /*
-                         * When a thread is ignoring safepoints, then the thread is not paused and
-                         * we cannot safely walk its stack (we don't even know where it starts).
-                         */
-                        continue;
-                    }
                     if (JavaStackWalker.initWalk(walk, vmThread)) {
                         walkStack(walk);
                     }
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
index 2ff6daf36e4c..83cfa91d88d3 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
@@ -239,7 +239,7 @@ GCImpl getGCImpl() {
     @Override
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     public boolean isAllocationDisallowed() {
-        return NoAllocationVerifier.isActive() || !SafepointBehavior.safepointChecksEnabled() || gcImpl.isCollectionInProgress();
+        return NoAllocationVerifier.isActive() || SafepointBehavior.ignoresSafepoints() || gcImpl.isCollectionInProgress();
     }
 
     /** A guard to place before an allocation, giving the call site and the allocation type. */
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
index fcfae79277ce..ff75a4b0c5c6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
@@ -26,10 +26,10 @@
 
 import java.util.Arrays;
 
-import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import org.graalvm.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
@@ -74,6 +74,7 @@
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.thread.VMOperationControl;
 import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.core.threadlocal.FastThreadLocalBytes;
 import com.oracle.svm.core.threadlocal.FastThreadLocalFactory;
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfos;
@@ -617,13 +618,13 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
                 log.string("Threads:").indent(true);
                 for (IsolateThread thread = VMThreads.firstThreadUnsafe(); thread.isNonNull(); thread = VMThreads.nextThread(thread)) {
                     log.zhex(thread).spaces(1).string(VMThreads.StatusSupport.getStatusString(thread));
+
                     int safepointBehavior = SafepointBehavior.getSafepointBehaviorVolatile(thread);
-                    if (safepointBehavior != SafepointBehavior.ALLOW_SAFEPOINT) {
-                        log.string(" (").string(SafepointBehavior.toString(safepointBehavior)).string(")");
-                    }
+                    log.string(" (").string(SafepointBehavior.toString(safepointBehavior)).string(")");
+
                     if (allowJavaHeapAccess) {
                         Thread threadObj = JavaThreads.fromVMThread(thread);
-                        log.string(" \"").string(threadObj.getName()).string("\" - ").object(threadObj);
+                        log.string(" \"").string(threadObj.getName()).string("\" - ").zhex(Word.objectToUntrackedPointer(threadObj));
                         if (threadObj.isDaemon()) {
                             log.string(", daemon");
                         }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
index 2b4042960e34..670c4ef1d1ba 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
@@ -111,7 +111,7 @@ public static void deoptTest() {
                             !CEntryPointSnippets.isIsolateInitialized() ||
                             ThreadingSupportImpl.isRecurringCallbackPaused() ||
                             VMOperation.isInProgress() ||
-                            !SafepointBehavior.safepointChecksEnabled() ||
+                            SafepointBehavior.ignoresSafepoints() ||
                             !JavaThreads.currentJavaThreadInitialized()) {
                 return; // Thread or VM is not in a safe (or sane) state for deoptimization
             }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index 721333f49bec..635178e253f9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -387,7 +387,7 @@ private static void enterSlowPathSafepointCheck() throws Throwable {
     @AlwaysInline("Always inline into foreign call stub")
     @Uninterruptible(reason = "Must not contain safepoint checks")
     public static void slowPathSafepointCheck() throws Throwable {
-        if (!SafepointBehavior.safepointChecksEnabled()) {
+        if (SafepointBehavior.ignoresSafepoints()) {
             /* Safepoints are explicitly disabled for this thread. */
             Safepoint.setSafepointRequested(THREAD_REQUEST_RESET);
             return;
@@ -519,8 +519,8 @@ public static void transitionVMToNative() {
     @Uninterruptible(reason = "Must not contain safepoint checks")
     private static void enterSlowPathTransitionFromNativeToNewStatus(int newStatus) {
         VMError.guarantee(StatusSupport.isStatusNativeOrSafepoint(), "Must either be at a safepoint or in native mode");
-        VMError.guarantee(SafepointBehavior.safepointChecksEnabled(),
-                        "The safepoint handling doesn't change the status of threads where the safepoint checks are disabled. So, the fast path transition must succeed and this slow path must not be called");
+        VMError.guarantee(!SafepointBehavior.ignoresSafepoints(),
+                        "The safepoint handling doesn't change the status of threads that ignore safepoints. So, the fast path transition must succeed and this slow path must not be called");
 
         Statistics.incSlowPathFrozen();
         try {
@@ -639,7 +639,7 @@ private static void requestSafepoints(String reason) {
                 if (isMyself(vmThread)) {
                     continue;
                 }
-                if (!SafepointBehavior.safepointChecksEnabled(vmThread)) {
+                if (SafepointBehavior.ignoresSafepoints(vmThread)) {
                     /* If safepoints are disabled, do not ask it to stop at safepoints. */
                     continue;
                 }
@@ -793,7 +793,7 @@ private static void releaseSafepoints(String reason) {
             VMThreads.THREAD_MUTEX.assertIsOwner("Must hold mutex when releasing safepoints.");
             // Set all the thread statuses that are at safepoint back to being in native code.
             for (IsolateThread vmThread = VMThreads.firstThread(); vmThread.isNonNull(); vmThread = VMThreads.nextThread(vmThread)) {
-                if (!isMyself(vmThread) && SafepointBehavior.safepointChecksEnabled(vmThread)) {
+                if (!isMyself(vmThread) && !SafepointBehavior.ignoresSafepoints(vmThread)) {
                     if (trace.isEnabled()) {
                         trace.string("  vmThread status: ").string(StatusSupport.getStatusString(vmThread));
                     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
index 16f00e270ee7..8047f6dbf0bc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
@@ -262,7 +262,7 @@ void enqueueFromNonJavaThread(NativeVMOperationData data) {
     private void enqueue(VMOperation operation, NativeVMOperationData data) {
         StackOverflowCheck.singleton().makeYellowZoneAvailable();
         try {
-            VMError.guarantee(SafepointBehavior.safepointChecksEnabled(), "could cause deadlocks otherwise");
+            VMError.guarantee(!SafepointBehavior.ignoresSafepoints(), "could cause deadlocks otherwise");
             log().string("[VMOperationControl.enqueue:").string("  operation: ").string(operation.getName());
             if (!MultiThreaded.getValue()) {
                 // no safepoint is needed, so we can always directly execute the operation
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index b4cab32f452a..2155b54d49c6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -812,13 +812,13 @@ public static class SafepointBehavior {
         static final int THREAD_CRASHED = 2;
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static boolean safepointChecksEnabled() {
-            return safepointBehaviorTL.getVolatile() == ALLOW_SAFEPOINT;
+        public static boolean ignoresSafepoints() {
+            return safepointBehaviorTL.getVolatile() != ALLOW_SAFEPOINT;
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static boolean safepointChecksEnabled(IsolateThread vmThread) {
-            return safepointBehaviorTL.getVolatile(vmThread) == ALLOW_SAFEPOINT;
+        public static boolean ignoresSafepoints(IsolateThread vmThread) {
+            return safepointBehaviorTL.getVolatile(vmThread) != ALLOW_SAFEPOINT;
         }
 
         @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)

From 213b71cd2efe398ec8f6dc4c4318a38f8d9fd7cf Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Tue, 28 Sep 2021 22:56:59 +0200
Subject: [PATCH 573/681] Add compressed frame encoding scheme.

---
 .../com/oracle/svm/core/SubstrateOptions.java |   3 +
 .../oracle/svm/core/code/CodeInfoAccess.java  |  40 ++-
 .../oracle/svm/core/code/CodeInfoDecoder.java |   4 +-
 .../oracle/svm/core/code/CodeInfoEncoder.java |  26 +-
 .../oracle/svm/core/code/CodeInfoImpl.java    |   6 -
 .../oracle/svm/core/code/CodeInfoOffsets.java |   4 -
 .../oracle/svm/core/code/CodeInfoTable.java   |   1 -
 .../svm/core/code/FrameInfoDecoder.java       | 179 +++++++---
 .../svm/core/code/FrameInfoEncoder.java       | 323 +++++++++++++-----
 .../svm/core/code/FrameInfoQueryResult.java   |  19 +-
 .../oracle/svm/core/code/ImageCodeInfo.java   |  12 -
 .../svm/core/code/RuntimeCodeInfoAccess.java  |   2 -
 .../oracle/svm/core/deopt/Deoptimizer.java    |   4 -
 .../stack/SubstrateStackIntrospection.java    |   4 -
 .../svm/core/stack/ThreadStackPrinter.java    |   8 +-
 .../svm/graal/meta/RuntimeCodeInstaller.java  |  20 +-
 .../hosted/image/NativeImageCodeCache.java    |   8 +-
 17 files changed, 439 insertions(+), 224 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index c4e350b410ac..43e972075f0d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -354,6 +354,9 @@ public static final long getTearDownFailureNanos() {
     @Option(help = "Use callee saved registers to reduce spilling for low-frequency calls to stubs (if callee saved registers are supported by the architecture)")//
     public static final HostedOptionKey<Boolean> UseCalleeSavedRegisters = new HostedOptionKey<>(true);
 
+    @Option(help = "Use compressed frame encoding for frames without local values.", type = OptionType.Expert)//
+    public static final HostedOptionKey<Boolean> UseCompressedFrameEncodings = new HostedOptionKey<>(true);
+
     @Option(help = "Report error if <typename>[:<UsageKind>{,<UsageKind>}] is discovered during analysis (valid values for UsageKind: InHeap, Allocated, Reachable).", type = OptionType.Debug)//
     public static final HostedOptionKey<LocatableMultiOptionValue.Strings> ReportAnalysisForbiddenType = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
index 27be5a52b763..0ac344d0be9e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
@@ -214,7 +214,6 @@ public static UnsignedWord getNativeMetadataSize(CodeInfo info) {
                             .add(NonmovableArrays.byteSizeOf(impl.getFrameInfoObjectConstants()))
                             .add(NonmovableArrays.byteSizeOf(impl.getFrameInfoSourceClasses()))
                             .add(NonmovableArrays.byteSizeOf(impl.getFrameInfoSourceMethodNames()))
-                            .add(NonmovableArrays.byteSizeOf(impl.getFrameInfoNames()))
                             .add(NonmovableArrays.byteSizeOf(impl.getDeoptimizationStartOffsets()))
                             .add(NonmovableArrays.byteSizeOf(impl.getDeoptimizationEncodings()))
                             .add(NonmovableArrays.byteSizeOf(impl.getDeoptimizationObjectConstants()))
@@ -239,21 +238,39 @@ public static CodePointer absoluteIP(CodeInfo info, long relativeIP) {
         return (CodePointer) ((UnsignedWord) cast(info).getCodeStart()).add(WordFactory.unsigned(relativeIP));
     }
 
-    public static long initFrameInfoReader(CodeInfo info, CodePointer ip, ReusableTypeReader frameInfoReader) {
+    public static class FrameInfoState {
+        public long entryOffset;
+        public boolean isFirstFrame;
+        public boolean isDone;
+        public int firstValue;
+
+        public FrameInfoState() {
+            reset();
+        }
+
+        public void reset() {
+            entryOffset = -1;
+            isFirstFrame = true;
+            isDone = false;
+            firstValue = -1;
+        }
+    }
+
+    public static void initFrameInfoReader(CodeInfo info, CodePointer ip, ReusableTypeReader frameInfoReader, FrameInfoState state) {
         long entryOffset = CodeInfoDecoder.lookupCodeInfoEntryOffset(info, relativeIP(info, ip));
+        state.entryOffset = entryOffset;
         if (entryOffset >= 0) {
             if (!CodeInfoDecoder.initFrameInfoReader(info, entryOffset, frameInfoReader)) {
-                return -1;
+                state.entryOffset = -1;
             }
         }
-        return entryOffset;
     }
 
-    public static FrameInfoQueryResult nextFrameInfo(CodeInfo info, long entryOffset, ReusableTypeReader frameInfoReader,
-                    FrameInfoDecoder.FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator, boolean fetchFirstFrame) {
-        int entryFlags = CodeInfoDecoder.loadEntryFlags(info, entryOffset);
+    public static FrameInfoQueryResult nextFrameInfo(CodeInfo info, ReusableTypeReader frameInfoReader,
+                    FrameInfoDecoder.FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator, FrameInfoState state) {
+        int entryFlags = CodeInfoDecoder.loadEntryFlags(info, state.entryOffset);
         boolean isDeoptEntry = CodeInfoDecoder.extractFI(entryFlags) == CodeInfoDecoder.FI_DEOPT_ENTRY_INDEX_S4;
-        return FrameInfoDecoder.decodeFrameInfo(isDeoptEntry, frameInfoReader, info, resultAllocator, valueInfoAllocator, fetchFirstFrame);
+        return FrameInfoDecoder.decodeFrameInfo(isDeoptEntry, frameInfoReader, info, resultAllocator, valueInfoAllocator, state);
     }
 
     @SuppressWarnings("unchecked")
@@ -307,12 +324,11 @@ public static void setCodeInfo(CodeInfo info, NonmovableArray<Byte> index, Nonmo
 
     @Uninterruptible(reason = "Nonmovable object arrays are not visible to GC until installed.")
     public static void setEncodings(CodeInfo info, NonmovableObjectArray<Object> objectConstants,
-                    NonmovableObjectArray<Class<?>> sourceClasses, NonmovableObjectArray<String> sourceMethodNames, NonmovableObjectArray<String> names) {
+                    NonmovableObjectArray<Class<?>> sourceClasses, NonmovableObjectArray<String> sourceMethodNames) {
         CodeInfoImpl impl = cast(info);
         impl.setFrameInfoObjectConstants(objectConstants);
         impl.setFrameInfoSourceClasses(sourceClasses);
         impl.setFrameInfoSourceMethodNames(sourceMethodNames);
-        impl.setFrameInfoNames(names);
         if (!SubstrateUtil.HOSTED) {
             // notify the GC about the frame metadata that is now live
             Heap.getHeap().getRuntimeCodeInfoGCSupport().registerFrameMetadata(impl);
@@ -370,10 +386,6 @@ public static NonmovableObjectArray<String> getFrameInfoSourceMethodNames(CodeIn
         return cast(info).getFrameInfoSourceMethodNames();
     }
 
-    public static NonmovableObjectArray<String> getFrameInfoNames(CodeInfo info) {
-        return cast(info).getFrameInfoNames();
-    }
-
     @Uninterruptible(reason = "Called from uninterruptible code", mayBeInlined = true)
     private static CodeInfoImpl cast(UntetheredCodeInfo info) {
         assert isValid(info);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
index d1cfdb170f44..3f511c8a6d40 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
@@ -29,8 +29,8 @@
 // Checkstyle: stop
 import java.lang.reflect.Executable;
 // Checkstyle: resume
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.graalvm.compiler.api.replacements.Fold;
@@ -367,7 +367,7 @@ private static FrameInfoQueryResult loadFrameInfo(CodeInfo info, long entryOffse
         }
         int frameInfoIndex = NonmovableByteArrayReader.getS4(CodeInfoAccess.getCodeInfoEncodings(info), offsetFI(entryOffset, entryFlags));
         return FrameInfoDecoder.decodeFrameInfo(isDeoptEntry, new ReusableTypeReader(CodeInfoAccess.getFrameInfoEncodings(info), frameInfoIndex), info,
-                        FrameInfoDecoder.HeapBasedFrameInfoQueryResultAllocator, FrameInfoDecoder.HeapBasedValueInfoAllocator, true);
+                        FrameInfoDecoder.HeapBasedFrameInfoQueryResultAllocator, FrameInfoDecoder.HeapBasedValueInfoAllocator);
     }
 
     @AlwaysInline("Make IP-lookup loop call free")
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
index f43f2fe72f06..910ff742cf13 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
@@ -116,7 +116,7 @@ private Encoders() {
             this.objectConstants = FrequencyEncoder.createEqualityEncoder();
             this.sourceClasses = FrequencyEncoder.createEqualityEncoder();
             this.sourceMethodNames = FrequencyEncoder.createEqualityEncoder();
-            if (FrameInfoDecoder.encodeDebugNames() || FrameInfoDecoder.encodeSourceReferences()) {
+            if (FrameInfoDecoder.encodeSourceReferences()) {
                 this.names = FrequencyEncoder.createEqualityEncoder();
             } else {
                 this.names = null;
@@ -127,28 +127,22 @@ private void encodeAllAndInstall(CodeInfo target, ReferenceAdjuster adjuster) {
             JavaConstant[] encodedJavaConstants = objectConstants.encodeAll(new JavaConstant[objectConstants.getLength()]);
             Class<?>[] sourceClassesArray = null;
             String[] sourceMethodNamesArray = null;
-            String[] namesArray = null;
-            final boolean encodeDebugNames = FrameInfoDecoder.encodeDebugNames();
-            if (encodeDebugNames || FrameInfoDecoder.encodeSourceReferences()) {
+            if (FrameInfoDecoder.encodeSourceReferences()) {
                 sourceClassesArray = sourceClasses.encodeAll(new Class<?>[sourceClasses.getLength()]);
                 sourceMethodNamesArray = sourceMethodNames.encodeAll(new String[sourceMethodNames.getLength()]);
             }
-            if (encodeDebugNames) {
-                namesArray = names.encodeAll(new String[names.getLength()]);
-            }
-            install(target, encodedJavaConstants, sourceClassesArray, sourceMethodNamesArray, namesArray, adjuster);
+            install(target, encodedJavaConstants, sourceClassesArray, sourceMethodNamesArray, adjuster);
         }
 
         @Uninterruptible(reason = "Nonmovable object arrays are not visible to GC until installed in target.")
         private static void install(CodeInfo target, JavaConstant[] objectConstantsArray, Class<?>[] sourceClassesArray,
-                        String[] sourceMethodNamesArray, String[] namesArray, ReferenceAdjuster adjuster) {
+                        String[] sourceMethodNamesArray, ReferenceAdjuster adjuster) {
 
             NonmovableObjectArray<Object> frameInfoObjectConstants = adjuster.copyOfObjectConstantArray(objectConstantsArray);
             NonmovableObjectArray<Class<?>> frameInfoSourceClasses = (sourceClassesArray != null) ? adjuster.copyOfObjectArray(sourceClassesArray) : NonmovableArrays.nullArray();
             NonmovableObjectArray<String> frameInfoSourceMethodNames = (sourceMethodNamesArray != null) ? adjuster.copyOfObjectArray(sourceMethodNamesArray) : NonmovableArrays.nullArray();
-            NonmovableObjectArray<String> frameInfoNames = (namesArray != null) ? adjuster.copyOfObjectArray(namesArray) : NonmovableArrays.nullArray();
 
-            CodeInfoAccess.setEncodings(target, frameInfoObjectConstants, frameInfoSourceClasses, frameInfoSourceMethodNames, frameInfoNames);
+            CodeInfoAccess.setEncodings(target, frameInfoObjectConstants, frameInfoSourceClasses, frameInfoSourceMethodNames);
         }
     }
 
@@ -334,7 +328,7 @@ private void encodeIPData() {
             writeSizeEncoding(encodingBuffer, data, entryFlags);
             writeExceptionOffset(encodingBuffer, data, entryFlags);
             writeReferenceMapIndex(encodingBuffer, data, entryFlags);
-            writeDeoptFrameInfo(encodingBuffer, data, entryFlags);
+            writeEncodedFrameInfo(encodingBuffer, data, entryFlags);
         }
 
         codeInfoIndex = NonmovableArrays.createByteArray(TypeConversion.asU4(indexBuffer.getBytesWritten()));
@@ -439,7 +433,7 @@ private static void writeReferenceMapIndex(UnsafeArrayTypeWriter writeBuffer, IP
     private static int flagsForDeoptFrameInfo(IPData data) {
         if (data.frameData == null) {
             return CodeInfoDecoder.FI_NO_DEOPT;
-        } else if (TypeConversion.isS4(data.frameData.indexInEncodings)) {
+        } else if (TypeConversion.isS4(data.frameData.encodedFrameInfoIndex)) {
             if (data.frameData.frame.isDeoptEntry) {
                 return CodeInfoDecoder.FI_DEOPT_ENTRY_INDEX_S4;
             } else {
@@ -450,11 +444,11 @@ private static int flagsForDeoptFrameInfo(IPData data) {
         }
     }
 
-    private static void writeDeoptFrameInfo(UnsafeArrayTypeWriter writeBuffer, IPData data, int entryFlags) {
+    private static void writeEncodedFrameInfo(UnsafeArrayTypeWriter writeBuffer, IPData data, int entryFlags) {
         switch (CodeInfoDecoder.extractFI(entryFlags)) {
             case CodeInfoDecoder.FI_DEOPT_ENTRY_INDEX_S4:
             case CodeInfoDecoder.FI_INFO_ONLY_INDEX_S4:
-                writeBuffer.putS4(data.frameData.indexInEncodings);
+                writeBuffer.putS4(data.frameData.encodedFrameInfoIndex);
                 break;
         }
     }
@@ -519,7 +513,7 @@ static void verifyMethod(SharedMethod method, CompilationResult compilation, int
 
     private static void verifyFrame(CompilationResult compilation, BytecodeFrame expectedFrame, FrameInfoQueryResult actualFrame, BitSet visitedVirtualObjects) {
         assert (expectedFrame == null) == (actualFrame == null);
-        if (expectedFrame == null || !actualFrame.needLocalValues) {
+        if (expectedFrame == null || !actualFrame.hasLocalValueInfo()) {
             return;
         }
         verifyFrame(compilation, expectedFrame.caller(), actualFrame.getCaller(), visitedVirtualObjects);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
index a96da5602940..fd3e06607dc3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
@@ -194,12 +194,6 @@ interface CodeInfoImpl extends CodeInfo {
     @RawField
     void setFrameInfoSourceMethodNames(NonmovableObjectArray<String> frameInfoSourceMethodNames);
 
-    @RawField
-    NonmovableObjectArray<String> getFrameInfoNames();
-
-    @RawField
-    void setFrameInfoNames(NonmovableObjectArray<String> frameInfoNames);
-
     @RawField
     int getState();
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java
index 2f68861169b7..0e5b2a6e03b4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoOffsets.java
@@ -59,10 +59,6 @@ public static long frameInfoSourceMethodNames() {
         return OffsetOf.get(CodeInfoImpl.class, "FrameInfoSourceMethodNames");
     }
 
-    public static long frameInfoNames() {
-        return OffsetOf.get(CodeInfoImpl.class, "FrameInfoNames");
-    }
-
     public static long deoptimizationObjectConstants() {
         return OffsetOf.get(CodeInfoImpl.class, "DeoptimizationObjectConstants");
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
index d70629670fc0..ba39aa63e0e5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
@@ -292,6 +292,5 @@ public void afterCompilation(AfterCompilationAccess config) {
         config.registerAsImmutable(imageInfo.frameInfoObjectConstants);
         config.registerAsImmutable(imageInfo.frameInfoSourceClasses);
         config.registerAsImmutable(imageInfo.frameInfoSourceMethodNames);
-        config.registerAsImmutable(imageInfo.frameInfoNames);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
index 5fad47de76dc..ed582a8518f3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
@@ -46,11 +46,32 @@
 
 public class FrameInfoDecoder {
 
+    protected static final int BCI_SHIFT = 2;
+    protected static final int DURING_CALL_MASK = 2;
+    protected static final int RETHROW_EXCEPTION_MASK = 1;
+
     protected static final int NO_CALLER_BCI = -1;
     protected static final int NO_LOCAL_INFO_BCI = -2;
 
+    /**
+     * Differentiates between compressed and uncompressed frame slices. See
+     * {@link #isCompressedFrameSlice(int)} for more information.
+     */
+    protected static final int UNCOMPRESSED_FRAME_SLICE_MARKER = -1;
+    /**
+     * Value added to source line to guarantee the value is greater than zero.
+     */
+    protected static final int COMPRESSED_SOURCE_LINE_ADDEND = 2;
+
     protected static boolean isFrameInfoMatch(long frameInfoIndex, NonmovableArray<Byte> frameInfoEncodings, long searchEncodedBci) {
         NonmovableByteArrayTypeReader readBuffer = new NonmovableByteArrayTypeReader(frameInfoEncodings, frameInfoIndex);
+        int firstValue = readBuffer.getSVInt();
+        if (isCompressedFrameSlice(firstValue)) {
+            /* Compressed frame slices have no local bci information. */
+            return false;
+        }
+
+        /* Read encoded bci from uncompressed frame slice. */
         long actualEncodedBci = readBuffer.getSV();
         assert actualEncodedBci != NO_CALLER_BCI;
 
@@ -138,7 +159,82 @@ public void decodeConstant(ValueInfo valueInfo, NonmovableObjectArray<?> frameIn
     static final HeapBasedValueInfoAllocator HeapBasedValueInfoAllocator = new HeapBasedValueInfoAllocator();
 
     protected static FrameInfoQueryResult decodeFrameInfo(boolean isDeoptEntry, TypeReader readBuffer, CodeInfo info,
-                    FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator, boolean fetchFirstFrame) {
+                    FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator) {
+        return decodeFrameInfo(isDeoptEntry, readBuffer, info, resultAllocator, valueInfoAllocator, new CodeInfoAccess.FrameInfoState());
+    }
+
+    protected static FrameInfoQueryResult decodeFrameInfo(boolean isDeoptEntry, TypeReader readBuffer, CodeInfo info,
+                    FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator, CodeInfoAccess.FrameInfoState state) {
+        if (state.isFirstFrame) {
+            state.firstValue = readBuffer.getSVInt();
+        }
+
+        FrameInfoQueryResult result;
+        if (isCompressedFrameSlice(state.firstValue)) {
+            result = decodeCompressedFrameInfo(isDeoptEntry, readBuffer, info, resultAllocator, state);
+        } else {
+            result = decodeUncompressedFrameInfo(isDeoptEntry, readBuffer, info, resultAllocator, valueInfoAllocator, state);
+        }
+        state.isFirstFrame = false;
+
+        return result;
+    }
+
+    /*
+     * See (FrameInfoEncoder.CompressedFrameInfoEncodingMedata) for more information about the
+     * compressed encoding format.
+     */
+    private static FrameInfoQueryResult decodeCompressedFrameInfo(boolean isDeoptEntry, TypeReader readBuffer, CodeInfo info,
+                    FrameInfoQueryResultAllocator resultAllocator, CodeInfoAccess.FrameInfoState state) {
+        FrameInfoQueryResult result = null;
+        FrameInfoQueryResult prev = null;
+
+        while (!state.isDone) {
+            FrameInfoQueryResult cur = resultAllocator.newFrameInfoQueryResult();
+            if (cur == null) {
+                return result;
+            }
+
+            assert encodeSourceReferences();
+            cur.encodedBci = NO_LOCAL_INFO_BCI;
+            cur.isDeoptEntry = isDeoptEntry;
+
+            final int sourceClassIndex;
+            if (state.isFirstFrame) {
+                sourceClassIndex = state.firstValue;
+            } else {
+                sourceClassIndex = readBuffer.getSVInt();
+                assert !isDeoptEntry : "Deoptimization entry must not have inlined frames";
+            }
+
+            final int sourceMethodNameIndex = readBuffer.getSVInt();
+            final int encodedSourceLineNumber = readBuffer.getSVInt();
+            final int sourceLineNumber = decodeCompressedSourceLineNumber(encodedSourceLineNumber);
+
+            cur.sourceClassIndex = sourceClassIndex;
+            cur.sourceMethodNameIndex = sourceMethodNameIndex;
+
+            cur.sourceClass = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoSourceClasses(info), sourceClassIndex);
+            cur.sourceMethodName = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoSourceMethodNames(info), sourceMethodNameIndex);
+            cur.sourceLineNumber = sourceLineNumber;
+
+            if (prev == null) {
+                // first frame read during this invocation
+                result = cur;
+            } else {
+                prev.caller = cur;
+            }
+            prev = cur;
+
+            state.isDone = encodedSourceLineNumber < 0;
+            state.isFirstFrame = false;
+        }
+
+        return result;
+    }
+
+    private static FrameInfoQueryResult decodeUncompressedFrameInfo(boolean isDeoptEntry, TypeReader readBuffer, CodeInfo info,
+                    FrameInfoQueryResultAllocator resultAllocator, ValueInfoAllocator valueInfoAllocator, CodeInfoAccess.FrameInfoState state) {
         FrameInfoQueryResult result = null;
         FrameInfoQueryResult prev = null;
         ValueInfo[][] virtualObjects = null;
@@ -154,12 +250,12 @@ protected static FrameInfoQueryResult decodeFrameInfo(boolean isDeoptEntry, Type
                 return result;
             }
 
+            assert state.isFirstFrame || !isDeoptEntry : "Deoptimization entry must not have inlined frames";
+
             cur.encodedBci = encodedBci;
             cur.isDeoptEntry = isDeoptEntry;
 
             final boolean needLocalValues = encodedBci != NO_LOCAL_INFO_BCI;
-            cur.needLocalValues = needLocalValues;
-            int curValueInfosLenght = 0;
 
             if (needLocalValues) {
                 cur.numLocks = readBuffer.getUVInt();
@@ -181,39 +277,25 @@ protected static FrameInfoQueryResult decodeFrameInfo(boolean isDeoptEntry, Type
                     cur.deoptMethodOffset = deoptMethodIndex;
                 }
 
-                curValueInfosLenght = readBuffer.getUVInt();
-                cur.valueInfos = decodeValues(valueInfoAllocator, curValueInfosLenght, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
+                int curValueInfosLength = readBuffer.getUVInt();
+                cur.valueInfos = decodeValues(valueInfoAllocator, curValueInfosLength, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
             }
 
-            if (prev != null) {
-                prev.caller = cur;
-                assert !isDeoptEntry : "Deoptimization entry must not have inlined frames";
-            } else {
-                if (!fetchFirstFrame) {
-                    /* CodeInfoDecoder.nextFrameInfo usecase. First frame was fetched previously. */
-                    result = cur;
-                } else {
-                    /* This is the first frame, i.e., the top frame that will be returned. */
-                    result = cur;
-
-                    if (needLocalValues) {
-                        int numVirtualObjects = readBuffer.getUVInt();
-                        virtualObjects = valueInfoAllocator.newValueInfoArrayArray(numVirtualObjects);
-                        for (int i = 0; i < numVirtualObjects; i++) {
-                            int numValues = readBuffer.getUVInt();
-                            ValueInfo[] decodedValues = decodeValues(valueInfoAllocator, numValues, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
-                            if (virtualObjects != null) {
-                                virtualObjects[i] = decodedValues;
-                            }
-                        }
+            if (state.isFirstFrame && needLocalValues) {
+                /* This is the first frame, i.e., the top frame that will be returned. */
+                int numVirtualObjects = readBuffer.getUVInt();
+                virtualObjects = valueInfoAllocator.newValueInfoArrayArray(numVirtualObjects);
+                for (int i = 0; i < numVirtualObjects; i++) {
+                    int numValues = readBuffer.getUVInt();
+                    ValueInfo[] decodedValues = decodeValues(valueInfoAllocator, numValues, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
+                    if (virtualObjects != null) {
+                        virtualObjects[i] = decodedValues;
                     }
                 }
             }
-            prev = cur;
             cur.virtualObjects = virtualObjects;
 
-            final boolean debugNames = needLocalValues && encodeDebugNames();
-            if (debugNames || encodeSourceReferences()) {
+            if (encodeSourceReferences()) {
                 final int sourceClassIndex = readBuffer.getSVInt();
                 final int sourceMethodNameIndex = readBuffer.getSVInt();
                 final int sourceLineNumber = readBuffer.getSVInt();
@@ -226,15 +308,15 @@ protected static FrameInfoQueryResult decodeFrameInfo(boolean isDeoptEntry, Type
                 cur.sourceLineNumber = sourceLineNumber;
             }
 
-            if (debugNames) {
-                for (int i = 0; i < curValueInfosLenght; ++i) {
-                    int nameIndex = readBuffer.getUVInt();
-                    if (cur.valueInfos != null) {
-                        cur.valueInfos[i].nameIndex = nameIndex;
-                        cur.valueInfos[i].name = NonmovableArrays.getObject(CodeInfoAccess.getFrameInfoNames(info), nameIndex);
-                    }
-                }
+            if (prev == null) {
+                // first frame read during this invocation
+                result = cur;
+            } else {
+                prev.caller = cur;
             }
+            prev = cur;
+
+            state.isFirstFrame = false;
         }
     }
 
@@ -267,18 +349,10 @@ private static ValueInfo[] decodeValues(ValueInfoAllocator valueInfoAllocator, i
         return valueInfos;
     }
 
-    protected static boolean encodeDebugNames() {
-        return false;
-    }
-
     protected static boolean encodeSourceReferences() {
         return SubstrateOptions.StackTrace.getValue();
     }
 
-    protected static final int BCI_SHIFT = 2;
-    protected static final int DURING_CALL_MASK = 2;
-    protected static final int RETHROW_EXCEPTION_MASK = 1;
-
     protected static int decodeBci(long encodedBci) {
         return TypeConversion.asS4(encodedBci >> BCI_SHIFT);
     }
@@ -291,6 +365,21 @@ protected static boolean decodeRethrowException(long encodedBci) {
         return (encodedBci & RETHROW_EXCEPTION_MASK) != 0;
     }
 
+    /**
+     * Complement of (FrameInfoEncode.encodeCompressedSourceLineNumber).
+     */
+    private static int decodeCompressedSourceLineNumber(int sourceLineNumber) {
+        return Math.abs(sourceLineNumber) - COMPRESSED_SOURCE_LINE_ADDEND;
+    }
+
+    /**
+     * Differentiates between compressed and uncompressed frame slice. Uncompressed frame slices are
+     * start with an {@link #UNCOMPRESSED_FRAME_SLICE_MARKER}.
+     */
+    private static boolean isCompressedFrameSlice(int firstValue) {
+        return firstValue != UNCOMPRESSED_FRAME_SLICE_MARKER;
+    }
+
     public static String readableBci(long encodedBci) {
         return decodeBci(encodedBci) +
                         ((encodedBci & DURING_CALL_MASK) != 0 ? " duringCall" : "") +
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
index cc5eb40a8a18..b52495a6e016 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
@@ -29,13 +29,17 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.collections.Equivalence;
 import org.graalvm.compiler.core.common.LIRKind;
+import org.graalvm.compiler.core.common.util.FrequencyEncoder;
 import org.graalvm.compiler.core.common.util.TypeConversion;
 import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.CalleeSavedRegisters;
 import com.oracle.svm.core.ReservedRegisters;
+import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.c.NonmovableArray;
 import com.oracle.svm.core.c.NonmovableArrays;
@@ -66,26 +70,23 @@
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaValue;
-import jdk.vm.ci.meta.Local;
-import jdk.vm.ci.meta.LocalVariableTable;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public class FrameInfoEncoder {
 
     public abstract static class Customization {
-        protected boolean shouldStoreMethod() {
-            return true;
-        }
+        /**
+         * Returns true if the method's deoptimization target should be saved within the debugInfo.
+         */
+        protected abstract boolean storeDeoptTargetMethod();
 
         /**
-         * Returns true if the given debugInfo should be encoded.
+         * Returns true if the given local values should be encoded within the debugInfo.
          *
          * @param method The method that contains the debugInfo.
          * @param infopoint The infopoint whose debugInfo that is considered for inclusion.
          */
-        protected boolean shouldInclude(ResolvedJavaMethod method, Infopoint infopoint) {
-            return true;
-        }
+        protected abstract boolean includeLocalValues(ResolvedJavaMethod method, Infopoint infopoint);
 
         /**
          * Returns true if the given debugInfo is a valid entry point for deoptimization (and not
@@ -94,21 +95,19 @@ protected boolean shouldInclude(ResolvedJavaMethod method, Infopoint infopoint)
          * @param method The method that contains the debugInfo.
          * @param infopoint The infopoint whose debugInfo that is considered for inclusion.
          */
-        protected boolean isDeoptEntry(ResolvedJavaMethod method, Infopoint infopoint) {
-            return false;
-        }
+        protected abstract boolean isDeoptEntry(ResolvedJavaMethod method, Infopoint infopoint);
 
         /**
-         * Fills the FrameInfoQueryResult.source* and {@link ValueInfo#name} fields.
+         * Fills the FrameInfoQueryResult.source* fields.
          */
-        protected abstract void fillDebugNames(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo, boolean fillValueNames);
+        protected abstract void fillSourceFields(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo);
     }
 
-    public abstract static class NamesFromMethod extends Customization {
+    public abstract static class SourceFieldsFromMethod extends Customization {
         private final HostedStringDeduplication stringTable = HostedStringDeduplication.singleton();
 
         @Override
-        protected void fillDebugNames(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo, boolean fillValueNames) {
+        protected void fillSourceFields(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo) {
             final ResolvedJavaMethod method = bytecodeFrame.getMethod();
 
             final StackTraceElement source = method.asStackTraceElement(bytecodeFrame.getBCI());
@@ -120,30 +119,14 @@ protected void fillDebugNames(BytecodeFrame bytecodeFrame, FrameInfoQueryResult
              */
             resultFrameInfo.sourceMethodName = stringTable.deduplicate(source.getMethodName(), true);
             resultFrameInfo.sourceLineNumber = source.getLineNumber();
-
-            if (fillValueNames) {
-                final LocalVariableTable localVariableTable = bytecodeFrame.getMethod().getLocalVariableTable();
-                if (localVariableTable != null) {
-                    Local[] locals = localVariableTable.getLocalsAt(bytecodeFrame.getBCI());
-                    if (locals != null) {
-                        for (Local local : locals) {
-                            if (local.getSlot() < resultFrameInfo.valueInfos.length) {
-                                resultFrameInfo.valueInfos[local.getSlot()].name = local.getName();
-                            } else {
-                                assert ValueUtil.isIllegalJavaValue(bytecodeFrame.values[local.getSlot()]);
-                            }
-                        }
-                    }
-                }
-            }
         }
 
         protected abstract Class<?> getDeclaringJavaClass(ResolvedJavaMethod method);
     }
 
-    public static class NamesFromImage extends Customization {
+    public abstract static class SourceFieldsFromImage extends Customization {
         @Override
-        protected void fillDebugNames(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo, boolean fillValueNames) {
+        protected void fillSourceFields(BytecodeFrame bytecodeFrame, FrameInfoQueryResult resultFrameInfo) {
             final int deoptOffsetInImage = ((SharedMethod) bytecodeFrame.getMethod()).getDeoptOffsetInImage();
             if (deoptOffsetInImage != 0) {
                 CodeInfoQueryResult targetCodeInfo = CodeInfoTable.lookupDeoptimizationEntrypoint(deoptOffsetInImage, resultFrameInfo.encodedBci);
@@ -154,41 +137,180 @@ protected void fillDebugNames(BytecodeFrame bytecodeFrame, FrameInfoQueryResult
                     resultFrameInfo.sourceClass = targetFrameInfo.sourceClass;
                     resultFrameInfo.sourceMethodName = targetFrameInfo.sourceMethodName;
                     resultFrameInfo.sourceLineNumber = targetFrameInfo.sourceLineNumber;
-
-                    if (fillValueNames) {
-                        final int minLength = Math.min(resultFrameInfo.valueInfos.length, targetFrameInfo.valueInfos.length);
-                        for (int i = 0; i < minLength; i++) {
-                            resultFrameInfo.valueInfos[i].name = targetFrameInfo.valueInfos[i].name;
-                        }
-                    }
                 }
             }
         }
     }
 
+    private static final int UNCOMPRESSED_FRAME_SLICE_INDEX = -1;
+
     static class FrameData {
         protected DebugInfo debugInfo;
         protected int totalFrameSize;
         protected ValueInfo[][] virtualObjects;
         protected FrameInfoQueryResult frame;
-        protected long indexInEncodings;
+        protected long encodedFrameInfoIndex;
+        protected int frameSliceIndex = UNCOMPRESSED_FRAME_SLICE_INDEX;
+    }
+
+    private static class SourceFieldData {
+        final Class<?> sourceClass;
+        final String sourceMethodName;
+        final int sourceLineNumber;
+        final boolean isSliceEnd;
+
+        SourceFieldData(Class<?> sourceClass, String sourceMethodName, int sourceLineNumber, boolean isSliceEnd) {
+            this.sourceClass = sourceClass;
+            this.sourceMethodName = sourceMethodName;
+            this.sourceLineNumber = sourceLineNumber;
+            this.isSliceEnd = isSliceEnd;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            SourceFieldData that = (SourceFieldData) o;
+            return sourceLineNumber == that.sourceLineNumber && isSliceEnd == that.isSliceEnd && sourceClass.equals(that.sourceClass) && sourceMethodName.equals(that.sourceMethodName);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(sourceClass, sourceMethodName, sourceLineNumber, isSliceEnd);
+        }
+    }
+
+    /**
+     * When the local values are not needed to be saved within the frame encoding, there can be
+     * significant space savings via using an alternative encoding.
+     *
+     * Within the "compressed" encoding, only the following three values are saved for each frame:
+     * <ol>
+     * <li>index to source class</li>
+     * <li>index to method name</li>
+     * <li>source line number</li>
+     * </ol>
+     *
+     * Due to inlining, multiple frames may represent a given {@link Infopoint}. Hence, for each
+     * Infopoint, we call the frame(s) representing it a *frame slice*. During decoding, within the
+     * compressed encoding the last frame of a given frame slice is indicated by reading a negative
+     * source line number.
+     *
+     * Additional space is saved when multiple Infopoints' frame slices are identical. All
+     * Infopoints with identical frame slice information will point to the same compressed frame
+     * encoding.
+     *
+     * Within the encoded frame metadata, frame slices stored in both the compressed and the
+     * original (i.e., *uncompressed*) frame encoding can coexist. To differentiate between
+     * compressed and uncompressed frame slices, uncompressed frame slices start with the
+     * {@link FrameInfoDecoder#UNCOMPRESSED_FRAME_SLICE_MARKER}.
+     */
+    private static class CompressedFrameInfoEncodingMetadata {
+        final List<SourceFieldData> framesToEncode = new ArrayList<>();
+        final EconomicMap<SourceFieldData, Integer> framesToEncodeIndexMap = EconomicMap.create(Equivalence.DEFAULT);
+        final List<List<SourceFieldData>> frameSlices = new ArrayList<>();
+        final EconomicMap<List<SourceFieldData>, Integer> frameSliceIndexMap = EconomicMap.create(Equivalence.DEFAULT);
+        final FrequencyEncoder<Integer> sliceFrequency = FrequencyEncoder.createEqualityEncoder();
+
+        boolean sealed = false;
+        EconomicMap<Integer, Long> encodedSliceIndexMap = EconomicMap.create(Equivalence.DEFAULT);
+
+        void addFrameSlice(FrameData data, List<SourceFieldData> slice) {
+            assert !sealed;
+            List<SourceFieldData> encodedFrameSlice = new ArrayList<>();
+            for (SourceFieldData fieldData : slice) {
+                Integer fieldDataIndex = framesToEncodeIndexMap.get(fieldData);
+                if (fieldDataIndex == null) {
+                    fieldDataIndex = framesToEncode.size();
+                    framesToEncode.add(fieldData);
+                    framesToEncodeIndexMap.put(fieldData, fieldDataIndex);
+                }
+                encodedFrameSlice.add(framesToEncode.get(fieldDataIndex));
+            }
+            Integer frameSliceIndex = frameSliceIndexMap.get(encodedFrameSlice);
+            if (frameSliceIndex == null) {
+                frameSliceIndex = frameSlices.size();
+                frameSlices.add(encodedFrameSlice);
+                frameSliceIndexMap.put(encodedFrameSlice, frameSliceIndex);
+            }
+            data.frameSliceIndex = frameSliceIndex;
+            sliceFrequency.addObject(frameSliceIndex);
+        }
+
+        void encodeCompressedData(UnsafeArrayTypeWriter encodingBuffer, Encoders encoders) {
+            assert !sealed;
+            sealed = true;
+            Integer[] sliceOrder = sliceFrequency.encodeAll(new Integer[sliceFrequency.getLength()]);
+            for (Integer sliceIdx : sliceOrder) {
+                assert !encodedSliceIndexMap.containsKey(sliceIdx);
+                encodedSliceIndexMap.put(sliceIdx, encodingBuffer.getBytesWritten());
+
+                List<SourceFieldData> slice = frameSlices.get(sliceIdx);
+                for (SourceFieldData fieldData : slice) {
+                    int classIndex = encoders.sourceClasses.getIndex(fieldData.sourceClass);
+                    int methodIndex = encoders.sourceMethodNames.getIndex(fieldData.sourceMethodName);
+
+                    VMError.guarantee(classIndex != FrameInfoDecoder.UNCOMPRESSED_FRAME_SLICE_MARKER);
+
+                    encodingBuffer.putSV(classIndex);
+                    encodingBuffer.putSV(methodIndex);
+                    encodingBuffer.putSV(encodeCompressedSourceLineNumber(fieldData.sourceLineNumber, fieldData.isSliceEnd));
+                }
+            }
+        }
+
+        long getEncodingOffset(int sliceIndex) {
+            assert sealed;
+            Long encodedSliceIndex = encodedSliceIndexMap.get(sliceIndex);
+            assert encodedSliceIndex != null;
+            return encodedSliceIndex;
+        }
+
+        /**
+         * When verifying the frame encoding, sourceClassIndex and sourceMethodNameIndex must be
+         * filled in correctly.
+         */
+        boolean writeFrameVerificationInfo(FrameData data, Encoders encoders) {
+            int curIdx = 0;
+            List<SourceFieldData> slice = frameSlices.get(data.frameSliceIndex);
+            for (FrameInfoQueryResult cur = data.frame; cur != null; cur = cur.caller) {
+                cur.encodedBci = FrameInfoDecoder.NO_LOCAL_INFO_BCI;
+                assert cur == data.frame || !cur.isDeoptEntry : "Deoptimization entry information for caller frames is not persisted";
+
+                cur.sourceClassIndex = encoders.sourceClasses.getIndex(cur.sourceClass);
+                cur.sourceMethodNameIndex = encoders.sourceMethodNames.getIndex(cur.sourceMethodName);
+                boolean isSliceEnd = cur.caller == null;
+                SourceFieldData fieldData = new SourceFieldData(cur.sourceClass, cur.sourceMethodName, cur.sourceLineNumber, isSliceEnd);
+                assert fieldData.equals(slice.get(curIdx));
+                curIdx++;
+            }
+            assert frameSlices.get(data.frameSliceIndex).size() == curIdx;
+            return true;
+        }
     }
 
     private final Customization customization;
 
     private final List<FrameData> allDebugInfos;
     private final Encoders encoders;
+    private final CompressedFrameInfoEncodingMetadata frameMetadata;
 
     protected FrameInfoEncoder(Customization customization, Encoders encoders) {
         this.customization = customization;
         this.encoders = encoders;
         this.allDebugInfos = new ArrayList<>();
+        this.frameMetadata = new CompressedFrameInfoEncodingMetadata();
     }
 
     protected FrameData addDebugInfo(ResolvedJavaMethod method, Infopoint infopoint, int totalFrameSize) {
-        final boolean shouldIncludeMethod = customization.shouldInclude(method, infopoint);
+        final boolean includeLocalValues = customization.includeLocalValues(method, infopoint);
         final boolean encodeSourceReferences = FrameInfoDecoder.encodeSourceReferences();
-        if (!shouldIncludeMethod && !encodeSourceReferences) {
+        final boolean useCompressedEncoding = SubstrateOptions.UseCompressedFrameEncodings.getValue() && !includeLocalValues;
+        if (!includeLocalValues && !encodeSourceReferences) {
             return null;
         }
 
@@ -197,28 +319,34 @@ protected FrameData addDebugInfo(ResolvedJavaMethod method, Infopoint infopoint,
         data.debugInfo = debugInfo;
         data.totalFrameSize = totalFrameSize;
         data.virtualObjects = new ValueInfo[countVirtualObjects(debugInfo)][];
-        data.frame = addFrame(data, debugInfo.frame(), customization.isDeoptEntry(method, infopoint), shouldIncludeMethod);
+        data.frame = addFrame(data, debugInfo.frame(), customization.isDeoptEntry(method, infopoint), includeLocalValues);
 
-        final boolean encodeDebugNames = shouldIncludeMethod && FrameInfoDecoder.encodeDebugNames();
-        if (encodeDebugNames || FrameInfoDecoder.encodeSourceReferences()) {
+        if (encodeSourceReferences) {
+            List<SourceFieldData> frameSlice = useCompressedEncoding ? new ArrayList<>() : null;
             BytecodeFrame bytecodeFrame = data.debugInfo.frame();
-            for (FrameInfoQueryResult resultFrame = data.frame; bytecodeFrame != null; resultFrame = resultFrame.caller) {
-                customization.fillDebugNames(bytecodeFrame, resultFrame, encodeDebugNames && shouldIncludeMethod);
+            for (FrameInfoQueryResult resultFrame = data.frame; resultFrame != null; resultFrame = resultFrame.caller) {
+                assert bytecodeFrame != null;
+                customization.fillSourceFields(bytecodeFrame, resultFrame);
+
+                // save source class and method name
+                final Class<?> sourceClass = resultFrame.sourceClass;
+                final String sourceMethodName = resultFrame.sourceMethodName;
+                encoders.sourceClasses.addObject(sourceClass);
+                encoders.sourceMethodNames.addObject(sourceMethodName);
+
+                // save encoding metadata
+                if (useCompressedEncoding) {
+                    assert !resultFrame.hasLocalValueInfo();
+                    final boolean isSliceEnd = resultFrame.caller == null;
+                    final int sourceLineNumber = resultFrame.sourceLineNumber;
+                    SourceFieldData fieldData = new SourceFieldData(sourceClass, sourceMethodName, sourceLineNumber, isSliceEnd);
+                    frameSlice.add(fieldData);
+                }
+
                 bytecodeFrame = bytecodeFrame.caller();
             }
-
-            for (FrameInfoQueryResult cur = data.frame; cur != null; cur = cur.caller) {
-                encoders.sourceClasses.addObject(cur.sourceClass);
-                encoders.sourceMethodNames.addObject(cur.sourceMethodName);
-
-                if (encodeDebugNames) {
-                    for (ValueInfo valueInfo : cur.valueInfos) {
-                        if (valueInfo.name == null) {
-                            valueInfo.name = "";
-                        }
-                        encoders.names.addObject(valueInfo.name);
-                    }
-                }
+            if (useCompressedEncoding) {
+                frameMetadata.addFrameSlice(data, frameSlice);
             }
         }
 
@@ -260,21 +388,20 @@ private FrameInfoQueryResult addFrame(FrameData data, BytecodeFrame frame, boole
         result.virtualObjects = data.virtualObjects;
         result.encodedBci = encodeBci(frame.getBCI(), frame.duringCall, frame.rethrowException);
         result.isDeoptEntry = isDeoptEntry;
-        result.needLocalValues = needLocalValues;
-
-        SharedMethod method = (SharedMethod) frame.getMethod();
-        if (customization.shouldStoreMethod()) {
-            result.deoptMethod = method;
-            encoders.objectConstants.addObject(SubstrateObjectConstant.forObject(method));
-        }
-        result.deoptMethodOffset = method.getDeoptOffsetInImage();
-
-        result.numLocals = frame.numLocals;
-        result.numStack = frame.numStack;
-        result.numLocks = frame.numLocks;
 
         ValueInfo[] valueInfos = null;
         if (needLocalValues) {
+            SharedMethod method = (SharedMethod) frame.getMethod();
+            if (customization.storeDeoptTargetMethod()) {
+                result.deoptMethod = method;
+                encoders.objectConstants.addObject(SubstrateObjectConstant.forObject(method));
+            }
+            result.deoptMethodOffset = method.getDeoptOffsetInImage();
+
+            result.numLocals = frame.numLocals;
+            result.numStack = frame.numStack;
+            result.numLocks = frame.numLocks;
+
             JavaValue[] values = frame.values;
             int numValues = 0;
             for (int i = values.length; --i >= 0;) {
@@ -581,19 +708,27 @@ private static void afterInstallation(CodeInfo info) {
 
     private NonmovableArray<Byte> encodeFrameDatas() {
         UnsafeArrayTypeWriter encodingBuffer = UnsafeArrayTypeWriter.create(ByteArrayReader.supportsUnalignedMemoryAccess());
+        frameMetadata.encodeCompressedData(encodingBuffer, encoders);
         for (FrameData data : allDebugInfos) {
-            data.indexInEncodings = encodingBuffer.getBytesWritten();
-            encodeFrameData(data, encodingBuffer);
+            if (data.frameSliceIndex == UNCOMPRESSED_FRAME_SLICE_INDEX) {
+                data.encodedFrameInfoIndex = encodingBuffer.getBytesWritten();
+                encodeUncompressedFrameData(data, encodingBuffer);
+            } else {
+                data.encodedFrameInfoIndex = frameMetadata.getEncodingOffset(data.frameSliceIndex);
+                assert frameMetadata.writeFrameVerificationInfo(data, encoders);
+            }
         }
         NonmovableArray<Byte> frameInfoEncodings = NonmovableArrays.createByteArray(TypeConversion.asS4(encodingBuffer.getBytesWritten()));
         encodingBuffer.toByteBuffer(NonmovableArrays.asByteBuffer(frameInfoEncodings));
         return frameInfoEncodings;
     }
 
-    private void encodeFrameData(FrameData data, UnsafeArrayTypeWriter encodingBuffer) {
+    private void encodeUncompressedFrameData(FrameData data, UnsafeArrayTypeWriter encodingBuffer) {
+        encodingBuffer.putSV(FrameInfoDecoder.UNCOMPRESSED_FRAME_SLICE_MARKER);
+
         for (FrameInfoQueryResult cur = data.frame; cur != null; cur = cur.caller) {
             assert cur.encodedBci != FrameInfoDecoder.NO_CALLER_BCI : "used as the end marker during decoding";
-            final boolean needLocalValues = cur.needLocalValues;
+            final boolean needLocalValues = cur.hasLocalValueInfo();
             if (!needLocalValues) {
                 cur.encodedBci = FrameInfoDecoder.NO_LOCAL_INFO_BCI;
             }
@@ -627,8 +762,7 @@ private void encodeFrameData(FrameData data, UnsafeArrayTypeWriter encodingBuffe
                 }
             }
 
-            final boolean encodeDebugNames = needLocalValues && FrameInfoDecoder.encodeDebugNames();
-            if (encodeDebugNames || FrameInfoDecoder.encodeSourceReferences()) {
+            if (FrameInfoDecoder.encodeSourceReferences()) {
                 final int classIndex = encoders.sourceClasses.getIndex(cur.sourceClass);
                 final int methodIndex = encoders.sourceMethodNames.getIndex(cur.sourceMethodName);
 
@@ -639,13 +773,6 @@ private void encodeFrameData(FrameData data, UnsafeArrayTypeWriter encodingBuffe
                 encodingBuffer.putSV(methodIndex);
                 encodingBuffer.putSV(cur.sourceLineNumber);
             }
-
-            if (encodeDebugNames) {
-                for (ValueInfo valueInfo : cur.valueInfos) {
-                    valueInfo.nameIndex = encoders.names.getIndex(valueInfo.name);
-                    encodingBuffer.putUV(valueInfo.nameIndex);
-                }
-            }
         }
         encodingBuffer.putSV(FrameInfoDecoder.NO_CALLER_BCI);
     }
@@ -695,11 +822,21 @@ public static long encodeBci(int bci, boolean duringCall, boolean rethrowExcepti
         return (((long) bci) << FrameInfoDecoder.BCI_SHIFT) | (duringCall ? FrameInfoDecoder.DURING_CALL_MASK : 0) | (rethrowException ? FrameInfoDecoder.RETHROW_EXCEPTION_MASK : 0);
     }
 
+    /**
+     * The source line number also encodes whether the is it the end of or a frame slice or not. The
+     * original value is incremented to guarantee all source line numbers are greater than 0.
+     */
+    private static int encodeCompressedSourceLineNumber(int sourceLineNumber, boolean isSliceEnd) {
+        int lineNumberWithAddend = sourceLineNumber + FrameInfoDecoder.COMPRESSED_SOURCE_LINE_ADDEND;
+        VMError.guarantee(lineNumberWithAddend > 0);
+        return isSliceEnd ? -(lineNumberWithAddend) : (lineNumberWithAddend);
+    }
+
     void verifyEncoding(CodeInfo info) {
         for (FrameData expectedData : allDebugInfos) {
             FrameInfoQueryResult actualFrame = FrameInfoDecoder.decodeFrameInfo(expectedData.frame.isDeoptEntry,
-                            new ReusableTypeReader(CodeInfoAccess.getFrameInfoEncodings(info), expectedData.indexInEncodings),
-                            info, FrameInfoDecoder.HeapBasedFrameInfoQueryResultAllocator, FrameInfoDecoder.HeapBasedValueInfoAllocator, true);
+                            new ReusableTypeReader(CodeInfoAccess.getFrameInfoEncodings(info), expectedData.encodedFrameInfoIndex),
+                            info, FrameInfoDecoder.HeapBasedFrameInfoQueryResultAllocator, FrameInfoDecoder.HeapBasedValueInfoAllocator);
             FrameInfoVerifier.verifyFrames(expectedData, expectedData.frame, actualFrame);
         }
     }
@@ -712,8 +849,8 @@ protected static void verifyFrames(FrameInfoEncoder.FrameData expectedData, Fram
         while (expectedFrame != null) {
             assert actualFrame != null;
             assert expectedFrame.isDeoptEntry == actualFrame.isDeoptEntry;
-            assert expectedFrame.needLocalValues == actualFrame.needLocalValues;
-            if (expectedFrame.needLocalValues) {
+            assert expectedFrame.hasLocalValueInfo() == actualFrame.hasLocalValueInfo();
+            if (expectedFrame.hasLocalValueInfo()) {
                 assert expectedFrame.encodedBci == actualFrame.encodedBci;
                 assert expectedFrame.deoptMethod == null && actualFrame.deoptMethod == null ||
                                 ((expectedFrame.deoptMethod != null) && expectedFrame.deoptMethod.equals(actualFrame.deoptMethod));
@@ -739,7 +876,7 @@ protected static void verifyFrames(FrameInfoEncoder.FrameData expectedData, Fram
         }
         assert actualFrame == null;
 
-        if (actualTopFrame.needLocalValues) {
+        if (actualTopFrame.hasLocalValueInfo()) {
             assert expectedData.virtualObjects.length == actualTopFrame.virtualObjects.length;
             for (int i = 0; i < expectedData.virtualObjects.length; i++) {
                 verifyValues(expectedData.virtualObjects[i], actualTopFrame.virtualObjects[i]);
@@ -759,8 +896,6 @@ private static void verifyValues(ValueInfo[] expectedValues, ValueInfo[] actualV
             assert expectedValue.isEliminatedMonitor == actualValue.isEliminatedMonitor;
             assert expectedValue.data == actualValue.data;
             verifyConstant(expectedValue.value, actualValue.value);
-            assert Objects.equals(expectedValue.name, actualValue.name);
-            assert expectedValue.nameIndex == actualValue.nameIndex;
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoQueryResult.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoQueryResult.java
index 0c71ad083135..9d9a0a1fd920 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoQueryResult.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoQueryResult.java
@@ -99,9 +99,6 @@ public static class ValueInfo {
         protected boolean isEliminatedMonitor;
         protected long data;
         protected JavaConstant value;
-        protected String name;
-        /** Index of {@link #name} in {@link FrameInfoDecoder#decodeFrameInfo frameInfoNames}. */
-        protected int nameIndex = -1;
 
         /**
          * Returns the type of the value, describing how to access the value.
@@ -156,7 +153,6 @@ public JavaConstant getValue() {
     protected int deoptMethodOffset;
     protected long encodedBci;
     protected boolean isDeoptEntry;
-    protected boolean needLocalValues;
     protected int numLocals;
     protected int numStack;
     protected int numLocks;
@@ -182,7 +178,6 @@ public void init() {
         deoptMethodOffset = 0;
         encodedBci = 0;
         isDeoptEntry = false;
-        needLocalValues = false;
         numLocals = 0;
         numStack = 0;
         numLocks = 0;
@@ -287,6 +282,13 @@ public int getNumStack() {
         return numStack;
     }
 
+    /**
+     * Returns whether any local value info is present.
+     */
+    public boolean hasLocalValueInfo() {
+        return valueInfos != null;
+    }
+
     /**
      * Returns the local variables and expression stack values.
      */
@@ -370,11 +372,4 @@ public Log log(Log log) {
 
         return log;
     }
-
-    /**
-     * Returns the name of the local variable with the given index, for debugging purposes only.
-     */
-    public String getLocalVariableName(int idx) {
-        return idx < valueInfos.length ? valueInfos[idx].name : null;
-    }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
index 2d1f91c9bb65..cd7c4bfda8f6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
@@ -65,7 +65,6 @@ public class ImageCodeInfo {
     @UnknownObjectField(types = {Object[].class}) Object[] frameInfoObjectConstants;
     @UnknownObjectField(types = {Class[].class}) Class<?>[] frameInfoSourceClasses;
     @UnknownObjectField(types = {String[].class}) String[] frameInfoSourceMethodNames;
-    @UnknownObjectField(types = {String[].class}) String[] frameInfoNames;
 
     @Platforms(Platform.HOSTED_ONLY.class)
     ImageCodeInfo() {
@@ -98,7 +97,6 @@ CodeInfo prepareCodeInfo() {
         info.setFrameInfoObjectConstants(NonmovableArrays.fromImageHeap(frameInfoObjectConstants));
         info.setFrameInfoSourceClasses(NonmovableArrays.fromImageHeap(frameInfoSourceClasses));
         info.setFrameInfoSourceMethodNames(NonmovableArrays.fromImageHeap(frameInfoSourceMethodNames));
-        info.setFrameInfoNames(NonmovableArrays.fromImageHeap(frameInfoNames));
 
         return info;
     }
@@ -237,16 +235,6 @@ public void setFrameInfoSourceMethodNames(NonmovableObjectArray<String> array) {
             frameInfoSourceMethodNames = NonmovableArrays.getHostedArray(array);
         }
 
-        @Override
-        public NonmovableObjectArray<String> getFrameInfoNames() {
-            return NonmovableArrays.fromImageHeap(frameInfoNames);
-        }
-
-        @Override
-        public void setFrameInfoNames(NonmovableObjectArray<String> array) {
-            frameInfoNames = NonmovableArrays.getHostedArray(array);
-        }
-
         @Override
         public void setObjectFields(NonmovableObjectArray<Object> fields) {
             throw VMError.shouldNotReachHere("not supported for image code");
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
index bc6322ac101e..c017746f2c5a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoAccess.java
@@ -173,7 +173,6 @@ public static boolean walkWeakReferences(CodeInfo info, ObjectReferenceVisitor v
         continueVisiting = continueVisiting && NonmovableArrays.walkUnmanagedObjectArray(impl.getFrameInfoObjectConstants(), visitor);
         continueVisiting = continueVisiting && NonmovableArrays.walkUnmanagedObjectArray(impl.getFrameInfoSourceClasses(), visitor);
         continueVisiting = continueVisiting && NonmovableArrays.walkUnmanagedObjectArray(impl.getFrameInfoSourceMethodNames(), visitor);
-        continueVisiting = continueVisiting && NonmovableArrays.walkUnmanagedObjectArray(impl.getFrameInfoNames(), visitor);
         continueVisiting = continueVisiting && NonmovableArrays.walkUnmanagedObjectArray(impl.getDeoptimizationObjectConstants(), visitor);
         return continueVisiting;
     }
@@ -324,7 +323,6 @@ public static void forEachObjectArray(CodeInfo info, NonmovableArrayAction actio
         action.apply(impl.getFrameInfoObjectConstants());
         action.apply(impl.getFrameInfoSourceClasses());
         action.apply(impl.getFrameInfoSourceMethodNames());
-        action.apply(impl.getFrameInfoNames());
         action.apply(impl.getDeoptimizationObjectConstants());
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
index 54787ca1a7a6..cf65e7102af0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
@@ -1124,10 +1124,6 @@ private static void printVirtualFrame(Log log, VirtualFrame virtualFrame) {
             JavaConstant con = virtualFrame.getConstant(i);
             if (con.getJavaKind() != JavaKind.Illegal) {
                 log.newline().string("            slot ").signed(i);
-                String name = frameInfo.getLocalVariableName(i);
-                if (name != null) {
-                    log.string(" ").string(name);
-                }
                 log.string("  kind: ").string(con.getJavaKind().toString());
                 if (con.getJavaKind() == JavaKind.Object) {
                     Object val = SubstrateObjectConstant.asObject(con);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
index 6819ad7e7bfb..d015dffd0b99 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
@@ -362,10 +362,6 @@ public String toString() {
             JavaConstant con = getLocalConstant(i);
             if (con.getJavaKind() != JavaKind.Illegal) {
                 result.append("\n    local ").append(i);
-                String name = frameInfo.getLocalVariableName(i);
-                if (name != null) {
-                    result.append(" ").append(name);
-                }
                 if (con.getJavaKind() == JavaKind.Object) {
                     if (isVirtual(i)) {
                         result.append("  [virtual object]");
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java
index 338e13d45439..339c434efe67 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/ThreadStackPrinter.java
@@ -104,6 +104,7 @@ public void decodeConstant(ValueInfo valueInfo, NonmovableObjectArray<?> frameIn
 
         private static SingleShotFrameInfoQueryResultAllocator SingleShotFrameInfoQueryResultAllocator = new SingleShotFrameInfoQueryResultAllocator();
         private static DummyValueInfoAllocator DummyValueInfoAllocator = new DummyValueInfoAllocator();
+        private static CodeInfoAccess.FrameInfoState frameInfoState = new CodeInfoAccess.FrameInfoState();
 
         @Override
         protected void logFrame(Log log, Pointer sp, CodePointer ip, CodeInfo codeInfo, DeoptimizedFrame deoptFrame) {
@@ -111,12 +112,13 @@ protected void logFrame(Log log, Pointer sp, CodePointer ip, CodeInfo codeInfo,
                 logVirtualFrames(log, sp, ip, deoptFrame);
             } else {
                 frameInfoReader.reset();
-                long entryOffset = CodeInfoAccess.initFrameInfoReader(codeInfo, ip, frameInfoReader);
-                if (entryOffset >= 0) {
+                frameInfoState.reset();
+                CodeInfoAccess.initFrameInfoReader(codeInfo, ip, frameInfoReader, frameInfoState);
+                if (frameInfoState.entryOffset >= 0) {
                     boolean isFirst = true;
                     FrameInfoQueryResult validResult;
                     SingleShotFrameInfoQueryResultAllocator.reload();
-                    while ((validResult = CodeInfoAccess.nextFrameInfo(codeInfo, entryOffset, frameInfoReader, SingleShotFrameInfoQueryResultAllocator, DummyValueInfoAllocator, isFirst)) != null) {
+                    while ((validResult = CodeInfoAccess.nextFrameInfo(codeInfo, frameInfoReader, SingleShotFrameInfoQueryResultAllocator, DummyValueInfoAllocator, frameInfoState)) != null) {
                         SingleShotFrameInfoQueryResultAllocator.reload();
                         if (!isFirst) {
                             log.newline();
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
index d1d104b8e68d..a6580c89399b 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
 import org.graalvm.compiler.core.common.NumUtil;
@@ -241,7 +242,7 @@ private void patchDirectObjectConstants(ObjectConstantsHolder objectConstants, C
     }
 
     private void createCodeChunkInfos(CodeInfo runtimeMethodInfo, ReferenceAdjuster adjuster) {
-        CodeInfoEncoder codeInfoEncoder = new CodeInfoEncoder(new FrameInfoEncoder.NamesFromImage());
+        CodeInfoEncoder codeInfoEncoder = new CodeInfoEncoder(new RuntimeFrameInfoCustomization());
         codeInfoEncoder.addMethod(method, compilation, 0);
         codeInfoEncoder.encodeAllAndInstall(runtimeMethodInfo, adjuster);
 
@@ -266,4 +267,21 @@ private void patchData(Map<Integer, NativeImagePatcher> patcher, @SuppressWarnin
             }
         }
     }
+
+    private static class RuntimeFrameInfoCustomization extends FrameInfoEncoder.SourceFieldsFromImage {
+        @Override
+        protected boolean storeDeoptTargetMethod() {
+            return true;
+        }
+
+        @Override
+        protected boolean includeLocalValues(ResolvedJavaMethod method, Infopoint infopoint) {
+            return true;
+        }
+
+        @Override
+        protected boolean isDeoptEntry(ResolvedJavaMethod method, Infopoint infopoint) {
+            return false;
+        }
+    }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
index 8f43ebfeb1d8..9a68d5596432 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
@@ -214,7 +214,7 @@ public int getAlignedConstantsSize() {
 
     public void buildRuntimeMetadata(CFunctionPointer firstMethod, UnsignedWord codeSize) {
         // Build run-time metadata.
-        FrameInfoCustomization frameInfoCustomization = new FrameInfoCustomization();
+        HostedFrameInfoCustomization frameInfoCustomization = new HostedFrameInfoCustomization();
         CodeInfoEncoder codeInfoEncoder = new CodeInfoEncoder(frameInfoCustomization);
         for (Entry<HostedMethod, CompilationResult> entry : compilations.entrySet()) {
             final HostedMethod method = entry.getKey();
@@ -435,7 +435,7 @@ public void printCompilationResults() {
         }
     }
 
-    private static class FrameInfoCustomization extends FrameInfoEncoder.NamesFromMethod {
+    private static class HostedFrameInfoCustomization extends FrameInfoEncoder.SourceFieldsFromMethod {
         int numDeoptEntryPoints;
         int numDuringCallEntryPoints;
 
@@ -447,12 +447,12 @@ protected Class<?> getDeclaringJavaClass(ResolvedJavaMethod method) {
         }
 
         @Override
-        protected boolean shouldStoreMethod() {
+        protected boolean storeDeoptTargetMethod() {
             return false;
         }
 
         @Override
-        protected boolean shouldInclude(ResolvedJavaMethod method, Infopoint infopoint) {
+        protected boolean includeLocalValues(ResolvedJavaMethod method, Infopoint infopoint) {
             CompilationInfo compilationInfo = ((HostedMethod) method).compilationInfo;
             BytecodeFrame topFrame = infopoint.debugInfo.frame();
 

From ac93c557a49f36abb958b2962cef2890838de711 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Fri, 10 Sep 2021 13:00:34 -0700
Subject: [PATCH 574/681] Eliminate more MethodSubstitutions

---
 .../test/HotSpotCryptoSubstitutionTest.java   |   9 +-
 .../hotspot/GraalHotSpotVMConfig.java         | 174 +---
 .../compiler/hotspot/HotSpotBackend.java      |  32 +-
 .../hotspot/SymbolicSnippetEncoder.java       |  36 +-
 .../meta/HotSpotGraphBuilderPlugins.java      | 850 ++++++++++++------
 .../meta/HotSpotHostForeignCallsProvider.java |   4 -
 .../replacements/AESCryptSubstitutions.java   | 139 ---
 .../CipherBlockChainingSubstitutions.java     | 160 ----
 .../CounterModeSubstitutions.java             |  98 --
 .../HotSpotArraySubstitutions.java            |  56 --
 .../HotSpotClassSubstitutions.java            | 139 ---
 .../HotSpotInvocationPluginHelper.java        | 232 +++++
 .../replacements/HotSpotReplacementsUtil.java |  61 +-
 .../replacements/ReflectionSubstitutions.java |  55 --
 .../replacements/ThreadSubstitutions.java     |  62 --
 .../graalvm/compiler/java/BytecodeParser.java |  64 +-
 .../nodes/CanonicalizableLocation.java        |   4 +-
 .../graalvm/compiler/nodes/GraphEncoder.java  |  12 +-
 .../graphbuilderconf/GraphBuilderContext.java |  25 +-
 .../graphbuilderconf/InvocationPlugin.java    |   5 +
 .../InvocationPluginContext.java}             |  47 +-
 .../compiler/nodes/memory/ReadNode.java       |  25 +-
 .../aarch64/AArch64GraphBuilderPlugins.java   |  14 +-
 .../amd64/AMD64GraphBuilderPlugins.java       |  74 +-
 .../amd64/AMD64IntegerSubstitutions.java      |  77 --
 .../amd64/AMD64LongSubstitutions.java         |  66 --
 .../replacements/test/DerivedOopTest.java     |   9 +-
 .../test/PointerTrackingTest.java             |  40 +-
 .../replacements/IntegerSubstitutions.java    |  50 --
 .../replacements/IntrinsicGraphBuilder.java   |  31 +-
 .../replacements/InvocationPluginHelper.java  | 188 +++-
 .../compiler/replacements/PEGraphDecoder.java |  18 +-
 .../StandardGraphBuilderPlugins.java          |  20 +
 .../StringUTF16Substitutions.java             |   5 -
 .../SubstrateIntrinsicGraphBuilder.java       |   2 +-
 35 files changed, 1355 insertions(+), 1528 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotArraySubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java
 create mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java
 rename compiler/src/{org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java => org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java} (53%)
 delete mode 100644 compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
 delete mode 100644 compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java

diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
index 0fb518b2e85f..4cb1ba7dc3f3 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java
@@ -66,11 +66,10 @@ private void testEncryptDecrypt(String className, String methodName, String gene
         SecretKey key = gen.generateKey();
         Result expected = runEncryptDecrypt(key, algorithm);
         InstalledCode intrinsic = compileAndInstallSubstitution(klass, methodName);
-        if (intrinsic != null) {
-            Result actual = runEncryptDecrypt(key, algorithm);
-            assertEquals(expected, actual);
-            intrinsic.invalidate();
-        }
+        Assert.assertTrue("missing intrinsic", intrinsic != null);
+        Result actual = runEncryptDecrypt(key, algorithm);
+        assertEquals(expected, actual);
+        intrinsic.invalidate();
     }
 
     @Test
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
index 056579f96201..05d33da76c17 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -93,24 +93,8 @@ public CompressEncoding getKlassEncoding() {
     public final boolean cAssertions = getConstant("ASSERT", Boolean.class);
 
     public final int codeEntryAlignment = getFlag("CodeEntryAlignment", Integer.class);
-    public final boolean enableContended = getFlag("EnableContended", Boolean.class);
-    public final boolean restrictContended = getFlag("RestrictContended", Boolean.class);
-    public final int contendedPaddingWidth = getFlag("ContendedPaddingWidth", Integer.class);
-    public final int fieldsAllocationStyle;
-    public final boolean compactFields;
-    {
-        // JDK-8236224
-        if (JDK >= 15) {
-            fieldsAllocationStyle = 1;
-            compactFields = true;
-        } else {
-            fieldsAllocationStyle = getFlag("FieldsAllocationStyle", Integer.class);
-            compactFields = getFlag("CompactFields", Boolean.class);
-        }
-    }
+
     public final boolean verifyOops = getFlag("VerifyOops", Boolean.class);
-    public final boolean ciTime = getFlag("CITime", Boolean.class);
-    public final boolean ciTimeEach = getFlag("CITimeEach", Boolean.class);
     public final boolean dontCompileHugeMethods = getFlag("DontCompileHugeMethods", Boolean.class);
     public final int hugeMethodLimit = getFlag("HugeMethodLimit", Integer.class);
     public final boolean printInlining = getFlag("PrintInlining", Boolean.class);
@@ -118,7 +102,6 @@ public CompressEncoding getKlassEncoding() {
     public final boolean inlineNotify = JDK > 8;
     public final boolean useFastLocking = getFlag("JVMCIUseFastLocking", Boolean.class);
     public final boolean forceUnreachable = getFlag("ForceUnreachable", Boolean.class);
-    public final int codeSegmentSize = getFlag("CodeCacheSegmentSize", Integer.class);
     public final boolean foldStableValues = getFlag("FoldStableValues", Boolean.class);
     public final int maxVectorSize = getFlag("MaxVectorSize", Integer.class);
 
@@ -238,10 +221,6 @@ public long gcTotalCollectionsAddress() {
     public final int narrowOopShift = getFieldValue("CompilerToVM::Data::Universe_narrow_oop_shift", Integer.class, "int");
     public final int objectAlignment = getFlag("ObjectAlignmentInBytes", Integer.class);
 
-    public final int minObjAlignment() {
-        return objectAlignment / heapWordSize;
-    }
-
     public final int logMinObjAlignment() {
         return (int) (Math.log(objectAlignment) / Math.log(2));
     }
@@ -252,7 +231,6 @@ public final int logMinObjAlignment() {
     public final int logKlassAlignment = getConstant("LogKlassAlignmentInBytes", Integer.class);
 
     public final int stackShadowPages = getFlag("StackShadowPages", Integer.class);
-    public final int stackReservedPages = getFlag("StackReservedPages", Integer.class, 0, JDK >= 9);
     public final boolean useStackBanging = getFlag("UseStackBanging", Boolean.class, true, JDK < 17);
     public final int stackBias = getConstant("STACK_BIAS", Integer.class, 0, JDK < 15);
     public final int vmPageSize = getFieldValue("CompilerToVM::Data::vm_page_size", Integer.class, "int");
@@ -261,8 +239,6 @@ public final int logMinObjAlignment() {
     public final int hubOffset = getFieldOffset("oopDesc::_metadata._klass", Integer.class, "Klass*");
 
     public final int prototypeMarkWordOffset = getFieldOffset("Klass::_prototype_header", Integer.class, markWord);
-    public final int subklassOffset = getFieldOffset("Klass::_subklass", Integer.class, "Klass*");
-    public final int nextSiblingOffset = getFieldOffset("Klass::_next_sibling", Integer.class, "Klass*");
     public final int superCheckOffsetOffset = getFieldOffset("Klass::_super_check_offset", Integer.class, "juint");
     public final int secondarySuperCacheOffset = getFieldOffset("Klass::_secondary_super_cache", Integer.class, "Klass*");
     public final int secondarySupersOffset = getFieldOffset("Klass::_secondary_supers", Integer.class, "Array<Klass*>*");
@@ -288,32 +264,12 @@ public final int logMinObjAlignment() {
     public final int klassLayoutHelperNeutralValue = getConstant("Klass::_lh_neutral_value", Integer.class);
     public final int layoutHelperLog2ElementSizeShift = getConstant("Klass::_lh_log2_element_size_shift", Integer.class);
     public final int layoutHelperLog2ElementSizeMask = getConstant("Klass::_lh_log2_element_size_mask", Integer.class);
-    public final int layoutHelperElementTypeShift = getConstant("Klass::_lh_element_type_shift", Integer.class);
-    public final int layoutHelperElementTypeMask = getConstant("Klass::_lh_element_type_mask", Integer.class);
     public final int layoutHelperHeaderSizeShift = getConstant("Klass::_lh_header_size_shift", Integer.class);
     public final int layoutHelperHeaderSizeMask = getConstant("Klass::_lh_header_size_mask", Integer.class);
-    public final int layoutHelperArrayTagShift = getConstant("Klass::_lh_array_tag_shift", Integer.class);
-    public final int layoutHelperArrayTagTypeValue = getConstant("Klass::_lh_array_tag_type_value", Integer.class);
-    public final int layoutHelperArrayTagObjectValue = getConstant("Klass::_lh_array_tag_obj_value", Integer.class);
-
-    /**
-     * This filters out the bit that differentiates a type array from an object array.
-     */
-    public int layoutHelperElementTypePrimitiveInPlace() {
-        return (layoutHelperArrayTagTypeValue & ~layoutHelperArrayTagObjectValue) << layoutHelperArrayTagShift;
-    }
-
-    public final int vtableEntrySize = getFieldValue("CompilerToVM::Data::sizeof_vtableEntry", Integer.class, "int");
-    public final int vtableEntryMethodOffset = getFieldOffset("vtableEntry::_method", Integer.class, "Method*");
 
     public final int instanceKlassInitStateOffset = getFieldOffset("InstanceKlass::_init_state", Integer.class, "u1");
     public final int instanceKlassInitThreadOffset = getFieldOffset("InstanceKlass::_init_thread", Integer.class, "Thread*", -1, JDK == 8 || JDK >= 15 || (JVMCI && jvmciGE(JVMCI_20_0_b03)));
-    public final int instanceKlassConstantsOffset = getFieldOffset("InstanceKlass::_constants", Integer.class, "ConstantPool*");
-    public final int instanceKlassFieldsOffset = getFieldOffset("InstanceKlass::_fields", Integer.class, "Array<u2>*");
-    public final int klassVtableStartOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_start_offset", Integer.class, "int");
-    public final int klassVtableLengthOffset = getFieldValue("CompilerToVM::Data::Klass_vtable_length_offset", Integer.class, "int");
 
-    public final int instanceKlassStateLinked = getConstant("InstanceKlass::linked", Integer.class);
     public final int instanceKlassStateBeingInitialized = getConstant("InstanceKlass::being_initialized", Integer.class, -1, JDK == 8 || (JVMCI ? jvmciGE(JVMCI_20_0_b03) : JDK >= 14));
     public final int instanceKlassStateFullyInitialized = getConstant("InstanceKlass::fully_initialized", Integer.class);
 
@@ -328,32 +284,13 @@ public final int arrayOopDescLengthOffset() {
         return useCompressedClassPointers ? hubOffset + narrowKlassSize : arrayOopDescSize;
     }
 
-    public final int arrayU1LengthOffset = getFieldOffset("Array<int>::_length", Integer.class, "int");
-    public final int arrayU1DataOffset = getFieldOffset("Array<u1>::_data", Integer.class);
-    public final int arrayU2DataOffset = getFieldOffset("Array<u2>::_data", Integer.class);
     public final int metaspaceArrayLengthOffset = getFieldOffset("Array<Klass*>::_length", Integer.class, "int");
     public final int metaspaceArrayBaseOffset = getFieldOffset("Array<Klass*>::_data[0]", Integer.class, "Klass*");
 
     public final int arrayClassElementOffset = getFieldOffset("ObjArrayKlass::_element_klass", Integer.class, "Klass*");
 
-    public final int fieldInfoAccessFlagsOffset = getConstant("FieldInfo::access_flags_offset", Integer.class);
-    public final int fieldInfoNameIndexOffset = getConstant("FieldInfo::name_index_offset", Integer.class);
-    public final int fieldInfoSignatureIndexOffset = getConstant("FieldInfo::signature_index_offset", Integer.class);
-    public final int fieldInfoInitvalIndexOffset = getConstant("FieldInfo::initval_index_offset", Integer.class);
-    public final int fieldInfoLowPackedOffset = getConstant("FieldInfo::low_packed_offset", Integer.class);
-    public final int fieldInfoHighPackedOffset = getConstant("FieldInfo::high_packed_offset", Integer.class);
-    public final int fieldInfoFieldSlots = getConstant("FieldInfo::field_slots", Integer.class);
-
-    public final int fieldInfoTagSize = getConstant("FIELDINFO_TAG_SIZE", Integer.class);
-
-    public final int jvmAccMonitorMatch = getConstant("JVM_ACC_MONITOR_MATCH", Integer.class);
-    public final int jvmAccHasMonitorBytecodes = getConstant("JVM_ACC_HAS_MONITOR_BYTECODES", Integer.class);
     public final int jvmAccHasFinalizer = getConstant("JVM_ACC_HAS_FINALIZER", Integer.class);
-    public final int jvmAccFieldInternal = getConstant("JVM_ACC_FIELD_INTERNAL", Integer.class);
-    public final int jvmAccFieldStable = getConstant("JVM_ACC_FIELD_STABLE", Integer.class);
-    public final int jvmAccFieldHasGenericSignature = getConstant("JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE", Integer.class);
     public final int jvmAccWrittenFlags = getConstant("JVM_ACC_WRITTEN_FLAGS", Integer.class);
-    public final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
     public final int jvmAccIsHiddenClass = getConstant("JVM_ACC_IS_HIDDEN_CLASS", Integer.class, 0, JDK >= 15); // JDK-8219607
 
     public final int jvmciCompileStateCanPostOnExceptionsOffset = getJvmciJvmtiCapabilityOffset("_jvmti_can_post_on_exceptions");
@@ -431,37 +368,6 @@ public boolean requiresReservedStackCheck(List<ResolvedJavaMethod> methods) {
         return false;
     }
 
-    /**
-     * An invalid value for {@link #rtldDefault}.
-     */
-    public static final long INVALID_RTLD_DEFAULT_HANDLE = 0xDEADFACE;
-
-    /**
-     * Address of the library lookup routine. The C signature of this routine is:
-     *
-     * <pre>
-     *     void* (const char *filename, char *ebuf, int ebuflen)
-     * </pre>
-     */
-    public final long dllLoad = getAddress("os::dll_load");
-
-    /**
-     * Address of the library lookup routine. The C signature of this routine is:
-     *
-     * <pre>
-     *     void* (void* handle, const char* name)
-     * </pre>
-     */
-    public final long dllLookup = getAddress("os::dll_lookup");
-
-    /**
-     * A pseudo-handle which when used as the first argument to {@link #dllLookup} means lookup will
-     * return the first occurrence of the desired symbol using the default library search order. If
-     * this field is {@value #INVALID_RTLD_DEFAULT_HANDLE}, then this capability is not supported on
-     * the current platform.
-     */
-    public final long rtldDefault = getAddress("RTLD_DEFAULT", INVALID_RTLD_DEFAULT_HANDLE, osName.equals("darwin") || osName.equals("linux"));
-
     /**
      * This field is used to pass exception objects into and out of the runtime system during
      * exception handling for compiled code.
@@ -507,19 +413,14 @@ public int threadLastJavaFpOffset() {
         return javaThreadAnchorOffset + getFieldOffset("JavaFrameAnchor::_last_Java_fp", Integer.class, "intptr_t*");
     }
 
-    public final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, 0, osArch.equals("amd64"));
     public final int frameInterpreterFrameSenderSpOffset = getConstant("frame::interpreter_frame_sender_sp_offset", Integer.class, 0, osArch.equals("amd64"));
     public final int frameInterpreterFrameLastSpOffset = getConstant("frame::interpreter_frame_last_sp_offset", Integer.class, 0, osArch.equals("amd64"));
 
     public final int osThreadInterruptedOffset = getFieldOffset("OSThread::_interrupted", Integer.class, "jint", Integer.MAX_VALUE, JDK < 14);
 
-    public final long markWordHashShift = getConstant(markWordField("hash_shift"), Long.class);
-
     public final int biasedLockMaskInPlace = getConstant(markWordField("biased_lock_mask_in_place"), Integer.class);
     public final int ageMaskInPlace = getConstant(markWordField("age_mask_in_place"), Integer.class);
     public final int epochMaskInPlace = getConstant(markWordField("epoch_mask_in_place"), Integer.class);
-    public final long markWordHashMask = getConstant(markWordField("hash_mask"), Long.class);
-    public final long markWordHashMaskInPlace = getConstant(markWordField("hash_mask_in_place"), Long.class);
 
     public final int unlockedMask = getConstant(markWordField("unlocked_value"), Integer.class);
     public final int monitorMask = getConstant(markWordField("monitor_value"), Integer.class, -1, gr21761);
@@ -535,22 +436,6 @@ public int threadLastJavaFpOffset() {
     public final int markWordNoHashInPlace = getConstant(markWordField("no_hash_in_place"), Integer.class);
     public final int markWordNoLockInPlace = getConstant(markWordField("no_lock_in_place"), Integer.class);
 
-    /**
-     * See {@code markOopDesc::prototype()}/{@code markWord::prototype()}.
-     */
-    public long arrayPrototypeMarkWord() {
-        return markWordNoHashInPlace | markWordNoLockInPlace;
-    }
-
-    /**
-     * See {@code markOopDesc::copy_set_hash()}/{@code markWord::copy_set_hash()}.
-     */
-    public long tlabIntArrayMarkWord() {
-        long tmp = arrayPrototypeMarkWord() & (~markWordHashMaskInPlace);
-        tmp |= ((0x2 & markWordHashMask) << markWordHashShift);
-        return tmp;
-    }
-
     private static String markWordField(String simpleName) {
         return (JDK < 14 ? "markOopDesc::" : "markWord::") + simpleName;
     }
@@ -565,35 +450,15 @@ private static String markWordField(String simpleName) {
      */
     public final int uninitializedIdentityHashCodeValue = getConstant(markWordField("no_hash"), Integer.class);
 
-    public final int methodAccessFlagsOffset = getFieldOffset("Method::_access_flags", Integer.class, "AccessFlags");
-    public final int methodConstMethodOffset = getFieldOffset("Method::_constMethod", Integer.class, "ConstMethod*");
-    public final int methodIntrinsicIdOffset = getFieldOffset("Method::_intrinsic_id", Integer.class, JDK <= 8 ? "u1" : "u2");
-    public final int methodFlagsOffset = getFieldOffset("Method::_flags", Integer.class, JDK <= 8 ? "u1" : "u2");
-    public final int methodVtableIndexOffset = getFieldOffset("Method::_vtable_index", Integer.class, "int");
-
-    public final int methodCountersOffset = getFieldOffset("Method::_method_counters", Integer.class, "MethodCounters*");
-    public final int methodDataOffset = getFieldOffset("Method::_method_data", Integer.class, "MethodData*");
     public final int methodCompiledEntryOffset = getFieldOffset("Method::_from_compiled_entry", Integer.class, "address");
-    public final int methodCodeOffset = getFieldOffset("Method::_code", Integer.class, JDK <= 8 ? "nmethod*" : "CompiledMethod*");
-
-    public final int methodFlagsCallerSensitive = getConstant("Method::_caller_sensitive", Integer.class);
-    public final int methodFlagsForceInline = getConstant("Method::_force_inline", Integer.class);
-    public final int methodFlagsDontInline = getConstant("Method::_dont_inline", Integer.class);
-    public final int methodFlagsHidden = getConstant("Method::_hidden", Integer.class);
-    public final int nonvirtualVtableIndex = getConstant("Method::nonvirtual_vtable_index", Integer.class);
-    public final int invalidVtableIndex = getConstant("Method::invalid_vtable_index", Integer.class);
 
     public final int invocationCounterOffset = getFieldOffset("MethodCounters::_invocation_counter", Integer.class, "InvocationCounter");
     public final int backedgeCounterOffset = getFieldOffset("MethodCounters::_backedge_counter", Integer.class, "InvocationCounter");
     public final int invocationCounterIncrement = JDK <= 8 ? 0 : getConstant("InvocationCounter::count_increment", Integer.class);
     public final int invocationCounterShift = JDK <= 8 ? 0 : getConstant("InvocationCounter::count_shift", Integer.class);
 
-    public final int nmethodEntryOffset = getFieldOffset("nmethod::_verified_entry_point", Integer.class, "address");
     public final int compilationLevelFullOptimization = getConstant("CompLevel_full_optimization", Integer.class);
 
-    public final int constantPoolSize = getFieldValue("CompilerToVM::Data::sizeof_ConstantPool", Integer.class, "int");
-    public final int constantPoolLengthOffset = getFieldOffset("ConstantPool::_length", Integer.class, "int");
-
     public final int heapWordSize = getConstant("HeapWordSize", Integer.class);
 
     /**
@@ -669,7 +534,6 @@ private static String markWordField(String simpleName) {
     public final int basicLockSize = getFieldValue("CompilerToVM::Data::sizeof_BasicLock", Integer.class, "int");
     public final int basicLockDisplacedHeaderOffset = getFieldOffset("BasicLock::_displaced_header", Integer.class, markWord);
 
-    public final int threadAllocatedBytesOffset = getFieldOffset("Thread::_allocated_bytes", Integer.class, "jlong");
     public final int threadPollingPageOffset;
     {
         // JDK-8237497
@@ -685,16 +549,9 @@ private static String markWordField(String simpleName) {
         }
     }
 
-    public final int tlabRefillWasteIncrement = getFlag("TLABWasteIncrement", Integer.class);
-
-    private final int threadLocalAllocBufferStartOffset = getFieldOffset("ThreadLocalAllocBuffer::_start", Integer.class, "HeapWord*");
     private final int threadLocalAllocBufferEndOffset = getFieldOffset("ThreadLocalAllocBuffer::_end", Integer.class, "HeapWord*");
     private final int threadLocalAllocBufferTopOffset = getFieldOffset("ThreadLocalAllocBuffer::_top", Integer.class, "HeapWord*");
 
-    public int threadTlabStartOffset() {
-        return threadTlabOffset + threadLocalAllocBufferStartOffset;
-    }
-
     public int threadTlabEndOffset() {
         return threadTlabOffset + threadLocalAllocBufferEndOffset;
     }
@@ -703,10 +560,6 @@ public int threadTlabTopOffset() {
         return threadTlabOffset + threadLocalAllocBufferTopOffset;
     }
 
-    public final int tlabAlignmentReserve = getFieldValue("CompilerToVM::Data::ThreadLocalAllocBuffer_alignment_reserve", Integer.class, "size_t");
-
-    public final boolean tlabStats = getFlag("TLABStats", Boolean.class);
-
     // We set 0x10 as default value to disable DC ZVA if this field is not present in HotSpot.
     // ARMv8-A architecture reference manual D12.2.35 Data Cache Zero ID register says:
     // * BS, bits [3:0] indicate log2 of the DC ZVA block size in (4-byte) words.
@@ -716,13 +569,6 @@ public int threadTlabTopOffset() {
 
     public final int zvaLength = getFieldValue("VM_Version::_zva_length", Integer.class, "int", 0, JDK >= 16 && osArch.equals("aarch64"));
 
-    // FIXME This is only temporary until the GC code is changed.
-    public final boolean inlineContiguousAllocationSupported = getFieldValue("CompilerToVM::Data::_supports_inline_contig_alloc", Boolean.class);
-    public final long heapEndAddress = getFieldValue("CompilerToVM::Data::_heap_end_addr", Long.class, "HeapWord**");
-    public final long heapTopAddress = getFieldValue("CompilerToVM::Data::_heap_top_addr", Long.class, JDK <= 8 ? "HeapWord**" : "HeapWord* volatile*");
-
-    public final boolean cmsIncrementalMode = getFlag("CMSIncrementalMode", Boolean.class, false, JDK <= 8);
-
     public final long inlineCacheMissStub = getFieldValue("CompilerToVM::Data::SharedRuntime_ic_miss_stub", Long.class, "address");
     public final long handleWrongMethodStub = getFieldValue("CompilerToVM::Data::SharedRuntime_handle_wrong_method_stub", Long.class, "address");
 
@@ -868,24 +714,6 @@ private boolean checkNullAllocationStubs() {
 
     public final int jvmciCountersSize = getFlag("JVMCICounterSize", Integer.class);
 
-    public final long deoptimizationFetchUnrollInfo = getAddress("Deoptimization::fetch_unroll_info");
-    public final long deoptimizationUncommonTrap = getAddress("Deoptimization::uncommon_trap");
-    public final long deoptimizationUnpackFrames = getAddress("Deoptimization::unpack_frames");
-
-    public final int deoptimizationUnpackDeopt = getConstant("Deoptimization::Unpack_deopt", Integer.class);
-    public final int deoptimizationUnpackException = getConstant("Deoptimization::Unpack_exception", Integer.class);
-    public final int deoptimizationUnpackUncommonTrap = getConstant("Deoptimization::Unpack_uncommon_trap", Integer.class);
-    public final int deoptimizationUnpackReexecute = getConstant("Deoptimization::Unpack_reexecute", Integer.class);
-
-    public final int deoptimizationUnrollBlockSizeOfDeoptimizedFrameOffset = getFieldOffset("Deoptimization::UnrollBlock::_size_of_deoptimized_frame", Integer.class, "int");
-    public final int deoptimizationUnrollBlockCallerAdjustmentOffset = getFieldOffset("Deoptimization::UnrollBlock::_caller_adjustment", Integer.class, "int");
-    public final int deoptimizationUnrollBlockNumberOfFramesOffset = getFieldOffset("Deoptimization::UnrollBlock::_number_of_frames", Integer.class, "int");
-    public final int deoptimizationUnrollBlockTotalFrameSizesOffset = getFieldOffset("Deoptimization::UnrollBlock::_total_frame_sizes", Integer.class, "int");
-    public final int deoptimizationUnrollBlockUnpackKindOffset = getFieldOffset("Deoptimization::UnrollBlock::_unpack_kind", Integer.class, "int");
-    public final int deoptimizationUnrollBlockFrameSizesOffset = getFieldOffset("Deoptimization::UnrollBlock::_frame_sizes", Integer.class, "intptr_t*");
-    public final int deoptimizationUnrollBlockFramePcsOffset = getFieldOffset("Deoptimization::UnrollBlock::_frame_pcs", Integer.class, "address*");
-    public final int deoptimizationUnrollBlockInitialInfoOffset = getFieldOffset("Deoptimization::UnrollBlock::_initial_info", Integer.class, "intptr_t");
-
     // JDK-8231756, GR-16685
     public final boolean deoptimizationSupportLargeAccessByteArrayVirtualization = //
                     getConstant("Deoptimization::_support_large_access_byte_array_virtualization", Boolean.class, false, JVMCI || JDK >= 15);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
index e512ced1529f..acd7faf3205f 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
@@ -53,9 +53,7 @@
 import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor;
 import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
 import org.graalvm.compiler.hotspot.nodes.VMErrorNode;
-import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
-import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
 import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -149,43 +147,29 @@ public static class Options {
     private final HotSpotGraalRuntimeProvider runtime;
 
     /**
-     * @see AESCryptSubstitutions#encryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer)
+     * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.AESCryptPlugin
      */
     public static final HotSpotForeignCallDescriptor ENCRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt_block",
                     void.class, Word.class, Word.class, Pointer.class);
 
     /**
-     * @see AESCryptSubstitutions#decryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer)
+     * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.AESCryptPlugin
      */
     public static final HotSpotForeignCallDescriptor DECRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt_block",
                     void.class, Word.class, Word.class, Pointer.class);
 
     /**
-     * @see AESCryptSubstitutions#decryptBlockStub(ForeignCallDescriptor, Word, Word, Pointer)
-     */
-    public static final HotSpotForeignCallDescriptor DECRYPT_BLOCK_WITH_ORIGINAL_KEY = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte),
-                    "decrypt_block_with_original_key", void.class, Word.class, Word.class, Pointer.class,
-                    Pointer.class);
-
-    /**
-     * @see CipherBlockChainingSubstitutions#crypt
+     * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.CipherBlockChainingCryptPlugin
      */
     public static final HotSpotForeignCallDescriptor ENCRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt", void.class,
                     Word.class, Word.class, Pointer.class, Pointer.class, int.class);
 
     /**
-     * @see CipherBlockChainingSubstitutions#crypt
+     * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.CipherBlockChainingCryptPlugin
      */
     public static final HotSpotForeignCallDescriptor DECRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt", void.class,
                     Word.class, Word.class, Pointer.class, Pointer.class, int.class);
 
-    /**
-     * @see CipherBlockChainingSubstitutions#crypt
-     */
-    public static final HotSpotForeignCallDescriptor DECRYPT_WITH_ORIGINAL_KEY = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte),
-                    "decrypt_with_original_key", void.class, Word.class, Word.class, Pointer.class, Pointer.class,
-                    int.class, Pointer.class);
-
     /**
      * @see BigIntegerSubstitutions#multiplyToLen
      */
@@ -283,14 +267,6 @@ public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) {
                     Word.class, Word.class, Word.class, Word.class, int.class,
                     Word.class, Word.class);
 
-    public static int counterModeAESCrypt(Word srcAddr, Word dstAddr, Word kPtr, Word cntPtr, int len, Word encCntPtr, Word used) {
-        return counterModeAESCrypt(COUNTERMODE_IMPL_CRYPT, srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, used);
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    private static native int counterModeAESCrypt(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word srcAddr, Word dstAddr, Word kPtr, Word cntPtr, int len, Word encCntPtr,
-                    Word used);
-
     /**
      * Descriptor for {@code StubRoutines::_vectorizedMismatch}.
      */
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
index b15c52dc2678..1df3979889ed 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
@@ -110,7 +110,9 @@
 import org.graalvm.compiler.replacements.SnippetCounter;
 import org.graalvm.compiler.replacements.SnippetIntegerHistogram;
 import org.graalvm.compiler.replacements.SnippetTemplate;
+import org.graalvm.compiler.replacements.classfile.ClassfileBytecode;
 
+import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 import jdk.vm.ci.hotspot.HotSpotObjectConstant;
@@ -428,11 +430,40 @@ private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod
         }
     }
 
+    /**
+     * Helper class to provide more precise information about the source of an illegal object when
+     * encoding graphs.
+     */
+    private static class CheckingGraphEncoder extends GraphEncoder {
+        CheckingGraphEncoder(Architecture architecture) {
+            super(architecture);
+        }
+
+        @Override
+        protected void addObject(Object object) {
+            checkIllegalSnippetObjects(object);
+            super.addObject(object);
+        }
+    }
+
+    /**
+     * Check for Objects which should never appear in an encoded snippet.
+     */
+    private static void checkIllegalSnippetObjects(Object o) {
+        if (o instanceof HotSpotSignature || o instanceof ClassfileBytecode) {
+            throw new GraalError("Illegal object in encoded snippet: " + o);
+        }
+    }
+
     @SuppressWarnings("try")
     private boolean verifySnippetEncodeDecode(DebugContext debug, ResolvedJavaMethod method, ResolvedJavaMethod original, String originalMethodString, Object[] args, boolean trackNodeSourcePosition,
                     StructuredGraph graph) {
         // Verify the encoding and decoding process
-        EncodedGraph encodedGraph = GraphEncoder.encodeSingleGraph(graph, HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch);
+        GraphEncoder encoder = new CheckingGraphEncoder(HotSpotJVMCIRuntime.runtime().getHostJVMCIBackend().getTarget().arch);
+        encoder.prepare(graph);
+        encoder.finishPrepare();
+        int startOffset = encoder.encode(graph);
+        EncodedGraph encodedGraph = new EncodedGraph(encoder.getEncoding(), startOffset, encoder.getObjects(), encoder.getNodeClasses(), graph);
 
         HotSpotProviders originalProvider = snippetReplacements.getProviders();
 
@@ -750,6 +781,7 @@ SnippetReflectionProvider getSnippetReflection() {
          * convert the object or pass it through.
          */
         private Object filterSnippetObject(DebugContext debug, Object o) {
+            checkIllegalSnippetObjects(o);
             if (o instanceof HotSpotResolvedJavaMethod) {
                 return filterMethod(debug, (HotSpotResolvedJavaMethod) o);
             } else if (o instanceof HotSpotResolvedJavaField) {
@@ -771,8 +803,6 @@ private Object filterSnippetObject(DebugContext debug, Object o) {
                 return filterStampPair(debug, (StampPair) o);
             } else if (o instanceof ResolvedJavaMethodBytecode) {
                 return filterBytecode(debug, (ResolvedJavaMethodBytecode) o);
-            } else if (o instanceof HotSpotSignature) {
-                throw new GraalError(o.toString());
             }
             return o;
         }
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 26c8549899ee..1150a84dccf0 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -25,14 +25,21 @@
 package org.graalvm.compiler.hotspot.meta;
 
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+import static org.graalvm.compiler.core.common.calc.Condition.EQ;
+import static org.graalvm.compiler.core.common.calc.Condition.LT;
+import static org.graalvm.compiler.core.common.calc.Condition.NE;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.CRC_TABLE_LOCATION;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
+import static org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.AESCryptPlugin.AES_BLOCK_SIZE_IN_BYTES;
 import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing;
 import static org.graalvm.compiler.nodes.ConstantNode.forBoolean;
 
@@ -42,16 +49,15 @@
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
 import java.lang.reflect.Array;
-import java.lang.reflect.Type;
+import java.lang.reflect.Modifier;
 import java.math.BigInteger;
 import java.util.zip.CRC32;
 
 import org.graalvm.collections.Pair;
+import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.core.common.type.TypeReference;
 import org.graalvm.compiler.debug.GraalError;
@@ -61,28 +67,22 @@
 import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode;
-import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode;
-import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode;
-import org.graalvm.compiler.hotspot.replacements.CounterModeSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.FastNotifyNode;
-import org.graalvm.compiler.hotspot.replacements.HotSpotArraySubstitutions;
-import org.graalvm.compiler.hotspot.replacements.HotSpotClassSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.HotSpotIdentityHashCodeNode;
+import org.graalvm.compiler.hotspot.replacements.HotSpotInvocationPluginHelper;
 import org.graalvm.compiler.hotspot.replacements.HotSpotReflectionGetCallerClassNode;
 import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
+import org.graalvm.compiler.hotspot.replacements.HubGetClassNode;
 import org.graalvm.compiler.hotspot.replacements.ObjectCloneNode;
-import org.graalvm.compiler.hotspot.replacements.ReflectionSubstitutions;
-import org.graalvm.compiler.hotspot.replacements.ThreadSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.UnsafeCopyMemoryNode;
 import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
 import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedGuardNode;
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PiNode;
@@ -90,17 +90,16 @@
 import org.graalvm.compiler.nodes.calc.AddNode;
 import org.graalvm.compiler.nodes.calc.AndNode;
 import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
+import org.graalvm.compiler.nodes.calc.IntegerTestNode;
 import org.graalvm.compiler.nodes.calc.IsNullNode;
 import org.graalvm.compiler.nodes.calc.LeftShiftNode;
 import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
 import org.graalvm.compiler.nodes.calc.SignExtendNode;
 import org.graalvm.compiler.nodes.calc.SubNode;
 import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
 import org.graalvm.compiler.nodes.calc.XorNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
 import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.ForeignCallPlugin;
@@ -112,11 +111,12 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
+import org.graalvm.compiler.nodes.java.DynamicNewArrayNode;
 import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode;
+import org.graalvm.compiler.nodes.java.InstanceOfNode;
 import org.graalvm.compiler.nodes.java.NewArrayNode;
 import org.graalvm.compiler.nodes.java.ValidateNewInstanceClassNode;
 import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType;
-import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.Replacements;
@@ -124,6 +124,7 @@
 import org.graalvm.compiler.options.OptionValues;
 import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
 import org.graalvm.compiler.replacements.InlineDuringParsingPlugin;
+import org.graalvm.compiler.replacements.InvocationPluginHelper;
 import org.graalvm.compiler.replacements.MethodHandlePlugin;
 import org.graalvm.compiler.replacements.NodeIntrinsificationProvider;
 import org.graalvm.compiler.replacements.ReplacementsImpl;
@@ -141,10 +142,12 @@
 import jdk.vm.ci.hotspot.VMIntrinsicMethod;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
-import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
+import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.UnresolvedJavaType;
 import jdk.vm.ci.services.Services;
 import sun.misc.Unsafe;
 
@@ -155,12 +158,6 @@ public class HotSpotGraphBuilderPlugins {
 
     /**
      * Creates a {@link Plugins} object that should be used when running on HotSpot.
-     *
-     * @param constantReflection
-     * @param snippetReflection
-     * @param foreignCalls
-     * @param options
-     * @param target
      */
     public static Plugins create(HotSpotGraalRuntimeProvider graalRuntime,
                     CompilerConfiguration compilerConfiguration,
@@ -202,9 +199,9 @@ public void run() {
                 registerObjectPlugins(invocationPlugins, config, replacements);
                 registerClassPlugins(plugins, config, replacements);
                 registerSystemPlugins(invocationPlugins);
-                registerThreadPlugins(invocationPlugins, metaAccess, wordTypes, config, replacements);
+                registerThreadPlugins(invocationPlugins, config, replacements);
                 registerCallSitePlugins(invocationPlugins);
-                registerReflectionPlugins(invocationPlugins, replacements);
+                registerReflectionPlugins(invocationPlugins, replacements, config);
                 registerAESPlugins(invocationPlugins, config, replacements);
                 registerCRC32Plugins(invocationPlugins, config, replacements);
                 registerCRC32CPlugins(invocationPlugins, config, replacements);
@@ -215,7 +212,7 @@ public void run() {
                 registerBase64Plugins(invocationPlugins, config, metaAccess);
                 registerUnsafePlugins(invocationPlugins, config, replacements);
                 StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, snippetReflection, invocationPlugins, replacements, true, false, true, graalRuntime.getHostProviders().getLowerer());
-                registerArrayPlugins(invocationPlugins, replacements);
+                registerArrayPlugins(invocationPlugins, replacements, config);
                 registerStringPlugins(invocationPlugins, replacements, wordTypes, foreignCalls, config);
                 registerArraysSupportPlugins(invocationPlugins, config, replacements);
                 registerReferencePlugins(invocationPlugins, replacements);
@@ -227,15 +224,9 @@ public void run() {
             // In libgraal all NodeIntrinsics been converted into special nodes so the plugins
             // aren't needed.
             NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes, target);
-            invocationPlugins.defer(new Runnable() {
-
-                @Override
-                public void run() {
-
-                    for (GeneratedPluginFactory factory : GraalServices.load(GeneratedPluginFactory.class)) {
-                        factory.registerPlugins(invocationPlugins, nodeIntrinsificationProvider);
-                    }
-
+            invocationPlugins.defer(() -> {
+                for (GeneratedPluginFactory factory : GraalServices.load(GeneratedPluginFactory.class)) {
+                    factory.registerPlugins(invocationPlugins, nodeIntrinsificationProvider);
                 }
             });
         }
@@ -335,25 +326,169 @@ public boolean inlineOnly() {
     private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         Registration r = new Registration(plugins.getInvocationPlugins(), Class.class, replacements);
 
-        r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getModifiers", Receiver.class);
-        r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isInterface", Receiver.class);
+        r.register1("getModifiers", Receiver.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                // @formatter:off
+                //    public static int getModifiers(final Class<?> thisObj) {
+                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
+                //        if (klass.isNull()) {
+                //            // Class for primitive type
+                //            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
+                //        } else {
+                //            return klass.readInt(klassModifierFlagsOffset(INJECTED_VMCONFIG), KLASS_MODIFIER_FLAGS_LOCATION);
+                //        }
+                //    }
+                // @formatter:on
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode klass = helper.readKlass(receiver.get());
+                    ValueNode nonNullKlass = helper.emitNullReturnGuard(klass, ConstantNode.forInt(Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC), GraalDirectives.UNLIKELY_PROBABILITY);
+                    helper.emitFinalReturn(JavaKind.Int, helper.readKlassModifierFlags(nonNullKlass));
+                }
+                return true;
+            }
+        });
+        r.register1("isInterface", Receiver.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                // @formatter:off
+                //    public static boolean isInterface(final Class<?> thisObj) {
+                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
+                //        if (klass.isNull()) {
+                //            // Class for primitive type
+                //            return false;
+                //        } else {
+                //            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
+                //            return (accessFlags & Modifier.INTERFACE) != 0;
+                //        }
+                //    }
+                // @formatter:on
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                    ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.defaultForKind(JavaKind.Boolean), GraalDirectives.UNLIKELY_PROBABILITY);
+                    ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
+                    LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT));
+                    helper.emitFinalReturn(JavaKind.Boolean, b.add(ConditionalNode.create(test, ConstantNode.forInt(0), ConstantNode.forInt(1), NodeView.DEFAULT)));
+                }
+                return true;
+            }
+        });
         r.register1("isPrimitive", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                ValueNode hub = b.add(new ClassGetHubNode(receiver.get()));
-                LogicNode isNull = b.add(IsNullNode.create(hub));
-                b.addPush(JavaKind.Boolean, ConditionalNode.create(isNull, b.add(forBoolean(true)), b.add(forBoolean(false)), NodeView.DEFAULT));
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode klass = helper.readKlass(receiver.get());
+                    LogicNode isNull = b.add(IsNullNode.create(klass));
+                    b.addPush(JavaKind.Boolean, ConditionalNode.create(isNull, b.add(forBoolean(true)), b.add(forBoolean(false)), NodeView.DEFAULT));
+                }
+                return true;
+            }
+        });
+        r.register1("getSuperclass", Receiver.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                // @formatter:off
+                //     public static Class<?> getSuperclass(final Class<?> thisObj) {
+                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
+                //        if (klass.isNull()) {
+                //            // Class for primitive type
+                //            return null;
+                //        }
+                //        KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
+                //        int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
+                //        if ((accessFlags & Modifier.INTERFACE) != 0) {
+                //            return null;
+                //        }
+                //        if (klassIsArray(klassNonNull)) {
+                //            return ConstantNode.forClass(getObjectType(INJECTED_METAACCESS));
+                //        }
+                //        KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
+                //        if (superKlass.isNull()) {
+                //            return null;
+                //        }
+                //        KlassPointer superKlassNonNull = ClassGetHubNode.piCastNonNull(superKlass, SnippetAnchorNode.anchor());
+                //        return HubGetClassNode.readClass(superKlassNonNull);
+                //    }
+                // @formatter:on
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                    ConstantNode nullValue = ConstantNode.defaultForKind(JavaKind.Object);
+
+                    PiNode klassNonNull = helper.emitNullReturnGuard(klass, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+                    ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
+                    LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT));
+                    helper.emitReturnIfNot(test, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+
+                    ValueNode layoutHelper = helper.klassLayoutHelper(klassNonNull);
+                    ResolvedJavaType objectType = b.getMetaAccess().lookupJavaType(Object.class);
+                    ValueNode objectClass = b.add(ConstantNode.forConstant(b.getConstantReflection().asJavaClass(objectType), b.getMetaAccess()));
+                    helper.emitReturnIf(layoutHelper, Condition.LT, ConstantNode.forInt(config.klassLayoutHelperNeutralValue), objectClass,
+                                    GraalDirectives.UNLIKELY_PROBABILITY);
+
+                    ValueNode superKlass = helper.readKlassSuperKlass(klassNonNull);
+                    PiNode superKlassNonNull = helper.emitNullReturnGuard(superKlass, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+                    helper.emitFinalReturn(JavaKind.Object, new HubGetClassNode(b.getMetaAccess(), superKlassNonNull));
+                }
                 return true;
             }
         });
-        r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getSuperclass", Receiver.class);
 
         if (config.jvmAccIsHiddenClass != 0) {
-            r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isHidden", Receiver.class);
+            r.register1("isHidden", Receiver.class, new InvocationPlugin() {
+                @Override
+                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                    // @formatter:off
+                    //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
+                    //        if (klass.isNull()) {
+                    //            // Class for primitive type
+                    //            return false;
+                    //        } else {
+                    //            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
+                    //            return (accessFlags & (jvmAccIsHiddenClass(INJECTED_VMCONFIG))) != 0;
+                    //        }
+                    // @formatter:on
+                    try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                        ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                        ValueNode nonNullKlass = helper.emitNullReturnGuard(klass, ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
+                        ValueNode accessFlags = helper.readKlassAccessFlags(nonNullKlass);
+                        LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(config.jvmAccIsHiddenClass), NodeView.DEFAULT));
+                        helper.emitFinalReturn(JavaKind.Boolean, b.add(ConditionalNode.create(test, ConstantNode.forInt(0), ConstantNode.forInt(1), NodeView.DEFAULT)));
+                    }
+                    return true;
+                }
+            });
         }
 
         if (config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop", Integer.MAX_VALUE, JDK <= 8) != Integer.MAX_VALUE) {
-            r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getComponentType", Receiver.class);
+            r.register1("getComponentType", Receiver.class, new InvocationPlugin() {
+                @Override
+                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
+                    // @formatter:off
+                    //     public static Class<?> getComponentType(final Class<?> thisObj) {
+                    //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
+                    //        if (klass.isNull()) {
+                    //            // Class for primitive type
+                    //            return null;
+                    //        }
+                    //        KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
+                    //        if (!klassIsArray(klassNonNull)) {
+                    //            return null;
+                    //        }
+                    //        return PiNode.asNonNullClass(klassNonNull.readObject(arrayKlassComponentMirrorOffset(INJECTED_VMCONFIG), ARRAY_KLASS_COMPONENT_MIRROR));
+                    //    }
+                    // @formatter:on
+                    try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                        ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                        ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.defaultForKind(JavaKind.Object), GraalDirectives.UNLIKELY_PROBABILITY);
+                        ValueNode layoutHelper = helper.klassLayoutHelper(klassNonNull);
+                        GuardingNode guard = helper.emitReturnIf(layoutHelper, Condition.GE, ConstantNode.forInt(config.klassLayoutHelperNeutralValue), ConstantNode.defaultForKind(JavaKind.Object),
+                                        GraalDirectives.UNLIKELY_PROBABILITY);
+                        ValueNode componentMirror = helper.readArrayKlassComponentMirror(klassNonNull, guard);
+                        helper.emitFinalReturn(JavaKind.Object, componentMirror);
+                    }
+                    return true;
+                }
+            });
         }
     }
 
@@ -381,7 +516,7 @@ public boolean inlineOnly() {
         plugins.register(plugin, VolatileCallSite.class, "getTarget", Receiver.class);
     }
 
-    private static void registerReflectionPlugins(InvocationPlugins plugins, Replacements replacements) {
+    private static void registerReflectionPlugins(InvocationPlugins plugins, Replacements replacements, GraalHotSpotVMConfig config) {
         Registration r = new Registration(plugins, reflectionClass, replacements);
         r.register0("getCallerClass", new InvocationPlugin() {
             @Override
@@ -395,7 +530,29 @@ public boolean inlineOnly() {
                 return true;
             }
         });
-        r.registerMethodSubstitution(ReflectionSubstitutions.class, "getClassAccessFlags", Class.class);
+        r.register1("getClassAccessFlags", Class.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
+                // @formatter:off
+                //    public static int getClassAccessFlags(Class<?> aClass) {
+                //        KlassPointer klass = ClassGetHubNode.readClass(GraalDirectives.guardingNonNull(aClass));
+                //        if (klass.isNull()) {
+                //            // Class for primitive type
+                //            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
+                //        } else {
+                //            return klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION) & jvmAccWrittenFlags(INJECTED_VMCONFIG);
+                //        }
+                //    }
+                // @formatter:on
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode klass = b.add(ClassGetHubNode.create(b.nullCheckedValue(arg), b.getMetaAccess(), b.getConstantReflection()));
+                    ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.forInt(Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC), GraalDirectives.UNLIKELY_PROBABILITY);
+                    ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
+                    helper.emitFinalReturn(JavaKind.Int, new AndNode(accessFlags, ConstantNode.forInt(config.jvmAccWrittenFlags)));
+                }
+                return true;
+            }
+        });
     }
 
     private static void registerUnsafePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
@@ -463,10 +620,31 @@ public boolean inlineOnly() {
         });
     }
 
-    private static void registerArrayPlugins(InvocationPlugins plugins, Replacements replacements) {
+    private static void registerArrayPlugins(InvocationPlugins plugins, Replacements replacements, GraalHotSpotVMConfig config) {
         Registration r = new Registration(plugins, Array.class, replacements);
         r.setAllowOverwrite(true);
-        r.registerMethodSubstitution(HotSpotArraySubstitutions.class, "newInstance", Class.class, int.class);
+        r.register2("newInstance", Class.class, int.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode componentType, ValueNode length) {
+                // @formatter:off
+                //    public static Object newInstance(Class<?> componentType, int length) {
+                //        if (componentType == null || loadKlassFromObject(componentType, arrayKlassOffset(INJECTED_VMCONFIG), CLASS_ARRAY_KLASS_LOCATION).isNull()) {
+                //            // Exit the intrinsic here for the case where the array class does not exist
+                //            return newInstance(componentType, length);
+                //        }
+                //        return DynamicNewArrayNode.newArray(GraalDirectives.guardingNonNull(componentType), length);
+                //    }
+                // @formatter:on
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode nonNullComponentType = b.nullCheckedValue(componentType);
+                    ValueNode arrayClass = helper.loadArrayKlass(nonNullComponentType);
+                    helper.doFallbackIf(IsNullNode.create(arrayClass), false, GraalDirectives.UNLIKELY_PROBABILITY);
+                    helper.emitFinalReturn(JavaKind.Object, new DynamicNewArrayNode(nonNullComponentType, length,
+                                    true));
+                }
+                return true;
+            }
+        });
     }
 
     private static void registerStringPlugins(InvocationPlugins plugins, Replacements replacements, WordTypes wordTypes, ArrayCopyForeignCalls foreignCalls, GraalHotSpotVMConfig vmConfig) {
@@ -477,19 +655,20 @@ private static void registerStringPlugins(InvocationPlugins plugins, Replacement
 
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value, ValueNode srcBegin, ValueNode length) {
-                    PluginHelper helper = new PluginHelper(b, wordTypes);
-                    helper.guard(srcBegin, Condition.LT, ConstantNode.forInt(0), DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    helper.guard(length, Condition.LT, ConstantNode.forInt(0), DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    helper.guard(length, Condition.GT, ConstantNode.forInt(MAX_LENGTH), DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    ValueNode valueLength = b.add(new ArrayLengthNode(value));
-                    ValueNode limit = b.add(new SubNode(valueLength, length));
-                    helper.guard(srcBegin, Condition.GT, limit, DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    ValueNode newArray = b.add(new NewArrayNode(b.getMetaAccess().lookupJavaType(Byte.TYPE), b.add(new LeftShiftNode(length, ConstantNode.forInt(1))), false));
-                    b.addPush(JavaKind.Object, newArray);
-                    // The stateAfter should include the value pushed, so push it first and then
-                    // perform the call that fills in the array.
-                    b.add(new ArrayCopyCallNode(foreignCalls, wordTypes, value, srcBegin, newArray, ConstantNode.forInt(0), length, JavaKind.Char, LocationIdentity.init(), false, true, true,
-                                    vmConfig.heapWordSize));
+                    try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, vmConfig)) {
+                        helper.intrinsicRangeCheck(srcBegin, Condition.LT, ConstantNode.forInt(0));
+                        helper.intrinsicRangeCheck(length, Condition.LT, ConstantNode.forInt(0));
+                        helper.intrinsicRangeCheck(length, Condition.GT, ConstantNode.forInt(MAX_LENGTH));
+                        ValueNode valueLength = b.add(new ArrayLengthNode(value));
+                        ValueNode limit = b.add(new SubNode(valueLength, length));
+                        helper.intrinsicRangeCheck(srcBegin, Condition.GT, limit);
+                        ValueNode newArray = b.add(new NewArrayNode(b.getMetaAccess().lookupJavaType(Byte.TYPE), b.add(new LeftShiftNode(length, ConstantNode.forInt(1))), false));
+                        b.addPush(JavaKind.Object, newArray);
+                        // The stateAfter should include the value pushed, so push it first and then
+                        // perform the call that fills in the array.
+                        b.add(new ArrayCopyCallNode(foreignCalls, wordTypes, value, srcBegin, newArray, ConstantNode.forInt(0), length, JavaKind.Char, LocationIdentity.init(), false, true, true,
+                                        vmConfig.heapWordSize));
+                    }
                     return true;
                 }
             });
@@ -497,41 +676,32 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value, ValueNode srcBegin, ValueNode srcEnd, ValueNode dst,
                                 ValueNode dstBegin) {
-                    PluginHelper helper = new PluginHelper(b, wordTypes);
-                    ValueNode length = helper.sub(srcEnd, srcBegin);
-                    helper.guard(srcBegin, Condition.LT, ConstantNode.forInt(0), DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    helper.guard(length, Condition.LT, ConstantNode.forInt(0), DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    ValueNode srcLimit = helper.sub(helper.rightShift(helper.length(value), 1), length);
-                    helper.guard(srcBegin, Condition.GT, srcLimit, DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    ValueNode limit = helper.sub(helper.length(dst), length);
-                    helper.guard(dstBegin, Condition.GT, limit, DeoptimizationAction.None, DeoptimizationReason.BoundsCheckException);
-                    b.add(new ArrayCopyCallNode(foreignCalls, wordTypes, value, srcBegin, dst, dstBegin, length, JavaKind.Char, JavaKind.Byte, JavaKind.Char, false, true, true,
-                                    vmConfig.heapWordSize));
+                    try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, vmConfig)) {
+                        ValueNode length = helper.sub(srcEnd, srcBegin);
+                        helper.intrinsicRangeCheck(srcBegin, Condition.LT, ConstantNode.forInt(0));
+                        helper.intrinsicRangeCheck(length, Condition.LT, ConstantNode.forInt(0));
+                        ValueNode srcLimit = helper.sub(helper.shr(helper.length(value), 1), length);
+                        helper.intrinsicRangeCheck(srcBegin, Condition.GT, srcLimit);
+                        ValueNode limit = helper.sub(helper.length(dst), length);
+                        helper.intrinsicRangeCheck(dstBegin, Condition.GT, limit);
+                        b.add(new ArrayCopyCallNode(foreignCalls, wordTypes, value, srcBegin, dst, dstBegin, length, JavaKind.Char, JavaKind.Byte, JavaKind.Char, false, true, true,
+                                        vmConfig.heapWordSize));
+                    }
                     return true;
                 }
             });
         }
     }
 
-    private static void registerThreadPlugins(InvocationPlugins plugins, MetaAccessProvider metaAccess, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
+    private static void registerThreadPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
         Registration r = new Registration(plugins, Thread.class, replacements);
         r.register0("currentThread", new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                CurrentJavaThreadNode thread = b.add(new CurrentJavaThreadNode(wordTypes.getWordKind()));
-                ValueNode offset = b.add(ConstantNode.forLong(config.threadObjectOffset));
-                AddressNode address = b.add(new OffsetAddressNode(thread, offset));
-                // JavaThread::_threadObj is never compressed
-                ObjectStamp stamp = StampFactory.objectNonNull(TypeReference.create(b.getAssumptions(), metaAccess.lookupJavaType(Thread.class)));
-                ReadNode value = b.add(new ReadNode(address, JAVA_THREAD_THREAD_OBJECT_LOCATION,
-                                config.threadObjectFieldIsHandle ? StampFactory.forKind(wordTypes.getWordKind()) : stamp, BarrierType.NONE));
-                if (config.threadObjectFieldIsHandle) {
-                    // Read the Object from the OopHandle
-                    ValueNode handleOffset = ConstantNode.forIntegerKind(wordTypes.getWordKind(), 0, b.getGraph());
-                    AddressNode handleAddress = b.add(new OffsetAddressNode(value, handleOffset));
-                    value = b.add(new ReadNode(handleAddress, HOTSPOT_OOP_HANDLE_LOCATION, stamp, BarrierType.NONE));
+                try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    ValueNode value = helper.readCurrentThreadObject();
+                    b.push(JavaKind.Object, value);
                 }
-                b.push(JavaKind.Object, value);
                 return true;
             }
         });
@@ -539,7 +709,41 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         if (config.osThreadInterruptedOffset != Integer.MAX_VALUE) {
             // This substitution is no longer in used when threadObj is a handle
             assert !config.threadObjectFieldIsHandle;
-            r.registerMethodSubstitution(ThreadSubstitutions.class, "isInterrupted", Receiver.class, boolean.class);
+            r.register2("isInterrupted", Receiver.class, boolean.class, new InvocationPlugin() {
+                @Override
+                public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode clearInterrupted) {
+                    // @formatter:off
+                    //     public static boolean isInterrupted(final Thread thisObject, boolean clearInterrupted) {
+                    //        Word javaThread = CurrentJavaThreadNode.get();
+                    //        Object thread = javaThread.readObject(threadObjectOffset(INJECTED_VMCONFIG), JAVA_THREAD_THREAD_OBJECT_LOCATION);
+                    //        if (thisObject == thread) {
+                    //            Word osThread = javaThread.readWord(osThreadOffset(INJECTED_VMCONFIG), JAVA_THREAD_OSTHREAD_LOCATION);
+                    //            int interrupted = osThread.readInt(osThreadInterruptedOffset(INJECTED_VMCONFIG), any());
+                    //            if (interrupted == 0) {
+                    //                return false;
+                    //            }
+                    //            if (clearInterrupted == false) {
+                    //                return interrupted != 0;
+                    //            }
+                    //        }
+                    //        return isInterrupted(thisObject, clearInterrupted);
+                    //    }
+                    // @formatter:on
+                    try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                        ValueNode receiverThreadObject = receiver.get();
+                        CurrentJavaThreadNode thread = b.add(new CurrentJavaThreadNode(helper.getWordKind()));
+                        ValueNode currentThreadObject = helper.readCurrentThreadObject(thread);
+                        helper.doFallbackIf(receiverThreadObject, NE, currentThreadObject, GraalDirectives.UNLIKELY_PROBABILITY);
+                        ValueNode osThread = helper.readOsThread(thread);
+                        ValueNode interrupted = helper.readOsThreadInterrupted(osThread);
+                        helper.emitReturnIf(interrupted, EQ, ConstantNode.forInt(0), ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
+                        helper.doFallbackIf(clearInterrupted, EQ, ConstantNode.forBoolean(true), GraalDirectives.UNLIKELY_PROBABILITY);
+                        helper.emitReturnIf(interrupted, EQ, ConstantNode.forInt(0), ConstantNode.forBoolean(false), GraalDirectives.LIKELY_PROBABILITY);
+                        helper.emitFinalReturn(JavaKind.Boolean, ConstantNode.forBoolean(true));
+                    }
+                    return true;
+                }
+            });
         }
 
     }
@@ -593,176 +797,216 @@ public static boolean isIntrinsicName(GraalHotSpotVMConfig config, String classN
         return false;
     }
 
-    private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-        if (config.useAESIntrinsics) {
-            assert config.aescryptEncryptBlockStub != 0L;
-            assert config.aescryptDecryptBlockStub != 0L;
-            assert config.cipherBlockChainingEncryptAESCryptStub != 0L;
-            assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
-
-            Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
-
-            Pair<String, String> cbcEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
-            registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcEncryptName, Receiver.class, byte[].class, int.class, int.class,
-                            byte[].class, int.class);
-
-            Pair<String, String> cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
-            registerAndCheckMismatch(r, CipherBlockChainingSubstitutions.class, cbcDecryptName, cbcDecryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class,
-                            byte[].class, int.class);
-
-            r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
-
-            Pair<String, String> aesEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
-            registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesEncryptName, Receiver.class, byte[].class, int.class, byte[].class, int.class);
-
-            Pair<String, String> aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
-            registerAndCheckMismatch(r, AESCryptSubstitutions.class, aesDecryptName, aesDecryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class);
-        }
-    }
+    public static class AESCryptPlugin implements org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin {
+        private final boolean doEncrypt;
 
-    private static void registerAndCheckMismatch(Registration r, Class<?> substitutionClass, Pair<String, String> intrinsicNames, Type... argumentTypes) {
-        try {
-            r.registerMethodSubstitution(substitutionClass, intrinsicNames.getLeft(), argumentTypes);
-        } catch (NoSuchMethodError e) {
-            throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
-                            intrinsicNames.getRight(), intrinsicNames.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+        public static ResolvedJavaType getType(ResolvedJavaType context, String typeName) {
+            try {
+                UnresolvedJavaType unresolved = UnresolvedJavaType.create(typeName);
+                return unresolved.resolve(context);
+            } catch (LinkageError e) {
+                throw new GraalError(e);
+            }
         }
-    }
 
-    private static void registerAndCheckMismatch(Registration r, Class<?> substitutionClass, Pair<String, String> intrinsicNames, String substituteName, Type... argumentTypes) {
-        try {
-            r.registerMethodSubstitution(substitutionClass, intrinsicNames.getLeft(), substituteName, argumentTypes);
-        } catch (NoSuchMethodError e) {
-            throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
-                            intrinsicNames.getRight(), intrinsicNames.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+        static ResolvedJavaType aesCryptType(ResolvedJavaType context) {
+            return getType(context, "Lcom/sun/crypto/provider/AESCrypt;");
         }
-    }
 
-    private static void registerAndCheckMismatch(Registration r, Pair<String, String> intrinsicNames, Type arg1, Type arg2, Type arg3, InvocationPlugin plugin) {
-        try {
-            r.register3(intrinsicNames.getLeft(), arg1, arg2, arg3, plugin);
-        } catch (NoSuchMethodError e) {
-            throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
-                            intrinsicNames.getRight(), intrinsicNames.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+        AESCryptPlugin(boolean doEncrypt) {
+            this.doEncrypt = doEncrypt;
         }
-    }
-
-    private static ValueNode arrayStart(GraphBuilderContext b, ValueNode array, JavaKind kind) {
-        int byteArrayBaseOffset = b.getMetaAccess().getArrayBaseOffset(kind);
-        return b.add(new ComputeObjectAddressNode(array, ConstantNode.forInt(byteArrayBaseOffset)));
-    }
 
-    private static ValueNode byteArrayStart(GraphBuilderContext b, ValueNode array) {
-        JavaKind kind = JavaKind.Byte;
-        return arrayStart(b, array, kind);
-    }
-
-    static class PluginHelper {
-        protected final GraphBuilderContext context;
-        protected final WordTypes wordTypes;
+        /**
+         * The AES block size is a constant 128 bits as defined by the
+         * <a href="http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.197.pdf">standard<a/>.
+         */
+        static final int AES_BLOCK_SIZE_IN_BYTES = 16;
 
-        PluginHelper(GraphBuilderContext context, WordTypes wordTypes) {
-            this.context = context;
-            this.wordTypes = wordTypes;
+        @Override
+        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode out, ValueNode outOffset) {
+            // @formatter:off
+            //     private static void crypt(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset, boolean encrypt) {
+            //        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AES_BLOCK_SIZE_IN_BYTES < inOffset || outOffset < 0 || out.length - AES_BLOCK_SIZE_IN_BYTES < outOffset)) {
+            //            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
+            //        }
+            //        Object realReceiver = PiNode.piCastNonNull(rcvr, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
+            //        Object kObject = RawLoadNode.load(realReceiver, kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
+            //        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
+            //        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
+            //        if (encrypt) {
+            //            encryptBlockStub(ENCRYPT_BLOCK, inAddr, outAddr, kAddr);
+            //        } else {
+            //            decryptBlockStub(DECRYPT_BLOCK, inAddr, outAddr, kAddr);
+            //        }
+            //    }
+            // @formatter:on
+            try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                ValueNode nonNullReceiver = receiver.get();
+                ValueNode nonNullIn = b.nullCheckedValue(in);
+                ValueNode nonNullOut = b.nullCheckedValue(out);
+
+                ConstantNode zero = ConstantNode.forInt(0);
+                helper.intrinsicRangeCheck(inOffset, LT, zero);
+                ValueNode inLength = helper.length(nonNullIn);
+                helper.intrinsicRangeCheck(helper.sub(inLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, inOffset);
+                helper.intrinsicRangeCheck(outOffset, LT, zero);
+                ValueNode outLength = helper.length(nonNullOut);
+                helper.intrinsicRangeCheck(helper.sub(outLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, outOffset);
+
+                ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
+                ValueNode k = b.nullCheckedValue(helper.loadField(nonNullReceiver, kField));
+                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
+                ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
+                ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
+                HotSpotForeignCallDescriptor descriptor = doEncrypt ? ENCRYPT_BLOCK : DECRYPT_BLOCK;
+                b.add(new ForeignCallNode(descriptor, inAddr, outAddr, kAddr));
+            }
+            return true;
         }
+    }
 
-        ValueNode xor(ValueNode x, ValueNode y) {
-            return context.add(new XorNode(x, y));
-        }
+    public static class CipherBlockChainingCryptPlugin implements InvocationPlugin {
+        private final boolean doEncrypt;
 
-        ValueNode add(ValueNode x, ValueNode y) {
-            return context.add(new AddNode(x, y));
+        public static ResolvedJavaType getType(ResolvedJavaType context, String typeName) {
+            try {
+                UnresolvedJavaType unresolved = UnresolvedJavaType.create(typeName);
+                return unresolved.resolve(context);
+            } catch (LinkageError e) {
+                throw new GraalError(e);
+            }
         }
 
-        ValueNode sub(ValueNode x, ValueNode y) {
-            return context.add(new SubNode(x, y));
+        static ResolvedJavaType aesCryptType(ResolvedJavaType context) {
+            return getType(context, "Lcom/sun/crypto/provider/AESCrypt;");
         }
 
-        ValueNode length(ValueNode x) {
-            return context.add(new ArrayLengthNode(x));
+        static ResolvedJavaType feedbackCipherType(ResolvedJavaType context) {
+            return getType(context, "Lcom/sun/crypto/provider/FeedbackCipher;");
         }
 
-        ValueNode byteArrayStart(ValueNode array) {
-            return arrayIndex(array, JavaKind.Byte, null);
+        CipherBlockChainingCryptPlugin(boolean doEncrypt) {
+            this.doEncrypt = doEncrypt;
         }
 
-        ValueNode arrayIndex(ValueNode array, JavaKind kind, ValueNode index) {
-            int arrayBaseOffset = context.getMetaAccess().getArrayBaseOffset(kind);
-            ValueNode offset = ConstantNode.forInt(arrayBaseOffset);
-            if (index != null) {
-                offset = add(offset, scale(index, kind));
+        @Override
+        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode inLength, ValueNode out, ValueNode outOffset) {
+            // @formatter:off
+            //static int encrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
+            //        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
+            //        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
+            //            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
+            //            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, true);
+            //            return inLength;
+            //        } else {
+            //            return encrypt(realReceiver, in, inOffset, inLength, out, outOffset);
+            //        }
+            //    }
+            //
+            //   private static void crypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset, Object embeddedCipher, boolean encrypt) {
+            //        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AESCryptSubstitutions.AES_BLOCK_SIZE_IN_BYTES < inOffset || outOffset < 0 ||
+            //                        out.length - AESCryptSubstitutions.AES_BLOCK_SIZE_IN_BYTES < outOffset)) {
+            //            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
+            //        }
+            //        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
+            //        Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
+            //        Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //        Object rObject = RawLoadNode.load(realReceiver, rOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
+            //        Pointer rAddr = Word.objectToTrackedPointer(rObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
+            //        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
+            //        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
+            //        if (encrypt) {
+            //            encryptAESCryptStub(ENCRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
+            //        } else {
+            //            decryptAESCryptStub(DECRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
+            //        }
+            //    }
+            // @formatter:on
+            try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                ValueNode nonNullReceiver = receiver.get();
+                ResolvedJavaField embeddedCipherField = helper.getField(feedbackCipherType(targetMethod.getDeclaringClass()), "embeddedCipher");
+                ValueNode embeddedCipher = helper.loadField(nonNullReceiver, embeddedCipherField);
+                LogicNode typeCheck = InstanceOfNode.create(TypeReference.create(b.getAssumptions(), aesCryptType(targetMethod.getDeclaringClass())), embeddedCipher);
+                helper.doFallbackIf(typeCheck, true, GraalDirectives.UNLIKELY_PROBABILITY);
+
+                ValueNode nonNullIn = b.nullCheckedValue(in);
+                ValueNode nonNullOut = b.nullCheckedValue(out);
+
+                ConstantNode zero = ConstantNode.forInt(0);
+                helper.intrinsicRangeCheck(inOffset, LT, zero);
+                helper.intrinsicRangeCheck(helper.sub(inLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, inOffset);
+                helper.intrinsicRangeCheck(outOffset, LT, zero);
+                ValueNode outLength = helper.length(nonNullOut);
+                helper.intrinsicRangeCheck(helper.sub(outLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, outOffset);
+
+                ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
+                ResolvedJavaField rField = helper.getField(targetMethod.getDeclaringClass(), "r");
+
+                ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
+                ValueNode r = b.nullCheckedValue(helper.loadField(nonNullReceiver, rField));
+                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
+                ValueNode rAddr = helper.arrayElementPointer(r, JavaKind.Byte, null);
+                ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
+                ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
+                HotSpotForeignCallDescriptor descriptor = doEncrypt ? ENCRYPT : DECRYPT;
+                ForeignCallNode call = new ForeignCallNode(descriptor, inAddr, outAddr, kAddr, rAddr, inLength);
+                b.append(call);
+                b.addPush(JavaKind.Int, inLength);
+                b.setStateAfter(call);
+                b.pop(JavaKind.Int);
+                helper.emitFinalReturn(JavaKind.Int, inLength);
             }
-
-            return context.add(new ComputeObjectAddressNode(array, offset));
+            return true;
         }
+    }
 
-        private ValueNode scale(ValueNode index, JavaKind kind) {
-            int arrayIndexScale = context.getMetaAccess().getArrayIndexScale(kind);
-            return shl(asWord(index), arrayIndexScale);
-        }
+    private static void registerAESPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
+        if (config.useAESIntrinsics) {
+            assert config.aescryptEncryptBlockStub != 0L;
+            assert config.aescryptDecryptBlockStub != 0L;
+            assert config.cipherBlockChainingEncryptAESCryptStub != 0L;
+            assert config.cipherBlockChainingDecryptAESCryptStub != 0L;
 
-        private ValueNode shl(ValueNode node, int arrayIndexScale) {
-            if (arrayIndexScale == 1) {
-                return node;
-            }
-            return context.add(new LeftShiftNode(node, ConstantNode.forInt(arrayIndexScale)));
-        }
+            Registration r = new Registration(plugins, "com.sun.crypto.provider.CipherBlockChaining", replacements);
 
-        private ValueNode asWord(ValueNode index) {
-            assert index.getStackKind().isPrimitive();
-            if (index.getStackKind() != wordTypes.getWordKind()) {
-                return SignExtendNode.create(index, wordTypes.getWordKind().getBitCount(), NodeView.DEFAULT);
+            Pair<String, String> cbcEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implEncrypt", "encrypt");
+            try {
+                r.registerOptional6(cbcEncryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class, new CipherBlockChainingCryptPlugin(true));
+            } catch (NoSuchMethodError e3) {
+                throw new GraalError(e3, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                cbcEncryptName.getRight(), cbcEncryptName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
             }
-            return index;
-        }
 
-        private LogicNode createCompare(CanonicalCondition cond, ValueNode a, ValueNode b) {
-            assert !a.getStackKind().isNumericFloat();
-            switch (cond) {
-                case EQ:
-                    if (a.getStackKind() == JavaKind.Object) {
-                        return ObjectEqualsNode.create(getConstantReflection(), getMetaAccess(), b.getOptions(), a, b, NodeView.DEFAULT);
-                    } else {
-                        return IntegerEqualsNode.create(getConstantReflection(), getMetaAccess(), b.getOptions(), null, a, b, NodeView.DEFAULT);
-                    }
-                case LT:
-                    assert a.getStackKind() != JavaKind.Object;
-                    return IntegerLessThanNode.create(getConstantReflection(), getMetaAccess(), b.getOptions(), null, a, b, NodeView.DEFAULT);
-                default:
-                    throw GraalError.shouldNotReachHere("Unexpected condition: " + cond);
+            Pair<String, String> cbcDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/CipherBlockChaining", "implDecrypt", "decrypt");
+            try {
+                r.registerOptional6(cbcDecryptName.getLeft(), Receiver.class, byte[].class, int.class, int.class, byte[].class, int.class, new CipherBlockChainingCryptPlugin(false));
+            } catch (NoSuchMethodError e2) {
+                throw new GraalError(e2, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                cbcDecryptName.getRight(), cbcDecryptName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
             }
-        }
-
-        private ConstantReflectionProvider getConstantReflection() {
-            return context.getConstantReflection();
-        }
-
-        private MetaAccessProvider getMetaAccess() {
-            return context.getMetaAccess();
-        }
 
-        void guard(ValueNode x, Condition condition, ValueNode y, DeoptimizationAction action, DeoptimizationReason deoptReason) {
-            Condition.CanonicalizedCondition canonicalizedCondition = condition.canonicalize();
+            r = new Registration(plugins, "com.sun.crypto.provider.AESCrypt", replacements);
 
-            // Check whether the condition needs to mirror the operands.
-            ValueNode a = x;
-            ValueNode b = y;
-            if (canonicalizedCondition.mustMirror()) {
-                a = y;
-                b = x;
+            Pair<String, String> aesEncryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implEncryptBlock", "encryptBlock");
+            try {
+                r.registerOptional5(aesEncryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class, new AESCryptPlugin(true));
+            } catch (NoSuchMethodError e1) {
+                throw new GraalError(e1, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                aesEncryptName.getRight(), aesEncryptName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
             }
-            LogicNode compare = createCompare(canonicalizedCondition.getCanonicalCondition(), a, b);
-            context.add(new FixedGuardNode(compare, deoptReason, action, !canonicalizedCondition.mustNegate()));
-        }
-
-        public ValueNode leftShift(ValueNode node, int i) {
-            return context.add(new LeftShiftNode(node, ConstantNode.forInt(i)));
-        }
 
-        public ValueNode rightShift(ValueNode node, int i) {
-            return context.add(new RightShiftNode(node, ConstantNode.forInt(i)));
+            Pair<String, String> aesDecryptName = selectIntrinsicName(config, "com/sun/crypto/provider/AESCrypt", "implDecryptBlock", "decryptBlock");
+            try {
+                r.registerOptional5(aesDecryptName.getLeft(), Receiver.class, byte[].class, int.class, byte[].class, int.class, new AESCryptPlugin(false));
+            } catch (NoSuchMethodError e) {
+                throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                aesDecryptName.getRight(), aesDecryptName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+            }
         }
-
     }
 
     private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
@@ -779,12 +1023,14 @@ private static void registerBigIntegerPlugins(InvocationPlugins plugins, GraalHo
             r.register5("implMulAdd", int[].class, int[].class, int.class, int.class, int.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode out, ValueNode in, ValueNode offset, ValueNode len, ValueNode k) {
-                    ValueNode outNonNull = b.nullCheckedValue(out);
-                    ValueNode outNonNullLength = b.add(new ArrayLengthNode(outNonNull));
-                    ValueNode newOffset = new SubNode(outNonNullLength, offset);
-                    ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MUL_ADD, byteArrayStart(b, outNonNull), byteArrayStart(b, in), newOffset, len, k);
-                    b.addPush(JavaKind.Int, call);
-                    b.setStateAfter(call);
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        ValueNode outNonNull = b.nullCheckedValue(out);
+                        ValueNode outNonNullLength = b.add(new ArrayLengthNode(outNonNull));
+                        ValueNode newOffset = new SubNode(outNonNullLength, offset);
+                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MUL_ADD, helper.arrayStart(outNonNull, JavaKind.Int), helper.arrayStart(in, JavaKind.Int), newOffset, len, k);
+                        b.addPush(JavaKind.Int, call);
+                        b.setStateAfter(call);
+                    }
                     return true;
                 }
             });
@@ -795,14 +1041,18 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
              * int[] product)
              */
             r.register6("implMontgomeryMultiply", int[].class, int[].class, int[].class, int.class, long.class, int[].class, new InvocationPlugin() {
+
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode a, ValueNode bObject, ValueNode n, ValueNode len, ValueNode inv,
                                 ValueNode product) {
-                    ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_MULTIPLY, byteArrayStart(b, a), byteArrayStart(b, bObject), byteArrayStart(b, n), len, inv,
-                                    byteArrayStart(b, product));
-                    b.add(call);
-                    b.addPush(JavaKind.Object, product);
-                    b.setStateAfter(call);
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_MULTIPLY, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(bObject, JavaKind.Int),
+                                        helper.arrayStart(n, JavaKind.Int), len, inv,
+                                        helper.arrayStart(product, JavaKind.Int));
+                        b.add(call);
+                        b.addPush(JavaKind.Object, product);
+                        b.setStateAfter(call);
+                    }
                     return true;
                 }
             });
@@ -814,10 +1064,13 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             r.register5("implMontgomerySquare", int[].class, int[].class, int.class, long.class, int[].class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode a, ValueNode n, ValueNode len, ValueNode inv, ValueNode product) {
-                    ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_SQUARE, byteArrayStart(b, a), byteArrayStart(b, n), len, inv, byteArrayStart(b, product));
-                    b.add(call);
-                    b.addPush(JavaKind.Object, product);
-                    b.setStateAfter(call);
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_SQUARE, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(n, JavaKind.Int), len, inv,
+                                        helper.arrayStart(product, JavaKind.Int));
+                        b.add(call);
+                        b.addPush(JavaKind.Object, product);
+                        b.setStateAfter(call);
+                    }
                     return true;
                 }
             });
@@ -829,10 +1082,12 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             r.register4("implSquareToLen", int[].class, int.class, int[].class, int.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode len, ValueNode z, ValueNode zlen) {
-                    ForeignCallNode call = new ForeignCallNode(HotSpotBackend.SQUARE_TO_LEN, byteArrayStart(b, x), len, byteArrayStart(b, z), zlen);
-                    b.add(call);
-                    b.addPush(JavaKind.Object, z);
-                    b.setStateAfter(call);
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.SQUARE_TO_LEN, helper.arrayStart(x, JavaKind.Int), len, helper.arrayStart(z, JavaKind.Int), zlen);
+                        b.add(call);
+                        b.addPush(JavaKind.Object, z);
+                        b.setStateAfter(call);
+                    }
                     return true;
                 }
             });
@@ -859,6 +1114,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             b.add(new ForeignCallNode(descriptor, bufAddr, stateAddr));
             return true;
         }
+
     }
 
     private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
@@ -876,19 +1132,34 @@ private static void registerSHAPlugins(InvocationPlugins plugins, GraalHotSpotVM
             assert config.sha1ImplCompress != 0L;
             Registration r = new Registration(plugins, "sun.security.provider.SHA", replacements);
             InvocationPlugin plugin = new SHAInvocationPlugin(HotSpotBackend.SHA_IMPL_COMPRESS);
-            registerAndCheckMismatch(r, implCompressName, Receiver.class, byte[].class, int.class, plugin);
+            try {
+                r.register3(implCompressName.getLeft(), Receiver.class, byte[].class, int.class, plugin);
+            } catch (NoSuchMethodError e) {
+                throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                implCompressName.getRight(), implCompressName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+            }
         }
         if (useSha256) {
             assert config.sha256ImplCompress != 0L;
             Registration r = new Registration(plugins, "sun.security.provider.SHA2", replacements);
             InvocationPlugin plugin = new SHAInvocationPlugin(HotSpotBackend.SHA2_IMPL_COMPRESS);
-            registerAndCheckMismatch(r, implCompressName, Receiver.class, byte[].class, int.class, plugin);
+            try {
+                r.register3(implCompressName.getLeft(), Receiver.class, byte[].class, int.class, plugin);
+            } catch (NoSuchMethodError e) {
+                throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                implCompressName.getRight(), implCompressName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+            }
         }
         if (useSha512) {
             assert config.sha512ImplCompress != 0L;
             Registration r = new Registration(plugins, "sun.security.provider.SHA5", replacements);
             InvocationPlugin plugin = new SHAInvocationPlugin(HotSpotBackend.SHA5_IMPL_COMPRESS);
-            registerAndCheckMismatch(r, implCompressName, Receiver.class, byte[].class, int.class, plugin);
+            try {
+                r.register3(implCompressName.getLeft(), Receiver.class, byte[].class, int.class, plugin);
+            } catch (NoSuchMethodError e) {
+                throw new GraalError(e, "Found method named '%s' instead of '%s' in class '%s'. This is most likely because the JVMCI JDK in %s was built on an incompatible base JDK.",
+                                implCompressName.getRight(), implCompressName.getLeft(), r.getDeclaringType().getTypeName(), Services.getSavedProperties().get("java.home"));
+            }
         }
     }
 
@@ -925,12 +1196,91 @@ public boolean apply(GraphBuilderContext b,
         }
     }
 
+    static class CounterModeCryptPlugin implements InvocationPlugin {
+        public static ResolvedJavaType getType(ResolvedJavaType context, String typeName) {
+            try {
+                UnresolvedJavaType unresolved = UnresolvedJavaType.create(typeName);
+                return unresolved.resolve(context);
+            } catch (LinkageError e) {
+                throw new GraalError(e);
+            }
+        }
+
+        static ResolvedJavaType aesCryptType(ResolvedJavaType context) {
+            return getType(context, "Lcom/sun/crypto/provider/AESCrypt;");
+        }
+
+        static ResolvedJavaType feedbackCipherType(ResolvedJavaType context) {
+            return getType(context, "Lcom/sun/crypto/provider/FeedbackCipher;");
+        }
+
+        @Override
+        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode len, ValueNode out, ValueNode outOffset) {
+            // @formatter:off
+            //     static int implCrypt(Object receiver, byte[] in, int inOff, int len, byte[] out, int outOff) {
+            //        Object realReceiver = piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
+            //        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
+            //            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
+            //
+            //            Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff));
+            //            Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff));
+            //            Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT)));
+            //
+            //            int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT);
+            //            int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT);
+            //            Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
+            //            Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any());
+            //            Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any());
+            //
+            //            Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
+            //            Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
+            //            Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
+            //
+            //            return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr);
+            //        } else {
+            //            return implCrypt(realReceiver, in, inOff, len, out, outOff);
+            //        }
+            //    }
+            // @formatter:on
+            try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                ValueNode nonNullReceiver = receiver.get();
+                ResolvedJavaField embeddedCipherField = helper.getField(feedbackCipherType(targetMethod.getDeclaringClass()), "embeddedCipher");
+                ValueNode embeddedCipher = helper.loadField(nonNullReceiver, embeddedCipherField);
+                LogicNode typeCheck = InstanceOfNode.create(TypeReference.create(b.getAssumptions(), aesCryptType(targetMethod.getDeclaringClass())), embeddedCipher);
+                helper.doFallbackIf(typeCheck, true, GraalDirectives.UNLIKELY_PROBABILITY);
+
+                ValueNode nonNullIn = b.nullCheckedValue(in);
+                ValueNode nonNullOut = b.nullCheckedValue(out);
+                ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
+                ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
+
+                ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
+                ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
+                ResolvedJavaField counterField = helper.getField(targetMethod.getDeclaringClass(), "counter");
+                ValueNode counter = helper.loadField(nonNullReceiver, counterField);
+                ValueNode counterAddr = helper.arrayElementPointer(counter, JavaKind.Byte, null);
+                ResolvedJavaField encryptedCounterField = helper.getField(targetMethod.getDeclaringClass(), "encryptedCounter");
+                ValueNode encryptedCounter = helper.loadField(nonNullReceiver, encryptedCounterField);
+                ValueNode encryptedCounterAddr = helper.arrayElementPointer(encryptedCounter, JavaKind.Byte, null);
+                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
+
+                ValueNode usedPtr = b.add(new ComputeObjectAddressNode(nonNullReceiver, helper.asWord(helper.getFieldOffset(targetMethod.getDeclaringClass(), "used"))));
+                ForeignCallNode call = b.append(new ForeignCallNode(COUNTERMODE_IMPL_CRYPT, inAddr, outAddr, kAddr, counterAddr, len, encryptedCounterAddr, usedPtr));
+                b.addPush(JavaKind.Int, call);
+                b.pop(JavaKind.Int);
+                helper.emitFinalReturn(JavaKind.Int, call);
+            }
+            return true;
+        }
+    }
+
     private static void registerCounterModePlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, Replacements replacements) {
-        if (isIntrinsicName(config, "com/sun/crypto/provider/CounterMode", "implCrypt")) {
-            assert !config.useAESCTRIntrinsics || config.counterModeAESCrypt != 0L;
+        if (isIntrinsicName(config, "com/sun/crypto/provider/CounterMode", "implCrypt") && config.useAESCTRIntrinsics) {
+            assert config.counterModeAESCrypt != 0L;
             Registration r = new Registration(plugins, "com.sun.crypto.provider.CounterMode", replacements);
-            r.registerConditionalMethodSubstitution(config.useAESCTRIntrinsics, CounterModeSubstitutions.class, "implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class,
-                            int.class);
+            r.register6("implCrypt", Receiver.class, byte[].class, int.class, int.class, byte[].class,
+                            int.class, new CounterModeCryptPlugin());
         }
     }
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 36243ca2a141..d4b91c2edc1a 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -31,8 +31,6 @@
 import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK_WITH_ORIGINAL_KEY;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_WITH_ORIGINAL_KEY;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
@@ -570,7 +568,6 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
                 // These stubs do callee saving
                 registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall);
                 registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall);
-                registerForeignCall(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, c.aescryptDecryptBlockStub, NativeCall);
             } catch (GraalError e) {
                 if (!(e.getCause() instanceof ClassNotFoundException)) {
                     throw e;
@@ -580,7 +577,6 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
                 // These stubs do callee saving
                 registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall);
                 registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall);
-                registerForeignCall(DECRYPT_WITH_ORIGINAL_KEY, c.cipherBlockChainingDecryptAESCryptStub, NativeCall);
             } catch (GraalError e) {
                 if (!(e.getCause() instanceof ClassNotFoundException)) {
                     throw e;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java
deleted file mode 100644
index bca80df1a089..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2012, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT;
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK_WITH_ORIGINAL_KEY;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
-import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.aesCryptType;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.getArrayBaseOffset;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.word.LocationIdentity;
-import org.graalvm.word.Pointer;
-import org.graalvm.word.WordFactory;
-
-import jdk.vm.ci.meta.DeoptimizationAction;
-import jdk.vm.ci.meta.DeoptimizationReason;
-import jdk.vm.ci.meta.JavaKind;
-
-// JaCoCo Exclude
-
-/**
- * Substitutions for {@code com.sun.crypto.provider.AESCrypt} methods.
- */
-@ClassSubstitution(className = "com.sun.crypto.provider.AESCrypt", optional = true)
-public class AESCryptSubstitutions {
-
-    /**
-     * The AES block size is a constant 128 bits as defined by the
-     * <a href="http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.197.pdf">standard<a/>.
-     */
-    static final int AES_BLOCK_SIZE_IN_BYTES = 16;
-
-    @Fold
-    static long kOffset(@Fold.InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(aesCryptType(context), "K");
-    }
-
-    @Fold
-    static long lastKeyOffset(@Fold.InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(aesCryptType(context), "lastKey");
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static void encryptBlock(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset) {
-        crypt(rcvr, in, inOffset, out, outOffset, true, false);
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static void implEncryptBlock(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset) {
-        crypt(rcvr, in, inOffset, out, outOffset, true, false);
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static void decryptBlock(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset) {
-        crypt(rcvr, in, inOffset, out, outOffset, false, false);
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static void implDecryptBlock(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset) {
-        crypt(rcvr, in, inOffset, out, outOffset, false, false);
-    }
-
-    private static void crypt(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset, boolean encrypt, boolean withOriginalKey) {
-        checkArgs(in, inOffset, out, outOffset);
-        Object realReceiver = PiNode.piCastNonNull(rcvr, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-        Object kObject = RawLoadNode.load(realReceiver, kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
-        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
-        if (encrypt) {
-            encryptBlockStub(ENCRYPT_BLOCK, inAddr, outAddr, kAddr);
-        } else {
-            if (withOriginalKey) {
-                Object lastKeyObject = RawLoadNode.load(realReceiver, lastKeyOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-                Pointer lastKeyAddr = Word.objectToTrackedPointer(lastKeyObject).add(getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-                decryptBlockWithOriginalKeyStub(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, inAddr, outAddr, kAddr, lastKeyAddr);
-            } else {
-                decryptBlockStub(DECRYPT_BLOCK, inAddr, outAddr, kAddr);
-            }
-        }
-    }
-
-    /**
-     * Perform null and array bounds checks for arguments to a cipher operation.
-     */
-    static void checkArgs(byte[] in, int inOffset, byte[] out, int outOffset) {
-        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AES_BLOCK_SIZE_IN_BYTES < inOffset || outOffset < 0 || out.length - AES_BLOCK_SIZE_IN_BYTES < outOffset)) {
-            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
-        }
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void encryptBlockStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key);
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void decryptBlockStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key);
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void decryptBlockWithOriginalKeyStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key, Pointer originalKey);
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java
deleted file mode 100644
index 643a2203f09b..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CipherBlockChainingSubstitutions.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2012, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT;
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_WITH_ORIGINAL_KEY;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
-import static org.graalvm.compiler.nodes.PiNode.piCastNonNull;
-import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.word.LocationIdentity;
-import org.graalvm.word.Pointer;
-import org.graalvm.word.WordFactory;
-
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-// JaCoCo Exclude
-
-/**
- * Substitutions for {@code com.sun.crypto.provider.CipherBlockChaining} methods.
- */
-@ClassSubstitution(className = "com.sun.crypto.provider.CipherBlockChaining", optional = true)
-public class CipherBlockChainingSubstitutions {
-
-    @Fold
-    static ResolvedJavaType aesCryptType(@Fold.InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getType(context, "Lcom/sun/crypto/provider/AESCrypt;");
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static int encrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, true, false);
-            return inLength;
-        } else {
-            return encrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    @Fold
-    static long embeddedCipherOffset(@Fold.InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.getType(context, "Lcom/sun/crypto/provider/FeedbackCipher;"), "embeddedCipher");
-    }
-
-    @Fold
-    static long rOffset(@Fold.InjectedParameter IntrinsicContext intrinsicContext) {
-        return HotSpotReplacementsUtil.getFieldOffset(HotSpotReplacementsUtil.methodHolderClass(intrinsicContext), "r");
-    }
-
-    @MethodSubstitution(isStatic = false, value = "implEncrypt")
-    static int implEncrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, true, false);
-            return inLength;
-        } else {
-            return implEncrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static int decrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        if (in != out && doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, false, false);
-            return inLength;
-        } else {
-            return decrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    @MethodSubstitution(isStatic = false)
-    static int implDecrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        if (in != out && doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, false, false);
-            return inLength;
-        } else {
-            return implDecrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-        }
-    }
-
-    private static void crypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset, Object embeddedCipher, boolean encrypt, boolean withOriginalKey) {
-        AESCryptSubstitutions.checkArgs(in, inOffset, out, outOffset);
-        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-        Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        Object rObject = RawLoadNode.load(realReceiver, rOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-        Pointer rAddr = Word.objectToTrackedPointer(rObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
-        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
-        if (encrypt) {
-            encryptAESCryptStub(ENCRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
-        } else {
-            if (withOriginalKey) {
-                Object lastKeyObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.lastKeyOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-                Pointer lastKeyAddr = Word.objectToTrackedPointer(lastKeyObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-                decryptAESCryptWithOriginalKeyStub(DECRYPT_WITH_ORIGINAL_KEY, inAddr, outAddr, kAddr, rAddr, inLength, lastKeyAddr);
-            } else {
-                decryptAESCryptStub(DECRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
-            }
-        }
-    }
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void encryptAESCryptStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key, Pointer r, int inLength);
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void decryptAESCryptStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key, Pointer r, int inLength);
-
-    @NodeIntrinsic(ForeignCallNode.class)
-    public static native void decryptAESCryptWithOriginalKeyStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word in, Word out, Pointer key, Pointer r, int inLength, Pointer originalKey);
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java
deleted file mode 100644
index ae631adb2b53..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CounterModeSubstitutions.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2019, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_INTRINSIC_CONTEXT;
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
-import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.aesCryptType;
-import static org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions.embeddedCipherOffset;
-import static org.graalvm.compiler.nodes.PiNode.piCastNonNull;
-import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.word.LocationIdentity;
-import org.graalvm.word.WordFactory;
-
-import jdk.vm.ci.meta.JavaKind;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-@ClassSubstitution(className = "com.sun.crypto.provider.CounterMode", optional = true)
-public class CounterModeSubstitutions {
-
-    @MethodSubstitution(isStatic = false)
-    static int implCrypt(Object receiver, byte[] in, int inOff, int len, byte[] out, int outOff) {
-        Object realReceiver = piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-
-            Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff));
-            Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff));
-            Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT)));
-
-            int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT);
-            int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT);
-            Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any());
-            Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any());
-
-            Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-            Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-            Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-
-            return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr);
-        } else {
-            return implCrypt(realReceiver, in, inOff, len, out, outOff);
-        }
-    }
-
-    static ResolvedJavaType counterModeType(IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getType(context, "Lcom/sun/crypto/provider/CounterMode;");
-    }
-
-    @Fold
-    static int counterOffset(@InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "counter");
-    }
-
-    @Fold
-    static int encCounterOffset(@InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "encryptedCounter");
-    }
-
-    @Fold
-    static int usedOffset(@InjectedParameter IntrinsicContext context) {
-        return HotSpotReplacementsUtil.getFieldOffset(counterModeType(context), "used");
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotArraySubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotArraySubstitutions.java
deleted file mode 100644
index c2b6dc9fae03..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotArraySubstitutions.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadKlassFromObject;
-
-import java.lang.reflect.Array;
-
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.nodes.java.DynamicNewArrayNode;
-
-// JaCoCo Exclude
-
-/**
- * Substitutions for {@link Array} methods.
- */
-@ClassSubstitution(Array.class)
-public class HotSpotArraySubstitutions {
-
-    @MethodSubstitution
-    public static Object newInstance(Class<?> componentType, int length) {
-        if (componentType == null || loadKlassFromObject(componentType, arrayKlassOffset(INJECTED_VMCONFIG), CLASS_ARRAY_KLASS_LOCATION).isNull()) {
-            // Exit the intrinsic here for the case where the array class does not exist
-            return newInstance(componentType, length);
-        }
-        return DynamicNewArrayNode.newArray(GraalDirectives.guardingNonNull(componentType), length);
-    }
-
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java
deleted file mode 100644
index 7dac09eda4de..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2012, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS;
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassComponentMirrorOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jvmAccIsHiddenClass;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassIsArray;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassModifierFlagsOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassSuperKlassOffset;
-
-import java.lang.reflect.Modifier;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaType;
-
-// JaCoCo Exclude
-
-/**
- * Substitutions for {@link java.lang.Class} methods.
- */
-@ClassSubstitution(Class.class)
-public class HotSpotClassSubstitutions {
-
-    @MethodSubstitution(isStatic = false)
-    public static int getModifiers(final Class<?> thisObj) {
-        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-        if (klass.isNull()) {
-            // Class for primitive type
-            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
-        } else {
-            return klass.readInt(klassModifierFlagsOffset(INJECTED_VMCONFIG), KLASS_MODIFIER_FLAGS_LOCATION);
-        }
-    }
-
-    @MethodSubstitution(isStatic = false)
-    public static boolean isInterface(final Class<?> thisObj) {
-        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-        if (klass.isNull()) {
-            // Class for primitive type
-            return false;
-        } else {
-            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-            return (accessFlags & Modifier.INTERFACE) != 0;
-        }
-    }
-
-    @MethodSubstitution(isStatic = false, optional = true)
-    public static boolean isHidden(final Class<?> thisObj) {
-        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-        if (klass.isNull()) {
-            // Class for primitive type
-            return false;
-        } else {
-            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-            return (accessFlags & (jvmAccIsHiddenClass(INJECTED_VMCONFIG))) != 0;
-        }
-    }
-
-    @Fold
-    public static ResolvedJavaType getObjectType(@Fold.InjectedParameter MetaAccessProvider metaAccesss) {
-        return metaAccesss.lookupJavaType(Object.class);
-    }
-
-    @MethodSubstitution(isStatic = false)
-    public static Class<?> getSuperclass(final Class<?> thisObj) {
-        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-        if (!klass.isNull()) {
-            KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
-            int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-            if ((accessFlags & Modifier.INTERFACE) == 0) {
-                if (klassIsArray(klassNonNull)) {
-                    return ConstantNode.forClass(getObjectType(INJECTED_METAACCESS));
-                } else {
-                    KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
-                    if (superKlass.isNull()) {
-                        return null;
-                    } else {
-                        KlassPointer superKlassNonNull = ClassGetHubNode.piCastNonNull(superKlass, SnippetAnchorNode.anchor());
-                        return HubGetClassNode.readClass(superKlassNonNull);
-                    }
-                }
-            }
-        } else {
-            // Class for primitive type
-        }
-        return null;
-    }
-
-    @MethodSubstitution(isStatic = false)
-    public static Class<?> getComponentType(final Class<?> thisObj) {
-        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-        if (!klass.isNull()) {
-            KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
-            if (klassIsArray(klassNonNull)) {
-                return PiNode.asNonNullClass(klassNonNull.readObject(arrayKlassComponentMirrorOffset(INJECTED_VMCONFIG), ARRAY_KLASS_COMPONENT_MIRROR));
-            }
-        } else {
-            // Class for primitive type
-        }
-        return null;
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
new file mode 100644
index 000000000000..d1ba3adf1c7b
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.hotspot.replacements;
+
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION;
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION;
+import static org.graalvm.word.LocationIdentity.any;
+
+import java.util.function.Function;
+
+import org.graalvm.compiler.core.common.type.ObjectStamp;
+import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.core.common.type.TypeReference;
+import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
+import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
+import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.PiNode;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.calc.IsNullNode;
+import org.graalvm.compiler.nodes.extended.GuardingNode;
+import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess.BarrierType;
+import org.graalvm.compiler.nodes.memory.ReadNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.type.StampTool;
+import org.graalvm.compiler.replacements.InvocationPluginHelper;
+import org.graalvm.word.LocationIdentity;
+
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+
+/**
+ * A helper class for generating mildly complex HotSpot specific plugins. It primarily adds helpers
+ * for correctly performing reads of HotSpot specific fields.
+ */
+public class HotSpotInvocationPluginHelper extends InvocationPluginHelper {
+
+    private final GraalHotSpotVMConfig config;
+
+    public HotSpotInvocationPluginHelper(GraphBuilderContext b, ResolvedJavaMethod targetMethod, GraalHotSpotVMConfig config) {
+        super(b, targetMethod);
+        this.config = config;
+    }
+
+    private Stamp getClassStamp(boolean nonNull) {
+        ResolvedJavaType toType = b.getMetaAccess().lookupJavaType(Class.class);
+        return StampFactory.object(TypeReference.createExactTrusted(toType), nonNull);
+    }
+
+    public ValueNode readKlass(ValueNode clazz) {
+        return b.add(ClassGetHubNode.create(clazz, b.getMetaAccess(), b.getConstantReflection()));
+    }
+
+    private ValueNode readLocation(ValueNode base, HotSpotVMConfigField field) {
+        return readLocation(base, field.getOffset(config), field.location, field.getStamp(getWordKind()), null);
+    }
+
+    private ValueNode readLocation(ValueNode base, HotSpotVMConfigField field, Stamp stamp) {
+        assert field.getStamp(getWordKind()) == null;
+        return readLocation(base, field.getOffset(config), field.location, stamp, null);
+    }
+
+    private ValueNode readLocation(ValueNode base, int offset, LocationIdentity location, Stamp stamp, GuardingNode guard) {
+        assert StampTool.isPointerNonNull(base) || base.stamp(NodeView.DEFAULT).getStackKind() == getWordKind() : "must be null guarded";
+        AddressNode address = makeOffsetAddress(base, asWord(offset));
+        ReadNode value = b.add(new ReadNode(address, location, stamp, BarrierType.NONE));
+        ValueNode returnValue = ReadNode.canonicalizeRead(value, value.getAddress(), value.getLocationIdentity(), b, NodeView.DEFAULT);
+        if (value != returnValue) {
+            // We could clean up the dead nodes here
+        } else {
+            if (guard != null) {
+                value.setGuard(guard);
+            }
+        }
+        return b.add(returnValue);
+    }
+
+    /**
+     * A field abstraction for fields of {@link GraalHotSpotVMConfig}.
+     */
+    enum HotSpotVMConfigField {
+        KLASS_MODIFIER_FLAGS_OFFSET(config -> config.klassModifierFlagsOffset, KLASS_MODIFIER_FLAGS_LOCATION, StampFactory.forKind(JavaKind.Int)),
+        KLASS_SUPER_KLASS_OFFSET(config -> config.klassSuperKlassOffset, KLASS_SUPER_KLASS_LOCATION, KlassPointerStamp.klass()),
+        CLASS_ARRAY_KLASS_OFFSET(config -> config.arrayKlassOffset, CLASS_ARRAY_KLASS_LOCATION, KlassPointerStamp.klassNonNull()),
+        OS_THREAD_INTERRUPTED_OFFSET(config -> config.osThreadInterruptedOffset, any(), StampFactory.forKind(JavaKind.Int)),
+        JAVA_THREAD_OSTHREAD_OFFSET(config -> config.osThreadOffset, JAVA_THREAD_OSTHREAD_LOCATION, true),
+        JAVA_THREAD_THREAD_OBJECT(config -> config.threadObjectOffset, JAVA_THREAD_THREAD_OBJECT_LOCATION, null),
+        KLASS_ACCESS_FLAGS_OFFSET(config -> config.klassAccessFlagsOffset, KLASS_ACCESS_FLAGS_LOCATION, StampFactory.forKind(JavaKind.Int)),
+        HOTSPOT_OOP_HANDLE_VALUE(config -> 0, HOTSPOT_OOP_HANDLE_LOCATION, StampFactory.forKind(JavaKind.Object));
+
+        private final Function<GraalHotSpotVMConfig, Integer> getter;
+        private final LocationIdentity location;
+
+        private final Stamp stamp;
+        private final boolean isWord;
+
+        HotSpotVMConfigField(Function<GraalHotSpotVMConfig, Integer> getter, LocationIdentity location, Stamp stamp) {
+            this.getter = getter;
+            this.location = location;
+            this.stamp = stamp;
+            this.isWord = false;
+        }
+
+        HotSpotVMConfigField(Function<GraalHotSpotVMConfig, Integer> getter, LocationIdentity location, boolean isWord) {
+            this.getter = getter;
+            this.location = location;
+            this.stamp = null;
+            this.isWord = isWord;
+            assert isWord;
+        }
+
+        public int getOffset(GraalHotSpotVMConfig config) {
+            return getter.apply(config);
+        }
+
+        public Stamp getStamp(JavaKind wordKind) {
+            if (isWord) {
+                return StampFactory.forKind(wordKind);
+            }
+            return stamp;
+        }
+
+    }
+
+    /**
+     * Read Klass::_modifier_flags.
+     */
+    public ValueNode readKlassModifierFlags(ValueNode klass) {
+        return readLocation(klass, HotSpotVMConfigField.KLASS_MODIFIER_FLAGS_OFFSET);
+    }
+
+    /**
+     * Read Klass::_access_flags.
+     */
+    public ValueNode readKlassAccessFlags(ValueNode klass) {
+        return readLocation(klass, HotSpotVMConfigField.KLASS_ACCESS_FLAGS_OFFSET);
+    }
+
+    /**
+     * Read Klass:_layout_helper.
+     */
+    public ValueNode klassLayoutHelper(ValueNode klass) {
+        return b.add(KlassLayoutHelperNode.create(config, klass, b.getConstantReflection(), b.getMetaAccess()));
+    }
+
+    /**
+     * Read ArrayKlass::_component_mirror.
+     */
+    public ValueNode readArrayKlassComponentMirror(ValueNode klass, GuardingNode guard) {
+        int offset = config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop");
+        Stamp stamp = getClassStamp(true);
+        return readLocation(klass, offset, ARRAY_KLASS_COMPONENT_MIRROR, stamp, guard);
+    }
+
+    /**
+     * Read Klass::_super.
+     */
+    public ValueNode readKlassSuperKlass(PiNode klassNonNull) {
+        return readLocation(klassNonNull, HotSpotVMConfigField.KLASS_SUPER_KLASS_OFFSET);
+    }
+
+    public PiNode emitNullReturnGuard(ValueNode klass, ValueNode returnValue, double probability) {
+        GuardingNode nonnullGuard = emitReturnIf(IsNullNode.create(klass), returnValue, probability);
+        return piCast(klass, nonnullGuard, KlassPointerStamp.klassNonNull());
+    }
+
+    /**
+     * Read the injected field java.lang.Class.array_klass.
+     */
+    public ValueNode loadArrayKlass(ValueNode componentType) {
+        return readLocation(componentType, HotSpotVMConfigField.CLASS_ARRAY_KLASS_OFFSET);
+    }
+
+    public ValueNode readCurrentThreadObject() {
+        return readCurrentThreadObject(b.add(new CurrentJavaThreadNode(getWordKind())));
+    }
+
+    public ValueNode readCurrentThreadObject(CurrentJavaThreadNode thread) {
+        // JavaThread::_threadObj is never compressed
+        ObjectStamp threadStamp = StampFactory.objectNonNull(TypeReference.create(b.getAssumptions(), b.getMetaAccess().lookupJavaType(Thread.class)));
+        Stamp fieldStamp = config.threadObjectFieldIsHandle ? StampFactory.forKind(getWordKind()) : threadStamp;
+        ValueNode value = readLocation(thread, HotSpotVMConfigField.JAVA_THREAD_THREAD_OBJECT, fieldStamp);
+        if (config.threadObjectFieldIsHandle) {
+            // Read the Object from the OopHandle
+            ValueNode handleOffset = ConstantNode.forIntegerKind(getWordKind(), 0, b.getGraph());
+            AddressNode handleAddress = b.add(new OffsetAddressNode(value, handleOffset));
+            value = b.add(new ReadNode(handleAddress, HOTSPOT_OOP_HANDLE_LOCATION, threadStamp, BarrierType.NONE));
+        }
+        return value;
+    }
+
+    public ValueNode readOsThread(CurrentJavaThreadNode thread) {
+        return readLocation(thread, HotSpotVMConfigField.JAVA_THREAD_OSTHREAD_OFFSET);
+    }
+
+    public ValueNode readOsThreadInterrupted(ValueNode osThread) {
+        return readLocation(osThread, HotSpotVMConfigField.OS_THREAD_INTERRUPTED_OFFSET);
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
index ef7d46718cc8..919ab65e0e22 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java
@@ -39,7 +39,6 @@
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
 import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodes.CanonicalizableLocation;
@@ -58,10 +57,10 @@
 import org.graalvm.compiler.nodes.memory.AddressableMemoryAccess;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.type.StampTool;
 import org.graalvm.compiler.replacements.ReplacementsUtil;
 import org.graalvm.compiler.replacements.nodes.ReadRegisterNode;
-import org.graalvm.compiler.replacements.nodes.WriteRegisterNode;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordFactory;
@@ -92,7 +91,7 @@ abstract static class HotSpotOptimizingLocationIdentity extends NamedLocationIde
         }
 
         @Override
-        public abstract ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool);
+        public abstract ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool);
 
         protected ValueNode findReadHub(ValueNode object) {
             ValueNode base = object;
@@ -145,7 +144,7 @@ public static ResolvedJavaType methodHolderClass(@InjectedParameter IntrinsicCon
     }
 
     @Fold
-    static ResolvedJavaType getType(@Fold.InjectedParameter IntrinsicContext context, String typeName) {
+    public static ResolvedJavaType getType(@Fold.InjectedParameter IntrinsicContext context, String typeName) {
         try {
             UnresolvedJavaType unresolved = UnresolvedJavaType.create(typeName);
             return unresolved.resolve(methodHolderClass(context));
@@ -159,7 +158,7 @@ public static int getFieldOffset(ResolvedJavaType type, String fieldName) {
         return getField(type, fieldName).getOffset();
     }
 
-    private static ResolvedJavaField getField(ResolvedJavaType type, String fieldName) {
+    public static ResolvedJavaField getField(ResolvedJavaType type, String fieldName) {
         for (ResolvedJavaField field : type.getInstanceFields(true)) {
             if (field.getName().equals(fieldName)) {
                 return field;
@@ -304,25 +303,8 @@ public static Object getPendingException(Word thread) {
      */
     public static final LocationIdentity JAVA_THREAD_THREAD_OBJECT_LOCATION = NamedLocationIdentity.immutable("JavaThread::_threadObj");
 
-    @Fold
-    public static int threadObjectOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.threadObjectOffset;
-    }
-
     public static final LocationIdentity JAVA_THREAD_OSTHREAD_LOCATION = NamedLocationIdentity.mutable("JavaThread::_osthread");
 
-    @Fold
-    public static int osThreadOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        assert config.osThreadOffset != Integer.MAX_VALUE;
-        return config.osThreadOffset;
-    }
-
-    @Fold
-    public static int osThreadInterruptedOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        assert config.osThreadInterruptedOffset != Integer.MAX_VALUE;
-        return config.osThreadInterruptedOffset;
-    }
-
     @Fold
     public static JavaKind getWordKind() {
         return runtime().getHostJVMCIBackend().getCodeCache().getTarget().wordJavaKind;
@@ -352,16 +334,6 @@ public static int klassAccessFlagsOffset(@InjectedParameter GraalHotSpotVMConfig
         return config.klassAccessFlagsOffset;
     }
 
-    @Fold
-    public static int jvmAccWrittenFlags(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.jvmAccWrittenFlags;
-    }
-
-    @Fold
-    public static int jvmAccIsHiddenClass(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.jvmAccIsHiddenClass;
-    }
-
     @Fold
     public static int jvmAccHasFinalizer(@InjectedParameter GraalHotSpotVMConfig config) {
         return config.jvmAccHasFinalizer;
@@ -369,7 +341,7 @@ public static int jvmAccHasFinalizer(@InjectedParameter GraalHotSpotVMConfig con
 
     public static final LocationIdentity KLASS_LAYOUT_HELPER_LOCATION = new HotSpotOptimizingLocationIdentity("Klass::_layout_helper") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             ValueNode javaObject = findReadHub(object);
             if (javaObject != null) {
                 if (javaObject.stamp(NodeView.DEFAULT) instanceof ObjectStamp) {
@@ -458,18 +430,8 @@ public static boolean klassIsArray(KlassPointer klassNonNull) {
 
     public static final LocationIdentity ARRAY_KLASS_COMPONENT_MIRROR = NamedLocationIdentity.immutable("ArrayKlass::_component_mirror");
 
-    @Fold
-    public static int arrayKlassComponentMirrorOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop");
-    }
-
     public static final LocationIdentity KLASS_SUPER_KLASS_LOCATION = NamedLocationIdentity.immutable("Klass::_super");
 
-    @Fold
-    public static int klassSuperKlassOffset(@InjectedParameter GraalHotSpotVMConfig config) {
-        return config.klassSuperKlassOffset;
-    }
-
     public static final LocationIdentity MARK_WORD_LOCATION = NamedLocationIdentity.mutable("MarkWord");
 
     @Fold
@@ -481,7 +443,7 @@ public static int markOffset(@InjectedParameter GraalHotSpotVMConfig config) {
 
     public static final LocationIdentity HUB_LOCATION = new HotSpotOptimizingLocationIdentity("Hub") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             TypeReference constantType = StampTool.typeReferenceOrNull(object);
             if (constantType != null && constantType.isExact()) {
                 return ConstantNode.forConstant(read.stamp(NodeView.DEFAULT), tool.getConstantReflection().asObjectHub(constantType.getType()), tool.getMetaAccess());
@@ -492,7 +454,7 @@ public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNod
 
     public static final LocationIdentity COMPRESSED_HUB_LOCATION = new HotSpotOptimizingLocationIdentity("CompressedHub") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             TypeReference constantType = StampTool.typeReferenceOrNull(object);
             if (constantType != null && constantType.isExact()) {
                 return ConstantNode.forConstant(read.stamp(NodeView.DEFAULT), ((HotSpotMetaspaceConstant) tool.getConstantReflection().asObjectHub(constantType.getType())).compress(),
@@ -792,9 +754,6 @@ public static Word registerAsWord(@ConstantNodeParameter Register register) {
     @NodeIntrinsic(value = ReadRegisterNode.class)
     public static native Word registerAsWord(@ConstantNodeParameter Register register, @ConstantNodeParameter boolean directUse, @ConstantNodeParameter boolean incoming);
 
-    @NodeIntrinsic(value = WriteRegisterNode.class)
-    public static native void writeRegisterAsWord(@ConstantNodeParameter Register register, Word value);
-
     @NodeIntrinsic(value = RawLoadNode.class)
     private static native Word loadWordFromObjectIntrinsic(Object object, long offset, @ConstantNodeParameter LocationIdentity locationIdentity, @ConstantNodeParameter JavaKind wordKind);
 
@@ -859,14 +818,14 @@ public static int klassModifierFlagsOffset(@InjectedParameter GraalHotSpotVMConf
 
     public static final LocationIdentity CLASS_KLASS_LOCATION = new HotSpotOptimizingLocationIdentity("Class._klass") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             return foldIndirection(read, object, CLASS_MIRROR_LOCATION);
         }
     };
 
     public static final LocationIdentity CLASS_ARRAY_KLASS_LOCATION = new HotSpotOptimizingLocationIdentity("Class._array_klass") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             return foldIndirection(read, object, ARRAY_KLASS_COMPONENT_MIRROR);
         }
     };
@@ -932,7 +891,7 @@ public static ResolvedJavaType referenceType(@InjectedParameter MetaAccessProvid
 
     public static final LocationIdentity OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION = new HotSpotOptimizingLocationIdentity("ObjArrayKlass::_element_klass") {
         @Override
-        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool) {
+        public ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CoreProviders tool) {
             ValueNode javaObject = findReadHub(object);
             if (javaObject != null) {
                 ResolvedJavaType type = StampTool.typeOrNull(javaObject);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java
deleted file mode 100644
index 178f8b84a1a1..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ReflectionSubstitutions.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jvmAccWrittenFlags;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset;
-
-import java.lang.reflect.Modifier;
-
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.hotspot.word.KlassPointer;
-
-/**
- * Substitutions for {@code sun.reflect.Reflection} methods.
- */
-@ClassSubstitution(className = {"jdk.internal.reflect.Reflection", "sun.reflect.Reflection"}, optional = true)
-public class ReflectionSubstitutions {
-
-    @MethodSubstitution
-    public static int getClassAccessFlags(Class<?> aClass) {
-        KlassPointer klass = ClassGetHubNode.readClass(GraalDirectives.guardingNonNull(aClass));
-        if (klass.isNull()) {
-            // Class for primitive type
-            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
-        } else {
-            return klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION) & jvmAccWrittenFlags(INJECTED_VMCONFIG);
-        }
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java
deleted file mode 100644
index ddf93e331c04..000000000000
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ThreadSubstitutions.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2012, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.hotspot.replacements;
-
-import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_THREAD_OBJECT_LOCATION;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.osThreadInterruptedOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.osThreadOffset;
-import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.threadObjectOffset;
-import static org.graalvm.word.LocationIdentity.any;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
-import org.graalvm.compiler.word.Word;
-
-/**
- * Substitutions for {@link java.lang.Thread} methods.
- */
-@ClassSubstitution(Thread.class)
-public class ThreadSubstitutions {
-
-    /**
-     * hidden in 9.
-     */
-    @MethodSubstitution(isStatic = false, optional = true)
-    public static boolean isInterrupted(final Thread thisObject, boolean clearInterrupted) {
-        Word javaThread = CurrentJavaThreadNode.get();
-        Object thread = javaThread.readObject(threadObjectOffset(INJECTED_VMCONFIG), JAVA_THREAD_THREAD_OBJECT_LOCATION);
-        if (thisObject == thread) {
-            Word osThread = javaThread.readWord(osThreadOffset(INJECTED_VMCONFIG), JAVA_THREAD_OSTHREAD_LOCATION);
-            boolean interrupted = osThread.readInt(osThreadInterruptedOffset(INJECTED_VMCONFIG), any()) != 0;
-            if (!interrupted || !clearInterrupted) {
-                return interrupted;
-            }
-        }
-        return isInterrupted(thisObject, clearInterrupted);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index 82fc408977ed..df74ebe747eb 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -408,6 +408,7 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPluginContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver;
 import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
@@ -494,7 +495,11 @@ public class BytecodeParser extends CoreProvidersDelegate implements GraphBuilde
     private boolean bciCanBeDuplicated = false;
 
     @Override
-    public FrameState getIntrinsicReturnState(JavaKind returnKind, ValueNode returnVal) {
+    public FrameState getInvocationPluginReturnState(JavaKind returnKind, ValueNode returnVal) {
+        if (parsingIntrinsic()) {
+            // Invocation plugins inside of snippets shouldn't produce a real FrameState
+            return graph.add(new FrameState(BytecodeFrame.AFTER_BCI));
+        }
         FrameStateBuilder frameStateBuilder = frameState;
         if (returnVal != null) {
             // Push the return value on the top of stack
@@ -510,6 +515,14 @@ public FrameState getIntrinsicReturnState(JavaKind returnKind, ValueNode returnV
         }
     }
 
+    @Override
+    public FrameState getInvocationPluginBeforeState() {
+        assert isParsingInvocationPlugin();
+        ResolvedJavaMethod callee = invocationPluginContext.targetMethod;
+        JavaKind[] argSlotKinds = callee.getSignature().toParameterKinds(!callee.isStatic());
+        return frameState.create(bci(), getNonIntrinsicAncestor(), false, argSlotKinds, invocationPluginContext.args);
+    }
+
     @Override
     public boolean canMergeIntrinsicReturns() {
         return true;
@@ -1790,6 +1803,8 @@ static class CurrentInvoke {
     protected final ConstantPool constantPool;
     protected final IntrinsicContext intrinsicContext;
 
+    protected InvocationPluginContext invocationPluginContext;
+
     @Override
     public InvokeKind getInvokeKind() {
         return currentInvoke == null ? null : currentInvoke.kind;
@@ -2190,13 +2205,58 @@ protected boolean tryInvocationPlugin(InvokeKind invokeKind, ValueNode[] args, R
         return false;
     }
 
+    class InvocationPluginScope implements DebugCloseable {
+        InvocationPluginScope(InvokeKind invokeKind, ValueNode[] args, ResolvedJavaMethod targetMethod, JavaKind resultType, InvocationPlugin plugin) {
+            assert invocationPluginContext == null;
+            invocationPluginContext = new InvocationPluginContext(invokeKind, args, targetMethod, resultType, plugin);
+        }
+
+        @Override
+        public void close() {
+            invocationPluginContext = null;
+        }
+    }
+
+    @Override
+    public Invoke invokeFallback(FixedWithNextNode predecessor, EndNode end) {
+        assert isParsingInvocationPlugin();
+        assert currentInvoke != null : "must be processing invoke";
+
+        FixedWithNextNode previousLastInstr = lastInstr;
+        lastInstr = predecessor;
+        InvokeKind invokeKind = invocationPluginContext.invokeKind;
+        ResolvedJavaMethod targetMethod = invocationPluginContext.targetMethod;
+        ValueNode[] args = invocationPluginContext.args;
+        int invokeBci = bci();
+        JavaTypeProfile profile = getProfileForInvoke(invokeKind);
+        // inlineInfo is null during application
+        ExceptionEdgeAction edgeAction = getActionForInvokeExceptionEdge(null);
+
+        int beforeDepth = getFrameStateBuilder().stackSize();
+        Invoke invoke = createNonInlinedInvoke(edgeAction, invokeBci, args, targetMethod, invokeKind, currentInvoke.returnType.getJavaKind(), currentInvoke.returnType, profile);
+        if (getFrameStateBuilder().stackSize() != beforeDepth) {
+            assert getFrameStateBuilder().stackSize() > beforeDepth : "only pushes expected";
+            getFrameStateBuilder().pop(currentInvoke.returnType.getJavaKind());
+        }
+        graph.getInliningLog().addDecision(invoke, false, "GraphBuilderPhase", null, null, "bytecode parser did not replace invoke");
+        invoke.setInlineControl(Invoke.InlineControl.BytecodesOnly);
+        lastInstr.setNext(end);
+        lastInstr = previousLastInstr;
+        return invoke;
+    }
+
+    @Override
+    public boolean isParsingInvocationPlugin() {
+        return invocationPluginContext != null;
+    }
+
     @SuppressWarnings("try")
     protected boolean applyInvocationPlugin(InvokeKind invokeKind, ValueNode[] args, ResolvedJavaMethod targetMethod, JavaKind resultType, InvocationPlugin plugin) {
         InvocationPluginReceiver pluginReceiver = invocationPluginReceiver.init(targetMethod, args);
         assert invokeKind.isDirect() : "Cannot apply invocation plugin on an indirect call site.";
 
         InvocationPluginAssertions assertions = Assertions.assertionsEnabled() ? new InvocationPluginAssertions(plugin, args, targetMethod, resultType) : null;
-        try (DebugCloseable context = openNodeContext(targetMethod)) {
+        try (DebugCloseable context = openNodeContext(targetMethod); InvocationPluginScope pluginScope = new InvocationPluginScope(invokeKind, args, targetMethod, resultType, plugin)) {
             Mark mark = graph.getMark();
             if (plugin.execute(this, targetMethod, pluginReceiver, args)) {
                 checkDeoptAfterPlugin(mark, targetMethod);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java
index 39a4de9a1301..becd2a74e232 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java
@@ -24,9 +24,9 @@
  */
 package org.graalvm.compiler.nodes;
 
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
 
 public interface CanonicalizableLocation {
-    ValueNode canonicalizeRead(ValueNode read, AddressNode location, ValueNode object, CanonicalizerTool tool);
+    ValueNode canonicalizeRead(ValueNode read, AddressNode address, ValueNode object, CoreProviders tool);
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java
index 7bf031683558..dfed035ef116 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphEncoder.java
@@ -189,22 +189,26 @@ public GraphEncoder(Architecture architecture, DebugContext debug) {
      * Must be invoked before {@link #finishPrepare()} and {@link #encode}.
      */
     public void prepare(StructuredGraph graph) {
-        objects.addObject(graph.getGuardsStage());
+        addObject(graph.getGuardsStage());
         for (Node node : graph.getNodes()) {
             NodeClass<? extends Node> nodeClass = node.getNodeClass();
             nodeClasses.addObject(nodeClass);
-            objects.addObject(node.getNodeSourcePosition());
+            addObject(node.getNodeSourcePosition());
             for (int i = 0; i < nodeClass.getData().getCount(); i++) {
                 if (!nodeClass.getData().getType(i).isPrimitive()) {
-                    objects.addObject(nodeClass.getData().get(node, i));
+                    addObject(nodeClass.getData().get(node, i));
                 }
             }
             if (node instanceof Invoke) {
-                objects.addObject(((Invoke) node).getContextType());
+                addObject(((Invoke) node).getContextType());
             }
         }
     }
 
+    protected void addObject(Object object) {
+        objects.addObject(object);
+    }
+
     public void finishPrepare() {
         objectsArray = objects.encodeAll(new Object[objects.getLength()]);
         nodeClassesArray = nodeClasses.encodeAll(new NodeClass<?>[nodeClasses.getLength()]);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 674c9d515032..0af1e5c6af03 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -43,7 +43,9 @@
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.DynamicPiNode;
+import org.graalvm.compiler.nodes.EndNode;
 import org.graalvm.compiler.nodes.FixedGuardNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.Invoke;
@@ -298,6 +300,8 @@ default boolean isPluginEnabled(GraphBuilderPlugin plugin) {
      */
     IntrinsicContext getIntrinsic();
 
+    boolean isParsingInvocationPlugin();
+
     BailoutException bailout(String string);
 
     default ValueNode nullCheckedValue(ValueNode value) {
@@ -309,6 +313,7 @@ default ValueNode nullCheckedValue(ValueNode value) {
      * since it might be checking a range of indexes for an operation on an array body.
      */
     default GuardingNode intrinsicRangeCheck(LogicNode condition, boolean negated) {
+        assert isParsingInvocationPlugin();
         if (needsExplicitException()) {
             return emitBytecodeExceptionCheck(condition, negated, BytecodeExceptionKind.INTRINSIC_OUT_OF_BOUNDS);
         } else {
@@ -386,10 +391,11 @@ default void genCheckcastDynamic(ValueNode object, ValueNode javaClass) {
      * {@link org.graalvm.compiler.nodes.MergeNode} to handle multiple return paths but not all
      * contexts can do this.
      *
-     * @return false if {@link #getIntrinsicReturnState(JavaKind, ValueNode)} cannot be called (i.e.
-     *         it unconditionally raises an error)
+     * @return false if {@link #getInvocationPluginReturnState(JavaKind, ValueNode)} cannot be
+     *         called (i.e. it unconditionally raises an error)
      */
     default boolean canMergeIntrinsicReturns() {
+        assert isParsingInvocationPlugin();
         return false;
     }
 
@@ -398,7 +404,15 @@ default boolean canMergeIntrinsicReturns() {
      * the top of stack. Usually this will be a state in the caller after the call site.
      */
     @SuppressWarnings("unused")
-    default FrameState getIntrinsicReturnState(JavaKind returnKind, ValueNode returnValue) {
+    default FrameState getInvocationPluginReturnState(JavaKind returnKind, ValueNode returnValue) {
+        throw new GraalError("Cannot be called on a " + getClass().getName() + " object");
+    }
+
+    /**
+     * Build a FrameState that represents the represents the state before an intrinsic was invoked.
+     */
+    @SuppressWarnings("all")
+    default FrameState getInvocationPluginBeforeState() {
         throw new GraalError("Cannot be called on a " + getClass().getName() + " object");
     }
 
@@ -410,6 +424,11 @@ default boolean disallowDeoptInPlugins() {
         return StrictDeoptInsertionChecks.getValue(getOptions());
     }
 
+    @SuppressWarnings("all")
+    default Invoke invokeFallback(FixedWithNextNode predecessor, EndNode end) {
+        throw new GraalError("Cannot be called on a " + getClass().getName() + " object");
+    }
+
     /**
      * Interface whose instances hold inlining information about the current context, in a wider
      * sense. The wider sense in this case concerns graph building approaches that don't necessarily
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
index 6515a300ea49..eb9a5e8a944b 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
@@ -24,6 +24,8 @@
  */
 package org.graalvm.compiler.nodes.graphbuilderconf;
 
+import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
+
 import java.lang.reflect.Method;
 
 import org.graalvm.compiler.debug.GraalError;
@@ -222,6 +224,9 @@ default String getSourceLocation() {
                 return String.format("%s.%s()", m.getClass().getName(), m.getName());
             }
         }
+        if (IS_IN_NATIVE_IMAGE) {
+            return String.format("%s.%s()", c.getName(), "apply");
+        }
         throw new GraalError("could not find method named \"apply\" or \"defaultHandler\" in " + c.getName());
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
similarity index 53%
rename from compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java
rename to compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
index 2c9dc8777d42..6702092bed53 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/LongSubstitutions.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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,31 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package org.graalvm.compiler.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
-import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
+import org.graalvm.compiler.nodes.CallTargetNode;
+import org.graalvm.compiler.nodes.ValueNode;
 
-// JaCoCo Exclude
+import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-@ClassSubstitution(Long.class)
-public class LongSubstitutions {
+public class InvocationPluginContext {
 
-    @MethodSubstitution
-    public static int numberOfLeadingZeros(long i) {
-        if (i == 0) {
-            return 64;
-        }
-        return 63 - BitScanReverseNode.unsafeScan(i);
-    }
+    public final CallTargetNode.InvokeKind invokeKind;
+    public final ValueNode[] args;
+    public final JavaKind resultType;
+    /**
+     * Plugin current being processed.
+     */
+    public final InvocationPlugin plugin;
+
+    /**
+     * Method being intrinsified.
+     */
+    public final ResolvedJavaMethod targetMethod;
 
-    @MethodSubstitution
-    public static int numberOfTrailingZeros(long i) {
-        if (i == 0) {
-            return 64;
-        }
-        return BitScanForwardNode.unsafeScan(i);
+    public InvocationPluginContext(CallTargetNode.InvokeKind invokeKind, ValueNode[] args, ResolvedJavaMethod targetMethod, JavaKind resultType, InvocationPlugin plugin) {
+        this.invokeKind = invokeKind;
+        this.args = args;
+        this.resultType = resultType;
+        this.plugin = plugin;
+        this.targetMethod = targetMethod;
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
index 65db5b58aaea..26dd36523176 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/ReadNode.java
@@ -34,8 +34,6 @@
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodeinfo.InputType;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.CanonicalizableLocation;
@@ -47,6 +45,9 @@
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.compiler.nodes.spi.Virtualizable;
 import org.graalvm.compiler.nodes.spi.VirtualizerTool;
@@ -54,6 +55,7 @@
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
 
 /**
@@ -109,16 +111,29 @@ public boolean isAllowedUsageType(InputType type) {
     }
 
     public static ValueNode canonicalizeRead(ValueNode read, AddressNode address, LocationIdentity locationIdentity, CanonicalizerTool tool) {
+        if (!tool.canonicalizeReads()) {
+            return read;
+        }
         NodeView view = NodeView.from(tool);
+        return canonicalizeRead(read, address, locationIdentity, tool, view);
+    }
+
+    public static ValueNode canonicalizeRead(ValueNode read, AddressNode address, LocationIdentity locationIdentity, CoreProviders tool, NodeView view) {
         MetaAccessProvider metaAccess = tool.getMetaAccess();
-        if (tool.canonicalizeReads() && address instanceof OffsetAddressNode) {
+        ConstantReflectionProvider constantReflection = tool.getConstantReflection();
+        return canonicalizeRead(read, address, locationIdentity, tool, view, metaAccess, constantReflection);
+    }
+
+    public static ValueNode canonicalizeRead(ValueNode read, AddressNode address, LocationIdentity locationIdentity, CoreProviders tool, NodeView view, MetaAccessProvider metaAccess,
+                    ConstantReflectionProvider constantReflection) {
+        if (address instanceof OffsetAddressNode) {
             OffsetAddressNode objAddress = (OffsetAddressNode) address;
             ValueNode object = objAddress.getBase();
             // Note: readConstant cannot be used to read the array length, so in order to avoid an
             // unnecessary CompilerToVM.readFieldValue call ending in an IllegalArgumentException,
             // check if we are reading the array length location first.
             if (locationIdentity.equals(ARRAY_LENGTH_LOCATION)) {
-                ValueNode length = GraphUtil.arrayLength(object, ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ, tool.getConstantReflection());
+                ValueNode length = GraphUtil.arrayLength(object, ArrayLengthProvider.FindLengthMode.CANONICALIZE_READ, constantReflection);
                 if (length != null) {
                     return length;
                 }
@@ -126,7 +141,7 @@ public static ValueNode canonicalizeRead(ValueNode read, AddressNode address, Lo
                 long displacement = objAddress.getOffset().asJavaConstant().asLong();
                 int stableDimension = ((ConstantNode) object).getStableDimension();
                 if (locationIdentity.isImmutable() || stableDimension > 0) {
-                    Constant constant = read.stamp(view).readConstant(tool.getConstantReflection().getMemoryAccessProvider(), object.asConstant(), displacement);
+                    Constant constant = read.stamp(view).readConstant(constantReflection.getMemoryAccessProvider(), object.asConstant(), displacement);
                     boolean isDefaultStable = locationIdentity.isImmutable() || ((ConstantNode) object).isDefaultStable();
                     if (constant != null && (isDefaultStable || !constant.isDefaultForKind())) {
                         return ConstantNode.forConstant(read.stamp(view), constant, Math.max(stableDimension - 1, 0), isDefaultStable, metaAccess);
diff --git a/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
index d2f281b42711..484cbc84bd4d 100644
--- a/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.replacements.aarch64;
 
+import static org.graalvm.compiler.replacements.ArrayIndexOf.STUB_INDEX_OF_1_CHAR_COMPACT;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
@@ -42,6 +43,8 @@
 import org.graalvm.compiler.nodes.calc.LeftShiftNode;
 import org.graalvm.compiler.nodes.calc.MaxNode;
 import org.graalvm.compiler.nodes.calc.MinNode;
+import org.graalvm.compiler.nodes.calc.NarrowNode;
+import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
 import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
@@ -53,6 +56,7 @@
 import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
 import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.replacements.ArrayIndexOfDispatchNode;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.StringLatin1IndexOfCharPlugin;
 import org.graalvm.compiler.replacements.StringLatin1Substitutions;
 import org.graalvm.compiler.replacements.StringUTF16Substitutions;
@@ -313,7 +317,15 @@ private static void registerStringUTF16Plugins(InvocationPlugins plugins, Replac
         r.register2("compareTo", byte[].class, byte[].class, new ArrayCompareToPlugin(JavaKind.Char, JavaKind.Char));
         r.register2("compareToLatin1", byte[].class, byte[].class, new ArrayCompareToPlugin(JavaKind.Char, JavaKind.Byte, true));
         r.registerMethodSubstitution(StringUTF16Substitutions.class, "indexOfUnsafe", byte[].class, int.class, byte[].class, int.class, int.class);
-        r.registerMethodSubstitution(StringUTF16Substitutions.class, "indexOfCharUnsafe", byte[].class, int.class, int.class, int.class);
+        r.register4("indexOfCharUnsafe", byte[].class, int.class, int.class, int.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value, ValueNode ch, ValueNode fromIndex, ValueNode max) {
+                ZeroExtendNode toChar = b.add(new ZeroExtendNode(b.add(new NarrowNode(ch, JavaKind.Char.getBitCount())), JavaKind.Int.getBitCount()));
+                b.addPush(JavaKind.Int, new ArrayIndexOfDispatchNode(STUB_INDEX_OF_1_CHAR_COMPACT, JavaKind.Byte, JavaKind.Char, false, value, max, fromIndex,
+                                toChar));
+                return true;
+            }
+        });
         Registration r2 = new Registration(plugins, StringUTF16Substitutions.class, replacements);
         r2.register2("getChar", byte[].class, int.class, new InvocationPlugin() {
             @Override
diff --git a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
index ddeacaf576ec..c5f597626d68 100644
--- a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -24,6 +24,7 @@
  */
 package org.graalvm.compiler.replacements.amd64;
 
+import static org.graalvm.compiler.replacements.ArrayIndexOf.STUB_INDEX_OF_1_CHAR_COMPACT;
 import static org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.STRING_VALUE_FIELD;
 import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW;
 import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
@@ -44,6 +45,8 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.CopySignNode;
 import org.graalvm.compiler.nodes.calc.LeftShiftNode;
+import org.graalvm.compiler.nodes.calc.NarrowNode;
+import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
 import org.graalvm.compiler.nodes.extended.JavaReadNode;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
@@ -56,6 +59,7 @@
 import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
 import org.graalvm.compiler.nodes.spi.Replacements;
 import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.replacements.ArrayIndexOfDispatchNode;
 import org.graalvm.compiler.replacements.InvocationPluginHelper;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
 import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.StringLatin1IndexOfCharPlugin;
@@ -66,6 +70,8 @@
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
 import org.graalvm.compiler.replacements.nodes.BitCountNode;
+import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
+import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
 import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
@@ -90,8 +96,8 @@ public static void register(Plugins plugins, Replacements replacements, AMD64 ar
             @Override
             public void run() {
                 registerThreadPlugins(invocationPlugins, arch);
-                registerIntegerLongPlugins(invocationPlugins, AMD64IntegerSubstitutions.class, JavaKind.Int, arch, replacements);
-                registerIntegerLongPlugins(invocationPlugins, AMD64LongSubstitutions.class, JavaKind.Long, arch, replacements);
+                registerIntegerLongPlugins(invocationPlugins, JavaKind.Int, arch, replacements);
+                registerIntegerLongPlugins(invocationPlugins, JavaKind.Long, arch, replacements);
                 if (GraalOptions.EmitStringSubstitutions.getValue(options)) {
                     if (JavaVersionUtil.JAVA_SPEC <= 8) {
                         registerStringPlugins(invocationPlugins, replacements);
@@ -121,12 +127,60 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         }
     }
 
-    private static void registerIntegerLongPlugins(InvocationPlugins plugins, Class<?> substituteDeclaringClass, JavaKind kind, AMD64 arch, Replacements replacements) {
+    private static void registerIntegerLongPlugins(InvocationPlugins plugins, JavaKind kind, AMD64 arch, Replacements replacements) {
         Class<?> declaringClass = kind.toBoxedJavaClass();
         Class<?> type = kind.toJavaClass();
         Registration r = new Registration(plugins, declaringClass, replacements);
-        r.registerMethodSubstitution(substituteDeclaringClass, "numberOfLeadingZeros", type);
-        r.registerMethodSubstitution(substituteDeclaringClass, "numberOfTrailingZeros", type);
+        r.register1("numberOfLeadingZeros", type, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
+                // @formatter:off
+                //    public static int numberOfLeadingZeros(int i) {
+                //        if (lzcnt(INJECTED_TARGET)) {
+                //            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
+                //        }
+                //        if (i == 0) {
+                //            return 32;
+                //        }
+                //        return 31 - BitScanReverseNode.unsafeScan(i);
+                //    }
+                // @formatter:on
+                if (arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction)) {
+                    b.addPush(JavaKind.Int, new AMD64CountLeadingZerosNode(arg));
+                } else {
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        helper.emitReturnIf(arg, Condition.EQ, ConstantNode.forIntegerKind(kind, 0), ConstantNode.forInt(kind.getBitCount()), GraalDirectives.UNLIKELY_PROBABILITY);
+                        helper.emitFinalReturn(JavaKind.Int, helper.sub(ConstantNode.forInt(kind.getBitCount() - 1), new BitScanReverseNode(arg)));
+                    }
+                }
+                return true;
+            }
+        });
+        r.register1("numberOfTrailingZeros", type, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
+                // @formatter:off
+                //    public static int numberOfTrailingZeros(int i) {
+                //        if (tzcnt(INJECTED_TARGET)) {
+                //            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
+                //        }
+                //        if (i == 0) {
+                //            return 32;
+                //        }
+                //        return BitScanForwardNode.unsafeScan(i);
+                //    }
+                // @formatter:on
+                if (arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction)) {
+                    b.addPush(JavaKind.Int, new AMD64CountTrailingZerosNode(arg));
+                } else {
+                    try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        helper.emitReturnIf(arg, Condition.EQ, ConstantNode.forIntegerKind(kind, 0), ConstantNode.forInt(kind.getBitCount()), GraalDirectives.UNLIKELY_PROBABILITY);
+                        helper.emitFinalReturn(JavaKind.Int, b.add(new BitScanForwardNode(arg)));
+                    }
+                }
+                return true;
+            }
+        });
 
         r.registerConditional1(arch.getFeatures().contains(AMD64.CPUFeature.POPCNT),
                         "bitCount", type, new InvocationPlugin() {
@@ -465,7 +519,15 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
         r.registerMethodSubstitution(StringUTF16Substitutions.class, "indexOfUnsafe", byte[].class, int.class, byte[].class, int.class, int.class);
         r.registerMethodSubstitution(StringUTF16Substitutions.class, "indexOfLatin1Unsafe", byte[].class, int.class, byte[].class, int.class, int.class);
-        r.registerMethodSubstitution(StringUTF16Substitutions.class, "indexOfCharUnsafe", byte[].class, int.class, int.class, int.class);
+        r.register4("indexOfCharUnsafe", byte[].class, int.class, int.class, int.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value, ValueNode ch, ValueNode fromIndex, ValueNode max) {
+                ZeroExtendNode toChar = b.add(new ZeroExtendNode(b.add(new NarrowNode(ch, JavaKind.Char.getBitCount())), JavaKind.Int.getBitCount()));
+                b.addPush(JavaKind.Int, new ArrayIndexOfDispatchNode(STUB_INDEX_OF_1_CHAR_COMPACT, JavaKind.Byte, JavaKind.Char, false, value, max, fromIndex,
+                                toChar));
+                return true;
+            }
+        });
         Registration r2 = new Registration(plugins, StringUTF16Substitutions.class, replacements);
         r2.register2("getChar", byte[].class, int.class, new InvocationPlugin() {
             @Override
diff --git a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
deleted file mode 100644
index 6318e7494adc..000000000000
--- a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64IntegerSubstitutions.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.replacements.amd64;
-
-import static org.graalvm.compiler.replacements.NodeIntrinsificationProvider.INJECTED_TARGET;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
-import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
-
-import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.code.TargetDescription;
-
-@ClassSubstitution(Integer.class)
-public class AMD64IntegerSubstitutions {
-
-    @Fold
-    static boolean lzcnt(@Fold.InjectedParameter TargetDescription target) {
-        AMD64 arch = (AMD64) target.arch;
-        return arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction);
-    }
-
-    @Fold
-    static boolean tzcnt(@Fold.InjectedParameter TargetDescription target) {
-        AMD64 arch = (AMD64) target.arch;
-        return arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction);
-    }
-
-    @MethodSubstitution
-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
-    public static int numberOfLeadingZeros(int i) {
-        if (lzcnt(INJECTED_TARGET)) {
-            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
-        }
-        if (i == 0) {
-            return 32;
-        }
-        return 31 - BitScanReverseNode.unsafeScan(i);
-    }
-
-    @MethodSubstitution
-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
-    public static int numberOfTrailingZeros(int i) {
-        if (tzcnt(INJECTED_TARGET)) {
-            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
-        }
-        if (i == 0) {
-            return 32;
-        }
-        return BitScanForwardNode.unsafeScan(i);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
deleted file mode 100644
index a1d5126138b9..000000000000
--- a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64LongSubstitutions.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2019, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.replacements.amd64;
-
-// JaCoCo Exclude
-
-import static org.graalvm.compiler.replacements.NodeIntrinsificationProvider.INJECTED_TARGET;
-import static org.graalvm.compiler.replacements.amd64.AMD64IntegerSubstitutions.lzcnt;
-import static org.graalvm.compiler.replacements.amd64.AMD64IntegerSubstitutions.tzcnt;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
-import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
-
-@ClassSubstitution(Long.class)
-public class AMD64LongSubstitutions {
-
-    @MethodSubstitution
-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
-    public static int numberOfLeadingZeros(long i) {
-        if (lzcnt(INJECTED_TARGET)) {
-            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
-        }
-        if (i == 0) {
-            return 64;
-        }
-        return 63 - BitScanReverseNode.unsafeScan(i);
-    }
-
-    @MethodSubstitution
-    @SuppressFBWarnings(value = "NP_NULL_PARAM_DEREF_NONVIRTUAL", justification = "foldable method parameters are injected")
-    public static int numberOfTrailingZeros(long i) {
-        if (tzcnt(INJECTED_TARGET)) {
-            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
-        }
-
-        if (i == 0) {
-            return 64;
-        }
-        return BitScanForwardNode.unsafeScan(i);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java
index 6d317cecead1..5c8b5f56ffb6 100644
--- a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java
+++ b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java
@@ -37,7 +37,6 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
 import org.graalvm.compiler.word.Word;
 import org.graalvm.compiler.word.WordCastNode;
 import org.junit.Assert;
@@ -45,6 +44,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
@@ -253,13 +253,12 @@ public static Result fieldOffsetMergeSnippet03(Result objResult, Result a, Resul
     @Override
     protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
         Registration r = new Registration(invocationPlugins, DerivedOopTest.class);
-        ClassfileBytecodeProvider bytecodeProvider = getSystemClassLoaderBytecodeProvider();
-
-        ResolvedJavaMethod intrinsic = getResolvedJavaMethod("getRawPointerIntrinsic");
         r.register1("getRawPointer", Object.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
-                return b.intrinsify(bytecodeProvider, targetMethod, intrinsic, receiver, new ValueNode[]{arg});
+                WordCastNode objectToTracked = b.add(WordCastNode.objectToTrackedPointer(arg, getReplacements().getWordKind()));
+                b.addPush(JavaKind.Long, objectToTracked);
+                return true;
             }
         });
         super.registerInvocationPlugins(invocationPlugins);
diff --git a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java
index e2ca0a9f1639..e4ecdb7f8b79 100644
--- a/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java
+++ b/compiler/src/org.graalvm.compiler.replacements.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.replacements.test;
 
 import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.debug.GraalError;
@@ -35,9 +34,10 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
 import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.word.Word;
+import org.graalvm.compiler.word.WordCastNode;
 import org.junit.Test;
 
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public class PointerTrackingTest extends ReplacementsTest implements Snippets {
@@ -111,30 +111,24 @@ static long getUntrackedPointer(@SuppressWarnings("unused") Object obj) {
         throw GraalError.shouldNotReachHere("should be intrinsified");
     }
 
-    static long getTrackedPointerIntrinsic(Object obj) {
-        return Word.objectToTrackedPointer(obj).rawValue();
-    }
-
-    static long getUntrackedPointerIntrinsic(Object obj) {
-        return Word.objectToUntrackedPointer(obj).rawValue();
-    }
-
-    private void register(Registration r, String fnName) {
-        ResolvedJavaMethod intrinsic = getResolvedJavaMethod(fnName + "Intrinsic");
-        BytecodeProvider bytecodeProvider = getSystemClassLoaderBytecodeProvider();
-        r.register1(fnName, Object.class, new InvocationPlugin() {
+    @Override
+    protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
+        Registration r = new Registration(invocationPlugins, PointerTrackingTest.class);
+        r.register1("getTrackedPointer", Object.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
-                return b.intrinsify(bytecodeProvider, targetMethod, intrinsic, receiver, new ValueNode[]{arg});
+                WordCastNode objectToTracked = b.add(WordCastNode.objectToTrackedPointer(arg, getReplacements().getWordKind()));
+                b.addPush(JavaKind.Long, objectToTracked);
+                return true;
+            }
+        });
+        r.register1("getUntrackedPointer", Object.class, new InvocationPlugin() {
+            @Override
+            public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
+                WordCastNode objectToTracked = b.add(WordCastNode.objectToUntrackedPointer(arg, getReplacements().getWordKind()));
+                b.addPush(JavaKind.Long, objectToTracked);
+                return true;
             }
         });
-    }
-
-    @Override
-    protected void registerInvocationPlugins(InvocationPlugins invocationPlugins) {
-        Registration r = new Registration(invocationPlugins, PointerTrackingTest.class);
-
-        register(r, "getTrackedPointer");
-        register(r, "getUntrackedPointer");
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java
deleted file mode 100644
index 3274061db711..000000000000
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntegerSubstitutions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2012, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.replacements;
-
-import org.graalvm.compiler.api.replacements.ClassSubstitution;
-import org.graalvm.compiler.api.replacements.MethodSubstitution;
-import org.graalvm.compiler.replacements.nodes.BitScanForwardNode;
-import org.graalvm.compiler.replacements.nodes.BitScanReverseNode;
-
-@ClassSubstitution(Integer.class)
-public class IntegerSubstitutions {
-
-    @MethodSubstitution
-    public static int numberOfLeadingZeros(int i) {
-        if (i == 0) {
-            return 32;
-        }
-        return 31 - BitScanReverseNode.unsafeScan(i);
-    }
-
-    @MethodSubstitution
-    public static int numberOfTrailingZeros(int i) {
-        if (i == 0) {
-            return 32;
-        }
-        return BitScanForwardNode.unsafeScan(i);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
index c3bf9559a205..3c1531038a42 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
@@ -41,6 +41,8 @@
 import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.CallTargetNode;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
+import org.graalvm.compiler.nodes.EndNode;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.FrameState;
@@ -59,12 +61,15 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
 import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
 import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
 import org.graalvm.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.BailoutException;
+import jdk.vm.ci.meta.DeoptimizationAction;
+import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -84,6 +89,7 @@ public class IntrinsicGraphBuilder extends CoreProvidersDelegate implements Grap
     protected FixedWithNextNode lastInstr;
     protected ValueNode[] arguments;
     protected ValueNode returnValue;
+    private boolean parsingIntrinsic;
 
     private FrameState createStateAfterStartOfReplacementGraph(ResolvedJavaMethod original, GraphBuilderConfiguration graphBuilderConfig) {
         FrameStateBuilder startFrameState = new FrameStateBuilder(this, code, graph, graphBuilderConfig.retainLocalVariables());
@@ -303,7 +309,7 @@ public int getDepth() {
 
     @Override
     public boolean parsingIntrinsic() {
-        return true;
+        return parsingIntrinsic;
     }
 
     @Override
@@ -322,7 +328,8 @@ public ValueNode get(boolean performNullCheck) {
     }
 
     @SuppressWarnings("try")
-    public StructuredGraph buildGraph(InvocationPlugin plugin) {
+    public final StructuredGraph buildGraph(InvocationPlugin plugin) {
+        parsingIntrinsic = plugin instanceof MethodSubstitutionPlugin;
         // The caller is expected to have filtered out decorator plugins since they cannot be
         // processed without special handling.
         assert !plugin.isDecorator() : plugin;
@@ -345,10 +352,15 @@ public StructuredGraph buildGraph(InvocationPlugin plugin) {
     }
 
     @Override
-    public FrameState getIntrinsicReturnState(JavaKind returnKind, ValueNode retVal) {
+    public FrameState getInvocationPluginReturnState(JavaKind returnKind, ValueNode retVal) {
         return getGraph().add(new FrameState(AFTER_BCI));
     }
 
+    @Override
+    public FrameState getInvocationPluginBeforeState() {
+        return getGraph().start().stateAfter();
+    }
+
     @Override
     public boolean canMergeIntrinsicReturns() {
         return true;
@@ -364,6 +376,19 @@ public boolean intrinsify(ResolvedJavaMethod targetMethod, StructuredGraph subst
         return false;
     }
 
+    @Override
+    public boolean isParsingInvocationPlugin() {
+        return true;
+    }
+
+    @Override
+    public Invoke invokeFallback(FixedWithNextNode predecessor, EndNode end) {
+        assert isParsingInvocationPlugin();
+        DeoptimizeNode deopt = getGraph().add(new DeoptimizeNode(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint));
+        predecessor.setNext(deopt);
+        return null;
+    }
+
     @Override
     public String toString() {
         return String.format("%s:intrinsic", method.format("%H.%n(%p)"));
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
index 8b59e56f0b0c..887978e3187f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
@@ -24,10 +24,13 @@
  */
 package org.graalvm.compiler.replacements;
 
+import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
+
 import java.util.ArrayList;
 
 import org.graalvm.compiler.core.common.calc.CanonicalCondition;
 import org.graalvm.compiler.core.common.calc.Condition;
+import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.GraalError;
@@ -36,12 +39,14 @@
 import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
 import org.graalvm.compiler.nodes.FixedNode;
+import org.graalvm.compiler.nodes.FixedWithNextNode;
 import org.graalvm.compiler.nodes.IfNode;
+import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.LogicNode;
 import org.graalvm.compiler.nodes.MergeNode;
 import org.graalvm.compiler.nodes.NodeView;
+import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.ProfileData;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.ValuePhiNode;
@@ -60,13 +65,15 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.compiler.nodes.java.ArrayLengthNode;
 import org.graalvm.compiler.nodes.java.LoadFieldNode;
+import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
+import org.graalvm.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.code.CodeUtil;
-import jdk.vm.ci.meta.DeoptimizationAction;
-import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * This is a helper class for writing moderately complex
@@ -99,13 +106,14 @@
  */
 public class InvocationPluginHelper implements DebugCloseable {
     protected final GraphBuilderContext b;
-    protected final JavaKind wordKind;
+    private final JavaKind wordKind;
     private final JavaKind returnKind;
     private final ArrayList<ReturnData> returns = new ArrayList<>();
     private boolean emittedReturn;
+    private FixedWithNextNode fallbackEntry;
 
     public ValueNode arraylength(ValueNode receiverValue) {
-        // assert StampTool.isPointerAlwaysNull(receiverValue);
+        assert StampTool.isPointerNonNull(receiverValue);
         return b.add(new ArrayLengthNode(receiverValue));
     }
 
@@ -116,6 +124,14 @@ public void close() {
         }
     }
 
+    public JavaKind getWordKind() {
+        return wordKind;
+    }
+
+    public PiNode piCast(ValueNode value, GuardingNode nonnullGuard, Stamp stamp) {
+        return b.add(new PiNode(value, stamp, nonnullGuard.asNode()));
+    }
+
     static class ReturnData {
         final EndNode end;
         final ValueNode returnValue;
@@ -166,10 +182,13 @@ public ValueNode sub(ValueNode x, ValueNode y) {
     }
 
     public ValueNode length(ValueNode x) {
+        assert StampTool.typeOrNull(x) != null && StampTool.typeOrNull(x).isArray() : x.stamp(NodeView.DEFAULT);
         return b.add(new ArrayLengthNode(x));
     }
 
     public ValueNode arrayElementPointer(ValueNode array, JavaKind kind, ValueNode index) {
+        assert StampTool.typeOrNull(array) != null && StampTool.typeOrNull(array).isArray() : array.stamp(NodeView.DEFAULT);
+        assert StampTool.typeOrNull(array).getComponentType().getJavaKind() == kind : array.stamp(NodeView.DEFAULT);
         int arrayBaseOffset = b.getMetaAccess().getArrayBaseOffset(kind);
         ValueNode offset = ConstantNode.forInt(arrayBaseOffset);
         if (index != null) {
@@ -179,11 +198,32 @@ public ValueNode arrayElementPointer(ValueNode array, JavaKind kind, ValueNode i
         return b.add(new ComputeObjectAddressNode(array, asWord(offset)));
     }
 
+    /**
+     * Returns the address of the first element of an array.
+     */
+    public ValueNode arrayStart(ValueNode array, JavaKind kind) {
+        return arrayElementPointer(array, kind, null);
+    }
+
+    /**
+     * Shift {@code index} by the proper amount based on the element kind.
+     */
     public ValueNode scale(ValueNode index, JavaKind kind) {
         int arrayIndexShift = CodeUtil.log2(b.getMetaAccess().getArrayIndexScale(kind));
         return shl(index, arrayIndexShift);
     }
 
+    /**
+     * Build an {@link OffsetAddressNode} ensuring that the offset is also converted to a
+     * {@link org.graalvm.compiler.word.Word Word}.
+     */
+    public AddressNode makeOffsetAddress(ValueNode base, ValueNode offset) {
+        return b.add(new OffsetAddressNode(base, asWord(offset)));
+    }
+
+    /**
+     * Ensure a primitive type is word sized.
+     */
     public ValueNode asWord(ValueNode index) {
         assert index.getStackKind().isPrimitive();
         if (index.getStackKind() != wordKind) {
@@ -192,6 +232,10 @@ public ValueNode asWord(ValueNode index) {
         return index;
     }
 
+    public ValueNode asWord(long index) {
+        return ConstantNode.forIntegerKind(wordKind, index);
+    }
+
     private LogicNode createCompare(ValueNode origX, ValueNode origY, Condition.CanonicalizedCondition canonicalizedCondition) {
         // Check whether the condition needs to mirror the operands.
         ValueNode x = origX;
@@ -225,12 +269,35 @@ public ValueNode loadField(ValueNode value, ResolvedJavaField field) {
                         b.getOptions(), b.getAssumptions(), value, field, false, false));
     }
 
-    public void guard(ValueNode origX, Condition condition, ValueNode origY, DeoptimizationAction action, DeoptimizationReason deoptReason) {
-        Condition.CanonicalizedCondition canonicalizedCondition = condition.canonicalize();
-        LogicNode compare = createCompare(origX, origY, canonicalizedCondition);
-        b.add(new FixedGuardNode(compare, deoptReason, action, !canonicalizedCondition.mustNegate()));
+    /**
+     * Lookup a Java field by name.
+     *
+     * @throws GraalError if the field isn't found.
+     */
+    public ResolvedJavaField getField(ResolvedJavaType type, String fieldName) {
+        for (ResolvedJavaField field : type.getInstanceFields(true)) {
+            if (field.getName().equals(fieldName)) {
+                return field;
+            }
+        }
+        throw new GraalError("missing field " + fieldName + " in type " + type);
+    }
+
+    /**
+     * Get the offset of a field. Normally InvocationPlugins are run in the target VM so nothing
+     * special needs to be done to handle these offsets but if a
+     * {@link org.graalvm.compiler.api.replacements.Snippet Snippet} even triggers a plugin that
+     * uses a field offset them some extra machinery will be needed to delay the lookup.
+     */
+    public ValueNode getFieldOffset(ResolvedJavaType type, String fieldName) {
+        assert !IS_BUILDING_NATIVE_IMAGE || !b.parsingIntrinsic() : "these values must be deferred in substitutions and snippets";
+        return ConstantNode.forInt(getField(type, fieldName).getOffset());
     }
 
+    /**
+     * Perform a range check for an intrinsic. This is a range check that represents a hard error in
+     * the intrinsic so it's permissible to throw an exception directly for this case.
+     */
     public GuardingNode intrinsicRangeCheck(ValueNode x, Condition condition, ValueNode y) {
         Condition.CanonicalizedCondition canonicalizedCondition = condition.canonicalize();
         LogicNode compare = createCompare(x, y, canonicalizedCondition);
@@ -262,7 +329,7 @@ public AbstractBeginNode emitReturnIf(LogicNode condition, boolean negated, Valu
         EndNode end = b.getGraph().add(new EndNode());
         trueSuccessor.setNext(end);
         addReturnValue(end, returnKind, returnValue);
-        ProfileData.BranchProbabilityData probability = ProfileData.BranchProbabilityData.injected(returnProbability, true);
+        ProfileData.BranchProbabilityData probability = ProfileData.BranchProbabilityData.injected(returnProbability, negated);
         IfNode node = new IfNode(condition, negated ? null : trueSuccessor, negated ? trueSuccessor : null, probability);
         IfNode ifNode = b.append(node);
         BeginNode otherSuccessor = b.append(new BeginNode());
@@ -280,31 +347,34 @@ public void emitFinalReturn(JavaKind kind, ValueNode origReturnValue) {
         if (returnValue.isUnregistered()) {
             returnValue = b.append(returnValue);
         }
-        EndNode end = b.append(new EndNode());
-        addReturnValue(end, kind, returnValue);
 
-        MergeNode returnMerge = b.append(new MergeNode());
-        ValuePhiNode returnPhi = null;
-        if (returnKind != JavaKind.Void) {
-            returnPhi = b.add(new ValuePhiNode(StampFactory.forKind(returnKind), returnMerge));
-        }
-        returnMerge.setStateAfter(b.getIntrinsicReturnState(kind, returnPhi));
-        for (ReturnData r : returns) {
-            returnMerge.addForwardEnd(r.end);
-            if (returnPhi != null) {
-                returnPhi.addInput(r.returnValue);
-            } else {
-                assert r.returnValue == null;
+        if (returns.size() > 0) {
+            EndNode end = b.append(new EndNode());
+            addReturnValue(end, kind, returnValue);
+            MergeNode returnMerge = b.append(new MergeNode());
+            ValuePhiNode returnPhi = null;
+            if (returnKind != JavaKind.Void) {
+                returnPhi = b.add(new ValuePhiNode(StampFactory.forKind(returnKind), returnMerge));
+            }
+            returnMerge.setStateAfter(b.getInvocationPluginReturnState(kind, returnPhi));
+            for (ReturnData r : returns) {
+                returnMerge.addForwardEnd(r.end);
+                if (returnPhi != null) {
+                    returnPhi.addInput(r.returnValue);
+                } else {
+                    assert r.returnValue == null;
+                }
             }
+            returnValue = returnPhi.singleValueOrThis();
         }
-        b.addPush(returnKind, returnPhi);
+        b.addPush(returnKind, returnValue);
         emittedReturn = true;
     }
 
     /**
      * Connect an {@link EndNode} and return value into the final control flow merge.
      */
-    private void addReturnValue(EndNode end, JavaKind kind, ValueNode returnValueInput) {
+    protected void addReturnValue(EndNode end, JavaKind kind, ValueNode returnValueInput) {
         assert b.canMergeIntrinsicReturns();
         ValueNode returnValue = returnValueInput;
         if (returnValue.isUnregistered()) {
@@ -312,7 +382,71 @@ private void addReturnValue(EndNode end, JavaKind kind, ValueNode returnValueInp
             returnValue = b.add(returnValue);
         }
         assert !returnValue.isUnregistered() : returnValue;
-        assert kind == returnKind;
+        assert kind == returnKind : "mismatch in return kind";
         returns.add(new ReturnData(end, returnValue));
     }
+
+    /**
+     * Create a branch to the fallback path, building an {@link MergeNode} if necessary.
+     */
+    private BeginNode branchToFallback() {
+        if (fallbackEntry == null) {
+            BeginNode fallbackSuccessor = b.getGraph().add(new BeginNode());
+            EndNode end = b.getGraph().add(new EndNode());
+            Invoke invoke = b.invokeFallback(fallbackSuccessor, end);
+            if (invoke != null) {
+                fallbackEntry = fallbackSuccessor;
+                addReturnValue(end, returnKind, returnKind == JavaKind.Void ? null : invoke.asNode());
+            } else {
+                assert end.predecessor() == null;
+                end.safeDelete();
+            }
+            return fallbackSuccessor;
+        }
+        // Multiple paths lead to the fallback, so upgrade it to a MergeNode
+        if (!(fallbackEntry instanceof MergeNode)) {
+            assert fallbackEntry instanceof BeginNode;
+            BeginNode begin = (BeginNode) fallbackEntry;
+            FixedNode next = begin.next();
+            EndNode end = b.getGraph().add(new EndNode());
+            begin.setNext(end);
+            MergeNode merge = b.getGraph().add(new MergeNode());
+            merge.addForwardEnd(end);
+            merge.setNext(next);
+            fallbackEntry = merge;
+            merge.setStateAfter(b.getInvocationPluginBeforeState());
+        }
+        MergeNode fallbackMerge = (MergeNode) fallbackEntry;
+        BeginNode fallbackSuccessor = b.getGraph().add(new BeginNode());
+        EndNode end = b.getGraph().add(new EndNode());
+        fallbackSuccessor.setNext(end);
+        fallbackMerge.addForwardEnd(end);
+        return fallbackSuccessor;
+    }
+
+    public GuardingNode doFallbackIf(ValueNode x, Condition condition, ValueNode y, double returnProbability) {
+        Condition.CanonicalizedCondition canonicalizedCondition = condition.canonicalize();
+        LogicNode compare = createCompare(x, y, canonicalizedCondition);
+        return doFallbackIf(compare, canonicalizedCondition.mustNegate(), returnProbability);
+    }
+
+    /**
+     * Fallback to the original implementation based on the {@code condition}. Depending on the
+     * environment the fallback may be done through a
+     * {@link org.graalvm.compiler.nodes.DeoptimizeNode DeoptimizeNode} or through a real
+     * {@link Invoke}.
+     */
+    public GuardingNode doFallbackIf(LogicNode condition, boolean negated, double probability) {
+        BeginNode fallbackSuccessor = branchToFallback();
+        ProfileData.BranchProbabilityData probabilityData = ProfileData.BranchProbabilityData.injected(probability, negated);
+        IfNode node = new IfNode(condition, negated ? null : fallbackSuccessor, negated ? fallbackSuccessor : null, probabilityData);
+        IfNode ifNode = b.append(node);
+        BeginNode fallThroughSuccessor = b.append(new BeginNode());
+        if (negated) {
+            ifNode.setTrueSuccessor(fallThroughSuccessor);
+        } else {
+            ifNode.setFalseSuccessor(fallThroughSuccessor);
+        }
+        return fallThroughSuccessor;
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 9bf4c2381dcf..290c58b0c74d 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -350,6 +350,11 @@ public boolean needsExplicitException() {
             return needsExplicitException;
         }
 
+        @Override
+        public boolean isParsingInvocationPlugin() {
+            throw GraalError.shouldNotReachHere();
+        }
+
         /**
          * {@link Fold} and {@link NodeIntrinsic} can be deferred during parsing/decoding. Only by
          * the end of {@linkplain SnippetTemplate#instantiate Snippet instantiation} do they need to
@@ -484,16 +489,23 @@ protected class PEAppendGraphBuilderContext extends PENonAppendGraphBuilderConte
         protected boolean exceptionEdgeConsumed;
         protected final InvokeKind invokeKind;
         protected final JavaType invokeReturnType;
+        protected final boolean parsingInvocationPlugin;
 
         public PEAppendGraphBuilderContext(PEMethodScope inlineScope, FixedWithNextNode lastInstr) {
-            this(inlineScope, lastInstr, null, null);
+            this(inlineScope, lastInstr, null, null, false);
         }
 
-        public PEAppendGraphBuilderContext(PEMethodScope inlineScope, FixedWithNextNode lastInstr, InvokeKind invokeKind, JavaType invokeReturnType) {
+        public PEAppendGraphBuilderContext(PEMethodScope inlineScope, FixedWithNextNode lastInstr, InvokeKind invokeKind, JavaType invokeReturnType, boolean parsingInvocationPlugin) {
             super(inlineScope, inlineScope.invokeData != null ? inlineScope.invokeData.invoke : null);
             this.lastInstr = lastInstr;
             this.invokeKind = invokeKind;
             this.invokeReturnType = invokeReturnType;
+            this.parsingInvocationPlugin = parsingInvocationPlugin;
+        }
+
+        @Override
+        public boolean isParsingInvocationPlugin() {
+            return parsingInvocationPlugin;
         }
 
         @Override
@@ -1047,7 +1059,7 @@ protected boolean tryInvocationPlugin(PEMethodScope methodScope, LoopScope loopS
             PEMethodScope inlineScope = createMethodScope(graph, methodScope, loopScope, null, targetMethod, invokeData, methodScope.inliningDepth + 1, arguments);
 
             JavaType returnType = targetMethod.getSignature().getReturnType(methodScope.method.getDeclaringClass());
-            PEAppendGraphBuilderContext graphBuilderContext = new PEAppendGraphBuilderContext(inlineScope, invokePredecessor, callTarget.invokeKind(), returnType);
+            PEAppendGraphBuilderContext graphBuilderContext = new PEAppendGraphBuilderContext(inlineScope, invokePredecessor, callTarget.invokeKind(), returnType, true);
             InvocationPluginReceiver invocationPluginReceiver = new InvocationPluginReceiver(graphBuilderContext);
 
             if (invocationPlugin.execute(graphBuilderContext, targetMethod, invocationPluginReceiver.init(targetMethod, arguments), arguments)) {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index 9637b67cdcb2..ee022546f828 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -273,6 +273,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         if (JavaVersionUtil.JAVA_SPEC <= 8) {
             Registration sr = new Registration(plugins, StringSubstitutions.class);
             sr.register1("getValue", String.class, new InvocationPlugin() {
+                @Override
+                public boolean inlineOnly() {
+                    return true;
+                }
+
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
                     ResolvedJavaField field = b.getMetaAccess().lookupJavaField(STRING_VALUE_FIELD);
@@ -308,6 +313,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
             Registration sr = new Registration(plugins, JDK9StringSubstitutions.class);
             sr.register1("getValue", String.class, new InvocationPlugin() {
+                @Override
+                public boolean inlineOnly() {
+                    return true;
+                }
+
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
                     ResolvedJavaField field = b.getMetaAccess().lookupJavaField(STRING_VALUE_FIELD);
@@ -318,6 +328,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 }
             });
             sr.register1("getCoder", String.class, new InvocationPlugin() {
+                @Override
+                public boolean inlineOnly() {
+                    return true;
+                }
+
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
                     ResolvedJavaField field = b.getMetaAccess().lookupJavaField(STRING_CODER_FIELD);
@@ -327,6 +342,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 }
             });
             sr.register2("getByte", byte[].class, int.class, new InvocationPlugin() {
+                @Override
+                public boolean inlineOnly() {
+                    return true;
+                }
+
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg1, ValueNode arg2) {
                     b.addPush(JavaKind.Byte, new JavaReadNode(JavaKind.Byte,
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java
index ae3d8589f741..0cb10b1a46a4 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StringUTF16Substitutions.java
@@ -73,11 +73,6 @@ private static Word charOffsetPointer(byte[] value, int offset) {
      */
     private static native char getChar(byte[] value, int i);
 
-    @MethodSubstitution
-    public static int indexOfCharUnsafe(byte[] value, int ch, int fromIndex, int max) {
-        return ArrayIndexOf.indexOf1CharCompact(value, max, fromIndex, (char) ch);
-    }
-
     @MethodSubstitution
     public static int indexOfUnsafe(byte[] source, int sourceCount, byte[] target, int targetCount, int fromIndex) {
         ReplacementsUtil.dynamicAssert(fromIndex >= 0, "StringUTF16.indexOfUnsafe invalid args: fromIndex negative");
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
index 935ebbf04767..5a0836569007 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
@@ -79,7 +79,7 @@ private FrameState getFrameState(ValueNode returnVal) {
     }
 
     @Override
-    public FrameState getIntrinsicReturnState(JavaKind returnKind, ValueNode retVal) {
+    public FrameState getInvocationPluginReturnState(JavaKind returnKind, ValueNode retVal) {
         return getFrameState(retVal);
     }
 

From dedaedcf0e08e3a87035f55d871b1cfe8a6a2d19 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Mon, 18 Oct 2021 10:44:27 -0700
Subject: [PATCH 575/681] Review comments from String invocation plugin PR

---
 .../src/org/graalvm/compiler/java/BytecodeParser.java |  2 +-
 .../nodes/graphbuilderconf/GraphBuilderContext.java   |  6 +++---
 .../replacements/DefaultJavaLoweringProvider.java     |  2 +-
 .../oracle/svm/core/snippets/ImplicitExceptions.java  | 11 -----------
 .../svm/hosted/phases/HostedGraphBuilderPhase.java    |  2 +-
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index df74ebe747eb..78e3645a2f00 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -2276,7 +2276,7 @@ private boolean checkDeoptAfterPlugin(Mark mark, ResolvedJavaMethod targetMethod
         if (!needsExplicitException()) {
             return true;
         }
-        if (StrictDeoptInsertionChecks.getValue(getOptions()) || (Assertions.assertionsEnabled() && disallowDeoptInPlugins())) {
+        if (StrictDeoptInsertionChecks.getValue(getOptions()) || (Assertions.assertionsEnabled() && !allowDeoptInPlugins())) {
             for (Node node : graph.getNewNodes(mark)) {
                 if (node instanceof FixedGuardNode || node instanceof DeoptimizeNode) {
                     throw new AssertionError("node " + node + " may not be used by plugin in graphs with explicit exceptions for " + targetMethod);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 0af1e5c6af03..58afb2c10ab6 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -417,11 +417,11 @@ default FrameState getInvocationPluginBeforeState() {
     }
 
     /**
-     * When this returns true, the parser will report an error if an {@link InvocationPlugin}
+     * When this returns false, the parser will report an error if an {@link InvocationPlugin}
      * inserts a {@link org.graalvm.compiler.nodes.DeoptimizeNode} or {@link FixedGuardNode}.
      */
-    default boolean disallowDeoptInPlugins() {
-        return StrictDeoptInsertionChecks.getValue(getOptions());
+    default boolean allowDeoptInPlugins() {
+        return !StrictDeoptInsertionChecks.getValue(getOptions());
     }
 
     @SuppressWarnings("all")
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
index 1c69da41509f..4f6bca46b658 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -318,7 +318,7 @@ public void lower(Node n, LoweringTool tool) {
 
     private static void lowerComputeObjectAddressNode(ComputeObjectAddressNode n) {
         /*
-         * Lower the node into a ComputeObjectAddress node and an Add but ensure that it's below any
+         * Lower the node into a GetObjectAddressNode node and an Add but ensure that it's below any
          * potential safepoints and above it's uses.
          */
         for (Node use : n.usages().snapshot()) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
index 0d77e718dcc5..8cc2f0420ada 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
@@ -221,17 +221,6 @@ private static void throwNewIntrinsicOutOfBoundsException() {
         throw new ArrayIndexOutOfBoundsException();
     }
 
-    /** Foreign call: {@link #THROW_NEW_INTRINSIC_OUT_OF_BOUNDS_EXCEPTION}. */
-    @SubstrateForeignCallTarget(stubCallingConvention = true)
-    private static void throwNewIntrinsicOutOfBoundsExceptionWithArgs(int index, int length) {
-        vmErrorIfImplicitExceptionsAreFatal();
-        /*
-         * JDK 11 added the length to the error message, we can do that for all Java versions to be
-         * consistent.
-         */
-        throw new ArrayIndexOutOfBoundsException("Index " + index + " out of bounds for length " + length);
-    }
-
     /** Foreign call: {@link #THROW_NEW_OUT_OF_BOUNDS_EXCEPTION_WITH_ARGS}. */
     @SubstrateForeignCallTarget(stubCallingConvention = true)
     private static void throwNewOutOfBoundsExceptionWithArgs(int index, int length) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
index bb44db0e02fd..db05e96f5d4b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
@@ -108,7 +108,7 @@ protected boolean stampFromValueForForcedPhis() {
     }
 
     @Override
-    public boolean disallowDeoptInPlugins() {
+    public boolean allowDeoptInPlugins() {
         return false;
     }
 

From 808a7b9aedd0453ed1c39970e46bb6a6c725c8c8 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Tue, 19 Oct 2021 11:55:28 -0700
Subject: [PATCH 576/681] Fix return value of CBC stub calls and improve names

---
 .../compiler/hotspot/HotSpotBackend.java      | 19 ++++++++--------
 .../meta/HotSpotGraphBuilderPlugins.java      | 22 +++++++------------
 .../meta/HotSpotHostForeignCallsProvider.java | 16 +++++++-------
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
index acd7faf3205f..f0882b3d327f 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
@@ -149,26 +149,26 @@ public static class Options {
     /**
      * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.AESCryptPlugin
      */
-    public static final HotSpotForeignCallDescriptor ENCRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt_block",
-                    void.class, Word.class, Word.class, Pointer.class);
+    public static final HotSpotForeignCallDescriptor AESCRYPT_ENCRYPTBLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte),
+                    "aescrypt_encryptBlock", void.class, Word.class, Word.class, Pointer.class);
 
     /**
      * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.AESCryptPlugin
      */
-    public static final HotSpotForeignCallDescriptor DECRYPT_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt_block",
-                    void.class, Word.class, Word.class, Pointer.class);
+    public static final HotSpotForeignCallDescriptor AESCRYPT_DECRYPTBLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte),
+                    "aescrypt_decryptBlock", void.class, Word.class, Word.class, Pointer.class);
 
     /**
      * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.CipherBlockChainingCryptPlugin
      */
-    public static final HotSpotForeignCallDescriptor ENCRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "encrypt", void.class,
-                    Word.class, Word.class, Pointer.class, Pointer.class, int.class);
+    public static final HotSpotForeignCallDescriptor CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE,
+                    NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "cipherBlockChaining_encrypt_aescrypt", int.class, Word.class, Word.class, Pointer.class, Pointer.class, int.class);
 
     /**
      * @see org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins.CipherBlockChainingCryptPlugin
      */
-    public static final HotSpotForeignCallDescriptor DECRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "decrypt", void.class,
-                    Word.class, Word.class, Pointer.class, Pointer.class, int.class);
+    public static final HotSpotForeignCallDescriptor CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE,
+                    NamedLocationIdentity.getArrayLocation(JavaKind.Byte), "cipherBlockChaining_decrypt_aescrypt", int.class, Word.class, Word.class, Pointer.class, Pointer.class, int.class);
 
     /**
      * @see BigIntegerSubstitutions#multiplyToLen
@@ -264,8 +264,7 @@ public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) {
      * Descriptor for {@code StubRoutines::_counterMode_AESCrypt}.
      */
     public static final HotSpotForeignCallDescriptor COUNTERMODE_IMPL_CRYPT = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "counterModeAESCrypt", int.class,
-                    Word.class, Word.class, Word.class, Word.class, int.class,
-                    Word.class, Word.class);
+                    Word.class, Word.class, Word.class, Word.class, int.class, Word.class, Word.class);
 
     /**
      * Descriptor for {@code StubRoutines::_vectorizedMismatch}.
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 1150a84dccf0..44ec72e0f153 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -29,13 +29,13 @@
 import static org.graalvm.compiler.core.common.calc.Condition.LT;
 import static org.graalvm.compiler.core.common.calc.Condition.NE;
 import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigAccess.JDK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.AESCRYPT_DECRYPTBLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.AESCRYPT_ENCRYPTBLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.CRC_TABLE_LOCATION;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C;
@@ -952,13 +952,9 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 ValueNode rAddr = helper.arrayElementPointer(r, JavaKind.Byte, null);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
                 ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
-                HotSpotForeignCallDescriptor descriptor = doEncrypt ? ENCRYPT : DECRYPT;
-                ForeignCallNode call = new ForeignCallNode(descriptor, inAddr, outAddr, kAddr, rAddr, inLength);
-                b.append(call);
-                b.addPush(JavaKind.Int, inLength);
-                b.setStateAfter(call);
-                b.pop(JavaKind.Int);
-                helper.emitFinalReturn(JavaKind.Int, inLength);
+                HotSpotForeignCallDescriptor descriptor = doEncrypt ? CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT : CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT;
+                ForeignCallNode call = b.add(new ForeignCallNode(descriptor, inAddr, outAddr, kAddr, rAddr, inLength));
+                helper.emitFinalReturn(JavaKind.Int, call);
             }
             return true;
         }
@@ -1266,9 +1262,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
 
                 ValueNode usedPtr = b.add(new ComputeObjectAddressNode(nonNullReceiver, helper.asWord(helper.getFieldOffset(targetMethod.getDeclaringClass(), "used"))));
-                ForeignCallNode call = b.append(new ForeignCallNode(COUNTERMODE_IMPL_CRYPT, inAddr, outAddr, kAddr, counterAddr, len, encryptedCounterAddr, usedPtr));
-                b.addPush(JavaKind.Int, call);
-                b.pop(JavaKind.Int);
+                ForeignCallNode call = b.add(new ForeignCallNode(COUNTERMODE_IMPL_CRYPT, inAddr, outAddr, kAddr, counterAddr, len, encryptedCounterAddr, usedPtr));
                 helper.emitFinalReturn(JavaKind.Int, call);
             }
             return true;
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index d4b91c2edc1a..d2baba3ebc61 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -27,12 +27,12 @@
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
 import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_DREM;
 import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_FREM;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.AESCRYPT_DECRYPTBLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.AESCRYPT_ENCRYPTBLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT;
+import static org.graalvm.compiler.hotspot.HotSpotBackend.CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.COUNTERMODE_IMPL_CRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
-import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.GHASH_PROCESS_BLOCKS;
 import static org.graalvm.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER;
@@ -566,8 +566,8 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
              */
             try {
                 // These stubs do callee saving
-                registerForeignCall(ENCRYPT_BLOCK, c.aescryptEncryptBlockStub, NativeCall);
-                registerForeignCall(DECRYPT_BLOCK, c.aescryptDecryptBlockStub, NativeCall);
+                registerForeignCall(AESCRYPT_ENCRYPTBLOCK, c.aescryptEncryptBlockStub, NativeCall);
+                registerForeignCall(AESCRYPT_DECRYPTBLOCK, c.aescryptDecryptBlockStub, NativeCall);
             } catch (GraalError e) {
                 if (!(e.getCause() instanceof ClassNotFoundException)) {
                     throw e;
@@ -575,8 +575,8 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
             }
             try {
                 // These stubs do callee saving
-                registerForeignCall(ENCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall);
-                registerForeignCall(DECRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall);
+                registerForeignCall(CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT, c.cipherBlockChainingEncryptAESCryptStub, NativeCall);
+                registerForeignCall(CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT, c.cipherBlockChainingDecryptAESCryptStub, NativeCall);
             } catch (GraalError e) {
                 if (!(e.getCause() instanceof ClassNotFoundException)) {
                     throw e;

From 74a82722b28407c8fda5f770fe16aa6d17ace115 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Tue, 19 Oct 2021 11:55:37 -0700
Subject: [PATCH 577/681] Use arrayStart where possible

---
 .../hotspot/meta/HotSpotGraphBuilderPlugins.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 44ec72e0f153..847321812548 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -857,10 +857,10 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
                 ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
                 ValueNode k = b.nullCheckedValue(helper.loadField(nonNullReceiver, kField));
-                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
+                ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
                 ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
-                HotSpotForeignCallDescriptor descriptor = doEncrypt ? ENCRYPT_BLOCK : DECRYPT_BLOCK;
+                HotSpotForeignCallDescriptor descriptor = doEncrypt ? AESCRYPT_ENCRYPTBLOCK : AESCRYPT_DECRYPTBLOCK;
                 b.add(new ForeignCallNode(descriptor, inAddr, outAddr, kAddr));
             }
             return true;
@@ -948,8 +948,8 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
                 ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
                 ValueNode r = b.nullCheckedValue(helper.loadField(nonNullReceiver, rField));
-                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
-                ValueNode rAddr = helper.arrayElementPointer(r, JavaKind.Byte, null);
+                ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
+                ValueNode rAddr = helper.arrayStart(r, JavaKind.Byte);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
                 ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
                 HotSpotForeignCallDescriptor descriptor = doEncrypt ? CIPHER_BLOCK_CHAINING_ENCRYPT_AESCRYPT : CIPHER_BLOCK_CHAINING_DECRYPT_AESCRYPT;
@@ -1255,11 +1255,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
                 ResolvedJavaField counterField = helper.getField(targetMethod.getDeclaringClass(), "counter");
                 ValueNode counter = helper.loadField(nonNullReceiver, counterField);
-                ValueNode counterAddr = helper.arrayElementPointer(counter, JavaKind.Byte, null);
+                ValueNode counterAddr = helper.arrayStart(counter, JavaKind.Byte);
                 ResolvedJavaField encryptedCounterField = helper.getField(targetMethod.getDeclaringClass(), "encryptedCounter");
                 ValueNode encryptedCounter = helper.loadField(nonNullReceiver, encryptedCounterField);
-                ValueNode encryptedCounterAddr = helper.arrayElementPointer(encryptedCounter, JavaKind.Byte, null);
-                ValueNode kAddr = helper.arrayElementPointer(k, JavaKind.Int, null);
+                ValueNode encryptedCounterAddr = helper.arrayStart(encryptedCounter, JavaKind.Byte);
+                ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
 
                 ValueNode usedPtr = b.add(new ComputeObjectAddressNode(nonNullReceiver, helper.asWord(helper.getFieldOffset(targetMethod.getDeclaringClass(), "used"))));
                 ForeignCallNode call = b.add(new ForeignCallNode(COUNTERMODE_IMPL_CRYPT, inAddr, outAddr, kAddr, counterAddr, len, encryptedCounterAddr, usedPtr));

From 747b82f087c80a59ba45e511bad242454ca6b281 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Tue, 19 Oct 2021 12:13:01 -0700
Subject: [PATCH 578/681] Cleanup some other uses of setStateAfter

---
 .../compiler/hotspot/HotSpotBackend.java      |  9 +++----
 .../meta/HotSpotGraphBuilderPlugins.java      | 24 +++++++++----------
 .../StandardGraphBuilderPlugins.java          |  2 +-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
index f0882b3d327f..7e644b843e7c 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotBackend.java
@@ -185,19 +185,16 @@ public static void multiplyToLenStub(Word xAddr, int xlen, Word yAddr, int ylen,
     private static native void multiplyToLenStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word xIn, int xLen, Word yIn, int yLen, Word zIn, int zLen);
 
     public static final HotSpotForeignCallDescriptor MUL_ADD = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), "mulAdd",
-                    int.class,
-                    Word.class, Word.class, int.class, int.class, int.class);
+                    int.class, Word.class, Word.class, int.class, int.class, int.class);
 
     public static final HotSpotForeignCallDescriptor MONTGOMERY_MULTIPLY = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int),
-                    "implMontgomeryMultiply", void.class, Word.class, Word.class, Word.class, int.class, long.class,
-                    Word.class);
+                    "implMontgomeryMultiply", void.class, Word.class, Word.class, Word.class, int.class, long.class, Word.class);
 
     public static final HotSpotForeignCallDescriptor MONTGOMERY_SQUARE = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int),
                     "implMontgomerySquare", void.class, Word.class, Word.class, int.class, long.class, Word.class);
 
     public static final HotSpotForeignCallDescriptor SQUARE_TO_LEN = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int),
-                    "implSquareToLen",
-                    void.class, Word.class, int.class, Word.class, int.class);
+                    "implSquareToLen", void.class, Word.class, int.class, Word.class, int.class);
 
     public static final HotSpotForeignCallDescriptor SHA_IMPL_COMPRESS = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "shaImplCompress", void.class, Word.class,
                     Object.class);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 847321812548..38fd16b8fdb5 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -1025,7 +1025,6 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                         ValueNode newOffset = new SubNode(outNonNullLength, offset);
                         ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MUL_ADD, helper.arrayStart(outNonNull, JavaKind.Int), helper.arrayStart(in, JavaKind.Int), newOffset, len, k);
                         b.addPush(JavaKind.Int, call);
-                        b.setStateAfter(call);
                     }
                     return true;
                 }
@@ -1042,12 +1041,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode a, ValueNode bObject, ValueNode n, ValueNode len, ValueNode inv,
                                 ValueNode product) {
                     try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
-                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_MULTIPLY, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(bObject, JavaKind.Int),
-                                        helper.arrayStart(n, JavaKind.Int), len, inv,
-                                        helper.arrayStart(product, JavaKind.Int));
-                        b.add(call);
+                        // The stub doesn't return the right value for the intrinsic so push it here
+                        // and the proper after FrameState will be put on ForeignCallNode by add.
                         b.addPush(JavaKind.Object, product);
-                        b.setStateAfter(call);
+                        b.add(new ForeignCallNode(HotSpotBackend.MONTGOMERY_MULTIPLY, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(bObject, JavaKind.Int),
+                                        helper.arrayStart(n, JavaKind.Int), len, inv, helper.arrayStart(product, JavaKind.Int)));
                     }
                     return true;
                 }
@@ -1061,11 +1059,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode a, ValueNode n, ValueNode len, ValueNode inv, ValueNode product) {
                     try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
-                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.MONTGOMERY_SQUARE, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(n, JavaKind.Int), len, inv,
-                                        helper.arrayStart(product, JavaKind.Int));
-                        b.add(call);
+                        // The stub doesn't return the right value for the intrinsic so push it here
+                        // and the proper after FrameState will be put on ForeignCallNode by add.
                         b.addPush(JavaKind.Object, product);
-                        b.setStateAfter(call);
+                        b.add(new ForeignCallNode(HotSpotBackend.MONTGOMERY_SQUARE, helper.arrayStart(a, JavaKind.Int), helper.arrayStart(n, JavaKind.Int), len, inv,
+                                        helper.arrayStart(product, JavaKind.Int)));
                     }
                     return true;
                 }
@@ -1079,10 +1077,10 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode len, ValueNode z, ValueNode zlen) {
                     try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
-                        ForeignCallNode call = new ForeignCallNode(HotSpotBackend.SQUARE_TO_LEN, helper.arrayStart(x, JavaKind.Int), len, helper.arrayStart(z, JavaKind.Int), zlen);
-                        b.add(call);
+                        // The stub doesn't return the right value for the intrinsic so push it here
+                        // and the proper after FrameState will be put on ForeignCallNode by add.
                         b.addPush(JavaKind.Object, z);
-                        b.setStateAfter(call);
+                        b.add(new ForeignCallNode(HotSpotBackend.SQUARE_TO_LEN, helper.arrayStart(x, JavaKind.Int), len, helper.arrayStart(z, JavaKind.Int), zlen));
                     }
                     return true;
                 }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index ee022546f828..4ecf2db8308c 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -1008,7 +1008,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                     if (RegisterFinalizerNode.mayHaveFinalizer(object, b.getMetaAccess(), b.getAssumptions())) {
                         RegisterFinalizerNode regFin = new RegisterFinalizerNode(object);
                         b.add(regFin);
-                        b.setStateAfter(regFin);
+                        assert regFin.stateAfter() != null;
                     }
                     return true;
                 }

From e2501aaea5f0058649565552e614f1cab85baaa8 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Wed, 20 Oct 2021 22:47:02 -0700
Subject: [PATCH 579/681] Review comments

---
 .../meta/HotSpotGraphBuilderPlugins.java      |  5 +-
 .../HotSpotInvocationPluginHelper.java        | 21 ++++---
 .../replacements/InvocationPluginHelper.java  | 59 +++++++++----------
 .../replacements/nodes/ArrayEqualsNode.java   | 32 ----------
 .../nodes/BitScanForwardNode.java             | 20 +------
 .../nodes/BitScanReverseNode.java             | 20 +------
 6 files changed, 44 insertions(+), 113 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 38fd16b8fdb5..55212ca70a28 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -451,8 +451,8 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                         ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
                         ValueNode nonNullKlass = helper.emitNullReturnGuard(klass, ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
                         ValueNode accessFlags = helper.readKlassAccessFlags(nonNullKlass);
-                        LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(config.jvmAccIsHiddenClass), NodeView.DEFAULT));
-                        helper.emitFinalReturn(JavaKind.Boolean, b.add(ConditionalNode.create(test, ConstantNode.forInt(0), ConstantNode.forInt(1), NodeView.DEFAULT)));
+                        LogicNode test = IntegerTestNode.create(accessFlags, ConstantNode.forInt(config.jvmAccIsHiddenClass), NodeView.DEFAULT);
+                        helper.emitFinalReturn(JavaKind.Boolean, ConditionalNode.create(test, ConstantNode.forBoolean(false), ConstantNode.forBoolean(true), NodeView.DEFAULT));
                     }
                     return true;
                 }
@@ -797,6 +797,7 @@ public static boolean isIntrinsicName(GraalHotSpotVMConfig config, String classN
         return false;
     }
 
+    // Fully qualified name is a workaround for JDK-8056066
     public static class AESCryptPlugin implements org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin {
         private final boolean doEncrypt;
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
index d1ba3adf1c7b..d0abbd1b468a 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
@@ -109,14 +109,14 @@ private ValueNode readLocation(ValueNode base, int offset, LocationIdentity loca
     }
 
     /**
-     * A field abstraction for fields of {@link GraalHotSpotVMConfig}.
+     * An abstraction for fields of {@link GraalHotSpotVMConfig}.
      */
     enum HotSpotVMConfigField {
         KLASS_MODIFIER_FLAGS_OFFSET(config -> config.klassModifierFlagsOffset, KLASS_MODIFIER_FLAGS_LOCATION, StampFactory.forKind(JavaKind.Int)),
         KLASS_SUPER_KLASS_OFFSET(config -> config.klassSuperKlassOffset, KLASS_SUPER_KLASS_LOCATION, KlassPointerStamp.klass()),
         CLASS_ARRAY_KLASS_OFFSET(config -> config.arrayKlassOffset, CLASS_ARRAY_KLASS_LOCATION, KlassPointerStamp.klassNonNull()),
         OS_THREAD_INTERRUPTED_OFFSET(config -> config.osThreadInterruptedOffset, any(), StampFactory.forKind(JavaKind.Int)),
-        JAVA_THREAD_OSTHREAD_OFFSET(config -> config.osThreadOffset, JAVA_THREAD_OSTHREAD_LOCATION, true),
+        JAVA_THREAD_OSTHREAD_OFFSET(config -> config.osThreadOffset, JAVA_THREAD_OSTHREAD_LOCATION),
         JAVA_THREAD_THREAD_OBJECT(config -> config.threadObjectOffset, JAVA_THREAD_THREAD_OBJECT_LOCATION, null),
         KLASS_ACCESS_FLAGS_OFFSET(config -> config.klassAccessFlagsOffset, KLASS_ACCESS_FLAGS_LOCATION, StampFactory.forKind(JavaKind.Int)),
         HOTSPOT_OOP_HANDLE_VALUE(config -> 0, HOTSPOT_OOP_HANDLE_LOCATION, StampFactory.forKind(JavaKind.Object));
@@ -134,12 +134,11 @@ enum HotSpotVMConfigField {
             this.isWord = false;
         }
 
-        HotSpotVMConfigField(Function<GraalHotSpotVMConfig, Integer> getter, LocationIdentity location, boolean isWord) {
+        HotSpotVMConfigField(Function<GraalHotSpotVMConfig, Integer> getter, LocationIdentity location) {
             this.getter = getter;
             this.location = location;
             this.stamp = null;
-            this.isWord = isWord;
-            assert isWord;
+            this.isWord = true;
         }
 
         public int getOffset(GraalHotSpotVMConfig config) {
@@ -156,28 +155,28 @@ public Stamp getStamp(JavaKind wordKind) {
     }
 
     /**
-     * Read Klass::_modifier_flags.
+     * Read {@code Klass::_modifier_flags}.
      */
     public ValueNode readKlassModifierFlags(ValueNode klass) {
         return readLocation(klass, HotSpotVMConfigField.KLASS_MODIFIER_FLAGS_OFFSET);
     }
 
     /**
-     * Read Klass::_access_flags.
+     * Read {@code Klass::_access_flags}.
      */
     public ValueNode readKlassAccessFlags(ValueNode klass) {
         return readLocation(klass, HotSpotVMConfigField.KLASS_ACCESS_FLAGS_OFFSET);
     }
 
     /**
-     * Read Klass:_layout_helper.
+     * Read {@code Klass:_layout_helper}.
      */
     public ValueNode klassLayoutHelper(ValueNode klass) {
         return b.add(KlassLayoutHelperNode.create(config, klass, b.getConstantReflection(), b.getMetaAccess()));
     }
 
     /**
-     * Read ArrayKlass::_component_mirror.
+     * Read {@code ArrayKlass::_component_mirror}.
      */
     public ValueNode readArrayKlassComponentMirror(ValueNode klass, GuardingNode guard) {
         int offset = config.getFieldOffset("ArrayKlass::_component_mirror", Integer.class, "oop");
@@ -186,7 +185,7 @@ public ValueNode readArrayKlassComponentMirror(ValueNode klass, GuardingNode gua
     }
 
     /**
-     * Read Klass::_super.
+     * Read {@code Klass::_super}.
      */
     public ValueNode readKlassSuperKlass(PiNode klassNonNull) {
         return readLocation(klassNonNull, HotSpotVMConfigField.KLASS_SUPER_KLASS_OFFSET);
@@ -198,7 +197,7 @@ public PiNode emitNullReturnGuard(ValueNode klass, ValueNode returnValue, double
     }
 
     /**
-     * Read the injected field java.lang.Class.array_klass.
+     * Read the injected field {@code java.lang.Class.array_klass}.
      */
     public ValueNode loadArrayKlass(ValueNode componentType) {
         return readLocation(componentType, HotSpotVMConfigField.CLASS_ARRAY_KLASS_OFFSET);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
index 887978e3187f..c418f715676a 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
@@ -28,6 +28,7 @@
 
 import java.util.ArrayList;
 
+import org.graalvm.compiler.api.replacements.Snippet;
 import org.graalvm.compiler.core.common.calc.CanonicalCondition;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.type.Stamp;
@@ -38,9 +39,11 @@
 import org.graalvm.compiler.nodes.BeginNode;
 import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
 import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.DeoptimizeNode;
 import org.graalvm.compiler.nodes.EndNode;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.FixedWithNextNode;
+import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.LogicNode;
@@ -68,6 +71,7 @@
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
 import org.graalvm.compiler.nodes.type.StampTool;
+import org.graalvm.compiler.word.Word;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
@@ -76,18 +80,16 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
- * This is a helper class for writing moderately complex
- * {@link org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin InvocationPlugins}. It's
- * intentionally more limited than something like {@link GraphKit} because it's rarely useful to
- * write explicit plugins for complex pieces of logic. They are better handled by writing a snippet
- * for the complex logic and having an {@link InvocationPlugin} that performs any required null
- * checks or range checks and then adds a node which is later lowered from the snippet. A major
- * reason for this is that any complex control invariably has {@link MergeNode MergeNodes} which are
- * required to have a valid {@link org.graalvm.compiler.nodes.FrameState} when they comes out of the
- * parser. For intrinsics the only valid {@link org.graalvm.compiler.nodes.FrameState FrameStates}
- * is the entry state and the state after then return and it can be hard to correctly assign states
- * to the merges. There is also little benefit to introducing complex intrinsic graphs early because
- * their are rarely amenable to high level optimizations.
+ * This is a helper class for writing moderately complex {@link InvocationPlugin InvocationPlugins}.
+ * It's intentionally more limited than something like {@link GraphKit} because it's rarely useful
+ * to write explicit plugins for complex pieces of logic. They are better handled by writing a
+ * snippet for the complex logic and having an {@link InvocationPlugin} that performs any required
+ * null checks or range checks and then adds a node which is later lowered by the snippet. A major
+ * reason for this is that any complex control invariably has {@link MergeNode}s which are required
+ * to have a valid {@link FrameState}s when they comes out of the parser. For intrinsics the only
+ * valid {@link FrameState}s is the entry state and the state after the return and it can be hard to
+ * correctly assign states to the merges. There is also little benefit to introducing complex
+ * intrinsic graphs early because they are rarely amenable to high level optimizations.
  *
  * The recommended usage pattern is to construct the helper instance in a try/resource block, which
  * performs some sanity checking when the block is exited.
@@ -98,9 +100,8 @@
  * </pre>
  *
  * The main idiom provided is {@link #emitReturnIf(LogicNode, boolean, ValueNode, double)} plus
- * variants. It models a side exit from a main sequence of logic.
- * {@link org.graalvm.compiler.nodes.FixedWithNextNode FixedWithNextNodes} are inserted in the main
- * control flow and until the final return value is emitted with
+ * variants. It models a side exit from a main sequence of logic. {@link FixedWithNextNode}s are
+ * inserted in the main control flow and until the final return value is emitted with
  * {@link #emitFinalReturn(JavaKind, ValueNode)}. If only a single value is returned the normal
  * {@link GraphBuilderContext#addPush(JavaKind, ValueNode)} can be used instead.
  */
@@ -206,7 +207,7 @@ public ValueNode arrayStart(ValueNode array, JavaKind kind) {
     }
 
     /**
-     * Shift {@code index} by the proper amount based on the element kind.
+     * Shifts {@code index} by the proper amount based on the element kind.
      */
     public ValueNode scale(ValueNode index, JavaKind kind) {
         int arrayIndexShift = CodeUtil.log2(b.getMetaAccess().getArrayIndexScale(kind));
@@ -214,15 +215,15 @@ public ValueNode scale(ValueNode index, JavaKind kind) {
     }
 
     /**
-     * Build an {@link OffsetAddressNode} ensuring that the offset is also converted to a
-     * {@link org.graalvm.compiler.word.Word Word}.
+     * Builds an {@link OffsetAddressNode} ensuring that the offset is also converted to a
+     * {@link Word}.
      */
     public AddressNode makeOffsetAddress(ValueNode base, ValueNode offset) {
         return b.add(new OffsetAddressNode(base, asWord(offset)));
     }
 
     /**
-     * Ensure a primitive type is word sized.
+     * Ensures a primitive type is word sized.
      */
     public ValueNode asWord(ValueNode index) {
         assert index.getStackKind().isPrimitive();
@@ -284,10 +285,9 @@ public ResolvedJavaField getField(ResolvedJavaType type, String fieldName) {
     }
 
     /**
-     * Get the offset of a field. Normally InvocationPlugins are run in the target VM so nothing
-     * special needs to be done to handle these offsets but if a
-     * {@link org.graalvm.compiler.api.replacements.Snippet Snippet} even triggers a plugin that
-     * uses a field offset them some extra machinery will be needed to delay the lookup.
+     * Gets the offset of a field. Normally InvocationPlugins are run in the target VM so nothing
+     * special needs to be done to handle these offsets but if a {@link Snippet} even triggers a
+     * plugin that uses a field offset them some extra machinery will be needed to delay the lookup.
      */
     public ValueNode getFieldOffset(ResolvedJavaType type, String fieldName) {
         assert !IS_BUILDING_NATIVE_IMAGE || !b.parsingIntrinsic() : "these values must be deferred in substitutions and snippets";
@@ -295,8 +295,8 @@ public ValueNode getFieldOffset(ResolvedJavaType type, String fieldName) {
     }
 
     /**
-     * Perform a range check for an intrinsic. This is a range check that represents a hard error in
-     * the intrinsic so it's permissible to throw an exception directly for this case.
+     * Performs a range check for an intrinsic. This is a range check that represents a hard error
+     * in the intrinsic so it's permissible to throw an exception directly for this case.
      */
     public GuardingNode intrinsicRangeCheck(ValueNode x, Condition condition, ValueNode y) {
         Condition.CanonicalizedCondition canonicalizedCondition = condition.canonicalize();
@@ -319,7 +319,7 @@ public AbstractBeginNode emitReturnIfNot(LogicNode condition, ValueNode returnVa
     }
 
     /**
-     * Build an {@link IfNode} that returns a value based on the condition and the negated flag.
+     * Builds an {@link IfNode} that returns a value based on the condition and the negated flag.
      * This can currently only be used for simple return values and doesn't allow {@link FixedNode
      * FixedNodes} to be part of the return path. All the return values are linked to a
      * {@link MergeNode} which terminates the graphs produced by the plugin.
@@ -372,7 +372,7 @@ public void emitFinalReturn(JavaKind kind, ValueNode origReturnValue) {
     }
 
     /**
-     * Connect an {@link EndNode} and return value into the final control flow merge.
+     * Connects an {@link EndNode} and return value into the final control flow merge.
      */
     protected void addReturnValue(EndNode end, JavaKind kind, ValueNode returnValueInput) {
         assert b.canMergeIntrinsicReturns();
@@ -387,7 +387,7 @@ protected void addReturnValue(EndNode end, JavaKind kind, ValueNode returnValueI
     }
 
     /**
-     * Create a branch to the fallback path, building an {@link MergeNode} if necessary.
+     * Creates a branch to the fallback path, building a {@link MergeNode} if necessary.
      */
     private BeginNode branchToFallback() {
         if (fallbackEntry == null) {
@@ -432,8 +432,7 @@ public GuardingNode doFallbackIf(ValueNode x, Condition condition, ValueNode y,
 
     /**
      * Fallback to the original implementation based on the {@code condition}. Depending on the
-     * environment the fallback may be done through a
-     * {@link org.graalvm.compiler.nodes.DeoptimizeNode DeoptimizeNode} or through a real
+     * environment the fallback may be done through a {@link DeoptimizeNode} or through a real
      * {@link Invoke}.
      */
     public GuardingNode doFallbackIf(LogicNode condition, boolean negated, double probability) {
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
index c490fbf9bd3e..3891c258afc3 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
@@ -199,38 +199,6 @@ public void virtualize(VirtualizerTool tool) {
     @NodeIntrinsic
     public static native boolean equals(Object array1, Object array2, int length, @ConstantNodeParameter JavaKind kind);
 
-    public static boolean equals(boolean[] array1, boolean[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Boolean);
-    }
-
-    public static boolean equals(byte[] array1, byte[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Byte);
-    }
-
-    public static boolean equals(char[] array1, char[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Char);
-    }
-
-    public static boolean equals(short[] array1, short[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Short);
-    }
-
-    public static boolean equals(int[] array1, int[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Int);
-    }
-
-    public static boolean equals(long[] array1, long[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Long);
-    }
-
-    public static boolean equals(float[] array1, float[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Float);
-    }
-
-    public static boolean equals(double[] array1, double[] array2, int length) {
-        return equals(array1, array2, length, JavaKind.Double);
-    }
-
     public ValueNode getArray1() {
         return array1;
     }
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java
index eaaf474d1a07..e222c41c15d1 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java
@@ -32,7 +32,6 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -40,6 +39,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.UnaryNode;
 import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
@@ -119,24 +119,6 @@ public static int scan(int v) {
         return scan(0xffffffffL & v);
     }
 
-    /**
-     * Raw intrinsic for bsf instruction.
-     *
-     * @param v
-     * @return number of trailing zeros or an undefined value if {@code v} == 0.
-     */
-    @NodeIntrinsic
-    public static native int unsafeScan(long v);
-
-    /**
-     * Raw intrinsic for bsf instruction.
-     *
-     * @param v
-     * @return number of trailing zeros or an undefined value if {@code v} == 0.
-     */
-    @NodeIntrinsic
-    public static native int unsafeScan(int v);
-
     @Override
     public void generate(NodeLIRBuilderTool builder, ArithmeticLIRGeneratorTool gen) {
         builder.setResult(this, gen.emitBitScanForward(builder.operand(getValue())));
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java
index f9b3f9ddab00..7c334f7b8e7f 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java
@@ -32,7 +32,6 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.ConstantNode;
@@ -40,6 +39,7 @@
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.UnaryNode;
 import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
@@ -110,24 +110,6 @@ public static int scan(int v) {
         return 31 - Integer.numberOfLeadingZeros(v);
     }
 
-    /**
-     * Raw intrinsic for bsr instruction.
-     *
-     * @param v
-     * @return index of first set bit or an undefined value if {@code v} == 0.
-     */
-    @NodeIntrinsic
-    public static native int unsafeScan(int v);
-
-    /**
-     * Raw intrinsic for bsr instruction.
-     *
-     * @param v
-     * @return index of first set bit or an undefined value if {@code v} == 0.
-     */
-    @NodeIntrinsic
-    public static native int unsafeScan(long v);
-
     @Override
     public void generate(NodeLIRBuilderTool builder, ArithmeticLIRGeneratorTool gen) {
         builder.setResult(this, gen.emitBitScanReverse(builder.operand(getValue())));

From bc180dc4337697e47d286e937fdf932ca469a49d Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Thu, 21 Oct 2021 00:47:02 -0700
Subject: [PATCH 580/681] More comment cleanups

---
 .../meta/HotSpotGraphBuilderPlugins.java      | 291 +++++-------------
 .../HotSpotInvocationPluginHelper.java        |  12 +-
 .../graphbuilderconf/GraphBuilderContext.java |   6 +-
 .../replacements/InvocationPluginHelper.java  |  20 +-
 .../StandardGraphBuilderPlugins.java          |  94 ++----
 5 files changed, 144 insertions(+), 279 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
index 55212ca70a28..3b61b146b461 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
@@ -56,6 +56,7 @@
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.common.calc.CanonicalCondition;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.compiler.core.common.type.StampFactory;
@@ -69,7 +70,6 @@
 import org.graalvm.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode;
 import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode;
-import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode;
 import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
 import org.graalvm.compiler.hotspot.replacements.FastNotifyNode;
 import org.graalvm.compiler.hotspot.replacements.HotSpotIdentityHashCodeNode;
@@ -329,20 +329,11 @@ private static void registerClassPlugins(Plugins plugins, GraalHotSpotVMConfig c
         r.register1("getModifiers", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                // @formatter:off
-                //    public static int getModifiers(final Class<?> thisObj) {
-                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-                //        if (klass.isNull()) {
-                //            // Class for primitive type
-                //            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
-                //        } else {
-                //            return klass.readInt(klassModifierFlagsOffset(INJECTED_VMCONFIG), KLASS_MODIFIER_FLAGS_LOCATION);
-                //        }
-                //    }
-                // @formatter:on
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                    ValueNode klass = helper.readKlass(receiver.get());
+                    ValueNode klass = helper.readKlassFromClass(receiver.get());
+                    // Primitive Class case
                     ValueNode nonNullKlass = helper.emitNullReturnGuard(klass, ConstantNode.forInt(Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC), GraalDirectives.UNLIKELY_PROBABILITY);
+                    // other return Klass::_modifier_flags
                     helper.emitFinalReturn(JavaKind.Int, helper.readKlassModifierFlags(nonNullKlass));
                 }
                 return true;
@@ -351,24 +342,14 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         r.register1("isInterface", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                // @formatter:off
-                //    public static boolean isInterface(final Class<?> thisObj) {
-                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-                //        if (klass.isNull()) {
-                //            // Class for primitive type
-                //            return false;
-                //        } else {
-                //            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-                //            return (accessFlags & Modifier.INTERFACE) != 0;
-                //        }
-                //    }
-                // @formatter:on
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                    ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
-                    ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.defaultForKind(JavaKind.Boolean), GraalDirectives.UNLIKELY_PROBABILITY);
+                    ValueNode klass = helper.readKlassFromClass(receiver.get());
+                    // Primitive Class case returns false
+                    ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
                     ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
-                    LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT));
-                    helper.emitFinalReturn(JavaKind.Boolean, b.add(ConditionalNode.create(test, ConstantNode.forInt(0), ConstantNode.forInt(1), NodeView.DEFAULT)));
+                    // return (Klass::_access_flags & Modifier.INTERFACE) == 0 ? false : true
+                    LogicNode test = IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT);
+                    helper.emitFinalReturn(JavaKind.Boolean, ConditionalNode.create(test, ConstantNode.forBoolean(false), ConstantNode.forBoolean(true), NodeView.DEFAULT));
                 }
                 return true;
             }
@@ -377,7 +358,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                    ValueNode klass = helper.readKlass(receiver.get());
+                    ValueNode klass = helper.readKlassFromClass(receiver.get());
                     LogicNode isNull = b.add(IsNullNode.create(klass));
                     b.addPush(JavaKind.Boolean, ConditionalNode.create(isNull, b.add(forBoolean(true)), b.add(forBoolean(false)), NodeView.DEFAULT));
                 }
@@ -387,46 +368,31 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         r.register1("getSuperclass", Receiver.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                // @formatter:off
-                //     public static Class<?> getSuperclass(final Class<?> thisObj) {
-                //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-                //        if (klass.isNull()) {
-                //            // Class for primitive type
-                //            return null;
-                //        }
-                //        KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
-                //        int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-                //        if ((accessFlags & Modifier.INTERFACE) != 0) {
-                //            return null;
-                //        }
-                //        if (klassIsArray(klassNonNull)) {
-                //            return ConstantNode.forClass(getObjectType(INJECTED_METAACCESS));
-                //        }
-                //        KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
-                //        if (superKlass.isNull()) {
-                //            return null;
-                //        }
-                //        KlassPointer superKlassNonNull = ClassGetHubNode.piCastNonNull(superKlass, SnippetAnchorNode.anchor());
-                //        return HubGetClassNode.readClass(superKlassNonNull);
-                //    }
-                // @formatter:on
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                    ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                    ValueNode klass = helper.readKlassFromClass(receiver.get());
                     ConstantNode nullValue = ConstantNode.defaultForKind(JavaKind.Object);
 
+                    // Primitive Class case returns null
                     PiNode klassNonNull = helper.emitNullReturnGuard(klass, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+
+                    // if ((Klass::_access_flags & Modifer.INTERCAE) != 0) return null
                     ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
-                    LogicNode test = b.add(IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT));
+                    LogicNode test = IntegerTestNode.create(accessFlags, ConstantNode.forInt(Modifier.INTERFACE), NodeView.DEFAULT);
                     helper.emitReturnIfNot(test, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
 
+                    // Handle array Class case
+                    // if (Klass::_layout_helper < 0) return Object.class
                     ValueNode layoutHelper = helper.klassLayoutHelper(klassNonNull);
                     ResolvedJavaType objectType = b.getMetaAccess().lookupJavaType(Object.class);
-                    ValueNode objectClass = b.add(ConstantNode.forConstant(b.getConstantReflection().asJavaClass(objectType), b.getMetaAccess()));
+                    ValueNode objectClass = ConstantNode.forConstant(b.getConstantReflection().asJavaClass(objectType), b.getMetaAccess());
                     helper.emitReturnIf(layoutHelper, Condition.LT, ConstantNode.forInt(config.klassLayoutHelperNeutralValue), objectClass,
                                     GraalDirectives.UNLIKELY_PROBABILITY);
 
+                    // Read Klass::_super
                     ValueNode superKlass = helper.readKlassSuperKlass(klassNonNull);
+                    // Return null if super is null
                     PiNode superKlassNonNull = helper.emitNullReturnGuard(superKlass, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+                    // Convert Klass to Class and return
                     helper.emitFinalReturn(JavaKind.Object, new HubGetClassNode(b.getMetaAccess(), superKlassNonNull));
                 }
                 return true;
@@ -437,19 +403,11 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             r.register1("isHidden", Receiver.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                    // @formatter:off
-                    //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-                    //        if (klass.isNull()) {
-                    //            // Class for primitive type
-                    //            return false;
-                    //        } else {
-                    //            int accessFlags = klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
-                    //            return (accessFlags & (jvmAccIsHiddenClass(INJECTED_VMCONFIG))) != 0;
-                    //        }
-                    // @formatter:on
                     try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                        ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
+                        ValueNode klass = helper.readKlassFromClass(receiver.get());
+                        // Primitive Class case returns false
                         ValueNode nonNullKlass = helper.emitNullReturnGuard(klass, ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
+                        // return (Klass::_access_flags & jvmAccIsHiddenClass) == 0 ? false : true
                         ValueNode accessFlags = helper.readKlassAccessFlags(nonNullKlass);
                         LogicNode test = IntegerTestNode.create(accessFlags, ConstantNode.forInt(config.jvmAccIsHiddenClass), NodeView.DEFAULT);
                         helper.emitFinalReturn(JavaKind.Boolean, ConditionalNode.create(test, ConstantNode.forBoolean(false), ConstantNode.forBoolean(true), NodeView.DEFAULT));
@@ -463,26 +421,17 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             r.register1("getComponentType", Receiver.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
-                    // @formatter:off
-                    //     public static Class<?> getComponentType(final Class<?> thisObj) {
-                    //        KlassPointer klass = ClassGetHubNode.readClass(thisObj);
-                    //        if (klass.isNull()) {
-                    //            // Class for primitive type
-                    //            return null;
-                    //        }
-                    //        KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
-                    //        if (!klassIsArray(klassNonNull)) {
-                    //            return null;
-                    //        }
-                    //        return PiNode.asNonNullClass(klassNonNull.readObject(arrayKlassComponentMirrorOffset(INJECTED_VMCONFIG), ARRAY_KLASS_COMPONENT_MIRROR));
-                    //    }
-                    // @formatter:on
                     try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                        ValueNode klass = b.add(ClassGetHubNode.create(receiver.get(), b.getMetaAccess(), b.getConstantReflection()));
-                        ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.defaultForKind(JavaKind.Object), GraalDirectives.UNLIKELY_PROBABILITY);
+                        ValueNode klass = helper.readKlassFromClass(receiver.get());
+                        // Primitive Class case returns null
+                        final ConstantNode nullValue = ConstantNode.defaultForKind(JavaKind.Object);
+                        ValueNode klassNonNull = helper.emitNullReturnGuard(klass, nullValue, GraalDirectives.UNLIKELY_PROBABILITY);
+                        // Non-array case
+                        // if (Klass::_layout_helper >= 0) return null
                         ValueNode layoutHelper = helper.klassLayoutHelper(klassNonNull);
-                        GuardingNode guard = helper.emitReturnIf(layoutHelper, Condition.GE, ConstantNode.forInt(config.klassLayoutHelperNeutralValue), ConstantNode.defaultForKind(JavaKind.Object),
+                        GuardingNode guard = helper.emitReturnIf(layoutHelper, Condition.GE, ConstantNode.forInt(config.klassLayoutHelperNeutralValue), nullValue,
                                         GraalDirectives.UNLIKELY_PROBABILITY);
+                        // Return ArrayKlass::_component_mirror
                         ValueNode componentMirror = helper.readArrayKlassComponentMirror(klassNonNull, guard);
                         helper.emitFinalReturn(JavaKind.Object, componentMirror);
                     }
@@ -533,20 +482,11 @@ public boolean inlineOnly() {
         r.register1("getClassAccessFlags", Class.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
-                // @formatter:off
-                //    public static int getClassAccessFlags(Class<?> aClass) {
-                //        KlassPointer klass = ClassGetHubNode.readClass(GraalDirectives.guardingNonNull(aClass));
-                //        if (klass.isNull()) {
-                //            // Class for primitive type
-                //            return Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC;
-                //        } else {
-                //            return klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION) & jvmAccWrittenFlags(INJECTED_VMCONFIG);
-                //        }
-                //    }
-                // @formatter:on
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
-                    ValueNode klass = b.add(ClassGetHubNode.create(b.nullCheckedValue(arg), b.getMetaAccess(), b.getConstantReflection()));
+                    ValueNode klass = helper.readKlassFromClass(b.nullCheckedValue(arg));
+                    // Primitive Class case
                     ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.forInt(Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC), GraalDirectives.UNLIKELY_PROBABILITY);
+                    // Return (Klass::_access_flags & jvmAccWrittenFlags)
                     ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
                     helper.emitFinalReturn(JavaKind.Int, new AndNode(accessFlags, ConstantNode.forInt(config.jvmAccWrittenFlags)));
                 }
@@ -626,19 +566,14 @@ private static void registerArrayPlugins(InvocationPlugins plugins, Replacements
         r.register2("newInstance", Class.class, int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode componentType, ValueNode length) {
-                // @formatter:off
-                //    public static Object newInstance(Class<?> componentType, int length) {
-                //        if (componentType == null || loadKlassFromObject(componentType, arrayKlassOffset(INJECTED_VMCONFIG), CLASS_ARRAY_KLASS_LOCATION).isNull()) {
-                //            // Exit the intrinsic here for the case where the array class does not exist
-                //            return newInstance(componentType, length);
-                //        }
-                //        return DynamicNewArrayNode.newArray(GraalDirectives.guardingNonNull(componentType), length);
-                //    }
-                // @formatter:on
                 try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
+                    // If (componentType == null) then deopt
                     ValueNode nonNullComponentType = b.nullCheckedValue(componentType);
+                    // Read Class.array_klass
                     ValueNode arrayClass = helper.loadArrayKlass(nonNullComponentType);
-                    helper.doFallbackIf(IsNullNode.create(arrayClass), false, GraalDirectives.UNLIKELY_PROBABILITY);
+                    // Take the fallback path is the array klass is null
+                    helper.doFallbackIf(IsNullNode.create(arrayClass), GraalDirectives.UNLIKELY_PROBABILITY);
+                    // Otherwise perform the array allocation
                     helper.emitFinalReturn(JavaKind.Object, new DynamicNewArrayNode(nonNullComponentType, length,
                                     true));
                 }
@@ -712,34 +647,25 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
             r.register2("isInterrupted", Receiver.class, boolean.class, new InvocationPlugin() {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode clearInterrupted) {
-                    // @formatter:off
-                    //     public static boolean isInterrupted(final Thread thisObject, boolean clearInterrupted) {
-                    //        Word javaThread = CurrentJavaThreadNode.get();
-                    //        Object thread = javaThread.readObject(threadObjectOffset(INJECTED_VMCONFIG), JAVA_THREAD_THREAD_OBJECT_LOCATION);
-                    //        if (thisObject == thread) {
-                    //            Word osThread = javaThread.readWord(osThreadOffset(INJECTED_VMCONFIG), JAVA_THREAD_OSTHREAD_LOCATION);
-                    //            int interrupted = osThread.readInt(osThreadInterruptedOffset(INJECTED_VMCONFIG), any());
-                    //            if (interrupted == 0) {
-                    //                return false;
-                    //            }
-                    //            if (clearInterrupted == false) {
-                    //                return interrupted != 0;
-                    //            }
-                    //        }
-                    //        return isInterrupted(thisObject, clearInterrupted);
-                    //    }
-                    // @formatter:on
                     try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
                         ValueNode receiverThreadObject = receiver.get();
                         CurrentJavaThreadNode thread = b.add(new CurrentJavaThreadNode(helper.getWordKind()));
                         ValueNode currentThreadObject = helper.readCurrentThreadObject(thread);
+
+                        // if (this != Thread.currentThread()) do fallback
                         helper.doFallbackIf(receiverThreadObject, NE, currentThreadObject, GraalDirectives.UNLIKELY_PROBABILITY);
                         ValueNode osThread = helper.readOsThread(thread);
                         ValueNode interrupted = helper.readOsThreadInterrupted(osThread);
-                        helper.emitReturnIf(interrupted, EQ, ConstantNode.forInt(0), ConstantNode.forBoolean(false), GraalDirectives.UNLIKELY_PROBABILITY);
-                        helper.doFallbackIf(clearInterrupted, EQ, ConstantNode.forBoolean(true), GraalDirectives.UNLIKELY_PROBABILITY);
+
+                        // if (thread._osthread._isinterrupted == 0) return false
                         helper.emitReturnIf(interrupted, EQ, ConstantNode.forInt(0), ConstantNode.forBoolean(false), GraalDirectives.LIKELY_PROBABILITY);
-                        helper.emitFinalReturn(JavaKind.Boolean, ConstantNode.forBoolean(true));
+
+                        // if (clearInterrupted) fallback to invoke
+                        helper.doFallbackIf(clearInterrupted, EQ, ConstantNode.forBoolean(true), GraalDirectives.UNLIKELY_PROBABILITY);
+
+                        // return interrupted == 0 ? false : true
+                        LogicNode test = helper.createCompare(interrupted, CanonicalCondition.EQ, ConstantNode.forInt(0));
+                        helper.emitFinalReturn(JavaKind.Boolean, ConditionalNode.create(test, ConstantNode.forBoolean(false), ConstantNode.forBoolean(true), NodeView.DEFAULT));
                     }
                     return true;
                 }
@@ -826,38 +752,27 @@ static ResolvedJavaType aesCryptType(ResolvedJavaType context) {
 
         @Override
         public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode out, ValueNode outOffset) {
-            // @formatter:off
-            //     private static void crypt(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset, boolean encrypt) {
-            //        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AES_BLOCK_SIZE_IN_BYTES < inOffset || outOffset < 0 || out.length - AES_BLOCK_SIZE_IN_BYTES < outOffset)) {
-            //            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
-            //        }
-            //        Object realReceiver = PiNode.piCastNonNull(rcvr, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            //        Object kObject = RawLoadNode.load(realReceiver, kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-            //        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
-            //        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
-            //        if (encrypt) {
-            //            encryptBlockStub(ENCRYPT_BLOCK, inAddr, outAddr, kAddr);
-            //        } else {
-            //            decryptBlockStub(DECRYPT_BLOCK, inAddr, outAddr, kAddr);
-            //        }
-            //    }
-            // @formatter:on
             try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
                 ValueNode nonNullReceiver = receiver.get();
                 ValueNode nonNullIn = b.nullCheckedValue(in);
                 ValueNode nonNullOut = b.nullCheckedValue(out);
 
                 ConstantNode zero = ConstantNode.forInt(0);
+                // if (inOffset < 0) then deopt
                 helper.intrinsicRangeCheck(inOffset, LT, zero);
+                // if (in.length - AES_BLOCK_SIZE_IN_BYTES < inOffset) then deopt
                 ValueNode inLength = helper.length(nonNullIn);
                 helper.intrinsicRangeCheck(helper.sub(inLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, inOffset);
+                // if (outOffset < 0) then deopt
                 helper.intrinsicRangeCheck(outOffset, LT, zero);
+                // if (out.length - AES_BLOCK_SIZE_IN_BYTES < outOffset) then deopt
                 ValueNode outLength = helper.length(nonNullOut);
                 helper.intrinsicRangeCheck(helper.sub(outLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, outOffset);
 
+                // Read AESCrypt.K from receiver
                 ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
                 ValueNode k = b.nullCheckedValue(helper.loadField(nonNullReceiver, kField));
+                // Compute pointers to the array bodies
                 ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
                 ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
@@ -894,61 +809,39 @@ static ResolvedJavaType feedbackCipherType(ResolvedJavaType context) {
 
         @Override
         public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode inLength, ValueNode out, ValueNode outOffset) {
-            // @formatter:off
-            //static int encrypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset) {
-            //        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-            //        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            //            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            //            crypt(realReceiver, in, inOffset, inLength, out, outOffset, aesCipher, true);
-            //            return inLength;
-            //        } else {
-            //            return encrypt(realReceiver, in, inOffset, inLength, out, outOffset);
-            //        }
-            //    }
-            //
-            //   private static void crypt(Object rcvr, byte[] in, int inOffset, int inLength, byte[] out, int outOffset, Object embeddedCipher, boolean encrypt) {
-            //        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AESCryptSubstitutions.AES_BLOCK_SIZE_IN_BYTES < inOffset || outOffset < 0 ||
-            //                        out.length - AESCryptSubstitutions.AES_BLOCK_SIZE_IN_BYTES < outOffset)) {
-            //            DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
-            //        }
-            //        Object realReceiver = piCastNonNull(rcvr, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-            //        Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            //        Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //        Object rObject = RawLoadNode.load(realReceiver, rOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //        Pointer kAddr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-            //        Pointer rAddr = Word.objectToTrackedPointer(rObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-            //        Word inAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOffset));
-            //        Word outAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOffset));
-            //        if (encrypt) {
-            //            encryptAESCryptStub(ENCRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
-            //        } else {
-            //            decryptAESCryptStub(DECRYPT, inAddr, outAddr, kAddr, rAddr, inLength);
-            //        }
-            //    }
-            // @formatter:on
             try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
                 ValueNode nonNullReceiver = receiver.get();
+                // Read FeedbackCipher.embeddedCipher
                 ResolvedJavaField embeddedCipherField = helper.getField(feedbackCipherType(targetMethod.getDeclaringClass()), "embeddedCipher");
                 ValueNode embeddedCipher = helper.loadField(nonNullReceiver, embeddedCipherField);
+
+                // Use the fallback path if the embeddedCipher is not an instance of AESCrypt
                 LogicNode typeCheck = InstanceOfNode.create(TypeReference.create(b.getAssumptions(), aesCryptType(targetMethod.getDeclaringClass())), embeddedCipher);
-                helper.doFallbackIf(typeCheck, true, GraalDirectives.UNLIKELY_PROBABILITY);
+                helper.doFallbackIfNot(typeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
 
                 ValueNode nonNullIn = b.nullCheckedValue(in);
                 ValueNode nonNullOut = b.nullCheckedValue(out);
 
                 ConstantNode zero = ConstantNode.forInt(0);
+                // if (inOffset < 0) then deopt
                 helper.intrinsicRangeCheck(inOffset, LT, zero);
+                // if (in.length - AES_BLOCK_SIZE_IN_BYTES < inOffset) then deopt
                 helper.intrinsicRangeCheck(helper.sub(inLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, inOffset);
+                // if (outOffset < 0) then deopt
                 helper.intrinsicRangeCheck(outOffset, LT, zero);
+                // if (out.length - AES_BLOCK_SIZE_IN_BYTES < outOffset) then deopt
                 ValueNode outLength = helper.length(nonNullOut);
                 helper.intrinsicRangeCheck(helper.sub(outLength, ConstantNode.forInt(AES_BLOCK_SIZE_IN_BYTES)), LT, outOffset);
 
+                // Read AESCrypt.K
                 ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
-                ResolvedJavaField rField = helper.getField(targetMethod.getDeclaringClass(), "r");
-
                 ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
+
+                // Read CipherBlockChaining.r
+                ResolvedJavaField rField = helper.getField(targetMethod.getDeclaringClass(), "r");
                 ValueNode r = b.nullCheckedValue(helper.loadField(nonNullReceiver, rField));
+
+                // Compute pointers into arrays
                 ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
                 ValueNode rAddr = helper.arrayStart(r, JavaKind.Byte);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
@@ -1211,55 +1104,39 @@ static ResolvedJavaType feedbackCipherType(ResolvedJavaType context) {
 
         @Override
         public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode in, ValueNode inOffset, ValueNode len, ValueNode out, ValueNode outOffset) {
-            // @formatter:off
-            //     static int implCrypt(Object receiver, byte[] in, int inOff, int len, byte[] out, int outOff) {
-            //        Object realReceiver = piCastNonNull(receiver, HotSpotReplacementsUtil.methodHolderClass(INJECTED_INTRINSIC_CONTEXT));
-            //        Object embeddedCipher = RawLoadNode.load(realReceiver, embeddedCipherOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //        if (doInstanceof(aesCryptType(INJECTED_INTRINSIC_CONTEXT), embeddedCipher)) {
-            //            Object aesCipher = piCastNonNull(embeddedCipher, aesCryptType(INJECTED_INTRINSIC_CONTEXT));
-            //
-            //            Word srcAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(in, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + inOff));
-            //            Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(out, ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte) + outOff));
-            //            Word usedPtr = WordFactory.unsigned(ComputeObjectAddressNode.get(realReceiver, usedOffset(INJECTED_INTRINSIC_CONTEXT)));
-            //
-            //            int cntOffset = counterOffset(INJECTED_INTRINSIC_CONTEXT);
-            //            int encCntOffset = encCounterOffset(INJECTED_INTRINSIC_CONTEXT);
-            //            Object kObject = RawLoadNode.load(aesCipher, AESCryptSubstitutions.kOffset(INJECTED_INTRINSIC_CONTEXT), JavaKind.Object, LocationIdentity.any());
-            //            Object cntObj = RawLoadNode.load(realReceiver, cntOffset, JavaKind.Object, LocationIdentity.any());
-            //            Object encCntObj = RawLoadNode.load(realReceiver, encCntOffset, JavaKind.Object, LocationIdentity.any());
-            //
-            //            Word kPtr = Word.objectToTrackedPointer(kObject).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Int));
-            //            Word cntPtr = Word.objectToTrackedPointer(cntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-            //            Word encCntPtr = Word.objectToTrackedPointer(encCntObj).add(ReplacementsUtil.getArrayBaseOffset(INJECTED_METAACCESS, JavaKind.Byte));
-            //
-            //            return HotSpotBackend.counterModeAESCrypt(srcAddr, dstAddr, kPtr, cntPtr, len, encCntPtr, usedPtr);
-            //        } else {
-            //            return implCrypt(realReceiver, in, inOff, len, out, outOff);
-            //        }
-            //    }
-            // @formatter:on
             try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
                 ValueNode nonNullReceiver = receiver.get();
+
+                // Read FeedbackCipher.embeddedCipher
                 ResolvedJavaField embeddedCipherField = helper.getField(feedbackCipherType(targetMethod.getDeclaringClass()), "embeddedCipher");
                 ValueNode embeddedCipher = helper.loadField(nonNullReceiver, embeddedCipherField);
+
+                // Use the fallback path if the embeddedCipher is not an instance of AESCrypt
                 LogicNode typeCheck = InstanceOfNode.create(TypeReference.create(b.getAssumptions(), aesCryptType(targetMethod.getDeclaringClass())), embeddedCipher);
-                helper.doFallbackIf(typeCheck, true, GraalDirectives.UNLIKELY_PROBABILITY);
+                helper.doFallbackIfNot(typeCheck, GraalDirectives.UNLIKELY_PROBABILITY);
 
+                // Compute pointers to array bodies
                 ValueNode nonNullIn = b.nullCheckedValue(in);
                 ValueNode nonNullOut = b.nullCheckedValue(out);
                 ValueNode inAddr = helper.arrayElementPointer(nonNullIn, JavaKind.Byte, inOffset);
                 ValueNode outAddr = helper.arrayElementPointer(nonNullOut, JavaKind.Byte, outOffset);
 
+                // Read AESCrypt.K
                 ResolvedJavaField kField = helper.getField(aesCryptType(targetMethod.getDeclaringClass()), "K");
                 ValueNode k = b.nullCheckedValue(helper.loadField(embeddedCipher, kField));
+
+                // Read CounterModeCrypt.counter
                 ResolvedJavaField counterField = helper.getField(targetMethod.getDeclaringClass(), "counter");
                 ValueNode counter = helper.loadField(nonNullReceiver, counterField);
                 ValueNode counterAddr = helper.arrayStart(counter, JavaKind.Byte);
+
+                // Read CounterModeCrypt.encryptedCounter
                 ResolvedJavaField encryptedCounterField = helper.getField(targetMethod.getDeclaringClass(), "encryptedCounter");
                 ValueNode encryptedCounter = helper.loadField(nonNullReceiver, encryptedCounterField);
                 ValueNode encryptedCounterAddr = helper.arrayStart(encryptedCounter, JavaKind.Byte);
                 ValueNode kAddr = helper.arrayStart(k, JavaKind.Int);
 
+                // Compute address of CounterModeCrypt.used field
                 ValueNode usedPtr = b.add(new ComputeObjectAddressNode(nonNullReceiver, helper.asWord(helper.getFieldOffset(targetMethod.getDeclaringClass(), "used"))));
                 ForeignCallNode call = b.add(new ForeignCallNode(COUNTERMODE_IMPL_CRYPT, inAddr, outAddr, kAddr, counterAddr, len, encryptedCounterAddr, usedPtr));
                 helper.emitFinalReturn(JavaKind.Int, call);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
index d0abbd1b468a..2a14ce0712f7 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java
@@ -63,8 +63,8 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
- * A helper class for generating mildly complex HotSpot specific plugins. It primarily adds helpers
- * for correctly performing reads of HotSpot specific fields.
+ * A helper class for HotSpot specific invocation plugins. In particular it adds helpers for
+ * correctly performing reads of HotSpot specific fields.
  */
 public class HotSpotInvocationPluginHelper extends InvocationPluginHelper {
 
@@ -80,7 +80,7 @@ private Stamp getClassStamp(boolean nonNull) {
         return StampFactory.object(TypeReference.createExactTrusted(toType), nonNull);
     }
 
-    public ValueNode readKlass(ValueNode clazz) {
+    public ValueNode readKlassFromClass(ValueNode clazz) {
         return b.add(ClassGetHubNode.create(clazz, b.getMetaAccess(), b.getConstantReflection()));
     }
 
@@ -221,10 +221,16 @@ public ValueNode readCurrentThreadObject(CurrentJavaThreadNode thread) {
         return value;
     }
 
+    /**
+     * Reads {@code JavaThread::_osthread}.
+     */
     public ValueNode readOsThread(CurrentJavaThreadNode thread) {
         return readLocation(thread, HotSpotVMConfigField.JAVA_THREAD_OSTHREAD_OFFSET);
     }
 
+    /**
+     * Reads {@code OSThread::_interrupted}.
+     */
     public ValueNode readOsThreadInterrupted(ValueNode osThread) {
         return readLocation(osThread, HotSpotVMConfigField.OS_THREAD_INTERRUPTED_OFFSET);
     }
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 58afb2c10ab6..5394b07a6aef 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -50,6 +50,7 @@
 import org.graalvm.compiler.nodes.IfNode;
 import org.graalvm.compiler.nodes.Invoke;
 import org.graalvm.compiler.nodes.LogicNode;
+import org.graalvm.compiler.nodes.MergeNode;
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.PluginReplacementNode;
@@ -387,9 +388,8 @@ default void genCheckcastDynamic(ValueNode object, ValueNode javaClass) {
     }
 
     /**
-     * Some {@link InvocationPlugin InvocationPlugins} have to build a
-     * {@link org.graalvm.compiler.nodes.MergeNode} to handle multiple return paths but not all
-     * contexts can do this.
+     * Some {@link InvocationPlugin InvocationPlugins} have to build a {@link MergeNode} to handle
+     * multiple return paths but not all contexts can do this.
      *
      * @return false if {@link #getInvocationPluginReturnState(JavaKind, ValueNode)} cannot be
      *         called (i.e. it unconditionally raises an error)
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
index c418f715676a..95df4bc3499e 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
@@ -115,7 +115,7 @@ public class InvocationPluginHelper implements DebugCloseable {
 
     public ValueNode arraylength(ValueNode receiverValue) {
         assert StampTool.isPointerNonNull(receiverValue);
-        return b.add(new ArrayLengthNode(receiverValue));
+        return b.add(ArrayLengthNode.create(receiverValue, b.getConstantReflection()));
     }
 
     @Override
@@ -245,10 +245,10 @@ private LogicNode createCompare(ValueNode origX, ValueNode origY, Condition.Cano
             x = origY;
             y = origX;
         }
-        return createCompare(canonicalizedCondition.getCanonicalCondition(), x, y);
+        return createCompare(x, canonicalizedCondition.getCanonicalCondition(), y);
     }
 
-    public LogicNode createCompare(CanonicalCondition cond, ValueNode x, ValueNode y) {
+    public LogicNode createCompare(ValueNode x, CanonicalCondition cond, ValueNode y) {
         assert !x.getStackKind().isNumericFloat();
         switch (cond) {
             case EQ:
@@ -271,7 +271,7 @@ public ValueNode loadField(ValueNode value, ResolvedJavaField field) {
     }
 
     /**
-     * Lookup a Java field by name.
+     * Finds a Java field by name.
      *
      * @throws GraalError if the field isn't found.
      */
@@ -324,7 +324,7 @@ public AbstractBeginNode emitReturnIfNot(LogicNode condition, ValueNode returnVa
      * FixedNodes} to be part of the return path. All the return values are linked to a
      * {@link MergeNode} which terminates the graphs produced by the plugin.
      */
-    public AbstractBeginNode emitReturnIf(LogicNode condition, boolean negated, ValueNode returnValue, double returnProbability) {
+    private AbstractBeginNode emitReturnIf(LogicNode condition, boolean negated, ValueNode returnValue, double returnProbability) {
         BeginNode trueSuccessor = b.getGraph().add(new BeginNode());
         EndNode end = b.getGraph().add(new EndNode());
         trueSuccessor.setNext(end);
@@ -430,12 +430,20 @@ public GuardingNode doFallbackIf(ValueNode x, Condition condition, ValueNode y,
         return doFallbackIf(compare, canonicalizedCondition.mustNegate(), returnProbability);
     }
 
+    public GuardingNode doFallbackIfNot(LogicNode condition, double probability) {
+        return doFallbackIf(condition, true, probability);
+    }
+
+    public GuardingNode doFallbackIf(LogicNode condition, double probability) {
+        return doFallbackIf(condition, false, probability);
+    }
+
     /**
      * Fallback to the original implementation based on the {@code condition}. Depending on the
      * environment the fallback may be done through a {@link DeoptimizeNode} or through a real
      * {@link Invoke}.
      */
-    public GuardingNode doFallbackIf(LogicNode condition, boolean negated, double probability) {
+    private GuardingNode doFallbackIf(LogicNode condition, boolean negated, double probability) {
         BeginNode fallbackSuccessor = branchToFallback();
         ProfileData.BranchProbabilityData probabilityData = ProfileData.BranchProbabilityData.injected(probability, negated);
         IfNode node = new IfNode(condition, negated ? null : fallbackSuccessor, negated ? fallbackSuccessor : null, probabilityData);
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index 4ecf2db8308c..cc34498b06ee 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -395,59 +395,45 @@ static class StringEqualsInvocationPlugin implements InvocationPlugin {
 
         @SuppressWarnings("try")
         @Override
-        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg2) {
-            // @formatter:off
-            //         if (thisString == obj) {
-            //            return true;
-            //        }
-            //        if (!(obj instanceof String)) {
-            //            return false;
-            //        }
-            //        String thatString = (String) obj;
-            //        if (getCoder(thisString) != getCoder(thatString)) {
-            //            return false;
-            //        }
-            //        final byte[] array1 = getValue(thisString);
-            //        final byte[] array2 = getValue(thatString);
-            //        if (array1.length != array2.length) {
-            //            return false;
-            //        }
-            //        if (array1.length == 0) {
-            //            return true;
-            //        }
-            //
-            //        return ArrayEqualsNode.equals(array1, array2, GraalDirectives.isCompilationConstant(thatString) ? array2.length : array1.length);
-            // @formatter:on
+        public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode other) {
             if (!b.canMergeIntrinsicReturns()) {
                 return false;
             }
             try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
-                ResolvedJavaField valueField = b.getMetaAccess().lookupJavaField(STRING_VALUE_FIELD);
+                ConstantNode trueValue = ConstantNode.forBoolean(true);
+                ConstantNode falseValue = ConstantNode.forBoolean(false);
 
-                ValueNode arg1 = receiver.get();
-                helper.emitReturnIf(b.add(new ObjectEqualsNode(arg1, arg2)), b.add(ConstantNode.forBoolean(true)), BranchProbabilityNode.SLOW_PATH_PROBABILITY);
+                // if (this == other) return true
+                ValueNode thisString = receiver.get();
+                helper.emitReturnIf(b.add(new ObjectEqualsNode(thisString, other)), trueValue, BranchProbabilityNode.SLOW_PATH_PROBABILITY);
 
+                // if (!(other instanceof String)) return false
                 TypeReference stringType = TypeReference.createTrusted(b.getAssumptions(), b.getMetaAccess().lookupJavaType(String.class));
-                GuardingNode stringArg2Guard = helper.emitReturnIfNot(InstanceOfNode.create(stringType, arg2), b.add(ConstantNode.forBoolean(false)),
+                GuardingNode stringArg2Guard = helper.emitReturnIfNot(InstanceOfNode.create(stringType, other), b.add(falseValue),
                                 BranchProbabilityNode.SLOW_PATH_PROBABILITY);
-                Stamp stamp2 = StampFactory.objectNonNull(stringType);
-                ValueNode stringArg2 = b.add(new PiNode(arg2, stamp2, stringArg2Guard.asNode()));
+                Stamp stamp = StampFactory.objectNonNull(stringType);
+                ValueNode otherString = b.add(new PiNode(other, stamp, stringArg2Guard.asNode()));
 
                 if (JavaVersionUtil.JAVA_SPEC > 8) {
                     ResolvedJavaField coderField = b.getMetaAccess().lookupJavaField(STRING_CODER_FIELD);
-                    ValueNode thisCoder = helper.loadField(arg1, coderField);
-                    ValueNode thatCoder = helper.loadField(stringArg2, coderField);
-                    helper.emitReturnIfNot(b.add(new IntegerEqualsNode(thisCoder, thatCoder)), b.add(ConstantNode.forBoolean(false)), BranchProbabilityNode.SLOW_PATH_PROBABILITY);
+                    ValueNode thisCoder = helper.loadField(thisString, coderField);
+                    ValueNode thatCoder = helper.loadField(otherString, coderField);
+                    // if (thisString.coder != otherString.coder) return false
+                    helper.emitReturnIfNot(b.add(new IntegerEqualsNode(thisCoder, thatCoder)), falseValue, BranchProbabilityNode.SLOW_PATH_PROBABILITY);
                 }
 
-                ValueNode thisValue = b.nullCheckedValue(helper.loadField(stringArg2, valueField));
-                ValueNode thatValue = b.nullCheckedValue(helper.loadField(arg1, valueField));
-
-                ValueNode thisLength = b.add(new ArrayLengthNode(thisValue));
-                ValueNode thatLength = b.add(new ArrayLengthNode(thatValue));
-                helper.emitReturnIfNot(IntegerEqualsNode.create(thisLength, thatLength, NodeView.DEFAULT), b.add(ConstantNode.forBoolean(false)), BranchProbabilityNode.SLOW_PATH_PROBABILITY);
-                helper.emitReturnIf(IntegerEqualsNode.create(thisLength, b.add(ConstantNode.forInt(0)), NodeView.DEFAULT), b.add(ConstantNode.forBoolean(true)),
+                ResolvedJavaField valueField = b.getMetaAccess().lookupJavaField(STRING_VALUE_FIELD);
+                ValueNode thisValue = b.nullCheckedValue(helper.loadField(otherString, valueField));
+                ValueNode thatValue = b.nullCheckedValue(helper.loadField(thisString, valueField));
+
+                ValueNode thisLength = helper.arraylength(thisValue);
+                ValueNode thatLength = helper.arraylength(thatValue);
+                // if (thisString.value.length != otherString.value.length) return false
+                helper.emitReturnIfNot(IntegerEqualsNode.create(thisLength, thatLength, NodeView.DEFAULT), falseValue, BranchProbabilityNode.SLOW_PATH_PROBABILITY);
+                // if (length == 0) return true
+                helper.emitReturnIf(IntegerEqualsNode.create(thisLength, ConstantNode.forInt(0), NodeView.DEFAULT), trueValue,
                                 BranchProbabilityNode.SLOW_PATH_PROBABILITY);
+                // compare the array bodies
                 helper.emitFinalReturn(JavaKind.Boolean, b.append(new ArrayEqualsNode(thisValue, thatValue, thisLength.isConstant() ? thisLength : thatLength,
                                 JavaVersionUtil.JAVA_SPEC > 8 ? JavaKind.Byte : JavaKind.Char)));
             }
@@ -1913,35 +1899,23 @@ public static class StringLatin1IndexOfCharPlugin implements InvocationPlugin {
         @SuppressWarnings("try")
         @Override
         public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value, ValueNode ch, ValueNode origFromIndex) {
-            // @formatter:off
-            //     public static int indexOf(byte[] value, int ch, int origFromIndex) {
-            //         int fromIndex = origFromIndex;
-            //        if (injectBranchProbability(UNLIKELY_PROBABILITY, ch >>> 8 != 0)) {
-            //            // search value must be a byte value
-            //            return -1;
-            //        }
-            //        int length = value.length;
-            //        if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex < 0)) {
-            //            fromIndex = 0;
-            //        } else if (injectBranchProbability(UNLIKELY_PROBABILITY, fromIndex >= length)) {
-            //            // Note: fromIndex might be near -1>>>1.
-            //            return -1;
-            //        }
-            //        return ArrayIndexOf.indexOf1Byte(value, length, fromIndex, (byte) ch);
-            //     }
-            // @formatter:on
             if (!b.canMergeIntrinsicReturns()) {
                 return false;
             }
             try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
                 ConstantNode zero = ConstantNode.forInt(0);
+                // if (ch >>> 8 != 0) return -1
                 helper.emitReturnIf(helper.ushr(ch, 8), Condition.NE, zero, ConstantNode.forInt(-1), GraalDirectives.UNLIKELY_PROBABILITY);
                 ValueNode nonNullValue = b.nullCheckedValue(value);
-                ValueNode length = b.add(new ArrayLengthNode(nonNullValue));
+
+                // if (fromIndex >= value.length) return -1
+                ValueNode length = helper.arraylength(nonNullValue);
                 helper.emitReturnIf(origFromIndex, Condition.GE, length, ConstantNode.forInt(-1), GraalDirectives.UNLIKELY_PROBABILITY);
-                LogicNode condition = helper.createCompare(CanonicalCondition.LT, origFromIndex, zero);
-                ValueNode fromIndex = b.add(ConditionalNode.create(condition, zero, origFromIndex, NodeView.DEFAULT));
-                helper.emitFinalReturn(JavaKind.Int, b.append(new ArrayIndexOfDispatchNode(STUB_INDEX_OF_1_BYTE, JavaKind.Byte, JavaKind.Byte, false, nonNullValue, length, fromIndex, ch)));
+                LogicNode condition = helper.createCompare(origFromIndex, CanonicalCondition.LT, zero);
+                // fromIndex = max(fromIndex, 0)
+                ValueNode fromIndex = ConditionalNode.create(condition, zero, origFromIndex, NodeView.DEFAULT);
+                helper.emitFinalReturn(JavaKind.Int, new ArrayIndexOfDispatchNode(STUB_INDEX_OF_1_BYTE, JavaKind.Byte, JavaKind.Byte,
+                                false, nonNullValue, length, fromIndex, ch));
             }
             return true;
         }

From 7682a4dd4132a0cbdca9cd3d2095dca79921ce08 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Thu, 21 Oct 2021 12:01:22 -0700
Subject: [PATCH 581/681] Convert assert to guarantee

---
 .../graalvm/compiler/replacements/InvocationPluginHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
index 95df4bc3499e..4827f1260f14 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
@@ -290,7 +290,7 @@ public ResolvedJavaField getField(ResolvedJavaType type, String fieldName) {
      * plugin that uses a field offset them some extra machinery will be needed to delay the lookup.
      */
     public ValueNode getFieldOffset(ResolvedJavaType type, String fieldName) {
-        assert !IS_BUILDING_NATIVE_IMAGE || !b.parsingIntrinsic() : "these values must be deferred in substitutions and snippets";
+        GraalError.guarantee(!IS_BUILDING_NATIVE_IMAGE || !b.parsingIntrinsic(), "these values must be deferred in substitutions and snippets");
         return ConstantNode.forInt(getField(type, fieldName).getOffset());
     }
 

From 7162365d223fdce3bd180b2611741f32a4013191 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Mon, 18 Oct 2021 11:56:28 -0700
Subject: [PATCH 582/681] Remove support for outdated JDK versions between 11
 and 17

---
 substratevm/CHANGELOG.md                      |  4 +-
 substratevm/mx.substratevm/suite.py           | 58 ++-----------------
 .../svm/core/graal/llvm/LLVMGenerator.java    | 31 +++++-----
 .../Target_java_lang_Module_JDK11OrLater.java | 14 ++---
 .../core/jdk15/HiddenClassSupportImpl.java    | 52 -----------------
 .../JDKClassLoadingDeadlockWorkaround.java    | 51 ----------------
 .../jdk17/RecordSupportJDK17OrLater.java}     | 10 ++--
 ...t_java_lang_ClassLoader_JDK17OrLater.java} | 20 +++----
 ...Target_java_lang_Module_JDK17OrLater.java} |  8 +--
 ...va_nio_DirectByteBuffer_JDK17OrLater.java} | 26 ++++-----
 ...ernal_loader_BootLoader_JDK17OrLater.java} |  8 +--
 .../src/com/oracle/svm/core/Containers.java   |  2 +-
 .../com/oracle/svm/core/SubstrateOptions.java |  2 +-
 .../com/oracle/svm/core/SubstrateUtil.java    |  4 +-
 ...Target_java_lang_ref_PhantomReference.java |  4 +-
 .../heap/Target_java_lang_ref_Reference.java  | 14 ++---
 .../heap/Target_jdk_internal_ref_Cleaner.java | 14 ++---
 .../com/oracle/svm/core/hub/DynamicHub.java   | 33 +++++------
 .../svm/core/jdk/HiddenClassSupport.java      | 52 -----------------
 .../com/oracle/svm/core/jdk/JDK11To14.java    | 36 ------------
 .../com/oracle/svm/core/jdk/JDK11To16.java    | 36 ------------
 .../svm/core/jdk/JDK11_0_10OrEarlier.java     | 38 ------------
 .../svm/core/jdk/JDK11_0_11OrLater.java       | 38 ------------
 .../oracle/svm/core/jdk/JDK14OrEarlier.java   | 36 ------------
 .../com/oracle/svm/core/jdk/JDK14OrLater.java | 36 ------------
 .../oracle/svm/core/jdk/JDK15OrEarlier.java   | 36 ------------
 .../com/oracle/svm/core/jdk/JDK15OrLater.java | 36 ------------
 .../oracle/svm/core/jdk/JDK16OrEarlier.java   | 36 ------------
 .../com/oracle/svm/core/jdk/JDK16OrLater.java | 36 ------------
 .../svm/core/jdk/JavaLangSubstitutions.java   |  2 +-
 .../Package_jdk_internal_loader_helper.java   |  2 +-
 .../oracle/svm/core/jdk/RecomputedFields.java |  6 +-
 .../oracle/svm/core/jdk/RecordSupport.java    | 10 ++--
 .../svm/core/jdk/SecuritySubstitutions.java   |  8 +--
 .../svm/core/jdk/SunMiscSubstitutions.java    |  8 +--
 .../svm/core/jdk/SunNioSubstitutions.java     |  4 +-
 .../jdk/Target_java_lang_ClassLoader.java     | 12 ++--
 .../jdk/Target_javax_net_ssl_SSLContext.java  | 43 --------------
 ...rget_jdk_internal_util_StaticProperty.java |  8 +--
 ...jdk_nashorn_api_scripting_ClassFilter.java |  2 +-
 ..._scripting_NashornScriptEngineFactory.java |  2 +-
 .../core/jdk/ThreadLocalRandomAccessors.java  |  4 +-
 .../oracle/svm/core/jdk/VarHandleFeature.java |  4 +-
 ...rviceProviderPool_OptimizedLocaleMode.java |  4 +-
 .../SubstrateOperatingSystemMXBean.java       |  6 +-
 .../SubstrateOperatingSystemMXBeanBase.java   |  3 +-
 .../oracle/svm/core/thread/JavaThreads.java   |  6 +-
 .../core/thread/Target_java_lang_Thread.java  | 18 +++---
 .../com/oracle/svm/driver/NativeImage.java    |  2 +-
 .../JNIRegistrationSupport_JDK17OrLater.java} | 13 ++++-
 .../hosted/NativeImageGeneratorRunner.java    |  4 +-
 .../src/com/oracle/svm/hosted/SVMHost.java    |  4 +-
 .../svm/hosted/SecurityServicesFeature.java   | 12 ++--
 .../analysis/DynamicHubInitializer.java       | 10 ++--
 .../svm/hosted/image/sources/SourceCache.java |  6 +-
 .../svm/hosted/jdk/JDKRegistrations.java      |  7 +--
 .../hosted/jdk/JNIRegistrationJavaNet.java    | 14 +++--
 .../hosted/jdk/JNIRegistrationJavaNio.java    | 15 +++--
 .../hosted/jdk/JNIRegistrationSupport.java    |  4 +-
 .../SubstrateGraphBuilderPlugins.java         |  2 +-
 .../UnsafeAutomaticSubstitutionProcessor.java |  6 +-
 .../src/com/oracle/svm/jfr/JfrEnabled.java    |  2 +-
 .../com/oracle/svm/jfr/JfrTypeRepository.java |  7 ++-
 .../svm/jfr/Target_jdk_jfr_internal_JVM.java  | 29 +++++-----
 .../svm/jfr/logging/JfrLogConfiguration.java  | 12 +---
 .../methodhandles/MethodHandleFeature.java    |  2 +-
 ..._java_lang_invoke_MethodHandleNatives.java | 19 +++---
 ...java_lang_invoke_MethodHandles_Lookup.java | 20 +++----
 ...et_java_lang_reflect_AccessibleObject.java |  4 +-
 .../src/com/oracle/svm/test/GitHub1398.java   |  2 +-
 70 files changed, 246 insertions(+), 873 deletions(-)
 delete mode 100644 substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/HiddenClassSupportImpl.java
 delete mode 100644 substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/JDKClassLoadingDeadlockWorkaround.java
 rename substratevm/src/{com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/RecordSupportJDK16OrLater.java => com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/RecordSupportJDK17OrLater.java} (93%)
 rename substratevm/src/{com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_ClassLoader_JDK15OrLater.java => com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_ClassLoader_JDK17OrLater.java} (87%)
 rename substratevm/src/{com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java => com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_Module_JDK17OrLater.java} (90%)
 rename substratevm/src/{com.oracle.svm.core.jdk14/src/com/oracle/svm/core/jdk14/Target_java_nio_DirectByteBuffer_JDK14OrLater.java => com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_nio_DirectByteBuffer_JDK17OrLater.java} (76%)
 rename substratevm/src/{com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_jdk_internal_loader_BootLoader_JDK15OrLater.java => com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_loader_BootLoader_JDK17OrLater.java} (89%)
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HiddenClassSupport.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To14.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To16.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_10OrEarlier.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_11OrLater.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrEarlier.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrLater.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrEarlier.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrLater.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrEarlier.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrLater.java
 delete mode 100644 substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_javax_net_ssl_SSLContext.java
 rename substratevm/src/{com.oracle.svm.hosted.jdk14/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport_JDK14OrLater.java => com.oracle.svm.hosted.jdk17/src/com/oracle/svm/hosted/jdk17/JNIRegistrationSupport_JDK17OrLater.java} (82%)

diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md
index 5823faf69b22..b01373c7212c 100644
--- a/substratevm/CHANGELOG.md
+++ b/substratevm/CHANGELOG.md
@@ -1,10 +1,10 @@
 # Native Image Changelog
 
-This changelog summarizes major changes to Native Image, developed under the codename **Substrate VM**.
+This changelog summarizes major changes to GraalVM Native Image.
 
 ## Version 22.0.0
 * (GR-33930) Decouple HostedOptionParser setup from classpath/modulepath scanning (use ServiceLoader for collecting options).
 * (GR-33504) Implement --add-reads for native-image and fix --add-opens error handling.
 * (GR-33983) Remove obsolete com.oracle.svm.thirdparty.jline.JLineFeature from substratevm:LIBRARY_SUPPORT.
+* (GR-34577) Remove support for outdated JDK versions between 11 and 17. Since JDK versions 12, 13, 14, 15, 16 are no longer supported, there is no need to explicitly check for and allow these versions.
 
-## Version 21.3.0

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index c1b7e79a15bf..add17042b116 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -230,58 +230,13 @@
             "workingSets": "SVM",
         },
 
-        "com.oracle.svm.core.jdk14": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.access.foreign",
-                ],
-            },
-            "javaCompliance": "14+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
-        "com.oracle.svm.core.jdk15": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core.jdk11"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.loader",
-                    "jdk.internal.misc",
-                    "sun.invoke.util",
-                ],
-            },
-            "javaCompliance": "15+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
-        "com.oracle.svm.core.jdk16": {
-            "subDir": "src",
-            "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
-            "requiresConcealed" : {
-                "java.base" : [
-                    "jdk.internal.loader",
-                    "jdk.internal.misc",
-                    "sun.invoke.util",
-                ],
-            },
-            "javaCompliance": "16+",
-            "checkstyle": "com.oracle.svm.core",
-            "workingSets": "SVM",
-        },
-
         "com.oracle.svm.core.jdk17": {
             "subDir": "src",
             "sourceDirs": ["src"],
-            "dependencies": ["com.oracle.svm.core"],
+            "dependencies": ["com.oracle.svm.core.jdk11"],
             "requiresConcealed" : {
                 "java.base" : [
+                    "jdk.internal.access.foreign",
                     "jdk.internal.loader",
                     "jdk.internal.misc",
                     "jdk.internal.platform",
@@ -455,7 +410,7 @@
             ],
             "workingSets": "SVM",
         },
-        "com.oracle.svm.hosted.jdk14": {
+        "com.oracle.svm.hosted.jdk17": {
             "subDir": "src",
             "sourceDirs": ["src"],
             "dependencies": [
@@ -467,7 +422,7 @@
                 "jdk.internal.vm.ci" :
                     ["jdk.vm.ci.meta"],
             },
-            "javaCompliance": "14+",
+            "javaCompliance": "17+",
             "annotationProcessors": [
                 "compiler:GRAAL_PROCESSOR",
             ],
@@ -1079,13 +1034,10 @@
                 "com.oracle.svm.hosted",
                 "com.oracle.svm.hosted.jdk8",
                 "com.oracle.svm.hosted.jdk11",
-                "com.oracle.svm.hosted.jdk14",
+                "com.oracle.svm.hosted.jdk17",
                 "com.oracle.svm.core",
                 "com.oracle.svm.core.jdk8",
                 "com.oracle.svm.core.jdk11",
-                "com.oracle.svm.core.jdk14",
-                "com.oracle.svm.core.jdk15",
-                "com.oracle.svm.core.jdk16",
                 "com.oracle.svm.core.jdk17",
                 "com.oracle.svm.core.graal.amd64",
                 "com.oracle.svm.core.graal.aarch64",
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
index fc117c5a3ae1..de477e6a83f4 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
@@ -40,9 +40,6 @@
 import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
 import static org.graalvm.compiler.debug.GraalError.unimplemented;
 
-// Checkstyle: allow reflection
-import java.lang.reflect.Field;
-// Checkstyle: disallow reflection
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -131,6 +128,7 @@
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMBasicBlockRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
+import com.oracle.svm.util.ReflectionUtil;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
@@ -2015,25 +2013,22 @@ public void emitCacheWritebackSync(boolean isPreSync) {
 
     /**
      * Gets the value of {@code jdk.internal.misc.UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE} which
-     * was introduced in JDK 14 by JEP 352.
+     * was introduced after JDK 11 by JEP 352.
      *
-     * This method uses reflection to be compatible with JDKs prior to 14.
+     * This method uses reflection to be compatible with JDK 11 and earlier.
      */
     private static int initDataCacheLineFlushSize() {
-        if (JavaVersionUtil.JAVA_SPEC >= 14) {
-            Class<?> c;
-            try {
-                // Checkstyle: stop
-                c = Class.forName("jdk.internal.misc.UnsafeConstants");
-                // Checkstyle: resume
-                Field f = c.getDeclaredField("DATA_CACHE_LINE_FLUSH_SIZE");
-                f.setAccessible(true);
-                return (int) f.get(null);
-            } catch (Exception e) {
-                throw new GraalError(e, "Expected UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE to exist and be readable");
-            }
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
+            return 0;
+        }
+        try {
+            // Checkstyle: stop
+            Class<?> c = Class.forName("jdk.internal.misc.UnsafeConstants");
+            // Checkstyle: resume
+            return ReflectionUtil.readStaticField(c, "DATA_CACHE_LINE_FLUSH_SIZE");
+        } catch (ClassNotFoundException e) {
+            throw new GraalError(e, "Expected UnsafeConstants.DATA_CACHE_LINE_FLUSH_SIZE to exist and be readable");
         }
-        return 0;
     }
 
     private static int getDataCacheLineFlushSize() {
diff --git a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java
index 53b5b2217105..a77695ddac3f 100644
--- a/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk11/src/com/oracle/svm/core/jdk11/Target_java_lang_Module_JDK11OrLater.java
@@ -24,21 +24,21 @@
  */
 package com.oracle.svm.core.jdk11;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Objects;
+
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK11To14;
 import com.oracle.svm.core.jdk.Resources;
 import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Objects;
-
 @SuppressWarnings("unused")
 @TargetClass(value = java.lang.Module.class, onlyWith = JDK11OrLater.class)
 public final class Target_java_lang_Module_JDK11OrLater {
@@ -58,7 +58,7 @@ public InputStream getResourceAsStream(String name) {
     }
 
     @Substitute //
-    @TargetElement(onlyWith = JDK11To14.class)
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
     private static void defineModule0(Module module, boolean isOpen, String version, String location, String[] pns) {
         ModuleUtil.defineModule(module, isOpen, Arrays.asList(pns));
     }
diff --git a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/HiddenClassSupportImpl.java b/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/HiddenClassSupportImpl.java
deleted file mode 100644
index a8981b0cfd79..000000000000
--- a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/HiddenClassSupportImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk15;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.hosted.Feature;
-
-import com.oracle.svm.core.annotate.AutomaticFeature;
-import com.oracle.svm.core.jdk.HiddenClassSupport;
-
-final class HiddenClassSupportImpl extends HiddenClassSupport {
-    @Override
-    public boolean isHidden(Class<?> clazz) {
-        return clazz.isHidden();
-    }
-}
-
-@AutomaticFeature
-final class HiddenClassFeature implements Feature {
-    @Override
-    public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return JavaVersionUtil.JAVA_SPEC >= 15;
-    }
-
-    @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(HiddenClassSupport.class, new HiddenClassSupportImpl());
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/JDKClassLoadingDeadlockWorkaround.java b/substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/JDKClassLoadingDeadlockWorkaround.java
deleted file mode 100644
index 70fdf9871f68..000000000000
--- a/substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/JDKClassLoadingDeadlockWorkaround.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk16;
-
-import java.lang.constant.ConstantDescs;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.nativeimage.hosted.Feature;
-
-import com.oracle.svm.core.annotate.AutomaticFeature;
-
-/**
- * Workaround for JDK bug JDK-8263108. Class initialization of classes in java.lang.constant can
- * deadlock during the multi-threaded static analysis. Forcing class initialization early before the
- * analysis resolves the problem.
- */
-@AutomaticFeature
-final class JDKClassLoadingDeadlockWorkaround implements Feature {
-    @Override
-    public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return JavaVersionUtil.JAVA_SPEC >= 16;
-    }
-
-    @SuppressWarnings("unused")
-    @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        Object unused = ConstantDescs.CD_Object;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/RecordSupportJDK16OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/RecordSupportJDK17OrLater.java
similarity index 93%
rename from substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/RecordSupportJDK16OrLater.java
rename to substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/RecordSupportJDK17OrLater.java
index 70e543c7697a..4a38a60ba77e 100644
--- a/substratevm/src/com.oracle.svm.core.jdk16/src/com/oracle/svm/core/jdk16/RecordSupportJDK16OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/RecordSupportJDK17OrLater.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk16;
+package com.oracle.svm.core.jdk17;
 
 // Checkstyle: allow reflection
 
@@ -39,7 +39,7 @@
 import com.oracle.svm.core.jdk.RecordSupport;
 import com.oracle.svm.core.util.VMError;
 
-final class RecordSupportJDK16OrLater extends RecordSupport {
+final class RecordSupportJDK17OrLater extends RecordSupport {
     @Override
     public boolean isRecord(Class<?> clazz) {
         return clazz.isRecord();
@@ -73,14 +73,14 @@ public Constructor<?> getCanonicalRecordConstructor(Class<?> clazz) {
 }
 
 @AutomaticFeature
-final class RecordFeatureJDK16OrLater implements Feature {
+final class RecordFeatureJDK17OrLater implements Feature {
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return JavaVersionUtil.JAVA_SPEC >= 16;
+        return JavaVersionUtil.JAVA_SPEC >= 17;
     }
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(RecordSupport.class, new RecordSupportJDK16OrLater());
+        ImageSingletons.add(RecordSupport.class, new RecordSupportJDK17OrLater());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_ClassLoader_JDK15OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_ClassLoader_JDK17OrLater.java
similarity index 87%
rename from substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_ClassLoader_JDK15OrLater.java
rename to substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_ClassLoader_JDK17OrLater.java
index d3cf2247687a..414a31e47c77 100644
--- a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_ClassLoader_JDK15OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_ClassLoader_JDK17OrLater.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk15;
+package com.oracle.svm.core.jdk17;
 
 import java.io.File;
 import java.util.Deque;
@@ -32,15 +32,15 @@
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDK15OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.NativeLibrarySupport;
 
 import jdk.internal.loader.NativeLibraries;
 import jdk.internal.loader.NativeLibrary;
 
-@TargetClass(value = ClassLoader.class, onlyWith = JDK15OrLater.class)
+@TargetClass(value = ClassLoader.class, onlyWith = JDK17OrLater.class)
 @SuppressWarnings({"static-method", "unused"})
-final class Target_java_lang_ClassLoader_JDK15OrLater {
+final class Target_java_lang_ClassLoader_JDK17OrLater {
 
     @Substitute
     static NativeLibrary loadLibrary(Class<?> fromClass, String name) {
@@ -57,8 +57,8 @@ static NativeLibrary loadLibrary(Class<?> fromClass, File file) {
     }
 }
 
-@TargetClass(value = jdk.internal.loader.NativeLibraries.class, onlyWith = JDK15OrLater.class)
-final class Target_jdk_internal_loader_NativeLibraries_JDK15OrLater {
+@TargetClass(value = jdk.internal.loader.NativeLibraries.class, onlyWith = JDK17OrLater.class)
+final class Target_jdk_internal_loader_NativeLibraries_JDK17OrLater {
 
     /**
      * The NativeLibraries is only used by the `loadLibrary` methods that are substituted, so we do
@@ -88,7 +88,7 @@ public static NativeLibraries jniNativeLibraries(ClassLoader loader) {
      */
 
     @Delete
-    private static native boolean load(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater impl, String name, boolean isBuiltin, boolean isJNI);
+    private static native boolean load(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater impl, String name, boolean isBuiltin, boolean isJNI);
 
     @Delete
     private static native void unload(String name, boolean isBuiltin, boolean isJNI, long handle);
@@ -97,9 +97,9 @@ public static NativeLibraries jniNativeLibraries(ClassLoader loader) {
     private static native String findBuiltinLib(String name);
 
     @Delete
-    private static native long findEntry0(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater lib, String name);
+    private static native long findEntry0(Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater lib, String name);
 }
 
-@TargetClass(value = jdk.internal.loader.NativeLibraries.class, innerClass = "NativeLibraryImpl", onlyWith = JDK15OrLater.class)
-final class Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK15OrLater {
+@TargetClass(value = jdk.internal.loader.NativeLibraries.class, innerClass = "NativeLibraryImpl", onlyWith = JDK17OrLater.class)
+final class Target_jdk_internal_loader_NativeLibraries_NativeLibraryImpl_JDK17OrLater {
 }
diff --git a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_Module_JDK17OrLater.java
similarity index 90%
rename from substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java
rename to substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_Module_JDK17OrLater.java
index f4ca16397f9e..787a9785d78a 100644
--- a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_java_lang_Module_JDK15OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_lang_Module_JDK17OrLater.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk15;
+package com.oracle.svm.core.jdk17;
 
 import java.util.Arrays;
 import java.util.List;
@@ -31,12 +31,12 @@
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDK15OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk11.ModuleUtil;
 
 @SuppressWarnings("unused")
-@TargetClass(value = Module.class, onlyWith = JDK15OrLater.class)
-public final class Target_java_lang_Module_JDK15OrLater {
+@TargetClass(value = Module.class, onlyWith = JDK17OrLater.class)
+public final class Target_java_lang_Module_JDK17OrLater {
 
     // Checkstyle: allow synchronization
     @Substitute
diff --git a/substratevm/src/com.oracle.svm.core.jdk14/src/com/oracle/svm/core/jdk14/Target_java_nio_DirectByteBuffer_JDK14OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_nio_DirectByteBuffer_JDK17OrLater.java
similarity index 76%
rename from substratevm/src/com.oracle.svm.core.jdk14/src/com/oracle/svm/core/jdk14/Target_java_nio_DirectByteBuffer_JDK14OrLater.java
rename to substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_nio_DirectByteBuffer_JDK17OrLater.java
index 9fc54b52b726..122b63bccbed 100644
--- a/substratevm/src/com.oracle.svm.core.jdk14/src/com/oracle/svm/core/jdk14/Target_java_nio_DirectByteBuffer_JDK14OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_java_nio_DirectByteBuffer_JDK17OrLater.java
@@ -22,48 +22,48 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk14;
+package com.oracle.svm.core.jdk17;
 
 import java.io.FileDescriptor;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDK14OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 
 import jdk.internal.access.foreign.MemorySegmentProxy;
 
-@TargetClass(className = "java.nio.DirectByteBuffer", onlyWith = JDK14OrLater.class)
+@TargetClass(className = "java.nio.DirectByteBuffer", onlyWith = JDK17OrLater.class)
 @SuppressWarnings("unused")
-final class Target_java_nio_DirectByteBuffer_JDK14OrLater {
+final class Target_java_nio_DirectByteBuffer_JDK17OrLater {
 
     @Alias
-    protected Target_java_nio_DirectByteBuffer_JDK14OrLater(int cap, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync, MemorySegmentProxy segment) {
+    protected Target_java_nio_DirectByteBuffer_JDK17OrLater(int cap, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync, MemorySegmentProxy segment) {
     }
 
 }
 
-@TargetClass(className = "java.nio.DirectByteBufferR", onlyWith = JDK14OrLater.class)
+@TargetClass(className = "java.nio.DirectByteBufferR", onlyWith = JDK17OrLater.class)
 @SuppressWarnings("unused")
-final class Target_java_nio_DirectByteBufferR_JDK14OrLater {
+final class Target_java_nio_DirectByteBufferR_JDK17OrLater {
 
     @Alias
-    protected Target_java_nio_DirectByteBufferR_JDK14OrLater(int cap, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync, MemorySegmentProxy segment) {
+    protected Target_java_nio_DirectByteBufferR_JDK17OrLater(int cap, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync, MemorySegmentProxy segment) {
     }
 
 }
 
-@TargetClass(className = "sun.nio.ch.Util", onlyWith = JDK14OrLater.class)
+@TargetClass(className = "sun.nio.ch.Util", onlyWith = JDK17OrLater.class)
 final class Target_sun_nio_ch_Util {
 
     @Substitute
-    private static Target_java_nio_DirectByteBuffer_JDK14OrLater newMappedByteBuffer(int size, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync) {
-        return new Target_java_nio_DirectByteBuffer_JDK14OrLater(size, addr, fd, unmapper, isSync, null);
+    private static Target_java_nio_DirectByteBuffer_JDK17OrLater newMappedByteBuffer(int size, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync) {
+        return new Target_java_nio_DirectByteBuffer_JDK17OrLater(size, addr, fd, unmapper, isSync, null);
     }
 
     @Substitute
-    static Target_java_nio_DirectByteBufferR_JDK14OrLater newMappedByteBufferR(int size, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync) {
-        return new Target_java_nio_DirectByteBufferR_JDK14OrLater(size, addr, fd, unmapper, isSync, null);
+    static Target_java_nio_DirectByteBufferR_JDK17OrLater newMappedByteBufferR(int size, long addr, FileDescriptor fd, Runnable unmapper, boolean isSync) {
+        return new Target_java_nio_DirectByteBufferR_JDK17OrLater(size, addr, fd, unmapper, isSync, null);
     }
 
 }
diff --git a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_jdk_internal_loader_BootLoader_JDK15OrLater.java b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_loader_BootLoader_JDK17OrLater.java
similarity index 89%
rename from substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_jdk_internal_loader_BootLoader_JDK15OrLater.java
rename to substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_loader_BootLoader_JDK17OrLater.java
index 09c1e91120f3..b44b604085b7 100644
--- a/substratevm/src/com.oracle.svm.core.jdk15/src/com/oracle/svm/core/jdk15/Target_jdk_internal_loader_BootLoader_JDK15OrLater.java
+++ b/substratevm/src/com.oracle.svm.core.jdk17/src/com/oracle/svm/core/jdk17/Target_jdk_internal_loader_BootLoader_JDK17OrLater.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.core.jdk15;
+package com.oracle.svm.core.jdk17;
 
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.jdk.JDK15OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 
-@TargetClass(className = "jdk.internal.loader.BootLoader", onlyWith = JDK15OrLater.class)
-final class Target_jdk_internal_loader_BootLoader_JDK15OrLater {
+@TargetClass(className = "jdk.internal.loader.BootLoader", onlyWith = JDK17OrLater.class)
+final class Target_jdk_internal_loader_BootLoader_JDK17OrLater {
 
     @SuppressWarnings("unused")
     @Substitute
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
index f6828743c3dd..1c338ac0fc4d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
@@ -44,7 +44,7 @@
 /**
  * Provides container awareness to the rest of the VM.
  *
- * The implementation is based on the Container Metrics API from JDK 15.
+ * The implementation is based on the Container Metrics API from JDK 17.
  */
 public class Containers {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index 399eb506bfe0..a55ded155484 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -359,7 +359,7 @@ public static final long getTearDownFailureNanos() {
         @Override
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, String oldValue, String newValue) {
             if ("llvm".equals(newValue)) {
-                if (JavaVersionUtil.JAVA_SPEC >= 9) {
+                if (JavaVersionUtil.JAVA_SPEC >= 11) {
                     /* See GR-14405, https://github.com/oracle/graal/issues/1056 */
                     GraalOptions.EmitStringSubstitutions.update(values, false);
                 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
index 0cb5e35fdeb1..2f8bfa179701 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
@@ -403,10 +403,10 @@ public static String mangleName(String methodName) {
         return mangled;
     }
 
-    private static final Method isHiddenMethod = JavaVersionUtil.JAVA_SPEC >= 15 ? ReflectionUtil.lookupMethod(Class.class, "isHidden") : null;
+    private static final Method isHiddenMethod = JavaVersionUtil.JAVA_SPEC >= 17 ? ReflectionUtil.lookupMethod(Class.class, "isHidden") : null;
 
     public static boolean isHiddenClass(Class<?> javaClass) {
-        if (JavaVersionUtil.JAVA_SPEC >= 15) {
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
             try {
                 return (boolean) isHiddenMethod.invoke(javaClass);
             } catch (IllegalAccessException | InvocationTargetException e) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_PhantomReference.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_PhantomReference.java
index 0537604c629b..e6a3b291f5d8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_PhantomReference.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_PhantomReference.java
@@ -30,12 +30,12 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
-import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 
 @TargetClass(PhantomReference.class)
 public final class Target_java_lang_ref_PhantomReference<T> {
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     boolean refersTo0(Object obj) {
         return ReferenceInternals.refersTo(SubstrateUtil.cast(this, PhantomReference.class), obj);
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
index 79281b6269b3..848b5db4978e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
@@ -31,12 +31,12 @@
 import java.lang.reflect.Field;
 import java.util.function.BooleanSupplier;
 
-import com.oracle.svm.core.SubstrateUtil;
 import org.graalvm.compiler.api.directives.GraalDirectives;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.ExcludeFromReferenceMap;
@@ -50,7 +50,7 @@
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.annotate.UnknownClass;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.JDK17_0_2OrLater;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.util.VMError;
@@ -134,7 +134,7 @@ public void clear() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private void clear0() {
         clear();
     }
@@ -144,11 +144,11 @@ private void clear0() {
     native boolean refersToImpl(T obj);
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public native boolean refersTo(T obj);
 
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     boolean refersTo0(Object obj) {
         return ReferenceInternals.refersTo(SubstrateUtil.cast(this, Reference.class), obj);
     }
@@ -204,11 +204,11 @@ static void reachabilityFence(Object ref) {
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK16OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     native T getFromInactiveFinalReference();
 
     @Substitute //
-    @TargetElement(onlyWith = JDK16OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     void clearInactiveFinalReference() {
         // assert this instanceof FinalReference;
         assert next != null; // I.e. FinalReference is inactive
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java
index c610ee7be797..fab9b8081c7e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_jdk_internal_ref_Cleaner.java
@@ -35,8 +35,8 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK15OrEarlier;
 
 @Platforms(Platform.HOSTED_ONLY.class)
 class Package_jdk_internal_ref implements Function<TargetClass, String> {
@@ -99,11 +99,11 @@ final class Target_jdk_internal_ref_CleanerImpl {
     Target_jdk_internal_ref_PhantomCleanable phantomCleanableList;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "jdk.internal.ref.CleanerImpl$WeakCleanableRef")//
-    @TargetElement(onlyWith = JDK15OrEarlier.class) //
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
     Target_jdk_internal_ref_WeakCleanable weakCleanableList;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "jdk.internal.ref.CleanerImpl$SoftCleanableRef")//
-    @TargetElement(onlyWith = JDK15OrEarlier.class) //
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
     Target_jdk_internal_ref_SoftCleanable softCleanableList;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.NewInstance, declClassName = "java.lang.ref.ReferenceQueue")//
@@ -114,12 +114,12 @@ final class Target_jdk_internal_ref_CleanerImpl {
 final class Target_jdk_internal_ref_PhantomCleanable {
 }
 
-// Removed by JDK-8251861 in JDK 16
-@TargetClass(className = "jdk.internal.ref.WeakCleanable", onlyWith = {JDK11OrLater.class, JDK15OrEarlier.class})
+// Removed by JDK-8251861
+@TargetClass(className = "jdk.internal.ref.WeakCleanable", onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
 final class Target_jdk_internal_ref_WeakCleanable {
 }
 
-// Removed by JDK-8251861 in JDK 16
-@TargetClass(className = "jdk.internal.ref.SoftCleanable", onlyWith = {JDK11OrLater.class, JDK15OrEarlier.class})
+// Removed by JDK-8251861
+@TargetClass(className = "jdk.internal.ref.SoftCleanable", onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
 final class Target_jdk_internal_ref_SoftCleanable {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
index d83b17f47a47..152a650b5892 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -79,8 +79,7 @@
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.code.CodeInfoDecoder;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK15OrLater;
-import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.jdk.Package_jdk_internal_reflect;
 import com.oracle.svm.core.jdk.Resources;
@@ -176,12 +175,12 @@ public final class DynamicHub implements JavaKind.FormatWithToString, AnnotatedE
     private static final int IS_INSTANTIATED_FLAG_BIT = 0;
 
     /**
-     * Is this a Hidden Class (Since JDK 15).
+     * Is this a Hidden Class.
      */
     private static final int IS_HIDDED_FLAG_BIT = 1;
 
     /**
-     * Is this a Record Class (Since JDK 15).
+     * Is this a Record Class.
      */
     private static final int IS_RECORD_FLAG_BIT = 2;
 
@@ -807,13 +806,13 @@ private boolean isAnonymousClass() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public boolean isHidden() {
         return isFlagSet(IS_HIDDED_FLAG_BIT);
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public boolean isRecord() {
         return isFlagSet(IS_RECORD_FLAG_BIT);
     }
@@ -1283,11 +1282,11 @@ private Method[] privateGetPublicMethods() {
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private native Target_java_lang_reflect_RecordComponent[] getRecordComponents();
 
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private Target_java_lang_reflect_RecordComponent[] getRecordComponents0() {
         Object[] result = rd.recordComponents;
         if (result == null) {
@@ -1567,14 +1566,14 @@ private Class<?>[] getNestMembers() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @Override
     public DynamicHub componentType() {
         return componentType;
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @Override
     public DynamicHub arrayType() {
         return arrayHub;
@@ -1587,20 +1586,20 @@ public DynamicHub arrayType() {
      */
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private Class<?> elementType() {
         throw VMError.unsupportedFeature("Method is not available in JDK 8 or JDK 11");
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @Override
     public String descriptorString() {
         throw VMError.unsupportedFeature("Method is not available in JDK 8 or JDK 11");
     }
 
     @KeepOriginal
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @Override
     public Optional<?> describeConstable() {
         throw VMError.unsupportedFeature("Method is not available in JDK 8 or JDK 11");
@@ -1687,21 +1686,21 @@ public Optional<?> describeConstable() {
  */
 
 @Substitute
-@TargetClass(className = "java.lang.constant.Constable", onlyWith = JDK15OrLater.class)
+@TargetClass(className = "java.lang.constant.Constable", onlyWith = JDK17OrLater.class)
 interface Target_java_lang_constant_Constable {
     @KeepOriginal
     Optional<?> describeConstable();
 }
 
 @Substitute
-@TargetClass(className = "java.lang.invoke.TypeDescriptor", onlyWith = JDK15OrLater.class)
+@TargetClass(className = "java.lang.invoke.TypeDescriptor", onlyWith = JDK17OrLater.class)
 interface Target_java_lang_invoke_TypeDescriptor {
     @KeepOriginal
     String descriptorString();
 }
 
 @Substitute
-@TargetClass(className = "java.lang.invoke.TypeDescriptor", innerClass = "OfField", onlyWith = JDK15OrLater.class)
+@TargetClass(className = "java.lang.invoke.TypeDescriptor", innerClass = "OfField", onlyWith = JDK17OrLater.class)
 interface Target_java_lang_invoke_TypeDescriptor_OfField<F extends Target_java_lang_invoke_TypeDescriptor_OfField<F>> extends Target_java_lang_invoke_TypeDescriptor {
     @KeepOriginal
     boolean isArray();
@@ -1737,6 +1736,6 @@ public static Target_jdk_internal_reflect_ReflectionFactory getReflectionFactory
     }
 }
 
-@TargetClass(className = "java.lang.reflect.RecordComponent", onlyWith = JDK16OrLater.class)
+@TargetClass(className = "java.lang.reflect.RecordComponent", onlyWith = JDK17OrLater.class)
 final class Target_java_lang_reflect_RecordComponent {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HiddenClassSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HiddenClassSupport.java
deleted file mode 100644
index 9f3713891e35..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/HiddenClassSupport.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.nativeimage.ImageSingletons;
-
-import com.oracle.svm.core.util.VMError;
-
-/**
- * Abstracts the information about hidden classes, which are not available in Java 11 and Java 8.
- * This class provides all information about hidden classes without exposing any JDK types and
- * methods that are not yet present in the old JDKs.
- */
-public abstract class HiddenClassSupport {
-    @Fold
-    public static HiddenClassSupport singleton() {
-        return ImageSingletons.lookup(HiddenClassSupport.class);
-    }
-
-    @Fold
-    public static boolean isAvailable() {
-        return ImageSingletons.contains(HiddenClassSupport.class);
-    }
-
-    /** Same as {@code Class.isHidden()}. */
-    public boolean isHidden(@SuppressWarnings("unused") Class<?> clazz) {
-        throw VMError.shouldNotReachHere();
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To14.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To14.java
deleted file mode 100644
index b4a8261954da..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To14.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK11To14 implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC >= 11 && JavaVersionUtil.JAVA_SPEC <= 14;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To16.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To16.java
deleted file mode 100644
index f1dbc16c2979..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11To16.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK11To16 implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC >= 11 && JavaVersionUtil.JAVA_SPEC <= 16;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_10OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_10OrEarlier.java
deleted file mode 100644
index 826e99189c19..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_10OrEarlier.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-
-public class JDK11_0_10OrEarlier implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC < 11 ||
-                        (JavaVersionUtil.JAVA_SPEC == 11 && GraalServices.getJavaUpdateVersion() <= 10);
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_11OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_11OrLater.java
deleted file mode 100644
index cf6f5c52a22c..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11_0_11OrLater.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-
-public class JDK11_0_11OrLater implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC > 11 ||
-                        (JavaVersionUtil.JAVA_SPEC == 11 && GraalServices.getJavaUpdateVersion() > 10);
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrEarlier.java
deleted file mode 100644
index 1a1941e754c4..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrEarlier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK14OrEarlier implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC <= 14;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrLater.java
deleted file mode 100644
index 57e1645fbbd6..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK14OrLater.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2019, 2019, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK14OrLater implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC >= 14;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrEarlier.java
deleted file mode 100644
index 2967a069bcd6..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrEarlier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK15OrEarlier implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC <= 15;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrLater.java
deleted file mode 100644
index 91c8331a6548..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK15OrLater.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK15OrLater implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC >= 15;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrEarlier.java
deleted file mode 100644
index 8e0738e42b8f..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrEarlier.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK16OrEarlier implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC <= 16;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrLater.java
deleted file mode 100644
index 51b1acebf518..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK16OrLater.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2021, 2021, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import java.util.function.BooleanSupplier;
-
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-
-public class JDK16OrLater implements BooleanSupplier {
-    @Override
-    public boolean getAsBoolean() {
-        return JavaVersionUtil.JAVA_SPEC >= 16;
-    }
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
index cc63053484bf..44394c64a92c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
@@ -647,7 +647,7 @@ static void disable() {
 final class Target_java_lang_NullPointerException {
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @SuppressWarnings("static-method")
     private String getExtendedNPEMessage() {
         return null;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Package_jdk_internal_loader_helper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Package_jdk_internal_loader_helper.java
index dd2ba22bd3fb..bbf64c8771e3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Package_jdk_internal_loader_helper.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Package_jdk_internal_loader_helper.java
@@ -37,7 +37,7 @@ public class Package_jdk_internal_loader_helper implements Function<TargetClass,
 
     @Override
     public String apply(TargetClass annotation) {
-        if (JavaVersionUtil.JAVA_SPEC <= 14) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             return "java.lang." + annotation.className();
         } else {
             return "jdk.internal.loader." + annotation.className();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
index 84c5399e46ca..17bacdf4750a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
@@ -418,9 +418,9 @@ static Executor get() {
     }
 }
 
-@TargetClass(value = java.util.concurrent.ForkJoinTask.class, onlyWith = JDK16OrEarlier.class)
+@TargetClass(value = java.util.concurrent.ForkJoinTask.class, onlyWith = JDK11OrEarlier.class)
 @SuppressWarnings("static-method")
-final class Target_java_util_concurrent_ForkJoinTask_JDK16OrEarlier {
+final class Target_java_util_concurrent_ForkJoinTask_JDK11OrEarlier {
     @Alias @RecomputeFieldValue(kind = Kind.FromAlias) //
     private static Target_java_util_concurrent_ForkJoinTask_ExceptionNode[] exceptionTable;
     @Alias @RecomputeFieldValue(kind = Kind.FromAlias) //
@@ -439,7 +439,7 @@ final class Target_java_util_concurrent_ForkJoinTask_JDK16OrEarlier {
     }
 }
 
-@TargetClass(value = java.util.concurrent.ForkJoinTask.class, innerClass = "ExceptionNode", onlyWith = JDK16OrEarlier.class)
+@TargetClass(value = java.util.concurrent.ForkJoinTask.class, innerClass = "ExceptionNode", onlyWith = JDK11OrEarlier.class)
 final class Target_java_util_concurrent_ForkJoinTask_ExceptionNode {
 }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecordSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecordSupport.java
index ff0c3dfb39e4..7e984ef46823 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecordSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecordSupport.java
@@ -78,10 +78,10 @@ public static RecordSupport singleton() {
 }
 
 /**
- * Placeholder implementation for old JDK version that do not have Record classes. Since
+ * Placeholder implementation for JDK versions that do not have Record classes. Since
  * {@link #isRecord} always returns false, the other methods must never be invoked.
  */
-final class RecordSupportBeforeJDK16 extends RecordSupport {
+final class RecordSupportJDK11OrEarlier extends RecordSupport {
     @Override
     public boolean isRecord(Class<?> clazz) {
         return false;
@@ -104,14 +104,14 @@ public Constructor<?> getCanonicalRecordConstructor(Class<?> clazz) {
 }
 
 @AutomaticFeature
-final class RecordFeatureBeforeJDK16 implements Feature {
+final class RecordFeatureBeforeJDK17 implements Feature {
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
-        return JavaVersionUtil.JAVA_SPEC < 16;
+        return JavaVersionUtil.JAVA_SPEC <= 11;
     }
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(RecordSupport.class, new RecordSupportBeforeJDK16());
+        ImageSingletons.add(RecordSupport.class, new RecordSupportJDK11OrEarlier());
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
index 27325d3b6f01..2eb7250dd07c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java
@@ -308,7 +308,7 @@ final class Target_javax_crypto_JceSecurity {
      *
      * This is only used in {@link KeyAgreement}, it's safe to remove.
      */
-    @Alias @TargetElement(onlyWith = JDK15OrEarlier.class) //
+    @Alias @TargetElement(onlyWith = JDK11OrEarlier.class) //
     @InjectAccessors(JceSecurityAccessor.class) //
     static SecureRandom RANDOM;
 
@@ -376,7 +376,7 @@ public Object transform(MetaAccessProvider metaAccess, ResolvedJavaField origina
     }
 }
 
-@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = JDK16OrLater.class)
+@TargetClass(className = "javax.crypto.JceSecurity", innerClass = "IdentityWrapper", onlyWith = JDK17OrLater.class)
 @SuppressWarnings({"unused"})
 final class Target_javax_crypto_JceSecurity_IdentityWrapper {
     @Alias //
@@ -419,10 +419,10 @@ private static synchronized SecureRandom initializeOnce() {
 final class JceSecurityUtil {
 
     static Object providerKey(Provider p) {
-        if (JavaVersionUtil.JAVA_SPEC < 16) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             return p;
         }
-        /* Starting with JDK 16 the verification results map key is an identity wrapper object. */
+        /* Starting with JDK 17 the verification results map key is an identity wrapper object. */
         return new Target_javax_crypto_JceSecurity_IdentityWrapper(p);
     }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
index d2439f7f6ab1..fdfcc3c478ba 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
@@ -145,10 +145,6 @@ private void setMemory0(Object destBase, long destOffset, long bytes, byte bvalu
 
     @Substitute
     private int addressSize() {
-        /*
-         * JDK 14 now injects Unsafe contants via the Hotspot VM, so we just determine the size of
-         * pointers ourself.
-         */
         return ConfigurationValues.getTarget().wordSize;
     }
 
@@ -208,7 +204,7 @@ private Class<?> defineClass(String name, byte[] b, int off, int len, ClassLoade
 
     // JDK-8243287
     @Substitute
-    @TargetElement(onlyWith = JDK16OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     private Class<?> defineAnonymousClass(Class<?> hostClass, byte[] data, Object[] cpPatches) {
         throw VMError.unsupportedFeature("Defining anonymous classes at runtime is not supported.");
     }
@@ -290,7 +286,7 @@ private Class<?> defineClass0(String name, byte[] b, int off, int len, ClassLoad
 
     // JDK-8243287
     @Delete
-    @TargetElement(onlyWith = JDK11To16.class)
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
     private native Class<?> defineAnonymousClass0(Class<?> hostClass, byte[] data, Object[] cpPatches);
 
     @Delete
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunNioSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunNioSubstitutions.java
index 306cb60b80e2..4106a14d6f90 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunNioSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunNioSubstitutions.java
@@ -31,7 +31,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.util.VMError;
 
-@TargetClass(className = "java.nio.channels.spi.SelectorProvider", onlyWith = JDK14OrEarlier.class)
+@TargetClass(className = "java.nio.channels.spi.SelectorProvider", onlyWith = JDK11OrEarlier.class)
 final class Target_java_nio_channels_spi_SelectorProvider {
 
     @Alias//
@@ -57,7 +57,7 @@ static SelectorProvider provider() {
     }
 }
 
-@TargetClass(className = "java.nio.channels.spi.SelectorProvider", innerClass = "Holder", onlyWith = JDK15OrLater.class)
+@TargetClass(className = "java.nio.channels.spi.SelectorProvider", innerClass = "Holder", onlyWith = JDK17OrLater.class)
 final class Target_java_nio_channels_spi_SelectorProvider_Holder {
 
     @Alias//
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
index a51b8b25800e..1cae57e01340 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
@@ -124,8 +124,8 @@ public static InputStream getSystemResourceAsStream(String name) {
 
     @Substitute
     @SuppressWarnings("unused")
-    @TargetElement(onlyWith = JDK14OrEarlier.class) //
-    /* Substitution for JDK 15 and later is in Target_java_lang_ClassLoader_JDK15OrLater. */
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
+    /* Substitution for JDK 17 and later is in Target_java_lang_ClassLoader_JDK17OrLater. */
     static void loadLibrary(Class<?> fromClass, String name, boolean isAbsolute) {
         if (isAbsolute) {
             NativeLibrarySupport.singleton().loadLibraryAbsolute(new File(name));
@@ -169,7 +169,7 @@ Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
     }
 
     @Delete
-    @TargetElement(onlyWith = JDK16OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     native Class<?> findBootstrapClassOrNull(String name);
 
     // JDK-8265605
@@ -319,7 +319,7 @@ protected void resolveClass(@SuppressWarnings("unused") Class<?> c) {
     private static native Class<?> defineClass2(ClassLoader loader, String name, java.nio.ByteBuffer b, int off, int len, ProtectionDomain pd, String source);
 
     @Delete
-    @TargetElement(onlyWith = JDK16OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     private native Class<?> findBootstrapClass(String name);
 
     // JDK-8265605
@@ -328,14 +328,14 @@ protected void resolveClass(@SuppressWarnings("unused") Class<?> c) {
     private static native Class<?> findBootstrapClassJDK17OrLater(String name);
 
     @Delete
-    @TargetElement(onlyWith = JDK14OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     private static native String findBuiltinLib(String name);
 
     @Delete
     private static native Target_java_lang_AssertionStatusDirectives retrieveDirectives();
 }
 
-@TargetClass(value = ClassLoader.class, innerClass = "NativeLibrary", onlyWith = JDK14OrEarlier.class)
+@TargetClass(value = ClassLoader.class, innerClass = "NativeLibrary", onlyWith = JDK11OrEarlier.class)
 final class Target_java_lang_ClassLoader_NativeLibrary {
 
     /*
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_javax_net_ssl_SSLContext.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_javax_net_ssl_SSLContext.java
deleted file mode 100644
index e13e9ab406c6..000000000000
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_javax_net_ssl_SSLContext.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2020, 2020, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.svm.core.jdk;
-
-import javax.net.ssl.SSLContext;
-
-import com.oracle.svm.core.annotate.Alias;
-import com.oracle.svm.core.annotate.RecomputeFieldValue;
-import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
-import com.oracle.svm.core.annotate.TargetClass;
-
-/**
- * The class SSLContext has a VarHandle field on JDK 15 and later, so we cannot initialize the class
- * at run time. We therefore reset just the single static field that is lazily initialized.
- */
-@TargetClass(javax.net.ssl.SSLContext.class)
-final class Target_javax_net_ssl_SSLContext {
-
-    @Alias @RecomputeFieldValue(kind = Kind.Reset) //
-    private static volatile SSLContext defaultContext;
-}
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
index ce5669f7fd7f..29d0e0d88861 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java
@@ -63,26 +63,26 @@ private static String userName() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static String javaIoTmpDir() {
         return ImageSingletons.lookup(SystemPropertiesSupport.class).tmpDir();
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static String javaLibraryPath() {
         return ImageSingletons.lookup(SystemPropertiesSupport.class).javaLibraryPath();
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static String sunBootLibraryPath() {
         String value = ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("sun.boot.library.path");
         return value == null ? "" : value;
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static String jdkSerialFilter() {
         return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("jdk.serialFilter");
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_ClassFilter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_ClassFilter.java
index 61b0d77b3f55..72a3728caa24 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_ClassFilter.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_ClassFilter.java
@@ -27,6 +27,6 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.NashornSupport.NashornAvailable;
 
-@TargetClass(className = "jdk.nashorn.api.scripting.ClassFilter", onlyWith = {JDK14OrEarlier.class, NashornAvailable.class})
+@TargetClass(className = "jdk.nashorn.api.scripting.ClassFilter", onlyWith = {JDK11OrEarlier.class, NashornAvailable.class})
 public final class Target_jdk_nashorn_api_scripting_ClassFilter {
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory.java
index 2af6efcd1fc7..31714e6a4649 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory.java
@@ -31,7 +31,7 @@
 import com.oracle.svm.core.jdk.NashornSupport.NashornAvailable;
 import com.oracle.svm.core.util.VMError;
 
-@TargetClass(className = "jdk.nashorn.api.scripting.NashornScriptEngineFactory", onlyWith = {JDK14OrEarlier.class, NashornAvailable.class})
+@TargetClass(className = "jdk.nashorn.api.scripting.NashornScriptEngineFactory", onlyWith = {JDK11OrEarlier.class, NashornAvailable.class})
 public final class Target_jdk_nashorn_api_scripting_NashornScriptEngineFactory {
     @Substitute
     @SuppressWarnings({"unused", "static-method"})
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ThreadLocalRandomAccessors.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ThreadLocalRandomAccessors.java
index a8bd66da1e57..75671b8a1949 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ThreadLocalRandomAccessors.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ThreadLocalRandomAccessors.java
@@ -45,7 +45,7 @@ final class Target_java_util_concurrent_ThreadLocalRandom {
     private static AtomicLong seeder;
 
     @Alias
-    @TargetElement(onlyWith = JDK16OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     static native long mix64(long z);
 
 }
@@ -72,7 +72,7 @@ public static void setSeeder(AtomicLong value) {
 
     @Override
     long mix64(long l) {
-        if (JavaVersionUtil.JAVA_SPEC < 17) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             return Target_java_util_concurrent_ThreadLocalRandom.mix64(l);
         } else {
             return Target_jdk_internal_util_random_RandomSupport.mixMurmur64(l);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleFeature.java
index 25569ad9e417..d19a0b91920c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VarHandleFeature.java
@@ -102,7 +102,7 @@ public class VarHandleFeature implements Feature {
     private static final Unsafe UNSAFE = GraalUnsafeAccess.getUnsafe();
 
     /** The JDK 11 class VarHandleObjects got renamed to VarHandleReferences. */
-    static final String OBJECT_SUFFIX = JavaVersionUtil.JAVA_SPEC > 11 ? "References" : "Objects";
+    static final String OBJECT_SUFFIX = JavaVersionUtil.JAVA_SPEC <= 11 ? "Objects" : "References";
 
     private final Map<Class<?>, VarHandleInfo> infos = new HashMap<>();
 
@@ -489,7 +489,7 @@ final class Target_java_lang_invoke_VarHandle {
      * collects details about the MemberName, which are method handle internals that must not be
      * reachable.
      */
-    @TargetElement(onlyWith = JDK14OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     @Substitute
     @Override
     public String toString() {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode.java
index 6798bf245fd9..fa3d5b946f97 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_locale_provider_LocaleServiceProviderPool_OptimizedLocaleMode.java
@@ -28,8 +28,8 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
+import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK11To14;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.jdk.localization.LocalizationSupport;
 import com.oracle.svm.core.jdk.localization.substitutions.modes.OptimizedLocaleMode;
@@ -94,7 +94,7 @@ public native <P extends LocaleServiceProvider, S> S getLocalizedObject(LocaleSe
                     Object... params);
 
     @KeepOriginal //
-    @TargetElement(onlyWith = JDK11To14.class) //
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class}) //
     static native void config(Class<? extends Object> caller, String message);
 
     @Substitute
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBean.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBean.java
index 4261147b9519..c6a53cd86459 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBean.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBean.java
@@ -70,7 +70,7 @@ public int getAvailableProcessors() {
         return Runtime.getRuntime().availableProcessors();
     }
 
-    @SuppressWarnings("deprecation") // getTotalPhysicalMemorySize deprecated since JDK 14
+    @SuppressWarnings("deprecation") // getTotalPhysicalMemorySize is deprecated after JDK 11
     @Override
     public long getTotalPhysicalMemorySize() {
         return PhysicalMemory.size().rawValue();
@@ -101,13 +101,13 @@ public long getProcessCpuTime() {
         throw VMError.unsupportedFeature(MSG);
     }
 
-    @SuppressWarnings("deprecation") // getFreePhysicalMemorySize deprecated since JDK 14
+    @SuppressWarnings("deprecation") // getFreePhysicalMemorySize is deprecated after JDK 11
     @Override
     public long getFreePhysicalMemorySize() {
         throw VMError.unsupportedFeature(MSG);
     }
 
-    @SuppressWarnings("deprecation") // getSystemCpuLoad deprecated since JDK 14
+    @SuppressWarnings("deprecation") // getSystemCpuLoad is deprecated after JDK 11
     @Override
     public double getSystemCpuLoad() {
         throw VMError.unsupportedFeature(MSG);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBeanBase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBeanBase.java
index 3ddc68935c62..dab9ceccd728 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBeanBase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/SubstrateOperatingSystemMXBeanBase.java
@@ -27,7 +27,7 @@
 import com.oracle.svm.core.util.VMError;
 
 /**
- * Base class for defining methods introduced in JDK 14 by JDK-8226575.
+ * Base class for defining methods introduced after JDK 11 by JDK-8226575.
  *
  * Putting these in a class that does not implement {@link com.sun.management.OperatingSystemMXBean}
  * avoids javac errors related these methods being annotated by {@link Override}.
@@ -35,7 +35,6 @@
 public abstract class SubstrateOperatingSystemMXBeanBase {
     static final String MSG = "OperatingSystemMXBean methods";
 
-    // Temporary fix for JDK14 added methods.
     // Will be removed after [GR-20166] is implemented.
     public double getCpuLoad() {
         throw VMError.unsupportedFeature(MSG);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index bb208acc802d..23e2dbbbc0e9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -177,10 +177,10 @@ public static void setThreadStatus(Thread thread, int threadStatus) {
      * in VM-internal contexts.
      */
     public static boolean isInterrupted(Thread thread) {
-        if (JavaVersionUtil.JAVA_SPEC >= 14) {
-            return toTarget(thread).interruptedJDK14OrLater;
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
+            return toTarget(thread).interruptedJDK17OrLater;
         }
-        return toTarget(thread).interrupted;
+        return toTarget(thread).interruptedJDK11OrEarlier;
     }
 
     protected static AtomicReference<ParkEvent> getUnsafeParkEvent(Thread thread) {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
index 5f45e94a4b90..8f3c109bdff4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
@@ -43,7 +43,7 @@
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK14OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.core.jdk.LoomJDK;
 import com.oracle.svm.core.jdk.NotLoomJDK;
@@ -64,17 +64,17 @@ public final class Target_java_lang_Thread {
      *
      * After JDK 11, a field with same name has been introduced and the logic to set / reset it has
      * moved into Java code. So this injected field and the substitutions that maintain it are no
-     * longer necessary. See {@link #interruptedJDK14OrLater}.
+     * longer necessary. See {@link #interruptedJDK17OrLater}.
      */
     @Inject //
     @TargetElement(onlyWith = JDK11OrEarlier.class) //
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
-    volatile boolean interrupted;
+    volatile boolean interruptedJDK11OrEarlier;
 
     @Alias //
-    @TargetElement(name = "interrupted", onlyWith = JDK14OrLater.class) //
+    @TargetElement(name = "interrupted", onlyWith = JDK17OrLater.class) //
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
-    volatile boolean interruptedJDK14OrLater;
+    volatile boolean interruptedJDK17OrLater;
 
     @Inject @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
     boolean wasStartedByCurrentIsolate;
@@ -379,7 +379,7 @@ private void setPriority0(int priority) {
     @Substitute
     @TargetElement(onlyWith = JDK11OrEarlier.class)
     private boolean isInterrupted(boolean clearInterrupted) {
-        final boolean result = interrupted;
+        final boolean result = interruptedJDK11OrEarlier;
         if (result && clearInterrupted) {
             /*
              * As we don't use a lock, it is possible to observe any kinds of races with other
@@ -389,7 +389,7 @@ private boolean isInterrupted(boolean clearInterrupted) {
              * isInterrupted as clearInterrupted may only be true if this method is being executed
              * by the current thread.
              */
-            interrupted = false;
+            interruptedJDK11OrEarlier = false;
         }
         return result;
     }
@@ -403,7 +403,7 @@ private boolean isInterrupted(boolean clearInterrupted) {
     @Substitute
     void interrupt0() {
         if (JavaVersionUtil.JAVA_SPEC <= 11) {
-            interrupted = true;
+            interruptedJDK11OrEarlier = true;
         } else {
             /*
              * After JDK 11, the interrupted flag is maintained by the JDK in Java code, i.e.,
@@ -537,7 +537,7 @@ private static Map<Thread, StackTraceElement[]> getAllStackTraces() {
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static void clearInterruptEvent() {
         /*
          * In the JDK, this is a no-op except on Windows. The JDK resets the interrupt event used by
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index 1373baa0d0c9..8c7d20b9f560 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1804,7 +1804,7 @@ protected String getXmsValue() {
         return "1g";
     }
 
-    @SuppressWarnings("deprecation") // getTotalPhysicalMemorySize deprecated since JDK 14
+    @SuppressWarnings("deprecation") // getTotalPhysicalMemorySize is deprecated after JDK 11
     private static long getPhysicalMemorySize() {
         OperatingSystemMXBean osMXBean = ManagementFactory.getOperatingSystemMXBean();
         long totalPhysicalMemorySize = ((com.sun.management.OperatingSystemMXBean) osMXBean).getTotalPhysicalMemorySize();
diff --git a/substratevm/src/com.oracle.svm.hosted.jdk14/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport_JDK14OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk17/src/com/oracle/svm/hosted/jdk17/JNIRegistrationSupport_JDK17OrLater.java
similarity index 82%
rename from substratevm/src/com.oracle.svm.hosted.jdk14/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport_JDK14OrLater.java
rename to substratevm/src/com.oracle.svm.hosted.jdk17/src/com/oracle/svm/hosted/jdk17/JNIRegistrationSupport_JDK17OrLater.java
index bf3572c0cfc5..05db2050e164 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk14/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport_JDK14OrLater.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk17/src/com/oracle/svm/hosted/jdk17/JNIRegistrationSupport_JDK17OrLater.java
@@ -22,26 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.hosted.jdk;
+package com.oracle.svm.hosted.jdk17;
 
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import org.graalvm.compiler.phases.util.Providers;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
 
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.graal.GraalFeature;
+import com.oracle.svm.hosted.jdk.JNIRegistrationSupport;
 
 import jdk.internal.loader.BootLoader;
 
 /**
- * Registration of native JDK libraries for JDK 14 and later that are loaded via
+ * Registration of native JDK libraries for JDK 17 and later that are loaded via
  * jdk.internal.loader.BootLoader
  */
 @Platforms(InternalPlatform.PLATFORM_JNI.class)
 @AutomaticFeature
-class JNIRegistrationSupport_JDK14OrLater implements GraalFeature {
+final class JNIRegistrationSupport_JDK17OrLater implements GraalFeature {
+    @Override
+    public boolean isInConfiguration(IsInConfigurationAccess access) {
+        return JavaVersionUtil.JAVA_SPEC >= 17;
+    }
+
     @Override
     public void registerGraphBuilderPlugins(Providers providers, Plugins plugins, ParsingReason reason) {
         JNIRegistrationSupport.singleton().registerLoadLibraryPlugin(plugins, BootLoader.class);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 67096fe11c59..c66c8b2482bc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -590,12 +590,12 @@ public static void main(String[] args) {
             ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler.management", true);
             ModuleSupport.exportAndOpenAllPackagesToUnnamed("com.oracle.graal.graal_enterprise", true);
             ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "jdk.internal.loader", false);
-            if (JavaVersionUtil.JAVA_SPEC >= 15) {
+            if (JavaVersionUtil.JAVA_SPEC >= 17) {
                 ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "jdk.internal.misc", false);
             }
             ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "sun.text.spi", false);
             ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "jdk.internal.org.objectweb.asm", false);
-            if (JavaVersionUtil.JAVA_SPEC >= 16) {
+            if (JavaVersionUtil.JAVA_SPEC >= 17) {
                 ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "sun.reflect.annotation", false);
                 ModuleSupport.exportAndOpenPackageToUnnamed("java.base", "sun.security.jca", false);
                 ModuleSupport.exportAndOpenPackageToUnnamed("jdk.jdeps", "com.sun.tools.classfile", false);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
index 357e0d28d858..faa649e0e9b1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
@@ -391,9 +391,6 @@ private DynamicHub createHub(AnalysisType type) {
          */
         String sourceFileName = stringTable.deduplicate(type.getSourceFileName(), true);
 
-        /* JDK 15 added support for Hidden Classes. Record if this javaClass is hidden. */
-        boolean isHidden = SubstrateUtil.isHiddenClass(javaClass);
-
         Class<?> nestHost = null;
         if (JavaVersionUtil.JAVA_SPEC >= 11) {
             try {
@@ -403,6 +400,7 @@ private DynamicHub createHub(AnalysisType type) {
             }
         }
 
+        boolean isHidden = SubstrateUtil.isHiddenClass(javaClass);
         boolean isRecord = RecordSupport.singleton().isRecord(javaClass);
         boolean assertionStatus = RuntimeAssertionsSupport.singleton().desiredAssertionStatus(javaClass);
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
index 1c1aa6a8a8d8..770117823cab 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
@@ -296,7 +296,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
             registerServiceReachabilityHandlers(access);
         }
 
-        if (JavaVersionUtil.JAVA_SPEC < 16) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             // https://bugs.openjdk.java.net/browse/JDK-8235710
             access.registerReachabilityHandler(SecurityServicesFeature::linkSunEC,
                             method(access, "sun.security.ec.ECDSASignature", "signDigest", byte[].class, byte[].class, byte[].class, byte[].class, int.class),
@@ -314,8 +314,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         if (isWindows()) {
             access.registerReachabilityHandler(SecurityServicesFeature::registerSunMSCAPIConfig, clazz(access, "sun.security.mscapi.SunMSCAPI"));
             // statically linking sunmscapi conflicts with sunEC
-            // after the removal of sunEC in jdk 16, we can statically link sunmscapi
-            if (JavaVersionUtil.JAVA_SPEC >= 16) {
+            // after the removal of sunEC in jdk 17, we can statically link sunmscapi
+            if (JavaVersionUtil.JAVA_SPEC >= 17) {
                 access.registerReachabilityHandler(SecurityServicesFeature::linkSunMSCAPI, clazz(access, "sun.security.mscapi.SunMSCAPI"));
                 /* Resolve calls to sun_security_mscapi* as builtIn. */
                 PlatformNativeLibrarySupport.singleton().addBuiltinPkgNativePrefix("sun_security_mscapi");
@@ -736,10 +736,10 @@ private static void registerForReflection(Class<?> clazz) {
     @SuppressWarnings("unchecked")
     private Function<Object, Object> constructVerificationCacheCleaner() {
         /*
-         * Before JDK 16, the verification cache was a Provider -> Verification result
+         * For JDK 8 and JDK 11, the verification cache is a Provider -> Verification result
          * IdentityHashMap.
          */
-        if (JavaVersionUtil.JAVA_SPEC <= 15) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             return obj -> {
                 Map<Provider, Object> original = (Map<Provider, Object>) obj;
                 Map<Provider, Object> verificationResults = new IdentityHashMap<>(original);
@@ -750,7 +750,7 @@ private Function<Object, Object> constructVerificationCacheCleaner() {
             };
         }
         /*
-         * For JDK 16 and later, the verification cache is an IdentityWrapper -> Verification result
+         * For JDK 17 and later, the verification cache is an IdentityWrapper -> Verification result
          * ConcurrentHashMap. The IdentityWrapper contains the actual provider in the 'obj' field.
          */
         Class<?> identityWrapper = loader.findClassOrFail("javax.crypto.JceSecurity$IdentityWrapper");
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
index 7919db92785d..760d97244dc6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/DynamicHubInitializer.java
@@ -229,11 +229,11 @@ static class AnnotatedInterfacesEncodingKey {
         }
 
         /*
-         * JDK 12 introduced a broken implementation of hashCode() and equals() for the
-         * implementation classes of annotated types, leading to an infinite recursion. Tracked as
-         * JDK-8224012. As a workaround, we use shallow implementations that only depend on the
-         * identity hash code and reference equality. This is the same behavior as on JDK 8 and JDK
-         * 11 anyway.
+         * After JDK 11, the implementation of hashCode() and equals() for the implementation
+         * classes of annotated types can lead to the reification of generic bounds, which can lead
+         * to TypeNotPresentException when the class path is incomplete. Therefore, we use shallow
+         * implementations that only depend on the identity hash code and reference equality. This
+         * is the same behavior as on JDK 8 and JDK 11 anyway.
          */
 
         @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
index 8fcbce1b5ca8..db79cf0e7819 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
@@ -40,16 +40,16 @@
 import java.util.HashMap;
 import java.util.List;
 
-import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.util.ModuleSupport;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.option.OptionUtils;
+import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl;
 import com.oracle.svm.hosted.ImageClassLoader;
+import com.oracle.svm.util.ModuleSupport;
 
 /**
  * An abstract cache manager for some subspace of the JDK, GraalVM or application source file space.
@@ -107,7 +107,7 @@ private void addJDKSources() {
         assert javaHome != null;
         Path javaHomePath = Paths.get("", javaHome);
         Path srcZipPath;
-        if (JavaVersionUtil.JAVA_SPEC < 11) {
+        if (JavaVersionUtil.JAVA_SPEC <= 8) {
             Path srcZipDir = javaHomePath.getParent();
             if (srcZipDir == null) {
                 VMError.shouldNotReachHere("Cannot resolve parent directory of " + javaHome);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
index fc7f993d28d8..c1dc373bf787 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JDKRegistrations.java
@@ -48,21 +48,18 @@ public void duringSetup(DuringSetupAccess a) {
             rerunClassInit(a, "java.lang.ProcessImpl", "java.lang.ProcessHandleImpl", "java.lang.ProcessHandleImpl$Info", "java.io.FilePermission");
         }
 
-        if (JavaVersionUtil.JAVA_SPEC >= 15) {
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
             /*
              * Holds system and user library paths derived from the `java.library.path` and
              * `sun.boot.library.path` system properties.
              */
             rerunClassInit(a, "jdk.internal.loader.NativeLibraries$LibraryPaths");
-        }
-        if (JavaVersionUtil.JAVA_SPEC >= 16) {
             /*
              * Contains lots of state that is only available at run time: loads a native library,
              * stores a `Random` object and the temporary directory in a static final field.
              */
             rerunClassInit(a, "sun.nio.ch.UnixDomainSockets");
-        }
-        if (JavaVersionUtil.JAVA_SPEC >= 17) {
+
             rerunClassInit(a, "java.util.concurrent.ThreadLocalRandom$ThreadLocalRandomProxy");
         }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java
index c0e2ba381a3e..d8252d5cbad5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNet.java
@@ -61,10 +61,12 @@ public void duringSetup(DuringSetupAccess a) {
         rerunClassInit(a, "java.net.DatagramPacket", "java.net.InetAddress", "java.net.NetworkInterface",
                         "java.net.SocketInputStream", "java.net.SocketOutputStream",
                         /* Caches networking properties. */
-                        "java.net.DefaultDatagramSocketImplFactory");
+                        "java.net.DefaultDatagramSocketImplFactory",
+                        /* Stores a default SSLContext in a static field. */
+                        "javax.net.ssl.SSLContext");
         if (isWindows()) {
             rerunClassInit(a, "java.net.DualStackPlainDatagramSocketImpl", "java.net.TwoStacksPlainDatagramSocketImpl");
-            if (JavaVersionUtil.JAVA_SPEC < 11) {
+            if (JavaVersionUtil.JAVA_SPEC <= 8) {
                 rerunClassInit(a, "java.net.DualStackPlainSocketImpl", "java.net.TwoStacksPlainSocketImpl",
                                 /* Caches networking properties. */
                                 "java.net.PlainSocketImpl");
@@ -134,7 +136,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         a.registerReachabilityHandler(JNIRegistrationJavaNet::registerDatagramPacketInit,
                         method(a, "java.net.DatagramPacket", "init"));
 
-        if (JavaVersionUtil.JAVA_SPEC < 15) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             a.registerReachabilityHandler(JNIRegistrationJavaNet::registerDatagramSocketCheckOldImpl,
                             method(a, "java.net.DatagramSocket", "checkOldImpl"));
         }
@@ -145,7 +147,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         a.registerReachabilityHandler(JNIRegistrationJavaNet::registerPlainDatagramSocketImplSocketGetOption,
                         method(a, "java.net." + plainDatagramSocketImpl, "socketGetOption", int.class));
 
-        if (JavaVersionUtil.JAVA_SPEC < 11 || isPosix()) {
+        if (JavaVersionUtil.JAVA_SPEC <= 8 || isPosix()) {
             String plainSocketImpl = isWindows() ? "TwoStacksPlainSocketImpl" : "PlainSocketImpl";
             a.registerReachabilityHandler(JNIRegistrationJavaNet::registerPlainSocketImplInitProto,
                             method(a, "java.net." + plainSocketImpl, "initProto"));
@@ -156,7 +158,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
             a.registerReachabilityHandler(JNIRegistrationJavaNet::registerDualStackPlainDatagramSocketImplInitIDs,
                             method(a, "java.net.DualStackPlainDatagramSocketImpl", "initIDs"));
 
-            String dualStackPlainSocketImpl = JavaVersionUtil.JAVA_SPEC < 11 ? "DualStackPlainSocketImpl" : "PlainSocketImpl";
+            String dualStackPlainSocketImpl = JavaVersionUtil.JAVA_SPEC <= 8 ? "DualStackPlainSocketImpl" : "PlainSocketImpl";
             a.registerReachabilityHandler(JNIRegistrationJavaNet::registerDualStackPlainSocketImplInitIDs,
                             method(a, "java.net." + dualStackPlainSocketImpl, "initIDs"));
             a.registerReachabilityHandler(JNIRegistrationJavaNet::registerDualStackPlainSocketImplLocalAddress,
@@ -192,7 +194,7 @@ static void registerInitInetAddressIDs(DuringAnalysisAccess a) {
         /* Java_java_net_Inet6Address_init */
         JNIRuntimeAccess.register(constructor(a, "java.net.Inet6Address"));
         JNIRuntimeAccess.register(fields(a, "java.net.Inet6Address", "holder6"));
-        if (JavaVersionUtil.JAVA_SPEC < 13) { // JDK-8216417
+        if (JavaVersionUtil.JAVA_SPEC <= 11) { // JDK-8216417
             Class<?> c = clazz(a, "java.net.Inet6Address");
             boolean optional = JavaVersionUtil.JAVA_SPEC == 11; // JDK-8269385
             Field f = ReflectionUtil.lookupField(optional, c, "cached_scope_id");
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java
index cde3bd53cf0f..3de0a1775c45 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java
@@ -86,9 +86,6 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
             if (isPosix()) {
                 a.registerReachabilityHandler(registerServerSocketChannelImplInitIDs, method(a, "sun.nio.ch.UnixAsynchronousServerSocketChannelImpl", "initIDs"));
             }
-        }
-
-        if (JavaVersionUtil.JAVA_SPEC < 13) {
             a.registerReachabilityHandler(JNIRegistrationJavaNio::registerDatagramChannelImplInitIDs, method(a, "sun.nio.ch.DatagramChannelImpl", "initIDs"));
         } else {
             // JDK-8220738
@@ -111,15 +108,17 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         a.registerReachabilityHandler(JNIRegistrationJavaNio::registerConnectionCreateInetSocketAddress, method(a, "com.sun.jndi.ldap.Connection", "createInetSocketAddress", String.class, int.class));
 
         Consumer<DuringAnalysisAccess> registerInitInetAddressIDs = JNIRegistrationJavaNet::registerInitInetAddressIDs;
-        if (JavaVersionUtil.JAVA_SPEC < 9) {
+        if (JavaVersionUtil.JAVA_SPEC <= 8) {
             a.registerReachabilityHandler(registerInitInetAddressIDs, method(a, "sun.nio.ch.IOUtil", "initIDs"));
         } else {
             a.registerReachabilityHandler(registerInitInetAddressIDs, method(a, "sun.nio.ch.Net", "initIDs"));
         }
 
-        // In JDK 14, all of the Buffer classes require MemorySegmentProxy which is accessed via
-        // reflection
-        if (JavaVersionUtil.JAVA_SPEC >= 14) {
+        /*
+         * Starting with support for JDK 17, all of the Buffer classes require MemorySegmentProxy
+         * which is accessed via reflection.
+         */
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
             RuntimeReflection.register(clazz(a, "jdk.internal.access.foreign.MemorySegmentProxy"));
         }
     }
@@ -200,7 +199,7 @@ private static void registerWindowsNativeDispatcherInitIDs(DuringAnalysisAccess
         JNIRuntimeAccess.register(fields(a, "sun.nio.fs.WindowsNativeDispatcher$VolumeInformation", "fileSystemName", "volumeName", "volumeSerialNumber", "flags"));
         JNIRuntimeAccess.register(clazz(a, "sun.nio.fs.WindowsNativeDispatcher$DiskFreeSpace"));
         JNIRuntimeAccess.register(fields(a, "sun.nio.fs.WindowsNativeDispatcher$DiskFreeSpace", "freeBytesAvailable", "totalNumberOfBytes", "totalNumberOfFreeBytes"));
-        if (JavaVersionUtil.JAVA_SPEC >= 10) {
+        if (JavaVersionUtil.JAVA_SPEC >= 11) {
             JNIRuntimeAccess.register(fields(a, "sun.nio.fs.WindowsNativeDispatcher$DiskFreeSpace", "bytesPerSector"));
         }
         JNIRuntimeAccess.register(clazz(a, "sun.nio.fs.WindowsNativeDispatcher$Account"));
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
index 69f744d2f4bc..3a464b68ef45 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
@@ -76,7 +76,7 @@
 /** Registration of native JDK libraries. */
 @Platforms(InternalPlatform.PLATFORM_JNI.class)
 @AutomaticFeature
-class JNIRegistrationSupport extends JNIRegistrationUtil implements GraalFeature {
+public final class JNIRegistrationSupport extends JNIRegistrationUtil implements GraalFeature {
 
     private final ConcurrentMap<String, Boolean> registeredLibraries = new ConcurrentHashMap<>();
     private NativeLibraries nativeLibraries = null;
@@ -103,7 +103,7 @@ public void registerGraphBuilderPlugins(Providers providers, Plugins plugins, Pa
         registerLoadLibraryPlugin(plugins, System.class);
     }
 
-    void registerLoadLibraryPlugin(Plugins plugins, Class<?> clazz) {
+    public void registerLoadLibraryPlugin(Plugins plugins, Class<?> clazz) {
         Registration r = new Registration(plugins.getInvocationPlugins(), clazz);
         r.register1("loadLibrary", String.class, new InvocationPlugin() {
             @Override
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
index 40fac0f35a43..4434796ad51d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
@@ -667,7 +667,7 @@ private static boolean isValidField(Field targetField, boolean isSunMiscUnsafe)
             /* A NullPointerException will be thrown at run time for this call. */
             return false;
         }
-        if (isSunMiscUnsafe && JavaVersionUtil.JAVA_SPEC >= 16 &&
+        if (isSunMiscUnsafe && JavaVersionUtil.JAVA_SPEC >= 17 &&
                         (RecordSupport.singleton().isRecord(targetField.getDeclaringClass()) || SubstrateUtil.isHiddenClass(targetField.getDeclaringClass()))) {
             /*
              * After JDK 11, sun.misc.Unsafe performs a few more checks than
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
index 903a2575b465..996e30b68b2e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
@@ -214,9 +214,9 @@ public void init(ImageClassLoader loader, MetaAccessProvider originalMetaAccess)
                 neverInlineSet.add(unsafeObjectFieldOffsetClassStringMethod);
             }
 
-            if (JavaVersionUtil.JAVA_SPEC >= 15) {
+            if (JavaVersionUtil.JAVA_SPEC >= 17) {
                 /*
-                 * JDK 15 and later add checks for hidden classes and record classes in
+                 * JDK 17 and later add checks for hidden classes and record classes in
                  * sun.misc.Unsafe before delegating to jdk.internal.misc.Unsafe. When inlined, the
                  * checks make control flow too complex to detect offset field assignments.
                  */
@@ -426,7 +426,7 @@ private boolean isValidField(Invoke invoke, Field field, List<String> unsuccessf
         }
 
         boolean valid = true;
-        if (JavaVersionUtil.JAVA_SPEC >= 15 && isInvokeTo(invoke, sunMiscUnsafeObjectFieldOffsetMethod)) {
+        if (JavaVersionUtil.JAVA_SPEC >= 17 && isInvokeTo(invoke, sunMiscUnsafeObjectFieldOffsetMethod)) {
             Class<?> declaringClass = field.getDeclaringClass();
             if (RecordSupport.singleton().isRecord(declaringClass)) {
                 unsuccessfulReasons.add("The argument to sun.misc.Unsafe.objectFieldOffset(Field) is a field of a record.");
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
index 35101f3a104b..e491abd834d1 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrEnabled.java
@@ -45,7 +45,7 @@ public static boolean get() {
     }
 
     private static boolean jvmVersionSupported() {
-        return JavaVersionUtil.JAVA_SPEC == 11 || JavaVersionUtil.JAVA_SPEC == 16 || JavaVersionUtil.JAVA_SPEC == 17;
+        return JavaVersionUtil.JAVA_SPEC >= 11;
     }
 
     private static boolean osSupported() {
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java
index 17ee27da460a..81221bc959ed 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java
@@ -29,12 +29,13 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.heap.Heap;
-import com.oracle.svm.core.jdk.HiddenClassSupport;
 import com.oracle.svm.jfr.traceid.JfrTraceId;
 
 /**
@@ -121,8 +122,8 @@ private static void writeClass(JfrChunkWriter writer, TypeInfo typeInfo, Class<?
         writer.writeCompressedLong(symbolRepo.getSymbolId(clazz.getName(), true, true));
         writer.writeCompressedLong(typeInfo.getPackageId(clazz.getPackage()));
         writer.writeCompressedLong(clazz.getModifiers());
-        if (HiddenClassSupport.isAvailable()) {
-            writer.writeBoolean(HiddenClassSupport.singleton().isHidden(clazz));
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
+            writer.writeBoolean(SubstrateUtil.isHiddenClass(clazz));
         }
     }
 
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
index b8f25658f94f..48d3bbcb4d27 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/Target_jdk_jfr_internal_JVM.java
@@ -35,10 +35,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
-import com.oracle.svm.core.jdk.JDK14OrEarlier;
-import com.oracle.svm.core.jdk.JDK14OrLater;
-import com.oracle.svm.core.jdk.JDK15OrLater;
-import com.oracle.svm.core.jdk.JDK16OrEarlier;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.jfr.traceid.JfrTraceId;
 
@@ -94,7 +91,7 @@ public void endRecording() {
 
     /** See {@link JVM#isRecording}. */
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public boolean isRecording() {
         return SubstrateJVM.get().unsafeIsRecording();
     }
@@ -119,7 +116,7 @@ public static long getClassId(Class<?> clazz) {
 
     /** See JVM.getClassIdNonIntrinsic(Class). */
     @Substitute
-    @TargetElement(onlyWith = JDK16OrEarlier.class)
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
     public static long getClassIdNonIntrinsic(Class<?> clazz) {
         return getClassId(clazz);
     }
@@ -288,13 +285,13 @@ public double getTimeConversionFactor() {
 
     /** See {@link SubstrateJVM#getChunkStartNanos}. */
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public long getChunkStartNanos() {
         return SubstrateJVM.get().getChunkStartNanos();
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public boolean setHandler(Class<? extends jdk.internal.event.Event> eventClass, EventHandler handler) {
         // eventHandler fields should all be set at compile time so this method
         // should never be reached at runtime
@@ -303,7 +300,7 @@ public boolean setHandler(Class<? extends jdk.internal.event.Event> eventClass,
 
     /** See {@link SubstrateJVM#getHandler}. */
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     public Object getHandler(Class<? extends jdk.internal.event.Event> eventClass) {
         return SubstrateJVM.getHandler(eventClass);
     }
@@ -359,14 +356,14 @@ public boolean setCutoff(long eventTypeId, long cutoffTicks) {
 
     /** See {@link JVM#emitOldObjectSamples}. */
     @Substitute
-    @TargetElement(onlyWith = JDK14OrEarlier.class) //
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
     public void emitOldObjectSamples(long cutoff, boolean emitAll) {
         // Not supported but this method is called during JFR shutdown, so we can't throw an error.
     }
 
     /** See {@link JVM#emitOldObjectSamples}. */
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public void emitOldObjectSamples(long cutoff, boolean emitAll, boolean skipBFS) {
         // Not supported but this method is called during JFR shutdown, so we can't throw an error.
     }
@@ -379,32 +376,32 @@ public boolean shouldRotateDisk() {
 
     /** See {@link JVM#flush}. */
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public void flush() {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public void include(Thread thread) {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public void exclude(Thread thread) {
         // Temporarily do nothing. This is used for JFR streaming.
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public boolean isExcluded(Thread thread) {
         // Temporarily do nothing. This is used for JFR streaming.
         return false;
     }
 
     @Substitute
-    @TargetElement(onlyWith = JDK14OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     public void markChunkFinal() {
         // Temporarily do nothing. This is used for JFR streaming.
     }
diff --git a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java
index 836ef94d2494..46efae8dcc33 100644
--- a/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java
+++ b/substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/logging/JfrLogConfiguration.java
@@ -112,21 +112,13 @@ private static Map<LogTag, Set<JfrLogTag>> createLogTagSets() {
         result.put(LogTag.JFR_SETTING, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SETTING));
         result.put(LogTag.JFR_DCMD, EnumSet.of(JfrLogTag.JFR, JfrLogTag.DCMD));
 
-        // JDK16 support
-        if (JavaVersionUtil.JAVA_SPEC >= 16) {
+        // JDK17 support
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
             try {
                 LogTag jfrSystemStreaming = Enum.valueOf(LogTag.class, "JFR_SYSTEM_STREAMING");
                 LogTag jfrSystemThrottle = Enum.valueOf(LogTag.class, "JFR_SYSTEM_THROTTLE");
                 result.put(jfrSystemStreaming, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.STREAMING));
                 result.put(jfrSystemThrottle, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.THROTTLE));
-            } catch (IllegalArgumentException | NullPointerException e) {
-                throw VMError.shouldNotReachHere("Should be defined", e);
-            }
-        }
-
-        // JDK17 support
-        if (JavaVersionUtil.JAVA_SPEC >= 17) {
-            try {
                 LogTag jfrStart = Enum.valueOf(LogTag.class, "JFR_START");
                 result.put(jfrStart, EnumSet.of(JfrLogTag.JFR, JfrLogTag.START));
             } catch (IllegalArgumentException | NullPointerException e) {
diff --git a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
index f2537e0e2ffc..5089c3b4dfcf 100644
--- a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
+++ b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/MethodHandleFeature.java
@@ -189,7 +189,7 @@ private static void registerMHImplFunctionsForReflection(DuringAnalysisAccess ac
 
     private static void registerMHImplConstantHandlesForReflection(DuringAnalysisAccess access) {
         Class<?> mhImplClazz = access.findClassByName("java.lang.invoke.MethodHandleImpl");
-        if (JavaVersionUtil.JAVA_SPEC <= 16) {
+        if (JavaVersionUtil.JAVA_SPEC <= 11) {
             RuntimeReflection.register(ReflectionUtil.lookupMethod(mhImplClazz, "copyAsPrimitiveArray", access.findClassByName("sun.invoke.util.Wrapper"), Object[].class));
             RuntimeReflection.register(ReflectionUtil.lookupMethod(mhImplClazz, "identity", Object[].class));
             RuntimeReflection.register(ReflectionUtil.lookupMethod(mhImplClazz, "fillNewArray", Integer.class, Object[].class));
diff --git a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
index 71754cac83f6..2dc0fdb0ffa7 100644
--- a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
+++ b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
@@ -54,9 +54,9 @@
 import com.oracle.svm.core.invoke.MethodHandleUtils.MethodHandlesNotSupported;
 import com.oracle.svm.core.invoke.MethodHandleUtils.MethodHandlesSupported;
 import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
+import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK15OrEarlier;
-import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 import com.oracle.svm.core.jdk.JDK8OrEarlier;
 import com.oracle.svm.reflect.target.Target_java_lang_reflect_Field;
 
@@ -209,7 +209,7 @@ private static Object getMemberVMInfo(Target_java_lang_invoke_MemberName self) {
     // JDK 11
 
     @Substitute
-    @TargetElement(onlyWith = {JDK11OrLater.class, JDK15OrEarlier.class})
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
     static Target_java_lang_invoke_MemberName resolve(Target_java_lang_invoke_MemberName self, Class<?> caller, boolean speculativeResolve) throws LinkageError, ClassNotFoundException {
         return Util_java_lang_invoke_MethodHandleNatives.resolve(self, caller, speculativeResolve);
     }
@@ -230,9 +230,10 @@ private static void clearCallSiteContext(Target_java_lang_invoke_MethodHandleNat
     @AnnotateOriginal
     static native String refKindName(byte refKind);
 
-    // JDK 16
+    // JDK 17
+
     @Substitute
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     static Target_java_lang_invoke_MemberName resolve(Target_java_lang_invoke_MemberName self, Class<?> caller, int lookupMode, boolean speculativeResolve)
                     throws LinkageError, ClassNotFoundException {
         Class<?> declaringClass = self.getDeclaringClass();
@@ -353,7 +354,7 @@ public static Target_java_lang_invoke_MemberName resolve(Target_java_lang_invoke
     private static Method verifyAccess;
 
     static boolean verifyAccess(Class<?> refc, Class<?> defc, int mods, Class<?> lookupClass, int allowedModes) {
-        assert JavaVersionUtil.JAVA_SPEC >= 16;
+        assert JavaVersionUtil.JAVA_SPEC >= 17;
         if (verifyAccess == null) {
             try {
                 verifyAccess = VerifyAccess.class.getDeclaredMethod("isMemberAccessible", Class.class, Class.class, int.class, Class.class, Class.class, int.class);
@@ -458,7 +459,7 @@ final class Target_java_lang_invoke_MethodHandleNatives_NotSupported {
     // JDK 11
 
     @Delete
-    @TargetElement(onlyWith = {JDK11OrLater.class, JDK15OrEarlier.class})
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
     private static native Target_java_lang_invoke_MemberName_NotSupported resolve(Target_java_lang_invoke_MemberName_NotSupported self, Class<?> caller, boolean speculativeResolve)
                     throws LinkageError, ClassNotFoundException;
 
@@ -470,10 +471,10 @@ private static native Target_java_lang_invoke_MemberName_NotSupported resolve(Ta
     @TargetElement(onlyWith = JDK11OrLater.class)
     private static native void clearCallSiteContext(Target_java_lang_invoke_MethodHandleNatives_CallSiteContext context);
 
-    // JDK 16
+    // JDK 17
 
     @Delete
-    @TargetElement(onlyWith = JDK16OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private static native Target_java_lang_invoke_MemberName_NotSupported resolve(Target_java_lang_invoke_MemberName_NotSupported self, Class<?> caller, int lookupMode, boolean speculativeResolve)
                     throws LinkageError, ClassNotFoundException;
 }
diff --git a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandles_Lookup.java b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandles_Lookup.java
index 2e5f4b55e697..81fc6211d2e7 100644
--- a/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandles_Lookup.java
+++ b/substratevm/src/com.oracle.svm.methodhandles/src/com/oracle/svm/methodhandles/Target_java_lang_invoke_MethodHandles_Lookup.java
@@ -37,9 +37,9 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.invoke.MethodHandleUtils.MethodHandlesSupported;
 import com.oracle.svm.core.invoke.Target_java_lang_invoke_MemberName;
-import com.oracle.svm.core.jdk.JDK11_0_10OrEarlier;
-import com.oracle.svm.core.jdk.JDK11_0_11OrLater;
-import com.oracle.svm.core.jdk.JDK15OrLater;
+import com.oracle.svm.core.jdk.JDK11OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
+import com.oracle.svm.core.jdk.JDK8OrEarlier;
 
 @TargetClass(value = MethodHandles.class, innerClass = "Lookup", onlyWith = MethodHandlesSupported.class)
 final class Target_java_lang_invoke_MethodHandles_Lookup {
@@ -51,7 +51,7 @@ public Class<?> defineClass(@SuppressWarnings("unused") byte[] bytes) {
 
     @SuppressWarnings({"static-method", "unused"})
     @Substitute
-    @TargetElement(onlyWith = JDK11_0_10OrEarlier.class)
+    @TargetElement(onlyWith = JDK8OrEarlier.class)
     private MethodHandle maybeBindCaller(Target_java_lang_invoke_MemberName method, MethodHandle mh,
                     Class<?> boundCallerClass)
                     throws IllegalAccessException {
@@ -61,7 +61,7 @@ private MethodHandle maybeBindCaller(Target_java_lang_invoke_MemberName method,
 
     @SuppressWarnings({"static-method", "unused"})
     @Substitute
-    @TargetElement(onlyWith = JDK11_0_11OrLater.class)
+    @TargetElement(onlyWith = JDK11OrLater.class)
     private MethodHandle maybeBindCaller(Target_java_lang_invoke_MemberName method, MethodHandle mh,
                     Target_java_lang_invoke_MethodHandles_Lookup boundCaller)
                     throws IllegalAccessException {
@@ -70,19 +70,19 @@ private MethodHandle maybeBindCaller(Target_java_lang_invoke_MemberName method,
     }
 
     @Alias //
-    @TargetElement(onlyWith = JDK15OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     private Class<?> lookupClass;
 
     @Alias //
-    @TargetElement(onlyWith = JDK15OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     private Class<?> prevLookupClass;
 
     @Alias //
-    @TargetElement(onlyWith = JDK15OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     private int allowedModes;
 
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     private IllegalAccessException makeAccessException(Class<?> targetClass) {
         String message = "access violation: " + targetClass;
         if (this == SubstrateUtil.cast(MethodHandles.publicLookup(), Target_java_lang_invoke_MethodHandles_Lookup.class)) {
@@ -101,7 +101,7 @@ private IllegalAccessException makeAccessException(Class<?> targetClass) {
     /** This call is a noop without the security manager. */
     @SuppressWarnings("unused")
     @Substitute
-    @TargetElement(onlyWith = JDK15OrLater.class)
+    @TargetElement(onlyWith = JDK17OrLater.class)
     void checkSecurityManager(Class<?> refc) {
     }
 }
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/Target_java_lang_reflect_AccessibleObject.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/Target_java_lang_reflect_AccessibleObject.java
index ddb9b80dbb93..44c24aefd6e9 100644
--- a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/Target_java_lang_reflect_AccessibleObject.java
+++ b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/target/Target_java_lang_reflect_AccessibleObject.java
@@ -34,7 +34,7 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.jdk.JDK11OrEarlier;
 import com.oracle.svm.core.jdk.JDK11OrLater;
-import com.oracle.svm.core.jdk.JDK16OrLater;
+import com.oracle.svm.core.jdk.JDK17OrLater;
 
 @TargetClass(value = AccessibleObject.class)
 public final class Target_java_lang_reflect_AccessibleObject {
@@ -46,7 +46,7 @@ public final class Target_java_lang_reflect_AccessibleObject {
     volatile Object securityCheckCache;
 
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) //
-    @TargetElement(onlyWith = JDK16OrLater.class) //
+    @TargetElement(onlyWith = JDK17OrLater.class) //
     volatile Object accessCheckCache;
 
     @Alias //
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/GitHub1398.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/GitHub1398.java
index 94e970d10946..dbec84589cc0 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/GitHub1398.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/GitHub1398.java
@@ -38,7 +38,7 @@
 public class GitHub1398 {
     public static final int PORT = 6789;
 
-    @SuppressWarnings("deprecation") // joinGroup deprecated since JDK 14
+    @SuppressWarnings("deprecation") // joinGroup is deprecated after JDK 11
     @Test
     public void testMulticast() {
         try {

From 16e4d4348e8cfb2f088a7346288eb1d1de1e622b Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 19 Oct 2021 01:23:15 +0200
Subject: [PATCH 583/681] Allocate and manage off-heap WasmMemory as a direct
 ByteBuffer.

---
 .../src/org/graalvm/wasm/WasmLanguage.java    |  5 +--
 .../wasm/memory/ByteArrayWasmMemory.java      |  5 +++
 .../graalvm/wasm/memory/UnsafeWasmMemory.java | 44 +++++++++----------
 .../org/graalvm/wasm/memory/WasmMemory.java   |  5 ++-
 4 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
index 824edf5cea0e..33c1f1896747 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/WasmLanguage.java
@@ -44,7 +44,6 @@
 
 import org.graalvm.options.OptionDescriptors;
 import org.graalvm.wasm.api.WebAssembly;
-import org.graalvm.wasm.memory.UnsafeWasmMemory;
 import org.graalvm.wasm.memory.WasmMemory;
 
 import com.oracle.truffle.api.CallTarget;
@@ -105,9 +104,7 @@ protected void finalizeContext(WasmContext context) {
         super.finalizeContext(context);
         for (int i = 0; i < context.memories().count(); ++i) {
             final WasmMemory memory = context.memories().memory(i);
-            if (memory instanceof UnsafeWasmMemory) {
-                ((UnsafeWasmMemory) memory).free();
-            }
+            memory.close();
         }
         try {
             context.fdManager().close();
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
index c90ebf2e200c..33320ba50dbd 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
@@ -408,4 +408,9 @@ public WasmMemory duplicate() {
         System.arraycopy(buffer, 0, other.buffer, 0, buffer.length);
         return other;
     }
+
+    @Override
+    public void close() {
+        buffer = null;
+    }
 }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
index 3b3eb0dd9677..e5451c6c0ac3 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
@@ -48,6 +48,7 @@
 import static org.graalvm.wasm.constants.Sizes.MEMORY_PAGE_SIZE;
 
 import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
 
 import org.graalvm.wasm.constants.Sizes;
 import org.graalvm.wasm.exception.Failure;
@@ -55,15 +56,11 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 
 import sun.misc.Unsafe;
 
-@ExportLibrary(InteropLibrary.class)
-public final class UnsafeWasmMemory extends WasmMemory implements AutoCloseable {
+public final class UnsafeWasmMemory extends WasmMemory {
     /**
      * @see #declaredMinSize()
      */
@@ -88,6 +85,8 @@ public final class UnsafeWasmMemory extends WasmMemory implements AutoCloseable
      */
     private final int maxAllowedSize;
 
+    private ByteBuffer buffer;
+
     private static final Unsafe unsafe;
 
     private UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSize, int maxAllowedSize) {
@@ -102,13 +101,23 @@ private UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSi
         this.size = declaredMinSize;
         this.maxAllowedSize = maxAllowedSize;
         final long byteSize = byteSize();
+        this.buffer = allocateBuffer(byteSize);
+        this.startAddress = getBufferAddress(buffer);
+    }
+
+    @TruffleBoundary
+    private static ByteBuffer allocateBuffer(final long byteSize) {
+        assert (int) byteSize == byteSize : byteSize;
         try {
-            this.startAddress = unsafe.allocateMemory(byteSize);
+            return ByteBuffer.allocateDirect((int) byteSize);
         } catch (OutOfMemoryError error) {
-            CompilerDirectives.transferToInterpreter();
             throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
         }
-        unsafe.setMemory(startAddress, byteSize, (byte) 0);
+    }
+
+    @TruffleBoundary
+    private static long getBufferAddress(ByteBuffer buffer) {
+        return ((sun.nio.ch.DirectBuffer) buffer).address();
     }
 
     public UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
@@ -170,10 +179,10 @@ public boolean grow(int extraPageSize) {
             // computation of targetByteSize does not overflow.
             final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
             try {
-                final long updatedStartAddress = unsafe.allocateMemory(targetByteSize);
+                ByteBuffer updatedBuffer = allocateBuffer(targetByteSize);
+                final long updatedStartAddress = getBufferAddress(updatedBuffer);
                 unsafe.copyMemory(startAddress, updatedStartAddress, byteSize());
-                unsafe.setMemory(updatedStartAddress + byteSize(), targetByteSize - byteSize(), (byte) 0);
-                unsafe.freeMemory(startAddress);
+                buffer = updatedBuffer;
                 startAddress = updatedStartAddress;
                 size += extraPageSize;
                 invokeGrowCallback();
@@ -348,7 +357,7 @@ public WasmMemory duplicate() {
     }
 
     public void free() {
-        unsafe.freeMemory(this.startAddress);
+        buffer = null;
         startAddress = 0;
         size = 0;
     }
@@ -364,17 +373,6 @@ public void close() {
         }
     }
 
-    @SuppressWarnings("static-method")
-    @ExportMessage
-    public boolean isPointer() {
-        return true;
-    }
-
-    @ExportMessage
-    public long asPointer() {
-        return startAddress;
-    }
-
     static {
         try {
             final Field f = Unsafe.class.getDeclaredField("theUnsafe");
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
index c112a72f2def..78bd51ac90c6 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
@@ -68,7 +68,7 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 
 @ExportLibrary(InteropLibrary.class)
-public abstract class WasmMemory extends EmbedderDataHolder implements TruffleObject {
+public abstract class WasmMemory extends EmbedderDataHolder implements TruffleObject, AutoCloseable {
 
     private Object growCallback = null;
 
@@ -505,4 +505,7 @@ public Object getGrowCallback() {
     protected void invokeGrowCallback() {
         WebAssembly.invokeMemGrowCallback(this);
     }
+
+    @Override
+    public abstract void close();
 }

From b0b69881b5127128eb450156081079aec6425937 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Tue, 19 Oct 2021 01:51:10 +0200
Subject: [PATCH 584/681] Allow an embedder to access off-heap WasmMemory as a
 ByteBuffer.

---
 .../src/org/graalvm/wasm/api/WebAssembly.java | 47 ++++++++++++-------
 .../wasm/memory/ByteArrayWasmMemory.java      |  7 +++
 .../graalvm/wasm/memory/UnsafeWasmMemory.java |  5 ++
 .../org/graalvm/wasm/memory/WasmMemory.java   |  3 ++
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/api/WebAssembly.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/api/WebAssembly.java
index e05e9d58a06c..a5f4dab7e42a 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/api/WebAssembly.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/api/WebAssembly.java
@@ -40,13 +40,17 @@
  */
 package org.graalvm.wasm.api;
 
-import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.TruffleContext;
-import com.oracle.truffle.api.interop.InteropException;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.InvalidArrayIndexException;
-import com.oracle.truffle.api.interop.UnknownIdentifierException;
-import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import static java.lang.Integer.compareUnsigned;
+import static org.graalvm.wasm.WasmMath.minUnsigned;
+import static org.graalvm.wasm.api.JsConstants.JS_LIMITS;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Pair;
 import org.graalvm.wasm.EmbedderDataHolder;
@@ -73,15 +77,13 @@
 import org.graalvm.wasm.memory.UnsafeWasmMemory;
 import org.graalvm.wasm.memory.WasmMemory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import static java.lang.Integer.compareUnsigned;
-import static org.graalvm.wasm.WasmMath.minUnsigned;
-import static org.graalvm.wasm.api.JsConstants.JS_LIMITS;
+import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.TruffleContext;
+import com.oracle.truffle.api.interop.InteropException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 
 public class WebAssembly extends Dictionary {
     private final WasmContext currentContext;
@@ -103,6 +105,7 @@ public WebAssembly(WasmContext currentContext) {
         addMember("mem_alloc", new Executable(args -> memAlloc(args)));
         addMember("mem_grow", new Executable(args -> memGrow(args)));
         addMember("mem_set_grow_callback", new Executable(args -> memSetGrowCallback(args)));
+        addMember("mem_as_byte_buffer", new Executable(args -> memAsByteBuffer(args)));
 
         addMember("global_alloc", new Executable(args -> globalAlloc(args)));
         addMember("global_read", new Executable(args -> globalRead(args)));
@@ -620,6 +623,18 @@ public static void invokeMemGrowCallback(WasmMemory memory) {
         }
     }
 
+    private static Object memAsByteBuffer(Object[] args) {
+        checkArgumentCount(args, 1);
+        if (args[0] instanceof WasmMemory) {
+            WasmMemory memory = (WasmMemory) args[0];
+            ByteBuffer buffer = memory.asByteBuffer();
+            if (buffer != null) {
+                return WasmContext.get(null).environment().asGuestValue(buffer);
+            }
+        }
+        return WasmVoidResult.getInstance();
+    }
+
     private static Object globalAlloc(Object[] args) {
         checkArgumentCount(args, 3);
 
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
index 33320ba50dbd..07ab098fdf5a 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
@@ -47,6 +47,8 @@
 import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_INSTANCE_SIZE;
 import static org.graalvm.wasm.constants.Sizes.MEMORY_PAGE_SIZE;
 
+import java.nio.ByteBuffer;
+
 import org.graalvm.wasm.constants.Sizes;
 import org.graalvm.wasm.exception.Failure;
 import org.graalvm.wasm.exception.WasmException;
@@ -413,4 +415,9 @@ public WasmMemory duplicate() {
     public void close() {
         buffer = null;
     }
+
+    @Override
+    public ByteBuffer asByteBuffer() {
+        return null;
+    }
 }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
index e5451c6c0ac3..058751c2a1ab 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
@@ -373,6 +373,11 @@ public void close() {
         }
     }
 
+    @Override
+    public ByteBuffer asByteBuffer() {
+        return buffer.duplicate();
+    }
+
     static {
         try {
             final Field f = Unsafe.class.getDeclaredField("theUnsafe");
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
index 78bd51ac90c6..28ac0227064a 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
@@ -40,6 +40,7 @@
  */
 package org.graalvm.wasm.memory;
 
+import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 
@@ -508,4 +509,6 @@ protected void invokeGrowCallback() {
 
     @Override
     public abstract void close();
+
+    public abstract ByteBuffer asByteBuffer();
 }

From d2704b5c03cd85b4d9773d8612c4ccc5cd1e38b4 Mon Sep 17 00:00:00 2001
From: Paley Li <paley.li@oracle.com>
Date: Fri, 22 Oct 2021 10:01:58 +0200
Subject: [PATCH 585/681] Sulong: wrap the native function returned by rtld
 default.

---
 .../truffle/llvm/runtime/nodes/intrinsics/c/LLVMDLSym.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMDLSym.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMDLSym.java
index 57f5feb5999f..8acee2c2d57b 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMDLSym.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMDLSym.java
@@ -91,6 +91,7 @@ protected Object doOp(@SuppressWarnings("unused") LLVMManagedPointer libraryHand
     protected Object doDefaultHandle(@SuppressWarnings("unused") LLVMNativePointer libraryHandle,
                     @SuppressWarnings("unused") LLVMPointer symbolName,
                     @SuppressWarnings("unused") @Cached() LLVMReadStringNode readStr,
+                    @Cached WrappedFunctionNode wrapper,
                     @Cached BranchProfile exception) {
         LLVMContext ctx = LLVMContext.get(this);
         String name = readStr.executeWithTarget(symbolName);
@@ -101,7 +102,7 @@ protected Object doDefaultHandle(@SuppressWarnings("unused") LLVMNativePointer l
                 ctx.setDLError(2);
                 return LLVMNativePointer.createNull();
             }
-            return nativeSymbol;
+            return wrapper.execute(nativeSymbol);
         }
         return ctx.getSymbol(symbol, exception);
     }

From d2bbb3f4c0316e332f7beb8da1542ad72ea927cb Mon Sep 17 00:00:00 2001
From: Paley Li <paley.li@oracle.com>
Date: Fri, 22 Oct 2021 10:31:00 +0200
Subject: [PATCH 586/681] Sulong: add extract element vector access for long.

---
 .../nodes/vector/LLVMExtractElementNode.java  | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vector/LLVMExtractElementNode.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vector/LLVMExtractElementNode.java
index 0df721e49699..c2d8d3b2599c 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vector/LLVMExtractElementNode.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/vector/LLVMExtractElementNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates.
  *
  * All rights reserved.
  *
@@ -52,6 +52,11 @@ public abstract static class LLVMI1ExtractElementNode extends LLVMExpressionNode
         protected boolean doI1(LLVMI1Vector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected boolean doI1(LLVMI1Vector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -62,6 +67,11 @@ public abstract static class LLVMI8ExtractElementNode extends LLVMExpressionNode
         protected byte doI8(LLVMI8Vector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected byte doI8(LLVMI8Vector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -72,6 +82,11 @@ public abstract static class LLVMI16ExtractElementNode extends LLVMExpressionNod
         protected short doI16(LLVMI16Vector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected short doI16(LLVMI16Vector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -82,6 +97,11 @@ public abstract static class LLVMI32ExtractElementNode extends LLVMExpressionNod
         protected int doI32(LLVMI32Vector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected int doI32(LLVMI32Vector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -93,10 +113,20 @@ protected long doI64(LLVMI64Vector vector, int index) {
             return vector.getValue(index);
         }
 
+        @Specialization
+        protected long doI64(LLVMI64Vector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
+
         @Specialization
         protected LLVMPointer doPointer(LLVMPointerVector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected LLVMPointer doPointer(LLVMPointerVector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -107,6 +137,11 @@ public abstract static class LLVMFloatExtractElementNode extends LLVMExpressionN
         protected float doFloat(LLVMFloatVector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected float doFloat(LLVMFloatVector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 
     @NodeChild(type = LLVMExpressionNode.class)
@@ -117,5 +152,10 @@ public abstract static class LLVMDoubleExtractElementNode extends LLVMExpression
         protected double doDouble(LLVMDoubleVector vector, int index) {
             return vector.getValue(index);
         }
+
+        @Specialization
+        protected double doDouble(LLVMDoubleVector vector, long index) {
+            return vector.getValue(Math.toIntExact(index));
+        }
     }
 }

From 165b245cf1117e4957b4562dcc2afc1fabed1c0b Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Sun, 19 Sep 2021 14:01:07 +0200
Subject: [PATCH 587/681] Extend boot module layer to include required modules

---
 .../oracle/svm/hosted/ModuleLayerFeature.java | 205 +++++++++++++++---
 1 file changed, 180 insertions(+), 25 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index 15cdecb526c2..a64c89eee839 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -45,13 +45,17 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * This feature:
@@ -87,9 +91,17 @@
 @Platforms(Platform.HOSTED_ONLY.class)
 public final class ModuleLayerFeature implements Feature {
 
-    private Field moduleNameToModuleField;
-    private Field moduleParentsField;
+    private Module everyoneModule;
+    private Set<Module> everyoneSet;
+    private Constructor<Module> moduleConstructor;
     private Constructor<ModuleLayer> moduleLayerConstructor;
+    private Field moduleLayerField;
+    private Field moduleLayerNameToModuleField;
+    private Field moduleLayerParentsField;
+    private Field moduleReadsField;
+    private Field moduleOpenPackagesField;
+    private Field moduleExportedPackagesField;
+    private Method moduleFindModuleMethod;
 
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
@@ -99,17 +111,26 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         ImageSingletons.add(BootModuleLayerSupport.class, new BootModuleLayerSupport());
-        moduleNameToModuleField = ReflectionUtil.lookupField(ModuleLayer.class, "nameToModule");
-        moduleParentsField = ReflectionUtil.lookupField(ModuleLayer.class, "parents");
+        everyoneModule = ReflectionUtil.readField(Module.class, "EVERYONE_MODULE", null);
+        everyoneSet = Set.of(everyoneModule);
+        moduleConstructor = ReflectionUtil.lookupConstructor(Module.class, ClassLoader.class, ModuleDescriptor.class);
         moduleLayerConstructor = ReflectionUtil.lookupConstructor(ModuleLayer.class, Configuration.class, List.class, Function.class);
+        moduleLayerField = ReflectionUtil.lookupField(Module.class, "layer");
+        moduleLayerNameToModuleField = ReflectionUtil.lookupField(ModuleLayer.class, "nameToModule");
+        moduleLayerParentsField = ReflectionUtil.lookupField(ModuleLayer.class, "parents");
+        moduleReadsField = ReflectionUtil.lookupField(Module.class, "reads");
+        moduleOpenPackagesField = ReflectionUtil.lookupField(Module.class, "openPackages");
+        moduleExportedPackagesField = ReflectionUtil.lookupField(Module.class, "exportedPackages");
+        moduleFindModuleMethod = ReflectionUtil.lookupMethod(Module.class, "findModule", String.class, Map.class, Map.class, List.class);
     }
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
-        Map<String, Module> baseModules = ModuleLayer.boot().modules()
-                        .stream()
-                        .collect(Collectors.toMap(Module::getName, m -> m));
+        Set<Module> baseModules = ModuleLayer.boot().modules()
+                .stream()
+                .map(Module::getName)
+                .collect(Collectors.toSet());
         ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, baseModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
@@ -119,49 +140,183 @@ public void afterAnalysis(AfterAnalysisAccess access) {
         FeatureImpl.AfterAnalysisAccessImpl accessImpl = (FeatureImpl.AfterAnalysisAccessImpl) access;
         AnalysisUniverse universe = accessImpl.getUniverse();
 
-        Map<String, Module> reachableModules = universe.getTypes()
-                        .stream()
-                        .filter(t -> t.isReachable() && !t.isArray())
-                        .map(t -> t.getJavaClass().getModule())
-                        .distinct()
-                        .filter(m -> m.isNamed() && !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
-                        .collect(Collectors.toMap(Module::getName, m -> m));
+        Stream<Module> analysisReachableModules = universe.getTypes()
+                .stream()
+                .filter(t -> t.isReachable() && !t.isArray())
+                .map(t -> t.getJavaClass().getModule())
+                .distinct();
 
-        ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, reachableModules);
+        Set<String> allReachableModules = analysisReachableModules
+                .filter(Module::isNamed)
+                .filter(m -> !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
+                .flatMap(ModuleLayerFeature::extractRequiredModuleNames)
+                .collect(Collectors.toSet());
+
+        ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, allReachableModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
 
-    private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Map<String, Module> reachableModules) {
+    private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Set<String> reachableModules) {
         Configuration cf = synthesizeRuntimeBootLayerConfiguration(cl.modulepath(), reachableModules);
         try {
             ModuleLayer runtimeBootLayer = moduleLayerConstructor.newInstance(cf, List.of(), null);
-            patchRuntimeBootLayer(runtimeBootLayer, reachableModules);
-            // Ensure that the lazy field ModuleLayer.modules gets set
-            runtimeBootLayer.modules();
+            Map<String, Module> nameToModule = synthesizeNameToModule(runtimeBootLayer, cl.getClassLoader());
+            patchRuntimeBootLayer(runtimeBootLayer, nameToModule);
             return runtimeBootLayer;
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException ex) {
             throw VMError.shouldNotReachHere("Failed to synthesize the runtime boot module layer.", ex);
         }
     }
 
-    private static Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Map<String, Module> reachableModules) {
+    private Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set<String> reachableModules) {
         ModuleFinder beforeFinder = new BootModuleLayerModuleFinder();
         ModuleFinder afterFinder = ModuleFinder.of(mp.toArray(Path[]::new));
-        Set<String> roots = reachableModules.keySet();
         try {
-            return Configuration.empty().resolve(beforeFinder, afterFinder, roots);
+            return Configuration.empty().resolve(beforeFinder, afterFinder, reachableModules);
         } catch (FindException | ResolutionException | SecurityException ex) {
             throw VMError.shouldNotReachHere("Failed to synthesize the runtime boot module layer configuration.", ex);
         }
     }
 
-    private void patchRuntimeBootLayer(ModuleLayer runtimeBootLayer, Map<String, Module> reachableModules) {
+    private void patchRuntimeBootLayer(ModuleLayer runtimeBootLayer, Map<String, Module> nameToModule) {
         try {
-            moduleNameToModuleField.set(runtimeBootLayer, reachableModules);
-            moduleParentsField.set(runtimeBootLayer, List.of(ModuleLayer.empty()));
+            moduleLayerNameToModuleField.set(runtimeBootLayer, nameToModule);
+            moduleLayerParentsField.set(runtimeBootLayer, List.of(ModuleLayer.empty()));
         } catch (IllegalAccessException ex) {
             throw VMError.shouldNotReachHere("Failed to patch the runtime boot module layer.", ex);
         }
+
+        // Ensure that the lazy modules field gets set
+        runtimeBootLayer.modules();
+    }
+
+    /**
+     * This method creates Module instances that will populate the runtime boot module layer of the image.
+     * This implementation is copy-pasted from {@link java.lang.Module#defineModules(Configuration, Function, ModuleLayer)}
+     * with few simplifications (removing multiple classloader support) and removal of VM state updates
+     * (otherwise we would be re-defining modules to the host VM).
+     */
+    private Map<String, Module> synthesizeNameToModule(ModuleLayer runtimeBootLayer, ClassLoader cl)
+            throws IllegalAccessException, InvocationTargetException, InstantiationException {
+        Configuration cf = runtimeBootLayer.configuration();
+
+        int cap = (int) (cf.modules().size() / 0.75f + 1.0f);
+        Map<String, Module> nameToModule = new HashMap<>(cap);
+
+        /*
+         * Remove mapping of modules to classloaders.
+         * Create module instances without defining them to the VM
+         */
+        for (ResolvedModule resolvedModule : cf.modules()) {
+            ModuleReference mref = resolvedModule.reference();
+            ModuleDescriptor descriptor = mref.descriptor();
+            String name = descriptor.name();
+            Module m = moduleConstructor.newInstance(cl, descriptor);
+            moduleLayerField.set(m, runtimeBootLayer);
+            nameToModule.put(name, m);
+        }
+
+        /*
+         * Setup readability and exports/opens.
+         * This part is unchanged, save for field setters and VM update removals
+         */
+        for (ResolvedModule resolvedModule : cf.modules()) {
+            ModuleReference mref = resolvedModule.reference();
+            ModuleDescriptor descriptor = mref.descriptor();
+
+            String mn = descriptor.name();
+            Module m = nameToModule.get(mn);
+            assert m != null;
+
+            Set<Module> reads = new HashSet<>();
+            for (ResolvedModule other : resolvedModule.reads()) {
+                Module m2 = nameToModule.get(other.name());
+                reads.add(m2);
+            }
+            moduleReadsField.set(m, reads);
+
+            if (!descriptor.isOpen() && !descriptor.isAutomatic()) {
+                if (descriptor.opens().isEmpty()) {
+                    Map<String, Set<Module>> exportedPackages = new HashMap<>();
+                    for (ModuleDescriptor.Exports exports : m.getDescriptor().exports()) {
+                        String source = exports.source();
+                        if (exports.isQualified()) {
+                            Set<Module> targets = new HashSet<>();
+                            for (String target : exports.targets()) {
+                                Module m2 = nameToModule.get(target);
+                                if (m2 != null) {
+                                    targets.add(m2);
+                                }
+                            }
+                            if (!targets.isEmpty()) {
+                                exportedPackages.put(source, targets);
+                            }
+                        } else {
+                            exportedPackages.put(source, everyoneSet);
+                        }
+                    }
+                    moduleExportedPackagesField.set(m, exportedPackages);
+                } else {
+                    Map<String, Set<Module>> openPackages = new HashMap<>();
+                    Map<String, Set<Module>> exportedPackages = new HashMap<>();
+                    for (ModuleDescriptor.Opens opens : descriptor.opens()) {
+                        String source = opens.source();
+                        if (opens.isQualified()) {
+                            Set<Module> targets = new HashSet<>();
+                            for (String target : opens.targets()) {
+                                Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
+                                if (m2 != null) {
+                                    targets.add(m2);
+                                }
+                            }
+                            if (!targets.isEmpty()) {
+                                openPackages.put(source, targets);
+                            }
+                        } else {
+                            openPackages.put(source, everyoneSet);
+                        }
+                    }
+
+                    for (ModuleDescriptor.Exports exports : descriptor.exports()) {
+                        String source = exports.source();
+                        Set<Module> openToTargets = openPackages.get(source);
+                        if (openToTargets != null && openToTargets.contains(everyoneModule)) {
+                            continue;
+                        }
+
+                        if (exports.isQualified()) {
+                            Set<Module> targets = new HashSet<>();
+                            for (String target : exports.targets()) {
+                                Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
+                                if (m2 != null) {
+                                    if (openToTargets == null || !openToTargets.contains(m2)) {
+                                        targets.add(m2);
+                                    }
+                                }
+                            }
+                            if (!targets.isEmpty()) {
+                                exportedPackages.put(source, targets);
+                            }
+                        } else {
+                            exportedPackages.put(source, everyoneSet);
+                        }
+                    }
+
+                    moduleOpenPackagesField.set(m, openPackages);
+                    moduleExportedPackagesField.set(m, exportedPackages);
+                }
+            }
+        }
+
+        return nameToModule;
+    }
+
+    /*
+     * Creates a stream of module names that are reachable from a given module through "requires"
+     */
+    private static Stream<String> extractRequiredModuleNames(Module m) {
+        Stream<String> requiredModules = m.getDescriptor().requires().stream().map(ModuleDescriptor.Requires::name);
+        return Stream.concat(Stream.of(m.getName()), requiredModules);
     }
 
     static class BootModuleLayerModuleFinder implements ModuleFinder {

From 0b1dc17033c78c2069c5a9687fb4e728c0398cc9 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Thu, 30 Sep 2021 11:08:11 +0200
Subject: [PATCH 588/681] Move reflection fields and nameToModule synthesizing
 logic into a final class

---
 .../oracle/svm/hosted/ModuleLayerFeature.java | 289 +++++++++---------
 1 file changed, 148 insertions(+), 141 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index a64c89eee839..780e1ba1883d 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -90,18 +90,10 @@
 @AutomaticFeature
 @Platforms(Platform.HOSTED_ONLY.class)
 public final class ModuleLayerFeature implements Feature {
-
-    private Module everyoneModule;
-    private Set<Module> everyoneSet;
-    private Constructor<Module> moduleConstructor;
     private Constructor<ModuleLayer> moduleLayerConstructor;
-    private Field moduleLayerField;
     private Field moduleLayerNameToModuleField;
     private Field moduleLayerParentsField;
-    private Field moduleReadsField;
-    private Field moduleOpenPackagesField;
-    private Field moduleExportedPackagesField;
-    private Method moduleFindModuleMethod;
+    private NameToModuleSynthesizer nameToModuleSynthesizer;
 
     @Override
     public boolean isInConfiguration(IsInConfigurationAccess access) {
@@ -111,23 +103,16 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         ImageSingletons.add(BootModuleLayerSupport.class, new BootModuleLayerSupport());
-        everyoneModule = ReflectionUtil.readField(Module.class, "EVERYONE_MODULE", null);
-        everyoneSet = Set.of(everyoneModule);
-        moduleConstructor = ReflectionUtil.lookupConstructor(Module.class, ClassLoader.class, ModuleDescriptor.class);
         moduleLayerConstructor = ReflectionUtil.lookupConstructor(ModuleLayer.class, Configuration.class, List.class, Function.class);
-        moduleLayerField = ReflectionUtil.lookupField(Module.class, "layer");
         moduleLayerNameToModuleField = ReflectionUtil.lookupField(ModuleLayer.class, "nameToModule");
         moduleLayerParentsField = ReflectionUtil.lookupField(ModuleLayer.class, "parents");
-        moduleReadsField = ReflectionUtil.lookupField(Module.class, "reads");
-        moduleOpenPackagesField = ReflectionUtil.lookupField(Module.class, "openPackages");
-        moduleExportedPackagesField = ReflectionUtil.lookupField(Module.class, "exportedPackages");
-        moduleFindModuleMethod = ReflectionUtil.lookupMethod(Module.class, "findModule", String.class, Map.class, Map.class, List.class);
+        nameToModuleSynthesizer = new NameToModuleSynthesizer();
     }
 
     @Override
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
-        Set<Module> baseModules = ModuleLayer.boot().modules()
+        Set<String> baseModules = ModuleLayer.boot().modules()
                 .stream()
                 .map(Module::getName)
                 .collect(Collectors.toSet());
@@ -156,11 +141,19 @@ public void afterAnalysis(AfterAnalysisAccess access) {
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
 
+    /*
+     * Creates a stream of module names that are reachable from a given module through "requires"
+     */
+    private static Stream<String> extractRequiredModuleNames(Module m) {
+        Stream<String> requiredModules = m.getDescriptor().requires().stream().map(ModuleDescriptor.Requires::name);
+        return Stream.concat(Stream.of(m.getName()), requiredModules);
+    }
+
     private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Set<String> reachableModules) {
         Configuration cf = synthesizeRuntimeBootLayerConfiguration(cl.modulepath(), reachableModules);
         try {
             ModuleLayer runtimeBootLayer = moduleLayerConstructor.newInstance(cf, List.of(), null);
-            Map<String, Module> nameToModule = synthesizeNameToModule(runtimeBootLayer, cl.getClassLoader());
+            Map<String, Module> nameToModule = nameToModuleSynthesizer.synthesizeNameToModule(runtimeBootLayer, cl.getClassLoader());
             patchRuntimeBootLayer(runtimeBootLayer, nameToModule);
             return runtimeBootLayer;
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException ex) {
@@ -190,153 +183,167 @@ private void patchRuntimeBootLayer(ModuleLayer runtimeBootLayer, Map<String, Mod
         runtimeBootLayer.modules();
     }
 
-    /**
-     * This method creates Module instances that will populate the runtime boot module layer of the image.
-     * This implementation is copy-pasted from {@link java.lang.Module#defineModules(Configuration, Function, ModuleLayer)}
-     * with few simplifications (removing multiple classloader support) and removal of VM state updates
-     * (otherwise we would be re-defining modules to the host VM).
-     */
-    private Map<String, Module> synthesizeNameToModule(ModuleLayer runtimeBootLayer, ClassLoader cl)
-            throws IllegalAccessException, InvocationTargetException, InstantiationException {
-        Configuration cf = runtimeBootLayer.configuration();
+    static class BootModuleLayerModuleFinder implements ModuleFinder {
 
-        int cap = (int) (cf.modules().size() / 0.75f + 1.0f);
-        Map<String, Module> nameToModule = new HashMap<>(cap);
+        @Override
+        public Optional<ModuleReference> find(String name) {
+            return ModuleLayer.boot()
+                    .configuration()
+                    .findModule(name)
+                    .map(ResolvedModule::reference);
+        }
 
-        /*
-         * Remove mapping of modules to classloaders.
-         * Create module instances without defining them to the VM
-         */
-        for (ResolvedModule resolvedModule : cf.modules()) {
-            ModuleReference mref = resolvedModule.reference();
-            ModuleDescriptor descriptor = mref.descriptor();
-            String name = descriptor.name();
-            Module m = moduleConstructor.newInstance(cl, descriptor);
-            moduleLayerField.set(m, runtimeBootLayer);
-            nameToModule.put(name, m);
+        @Override
+        public Set<ModuleReference> findAll() {
+            return ModuleLayer.boot()
+                    .configuration()
+                    .modules()
+                    .stream()
+                    .map(ResolvedModule::reference)
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    private static final class NameToModuleSynthesizer {
+        private final Module everyoneModule;
+        private final Set<Module> everyoneSet;
+        private final Constructor<Module> moduleConstructor;
+        private final Field moduleLayerField;
+        private final Field moduleReadsField;
+        private final Field moduleOpenPackagesField;
+        private final Field moduleExportedPackagesField;
+        private final Method moduleFindModuleMethod;
+
+        public NameToModuleSynthesizer() {
+            everyoneModule = ReflectionUtil.readField(Module.class, "EVERYONE_MODULE", null);
+            everyoneSet = Set.of(everyoneModule);
+            moduleConstructor = ReflectionUtil.lookupConstructor(Module.class, ClassLoader.class, ModuleDescriptor.class);
+            moduleLayerField = ReflectionUtil.lookupField(Module.class, "layer");
+            moduleReadsField = ReflectionUtil.lookupField(Module.class, "reads");
+            moduleOpenPackagesField = ReflectionUtil.lookupField(Module.class, "openPackages");
+            moduleExportedPackagesField = ReflectionUtil.lookupField(Module.class, "exportedPackages");
+            moduleFindModuleMethod = ReflectionUtil.lookupMethod(Module.class, "findModule", String.class, Map.class, Map.class, List.class);
         }
 
-        /*
-         * Setup readability and exports/opens.
-         * This part is unchanged, save for field setters and VM update removals
+        /**
+         * This method creates Module instances that will populate the runtime boot module layer of the image.
+         * This implementation is copy-pasted from {@link java.lang.Module#defineModules(Configuration, Function, ModuleLayer)}
+         * with few simplifications (removing multiple classloader support) and removal of VM state updates
+         * (otherwise we would be re-defining modules to the host VM).
          */
-        for (ResolvedModule resolvedModule : cf.modules()) {
-            ModuleReference mref = resolvedModule.reference();
-            ModuleDescriptor descriptor = mref.descriptor();
+        Map<String, Module> synthesizeNameToModule(ModuleLayer runtimeBootLayer, ClassLoader cl)
+                throws IllegalAccessException, InvocationTargetException, InstantiationException {
+            Configuration cf = runtimeBootLayer.configuration();
 
-            String mn = descriptor.name();
-            Module m = nameToModule.get(mn);
-            assert m != null;
+            int cap = (int) (cf.modules().size() / 0.75f + 1.0f);
+            Map<String, Module> nameToModule = new HashMap<>(cap);
 
-            Set<Module> reads = new HashSet<>();
-            for (ResolvedModule other : resolvedModule.reads()) {
-                Module m2 = nameToModule.get(other.name());
-                reads.add(m2);
+            /*
+             * Remove mapping of modules to classloaders.
+             * Create module instances without defining them to the VM
+             */
+            for (ResolvedModule resolvedModule : cf.modules()) {
+                ModuleReference mref = resolvedModule.reference();
+                ModuleDescriptor descriptor = mref.descriptor();
+                String name = descriptor.name();
+                Module m = moduleConstructor.newInstance(cl, descriptor);
+                moduleLayerField.set(m, runtimeBootLayer);
+                nameToModule.put(name, m);
             }
-            moduleReadsField.set(m, reads);
 
-            if (!descriptor.isOpen() && !descriptor.isAutomatic()) {
-                if (descriptor.opens().isEmpty()) {
-                    Map<String, Set<Module>> exportedPackages = new HashMap<>();
-                    for (ModuleDescriptor.Exports exports : m.getDescriptor().exports()) {
-                        String source = exports.source();
-                        if (exports.isQualified()) {
-                            Set<Module> targets = new HashSet<>();
-                            for (String target : exports.targets()) {
-                                Module m2 = nameToModule.get(target);
-                                if (m2 != null) {
-                                    targets.add(m2);
+            /*
+             * Setup readability and exports/opens.
+             * This part is unchanged, save for field setters and VM update removals
+             */
+            for (ResolvedModule resolvedModule : cf.modules()) {
+                ModuleReference mref = resolvedModule.reference();
+                ModuleDescriptor descriptor = mref.descriptor();
+
+                String mn = descriptor.name();
+                Module m = nameToModule.get(mn);
+                assert m != null;
+
+                Set<Module> reads = new HashSet<>();
+                for (ResolvedModule other : resolvedModule.reads()) {
+                    Module m2 = nameToModule.get(other.name());
+                    reads.add(m2);
+                }
+                moduleReadsField.set(m, reads);
+
+                if (!descriptor.isOpen() && !descriptor.isAutomatic()) {
+                    if (descriptor.opens().isEmpty()) {
+                        Map<String, Set<Module>> exportedPackages = new HashMap<>();
+                        for (ModuleDescriptor.Exports exports : m.getDescriptor().exports()) {
+                            String source = exports.source();
+                            if (exports.isQualified()) {
+                                Set<Module> targets = new HashSet<>();
+                                for (String target : exports.targets()) {
+                                    Module m2 = nameToModule.get(target);
+                                    if (m2 != null) {
+                                        targets.add(m2);
+                                    }
                                 }
+                                if (!targets.isEmpty()) {
+                                    exportedPackages.put(source, targets);
+                                }
+                            } else {
+                                exportedPackages.put(source, everyoneSet);
                             }
-                            if (!targets.isEmpty()) {
-                                exportedPackages.put(source, targets);
-                            }
-                        } else {
-                            exportedPackages.put(source, everyoneSet);
                         }
-                    }
-                    moduleExportedPackagesField.set(m, exportedPackages);
-                } else {
-                    Map<String, Set<Module>> openPackages = new HashMap<>();
-                    Map<String, Set<Module>> exportedPackages = new HashMap<>();
-                    for (ModuleDescriptor.Opens opens : descriptor.opens()) {
-                        String source = opens.source();
-                        if (opens.isQualified()) {
-                            Set<Module> targets = new HashSet<>();
-                            for (String target : opens.targets()) {
-                                Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
-                                if (m2 != null) {
-                                    targets.add(m2);
+                        moduleExportedPackagesField.set(m, exportedPackages);
+                    } else {
+                        Map<String, Set<Module>> openPackages = new HashMap<>();
+                        Map<String, Set<Module>> exportedPackages = new HashMap<>();
+                        for (ModuleDescriptor.Opens opens : descriptor.opens()) {
+                            String source = opens.source();
+                            if (opens.isQualified()) {
+                                Set<Module> targets = new HashSet<>();
+                                for (String target : opens.targets()) {
+                                    Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
+                                    if (m2 != null) {
+                                        targets.add(m2);
+                                    }
                                 }
+                                if (!targets.isEmpty()) {
+                                    openPackages.put(source, targets);
+                                }
+                            } else {
+                                openPackages.put(source, everyoneSet);
                             }
-                            if (!targets.isEmpty()) {
-                                openPackages.put(source, targets);
-                            }
-                        } else {
-                            openPackages.put(source, everyoneSet);
                         }
-                    }
 
-                    for (ModuleDescriptor.Exports exports : descriptor.exports()) {
-                        String source = exports.source();
-                        Set<Module> openToTargets = openPackages.get(source);
-                        if (openToTargets != null && openToTargets.contains(everyoneModule)) {
-                            continue;
-                        }
+                        for (ModuleDescriptor.Exports exports : descriptor.exports()) {
+                            String source = exports.source();
+                            Set<Module> openToTargets = openPackages.get(source);
+                            if (openToTargets != null && openToTargets.contains(everyoneModule)) {
+                                continue;
+                            }
 
-                        if (exports.isQualified()) {
-                            Set<Module> targets = new HashSet<>();
-                            for (String target : exports.targets()) {
-                                Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
-                                if (m2 != null) {
-                                    if (openToTargets == null || !openToTargets.contains(m2)) {
-                                        targets.add(m2);
+                            if (exports.isQualified()) {
+                                Set<Module> targets = new HashSet<>();
+                                for (String target : exports.targets()) {
+                                    Module m2 = (Module) moduleFindModuleMethod.invoke(null, target, Map.of(), nameToModule, runtimeBootLayer.parents());
+                                    if (m2 != null) {
+                                        if (openToTargets == null || !openToTargets.contains(m2)) {
+                                            targets.add(m2);
+                                        }
                                     }
                                 }
+                                if (!targets.isEmpty()) {
+                                    exportedPackages.put(source, targets);
+                                }
+                            } else {
+                                exportedPackages.put(source, everyoneSet);
                             }
-                            if (!targets.isEmpty()) {
-                                exportedPackages.put(source, targets);
-                            }
-                        } else {
-                            exportedPackages.put(source, everyoneSet);
                         }
-                    }
 
-                    moduleOpenPackagesField.set(m, openPackages);
-                    moduleExportedPackagesField.set(m, exportedPackages);
+                        moduleOpenPackagesField.set(m, openPackages);
+                        moduleExportedPackagesField.set(m, exportedPackages);
+                    }
                 }
             }
-        }
-
-        return nameToModule;
-    }
-
-    /*
-     * Creates a stream of module names that are reachable from a given module through "requires"
-     */
-    private static Stream<String> extractRequiredModuleNames(Module m) {
-        Stream<String> requiredModules = m.getDescriptor().requires().stream().map(ModuleDescriptor.Requires::name);
-        return Stream.concat(Stream.of(m.getName()), requiredModules);
-    }
-
-    static class BootModuleLayerModuleFinder implements ModuleFinder {
 
-        @Override
-        public Optional<ModuleReference> find(String name) {
-            return ModuleLayer.boot()
-                            .configuration()
-                            .findModule(name)
-                            .map(ResolvedModule::reference);
-        }
-
-        @Override
-        public Set<ModuleReference> findAll() {
-            return ModuleLayer.boot()
-                            .configuration()
-                            .modules()
-                            .stream()
-                            .map(ResolvedModule::reference)
-                            .collect(Collectors.toSet());
+            return nameToModule;
         }
     }
 }

From 93c9ed9d778fd1f10e961985e4e3fea6ab5cca85 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Fri, 8 Oct 2021 10:29:44 +0200
Subject: [PATCH 589/681] Support for static required modules

---
 .../com/oracle/svm/hosted/ModuleLayerFeature.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index 780e1ba1883d..2e54072ef57a 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -47,6 +47,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -164,7 +165,18 @@ private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Set<String>
     private Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set<String> reachableModules) {
         ModuleFinder beforeFinder = new BootModuleLayerModuleFinder();
         ModuleFinder afterFinder = ModuleFinder.of(mp.toArray(Path[]::new));
+
         try {
+            ModuleFinder composed = ModuleFinder.compose(beforeFinder, afterFinder);
+            List<String> notFoundModules = new ArrayList<>();
+            for (String module : reachableModules) {
+                Optional<ModuleReference> mref = composed.find(module);
+                if (mref.isEmpty()) {
+                    notFoundModules.add(module);
+                }
+            }
+            reachableModules.removeAll(notFoundModules);
+
             return Configuration.empty().resolve(beforeFinder, afterFinder, reachableModules);
         } catch (FindException | ResolutionException | SecurityException ex) {
             throw VMError.shouldNotReachHere("Failed to synthesize the runtime boot module layer configuration.", ex);

From 6d816896293428e7d881003b6f71c61dde3a5449 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Fri, 8 Oct 2021 11:09:36 +0200
Subject: [PATCH 590/681] Rename notFoundModules to missingModules

---
 .../src/com/oracle/svm/hosted/ModuleLayerFeature.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index 2e54072ef57a..c0c0ede93a69 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -168,14 +168,14 @@ private Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set
 
         try {
             ModuleFinder composed = ModuleFinder.compose(beforeFinder, afterFinder);
-            List<String> notFoundModules = new ArrayList<>();
+            List<String> missingModules = new ArrayList<>();
             for (String module : reachableModules) {
                 Optional<ModuleReference> mref = composed.find(module);
                 if (mref.isEmpty()) {
-                    notFoundModules.add(module);
+                    missingModules.add(module);
                 }
             }
-            reachableModules.removeAll(notFoundModules);
+            reachableModules.removeAll(missingModules);
 
             return Configuration.empty().resolve(beforeFinder, afterFinder, reachableModules);
         } catch (FindException | ResolutionException | SecurityException ex) {

From 6255d137b14fb66f86b37d48337ff8fd5eadcf43 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Fri, 8 Oct 2021 11:24:02 +0200
Subject: [PATCH 591/681] Style fixes

---
 .../src/com/oracle/svm/hosted/ModuleLayerFeature.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index c0c0ede93a69..e88afc6adc73 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -162,7 +162,7 @@ private ModuleLayer synthesizeRuntimeBootLayer(ImageClassLoader cl, Set<String>
         }
     }
 
-    private Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set<String> reachableModules) {
+    private static Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set<String> reachableModules) {
         ModuleFinder beforeFinder = new BootModuleLayerModuleFinder();
         ModuleFinder afterFinder = ModuleFinder.of(mp.toArray(Path[]::new));
 
@@ -226,7 +226,7 @@ private static final class NameToModuleSynthesizer {
         private final Field moduleExportedPackagesField;
         private final Method moduleFindModuleMethod;
 
-        public NameToModuleSynthesizer() {
+        NameToModuleSynthesizer() {
             everyoneModule = ReflectionUtil.readField(Module.class, "EVERYONE_MODULE", null);
             everyoneSet = Set.of(everyoneModule);
             moduleConstructor = ReflectionUtil.lookupConstructor(Module.class, ClassLoader.class, ModuleDescriptor.class);
@@ -239,7 +239,7 @@ public NameToModuleSynthesizer() {
 
         /**
          * This method creates Module instances that will populate the runtime boot module layer of the image.
-         * This implementation is copy-pasted from {@link java.lang.Module#defineModules(Configuration, Function, ModuleLayer)}
+         * This implementation is copy-pasted from Module#defineModules(Configuration, Function, ModuleLayer)
          * with few simplifications (removing multiple classloader support) and removal of VM state updates
          * (otherwise we would be re-defining modules to the host VM).
          */

From d39874f068a222a9b12fcdf15d93b7e4c1bd4413 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Fri, 15 Oct 2021 18:45:06 +0200
Subject: [PATCH 592/681] Add workaround for reflection filters

---
 .../oracle/svm/hosted/ModuleLayerFeature.java | 32 ++++++++++++++++---
 .../com/oracle/svm/util/ReflectionUtil.java   |  5 ++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index e88afc6adc73..99ed39b7c087 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -29,6 +29,7 @@
 import com.oracle.svm.core.jdk11.BootModuleLayerSupport;
 import com.oracle.svm.core.jdk.JDK11OrLater;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.ModuleSupport;
 import com.oracle.svm.util.ReflectionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -48,10 +49,12 @@
 import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
@@ -227,16 +230,35 @@ private static final class NameToModuleSynthesizer {
         private final Method moduleFindModuleMethod;
 
         NameToModuleSynthesizer() {
-            everyoneModule = ReflectionUtil.readField(Module.class, "EVERYONE_MODULE", null);
+            Method classGetDeclaredMethods0Method = ReflectionUtil.lookupMethod(Class.class, "getDeclaredFields0", boolean.class);
+            try {
+                ModuleSupport.openModuleByClass(Module.class, ModuleLayerFeature.class);
+                Field[] moduleClassFields = (Field[]) classGetDeclaredMethods0Method.invoke(Module.class, false);
+
+                Field everyoneModuleField = findFieldByName(moduleClassFields, "EVERYONE_MODULE");
+                everyoneModuleField.setAccessible(true);
+                everyoneModule = (Module) everyoneModuleField.get(null);
+
+                moduleLayerField = findFieldByName(moduleClassFields, "layer");
+                moduleReadsField = findFieldByName(moduleClassFields, "reads");
+                moduleOpenPackagesField = findFieldByName(moduleClassFields, "openPackages");
+                moduleExportedPackagesField = findFieldByName(moduleClassFields, "exportedPackages");
+                moduleLayerField.setAccessible(true);
+                moduleReadsField.setAccessible(true);
+                moduleOpenPackagesField.setAccessible(true);
+                moduleExportedPackagesField.setAccessible(true);
+            } catch (ReflectiveOperationException | NoSuchElementException ex) {
+                throw VMError.shouldNotReachHere("Failed to find the value of EVERYONE_MODULE field of Module class.", ex);
+            }
             everyoneSet = Set.of(everyoneModule);
             moduleConstructor = ReflectionUtil.lookupConstructor(Module.class, ClassLoader.class, ModuleDescriptor.class);
-            moduleLayerField = ReflectionUtil.lookupField(Module.class, "layer");
-            moduleReadsField = ReflectionUtil.lookupField(Module.class, "reads");
-            moduleOpenPackagesField = ReflectionUtil.lookupField(Module.class, "openPackages");
-            moduleExportedPackagesField = ReflectionUtil.lookupField(Module.class, "exportedPackages");
             moduleFindModuleMethod = ReflectionUtil.lookupMethod(Module.class, "findModule", String.class, Map.class, Map.class, List.class);
         }
 
+        private Field findFieldByName(Field[] fields, String name) {
+            return Arrays.stream(fields).filter(f -> f.getName().equals(name)).findAny().get();
+        }
+
         /**
          * This method creates Module instances that will populate the runtime boot module layer of the image.
          * This implementation is copy-pasted from Module#defineModules(Configuration, Function, ModuleLayer)
diff --git a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ReflectionUtil.java b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ReflectionUtil.java
index c63895bbaadd..8b40bf12d983 100644
--- a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ReflectionUtil.java
+++ b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ReflectionUtil.java
@@ -31,7 +31,10 @@
 import java.lang.reflect.Method;
 
 /**
- * This class contains utility methods for commonly used reflection functionality.
+ * This class contains utility methods for commonly used reflection functionality. Note that lookups
+ * will not work on JDK 17 in cases when the field/method is filtered. See
+ * jdk.internal.reflect.Reflection#fieldFilterMap for more information or
+ * com.oracle.svm.hosted.ModuleLayerFeature for an example of a workaround in such cases.
  */
 public final class ReflectionUtil {
 

From 8d88db0577737ed06dd48c68717f5f38a72be312 Mon Sep 17 00:00:00 2001
From: ivan-ristovic <ivan.ristovic95@gmail.com>
Date: Thu, 21 Oct 2021 15:49:54 +0200
Subject: [PATCH 593/681] Fix several style issues

---
 .../oracle/svm/hosted/ModuleLayerFeature.java | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
index 99ed39b7c087..3f0c27bec9d0 100644
--- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java
@@ -117,9 +117,9 @@ public void afterRegistration(AfterRegistrationAccess access) {
     public void beforeAnalysis(BeforeAnalysisAccess access) {
         FeatureImpl.BeforeAnalysisAccessImpl accessImpl = (FeatureImpl.BeforeAnalysisAccessImpl) access;
         Set<String> baseModules = ModuleLayer.boot().modules()
-                .stream()
-                .map(Module::getName)
-                .collect(Collectors.toSet());
+                        .stream()
+                        .map(Module::getName)
+                        .collect(Collectors.toSet());
         ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, baseModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
     }
@@ -130,16 +130,16 @@ public void afterAnalysis(AfterAnalysisAccess access) {
         AnalysisUniverse universe = accessImpl.getUniverse();
 
         Stream<Module> analysisReachableModules = universe.getTypes()
-                .stream()
-                .filter(t -> t.isReachable() && !t.isArray())
-                .map(t -> t.getJavaClass().getModule())
-                .distinct();
+                        .stream()
+                        .filter(t -> t.isReachable() && !t.isArray())
+                        .map(t -> t.getJavaClass().getModule())
+                        .distinct();
 
         Set<String> allReachableModules = analysisReachableModules
-                .filter(Module::isNamed)
-                .filter(m -> !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
-                .flatMap(ModuleLayerFeature::extractRequiredModuleNames)
-                .collect(Collectors.toSet());
+                        .filter(Module::isNamed)
+                        .filter(m -> !m.getDescriptor().modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC))
+                        .flatMap(ModuleLayerFeature::extractRequiredModuleNames)
+                        .collect(Collectors.toSet());
 
         ModuleLayer runtimeBootLayer = synthesizeRuntimeBootLayer(accessImpl.imageClassLoader, allReachableModules);
         BootModuleLayerSupport.instance().setBootLayer(runtimeBootLayer);
@@ -203,19 +203,19 @@ static class BootModuleLayerModuleFinder implements ModuleFinder {
         @Override
         public Optional<ModuleReference> find(String name) {
             return ModuleLayer.boot()
-                    .configuration()
-                    .findModule(name)
-                    .map(ResolvedModule::reference);
+                            .configuration()
+                            .findModule(name)
+                            .map(ResolvedModule::reference);
         }
 
         @Override
         public Set<ModuleReference> findAll() {
             return ModuleLayer.boot()
-                    .configuration()
-                    .modules()
-                    .stream()
-                    .map(ResolvedModule::reference)
-                    .collect(Collectors.toSet());
+                            .configuration()
+                            .modules()
+                            .stream()
+                            .map(ResolvedModule::reference)
+                            .collect(Collectors.toSet());
         }
     }
 
@@ -255,26 +255,27 @@ private static final class NameToModuleSynthesizer {
             moduleFindModuleMethod = ReflectionUtil.lookupMethod(Module.class, "findModule", String.class, Map.class, Map.class, List.class);
         }
 
-        private Field findFieldByName(Field[] fields, String name) {
+        private static Field findFieldByName(Field[] fields, String name) {
             return Arrays.stream(fields).filter(f -> f.getName().equals(name)).findAny().get();
         }
 
         /**
-         * This method creates Module instances that will populate the runtime boot module layer of the image.
-         * This implementation is copy-pasted from Module#defineModules(Configuration, Function, ModuleLayer)
-         * with few simplifications (removing multiple classloader support) and removal of VM state updates
-         * (otherwise we would be re-defining modules to the host VM).
+         * This method creates Module instances that will populate the runtime boot module layer of
+         * the image. This implementation is copy-pasted from Module#defineModules(Configuration,
+         * Function, ModuleLayer) with few simplifications (removing multiple classloader support)
+         * and removal of VM state updates (otherwise we would be re-defining modules to the host
+         * VM).
          */
         Map<String, Module> synthesizeNameToModule(ModuleLayer runtimeBootLayer, ClassLoader cl)
-                throws IllegalAccessException, InvocationTargetException, InstantiationException {
+                        throws IllegalAccessException, InvocationTargetException, InstantiationException {
             Configuration cf = runtimeBootLayer.configuration();
 
             int cap = (int) (cf.modules().size() / 0.75f + 1.0f);
             Map<String, Module> nameToModule = new HashMap<>(cap);
 
             /*
-             * Remove mapping of modules to classloaders.
-             * Create module instances without defining them to the VM
+             * Remove mapping of modules to classloaders. Create module instances without defining
+             * them to the VM
              */
             for (ResolvedModule resolvedModule : cf.modules()) {
                 ModuleReference mref = resolvedModule.reference();
@@ -286,8 +287,8 @@ Map<String, Module> synthesizeNameToModule(ModuleLayer runtimeBootLayer, ClassLo
             }
 
             /*
-             * Setup readability and exports/opens.
-             * This part is unchanged, save for field setters and VM update removals
+             * Setup readability and exports/opens. This part is unchanged, save for field setters
+             * and VM update removals
              */
             for (ResolvedModule resolvedModule : cf.modules()) {
                 ModuleReference mref = resolvedModule.reference();

From cbcb4a8c1c5403ff4f94b7974c92b7bf42ad0190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Fri, 22 Oct 2021 11:58:22 +0200
Subject: [PATCH 594/681] Update to oraclejdk17 with
 https://bugs.openjdk.java.net/browse/JDK-8269745 fix

---
 common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.json b/common.json
index e2d8d4b23743..fc3b4694c613 100644
--- a/common.json
+++ b/common.json
@@ -11,7 +11,7 @@
     "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b03", "platformspecific": true },
     "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+9-jvmci-21.3-b03", "platformspecific": true },
 
-    "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
+    "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03", "platformspecific": true },
     "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03-debug", "platformspecific": true },
     "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03", "platformspecific": true },

From 863eed48bc7152d259084d52676bd8c31623738e Mon Sep 17 00:00:00 2001
From: Roland Schatz <roland.schatz@oracle.com>
Date: Fri, 22 Oct 2021 15:27:33 +0200
Subject: [PATCH 595/681] Remove unnecessary finalizer.

This finalizer is dead code anyway. The LLVM Signal object can not die
as long as it's in the list in LLVMContext. The finalizer can only run
if it was removed before, so we don't need to remove it again.
---
 .../llvm/runtime/nodes/intrinsics/c/LLVMSignal.java       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMSignal.java b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMSignal.java
index 1e43f1899cec..92e81d302a2a 100644
--- a/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMSignal.java
+++ b/sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/c/LLVMSignal.java
@@ -178,14 +178,6 @@ public boolean isRunning() {
             return isRunning.get();
         }
 
-        @Override
-        @TruffleBoundary
-        protected void finalize() throws Throwable {
-            super.finalize();
-            stop();
-            unregisterFromContext();
-        }
-
         private static final long HANDLE_MAX_WAITING_TIME = 250; // ms
 
         @Override

From 6653146587d2d9f41664c1fdb8d9508a45ae8e74 Mon Sep 17 00:00:00 2001
From: Peter Hofer <peter.hofer@oracle.com>
Date: Fri, 22 Oct 2021 15:28:09 +0200
Subject: [PATCH 596/681] Indicate survivor overflow into old generation for
 pinned chunks.

---
 .../src/com/oracle/svm/core/genscavenge/GCImpl.java            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 2754e6ce4cc3..d3371be956c6 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -1015,6 +1015,9 @@ private void promotePinnedObject(PinnedObjectImpl pinned) {
                 boolean promoted = false;
                 if (!completeCollection && originalSpace.getNextAgeForPromotion() < policy.getTenuringAge()) {
                     promoted = heap.getYoungGeneration().promoteChunk(originalChunk, isAligned, originalSpace);
+                    if (!promoted) {
+                        accounting.onSurvivorOverflowed();
+                    }
                 }
                 if (!promoted) {
                     heap.getOldGeneration().promoteChunk(originalChunk, isAligned, originalSpace);

From 0cb56735948437e2cde80c7fc0fb96630a2f2bc0 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 22 Oct 2021 16:51:09 +0200
Subject: [PATCH 597/681] Extract BytecodeOSRMetadata initialization into a
 separate method.

---
 .../truffle/runtime/GraalRuntimeSupport.java  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
index 00c3f356eab9..5d623842c137 100644
--- a/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
+++ b/compiler/src/org.graalvm.compiler.truffle.runtime/src/org/graalvm/compiler/truffle/runtime/GraalRuntimeSupport.java
@@ -92,21 +92,7 @@ public boolean pollBytecodeOSRBackEdge(BytecodeOSRNode osrNode) {
         TruffleSafepoint.poll((Node) osrNode);
         BytecodeOSRMetadata osrMetadata = (BytecodeOSRMetadata) osrNode.getOSRMetadata();
         if (osrMetadata == null) {
-            Node node = (Node) osrNode;
-            osrMetadata = node.atomic(() -> { // double checked locking
-                BytecodeOSRMetadata metadata = (BytecodeOSRMetadata) osrNode.getOSRMetadata();
-                if (metadata == null) {
-                    OptimizedCallTarget callTarget = (OptimizedCallTarget) node.getRootNode().getCallTarget();
-                    if (callTarget.getOptionValue(PolyglotCompilerOptions.OSR)) {
-                        metadata = new BytecodeOSRMetadata(osrNode, callTarget.getOptionValue(PolyglotCompilerOptions.OSRCompilationThreshold));
-                    } else {
-                        metadata = BytecodeOSRMetadata.DISABLED;
-                    }
-
-                    osrNode.setOSRMetadata(metadata);
-                }
-                return metadata;
-            });
+            osrMetadata = initializeBytecodeOSRMetadata(osrNode);
         }
 
         // metadata can be set to DISABLED during initialization (above) or dynamically after
@@ -118,6 +104,24 @@ public boolean pollBytecodeOSRBackEdge(BytecodeOSRNode osrNode) {
         }
     }
 
+    private static BytecodeOSRMetadata initializeBytecodeOSRMetadata(BytecodeOSRNode osrNode) {
+        Node node = (Node) osrNode;
+        return node.atomic(() -> { // double checked locking
+            BytecodeOSRMetadata metadata = (BytecodeOSRMetadata) osrNode.getOSRMetadata();
+            if (metadata == null) {
+                OptimizedCallTarget callTarget = (OptimizedCallTarget) node.getRootNode().getCallTarget();
+                if (callTarget.getOptionValue(PolyglotCompilerOptions.OSR)) {
+                    metadata = new BytecodeOSRMetadata(osrNode, callTarget.getOptionValue(PolyglotCompilerOptions.OSRCompilationThreshold));
+                } else {
+                    metadata = BytecodeOSRMetadata.DISABLED;
+                }
+
+                osrNode.setOSRMetadata(metadata);
+            }
+            return metadata;
+        });
+    }
+
     @Override
     public Object tryBytecodeOSR(BytecodeOSRNode osrNode, int target, Object interpreterState, Runnable beforeTransfer, VirtualFrame parentFrame) {
         CompilerAsserts.neverPartOfCompilation();

From dda08771dae40d1c3b6b78ffae50859c39f1711f Mon Sep 17 00:00:00 2001
From: Martin Entlicher <martin.entlicher@oracle.com>
Date: Fri, 22 Oct 2021 17:48:02 +0200
Subject: [PATCH 598/681] Prevent from memory leaks in LSP. [GR-34359]

---
 .../tools/lsp/server/utils/SourceWrapper.java | 13 +----------
 .../server/utils/TextDocumentSurrogate.java   |  3 +--
 .../utils/TextDocumentSurrogateMap.java       | 22 ++++++++++++++++---
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/SourceWrapper.java b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/SourceWrapper.java
index d2ea732e0c9b..7d00cd6c0432 100644
--- a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/SourceWrapper.java
+++ b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/SourceWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -24,18 +24,11 @@
  */
 package org.graalvm.tools.lsp.server.utils;
 
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.source.Source;
 
 public final class SourceWrapper {
     private Source source;
     private boolean parsingSuccessful = false;
-    /**
-     * Needed to have a strong reference to the RootNode so that it and its children will not be
-     * garbage collected.
-     */
-    // TODO: Review why this needs to be held
-    @SuppressWarnings("unused") private CallTarget callTarget;
 
     public SourceWrapper(Source source) {
         this.setSource(source);
@@ -56,8 +49,4 @@ public boolean isParsingSuccessful() {
     public void setParsingSuccessful(boolean parsingSuccessful) {
         this.parsingSuccessful = parsingSuccessful;
     }
-
-    public void setCallTarget(CallTarget callTarget) {
-        this.callTarget = callTarget;
-    }
 }
diff --git a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java
index bcdd1e2db877..021bd04f9ac4 100644
--- a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java
+++ b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -219,7 +219,6 @@ public void notifyParsingDone(CallTarget callTarget) {
         boolean successful = callTarget != null;
         if (successful) {
             sourceWrapper.setParsingSuccessful(true);
-            sourceWrapper.setCallTarget(callTarget);
             changeEventsSinceLastSuccessfulParsing.clear();
         }
     }
diff --git a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogateMap.java b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogateMap.java
index bcc22b14da1b..4be35f414af5 100644
--- a/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogateMap.java
+++ b/tools/src/org.graalvm.tools.lsp/src/org/graalvm/tools/lsp/server/utils/TextDocumentSurrogateMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021, 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
@@ -26,7 +26,7 @@
 
 import java.net.URI;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -36,7 +36,7 @@
 
 public final class TextDocumentSurrogateMap {
     private final TruffleInstrument.Env env;
-    private final Map<URI, TextDocumentSurrogate> uri2TextDocumentSurrogate = new HashMap<>();
+    private final Map<URI, TextDocumentSurrogate> uri2TextDocumentSurrogate = new LRUCacheMap<>();
 
     public TextDocumentSurrogateMap(TruffleInstrument.Env env) {
         this.env = env;
@@ -83,4 +83,20 @@ public boolean isSourceNewestInSurrogate(Source source) {
         return false;
     }
 
+    private static class LRUCacheMap<K, V> extends LinkedHashMap<K, V> {
+
+        private static final long serialVersionUID = 2428506935618594078L;
+
+        private static final int MAX_SIZE = 2048;
+
+        LRUCacheMap() {
+            super(32, 0.75f, true);
+        }
+
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
+            return size() > MAX_SIZE;
+        }
+
+    }
 }

From 89435bc93221346b4de2f6e6b197c512c4619440 Mon Sep 17 00:00:00 2001
From: Tom Rodriguez <tom.rodriguez@oracle.com>
Date: Fri, 22 Oct 2021 10:02:07 -0700
Subject: [PATCH 599/681] Remove old comment

---
 .../amd64/AMD64GraphBuilderPlugins.java       | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
index c5f597626d68..1e6d1665a159 100644
--- a/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -134,21 +134,12 @@ private static void registerIntegerLongPlugins(InvocationPlugins plugins, JavaKi
         r.register1("numberOfLeadingZeros", type, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
-                // @formatter:off
-                //    public static int numberOfLeadingZeros(int i) {
-                //        if (lzcnt(INJECTED_TARGET)) {
-                //            return AMD64CountLeadingZerosNode.countLeadingZeros(i);
-                //        }
-                //        if (i == 0) {
-                //            return 32;
-                //        }
-                //        return 31 - BitScanReverseNode.unsafeScan(i);
-                //    }
-                // @formatter:on
                 if (arch.getFeatures().contains(AMD64.CPUFeature.LZCNT) && arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction)) {
                     b.addPush(JavaKind.Int, new AMD64CountLeadingZerosNode(arg));
                 } else {
                     try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        // if (arg == 0) return kind.getBitCount();
+                        // return new kind.getBitCount() - 1 - BitScanReverseNode(arg);
                         helper.emitReturnIf(arg, Condition.EQ, ConstantNode.forIntegerKind(kind, 0), ConstantNode.forInt(kind.getBitCount()), GraalDirectives.UNLIKELY_PROBABILITY);
                         helper.emitFinalReturn(JavaKind.Int, helper.sub(ConstantNode.forInt(kind.getBitCount() - 1), new BitScanReverseNode(arg)));
                     }
@@ -159,21 +150,12 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         r.register1("numberOfTrailingZeros", type, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
-                // @formatter:off
-                //    public static int numberOfTrailingZeros(int i) {
-                //        if (tzcnt(INJECTED_TARGET)) {
-                //            return AMD64CountTrailingZerosNode.countTrailingZeros(i);
-                //        }
-                //        if (i == 0) {
-                //            return 32;
-                //        }
-                //        return BitScanForwardNode.unsafeScan(i);
-                //    }
-                // @formatter:on
                 if (arch.getFeatures().contains(AMD64.CPUFeature.BMI1) && arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction)) {
                     b.addPush(JavaKind.Int, new AMD64CountTrailingZerosNode(arg));
                 } else {
                     try (InvocationPluginHelper helper = new InvocationPluginHelper(b, targetMethod)) {
+                        // if (arg == 0) return kind.getBitCount();
+                        // return new BitScanForwardNode(arg);
                         helper.emitReturnIf(arg, Condition.EQ, ConstantNode.forIntegerKind(kind, 0), ConstantNode.forInt(kind.getBitCount()), GraalDirectives.UNLIKELY_PROBABILITY);
                         helper.emitFinalReturn(JavaKind.Int, b.add(new BitScanForwardNode(arg)));
                     }

From fd66238a3e8c232229545642b9dfcbf855151b3e Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 22 Oct 2021 17:22:56 +0000
Subject: [PATCH 600/681] [GR-33305] Setup indirect call when using
 PythonBuffer*Library.

PullRequest: graalpython/1992
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 49694328a713..2bffa9938a85 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "a48aebd1681cc9b0bb454ab0995c97c5d2cbc5df",
+                "version": "b030df9b0042f67434f1b95848730f36a427ff31",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From 4f4fe2756836691afcdb37bbd96251c3544f9e27 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Fri, 8 Oct 2021 16:20:35 -0700
Subject: [PATCH 601/681] Add missing exception edge for array allocations

---
 .../meta/DefaultHotSpotLoweringProvider.java  |  2 +
 .../meta/HotSpotHostForeignCallsProvider.java |  3 +
 .../stubs/NegativeArraySizeExceptionStub.java | 80 +++++++++++++++++++
 .../stubs/OutOfBoundsExceptionStub.java       |  2 +-
 .../graalvm/compiler/java/BytecodeParser.java | 18 ++---
 .../nodes/extended/BytecodeExceptionNode.java | 10 +++
 .../graphbuilderconf/GraphBuilderContext.java | 23 ++++++
 .../StandardGraphBuilderPlugins.java          |  4 +-
 .../graal/snippets/NonSnippetLowerings.java   |  4 +
 .../snippets/SubstrateAllocationSnippets.java | 11 +--
 .../svm/core/snippets/ImplicitExceptions.java | 45 ++++++++++-
 ...trinsifyMethodHandlesInvocationPlugin.java |  2 +-
 .../SubstrateGraphBuilderPlugins.java         | 28 ++++---
 .../JNIPrimitiveArrayOperationMethod.java     |  3 +-
 14 files changed, 191 insertions(+), 44 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
index ba5b53b14bb8..70677179e236 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java
@@ -760,6 +760,7 @@ static final class Exceptions {
             cachedExceptions.put(BytecodeExceptionKind.OUT_OF_BOUNDS, clearStackTrace(new ArrayIndexOutOfBoundsException()));
             cachedExceptions.put(BytecodeExceptionKind.CLASS_CAST, clearStackTrace(new ClassCastException()));
             cachedExceptions.put(BytecodeExceptionKind.ARRAY_STORE, clearStackTrace(new ArrayStoreException()));
+            cachedExceptions.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, clearStackTrace(new NegativeArraySizeException()));
             cachedExceptions.put(BytecodeExceptionKind.DIVISION_BY_ZERO, clearStackTrace(new ArithmeticException()));
             cachedExceptions.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY,
                             clearStackTrace(new IllegalArgumentException(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY.getExceptionMessage())));
@@ -780,6 +781,7 @@ public static final class RuntimeCalls {
             runtimeCalls.put(BytecodeExceptionKind.CLASS_CAST, new ForeignCallSignature("createClassCastException", ClassCastException.class, Object.class, KlassPointer.class));
             runtimeCalls.put(BytecodeExceptionKind.NULL_POINTER, new ForeignCallSignature("createNullPointerException", NullPointerException.class));
             runtimeCalls.put(BytecodeExceptionKind.OUT_OF_BOUNDS, new ForeignCallSignature("createOutOfBoundsException", ArrayIndexOutOfBoundsException.class, int.class, int.class));
+            runtimeCalls.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, new ForeignCallSignature("createNegativeArraySizeException", NegativeArraySizeException.class, int.class));
             runtimeCalls.put(BytecodeExceptionKind.DIVISION_BY_ZERO, new ForeignCallSignature("createDivisionByZeroException", ArithmeticException.class));
             runtimeCalls.put(BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW, new ForeignCallSignature("createIntegerExactOverflowException", ArithmeticException.class));
             runtimeCalls.put(BytecodeExceptionKind.LONG_EXACT_OVERFLOW, new ForeignCallSignature("createLongExactOverflowException", ArithmeticException.class));
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
index 36243ca2a141..b9bbd50f0784 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java
@@ -113,6 +113,7 @@
 import org.graalvm.compiler.hotspot.stubs.IllegalArgumentExceptionArgumentIsNotAnArrayStub;
 import org.graalvm.compiler.hotspot.stubs.IntegerExactOverflowExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.LongExactOverflowExceptionStub;
+import org.graalvm.compiler.hotspot.stubs.NegativeArraySizeExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.NullPointerExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.OutOfBoundsExceptionStub;
 import org.graalvm.compiler.hotspot.stubs.Stub;
@@ -477,6 +478,8 @@ public void initialize(HotSpotProviders providers, OptionValues options) {
                         registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NULL_POINTER), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any())));
         link(new OutOfBoundsExceptionStub(options, providers,
                         registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.OUT_OF_BOUNDS), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any())));
+        link(new NegativeArraySizeExceptionStub(options, providers,
+                        registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any())));
         link(new DivisionByZeroExceptionStub(options, providers,
                         registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.DIVISION_BY_ZERO), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any())));
         link(new IntegerExactOverflowExceptionStub(options, providers,
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java
new file mode 100644
index 000000000000..17f1379f1bfb
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.hotspot.stubs;
+
+import static org.graalvm.compiler.hotspot.stubs.StubUtil.printNumber;
+
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
+import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+import org.graalvm.compiler.hotspot.nodes.AllocaNode;
+import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil;
+import org.graalvm.compiler.options.OptionValues;
+import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import org.graalvm.compiler.word.Word;
+
+import jdk.vm.ci.code.Register;
+
+/**
+ * Stub to allocate a {@link NegativeArraySizeException} thrown by a bytecode when the length of an
+ * array allocation is negative.
+ */
+public class NegativeArraySizeExceptionStub extends CreateExceptionStub {
+    public NegativeArraySizeExceptionStub(OptionValues options, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+        super("createNegativeArraySizeException", options, providers, linkage);
+    }
+
+    private static final boolean PRINT_LENGTH_IN_EXCEPTION = JavaVersionUtil.JAVA_SPEC >= 11;
+
+    @Override
+    protected Object getConstantParameterValue(int index, String name) {
+        switch (index) {
+            case 1:
+                return providers.getRegisters().getThreadRegister();
+            case 2:
+                // required bytes for maximum length + nullbyte
+                return OutOfBoundsExceptionStub.MAX_INT_STRING_SIZE + 1;
+            case 3:
+                return PRINT_LENGTH_IN_EXCEPTION;
+            default:
+                throw GraalError.shouldNotReachHere("unknown parameter " + name + " at index " + index);
+        }
+    }
+
+    @Snippet
+    private static Object createNegativeArraySizeException(int length, @ConstantParameter Register threadRegister, @ConstantParameter int bufferSizeInBytes,
+                    @ConstantParameter boolean printLengthInException) {
+        if (printLengthInException) {
+            Word buffer = AllocaNode.alloca(bufferSizeInBytes, HotSpotReplacementsUtil.wordSize());
+            Word ptr = printNumber(buffer, length);
+            ptr.writeByte(0, (byte) 0);
+            return createException(threadRegister, NegativeArraySizeException.class, buffer);
+        } else {
+            return createException(threadRegister, NegativeArraySizeException.class);
+        }
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
index 905809cfe0a0..26fcaad151a0 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java
@@ -50,7 +50,7 @@ public OutOfBoundsExceptionStub(OptionValues options, HotSpotProviders providers
 
     // JDK-8201593: Print array length in ArrayIndexOutOfBoundsException.
     private static final boolean PRINT_LENGTH_IN_EXCEPTION = JavaVersionUtil.JAVA_SPEC >= 11;
-    private static final int MAX_INT_STRING_SIZE = Integer.toString(Integer.MIN_VALUE).length();
+    static final int MAX_INT_STRING_SIZE = Integer.toString(Integer.MIN_VALUE).length();
     private static final String STR_INDEX = "Index ";
     private static final String STR_OUTOFBOUNDSFORLENGTH = " out of bounds for length ";
 
diff --git a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
index 82fc408977ed..802d55b956d6 100644
--- a/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
+++ b/compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/BytecodeParser.java
@@ -4644,7 +4644,7 @@ private static Class<?> arrayTypeCodeToClass(int code) {
 
     private void genNewPrimitiveArray(int typeCode) {
         ResolvedJavaType elementType = getMetaAccess().lookupJavaType(arrayTypeCodeToClass(typeCode));
-        ValueNode length = frameState.pop(JavaKind.Int);
+        ValueNode length = maybeEmitExplicitNegativeArraySizeCheck(frameState.pop(JavaKind.Int));
 
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
             if (plugin.handleNewArray(this, elementType, length)) {
@@ -4657,14 +4657,10 @@ private void genNewPrimitiveArray(int typeCode) {
 
     private void genNewObjectArray(int cpi) {
         JavaType type = lookupType(cpi, ANEWARRAY);
-        genNewObjectArray(type);
-    }
-
-    private void genNewObjectArray(JavaType type) {
         if (typeIsResolved(type)) {
             genNewObjectArray((ResolvedJavaType) type);
         } else {
-            ValueNode length = frameState.pop(JavaKind.Int);
+            ValueNode length = maybeEmitExplicitNegativeArraySizeCheck(frameState.pop(JavaKind.Int));
             handleUnresolvedNewObjectArray(type, length);
         }
     }
@@ -4676,7 +4672,7 @@ private void genNewObjectArray(ResolvedJavaType resolvedType) {
             classInitializationPlugin.apply(this, resolvedType.getArrayClass(), this::createCurrentFrameState);
         }
 
-        ValueNode length = frameState.pop(JavaKind.Int);
+        ValueNode length = maybeEmitExplicitNegativeArraySizeCheck(frameState.pop(JavaKind.Int));
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
             if (plugin.handleNewArray(this, resolvedType, length)) {
                 return;
@@ -4690,15 +4686,11 @@ private void genNewMultiArray(int cpi) {
         JavaType type = lookupType(cpi, MULTIANEWARRAY);
         int rank = getStream().readUByte(bci() + 3);
         ValueNode[] dims = new ValueNode[rank];
-        genNewMultiArray(type, rank, dims);
-    }
-
-    private void genNewMultiArray(JavaType type, int rank, ValueNode[] dims) {
         if (typeIsResolved(type)) {
             genNewMultiArray((ResolvedJavaType) type, rank, dims);
         } else {
             for (int i = rank - 1; i >= 0; i--) {
-                dims[i] = frameState.pop(JavaKind.Int);
+                dims[i] = maybeEmitExplicitNegativeArraySizeCheck(frameState.pop(JavaKind.Int));
             }
             handleUnresolvedNewMultiArray(type, dims);
         }
@@ -4712,7 +4704,7 @@ private void genNewMultiArray(ResolvedJavaType resolvedType, int rank, ValueNode
         }
 
         for (int i = rank - 1; i >= 0; i--) {
-            dims[i] = frameState.pop(JavaKind.Int);
+            dims[i] = maybeEmitExplicitNegativeArraySizeCheck(frameState.pop(JavaKind.Int));
         }
 
         for (NodePlugin plugin : graphBuilderConfig.getPlugins().getNodePlugins()) {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
index a048182f8cde..e5b93a5e1da9 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
@@ -122,6 +122,12 @@ public enum BytecodeExceptionKind {
          */
         ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY(0, IllegalArgumentException.class, "Argument is not an array"),
 
+        /**
+         * Represents a {@link NegativeArraySizeException} with one required int argument for the
+         * length of the array.
+         */
+        NEGATIVE_ARRAY_SIZE(1, NegativeArraySizeException.class),
+
         /**
          * Represents a {@link ArithmeticException}, with the exception message indicating a
          * division by zero. No arguments are allowed.
@@ -157,6 +163,10 @@ public enum BytecodeExceptionKind {
         public String getExceptionMessage() {
             return exceptionMessage;
         }
+
+        public int getNumArguments() {
+            return numArguments;
+        }
     }
 
     public static final NodeClass<BytecodeExceptionNode> TYPE = NodeClass.create(BytecodeExceptionNode.class);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 674c9d515032..49b89cce312f 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -57,6 +57,7 @@
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
+import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
 import org.graalvm.compiler.nodes.calc.IsNullNode;
 import org.graalvm.compiler.nodes.calc.NarrowNode;
 import org.graalvm.compiler.nodes.calc.SignExtendNode;
@@ -334,6 +335,28 @@ default ValueNode nullCheckedValue(ValueNode value, DeoptimizationAction action)
         return value;
     }
 
+    /**
+     * When {@link #needsExplicitException} is true, the method returns a node with a stamp that is
+     * always positive and emits code that throws the provided exceptionKind for a negative length.
+     */
+    default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength, BytecodeExceptionKind exceptionKind) {
+        if (!needsExplicitException() || ((IntegerStamp) arrayLength.stamp(NodeView.DEFAULT)).isPositive()) {
+            return arrayLength;
+        }
+        ConstantNode zero = ConstantNode.defaultForKind(arrayLength.getStackKind());
+        LogicNode condition = append(IntegerLessThanNode.create(getConstantReflection(), getMetaAccess(), getOptions(), null, arrayLength, zero, NodeView.DEFAULT));
+        ValueNode[] arguments = exceptionKind.getNumArguments() == 1 ? new ValueNode[]{arrayLength} : new ValueNode[0];
+        GuardingNode guardingNode = emitBytecodeExceptionCheck(condition, false, exceptionKind, arguments);
+        if (guardingNode == null) {
+            return arrayLength;
+        }
+        return append(PiNode.create(arrayLength, StampFactory.positiveInt(), guardingNode.asNode()));
+    }
+
+    default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength) {
+        return maybeEmitExplicitNegativeArraySizeCheck(arrayLength, BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE);
+    }
+
     default GuardingNode maybeEmitExplicitDivisionByZeroCheck(ValueNode divisor) {
         if (!needsExplicitException() || !((IntegerStamp) divisor.stamp(NodeView.DEFAULT)).contains(0)) {
             return null;
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
index 9637b67cdcb2..8ed37146e916 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -450,7 +450,9 @@ private static void registerArrayPlugins(InvocationPlugins plugins, Replacements
         r.register2("newInstance", Class.class, int.class, new InvocationPlugin() {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unused, ValueNode componentType, ValueNode length) {
-                b.addPush(JavaKind.Object, new DynamicNewArrayNode(componentType, length, true));
+                ValueNode componentTypeNonNull = b.nullCheckedValue(componentType);
+                ValueNode lengthPositive = b.maybeEmitExplicitNegativeArraySizeCheck(length);
+                b.addPush(JavaKind.Object, new DynamicNewArrayNode(componentTypeNonNull, lengthPositive, true));
                 return true;
             }
         });
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
index bffca2c3bfc3..658fe5962e21 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
@@ -140,6 +140,7 @@ protected NonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<Reso
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.ARRAY_STORE, ImplicitExceptions.GET_CACHED_ARRAY_STORE_EXCEPTION);
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH, ImplicitExceptions.GET_CACHED_ILLEGAL_ARGUMENT_EXCEPTION);
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY, ImplicitExceptions.GET_CACHED_ILLEGAL_ARGUMENT_EXCEPTION);
+        getCachedExceptionDescriptors.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, ImplicitExceptions.GET_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION);
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.DIVISION_BY_ZERO, ImplicitExceptions.GET_CACHED_ARITHMETIC_EXCEPTION);
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_NULLARY, ImplicitExceptions.GET_CACHED_ASSERTION_ERROR);
         getCachedExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_OBJECT, ImplicitExceptions.GET_CACHED_ASSERTION_ERROR);
@@ -152,6 +153,7 @@ protected NonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<Reso
         createExceptionDescriptors.put(BytecodeExceptionKind.ARRAY_STORE, ImplicitExceptions.CREATE_ARRAY_STORE_EXCEPTION);
         createExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH, ImplicitExceptions.CREATE_ILLEGAL_ARGUMENT_EXCEPTION);
         createExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY, ImplicitExceptions.CREATE_ILLEGAL_ARGUMENT_EXCEPTION);
+        createExceptionDescriptors.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, ImplicitExceptions.CREATE_NEGATIVE_ARRAY_SIZE_EXCEPTION);
         createExceptionDescriptors.put(BytecodeExceptionKind.DIVISION_BY_ZERO, ImplicitExceptions.CREATE_DIVISION_BY_ZERO_EXCEPTION);
         createExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_NULLARY, ImplicitExceptions.CREATE_ASSERTION_ERROR_NULLARY);
         createExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_OBJECT, ImplicitExceptions.CREATE_ASSERTION_ERROR_OBJECT);
@@ -164,6 +166,7 @@ protected NonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<Reso
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.ARRAY_STORE, ImplicitExceptions.THROW_CACHED_ARRAY_STORE_EXCEPTION);
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH, ImplicitExceptions.THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION);
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY, ImplicitExceptions.THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION);
+        throwCachedExceptionDescriptors.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, ImplicitExceptions.THROW_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION);
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.DIVISION_BY_ZERO, ImplicitExceptions.THROW_CACHED_ARITHMETIC_EXCEPTION);
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_NULLARY, ImplicitExceptions.THROW_CACHED_ASSERTION_ERROR);
         throwCachedExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_OBJECT, ImplicitExceptions.THROW_CACHED_ASSERTION_ERROR);
@@ -176,6 +179,7 @@ protected NonSnippetLowerings(RuntimeConfiguration runtimeConfig, Predicate<Reso
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.ARRAY_STORE, ImplicitExceptions.THROW_NEW_ARRAY_STORE_EXCEPTION_WITH_ARGS);
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH, ImplicitExceptions.THROW_NEW_ILLEGAL_ARGUMENT_EXCEPTION_WITH_ARGS);
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY, ImplicitExceptions.THROW_NEW_ILLEGAL_ARGUMENT_EXCEPTION_WITH_ARGS);
+        throwNewExceptionDescriptors.put(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE, ImplicitExceptions.THROW_NEW_NEGATIVE_ARRAY_SIZE_EXCEPTION);
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.DIVISION_BY_ZERO, ImplicitExceptions.THROW_NEW_DIVISION_BY_ZERO_EXCEPTION);
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_NULLARY, ImplicitExceptions.THROW_NEW_ASSERTION_ERROR_NULLARY);
         throwNewExceptionDescriptors.put(BytecodeExceptionKind.ASSERTION_ERROR_OBJECT, ImplicitExceptions.THROW_NEW_ASSERTION_ERROR_OBJECT);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
index 10164d1d354b..3a345c059fa5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
@@ -50,6 +50,7 @@
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.SnippetAnchorNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.UnreachableNode;
 import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallNode;
 import org.graalvm.compiler.nodes.extended.ForeignCallWithExceptionNode;
@@ -81,7 +82,6 @@
 import com.oracle.svm.core.graal.meta.SubstrateForeignCallsProvider;
 import com.oracle.svm.core.graal.nodes.NewStoredContinuationNode;
 import com.oracle.svm.core.graal.nodes.SubstrateNewHybridInstanceNode;
-import org.graalvm.compiler.nodes.UnreachableNode;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.StoredContinuation;
 import com.oracle.svm.core.hub.DynamicHub;
@@ -196,15 +196,6 @@ private static DynamicHub validateNewInstanceClass(DynamicHub hub) {
     /** Foreign call: {@link #NEW_MULTI_ARRAY}. */
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     private static Object newMultiArrayStub(Word dynamicHub, int rank, Word dimensionsStackValue) {
-        /*
-         * All dimensions must be checked here up front, since a previous dimension of length 0
-         * stops allocation of inner dimensions.
-         */
-        for (int i = 0; i < rank; i++) {
-            if (dimensionsStackValue.readInt(i * 4) < 0) {
-                throw new NegativeArraySizeException();
-            }
-        }
         // newMultiArray does not have a fast path, so there is no need to encode the hub as an
         // object header.
         DynamicHub hub = (DynamicHub) dynamicHub.toObject();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
index 0d77e718dcc5..080386af86fa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/ImplicitExceptions.java
@@ -53,6 +53,7 @@ public class ImplicitExceptions {
     public static final ClassCastException CACHED_CLASS_CAST_EXCEPTION = new ClassCastException(NO_STACK_MSG);
     public static final ArrayStoreException CACHED_ARRAY_STORE_EXCEPTION = new ArrayStoreException(NO_STACK_MSG);
     public static final IllegalArgumentException CACHED_ILLEGAL_ARGUMENT_EXCEPTION = new IllegalArgumentException(NO_STACK_MSG);
+    public static final NegativeArraySizeException CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION = new NegativeArraySizeException(NO_STACK_MSG);
     public static final ArithmeticException CACHED_ARITHMETIC_EXCEPTION = new ArithmeticException(NO_STACK_MSG);
     public static final AssertionError CACHED_ASSERTION_ERROR = new AssertionError(NO_STACK_MSG);
 
@@ -63,6 +64,7 @@ public class ImplicitExceptions {
     public static final SubstrateForeignCallDescriptor CREATE_CLASS_CAST_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createClassCastException", false);
     public static final SubstrateForeignCallDescriptor CREATE_ARRAY_STORE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createArrayStoreException", false);
     public static final SubstrateForeignCallDescriptor CREATE_ILLEGAL_ARGUMENT_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createIllegalArgumentException", false);
+    public static final SubstrateForeignCallDescriptor CREATE_NEGATIVE_ARRAY_SIZE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createNegativeArraySizeException", false);
     public static final SubstrateForeignCallDescriptor CREATE_DIVISION_BY_ZERO_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createDivisionByZeroException", false);
     public static final SubstrateForeignCallDescriptor CREATE_ASSERTION_ERROR_NULLARY = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createAssertionErrorNullary", false);
     public static final SubstrateForeignCallDescriptor CREATE_ASSERTION_ERROR_OBJECT = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "createAssertionErrorObject", false);
@@ -79,6 +81,7 @@ public class ImplicitExceptions {
                     true);
     public static final SubstrateForeignCallDescriptor THROW_NEW_ILLEGAL_ARGUMENT_EXCEPTION_WITH_ARGS = SnippetRuntime.findForeignCall(ImplicitExceptions.class,
                     "throwNewIllegalArgumentExceptionWithArgs", true);
+    public static final SubstrateForeignCallDescriptor THROW_NEW_NEGATIVE_ARRAY_SIZE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwNewNegativeArraySizeException", true);
     public static final SubstrateForeignCallDescriptor THROW_NEW_ARITHMETIC_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwNewArithmeticException", true);
     public static final SubstrateForeignCallDescriptor THROW_NEW_DIVISION_BY_ZERO_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwNewDivisionByZeroException", true);
     public static final SubstrateForeignCallDescriptor THROW_NEW_ASSERTION_ERROR_NULLARY = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwNewAssertionErrorNullary", true);
@@ -89,6 +92,8 @@ public class ImplicitExceptions {
     public static final SubstrateForeignCallDescriptor GET_CACHED_CLASS_CAST_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedClassCastException", false);
     public static final SubstrateForeignCallDescriptor GET_CACHED_ARRAY_STORE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedArrayStoreException", false);
     public static final SubstrateForeignCallDescriptor GET_CACHED_ILLEGAL_ARGUMENT_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedIllegalArgumentException", false);
+    public static final SubstrateForeignCallDescriptor GET_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedNegativeArraySizeException",
+                    false);
     public static final SubstrateForeignCallDescriptor GET_CACHED_ARITHMETIC_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedArithmeticException", false);
     public static final SubstrateForeignCallDescriptor GET_CACHED_ASSERTION_ERROR = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "getCachedAssertionError", false);
 
@@ -97,20 +102,22 @@ public class ImplicitExceptions {
     public static final SubstrateForeignCallDescriptor THROW_CACHED_CLASS_CAST_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedClassCastException", true);
     public static final SubstrateForeignCallDescriptor THROW_CACHED_ARRAY_STORE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedArrayStoreException", true);
     public static final SubstrateForeignCallDescriptor THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedIllegalArgumentException", true);
+    public static final SubstrateForeignCallDescriptor THROW_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedNegativeArraySizeException",
+                    true);
     public static final SubstrateForeignCallDescriptor THROW_CACHED_ARITHMETIC_EXCEPTION = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedArithmeticException", true);
     public static final SubstrateForeignCallDescriptor THROW_CACHED_ASSERTION_ERROR = SnippetRuntime.findForeignCall(ImplicitExceptions.class, "throwCachedAssertionError", true);
 
     public static final SubstrateForeignCallDescriptor[] FOREIGN_CALLS = new SubstrateForeignCallDescriptor[]{
                     CREATE_NULL_POINTER_EXCEPTION, CREATE_OUT_OF_BOUNDS_EXCEPTION, CREATE_INTRINSIC_OUT_OF_BOUNDS_EXCEPTION, CREATE_CLASS_CAST_EXCEPTION, CREATE_ARRAY_STORE_EXCEPTION,
-                    CREATE_ILLEGAL_ARGUMENT_EXCEPTION,
+                    CREATE_ILLEGAL_ARGUMENT_EXCEPTION, CREATE_NEGATIVE_ARRAY_SIZE_EXCEPTION,
                     CREATE_DIVISION_BY_ZERO_EXCEPTION, CREATE_ASSERTION_ERROR_NULLARY, CREATE_ASSERTION_ERROR_OBJECT,
                     THROW_NEW_NULL_POINTER_EXCEPTION, THROW_NEW_INTRINSIC_OUT_OF_BOUNDS_EXCEPTION, THROW_NEW_CLASS_CAST_EXCEPTION, THROW_NEW_ARRAY_STORE_EXCEPTION, THROW_NEW_ARITHMETIC_EXCEPTION,
                     THROW_NEW_OUT_OF_BOUNDS_EXCEPTION_WITH_ARGS, THROW_NEW_CLASS_CAST_EXCEPTION_WITH_ARGS, THROW_NEW_ARRAY_STORE_EXCEPTION_WITH_ARGS, THROW_NEW_ILLEGAL_ARGUMENT_EXCEPTION_WITH_ARGS,
-                    THROW_NEW_DIVISION_BY_ZERO_EXCEPTION, THROW_NEW_ASSERTION_ERROR_NULLARY, THROW_NEW_ASSERTION_ERROR_OBJECT,
+                    THROW_NEW_NEGATIVE_ARRAY_SIZE_EXCEPTION, THROW_NEW_DIVISION_BY_ZERO_EXCEPTION, THROW_NEW_ASSERTION_ERROR_NULLARY, THROW_NEW_ASSERTION_ERROR_OBJECT,
                     GET_CACHED_NULL_POINTER_EXCEPTION, GET_CACHED_OUT_OF_BOUNDS_EXCEPTION, GET_CACHED_CLASS_CAST_EXCEPTION, GET_CACHED_ARRAY_STORE_EXCEPTION, GET_CACHED_ILLEGAL_ARGUMENT_EXCEPTION,
-                    GET_CACHED_ARITHMETIC_EXCEPTION, GET_CACHED_ASSERTION_ERROR,
+                    GET_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION, GET_CACHED_ARITHMETIC_EXCEPTION, GET_CACHED_ASSERTION_ERROR,
                     THROW_CACHED_NULL_POINTER_EXCEPTION, THROW_CACHED_OUT_OF_BOUNDS_EXCEPTION, THROW_CACHED_CLASS_CAST_EXCEPTION, THROW_CACHED_ARRAY_STORE_EXCEPTION,
-                    THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION, THROW_CACHED_ARITHMETIC_EXCEPTION, THROW_CACHED_ASSERTION_ERROR,
+                    THROW_CACHED_ILLEGAL_ARGUMENT_EXCEPTION, THROW_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION, THROW_CACHED_ARITHMETIC_EXCEPTION, THROW_CACHED_ASSERTION_ERROR,
     };
 
     private static final FastThreadLocalInt implicitExceptionsAreFatal = FastThreadLocalFactory.createInt("ImplicitExceptions.implicitExceptionsAreFatal");
@@ -186,6 +193,13 @@ private static IllegalArgumentException createIllegalArgumentException(String me
         return new IllegalArgumentException(message);
     }
 
+    /** Foreign call: {@link #CREATE_NEGATIVE_ARRAY_SIZE_EXCEPTION}. */
+    @SubstrateForeignCallTarget(stubCallingConvention = true)
+    private static NegativeArraySizeException createNegativeArraySizeException(int length) {
+        vmErrorIfImplicitExceptionsAreFatal();
+        return new NegativeArraySizeException(String.valueOf(length));
+    }
+
     /** Foreign call: {@link #CREATE_DIVISION_BY_ZERO_EXCEPTION}. */
     @SubstrateForeignCallTarget(stubCallingConvention = true)
     private static ArithmeticException createDivisionByZeroException() {
@@ -280,6 +294,13 @@ private static void throwNewIllegalArgumentExceptionWithArgs(String message) {
         throw new IllegalArgumentException(message);
     }
 
+    /** Foreign call: {@link #THROW_NEW_NEGATIVE_ARRAY_SIZE_EXCEPTION}. */
+    @SubstrateForeignCallTarget(stubCallingConvention = true)
+    private static void throwNewNegativeArraySizeException(int length) {
+        vmErrorIfImplicitExceptionsAreFatal();
+        throw new NegativeArraySizeException(String.valueOf(length));
+    }
+
     /** Foreign call: {@link #THROW_NEW_ARITHMETIC_EXCEPTION}. */
     @SubstrateForeignCallTarget(stubCallingConvention = true)
     private static void throwNewArithmeticException() {
@@ -348,6 +369,14 @@ private static IllegalArgumentException getCachedIllegalArgumentException() {
         return CACHED_ILLEGAL_ARGUMENT_EXCEPTION;
     }
 
+    /** Foreign call: {@link #GET_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION}. */
+    @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Called to report an implicit exception in code that must not allocate.")
+    @SubstrateForeignCallTarget(stubCallingConvention = true)
+    private static NegativeArraySizeException getCachedNegativeArraySizeException() {
+        vmErrorIfImplicitExceptionsAreFatal();
+        return CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION;
+    }
+
     /** Foreign call: {@link #GET_CACHED_ARITHMETIC_EXCEPTION}. */
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Called to report an implicit exception in code that must not allocate.")
     @SubstrateForeignCallTarget(stubCallingConvention = true)
@@ -404,6 +433,14 @@ private static void throwCachedIllegalArgumentException() {
         throw CACHED_ILLEGAL_ARGUMENT_EXCEPTION;
     }
 
+    /** Foreign call: {@link #THROW_CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION}. */
+    @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Called to report an implicit exception in code that must not allocate.")
+    @SubstrateForeignCallTarget(stubCallingConvention = true)
+    private static void throwCachedNegativeArraySizeException() {
+        vmErrorIfImplicitExceptionsAreFatal();
+        throw CACHED_NEGATIVE_ARRAY_SIZE_EXCEPTION;
+    }
+
     /** Foreign call: {@link #THROW_CACHED_ARITHMETIC_EXCEPTION}. */
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Called to report an implicit exception in code that must not allocate.")
     @SubstrateForeignCallTarget(stubCallingConvention = true)
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
index 131fceac2399..ae3b7e76ed52 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
@@ -757,7 +757,7 @@ private boolean fixedWithNextNode(FixedNode oNode) throws AbortTransplantExcepti
 
             } else if (oNode.getClass() == NewArrayNode.class) {
                 NewArrayNode oNew = (NewArrayNode) oNode;
-                NewArrayNode tNew = b.add(new NewArrayNode(lookup(oNew.elementType()), node(oNew.length()), oNew.fillContents()));
+                NewArrayNode tNew = b.add(new NewArrayNode(lookup(oNew.elementType()), b.maybeEmitExplicitNegativeArraySizeCheck(node(oNew.length())), oNew.fillContents()));
                 transplanted.put(oNew, tNew);
                 return true;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
index 40fac0f35a43..9dee3b13730d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
@@ -56,7 +56,6 @@
 import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.PiNode;
 import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
 import org.graalvm.compiler.nodes.calc.NarrowNode;
 import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
 import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
@@ -554,19 +553,22 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                      * constant. That also allows us to constant-fold the required check that the
                      * component type is a primitive type.
                      */
-                    if (componentTypeNode.isJavaConstant() && componentTypeNode.asJavaConstant().isNonNull()) {
-                        ResolvedJavaType componentType = b.getConstantReflection().asJavaType(componentTypeNode.asJavaConstant());
-                        if (componentType.isPrimitive()) {
-                            /* Emits a null-check for the otherwise unused receiver. */
-                            unsafe.get();
-
-                            LogicNode lengthNegative = b.append(IntegerLessThanNode.create(lengthNode, ConstantNode.forInt(0), NodeView.DEFAULT));
-                            b.emitBytecodeExceptionCheck(lengthNegative, false, BytecodeExceptionNode.BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH);
-                            b.addPush(JavaKind.Object, new NewArrayNode(componentType, lengthNode, false));
-                            return true;
-                        }
+                    if (!componentTypeNode.isJavaConstant() || componentTypeNode.asJavaConstant().isNull()) {
+                        return false;
                     }
-                    return false;
+                    ResolvedJavaType componentType = b.getConstantReflection().asJavaType(componentTypeNode.asJavaConstant());
+                    if (componentType == null || !componentType.isPrimitive()) {
+                        return false;
+                    }
+                    /* Emits a null-check for the otherwise unused receiver. */
+                    unsafe.get();
+                    /*
+                     * Note that allocateUninitializedArray must throw a IllegalArgumentException,
+                     * and not a NegativeArraySizeException, when the length is negative.
+                     */
+                    ValueNode lengthPositive = b.maybeEmitExplicitNegativeArraySizeCheck(lengthNode, BytecodeExceptionNode.BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_NEGATIVE_LENGTH);
+                    b.addPush(JavaKind.Object, new NewArrayNode(componentType, lengthPositive, false));
+                    return true;
                 }
             });
         }
diff --git a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
index 37a78674568e..d8d4cbc3e3ef 100644
--- a/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
+++ b/substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/hosted/JNIPrimitiveArrayOperationMethod.java
@@ -29,6 +29,7 @@
 import java.util.List;
 
 import org.graalvm.compiler.core.common.type.Stamp;
+import org.graalvm.compiler.core.common.type.StampFactory;
 import org.graalvm.compiler.debug.DebugContext;
 import org.graalvm.compiler.java.FrameStateBuilder;
 import org.graalvm.compiler.nodes.AbstractMergeNode;
@@ -266,7 +267,7 @@ private ValueNode newArray(HostedProviders providers, JNIGraphKit kit, List<Valu
         assert wordKind == JavaKind.Long || wordKind == JavaKind.Int;
         ValueNode nullHandle = kit.createConstant(wordKind == JavaKind.Long ? JavaConstant.LONG_0 : JavaConstant.INT_0, wordKind);
         kit.elsePart();
-        ValueNode array = kit.append(new NewArrayNode(elementType, length, true));
+        ValueNode array = kit.append(new NewArrayNode(elementType, kit.createPiNode(length, StampFactory.positiveInt()), true));
         ValueNode arrayHandle = kit.boxObjectInLocalHandle(array);
         AbstractMergeNode merge = kit.endIf();
         merge.setStateAfter(kit.getFrameState().create(kit.bci(), merge));

From f6776db2a487b387c8fb5bb1239d6ace7718b8a1 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Thu, 21 Oct 2021 15:34:14 -0700
Subject: [PATCH 602/681] Use enum for PiNode intrisify op

---
 .../hotspot/replacements/ClassGetHubNode.java |  8 +++----
 .../org/graalvm/compiler/nodes/PiNode.java    | 24 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
index ae4f0d314426..3d05e7d1701a 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java
@@ -32,8 +32,6 @@
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
 import org.graalvm.compiler.hotspot.word.KlassPointer;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
@@ -49,6 +47,8 @@
 import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.compiler.nodes.memory.ReadNode;
 import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import org.graalvm.compiler.nodes.spi.Canonicalizable;
+import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
@@ -129,11 +129,11 @@ public Node canonical(CanonicalizerTool tool) {
     public static native KlassPointer readClass(Class<?> clazzNonNull);
 
     public static KlassPointer piCastNonNull(KlassPointer object, GuardingNode anchor) {
-        return intrinsifiedPiNode(object, anchor, PiNode.INTRINSIFY_OP_NON_NULL);
+        return intrinsifiedPiNode(object, anchor, PiNode.IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic(PiNode.class)
-    private static native KlassPointer intrinsifiedPiNode(KlassPointer object, GuardingNode anchor, @ConstantNodeParameter int intrinsifyOp);
+    private static native KlassPointer intrinsifiedPiNode(KlassPointer object, GuardingNode anchor, @ConstantNodeParameter PiNode.IntrinsifyOp intrinsifyOp);
 
     @Override
     public ValueNode getValue() {
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
index fc482920455a..dc695ec91b4e 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/PiNode.java
@@ -126,18 +126,20 @@ public static ValueNode create(ValueNode object, ValueNode guard) {
         return new PiNode(object, stamp, guard);
     }
 
-    public static final int INTRINSIFY_OP_NON_NULL = 1;
-    public static final int INTRINSIFY_OP_POSITIVE_INT = 2;
+    public enum IntrinsifyOp {
+        NON_NULL,
+        POSITIVE_INT
+    }
 
-    public static boolean intrinsify(GraphBuilderContext b, ValueNode input, ValueNode guard, int intrinsifyOp) {
+    public static boolean intrinsify(GraphBuilderContext b, ValueNode input, ValueNode guard, IntrinsifyOp intrinsifyOp) {
         Stamp piStamp;
         JavaKind pushKind;
         switch (intrinsifyOp) {
-            case INTRINSIFY_OP_NON_NULL:
+            case NON_NULL:
                 piStamp = AbstractPointerStamp.pointerNonNull(input.stamp(NodeView.DEFAULT));
                 pushKind = JavaKind.Object;
                 break;
-            case INTRINSIFY_OP_POSITIVE_INT:
+            case POSITIVE_INT:
                 piStamp = StampFactory.positiveInt();
                 pushKind = JavaKind.Int;
                 break;
@@ -324,33 +326,33 @@ public static Class<?> asNonNullObject(Object object) {
      *         {@code guard}
      */
     public static int piCastPositive(int value, GuardingNode guard) {
-        return intrinsified(value, guard, INTRINSIFY_OP_POSITIVE_INT);
+        return intrinsified(value, guard, IntrinsifyOp.POSITIVE_INT);
     }
 
     @NodeIntrinsic
-    private static native int intrinsified(int value, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native int intrinsified(int value, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
     public static Object piCastNonNull(Object object, GuardingNode guard) {
-        return intrinsified(object, guard, INTRINSIFY_OP_NON_NULL);
+        return intrinsified(object, guard, IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic
-    private static native Object intrinsified(Object object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native Object intrinsified(Object object, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object and ensures the newly stamped value is non-null and does not
      * float above a given guard.
      */
     public static Class<?> piCastNonNullClass(Class<?> type, GuardingNode guard) {
-        return intrinsified(type, guard, INTRINSIFY_OP_NON_NULL);
+        return intrinsified(type, guard, IntrinsifyOp.NON_NULL);
     }
 
     @NodeIntrinsic
-    private static native Class<?> intrinsified(Class<?> object, GuardingNode guard, @ConstantNodeParameter int intrinsifyOp);
+    private static native Class<?> intrinsified(Class<?> object, GuardingNode guard, @ConstantNodeParameter IntrinsifyOp intrinsifyOp);
 
     /**
      * Changes the stamp of an object to represent a given type and to indicate that the object is

From 4136a38e9134e142d261787ba1891748d3feaee1 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Fri, 22 Oct 2021 14:10:58 -0700
Subject: [PATCH 603/681] Fix race in field value recomputation

---
 .../hosted/substitute/ComputedValueField.java | 66 ++++++++++++-------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
index c5d75b307b96..86ad7c4c4bc6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
@@ -236,12 +236,43 @@ public JavaConstant readValue(MetaAccessProvider metaAccess, JavaConstant receiv
                 return constantValue;
         }
 
-        JavaConstant result = getCached(receiver);
-        if (result != null) {
+        ReadLock readLock = valueCacheLock.readLock();
+        try {
+            readLock.lock();
+            JavaConstant result = getCached(receiver);
+            if (result != null) {
+                return result;
+            }
+        } finally {
+            readLock.unlock();
+        }
+
+        WriteLock writeLock = valueCacheLock.writeLock();
+        try {
+            writeLock.lock();
+            /*
+             * Check the cache again, now that we are holding the write-lock, i.e., we know that no
+             * other thread is computing a value right now.
+             */
+            JavaConstant result = getCached(receiver);
+            if (result != null) {
+                return result;
+            }
+            /*
+             * Note that the value computation must be inside the lock, because we want to guarantee
+             * that field-value computers are only executed once per unique receiver.
+             */
+            result = computeValue(metaAccess, receiver);
+            putCached(receiver, result);
             return result;
+        } finally {
+            writeLock.unlock();
         }
+    }
 
+    private JavaConstant computeValue(MetaAccessProvider metaAccess, JavaConstant receiver) {
         SnippetReflectionProvider originalSnippetReflection = GraalAccess.getOriginalSnippetReflection();
+        JavaConstant result;
         switch (kind) {
             case NewInstance:
                 try {
@@ -300,7 +331,6 @@ public JavaConstant readValue(MetaAccessProvider metaAccess, JavaConstant receiv
                                 (annotated != null ? " specified by alias " + annotated.format("%H.%n") : "") +
                                 " not yet supported");
         }
-        putCached(receiver, result);
         return result;
     }
 
@@ -308,33 +338,19 @@ private void putCached(JavaConstant receiver, JavaConstant result) {
         if (disableCaching) {
             return;
         }
-        WriteLock writeLock = valueCacheLock.writeLock();
-        try {
-            writeLock.lock();
-            if (receiver == null) {
-                valueCacheNullKey = result;
-            } else {
-                valueCache.put(receiver, result);
-            }
-        } finally {
-            writeLock.unlock();
+        if (receiver == null) {
+            valueCacheNullKey = result;
+        } else {
+            valueCache.put(receiver, result);
         }
     }
 
     private JavaConstant getCached(JavaConstant receiver) {
-        JavaConstant result;
-        ReadLock readLock = valueCacheLock.readLock();
-        try {
-            readLock.lock();
-            if (receiver == null) {
-                result = valueCacheNullKey;
-            } else {
-                result = valueCache.get(receiver);
-            }
-        } finally {
-            readLock.unlock();
+        if (receiver == null) {
+            return valueCacheNullKey;
+        } else {
+            return valueCache.get(receiver);
         }
-        return result;
     }
 
     @Override

From b6164113fcdd1862ce486eff71cd6d45c810aedb Mon Sep 17 00:00:00 2001
From: Jan Stola <jan.stola@oracle.com>
Date: Sat, 23 Oct 2021 07:31:09 +0000
Subject: [PATCH 604/681] [GR-23997] Periodic update of the graal import
 (2021-10-22).

PullRequest: js/2200
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index 2bffa9938a85..e2cc0d808fab 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "c69f662f3e3cdce492999c328532cbf20c425dd1",
+                "version": "7aa0711bf4d8df2753b90c934b18241180abd861",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "c69f662f3e3cdce492999c328532cbf20c425dd1",
+                "version": "7aa0711bf4d8df2753b90c934b18241180abd861",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From c2bdad580816ceae27dfeec5401092f4ffe5cb71 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 13 Oct 2021 21:26:58 +0200
Subject: [PATCH 605/681] improve javadoc in some core IR classes

---
 .../src/org/graalvm/compiler/graph/Graph.java |   4 +
 .../src/org/graalvm/compiler/graph/Node.java  | 468 +++++++++++++-----
 .../org/graalvm/compiler/graph/NodeClass.java |  22 +-
 .../graalvm/compiler/nodeinfo/InputType.java  |   3 +
 .../org/graalvm/compiler/nodes/ValueNode.java |  14 +-
 .../compiler/nodes/extended/BoxNode.java      |   2 +-
 6 files changed, 364 insertions(+), 149 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
index 087d7741281c..bd7c49af43d6 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java
@@ -582,7 +582,11 @@ final void event(NodeEvent e, Node node) {
                     inputChanged(node);
                     break;
                 case ZERO_USAGES:
+                    GraalError.guarantee(node.isAlive(), "must be alive");
                     usagesDroppedToZero(node);
+                    if (!node.isAlive()) {
+                        throw new GraalError("%s must not kill %s", this, node);
+                    }
                     break;
                 case NODE_ADDED:
                     nodeAdded(node);
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index c11b1531a2c9..34180bb21c63 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -66,12 +66,18 @@
  * {@link Graph}.
  * <p>
  * Once a node has been added to a graph, it has a graph-unique {@link #id()}. Edges in the
- * subclasses are represented with annotated fields. There are two kind of edges : {@link Input} and
- * {@link Successor}. If a field, of a type compatible with {@link Node}, annotated with either
- * {@link Input} and {@link Successor} is not null, then there is an edge from this node to the node
- * this field points to.
+ * subclasses are represented with annotated fields. There are two kind of edges: {@link Input} and
+ * {@link Successor}. If a field of type {@link Node} is annotated with {@link Input} or
+ * {@link Successor}, it must not be {@code null}. There is an edge from this node to the node
+ * denoted by the field's value. A field annotated with {@link OptionalInput} is also such an edge
+ * but it may be {@code null}.
  * <p>
- * Nodes which are be value numberable should implement the {@link ValueNumberable} interface.
+ * Exactly one of {@link Input}, {@link OptionalInput}, or {@link Successor} must be applied to all
+ * fields of a node that are of type {@link Node}. A field of type {@link NodeInputList} must be
+ * annotated with {@link Input} or {@link OptionalInput}. A field of type {@link NodeSuccessorList}
+ * must be annotated with {@link Successor}.
+ * <p>
+ * Nodes which are value numberable should implement the {@link ValueNumberable} interface.
  *
  * <h1>Assertions and Verification</h1>
  *
@@ -98,10 +104,11 @@ public abstract class Node implements Cloneable, Formattable {
     // of this file works around a problem javac has resolving symbols
 
     /**
-     * Denotes a non-optional (non-null) node input. This should be applied to exactly the fields of
-     * a node that are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of
-     * type {@link Node} outside of their constructor should call
-     * {@link Node#updateUsages(Node, Node)} just prior to doing the update of the input.
+     * Denotes a non-optional (non-null) node input. This should only be applied to fields of type
+     * {@link Node} or {@link NodeInputList}.
+     *
+     * Nodes that update fields of type {@link Node} outside of their constructor should call
+     * {@link Node#updateUsages(Node, Node)} just prior to the update.
      */
     @java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
     @java.lang.annotation.Target(ElementType.FIELD)
@@ -110,10 +117,11 @@ public abstract class Node implements Cloneable, Formattable {
     }
 
     /**
-     * Denotes an optional (nullable) node input. This should be applied to exactly the fields of a
-     * node that are of type {@link Node} or {@link NodeInputList}. Nodes that update fields of type
-     * {@link Node} outside of their constructor should call {@link Node#updateUsages(Node, Node)}
-     * just prior to doing the update of the input.
+     * Denotes an optional (nullable) node input. This should only be applied to fields of type
+     * {@link Node} or {@link NodeInputList}.
+     *
+     * Nodes that update fields of type {@link Node} outside of their constructor should call
+     * {@link Node#updateUsages(Node, Node)} just prior to the update.
      */
     @java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
     @java.lang.annotation.Target(ElementType.FIELD)
@@ -121,6 +129,10 @@ public abstract class Node implements Cloneable, Formattable {
         InputType value() default InputType.Value;
     }
 
+    /**
+     * Denotes a non-optional (non-null) node successor. This should only be applied to fields of
+     * type {@link Node} or {@link NodeSuccessorList}.
+     */
     @java.lang.annotation.Retention(RetentionPolicy.RUNTIME)
     @java.lang.annotation.Target(ElementType.FIELD)
     public static @interface Successor {
@@ -221,13 +233,20 @@ public interface ValueNumberable {
     }
 
     /**
-     * Marker interface for nodes that contains other nodes. When the inputs to this node changes,
-     * users of this node should also be placed on the work list for canonicalization.
+     * Marker interface for nodes that contain other nodes. When the inputs to {@code this} change,
+     * users of {@code this} should also be placed on the work list for canonicalization.
      */
     public interface IndirectCanonicalization {
     }
 
+    /**
+     * The graph owning {@code this}.
+     */
     private Graph graph;
+
+    /**
+     * @see #id()
+     */
     int id;
 
     // this next pointer is used in Graph to implement fast iteration over NodeClass types, it
@@ -238,8 +257,13 @@ public interface IndirectCanonicalization {
     private static final Node[] NO_NODES = {};
 
     /**
-     * Head of usage list. The elements of the usage list in order are {@link #usage0},
-     * {@link #usage1} and {@link #extraUsages}. The first null entry terminates the list.
+     * Head of usage list (i.e. list of nodes that have {@code this} as an input). Note that each
+     * element denotes a specific usage so there can be duplicates in the list. For example, a
+     * {@code ConstNode} modeling a compile constant that is added to itself will show up twice in
+     * the usage list of the {@code AddNode}.
+     *
+     * The elements of the usage list in order are {@link #usage0}, {@link #usage1} and
+     * {@link #extraUsages}. The first null entry terminates the list.
      */
     Node usage0;
     Node usage1;
@@ -253,11 +277,7 @@ public interface IndirectCanonicalization {
     public static final int NOT_ITERABLE = -1;
 
     static class NodeStackTrace {
-        final StackTraceElement[] stackTrace;
-
-        NodeStackTrace() {
-            this.stackTrace = new Throwable().getStackTrace();
-        }
+        final StackTraceElement[] stackTrace = new Throwable().getStackTrace();
 
         private String getString(String label) {
             StringBuilder sb = new StringBuilder();
@@ -300,26 +320,31 @@ final void init(NodeClass<? extends Node> c) {
         }
     }
 
+    /**
+     * Gets an identifier for {@code this} that is unique in the context of {@link #graph} iff
+     * {@code this.graph() != NULL && this.isAlive()}. The value returned by this method can change
+     * after the graph is {@linkplain Graph#maybeCompress() compressed}.
+     */
     final int id() {
         return id;
     }
 
     /**
-     * Gets the graph context of this node.
+     * Gets the graph context of {@code this}.
      */
     public Graph graph() {
         return graph;
     }
 
     /**
-     * Gets the option values associated with this node's graph.
+     * Gets the option values associated with {@code this.graph()}.
      */
     public final OptionValues getOptions() {
         return graph == null ? null : graph.getOptions();
     }
 
     /**
-     * Gets the debug context associated with this node's graph.
+     * Gets the debug context associated with {@code this.graph()}.
      */
     public final DebugContext getDebug() {
         return graph.getDebug();
@@ -327,7 +352,7 @@ public final DebugContext getDebug() {
 
     /**
      * Returns an {@link NodeIterable iterable} which can be used to traverse all non-null input
-     * edges of this node.
+     * edges of {@code this}.
      *
      * @return an {@link NodeIterable iterable} for all non-null input edges.
      */
@@ -337,7 +362,7 @@ public NodeIterable<Node> inputs() {
 
     /**
      * Returns an {@link Iterable iterable} which can be used to traverse all non-null input edges
-     * of this node.
+     * of {@code this}.
      *
      * @return an {@link Iterable iterable} for all non-null input edges.
      */
@@ -352,7 +377,7 @@ public abstract static class EdgeVisitor {
     }
 
     /**
-     * Applies the given visitor to all inputs of this node.
+     * Applies the given visitor to all inputs of {@code this}.
      *
      * @param visitor the visitor to be applied to the inputs
      */
@@ -361,7 +386,7 @@ public void applyInputs(EdgeVisitor visitor) {
     }
 
     /**
-     * Applies the given visitor to all successors of this node.
+     * Applies the given visitor to all successors of {@code this}.
      *
      * @param visitor the visitor to be applied to the successors
      */
@@ -371,7 +396,7 @@ public void applySuccessors(EdgeVisitor visitor) {
 
     /**
      * Returns an {@link NodeIterable iterable} which can be used to traverse all non-null successor
-     * edges of this node.
+     * edges of {@code this}.
      *
      * @return an {@link NodeIterable iterable} for all non-null successor edges.
      */
@@ -382,7 +407,7 @@ public NodeIterable<Node> successors() {
 
     /**
      * Returns an {@link Iterable iterable} which can be used to traverse all successor edge
-     * positions of this node.
+     * positions of {@code this}.
      *
      * @return an {@link Iterable iterable} for all successor edge positoins.
      */
@@ -391,7 +416,7 @@ public Iterable<Position> successorPositions() {
     }
 
     /**
-     * Gets the maximum number of usages this node has had at any point in time.
+     * Gets the maximum number of usages {@code this} has had at any point in time.
      */
     public int getUsageCount() {
         if (usage0 == null) {
@@ -404,50 +429,50 @@ public int getUsageCount() {
     }
 
     /**
-     * Gets the list of nodes that use this node (i.e., as an input).
+     * Gets the list of nodes that use {@code this} (i.e., as an input).
      */
     public final NodeIterable<Node> usages() {
         return new NodeUsageIterable(this);
     }
 
     /**
-     * Checks whether this node has no usages.
+     * Checks whether {@code this} has no usages.
      */
     public final boolean hasNoUsages() {
         return this.usage0 == null;
     }
 
     /**
-     * Checks whether this node has usages.
+     * Checks whether {@code this} has usages.
      */
     public final boolean hasUsages() {
         return this.usage0 != null;
     }
 
     /**
-     * Checks whether this node has more than one usages.
+     * Checks whether {@code this} has more than one usage.
      */
     public final boolean hasMoreThanOneUsage() {
         return this.usage1 != null;
     }
 
     /**
-     * Checks whether this node has exactly one usage.
+     * Checks whether {@code this} has exactly one usage.
      */
     public final boolean hasExactlyOneUsage() {
         return hasUsages() && !hasMoreThanOneUsage();
     }
 
     /**
-     * Checks whether this node has only usages of a given {@link InputType}.
+     * Checks whether {@code this} has only usages of type {@code inputType}.
      *
-     * @param type the type of usages to look for
+     * @param inputType the type of usages to look for
      */
-    public final boolean hasOnlyUsagesOfType(InputType type) {
+    public final boolean hasOnlyUsagesOfType(InputType inputType) {
         for (Node usage : usages()) {
             for (Position pos : usage.inputPositions()) {
                 if (pos.get(usage) == this) {
-                    if (pos.getInputType() != type) {
+                    if (pos.getInputType() != inputType) {
                         return false;
                     }
                 }
@@ -541,7 +566,7 @@ private void movUsageFromEndToIndexOne() {
     }
 
     /**
-     * Removes a given node from this node's {@linkplain #usages() usages}.
+     * Removes one occurrence of a given node from this node's {@linkplain #usages() usages}.
      *
      * @param node the node to remove
      * @return whether or not {@code usage} was in the usage list
@@ -612,9 +637,8 @@ public final boolean isUnregistered() {
     }
 
     /**
-     * Updates the usages sets of the given nodes after an input slot is changed from
-     * {@code oldInput} to {@code newInput} by removing this node from {@code oldInput}'s usages and
-     * adds this node to {@code newInput}'s usages.
+     * Removes one occurrence of {@code this} from {@code oldInput}'s usages and adds it to
+     * {@code newInput}'s usages.
      */
     protected void updateUsages(Node oldInput, Node newInput) {
         assert isAlive() && (newInput == null || newInput.isAlive()) : "adding " + newInput + " to " + this + " instead of " + oldInput;
@@ -635,11 +659,11 @@ protected void updateUsages(Node oldInput, Node newInput) {
 
     /**
      * Updates the predecessor of the given nodes after a successor slot is changed from
-     * oldSuccessor to newSuccessor: removes this node from oldSuccessor's predecessors and adds
-     * this node to newSuccessor's predecessors.
+     * oldSuccessor to newSuccessor: removes {@code this} from oldSuccessor's predecessors and adds
+     * {@code this} to newSuccessor's predecessors.
      */
     protected void updatePredecessor(Node oldSuccessor, Node newSuccessor) {
-        assert isAlive() && (newSuccessor == null || newSuccessor.isAlive()) || newSuccessor == null && !isAlive() : "adding " + newSuccessor + " to " + this + " instead of " + oldSuccessor;
+        assert assertTrue(isAlive() && (newSuccessor == null || newSuccessor.isAlive()) || newSuccessor == null && !isAlive(), "adding %s to %s instead of %s", newSuccessor, this, oldSuccessor);
         assert graph == null || !graph.isFrozen();
         if (oldSuccessor != newSuccessor) {
             if (oldSuccessor != null) {
@@ -665,7 +689,7 @@ void initialize(Graph newGraph) {
     }
 
     /**
-     * Information associated with this node. A single value is stored directly in the field.
+     * Information associated with {@code this}. A single value is stored directly in the field.
      * Multiple values are stored by creating an Object[].
      */
     private Object annotation;
@@ -711,9 +735,8 @@ private <T> void setNodeInfo(Class<T> clazz, T value) {
     }
 
     /**
-     * Gets the source position information for this node or null if it doesn't exist.
+     * Gets the source position information for {@code this} or null if it doesn't exist.
      */
-
     public NodeSourcePosition getNodeSourcePosition() {
         return getNodeInfo(NodeSourcePosition.class);
     }
@@ -773,60 +796,137 @@ public boolean isAllowedUsageType(InputType type) {
         return getNodeClass().getAllowedUsageTypes().contains(type);
     }
 
-    private boolean checkReplaceWith(Node other) {
+    private boolean checkReplaceWith(Node replacement) {
         if (graph != null && graph.isFrozen()) {
             fail("cannot modify frozen graph");
         }
-        if (other == this) {
+        if (replacement == this) {
             fail("cannot replace a node with itself");
         }
         if (isDeleted()) {
             fail("cannot replace deleted node");
         }
-        if (other != null && other.isDeleted()) {
-            fail("cannot replace with deleted node %s", other);
+        if (replacement != null && replacement.isDeleted()) {
+            fail("cannot replace with deleted node %s", replacement);
         }
         return true;
     }
 
-    public final void replaceAtUsages(Node other) {
-        replaceAtAllUsages(other, (Node) null);
+    /**
+     * For each use of {@code this} in another node, replace it with {@code replacement}.
+     *
+     * This is shown by the graph transformation below where edges are from usages to inputs (e.g.
+     * {@code this} is an input of {@code n0}).
+     *
+     * Before:
+     *
+     * <pre>
+     *       this
+     *         ^
+     *         |
+     *        /|\
+     *       / | \
+     *      /  |  \
+     *    n0  n1 ..nN
+     *
+     * </pre>
+     *
+     * After:
+     *
+     * <pre>
+     *     replacement
+     *         ^
+     *         |
+     *        /|\
+     *       / | \
+     *      /  |  \
+     *    n0  n1 ..nN
+     * </pre>
+     *
+     * If {@code replacement == null}, then the edges are simply removed.
+     */
+    public final void replaceAtUsages(Node replacement) {
+        replaceAtAllUsages(replacement, false);
     }
 
-    public final void replaceAtUsages(Node other, Predicate<Node> filter) {
-        replaceAtUsages(other, filter, null);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if {@code filter == null} or {@code filter.test(n) == true}.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public final void replaceAtUsages(Node replacement, Predicate<Node> filter) {
+        replaceAtUsages(replacement, filter, false);
     }
 
-    public final void replaceAtUsagesAndDelete(Node other) {
-        replaceAtUsages(other, null, this);
+    /**
+     * For each use of {@code this} in another node, replace it with {@code replacement} and then
+     * {@linkplain #safeDelete() remove} {@code this} from the graph.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public final void replaceAtUsagesAndDelete(Node replacement) {
+        replaceAtUsages(replacement, null, true);
         safeDelete();
     }
 
-    public final void replaceAtUsagesAndDelete(Node other, Predicate<Node> filter) {
-        replaceAtUsages(other, filter, this);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if {@code filter == null} or {@code filter.test(n) == true} and then
+     * {@linkplain #safeDelete() remove} {@code this} from the graph.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public final void replaceAtUsagesAndDelete(Node replacement, Predicate<Node> filter) {
+        replaceAtUsages(replacement, filter, true);
         safeDelete();
     }
 
-    protected void replaceAtUsages(Node other, Predicate<Node> filter, Node toBeDeleted) {
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if {@code filter == null} or {@code filter.test(n) == true}.
+     *
+     * @param forDeletion specifies if the caller will {@linkplain #safeDelete() remove}
+     *            {@code this} from the graph after this method returns
+     * @see #replaceAtUsages(Node)
+     */
+    private void replaceAtUsages(Node replacement, Predicate<Node> filter, boolean forDeletion) {
         if (filter == null) {
-            replaceAtAllUsages(other, toBeDeleted);
+            replaceAtAllUsages(replacement, forDeletion);
         } else {
-            replaceAtMatchingUsages(other, filter, toBeDeleted);
+            replaceAtMatchingUsages(replacement, filter, forDeletion);
         }
+        assert checkReplaceAtUsagesInvariants(replacement);
     }
 
-    protected void replaceAtAllUsages(Node other, Node toBeDeleted) {
-        checkReplaceWith(other);
+    /**
+     * Subclasses can override this to check invariants related to replacing uses of {@code this}.
+     *
+     * @param replacement
+     * @return {@code true} if all invariants hold
+     */
+    protected boolean checkReplaceAtUsagesInvariants(Node replacement) {
+        return true;
+    }
+
+    /**
+     * For each use of {@code this} in another node, replace it with {@code replacement}.
+     *
+     * @param forDeletion specifies if the caller will {@linkplain #safeDelete() remove}
+     *            {@code this} from the graph after this method returns
+     */
+    public final void replaceAtAllUsages(Node replacement, boolean forDeletion) {
+        checkReplaceWith(replacement);
         if (usage0 == null) {
             return;
         }
-        replaceAtUsage(other, toBeDeleted, usage0);
+        replaceAtUsage(replacement, forDeletion, usage0);
         usage0 = null;
 
         if (usage1 == null) {
             return;
         }
-        replaceAtUsage(other, toBeDeleted, usage1);
+        replaceAtUsage(replacement, forDeletion, usage1);
         usage1 = null;
 
         if (extraUsagesCount <= 0) {
@@ -834,37 +934,53 @@ protected void replaceAtAllUsages(Node other, Node toBeDeleted) {
         }
         for (int i = 0; i < extraUsagesCount; i++) {
             Node usage = extraUsages[i];
-            replaceAtUsage(other, toBeDeleted, usage);
+            replaceAtUsage(replacement, forDeletion, usage);
         }
         this.extraUsages = NO_NODES;
         this.extraUsagesCount = 0;
     }
 
-    private void replaceAtUsage(Node other, Node toBeDeleted, Node usage) {
-        boolean result = usage.getNodeClass().replaceFirstInput(usage, this, other);
+    /**
+     * For the use of {@code this} in another node represented by {@code usage}, replace it with
+     * {@code replacement}.
+     *
+     * @param forDeletion specifies if the caller will {@linkplain #safeDelete() remove}
+     *            {@code this} from the graph after this method returns
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    private void replaceAtUsage(Node replacement, boolean forDeletion, Node usage) {
+        boolean result = usage.getNodeClass().replaceFirstInput(usage, this, replacement);
         assert assertTrue(result, "not found in inputs, usage: %s", usage);
         /*
          * Don't notify for nodes which are about to be deleted.
          */
-        if (toBeDeleted == null || usage != toBeDeleted) {
+        if (!forDeletion || usage != this) {
             maybeNotifyInputChanged(usage);
         }
-        if (other != null) {
-            other.addUsage(usage);
+        if (replacement != null) {
+            replacement.addUsage(usage);
         }
     }
 
-    private void replaceAtMatchingUsages(Node other, Predicate<Node> filter, Node toBeDeleted) {
-        if (filter == null) {
-            throw fail("filter cannot be null");
-        }
-        checkReplaceWith(other);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if {@code filter.test(n) == true}.
+     *
+     * @param forDeletion specifies if the caller will {@linkplain #safeDelete() remove}
+     *            {@code this} from the graph after this method returns
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    private void replaceAtMatchingUsages(Node replacement, Predicate<Node> filter, boolean forDeletion) {
+        Objects.requireNonNull(filter);
+        checkReplaceWith(replacement);
         int i = 0;
         int usageCount = this.getUsageCount();
         while (i < usageCount) {
             Node usage = this.getUsageAt(i);
             if (filter.test(usage)) {
-                replaceAtUsage(other, toBeDeleted, usage);
+                replaceAtUsage(replacement, forDeletion, usage);
                 this.movUsageFromEndTo(i);
                 usageCount--;
             } else {
@@ -888,21 +1004,33 @@ public Node singleUsage() {
         return this.usage0;
     }
 
-    public void replaceAtMatchingUsages(Node other, NodePredicate usagePredicate) {
-        checkReplaceWith(other);
-        replaceAtMatchingUsages(other, usagePredicate, null);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if {@code filter.test(n) == true}.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public void replaceAtMatchingUsages(Node replacement, NodePredicate usagePredicate) {
+        checkReplaceWith(replacement);
+        replaceAtMatchingUsages(replacement, usagePredicate, false);
     }
 
-    private void replaceAtUsagePos(Node other, Node usage, Position pos) {
-        pos.initialize(usage, other);
+    private void replaceAtUsagePos(Node replacement, Node usage, Position pos) {
+        pos.initialize(usage, replacement);
         maybeNotifyInputChanged(usage);
-        if (other != null) {
-            other.addUsage(usage);
+        if (replacement != null) {
+            replacement.addUsage(usage);
         }
     }
 
-    public void replaceAtUsages(Node other, InputType type) {
-        checkReplaceWith(other);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if the type of the use is {@code inputType}.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public void replaceAtUsages(Node replacement, InputType inputType) {
+        checkReplaceWith(replacement);
         int i = 0;
         int usageCount = this.getUsageCount();
         if (usageCount == 0) {
@@ -911,8 +1039,8 @@ public void replaceAtUsages(Node other, InputType type) {
         usages: while (i < usageCount) {
             Node usage = this.getUsageAt(i);
             for (Position pos : usage.inputPositions()) {
-                if (pos.getInputType() == type && pos.get(usage) == this) {
-                    replaceAtUsagePos(other, usage, pos);
+                if (pos.getInputType() == inputType && pos.get(usage) == this) {
+                    replaceAtUsagePos(replacement, usage, pos);
                     this.movUsageFromEndTo(i);
                     usageCount--;
                     continue usages;
@@ -925,8 +1053,14 @@ public void replaceAtUsages(Node other, InputType type) {
         }
     }
 
-    public void replaceAtUsages(Node other, InputType... inputTypes) {
-        checkReplaceWith(other);
+    /**
+     * For each use of {@code this} in another node, {@code n}, replace it with {@code replacement}
+     * if the type of the use is in {@code inputTypes}.
+     *
+     * @see #replaceAtUsages(Node)
+     */
+    public void replaceAtUsages(Node replacement, InputType... inputTypes) {
+        checkReplaceWith(replacement);
         int i = 0;
         int usageCount = this.getUsageCount();
         if (usageCount == 0) {
@@ -937,7 +1071,7 @@ public void replaceAtUsages(Node other, InputType... inputTypes) {
             for (Position pos : usage.inputPositions()) {
                 for (InputType type : inputTypes) {
                     if (pos.getInputType() == type && pos.get(usage) == this) {
-                        replaceAtUsagePos(other, usage, pos);
+                        replaceAtUsagePos(replacement, usage, pos);
                         this.movUsageFromEndTo(i);
                         usageCount--;
                         continue usages;
@@ -961,64 +1095,132 @@ private void maybeNotifyInputChanged(Node node) {
         }
     }
 
+    /**
+     * Iterates over each {@link NodeEventListener} attached to {@code this.graph()} if
+     * {@code node.isAlive()} and notifies the listener that {@code node} has had its last usage
+     * removed.
+     */
     public void maybeNotifyZeroUsages(Node node) {
-        if (graph != null) {
+        if (graph != null && node.isAlive()) {
             assert !graph.isFrozen();
             NodeEventListener listener = graph.nodeEventListener;
-            if (listener != null && node.isAlive()) {
+            if (listener != null) {
                 listener.event(Graph.NodeEvent.ZERO_USAGES, node);
             }
         }
     }
 
-    public void replaceAtPredecessor(Node other) {
-        checkReplaceWith(other);
+    /**
+     * Updates the control flow edge, if it exists, from {@link #predecessor()} to {@code this} to
+     * have a target of {@code replacement}.
+     */
+    public void replaceAtPredecessor(Node replacement) {
+        checkReplaceWith(replacement);
         if (predecessor != null) {
-            if (!predecessor.getNodeClass().replaceFirstSuccessor(predecessor, this, other)) {
+            if (!predecessor.getNodeClass().replaceFirstSuccessor(predecessor, this, replacement)) {
                 fail("not found in successors, predecessor: %s", predecessor);
             }
-            predecessor.updatePredecessor(this, other);
+            predecessor.updatePredecessor(this, replacement);
         }
     }
 
-    public void replaceAndDelete(Node other) {
-        checkReplaceWith(other);
-        if (other == null) {
+    /**
+     * Replaces {@code this} at its predecessor (if any) and its usages with {@code replacement} and
+     * removes it from its graph.
+     */
+    public void replaceAndDelete(Node replacement) {
+        checkReplaceWith(replacement);
+        if (replacement == null) {
             fail("cannot replace with null");
         }
         if (this.hasUsages()) {
-            replaceAtUsages(other);
+            replaceAtUsages(replacement);
         }
-        replaceAtPredecessor(other);
+        replaceAtPredecessor(replacement);
         this.safeDelete();
     }
 
+    /**
+     * Finds the first {@link Successor} in {@code this} whose value is {@code oldSuccessor} and
+     * replaces it with {@code newSuccessor}. The predecessor fields in {@code oldSuccessor} and
+     * {@code newSuccessor} are updated to reflect any change made.
+     */
     public void replaceFirstSuccessor(Node oldSuccessor, Node newSuccessor) {
         if (nodeClass.replaceFirstSuccessor(this, oldSuccessor, newSuccessor)) {
             updatePredecessor(oldSuccessor, newSuccessor);
         }
     }
 
+    /**
+     * Finds the first {@link Input} or {@link OptionalInput} in {@code this} whose value is
+     * {@code oldInput} and replaces it with {@code newInput}. If the input is changed, the usage
+     * info for {@code oldInput} and {@code newInput} is updated as well.
+     *
+     * Before {@code this.replaceFirstInput(n0, n2)}:
+     *
+     * <pre>
+     *       n0  n1  n0
+     *        \  |  /
+     *         \ | /
+     *          \|/
+     *           |
+     *           V
+     *         this
+     * </pre>
+     *
+     * After {@code this.replaceFirstInput(n0, n2)}:
+     *
+     * <pre>
+     *       n2  n1  n0
+     *        \  |  /
+     *         \ | /
+     *          \|/
+     *           |
+     *           V
+     *         this
+     * </pre>
+     */
     public void replaceFirstInput(Node oldInput, Node newInput) {
         if (nodeClass.replaceFirstInput(this, oldInput, newInput)) {
             updateUsages(oldInput, newInput);
         }
     }
 
+    /**
+     * Finds all {@link Input}s and {@link OptionalInput}s in {@code this} whose value is
+     * {@code oldInput} and replaces them with {@code newInput}. If any input is changed, the usage
+     * info for {@code oldInput} and {@code newInput} is updated as well.
+     *
+     * Before {@code this.replaceAllInputs(n0, n2)}:
+     *
+     * <pre>
+     *       n0  n1  n0
+     *        \  |  /
+     *         \ | /
+     *          \|/
+     *           |
+     *           V
+     *         this
+     * </pre>
+     *
+     * After {@code this.replaceAllInputs(n0, n2)}:
+     *
+     * <pre>
+     *       n2  n1  n2
+     *        \  |  /
+     *         \ | /
+     *          \|/
+     *           |
+     *           V
+     *         this
+     * </pre>
+     */
     public void replaceAllInputs(Node oldInput, Node newInput) {
         while (nodeClass.replaceFirstInput(this, oldInput, newInput)) {
             updateUsages(oldInput, newInput);
         }
     }
 
-    public void replaceFirstInput(Node oldInput, Node newInput, InputType type) {
-        for (Position pos : inputPositions()) {
-            if (pos.getInputType() == type && pos.get(this) == oldInput) {
-                pos.set(this, newInput);
-            }
-        }
-    }
-
     public void clearInputs() {
         assert assertFalse(isDeleted(), "cannot clear inputs of deleted node");
         getNodeClass().unregisterAtInputsAsUsage(this);
@@ -1041,8 +1243,8 @@ private boolean checkDeletion() {
     }
 
     /**
-     * Removes this node from its graph. This node must have no {@linkplain Node#usages() usages}
-     * and no {@linkplain #predecessor() predecessor}.
+     * Removes {@code this} from {@code this.graph()}. This node must have no
+     * {@linkplain Node#usages() usages} and no {@linkplain #predecessor() predecessor}.
      */
     public void safeDelete() {
         assert checkDeletion();
@@ -1072,8 +1274,8 @@ public final Node copyWithInputs(boolean insertIntoGraph) {
     }
 
     /**
-     * @param newNode the result of cloning this node or {@link Unsafe#allocateInstance(Class) raw
-     *            allocating} a copy of this node
+     * @param newNode the result of cloning {@code this} or {@link Unsafe#allocateInstance(Class)
+     *            raw allocating} a copy of {@code this}
      * @param type the type of edges to process
      * @param edgesToCopy if {@code type} is in this set, the edges are copied otherwise they are
      *            cleared
@@ -1093,14 +1295,14 @@ private void copyOrClearEdgesForClone(Node newNode, Edges.Type type, EnumSet<Edg
     public static final EnumSet<Edges.Type> WithOnlySucessorEdges = EnumSet.of(Successors);
 
     /**
-     * Makes a copy of this node in(to) a given graph.
+     * Makes a copy of {@code this} in(to) a given graph.
      *
-     * @param into the graph in which the copy will be registered (which may be this node's graph)
-     *            or null if the copy should not be registered in a graph
+     * @param into the graph in which the copy will be registered (which may be
+     *            {@code this.graph()}) or null if the copy should not be registered in a graph
      * @param edgesToCopy specifies the edges to be copied. The edges not specified in this set are
      *            initialized to their default value (i.e., {@code null} for a direct edge, an empty
      *            list for an edge list)
-     * @return the copy of this node
+     * @return the copy of {@code this}
      */
     final Node clone(Graph into, EnumSet<Edges.Type> edgesToCopy) {
         final NodeClass<? extends Node> nodeClassTmp = getNodeClass();
@@ -1241,9 +1443,9 @@ public Iterable<? extends Node> cfgPredecessors() {
     }
 
     /**
-     * Returns an iterator that will provide all control-flow successors of this node. Normally this
-     * will be the contents of all fields annotated with {@link Successor}, but some node classes
-     * (like EndNode) may return different nodes.
+     * Returns an iterator that will provide all control-flow successors of {@code this}. Normally
+     * this will be the contents of all fields annotated with {@link Successor}, but some node
+     * classes (like EndNode) may return different nodes.
      */
     public Iterable<? extends Node> cfgSuccessors() {
         return successors();
@@ -1269,16 +1471,16 @@ public final int hashCode() {
      */
 
     /**
-     * Provides a {@link Map} of properties of this node for use in debugging (e.g., to view in the
-     * ideal graph visualizer).
+     * Provides a {@link Map} of properties of {@code this} for use in debugging (e.g., to view in
+     * the ideal graph visualizer).
      */
     public final Map<Object, Object> getDebugProperties() {
         return getDebugProperties(new HashMap<>());
     }
 
     /**
-     * Fills a {@link Map} with properties of this node for use in debugging (e.g., to view in the
-     * ideal graph visualizer). Subclasses overriding this method should also fill the map using
+     * Fills a {@link Map} with properties of {@code this} for use in debugging (e.g., to view in
+     * the ideal graph visualizer). Subclasses overriding this method should also fill the map using
      * their superclass.
      *
      * @param map
@@ -1312,7 +1514,7 @@ public final String toString() {
     }
 
     /**
-     * Creates a String representation for this node with a given {@link Verbosity}.
+     * Creates a String representation for {@code this} with a given {@link Verbosity}.
      */
     public String toString(Verbosity verbosity) {
         switch (verbosity) {
@@ -1410,7 +1612,7 @@ public void formatTo(Formatter formatter, int flags, int width, int precision) {
      *
      * The result of this method undefined if {@code other.getClass() != this.getClass()}.
      *
-     * @param other a node of exactly the same type as this node
+     * @param other a node of exactly the same type as {@code this}
      * @return true if the data fields of this object and {@code other} are equal
      */
     public final boolean valueEquals(Node other) {
@@ -1418,7 +1620,7 @@ public final boolean valueEquals(Node other) {
     }
 
     /**
-     * Determines if this node is equal to the other node while ignoring differences in
+     * Determines if {@code this} is equal to the other node while ignoring differences in
      * {@linkplain Successor control-flow} edges.
      *
      */
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
index 17533816a7cf..41c0ed9b30bd 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeClass.java
@@ -1357,15 +1357,33 @@ private static void registerAtSuccessorsAsPredecessorHelper(Node node, long offs
         }
     }
 
+    /**
+     * Finds the first {@link Input} or {@link OptionalInput} in {@code node} whose value
+     * {@code == key} and replaces it with {@code replacement}.
+     *
+     * Pre-requisite: {@code node.getNodeClass() == this}
+     *
+     * @return {@code true} if a replacement was made, {@code false} if {@code key} was not an input
+     */
     public boolean replaceFirstInput(Node node, Node key, Node replacement) {
+        assert node.getNodeClass() == this;
         return replaceFirstEdge(node, key, replacement, this.inputsIteration, inputs);
     }
 
+    /**
+     * Finds the first {@link Successor} in {@code node} whose value is {@code key} and replaces it
+     * with {@code replacement}.
+     *
+     * Pre-requisite: {@code node.getNodeClass() == this}
+     *
+     * @return {@code true} if a replacement was made, {@code false} if {@code key} was not an input
+     */
     public boolean replaceFirstSuccessor(Node node, Node key, Node replacement) {
+        assert node.getNodeClass() == this;
         return replaceFirstEdge(node, key, replacement, this.successorIteration, successors);
     }
 
-    public static boolean replaceFirstEdge(Node node, Node key, Node replacement, long mask, Edges edges) {
+    private static boolean replaceFirstEdge(Node node, Node key, Node replacement, long mask, Edges edges) {
         int index = 0;
         long myMask = mask;
         while (myMask != 0) {
@@ -1388,7 +1406,7 @@ public static boolean replaceFirstEdge(Node node, Node key, Node replacement, lo
         return false;
     }
 
-    public void registerAtInputsAsUsage(Node node) {
+    void registerAtInputsAsUsage(Node node) {
         long myMask = this.inputsIteration;
         while (myMask != 0) {
             long offset = (myMask & OFFSET_MASK);
diff --git a/compiler/src/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java b/compiler/src/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java
index 3f064e5ed331..78e41d7c35d1 100644
--- a/compiler/src/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java
+++ b/compiler/src/org.graalvm.compiler.nodeinfo/src/org/graalvm/compiler/nodeinfo/InputType.java
@@ -24,6 +24,9 @@
  */
 package org.graalvm.compiler.nodeinfo;
 
+/**
+ * Constants denoting how a node is using an input node.
+ */
 public enum InputType {
     /**
      * Inputs that consume an actual value generated by the referenced node.
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
index d94329f04f6d..3d611b16b69a 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/ValueNode.java
@@ -25,7 +25,6 @@
 package org.graalvm.compiler.nodes;
 
 import java.util.Iterator;
-import java.util.function.Predicate;
 
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.graph.Node;
@@ -225,18 +224,7 @@ public boolean hasUsagesOtherThan(ValueNode node, NodeValueMap nodeValueMap) {
     }
 
     @Override
-    protected void replaceAtUsages(Node other, Predicate<Node> filter, Node toBeDeleted) {
-        super.replaceAtUsages(other, filter, toBeDeleted);
-        assert checkReplaceAtUsagesInvariants(other);
-    }
-
-    @Override
-    protected void replaceAtAllUsages(Node other, Node toBeDeleted) {
-        super.replaceAtAllUsages(other, toBeDeleted);
-        assert checkReplaceAtUsagesInvariants(other);
-    }
-
-    private boolean checkReplaceAtUsagesInvariants(Node other) {
+    protected boolean checkReplaceAtUsagesInvariants(Node other) {
         assert other == null || other instanceof ValueNode;
         if (this.hasUsages() && !this.stamp(NodeView.DEFAULT).isEmpty() && !(other instanceof PhiNode) && other != null) {
             Stamp thisStamp = stamp(NodeView.DEFAULT);
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
index bb109c7a7d37..24116dee464c 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BoxNode.java
@@ -211,7 +211,7 @@ public ValueNode getValue() {
         @Override
         public void lower(LoweringTool tool) {
             if (tool.getLoweringStage() == LoweringTool.StandardLoweringStage.MID_TIER) {
-                replaceAtAllUsages(value, this);
+                replaceAtAllUsages(value, true);
             }
         }
 

From 92e58153917f41e57e33be41e5b8fc67bf1dad95 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 14 Oct 2021 17:13:51 +0200
Subject: [PATCH 606/681] convert some assertions to unconditional checks

---
 .../src/org/graalvm/compiler/graph/Node.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index 34180bb21c63..359fa026d111 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -645,7 +645,7 @@ protected void updateUsages(Node oldInput, Node newInput) {
         if (oldInput != newInput) {
             if (oldInput != null) {
                 boolean result = removeThisFromUsages(oldInput);
-                assert assertTrue(result, "not found in usages, old input: %s", oldInput);
+                assertTrue(result, "not found in usages, old input: %s", oldInput);
             }
             maybeNotifyInputChanged(this);
             if (newInput != null) {
@@ -663,15 +663,15 @@ protected void updateUsages(Node oldInput, Node newInput) {
      * {@code this} to newSuccessor's predecessors.
      */
     protected void updatePredecessor(Node oldSuccessor, Node newSuccessor) {
-        assert assertTrue(isAlive() && (newSuccessor == null || newSuccessor.isAlive()) || newSuccessor == null && !isAlive(), "adding %s to %s instead of %s", newSuccessor, this, oldSuccessor);
+        assertTrue(isAlive() && (newSuccessor == null || newSuccessor.isAlive()) || newSuccessor == null && !isAlive(), "adding %s to %s instead of %s", newSuccessor, this, oldSuccessor);
         assert graph == null || !graph.isFrozen();
         if (oldSuccessor != newSuccessor) {
             if (oldSuccessor != null) {
-                assert assertTrue(newSuccessor == null || oldSuccessor.predecessor == this, "wrong predecessor in old successor (%s): %s, should be %s", oldSuccessor, oldSuccessor.predecessor, this);
+                assertTrue(newSuccessor == null || oldSuccessor.predecessor == this, "wrong predecessor in old successor (%s): %s, should be %s", oldSuccessor, oldSuccessor.predecessor, this);
                 oldSuccessor.predecessor = null;
             }
             if (newSuccessor != null) {
-                assert assertTrue(newSuccessor.predecessor == null, "unexpected non-null predecessor in new successor (%s): %s, this=%s", newSuccessor, newSuccessor.predecessor, this);
+                assertTrue(newSuccessor.predecessor == null, "unexpected non-null predecessor in new successor (%s): %s, this=%s", newSuccessor, newSuccessor.predecessor, this);
                 newSuccessor.predecessor = this;
                 maybeNotifyInputChanged(newSuccessor);
             }
@@ -680,7 +680,7 @@ protected void updatePredecessor(Node oldSuccessor, Node newSuccessor) {
     }
 
     void initialize(Graph newGraph) {
-        assert assertTrue(id == INITIAL_ID, "unexpected id: %d", id);
+        assertTrue(id == INITIAL_ID, "unexpected id: %d", id);
         this.graph = newGraph;
         newGraph.register(this);
         NodeClass<? extends Node> nc = nodeClass;
@@ -951,7 +951,7 @@ public final void replaceAtAllUsages(Node replacement, boolean forDeletion) {
      */
     private void replaceAtUsage(Node replacement, boolean forDeletion, Node usage) {
         boolean result = usage.getNodeClass().replaceFirstInput(usage, this, replacement);
-        assert assertTrue(result, "not found in inputs, usage: %s", usage);
+        assertTrue(result, "not found in inputs, usage: %s", usage);
         /*
          * Don't notify for nodes which are about to be deleted.
          */
@@ -1222,7 +1222,7 @@ public void replaceAllInputs(Node oldInput, Node newInput) {
     }
 
     public void clearInputs() {
-        assert assertFalse(isDeleted(), "cannot clear inputs of deleted node");
+        assertFalse(isDeleted(), "cannot clear inputs of deleted node");
         getNodeClass().unregisterAtInputsAsUsage(this);
     }
 
@@ -1231,7 +1231,7 @@ boolean removeThisFromUsages(Node n) {
     }
 
     public void clearSuccessors() {
-        assert assertFalse(isDeleted(), "cannot clear successors of deleted node");
+        assertFalse(isDeleted(), "cannot clear successors of deleted node");
         getNodeClass().unregisterAtSuccessorsAsPredecessor(this);
     }
 

From c709615eac748c3156a7afaf8fcbbada5de9b233 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 20 Oct 2021 10:36:10 +0200
Subject: [PATCH 607/681] remove VerificationError class

---
 .../src/org/graalvm/compiler/graph/Node.java  |  4 +-
 .../compiler/graph/NodeIdAccessor.java        |  4 +-
 .../org/graalvm/compiler/graph/NodeMap.java   |  2 +-
 .../compiler/graph/VerificationError.java     | 47 -------------------
 .../nodes/virtual/EnsureVirtualizedNode.java  |  6 +--
 .../phases/contract/NodeCostUtil.java         |  4 +-
 .../phases/VerifyFrameDoesNotEscapePhase.java |  4 +-
 7 files changed, 12 insertions(+), 59 deletions(-)
 delete mode 100644 compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java

diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
index 359fa026d111..5c68673c0d96 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java
@@ -1430,8 +1430,8 @@ public boolean assertFalse(boolean condition, String message, Object... args) {
         }
     }
 
-    protected VerificationError fail(String message, Object... args) throws GraalGraphError {
-        throw new VerificationError(message, args).addContext(this);
+    protected GraalGraphError fail(String message, Object... args) throws GraalGraphError {
+        throw new GraalGraphError(message, args).addContext(this);
     }
 
     public Iterable<? extends Node> cfgPredecessors() {
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java
index 4e1a0c1bc037..6debde470cee 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeIdAccessor.java
@@ -44,12 +44,12 @@ Graph getGraph() {
      * Verifies that node identifiers have not changed since this object was created.
      *
      * @return true if the check succeeds
-     * @throws VerificationError if the check fails
+     * @throws GraalGraphError if the check fails
      */
     boolean verifyIdsAreStable() {
         int compressions = graph.compressions - epoch;
         if (compressions != 0) {
-            throw new VerificationError("accessing node id in %s across %d graph compression%s", graph, compressions, compressions == 1 ? "" : "s");
+            throw new GraalGraphError("accessing node id in %s across %d graph compression%s", graph, compressions, compressions == 1 ? "" : "s");
         }
         return true;
     }
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java
index 30fbeaa25faa..ff89647d8c27 100644
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java
+++ b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java
@@ -96,7 +96,7 @@ public Graph graph() {
     public void set(Node node, T value) {
         assert check(node);
         if (!node.isAlive()) {
-            throw new VerificationError("this node is not alive: " + node);
+            throw new GraalGraphError("this node is not alive: " + node);
         }
         values[getNodeId(node)] = value;
     }
diff --git a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java b/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java
deleted file mode 100644
index b41d795d4ad0..000000000000
--- a/compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/VerificationError.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2011, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package org.graalvm.compiler.graph;
-
-/**
- * This error represents a failed verification of a node . It must only be used for conditions that
- * should never occur during normal operation.
- */
-public class VerificationError extends GraalGraphError {
-
-    private static final long serialVersionUID = 8459607567446819822L;
-
-    /**
-     * This constructor creates a {@link VerificationError} with a message assembled via
-     * {@link String#format(String, Object...)}. It always uses the ENGLISH locale in order to
-     * always generate the same output.
-     *
-     * @param msg the message that will be associated with the error, in String.format syntax
-     * @param args parameters to String.format - parameters that implement {@link Iterable} will be
-     *            expanded into a [x, x, ...] representation.
-     */
-    public VerificationError(String msg, Object... args) {
-        super(msg, args);
-    }
-}
diff --git a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java
index a23285d9ea71..d846ec7d68ba 100644
--- a/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java
+++ b/compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java
@@ -29,9 +29,9 @@
 
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
+import org.graalvm.compiler.graph.GraalGraphError;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.VerificationError;
 import org.graalvm.compiler.nodeinfo.NodeInfo;
 import org.graalvm.compiler.nodes.AbstractEndNode;
 import org.graalvm.compiler.nodes.FixedNode;
@@ -67,7 +67,7 @@ public void virtualize(VirtualizerTool tool) {
         if (alias instanceof VirtualObjectNode) {
             VirtualObjectNode virtual = (VirtualObjectNode) alias;
             if (virtual instanceof VirtualBoxingNode) {
-                Throwable exception = new VerificationError("ensureVirtual is not valid for boxing objects: %s", virtual.type().getName());
+                Throwable exception = new GraalGraphError("ensureVirtual is not valid for boxing objects: %s", virtual.type().getName());
                 throw GraphUtil.approxSourceException(this, exception);
             }
             if (!localOnly) {
@@ -95,7 +95,7 @@ public static void ensureVirtualFailure(Node location, Stamp stamp) {
                 additionalReason = " (must not let virtual object escape at node " + next + ")";
             }
         }
-        Throwable exception = new VerificationError("Object of type %s should not be materialized%s:", StampTool.typeOrNull(stamp).getName(), additionalReason);
+        Throwable exception = new GraalGraphError("Object of type %s should not be materialized%s:", StampTool.typeOrNull(stamp).getName(), additionalReason);
 
         Node pos;
         if (location instanceof FixedWithNextNode) {
diff --git a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
index dd5f43e06124..57b02c264ef4 100644
--- a/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
+++ b/compiler/src/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
@@ -31,8 +31,8 @@
 import org.graalvm.compiler.core.common.cfg.BlockMap;
 import org.graalvm.compiler.debug.CounterKey;
 import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.graph.GraalGraphError;
 import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.VerificationError;
 import org.graalvm.compiler.nodes.FixedNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.cfg.Block;
@@ -128,7 +128,7 @@ public static void phaseFulfillsSizeContract(StructuredGraph graph, int codeSize
         if (deltaCompare(codeSizeAfter, codeSizeBefore * codeSizeIncrease, graphSizeDelta) > 0) {
             ResolvedJavaMethod method = graph.method();
             double increase = (double) codeSizeAfter / (double) codeSizeBefore;
-            throw new VerificationError("Phase %s expects to increase code size by at most a factor of %.2f but an increase of %.2f was seen (code size before: %d, after: %d)%s",
+            throw new GraalGraphError("Phase %s expects to increase code size by at most a factor of %.2f but an increase of %.2f was seen (code size before: %d, after: %d)%s",
                             contract.contractorName(), codeSizeIncrease, increase, codeSizeBefore, codeSizeAfter,
                             method != null ? " when compiling method " + method.format("%H.%n(%p)") + "." : ".");
         }
diff --git a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
index da5f43ff99fe..de0d438d3fe8 100644
--- a/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
+++ b/compiler/src/org.graalvm.compiler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
@@ -24,7 +24,7 @@
  */
 package org.graalvm.compiler.truffle.compiler.phases;
 
-import org.graalvm.compiler.graph.VerificationError;
+import org.graalvm.compiler.graph.GraalGraphError;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.compiler.nodes.util.GraphUtil;
@@ -44,7 +44,7 @@ protected void run(StructuredGraph graph) {
                 if (callTarget.invoke() != null) {
                     String properties = callTarget.getDebugProperties().toString();
                     String arguments = callTarget.arguments().toString();
-                    Throwable exception = new VerificationError("Frame escapes at: %s#%s\nproperties:%s\narguments: %s", callTarget, callTarget.targetMethod(), properties, arguments);
+                    Throwable exception = new GraalGraphError("Frame escapes at: %s#%s\nproperties:%s\narguments: %s", callTarget, callTarget.targetMethod(), properties, arguments);
                     throw GraphUtil.approxSourceException(callTarget, exception);
                 }
             }

From 9790a2fa1beb5f192b579de4bbeabfe7fb547a2f Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Fri, 15 Oct 2021 22:12:04 +0200
Subject: [PATCH 608/681] stopped tests polluting console log

---
 .../compiler/core/test/DumpPathTest.java      | 11 +++++--
 .../hotspot/test/CompileTheWorldTest.java     | 32 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java
index 628d39f367e6..880b253bb62a 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/DumpPathTest.java
@@ -32,6 +32,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.compiler.debug.DebugOptions;
+import org.graalvm.compiler.debug.TTY;
 import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionValues;
@@ -47,21 +48,25 @@ public static Object snippet() {
         return new String("snippet");
     }
 
+    @SuppressWarnings("try")
     @Test
-    public void testDump() throws IOException {
+    public void testDump() throws Exception {
         assumeManagementLibraryIsLoadable();
         try (TemporaryDirectory temp = new TemporaryDirectory(Paths.get("."), "DumpPathTest")) {
             String[] extensions = new String[]{".cfg", ".bgv", ".graph-strings"};
             EconomicMap<OptionKey<?>, Object> overrides = OptionValues.newOptionMap();
             overrides.put(DebugOptions.DumpPath, temp.toString());
+            overrides.put(DebugOptions.ShowDumpFiles, false);
             overrides.put(DebugOptions.PrintCFG, true);
             overrides.put(DebugOptions.PrintGraph, PrintGraphTarget.File);
             overrides.put(DebugOptions.PrintCanonicalGraphStrings, true);
             overrides.put(DebugOptions.Dump, "*");
             overrides.put(DebugOptions.MethodFilter, null);
 
-            // Generate dump files.
-            test(new OptionValues(getInitialOptions(), overrides), "snippet");
+            try (AutoCloseable c = new TTY.Filter()) {
+                // Generate dump files.
+                test(new OptionValues(getInitialOptions(), overrides), "snippet");
+            }
             // Check that IGV files got created, in the right place.
             checkForFiles(temp.path, extensions);
         }
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java
index c0701bc5ec7e..29279f9f7ecc 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java
@@ -31,6 +31,7 @@
 import org.graalvm.compiler.core.phases.HighTier;
 import org.graalvm.compiler.core.test.GraalCompilerTest;
 import org.graalvm.compiler.debug.DebugOptions;
+import org.graalvm.compiler.debug.TTY;
 import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
 import org.graalvm.compiler.options.OptionValues;
 import org.junit.Test;
@@ -42,6 +43,7 @@
  */
 public class CompileTheWorldTest extends GraalCompilerTest {
 
+    @SuppressWarnings("try")
     @Test
     public void testJDK() throws Throwable {
         boolean originalBailoutAction = CompilationBailoutAsFailure.getValue(getInitialOptions());
@@ -57,20 +59,22 @@ public void testJDK() throws Throwable {
         String methodFilters = null;
         String excludeMethodFilters = null;
         boolean verbose = false;
-        CompileTheWorld ctw = new CompileTheWorld(runtime,
-                        (HotSpotGraalCompiler) runtime.getCompiler(),
-                        CompileTheWorld.SUN_BOOT_CLASS_PATH,
-                        startAt,
-                        stopAt,
-                        maxClasses,
-                        methodFilters,
-                        excludeMethodFilters,
-                        verbose,
-                        harnessOptions,
-                        new OptionValues(initialOptions, HighTier.Options.Inline, false,
-                                        DebugOptions.DisableIntercept, true,
-                                        CompilationFailureAction, ExceptionAction.Silent));
-        ctw.compile();
+        try (AutoCloseable c = new TTY.Filter()) {
+            CompileTheWorld ctw = new CompileTheWorld(runtime,
+                            (HotSpotGraalCompiler) runtime.getCompiler(),
+                            CompileTheWorld.SUN_BOOT_CLASS_PATH,
+                            startAt,
+                            stopAt,
+                            maxClasses,
+                            methodFilters,
+                            excludeMethodFilters,
+                            verbose,
+                            harnessOptions,
+                            new OptionValues(initialOptions, HighTier.Options.Inline, false,
+                                            DebugOptions.DisableIntercept, true,
+                                            CompilationFailureAction, ExceptionAction.Silent));
+            ctw.compile();
+        }
         assert CompilationBailoutAsFailure.getValue(initialOptions) == originalBailoutAction;
         assert CompilationFailureAction.getValue(initialOptions) == originalFailureAction;
     }

From 7742b6c9d2219f33f5be77385aea03be014563a0 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Fri, 15 Oct 2021 22:20:48 +0200
Subject: [PATCH 609/681] ensure catch_files are kept in sync with code
 emitting the messages they catch

---
 common.hocon                                  |  4 +-
 common.json                                   |  8 ++-
 common.jsonnet                                |  4 +-
 compiler/mx.compiler/mx_compiler.py           | 49 ++++++++++++++++++-
 .../graalvm/compiler/debug/DebugContext.java  | 17 ++++++-
 .../graalvm/compiler/debug/DebugOptions.java  | 11 ++++-
 .../debug/StandardPathUtilitiesProvider.java  | 18 ++++++-
 .../hotspot/test/CompilationWrapperTest.java  | 17 +++++--
 8 files changed, 112 insertions(+), 16 deletions(-)

diff --git a/common.hocon b/common.hocon
index 499cdfa0cd62..af5f11e7a34a 100644
--- a/common.hocon
+++ b/common.hocon
@@ -43,9 +43,7 @@ labsjdk-ce-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ce-17Debug} }}
 labsjdk-ee-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ee-17Debug} }}
 
 common : ${mx} ${deps.common} {
-  catch_files : [
-    "Graal diagnostic output saved in (?P<filename>.+\.zip)"
-  ]
+  catch_files : ${catch_files}
 }
 
 linux : ${common} ${deps.linux}
diff --git a/common.json b/common.json
index e2d8d4b23743..66f05f5d5e24 100644
--- a/common.json
+++ b/common.json
@@ -18,13 +18,19 @@
     "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03-debug", "platformspecific": true }
   },
 
-  "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
+  "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
   "devkits": {
       "windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-openjdk8":   { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
       "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }}
   },
+
+  "catch_files" : [
+    "Graal diagnostic output saved in '(?P<filename>[^']+)'",
+    "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",
diff --git a/common.jsonnet b/common.jsonnet
index 4944c97b44d9..30367145916c 100644
--- a/common.jsonnet
+++ b/common.jsonnet
@@ -105,9 +105,7 @@
     # enforce self.arch (useful for generating job names)
     arch:: error "self.arch not set",
     capabilities +: [],
-    catch_files +: [
-      "Graal diagnostic output saved in (?P<filename>.+\\.zip)"
-    ]
+    catch_files +: common_json.catch_files
   },
 
   linux:: deps.linux + self.common + {
diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index e3afae88a698..81f5a18bca67 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -43,7 +43,7 @@
 
 import mx
 import mx_gate
-from mx_gate import Task
+from mx_gate import Task, Tags
 from mx import SafeDirectoryUpdater
 
 import mx_unittest
@@ -395,7 +395,54 @@ def _gate_scala_dacapo(name, iterations, extraVMarguments=None):
     args = ['-n', str(iterations), '--preserve']
     return mx_benchmark.gate_mx_benchmark(["scala-dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args)
 
+def _check_catch_files():
+    """
+    Verifies that there is a "catch_files" array in common.json at the root of
+    the repository containing this suite and that the array contains elements
+    matching DebugContext.DUMP_FILE_MESSAGE_REGEXP and
+    StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP.
+    """
+    catch_files_fields = (
+        ('DebugContext', 'DUMP_FILE_MESSAGE_REGEXP'),
+        ('StandardPathUtilitiesProvider', 'DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP')
+    )
+
+    def get_regexp(class_name, field_name):
+        source_path = join(_suite.dir, 'src', 'org.graalvm.compiler.debug', 'src', 'org', 'graalvm', 'compiler', 'debug', class_name + '.java')
+        regexp = None
+        with open(source_path) as fp:
+            for line in fp.readlines():
+                decl = field_name + ' = "'
+                index = line.find(decl)
+                if index != -1:
+                    start_index = index + len(decl)
+                    end_index = line.find('"', start_index)
+                    regexp = line[start_index:end_index]
+
+                    # Convert from Java style regexp to Python style
+                    return regexp.replace('(?<', '(?P<')
+
+        if not regexp:
+            mx.abort('Could not find value of ' + field_name + ' in ' + source_path)
+        return regexp
+
+    common_path = join(dirname(_suite.dir), 'common.json')
+    if not exists(common_path):
+        mx.abort('Required file does not exist: {}'.format(common_path))
+    with open(common_path) as common_file:
+        common_cfg = json.load(common_file)
+    catch_files = common_cfg.get('catch_files')
+    if catch_files is None:
+        mx.abort('Could not find catch_files attribute in {}'.format(common_path))
+    for class_name, field_name in catch_files_fields:
+        regexp = get_regexp(class_name, field_name)
+        if regexp not in catch_files:
+            mx.abort('Could not find catch_files entry in {} matching "{}"'.format(common_path, regexp))
+
 def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None, extraUnitTestArguments=None):
+    with Task('CheckCatchFiles', tasks, tags=[Tags.style]) as t:
+        if t: _check_catch_files()
+
     if jdk.javaCompliance >= '9':
         with Task('JDK_java_base_test', tasks, tags=['javabasetest']) as t:
             if t: java_base_unittest(_remove_empty_entries(extraVMarguments) + [])
diff --git a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
index d884bef2a8b7..bdd24a8a3665 100644
--- a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
+++ b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java
@@ -84,6 +84,21 @@
  */
 public final class DebugContext implements AutoCloseable {
 
+    /**
+     * The format of the message printed on the console by {@link #getDumpPath} when
+     * {@link DebugOptions#ShowDumpFiles} is true. The {@code %s} placeholder is replaced with the
+     * absolute path of the dump file (i.e. the value returned by the method).
+     */
+    public static final String DUMP_FILE_MESSAGE_FORMAT = "Dumping debug output to '%s'";
+
+    /**
+     * The regular expression for matching the message derived from
+     * {@link #DUMP_FILE_MESSAGE_FORMAT}.
+     *
+     * Keep in sync with the {@code catch_files} array in {@code common.json}.
+     */
+    public static final String DUMP_FILE_MESSAGE_REGEXP = "Dumping debug output to '(?<filename>[^']+)'";
+
     public static final Description NO_DESCRIPTION = new Description(null, "NO_DESCRIPTION");
     public static final GlobalMetrics NO_GLOBAL_METRIC_VALUES = null;
     public static final Iterable<DebugHandlersFactory> NO_CONFIG_CUSTOMIZERS = Collections.emptyList();
@@ -613,7 +628,7 @@ public String getDumpPath(String extension, boolean createMissingDirectory) {
             String label = description == null ? null : description.getLabel();
             String result = PathUtilities.createUnique(immutable.options, DumpPath, id, label, extension, createMissingDirectory);
             if (ShowDumpFiles.getValue(immutable.options)) {
-                TTY.println("Dumping debug output to %s", result);
+                TTY.println(DUMP_FILE_MESSAGE_FORMAT, result);
             }
             return result;
         } catch (IOException ex) {
diff --git a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java
index 69989007bf1d..4e9745250b0c 100644
--- a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java
+++ b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugOptions.java
@@ -124,7 +124,7 @@ public enum PrintGraphTarget {
     public static final OptionKey<Boolean> DebugStubsAndSnippets = new OptionKey<>(false);
     @Option(help = "Send compiler IR to dump handlers on error.", type = OptionType.Debug)
     public static final OptionKey<Boolean> DumpOnError = new OptionKey<>(false);
-    @Option(help = "Specify the DumpLevel if CompilationFailureAction#Diagnose is used." +
+    @Option(help = "Specify the dump level if CompilationFailureAction#Diagnose is used." +
                     "See CompilationFailureAction for details. file:doc-files/CompilationFailureActionHelp.txt", type = OptionType.Debug)
     public static final OptionKey<Integer> DiagnoseDumpLevel = new OptionKey<>(DebugContext.VERBOSE_LEVEL);
     @Option(help = "Disable intercepting exceptions in debug scopes.", type = OptionType.Debug)
@@ -196,6 +196,13 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
 
     // @formatter:on
 
+    /**
+     * The format of the message printed on the console by {@link #getDumpDirectory} when
+     * {@link DebugOptions#ShowDumpFiles} is true. The {@code %s} placeholder is replaced with the
+     * value returned by {@link #getDumpDirectory}.
+     */
+    private static final String DUMP_DIRECTORY_MESSAGE_FORMAT = "Dumping debug output in '%s'";
+
     /**
      * Gets the directory in which {@link DebugDumpHandler}s can generate output. This will be the
      * directory specified by {@link #DumpPath} if it has been set otherwise it will be derived from
@@ -214,7 +221,7 @@ public static String getDumpDirectory(OptionValues options) throws IOException {
                 if (!exists(dumpDir)) {
                     createDirectories(dumpDir);
                     if (ShowDumpFiles.getValue(options)) {
-                        TTY.println("Dumping debug output in %s", dumpDir.toString());
+                        TTY.println(DUMP_DIRECTORY_MESSAGE_FORMAT, dumpDir);
                     }
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java
index 74bfe8f3dd34..d14ff89fbbcf 100644
--- a/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java
+++ b/compiler/src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java
@@ -52,6 +52,22 @@
  * A {@link PathUtilitiesProvider} implemented in terms of {@link File} and {@link Path} APIs.
  */
 public class StandardPathUtilitiesProvider implements PathUtilitiesProvider {
+
+    /**
+     * The format of the message printed on the console by {@link #archiveAndDelete} showing the
+     * absolute path of the zip file created. The {@code %s} placeholder is replaced with the
+     * absolute path of the zip file.
+     */
+    public static final String DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT = "Graal diagnostic output saved in '%s'";
+
+    /**
+     * The regular expression for matching the message derived from
+     * {@link #DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT}.
+     *
+     * Keep in sync with the {@code catch_files} array in {@code common.json}.
+     */
+    public static final String DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP = "Graal diagnostic output saved in '(?<filename>[^']+)'";
+
     @Override
     public String createDirectories(String path) throws IOException {
         Files.createDirectories(Paths.get(path));
@@ -175,7 +191,7 @@ public FileVisitResult postVisitDirectory(Path d, IOException exc) throws IOExce
                     }
                 });
                 // Keep this in sync with the catch_files in common.hocon
-                TTY.println("Graal diagnostic output saved in %s", zipFile);
+                TTY.println(DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT, zipFile);
                 return zipFile.getAbsolutePath();
             } catch (IOException e) {
                 toDelete.clear();
diff --git a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
index bd46c26ff4a5..e0cf4eebaa95 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java
@@ -24,6 +24,8 @@
  */
 package org.graalvm.compiler.hotspot.test;
 
+import static org.graalvm.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT;
+import static org.graalvm.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP;
 import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine;
 import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments;
 
@@ -35,6 +37,8 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -224,7 +228,10 @@ private static void testHelper(List<Probe> initialProbes, List<String> extraVmAr
 
         try {
             List<Probe> probes = new ArrayList<>(initialProbes);
-            Probe diagnosticProbe = new Probe("Graal diagnostic output saved in ", 1);
+            String format = DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT;
+            assert format.endsWith("'%s'") : format;
+            String prefix = format.substring(0, format.length() - "'%s'".length());
+            Probe diagnosticProbe = new Probe(prefix, 1);
             probes.add(diagnosticProbe);
             probes.add(new Probe("Forced crash after compiling", Integer.MAX_VALUE) {
                 @Override
@@ -246,10 +253,12 @@ String test() {
                     Assert.fail(String.format("Did not find expected occurrences of '%s' in output of command: %s%n%s", probe.substring, error, proc));
                 }
             }
+
+            Pattern diagnosticOutputFileRE = Pattern.compile(DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP);
             String line = diagnosticProbe.lastMatchingLine;
-            int substringStart = line.indexOf(diagnosticProbe.substring);
-            int substringLength = diagnosticProbe.substring.length();
-            String diagnosticOutputZip = line.substring(substringStart + substringLength).trim();
+            Matcher m = diagnosticOutputFileRE.matcher(line);
+            Assert.assertTrue(line, m.find());
+            String diagnosticOutputZip = m.group(1);
 
             List<String> dumpPathEntries = Arrays.asList(dumpPath.list());
 

From b638916d44df3086898d4508856558f5d8a69a78 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Fri, 15 Oct 2021 22:35:44 +0200
Subject: [PATCH 610/681] updated compilation failure options added by mx when
 running the VM

---
 compiler/mx.compiler/mx_compiler.py | 60 ++++++++++++++++++++++++++---
 vm/mx.vm/mx_vm_gate.py              |  2 +-
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 81f5a18bca67..137c075194c0 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -158,6 +158,23 @@ def source_supplier():
 mx_gate.add_jacoco_excludes(['com.oracle.truffle'])
 mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution'])
 
+def _get_graal_option(vmargs, name, default=None, prefix='-Dgraal.'):
+    """
+    Gets the value of the `name` Graal option in `vmargs`.
+
+    :param list vmargs: VM arguments to inspect
+    :param str name: the name of the option
+    :param default: the default value of the option if it's not present in `vmargs`
+    :param str prefix: the prefix used for Graal options in `vmargs`
+    :return: the value of the option as specified in `vmargs` or `default`
+    """
+    if vmargs:
+        for arg in reversed(vmargs):
+            selector = prefix + name + '='
+            if arg.startswith(selector):
+                return arg[len(selector):]
+    return default
+
 def _get_XX_option_value(vmargs, name, default):
     """
     Gets the value of an ``-XX:`` style HotSpot VM option.
@@ -371,13 +388,44 @@ def _is_batik_supported(jdk):
         mx.warn('Batik uses Sun internal class com.sun.image.codec.jpeg.TruncatedFileException which is not present in ' + jdk.home)
         return False
 
+def _compiler_error_options(default_compilation_failure_action='ExitVM', vmargs=None, prefix='-Dgraal.'):
+    """
+    Gets options to be prefixed to the VM command line related to Graal compilation errors to improve
+    the chance of graph dumps being emitted and preserved in CI build logs.
+
+    :param str default_compilation_failure_action: value for CompilationFailureAction if it is added
+    :param list vmargs: arguments to search for existing instances of the options added by this method
+    :param str prefix: the prefix used for Graal options in `vmargs` and to use when adding options
+    """
+    action = _get_graal_option(vmargs, 'CompilationFailureAction')
+    res = []
+
+    # Add CompilationFailureAction if absent from vmargs
+    if action is None:
+        action = default_compilation_failure_action
+        res.append(prefix + 'CompilationFailureAction=' + action)
+
+    # Add DumpOnError=true if absent from vmargs and CompilationFailureAction is Diagnose or ExitVM.
+    dump_on_error = _get_graal_option(vmargs, 'DumpOnError', prefix=prefix)
+    if action in ('Diagnose', 'ExitVM'):
+        if dump_on_error is None:
+            res.append(prefix + 'DumpOnError=true')
+            dump_on_error = 'true'
+
+    # Add ShowDumpFiles=true if absent from vmargs and DumpOnError=true.
+    if dump_on_error == 'true':
+        show_dump_files = _get_graal_option(vmargs, 'ShowDumpFiles', prefix=prefix)
+        if show_dump_files is None:
+            res.append(prefix + 'ShowDumpFiles=true')
+    return res
+
 def _gate_dacapo(name, iterations, extraVMarguments=None, force_serial_gc=True, set_start_heap_size=True, threads=None):
     if iterations == -1:
         return
     vmargs = ['-XX:+UseSerialGC'] if force_serial_gc else []
     if set_start_heap_size:
         vmargs += ['-Xms2g']
-    vmargs += ['-XX:-UseCompressedOops', '-Djava.net.preferIPv4Stack=true', '-Dgraal.CompilationFailureAction=ExitVM'] + _remove_empty_entries(extraVMarguments)
+    vmargs += ['-XX:-UseCompressedOops', '-Djava.net.preferIPv4Stack=true'] + _compiler_error_options() + _remove_empty_entries(extraVMarguments)
     args = ['-n', str(iterations), '--preserve']
     if threads is not None:
         args += ['-t', str(threads)]
@@ -390,7 +438,7 @@ def jdk_includes_corba(jdk):
 def _gate_scala_dacapo(name, iterations, extraVMarguments=None):
     if iterations == -1:
         return
-    vmargs = ['-Xms2g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-Dgraal.CompilationFailureAction=ExitVM'] + _remove_empty_entries(extraVMarguments)
+    vmargs = ['-Xms2g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops'] + _compiler_error_options() + _remove_empty_entries(extraVMarguments)
 
     args = ['-n', str(iterations), '--preserve']
     return mx_benchmark.gate_mx_benchmark(["scala-dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args)
@@ -473,7 +521,8 @@ def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVM
     with Task('CTW:hosted', tasks, tags=GraalTags.ctw) as t:
         if t:
             ctw([
-                    '-DCompileTheWorld.Config=Inline=false CompilationFailureAction=ExitVM CompilationBailoutAsFailure=false', '-esa', '-XX:-UseJVMCICompiler', '-XX:+EnableJVMCI',
+                    '-DCompileTheWorld.Config=Inline=false CompilationBailoutAsFailure=false ' + ' '.join(_compiler_error_options(prefix='')),
+                    '-esa', '-XX:-UseJVMCICompiler', '-XX:+EnableJVMCI',
                     '-DCompileTheWorld.MultiThreaded=true', '-Dgraal.InlineDuringParsing=false', '-Dgraal.TrackNodeSourcePosition=true',
                     '-DCompileTheWorld.Verbose=false', '-XX:ReservedCodeCacheSize=300m',
                 ], _remove_empty_entries(extraVMarguments))
@@ -587,7 +636,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
 
 _defaultFlags = ['-Dgraal.CompilationWatchDogStartDelay=60.0D']
 _assertionFlags = ['-esa', '-Dgraal.DetailedAsserts=true']
-_graalErrorFlags = ['-Dgraal.CompilationFailureAction=ExitVM']
+_graalErrorFlags = _compiler_error_options()
 _graalEconomyFlags = ['-Dgraal.CompilerConfiguration=economy']
 _verificationFlags = ['-Dgraal.VerifyGraalGraphs=true', '-Dgraal.VerifyGraalGraphEdges=true', '-Dgraal.VerifyGraalPhasesSize=true', '-Dgraal.VerifyPhases=true']
 _coopFlags = ['-XX:-UseCompressedOops']
@@ -763,8 +812,7 @@ def _parseVmArgs(args, addDefaultArgs=True):
     # The default for CompilationFailureAction in the code is Silent as this is
     # what we want for GraalVM. When using Graal via mx (e.g. in the CI gates)
     # Diagnose is a more useful "default" value.
-    if not any(a.startswith('-Dgraal.CompilationFailureAction=') for a in args):
-        argsPrefix.append('-Dgraal.CompilationFailureAction=Diagnose')
+    argsPrefix.extend(_compiler_error_options('Diagnose', args))
 
     # It is safe to assume that Network dumping is the desired default when using mx.
     # Mx is never used in production environments.
diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
index 6bdd62cb4542..12c93ae19331 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -143,7 +143,7 @@ def gate_body(args, tasks):
             with Task('LibGraal Compiler:CTW', tasks, tags=[VmGateTasks.libgraal]) as t:
                 if t:
                     mx_compiler.ctw([
-                            '-DCompileTheWorld.Config=Inline=false CompilationFailureAction=ExitVM',
+                            '-DCompileTheWorld.Config=Inline=false ' + ' '.join(mx_compiler._compiler_error_options(prefix='')),
                             '-esa',
                             '-XX:+EnableJVMCI',
                             '-DCompileTheWorld.MultiThreaded=true',

From e2acf82ace08ff5818752ce62ba2133056ee0801 Mon Sep 17 00:00:00 2001
From: Tom Shull <tom.shull@oracle.com>
Date: Mon, 25 Oct 2021 13:35:54 +0200
Subject: [PATCH 611/681] Handle more cases within
 IntrinsifyMethodHandlesInvocationPlugin.

---
 .../IntrinsifyMethodHandlesInvocationPlugin.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
index 131fceac2399..43e5d7da686e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
@@ -849,7 +849,14 @@ private void transplantInvoke(FixedWithNextNode oNode, ResolvedJavaMethod tTarge
                  * situation, it is necessary to push the NewInstanceNode onto the stack so that it
                  * is included in the stateDuring FrameState of the InvokeNode.
                  */
-                Node pred = oNode.predecessor();
+                Node pred = oNode;
+                do {
+                    pred = pred.predecessor();
+                    /*
+                     * The prior NewInstanceNode may be guarded by a fixed guard (e.g., for an
+                     * instanceof check). In this case, look at fixed guard's predecessor.
+                     */
+                } while (pred.getClass() == FixedGuardNode.class);
                 if (pred.getClass() == NewInstanceNode.class && transplanted.containsKey(pred)) {
                     Node tNew = transplanted.get(pred);
                     pushToFrameStack((ValueNode) tNew);
@@ -873,7 +880,7 @@ private void transplantInvoke(FixedWithNextNode oNode, ResolvedJavaMethod tTarge
         @SuppressWarnings("unchecked")
         private <T extends Stamp> T stamp(T oStamp) throws AbortTransplantException {
             Stamp result;
-            if (((Stamp) oStamp).getClass() == ObjectStamp.class) {
+            if (oStamp.getClass() == ObjectStamp.class) {
                 ObjectStamp oObjectStamp = (ObjectStamp) oStamp;
                 result = new ObjectStamp(lookup(oObjectStamp.type()), oObjectStamp.isExactType(), oObjectStamp.nonNull(), oObjectStamp.alwaysNull(), oObjectStamp.isAlwaysArray());
             } else if (oStamp instanceof PrimitiveStamp) {

From 740c3fe14eaa9463ee9228ddbd956ef1e74ef56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Pejovi=C4=87?= <aleksandar.pejovic@oracle.com>
Date: Mon, 25 Oct 2021 15:08:55 +0200
Subject: [PATCH 612/681] Add missing module info for SVM MBeans

---
 substratevm/mx.substratevm/suite.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 5cdc77ecf06d..0ffb82d828d0 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1140,6 +1140,9 @@
                         "sun.util.resources",
                         "sun.invoke.util",
                     ],
+                    "java.management": [
+                        "sun.management",
+                    ],
                     "java.xml.crypto": [
                         "org.jcp.xml.dsig.internal.dom",
                     ],

From 4833a5d8ce07dd3b36a41ef413d0745fb6d403db Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 15:45:44 +0200
Subject: [PATCH 613/681] Extract function that infers env vars to reproduce
 the current GraalVM config.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 52 +++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index fff469e96bea..0202706ef2a9 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2811,6 +2811,33 @@ def print_standalone_home(args):
     print(standalone_home(args.comp_dir_name))
 
 
+def _infer_env(graalvm_dist):
+    components = []
+    dynamicImports = set()
+    foundLibpoly = False
+    for component in registered_graalvm_components():
+        if component.short_name == 'libpoly':
+            foundLibpoly = True  # 'libpoly' is special, we need to exclude it instead of including
+        else:
+            components.append(component.short_name)
+        suite = component.suite
+        if suite.dir == suite.vc_dir:
+            dynamicImports.add(os.path.basename(suite.dir))
+        else:
+            dynamicImports.add("/" + os.path.basename(suite.dir))
+
+    nativeImages = []
+    for p in _suite.projects:
+        if isinstance(p, GraalVmLauncher) and p.get_containing_graalvm() == graalvm_dist:
+            if p.is_native():
+                nativeImages.append(p.native_image_name)
+        elif isinstance(p, GraalVmLibrary):
+            if not p.is_skipped():
+                library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
+                nativeImages.append('lib:' + library_name)
+    return dynamicImports, components, foundLibpoly, nativeImages
+
+
 def graalvm_enter(args):
     """enter a subshell for developing with a particular GraalVM config"""
     env = os.environ.copy()
@@ -2866,30 +2893,7 @@ def graalvm_enter(args):
         return
 
     graalvm_dist = get_final_graalvm_distribution()
-
-    components = []
-    dynamicImports = set()
-    foundLibpoly = False
-    for component in registered_graalvm_components():
-        if component.short_name == 'libpoly':
-            foundLibpoly = True  # 'libpoly' is special, we need to exclude it instead of including
-        else:
-            components.append(component.short_name)
-        suite = component.suite
-        if suite.dir == suite.vc_dir:
-            dynamicImports.add(os.path.basename(suite.dir))
-        else:
-            dynamicImports.add("/" + os.path.basename(suite.dir))
-
-    nativeImages = []
-    for p in _suite.projects:
-        if isinstance(p, GraalVmLauncher) and p.get_containing_graalvm() == graalvm_dist:
-            if p.is_native():
-                nativeImages.append(p.native_image_name)
-        elif isinstance(p, GraalVmLibrary):
-            if not p.is_skipped():
-                library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
-                nativeImages.append('lib:' + library_name)
+    dynamicImports, components, foundLibpoly, nativeImages = _infer_env(graalvm_dist)
 
     env['GRAALVM_HOME'] = graalvm_home()
 

From 31c4a8852923895a46db30b4b7c42834fc7383e8 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 15:50:16 +0200
Subject: [PATCH 614/681] Return the list of components to be excluded.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 0202706ef2a9..44b0884f11c0 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2812,12 +2812,12 @@ def print_standalone_home(args):
 
 
 def _infer_env(graalvm_dist):
-    components = []
     dynamicImports = set()
+    components = []
     foundLibpoly = False
     for component in registered_graalvm_components():
         if component.short_name == 'libpoly':
-            foundLibpoly = True  # 'libpoly' is special, we need to exclude it instead of including
+            foundLibpoly = True
         else:
             components.append(component.short_name)
         suite = component.suite
@@ -2825,6 +2825,7 @@ def _infer_env(graalvm_dist):
             dynamicImports.add(os.path.basename(suite.dir))
         else:
             dynamicImports.add("/" + os.path.basename(suite.dir))
+    excludeComponents = [] if foundLibpoly else ['libpoly']  # 'libpoly' is special, we need to exclude it instead of including
 
     nativeImages = []
     for p in _suite.projects:
@@ -2835,7 +2836,8 @@ def _infer_env(graalvm_dist):
             if not p.is_skipped():
                 library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
                 nativeImages.append('lib:' + library_name)
-    return dynamicImports, components, foundLibpoly, nativeImages
+
+    return dynamicImports, components, excludeComponents, nativeImages
 
 
 def graalvm_enter(args):
@@ -2893,15 +2895,14 @@ def graalvm_enter(args):
         return
 
     graalvm_dist = get_final_graalvm_distribution()
-    dynamicImports, components, foundLibpoly, nativeImages = _infer_env(graalvm_dist)
+    dynamicImports, components, exclude_components, nativeImages = _infer_env(graalvm_dist)
 
     env['GRAALVM_HOME'] = graalvm_home()
 
     env['DYNAMIC_IMPORTS'] = ','.join(dynamicImports)
     env['COMPONENTS'] = ','.join(components)
     env['NATIVE_IMAGES'] = ','.join(nativeImages)
-    if not foundLibpoly:
-        env['EXCLUDE_COMPONENTS'] = 'libpoly'
+    env['EXCLUDE_COMPONENTS'] = ','.join(exclude_components)
 
     # Disable loading of the global ~/.mx/env file in the subshell. The contents of this file are already in the current
     # environment. Parsing the ~/.mx/env file again would lead to confusing results, especially if it contains settings

From e7ea0844edbb59b995451946507a3990270f9369 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 15:52:12 +0200
Subject: [PATCH 615/681] Return the list of installables to be disabled.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 44b0884f11c0..7337a0dd7b46 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2815,6 +2815,7 @@ def _infer_env(graalvm_dist):
     dynamicImports = set()
     components = []
     foundLibpoly = False
+    disableInstallables = []
     for component in registered_graalvm_components():
         if component.short_name == 'libpoly':
             foundLibpoly = True
@@ -2825,6 +2826,8 @@ def _infer_env(graalvm_dist):
             dynamicImports.add(os.path.basename(suite.dir))
         else:
             dynamicImports.add("/" + os.path.basename(suite.dir))
+        if component.installable and _disable_installable(component):
+            disableInstallables.append(component.short_name)
     excludeComponents = [] if foundLibpoly else ['libpoly']  # 'libpoly' is special, we need to exclude it instead of including
 
     nativeImages = []
@@ -2837,7 +2840,7 @@ def _infer_env(graalvm_dist):
                 library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
                 nativeImages.append('lib:' + library_name)
 
-    return dynamicImports, components, excludeComponents, nativeImages
+    return dynamicImports, components, excludeComponents, nativeImages, disableInstallables
 
 
 def graalvm_enter(args):
@@ -2895,7 +2898,7 @@ def graalvm_enter(args):
         return
 
     graalvm_dist = get_final_graalvm_distribution()
-    dynamicImports, components, exclude_components, nativeImages = _infer_env(graalvm_dist)
+    dynamicImports, components, exclude_components, nativeImages, disableInstallables = _infer_env(graalvm_dist)
 
     env['GRAALVM_HOME'] = graalvm_home()
 
@@ -2903,6 +2906,7 @@ def graalvm_enter(args):
     env['COMPONENTS'] = ','.join(components)
     env['NATIVE_IMAGES'] = ','.join(nativeImages)
     env['EXCLUDE_COMPONENTS'] = ','.join(exclude_components)
+    env['DISABLE_INSTALLABLES'] = ','.join(disableInstallables)
 
     # Disable loading of the global ~/.mx/env file in the subshell. The contents of this file are already in the current
     # environment. Parsing the ~/.mx/env file again would lead to confusing results, especially if it contains settings

From eb84835f2183d862f0e25b24dfd556912791d9b4 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 15:54:13 +0200
Subject: [PATCH 616/681] Add an option to `mx graalvm-show` to print the
 contents of an env file that reproduces the current GraalVM config.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 7337a0dd7b46..5ab10edf84b7 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2925,6 +2925,7 @@ def graalvm_show(args, forced_graalvm_dist=None):
     """
     parser = ArgumentParser(prog='mx graalvm-show', description='Print the GraalVM config')
     parser.add_argument('--stage1', action='store_true', help='show the components for stage1')
+    parser.add_argument('--print-env', action='store_true', help='print the contents of an env file that reproduces the current GraalVM config')
     args = parser.parse_args(args)
 
     graalvm_dist = forced_graalvm_dist or (get_stage1_graalvm_distribution() if args.stage1 else get_final_graalvm_distribution())
@@ -2980,6 +2981,18 @@ def graalvm_show(args, forced_graalvm_dist=None):
         else:
             print("No standalone")
 
+        if args.print_env:
+            def _print_env(name, val):
+                if val:
+                    print(name + '=' + ','.join(val))
+            print('Inferred env file:')
+            dynamic_imports, components, exclude_components, native_images, disable_installables = _infer_env(graalvm_dist)
+            _print_env('DYNAMIC_IMPORTS', dynamic_imports)
+            _print_env('COMPONENTS', components)
+            _print_env('EXCLUDE_COMPONENTS', exclude_components)
+            _print_env('NATIVE_IMAGES', native_images)
+            _print_env('DISABLE_INSTALLABLES', disable_installables)
+
 
 def _get_dists(dist_class):
     """

From 49ad6340d8c7e1c639b5ab32fc834f1bf1e93208 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 16:03:24 +0200
Subject: [PATCH 617/681] Stage1 GraalVMs do not have native libraries.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 5ab10edf84b7..d463a5cb5265 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -341,6 +341,7 @@ def __init__(self, suite, name, deps, components, is_graalvm, exclLibs, platform
                  stage1=False,
                  **kw_args): # pylint: disable=super-init-not-called
         self.components = components or registered_graalvm_components(stage1)
+        self.stage1 = stage1
         self.skip_archive = stage1 # Do not build *.tar archive for stage1 distributions
         layout = {}
         src_jdk_base = _src_jdk_base if add_jdk_base else '.'
@@ -2835,7 +2836,7 @@ def _infer_env(graalvm_dist):
         if isinstance(p, GraalVmLauncher) and p.get_containing_graalvm() == graalvm_dist:
             if p.is_native():
                 nativeImages.append(p.native_image_name)
-        elif isinstance(p, GraalVmLibrary):
+        elif not graalvm_dist.stage1 and isinstance(p, GraalVmLibrary):
             if not p.is_skipped():
                 library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
                 nativeImages.append('lib:' + library_name)

From 21a3a7bf1b4271a68abb3b9cea79aee4bd3c90cb Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 16:07:22 +0200
Subject: [PATCH 618/681] Fix bug when there are no native images.

If `/vm` and '/substratevm` are imported, not setting `NATIVE_IMAGES`
builds all native images.
---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index d463a5cb5265..7468772c5dc1 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2840,6 +2840,8 @@ def _infer_env(graalvm_dist):
             if not p.is_skipped():
                 library_name = remove_lib_prefix_suffix(p.native_image_name, require_suffix_prefix=False)
                 nativeImages.append('lib:' + library_name)
+    if not nativeImages:
+        nativeImages = ['false']
 
     return dynamicImports, components, excludeComponents, nativeImages, disableInstallables
 

From fc67908b1f02bc99c406c28ca510c443fc3623f2 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 16:49:33 +0200
Subject: [PATCH 619/681] Sort env file property values.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 7468772c5dc1..cbec947930d0 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2843,7 +2843,7 @@ def _infer_env(graalvm_dist):
     if not nativeImages:
         nativeImages = ['false']
 
-    return dynamicImports, components, excludeComponents, nativeImages, disableInstallables
+    return sorted(list(dynamicImports)), sorted(components), sorted(excludeComponents), sorted(nativeImages), sorted(disableInstallables)
 
 
 def graalvm_enter(args):

From e3fb1e5d7732b93cd1f43fd607e60c84a2bbc4b2 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 17:26:16 +0200
Subject: [PATCH 620/681] Tolerate that the component list includes
 non-registered components.

Helps writing env files that are used also on platforms
on which not all components are available.
---
 sdk/mx.sdk/mx_sdk.py         | 4 ++--
 sdk/mx.sdk/mx_sdk_vm_impl.py | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk.py b/sdk/mx.sdk/mx_sdk.py
index 4095538281ff..955ba58d81ff 100644
--- a/sdk/mx.sdk/mx_sdk.py
+++ b/sdk/mx.sdk/mx_sdk.py
@@ -157,8 +157,8 @@ def register_graalvm_component(component):
     return mx_sdk_vm.register_graalvm_component(component)
 
 
-def graalvm_component_by_name(name):
-    return mx_sdk_vm.graalvm_component_by_name(name)
+def graalvm_component_by_name(name, fatalIfMissing=True):
+    return mx_sdk_vm.graalvm_component_by_name(name, fatalIfMissing=fatalIfMissing)
 
 
 def graalvm_components(opt_limit_to_suite=False):
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index cbec947930d0..33f4c2bdf1ad 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -3162,7 +3162,11 @@ def _components_include_list():
             suite_name = name[len('suite:'):]
             components.extend([c for c in mx_sdk_vm.graalvm_components() if c.suite.name == suite_name])
         else:
-            components.append(mx_sdk.graalvm_component_by_name(name))
+            component = mx_sdk.graalvm_component_by_name(name, False)
+            if component:
+                components.append(component)
+            else:
+                mx.warn("The component inclusion list ('--components' or '$COMPONENTS') includes an unknown component: '{}'".format(name))
     return components
 
 

From 7a0b30ada847d8770428218fa103771d4bd50066 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 17:40:50 +0200
Subject: [PATCH 621/681] Support 'NO_LICENSES'.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 33f4c2bdf1ad..bce1af051d9c 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2843,7 +2843,7 @@ def _infer_env(graalvm_dist):
     if not nativeImages:
         nativeImages = ['false']
 
-    return sorted(list(dynamicImports)), sorted(components), sorted(excludeComponents), sorted(nativeImages), sorted(disableInstallables)
+    return sorted(list(dynamicImports)), sorted(components), sorted(excludeComponents), sorted(nativeImages), sorted(disableInstallables), _no_licenses()
 
 
 def graalvm_enter(args):
@@ -2901,7 +2901,7 @@ def graalvm_enter(args):
         return
 
     graalvm_dist = get_final_graalvm_distribution()
-    dynamicImports, components, exclude_components, nativeImages, disableInstallables = _infer_env(graalvm_dist)
+    dynamicImports, components, exclude_components, nativeImages, disableInstallables, noLicenses = _infer_env(graalvm_dist)
 
     env['GRAALVM_HOME'] = graalvm_home()
 
@@ -2910,6 +2910,8 @@ def graalvm_enter(args):
     env['NATIVE_IMAGES'] = ','.join(nativeImages)
     env['EXCLUDE_COMPONENTS'] = ','.join(exclude_components)
     env['DISABLE_INSTALLABLES'] = ','.join(disableInstallables)
+    if noLicenses:
+        env['NO_LICENSES'] = 'true'
 
     # Disable loading of the global ~/.mx/env file in the subshell. The contents of this file are already in the current
     # environment. Parsing the ~/.mx/env file again would lead to confusing results, especially if it contains settings
@@ -2989,12 +2991,14 @@ def _print_env(name, val):
                 if val:
                     print(name + '=' + ','.join(val))
             print('Inferred env file:')
-            dynamic_imports, components, exclude_components, native_images, disable_installables = _infer_env(graalvm_dist)
+            dynamic_imports, components, exclude_components, native_images, disable_installables, no_licenses = _infer_env(graalvm_dist)
             _print_env('DYNAMIC_IMPORTS', dynamic_imports)
             _print_env('COMPONENTS', components)
             _print_env('EXCLUDE_COMPONENTS', exclude_components)
             _print_env('NATIVE_IMAGES', native_images)
             _print_env('DISABLE_INSTALLABLES', disable_installables)
+            if no_licenses:
+                print('NO_LICENSES=true')
 
 
 def _get_dists(dist_class):

From 42f2145336c11b5fc5923220a9186f535f872de8 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 17:51:20 +0200
Subject: [PATCH 622/681] Do not recompute the list of disabled installables,
 use the one provided by the user.

Helps when `--disable-installables=true`.
---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index bce1af051d9c..c58b8138a701 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2816,7 +2816,6 @@ def _infer_env(graalvm_dist):
     dynamicImports = set()
     components = []
     foundLibpoly = False
-    disableInstallables = []
     for component in registered_graalvm_components():
         if component.short_name == 'libpoly':
             foundLibpoly = True
@@ -2827,8 +2826,6 @@ def _infer_env(graalvm_dist):
             dynamicImports.add(os.path.basename(suite.dir))
         else:
             dynamicImports.add("/" + os.path.basename(suite.dir))
-        if component.installable and _disable_installable(component):
-            disableInstallables.append(component.short_name)
     excludeComponents = [] if foundLibpoly else ['libpoly']  # 'libpoly' is special, we need to exclude it instead of including
 
     nativeImages = []
@@ -2843,6 +2840,12 @@ def _infer_env(graalvm_dist):
     if not nativeImages:
         nativeImages = ['false']
 
+    disableInstallables = _disabled_installables()
+    if disableInstallables is None:
+        disableInstallables = []
+    elif isinstance(disableInstallables, bool):
+        disableInstallables = [str(disableInstallables)]
+
     return sorted(list(dynamicImports)), sorted(components), sorted(excludeComponents), sorted(nativeImages), sorted(disableInstallables), _no_licenses()
 
 
@@ -3271,9 +3274,13 @@ def _skip_libraries(library):
             return library_name in skipped
 
 
+def _disabled_installables():
+    return _parse_cmd_arg('disable_installables', default_value=str(not has_vm_suite()))
+
+
 def _disable_installable(component):
     """ :type component: str | mx_sdk.GraalVmComponent """
-    disabled = _parse_cmd_arg('disable_installables', default_value=str(not has_vm_suite()))
+    disabled = _disabled_installables()
     if isinstance(disabled, bool):
         return disabled
     else:

From 7d92eb247d1eb9243d76de2c1d9721723e9f983c Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 18:22:12 +0200
Subject: [PATCH 623/681] Env files use component inclusion lists.

---
 vm/mx.vm/ce                  | 8 ++++----
 vm/mx.vm/ce-aarch64          | 8 ++++----
 vm/mx.vm/ce-complete         | 9 ++++-----
 vm/mx.vm/ce-fastr            | 8 ++++----
 vm/mx.vm/ce-llimul           | 8 ++++----
 vm/mx.vm/ce-llvm             | 8 ++++----
 vm/mx.vm/ce-no_native        | 7 +++----
 vm/mx.vm/ce-nodejs           | 8 ++++----
 vm/mx.vm/ce-python           | 4 +++-
 vm/mx.vm/ce-ruby             | 8 +++++---
 vm/mx.vm/ce-test             | 7 +++----
 vm/mx.vm/ce-win              | 8 ++++----
 vm/mx.vm/libgraal            | 9 +++++----
 vm/mx.vm/polybench-ce        | 7 ++++---
 vm/mx.vm/polybench-nfi-ce    | 8 +++++---
 vm/mx.vm/polybench-sulong-ce | 8 +++++---
 vm/mx.vm/toolchain-only      | 9 +++++----
 17 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/vm/mx.vm/ce b/vm/mx.vm/ce
index 7b181de18acf..99a2e2ca35f8 100644
--- a/vm/mx.vm/ce
+++ b/vm/mx.vm/ce
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-aarch64 b/vm/mx.vm/ce-aarch64
index 7b181de18acf..99a2e2ca35f8 100644
--- a/vm/mx.vm/ce-aarch64
+++ b/vm/mx.vm/ce-aarch64
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index 0e9a641bf322..f2e72301cb75 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,5 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs,truffleruby,graalpython,/wasm,/espresso
-DISABLE_INSTALLABLES=true
-EXCLUDE_COMPONENTS=nju,njucp,dis,pbm,pmh,llmulrl,elau
-FORCE_BASH_LAUNCHERS=polyglot,native-image-configure
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,graalpython,truffleruby
+COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalpython,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,truffleruby,wasm
+DISABLE_INSTALLABLES=True
diff --git a/vm/mx.vm/ce-fastr b/vm/mx.vm/ce-fastr
index f2b4758d9b82..8a65daad21fb 100644
--- a/vm/mx.vm/ce-fastr
+++ b/vm/mx.vm/ce-fastr
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js,fastr
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot,polybench,RMain
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,fastr
+COMPONENTS=R,cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-llimul b/vm/mx.vm/ce-llimul
index fc626e8b25f3..99a2e2ca35f8 100644
--- a/vm/mx.vm/ce-llimul
+++ b/vm/mx.vm/ce-llimul
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-llvm b/vm/mx.vm/ce-llvm
index 47eda134c2b0..b20df1e928fd 100644
--- a/vm/mx.vm/ce-llvm
+++ b/vm/mx.vm/ce-llvm
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-no_native b/vm/mx.vm/ce-no_native
index 4edb3c961621..bcb52c90840c 100644
--- a/vm/mx.vm/ce-no_native
+++ b/vm/mx.vm/ce-no_native
@@ -1,5 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=false
 DISABLE_INSTALLABLES=ni,nil
-FORCE_BASH_LAUNCHERS=true
-SKIP_LIBRARIES=true
-EXCLUDE_COMPONENTS=nju,njucp,llp,lg,dis,pbm,pmh,llmulrl
diff --git a/vm/mx.vm/ce-nodejs b/vm/mx.vm/ce-nodejs
index faeee88a6033..59fb4e254045 100644
--- a/vm/mx.vm/ce-nodejs
+++ b/vm/mx.vm/ce-nodejs
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,llp,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot,polybench
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,njs,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:graal-nodejs,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-python b/vm/mx.vm/ce-python
index c7ea6e78e539..962201ae5e1b 100644
--- a/vm/mx.vm/ce-python
+++ b/vm/mx.vm/ce-python
@@ -1,3 +1,5 @@
 # Do not modify this env file without updating the Graal.Python benchmark builders
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js,graalpython
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,graalpython
+COMPONENTS=cmp,cov,dap,dis,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,nju,njucp,pbm,pmh,poly,polynative,pro,pyn,pynl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalpython,lib:jvmcicompiler
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-ruby b/vm/mx.vm/ce-ruby
index c6ae7464111c..562465d8f22a 100644
--- a/vm/mx.vm/ce-ruby
+++ b/vm/mx.vm/ce-ruby
@@ -1,3 +1,5 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,truffleruby
-COMPONENTS=gvm,TruffleRuby,SubstrateVM,LibGraal,suite:tools
-DISABLE_INSTALLABLES=false
+DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,truffleruby
+COMPONENTS=cmp,cov,dap,gvm,ins,insight,insightheap,lg,llp,llrc,llrn,lsp,nfi,pro,rby,rbyl,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
+EXCLUDE_COMPONENTS=libpoly
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,truffleruby
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-test b/vm/mx.vm/ce-test
index bd0f21fc4b7a..cc05f754c0f2 100644
--- a/vm/mx.vm/ce-test
+++ b/vm/mx.vm/ce-test
@@ -1,5 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-js
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,dis,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,nju,njucp,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,native-image-configure
 DISABLE_INSTALLABLES=llp
-EXCLUDE_COMPONENTS=pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot
-SKIP_LIBRARIES=polyglot
diff --git a/vm/mx.vm/ce-win b/vm/mx.vm/ce-win
index e4da0dd26b49..af5438b74c8b 100644
--- a/vm/mx.vm/ce-win
+++ b/vm/mx.vm/ce-win
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/tools,/graal-js
-EXCLUDE_COMPONENTS=nju,njucp,nic,ni,nil,svml,llp,dis,pbm,pmh,llmulrl
-FORCE_BASH_LAUNCHERS=polyglot
-SKIP_LIBRARIES=polyglot
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=gu,js,lib:jvmcicompiler
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/libgraal b/vm/mx.vm/libgraal
index 258f33eb5bd8..e2e43e4a3b3a 100644
--- a/vm/mx.vm/libgraal
+++ b/vm/mx.vm/libgraal
@@ -1,4 +1,5 @@
-DYNAMIC_IMPORTS=/substratevm
-FORCE_BASH_LAUNCHERS=true
-DISABLE_LIBPOLYGLOT=true
-EXCLUDE_COMPONENTS=svmag,nju,njucp,nic,ni,nil,llp,pbm,pmh
+DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/truffle,/vm
+COMPONENTS=cmp,dis,gu,gvm,lg,nfi,poly,polynative,sdk,svm,svml,svmnfi,tfl,tflm
+EXCLUDE_COMPONENTS=libpoly
+NATIVE_IMAGES=lib:jvmcicompiler
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/polybench-ce b/vm/mx.vm/polybench-ce
index 4e37808eae0b..a9b84fa57dbe 100644
--- a/vm/mx.vm/polybench-ce
+++ b/vm/mx.vm/polybench-ce
@@ -1,3 +1,4 @@
-DYNAMIC_IMPORTS=/substratevm,/wasm,/graal-js,truffleruby,graalpython,/espresso
-COMPONENTS=Polybench Launcher,Polyglot Microbenchmark Harness,Native Image,GraalWasm,Java on Truffle,TruffleRuby,Graal.Python,Graal.js,LLVM Runtime Launcher,LLVM Runtime Native,LibGraal
-NATIVE_IMAGES=polybench,lib:jvmcicompiler
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/regex,/sdk,/substratevm,/sulong,/truffle,/vm,/wasm,graalpython,truffleruby
+COMPONENTS=cmp,ejvm,gwa,java,js,lg,llp,llrc,llrl,llrn,nfi,ni,nil,pbm,pmh,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,tfl,tflm
+NATIVE_IMAGES=lib:jvmcicompiler,polybench
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/polybench-nfi-ce b/vm/mx.vm/polybench-nfi-ce
index 53d16ba3b004..186e8b4c3d55 100644
--- a/vm/mx.vm/polybench-nfi-ce
+++ b/vm/mx.vm/polybench-nfi-ce
@@ -1,3 +1,5 @@
-DYNAMIC_IMPORTS=/substratevm,/graal-js
-COMPONENTS=Polybench Launcher,Polyglot Microbenchmark Harness,Native Image,Graal.js,LibGraal,Truffle NFI
-NATIVE_IMAGES=polybench,lib:jvmcicompiler
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/truffle,/vm
+COMPONENTS=cmp,js,lg,nfi,ni,nil,pbm,pmh,rgx,sdk,svm,svmnfi,tfl,tflm
+EXCLUDE_COMPONENTS=libpoly
+NATIVE_IMAGES=lib:jvmcicompiler,polybench
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/polybench-sulong-ce b/vm/mx.vm/polybench-sulong-ce
index 862114493584..f187c1565a95 100644
--- a/vm/mx.vm/polybench-sulong-ce
+++ b/vm/mx.vm/polybench-sulong-ce
@@ -1,3 +1,5 @@
-DYNAMIC_IMPORTS=/substratevm,/sulong
-COMPONENTS=Polybench Launcher,Native Image,LLVM Runtime Launcher,LLVM Runtime Native,LibGraal
-NATIVE_IMAGES=polybench,lib:jvmcicompiler
+DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/sulong,/truffle,/vm
+COMPONENTS=cmp,lg,llrc,llrl,llrn,nfi,ni,nil,pbm,sdk,svm,svmnfi,tfl,tflm
+EXCLUDE_COMPONENTS=libpoly
+NATIVE_IMAGES=lib:jvmcicompiler,polybench
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/toolchain-only b/vm/mx.vm/toolchain-only
index bcdfc81b1d6b..4d4f03c4ae59 100644
--- a/vm/mx.vm/toolchain-only
+++ b/vm/mx.vm/toolchain-only
@@ -1,4 +1,5 @@
-DYNAMIC_IMPORTS=/substratevm,/sulong
-COMPONENTS=SubstrateVM,LLVM Runtime Native,LLVM.org toolchain
-NATIVE_IMAGES=graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,graalvm-native-binutil
-DISABLE_POLYGLOT=true
+DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/sulong,/truffle
+COMPONENTS=cmp,llp,llrc,llrn,nfi,sdk,svm,svmnfi,tfl,tflm
+EXCLUDE_COMPONENTS=libpoly
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld
+DISABLE_INSTALLABLES=False

From e4ea8961e4d7c0110e9acbd86643486835593f3f Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 19:57:38 +0200
Subject: [PATCH 624/681] Initial commit of new 'complete' env files.

Just a copy of the 'base' ones, to make it easier to review follow-up
changes.
---
 vm/mx.vm/ce-aarch64-complete | 4 ++++
 vm/mx.vm/ce-win-complete     | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 vm/mx.vm/ce-aarch64-complete
 create mode 100644 vm/mx.vm/ce-win-complete

diff --git a/vm/mx.vm/ce-aarch64-complete b/vm/mx.vm/ce-aarch64-complete
new file mode 100644
index 000000000000..99a2e2ca35f8
--- /dev/null
+++ b/vm/mx.vm/ce-aarch64-complete
@@ -0,0 +1,4 @@
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-win-complete b/vm/mx.vm/ce-win-complete
new file mode 100644
index 000000000000..af5438b74c8b
--- /dev/null
+++ b/vm/mx.vm/ce-win-complete
@@ -0,0 +1,4 @@
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle,/vm
+COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=gu,js,lib:jvmcicompiler
+DISABLE_INSTALLABLES=False

From be98114b5f64f3eea58122b00bd4652241421f0a Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 20:14:37 +0200
Subject: [PATCH 625/681] Fix 'complete' env files.

They now include FastR.
---
 vm/mx.vm/ce-aarch64-complete | 6 +++---
 vm/mx.vm/ce-complete         | 4 ++--
 vm/mx.vm/ce-win-complete     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vm/mx.vm/ce-aarch64-complete b/vm/mx.vm/ce-aarch64-complete
index 99a2e2ca35f8..fe8b1ac2b3f3 100644
--- a/vm/mx.vm/ce-aarch64-complete
+++ b/vm/mx.vm/ce-aarch64-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,truffleruby
+COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,njs,poly,polynative,pro,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lli,truffleruby,wasm
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index f2e72301cb75..db8572377267 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,graalpython,truffleruby
-COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,fastr,graalpython,truffleruby
+COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalpython,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,truffleruby,wasm
 DISABLE_INSTALLABLES=True
diff --git a/vm/mx.vm/ce-win-complete b/vm/mx.vm/ce-win-complete
index af5438b74c8b..30839bb17a94 100644
--- a/vm/mx.vm/ce-win-complete
+++ b/vm/mx.vm/ce-win-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle,/vm
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
-NATIVE_IMAGES=gu,js,lib:jvmcicompiler
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/tools,/truffle,/vm,/wasm
+COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,lsp,nfi,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
+NATIVE_IMAGES=gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,wasm
 DISABLE_INSTALLABLES=False

From a85079afbfa76f18eff66aac7ba4aa2d05e5142d Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 20:22:31 +0200
Subject: [PATCH 626/681] Fix 'deploy' builders.

---
 vm/ci_common/common.hocon | 90 +++++++++++++++++++--------------------
 vm/ci_includes/vm.hocon   |  7 ---
 2 files changed, 44 insertions(+), 53 deletions(-)

diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index c9cf45498857..12633e12ad36 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -290,8 +290,9 @@ ondemand_vm_darwin: ${vm_darwin} {
   targets: [ondemand]
 }
 
-mx_vm_common: [mx, --strip-jars, "--sources=sdk:GRAAL_SDK,truffle:TRUFFLE_API,compiler:GRAAL,substratevm:SVM", --with-debuginfo, --env, "${VM_ENV}", "--force-bash-launchers=env.FORCE_BASH_LAUNCHERS,"${non-product-native-launchers}, "--base-jdk-info=${BASE_JDK_NAME}:${BASE_JDK_VERSION}"]
-mx_vm_installables: ${mx_vm_common}
+mx_vm_cmd_suffix: ["--sources=sdk:GRAAL_SDK,truffle:TRUFFLE_API,compiler:GRAAL,substratevm:SVM", --with-debuginfo, "--base-jdk-info=${BASE_JDK_NAME}:${BASE_JDK_VERSION}"]
+mx_vm_common: [mx, --env, "${VM_ENV}"] ${mx_vm_cmd_suffix}
+mx_vm_installables: [mx, --env, "${VM_ENV}-complete"] ${mx_vm_cmd_suffix}
 
 maven_deploy_sdk: [--suite, sdk, maven-deploy, --validate, none, --all-distribution-types, --with-suite-revisions-metadata]
 maven_deploy_sdk_base:               ${maven_deploy_sdk} [--tags, graalvm,                             ${binaries-repository}]
@@ -354,10 +355,10 @@ upload_file_sizes: [bench-uploader.py, "sizes.json"]
 
 deploy_graalvm_linux_amd64: {
   run: [
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, graalvm-show]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${mx_vm_installables} [graalvm-show]
+    ${mx_vm_installables} [build]
+    ${mx_vm_installables} ${maven_deploy_sdk_components}
+    ${mx_vm_installables} ${record_file_sizes}
     ${upload_file_sizes}
   ] ${collect_profiles} [
     ${mx_vm_common} ${vm_profiles} [graalvm-show]
@@ -375,10 +376,10 @@ deploy_graalvm_linux_amd64: {
 deploy_graalvm_linux_aarch64: {
   run: [
     [set-export, VM_ENV, "${VM_ENV}-aarch64"]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, graalvm-show]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${mx_vm_installables} [graalvm-show]
+    ${mx_vm_installables} [build]
+    ${mx_vm_installables} ${maven_deploy_sdk_components}
+    ${mx_vm_installables} ${record_file_sizes}
     ${upload_file_sizes}
   ] ${collect_profiles} [
     ${mx_vm_common} ${vm_profiles} [graalvm-show]
@@ -406,11 +407,11 @@ deploy_graalvm_base_darwin_amd64: {
 
 deploy_graalvm_installables_darwin_amd64: {
   run: [
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, graalvm-show]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}, build]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${maven_deploy_sdk_components}
+    ${mx_vm_installables} [graalvm-show]
+    ${mx_vm_installables} [build]
+    ${mx_vm_installables} ${maven_deploy_sdk_components}
     ${notify-nexus-deploy}
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components}] ${record_file_sizes}
+    ${mx_vm_installables} ${record_file_sizes}
     ${upload_file_sizes}
     ${notify-releaser}
   ]
@@ -433,11 +434,11 @@ deploy_graalvm_base_windows_amd64: {
 deploy_graalvm_installables_windows_amd64: {
   run: [
     [set-export, VM_ENV, "${VM_ENV}-win"]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}, graalvm-show]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}, build]
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}] ${maven_deploy_sdk_components}
+    ${mx_vm_installables} [graalvm-show]
+    ${mx_vm_installables} [build]
+    ${mx_vm_installables} ${maven_deploy_sdk_components}
     ${notify-nexus-deploy}
-    ${mx_vm_installables} [--dynamicimports, "${VM_EXTRA_SUITES}", "--exclude-components="${non-product-vm-components-windows}] ${record_file_sizes}
+    ${mx_vm_installables} ${record_file_sizes}
     ${upload_file_sizes}
   ]
   timelimit: "1:30:00"
@@ -489,27 +490,27 @@ builds += [
   #
 
   # Linux/AMD64
-  ${vm_java_8}  ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites}]] ${deploy_graalvm_linux_amd64.run}, name: deploy-vm-java8-linux-amd64}
-  ${vm_java_11} ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites}]] ${deploy_graalvm_linux_amd64.run}, name: deploy-vm-java11-linux-amd64}
-  ${vm_java_17} ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites}]] ${deploy_graalvm_linux_amd64.run}, name: deploy-vm-java17-linux-amd64}
+  ${vm_java_8}  ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {name: deploy-vm-java8-linux-amd64}
+  ${vm_java_11} ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {name: deploy-vm-java11-linux-amd64}
+  ${vm_java_17} ${full_vm_build_linux} ${linux-deploy} ${deploy_vm_linux} ${deploy_graalvm_linux_amd64} {name: deploy-vm-java17-linux-amd64}
 
   # Linux/AARCH64
-  ${vm_java_11} ${full_vm_build_linux_aarch64} ${linux-deploy} ${deploy_daily_vm_linux_aarch64} ${deploy_graalvm_linux_aarch64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites_aarch64}]] ${deploy_graalvm_linux_aarch64.run}, name: deploy-vm-java11-linux-aarch64}
-  ${vm_java_17} ${full_vm_build_linux_aarch64} ${linux-deploy} ${deploy_daily_vm_linux_aarch64} ${deploy_graalvm_linux_aarch64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites_aarch64}]] ${deploy_graalvm_linux_aarch64.run}, name: deploy-vm-java17-linux-aarch64}
+  ${vm_java_11} ${full_vm_build_linux_aarch64} ${linux-deploy} ${deploy_daily_vm_linux_aarch64} ${deploy_graalvm_linux_aarch64} {name: deploy-vm-java11-linux-aarch64}
+  ${vm_java_17} ${full_vm_build_linux_aarch64} ${linux-deploy} ${deploy_daily_vm_linux_aarch64} ${deploy_graalvm_linux_aarch64} {name: deploy-vm-java17-linux-aarch64}
 
   # Darwin/AMD64
-  ${vm_java_11} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_base_darwin_amd64}         {                                                                                                                 name: deploy-vm-base-java11-darwin-amd64}
-  ${vm_java_11} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_installables_darwin_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites}]] ${deploy_graalvm_installables_darwin_amd64.run},        name: deploy-vm-installable-java11-darwin-amd64}
-  ${vm_java_17} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_base_darwin_amd64}         {                                                                                                                 name: deploy-vm-base-java17-darwin-amd64}
-  ${vm_java_17} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_installables_darwin_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites}]] ${deploy_graalvm_installables_darwin_amd64.run}, name: deploy-vm-installable-java17-darwin-amd64}
+  ${vm_java_11} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_base_darwin_amd64}         {name: deploy-vm-base-java11-darwin-amd64}
+  ${vm_java_11} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_installables_darwin_amd64} {name: deploy-vm-installable-java11-darwin-amd64}
+  ${vm_java_17} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_base_darwin_amd64}         {name: deploy-vm-base-java17-darwin-amd64}
+  ${vm_java_17} ${full_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_installables_darwin_amd64} {name: deploy-vm-installable-java17-darwin-amd64}
 
   # Windows/AMD64
-  ${vm_java_8}  ${deploy_daily_vm_windows} ${js_windows} ${vm_common_windows_jdk8} ${deploy_graalvm_base_windows_amd64}                       {                                                                                                                          name: deploy-vm-base-java8-windows-amd64}
-  ${vm_java_8}  ${deploy_daily_vm_windows} ${js_windows} ${vm_common_windows_jdk8} ${deploy_graalvm_installables_windows_amd64}               {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites_windows}]] ${deploy_graalvm_installables_windows_amd64.run},        name: deploy-vm-installable-java8-windows-amd64}
-  ${vm_java_11} ${deploy_daily_vm_windows-jdk11} ${svm-common-windows-jdk11} ${js_windows_jdk11} ${deploy_graalvm_base_windows_amd64}         {                                                                                                                          name: deploy-vm-base-java11-windows-amd64}
-  ${vm_java_11} ${deploy_daily_vm_windows-jdk11} ${svm-common-windows-jdk11} ${js_windows_jdk11} ${deploy_graalvm_installables_windows_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites_windows}]] ${deploy_graalvm_installables_windows_amd64.run},        name: deploy-vm-installable-java11-windows-amd64}
-  ${vm_java_17} ${deploy_daily_vm_windows-jdk17} ${svm-common-windows-jdk17} ${js_windows_jdk17} ${deploy_graalvm_base_windows_amd64}         {                                                                                                                          name: deploy-vm-base-java17-windows-amd64}
-  ${vm_java_17} ${deploy_daily_vm_windows-jdk17} ${svm-common-windows-jdk17} ${js_windows_jdk17} ${deploy_graalvm_installables_windows_amd64} {run: [[set-export, VM_EXTRA_SUITES, ${vm_extra_suites_windows}]] ${deploy_graalvm_installables_windows_amd64.run}, name: deploy-vm-installable-java17-windows-amd64}
+  ${vm_java_8}  ${deploy_daily_vm_windows} ${js_windows} ${vm_common_windows_jdk8} ${deploy_graalvm_base_windows_amd64}                       {name: deploy-vm-base-java8-windows-amd64}
+  ${vm_java_8}  ${deploy_daily_vm_windows} ${js_windows} ${vm_common_windows_jdk8} ${deploy_graalvm_installables_windows_amd64}               {name: deploy-vm-installable-java8-windows-amd64}
+  ${vm_java_11} ${deploy_daily_vm_windows-jdk11} ${svm-common-windows-jdk11} ${js_windows_jdk11} ${deploy_graalvm_base_windows_amd64}         {name: deploy-vm-base-java11-windows-amd64}
+  ${vm_java_11} ${deploy_daily_vm_windows-jdk11} ${svm-common-windows-jdk11} ${js_windows_jdk11} ${deploy_graalvm_installables_windows_amd64} {name: deploy-vm-installable-java11-windows-amd64}
+  ${vm_java_17} ${deploy_daily_vm_windows-jdk17} ${svm-common-windows-jdk17} ${js_windows_jdk17} ${deploy_graalvm_base_windows_amd64}         {name: deploy-vm-base-java17-windows-amd64}
+  ${vm_java_17} ${deploy_daily_vm_windows-jdk17} ${svm-common-windows-jdk17} ${js_windows_jdk17} ${deploy_graalvm_installables_windows_amd64} {name: deploy-vm-installable-java17-windows-amd64}
 
   #
   # Deploy GraalVM+Ruby images
@@ -519,16 +520,15 @@ builds += [
   ${vm_java_11} ${ruby_vm_build_darwin} ${darwin-deploy} ${deploy_daily_vm_darwin} ${deploy_graalvm_plus_ruby} {name: deploy-vm-ruby-java11-darwin-amd64}
 
   #
-  # Deploy GraalVM Complete (no FastR)
+  # Deploy GraalVM Complete
   #
 
   # Linux/AMD64
   ${vm_java_8} ${full_vm_build_linux} ${linux-deploy} ${ondemand_vm_linux} {
     run: [
-      [set-export, VM_ENV, "${VM_ENV}-complete"]
-      ${mx_vm_common} [graalvm-show]
-      ${mx_vm_common} [build]
-      ${mx_vm_common} ${maven_deploy_sdk_base}
+      ${mx_vm_installables} [graalvm-show]
+      ${mx_vm_installables} [build]
+      ${mx_vm_installables} ${maven_deploy_sdk_base}
       ${notify-nexus-deploy}
     ]
     timelimit: "1:30:00"
@@ -536,10 +536,9 @@ builds += [
   }
   ${vm_java_11} ${full_vm_build_linux} ${linux-deploy} ${ondemand_vm_linux} {
     run: [
-      [set-export, VM_ENV, "${VM_ENV}-complete"]
-      ${mx_vm_common} [graalvm-show]
-      ${mx_vm_common} [build]
-      ${mx_vm_common} ${maven_deploy_sdk_base}
+      ${mx_vm_installables} [graalvm-show]
+      ${mx_vm_installables} [build]
+      ${mx_vm_installables} ${maven_deploy_sdk_base}
       ${notify-nexus-deploy}
     ]
     timelimit: "1:30:00"
@@ -549,10 +548,9 @@ builds += [
   # Darwin/AMD64
   ${vm_java_11} ${full_vm_build_darwin} ${darwin-deploy} ${ondemand_vm_darwin} {
     run: [
-      [set-export, VM_ENV, "${VM_ENV}-complete"]
-      ${mx_vm_common} [graalvm-show]
-      ${mx_vm_common} [build]
-      ${mx_vm_common} ${maven_deploy_sdk_base}
+      ${mx_vm_installables} [graalvm-show]
+      ${mx_vm_installables} [build]
+      ${mx_vm_installables} ${maven_deploy_sdk_base}
       ${notify-nexus-deploy}
     ]
     timelimit: "2:30:00"
diff --git a/vm/ci_includes/vm.hocon b/vm/ci_includes/vm.hocon
index efc29712ed17..cce9832d4477 100644
--- a/vm/ci_includes/vm.hocon
+++ b/vm/ci_includes/vm.hocon
@@ -22,18 +22,11 @@ vm_java_17: ${labsjdk-ce-17} {
 vm_common_windows_jdk8: ${svm-common-windows-openjdk8}
 
 svm_suite: /substratevm
-vm_extra_suites:         "/graal-nodejs,/wasm,/espresso,truffleruby,graalpython,fastr"
-vm_extra_suites_aarch64: "/graal-nodejs,/wasm,/espresso,truffleruby"
-vm_extra_suites_windows: "/graal-nodejs,/wasm,/espresso"
 custom_vm_linux: {}
 custom_vm_darwin: {}
 vm_profiles: []
 collect_profiles: []
 
-non-product-vm-components: "nju,dis,pbm,llmulrl,elau"
-non-product-vm-components-windows: ${non-product-vm-components}",llp"
-non-product-native-launchers: "RMain,polybench,native-image-configure"
-
 vm_setup: {
   short_name: ce
   setup: [

From 5e56a4f4492c64bb0d756f1b775a8f6d579fd07f Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 22:26:50 +0200
Subject: [PATCH 627/681] Support '--components=<bool>'.

---
 sdk/mx.sdk/mx_sdk_vm_impl.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index c58b8138a701..2e12fe2d3d2a 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -3160,9 +3160,11 @@ def _debug_images():
 
 
 def _components_include_list():
-    included = _parse_cmd_arg('components', parse_bool=False, default_value=None)
+    included = _parse_cmd_arg('components', parse_bool=True, default_value=None)
     if included is None:
         return None
+    if isinstance(included, bool):
+        return mx_sdk_vm.graalvm_components() if included else []
     components = []
     for name in included:
         if name.startswith('suite:'):

From e879e6a7f31edb43ea99b21da6820cbc30a3b479 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 19 Oct 2021 16:21:50 +0200
Subject: [PATCH 628/681] support jump tables with secondary keys

---
 compiler/mx.compiler/suite.py                 |  1 +
 .../compiler/asm/test/AssemblerTest.java      | 10 +++--
 .../compiler/code/CompilationResult.java      | 38 +++++++++++++++---
 .../graalvm/compiler/code/HexCodeFile.java    | 40 +++++++++++++++----
 .../code/HexCodeFileDisassemblerProvider.java | 30 +++++++++++++-
 .../lir/aarch64/AArch64ControlFlow.java       |  3 +-
 .../compiler/lir/amd64/AMD64ControlFlow.java  | 14 +++----
 .../compiler/lir/hashing/IntHasher.java       |  2 +-
 .../compiler/printer/CFGPrinterObserver.java  | 15 ++++---
 9 files changed, 118 insertions(+), 35 deletions(-)

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index c528d0471775..6dbace9c93ce 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -434,6 +434,7 @@
       ],
       "annotationProcessors" : [
       ],
+      "spotbugs" : "false",
       "checkstyle" : "org.graalvm.compiler.graph",
       "javaCompliance" : "8,11+",
       "workingSets" : "API,Graal",
diff --git a/compiler/src/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java b/compiler/src/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java
index 6f464c509e3d..ea4162c958b4 100644
--- a/compiler/src/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java
+++ b/compiler/src/org.graalvm.compiler.asm.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java
@@ -104,10 +104,12 @@ protected InstalledCode assembleMethod(Method m, CodeGenTest test) {
             InstalledCode code = backend.addInstalledCode(debug, method, asCompilationRequest(compilationId), compResult);
 
             for (DisassemblerProvider dis : GraalServices.load(DisassemblerProvider.class)) {
-                String disasm1 = dis.disassembleCompiledCode(options, codeCache, compResult);
-                Assert.assertTrue(compResult.toString(), disasm1 == null || disasm1.length() > 0);
-                String disasm2 = dis.disassembleInstalledCode(codeCache, compResult, code);
-                Assert.assertTrue(code.toString(), disasm2 == null || disasm2.length() > 0);
+                if (dis.isAvailable(options)) {
+                    String disasm1 = dis.disassembleCompiledCode(options, codeCache, compResult);
+                    Assert.assertTrue(compResult.toString(), disasm1 == null || disasm1.length() > 0);
+                    String disasm2 = dis.disassembleInstalledCode(codeCache, compResult, code);
+                    Assert.assertTrue(code.toString(), disasm2 == null || disasm2.length() > 0);
+                }
             }
             return code;
         } catch (Throwable e) {
diff --git a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
index 3c422def1e3d..b9c5ae56bb69 100644
--- a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
+++ b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/CompilationResult.java
@@ -135,7 +135,7 @@ public String toString() {
 
     /**
      * Describes a table of signed offsets embedded in the code. The offsets are relative to the
-     * starting address of the table. This type of table maybe generated when translating a
+     * starting address of the table. This type of table can be generated when translating a
      * multi-way branch based on a key value from a dense value set (e.g. the {@code tableswitch}
      * JVM instruction).
      *
@@ -144,6 +144,31 @@ public String toString() {
      */
     public static final class JumpTable extends CodeAnnotation {
 
+        /**
+         * Constants denoting the format and size of each entry in a jump table.
+         */
+        public enum EntryFormat {
+            /**
+             * Each entry is a 4 byte offset. The base of the offset is platform dependent.
+             */
+            OFFSET(4),
+
+            /**
+             * Each entry is a secondary key value followed by a 4 byte offset. The base of the
+             * offset is platform dependent.
+             */
+            KEY2_OFFSET(8);
+
+            EntryFormat(int size) {
+                this.size = size;
+            }
+
+            /**
+             * Gets the size of an entry in bytes.
+             */
+            public final int size;
+        }
+
         /**
          * The low value in the key range (inclusive).
          */
@@ -157,13 +182,16 @@ public static final class JumpTable extends CodeAnnotation {
         /**
          * The size (in bytes) of each table entry.
          */
-        public final int entrySize;
+        public final EntryFormat entryFormat;
 
-        public JumpTable(int position, int low, int high, int entrySize) {
+        public JumpTable(int position, int low, int high, EntryFormat entryFormat) {
             super(position);
+            if (high <= low) {
+                throw new IllegalArgumentException(String.format("low (%d) is not less than high(%d)", low, high));
+            }
             this.low = low;
             this.high = high;
-            this.entrySize = entrySize;
+            this.entryFormat = entryFormat;
         }
 
         @Override
@@ -173,7 +201,7 @@ public boolean equals(Object obj) {
             }
             if (obj instanceof JumpTable) {
                 JumpTable that = (JumpTable) obj;
-                if (this.getPosition() == that.getPosition() && this.entrySize == that.entrySize && this.low == that.low && this.high == that.high) {
+                if (this.getPosition() == that.getPosition() && this.entryFormat == that.entryFormat && this.low == that.low && this.high == that.high) {
                     return true;
                 }
             }
diff --git a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java
index 0e11d7796eff..e987d4bca74f 100644
--- a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java
+++ b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFile.java
@@ -24,6 +24,9 @@
  */
 package org.graalvm.compiler.code;
 
+import static org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat.KEY2_OFFSET;
+import static org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat.OFFSET;
+
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
@@ -37,8 +40,7 @@
 import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
 import org.graalvm.compiler.code.CompilationResult.CodeComment;
 import org.graalvm.compiler.code.CompilationResult.JumpTable;
-
-import jdk.vm.ci.code.CodeUtil;
+import org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat;
 
 /**
  * A HexCodeFile is a textual format for representing a chunk of machine code along with extra
@@ -59,7 +61,9 @@
  *
  *     OperandComment ::= "OperandComment" Position String
  *
- *     JumpTable ::= "JumpTable" Position EntrySize Low High
+ *     EntryFormat ::= 4 | 8 | "OFFSET" | "KEY2_OFFSET"
+ *
+ *     JumpTable ::= "JumpTable" Position EntryFormat Low High
  *
  *     LookupTable ::= "LookupTable" Position NPairs KeySize OffsetSize
  *
@@ -95,13 +99,13 @@
  */
 public class HexCodeFile {
 
-    public static final String NEW_LINE = CodeUtil.NEW_LINE;
+    public static final String NEW_LINE = System.lineSeparator();
     public static final String SECTION_DELIM = " <||@";
     public static final String COLUMN_END = " <|@";
     public static final Pattern SECTION = Pattern.compile("(\\S+)\\s+(.*)", Pattern.DOTALL);
     public static final Pattern COMMENT = Pattern.compile("(\\d+)\\s+(.*)", Pattern.DOTALL);
     public static final Pattern OPERAND_COMMENT = COMMENT;
-    public static final Pattern JUMP_TABLE = Pattern.compile("(\\d+)\\s+(\\d+)\\s+(-{0,1}\\d+)\\s+(-{0,1}\\d+)\\s*");
+    public static final Pattern JUMP_TABLE = Pattern.compile("(\\d+)\\s+(\\S+)\\s+(-{0,1}\\d+)\\s+(-{0,1}\\d+)\\s*");
     public static final Pattern LOOKUP_TABLE = Pattern.compile("(\\d+)\\s+(\\d+)\\s+(\\d+)\\s+(\\d+)\\s*");
     public static final Pattern HEX_CODE = Pattern.compile("(\\p{XDigit}+)(?:\\s+(\\p{XDigit}*))?");
     public static final Pattern PLATFORM = Pattern.compile("(\\S+)\\s+(\\S+)", Pattern.DOTALL);
@@ -173,7 +177,10 @@ public void writeTo(OutputStream out) {
         ps.printf("HexCode %x %s %s%n", startAddress, HexCodeFile.hexCodeString(code), SECTION_DELIM);
 
         for (JumpTable table : jumpTables) {
-            ps.printf("JumpTable %d %d %d %d %s%n", table.getPosition(), table.entrySize, table.low, table.high, SECTION_DELIM);
+            EntryFormat ef = table.entryFormat;
+            // Backwards compatibility support for old versions of C1Visualizer
+            String efString = ef == OFFSET || ef == KEY2_OFFSET ? String.valueOf(ef.size) : ef.name();
+            ps.printf("JumpTable %d %s %d %d %s%n", table.getPosition(), efString, table.low, table.high, SECTION_DELIM);
         }
 
         for (Map.Entry<Integer, List<String>> e : comments.entrySet()) {
@@ -433,13 +440,30 @@ void parseSection(int offset, String section) {
                 m = HexCodeFile.JUMP_TABLE.matcher(body);
                 check(m.matches(), bodyOffset, "JumpTable does not match pattern " + HexCodeFile.JUMP_TABLE);
                 int pos = parseInt(bodyOffset + m.start(1), m.group(1));
-                int entrySize = parseInt(bodyOffset + m.start(2), m.group(2));
+                JumpTable.EntryFormat entryFormat = parseJumpTableEntryFormat(m, bodyOffset);
                 int low = parseInt(bodyOffset + m.start(3), m.group(3));
                 int high = parseInt(bodyOffset + m.start(4), m.group(4));
-                hcf.jumpTables.add(new JumpTable(pos, low, high, entrySize));
+                hcf.jumpTables.add(new JumpTable(pos, low, high, entryFormat));
             } else {
                 error(offset, "Unknown section header: " + header);
             }
         }
+
+        private JumpTable.EntryFormat parseJumpTableEntryFormat(Matcher m, int bodyOffset) throws Error {
+            String entryFormatName = m.group(2);
+            JumpTable.EntryFormat entryFormat;
+            if ("4".equals(entryFormatName)) {
+                entryFormat = EntryFormat.OFFSET;
+            } else if ("8".equals(entryFormatName)) {
+                entryFormat = EntryFormat.KEY2_OFFSET;
+            } else {
+                try {
+                    entryFormat = EntryFormat.valueOf(entryFormatName);
+                } catch (IllegalArgumentException e) {
+                    throw error(bodyOffset + m.start(2), "Not a valid " + EntryFormat.class.getSimpleName() + " value: " + entryFormatName);
+                }
+            }
+            return entryFormat;
+        }
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java
index 409438ff72ae..eac63bd2e3ef 100644
--- a/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java
+++ b/compiler/src/org.graalvm.compiler.code/src/org/graalvm/compiler/code/HexCodeFileDisassemblerProvider.java
@@ -26,6 +26,7 @@
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 
 import org.graalvm.compiler.options.OptionValues;
@@ -43,6 +44,7 @@
 import jdk.vm.ci.code.site.DataPatch;
 import jdk.vm.ci.code.site.ExceptionHandler;
 import jdk.vm.ci.code.site.Infopoint;
+import jdk.vm.ci.services.Services;
 
 /**
  * {@link HexCodeFile} based implementation of {@link DisassemblerProvider}.
@@ -124,6 +126,11 @@ private static void addOperandComment(HexCodeFile hcf, int pos, String comment)
         hcf.addOperandComment(pos, comment);
     }
 
+    @Override
+    public boolean isAvailable(OptionValues options) {
+        return HexCodeFileDisTool.processMethod != null;
+    }
+
     /**
      * Interface to the tool for disassembling an {@link HexCodeFile#toEmbeddedString() embedded}
      * {@link HexCodeFile}.
@@ -135,10 +142,31 @@ static class HexCodeFileDisTool {
             MethodHandle toolMethod = null;
             try {
                 Class<?> toolClass = Class.forName("com.oracle.max.hcfdis.HexCodeFileDis", true, ClassLoader.getSystemClassLoader());
-                toolMethod = MethodHandles.lookup().unreflect(toolClass.getDeclaredMethod("processEmbeddedString", String.class));
+                Method reflectMethod = toolClass.getDeclaredMethod("processEmbeddedString", String.class);
+                reflectMethod.setAccessible(true);
+                toolMethod = MethodHandles.lookup().unreflect(reflectMethod);
             } catch (Exception e) {
                 // Tool not available on the class path
             }
+
+            // Try disassemble a zero-length code array to see if the disassembler
+            // can really be used (e.g., the Capstone native support may be not available on the
+            // current platform).
+            if (toolMethod != null) {
+                byte[] code = {};
+                String arch = Services.getSavedProperties().get("os.arch");
+                if (arch.equals("x86_64")) {
+                    arch = "amd64";
+                }
+                int wordWidth = arch.endsWith("64") ? 64 : Integer.parseInt(Services.getSavedProperties().getOrDefault("sun.arch.data.model", "64"));
+                String hcf = new HexCodeFile(code, 0L, arch.toLowerCase(), wordWidth).toEmbeddedString();
+                try {
+                    toolMethod.invokeExact(hcf);
+                } catch (Throwable e) {
+                    toolMethod = null;
+                }
+            }
+
             processMethod = toolMethod;
         }
 
diff --git a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
index 360253ba167c..ededa35602f3 100644
--- a/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
+++ b/compiler/src/org.graalvm.compiler.lir.aarch64/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java
@@ -40,6 +40,7 @@
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
 import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
 import org.graalvm.compiler.code.CompilationResult.JumpTable;
+import org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.debug.GraalError;
@@ -443,7 +444,7 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) {
                 for (LabelRef target : targets) {
                     masm.jmp(target.label());
                 }
-                JumpTable jt = new JumpTable(jumpTable.position(), lowKey, highKey, 4);
+                JumpTable jt = new JumpTable(jumpTable.position(), lowKey, highKey, EntryFormat.OFFSET);
                 crb.compilationResult.addAnnotation(jt);
             }
         }
diff --git a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java
index 744cd24c7b7c..73cbef8139b2 100644
--- a/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java
+++ b/compiler/src/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java
@@ -47,6 +47,7 @@
 import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
 import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
 import org.graalvm.compiler.code.CompilationResult.JumpTable;
+import org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.calc.Condition;
 import org.graalvm.compiler.debug.GraalError;
@@ -740,7 +741,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
                 }
             }
 
-            JumpTable jt = new JumpTable(jumpTablePos, lowKey, highKey, 4);
+            JumpTable jt = new JumpTable(jumpTablePos, lowKey, highKey, EntryFormat.OFFSET);
             crb.compilationResult.addAnnotation(jt);
         }
     }
@@ -800,13 +801,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
             masm.jmp(scratchReg);
 
             // Inserting padding so that jump the table address is aligned
-            int entrySize;
-            if (defaultTarget != null) {
-                entrySize = 8;
-            } else {
-                entrySize = 4;
-            }
-            masm.align(entrySize);
+            EntryFormat entryFormat = defaultTarget == null ? EntryFormat.OFFSET : EntryFormat.KEY2_OFFSET;
+            masm.align(entryFormat.size);
 
             // Patch LEA instruction above now that we know the position of the jump table
             // this is ugly but there is no better way to do this given the assembler API
@@ -834,7 +830,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
                 }
             }
 
-            JumpTable jt = new JumpTable(jumpTablePos, keys[0].asInt(), keys[keys.length - 1].asInt(), entrySize);
+            JumpTable jt = new JumpTable(jumpTablePos, 0, keys.length - 1, entryFormat);
             crb.compilationResult.addAnnotation(jt);
         }
     }
diff --git a/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java b/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java
index 8018d4179340..962dfad82e77 100644
--- a/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java
+++ b/compiler/src/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/hashing/IntHasher.java
@@ -45,7 +45,7 @@ private IntHasher(int cardinality, short factor, byte shift) {
         this.shift = shift;
     }
 
-    // 1 + the first 9999 prime numbers
+    // 1 + the first 999 prime numbers
     private static final Short[] factors = new Short[1000];
 
     static {
diff --git a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java
index 622ea233d6e6..b690d993d9bb 100644
--- a/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java
+++ b/compiler/src/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/CFGPrinterObserver.java
@@ -270,14 +270,17 @@ private static DisassemblerProvider selectDisassemblerProvider(OptionValues opti
         String arch = Services.getSavedProperties().get("os.arch");
         final boolean isAArch64 = arch.equals("aarch64");
         for (DisassemblerProvider d : GraalServices.load(DisassemblerProvider.class)) {
-            String name = d.getName();
-            if (isAArch64 && name.equals("objdump") && d.isAvailable(options)) {
-                return d;
-            } else if (name.equals("hcf")) {
-                if (!isAArch64) {
+            if (d.isAvailable(options)) {
+                String name = d.getName();
+                if (isAArch64 && name.equals("objdump")) {
+                    // Prefer objdump disassembler over others
                     return d;
+                } else if (name.equals("hcf")) {
+                    if (!isAArch64) {
+                        return d;
+                    }
+                    selected = d;
                 }
-                selected = d;
             }
         }
         if (selected == null) {

From 9ea0bd7a4a8e77b518746e9d28cd07200dfd3c2b Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 22:49:05 +0200
Subject: [PATCH 629/681] GraalVM 'ce-complete' now includes FastR.

---
 vm/mx.vm/mx_vm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index 372b5321c85b..da62fc8dff47 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -129,7 +129,7 @@
 
 # pylint: disable=line-too-long
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
-ce_complete_components = ['bpolyglot', 'bnative-image-configure', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
+ce_complete_components = ['R', 'bRMain', 'bpolyglot', 'bnative-image-configure', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']

From 13eabd096f945120e78b7b7751ea8884d875109a Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 23:11:04 +0200
Subject: [PATCH 630/681] Add GraalVM configs for the new 'complete' env files.

---
 vm/mx.vm/mx_vm.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
index da62fc8dff47..4449a63b978b 100644
--- a/vm/mx.vm/mx_vm.py
+++ b/vm/mx.vm/mx_vm.py
@@ -129,7 +129,9 @@
 
 # pylint: disable=line-too-long
 ce_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
-ce_complete_components = ['R', 'bRMain', 'bpolyglot', 'bnative-image-configure', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'njs', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rby', 'rbyl', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'svml', 'tfl', 'tflm', 'vvm']
+ce_win_complete_components = ['bpolyglot', 'cmp', 'cov', 'dap', 'ejvm', 'gu', 'gvm', 'gwa', 'ins', 'insight', 'insightheap', 'java', 'js', 'lg', 'libpoly', 'lsp', 'nfi', 'njs', 'poly', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
+ce_aarch64_complete_components = ce_win_complete_components + ['llp', 'llrc', 'llrl', 'llrn', 'rby', 'rbyl', 'svml']
+ce_complete_components = ce_aarch64_complete_components + ['nil', 'pyn', 'R', 'ni', 'bRMain', 'nic', 'pynl', 'bnative-image-configure']
 ce_ruby_components = ['cmp', 'cov', 'dap', 'gvm', 'ins', 'insight', 'insightheap', 'lg', 'llp', 'llrc', 'llrn', 'lsp', 'nfi', 'pro', 'rby', 'rbyl', 'rgx', 'sdk', 'svm', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_python_components = ['bgraalvm-native-binutil', 'bgraalvm-native-clang', 'bgraalvm-native-clang++', 'bgraalvm-native-ld', 'bgu', 'bjs', 'blli', 'bnative-image', 'bnative-image-configure', 'bpolybench', 'bpolyglot', 'cmp', 'cov', 'dap', 'dis', 'gu', 'gvm', 'ins', 'insight', 'insightheap', 'js', 'lg', 'libpoly', 'llp', 'llrc', 'llrl', 'llrn', 'lsp', 'nfi', 'ni', 'nic', 'nil', 'nju', 'njucp', 'pbm', 'pmh', 'poly', 'polynative', 'pro', 'pyn', 'pynl', 'rgx', 'sdk', 'snative-image-agent', 'snative-image-diagnostics-agent', 'spolyglot', 'svm', 'svml', 'svmnfi', 'tfl', 'tflm', 'vvm']
 ce_fastr_components = ce_components + ['R', 'llp', 'bRMain']
@@ -140,6 +142,8 @@
 mx_sdk_vm.register_vm_config('ce', ce_components, _suite)
 mx_sdk_vm.register_vm_config('ce', ce_components + ['njs'], _suite, dist_name='ce', env_file='ce-nodejs')
 mx_sdk_vm.register_vm_config('ce', ce_ruby_components, _suite, dist_name='ce-ruby', env_file='ce-ruby')
+mx_sdk_vm.register_vm_config('ce', ce_win_complete_components, _suite, dist_name='ce-win-complete')
+mx_sdk_vm.register_vm_config('ce', ce_aarch64_complete_components, _suite, dist_name='ce-aarch64-complete')
 mx_sdk_vm.register_vm_config('ce', ce_complete_components, _suite, dist_name='ce-complete')
 mx_sdk_vm.register_vm_config('ce-python', ce_python_components, _suite)
 mx_sdk_vm.register_vm_config('ce-fastr', ce_fastr_components, _suite)

From fe090df203de2c5904e9daf9d3f5d289443f8fb5 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 23:19:27 +0200
Subject: [PATCH 631/681] Rename benchmarks.

---
 .../src/micro/benchmarks/TypecheckBenchmark.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
index 66b3bf41aa03..b07a9a88d0eb 100644
--- a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
@@ -307,44 +307,44 @@ public int repetitiveInstanceOfDynamic(ThreadState state) {
     }
 
     @Benchmark
-    public boolean isAssignableFromShouldFold(ThreadState state) {
+    public boolean classIsAssignableFromShouldFold(ThreadState state) {
         return AA.class.isAssignableFrom(state.aa1.getClass());
     }
 
     @Benchmark
-    public boolean isInstanceShouldFold(ThreadState state) {
+    public boolean classIsInstanceShouldFold(ThreadState state) {
         return AA.class.isInstance(state.aa1);
     }
 
     @Benchmark
-    public int isAssignableFrom(ThreadState state) {
+    public int classIsAssignableFrom(ThreadState state) {
         int res = 0;
         Object[] objects = state.object;
         for (int i = 0; i < objects.length; i++) {
-            if (isAssignableFrom(objects[i])) {
+            if (classIsAssignableFrom(objects[i])) {
                 res++;
             }
         }
         return res;
     }
 
-    boolean isAssignableFrom(Object obj) {
+    boolean classIsAssignableFrom(Object obj) {
         return AA1.class.isAssignableFrom(obj.getClass());
     }
 
     @Benchmark
-    public int isInstance(ThreadState state) {
+    public int classIsInstance(ThreadState state) {
         int res = 0;
         Object[] objects = state.object;
         for (int i = 0; i < objects.length; i++) {
-            if (isInstance(objects[i])) {
+            if (classIsInstance(objects[i])) {
                 res++;
             }
         }
         return res;
     }
 
-    boolean isInstance(Object obj) {
+    boolean classIsInstance(Object obj) {
         return AA1.class.isInstance(obj);
     }
 }

From 607676faf220d7e351594acbdf9e8ae4303c8bf6 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Mon, 25 Oct 2021 23:52:43 +0200
Subject: [PATCH 632/681] Add benchmarks for 'instanceof'.

---
 .../micro/benchmarks/TypecheckBenchmark.java  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
index b07a9a88d0eb..ad0bb7f25eea 100644
--- a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/TypecheckBenchmark.java
@@ -316,6 +316,11 @@ public boolean classIsInstanceShouldFold(ThreadState state) {
         return AA.class.isInstance(state.aa1);
     }
 
+    @Benchmark
+    public boolean instanceOfClassShouldFold(ThreadState state) {
+        return state.aa1 instanceof AA;
+    }
+
     @Benchmark
     public int classIsAssignableFrom(ThreadState state) {
         int res = 0;
@@ -347,4 +352,20 @@ public int classIsInstance(ThreadState state) {
     boolean classIsInstance(Object obj) {
         return AA1.class.isInstance(obj);
     }
+
+    @Benchmark
+    public int instanceOfClass(ThreadState state) {
+        int res = 0;
+        Object[] objects = state.object;
+        for (int i = 0; i < objects.length; i++) {
+            if (instanceOfClass(objects[i])) {
+                res++;
+            }
+        }
+        return res;
+    }
+
+    boolean instanceOfClass(Object obj) {
+        return obj instanceof AA1;
+    }
 }

From 99c9d7e12516d6eb9f8d4a45b45017eae4547cfa Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Mon, 25 Oct 2021 15:36:59 -0700
Subject: [PATCH 633/681] Support Class.toGenericString on JDK 17

---
 .../src/com/oracle/svm/core/hub/DynamicHub.java               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
index 152a650b5892..dd84cbf18ba8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -1605,6 +1605,10 @@ public Optional<?> describeConstable() {
         throw VMError.unsupportedFeature("Method is not available in JDK 8 or JDK 11");
     }
 
+    @KeepOriginal
+    @TargetElement(onlyWith = JDK17OrLater.class)
+    private static native String typeVarBounds(TypeVariable<?> typeVar);
+
     /*
      * We are defensive and also handle private native methods by marking them as deleted. If they
      * are reachable, the user is certainly doing something wrong. But we do not want to fail with a

From e49a983a8d79612356604346237c1a1517a5562f Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Tue, 26 Oct 2021 01:19:58 +0200
Subject: [PATCH 634/681] Vm env files should not import '/vm'.

---
 vm/mx.vm/ce                  | 2 +-
 vm/mx.vm/ce-aarch64          | 2 +-
 vm/mx.vm/ce-aarch64-complete | 2 +-
 vm/mx.vm/ce-complete         | 2 +-
 vm/mx.vm/ce-fastr            | 2 +-
 vm/mx.vm/ce-llimul           | 2 +-
 vm/mx.vm/ce-llvm             | 2 +-
 vm/mx.vm/ce-no_native        | 2 +-
 vm/mx.vm/ce-nodejs           | 2 +-
 vm/mx.vm/ce-python           | 2 +-
 vm/mx.vm/ce-ruby             | 2 +-
 vm/mx.vm/ce-test             | 2 +-
 vm/mx.vm/ce-win              | 2 +-
 vm/mx.vm/ce-win-complete     | 2 +-
 vm/mx.vm/libgraal            | 2 +-
 vm/mx.vm/polybench-ce        | 2 +-
 vm/mx.vm/polybench-nfi-ce    | 2 +-
 vm/mx.vm/polybench-sulong-ce | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/vm/mx.vm/ce b/vm/mx.vm/ce
index 99a2e2ca35f8..0bca517fda64 100644
--- a/vm/mx.vm/ce
+++ b/vm/mx.vm/ce
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-aarch64 b/vm/mx.vm/ce-aarch64
index 99a2e2ca35f8..0bca517fda64 100644
--- a/vm/mx.vm/ce-aarch64
+++ b/vm/mx.vm/ce-aarch64
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-aarch64-complete b/vm/mx.vm/ce-aarch64-complete
index fe8b1ac2b3f3..1f900ff99306 100644
--- a/vm/mx.vm/ce-aarch64-complete
+++ b/vm/mx.vm/ce-aarch64-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,truffleruby
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,truffleruby
 COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,njs,poly,polynative,pro,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lli,truffleruby,wasm
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index db8572377267..96f08f65a2ff 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,/wasm,fastr,graalpython,truffleruby
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby
 COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalpython,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,truffleruby,wasm
 DISABLE_INSTALLABLES=True
diff --git a/vm/mx.vm/ce-fastr b/vm/mx.vm/ce-fastr
index 8a65daad21fb..41c378cde9dd 100644
--- a/vm/mx.vm/ce-fastr
+++ b/vm/mx.vm/ce-fastr
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,fastr
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,fastr
 COMPONENTS=R,cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-llimul b/vm/mx.vm/ce-llimul
index 99a2e2ca35f8..0bca517fda64 100644
--- a/vm/mx.vm/ce-llimul
+++ b/vm/mx.vm/ce-llimul
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-llvm b/vm/mx.vm/ce-llvm
index b20df1e928fd..7dfa48383e01 100644
--- a/vm/mx.vm/ce-llvm
+++ b/vm/mx.vm/ce-llvm
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-no_native b/vm/mx.vm/ce-no_native
index bcb52c90840c..588ef3960aa7 100644
--- a/vm/mx.vm/ce-no_native
+++ b/vm/mx.vm/ce-no_native
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=false
 DISABLE_INSTALLABLES=ni,nil
diff --git a/vm/mx.vm/ce-nodejs b/vm/mx.vm/ce-nodejs
index 59fb4e254045..9a905e9540fa 100644
--- a/vm/mx.vm/ce-nodejs
+++ b/vm/mx.vm/ce-nodejs
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,njs,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:graal-nodejs,lib:jvmcicompiler,lli
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-python b/vm/mx.vm/ce-python
index 962201ae5e1b..f755ef3ecde6 100644
--- a/vm/mx.vm/ce-python
+++ b/vm/mx.vm/ce-python
@@ -1,5 +1,5 @@
 # Do not modify this env file without updating the Graal.Python benchmark builders
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,graalpython
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,graalpython
 COMPONENTS=cmp,cov,dap,dis,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,nju,njucp,pbm,pmh,poly,polynative,pro,pyn,pynl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalpython,lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-ruby b/vm/mx.vm/ce-ruby
index 562465d8f22a..4c0231ea2355 100644
--- a/vm/mx.vm/ce-ruby
+++ b/vm/mx.vm/ce-ruby
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm,truffleruby
+DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,truffleruby
 COMPONENTS=cmp,cov,dap,gvm,ins,insight,insightheap,lg,llp,llrc,llrn,lsp,nfi,pro,rby,rbyl,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,truffleruby
diff --git a/vm/mx.vm/ce-test b/vm/mx.vm/ce-test
index cc05f754c0f2..06d84ae260eb 100644
--- a/vm/mx.vm/ce-test
+++ b/vm/mx.vm/ce-test
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
 COMPONENTS=cmp,cov,dap,dis,gu,gvm,ins,insight,insightheap,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,nju,njucp,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,native-image-configure
 DISABLE_INSTALLABLES=llp
diff --git a/vm/mx.vm/ce-win b/vm/mx.vm/ce-win
index af5438b74c8b..e063016b96c8 100644
--- a/vm/mx.vm/ce-win
+++ b/vm/mx.vm/ce-win
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
 COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=gu,js,lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-win-complete b/vm/mx.vm/ce-win-complete
index 30839bb17a94..5649998d0fd1 100644
--- a/vm/mx.vm/ce-win-complete
+++ b/vm/mx.vm/ce-win-complete
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/tools,/truffle,/vm,/wasm
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/tools,/truffle,/wasm
 COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,lsp,nfi,njs,poly,polynative,pro,rgx,sdk,svm,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,wasm
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/libgraal b/vm/mx.vm/libgraal
index e2e43e4a3b3a..bb5896b7da26 100644
--- a/vm/mx.vm/libgraal
+++ b/vm/mx.vm/libgraal
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/truffle
 COMPONENTS=cmp,dis,gu,gvm,lg,nfi,poly,polynative,sdk,svm,svml,svmnfi,tfl,tflm
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=lib:jvmcicompiler
diff --git a/vm/mx.vm/polybench-ce b/vm/mx.vm/polybench-ce
index a9b84fa57dbe..c3848773752c 100644
--- a/vm/mx.vm/polybench-ce
+++ b/vm/mx.vm/polybench-ce
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/regex,/sdk,/substratevm,/sulong,/truffle,/vm,/wasm,graalpython,truffleruby
+DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/regex,/sdk,/substratevm,/sulong,/truffle,/wasm,graalpython,truffleruby
 COMPONENTS=cmp,ejvm,gwa,java,js,lg,llp,llrc,llrl,llrn,nfi,ni,nil,pbm,pmh,pyn,pynl,rby,rbyl,rgx,sdk,svm,svmnfi,tfl,tflm
 NATIVE_IMAGES=lib:jvmcicompiler,polybench
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/polybench-nfi-ce b/vm/mx.vm/polybench-nfi-ce
index 186e8b4c3d55..f99c5d0fff0e 100644
--- a/vm/mx.vm/polybench-nfi-ce
+++ b/vm/mx.vm/polybench-nfi-ce
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/truffle
 COMPONENTS=cmp,js,lg,nfi,ni,nil,pbm,pmh,rgx,sdk,svm,svmnfi,tfl,tflm
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=lib:jvmcicompiler,polybench
diff --git a/vm/mx.vm/polybench-sulong-ce b/vm/mx.vm/polybench-sulong-ce
index f187c1565a95..ea47076fbc2b 100644
--- a/vm/mx.vm/polybench-sulong-ce
+++ b/vm/mx.vm/polybench-sulong-ce
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/sulong,/truffle,/vm
+DYNAMIC_IMPORTS=/compiler,/sdk,/substratevm,/sulong,/truffle
 COMPONENTS=cmp,lg,llrc,llrl,llrn,nfi,ni,nil,pbm,sdk,svm,svmnfi,tfl,tflm
 EXCLUDE_COMPONENTS=libpoly
 NATIVE_IMAGES=lib:jvmcicompiler,polybench

From 83e1ca2666d24ab80414745b9768d789a694ad05 Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Tue, 26 Oct 2021 08:02:42 +0200
Subject: [PATCH 635/681] 'complete' env files do not disable installables.

---
 vm/mx.vm/ce-complete | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/ce-complete b/vm/mx.vm/ce-complete
index 96f08f65a2ff..67250b0ca15f 100644
--- a/vm/mx.vm/ce-complete
+++ b/vm/mx.vm/ce-complete
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/espresso,/graal-js,/graal-nodejs,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/wasm,fastr,graalpython,truffleruby
 COMPONENTS=cmp,cov,dap,ejvm,gu,gvm,gwa,ins,insight,insightheap,java,js,lg,llp,llrc,llrl,llrn,lsp,nfi,ni,nic,nil,njs,poly,polynative,pro,pyn,pynl,R,rby,rbyl,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
 NATIVE_IMAGES=graalpython,graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:espresso,lib:graal-nodejs,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,lli,native-image,truffleruby,wasm
-DISABLE_INSTALLABLES=True
+DISABLE_INSTALLABLES=false

From 43b6b88354e708dd395187fc705e336aa2000ad5 Mon Sep 17 00:00:00 2001
From: Loic Ottet <loic.ottet@oracle.com>
Date: Tue, 26 Oct 2021 11:32:54 +0200
Subject: [PATCH 636/681] Fix JavaCPP AArch64 libraries

---
 substratevm/mx.substratevm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 5cdc77ecf06d..073c841ef616 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -108,8 +108,8 @@
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.x86_64"
                     },
                     "aarch64": {
-                        "sha1": "49b2bff3ab0ecea436bd0f8ed64af28e5bdbd03a",
-                        "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2-linux-arm64.jar"],
+                        "sha1": "1340a75f741014eab5795cf37b24551913854dec",
+                        "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2_1-linux-arm64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.arm64"
                     },
                     "<others>": {

From deb80d4bc6f7115c756c619c45d48375d8109fdf Mon Sep 17 00:00:00 2001
From: Tomas Zezula <tomas.zezula@oracle.com>
Date: Mon, 25 Oct 2021 20:57:40 +0200
Subject: [PATCH 637/681] [GR-34702] Stale JNI reference in the
 JNIExceptionWrapper#throwableHandle.

---
 compiler/mx.compiler/suite.py                 |  1 +
 .../libgraal/jni/LibGraalJNIMethodScope.java  | 87 +++++++++++++++++++
 .../graalvm/libgraal/jni/LibGraalUtil.java    |  6 +-
 .../nativebridge/jni/JNIMethodScope.java      |  8 +-
 .../hotspot/libgraal/LibGraalFeature.java     |  3 +-
 5 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalJNIMethodScope.java

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index c528d0471775..bf324c4f9193 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -447,6 +447,7 @@
         "org.graalvm.nativebridge.jni",
         "org.graalvm.libgraal.jni.annotation",
         "sdk:GRAAL_SDK",
+        "JVMCI_HOTSPOT",
       ],
       "annotationProcessors" : [
         "GRAAL_LIBGRAAL_PROCESSOR",
diff --git a/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalJNIMethodScope.java b/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalJNIMethodScope.java
new file mode 100644
index 000000000000..803e5d876b84
--- /dev/null
+++ b/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalJNIMethodScope.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.libgraal.jni;
+
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
+import org.graalvm.nativebridge.jni.JNI.JNIEnv;
+import org.graalvm.nativebridge.jni.JNIMethodScope;
+import org.graalvm.nativeimage.c.type.CLongPointer;
+import org.graalvm.word.PointerBase;
+import org.graalvm.word.WordFactory;
+
+import static org.graalvm.nativebridge.jni.JNIUtil.PopLocalFrame;
+import static org.graalvm.nativebridge.jni.JNIUtil.PushLocalFrame;
+
+/**
+ * A {@link JNIMethodScope} subclass which pushes a JNI locals frame when there is no Java frame
+ * anchor on the stack. A Java frame anchor means there is an active Java-to-native stub (see
+ * {@code SharedRuntime::generate_native_wrapper}) that will clear all JNI references in the current
+ * JNI locals frame after the native call returns. A call directly into libgraal from the VM does
+ * not use such a stub so without explicitly allocating a new JNI locals frame, the JNI references
+ * created by libgraal will never be freed (i.e., a memory leak).
+ */
+final class LibGraalJNIMethodScope extends JNIMethodScope {
+
+    private static volatile int lastJavaPCOffset = -1;
+
+    private LibGraalJNIMethodScope(String scopeName, JNIEnv env) {
+        super(scopeName, env);
+        PushLocalFrame(env, 64);
+    }
+
+    @Override
+    public void close() {
+        setObjectResult(PopLocalFrame(getEnv(), getObjectResult()));
+        super.close();
+    }
+
+    /**
+     * Creates a new {@link JNIMethodScope} and pushes a JNI locals frame when the scope is a top
+     * level scope and there is no Java frame anchor on the stack.
+     *
+     * @see LibGraalJNIMethodScope
+     */
+    static JNIMethodScope open(String scopeName, JNIEnv env) {
+        return scopeOrNull() == null && getJavaFrameAnchor().isNull() ? new LibGraalJNIMethodScope(scopeName, env) : new JNIMethodScope(scopeName, env);
+    }
+
+    private static PointerBase getJavaFrameAnchor() {
+        CLongPointer currentThreadLastJavaPCOffset = (CLongPointer) WordFactory.unsigned(HotSpotJVMCIRuntime.runtime().getCurrentJavaThread()).add(getLastJavaPCOffset());
+        return WordFactory.pointer(currentThreadLastJavaPCOffset.read());
+    }
+
+    private static int getLastJavaPCOffset() {
+        int res = lastJavaPCOffset;
+        if (res == -1) {
+            HotSpotVMConfigAccess configAccess = new HotSpotVMConfigAccess(HotSpotJVMCIRuntime.runtime().getConfigStore());
+            int anchor = configAccess.getFieldOffset("JavaThread::_anchor", Integer.class, "JavaFrameAnchor");
+            int lastJavaPc = configAccess.getFieldOffset("JavaFrameAnchor::_last_Java_pc", Integer.class, "address");
+            res = anchor + lastJavaPc;
+            lastJavaPCOffset = res;
+        }
+        return res;
+    }
+}
diff --git a/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalUtil.java b/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalUtil.java
index a3315aa54a86..21897b4a9aa7 100644
--- a/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalUtil.java
+++ b/compiler/src/org.graalvm.libgraal.jni/src/org/graalvm/libgraal/jni/LibGraalUtil.java
@@ -46,7 +46,11 @@ private LibGraalUtil() {
 
     public static JNIMethodScope openScope(Class<?> entryPointClass, Enum<?> id, JNIEnv env) {
         Objects.requireNonNull(id, "Id must be non null.");
-        return new JNIMethodScope(entryPointClass.getSimpleName() + "::" + id, env);
+        return LibGraalJNIMethodScope.open(entryPointClass.getSimpleName() + "::" + id, env);
+    }
+
+    public static JNIMethodScope openScope(String scopeName, JNIEnv env) {
+        return LibGraalJNIMethodScope.open(scopeName, env);
     }
 
     /*----------------- CHECKING ------------------*/
diff --git a/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIMethodScope.java b/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIMethodScope.java
index 2ce314d41beb..26f9d0c81171 100644
--- a/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIMethodScope.java
+++ b/compiler/src/org.graalvm.nativebridge.jni/src/org/graalvm/nativebridge/jni/JNIMethodScope.java
@@ -24,8 +24,6 @@
  */
 package org.graalvm.nativebridge.jni;
 
-import static org.graalvm.nativebridge.jni.JNIUtil.PopLocalFrame;
-import static org.graalvm.nativebridge.jni.JNIUtil.PushLocalFrame;
 import static org.graalvm.nativebridge.jni.JNIUtil.getFeatureName;
 
 import org.graalvm.nativebridge.jni.JNI.JNIEnv;
@@ -42,7 +40,7 @@
  * {@linkplain #getObjectResult() retrieved} and returned outside the try-with-resources statement.
  * This is necessary to support use of JNI local frames.
  */
-public final class JNIMethodScope implements AutoCloseable {
+public class JNIMethodScope implements AutoCloseable {
 
     private static final ThreadLocal<JNIMethodScope> topScope = new ThreadLocal<>();
 
@@ -104,9 +102,6 @@ public JNIMethodScope(String scopeName, JNIEnv env) {
         JNIMethodScope top = topScope.get();
         this.env = env;
         if (top == null) {
-            // Only push a JNI frame for the top level native method call.
-            // HotSpot's JNI implementation currently ignores the `capacity` argument
-            PushLocalFrame(env, 64);
             top = this;
             parent = null;
             topScope.set(this);
@@ -143,7 +138,6 @@ public void close() {
                 throw new IllegalStateException("Unexpected JNI scope: " + topScope.get());
             }
             topScope.set(null);
-            objResult = PopLocalFrame(env, objResult);
         } else {
             JNIMethodScope top = parent;
             while (top.parent != null) {
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
index 689854403737..3d3faf79e2ad 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
@@ -99,6 +99,7 @@
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
 import org.graalvm.libgraal.LibGraal;
 import org.graalvm.libgraal.jni.LibGraalNativeBridgeSupport;
+import org.graalvm.libgraal.jni.LibGraalUtil;
 import org.graalvm.nativebridge.jni.JNI;
 import org.graalvm.nativebridge.jni.JNIExceptionWrapper;
 import org.graalvm.nativebridge.jni.JNIMethodScope;
@@ -649,7 +650,7 @@ private static CompilationRequestResult compileMethod(HotSpotGraalCompiler compi
         // This scope is required to allow Graal compilations of host methods to call methods
         // on the TruffleCompilerRuntime. This is, for example, required to find out about
         // Truffle-specific method annotations.
-        try (JNIMethodScope scope = new JNIMethodScope("<called from VM>", env)) {
+        try (JNIMethodScope scope = LibGraalUtil.openScope("<called from VM>", env)) {
             return compiler.compileMethod(request, true, compiler.getGraalRuntime().getOptions());
         }
     }

From d3bc5eb17f452c168a34713b8458ce2931a0d812 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Mon, 25 Oct 2021 11:48:36 +0200
Subject: [PATCH 638/681] Migrate sdk to jsonnet.

---
 ci.hocon       |  3 ---
 ci.jsonnet     |  4 ++++
 sdk/ci.hocon   | 19 -------------------
 sdk/ci.jsonnet | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 22 deletions(-)
 delete mode 100644 sdk/ci.hocon
 create mode 100644 sdk/ci.jsonnet

diff --git a/ci.hocon b/ci.hocon
index ccd3bbeb9ed8..028ec35bce88 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -5,9 +5,6 @@ builds = []
 
 binaries-repository = "lafo"
 
-#SDK
-include "sdk/ci.hocon"
-
 #Truffle
 include "truffle/ci.hocon"
 
diff --git a/ci.jsonnet b/ci.jsonnet
index 25ce9f3c4898..fc8f86fa5a33 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -7,6 +7,9 @@ local wasm = import 'wasm/ci.jsonnet';
 # Espresso
 local espresso = import 'espresso/ci.jsonnet';
 
+# SDK
+local sdk = import 'sdk/ci.jsonnet';
+
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
 
@@ -30,6 +33,7 @@ local add_excludes_guard(build) = build + {
     compiler.builds +
     wasm.builds +
     espresso.builds +
+    sdk.builds +
     sulong.builds +
     javadoc.builds
   )]
diff --git a/sdk/ci.hocon b/sdk/ci.hocon
deleted file mode 100644
index 48b28458ad75..000000000000
--- a/sdk/ci.hocon
+++ /dev/null
@@ -1,19 +0,0 @@
-sdkCommon: {
-  setup : [
-    [cd, "./sdk"]
-  ]
-  timelimit : "30:00"
-}
-
-sdkGate : ${sdkCommon} {
-  targets : [ gate ],
-  run : [
-    ["mx", "gate"]
-  ]
-}
-
-builds += [
-  ${linux-amd64}     ${oraclejdk8}     ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8"   },
-  ${linux-amd64}     ${oraclejdk11}    ${sdkGate} ${eclipse}        { name: "gate-sdk-linux-oraclejdk-11"  },
-  ${darwin-amd64}    ${oraclejdk8}     ${sdkGate}                   { name: "gate-sdk-darwin-8"  },
-]
diff --git a/sdk/ci.jsonnet b/sdk/ci.jsonnet
new file mode 100644
index 000000000000..90b429090155
--- /dev/null
+++ b/sdk/ci.jsonnet
@@ -0,0 +1,22 @@
+{
+  local common = import '../common.jsonnet',
+
+  local sdk_gate = {
+    name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
+    setup: [
+      ["cd", "./sdk"],
+    ],
+    run: [
+      ["mx", "gate"]
+    ],
+    targets: ["gate"],
+    timelimit: "30:00",
+  },
+
+  builds: [
+    common["linux-amd64"]  + common.oraclejdk8  + sdk_gate + common.eclipse + common.jdt,
+    common["linux-amd64"]  + common.oraclejdk11 + sdk_gate + common.eclipse,
+    common["linux-amd64"]  + common.oraclejdk17 + sdk_gate + common.eclipse,
+    common["darwin-amd64"] + common.oraclejdk8  + sdk_gate,
+  ]
+}

From 2c60ab6f970d39d1bde7e856ecd651ff0860c621 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 26 Oct 2021 13:38:45 +0200
Subject: [PATCH 639/681] Add jdt to linux sdk builds.

---
 sdk/ci.jsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/ci.jsonnet b/sdk/ci.jsonnet
index 90b429090155..254102d4d6fc 100644
--- a/sdk/ci.jsonnet
+++ b/sdk/ci.jsonnet
@@ -15,8 +15,8 @@
 
   builds: [
     common["linux-amd64"]  + common.oraclejdk8  + sdk_gate + common.eclipse + common.jdt,
-    common["linux-amd64"]  + common.oraclejdk11 + sdk_gate + common.eclipse,
-    common["linux-amd64"]  + common.oraclejdk17 + sdk_gate + common.eclipse,
+    common["linux-amd64"]  + common.oraclejdk11 + sdk_gate + common.eclipse + common.jdt,
+    common["linux-amd64"]  + common.oraclejdk17 + sdk_gate + common.eclipse + common.jdt,
     common["darwin-amd64"] + common.oraclejdk8  + sdk_gate,
   ]
 }

From 7248737ed781ba14b13a96df45669a2ef0dad968 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 26 Oct 2021 16:15:14 +0200
Subject: [PATCH 640/681] Drop JDK8 builds and add darwin+JDK17 build.

---
 sdk/ci.jsonnet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/ci.jsonnet b/sdk/ci.jsonnet
index 254102d4d6fc..fc621fc73fdb 100644
--- a/sdk/ci.jsonnet
+++ b/sdk/ci.jsonnet
@@ -14,9 +14,9 @@
   },
 
   builds: [
-    common["linux-amd64"]  + common.oraclejdk8  + sdk_gate + common.eclipse + common.jdt,
     common["linux-amd64"]  + common.oraclejdk11 + sdk_gate + common.eclipse + common.jdt,
     common["linux-amd64"]  + common.oraclejdk17 + sdk_gate + common.eclipse + common.jdt,
-    common["darwin-amd64"] + common.oraclejdk8  + sdk_gate,
+    common["darwin-amd64"] + common.oraclejdk11 + sdk_gate,
+    common["darwin-amd64"] + common.oraclejdk17 + sdk_gate,
   ]
 }

From 4cebfc09244b55a2f120952d59ba0c2884d68785 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Tue, 26 Oct 2021 16:36:07 +0200
Subject: [PATCH 641/681] Drop default workload size from dacapo:tradebeans.

---
 java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 66506adb0387..075409a00189 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -803,7 +803,7 @@ def run(self, benchmarks, bmSuiteArgs):
     "pmd":          ["default", "small", "large"],
     "sunflow":      ["default", "small", "large"],
     "tomcat":       ["default", "small", "large", "huge"],
-    "tradebeans":   ["default", "small", "large", "huge"],
+    "tradebeans":   ["small", "large", "huge"],
     "tradesoap":    ["default", "small", "large", "huge"],
     "xalan":        ["default", "small", "large"]
 }

From 5822dd5f0913c66ab9d3df751bed3ffeae2e27e7 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Tue, 26 Oct 2021 17:41:24 +0200
Subject: [PATCH 642/681] benchmark gate must rely on mx benchmark to retrieve
 the supported benchmark list

---
 compiler/mx.compiler/mx_compiler.py | 43 ++++++++++-------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 137c075194c0..84a28c83eb40 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -375,19 +375,6 @@ def _remove_empty_entries(a):
         return []
     return [x for x in a if x]
 
-def _is_batik_supported(jdk):
-    """
-    Determines if Batik runs on the given jdk. Batik's JPEGRegistryEntry contains a reference
-    to TruncatedFileException, which is specific to the Sun/Oracle JDK. On a different JDK,
-    this results in a NoClassDefFoundError: com/sun/image/codec/jpeg/TruncatedFileException
-    """
-    try:
-        subprocess.check_output([jdk.javap, 'com.sun.image.codec.jpeg.TruncatedFileException'])
-        return True
-    except subprocess.CalledProcessError:
-        mx.warn('Batik uses Sun internal class com.sun.image.codec.jpeg.TruncatedFileException which is not present in ' + jdk.home)
-        return False
-
 def _compiler_error_options(default_compilation_failure_action='ExitVM', vmargs=None, prefix='-Dgraal.'):
     """
     Gets options to be prefixed to the VM command line related to Graal compilation errors to improve
@@ -548,6 +535,9 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     # A few iterations to increase the chance of catching compilation errors
     default_iterations = 2
 
+    bmSuiteArgs = ["--jvm", "server"]
+    benchVmArgs = bmSuiteArgs + _remove_empty_entries(extraVMarguments)
+
     dacapo_suite = mx_graal_benchmark.DaCapoBenchmarkSuite()
     dacapo_gate_iterations = {
         k: default_iterations for k, v in dacapo_suite.daCapoIterations().items() if v > 0
@@ -555,12 +545,10 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     dacapo_gate_iterations.update({'fop': 8})
     mx.warn("Disabling gate for dacapo:tradesoap (GR-33605)")
     dacapo_gate_iterations.update({'tradesoap': -1})
-    for name, iterations in sorted(dacapo_gate_iterations.items()):
-        if name == "batik" and not _is_batik_supported(jdk):
-            continue
+    for name in dacapo_suite.benchmarkList(bmSuiteArgs):
+        iterations = dacapo_gate_iterations.get(name, -1)
         with Task(prefix + 'DaCapo:' + name, tasks, tags=GraalTags.benchmarktest) as t:
-            if t: _gate_dacapo(name, iterations, _remove_empty_entries(extraVMarguments) +
-                               ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
+            if t: _gate_dacapo(name, iterations, benchVmArgs + ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
 
     # run Scala DaCapo benchmarks #
     ###############################
@@ -568,17 +556,16 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     scala_dacapo_gate_iterations = {
         k: default_iterations for k, v in scala_dacapo_suite.daCapoIterations().items() if v > 0
     }
-
-    for name, iterations in sorted(scala_dacapo_gate_iterations.items()):
+    for name in scala_dacapo_suite.benchmarkList(bmSuiteArgs):
+        iterations = scala_dacapo_gate_iterations.get(name, -1)
         with Task(prefix + 'ScalaDaCapo:' + name, tasks, tags=GraalTags.benchmarktest) as t:
-            if t: _gate_scala_dacapo(name, iterations, _remove_empty_entries(extraVMarguments) +
-                                     ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
+            if t: _gate_scala_dacapo(name, iterations, benchVmArgs + ['-Dgraal.TrackNodeSourcePosition=true'] + dacapo_esa)
 
     # run benchmark with non default setup #
     ########################################
     # ensure -Xbatch still works
     with Task(prefix + 'DaCapo_pmd:BatchMode', tasks, tags=GraalTags.test) as t:
-        if t: _gate_dacapo('pmd', 1, _remove_empty_entries(extraVMarguments) + ['-Xbatch'])
+        if t: _gate_dacapo('pmd', 1, benchVmArgs + ['-Xbatch'])
 
     # ensure benchmark counters still work
     if mx.get_arch() != 'aarch64': # GR-8364 Exclude benchmark counters on AArch64
@@ -587,7 +574,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
                 fd, logFile = tempfile.mkstemp()
                 os.close(fd) # Don't leak file descriptors
                 try:
-                    _gate_dacapo('pmd', default_iterations, _remove_empty_entries(extraVMarguments) + ['-Dgraal.LogFile=' + logFile, '-Dgraal.LIRProfileMoves=true', '-Dgraal.GenericDynamicCounters=true', '-Dgraal.TimedDynamicCounters=1000', '-XX:JVMCICounterSize=10'])
+                    _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Dgraal.LogFile=' + logFile, '-Dgraal.LIRProfileMoves=true', '-Dgraal.GenericDynamicCounters=true', '-Dgraal.TimedDynamicCounters=1000', '-XX:JVMCICounterSize=10'])
                     with open(logFile) as fp:
                         haystack = fp.read()
                         needle = 'MoveOperations (dynamic counters)'
@@ -602,24 +589,24 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
 
     # ensure -XX:+PreserveFramePointer  still works
     with Task(prefix + 'DaCapo_pmd:PreserveFramePointer', tasks, tags=GraalTags.test) as t:
-        if t: _gate_dacapo('pmd', default_iterations, _remove_empty_entries(extraVMarguments) + ['-Xmx256M', '-XX:+PreserveFramePointer'], threads=4, force_serial_gc=False, set_start_heap_size=False)
+        if t: _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Xmx256M', '-XX:+PreserveFramePointer'], threads=4, force_serial_gc=False, set_start_heap_size=False)
 
     if isJDK8:
         # temporarily isolate those test (GR-10990)
         cms = ['cms']
         # ensure CMS still works
         with Task(prefix + 'DaCapo_pmd:CMS', tasks, tags=cms) as t:
-            if t: _gate_dacapo('pmd', default_iterations, _remove_empty_entries(extraVMarguments) + ['-Xmx256M', '-XX:+UseConcMarkSweepGC'], threads=4, force_serial_gc=False, set_start_heap_size=False)
+            if t: _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Xmx256M', '-XX:+UseConcMarkSweepGC'], threads=4, force_serial_gc=False, set_start_heap_size=False)
 
         # ensure CMSIncrementalMode still works
         with Task(prefix + 'DaCapo_pmd:CMSIncrementalMode', tasks, tags=cms) as t:
-            if t: _gate_dacapo('pmd', default_iterations, _remove_empty_entries(extraVMarguments) + ['-Xmx256M', '-XX:+UseConcMarkSweepGC', '-XX:+CMSIncrementalMode'], threads=4, force_serial_gc=False, set_start_heap_size=False)
+            if t: _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Xmx256M', '-XX:+UseConcMarkSweepGC', '-XX:+CMSIncrementalMode'], threads=4, force_serial_gc=False, set_start_heap_size=False)
 
 
         if prefix != '':
             # ensure G1 still works with libgraal
             with Task(prefix + 'DaCapo_pmd:G1', tasks, tags=cms) as t:
-                if t: _gate_dacapo('pmd', default_iterations, _remove_empty_entries(extraVMarguments) + ['-Xmx256M', '-XX:+UseG1GC'], threads=4, force_serial_gc=False, set_start_heap_size=False)
+                if t: _gate_dacapo('pmd', default_iterations, benchVmArgs + ['-Xmx256M', '-XX:+UseG1GC'], threads=4, force_serial_gc=False, set_start_heap_size=False)
 
 
 

From fbeecd64af1fe1aff2ffadad0d3f141e9167bef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=C2=B2=20Peterssen?= <alfonso.peterssen@oracle.com>
Date: Mon, 25 Oct 2021 22:27:18 +0200
Subject: [PATCH 643/681] Report polymorphism only for the most generic
 specialization.

---
 .../truffle/espresso/nodes/bytecodes/InvokeInterface.java       | 2 --
 .../oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java  | 2 --
 .../oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
index db1cd7bf015d..e01a1a11ad72 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeInterface.java
@@ -76,7 +76,6 @@ static StaticObject getReceiver(Object[] args) {
         return (StaticObject) args[0];
     }
 
-    @ReportPolymorphism
     @ImportStatic(InvokeInterface.class)
     @NodeInfo(shortName = "INVOKEINTERFACE !nullcheck")
     public abstract static class WithoutNullCheck extends Node {
@@ -156,7 +155,6 @@ Object executeWithNullCheck(Method resolutionSeed, Object[] args,
         }
 
         @GenerateUncached
-        @ReportPolymorphism
         @NodeInfo(shortName = "INVOKEINTERFACE dynamic !nullcheck")
         public abstract static class WithoutNullCheck extends Node {
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
index 9063ece5b3d4..a26bb8453ae6 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeSpecial.java
@@ -79,7 +79,6 @@ static Method.MethodVersion methodLookup(Method method, StaticObject receiver) {
         return method.getMethodVersion();
     }
 
-    @ReportPolymorphism
     @ImportStatic(InvokeSpecial.class)
     @NodeInfo(shortName = "INVOKESPECIAL !nullcheck")
     public abstract static class WithoutNullCheck extends Node {
@@ -137,7 +136,6 @@ Object executeWithNullCheck(Method method, Object[] args,
         }
 
         @GenerateUncached
-        @ReportPolymorphism
         @NodeInfo(shortName = "INVOKESPECIAL dynamic !nullcheck")
         public abstract static class WithoutNullCheck extends Node {
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
index cf864a902c1f..01f0d7b552c4 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeVirtual.java
@@ -79,7 +79,6 @@ static StaticObject getReceiver(Object[] args) {
         return (StaticObject) args[0];
     }
 
-    @ReportPolymorphism
     @ImportStatic(InvokeVirtual.class)
     @NodeInfo(shortName = "INVOKEVIRTUAL !nullcheck")
     public abstract static class WithoutNullCheck extends Node {
@@ -201,7 +200,6 @@ Object executeWithNullCheck(Method resolutionSeed, Object[] args,
         }
 
         @GenerateUncached
-        @ReportPolymorphism
         @NodeInfo(shortName = "INVOKEVIRTUAL dynamic !nullcheck")
         public abstract static class WithoutNullCheck extends Node {
 

From 9ec1a6020e3dfe48944137f47f276f4720ec4d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=C2=B2=20Peterssen?= <alfonso.peterssen@oracle.com>
Date: Mon, 25 Oct 2021 22:31:55 +0200
Subject: [PATCH 644/681] Fix ecj 11 warnings.

---
 .../truffle/espresso/substitutions/EspressoReference.java      | 2 +-
 .../src/java/lang/ref/PublicFinalReference.java                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/EspressoReference.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/EspressoReference.java
index c081fc92a1ee..9c795c8652b1 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/EspressoReference.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/EspressoReference.java
@@ -94,7 +94,7 @@ public StaticObject getGuestReference() {
 
 /**
  * Usable version of {@link PublicFinalReference} is injected early via
- * {@link sun.misc.Unsafe#defineClass} on the the boot class loader.
+ * {@code sun.misc.Unsafe#defineClass} on the the boot class loader.
  */
 final class EspressoFinalReference extends PublicFinalReference<StaticObject> implements EspressoReference<StaticObject> {
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/java/lang/ref/PublicFinalReference.java b/espresso/src/com.oracle.truffle.espresso/src/java/lang/ref/PublicFinalReference.java
index ad4effcc2b7b..75390ee05799 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/java/lang/ref/PublicFinalReference.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/java/lang/ref/PublicFinalReference.java
@@ -27,8 +27,7 @@
 
 /**
  * Open {@link FinalReference}; implementation detail for a meta-circular implementation of
- * {@link Object#finalize() finalization}. If the host supports FinalReference(s), so does the
- * guest.
+ * finalization. If the host supports FinalReference(s), so does the guest.
  *
  * <p>
  * This class is just a placeholder, not usable as-is. A modified version without the throwing

From eb14bab836dce4453a4255f2093517c70b14787d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=C2=B2=20Peterssen?= <alfonso.peterssen@oracle.com>
Date: Mon, 25 Oct 2021 22:33:40 +0200
Subject: [PATCH 645/681] Fix typo.

---
 .../oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
index 8777af830f12..91ccfa8b0a0a 100644
--- a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
+++ b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/bytecodes/InvokeStatic.java
@@ -59,9 +59,9 @@ public abstract class InvokeStatic extends Node {
     @Specialization
     Object callWithClassInitCheck(Object[] args,
                     @Cached InitCheck initCheck,
-                    @Cached("create(staticMethod)") WithoutClassInitCheck invokeVirtual) {
+                    @Cached("create(staticMethod)") WithoutClassInitCheck invokeStatic) {
         initCheck.execute(staticMethod.getDeclaringKlass());
-        return invokeVirtual.execute(args);
+        return invokeStatic.execute(args);
     }
 
     @ImportStatic(InvokeStatic.class)

From cd38df6dbea0f5bf073d88d129a95710674320c4 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <tim.felgentreff@oracle.com>
Date: Wed, 27 Oct 2021 09:17:54 +0000
Subject: [PATCH 646/681] [GR-21590] Update Python imports

PullRequest: graalpython/2003
---
 vm/mx.vm/suite.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index e2cc0d808fab..afc96f909142 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -75,7 +75,7 @@
             },
             {
                 "name": "graalpython",
-                "version": "b030df9b0042f67434f1b95848730f36a427ff31",
+                "version": "18731288f709e838b382342bda8fad88c4397225",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},

From af1c19a5d4d437734865f118a5e566adc78dad4a Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Wed, 27 Oct 2021 16:40:28 +0200
Subject: [PATCH 647/681] Exclude batik on OpenJDK in mx benchmark

---
 .../mx.java-benchmarks/mx_java_benchmarks.py  | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
index 075409a00189..db90964f0fb0 100644
--- a/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
+++ b/java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py
@@ -809,6 +809,21 @@ def run(self, benchmarks, bmSuiteArgs):
 }
 
 
+def _is_batik_supported(jdk):
+    """
+    Determines if Batik runs on the given jdk. Batik's JPEGRegistryEntry contains a reference
+    to TruncatedFileException, which is specific to the Sun/Oracle JDK. On a different JDK,
+    this results in a NoClassDefFoundError: com/sun/image/codec/jpeg/TruncatedFileException
+    """
+    import subprocess
+    try:
+        subprocess.check_output([jdk.javap, 'com.sun.image.codec.jpeg.TruncatedFileException'])
+        return True
+    except subprocess.CalledProcessError:
+        mx.warn('Batik uses Sun internal class com.sun.image.codec.jpeg.TruncatedFileException which is not present in ' + jdk.home)
+        return False
+
+
 class DaCapoBenchmarkSuite(BaseDaCapoBenchmarkSuite): #pylint: disable=too-many-ancestors
     """DaCapo benchmark suite implementation."""
 
@@ -856,13 +871,16 @@ def daCapoIterations(self):
             # Stopped working as of 8u92 on the initial release
             del iterations["tomcat"]
 
-        if mx.get_jdk().javaCompliance >= '9' and self.version() in ["9.12-bach", "9.12-MR1-bach"]:
-            if "batik" in iterations:
-                # batik crashes on JDK9+. This is fixed in the dacapo chopin release only
+        if self.version() in ["9.12-bach", "9.12-MR1-bach"]:
+            if mx.get_jdk().javaCompliance >= '9':
+                if "batik" in iterations:
+                    # batik crashes on JDK9+. This is fixed in the dacapo chopin release only
+                    del iterations["batik"]
+                if "tradesoap" in iterations:
+                    # validation fails transiently but frequently in the first iteration in JDK9+
+                    del iterations["tradesoap"]
+            elif not _is_batik_supported(java_home_jdk()):
                 del iterations["batik"]
-            if "tradesoap" in iterations:
-                # validation fails transiently but frequently in the first iteration in JDK9+
-                del iterations["tradesoap"]
 
         if self.workloadSize() == "small":
             # Ensure sufficient warmup by doubling the number of default iterations for the small configuration

From 1b42653a4b3c28d80e28b9da83aa18e2826516a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20W=C3=B6gerer?= <paul.woegerer@oracle.com>
Date: Wed, 27 Oct 2021 16:39:18 +0200
Subject: [PATCH 648/681] Remove obsolete blacklisting of
 com.oracle.svm.test.jdk11.jfr.* tests

---
 substratevm/mx.substratevm/mx_substratevm.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 061b9a99ad02..f737bd599554 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -431,8 +431,6 @@ def native_unittests_task():
     ]
 
     if svm_java_compliance() == '17':
-        # The following tests fail with --builder-on-modulepath enabled (GR-34117)
-        mx_unittest.add_global_ignore_glob('com.oracle.svm.test.jdk11.jfr.*')
         if mx.is_windows():
             mx_unittest.add_global_ignore_glob('com.oracle.svm.test.SecurityServiceTest')
 

From 38daa153cec38f0a8b19980cb74b00104363f4a4 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 27 Oct 2021 20:23:28 +0200
Subject: [PATCH 649/681] Use Unsafe to access address field of
 DirectByteBuffer.

---
 .../src/org/graalvm/wasm/memory/UnsafeWasmMemory.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
index 058751c2a1ab..dc6ad1c23746 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
@@ -48,6 +48,7 @@
 import static org.graalvm.wasm.constants.Sizes.MEMORY_PAGE_SIZE;
 
 import java.lang.reflect.Field;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
 import org.graalvm.wasm.constants.Sizes;
@@ -88,6 +89,7 @@ public final class UnsafeWasmMemory extends WasmMemory {
     private ByteBuffer buffer;
 
     private static final Unsafe unsafe;
+    private static final long addressOffset;
 
     private UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSize, int maxAllowedSize) {
         assert compareUnsigned(declaredMinSize, initialSize) <= 0;
@@ -115,9 +117,8 @@ private static ByteBuffer allocateBuffer(final long byteSize) {
         }
     }
 
-    @TruffleBoundary
     private static long getBufferAddress(ByteBuffer buffer) {
-        return ((sun.nio.ch.DirectBuffer) buffer).address();
+        return unsafe.getLong(buffer, addressOffset);
     }
 
     public UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
@@ -144,8 +145,8 @@ public void copy(Node node, int src, int dst, int n) {
     @Override
     public void reset() {
         size = declaredMinSize;
-        unsafe.freeMemory(startAddress);
-        startAddress = unsafe.allocateMemory(byteSize());
+        buffer = allocateBuffer(byteSize());
+        startAddress = getBufferAddress(buffer);
     }
 
     @Override
@@ -383,6 +384,8 @@ public ByteBuffer asByteBuffer() {
             final Field f = Unsafe.class.getDeclaredField("theUnsafe");
             f.setAccessible(true);
             unsafe = (Unsafe) f.get(null);
+            Field addressField = Buffer.class.getDeclaredField("address");
+            addressOffset = unsafe.objectFieldOffset(addressField);
         } catch (Exception e) {
             throw CompilerDirectives.shouldNotReachHere(e);
         }

From 97acffe3b2d7ae727115a970b5214cd659e95449 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Wed, 27 Oct 2021 19:41:04 +0200
Subject: [PATCH 650/681] Test UnsafeWasmMemory.

---
 .../org/graalvm/wasm/test/WasmFileSuite.java  | 55 ++++++++++---------
 .../wasm/test/suites/memory/MemorySuite.java  | 30 +++++++++-
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
index 67d19d5f0739..3f1500802185 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java
@@ -40,24 +40,8 @@
  */
 package org.graalvm.wasm.test;
 
-import com.oracle.truffle.api.Truffle;
-import junit.framework.AssertionFailedError;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.EnvironmentAccess;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-import org.graalvm.wasm.GlobalRegistry;
-import org.graalvm.wasm.WasmContext;
-import org.graalvm.wasm.WasmFunctionInstance;
-import org.graalvm.wasm.WasmInstance;
-import org.graalvm.wasm.WasmOptions;
-import org.graalvm.wasm.WasmLanguage;
-import org.graalvm.wasm.memory.WasmMemory;
-import org.graalvm.wasm.test.options.WasmTestOptions;
-import org.graalvm.wasm.utils.cases.WasmCase;
-import org.graalvm.wasm.utils.cases.WasmCaseData;
-import org.junit.Assert;
+import static junit.framework.TestCase.fail;
+import static org.graalvm.wasm.WasmUtil.prepend;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -77,8 +61,25 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static junit.framework.TestCase.fail;
-import static org.graalvm.wasm.WasmUtil.prepend;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.EnvironmentAccess;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+import org.graalvm.wasm.GlobalRegistry;
+import org.graalvm.wasm.WasmContext;
+import org.graalvm.wasm.WasmFunctionInstance;
+import org.graalvm.wasm.WasmInstance;
+import org.graalvm.wasm.WasmLanguage;
+import org.graalvm.wasm.memory.WasmMemory;
+import org.graalvm.wasm.test.options.WasmTestOptions;
+import org.graalvm.wasm.utils.cases.WasmCase;
+import org.graalvm.wasm.utils.cases.WasmCaseData;
+import org.junit.Assert;
+
+import com.oracle.truffle.api.Truffle;
+
+import junit.framework.AssertionFailedError;
 
 public abstract class WasmFileSuite extends AbstractWasmSuite {
 
@@ -297,11 +298,15 @@ private WasmTestStatus runTestCase(WasmCase testCase) {
                 contextBuilder.arguments(WasmLanguage.ID, prepend(commandLineArgs.split(" "), ""));
             }
 
-            final String saturatingFloatToIntProperty = "wasm." + WasmOptions.SATURATING_FLOAT_TO_INT_NAME;
-            final String saturatingFloatToIntValue = testCase.options().getProperty(saturatingFloatToIntProperty);
-            if (saturatingFloatToIntValue != null) {
-                contextBuilder.option(saturatingFloatToIntProperty, saturatingFloatToIntValue);
-            }
+            testCase.options().forEach((key, value) -> {
+                if (key instanceof String && value instanceof String) {
+                    String optionName = (String) key;
+                    String optionValue = (String) value;
+                    if (optionName.startsWith("wasm.")) {
+                        contextBuilder.option(optionName, optionValue);
+                    }
+                }
+            });
 
             final String envString = testCase.options().getProperty("env");
             if (envString != null) {
diff --git a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/memory/MemorySuite.java b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/memory/MemorySuite.java
index 619d678035df..fa88e14912c8 100644
--- a/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/memory/MemorySuite.java
+++ b/wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/memory/MemorySuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -41,17 +41,41 @@
 package org.graalvm.wasm.test.suites.memory;
 
 import java.io.IOException;
-
-import org.junit.Test;
+import java.util.Arrays;
+import java.util.Collection;
 
 import org.graalvm.wasm.test.WasmFileSuite;
+import org.graalvm.wasm.utils.cases.WasmCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class MemorySuite extends WasmFileSuite {
+
+    @Parameter public boolean useUnsafeWasmMemory;
+
+    @Parameters
+    public static Iterable<? extends Object> data() {
+        return Arrays.asList(false, true);
+    }
+
     @Override
     protected String testResource() {
         return "memory";
     }
 
+    @Override
+    protected Collection<? extends WasmCase> collectTestCases() throws IOException {
+        Collection<? extends WasmCase> testCases = super.collectTestCases();
+        for (WasmCase testCase : testCases) {
+            testCase.options().put("wasm.UseUnsafeMemory", Boolean.toString(useUnsafeWasmMemory));
+        }
+        return testCases;
+    }
+
     @Override
     @Test
     public void test() throws IOException {

From 2ad587c401f3fc2da4fda2d9b707a6bd605ea686 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Tue, 26 Oct 2021 13:00:11 -0700
Subject: [PATCH 651/681] Allow reflection registration of all ClassLoader
 methods

---
 .../com/oracle/svm/core/hub/DynamicHub.java   |  6 ++-
 .../com/oracle/svm/core/jdk/JRTSupport.java   |  6 ++-
 .../jdk/Target_java_lang_ClassLoader.java     | 43 +++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
index 152a650b5892..46bc4d3241d7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -1622,8 +1622,10 @@ public Optional<?> describeConstable() {
     @Delete
     private native Class<?>[] getInterfaces0();
 
-    @Delete
-    native void setSigners(Object[] signers);
+    @Substitute
+    private void setSigners(@SuppressWarnings("unused") Object[] signers) {
+        throw VMError.unsupportedFeature("Class metadata cannot be changed at run time");
+    }
 
     @Delete
     private native java.security.ProtectionDomain getProtectionDomain0();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
index 0be2c83ea3bb..2cf9b5e1f024 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
@@ -136,8 +136,10 @@ final class Target_jdk_internal_jimage_ImageReaderFactory_JRTEnabled {
  */
 @TargetClass(className = "jdk.internal.module.SystemModuleFinders", innerClass = "SystemImage", onlyWith = {JDK11OrLater.class, JRTDisabled.class})
 final class Target_jdk_internal_module_SystemModuleFinders_SystemImage_JRTDisabled {
-    @Delete
-    static native Object reader();
+    @Substitute
+    static Object reader() {
+        throw VMError.unsupportedFeature("JRT file system is disabled");
+    }
 }
 
 @TargetClass(className = "sun.net.www.protocol.jrt.Handler", onlyWith = {JDK11OrLater.class, JRTDisabled.class})
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
index 1cae57e01340..74ff72b34210 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
@@ -30,6 +30,8 @@
 import java.security.ProtectionDomain;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -242,6 +244,9 @@ private void clearAssertionStatus() {
         throw VMError.unsupportedFeature("The assertion status of classes is fixed at image build time.");
     }
 
+    @Delete
+    private native void initializeJavaAssertionMaps();
+
     /*
      * We are defensive and also handle private native methods by marking them as deleted. If they
      * are reachable, the user is certainly doing something wrong. But we do not want to fail with a
@@ -251,6 +256,9 @@ private void clearAssertionStatus() {
     @Delete
     private static native void registerNatives();
 
+    @Delete
+    private static native long findNative(ClassLoader loader, String entryName);
+
     @Substitute
     @SuppressWarnings({"unused", "static-method"})
     Class<?> defineClass(byte[] b, int off, int len) throws ClassFormatError {
@@ -333,6 +341,41 @@ protected void resolveClass(@SuppressWarnings("unused") Class<?> c) {
 
     @Delete
     private static native Target_java_lang_AssertionStatusDirectives retrieveDirectives();
+
+    /*
+     * Ensure that fields and methods that hold state of the image generator are not reachable when
+     * all fields or methods of the class are registered for reflection.
+     */
+
+    @Delete //
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class}) //
+    private static Set<String> loadedLibraryNames;
+    @Delete //
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class}) //
+    private static Map<String, Target_java_lang_ClassLoader_NativeLibrary> systemNativeLibraries;
+    @Delete //
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class}) //
+    private Map<String, Target_java_lang_ClassLoader_NativeLibrary> nativeLibraries;
+    // Checkstyle: stop
+    @Delete //
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
+    private static String[] usr_paths;
+    @Delete //
+    @TargetElement(onlyWith = JDK11OrEarlier.class) //
+    private static String[] sys_paths;
+    // Checkstyle: resume
+
+    @Delete
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
+    private native Map<String, Target_java_lang_ClassLoader_NativeLibrary> nativeLibraries();
+
+    @Delete
+    @TargetElement(onlyWith = {JDK11OrLater.class, JDK11OrEarlier.class})
+    private static native Map<String, Target_java_lang_ClassLoader_NativeLibrary> systemNativeLibraries();
+
+    @Delete
+    @TargetElement(onlyWith = JDK11OrEarlier.class)
+    private static native boolean loadLibrary0(Class<?> fromClass, File file);
 }
 
 @TargetClass(value = ClassLoader.class, innerClass = "NativeLibrary", onlyWith = JDK11OrEarlier.class)

From c20f35ac162010e86693ed16e565368d39aad56f Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 27 Oct 2021 22:59:41 +0200
Subject: [PATCH 652/681] Migrate regex to jsonnet.

---
 ci.hocon         |  3 ---
 ci.jsonnet       |  4 ++++
 regex/ci.hocon   | 28 ----------------------------
 regex/ci.jsonnet | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 31 deletions(-)
 delete mode 100644 regex/ci.hocon
 create mode 100644 regex/ci.jsonnet

diff --git a/ci.hocon b/ci.hocon
index 028ec35bce88..749ec3955658 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -18,9 +18,6 @@ logPatterns = [
 #Tools
 include "tools/ci.hocon"
 
-#Regex
-include "regex/ci.hocon"
-
 #Examples
 #Examples gate also disabled.
 #include "examples/ci.hocon"
diff --git a/ci.jsonnet b/ci.jsonnet
index fc8f86fa5a33..d764f440df01 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -7,6 +7,9 @@ local wasm = import 'wasm/ci.jsonnet';
 # Espresso
 local espresso = import 'espresso/ci.jsonnet';
 
+# Regex
+local regex = import 'regex/ci.jsonnet';
+
 # SDK
 local sdk = import 'sdk/ci.jsonnet';
 
@@ -33,6 +36,7 @@ local add_excludes_guard(build) = build + {
     compiler.builds +
     wasm.builds +
     espresso.builds +
+    regex.builds +
     sdk.builds +
     sulong.builds +
     javadoc.builds
diff --git a/regex/ci.hocon b/regex/ci.hocon
deleted file mode 100644
index 447db3f7e593..000000000000
--- a/regex/ci.hocon
+++ /dev/null
@@ -1,28 +0,0 @@
-regexCommon: {
-  setup : [
-    [cd, "./regex"]
-  ]
-  timelimit : "30:00"
-}
-
-gateLite : ${regexCommon} {
-  run : [
-    ["mx", "build" ],
-    ["mx", "unittest", "--verbose", "com.oracle.truffle.regex" ]
-  ]
-}
-
-regexWeekly: ${regex-weekly-notifications} {
-  targets: [ weekly ]
-}
-
-builds += [
-  ${linux-amd64} ${oraclejdk8}   ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-8"},
-  ${linux-amd64} ${oraclejdk11}  ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-oraclejdk-11"},
-  ${darwin-amd64} ${oraclejdk8} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-mac-lite-8"
-  }
-  ${darwin-amd64} ${oraclejdk11} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-mac-lite-oraclejdk-11"
-  }
-]
diff --git a/regex/ci.jsonnet b/regex/ci.jsonnet
new file mode 100644
index 000000000000..2c5242176d64
--- /dev/null
+++ b/regex/ci.jsonnet
@@ -0,0 +1,33 @@
+{
+  local common = import '../common.jsonnet',
+
+  local regex_common = {
+    setup+: [
+      ["cd", "./regex"],
+    ],
+    timelimit: "30:00",
+  },
+
+  local regex_gate = regex_common + common["linux-amd64"] + common.eclipse + common.jdt + {
+    name: 'gate-regex-oraclejdk' + self.jdk_version,
+    run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
+    targets: ["gate"],
+  },
+
+  local regex_gate_lite = regex_common + common["darwin-amd64"] + {
+    name: 'gate-regex-mac-lite-oraclejdk' + self.jdk_version,
+    run: [
+      ["mx", "build"],
+      ["mx", "unittest", "--verbose", "com.oracle.truffle.regex"],
+    ],
+    notify_groups:: ["regex"],
+    targets: ["weekly"],
+  },
+
+  builds: [
+    regex_gate      + common.oraclejdk8,
+    regex_gate      + common.oraclejdk11,
+    regex_gate_lite + common.oraclejdk8,
+    regex_gate_lite + common.oraclejdk11,
+  ],
+}
\ No newline at end of file

From d6986f018da0efcfcac918d32e9668916cc27174 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 26 Oct 2021 13:16:27 +0200
Subject: [PATCH 653/681] Revise regex's ci.jsonnet

---
 graal-common.json |  2 +-
 regex/ci.jsonnet  | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/graal-common.json b/graal-common.json
index e6854c6c3b14..89dd336f2737 100644
--- a/graal-common.json
+++ b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "32cfe3bc1cae2b79569d17017dc83ba8d494a4c9"
+    "overlay": "1f44a359d0300ee7b8faaafbf3778a07597b8a55"
   },
   "mx_version" : "HEAD"
 }
diff --git a/regex/ci.jsonnet b/regex/ci.jsonnet
index 2c5242176d64..883fdea288b2 100644
--- a/regex/ci.jsonnet
+++ b/regex/ci.jsonnet
@@ -8,13 +8,13 @@
     timelimit: "30:00",
   },
 
-  local regex_gate = regex_common + common["linux-amd64"] + common.eclipse + common.jdt + {
+  local regex_gate = regex_common + common.eclipse + common.jdt + {
     name: 'gate-regex-oraclejdk' + self.jdk_version,
     run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
     targets: ["gate"],
   },
 
-  local regex_gate_lite = regex_common + common["darwin-amd64"] + {
+  local regex_gate_lite = regex_common + {
     name: 'gate-regex-mac-lite-oraclejdk' + self.jdk_version,
     run: [
       ["mx", "build"],
@@ -24,10 +24,13 @@
     targets: ["weekly"],
   },
 
-  builds: [
-    regex_gate      + common.oraclejdk8,
-    regex_gate      + common.oraclejdk11,
-    regex_gate_lite + common.oraclejdk8,
-    regex_gate_lite + common.oraclejdk11,
-  ],
+  builds: std.flattenArrays([
+    [
+      common["linux-amd64"]  + jdk + regex_gate,
+      common["darwin-amd64"] + jdk + regex_gate_lite,
+    ] for jdk in [
+      common.oraclejdk11,
+      common.oraclejdk17,
+    ]
+  ]),
 }
\ No newline at end of file

From 3353f7779d42c9960c18fc8af800ea25f318d61d Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
Date: Tue, 26 Oct 2021 22:29:18 +0300
Subject: [PATCH 654/681] CI: Build GraalVM with libgraal for Quarkus tests

Closes #3952
---
 .github/workflows/quarkus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/quarkus.yml b/.github/workflows/quarkus.yml
index 2f6668d51798..c00f7de796e7 100644
--- a/.github/workflows/quarkus.yml
+++ b/.github/workflows/quarkus.yml
@@ -67,8 +67,8 @@ jobs:
     - name: Build graalvm native-image
       run: |
         cd substratevm
-        ${MX_PATH}/mx --native=native-image --components="Native Image" build
-        mv $(${MX_PATH}/mx --native=native-image --components="Native Image" graalvm-home) ${GRAALVM_HOME}
+        ${MX_PATH}/mx --native=native-image,lib:jvmcicompiler --components="Native Image,LibGraal" build
+        mv $(${MX_PATH}/mx --native=native-image,lib:jvmcicompiler --components="Native Image,LibGraal" graalvm-home) ${GRAALVM_HOME}
         ${GRAALVM_HOME}/bin/native-image --version
     - name: Tar GraalVM
       shell: bash

From 5b83607498ac75dbe34378b2cc1f44d5632f6076 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 27 Oct 2021 08:16:13 +0200
Subject: [PATCH 655/681] Bump ci-overlay version.

---
 graal-common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graal-common.json b/graal-common.json
index 89dd336f2737..abd8bdf2e74e 100644
--- a/graal-common.json
+++ b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "1f44a359d0300ee7b8faaafbf3778a07597b8a55"
+    "overlay": "116ca58f168daed55df5c54fb5cb17ef4d327f23"
   },
   "mx_version" : "HEAD"
 }

From 2a20d63cd1b91719888f3705bdca0b4b9b705cf7 Mon Sep 17 00:00:00 2001
From: Codrut Stancu <codrut.stancu@oracle.com>
Date: Wed, 27 Oct 2021 14:12:12 -0700
Subject: [PATCH 656/681] Re-run initialization of JCAUtil.

---
 .../src/com/oracle/svm/hosted/SecurityServicesFeature.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
index 770117823cab..7b3a05ae5474 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
@@ -266,6 +266,10 @@ public void duringSetup(DuringSetupAccess a) {
         rci.rerunInitialization(clazz(access, "com.sun.crypto.provider.SunJCE$SecureRandomHolder"), "for substitutions");
         rci.rerunInitialization(clazz(access, "sun.security.krb5.Confounder"), "for substitutions");
 
+        if (JavaVersionUtil.JAVA_SPEC >= 17) {
+            rci.rerunInitialization(clazz(access, "sun.security.jca.JCAUtil"), "JCAUtil.def holds a SecureRandom.");
+        }
+
         /*
          * When SSLContextImpl$DefaultManagersHolder sets-up the TrustManager in its initializer it
          * gets the value of the -Djavax.net.ssl.trustStore and -Djavax.net.ssl.trustStorePassword

From 68bf722ec039324fa2c39340d742ff502839d831 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 28 Oct 2021 02:55:24 +0200
Subject: [PATCH 657/681] Simplify WasmMemory implementations.

---
 .../wasm/memory/ByteArrayWasmMemory.java      | 83 +++++--------------
 .../graalvm/wasm/memory/UnsafeWasmMemory.java | 74 ++++-------------
 .../org/graalvm/wasm/memory/WasmMemory.java   | 51 +++++++++++-
 3 files changed, 84 insertions(+), 124 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
index 07ab098fdf5a..c9f2cbabb851 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/ByteArrayWasmMemory.java
@@ -43,13 +43,10 @@
 import static java.lang.Integer.compareUnsigned;
 import static java.lang.StrictMath.addExact;
 import static java.lang.StrictMath.multiplyExact;
-import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_DECLARATION_SIZE;
-import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_INSTANCE_SIZE;
 import static org.graalvm.wasm.constants.Sizes.MEMORY_PAGE_SIZE;
 
 import java.nio.ByteBuffer;
 
-import org.graalvm.wasm.constants.Sizes;
 import org.graalvm.wasm.exception.Failure;
 import org.graalvm.wasm.exception.WasmException;
 
@@ -59,52 +56,27 @@
 import com.oracle.truffle.api.nodes.Node;
 
 public final class ByteArrayWasmMemory extends WasmMemory {
-    /**
-     * @see #declaredMinSize()
-     */
-    private final int declaredMinSize;
-
-    /**
-     * @see #declaredMaxSize()
-     */
-    private final int declaredMaxSize;
-
-    /**
-     * The maximum practical size of this memory instance (measured in number of
-     * {@link Sizes#MEMORY_PAGE_SIZE pages}).
-     * <p>
-     * It is the minimum between {@link #declaredMaxSize the limit defined in the module binary},
-     * {@link Sizes#MAX_MEMORY_INSTANCE_SIZE the GraalWasm limit} and any additional limit (the JS
-     * API for example has lower limits).
-     * <p>
-     * This is different from {@link #declaredMaxSize()}, which can be higher.
-     */
-    private final int maxAllowedSize;
 
     private byte[] buffer;
 
     private ByteArrayWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSize, int maxAllowedSize) {
-        assert compareUnsigned(declaredMinSize, initialSize) <= 0;
-        assert compareUnsigned(initialSize, maxAllowedSize) <= 0;
-        assert compareUnsigned(maxAllowedSize, declaredMaxSize) <= 0;
-        assert compareUnsigned(maxAllowedSize, MAX_MEMORY_INSTANCE_SIZE) <= 0;
-        assert compareUnsigned(declaredMaxSize, MAX_MEMORY_DECLARATION_SIZE) <= 0;
-
-        this.declaredMinSize = declaredMinSize;
-        this.declaredMaxSize = declaredMaxSize;
-        this.maxAllowedSize = maxAllowedSize;
-        try {
-            this.buffer = new byte[initialSize * MEMORY_PAGE_SIZE];
-        } catch (OutOfMemoryError error) {
-            CompilerDirectives.transferToInterpreter();
-            throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
-        }
+        super(declaredMinSize, declaredMaxSize, initialSize, maxAllowedSize);
+        this.buffer = allocateBuffer(initialSize * MEMORY_PAGE_SIZE);
     }
 
     public ByteArrayWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
         this(declaredMinSize, declaredMaxSize, declaredMinSize, maxAllowedSize);
     }
 
+    @TruffleBoundary
+    private static byte[] allocateBuffer(final int byteSize) {
+        try {
+            return new byte[byteSize];
+        } catch (OutOfMemoryError error) {
+            throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
+        }
+    }
+
     private int validateAddress(Node node, long address, int length) {
         assert length >= 1;
         if (address < 0 || address > Integer.MAX_VALUE) {
@@ -134,16 +106,6 @@ public long byteSize() {
         return buffer.length;
     }
 
-    @Override
-    public int declaredMinSize() {
-        return declaredMinSize;
-    }
-
-    @Override
-    public int declaredMaxSize() {
-        return declaredMaxSize;
-    }
-
     @Override
     @TruffleBoundary
     public synchronized boolean grow(int extraPageSize) {
@@ -151,18 +113,15 @@ public synchronized boolean grow(int extraPageSize) {
             invokeGrowCallback();
             return true;
         } else if (compareUnsigned(extraPageSize, maxAllowedSize) <= 0 && compareUnsigned(size() + extraPageSize, maxAllowedSize) <= 0) {
-            try {
-                // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE)
-                // ensure computation of targetByteSize does not overflow.
-                final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
-                final byte[] newBuffer = new byte[targetByteSize];
-                System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
-                buffer = newBuffer;
-                invokeGrowCallback();
-                return true;
-            } catch (OutOfMemoryError error) {
-                throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
-            }
+            // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE)
+            // ensure computation of targetByteSize does not overflow.
+            final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
+            final int sourceByteSize = buffer.length;
+            final byte[] newBuffer = allocateBuffer(targetByteSize);
+            System.arraycopy(buffer, 0, newBuffer, 0, sourceByteSize);
+            buffer = newBuffer;
+            invokeGrowCallback();
+            return true;
         } else {
             return false;
         }
@@ -170,7 +129,7 @@ public synchronized boolean grow(int extraPageSize) {
 
     @Override
     public void reset() {
-        buffer = new byte[declaredMinSize * MEMORY_PAGE_SIZE];
+        buffer = allocateBuffer(declaredMinSize * MEMORY_PAGE_SIZE);
     }
 
     @Override
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
index dc6ad1c23746..104b0ba1ec8d 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/UnsafeWasmMemory.java
@@ -43,15 +43,12 @@
 import static java.lang.Integer.compareUnsigned;
 import static java.lang.StrictMath.addExact;
 import static java.lang.StrictMath.multiplyExact;
-import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_DECLARATION_SIZE;
-import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_INSTANCE_SIZE;
 import static org.graalvm.wasm.constants.Sizes.MEMORY_PAGE_SIZE;
 
 import java.lang.reflect.Field;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
-import org.graalvm.wasm.constants.Sizes;
 import org.graalvm.wasm.exception.Failure;
 import org.graalvm.wasm.exception.WasmException;
 
@@ -62,51 +59,27 @@
 import sun.misc.Unsafe;
 
 public final class UnsafeWasmMemory extends WasmMemory {
-    /**
-     * @see #declaredMinSize()
-     */
-    private final int declaredMinSize;
-
-    /**
-     * @see #declaredMaxSize()
-     */
-    private final int declaredMaxSize;
+
     private long startAddress;
     private int size;
 
-    /**
-     * The maximum practical size of this memory instance (measured in number of
-     * {@link Sizes#MEMORY_PAGE_SIZE pages}).
-     * <p>
-     * It is the minimum between {@link #declaredMaxSize the limit defined in the module binary},
-     * {@link Sizes#MAX_MEMORY_INSTANCE_SIZE the GraalWasm limit} and any additional limit (the JS
-     * API for example has lower limits).
-     * <p>
-     * This is different from {@link #declaredMaxSize()}, which can be higher.
-     */
-    private final int maxAllowedSize;
-
     private ByteBuffer buffer;
 
     private static final Unsafe unsafe;
     private static final long addressOffset;
 
     private UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int initialSize, int maxAllowedSize) {
-        assert compareUnsigned(declaredMinSize, initialSize) <= 0;
-        assert compareUnsigned(declaredMaxSize, MAX_MEMORY_DECLARATION_SIZE) <= 0;
-        assert compareUnsigned(initialSize, maxAllowedSize) <= 0;
-        assert compareUnsigned(maxAllowedSize, MAX_MEMORY_INSTANCE_SIZE) <= 0;
-        assert compareUnsigned(maxAllowedSize, declaredMaxSize) <= 0;
-
-        this.declaredMinSize = declaredMinSize;
-        this.declaredMaxSize = declaredMaxSize;
+        super(declaredMinSize, declaredMaxSize, initialSize, maxAllowedSize);
         this.size = declaredMinSize;
-        this.maxAllowedSize = maxAllowedSize;
         final long byteSize = byteSize();
         this.buffer = allocateBuffer(byteSize);
         this.startAddress = getBufferAddress(buffer);
     }
 
+    public UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
+        this(declaredMinSize, declaredMaxSize, declaredMinSize, maxAllowedSize);
+    }
+
     @TruffleBoundary
     private static ByteBuffer allocateBuffer(final long byteSize) {
         assert (int) byteSize == byteSize : byteSize;
@@ -121,10 +94,6 @@ private static long getBufferAddress(ByteBuffer buffer) {
         return unsafe.getLong(buffer, addressOffset);
     }
 
-    public UnsafeWasmMemory(int declaredMinSize, int declaredMaxSize, int maxAllowedSize) {
-        this(declaredMinSize, declaredMaxSize, declaredMinSize, maxAllowedSize);
-    }
-
     private void validateAddress(Node node, long address, int length) {
         assert length >= 1;
         long byteSize = byteSize();
@@ -159,16 +128,6 @@ public long byteSize() {
         return Integer.toUnsignedLong(size) * MEMORY_PAGE_SIZE;
     }
 
-    @Override
-    public int declaredMinSize() {
-        return declaredMinSize;
-    }
-
-    @Override
-    public int declaredMaxSize() {
-        return declaredMaxSize;
-    }
-
     @Override
     @TruffleBoundary
     public boolean grow(int extraPageSize) {
@@ -179,18 +138,15 @@ public boolean grow(int extraPageSize) {
             // Condition above and limit on maxPageSize (see ModuleLimits#MAX_MEMORY_SIZE) ensure
             // computation of targetByteSize does not overflow.
             final int targetByteSize = multiplyExact(addExact(size(), extraPageSize), MEMORY_PAGE_SIZE);
-            try {
-                ByteBuffer updatedBuffer = allocateBuffer(targetByteSize);
-                final long updatedStartAddress = getBufferAddress(updatedBuffer);
-                unsafe.copyMemory(startAddress, updatedStartAddress, byteSize());
-                buffer = updatedBuffer;
-                startAddress = updatedStartAddress;
-                size += extraPageSize;
-                invokeGrowCallback();
-                return true;
-            } catch (OutOfMemoryError error) {
-                throw WasmException.create(Failure.MEMORY_ALLOCATION_FAILED);
-            }
+            final long sourceByteSize = byteSize();
+            ByteBuffer updatedBuffer = allocateBuffer(targetByteSize);
+            final long updatedStartAddress = getBufferAddress(updatedBuffer);
+            unsafe.copyMemory(startAddress, updatedStartAddress, sourceByteSize);
+            buffer = updatedBuffer;
+            startAddress = updatedStartAddress;
+            size += extraPageSize;
+            invokeGrowCallback();
+            return true;
         } else {
             return false;
         }
diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
index 28ac0227064a..00243bc227c8 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
@@ -40,6 +40,10 @@
  */
 package org.graalvm.wasm.memory;
 
+import static java.lang.Integer.compareUnsigned;
+import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_DECLARATION_SIZE;
+import static org.graalvm.wasm.constants.Sizes.MAX_MEMORY_INSTANCE_SIZE;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
@@ -71,7 +75,44 @@
 @ExportLibrary(InteropLibrary.class)
 public abstract class WasmMemory extends EmbedderDataHolder implements TruffleObject, AutoCloseable {
 
-    private Object growCallback = null;
+    /**
+     * @see #declaredMinSize()
+     */
+    protected final int declaredMinSize;
+
+    /**
+     * @see #declaredMaxSize()
+     */
+    protected final int declaredMaxSize;
+
+    /**
+     * The maximum practical size of this memory instance (measured in number of
+     * {@link Sizes#MEMORY_PAGE_SIZE pages}).
+     * <p>
+     * It is the minimum between {@link #declaredMaxSize the limit defined in the module binary},
+     * {@link Sizes#MAX_MEMORY_INSTANCE_SIZE the GraalWasm limit} and any additional limit (the JS
+     * API for example has lower limits).
+     * <p>
+     * This is different from {@link #declaredMaxSize()}, which can be higher.
+     */
+    protected final int maxAllowedSize;
+
+    /**
+     * Optional grow callback to notify the embedder .
+     */
+    private Object growCallback;
+
+    protected WasmMemory(int declaredMinSize, int declaredMaxSize, int initialSize, int maxAllowedSize) {
+        assert compareUnsigned(declaredMinSize, initialSize) <= 0;
+        assert compareUnsigned(initialSize, maxAllowedSize) <= 0;
+        assert compareUnsigned(maxAllowedSize, declaredMaxSize) <= 0;
+        assert compareUnsigned(maxAllowedSize, MAX_MEMORY_INSTANCE_SIZE) <= 0;
+        assert compareUnsigned(declaredMaxSize, MAX_MEMORY_DECLARATION_SIZE) <= 0;
+
+        this.declaredMinSize = declaredMinSize;
+        this.declaredMaxSize = declaredMaxSize;
+        this.maxAllowedSize = maxAllowedSize;
+    }
 
     public abstract void copy(Node node, int src, int dst, int n);
 
@@ -93,7 +134,9 @@ public abstract class WasmMemory extends EmbedderDataHolder implements TruffleOb
      * This is a lower bound on this memory's size. This memory can only be imported with a lower or
      * equal minimum size.
      */
-    public abstract int declaredMinSize();
+    public final int declaredMinSize() {
+        return declaredMinSize;
+    }
 
     /**
      * The maximum size of this memory as declared in the binary (measured in number of
@@ -104,7 +147,9 @@ public abstract class WasmMemory extends EmbedderDataHolder implements TruffleOb
      * <p>
      * This is different from the internal maximum allowed size, which can be lower.
      */
-    public abstract int declaredMaxSize();
+    public final int declaredMaxSize() {
+        return declaredMaxSize;
+    }
 
     public abstract boolean grow(int extraPageSize);
 

From 092ff08254c1975490c289f911b4353a77fcb00b Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Thu, 28 Oct 2021 02:59:17 +0200
Subject: [PATCH 658/681] Remove AutoCloseable interface from WasmMemory.

---
 .../src/org/graalvm/wasm/memory/WasmMemory.java                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
index 00243bc227c8..8b71d7c1b655 100644
--- a/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
+++ b/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/memory/WasmMemory.java
@@ -73,7 +73,7 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 
 @ExportLibrary(InteropLibrary.class)
-public abstract class WasmMemory extends EmbedderDataHolder implements TruffleObject, AutoCloseable {
+public abstract class WasmMemory extends EmbedderDataHolder implements TruffleObject {
 
     /**
      * @see #declaredMinSize()
@@ -552,7 +552,6 @@ protected void invokeGrowCallback() {
         WebAssembly.invokeMemGrowCallback(this);
     }
 
-    @Override
     public abstract void close();
 
     public abstract ByteBuffer asByteBuffer();

From a6917b4ae0355a7fcf213f7648da5ff2de8a0769 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 28 Oct 2021 11:39:40 +0200
Subject: [PATCH 659/681] Migrate tools to jsonnet.

---
 ci.hocon         |  3 --
 ci.jsonnet       |  4 +++
 tools/ci.hocon   | 79 ----------------------------------------------
 tools/ci.jsonnet | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 82 deletions(-)
 delete mode 100644 tools/ci.hocon
 create mode 100644 tools/ci.jsonnet

diff --git a/ci.hocon b/ci.hocon
index 749ec3955658..2a99603db840 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -15,9 +15,6 @@ logPatterns = [
     ${compiler-suite-root}"/graal_dumps/*/*"
 ]
 
-#Tools
-include "tools/ci.hocon"
-
 #Examples
 #Examples gate also disabled.
 #include "examples/ci.hocon"
diff --git a/ci.jsonnet b/ci.jsonnet
index d764f440df01..a50a9c1b55b8 100644
--- a/ci.jsonnet
+++ b/ci.jsonnet
@@ -16,6 +16,9 @@ local sdk = import 'sdk/ci.jsonnet';
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
 
+# Tools
+local tools = import 'tools/ci.jsonnet';
+
 # JavaDoc
 local javadoc = import "ci_includes/publish-javadoc.jsonnet";
 
@@ -39,6 +42,7 @@ local add_excludes_guard(build) = build + {
     regex.builds +
     sdk.builds +
     sulong.builds +
+    tools.builds +
     javadoc.builds
   )]
 }
diff --git a/tools/ci.hocon b/tools/ci.hocon
deleted file mode 100644
index 619f10fbbde4..000000000000
--- a/tools/ci.hocon
+++ /dev/null
@@ -1,79 +0,0 @@
-toolsCommon: {
-  setup : [
-    [cd, "./tools"]
-  ]
-  timelimit : "30:00"
-}
-
-toolsGateLite : ${toolsCommon} {
-  run : [
-    ["mx", "build" ],
-    ["mx", "unittest", "--verbose" ]
-    ["mx", "sigtest" ]
-  ]
-}
-
-toolsCoverageWhitelisting: [
-  "--jacoco-whitelist-package",
-  "org.graalvm.tools",
-  "--jacoco-whitelist-package",
-  "com.oracle.truffle.tools"
-]
-
-toolsCoverageWeekly: {
-  "run": [
-    [
-      "mx"
-    ] ${toolsCoverageWhitelisting} [
-      "--strict-compliance",
-      "gate", 
-      "--strict-mode",
-      "--jacoco-omit-excluded",
-      "--jacocout", 
-      "html"
-    ],
-    ["mx"] ${toolsCoverageWhitelisting} ["coverage-upload"]
-  ],
-  targets: ["weekly"]
-}
-
-toolsWeekly: ${tools-weekly-notifications} {
-  targets: ["weekly"]
-}
-
-builds += [
-  ${linux-amd64} ${oraclejdk8}    ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-8"},
-  ${linux-amd64} ${oraclejdk11}   ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-11"},
-  ${linux-amd64} ${oraclejdk17}   ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-oraclejdk-17"},
-  ${linux-amd64} ${oraclejdk8}    ${toolsCommon} {
-    run : [
-        ["mx", "build"],
-        ["mx", "javadoc"],
-    ],
-    targets : [gate],
-    name: "gate-tools-javadoc"
-  },
-
-  ${windows-amd64} ${oraclejdk8}  ${toolsGateLite} ${devkits.windows-oraclejdk8} {
-    targets : [gate],
-    name: "gate-tools-windows-8"
-  },
-
-  ${darwin-amd64} ${oraclejdk8} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-mac-lite-8"
-  },
-
-  ${darwin-amd64} ${oraclejdk11} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-mac-lite-oraclejdk-11"
-  }
-  ${darwin-amd64} ${oraclejdk17} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-mac-lite-oraclejdk-17"
-  }
-  ${linux-aarch64} ${labsjdk11} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-linux-aarch64-lite-labsjdk-11"
-  },
-
-  ${linux-amd64} ${oraclejdk8} ${toolsCommon} ${eclipse} ${jdt} ${toolsCoverageWeekly} {
-    name: "weekly-tools-coverage"
-  }
-]
diff --git a/tools/ci.jsonnet b/tools/ci.jsonnet
new file mode 100644
index 000000000000..105e8ae200ea
--- /dev/null
+++ b/tools/ci.jsonnet
@@ -0,0 +1,82 @@
+{
+  local common = import '../common.jsonnet',
+  local devkits = (import "../common.json").devkits,
+
+  local tools_common = {
+    setup+: [
+      ["cd", "./tools"],
+    ],
+    timelimit: "30:00",
+  },
+
+  local tools_gate = tools_common + common["linux-amd64"] + common.eclipse + common.jdt + {
+    name: 'gate-tools-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
+    run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
+    targets: ["gate"],
+  },
+
+  local tools_gate_lite = tools_common + {
+    name: 'gate-tools-lite-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
+    run: [
+      ["mx", "build"],
+      ["mx", "unittest", "--verbose"],
+      ["mx", "sigtest"],
+    ],
+    notify_groups:: ["tools"],
+    targets: ["weekly"],
+  },
+
+  local coverage_whitelisting = [
+    "--jacoco-whitelist-package",
+    "org.graalvm.tools",
+    "--jacoco-whitelist-package",
+    "com.oracle.truffle.tools"
+  ],
+
+  builds: [
+    common.oraclejdk8  + tools_gate,
+    common.oraclejdk11 + tools_gate,
+    common.oraclejdk17 + tools_gate,
+
+    common["linux-amd64"] + common.oraclejdk8 + tools_common + {
+      name: "gate-tools-javadoc",
+      run: [
+        ["mx", "build"],
+        ["mx", "javadoc"],
+      ],
+      targets: ["gate"],
+    },
+
+    common["windows-amd64"] + common.oraclejdk8 + devkits["windows-oraclejdk8"] + tools_gate_lite + {
+      packages+: {
+        "mx": "HEAD",
+        "pip:isort": "==4.3.19",
+        "pip:logilab-common": "==1.4.4",
+        "pip:ninja_syntax": "==1.7.2",
+        "pip:pylint": "==1.9.3",
+      },
+    },
+
+    common["darwin-amd64"] + common.oraclejdk8  + tools_gate_lite,
+    common["darwin-amd64"] + common.oraclejdk11 + tools_gate_lite,
+    common["darwin-amd64"] + common.oraclejdk17 + tools_gate_lite,
+    
+    common["linux-aarch64"] + common.labsjdk11 + tools_gate_lite,
+
+    common["linux-amd64"] + common.oraclejdk8 + tools_common + common.eclipse + common.jdt + {
+      name: "weekly-tools-coverage",
+      run: [
+        ["mx"] + coverage_whitelisting + [
+          "--strict-compliance",
+          "gate", 
+          "--strict-mode",
+          "--jacoco-omit-excluded",
+          "--jacocout", 
+          "html",
+        ],
+        ["mx"] + coverage_whitelisting + ["coverage-upload"],
+      ],
+      targets: ["weekly"],
+    }
+  ],
+}
\ No newline at end of file

From 4103f53df603101ac9d7795c65273df3fb528b97 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 26 Oct 2021 15:23:40 +0200
Subject: [PATCH 660/681] Move tools to JDK11+.

---
 tools/ci.jsonnet | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/ci.jsonnet b/tools/ci.jsonnet
index 105e8ae200ea..eab472d6c886 100644
--- a/tools/ci.jsonnet
+++ b/tools/ci.jsonnet
@@ -34,11 +34,10 @@
   ],
 
   builds: [
-    common.oraclejdk8  + tools_gate,
     common.oraclejdk11 + tools_gate,
     common.oraclejdk17 + tools_gate,
 
-    common["linux-amd64"] + common.oraclejdk8 + tools_common + {
+    common["linux-amd64"] + common.oraclejdk11 + tools_common + {
       name: "gate-tools-javadoc",
       run: [
         ["mx", "build"],
@@ -47,7 +46,7 @@
       targets: ["gate"],
     },
 
-    common["windows-amd64"] + common.oraclejdk8 + devkits["windows-oraclejdk8"] + tools_gate_lite + {
+    common["windows-amd64"] + common.oraclejdk11 + devkits["windows-oraclejdk11"] + tools_gate_lite + {
       packages+: {
         "mx": "HEAD",
         "pip:isort": "==4.3.19",
@@ -57,13 +56,12 @@
       },
     },
 
-    common["darwin-amd64"] + common.oraclejdk8  + tools_gate_lite,
     common["darwin-amd64"] + common.oraclejdk11 + tools_gate_lite,
     common["darwin-amd64"] + common.oraclejdk17 + tools_gate_lite,
     
     common["linux-aarch64"] + common.labsjdk11 + tools_gate_lite,
 
-    common["linux-amd64"] + common.oraclejdk8 + tools_common + common.eclipse + common.jdt + {
+    common["linux-amd64"] + common.oraclejdk11 + tools_common + common.eclipse + common.jdt + {
       name: "weekly-tools-coverage",
       run: [
         ["mx"] + coverage_whitelisting + [

From ccf26900f3bfc841c9f31276b0c18002b0b2aa12 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Tue, 26 Oct 2021 16:25:53 +0200
Subject: [PATCH 661/681] Revise tools' ci.jsonnet.

---
 tools/ci.jsonnet | 74 ++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/tools/ci.jsonnet b/tools/ci.jsonnet
index eab472d6c886..56f34f5e6376 100644
--- a/tools/ci.jsonnet
+++ b/tools/ci.jsonnet
@@ -9,7 +9,7 @@
     timelimit: "30:00",
   },
 
-  local tools_gate = tools_common + common["linux-amd64"] + common.eclipse + common.jdt + {
+  local tools_gate = tools_common + common.eclipse + common.jdt + {
     name: 'gate-tools-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
     run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
     targets: ["gate"],
@@ -26,6 +26,15 @@
     targets: ["weekly"],
   },
 
+  local tools_javadoc = tools_common + {
+    name: "gate-tools-javadoc",
+    run: [
+      ["mx", "build"],
+      ["mx", "javadoc"],
+    ],
+    targets: ["gate"],
+  },
+
   local coverage_whitelisting = [
     "--jacoco-whitelist-package",
     "org.graalvm.tools",
@@ -33,48 +42,33 @@
     "com.oracle.truffle.tools"
   ],
 
-  builds: [
-    common.oraclejdk11 + tools_gate,
-    common.oraclejdk17 + tools_gate,
-
-    common["linux-amd64"] + common.oraclejdk11 + tools_common + {
-      name: "gate-tools-javadoc",
-      run: [
-        ["mx", "build"],
-        ["mx", "javadoc"],
+  local tools_coverage_weekly = tools_common + common.eclipse + common.jdt + {
+    name: "weekly-tools-coverage",
+    run: [
+      ["mx"] + coverage_whitelisting + [
+        "--strict-compliance",
+        "gate", 
+        "--strict-mode",
+        "--jacoco-omit-excluded",
+        "--jacocout", 
+        "html",
       ],
-      targets: ["gate"],
-    },
+      ["mx"] + coverage_whitelisting + ["coverage-upload"],
+    ],
+    targets: ["weekly"],
+  },
 
-    common["windows-amd64"] + common.oraclejdk11 + devkits["windows-oraclejdk11"] + tools_gate_lite + {
-      packages+: {
-        "mx": "HEAD",
-        "pip:isort": "==4.3.19",
-        "pip:logilab-common": "==1.4.4",
-        "pip:ninja_syntax": "==1.7.2",
-        "pip:pylint": "==1.9.3",
-      },
-    },
+  builds: [
+    common["linux-amd64"]   + common.oraclejdk11 + tools_gate,
+    common["linux-amd64"]   + common.oraclejdk17 + tools_gate,
 
-    common["darwin-amd64"] + common.oraclejdk11 + tools_gate_lite,
-    common["darwin-amd64"] + common.oraclejdk17 + tools_gate_lite,
-    
-    common["linux-aarch64"] + common.labsjdk11 + tools_gate_lite,
+    common["linux-amd64"]   + common.oraclejdk11 + tools_javadoc,
+    common["linux-amd64"]   + common.oraclejdk11 + tools_coverage_weekly,
+    common["linux-aarch64"] + common.labsjdk11   + tools_gate_lite,
 
-    common["linux-amd64"] + common.oraclejdk11 + tools_common + common.eclipse + common.jdt + {
-      name: "weekly-tools-coverage",
-      run: [
-        ["mx"] + coverage_whitelisting + [
-          "--strict-compliance",
-          "gate", 
-          "--strict-mode",
-          "--jacoco-omit-excluded",
-          "--jacocout", 
-          "html",
-        ],
-        ["mx"] + coverage_whitelisting + ["coverage-upload"],
-      ],
-      targets: ["weekly"],
-    }
+    common["windows-amd64"] + common.oraclejdk11 + devkits["windows-jdk11"] + tools_gate_lite,
+
+    common["darwin-amd64"]  + common.oraclejdk11 + tools_gate_lite,
+    common["darwin-amd64"]  + common.oraclejdk17 + tools_gate_lite,
   ],
 }
\ No newline at end of file

From d1daeb7fadbc93ce7b0e5b1d1cae1cc8fed54de8 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Wed, 27 Oct 2021 11:44:56 +0200
Subject: [PATCH 662/681] Use JDK17 instead of JDK11 and add windows-jdk17.

(except for javadoc which does not support JDK17 yet)
---
 tools/ci.jsonnet | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/ci.jsonnet b/tools/ci.jsonnet
index 56f34f5e6376..233eb3f821bb 100644
--- a/tools/ci.jsonnet
+++ b/tools/ci.jsonnet
@@ -63,10 +63,11 @@
     common["linux-amd64"]   + common.oraclejdk17 + tools_gate,
 
     common["linux-amd64"]   + common.oraclejdk11 + tools_javadoc,
-    common["linux-amd64"]   + common.oraclejdk11 + tools_coverage_weekly,
-    common["linux-aarch64"] + common.labsjdk11   + tools_gate_lite,
+    common["linux-amd64"]   + common.oraclejdk17 + tools_coverage_weekly,
+    common["linux-aarch64"] + common.labsjdk17   + tools_gate_lite,
 
     common["windows-amd64"] + common.oraclejdk11 + devkits["windows-jdk11"] + tools_gate_lite,
+    common["windows-amd64"] + common.oraclejdk17 + devkits["windows-jdk17"] + tools_gate_lite,
 
     common["darwin-amd64"]  + common.oraclejdk11 + tools_gate_lite,
     common["darwin-amd64"]  + common.oraclejdk17 + tools_gate_lite,

From d9be379b8e2285ef88201a88e7356f649ee502b0 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 26 Oct 2021 22:15:01 +0200
Subject: [PATCH 663/681] scale test timeout

---
 .../graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
index 42e79fffb343..f7b81e521662 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java
@@ -26,6 +26,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import org.graalvm.compiler.test.GraalTest;
 import org.graalvm.compiler.truffle.runtime.BytecodeOSRMetadata;
 import org.graalvm.compiler.truffle.runtime.FrameWithoutBoxing;
 import org.graalvm.compiler.truffle.runtime.GraalTruffleRuntime;
@@ -35,7 +36,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
 
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -60,8 +60,7 @@ public class BytecodeOSRNodeTest extends TestWithSynchronousCompiling {
 
     private static final GraalTruffleRuntime runtime = (GraalTruffleRuntime) Truffle.getRuntime();
 
-    // 20s timeout
-    @Rule public TestRule timeout = new Timeout(30, TimeUnit.SECONDS);
+    @Rule public TestRule timeout = GraalTest.createTimeout(30, TimeUnit.SECONDS);
 
     private int osrThreshold;
 

From 2ffac479b1e2512a2a99552ce2c481bb9b34864b Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 27 Oct 2021 15:48:08 +0200
Subject: [PATCH 664/681] make CheckGraalInvariants work with
 MX_BUILD_EXPLODED=true

---
 .../core/test/CheckGraalInvariants.java       | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
index 247d4727bb19..60bebd7b9e19 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java
@@ -32,6 +32,8 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -157,6 +159,10 @@ protected String getClassPath() {
                 classpath = System.getProperty("sun.boot.class.path");
             } else {
                 classpath = JRT_CLASS_PATH_ENTRY;
+                String upgradeModulePath = System.getProperty("jdk.module.upgrade.path");
+                if (upgradeModulePath != null) {
+                    classpath += File.pathSeparator + upgradeModulePath;
+                }
             }
 
             // Also process classes that go into the libgraal native image.
@@ -281,39 +287,43 @@ public static void runTest(InvariantsTool tool) {
                     if (path.equals(JRT_CLASS_PATH_ENTRY)) {
                         for (String className : ModuleSupport.getJRTGraalClassNames()) {
                             if (isGSON(className)) {
-                                /*
-                                 * GSON classes are compiled with old JDK
-                                 */
                                 continue;
                             }
                             classNames.add(className);
                         }
                     } else {
-                        final ZipFile zipFile = new ZipFile(new File(path));
-                        for (final Enumeration<? extends ZipEntry> entry = zipFile.entries(); entry.hasMoreElements();) {
-                            final ZipEntry zipEntry = entry.nextElement();
-                            String name = zipEntry.getName();
-                            if (name.endsWith(".class") && !name.startsWith("META-INF/versions/")) {
-                                String className = name.substring(0, name.length() - ".class".length()).replace('/', '.');
-                                if (isInNativeImage(className)) {
-                                    /*
-                                     * Native Image is an external tool and does not need to follow
-                                     * the Graal invariants.
-                                     */
-                                    continue;
+                        File file = new File(path);
+                        if (!file.exists()) {
+                            continue;
+                        }
+                        if (file.isDirectory()) {
+                            Path root = file.toPath();
+                            Files.walk(root).forEach(p -> {
+                                String name = root.relativize(p).toString();
+                                if (name.endsWith(".class") && !name.startsWith("META-INF/versions/")) {
+                                    String className = name.substring(0, name.length() - ".class".length()).replace('/', '.');
+                                    if (!(isInNativeImage(className) || isGSON(className))) {
+                                        classNames.add(className);
+                                    }
                                 }
-                                if (isGSON(className)) {
-                                    /*
-                                     * GSON classes are compiled with old JDK
-                                     */
-                                    continue;
+                            });
+                        } else {
+                            final ZipFile zipFile = new ZipFile(file);
+                            for (final Enumeration<? extends ZipEntry> entry = zipFile.entries(); entry.hasMoreElements();) {
+                                final ZipEntry zipEntry = entry.nextElement();
+                                String name = zipEntry.getName();
+                                if (name.endsWith(".class") && !name.startsWith("META-INF/versions/")) {
+                                    String className = name.substring(0, name.length() - ".class".length()).replace('/', '.');
+                                    if (isInNativeImage(className) || isGSON(className)) {
+                                        continue;
+                                    }
+                                    classNames.add(className);
                                 }
-                                classNames.add(className);
                             }
                         }
                     }
                 } catch (IOException ex) {
-                    Assert.fail(ex.toString());
+                    throw new AssertionError(ex);
                 }
             }
         }
@@ -543,10 +553,16 @@ private static void checkOptionFieldUsages(List<String> errors, Map<ResolvedJava
         }
     }
 
+    /**
+     * Native Image is an external tool and does not need to follow the Graal invariants.
+     */
     private static boolean isInNativeImage(String className) {
         return className.startsWith("org.graalvm.nativeimage");
     }
 
+    /**
+     * GSON classes are compiled with old JDK.
+     */
     private static boolean isGSON(String className) {
         return className.contains("com.google.gson");
     }

From 66fd6060240a7321abdbd6cd5c8cf90c05d76f1d Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 26 Oct 2021 22:14:16 +0200
Subject: [PATCH 665/681] omit DaCapo_pmd:BenchmarkCounters gate task on
 fastdebug (GR-34723)

---
 compiler/mx.compiler/mx_compiler.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 137c075194c0..6b2ab8370017 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -580,8 +580,12 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     with Task(prefix + 'DaCapo_pmd:BatchMode', tasks, tags=GraalTags.test) as t:
         if t: _gate_dacapo('pmd', 1, _remove_empty_entries(extraVMarguments) + ['-Xbatch'])
 
-    # ensure benchmark counters still work
-    if mx.get_arch() != 'aarch64': # GR-8364 Exclude benchmark counters on AArch64
+    # ensure benchmark counters still work but omit this test on
+    # fastdebug as benchmark counter threads may not produce
+    # output in a timely manner
+    out = mx.OutputCapture()
+    mx.run([jdk.java, '-version'], err=subprocess.STDOUT, out=out)
+    if 'fastdebug' not in out.data:
         with Task(prefix + 'DaCapo_pmd:BenchmarkCounters', tasks, tags=GraalTags.test) as t:
             if t:
                 fd, logFile = tempfile.mkstemp()

From f554e9607669bb0975e968008be50d76966141b6 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Wed, 20 Oct 2021 09:59:59 +0200
Subject: [PATCH 666/681] only use intrinsics for unsafe unaligned access if
 the hardware supports it

---
 .../graalvm/compiler/hotspot/GraalHotSpotVMConfig.java   | 1 +
 .../compiler/hotspot/meta/HotSpotInvocationPlugins.java  | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
index 05d33da76c17..8f2114639e5b 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
@@ -111,6 +111,7 @@ public CompressEncoding getKlassEncoding() {
     public final boolean useTLAB = getFlag("UseTLAB", Boolean.class);
     public final boolean useBiasedLocking = getFlag("UseBiasedLocking", Boolean.class);
     public final boolean usePopCountInstruction = getFlag("UsePopCountInstruction", Boolean.class);
+    public final boolean useUnalignedAccesses = getFlag("UseUnalignedAccesses", Boolean.class, false, JDK >= 9);
     public final boolean useAESIntrinsics = getFlag("UseAESIntrinsics", Boolean.class);
     public final boolean useAESCTRIntrinsics = getFlag("UseAESCTRIntrinsics", Boolean.class, false, (JDK == 8 && !IS_OPENJDK) || JDK >= 9);
     public final boolean useCRC32Intrinsics = getFlag("UseCRC32Intrinsics", Boolean.class);
diff --git a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
index ea5c6c4cf0cf..982e271339c8 100644
--- a/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
+++ b/compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java
@@ -66,7 +66,12 @@ final class HotSpotInvocationPlugins extends InvocationPlugins {
     protected void register(InvocationPlugin plugin, boolean isOptional, boolean allowOverwrite, Type declaringClass, String name, Type... argumentTypes) {
         if (!config.usePopCountInstruction) {
             if (name.equals("bitCount")) {
-                assert declaringClass.equals(Integer.class) || declaringClass.equals(Long.class);
+                GraalError.guarantee(declaringClass.equals(Integer.class) || declaringClass.equals(Long.class), declaringClass.getTypeName());
+                return;
+            }
+        }
+        if (!config.useUnalignedAccesses) {
+            if (name.endsWith("Unaligned") && declaringClass.getTypeName().equals("jdk.internal.misc.Unsafe")) {
                 return;
             }
         }
@@ -80,7 +85,7 @@ public void checkNewNodes(GraphBuilderContext b, InvocationPlugin plugin, NodeIt
                 // MacroNode based plugins can only be used for inlining since they
                 // require a valid bci should they need to replace themselves with
                 // an InvokeNode during lowering.
-                assert plugin.inlineOnly() : String.format("plugin that creates a %s (%s) must return true for inlineOnly(): %s", MacroInvokable.class.getSimpleName(), node, plugin);
+                GraalError.guarantee(plugin.inlineOnly(), "plugin that creates a %s (%s) must return true for inlineOnly(): %s", MacroInvokable.class.getSimpleName(), node, plugin);
             }
         }
         super.checkNewNodes(b, plugin, newNodes);

From e5ecb214516e086cf4dc374ca5724a2986ad46f3 Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 28 Oct 2021 18:47:19 +0200
Subject: [PATCH 667/681] Drop JDK8 benchmarking

---
 compiler/ci_common/benchmark-builders.jsonnet | 190 +++++-------------
 compiler/ci_common/compiler-common.libsonnet  |   2 +
 .../ci_includes/baseline-benchmarks.jsonnet   |  22 +-
 3 files changed, 59 insertions(+), 155 deletions(-)

diff --git a/compiler/ci_common/benchmark-builders.jsonnet b/compiler/ci_common/benchmark-builders.jsonnet
index 8b6f657708bf..fca206f76905 100644
--- a/compiler/ci_common/benchmark-builders.jsonnet
+++ b/compiler/ci_common/benchmark-builders.jsonnet
@@ -5,127 +5,52 @@
   local bench = (import 'benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
 
-  local jdk8  = c.oraclejdk8,
-  local jdk11 = c.labsjdk11,
-  local jdk17 = c.labsjdk17,
-
-  local amd64_jdks = [jdk8, jdk11, jdk17],
-  local aarch64_jdks = [jdk11, jdk17],
-
-  local main_builds = [
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.dacapo,
-    c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.dacapo,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.dacapo_size_variants,
-    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.dacapo_timing,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.dacapo_timing,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.scala_dacapo,
-    c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.scala_dacapo,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.scala_dacapo_timing,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.scala_dacapo_timing,
-    c.post_merge + hw.x52 + jdk8  + cc.libgraal + bench.renaissance,
-    c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.renaissance,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.specjvm2008,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.specjbb2005,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.specjbb2005,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.specjbb2015_full_machine,
-    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.specjbb2015_full_machine,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_0_10,
-    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.renaissance_0_10,
-    c.weekly     + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_0_13,
-    c.on_demand  + hw.x52 + jdk8  + cc.jargraal + bench.renaissance_0_13,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.awfy,
-    c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.awfy,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk8  + cc.jargraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.micros_graal_whitebox,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.micros_graal_whitebox,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.micros_graal_dist,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.micros_graal_dist,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.micros_misc_graal_dist,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.micros_misc_graal_dist,
-    c.daily      + hw.x52 + jdk8  + cc.libgraal + bench.micros_shootout_graal_dist,
-    c.weekly     + hw.x52 + jdk8  + cc.jargraal + bench.micros_shootout_graal_dist,
-
-    c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.dacapo,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.dacapo,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.dacapo_timing,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.dacapo_timing,
-    c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.scala_dacapo_timing,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.scala_dacapo_timing,
-    c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.renaissance,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.renaissance,
-    c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2005,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2005,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.specjbb2015_full_machine,
-    c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.specjbb2015_full_machine,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_10,
-    c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.renaissance_0_10,
-    c.weekly     + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_0_13,
-    c.on_demand  + hw.x52 + jdk11 + cc.jargraal + bench.renaissance_0_13,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.awfy,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.awfy,
-    c.post_merge + hw.x52 + jdk11 + cc.libgraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk11 + cc.jargraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.micros_graal_whitebox,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.micros_graal_whitebox,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.micros_graal_dist,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.micros_graal_dist,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.micros_misc_graal_dist,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.micros_misc_graal_dist,
-    c.daily      + hw.x52 + jdk11 + cc.libgraal + bench.micros_shootout_graal_dist,
-    c.weekly     + hw.x52 + jdk11 + cc.jargraal + bench.micros_shootout_graal_dist,
+  local main_builds = std.flattenArrays([
+    [
+    c.post_merge + hw.x52 + jdk + cc.libgraal + bench.dacapo,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.dacapo,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.dacapo_size_variants,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.dacapo_size_variants,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.dacapo_timing,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.dacapo_timing,
+    c.post_merge + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_size_variants,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo_size_variants,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.scala_dacapo_timing,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.scala_dacapo_timing,
+    c.post_merge + hw.x52 + jdk + cc.libgraal + bench.renaissance,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.renaissance,
+    c.post_merge + hw.x52 + jdk + cc.libgraal + bench.specjvm2008,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.specjvm2008,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.specjbb2005,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.specjbb2005,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.specjbb2015,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.specjbb2015,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.specjbb2015_full_machine,
+    c.on_demand  + hw.x52 + jdk + cc.jargraal + bench.specjbb2015_full_machine,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_10,
+    c.on_demand  + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_10,
+    c.weekly     + hw.x52 + jdk + cc.libgraal + bench.renaissance_0_13,
+    c.on_demand  + hw.x52 + jdk + cc.jargraal + bench.renaissance_0_13,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.awfy,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.awfy,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.microservice_benchmarks,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.microservice_benchmarks,
+    c.post_merge + hw.x52 + jdk + cc.libgraal + bench.renaissance_legacy,
+    c.daily      + hw.x52 + jdk + cc.jargraal + bench.renaissance_legacy,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_graal_whitebox,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_graal_whitebox,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_graal_dist,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_graal_dist,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_misc_graal_dist,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_misc_graal_dist,
+    c.daily      + hw.x52 + jdk + cc.libgraal + bench.micros_shootout_graal_dist,
+    c.weekly     + hw.x52 + jdk + cc.jargraal + bench.micros_shootout_graal_dist,
+    ]
+  for jdk in cc.bench_jdks
+  ]),
 
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.dacapo,
-    c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.dacapo,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk17 + cc.libgraal + bench.dacapo_timing,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.dacapo_timing,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo,
-    c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_size_variants,
-    c.weekly     + hw.x52 + jdk17 + cc.libgraal + bench.scala_dacapo_timing,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.scala_dacapo_timing,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.renaissance_0_13,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.renaissance_0_13,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.specjvm2008,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2005,
-    c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2005,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015,
-    c.weekly     + hw.x52 + jdk17 + cc.libgraal + bench.specjbb2015_full_machine,
-    c.on_demand  + hw.x52 + jdk17 + cc.jargraal + bench.specjbb2015_full_machine,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.awfy,
-    c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.awfy,
-    #c.post_merge + hw.x52 + jdk17 + cc.libgraal + bench.renaissance_legacy,
-    #c.daily      + hw.x52 + jdk17 + cc.jargraal + bench.renaissance_legacy,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_whitebox,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_whitebox,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.micros_graal_dist,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.micros_graal_dist,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.micros_misc_graal_dist,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.micros_misc_graal_dist,
-    c.daily      + hw.x52 + jdk17 + cc.libgraal + bench.micros_shootout_graal_dist,
-    c.weekly     + hw.x52 + jdk17 + cc.jargraal + bench.micros_shootout_graal_dist
-  ],
 
   // JFR and async-profiler jobs
   local profiling_builds = std.flattenArrays([
@@ -133,28 +58,15 @@
     c.weekly + hw.x52 + jdk + cc.libgraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" },
     c.weekly + hw.x52 + jdk + cc.jargraal + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" }
     ]
-  for jdk in amd64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.profiled_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
-  ]),
-
-  // Microservices
-  local microservice_builds = std.flattenArrays([
-    [
-    c.daily  + hw.x52 + jdk + cc.libgraal + suite,
-    c.weekly + hw.x52 + jdk + cc.jargraal + suite
-    ]
-  for jdk in amd64_jdks
-  for suite in bench.groups.microservice_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
   // intensive weekly benchmarking
   local weekly_forks_builds = std.flattenArrays([
     bc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.libgraal + suite, subdir='compiler')
-  for jdk in amd64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.weekly_forks_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
   local aarch64_builds = std.flattenArrays([
@@ -162,12 +74,12 @@
     c.weekly + hw.xgene3 + jdk + cc.libgraal + suite,
     c.weekly + hw.xgene3 + jdk + cc.jargraal + suite
     ]
-  for jdk in aarch64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.main_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
-  local all_builds = main_builds + weekly_forks_builds + profiling_builds + microservice_builds + aarch64_builds,
+  local all_builds = main_builds + weekly_forks_builds + profiling_builds + aarch64_builds,
+  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version)],
   // adds a "defined_in" field to all builds mentioning the location of this current file
-  builds:: [{ defined_in: std.thisFile } + b for b in all_builds]
+  builds:: [{ defined_in: std.thisFile } + b for b in filtered_builds]
 }
diff --git a/compiler/ci_common/compiler-common.libsonnet b/compiler/ci_common/compiler-common.libsonnet
index 03664e6216fe..7c3cfdb0954c 100644
--- a/compiler/ci_common/compiler-common.libsonnet
+++ b/compiler/ci_common/compiler-common.libsonnet
@@ -16,6 +16,8 @@
     ]
   },
 
+  bench_jdks:: [common.labsjdk11, common.labsjdk17],
+
   // Benchmarking building blocks
   // ****************************
   compiler_bench_base:: bench_common.bench_base + {
diff --git a/compiler/ci_includes/baseline-benchmarks.jsonnet b/compiler/ci_includes/baseline-benchmarks.jsonnet
index 4f31beedcbf5..eb1f49d3343b 100644
--- a/compiler/ci_includes/baseline-benchmarks.jsonnet
+++ b/compiler/ci_includes/baseline-benchmarks.jsonnet
@@ -5,18 +5,10 @@
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
 
-  local jdk8  = c.oraclejdk8,
-  local jdk11 = c.labsjdk11,
-  local jdk17 = c.labsjdk17,
-
-  local amd64_jdks = [jdk8, jdk11, jdk17],
-  local aarch64_jdks = [jdk11, jdk17],
-
   local hotspot_main_builds = [
     c.weekly + hw.x52 + jdk + cc.c2 + suite
-  for jdk in amd64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.all_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ],
 
 
@@ -24,28 +16,26 @@
     [
     c.weekly + hw.x52 + jdk + cc.c2 + cc.enable_profiling + suite + { job_prefix:: "bench-profiling" }
     ]
-  for jdk in amd64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.profiled_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
   local weekly_forks_builds = std.flattenArrays([
     bc.generate_fork_builds(c.weekly + hw.x52 + jdk + cc.c2 + suite)
-  for jdk in amd64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.weekly_forks_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
   local aarch64_builds = std.flattenArrays([
     [
     c.weekly + hw.xgene3 + jdk + cc.c2 + suite
     ]
-  for jdk in aarch64_jdks
+  for jdk in cc.bench_jdks
   for suite in bench.groups.main_suites
-  if suite.is_jdk_supported(jdk.jdk_version)
   ]),
 
   local all_builds = hotspot_main_builds + hotspot_profiling_builds + weekly_forks_builds + aarch64_builds,
+  local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version)],
   // adds a "defined_in" field to all builds mentioning the location of this current file
-  builds:: [{ defined_in: std.thisFile } + b for b in all_builds]
+  builds:: [{ defined_in: std.thisFile } + b for b in filtered_builds]
 }
\ No newline at end of file

From 8f545863a16bfde712f11232aa844fbff7f5dd4e Mon Sep 17 00:00:00 2001
From: Francois Farquet <francois.farquet@oracle.com>
Date: Thu, 28 Oct 2021 19:44:12 +0200
Subject: [PATCH 668/681] ci overlay bump

---
 graal-common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graal-common.json b/graal-common.json
index abd8bdf2e74e..2518229f5e88 100644
--- a/graal-common.json
+++ b/graal-common.json
@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "116ca58f168daed55df5c54fb5cb17ef4d327f23"
+    "overlay": "0799e09509ab1a429b63ba5ff0366fe682d04153"
   },
   "mx_version" : "HEAD"
 }

From c5a20837d273ea77e968d0d6f30b9bf45e231cab Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 28 Oct 2021 16:18:01 +0200
Subject: [PATCH 669/681] don't silently swallow log output on benchmark
 failure

---
 compiler/mx.compiler/mx_compiler.py | 20 ++++++++++++++++++--
 vm/mx.vm/mx_vm_gate.py              |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 6b2ab8370017..d7c477998407 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -429,7 +429,12 @@ def _gate_dacapo(name, iterations, extraVMarguments=None, force_serial_gc=True,
     args = ['-n', str(iterations), '--preserve']
     if threads is not None:
         args += ['-t', str(threads)]
-    return mx_benchmark.gate_mx_benchmark(["dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args)
+    out = mx.TeeOutputCapture(mx.OutputCapture())
+    exit_code, suite, results = mx_benchmark.gate_mx_benchmark(["dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args, out=out, err=out, nonZeroIsFatal=False)
+    if exit_code != 0:
+        mx.log(out)
+        mx.abort("Gate for dacapo benchmark '{}' failed!".format(name))
+    return exit_code, suite, results
 
 def jdk_includes_corba(jdk):
     # corba has been removed since JDK11 (http://openjdk.java.net/jeps/320)
@@ -441,7 +446,12 @@ def _gate_scala_dacapo(name, iterations, extraVMarguments=None):
     vmargs = ['-Xms2g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops'] + _compiler_error_options() + _remove_empty_entries(extraVMarguments)
 
     args = ['-n', str(iterations), '--preserve']
-    return mx_benchmark.gate_mx_benchmark(["scala-dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args)
+    out = mx.TeeOutputCapture(mx.OutputCapture())
+    exit_code, suite, results = mx_benchmark.gate_mx_benchmark(["scala-dacapo:{}".format(name), "--tracker=none", "--"] + vmargs + ["--"] + args, out=out, err=out, nonZeroIsFatal=False)
+    if exit_code != 0:
+        mx.log(out)
+        mx.abort("Gate for scala-dacapo benchmark '{}' failed!".format(name))
+    return exit_code, suite, results
 
 def _check_catch_files():
     """
@@ -597,6 +607,12 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
                         needle = 'MoveOperations (dynamic counters)'
                         if needle not in haystack:
                             mx.abort('Expected to see "' + needle + '" in output of length ' + str(len(haystack)) + ':\n' + haystack)
+                except BaseException:
+                    with open(logFile) as fp:
+                        haystack = fp.read()
+                    if haystack:
+                        mx.log(haystack)
+                    raise
                 finally:
                     os.remove(logFile)
 
diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
index 12c93ae19331..f8b27d82a467 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -103,7 +103,7 @@ def gate_body(args, tasks):
                               '-Dlibgraal.CrashAtIsFatal=true']
                     cmd = ["dacapo:avrora", "--tracker=none", "--"] + vmargs + ["--", "--preserve"]
                     out = mx.OutputCapture()
-                    exitcode, bench_suite, _ = mx_benchmark.gate_mx_benchmark(cmd, nonZeroIsFatal=False, out=out, err=out)
+                    exitcode, bench_suite, _ = mx_benchmark.gate_mx_benchmark(cmd, out=out, err=out, nonZeroIsFatal=False)
                     if exitcode == 0:
                         if 'CrashAtIsFatal: no fatalError function pointer installed' in out.data:
                             # Executing a VM that does not configure fatal errors handling

From cb20e35b4ef62d88a9ed54c80ec0d9b8a5a332c5 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 28 Oct 2021 16:40:18 +0200
Subject: [PATCH 670/681] disable DaCapo_pmd:BenchmarkCounters on AArch64
 (GR-34759)

---
 compiler/mx.compiler/mx_compiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index d7c477998407..a6a753d5df77 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -595,7 +595,7 @@ def compiler_gate_benchmark_runner(tasks, extraVMarguments=None, prefix=''):
     # output in a timely manner
     out = mx.OutputCapture()
     mx.run([jdk.java, '-version'], err=subprocess.STDOUT, out=out)
-    if 'fastdebug' not in out.data:
+    if 'fastdebug' not in out.data and mx.get_arch() != 'aarch64': # GR-34759
         with Task(prefix + 'DaCapo_pmd:BenchmarkCounters', tasks, tags=GraalTags.test) as t:
             if t:
                 fd, logFile = tempfile.mkstemp()

From 01302c459336ff24f3af56c05f970756195ca860 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Tue, 26 Oct 2021 22:38:02 +0200
Subject: [PATCH 671/681] do not use JVMCI when constant folding unaligned
 reads

---
 .../core/common/type/PrimitiveStamp.java      | 70 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
index f8f5385bb433..cb2dbaf83ff1 100644
--- a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
+++ b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
@@ -24,8 +24,17 @@
  */
 package org.graalvm.compiler.core.common.type;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.serviceprovider.BufferUtil;
+
 import jdk.vm.ci.meta.Constant;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MemoryAccessProvider;
+import jdk.vm.ci.meta.PrimitiveConstant;
 
 /**
  * Type describing primitive values.
@@ -47,7 +56,7 @@ public void accept(Visitor v) {
     /**
      * The width in bits of the value described by this stamp.
      */
-    public int getBits() {
+    public final int getBits() {
         return bits;
     }
 
@@ -62,7 +71,15 @@ public static int getBits(Stamp stamp) {
     @Override
     public Constant readConstant(MemoryAccessProvider provider, Constant base, long displacement) {
         try {
-            return provider.readPrimitiveConstant(getStackKind(), base, displacement, getBits());
+            int numBits = getBits();
+            GraalError.guarantee((numBits & 7) == 0, "numBits not a multiple of 8: %d", numBits);
+            int numBytes = numBits / 8;
+            boolean aligned = displacement % numBytes == 0;
+            if (aligned) {
+                return provider.readPrimitiveConstant(getStackKind(), base, displacement, numBits);
+            } else {
+                return readConstantUnaligned(provider, base, displacement, numBytes, getStackKind());
+            }
         } catch (IllegalArgumentException e) {
             /*
              * It's possible that the base and displacement aren't valid together so simply return
@@ -72,6 +89,55 @@ public Constant readConstant(MemoryAccessProvider provider, Constant base, long
         }
     }
 
+    /**
+     * As a result of JDK-8275874, {@link MemoryAccessProvider#readPrimitiveConstant} cannot be used
+     * for unaligned reads. Instead, it has to be done by reading individual bytes and stitching
+     * them together. The read is non-atomic which is fine for constant folding stable values (i.e.
+     * compile-time constant fields/elements).
+     */
+    private static Constant readConstantUnaligned(MemoryAccessProvider provider, Constant base, long displacement, int numBytes, JavaKind stackKind) {
+        ByteBuffer buf = ByteBuffer.allocate(numBytes);
+        for (int i = 0; i < numBytes; i++) {
+            JavaConstant c = provider.readPrimitiveConstant(JavaKind.Byte, base, displacement + i, 8);
+            if (c == null) {
+                // Some implementations of MemoryAccessProvider (e.g. HostedMemoryAccessProvider)
+                // can return null from readPrimitiveConstant
+                return null;
+            }
+            byte b = (byte) c.asInt();
+            buf.put(b);
+        }
+        BufferUtil.asBaseBuffer(buf).rewind();
+        buf.order(ByteOrder.nativeOrder());
+        if (numBytes == 8) {
+            return forPrimitive(stackKind, buf.getLong());
+        }
+        if (numBytes == 4) {
+            return forPrimitive(stackKind, buf.getInt());
+        }
+        GraalError.guarantee(numBytes == 2, "unexpected numBytes: %d", numBytes);
+        return forPrimitive(stackKind, buf.getShort());
+    }
+
+    /**
+     * Work around for {@code JavaConstant.forPrimitive(JavaKind kind, long rawValue)} only be
+     * available in more recent JVMCI versions.
+     */
+    private static PrimitiveConstant forPrimitive(JavaKind stackKind, long rawValue) {
+        switch (stackKind) {
+            case Int:
+                return JavaConstant.forInt((int) rawValue);
+            case Long:
+                return JavaConstant.forLong(rawValue);
+            case Float:
+                return JavaConstant.forFloat(Float.intBitsToFloat((int) rawValue));
+            case Double:
+                return JavaConstant.forDouble(Double.longBitsToDouble(rawValue));
+            default:
+                throw new IllegalArgumentException("Unexpected stack kind: " + stackKind);
+        }
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;

From 1205fd8ca7972732440402b6c1aac819c30a4b46 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Sat, 27 Mar 2021 18:26:16 +0100
Subject: [PATCH 672/681] added more tests for constant folding reads

---
 compiler/mx.compiler/suite.py                 |   5 +
 .../test/UnsafeGetStableArrayElement.java     | 437 ++++++++++++++++++
 .../core/test/StableArrayReadFoldingTest.java |  40 +-
 .../core/test/StampMemoryAccessTest.java      |  48 +-
 4 files changed, 521 insertions(+), 9 deletions(-)
 create mode 100644 compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index 6dbace9c93ce..41224ea15c71 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -1568,6 +1568,11 @@
       "requiresConcealed" : {
         "jdk.internal.vm.ci" : [
           "jdk.vm.ci.meta",
+          "jdk.vm.ci.code",
+        ],
+        "java.base" : [
+          "jdk.internal.misc",
+          "jdk.internal.vm.annotation",
         ],
       },
       "checkstyle" : "org.graalvm.compiler.graph",
diff --git a/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java b/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java
new file mode 100644
index 000000000000..f84c446b6f8a
--- /dev/null
+++ b/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright (c) 2021, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package org.graalvm.compiler.core.jdk9.test;
+
+import static jdk.internal.misc.Unsafe.ARRAY_BOOLEAN_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_CHAR_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_DOUBLE_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_FLOAT_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_INT_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_LONG_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_OBJECT_BASE_OFFSET;
+import static jdk.internal.misc.Unsafe.ARRAY_SHORT_BASE_OFFSET;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+import org.graalvm.compiler.nodes.ConstantNode;
+import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
+import org.graalvm.compiler.nodes.StructuredGraph.Builder;
+import org.graalvm.compiler.phases.PhaseSuite;
+import org.graalvm.compiler.phases.tiers.HighTierContext;
+import org.graalvm.compiler.test.AddExports;
+import org.junit.Assert;
+
+import jdk.internal.misc.Unsafe;
+import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.code.InvalidInstalledCodeException;
+import jdk.vm.ci.meta.JavaConstant;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
+/**
+ * This is based on {@code test/hotspot/jtreg/compiler/unsafe/UnsafeGetStableArrayElement.java} and
+ * differs in that it only asserts the behavior of Graal with respect to reading an element from a
+ * {@code Stable} array via Unsafe.
+ */
+@AddExports("java.base/jdk.internal.misc")
+public class UnsafeGetStableArrayElement extends GraalCompilerTest {
+    // @formatter:off
+    private static final List<Object> StableArrays = new ArrayList<>();
+    private static <T> T register(T t) {  StableArrays.add(t); return t; }
+
+    // These are treated as @Stable fields thanks to the applyStable method
+    static final boolean[] STABLE_BOOLEAN_ARRAY = register(new boolean[16]);
+    static final    byte[]    STABLE_BYTE_ARRAY = register(new    byte[16]);
+    static final   short[]   STABLE_SHORT_ARRAY = register(new   short[8]);
+    static final    char[]    STABLE_CHAR_ARRAY = register(new    char[8]);
+    static final     int[]     STABLE_INT_ARRAY = register(new     int[4]);
+    static final    long[]    STABLE_LONG_ARRAY = register(new    long[2]);
+    static final   float[]   STABLE_FLOAT_ARRAY = register(new   float[4]);
+    static final  double[]  STABLE_DOUBLE_ARRAY = register(new  double[2]);
+    static final  Object[]  STABLE_OBJECT_ARRAY = register(new  Object[4]);
+
+    static {
+        Setter.reset();
+    }
+    static final Unsafe U = Unsafe.getUnsafe();
+
+    static class Setter {
+        private static void setZ(boolean defaultVal) { STABLE_BOOLEAN_ARRAY[0] = defaultVal ? false :                true; }
+        private static void setB(boolean defaultVal) { STABLE_BYTE_ARRAY[0]    = defaultVal ?     0 :      Byte.MAX_VALUE; }
+        private static void setS(boolean defaultVal) { STABLE_SHORT_ARRAY[0]   = defaultVal ?     0 :     Short.MAX_VALUE; }
+        private static void setC(boolean defaultVal) { STABLE_CHAR_ARRAY[0]    = defaultVal ?     0 : Character.MAX_VALUE; }
+        private static void setI(boolean defaultVal) { STABLE_INT_ARRAY[0]     = defaultVal ?     0 :   Integer.MAX_VALUE; }
+        private static void setJ(boolean defaultVal) { STABLE_LONG_ARRAY[0]    = defaultVal ?     0 :      Long.MAX_VALUE; }
+        private static void setF(boolean defaultVal) { STABLE_FLOAT_ARRAY[0]   = defaultVal ?     0 :     Float.MAX_VALUE; }
+        private static void setD(boolean defaultVal) { STABLE_DOUBLE_ARRAY[0]  = defaultVal ?     0 :    Double.MAX_VALUE; }
+        private static void setL(boolean defaultVal) { STABLE_OBJECT_ARRAY[0]  = defaultVal ?  null :        new Object(); }
+
+        static void reset() {
+            setZ(false);
+            setB(false);
+            setS(false);
+            setC(false);
+            setI(false);
+            setJ(false);
+            setF(false);
+            setD(false);
+            setL(false);
+        }
+    }
+
+    static class Test {
+        static void changeZ() { Setter.setZ(true); }
+        static void changeB() { Setter.setB(true); }
+        static void changeS() { Setter.setS(true); }
+        static void changeC() { Setter.setC(true); }
+        static void changeI() { Setter.setI(true); }
+        static void changeJ() { Setter.setJ(true); }
+        static void changeF() { Setter.setF(true); }
+        static void changeD() { Setter.setD(true); }
+        static void changeL() { Setter.setL(true); }
+
+        static boolean testZ_Z() { return U.getBoolean(STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static byte    testZ_B() { return U.getByte(   STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static short   testZ_S() { return U.getShort(  STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static char    testZ_C() { return U.getChar(   STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static int     testZ_I() { return U.getInt(    STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static long    testZ_J() { return U.getLong(   STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static float   testZ_F() { return U.getFloat(  STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+        static double  testZ_D() { return U.getDouble( STABLE_BOOLEAN_ARRAY, ARRAY_BOOLEAN_BASE_OFFSET); }
+
+        static boolean testB_Z() { return U.getBoolean(STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static byte    testB_B() { return U.getByte(   STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static short   testB_S() { return U.getShort(  STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static char    testB_C() { return U.getChar(   STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static int     testB_I() { return U.getInt(    STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static long    testB_J() { return U.getLong(   STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static float   testB_F() { return U.getFloat(  STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+        static double  testB_D() { return U.getDouble( STABLE_BYTE_ARRAY, ARRAY_BYTE_BASE_OFFSET); }
+
+        static boolean testS_Z() { return U.getBoolean(STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static byte    testS_B() { return U.getByte(   STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static short   testS_S() { return U.getShort(  STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static char    testS_C() { return U.getChar(   STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static int     testS_I() { return U.getInt(    STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static long    testS_J() { return U.getLong(   STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static float   testS_F() { return U.getFloat(  STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+        static double  testS_D() { return U.getDouble( STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET); }
+
+        static boolean testC_Z() { return U.getBoolean(STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static byte    testC_B() { return U.getByte(   STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static short   testC_S() { return U.getShort(  STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static char    testC_C() { return U.getChar(   STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static int     testC_I() { return U.getInt(    STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static long    testC_J() { return U.getLong(   STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static float   testC_F() { return U.getFloat(  STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+        static double  testC_D() { return U.getDouble( STABLE_CHAR_ARRAY, ARRAY_CHAR_BASE_OFFSET); }
+
+        static boolean testI_Z() { return U.getBoolean(STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static byte    testI_B() { return U.getByte(   STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static short   testI_S() { return U.getShort(  STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static char    testI_C() { return U.getChar(   STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static int     testI_I() { return U.getInt(    STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static long    testI_J() { return U.getLong(   STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static float   testI_F() { return U.getFloat(  STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+        static double  testI_D() { return U.getDouble( STABLE_INT_ARRAY, ARRAY_INT_BASE_OFFSET); }
+
+        static boolean testJ_Z() { return U.getBoolean(STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static byte    testJ_B() { return U.getByte(   STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static short   testJ_S() { return U.getShort(  STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static char    testJ_C() { return U.getChar(   STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static int     testJ_I() { return U.getInt(    STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static long    testJ_J() { return U.getLong(   STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static float   testJ_F() { return U.getFloat(  STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+        static double  testJ_D() { return U.getDouble( STABLE_LONG_ARRAY, ARRAY_LONG_BASE_OFFSET); }
+
+        static boolean testF_Z() { return U.getBoolean(STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static byte    testF_B() { return U.getByte(   STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static short   testF_S() { return U.getShort(  STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static char    testF_C() { return U.getChar(   STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static int     testF_I() { return U.getInt(    STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static long    testF_J() { return U.getLong(   STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static float   testF_F() { return U.getFloat(  STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+        static double  testF_D() { return U.getDouble( STABLE_FLOAT_ARRAY, ARRAY_FLOAT_BASE_OFFSET); }
+
+        static boolean testD_Z() { return U.getBoolean(STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static byte    testD_B() { return U.getByte(   STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static short   testD_S() { return U.getShort(  STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static char    testD_C() { return U.getChar(   STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static int     testD_I() { return U.getInt(    STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static long    testD_J() { return U.getLong(   STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static float   testD_F() { return U.getFloat(  STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+        static double  testD_D() { return U.getDouble( STABLE_DOUBLE_ARRAY, ARRAY_DOUBLE_BASE_OFFSET); }
+
+        @SuppressWarnings("removal")
+        static Object  testL_L() { return U.getObject( STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static boolean testL_Z() { return U.getBoolean(STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static byte    testL_B() { return U.getByte(   STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static short   testL_S() { return U.getShort(  STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static char    testL_C() { return U.getChar(   STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static int     testL_I() { return U.getInt(    STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static long    testL_J() { return U.getLong(   STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static float   testL_F() { return U.getFloat(  STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+        static double  testL_D() { return U.getDouble( STABLE_OBJECT_ARRAY, ARRAY_OBJECT_BASE_OFFSET); }
+
+        static short   testS_U() { return U.getShortUnaligned(STABLE_SHORT_ARRAY, ARRAY_SHORT_BASE_OFFSET + 1); }
+        static char    testC_U() { return U.getCharUnaligned(  STABLE_CHAR_ARRAY,  ARRAY_CHAR_BASE_OFFSET + 1); }
+        static int     testI_U() { return U.getIntUnaligned(    STABLE_INT_ARRAY,   ARRAY_INT_BASE_OFFSET + 1); }
+        static long    testJ_U() { return U.getLongUnaligned(  STABLE_LONG_ARRAY,  ARRAY_LONG_BASE_OFFSET + 1); }
+    }
+    // @formatter:on
+
+    void run(Callable<?> c) throws Exception {
+        run(c, null, null);
+    }
+
+    @Override
+    protected StructuredGraph parse(Builder builder, PhaseSuite<HighTierContext> graphBuilderSuite) {
+        StructuredGraph graph = super.parse(builder, graphBuilderSuite);
+        applyStable(graph);
+        return graph;
+    }
+
+    /**
+     * Finds each {@link ConstantNode} in {@code graph} that wraps one of the {@link #StableArrays}
+     * and replaces it with {@link ConstantNode} with a
+     * {@linkplain ConstantNode#getStableDimension() stable dimension} of 1.
+     */
+    private void applyStable(StructuredGraph graph) {
+        if (graph.method().getDeclaringClass().toJavaName().equals(Test.class.getName())) {
+            SnippetReflectionProvider snippetReflection = getSnippetReflection();
+            for (ConstantNode cn : graph.getNodes().filter(ConstantNode.class)) {
+                JavaConstant javaConstant = (JavaConstant) cn.getValue();
+                Object obj = snippetReflection.asObject(Object.class, javaConstant);
+                if (StableArrays.contains(obj)) {
+                    ConstantNode stableConstant = ConstantNode.forConstant(javaConstant, 1, cn.isDefaultStable(), getMetaAccess());
+                    cn.replace(graph, stableConstant);
+                    break;
+                }
+            }
+        }
+    }
+
+    private static void assertEQ(CompiledMethod compiledMethod, Object left, Object right) {
+        Assert.assertEquals(String.valueOf(compiledMethod.method), left, right);
+    }
+
+    private static void assertNE(CompiledMethod compiledMethod, Object left, Object right) {
+        Assert.assertNotEquals(String.valueOf(compiledMethod.method), left, right);
+    }
+
+    static class CompiledMethod {
+        final ResolvedJavaMethod method;
+        final InstalledCode code;
+
+        CompiledMethod(ResolvedJavaMethod method, InstalledCode code) {
+            this.method = method;
+            this.code = code;
+        }
+
+        Object call() throws InvalidInstalledCodeException {
+            return this.code.executeVarargs();
+        }
+    }
+
+    /**
+     * Compile the method called by the lambda wrapped by {@code c}.
+     */
+    private CompiledMethod compile(Callable<?> c) {
+        ResolvedJavaMethod m = getResolvedJavaMethod(c.getClass(), "call");
+        StructuredGraph graph = parseEager(m, AllowAssumptions.NO);
+        List<ResolvedJavaMethod> invokedMethods = StreamSupport.stream(graph.getInvokes().spliterator(), false).map((inv) -> inv.getTargetMethod()).collect(Collectors.toList());
+        Assert.assertEquals(String.valueOf(invokedMethods), 1, invokedMethods.size());
+        ResolvedJavaMethod invokedMethod = invokedMethods.get(0);
+        return new CompiledMethod(invokedMethod, getCode(invokedMethods.get(0)));
+    }
+
+    void run(Callable<?> c, Runnable sameResultAction, Runnable changeResultAction) throws Exception {
+        Object first = c.call();
+        CompiledMethod cm = compile(c);
+
+        if (sameResultAction != null) {
+            sameResultAction.run();
+            assertEQ(cm, first, cm.call());
+        }
+
+        if (changeResultAction != null) {
+            changeResultAction.run();
+            assertNE(cm, first, cm.call());
+            assertEQ(cm, cm.call(), cm.call());
+        }
+    }
+
+    /**
+     * Tests this sequence:
+     *
+     * <pre>
+     * 1. {@code res1 = c()}
+     * 2. Compile c.
+     * 3. Change stable array element read by c.
+     * 4. {@code res2 = c()}
+     * 5. {@code assert Objects.equals(res1, res2)}
+     * </pre>
+     *
+     * That is, tests that compiling a method with an unsafe read of a stable array element folds
+     * the element value into the compiled code.
+     *
+     * @param c a handle to one of the methods in {@link Test}
+     * @param setDefaultAction a method that when invoked will change the value of the array element
+     *            read by {@code c}
+     */
+    void testMatched(Callable<?> c, Runnable setDefaultAction) throws Exception {
+        run(c, setDefaultAction, null);
+        Setter.reset();
+    }
+
+    /**
+     * Tests this sequence:
+     *
+     * <pre>
+     * 1. {@code res1 = c()}
+     * 2. Compile c.
+     * 3. Change stable array element read by c.
+     * 4. {@code res2 = c()}
+     * 5. {@code assert !Objects.equals(res1, res2)}
+     * </pre>
+     *
+     * That is, tests that compiling a method with an unsafe read of a stable array element does not
+     * fold the element value into the compiled code.
+     *
+     * @param c a handle to one of the methods in {@link Test}
+     * @param setDefaultAction a method that when invoked will change the value of the array element
+     *            read by {@code c}
+     */
+    void testMismatched(Callable<?> c, Runnable setDefaultAction) throws Exception {
+        run(c, null, setDefaultAction);
+        Setter.reset();
+    }
+
+    void testUnsafeAccess() throws Exception {
+        // boolean[], aligned accesses
+        testMatched(Test::testZ_Z, Test::changeZ);
+        testMatched(Test::testZ_B, Test::changeZ);
+        testMatched(Test::testZ_S, Test::changeZ);
+        testMatched(Test::testZ_C, Test::changeZ);
+        testMatched(Test::testZ_I, Test::changeZ);
+        testMatched(Test::testZ_J, Test::changeZ);
+        testMatched(Test::testZ_F, Test::changeZ);
+        testMatched(Test::testZ_D, Test::changeZ);
+
+        // byte[], aligned accesses
+        testMatched(Test::testB_Z, Test::changeB);
+        testMatched(Test::testB_B, Test::changeB);
+        testMatched(Test::testB_S, Test::changeB);
+        testMatched(Test::testB_C, Test::changeB);
+        testMatched(Test::testB_I, Test::changeB);
+        testMatched(Test::testB_J, Test::changeB);
+        testMatched(Test::testB_F, Test::changeB);
+        testMatched(Test::testB_D, Test::changeB);
+
+        // short[], aligned accesses
+        testMatched(Test::testS_Z, Test::changeS);
+        testMatched(Test::testS_B, Test::changeS);
+        testMatched(Test::testS_S, Test::changeS);
+        testMatched(Test::testS_C, Test::changeS);
+        testMatched(Test::testS_I, Test::changeS);
+        testMatched(Test::testS_J, Test::changeS);
+        testMatched(Test::testS_F, Test::changeS);
+        testMatched(Test::testS_D, Test::changeS);
+
+        // char[], aligned accesses
+        testMatched(Test::testC_Z, Test::changeC);
+        testMatched(Test::testC_B, Test::changeC);
+        testMatched(Test::testC_S, Test::changeC);
+        testMatched(Test::testC_C, Test::changeC);
+        testMatched(Test::testC_I, Test::changeC);
+        testMatched(Test::testC_J, Test::changeC);
+        testMatched(Test::testC_F, Test::changeC);
+        testMatched(Test::testC_D, Test::changeC);
+
+        // int[], aligned accesses
+        testMatched(Test::testI_Z, Test::changeI);
+        testMatched(Test::testI_B, Test::changeI);
+        testMatched(Test::testI_S, Test::changeI);
+        testMatched(Test::testI_C, Test::changeI);
+        testMatched(Test::testI_I, Test::changeI);
+        testMatched(Test::testI_J, Test::changeI);
+        testMatched(Test::testI_F, Test::changeI);
+        testMatched(Test::testI_D, Test::changeI);
+
+        // long[], aligned accesses
+        testMatched(Test::testJ_Z, Test::changeJ);
+        testMatched(Test::testJ_B, Test::changeJ);
+        testMatched(Test::testJ_S, Test::changeJ);
+        testMatched(Test::testJ_C, Test::changeJ);
+        testMatched(Test::testJ_I, Test::changeJ);
+        testMatched(Test::testJ_J, Test::changeJ);
+        testMatched(Test::testJ_F, Test::changeJ);
+        testMatched(Test::testJ_D, Test::changeJ);
+
+        // float[], aligned accesses
+        testMatched(Test::testF_Z, Test::changeF);
+        testMatched(Test::testF_B, Test::changeF);
+        testMatched(Test::testF_S, Test::changeF);
+        testMatched(Test::testF_C, Test::changeF);
+        testMatched(Test::testF_I, Test::changeF);
+        testMatched(Test::testF_J, Test::changeF);
+        testMatched(Test::testF_F, Test::changeF);
+        testMatched(Test::testF_D, Test::changeF);
+
+        // double[], aligned accesses
+        testMatched(Test::testD_Z, Test::changeD);
+        testMatched(Test::testD_B, Test::changeD);
+        testMatched(Test::testD_S, Test::changeD);
+        testMatched(Test::testD_C, Test::changeD);
+        testMatched(Test::testD_I, Test::changeD);
+        testMatched(Test::testD_J, Test::changeD);
+        testMatched(Test::testD_F, Test::changeD);
+        testMatched(Test::testD_D, Test::changeD);
+
+        // Object[], aligned accesses
+        testMatched(Test::testL_L, Test::changeL);
+        testMismatched(Test::testL_J, Test::changeL); // long & double are always as large as an OOP
+        testMismatched(Test::testL_D, Test::changeL);
+
+        // Unaligned accesses
+        testMatched(Test::testS_U, Test::changeS);
+        testMatched(Test::testC_U, Test::changeC);
+        testMatched(Test::testI_U, Test::changeI);
+        testMatched(Test::testJ_U, Test::changeJ);
+    }
+
+    @org.junit.Test
+    public void main() throws Exception {
+        testUnsafeAccess();
+    }
+}
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
index 2fed2cb69022..b265d4b788d6 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
@@ -24,20 +24,20 @@
  */
 package org.graalvm.compiler.core.test;
 
-import jdk.vm.ci.amd64.AMD64;
-import jdk.vm.ci.meta.ResolvedJavaMethod;
+import java.util.stream.IntStream;
 
 import org.graalvm.compiler.core.common.CompilationIdentifier;
 import org.graalvm.compiler.nodes.ConstantNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
 import org.graalvm.compiler.options.OptionValues;
-import org.junit.Assume;
 import org.junit.Test;
 
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+
 public class StableArrayReadFoldingTest extends GraalCompilerTest {
 
     static final boolean[] STABLE_BOOLEAN_ARRAY = new boolean[16];
-    static final int[] STABLE_INT_ARRAY = new int[16];
+    static final int[] STABLE_INT_ARRAY = IntStream.range(42, 42 + 16).toArray();
 
     static final long BOOLEAN_ARRAY_BASE_OFFSET;
     static final long INT_ARRAY_BASE_OFFSET;
@@ -101,11 +101,25 @@ public static boolean killWithSameTypeUnaligned() {
 
     @Test
     public void testKillWithSameTypeUnaligned() {
-        Assume.assumeTrue("Only test unaligned access on AMD64", getTarget().arch instanceof AMD64);
         ResolvedJavaMethod method = getResolvedJavaMethod("killWithSameTypeUnaligned");
         testAgainstExpected(method, new Result(true, null), null);
     }
 
+    public static boolean killWithSameTypeUnalignedVolatile() {
+        int beforeKill = UNSAFE.getIntVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+        STABLE_INT_ARRAY[0] = 0x01020304;
+        int afterKill = UNSAFE.getIntVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+
+        STABLE_INT_ARRAY[0] = 0;
+        return beforeKill == afterKill;
+    }
+
+    @Test
+    public void testKillWithSameTypeUnalignedVolatile() {
+        ResolvedJavaMethod method = getResolvedJavaMethod("killWithSameTypeUnalignedVolatile");
+        testAgainstExpected(method, new Result(true, null), null);
+    }
+
     public static boolean killWithDifferentTypeUnaligned() {
         byte beforeKill = UNSAFE.getByte(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
         STABLE_INT_ARRAY[0] = 0x01020304;
@@ -117,8 +131,22 @@ public static boolean killWithDifferentTypeUnaligned() {
 
     @Test
     public void testKillWithDifferentTypeUnaligned() {
-        Assume.assumeTrue("Only test unaligned access on AMD64", getTarget().arch instanceof AMD64);
         ResolvedJavaMethod method = getResolvedJavaMethod("killWithDifferentTypeUnaligned");
         testAgainstExpected(method, new Result(true, null), null);
     }
+
+    public static boolean killWithDifferentTypeUnalignedVolatile() {
+        byte beforeKill = UNSAFE.getByteVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+        STABLE_INT_ARRAY[0] = 0x01020304;
+        byte afterKill = UNSAFE.getByteVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+
+        STABLE_INT_ARRAY[0] = 0;
+        return beforeKill == afterKill;
+    }
+
+    @Test
+    public void testKillWithDifferentTypeUnalignedVolatile() {
+        ResolvedJavaMethod method = getResolvedJavaMethod("killWithDifferentTypeUnalignedVolatile");
+        testAgainstExpected(method, new Result(true, null), null);
+    }
 }
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
index 033d97d36bdc..26b808787dbc 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
@@ -24,8 +24,11 @@
  */
 package org.graalvm.compiler.core.test;
 
+import java.lang.reflect.Field;
+
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.core.common.type.StampFactory;
+import org.junit.Assert;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.JavaConstant;
@@ -33,12 +36,16 @@
 import jdk.vm.ci.meta.MemoryAccessProvider;
 
 /**
- *
+ * Tests {@link MemoryAccessProvider#readObjectConstant} and
+ * {@link MemoryAccessProvider#readPrimitiveConstant} by way of {@link Stamp#readConstant}.
  */
 public class StampMemoryAccessTest extends GraalCompilerTest {
 
+    long longField1 = Double.doubleToRawLongBits(Double.MAX_VALUE);
+    long longField2 = Double.doubleToRawLongBits(Double.MIN_VALUE);
+
     @Test
-    public void testReadPrimitive() {
+    public void testReadPrimitiveOutOfBounds() {
         MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
         Stamp stamp = StampFactory.forKind(JavaKind.Long);
         JavaConstant objectBase = getSnippetReflection().forObject("");
@@ -48,7 +55,7 @@ public void testReadPrimitive() {
     }
 
     @Test
-    public void testReadObject() {
+    public void testReadObjectOutOfBounds() {
         MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
         Stamp stamp = StampFactory.forKind(JavaKind.Object);
         JavaConstant objectBase = getSnippetReflection().forObject("");
@@ -56,4 +63,39 @@ public void testReadObject() {
         JavaConstant arrayBase = getSnippetReflection().forObject(new int[]{});
         assertTrue(stamp.readConstant(memory, arrayBase, 128) == null);
     }
+
+    @Test
+    public void testReadPrimitiveUnaligned() throws Exception {
+        MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
+        Object object = this;
+        JavaConstant objectBase = getSnippetReflection().forObject(object);
+        Field f = getClass().getDeclaredField("longField1");
+        long baseDisplacement = UNSAFE.objectFieldOffset(f);
+        for (JavaKind kind : JavaKind.values()) {
+            if (kind.isPrimitive() && kind != JavaKind.Void && kind.getByteCount() > 1) {
+                for (long offset = 1; offset < kind.getByteCount(); offset++) {
+                    long displacement = baseDisplacement + offset;
+                    Stamp stamp = StampFactory.forKind(kind);
+                    JavaKind stackKind = stamp.getStackKind();
+                    JavaConstant expect = readPrimitiveUnsafe(stackKind, object, displacement);
+                    Assert.assertEquals(expect, stamp.readConstant(memory, objectBase, displacement));
+                }
+            }
+        }
+    }
+
+    private static JavaConstant readPrimitiveUnsafe(JavaKind kind, Object object, long displacement) {
+        switch (kind) {
+            case Int:
+                return JavaConstant.forInt(UNSAFE.getInt(object, displacement));
+            case Long:
+                return JavaConstant.forLong(UNSAFE.getLong(object, displacement));
+            case Float:
+                return JavaConstant.forFloat(UNSAFE.getFloat(object, displacement));
+            case Double:
+                return JavaConstant.forDouble(UNSAFE.getDouble(object, displacement));
+            default:
+                throw new AssertionError("Unexpected kind: " + kind);
+        }
+    }
 }

From cb9f83b1bce7a5d9d101eca1266a1c95202aab66 Mon Sep 17 00:00:00 2001
From: Doug Simon <doug.simon@oracle.com>
Date: Thu, 28 Oct 2021 23:11:10 +0200
Subject: [PATCH 673/681] do not constant fold unaligned reads

---
 .../core/common/type/PrimitiveStamp.java      | 78 +++----------------
 .../test/UnsafeGetStableArrayElement.java     |  8 +-
 .../core/test/StableArrayReadFoldingTest.java | 51 ++++--------
 .../core/test/StampMemoryAccessTest.java      | 22 +-----
 4 files changed, 34 insertions(+), 125 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
index cb2dbaf83ff1..5d6567fcdc74 100644
--- a/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
+++ b/compiler/src/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java
@@ -24,17 +24,10 @@
  */
 package org.graalvm.compiler.core.common.type;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
 import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.serviceprovider.BufferUtil;
 
 import jdk.vm.ci.meta.Constant;
-import jdk.vm.ci.meta.JavaConstant;
-import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MemoryAccessProvider;
-import jdk.vm.ci.meta.PrimitiveConstant;
 
 /**
  * Type describing primitive values.
@@ -56,7 +49,7 @@ public void accept(Visitor v) {
     /**
      * The width in bits of the value described by this stamp.
      */
-    public final int getBits() {
+    public int getBits() {
         return bits;
     }
 
@@ -68,18 +61,20 @@ public static int getBits(Stamp stamp) {
         }
     }
 
+    private static boolean isAligned(long displacement, int numBits) {
+        GraalError.guarantee((numBits & 7) == 0, "numBits not a multiple of 8: %d", numBits);
+        int numBytes = numBits / 8;
+        return displacement % numBytes == 0;
+    }
+
     @Override
     public Constant readConstant(MemoryAccessProvider provider, Constant base, long displacement) {
+        if (!isAligned(displacement, getBits())) {
+            // Avoid crash when performing unaligned reads (JDK-8275645)
+            return null;
+        }
         try {
-            int numBits = getBits();
-            GraalError.guarantee((numBits & 7) == 0, "numBits not a multiple of 8: %d", numBits);
-            int numBytes = numBits / 8;
-            boolean aligned = displacement % numBytes == 0;
-            if (aligned) {
-                return provider.readPrimitiveConstant(getStackKind(), base, displacement, numBits);
-            } else {
-                return readConstantUnaligned(provider, base, displacement, numBytes, getStackKind());
-            }
+            return provider.readPrimitiveConstant(getStackKind(), base, displacement, getBits());
         } catch (IllegalArgumentException e) {
             /*
              * It's possible that the base and displacement aren't valid together so simply return
@@ -89,55 +84,6 @@ public Constant readConstant(MemoryAccessProvider provider, Constant base, long
         }
     }
 
-    /**
-     * As a result of JDK-8275874, {@link MemoryAccessProvider#readPrimitiveConstant} cannot be used
-     * for unaligned reads. Instead, it has to be done by reading individual bytes and stitching
-     * them together. The read is non-atomic which is fine for constant folding stable values (i.e.
-     * compile-time constant fields/elements).
-     */
-    private static Constant readConstantUnaligned(MemoryAccessProvider provider, Constant base, long displacement, int numBytes, JavaKind stackKind) {
-        ByteBuffer buf = ByteBuffer.allocate(numBytes);
-        for (int i = 0; i < numBytes; i++) {
-            JavaConstant c = provider.readPrimitiveConstant(JavaKind.Byte, base, displacement + i, 8);
-            if (c == null) {
-                // Some implementations of MemoryAccessProvider (e.g. HostedMemoryAccessProvider)
-                // can return null from readPrimitiveConstant
-                return null;
-            }
-            byte b = (byte) c.asInt();
-            buf.put(b);
-        }
-        BufferUtil.asBaseBuffer(buf).rewind();
-        buf.order(ByteOrder.nativeOrder());
-        if (numBytes == 8) {
-            return forPrimitive(stackKind, buf.getLong());
-        }
-        if (numBytes == 4) {
-            return forPrimitive(stackKind, buf.getInt());
-        }
-        GraalError.guarantee(numBytes == 2, "unexpected numBytes: %d", numBytes);
-        return forPrimitive(stackKind, buf.getShort());
-    }
-
-    /**
-     * Work around for {@code JavaConstant.forPrimitive(JavaKind kind, long rawValue)} only be
-     * available in more recent JVMCI versions.
-     */
-    private static PrimitiveConstant forPrimitive(JavaKind stackKind, long rawValue) {
-        switch (stackKind) {
-            case Int:
-                return JavaConstant.forInt((int) rawValue);
-            case Long:
-                return JavaConstant.forLong(rawValue);
-            case Float:
-                return JavaConstant.forFloat(Float.intBitsToFloat((int) rawValue));
-            case Double:
-                return JavaConstant.forDouble(Double.longBitsToDouble(rawValue));
-            default:
-                throw new IllegalArgumentException("Unexpected stack kind: " + stackKind);
-        }
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
diff --git a/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java b/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java
index f84c446b6f8a..c56b72001ebc 100644
--- a/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java
+++ b/compiler/src/org.graalvm.compiler.core.jdk9.test/src/org/graalvm/compiler/core/jdk9/test/UnsafeGetStableArrayElement.java
@@ -424,10 +424,10 @@ void testUnsafeAccess() throws Exception {
         testMismatched(Test::testL_D, Test::changeL);
 
         // Unaligned accesses
-        testMatched(Test::testS_U, Test::changeS);
-        testMatched(Test::testC_U, Test::changeC);
-        testMatched(Test::testI_U, Test::changeI);
-        testMatched(Test::testJ_U, Test::changeJ);
+        testMismatched(Test::testS_U, Test::changeS);
+        testMismatched(Test::testC_U, Test::changeC);
+        testMismatched(Test::testI_U, Test::changeI);
+        testMismatched(Test::testJ_U, Test::changeJ);
     }
 
     @org.junit.Test
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
index b265d4b788d6..f2e515a13a3f 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java
@@ -36,8 +36,9 @@
 
 public class StableArrayReadFoldingTest extends GraalCompilerTest {
 
+    static final int FIRST_INT = 42;
     static final boolean[] STABLE_BOOLEAN_ARRAY = new boolean[16];
-    static final int[] STABLE_INT_ARRAY = IntStream.range(42, 42 + 16).toArray();
+    static final int[] STABLE_INT_ARRAY = IntStream.range(FIRST_INT, FIRST_INT + 16).toArray();
 
     static final long BOOLEAN_ARRAY_BASE_OFFSET;
     static final long INT_ARRAY_BASE_OFFSET;
@@ -95,58 +96,34 @@ public static boolean killWithSameTypeUnaligned() {
         STABLE_INT_ARRAY[0] = 0x01020304;
         int afterKill = UNSAFE.getInt(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
 
-        STABLE_INT_ARRAY[0] = 0;
+        STABLE_INT_ARRAY[0] = FIRST_INT;
         return beforeKill == afterKill;
     }
 
+    /**
+     * Checks that unaligned reads are not constant folded.
+     */
     @Test
     public void testKillWithSameTypeUnaligned() {
         ResolvedJavaMethod method = getResolvedJavaMethod("killWithSameTypeUnaligned");
-        testAgainstExpected(method, new Result(true, null), null);
-    }
-
-    public static boolean killWithSameTypeUnalignedVolatile() {
-        int beforeKill = UNSAFE.getIntVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
-        STABLE_INT_ARRAY[0] = 0x01020304;
-        int afterKill = UNSAFE.getIntVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
-
-        STABLE_INT_ARRAY[0] = 0;
-        return beforeKill == afterKill;
-    }
-
-    @Test
-    public void testKillWithSameTypeUnalignedVolatile() {
-        ResolvedJavaMethod method = getResolvedJavaMethod("killWithSameTypeUnalignedVolatile");
-        testAgainstExpected(method, new Result(true, null), null);
+        testAgainstExpected(method, new Result(false, null), null);
     }
 
     public static boolean killWithDifferentTypeUnaligned() {
-        byte beforeKill = UNSAFE.getByte(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+        short beforeKill = UNSAFE.getShort(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
         STABLE_INT_ARRAY[0] = 0x01020304;
-        byte afterKill = UNSAFE.getByte(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
+        short afterKill = UNSAFE.getShort(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
 
-        STABLE_INT_ARRAY[0] = 0;
+        STABLE_INT_ARRAY[0] = FIRST_INT;
         return beforeKill == afterKill;
     }
 
+    /**
+     * Checks that unaligned reads are not constant folded.
+     */
     @Test
     public void testKillWithDifferentTypeUnaligned() {
         ResolvedJavaMethod method = getResolvedJavaMethod("killWithDifferentTypeUnaligned");
-        testAgainstExpected(method, new Result(true, null), null);
-    }
-
-    public static boolean killWithDifferentTypeUnalignedVolatile() {
-        byte beforeKill = UNSAFE.getByteVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
-        STABLE_INT_ARRAY[0] = 0x01020304;
-        byte afterKill = UNSAFE.getByteVolatile(STABLE_INT_ARRAY, INT_ARRAY_BASE_OFFSET + 1);
-
-        STABLE_INT_ARRAY[0] = 0;
-        return beforeKill == afterKill;
-    }
-
-    @Test
-    public void testKillWithDifferentTypeUnalignedVolatile() {
-        ResolvedJavaMethod method = getResolvedJavaMethod("killWithDifferentTypeUnalignedVolatile");
-        testAgainstExpected(method, new Result(true, null), null);
+        testAgainstExpected(method, new Result(false, null), null);
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
index 26b808787dbc..f5ce3cf893c6 100644
--- a/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
+++ b/compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java
@@ -64,6 +64,9 @@ public void testReadObjectOutOfBounds() {
         assertTrue(stamp.readConstant(memory, arrayBase, 128) == null);
     }
 
+    /**
+     * Checks that unaligned reads are not constant folded.
+     */
     @Test
     public void testReadPrimitiveUnaligned() throws Exception {
         MemoryAccessProvider memory = getConstantReflection().getMemoryAccessProvider();
@@ -76,26 +79,9 @@ public void testReadPrimitiveUnaligned() throws Exception {
                 for (long offset = 1; offset < kind.getByteCount(); offset++) {
                     long displacement = baseDisplacement + offset;
                     Stamp stamp = StampFactory.forKind(kind);
-                    JavaKind stackKind = stamp.getStackKind();
-                    JavaConstant expect = readPrimitiveUnsafe(stackKind, object, displacement);
-                    Assert.assertEquals(expect, stamp.readConstant(memory, objectBase, displacement));
+                    Assert.assertEquals(null, stamp.readConstant(memory, objectBase, displacement));
                 }
             }
         }
     }
-
-    private static JavaConstant readPrimitiveUnsafe(JavaKind kind, Object object, long displacement) {
-        switch (kind) {
-            case Int:
-                return JavaConstant.forInt(UNSAFE.getInt(object, displacement));
-            case Long:
-                return JavaConstant.forLong(UNSAFE.getLong(object, displacement));
-            case Float:
-                return JavaConstant.forFloat(UNSAFE.getFloat(object, displacement));
-            case Double:
-                return JavaConstant.forDouble(UNSAFE.getDouble(object, displacement));
-            default:
-                throw new AssertionError("Unexpected kind: " + kind);
-        }
-    }
 }

From 5d32ef104307e95b6f586a8b312047289e83bb73 Mon Sep 17 00:00:00 2001
From: Christian Wimmer <christian.wimmer@oracle.com>
Date: Thu, 28 Oct 2021 11:47:24 -0700
Subject: [PATCH 674/681] PEGraphDecoder reports wrong method for invocation
 plugins

---
 .../replacements/IntrinsicGraphBuilder.java        | 10 +++++++++-
 .../compiler/replacements/PEGraphDecoder.java      | 11 ++++++++++-
 .../SubstrateReflectionGetCallerClassNode.java     |  2 +-
 .../com/oracle/svm/core/jdk/StackTraceUtils.java   |  4 ++++
 .../svm/hosted/snippets/ReflectionPlugins.java     | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
index 3c1531038a42..a88f8654d9f5 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
@@ -284,7 +284,15 @@ public Bytecode getCode() {
 
     @Override
     public ResolvedJavaMethod getMethod() {
-        return method;
+        /*
+         * Invocation plugins expect to get the caller method that triggers the intrinsification.
+         * Since we are compiling the intrinsic on its own, we do not have any such caller method.
+         *
+         * In particular, returning `method` would be misleading because it is the method that is
+         * intrinsified, not the caller. The invocation plugin gets that method passed in as the
+         * `targetMethod` already.
+         */
+        return null;
     }
 
     @Override
diff --git a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
index 290c58b0c74d..3ec9337c5810 100644
--- a/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
@@ -352,7 +352,7 @@ public boolean needsExplicitException() {
 
         @Override
         public boolean isParsingInvocationPlugin() {
-            throw GraalError.shouldNotReachHere();
+            return false;
         }
 
         /**
@@ -449,6 +449,15 @@ public Bytecode getCode() {
 
         @Override
         public ResolvedJavaMethod getMethod() {
+            if (isParsingInvocationPlugin()) {
+                /*
+                 * While processing an invocation plugin, it is required to return the method that
+                 * calls the intrinsified method. But our methodScope object is for the callee,
+                 * i.e., the intrinsified method itself, for various other reasons. So we need to
+                 * compensate for that.
+                 */
+                return methodScope.caller.method;
+            }
             return methodScope.method;
         }
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
index 839463db4442..b0cfdde5aa93 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
@@ -53,6 +53,6 @@ protected boolean isCallerSensitive(ResolvedJavaMethod method) {
 
     @Override
     protected boolean ignoredBySecurityStackWalk(MetaAccessProvider metaAccess, ResolvedJavaMethod method) {
-        return !StackTraceUtils.shouldShowFrame(metaAccess, method, true, false, false);
+        return StackTraceUtils.ignoredBySecurityStackWalk(metaAccess, method);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
index fd0712617a24..e7275cfede50 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
@@ -171,6 +171,10 @@ public static boolean shouldShowFrame(MetaAccessProvider metaAccess, ResolvedJav
         return true;
     }
 
+    public static boolean ignoredBySecurityStackWalk(MetaAccessProvider metaAccess, ResolvedJavaMethod method) {
+        return !shouldShowFrame(metaAccess, method, true, false, false);
+    }
+
     public static ClassLoader latestUserDefinedClassLoader(Pointer startSP) {
         GetLatestUserDefinedClassLoaderVisitor visitor = new GetLatestUserDefinedClassLoaderVisitor();
         JavaStackWalker.walkCurrentThread(startSP, visitor);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
index 1a8bd9e723a7..76d3f034db33 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
@@ -66,6 +66,7 @@
 import com.oracle.svm.core.TypeResult;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.hub.PredefinedClassesSupport;
+import com.oracle.svm.core.jdk.StackTraceUtils;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ExceptionSynthesizer;
@@ -200,6 +201,11 @@ private void registerMethodHandlesPlugins(InvocationPlugins plugins) {
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver) {
                 return processMethodHandlesLookup(b, targetMethod);
             }
+
+            @Override
+            public boolean inlineOnly() {
+                return true;
+            }
         });
     }
 
@@ -248,6 +254,14 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
     private boolean processMethodHandlesLookup(GraphBuilderContext b, ResolvedJavaMethod targetMethod) {
         Supplier<String> targetParameters = () -> "";
 
+        if (StackTraceUtils.ignoredBySecurityStackWalk(b.getMetaAccess(), b.getMethod())) {
+            /*
+             * If our immediate caller (which is the only method available at the time the
+             * invocation plugin is running) is not the method returned by
+             * Reflection.getCallerClass(), we cannot intrinsify.
+             */
+            return false;
+        }
         Class<?> callerClass = OriginalClassProvider.getJavaClass(snippetReflection, b.getMethod().getDeclaringClass());
         MethodHandles.Lookup lookup;
         try {

From b5c796c9f040d89458cd655185b723e037ed6bdd Mon Sep 17 00:00:00 2001
From: Danilo Ansaloni <danilo.ansaloni@oracle.com>
Date: Fri, 29 Oct 2021 09:15:17 +0200
Subject: [PATCH 675/681] Remove unnecessary env file.

---
 vm/mx.vm/ce-llimul | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 vm/mx.vm/ce-llimul

diff --git a/vm/mx.vm/ce-llimul b/vm/mx.vm/ce-llimul
deleted file mode 100644
index 0bca517fda64..000000000000
--- a/vm/mx.vm/ce-llimul
+++ /dev/null
@@ -1,4 +0,0 @@
-DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,ins,insight,insightheap,js,lg,llrc,llrl,llrn,lsp,nfi,poly,polynative,pro,rgx,sdk,svm,svml,svmnfi,tfl,tflm,vvm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,gu,js,lib:jvmcicompiler,lli
-DISABLE_INSTALLABLES=False

From f03e7eee450d5b33ef6741f678943ddb8a6124d8 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Sun, 31 Oct 2021 21:50:24 +0000
Subject: [PATCH 676/681] [GR-23997] Periodic update of the graal import
 (2021-10-29).

PullRequest: js/2206
---
 vm/mx.vm/suite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
index afc96f909142..9b07de440292 100644
--- a/vm/mx.vm/suite.py
+++ b/vm/mx.vm/suite.py
@@ -39,7 +39,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "7aa0711bf4d8df2753b90c934b18241180abd861",
+                "version": "0dfde8bc88e444ec77a96e883e70a666e3c97272",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -49,7 +49,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "7aa0711bf4d8df2753b90c934b18241180abd861",
+                "version": "0dfde8bc88e444ec77a96e883e70a666e3c97272",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

From 18e56608b56efce4669990371b6882cca0044d33 Mon Sep 17 00:00:00 2001
From: David Kozak <david.kozak@oracle.com>
Date: Tue, 26 Oct 2021 16:32:03 +0200
Subject: [PATCH 677/681] register an object replacer for ResourceBundles

---
 .../jdk/localization/LocalizationFeature.java | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
index 3d38100016f8..f9ae1e9369e6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
@@ -260,6 +260,40 @@ public void afterRegistration(AfterRegistrationAccess access) {
         }
     }
 
+    @Override
+    public void duringSetup(DuringSetupAccess access) {
+        if (optimizedMode) {
+            access.registerObjectReplacer(this::eagerlyInitializeBundles);
+        }
+    }
+
+    /**
+     * In the optimized localization support, the bundles are stored in a map. In order to make the
+     * getContents methods unreachable, the bundles are initialized eagerly and the lookup methods
+     * are substituted. However, if there are bundle instances somewhere in the heap that were not
+     * put in the map, they won't be initialized and therefore accessing their content will cause
+     * runtime failures. Therefore, we visit each object in the heap and if it is a ResourceBundle,
+     * we eagerly initialize it.
+     */
+    private Object eagerlyInitializeBundles(Object object) {
+        assert optimizedMode : "Should only be triggered in the optimized mode.";
+        if (object instanceof ResourceBundle) {
+            ResourceBundle bundle = (ResourceBundle) object;
+            try {
+                /*
+                 * getKeys can be null for ResourceBundle.NONEXISTENT_BUNDLE, which causes the
+                 * keySet method to crash.
+                 */
+                if (bundle.getKeys() != null) {
+                    bundle.keySet();
+                }
+            } catch (Exception ex) {
+                trace("Failed to eagerly initialize bundle " + bundle + ", " + bundle.getBaseBundleName() + ", reason " + ex.getClass() + " " + ex.getMessage());
+            }
+        }
+        return object;
+    }
+
     @Platforms(Platform.HOSTED_ONLY.class)
     private LocalizationSupport selectLocalizationSupport() {
         if (optimizedMode) {

From 018c904164c50ecac39946aa298f1c846d15972c Mon Sep 17 00:00:00 2001
From: berstanio <sebastian_grunwald@web.de>
Date: Thu, 26 Aug 2021 13:29:57 +0200
Subject: [PATCH 678/681] First implementation of LLVMDebugInfoBuilder. (Merged
 Noisyfox's wip)

---
 substratevm/mx.substratevm/suite.py           |  26 +--
 .../graal/llvm/LLVMNativeImageCodeCache.java  |   6 +-
 .../svm/core/graal/llvm/NodeLLVMBuilder.java  |  27 ++-
 .../core/graal/llvm/SubstrateLLVMBackend.java |   1 +
 .../llvm/debug/LLVMDebugInfoBuilder.java      | 199 ++++++++++++++++
 .../LLVMNativeImageDebugInfoProvider.java     | 218 ++++++++++++++++++
 .../core/graal/llvm/util/LLVMIRBuilder.java   |  38 +--
 .../svm/core/graal/llvm/util/LLVMOptions.java |   3 +-
 .../com/oracle/svm/core/SubstrateOptions.java |  10 +-
 .../svm/hosted/NativeImageGenerator.java      |   3 +
 .../oracle/svm/hosted/image/NativeImage.java  |   3 +-
 .../image/NativeImageDebugInfoProvider.java   |   6 +-
 12 files changed, 499 insertions(+), 41 deletions(-)
 create mode 100644 substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
 create mode 100644 substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMNativeImageDebugInfoProvider.java

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index b51a8b10c431..8196f2cdbbe4 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -80,31 +80,31 @@
            },
         },
         "LLVM_WRAPPER_SHADOWED": {
-            "sha1" : "f2d365a8d432d6b2127acda19c5d3418126db9b0",
-            "sourceSha1" : "0801daf22b189bbd9d515614a2b79c92af225d56",
+            "sha1" : "9b75be4025a567a5614095a58cafa0866b434649",
+            "sourceSha1" : "3ada2e3b681326b3b112a5544ea28f70eff6e6ab",
             "dependencies" : ["JAVACPP_SHADOWED"],
-            "urlbase": "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/native-image",
-            "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2.jar"],
-            "sourceUrls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2-sources.jar"],
+            "urlbase": "http://mos.bplaced.net/llvm",
+            "urls": ["{urlbase}/llvm.jar"],
+            "sourceUrls": ["{urlbase}/llvm-sources.jar"],
             "license" : "GPLv2-CPE",
             "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm"
         },
         "JAVACPP_SHADOWED": {
-            "sha1" : "212aaddcd73448c7b6da781fb6cde934c667dc2c",
-            "sourceSha1" : "3e9cfc02750ba8ea3babc1b8546a50ec36b849a2",
-            "urlbase": "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/native-image",
-            "urls": ["{urlbase}/javacpp-shadowed-1.5.2.jar"],
-            "sourceUrls": ["{urlbase}/javacpp-shadowed-1.5.2-sources.jar"],
+            "sha1" : "8a50d14df49e025822afc0ad791435eee0d35166",
+            "sourceSha1" : "d0197a18b557a6c2be510680c395807631139686",
+            "urlbase": "http://mos.bplaced.net/llvm",
+            "urls": ["{urlbase}/javacpp.jar"],
+            "sourceUrls": ["{urlbase}/javacpp-sources.jar"],
             "license" : "GPLv2-CPE",
             "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.javacpp"
         },
         "LLVM_PLATFORM_SPECIFIC_SHADOWED": {
-            "urlbase": "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/native-image",
+            "urlbase": "http://mos.bplaced.net/llvm",
             "os_arch": {
                 "linux": {
                     "amd64": {
-                        "sha1": "53acc3692e0f67f3b4a4e5fa5b4a5a1de1aa7947",
-                        "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2-linux-x86_64.jar"],
+                        "sha1": "45b8746a30bc774e912eb6c5aa83740608107012",
+                        "urls": ["{urlbase}/llvm-linux-x86_64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.x86_64"
                     },
                     "aarch64": {
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
index 9ee35d616beb..e738b8d8ed0f 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
@@ -43,6 +43,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import com.oracle.svm.shadowed.org.bytedeco.javacpp.Loader;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.debug.DebugContext;
@@ -177,8 +178,8 @@ private void compileBitcodeBatches(BatchExecutor executor, DebugContext debug, i
         stackMapDumper.startDumpingFunctions();
 
         executor.forEach(numBatches, batchId -> (debugContext) -> {
-            llvmOptimize(debug, getBatchOptimizedFilename(batchId), getBatchBitcodeFilename(batchId));
-            llvmCompile(debug, getBatchCompiledFilename(batchId), getBatchOptimizedFilename(batchId));
+            //llvmOptimize(debug, getBatchOptimizedFilename(batchId), getBatchBitcodeFilename(batchId));
+            llvmCompile(debug, getBatchCompiledFilename(batchId), getBatchBitcodeFilename(batchId));
 
             LLVMStackMapInfo stackMap = objectFileReader.parseStackMap(getBatchCompiledPath(batchId));
             IntStream.range(getBatchStart(batchId), getBatchEnd(batchId)).forEach(id -> objectFileReader.readStackMap(stackMap, compilations.get(methodIndex[id]), methodIndex[id], id));
@@ -210,6 +211,7 @@ private void linkCompiledBatches(BatchExecutor executor, DebugContext debug, int
         buildRuntimeMetadata(new MethodPointer(firstMethod), WordFactory.signed(textSectionInfo.getCodeSize()));
     }
 
+    //TODO Optimization currently not supported
     private void llvmOptimize(DebugContext debug, String outputPath, String inputPath) {
         List<String> args = new ArrayList<>();
         if (LLVMOptions.BitcodeOptimizations.getValue()) {
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
index a1ca1fbd62c6..a4e5aa34ba71 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
@@ -27,6 +27,7 @@
 import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
 import static org.graalvm.compiler.debug.GraalError.unimplemented;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,6 +38,11 @@
 
 import jdk.vm.ci.meta.PlatformKind;
 import jdk.vm.ci.meta.ValueKind;
+import com.oracle.svm.core.graal.llvm.debug.LLVMDebugInfoBuilder;
+import com.oracle.objectfile.debugentry.TypeEntry;
+import com.oracle.objectfile.debuginfo.DebugInfoProvider;
+import com.oracle.svm.core.graal.llvm.debug.LLVMDebugInfoBuilder;
+import com.oracle.svm.core.graal.llvm.debug.LLVMNativeImageDebugInfoProvider;
 import org.graalvm.compiler.code.CompilationResult;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.calc.Condition;
@@ -131,8 +137,10 @@
 public class NodeLLVMBuilder implements NodeLIRBuilderTool, SubstrateNodeLIRBuilder {
     private final LLVMGenerator gen;
     private final LLVMIRBuilder builder;
-    private final RuntimeConfiguration runtimeConfiguration;
     private final DebugInfoBuilder debugInfoBuilder;
+    private final LLVMNativeImageDebugInfoProvider debugInfoProvider;
+    private final RuntimeConfiguration runtimeConfiguration;
+    public final LLVMDebugInfoBuilder llvmDebugInfoBuilder;
 
     private Map<Node, LLVMValueWrapper> valueMap = new HashMap<>();
     private final Set<AbstractBlockBase<?>> processedBlocks = new HashSet<>();
@@ -142,8 +150,11 @@ public class NodeLLVMBuilder implements NodeLIRBuilderTool, SubstrateNodeLIRBuil
     protected NodeLLVMBuilder(StructuredGraph graph, LLVMGenerator gen, RuntimeConfiguration runtimeConfiguration) {
         this.gen = gen;
         this.builder = gen.getBuilder();
+        // TODO The right place for the debuginfobuilder?
+        this.llvmDebugInfoBuilder = builder.createDIBuilder(graph.method());
         this.runtimeConfiguration = runtimeConfiguration;
         this.debugInfoBuilder = new SubstrateDebugInfoBuilder(graph, gen.getProviders().getMetaAccessExtensionProvider(), this);
+        this.debugInfoProvider = new LLVMNativeImageDebugInfoProvider(graph.getDebug());
         setCompilationResultMethod(gen.getCompilationResult(), graph);
 
         for (Block block : graph.getLastSchedule().getCFG().getBlocks()) {
@@ -278,6 +289,19 @@ public void doBlock(Block block, StructuredGraph graph, BlockMap<List<Node>> blo
 
         for (Node node : blockMap.get(block)) {
             if (node instanceof ValueNode) {
+                DebugInfoProvider.DebugLineInfo debugLineInfo = debugInfoProvider.getLineInfo(node.getNodeSourcePosition());
+                if(debugLineInfo != null) {
+
+                    int line = debugLineInfo.line();
+                    if (line != -1){
+                        /*
+                        *TODO Do this before or after emiting the node?
+                        * */
+                        llvmDebugInfoBuilder.emitLocation(line);
+                    }else {
+                        //TODO When is this the
+                    }
+                }
                 /*
                  * There can be cases in which the result of an instruction is already set before by
                  * other instructions.
@@ -500,7 +524,6 @@ public void emitInvoke(Invoke i) {
         LIRFrameState state = state(i);
         state.initDebugInfo(null, false);
         DebugInfo debugInfo = state.debugInfo();
-
         LLVMValueRef callee;
         boolean isVoid;
         LLVMValueRef[] args = getCallArguments(arguments, callTarget.callType(), targetMethod);
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
index c607ed62b74f..0e257a4663c3 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
@@ -122,6 +122,7 @@ private void emitLLVM(StructuredGraph graph, CompilationResult result) {
 
             /* LLVM generation */
             generate(nodeBuilder, graph);
+            nodeBuilder.llvmDebugInfoBuilder.finalizeBuilder();
             byte[] bitcode = generator.getBitcode();
             result.setTargetCode(bitcode, bitcode.length);
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
new file mode 100644
index 000000000000..c70fbba36f16
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
@@ -0,0 +1,199 @@
+package com.oracle.svm.core.graal.llvm.debug;
+
+import com.oracle.graal.pointsto.infrastructure.WrappedJavaMethod;
+import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.SubstrateUtil;
+import com.oracle.svm.core.graal.llvm.LLVMGenerator;
+import com.oracle.svm.core.graal.llvm.util.LLVMIRBuilder;
+import com.oracle.svm.core.graal.llvm.util.LLVMOptions;
+import com.oracle.svm.core.graal.llvm.util.LLVMUtils;
+import com.oracle.svm.hosted.annotation.CustomSubstitutionMethod;
+import com.oracle.svm.hosted.annotation.CustomSubstitutionType;
+import com.oracle.svm.hosted.image.sources.SourceManager;
+import com.oracle.svm.hosted.lambda.LambdaSubstitutionType;
+import com.oracle.svm.hosted.meta.HostedField;
+import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.hosted.meta.HostedType;
+import com.oracle.svm.hosted.substitute.InjectedFieldsType;
+import com.oracle.svm.hosted.substitute.SubstitutionMethod;
+import com.oracle.svm.hosted.substitute.SubstitutionType;
+import com.oracle.svm.shadowed.org.bytedeco.javacpp.PointerPointer;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMAttributeRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMBuilderRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMContextRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMDIBuilderRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMMetadataRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMModuleRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueMetadataEntry;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
+import com.oracle.svm.shadowed.org.bytedeco.llvm.global.LLVM;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.graph.NodeSourcePosition;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.nativeimage.ImageSingletons;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class LLVMDebugInfoBuilder {
+
+    private LLVMContextRef context;
+    private LLVMDIBuilderRef diBuilder;
+    private LLVMBuilderRef builder;
+
+    private LLVMMetadataRef cu;
+    private LLVMMetadataRef file;
+    private LLVMMetadataRef subprogram;
+    //private LLVMMetadataRef scope;//TODO Cu should need?
+    private ResolvedJavaMethod method;
+    private Path path;
+
+    public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method, LLVMContextRef context, LLVMModuleRef moduleRef, LLVMBuilderRef builderRef){
+        this.context = context;
+        this.method = method;
+        this.builder = builderRef;
+
+        ResolvedJavaType javaType = getDeclaringClass((HostedMethod) method, false);
+        HostedType hostedType = ((HostedMethod) method).getDeclaringClass();
+        Class<?> clazz = hostedType.getJavaClass();
+        SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
+        path = sourceManager.findAndCacheSource(javaType, clazz, debugContext);
+
+
+        diBuilder = LLVM.LLVMCreateDIBuilder(moduleRef);
+         if (path == null) {
+             //TODO could also happen when not defining -H:DebugInfoSourceSearchPath. Should be handled better
+             //TODO This seems to be the case for Proxys
+             return;
+         }
+        path = Paths.get(SubstrateOptions.DebugInfoSourceCacheRoot.getValue(), path.toString());
+        file = LLVM.LLVMDIBuilderCreateFile(diBuilder, path.getFileName().toString(), path.getFileName().toString().length(), path.getParent().toAbsolutePath().toString(), path.getParent().toAbsolutePath().toString().length());
+
+        cu = LLVM.LLVMDIBuilderCreateCompileUnit(diBuilder,
+                LLVM.LLVMDWARFSourceLanguageJava,
+                file,
+                "LLVM version 12.0.1-3-g6e0a5672bc-bgf11ed69a5a",
+                "LLVM version 12.0.1-3-g6e0a5672bc-bgf11ed69a5a".length(),
+                0,
+                null,
+                0,
+                3,
+                null,
+                0,
+                LLVM.LLVMDWARFEmissionFull,
+                0,
+                0,
+                0,
+                null,
+                0,
+                null,
+                0);
+        LLVM.LLVMAddModuleFlag(moduleRef, LLVM.LLVMModuleFlagBehaviorOverride, "Dwarf Version", "Dwarf Version".length(), LLVM.LLVMValueAsMetadata(LLVM.LLVMConstInt(LLVM.LLVMInt32TypeInContext(context), 4, 0)));
+        LLVM.LLVMAddModuleFlag(moduleRef, LLVM.LLVMModuleFlagBehaviorOverride, "Debug Info Version", "Debug Info Version".length(), LLVM.LLVMValueAsMetadata(LLVM.LLVMConstInt(LLVM.LLVMInt32TypeInContext(context), 3, 0)));
+        LLVMValueRef functionRef = LLVM.LLVMGetNamedFunction(moduleRef, SubstrateUtil.uniqueShortName(method));
+        if (method.getLineNumberTable() == null) {
+            //TODO What das this case mean?
+            return;
+        }
+        /*LLVM.LLVMDIBuilderCreateParameterVariable(diBuilder,
+                cu,//TODO Correct scope?
+                );*/
+        //TODO Parametertypes needs to be defined
+        LLVMMetadataRef subRoutineType = LLVM.LLVMDIBuilderCreateSubroutineType(diBuilder, file, (LLVMMetadataRef) null, 0, 0);
+        subprogram = LLVM.LLVMDIBuilderCreateFunction(diBuilder,
+                cu,
+                SubstrateUtil.uniqueShortName(method),
+                SubstrateUtil.uniqueShortName(method).length(),
+                name(),
+                name().length(),
+                file,
+                method.getLineNumberTable().getLineNumbers()[0],
+                subRoutineType,
+                1,
+                1,
+                0,
+                0,
+                0);
+        LLVM.LLVMSetSubprogram(functionRef, subprogram);
+    }
+
+    public void emitLocation(int line) {
+        if (subprogram == null) {
+            //TODO When the lineNumberTable was empty
+            return;
+        }
+        LLVM.LLVMSetCurrentDebugLocation2(builder, LLVM.LLVMDIBuilderCreateDebugLocation(context, line, 0, subprogram, null));
+    }
+
+    public void finalizeBuilder() {
+        LLVM.LLVMDIBuilderFinalize(diBuilder);
+        LLVM.LLVMDisposeDIBuilder(diBuilder);
+    }
+
+    /*
+    * TODO Copied from NativeImageDebugInfoProvider
+    */
+    public String name() {
+        ResolvedJavaMethod targetMethod = method;
+        while (targetMethod instanceof WrappedJavaMethod) {
+            targetMethod = ((WrappedJavaMethod) targetMethod).getWrapped();
+        }
+        if (targetMethod instanceof SubstitutionMethod) {
+            targetMethod = ((SubstitutionMethod) targetMethod).getOriginal();
+        } else if (targetMethod instanceof CustomSubstitutionMethod) {
+            targetMethod = ((CustomSubstitutionMethod) targetMethod).getOriginal();
+        }
+        String name = targetMethod.getName();
+        if (name.equals("<init>")) {
+            if (method instanceof HostedMethod) {
+                name = getDeclaringClass((HostedMethod) method, true).toJavaName();
+                if (name.indexOf('.') >= 0) {
+                    name = name.substring(name.lastIndexOf('.') + 1);
+                }
+                if (name.indexOf('$') >= 0) {
+                    name = name.substring(name.lastIndexOf('$') + 1);
+                }
+            } else {
+                name = targetMethod.format("%h");
+                if (name.indexOf('$') >= 0) {
+                    name = name.substring(name.lastIndexOf('$') + 1);
+                }
+            }
+        }
+        return name;
+    }
+
+    protected static ResolvedJavaType getDeclaringClass(HostedMethod hostedMethod, boolean wantOriginal) {
+        if (wantOriginal) {
+            return getOriginal(hostedMethod.getDeclaringClass());
+        }
+        // we want a substituted target if there is one. if there is a substitution at the end of
+        // the method chain fetch the annotated target class
+        ResolvedJavaMethod javaMethod = hostedMethod.getWrapped().getWrapped();
+        if (javaMethod instanceof SubstitutionMethod) {
+            SubstitutionMethod substitutionMethod = (SubstitutionMethod) javaMethod;
+            return substitutionMethod.getAnnotated().getDeclaringClass();
+        }
+        return javaMethod.getDeclaringClass();
+    }
+
+    private static ResolvedJavaType getOriginal(HostedType hostedType) {
+        /* partially unwrap then traverse through substitutions to the original */
+        ResolvedJavaType javaType = hostedType.getWrapped().getWrappedWithoutResolve();
+        if (javaType instanceof SubstitutionType) {
+            return ((SubstitutionType) javaType).getOriginal();
+        } else if (javaType instanceof CustomSubstitutionType<?, ?>) {
+            return ((CustomSubstitutionType<?, ?>) javaType).getOriginal();
+        } else if (javaType instanceof LambdaSubstitutionType) {
+            return ((LambdaSubstitutionType) javaType).getOriginal();
+        } else if (javaType instanceof InjectedFieldsType) {
+            return ((InjectedFieldsType) javaType).getOriginal();
+        }
+        return javaType;
+    }
+}
+
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMNativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMNativeImageDebugInfoProvider.java
new file mode 100644
index 000000000000..27a21d88685c
--- /dev/null
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMNativeImageDebugInfoProvider.java
@@ -0,0 +1,218 @@
+package com.oracle.svm.core.graal.llvm.debug;
+
+import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
+import com.oracle.graal.pointsto.infrastructure.WrappedJavaMethod;
+import com.oracle.objectfile.debuginfo.DebugInfoProvider;
+import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.hosted.annotation.CustomSubstitutionMethod;
+import com.oracle.svm.hosted.image.NativeImage;
+import com.oracle.svm.hosted.image.sources.SourceManager;
+import com.oracle.svm.hosted.meta.HostedMethod;
+import com.oracle.svm.hosted.substitute.SubstitutionMethod;
+import jdk.vm.ci.meta.JavaType;
+import jdk.vm.ci.meta.LineNumberTable;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.Signature;
+import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
+import org.graalvm.compiler.graph.NodeSourcePosition;
+import org.graalvm.nativeimage.ImageSingletons;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.oracle.svm.hosted.image.NativeImageDebugInfoProvider.getDeclaringClass;
+import static com.oracle.svm.hosted.image.NativeImageDebugInfoProvider.toJavaName;
+
+/**
+ * Incomplete and currently not really used implementation of NativeImageDebugInfoProvider. Will be probably used more later.
+ * Implemented by Noisyfox
+ * */
+public class LLVMNativeImageDebugInfoProvider {
+    private final DebugContext debugContext;
+
+    public LLVMNativeImageDebugInfoProvider(DebugContext debugContext) {
+        this.debugContext = debugContext;
+    }
+
+    public DebugInfoProvider.DebugLineInfo getLineInfo(NodeSourcePosition position) {
+        if (position == null) {
+            return null;
+        }
+
+        return new LLVMNativeImageDebugLineInfo(position);
+    }
+
+    class LLVMNativeImageDebugLineInfo implements DebugInfoProvider.DebugLineInfo {
+
+        private final int bci;
+        private final ResolvedJavaMethod method;
+        private final Path cachePath;
+        private Path fullFilePath;
+
+        public LLVMNativeImageDebugLineInfo(NodeSourcePosition position) {
+            int posbci = position.getBCI();
+            this.bci = (posbci >= 0 ? posbci : 0);
+            method = position.getMethod();
+            this.cachePath = SubstrateOptions.getDebugInfoSourceCacheRoot();
+            computeFullFilePath();
+        }
+
+        @Override
+        public String fileName() {
+            if (fullFilePath != null) {
+                Path fileName = fullFilePath.getFileName();
+                if (fileName != null) {
+                    return fileName.toString();
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public Path filePath() {
+            if (fullFilePath != null) {
+                return fullFilePath.getParent();
+            }
+            return null;
+        }
+
+        @Override
+        public Path cachePath() {
+            return cachePath;
+        }
+
+        @Override
+        public ResolvedJavaType ownerType() {
+            if (method instanceof HostedMethod) {
+                return getDeclaringClass((HostedMethod) method, true);
+            }
+            return method.getDeclaringClass();
+        }
+
+        @Override
+        public String name() {
+            ResolvedJavaMethod targetMethod = method;
+            while (targetMethod instanceof WrappedJavaMethod) {
+                targetMethod = ((WrappedJavaMethod) targetMethod).getWrapped();
+            }
+            if (targetMethod instanceof SubstitutionMethod) {
+                targetMethod = ((SubstitutionMethod) targetMethod).getOriginal();
+            } else if (targetMethod instanceof CustomSubstitutionMethod) {
+                targetMethod = ((CustomSubstitutionMethod) targetMethod).getOriginal();
+            }
+            String name = targetMethod.getName();
+            if (name.equals("<init>")) {
+                if (method instanceof HostedMethod) {
+                    name = getDeclaringClass((HostedMethod) method, true).toJavaName();
+                    if (name.indexOf('.') >= 0) {
+                        name = name.substring(name.lastIndexOf('.') + 1);
+                    }
+                    if (name.indexOf('$') >= 0) {
+                        name = name.substring(name.lastIndexOf('$') + 1);
+                    }
+                } else {
+                    name = targetMethod.format("%h");
+                    if (name.indexOf('$') >= 0) {
+                        name = name.substring(name.lastIndexOf('$') + 1);
+                    }
+                }
+            }
+            return name;
+        }
+
+        @Override
+        public String valueType() {
+            return method.format("%R");
+        }
+
+        @Override
+        public int modifiers() {
+            return method.getModifiers();
+        }
+
+        @Override
+        public List<String> paramTypes() {
+            Signature signature = method.getSignature();
+            int parameterCount = signature.getParameterCount(false);
+            List<String> paramTypes = new ArrayList<>(parameterCount);
+            for (int i = 0; i < parameterCount; i++) {
+                JavaType parameterType = signature.getParameterType(i, null);
+                paramTypes.add(toJavaName(parameterType));
+            }
+            return paramTypes;
+        }
+
+        @Override
+        public List<String> paramNames() {
+            /* Can only provide blank names for now. */
+            Signature signature = method.getSignature();
+            int parameterCount = signature.getParameterCount(false);
+            List<String> paramNames = new ArrayList<>(parameterCount);
+            for (int i = 0; i < parameterCount; i++) {
+                paramNames.add("");
+            }
+            return paramNames;
+        }
+
+        @Override
+        public String symbolNameForMethod() {
+            return NativeImage.localSymbolNameForMethod(method);
+        }
+
+        @Override
+        public boolean isDeoptTarget() {
+            if (method instanceof HostedMethod) {
+                return ((HostedMethod) method).isDeoptTarget();
+            }
+            return name().endsWith(HostedMethod.METHOD_NAME_DEOPT_SUFFIX);
+        }
+
+        @Override
+        public int addressLo() {
+            throw GraalError.unimplemented();
+        }
+
+        @Override
+        public int addressHi() {
+            throw GraalError.unimplemented();
+        }
+
+        @Override
+        public int line() {
+            LineNumberTable lineNumberTable = method.getLineNumberTable();
+            if (lineNumberTable != null) {
+                return lineNumberTable.getLineNumber(bci);
+            }
+            return -1;
+        }
+
+        @Override
+        public DebugInfoProvider.DebugLineInfo getCaller() {
+            throw GraalError.unimplemented();
+        }
+
+        private void computeFullFilePath() {
+            ResolvedJavaType declaringClass;
+            // if we have a HostedMethod then deal with substitutions
+            if (method instanceof HostedMethod) {
+                declaringClass = getDeclaringClass((HostedMethod) method, false);
+            } else {
+                declaringClass = method.getDeclaringClass();
+            }
+            Class<?> clazz = null;
+            if (declaringClass instanceof OriginalClassProvider) {
+                clazz = ((OriginalClassProvider) declaringClass).getJavaClass();
+            }
+            SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
+            try (DebugContext.Scope s = debugContext.scope("DebugCodeInfo", declaringClass)) {
+                fullFilePath = sourceManager.findAndCacheSource(declaringClass, clazz, debugContext);
+            } catch (Throwable e) {
+                throw debugContext.handle(e);
+            }
+        }
+    }
+
+}
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
index 55fa100c396d..a4c7c27280c1 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
@@ -24,21 +24,8 @@
  */
 package com.oracle.svm.core.graal.llvm.util;
 
-import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.ENUM_ATTRIBUTE_VALUE;
-import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.FALSE;
-import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.TRUE;
-import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpTypes;
-import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpValues;
-import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.Condition;
-
 import com.oracle.svm.core.FrameAccess;
+import com.oracle.svm.core.graal.llvm.debug.LLVMDebugInfoBuilder;
 import com.oracle.svm.shadowed.org.bytedeco.javacpp.BytePointer;
 import com.oracle.svm.shadowed.org.bytedeco.javacpp.Pointer;
 import com.oracle.svm.shadowed.org.bytedeco.javacpp.PointerPointer;
@@ -51,6 +38,21 @@
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.global.LLVM;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import org.graalvm.compiler.core.common.NumUtil;
+import org.graalvm.compiler.core.common.calc.Condition;
+import org.graalvm.compiler.debug.DebugContext;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.ENUM_ATTRIBUTE_VALUE;
+import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.FALSE;
+import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.TRUE;
+import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpTypes;
+import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpValues;
+import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
 
 public class LLVMIRBuilder implements AutoCloseable {
     private static final String DEFAULT_INSTR_NAME = "";
@@ -80,6 +82,10 @@ public LLVMIRBuilder(LLVMIRBuilder primary) {
         this.helpers = null;
     }
 
+    public LLVMDebugInfoBuilder createDIBuilder(ResolvedJavaMethod method) {
+        return new LLVMDebugInfoBuilder(DebugContext.forCurrentThread(), method, context, module, builder);
+    }
+
     public void setMainFunction(String functionName, LLVMTypeRef functionType) {
         assert function == null;
         this.function = addFunction(functionName, functionType);
@@ -186,7 +192,7 @@ public enum Attribute {
         NoRedZone("noredzone"),
         StatepointID("statepoint-id");
 
-        private String name;
+        public String name;
 
         Attribute(String name) {
             this.name = name;
@@ -796,6 +802,8 @@ public void buildDebugtrap() {
         buildIntrinsicCall("llvm.debugtrap", functionType(voidType()));
     }
 
+
+    // TODO: 15.08.2021 RELEVANTE ZEILE!!!!
     public LLVMValueRef functionEntryCount(LLVMValueRef count) {
         String functionEntryCountName = "function_entry_count";
         LLVMValueRef[] values = new LLVMValueRef[2];
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
index 6420ddb34a66..15b8d7e3c621 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
@@ -41,7 +41,8 @@ public class LLVMOptions {
     public static final HostedOptionKey<String> DumpLLVMStackMap = new HostedOptionKey<>(null);
 
     @Option(help = "Maximum size of batches used for LLVM compilation. 0 means a single batch, 1 means all functions separately", type = OptionType.Debug)//
-    public static final HostedOptionKey<Integer> LLVMMaxFunctionsPerBatch = new HostedOptionKey<>(1000);
+    //TODO Enabled for easier test
+    public static final HostedOptionKey<Integer> LLVMMaxFunctionsPerBatch = new HostedOptionKey<>(1);
 
     @Option(help = "Path to a custom ld binary for LLVM linking")//
     public static final HostedOptionKey<String> CustomLD = new HostedOptionKey<>("");
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index 2966a2779799..7fe37435932b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -127,7 +127,8 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
     private static ValueUpdateHandler debugInfoValueUpdateHandler = SubstrateOptions::defaultDebugInfoValueUpdateHandler;
 
     @Option(help = "Control native-image code optimizations: 0 - no optimizations, 1 - basic optimizations, 2 - aggressive optimizations.", type = OptionType.User)//
-    public static final HostedOptionKey<Integer> Optimize = new HostedOptionKey<Integer>(2) {
+    // TODO Currently best to disable optimizations. AOTInline and AOTTrivialInline needs to stay activated!
+    public static final HostedOptionKey<Integer> Optimize = new HostedOptionKey<Integer>(0) {
         @Override
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Integer oldValue, Integer newValue) {
             SubstrateOptions.IncludeNodeSourcePositions.update(values, newValue < 1);
@@ -152,7 +153,8 @@ public static void setDebugInfoValueUpdateHandler(ValueUpdateHandler updateHandl
     }
 
     @Option(help = "Track NodeSourcePositions during runtime-compilation")//
-    public static final HostedOptionKey<Boolean> IncludeNodeSourcePositions = new HostedOptionKey<>(false);
+    //TODO Enabled for easier test
+    public static final HostedOptionKey<Boolean> IncludeNodeSourcePositions = new HostedOptionKey<>(true);
 
     @Option(help = "Search path for C libraries passed to the linker (list of comma-separated directories)")//
     public static final HostedOptionKey<LocatableMultiOptionValue.Strings> CLibraryPath = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
@@ -449,7 +451,8 @@ public static int codeAlignment() {
 
     @APIOption(name = "-g", fixedValue = "2", customHelp = "generate debugging information")//
     @Option(help = "Insert debug info into the generated native image or library")//
-    public static final HostedOptionKey<Integer> GenerateDebugInfo = new HostedOptionKey<Integer>(0) {
+    //TODO Enabled for easier test
+    public static final HostedOptionKey<Integer> GenerateDebugInfo = new HostedOptionKey<Integer>(1) {
         @Override
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Integer oldValue, Integer newValue) {
             debugInfoValueUpdateHandler.onValueUpdate(values, oldValue, newValue);
@@ -466,6 +469,7 @@ public static void defaultDebugInfoValueUpdateHandler(EconomicMap<OptionKey<?>,
     }
 
     @Option(help = "Search path for source files for Application or GraalVM classes (list of comma-separated directories or jar files)")//
+    //TODO Needs to be set
     public static final HostedOptionKey<LocatableMultiOptionValue.Strings> DebugInfoSourceSearchPath = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings());
 
     @Option(help = "Directory under which to create source file cache for Application or GraalVM classes")//
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 3a1cda151bb7..3429c20048ec 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -59,6 +59,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import com.oracle.svm.hosted.image.sources.SourceManager;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.api.replacements.Fold;
@@ -597,10 +598,12 @@ private void doRun(Map<Method, CEntryPointData> entryPoints,
             featureHandler.forEachFeature(feature -> feature.beforeCompilation(beforeCompilationConfig));
 
             runtime.updateLazyState(hMetaAccess);
+            ImageSingletons.add(SourceManager.class, new SourceManager());
 
             NativeImageCodeCache codeCache;
             CompileQueue compileQueue;
             try (StopTimer t = new Timer(imageName, "compile").start()) {
+                //ImageSingletons.add(SourceManager.class, new SourceManager());
                 compileQueue = HostedConfiguration.instance().createCompileQueue(debug, featureHandler, hUniverse, runtime, DeoptTester.enabled(), bb.getProviders().getSnippetReflection(),
                                 compilationExecutor);
                 compileQueue.finish(debug);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index f679cf41263d..7232cb946d82 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -453,9 +453,8 @@ public void build(String imageName, DebugContext debug) {
             /*
              * If we constructed debug info give the object file a chance to install it
              */
-            if (SubstrateOptions.GenerateDebugInfo.getValue(HostedOptionValues.singleton()) > 0) {
+            if (SubstrateOptions.GenerateDebugInfo.getValue(HostedOptionValues.singleton()) > 0 && !SubstrateOptions.useLLVMBackend()) {
                 try (Timer.StopTimer t = new Timer(imageName, "dbginfo").start()) {
-                    ImageSingletons.add(SourceManager.class, new SourceManager());
                     DebugInfoProvider provider = new NativeImageDebugInfoProvider(debug, codeCache, heap);
                     objectFile.installDebugInfo(provider);
                 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
index ccd75a00f104..4219c3b107fb 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -85,7 +85,7 @@
  * Implementation of the DebugInfoProvider API interface that allows type, code and heap data info
  * to be passed to an ObjectFile when generation of debug info is enabled.
  */
-class NativeImageDebugInfoProvider implements DebugInfoProvider {
+public class NativeImageDebugInfoProvider implements DebugInfoProvider {
     private final DebugContext debugContext;
     private final NativeImageCodeCache codeCache;
     @SuppressWarnings("unused") private final NativeImageHeap heap;
@@ -195,7 +195,7 @@ protected static ResolvedJavaType getDeclaringClass(HostedType hostedType, boole
         return hostedType.getWrapped().getWrapped();
     }
 
-    protected static ResolvedJavaType getDeclaringClass(HostedMethod hostedMethod, boolean wantOriginal) {
+    public static ResolvedJavaType getDeclaringClass(HostedMethod hostedMethod, boolean wantOriginal) {
         if (wantOriginal) {
             return getOriginal(hostedMethod.getDeclaringClass());
         }
@@ -240,7 +240,7 @@ private static int getOriginalModifiers(HostedMethod hostedMethod) {
         return targetMethod.getModifiers();
     }
 
-    private static String toJavaName(JavaType javaType) {
+    public static String toJavaName(JavaType javaType) {
         if (javaType instanceof HostedType) {
             return getDeclaringClass((HostedType) javaType, true).toJavaName();
         }

From 1de65ca53eaf9bc6c7b3320c1de85280c5677067 Mon Sep 17 00:00:00 2001
From: berstanio <sebastian_grunwald@web.de>
Date: Mon, 30 Aug 2021 19:49:00 +0200
Subject: [PATCH 679/681] Upgrade JavaCPP and the LLVM preset to JavaCPP 1.5.6

---
 substratevm/mx.substratevm/suite.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 8196f2cdbbe4..9b458ff395ee 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -80,21 +80,21 @@
            },
         },
         "LLVM_WRAPPER_SHADOWED": {
-            "sha1" : "9b75be4025a567a5614095a58cafa0866b434649",
-            "sourceSha1" : "3ada2e3b681326b3b112a5544ea28f70eff6e6ab",
+            "sha1" : "55eb45a7ae133f98df8d61e821af0d373ae027e8",
+            "sourceSha1" : "f4841e1e2426333094df5c43751e6148a550e506",
             "dependencies" : ["JAVACPP_SHADOWED"],
             "urlbase": "http://mos.bplaced.net/llvm",
-            "urls": ["{urlbase}/llvm.jar"],
-            "sourceUrls": ["{urlbase}/llvm-sources.jar"],
+            "urls": ["{urlbase}/llvm-shadowed-12.0.1-1.5.6.jar"],
+            "sourceUrls": ["{urlbase}/llvm-shadowed-12.0.1-1.5.6-sources.jar"],
             "license" : "GPLv2-CPE",
             "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm"
         },
         "JAVACPP_SHADOWED": {
-            "sha1" : "8a50d14df49e025822afc0ad791435eee0d35166",
-            "sourceSha1" : "d0197a18b557a6c2be510680c395807631139686",
+            "sha1" : "761db712863a8ac533ef4e28ddcfdd49bc71955c",
+            "sourceSha1" : "da52e2a8b39415f279e388a0e68d77817d471ae3",
             "urlbase": "http://mos.bplaced.net/llvm",
-            "urls": ["{urlbase}/javacpp.jar"],
-            "sourceUrls": ["{urlbase}/javacpp-sources.jar"],
+            "urls": ["{urlbase}/javacpp-shadowed-1.5.6.jar"],
+            "sourceUrls": ["{urlbase}/javacpp-shadowed-1.5.6-sources.jar"],
             "license" : "GPLv2-CPE",
             "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.javacpp"
         },
@@ -104,12 +104,12 @@
                 "linux": {
                     "amd64": {
                         "sha1": "45b8746a30bc774e912eb6c5aa83740608107012",
-                        "urls": ["{urlbase}/llvm-linux-x86_64.jar"],
+                        "urls": ["{urlbase}/llvm-shadowed-12.0.1-1.5.6-linux-x86_64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.x86_64"
                     },
                     "aarch64": {
-                        "sha1": "1340a75f741014eab5795cf37b24551913854dec",
-                        "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2_1-linux-arm64.jar"],
+                        "sha1": "b7d973cf254ee2226296ed39025391b9aae41dd6",
+                        "urls": ["{urlbase}/llvm-shadowed-12.0.1-1.5.6-linux-arm64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.linux.arm64"
                     },
                     "<others>": {
@@ -118,8 +118,8 @@
                 },
                 "darwin": {
                     "amd64": {
-                        "sha1": "d1082bfd227b8f084682a2cd3b06e36f5d046e5e",
-                        "urls": ["{urlbase}/llvm-shadowed-9.0.0-1.5.2-macosx-x86_64.jar"],
+                        "sha1": "98f3c9b047eff0890b638a6f81c1f9697db658f2",
+                        "urls": ["{urlbase}/llvm-shadowed-12.0.1-1.5.6-macosx-x86_64.jar"],
                         "moduleName" : "com.oracle.svm.shadowed.org.bytedeco.llvm.macosx.x86_64"
                     },
                 },

From 97af48621fd61058a5206e3d00bbe3c014ee7edf Mon Sep 17 00:00:00 2001
From: berstanio <sebastian_grunwald@web.de>
Date: Mon, 15 Nov 2021 19:07:34 +0100
Subject: [PATCH 680/681] Fix wrong arguments for createFunction.
 uniqueShortName is now correctly the mangled name.

---
 .../svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
index c70fbba36f16..6de6afadf4e4 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
@@ -106,10 +106,10 @@ public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method
         LLVMMetadataRef subRoutineType = LLVM.LLVMDIBuilderCreateSubroutineType(diBuilder, file, (LLVMMetadataRef) null, 0, 0);
         subprogram = LLVM.LLVMDIBuilderCreateFunction(diBuilder,
                 cu,
+                name(),// Maybe better a combination of Class name and method name better
+                name().length(),
                 SubstrateUtil.uniqueShortName(method),
                 SubstrateUtil.uniqueShortName(method).length(),
-                name(),
-                name().length(),
                 file,
                 method.getLineNumberTable().getLineNumbers()[0],
                 subRoutineType,

From ad65ca1b2edfb1d21daf37427066173d8c388bbc Mon Sep 17 00:00:00 2001
From: berstanio <sebastian_grunwald@web.de>
Date: Mon, 15 Nov 2021 19:10:01 +0100
Subject: [PATCH 681/681] Provide nonesense debuginfo for proxies. Otherwise
 LLVM linker would throw errors when inlining a method with debug info at a
 location without debug info. (Probably temporary)

---
 .../svm/core/graal/llvm/NodeLLVMBuilder.java  |  8 ++++++-
 .../llvm/debug/LLVMDebugInfoBuilder.java      | 23 +++++++++++++------
 .../svm/core/graal/llvm/util/LLVMOptions.java |  3 +--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
index a4e5aa34ba71..d37488d46090 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
@@ -299,8 +299,14 @@ public void doBlock(Block block, StructuredGraph graph, BlockMap<List<Node>> blo
                         * */
                         llvmDebugInfoBuilder.emitLocation(line);
                     }else {
-                        //TODO When is this the
+                        //TODO When is this the case
+                        //TODO Temporarly to support inlining for proxies
+                        llvmDebugInfoBuilder.emitLocation(0);
                     }
+                }else {
+                    //TODO When is this the case
+                    //TODO Temporarly to support inlining for proxies
+                    llvmDebugInfoBuilder.emitLocation(0);
                 }
                 /*
                  * There can be cases in which the result of an instruction is already set before by
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
index 6de6afadf4e4..4f424a55cf9a 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/debug/LLVMDebugInfoBuilder.java
@@ -63,15 +63,18 @@ public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method
         SourceManager sourceManager = ImageSingletons.lookup(SourceManager.class);
         path = sourceManager.findAndCacheSource(javaType, clazz, debugContext);
 
-
         diBuilder = LLVM.LLVMCreateDIBuilder(moduleRef);
+
          if (path == null) {
              //TODO could also happen when not defining -H:DebugInfoSourceSearchPath. Should be handled better
              //TODO This seems to be the case for Proxys
-             return;
+             // TODO At first just emit dummy files
+             file = LLVM.LLVMDIBuilderCreateFile(diBuilder, (String) null, 0, null, 0);
+             //return;
+         } else {
+             path = Paths.get(SubstrateOptions.DebugInfoSourceCacheRoot.getValue(), path.toString());
+             file = LLVM.LLVMDIBuilderCreateFile(diBuilder, path.getFileName().toString(), path.getFileName().toString().length(), path.getParent().toAbsolutePath().toString(), path.getParent().toAbsolutePath().toString().length());
          }
-        path = Paths.get(SubstrateOptions.DebugInfoSourceCacheRoot.getValue(), path.toString());
-        file = LLVM.LLVMDIBuilderCreateFile(diBuilder, path.getFileName().toString(), path.getFileName().toString().length(), path.getParent().toAbsolutePath().toString(), path.getParent().toAbsolutePath().toString().length());
 
         cu = LLVM.LLVMDIBuilderCreateCompileUnit(diBuilder,
                 LLVM.LLVMDWARFSourceLanguageJava,
@@ -95,10 +98,15 @@ public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method
         LLVM.LLVMAddModuleFlag(moduleRef, LLVM.LLVMModuleFlagBehaviorOverride, "Dwarf Version", "Dwarf Version".length(), LLVM.LLVMValueAsMetadata(LLVM.LLVMConstInt(LLVM.LLVMInt32TypeInContext(context), 4, 0)));
         LLVM.LLVMAddModuleFlag(moduleRef, LLVM.LLVMModuleFlagBehaviorOverride, "Debug Info Version", "Debug Info Version".length(), LLVM.LLVMValueAsMetadata(LLVM.LLVMConstInt(LLVM.LLVMInt32TypeInContext(context), 3, 0)));
         LLVMValueRef functionRef = LLVM.LLVMGetNamedFunction(moduleRef, SubstrateUtil.uniqueShortName(method));
-        if (method.getLineNumberTable() == null) {
+
+        // TODO: 15.11.2021 We need to also emit debug info for proxies, when no source code is available
+        int line = 0;
+        if (method.getLineNumberTable() != null) {
             //TODO What das this case mean?
-            return;
+            line = method.getLineNumberTable().getLineNumbers()[0];
+            //return;
         }
+
         /*LLVM.LLVMDIBuilderCreateParameterVariable(diBuilder,
                 cu,//TODO Correct scope?
                 );*/
@@ -111,7 +119,7 @@ public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method
                 SubstrateUtil.uniqueShortName(method),
                 SubstrateUtil.uniqueShortName(method).length(),
                 file,
-                method.getLineNumberTable().getLineNumbers()[0],
+                line,
                 subRoutineType,
                 1,
                 1,
@@ -123,6 +131,7 @@ public LLVMDebugInfoBuilder(DebugContext debugContext, ResolvedJavaMethod method
 
     public void emitLocation(int line) {
         if (subprogram == null) {
+            //Currently wont happen
             //TODO When the lineNumberTable was empty
             return;
         }
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
index 15b8d7e3c621..6420ddb34a66 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
@@ -41,8 +41,7 @@ public class LLVMOptions {
     public static final HostedOptionKey<String> DumpLLVMStackMap = new HostedOptionKey<>(null);
 
     @Option(help = "Maximum size of batches used for LLVM compilation. 0 means a single batch, 1 means all functions separately", type = OptionType.Debug)//
-    //TODO Enabled for easier test
-    public static final HostedOptionKey<Integer> LLVMMaxFunctionsPerBatch = new HostedOptionKey<>(1);
+    public static final HostedOptionKey<Integer> LLVMMaxFunctionsPerBatch = new HostedOptionKey<>(1000);
 
     @Option(help = "Path to a custom ld binary for LLVM linking")//
     public static final HostedOptionKey<String> CustomLD = new HostedOptionKey<>("");