Skip to content

Commit 0c85601

Browse files
DSouzaMDSouzaM
committed
Only strip Node from the names of proxy nodes
1 parent fbb015d commit 0c85601

File tree

12 files changed

+244
-244
lines changed

12 files changed

+244
-244
lines changed

‎truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterBase.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@
505505
* - Instruction c.Continue
506506
* kind: CUSTOM
507507
* encoding: [61 : short, node : int]
508-
* nodeType: ContinueNode
508+
* nodeType: Continue
509509
* signature: Object (ContinuationResult, Object)
510510
* - Instruction c.CurrentLocation
511511
* kind: CUSTOM
@@ -7896,7 +7896,7 @@ public void emitCollectAllSourceLocations() {
78967896
}
78977897

78987898
/**
7899-
* Begins a custom {@link com.oracle.truffle.api.bytecode.test.basic_interpreter.BasicInterpreter.ContinueNode Continue} operation.
7899+
* Begins a custom {@link com.oracle.truffle.api.bytecode.test.basic_interpreter.BasicInterpreter.Continue Continue} operation.
79007900
* <p>
79017901
* Signature: Continue(result, value) -> Object
79027902
* <p>
@@ -7919,7 +7919,7 @@ public void beginContinue() {
79197919
}
79207920

79217921
/**
7922-
* Ends a custom {@link com.oracle.truffle.api.bytecode.test.basic_interpreter.BasicInterpreter.ContinueNode Continue} operation.
7922+
* Ends a custom {@link com.oracle.truffle.api.bytecode.test.basic_interpreter.BasicInterpreter.Continue Continue} operation.
79237923
* <p>
79247924
* Signature: Continue(result, value) -> Object
79257925
*
@@ -12369,7 +12369,7 @@ private static final class Instructions {
1236912369
* Instruction c.Continue
1237012370
* kind: CUSTOM
1237112371
* encoding: [61 : short, node : int]
12372-
* nodeType: ContinueNode
12372+
* nodeType: Continue
1237312373
* signature: Object (ContinuationResult, Object)
1237412374
*/
1237512375
private static final short CONTINUE_ = 61;
@@ -15060,10 +15060,10 @@ public boolean isAdoptable() {
1506015060
}
1506115061
/**
1506215062
* Debug Info: <pre>
15063-
* Specialization {@link ContinueNode#invokeDirect}
15063+
* Specialization {@link Continue#invokeDirect}
1506415064
* Activation probability: 0.65000
1506515065
* With/without class size: 22/8 bytes
15066-
* Specialization {@link ContinueNode#invokeIndirect}
15066+
* Specialization {@link Continue#invokeIndirect}
1506715067
* Activation probability: 0.35000
1506815068
* With/without class size: 11/4 bytes
1506915069
* </pre> */
@@ -15074,14 +15074,14 @@ private static final class Continue_Node extends Node implements Introspection.P
1507415074

1507515075
/**
1507615076
* State Info: <pre>
15077-
* 0: SpecializationActive {@link ContinueNode#invokeDirect}
15078-
* 1: SpecializationActive {@link ContinueNode#invokeIndirect}
15077+
* 0: SpecializationActive {@link Continue#invokeDirect}
15078+
* 1: SpecializationActive {@link Continue#invokeIndirect}
1507915079
* </pre> */
1508015080
@CompilationFinal private int state_0_;
1508115081
@UnsafeAccessedField @Child private InvokeDirectData invokeDirect_cache;
1508215082
/**
1508315083
* Source Info: <pre>
15084-
* Specialization: {@link ContinueNode#invokeIndirect}
15084+
* Specialization: {@link Continue#invokeIndirect}
1508515085
* Parameter: {@link IndirectCallNode} callNode</pre> */
1508615086
@Child private IndirectCallNode invokeIndirect_callNode_;
1508715087

@@ -15090,22 +15090,22 @@ private Object execute(VirtualFrame frameValue, VirtualFrame $stackFrame, Abstra
1509015090
int state_0 = this.state_0_;
1509115091
Object child0Value_ = FRAMES.uncheckedGetObject($stackFrame, $sp - 2);
1509215092
Object child1Value_ = FRAMES.uncheckedGetObject($stackFrame, $sp - 1);
15093-
if (state_0 != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] || SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */ && child0Value_ instanceof ContinuationResult) {
15093+
if (state_0 != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] || SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */ && child0Value_ instanceof ContinuationResult) {
1509415094
ContinuationResult child0Value__ = (ContinuationResult) child0Value_;
15095-
if ((state_0 & 0b1) != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */) {
15095+
if ((state_0 & 0b1) != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */) {
1509615096
InvokeDirectData s0_ = this.invokeDirect_cache;
1509715097
while (s0_ != null) {
1509815098
if ((child0Value__.getContinuationRootNode() == s0_.rootNode_)) {
15099-
return ContinueNode.invokeDirect(child0Value__, child1Value_, s0_.rootNode_, s0_.callNode_);
15099+
return Continue.invokeDirect(child0Value__, child1Value_, s0_.rootNode_, s0_.callNode_);
1510015100
}
1510115101
s0_ = s0_.next_;
1510215102
}
1510315103
}
15104-
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
15104+
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
1510515105
{
1510615106
IndirectCallNode callNode__ = this.invokeIndirect_callNode_;
1510715107
if (callNode__ != null) {
15108-
return ContinueNode.invokeIndirect(child0Value__, child1Value_, callNode__);
15108+
return Continue.invokeIndirect(child0Value__, child1Value_, callNode__);
1510915109
}
1511015110
}
1511115111
}
@@ -15118,7 +15118,7 @@ private Object executeAndSpecialize(Object child0Value, Object child1Value, Virt
1511815118
int state_0 = this.state_0_;
1511915119
if (child0Value instanceof ContinuationResult) {
1512015120
ContinuationResult child0Value_ = (ContinuationResult) child0Value;
15121-
if (((state_0 & 0b10)) == 0 /* is-not SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
15121+
if (((state_0 & 0b10)) == 0 /* is-not SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
1512215122
while (true) {
1512315123
int count0_ = 0;
1512415124
InvokeDirectData s0_ = INVOKE_DIRECT_CACHE_UPDATER.getVolatile(this);
@@ -15133,33 +15133,33 @@ private Object executeAndSpecialize(Object child0Value, Object child1Value, Virt
1513315133
if (s0_ == null) {
1513415134
{
1513515135
ContinuationRootNode rootNode__ = this.insert((child0Value_.getContinuationRootNode()));
15136-
if ((child0Value_.getContinuationRootNode() == rootNode__) && count0_ < (ContinueNode.LIMIT)) {
15136+
if ((child0Value_.getContinuationRootNode() == rootNode__) && count0_ < (Continue.LIMIT)) {
1513715137
s0_ = this.insert(new InvokeDirectData(s0_original));
1513815138
s0_.rootNode_ = s0_.insert(rootNode__);
1513915139
s0_.callNode_ = s0_.insert((DirectCallNode.create(rootNode__.getCallTarget())));
1514015140
if (!INVOKE_DIRECT_CACHE_UPDATER.compareAndSet(this, s0_original, s0_)) {
1514115141
continue;
1514215142
}
15143-
state_0 = state_0 | 0b1 /* add SpecializationActive[BasicInterpreter.ContinueNode.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */;
15143+
state_0 = state_0 | 0b1 /* add SpecializationActive[BasicInterpreter.Continue.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */;
1514415144
this.state_0_ = state_0;
15145-
$bytecode.getRoot().onSpecialize(new InstructionImpl($bytecode, $bci, BYTES.getShort($bc, $bci)), "ContinueNode$InvokeDirect");
15145+
$bytecode.getRoot().onSpecialize(new InstructionImpl($bytecode, $bci, BYTES.getShort($bc, $bci)), "Continue$InvokeDirect");
1514615146
}
1514715147
}
1514815148
}
1514915149
if (s0_ != null) {
15150-
return ContinueNode.invokeDirect(child0Value_, child1Value, s0_.rootNode_, s0_.callNode_);
15150+
return Continue.invokeDirect(child0Value_, child1Value, s0_.rootNode_, s0_.callNode_);
1515115151
}
1515215152
break;
1515315153
}
1515415154
}
1515515155
VarHandle.storeStoreFence();
1515615156
this.invokeIndirect_callNode_ = this.insert((IndirectCallNode.create()));
1515715157
this.invokeDirect_cache = null;
15158-
state_0 = state_0 & 0xfffffffe /* remove SpecializationActive[BasicInterpreter.ContinueNode.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */;
15159-
state_0 = state_0 | 0b10 /* add SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */;
15158+
state_0 = state_0 & 0xfffffffe /* remove SpecializationActive[BasicInterpreter.Continue.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */;
15159+
state_0 = state_0 | 0b10 /* add SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */;
1516015160
this.state_0_ = state_0;
15161-
$bytecode.getRoot().onSpecialize(new InstructionImpl($bytecode, $bci, BYTES.getShort($bc, $bci)), "ContinueNode$InvokeIndirect");
15162-
return ContinueNode.invokeIndirect(child0Value_, child1Value, this.invokeIndirect_callNode_);
15161+
$bytecode.getRoot().onSpecialize(new InstructionImpl($bytecode, $bci, BYTES.getShort($bc, $bci)), "Continue$InvokeIndirect");
15162+
return Continue.invokeIndirect(child0Value_, child1Value, this.invokeIndirect_callNode_);
1516315163
}
1516415164
throw new UnsupportedSpecializationException(this, null, child0Value, child1Value);
1516515165
}
@@ -15172,7 +15172,7 @@ public Introspection getIntrospectionData() {
1517215172
int state_0 = this.state_0_;
1517315173
s = new Object[3];
1517415174
s[0] = "invokeDirect";
15175-
if ((state_0 & 0b1) != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */) {
15175+
if ((state_0 & 0b1) != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeDirect(ContinuationResult, Object, ContinuationRootNode, DirectCallNode)] */) {
1517615176
s[1] = (byte)0b01 /* active */;
1517715177
ArrayList<Object> cached = new ArrayList<>();
1517815178
InvokeDirectData s0_ = this.invokeDirect_cache;
@@ -15183,7 +15183,7 @@ public Introspection getIntrospectionData() {
1518315183
s[2] = cached;
1518415184
}
1518515185
if (s[1] == null) {
15186-
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
15186+
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
1518715187
s[1] = (byte)0b10 /* excluded */;
1518815188
} else {
1518915189
s[1] = (byte)0b00 /* inactive */;
@@ -15192,7 +15192,7 @@ public Introspection getIntrospectionData() {
1519215192
data[1] = s;
1519315193
s = new Object[3];
1519415194
s[0] = "invokeIndirect";
15195-
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.ContinueNode.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
15195+
if ((state_0 & 0b10) != 0 /* is SpecializationActive[BasicInterpreter.Continue.invokeIndirect(ContinuationResult, Object, IndirectCallNode)] */) {
1519615196
{
1519715197
IndirectCallNode callNode__ = this.invokeIndirect_callNode_;
1519815198
if (callNode__ != null) {
@@ -15217,12 +15217,12 @@ private static final class InvokeDirectData extends Node implements Specializati
1521715217
@Child InvokeDirectData next_;
1521815218
/**
1521915219
* Source Info: <pre>
15220-
* Specialization: {@link ContinueNode#invokeDirect}
15220+
* Specialization: {@link Continue#invokeDirect}
1522115221
* Parameter: {@link ContinuationRootNode} rootNode</pre> */
1522215222
@Child ContinuationRootNode rootNode_;
1522315223
/**
1522415224
* Source Info: <pre>
15225-
* Specialization: {@link ContinueNode#invokeDirect}
15225+
* Specialization: {@link Continue#invokeDirect}
1522615226
* Parameter: {@link DirectCallNode} callNode</pre> */
1522715227
@Child DirectCallNode callNode_;
1522815228

0 commit comments

Comments
 (0)