Skip to content

Commit ad33a54

Browse files
committed
compiler: allow SnippetTemplate to update the duplicates map
1 parent b25d51e commit ad33a54

File tree

2 files changed

+4
-4
lines changed
  • compiler/src
    • org.graalvm.compiler.graph/src/org/graalvm/compiler/graph
    • org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements

2 files changed

+4
-4
lines changed

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ public int nodeIdCount() {
12411241
* @param replacementsMap the replacement map (can be null if no replacement is to be performed)
12421242
* @return a map which associates the original nodes from {@code nodes} to their duplicates
12431243
*/
1244-
public UnmodifiableEconomicMap<Node, Node> addDuplicates(Iterable<? extends Node> newNodes, final Graph oldGraph, int estimatedNodeCount, EconomicMap<Node, Node> replacementsMap) {
1244+
public EconomicMap<Node, Node> addDuplicates(Iterable<? extends Node> newNodes, final Graph oldGraph, int estimatedNodeCount, EconomicMap<Node, Node> replacementsMap) {
12451245
DuplicationReplacement replacements;
12461246
if (replacementsMap == null) {
12471247
replacements = null;

compiler/src/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/SnippetTemplate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
16081608
StructuredGraph replaceeGraph = replacee.graph();
16091609
EconomicMap<Node, Node> replacements = bind(replaceeGraph, metaAccess, args);
16101610
replacements.put(entryPointNode, AbstractBeginNode.prevBegin(replacee));
1611-
UnmodifiableEconomicMap<Node, Node> duplicates = inlineSnippet(replacee, debug, replaceeGraph, replacements);
1611+
EconomicMap<Node, Node> duplicates = inlineSnippet(replacee, debug, replaceeGraph, replacements);
16121612

16131613
// Re-wire the control flow graph around the replacee
16141614
FixedNode firstCFGNodeDuplicate = (FixedNode) duplicates.get(firstCFGNode);
@@ -1724,15 +1724,15 @@ public UnmodifiableEconomicMap<Node, Node> instantiate(MetaAccessProvider metaAc
17241724
}
17251725
}
17261726

1727-
private UnmodifiableEconomicMap<Node, Node> inlineSnippet(Node replacee, DebugContext debug, StructuredGraph replaceeGraph, EconomicMap<Node, Node> replacements) {
1727+
private EconomicMap<Node, Node> inlineSnippet(Node replacee, DebugContext debug, StructuredGraph replaceeGraph, EconomicMap<Node, Node> replacements) {
17281728
Mark mark = replaceeGraph.getMark();
17291729
try (InliningLog.UpdateScope scope = replaceeGraph.getInliningLog().openUpdateScope((oldNode, newNode) -> {
17301730
InliningLog log = replaceeGraph.getInliningLog();
17311731
if (oldNode == null) {
17321732
log.trackNewCallsite(newNode);
17331733
}
17341734
})) {
1735-
UnmodifiableEconomicMap<Node, Node> duplicates = replaceeGraph.addDuplicates(nodes, snippet, snippet.getNodeCount(), replacements);
1735+
EconomicMap<Node, Node> duplicates = replaceeGraph.addDuplicates(nodes, snippet, snippet.getNodeCount(), replacements);
17361736
if (scope != null) {
17371737
replaceeGraph.getInliningLog().addLog(duplicates, snippet.getInliningLog());
17381738
}

0 commit comments

Comments
 (0)