Skip to content

Commit e9b3019

Browse files
jchaloupatrick96
jchalou
authored and
patrick96
committed
[GR-51699] Upgrade ECJ to 3.41.
PullRequest: graal/20501
2 parents d5a5114 + ceacdde commit e9b3019

File tree

6 files changed

+31
-32
lines changed

6 files changed

+31
-32
lines changed

‎common.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.45.0",
7+
"mx_version": "7.45.3",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

‎substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/AArch64InterpreterStubSection.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void recordEnterStubForPatching(Assembler.CodeAnnotation a) {
151151
return;
152152
}
153153

154-
assert a instanceof AArch64MacroAssembler.AdrpAddMacroInstruction annotation;
154+
assert a instanceof AArch64MacroAssembler.AdrpAddMacroInstruction;
155155
AArch64MacroAssembler.AdrpAddMacroInstruction annotation = (AArch64MacroAssembler.AdrpAddMacroInstruction) a;
156156

157157
resolverPatchOffset = annotation.instructionPosition;

‎substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/Interpreter.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -405,13 +405,13 @@ private static void traceInterpreterEnter(InterpreterResolvedJavaMethod method,
405405
}
406406

407407
setLogIndent(indent + 2);
408-
traceInterpreter(" ".repeat(indent))
409-
.string("[interp] Entered ")
410-
.string(method.getDeclaringClass().getName())
411-
.string("::")
412-
.string(method.getName())
413-
.string(method.getSignature().toMethodDescriptor())
414-
.string(" with bci=").unsigned(curBCI)
408+
traceInterpreter(" ".repeat(indent)) //
409+
.string("[interp] Entered ") //
410+
.string(method.getDeclaringClass().getName()) //
411+
.string("::") //
412+
.string(method.getName()) //
413+
.string(method.getSignature().toMethodDescriptor()) //
414+
.string(" with bci=").unsigned(curBCI) //
415415
.string("/top=").unsigned(top).newline();
416416
}
417417

@@ -423,12 +423,12 @@ private static void traceInterpreterReturn(InterpreterResolvedJavaMethod method,
423423

424424
setLogIndent(indent);
425425
traceInterpreter(" ".repeat(indent));
426-
traceInterpreter("[interp] Leave ")
427-
.string(method.getDeclaringClass().getName())
428-
.string("::")
429-
.string(method.getName())
430-
.string(method.getSignature().toMethodDescriptor())
431-
.string(" with bci=").unsigned(curBCI)
426+
traceInterpreter("[interp] Leave ") //
427+
.string(method.getDeclaringClass().getName()) //
428+
.string("::") //
429+
.string(method.getName()) //
430+
.string(method.getSignature().toMethodDescriptor()) //
431+
.string(" with bci=").unsigned(curBCI) //
432432
.string("/top=").unsigned(top).newline();
433433
}
434434

@@ -438,8 +438,8 @@ private static void traceInterpreterInstruction(InterpreterFrame frame, int inde
438438
return;
439439
}
440440

441-
traceInterpreter(" ".repeat(indent))
442-
.string("bci=").unsigned(curBCI).string(" ")
441+
traceInterpreter(" ".repeat(indent)) //
442+
.string("bci=").unsigned(curBCI).string(" ") //
443443
.string(Bytecodes.nameOf(curOpcode));
444444
for (int slot = top - 1; slot >= 0; slot--) {
445445
traceInterpreter(", s").unsigned(slot).string("=").hex(frame.getLongStatic(slot)).string("/").object(frame.getObjectStatic(slot));
@@ -454,13 +454,13 @@ private static void traceInterpreterException(InterpreterResolvedJavaMethod meth
454454
}
455455

456456
setLogIndent(indent);
457-
traceInterpreter(" ".repeat(indent))
458-
.string("[interp] Exception ")
459-
.string(method.getDeclaringClass().getName())
460-
.string("::")
461-
.string(method.getName())
462-
.string(method.getSignature().toMethodDescriptor())
463-
.string(" with bci=").unsigned(curBCI)
457+
traceInterpreter(" ".repeat(indent)) //
458+
.string("[interp] Exception ") //
459+
.string(method.getDeclaringClass().getName()) //
460+
.string("::") //
461+
.string(method.getName()) //
462+
.string(method.getSignature().toMethodDescriptor()) //
463+
.string(" with bci=").unsigned(curBCI) //
464464
.string("/top=").unsigned(top).newline();
465465
}
466466

@@ -481,7 +481,7 @@ private static Object executeBodyFromBCI(InterpreterFrame frame, InterpreterReso
481481

482482
int debuggerEventFlags = 0;
483483
if (DebuggerEvents.singleton().isEventEnabled(Thread.currentThread(), EventKind.METHOD_ENTRY)) {
484-
if (((InterpreterResolvedJavaType) method.getDeclaringClass()).isMethodEnterEvent()) {
484+
if (method.getDeclaringClass().isMethodEnterEvent()) {
485485
debuggerEventFlags |= EventKind.METHOD_ENTRY.getFlag();
486486
}
487487
}
@@ -853,7 +853,7 @@ private static Object executeBodyFromBCI(InterpreterFrame frame, InterpreterReso
853853
Object returnValue = getReturnValueAsObject(frame, method, top);
854854
traceInterpreterReturn(method, indent, curBCI, top);
855855
if (DebuggerEvents.singleton().isEventEnabled(Thread.currentThread(), EventKind.METHOD_EXIT)) {
856-
if (((InterpreterResolvedJavaType) method.getDeclaringClass()).isMethodExitEvent()) {
856+
if (method.getDeclaringClass().isMethodExitEvent()) {
857857
int flags = EventKind.METHOD_EXIT.getFlag() | EventKind.METHOD_EXIT_WITH_RETURN_VALUE.getFlag();
858858
DebuggerEvents.singleton().getEventHandler().onEventAt(Thread.currentThread(), method, curBCI, returnValue, flags);
859859
}

‎substratevm/src/com.oracle.svm.interpreter/src/com/oracle/svm/interpreter/InterpreterSupportImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import com.oracle.svm.core.interpreter.InterpreterSupport;
3939
import com.oracle.svm.core.util.VMError;
4040
import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaMethod;
41-
import com.oracle.svm.interpreter.metadata.InterpreterResolvedJavaType;
4241

4342
import jdk.graal.compiler.word.Word;
4443
import jdk.vm.ci.meta.LineNumberTable;
@@ -94,7 +93,7 @@ public FrameSourceInfo getInterpretedMethodFrameInfo(FrameInfoQueryResult frameI
9493
InterpreterResolvedJavaMethod interpretedMethod = readInterpretedMethod(frameInfo, sp);
9594
int bci = readBCI(frameInfo, sp);
9695
InterpreterFrame interpreterFrame = readInterpreterFrame(frameInfo, sp);
97-
Class<?> interpretedClass = ((InterpreterResolvedJavaType) interpretedMethod.getDeclaringClass()).getJavaClass();
96+
Class<?> interpretedClass = interpretedMethod.getDeclaringClass().getJavaClass();
9897
String sourceMethodName = interpretedMethod.getName();
9998
LineNumberTable lineNumberTable = interpretedMethod.getLineNumberTable();
10099

‎sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMPolyglotReadBuffer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
33
*
44
* All rights reserved.
55
*
@@ -59,7 +59,7 @@ protected boolean isBufferPointer(LLVMPointer receiver) {
5959
}
6060

6161
protected boolean inBounds(LLVMPointer receiver, long byteOffset, int length) {
62-
return length >= 0 && byteOffset >= 0 && byteOffset + length <= ((LLVMInteropType.Buffer) receiver.getExportType()).getSize();
62+
return length >= 0 && byteOffset >= 0 && byteOffset + length <= receiver.getExportType().getSize();
6363
}
6464

6565
protected boolean isNativeOrder(ByteOrder order) {

‎sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/interop/LLVMPolyglotWriteBuffer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
33
*
44
* All rights reserved.
55
*
@@ -59,7 +59,7 @@ protected boolean isWritableBufferPointer(LLVMPointer receiver) {
5959
}
6060

6161
protected boolean inBounds(LLVMPointer receiver, long byteOffset, int length) {
62-
return byteOffset >= 0 && byteOffset + length <= ((LLVMInteropType.Buffer) receiver.getExportType()).getSize();
62+
return byteOffset >= 0 && byteOffset + length <= receiver.getExportType().getSize();
6363
}
6464

6565
protected boolean isNativeOrder(ByteOrder order) {

0 commit comments

Comments
 (0)