Skip to content

Commit bee61df

Browse files
committed
Change type of generator current exception to RuntimeException
1 parent a29779a commit bee61df

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/generator/GeneratorControlData.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ public final class GeneratorControlData {
3535
private final boolean[] activeFlags;
3636
private final int[] blockNodeIndices; // See {@link GeneratorBlockNode}
3737
private final Object[] forNodeIterators; // See {@link GeneratorForNode}
38-
private final Object[] activeExceptions; // See {@link GeneratorTryExceptNode}
39-
// {@link GeneratorTryFinallyNode}
38+
private final RuntimeException[] activeExceptions; // See {@link GeneratorTryExceptNode}
39+
// {@link GeneratorTryFinallyNode}
4040
private int lastYieldIndex;
4141

4242
public GeneratorControlData(GeneratorInfo generatorInfo) {
4343
this.activeFlags = new boolean[generatorInfo.getNumOfActiveFlags()];
4444
this.blockNodeIndices = new int[generatorInfo.getNumOfBlockNodes()];
4545
this.forNodeIterators = new Object[generatorInfo.getNumOfIteratorSlots()];
46-
this.activeExceptions = new Object[generatorInfo.getNumOfExceptionSlots()];
46+
this.activeExceptions = new RuntimeException[generatorInfo.getNumOfExceptionSlots()];
4747
}
4848

4949
public int getLastYieldIndex() {
@@ -79,11 +79,11 @@ public void setIteratorAt(int slot, Object value) {
7979
forNodeIterators[slot] = value;
8080
}
8181

82-
public Object getActiveException(int slot) {
82+
public RuntimeException getActiveException(int slot) {
8383
return activeExceptions[slot];
8484
}
8585

86-
public void setActiveException(int slot, Object activeException) {
86+
public void setActiveException(int slot, RuntimeException activeException) {
8787
this.activeExceptions[slot] = activeException;
8888
}
8989
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorAccessNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ public void setIterator(VirtualFrame frame, int iteratorSlot, Object value) {
136136
getControlData(frame).setIteratorAt(iteratorSlot, value);
137137
}
138138

139-
public Object getActiveException(VirtualFrame frame, int slot) {
139+
public RuntimeException getActiveException(VirtualFrame frame, int slot) {
140140
return getControlData(frame).getActiveException(slot);
141141
}
142142

143-
public void setActiveException(VirtualFrame frame, int slot, Object ex) {
143+
public void setActiveException(VirtualFrame frame, int slot, RuntimeException ex) {
144144
getControlData(frame).setActiveException(slot, ex);
145145
}
146146

0 commit comments

Comments
 (0)