Skip to content

Commit 79e81c1

Browse files
lukasstadlerlukasstadler
committed
use non-String IDs for synthetic frame slots
1 parent d9d7086 commit 79e81c1

File tree

295 files changed

+15221
-30366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+15221
-30366
lines changed

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/ParserTreePrinter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ private void addFrameDescriptor(FrameDescriptor fd) {
493493
String[] names = new String[identifiers.size()];
494494
int i = 0;
495495
for (Object identifier : identifiers) {
496-
names[i++] = (String) identifier;
496+
names[i++] = identifier.toString();
497497
}
498498
add(names);
499499
sb.append("]");
@@ -539,7 +539,7 @@ private void add(FrameSlot[] slots) {
539539
} else {
540540
first = false;
541541
}
542-
sb.append((String) slot.getIdentifier()).append(", ");
542+
sb.append(slot.getIdentifier()).append(", ");
543543
}
544544
}
545545
}

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/parser/SSTSerializationTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
package com.oracle.graal.python.test.parser;
4242

4343
import com.oracle.graal.python.PythonLanguage;
44-
import com.oracle.graal.python.nodes.frame.FrameSlotIDs;
4544
import com.oracle.graal.python.parser.ScopeInfo;
4645
import com.oracle.graal.python.runtime.PythonCodeSerializer;
4746
import com.oracle.graal.python.runtime.PythonParser;
@@ -1363,9 +1362,8 @@ private static void printScope(ScopeInfo scope, StringBuilder sb, int indent) {
13631362
sb.append("Kind: ").append(scope.getScopeKind()).append("\n");
13641363
Set<String> names = new HashSet<>();
13651364
scope.getFrameDescriptor().getIdentifiers().forEach((id) -> {
1366-
String name = (String) id;
1367-
if (!name.startsWith(FrameSlotIDs.TEMP_LOCAL_PREFIX) && !name.startsWith(FrameSlotIDs.RETURN_SLOT_ID)) {
1368-
names.add((String) id);
1365+
if (id instanceof String) {
1366+
names.add(id.toString());
13691367
}
13701368
});
13711369
indent(sb, indent + 1);

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/annotationType02.tast

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ ModuleRootNode Name: <module 'annotationType02'> SourceSection: [0,28]`def fn():
3636
FunctionBodyNode SourceSection: [12,27]`index : int = 0`
3737
WriteLocalVariableNodeGen SourceSection: [12,27]`index : int = 0`
3838
Identifier: index
39-
WriteLocalFrameSlotNodeGen SourceSection: None
40-
Frame: [0,index,Illegal]
39+
Frame: [0,index,Illegal]
4140
IntegerLiteralNode SourceSection: [26,27]`0`
4241
Value: 0
43-
Return Expresssion: ReadLocalVariableNode SourceSection: None
42+
Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
4443
Frame: [1,<return_val>,Illegal]
45-
ReadVariableFromFrameNodeGen SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment02.tast

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@ ModuleRootNode Name: <module 'assignment02'> SourceSection: [0,9]`a = b = 1`
88
ExpressionWithSideEffects SourceSection: [0,9]`a = b = 1`
99
WriteLocalVariableNodeGen SourceSection: None
1010
Identifier: <>temp0
11-
WriteLocalFrameSlotNodeGen SourceSection: None
12-
Frame: [0,<>temp0,Illegal]
11+
Frame: [0,<>temp0,Illegal]
1312
IntegerLiteralNode SourceSection: [8,9]`1`
1413
Value: 1
1514
WriteNameNodeGen SourceSection: None
1615
Identifier: a
17-
ReadLocalVariableNode SourceSection: None
16+
ReadLocalVariableNodeGen SourceSection: None
1817
Frame: [0,<>temp0,Illegal]
19-
ReadVariableFromFrameNodeGen SourceSection: None
2018
WriteNameNodeGen SourceSection: None
2119
Identifier: b
22-
ReadLocalVariableNode SourceSection: None
20+
ReadLocalVariableNodeGen SourceSection: None
2321
Frame: [0,<>temp0,Illegal]
24-
ReadVariableFromFrameNodeGen SourceSection: None
2522
EmptyNode SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment04.tast

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,25 @@ ModuleRootNode Name: <module 'assignment04'> SourceSection: [0,17]`a = b = c = d
88
ExpressionWithSideEffects SourceSection: [0,17]`a = b = c = d = e`
99
WriteLocalVariableNodeGen SourceSection: None
1010
Identifier: <>temp0
11-
WriteLocalFrameSlotNodeGen SourceSection: None
12-
Frame: [0,<>temp0,Illegal]
11+
Frame: [0,<>temp0,Illegal]
1312
ReadNameNodeGen SourceSection: [16,17]`e`
1413
Identifier: e
1514
IsBuiltinClassProfile SourceSection: None
1615
CachedDispatchFirst SourceSection: None
1716
WriteNameNodeGen SourceSection: None
1817
Identifier: a
19-
ReadLocalVariableNode SourceSection: None
18+
ReadLocalVariableNodeGen SourceSection: None
2019
Frame: [0,<>temp0,Illegal]
21-
ReadVariableFromFrameNodeGen SourceSection: None
2220
WriteNameNodeGen SourceSection: None
2321
Identifier: b
24-
ReadLocalVariableNode SourceSection: None
22+
ReadLocalVariableNodeGen SourceSection: None
2523
Frame: [0,<>temp0,Illegal]
26-
ReadVariableFromFrameNodeGen SourceSection: None
2724
WriteNameNodeGen SourceSection: None
2825
Identifier: c
29-
ReadLocalVariableNode SourceSection: None
26+
ReadLocalVariableNodeGen SourceSection: None
3027
Frame: [0,<>temp0,Illegal]
31-
ReadVariableFromFrameNodeGen SourceSection: None
3228
WriteNameNodeGen SourceSection: None
3329
Identifier: d
34-
ReadLocalVariableNode SourceSection: None
30+
ReadLocalVariableNodeGen SourceSection: None
3531
Frame: [0,<>temp0,Illegal]
36-
ReadVariableFromFrameNodeGen SourceSection: None
3732
EmptyNode SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment05.tast

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,22 @@ ModuleRootNode Name: <module 'assignment05'> SourceSection: [0,17]`a, b, c = 1,
2020
PythonObjectFactoryNodeGen SourceSection: None
2121
WriteLocalVariableNodeGen SourceSection: None
2222
Identifier: <>temp0
23-
WriteLocalFrameSlotNodeGen SourceSection: None
24-
Frame: [0,<>temp0,Illegal]
23+
Frame: [0,<>temp0,Illegal]
2524
WriteLocalVariableNodeGen SourceSection: None
2625
Identifier: <>temp1
27-
WriteLocalFrameSlotNodeGen SourceSection: None
28-
Frame: [1,<>temp1,Illegal]
26+
Frame: [1,<>temp1,Illegal]
2927
WriteLocalVariableNodeGen SourceSection: None
3028
Identifier: <>temp2
31-
WriteLocalFrameSlotNodeGen SourceSection: None
32-
Frame: [2,<>temp2,Illegal]
29+
Frame: [2,<>temp2,Illegal]
3330
WriteNameNodeGen SourceSection: None
3431
Identifier: a
35-
ReadLocalVariableNode SourceSection: None
32+
ReadLocalVariableNodeGen SourceSection: None
3633
Frame: [0,<>temp0,Illegal]
37-
ReadVariableFromFrameNodeGen SourceSection: None
3834
WriteNameNodeGen SourceSection: None
3935
Identifier: b
40-
ReadLocalVariableNode SourceSection: None
36+
ReadLocalVariableNodeGen SourceSection: None
4137
Frame: [1,<>temp1,Illegal]
42-
ReadVariableFromFrameNodeGen SourceSection: None
4338
WriteNameNodeGen SourceSection: None
4439
Identifier: c
45-
ReadLocalVariableNode SourceSection: None
40+
ReadLocalVariableNodeGen SourceSection: None
4641
Frame: [2,<>temp2,Illegal]
47-
ReadVariableFromFrameNodeGen SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment06.tast

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,29 @@ ModuleRootNode Name: <module 'assignment06'> SourceSection: [0,29]`def fn():↵
3636
FunctionBodyNode SourceSection: [12,29]`a = b = c = d = e`
3737
WriteLocalVariableNodeGen SourceSection: None
3838
Identifier: <>temp4
39-
WriteLocalFrameSlotNodeGen SourceSection: None
40-
Frame: [4,<>temp4,Illegal]
39+
Frame: [4,<>temp4,Illegal]
4140
ReadGlobalOrBuiltinNodeGen SourceSection: [28,29]`e`
4241
Identifier: e
4342
ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
4443
WriteLocalVariableNodeGen SourceSection: None
4544
Identifier: a
46-
WriteLocalFrameSlotNodeGen SourceSection: None
47-
Frame: [0,a,Illegal]
48-
ReadLocalVariableNode SourceSection: None
45+
Frame: [0,a,Illegal]
46+
ReadLocalVariableNodeGen SourceSection: None
4947
Frame: [4,<>temp4,Illegal]
50-
ReadVariableFromFrameNodeGen SourceSection: None
5148
WriteLocalVariableNodeGen SourceSection: None
5249
Identifier: b
53-
WriteLocalFrameSlotNodeGen SourceSection: None
54-
Frame: [1,b,Illegal]
55-
ReadLocalVariableNode SourceSection: None
50+
Frame: [1,b,Illegal]
51+
ReadLocalVariableNodeGen SourceSection: None
5652
Frame: [4,<>temp4,Illegal]
57-
ReadVariableFromFrameNodeGen SourceSection: None
5853
WriteLocalVariableNodeGen SourceSection: None
5954
Identifier: c
60-
WriteLocalFrameSlotNodeGen SourceSection: None
61-
Frame: [2,c,Illegal]
62-
ReadLocalVariableNode SourceSection: None
55+
Frame: [2,c,Illegal]
56+
ReadLocalVariableNodeGen SourceSection: None
6357
Frame: [4,<>temp4,Illegal]
64-
ReadVariableFromFrameNodeGen SourceSection: None
6558
WriteLocalVariableNodeGen SourceSection: None
6659
Identifier: d
67-
WriteLocalFrameSlotNodeGen SourceSection: None
68-
Frame: [3,d,Illegal]
69-
ReadLocalVariableNode SourceSection: None
60+
Frame: [3,d,Illegal]
61+
ReadLocalVariableNodeGen SourceSection: None
7062
Frame: [4,<>temp4,Illegal]
71-
ReadVariableFromFrameNodeGen SourceSection: None
72-
Return Expresssion: ReadLocalVariableNode SourceSection: None
63+
Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
7364
Frame: [5,<return_val>,Illegal]
74-
ReadVariableFromFrameNodeGen SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment07.tast

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,27 @@ ModuleRootNode Name: <module 'assignment07'> SourceSection: [0,29]`def fn():↵
4545
PythonObjectFactoryNodeGen SourceSection: None
4646
WriteLocalVariableNodeGen SourceSection: None
4747
Identifier: <>temp3
48-
WriteLocalFrameSlotNodeGen SourceSection: None
49-
Frame: [3,<>temp3,Illegal]
48+
Frame: [3,<>temp3,Illegal]
5049
WriteLocalVariableNodeGen SourceSection: None
5150
Identifier: <>temp4
52-
WriteLocalFrameSlotNodeGen SourceSection: None
53-
Frame: [4,<>temp4,Illegal]
51+
Frame: [4,<>temp4,Illegal]
5452
WriteLocalVariableNodeGen SourceSection: None
5553
Identifier: <>temp5
56-
WriteLocalFrameSlotNodeGen SourceSection: None
57-
Frame: [5,<>temp5,Illegal]
54+
Frame: [5,<>temp5,Illegal]
5855
WriteLocalVariableNodeGen SourceSection: None
5956
Identifier: a
60-
WriteLocalFrameSlotNodeGen SourceSection: None
61-
Frame: [0,a,Illegal]
62-
ReadLocalVariableNode SourceSection: None
57+
Frame: [0,a,Illegal]
58+
ReadLocalVariableNodeGen SourceSection: None
6359
Frame: [3,<>temp3,Illegal]
64-
ReadVariableFromFrameNodeGen SourceSection: None
6560
WriteLocalVariableNodeGen SourceSection: None
6661
Identifier: b
67-
WriteLocalFrameSlotNodeGen SourceSection: None
68-
Frame: [1,b,Illegal]
69-
ReadLocalVariableNode SourceSection: None
62+
Frame: [1,b,Illegal]
63+
ReadLocalVariableNodeGen SourceSection: None
7064
Frame: [4,<>temp4,Illegal]
71-
ReadVariableFromFrameNodeGen SourceSection: None
7265
WriteLocalVariableNodeGen SourceSection: None
7366
Identifier: c
74-
WriteLocalFrameSlotNodeGen SourceSection: None
75-
Frame: [2,c,Illegal]
76-
ReadLocalVariableNode SourceSection: None
67+
Frame: [2,c,Illegal]
68+
ReadLocalVariableNodeGen SourceSection: None
7769
Frame: [5,<>temp5,Illegal]
78-
ReadVariableFromFrameNodeGen SourceSection: None
79-
Return Expresssion: ReadLocalVariableNode SourceSection: None
70+
Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
8071
Frame: [6,<return_val>,Illegal]
81-
ReadVariableFromFrameNodeGen SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/assignment10.tast

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,37 @@ ModuleRootNode Name: <module 'assignment10'> SourceSection: [0,15]`i, j, k = x =
88
ExpressionWithSideEffects SourceSection: [0,15]`i, j, k = x = a`
99
WriteLocalVariableNodeGen SourceSection: None
1010
Identifier: <>temp0
11-
WriteLocalFrameSlotNodeGen SourceSection: None
12-
Frame: [0,<>temp0,Illegal]
11+
Frame: [0,<>temp0,Illegal]
1312
ReadNameNodeGen SourceSection: [14,15]`a`
1413
Identifier: a
1514
IsBuiltinClassProfile SourceSection: None
1615
CachedDispatchFirst SourceSection: None
1716
DestructuringAssignmentNodeGen SourceSection: None
18-
ReadLocalVariableNode SourceSection: None
17+
ReadLocalVariableNodeGen SourceSection: None
1918
Frame: [0,<>temp0,Illegal]
20-
ReadVariableFromFrameNodeGen SourceSection: None
2119
WriteLocalVariableNodeGen SourceSection: None
2220
Identifier: <>temp1
23-
WriteLocalFrameSlotNodeGen SourceSection: None
24-
Frame: [1,<>temp1,Illegal]
21+
Frame: [1,<>temp1,Illegal]
2522
WriteLocalVariableNodeGen SourceSection: None
2623
Identifier: <>temp2
27-
WriteLocalFrameSlotNodeGen SourceSection: None
28-
Frame: [2,<>temp2,Illegal]
24+
Frame: [2,<>temp2,Illegal]
2925
WriteLocalVariableNodeGen SourceSection: None
3026
Identifier: <>temp3
31-
WriteLocalFrameSlotNodeGen SourceSection: None
32-
Frame: [3,<>temp3,Illegal]
27+
Frame: [3,<>temp3,Illegal]
3328
WriteNameNodeGen SourceSection: None
3429
Identifier: i
35-
ReadLocalVariableNode SourceSection: None
30+
ReadLocalVariableNodeGen SourceSection: None
3631
Frame: [1,<>temp1,Illegal]
37-
ReadVariableFromFrameNodeGen SourceSection: None
3832
WriteNameNodeGen SourceSection: None
3933
Identifier: j
40-
ReadLocalVariableNode SourceSection: None
34+
ReadLocalVariableNodeGen SourceSection: None
4135
Frame: [2,<>temp2,Illegal]
42-
ReadVariableFromFrameNodeGen SourceSection: None
4336
WriteNameNodeGen SourceSection: None
4437
Identifier: k
45-
ReadLocalVariableNode SourceSection: None
38+
ReadLocalVariableNodeGen SourceSection: None
4639
Frame: [3,<>temp3,Illegal]
47-
ReadVariableFromFrameNodeGen SourceSection: None
4840
WriteNameNodeGen SourceSection: None
4941
Identifier: x
50-
ReadLocalVariableNode SourceSection: None
42+
ReadLocalVariableNodeGen SourceSection: None
5143
Frame: [0,<>temp0,Illegal]
52-
ReadVariableFromFrameNodeGen SourceSection: None
5344
EmptyNode SourceSection: None

‎graalpython/com.oracle.graal.python.test/testData/goldenFiles/AssignmentTests/augassign13.tast

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,12 @@ ModuleRootNode Name: <module 'augassign13'> SourceSection: [0,17]`def fn (): x +
3636
FunctionBodyNode SourceSection: [11,17]`x += 3`
3737
WriteLocalVariableNodeGen SourceSection: [11,17]`x += 3`
3838
Identifier: x
39-
WriteLocalFrameSlotNodeGen SourceSection: None
40-
Frame: [0,x,Illegal]
39+
Frame: [0,x,Illegal]
4140
LookupAndCallInplaceNodeGen SourceSection: None
42-
ReadLocalVariableNode SourceSection: [11,12]`x`
41+
ReadLocalVariableNodeGen SourceSection: [11,12]`x`
4342
Frame: [0,x,Illegal]
44-
ReadVariableFromFrameNodeGen SourceSection: None
4543
IntegerLiteralNode SourceSection: [16,17]`3`
4644
Value: 3
4745
ObjectLiteralNode SourceSection: None
48-
Return Expresssion: ReadLocalVariableNode SourceSection: None
46+
Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
4947
Frame: [1,<return_val>,Illegal]
50-
ReadVariableFromFrameNodeGen SourceSection: None

0 commit comments

Comments
 (0)