Skip to content

Commit d659d16

Browse files
committed
Move a few bytecodes into infrequent section
1 parent 6f8c474 commit d659d16

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,12 +1952,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
19521952
stackTop = bytecodeImportFrom(virtualFrame, stackTop, beginBci, oparg, localNames, localNodes, useCachedNodes);
19531953
break;
19541954
}
1955-
case OpCodesConstants.IMPORT_STAR: {
1956-
setCurrentBci(virtualFrame, bciSlot, bci);
1957-
oparg |= Byte.toUnsignedInt(localBC[++bci]);
1958-
stackTop = bytecodeImportStar(virtualFrame, stackTop, beginBci, oparg, localNames, localNodes, useCachedNodes);
1959-
break;
1960-
}
19611955
case OpCodesConstants.JUMP_FORWARD:
19621956
oparg |= Byte.toUnsignedInt(localBC[bci + 1]);
19631957
bci += oparg;
@@ -2320,10 +2314,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
23202314
virtualFrame.setObject(stackTop, getAwait.execute(virtualFrame, virtualFrame.getObject(stackTop)));
23212315
break;
23222316
}
2323-
case OpCodesConstants.PRINT_EXPR: {
2324-
stackTop = bytecodePrintExpr(virtualFrame, useCachedNodes, stackTop, bci, localNodes, bciSlot, beginBci);
2325-
break;
2326-
}
23272317
case OpCodesConstants.EXTENDED_ARG: {
23282318
oparg |= Byte.toUnsignedInt(localBC[++bci]);
23292319
oparg <<= 8;
@@ -2333,10 +2323,12 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
23332323
case OpCodesConstants.LOAD_FROM_DICT_OR_DEREF:
23342324
case OpCodesConstants.LOAD_FROM_DICT_OR_GLOBALS:
23352325
case OpCodesConstants.MAKE_TYPE_PARAM:
2326+
case OpCodesConstants.IMPORT_STAR:
23362327
stackTop = infrequentBytecodes(virtualFrame, localFrame, bc, bci, stackTop, beginBci, oparg, localBC, globals, locals, localNames, localNodes, bciSlot, localCelloffset,
23372328
useCachedNodes);
23382329
bci++;
23392330
break;
2331+
case OpCodesConstants.PRINT_EXPR:
23402332
case OpCodesConstants.LOAD_LOCALS:
23412333
case OpCodesConstants.MAKE_TYPE_ALIAS:
23422334
case OpCodesConstants.MAKE_GENERIC:
@@ -2473,6 +2465,16 @@ private int infrequentBytecodes(VirtualFrame virtualFrame, Frame localFrame, byt
24732465
stackTop = bytecodeMakeGeneric(virtualFrame, useCachedNodes, stackTop, localNodes, beginBci);
24742466
break;
24752467
}
2468+
case OpCodesConstants.PRINT_EXPR: {
2469+
stackTop = bytecodePrintExpr(virtualFrame, useCachedNodes, stackTop, bci, localNodes, bciSlot, beginBci);
2470+
break;
2471+
}
2472+
case OpCodesConstants.IMPORT_STAR: {
2473+
setCurrentBci(virtualFrame, bciSlot, bci);
2474+
oparg |= Byte.toUnsignedInt(localBC[++bci]);
2475+
stackTop = bytecodeImportStar(virtualFrame, stackTop, beginBci, oparg, localNames, localNodes, useCachedNodes);
2476+
break;
2477+
}
24762478
default:
24772479
throw raiseUnknownBytecodeError(bc);
24782480

0 commit comments

Comments
 (0)