@@ -1952,12 +1952,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
1952
1952
stackTop = bytecodeImportFrom (virtualFrame , stackTop , beginBci , oparg , localNames , localNodes , useCachedNodes );
1953
1953
break ;
1954
1954
}
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
- }
1961
1955
case OpCodesConstants .JUMP_FORWARD :
1962
1956
oparg |= Byte .toUnsignedInt (localBC [bci + 1 ]);
1963
1957
bci += oparg ;
@@ -2320,10 +2314,6 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
2320
2314
virtualFrame .setObject (stackTop , getAwait .execute (virtualFrame , virtualFrame .getObject (stackTop )));
2321
2315
break ;
2322
2316
}
2323
- case OpCodesConstants .PRINT_EXPR : {
2324
- stackTop = bytecodePrintExpr (virtualFrame , useCachedNodes , stackTop , bci , localNodes , bciSlot , beginBci );
2325
- break ;
2326
- }
2327
2317
case OpCodesConstants .EXTENDED_ARG : {
2328
2318
oparg |= Byte .toUnsignedInt (localBC [++bci ]);
2329
2319
oparg <<= 8 ;
@@ -2333,10 +2323,12 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
2333
2323
case OpCodesConstants .LOAD_FROM_DICT_OR_DEREF :
2334
2324
case OpCodesConstants .LOAD_FROM_DICT_OR_GLOBALS :
2335
2325
case OpCodesConstants .MAKE_TYPE_PARAM :
2326
+ case OpCodesConstants .IMPORT_STAR :
2336
2327
stackTop = infrequentBytecodes (virtualFrame , localFrame , bc , bci , stackTop , beginBci , oparg , localBC , globals , locals , localNames , localNodes , bciSlot , localCelloffset ,
2337
2328
useCachedNodes );
2338
2329
bci ++;
2339
2330
break ;
2331
+ case OpCodesConstants .PRINT_EXPR :
2340
2332
case OpCodesConstants .LOAD_LOCALS :
2341
2333
case OpCodesConstants .MAKE_TYPE_ALIAS :
2342
2334
case OpCodesConstants .MAKE_GENERIC :
@@ -2473,6 +2465,16 @@ private int infrequentBytecodes(VirtualFrame virtualFrame, Frame localFrame, byt
2473
2465
stackTop = bytecodeMakeGeneric (virtualFrame , useCachedNodes , stackTop , localNodes , beginBci );
2474
2466
break ;
2475
2467
}
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
+ }
2476
2478
default :
2477
2479
throw raiseUnknownBytecodeError (bc );
2478
2480
0 commit comments