Skip to content

Commit 961aa71

Browse files
committed
Replace neverPartOfCompilation with TruffleBoundary or deopt
1 parent 0c85601 commit 961aa71

File tree

10 files changed

+112
-112
lines changed

10 files changed

+112
-112
lines changed

truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterBase.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11393,61 +11393,61 @@ private SerializationRootNode(com.oracle.truffle.api.frame.FrameDescriptor.Build
1139311393

1139411394
@Override
1139511395
public Object execute(VirtualFrame frame) {
11396-
CompilerAsserts.neverPartOfCompilation();
11396+
CompilerDirectives.transferToInterpreterAndInvalidate();
1139711397
throw new IllegalStateException("method should not be called");
1139811398
}
1139911399

1140011400
@Override
11401+
@TruffleBoundary
1140111402
protected boolean isInstrumentable() {
11402-
CompilerAsserts.neverPartOfCompilation();
1140311403
throw new IllegalStateException("method should not be called");
1140411404
}
1140511405

1140611406
@Override
11407+
@TruffleBoundary
1140711408
protected void prepareForInstrumentation(Set<Class<?>> materializedTags) {
11408-
CompilerAsserts.neverPartOfCompilation();
1140911409
throw new IllegalStateException("method should not be called");
1141011410
}
1141111411

1141211412
@Override
11413+
@TruffleBoundary
1141311414
public boolean isCloningAllowed() {
11414-
CompilerAsserts.neverPartOfCompilation();
1141511415
throw new IllegalStateException("method should not be called");
1141611416
}
1141711417

1141811418
@Override
11419+
@TruffleBoundary
1141911420
protected boolean isCloneUninitializedSupported() {
11420-
CompilerAsserts.neverPartOfCompilation();
1142111421
throw new IllegalStateException("method should not be called");
1142211422
}
1142311423

1142411424
@Override
11425+
@TruffleBoundary
1142511426
protected RootNode cloneUninitialized() {
11426-
CompilerAsserts.neverPartOfCompilation();
1142711427
throw new IllegalStateException("method should not be called");
1142811428
}
1142911429

1143011430
@Override
1143111431
protected int findBytecodeIndex(Node node, Frame frame) {
11432-
CompilerAsserts.neverPartOfCompilation();
11432+
CompilerDirectives.transferToInterpreterAndInvalidate();
1143311433
throw new IllegalStateException("method should not be called");
1143411434
}
1143511435

1143611436
@Override
11437+
@TruffleBoundary
1143711438
protected boolean isCaptureFramesForTrace(boolean compiled) {
11438-
CompilerAsserts.neverPartOfCompilation();
1143911439
throw new IllegalStateException("method should not be called");
1144011440
}
1144111441

1144211442
@Override
11443+
@TruffleBoundary
1144311444
public SourceSection getSourceSection() {
11444-
CompilerAsserts.neverPartOfCompilation();
1144511445
throw new IllegalStateException("method should not be called");
1144611446
}
1144711447

1144811448
@Override
11449+
@TruffleBoundary
1144911450
protected Object translateStackTraceElement(TruffleStackTraceElement stackTraceElement) {
11450-
CompilerAsserts.neverPartOfCompilation();
1145111451
throw new IllegalStateException("method should not be called");
1145211452
}
1145311453

@@ -11464,14 +11464,14 @@ private static final class SerializationLocal extends BytecodeLocal {
1146411464
}
1146511465

1146611466
@Override
11467+
@TruffleBoundary
1146711468
public int getLocalOffset() {
11468-
CompilerAsserts.neverPartOfCompilation();
1146911469
throw new IllegalStateException();
1147011470
}
1147111471

1147211472
@Override
11473+
@TruffleBoundary
1147311474
public int getLocalIndex() {
11474-
CompilerAsserts.neverPartOfCompilation();
1147511475
throw new IllegalStateException();
1147611476
}
1147711477

truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterProductionBlockScoping.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16826,61 +16826,61 @@ private SerializationRootNode(com.oracle.truffle.api.frame.FrameDescriptor.Build
1682616826

1682716827
@Override
1682816828
public Object execute(VirtualFrame frame) {
16829-
CompilerAsserts.neverPartOfCompilation();
16829+
CompilerDirectives.transferToInterpreterAndInvalidate();
1683016830
throw new IllegalStateException("method should not be called");
1683116831
}
1683216832

1683316833
@Override
16834+
@TruffleBoundary
1683416835
protected boolean isInstrumentable() {
16835-
CompilerAsserts.neverPartOfCompilation();
1683616836
throw new IllegalStateException("method should not be called");
1683716837
}
1683816838

1683916839
@Override
16840+
@TruffleBoundary
1684016841
protected void prepareForInstrumentation(Set<Class<?>> materializedTags) {
16841-
CompilerAsserts.neverPartOfCompilation();
1684216842
throw new IllegalStateException("method should not be called");
1684316843
}
1684416844

1684516845
@Override
16846+
@TruffleBoundary
1684616847
public boolean isCloningAllowed() {
16847-
CompilerAsserts.neverPartOfCompilation();
1684816848
throw new IllegalStateException("method should not be called");
1684916849
}
1685016850

1685116851
@Override
16852+
@TruffleBoundary
1685216853
protected boolean isCloneUninitializedSupported() {
16853-
CompilerAsserts.neverPartOfCompilation();
1685416854
throw new IllegalStateException("method should not be called");
1685516855
}
1685616856

1685716857
@Override
16858+
@TruffleBoundary
1685816859
protected RootNode cloneUninitialized() {
16859-
CompilerAsserts.neverPartOfCompilation();
1686016860
throw new IllegalStateException("method should not be called");
1686116861
}
1686216862

1686316863
@Override
1686416864
protected int findBytecodeIndex(Node node, Frame frame) {
16865-
CompilerAsserts.neverPartOfCompilation();
16865+
CompilerDirectives.transferToInterpreterAndInvalidate();
1686616866
throw new IllegalStateException("method should not be called");
1686716867
}
1686816868

1686916869
@Override
16870+
@TruffleBoundary
1687016871
protected boolean isCaptureFramesForTrace(boolean compiled) {
16871-
CompilerAsserts.neverPartOfCompilation();
1687216872
throw new IllegalStateException("method should not be called");
1687316873
}
1687416874

1687516875
@Override
16876+
@TruffleBoundary
1687616877
public SourceSection getSourceSection() {
16877-
CompilerAsserts.neverPartOfCompilation();
1687816878
throw new IllegalStateException("method should not be called");
1687916879
}
1688016880

1688116881
@Override
16882+
@TruffleBoundary
1688216883
protected Object translateStackTraceElement(TruffleStackTraceElement stackTraceElement) {
16883-
CompilerAsserts.neverPartOfCompilation();
1688416884
throw new IllegalStateException("method should not be called");
1688516885
}
1688616886

@@ -16897,14 +16897,14 @@ private static final class SerializationLocal extends BytecodeLocal {
1689716897
}
1689816898

1689916899
@Override
16900+
@TruffleBoundary
1690016901
public int getLocalOffset() {
16901-
CompilerAsserts.neverPartOfCompilation();
1690216902
throw new IllegalStateException();
1690316903
}
1690416904

1690516905
@Override
16906+
@TruffleBoundary
1690616907
public int getLocalIndex() {
16907-
CompilerAsserts.neverPartOfCompilation();
1690816908
throw new IllegalStateException();
1690916909
}
1691016910

truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterProductionRootScoping.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16547,61 +16547,61 @@ private SerializationRootNode(com.oracle.truffle.api.frame.FrameDescriptor.Build
1654716547

1654816548
@Override
1654916549
public Object execute(VirtualFrame frame) {
16550-
CompilerAsserts.neverPartOfCompilation();
16550+
CompilerDirectives.transferToInterpreterAndInvalidate();
1655116551
throw new IllegalStateException("method should not be called");
1655216552
}
1655316553

1655416554
@Override
16555+
@TruffleBoundary
1655516556
protected boolean isInstrumentable() {
16556-
CompilerAsserts.neverPartOfCompilation();
1655716557
throw new IllegalStateException("method should not be called");
1655816558
}
1655916559

1656016560
@Override
16561+
@TruffleBoundary
1656116562
protected void prepareForInstrumentation(Set<Class<?>> materializedTags) {
16562-
CompilerAsserts.neverPartOfCompilation();
1656316563
throw new IllegalStateException("method should not be called");
1656416564
}
1656516565

1656616566
@Override
16567+
@TruffleBoundary
1656716568
public boolean isCloningAllowed() {
16568-
CompilerAsserts.neverPartOfCompilation();
1656916569
throw new IllegalStateException("method should not be called");
1657016570
}
1657116571

1657216572
@Override
16573+
@TruffleBoundary
1657316574
protected boolean isCloneUninitializedSupported() {
16574-
CompilerAsserts.neverPartOfCompilation();
1657516575
throw new IllegalStateException("method should not be called");
1657616576
}
1657716577

1657816578
@Override
16579+
@TruffleBoundary
1657916580
protected RootNode cloneUninitialized() {
16580-
CompilerAsserts.neverPartOfCompilation();
1658116581
throw new IllegalStateException("method should not be called");
1658216582
}
1658316583

1658416584
@Override
1658516585
protected int findBytecodeIndex(Node node, Frame frame) {
16586-
CompilerAsserts.neverPartOfCompilation();
16586+
CompilerDirectives.transferToInterpreterAndInvalidate();
1658716587
throw new IllegalStateException("method should not be called");
1658816588
}
1658916589

1659016590
@Override
16591+
@TruffleBoundary
1659116592
protected boolean isCaptureFramesForTrace(boolean compiled) {
16592-
CompilerAsserts.neverPartOfCompilation();
1659316593
throw new IllegalStateException("method should not be called");
1659416594
}
1659516595

1659616596
@Override
16597+
@TruffleBoundary
1659716598
public SourceSection getSourceSection() {
16598-
CompilerAsserts.neverPartOfCompilation();
1659916599
throw new IllegalStateException("method should not be called");
1660016600
}
1660116601

1660216602
@Override
16603+
@TruffleBoundary
1660316604
protected Object translateStackTraceElement(TruffleStackTraceElement stackTraceElement) {
16604-
CompilerAsserts.neverPartOfCompilation();
1660516605
throw new IllegalStateException("method should not be called");
1660616606
}
1660716607

@@ -16618,14 +16618,14 @@ private static final class SerializationLocal extends BytecodeLocal {
1661816618
}
1661916619

1662016620
@Override
16621+
@TruffleBoundary
1662116622
public int getLocalOffset() {
16622-
CompilerAsserts.neverPartOfCompilation();
1662316623
throw new IllegalStateException();
1662416624
}
1662516625

1662616626
@Override
16627+
@TruffleBoundary
1662716628
public int getLocalIndex() {
16628-
CompilerAsserts.neverPartOfCompilation();
1662916629
throw new IllegalStateException();
1663016630
}
1663116631

truffle/mxbuild/jdk21/com.oracle.truffle.api.bytecode.test/src_gen/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreterUnsafe.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11393,61 +11393,61 @@ private SerializationRootNode(com.oracle.truffle.api.frame.FrameDescriptor.Build
1139311393

1139411394
@Override
1139511395
public Object execute(VirtualFrame frame) {
11396-
CompilerAsserts.neverPartOfCompilation();
11396+
CompilerDirectives.transferToInterpreterAndInvalidate();
1139711397
throw new IllegalStateException("method should not be called");
1139811398
}
1139911399

1140011400
@Override
11401+
@TruffleBoundary
1140111402
protected boolean isInstrumentable() {
11402-
CompilerAsserts.neverPartOfCompilation();
1140311403
throw new IllegalStateException("method should not be called");
1140411404
}
1140511405

1140611406
@Override
11407+
@TruffleBoundary
1140711408
protected void prepareForInstrumentation(Set<Class<?>> materializedTags) {
11408-
CompilerAsserts.neverPartOfCompilation();
1140911409
throw new IllegalStateException("method should not be called");
1141011410
}
1141111411

1141211412
@Override
11413+
@TruffleBoundary
1141311414
public boolean isCloningAllowed() {
11414-
CompilerAsserts.neverPartOfCompilation();
1141511415
throw new IllegalStateException("method should not be called");
1141611416
}
1141711417

1141811418
@Override
11419+
@TruffleBoundary
1141911420
protected boolean isCloneUninitializedSupported() {
11420-
CompilerAsserts.neverPartOfCompilation();
1142111421
throw new IllegalStateException("method should not be called");
1142211422
}
1142311423

1142411424
@Override
11425+
@TruffleBoundary
1142511426
protected RootNode cloneUninitialized() {
11426-
CompilerAsserts.neverPartOfCompilation();
1142711427
throw new IllegalStateException("method should not be called");
1142811428
}
1142911429

1143011430
@Override
1143111431
protected int findBytecodeIndex(Node node, Frame frame) {
11432-
CompilerAsserts.neverPartOfCompilation();
11432+
CompilerDirectives.transferToInterpreterAndInvalidate();
1143311433
throw new IllegalStateException("method should not be called");
1143411434
}
1143511435

1143611436
@Override
11437+
@TruffleBoundary
1143711438
protected boolean isCaptureFramesForTrace(boolean compiled) {
11438-
CompilerAsserts.neverPartOfCompilation();
1143911439
throw new IllegalStateException("method should not be called");
1144011440
}
1144111441

1144211442
@Override
11443+
@TruffleBoundary
1144311444
public SourceSection getSourceSection() {
11444-
CompilerAsserts.neverPartOfCompilation();
1144511445
throw new IllegalStateException("method should not be called");
1144611446
}
1144711447

1144811448
@Override
11449+
@TruffleBoundary
1144911450
protected Object translateStackTraceElement(TruffleStackTraceElement stackTraceElement) {
11450-
CompilerAsserts.neverPartOfCompilation();
1145111451
throw new IllegalStateException("method should not be called");
1145211452
}
1145311453

@@ -11464,14 +11464,14 @@ private static final class SerializationLocal extends BytecodeLocal {
1146411464
}
1146511465

1146611466
@Override
11467+
@TruffleBoundary
1146711468
public int getLocalOffset() {
11468-
CompilerAsserts.neverPartOfCompilation();
1146911469
throw new IllegalStateException();
1147011470
}
1147111471

1147211472
@Override
11473+
@TruffleBoundary
1147311474
public int getLocalIndex() {
11474-
CompilerAsserts.neverPartOfCompilation();
1147511475
throw new IllegalStateException();
1147611476
}
1147711477

0 commit comments

Comments
 (0)