Skip to content

Commit 2b4bf3d

Browse files
committed
Revert switch to CompilerAsserts.compilationConstant from CompilerAsserts.partialEvaluationConstant in frame nodes
1 parent a04f3ec commit 2b4bf3d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/DeleteGlobalNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static DeleteGlobalNode create() {
6565
}
6666

6767
public final void executeWithGlobals(VirtualFrame frame, Object globals, TruffleString attributeId) {
68-
CompilerAsserts.compilationConstant(attributeId);
68+
CompilerAsserts.partialEvaluationConstant(attributeId);
6969
executeWithGlobalsImpl(frame, globals, attributeId);
7070
}
7171

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadGlobalOrBuiltinNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
@SuppressWarnings("truffle-inlining") // footprint reduction 48 -> 30
6666
public abstract class ReadGlobalOrBuiltinNode extends PNodeWithContext {
6767
public final Object execute(VirtualFrame frame, TruffleString name) {
68-
CompilerAsserts.compilationConstant(name);
68+
CompilerAsserts.partialEvaluationConstant(name);
6969
return executeWithGlobals(frame, PArguments.getGlobals(frame), name);
7070
}
7171

7272
protected abstract Object executeWithGlobals(VirtualFrame frame, Object globals, TruffleString name);
7373

7474
public Object read(Frame frame, Object globals, TruffleString name) {
75-
CompilerAsserts.compilationConstant(name);
75+
CompilerAsserts.partialEvaluationConstant(name);
7676
return executeWithGlobals((VirtualFrame) frame, globals, name);
7777
}
7878

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadNameNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
@SuppressWarnings("truffle-inlining") // footprint reduction 36 -> 17
6464
public abstract class ReadNameNode extends PNodeWithContext implements AccessNameNode {
6565
public final Object execute(VirtualFrame frame, TruffleString attributeId) {
66-
CompilerAsserts.compilationConstant(attributeId);
66+
CompilerAsserts.partialEvaluationConstant(attributeId);
6767
return executeImpl(frame, attributeId);
6868
}
6969

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteGlobalNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public static WriteGlobalNode create() {
7272
}
7373

7474
public final void executeObject(VirtualFrame frame, TruffleString name, Object value) {
75-
CompilerAsserts.compilationConstant(name);
75+
CompilerAsserts.partialEvaluationConstant(name);
7676
executeObjectWithGlobals(frame, PArguments.getGlobals(frame), name, value);
7777
}
7878

7979
public final void write(Frame frame, Object globals, TruffleString name, Object value) {
80-
CompilerAsserts.compilationConstant(name);
80+
CompilerAsserts.partialEvaluationConstant(name);
8181
executeObjectWithGlobals((VirtualFrame) frame, globals, name, value);
8282
}
8383

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteNameNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
public abstract class WriteNameNode extends PNodeWithContext implements AccessNameNode {
6060

6161
public final void execute(VirtualFrame frame, TruffleString attributeId, Object value) {
62-
CompilerAsserts.compilationConstant(attributeId);
62+
CompilerAsserts.partialEvaluationConstant(attributeId);
6363
executeImpl(frame, attributeId, value);
6464
}
6565

0 commit comments

Comments
 (0)