Merge remote-tracking branch 'upstream/master'

gluonhq · Oct 28, 2023 · 9172685 · 9172685
2 parents c22ac20 + 68d4bc7
commit 9172685
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...iler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/GraphEffectList.java b/...iler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/GraphEffectList.java
@@ -378,7 +378,7 @@ public void apply(StructuredGraph graph, ArrayList<Node> obsoleteNodes) {
                      * the pi will be used to improve the stamp information of the read. Such a read
                      * might later be replaced with a read with a less precise stamp.
                      */
-                    if (node.hasUsages() && !node.stamp(NodeView.DEFAULT).equals(replacementNode.stamp(NodeView.DEFAULT))) {
+                    if (node.hasUsages() && (replacementNode.stamp(NodeView.DEFAULT).tryImproveWith(node.stamp(NodeView.DEFAULT)) != null)) {
                         replacementNode = graph.unique(new PiNode(replacementNode, node.stamp(NodeView.DEFAULT)));
                     }
                     node.replaceAtUsages(replacementNode);

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -33,7 +33,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "15165ba9d18c2e7c93f7dcd6c37b9c8cdb1e7804",
+                "version": "95767f4db8df01a69fc77ba69335c9ce09a1165d",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
@@ -42,7 +42,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "15165ba9d18c2e7c93f7dcd6c37b9c8cdb1e7804",
+                "version": "95767f4db8df01a69fc77ba69335c9ce09a1165d",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]