Skip to content

Commit 3815717

Browse files
timfeltimfel
committed
remove @InliningCutoff from methods that have a transferToInterpreterAndInvalidate in their first block
1 parent 81068a5 commit 3815717

File tree

1 file changed

+10
-46
lines changed

1 file changed

+10
-46
lines changed

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

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ private <A, T extends Node> T insertChildNode(Node[] nodes, int nodeIndex, Class
691691
return CompilerDirectives.castExact(doInsertChildNode(nodes, nodeIndex, nodeSupplier, argument), cachedClass);
692692
}
693693

694-
@InliningCutoff
695694
@SuppressWarnings("unchecked")
696695
private <A, T extends Node> T doInsertChildNode(Node[] nodes, int nodeIndex, NodeFunction<A, T> nodeSupplier, A argument) {
697696
CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -727,7 +726,6 @@ private <T extends Node, U> T insertChildNodeInt(Node[] nodes, int nodeIndex, Cl
727726
return doInsertChildNodeInt(nodes, nodeIndex, nodeSupplier, argument);
728727
}
729728

730-
@InliningCutoff
731729
@SuppressWarnings("unchecked")
732730
private <T extends Node> T doInsertChildNodeInt(Node[] nodes, int nodeIndex, IntNodeFunction<T> nodeSupplier, int argument) {
733731
CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -751,7 +749,6 @@ private <T extends Node, U extends T> U insertChildNode(Node[] nodes, int nodeIn
751749
return CompilerDirectives.castExact(doInsertChildNode(nodes, nodeIndex, nodeSupplier), cachedClass);
752750
}
753751

754-
@InliningCutoff
755752
@SuppressWarnings("unchecked")
756753
private <T extends Node> T doInsertChildNode(Node[] nodes, int nodeIndex, NodeSupplier<T> nodeSupplier) {
757754
CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -2426,13 +2423,11 @@ private void chainPythonExceptions(VirtualFrame virtualFrame, MutableLoopData mu
24262423
}
24272424
}
24282425

2429-
@InliningCutoff
24302426
private PException raiseUnkownBytecodeError(final byte bc) {
24312427
CompilerDirectives.transferToInterpreterAndInvalidate();
24322428
throw PRaiseNode.raiseUncached(this, SystemError, toTruffleStringUncached("not implemented bytecode %s"), OpCodes.fromOpCode(bc));
24332429
}
24342430

2435-
@InliningCutoff
24362431
private void generalizeForIterI(int bci, QuickeningGeneralizeException e) {
24372432
CompilerDirectives.transferToInterpreterAndInvalidate();
24382433
if (e.type == QuickeningTypes.OBJECT) {
@@ -2442,7 +2437,6 @@ private void generalizeForIterI(int bci, QuickeningGeneralizeException e) {
24422437
}
24432438
}
24442439

2445-
@InliningCutoff
24462440
private void bytecodeForIter(int bci) {
24472441
CompilerDirectives.transferToInterpreterAndInvalidate();
24482442
if ((outputCanQuicken[bci] & QuickeningTypes.INT) != 0) {
@@ -2452,14 +2446,12 @@ private void bytecodeForIter(int bci) {
24522446
}
24532447
}
24542448

2455-
@InliningCutoff
24562449
private void generalizePopAndJumpIfTrueB(int bci) {
24572450
CompilerDirectives.transferToInterpreterAndInvalidate();
24582451
generalizeInputs(bci);
24592452
bytecode[bci] = OpCodesConstants.POP_AND_JUMP_IF_TRUE_O;
24602453
}
24612454

2462-
@InliningCutoff
24632455
private void generalizePopAndJumpIfFalseB(int bci) {
24642456
CompilerDirectives.transferToInterpreterAndInvalidate();
24652457
generalizeInputs(bci);
@@ -2484,14 +2476,12 @@ private boolean bytecodePopCondition(VirtualFrame virtualFrame, int stackTop, No
24842476
return isTrue.execute(virtualFrame, cond);
24852477
}
24862478

2487-
@InliningCutoff
24882479
private Object generalizePopCondition(VirtualFrame virtualFrame, int stackTop, int bci) {
24892480
CompilerDirectives.transferToInterpreterAndInvalidate();
24902481
generalizeInputs(bci);
24912482
return virtualFrame.getValue(stackTop);
24922483
}
24932484

2494-
@InliningCutoff
24952485
private void bytecodeBinaryOpAdaptive(VirtualFrame virtualFrame, int stackTop, byte[] localBC, int bci, Node[] localNodes, int op, boolean useCachedNodes) {
24962486
CompilerDirectives.transferToInterpreterAndInvalidate();
24972487
if (virtualFrame.isObject(stackTop) && virtualFrame.isObject(stackTop - 1)) {
@@ -2644,7 +2634,6 @@ private void bytecodeBinaryOpIIO(VirtualFrame virtualFrame, int stackTop, int bc
26442634
right = virtualFrame.getInt(stackTop);
26452635
left = virtualFrame.getInt(stackTop - 1);
26462636
} else {
2647-
CompilerDirectives.transferToInterpreterAndInvalidate();
26482637
generalizeBinaryOp(virtualFrame, stackTop, bci, localNodes, op);
26492638
return;
26502639
}
@@ -2823,7 +2812,6 @@ private void bytecodeBinaryOpDDD(VirtualFrame virtualFrame, int stackTop, int bc
28232812
right = virtualFrame.getDouble(stackTop);
28242813
left = virtualFrame.getDouble(stackTop - 1);
28252814
} else {
2826-
CompilerDirectives.transferToInterpreterAndInvalidate();
28272815
generalizeBinaryOp(virtualFrame, stackTop, bci, adoptedNodes, op);
28282816
return;
28292817
}
@@ -2861,7 +2849,6 @@ private void bytecodeBinaryOpDDB(VirtualFrame virtualFrame, int stackTop, int bc
28612849
right = virtualFrame.getDouble(stackTop);
28622850
left = virtualFrame.getDouble(stackTop - 1);
28632851
} else {
2864-
CompilerDirectives.transferToInterpreterAndInvalidate();
28652852
generalizeBinaryOp(virtualFrame, stackTop, bci, adoptedNodes, op);
28662853
return;
28672854
}
@@ -2898,7 +2885,6 @@ private void bytecodeBinaryOpDDO(VirtualFrame virtualFrame, int stackTop, int bc
28982885
right = virtualFrame.getInt(stackTop);
28992886
left = virtualFrame.getInt(stackTop - 1);
29002887
} else {
2901-
CompilerDirectives.transferToInterpreterAndInvalidate();
29022888
generalizeBinaryOp(virtualFrame, stackTop, bci, localNodes, op);
29032889
return;
29042890
}
@@ -2950,7 +2936,6 @@ private void bytecodeBinaryOpDDO(VirtualFrame virtualFrame, int stackTop, int bc
29502936
virtualFrame.setObject(stackTop - 1, result);
29512937
}
29522938

2953-
@InliningCutoff
29542939
private void generalizeBinaryOp(VirtualFrame virtualFrame, int stackTop, int bci, Node[] localNodes, int op) {
29552940
CompilerDirectives.transferToInterpreterAndInvalidate();
29562941
virtualFrame.setObject(stackTop, virtualFrame.getValue(stackTop));
@@ -2960,7 +2945,6 @@ private void generalizeBinaryOp(VirtualFrame virtualFrame, int stackTop, int bci
29602945
bytecodeBinaryOpOOO(virtualFrame, stackTop, bci, localNodes, op, bcioffset);
29612946
}
29622947

2963-
@InliningCutoff
29642948
private void generalizeBinaryOpIIIOverflow(VirtualFrame virtualFrame, int stackTop, int bci, int op) {
29652949
CompilerDirectives.transferToInterpreterAndInvalidate();
29662950
bytecode[bci] = OpCodesConstants.BINARY_OP_II_O;
@@ -2984,7 +2968,6 @@ private void bytecodeBinaryOpOOO(VirtualFrame virtualFrame, int stackTop, int bc
29842968
virtualFrame.setObject(stackTop - 1, result);
29852969
}
29862970

2987-
@InliningCutoff
29882971
private void bytecodeUnaryOpAdaptive(VirtualFrame virtualFrame, int stackTop, int bci, byte[] localBC, Node[] localNodes) {
29892972
CompilerDirectives.transferToInterpreterAndInvalidate();
29902973
int op = Byte.toUnsignedInt(localBC[bci + 1]);
@@ -3178,7 +3161,6 @@ private void bytecodeUnaryOpBO(VirtualFrame virtualFrame, int stackTop, int bci,
31783161
}
31793162
}
31803163

3181-
@InliningCutoff
31823164
private void generalizeUnaryOp(VirtualFrame virtualFrame, int stackTop, int bci, int op) {
31833165
CompilerDirectives.transferToInterpreterAndInvalidate();
31843166
virtualFrame.setObject(stackTop, virtualFrame.getValue(stackTop));
@@ -3204,7 +3186,6 @@ private void bytecodeUnaryOpOO(VirtualFrame virtualFrame, int stackTop, int bci,
32043186
virtualFrame.setObject(stackTop, result);
32053187
}
32063188

3207-
@InliningCutoff
32083189
private void bytecodeStoreFastAdaptive(VirtualFrame virtualFrame, Frame localFrame, int stackTop, int bci, byte[] localBC, int index, boolean inCompiledCode) {
32093190
CompilerDirectives.transferToInterpreterAndInvalidate();
32103191
byte stackType = stackSlotTypeToTypeId(virtualFrame, stackTop);
@@ -3337,8 +3318,7 @@ private void bytecodeStoreFastUnboxI(VirtualFrame virtualFrame, Frame localFrame
33373318
try {
33383319
object = virtualFrame.getObject(stackTop);
33393320
} catch (FrameSlotTypeException e) {
3340-
// This should only happen when quickened concurrently in multi-context
3341-
// mode
3321+
// This should only happen when quickened concurrently in multi-context mode
33423322
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
33433323
return;
33443324
}
@@ -3356,9 +3336,7 @@ private void bytecodeStoreFastBoxedI(VirtualFrame virtualFrame, Frame localFrame
33563336
try {
33573337
object = virtualFrame.getObject(stackTop);
33583338
} catch (FrameSlotTypeException e) {
3359-
CompilerDirectives.transferToInterpreterAndInvalidate();
3360-
// This should only happen when quickened concurrently in multi-context
3361-
// mode
3339+
// This should only happen when quickened concurrently in multi-context mode
33623340
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
33633341
return;
33643342
}
@@ -3389,8 +3367,7 @@ private void bytecodeStoreFastUnboxL(VirtualFrame virtualFrame, Frame localFrame
33893367
try {
33903368
object = virtualFrame.getObject(stackTop);
33913369
} catch (FrameSlotTypeException e) {
3392-
// This should only happen when quickened concurrently in multi-context
3393-
// mode
3370+
// This should only happen when quickened concurrently in multi-context mode
33943371
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
33953372
return;
33963373
}
@@ -3408,9 +3385,7 @@ private void bytecodeStoreFastBoxedL(VirtualFrame virtualFrame, Frame localFrame
34083385
try {
34093386
object = virtualFrame.getObject(stackTop);
34103387
} catch (FrameSlotTypeException e) {
3411-
CompilerDirectives.transferToInterpreterAndInvalidate();
3412-
// This should only happen when quickened concurrently in multi-context
3413-
// mode
3388+
// This should only happen when quickened concurrently in multi-context mode
34143389
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
34153390
return;
34163391
}
@@ -3441,8 +3416,7 @@ private void bytecodeStoreFastUnboxD(VirtualFrame virtualFrame, Frame localFrame
34413416
try {
34423417
object = virtualFrame.getObject(stackTop);
34433418
} catch (FrameSlotTypeException e) {
3444-
// This should only happen when quickened concurrently in multi-context
3445-
// mode
3419+
// This should only happen when quickened concurrently in multi-context mode
34463420
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
34473421
return;
34483422
}
@@ -3460,9 +3434,7 @@ private void bytecodeStoreFastBoxedD(VirtualFrame virtualFrame, Frame localFrame
34603434
try {
34613435
object = virtualFrame.getObject(stackTop);
34623436
} catch (FrameSlotTypeException e) {
3463-
CompilerDirectives.transferToInterpreterAndInvalidate();
3464-
// This should only happen when quickened concurrently in multi-context
3465-
// mode
3437+
// This should only happen when quickened concurrently in multi-context mode
34663438
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
34673439
return;
34683440
}
@@ -3493,8 +3465,7 @@ private void bytecodeStoreFastUnboxB(VirtualFrame virtualFrame, Frame localFrame
34933465
try {
34943466
object = virtualFrame.getObject(stackTop);
34953467
} catch (FrameSlotTypeException e) {
3496-
// This should only happen when quickened concurrently in multi-context
3497-
// mode
3468+
// This should only happen when quickened concurrently in multi-context mode
34983469
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
34993470
return;
35003471
}
@@ -3512,8 +3483,7 @@ private void bytecodeStoreFastBoxedB(VirtualFrame virtualFrame, Frame localFrame
35123483
try {
35133484
object = virtualFrame.getObject(stackTop);
35143485
} catch (FrameSlotTypeException e) {
3515-
// This should only happen when quickened concurrently in multi-context
3516-
// mode
3486+
// This should only happen when quickened concurrently in multi-context mode
35173487
generalizeStoreFast(virtualFrame, localFrame, stackTop, bci, index);
35183488
return;
35193489
}
@@ -3529,7 +3499,6 @@ private void bytecodeStoreFastBoxedB(VirtualFrame virtualFrame, Frame localFrame
35293499
virtualFrame.setObject(stackTop, null);
35303500
}
35313501

3532-
@InliningCutoff
35333502
private void generalizeStoreFast(VirtualFrame virtualFrame, Frame localFrame, int stackTop, int bci, int index) {
35343503
CompilerDirectives.transferToInterpreterAndInvalidate();
35353504
virtualFrame.setObject(index, virtualFrame.getValue(index));
@@ -3545,8 +3514,7 @@ private void bytecodeStoreFastO(VirtualFrame virtualFrame, Frame localFrame, int
35453514
try {
35463515
object = virtualFrame.getObject(stackTop);
35473516
} catch (FrameSlotTypeException e) {
3548-
// This should only happen when quickened concurrently in multi-context
3549-
// mode
3517+
// This should only happen when quickened concurrently in multi-context mode
35503518
generalizeVariableStores(index);
35513519
object = virtualFrame.getValue(stackTop);
35523520
}
@@ -3665,7 +3633,6 @@ private void bytecodeLoadFastB(VirtualFrame virtualFrame, Frame localFrame, int
36653633
}
36663634
}
36673635

3668-
@InliningCutoff
36693636
private void generalizeLoadFast(VirtualFrame virtualFrame, Frame localFrame, int stackTop, int bci, int index, boolean inCompiledCode) {
36703637
CompilerDirectives.transferToInterpreterAndInvalidate();
36713638
generalizeVariableStores(index);
@@ -3710,7 +3677,6 @@ private PException raiseVarReferencedBeforeAssignment(int bci, int index) {
37103677
throw raiseNode.raise(PythonBuiltinClassType.UnboundLocalError, ErrorMessages.LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT, varnames[index]);
37113678
}
37123679

3713-
@InliningCutoff
37143680
private Object generalizeBytecodeLoadFastO(Frame localFrame, int index) {
37153681
CompilerDirectives.transferToInterpreterAndInvalidate();
37163682
generalizeVariableStores(index);
@@ -3736,7 +3702,6 @@ private void generalizeInputs(int beginBci) {
37363702
}
37373703
}
37383704

3739-
@InliningCutoff
37403705
private void generalizeVariableStores(int index) {
37413706
CompilerDirectives.transferToInterpreterAndInvalidate();
37423707
variableTypes[index] = QuickeningTypes.OBJECT;
@@ -3757,6 +3722,7 @@ private void generalizeVariableStores(int index) {
37573722
}
37583723
}
37593724

3725+
@InliningCutoff
37603726
protected PException wrapJavaExceptionIfApplicable(Throwable e) {
37613727
if (e instanceof AbstractTruffleException) {
37623728
return null;
@@ -4882,7 +4848,6 @@ public void triggerDeferredDeprecationWarnings() {
48824848
}
48834849
}
48844850

4885-
@InliningCutoff
48864851
private void bytecodePopAndJumpIfFalse(VirtualFrame virtualFrame, int bci, int stackTop) {
48874852
CompilerDirectives.transferToInterpreterAndInvalidate();
48884853
if (virtualFrame.isBoolean(stackTop)) {
@@ -4892,7 +4857,6 @@ private void bytecodePopAndJumpIfFalse(VirtualFrame virtualFrame, int bci, int s
48924857
}
48934858
}
48944859

4895-
@InliningCutoff
48964860
private void bytecodePopAndJumpIfTrue(VirtualFrame virtualFrame, int bci, int stackTop) {
48974861
CompilerDirectives.transferToInterpreterAndInvalidate();
48984862
if (virtualFrame.isBoolean(stackTop)) {

0 commit comments

Comments
 (0)