Skip to content

Commit 50c4076

Browse files
committed
Fix compiler tests after rebase
1 parent 334c2ff commit 50c4076

File tree

2 files changed

+5
-3
lines changed
  • compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/operation
  • truffle/src/com.oracle.truffle.api.operation.test/src/com/oracle/truffle/api/operation/test

2 files changed

+5
-3
lines changed

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/operation/OperationOSRTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.concurrent.TimeUnit;
44

55
import org.graalvm.compiler.test.GraalTest;
6-
import org.graalvm.compiler.truffle.runtime.BytecodeOSRMetadata;
76
import org.graalvm.compiler.truffle.test.TestWithSynchronousCompiling;
87
import org.junit.Assert;
98
import org.junit.Before;
@@ -22,6 +21,7 @@
2221
import com.oracle.truffle.api.operation.OperationNodes;
2322
import com.oracle.truffle.api.operation.OperationParser;
2423
import com.oracle.truffle.api.operation.OperationRootNode;
24+
import com.oracle.truffle.runtime.BytecodeOSRMetadata;
2525

2626
public class OperationOSRTest extends TestWithSynchronousCompiling {
2727
private static final OperationOSRTestLanguage LANGUAGE = null;

truffle/src/com.oracle.truffle.api.operation.test/src/com/oracle/truffle/api/operation/test/TestOperations.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,11 @@ public static long bla(long a1, @Variadic Object[] a2) {
160160
static final class ThrowOperation {
161161
@Specialization
162162
public static Object perform(long value,
163-
@Bind("$bci") int bci,
163+
// TODO: passing the actual bci breaks compiler tests because of how we
164+
// instantiate a location node from the bci
165+
@SuppressWarnings("unused") @Bind("$bci") int bci,
164166
@Bind("$root") Node node) {
165-
throw new TestException("fail", node, bci, value);
167+
throw new TestException("fail", node, -1, value);
166168
}
167169
}
168170

0 commit comments

Comments
 (0)