compiler: SnippetTemplate should register the replacement for the fallback invoke

zapster · zapster · commit 0bcfad2c232a · 2021-08-17T08:25:29.000+02:00
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
@@ -1712,6 +1712,8 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
                 InvokeWithExceptionNode invoke = macroNode.createInvoke(returnValue);
                 // replace placeholder
                 replaceeGraph.replaceWithExceptionSplit(fallbackInvokeNode, invoke);
+                // register the invoke as the replacement for the fallback invoke
+                duplicates.put(fallbackInvoke, invoke);
             }
 
             if (killReplacee) {

Original file line number	Diff line number	Diff line change
`@@ -1712,6 +1712,8 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc`
`1712`	`1712`	`InvokeWithExceptionNode invoke = macroNode.createInvoke(returnValue);`
`1713`	`1713`	`// replace placeholder`
`1714`	`1714`	`replaceeGraph.replaceWithExceptionSplit(fallbackInvokeNode, invoke);`
	`1715`	`+ // register the invoke as the replacement for the fallback invoke`
	`1716`	`+ duplicates.put(fallbackInvoke, invoke);`
`1715`	`1717`	`}`
`1716`	`1718`
`1717`	`1719`	`if (killReplacee) {`