Fix minor issues (lint, javadoc, CI failures)

oracle · Feb 5, 2024 · 29411bf · 29411bf
1 parent 5aec0ea
commit 29411bf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
@@ -464,6 +464,7 @@
       "annotationProcessors" : ["TRUFFLE_DSL_PROCESSOR"],
       "javaCompliance" : "17+",
       "workingSets" : "API,Truffle",
+      "graalCompilerSourceEdition": "ignore",
     },
 
     "com.oracle.truffle.api.bytecode.test" : {

diff --git a/...ode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java b/...ode.test/src/com/oracle/truffle/api/bytecode/test/basic_interpreter/BasicInterpreter.java
@@ -350,6 +350,7 @@ public static boolean doObject(Object o) {
     @Operation
     public static final class GetSourcePosition {
         @Specialization
+        @TruffleBoundary
         public static Object doOperation(VirtualFrame frame,
                         @Bind("$node") Node node,
                         @Bind("$bytecode") BytecodeNode bytecode) {

diff --git a/....truffle.api.exception/src/com/oracle/truffle/api/exception/AbstractTruffleException.java b/....truffle.api.exception/src/com/oracle/truffle/api/exception/AbstractTruffleException.java
@@ -270,7 +270,7 @@ public final Node getLocation() {
      * Returns a source section associated with the exception. This method may return {@code null}
      * to indicate that the source section is not available.
      *
-     * @since 24.0
+     * @since 24.1
      */
     public SourceSection getSourceSection() {
         if (location == null) {

diff --git a/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/Frame.java b/truffle/src/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/Frame.java
@@ -913,7 +913,7 @@ default void clearStatic(int slot) {
      *
      * @param srcSlot the slot of the source local variable
      * @param destSlot the slot of the target local variable
-     * @since XXX
+     * @since 24.1
      */
     default void copyObject(int srcSlot, int destSlot) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -925,7 +925,7 @@ default void copyObject(int srcSlot, int destSlot) {
      *
      * @param srcSlot the slot of the source local variable
      * @param destSlot the slot of the target local variable
-     * @since XXX
+     * @since 24.1
      */
     default void copyPrimitive(int srcSlot, int destSlot) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -940,7 +940,7 @@ default void copyPrimitive(int srcSlot, int destSlot) {
      * @param dst the destination frame
      * @param dstOffset the first slot to copy locals into
      * @param length the number of slots to copy
-     * @since XXX
+     * @since 24.1
      */
     @SuppressWarnings("unused")
     default void copyTo(int srcOffset, Frame dst, int dstOffset, int length) {

diff --git a/...essor/src/com/oracle/truffle/dsl/processor/bytecode/generator/BytecodeDSLNodeFactory.java b/...essor/src/com/oracle/truffle/dsl/processor/bytecode/generator/BytecodeDSLNodeFactory.java
@@ -4779,12 +4779,12 @@ private CodeExecutableElement createReparseImpl() {
 
         private CodeExecutableElement createPerformUpdate() {
             CodeExecutableElement ex = new CodeExecutableElement(Set.of(PRIVATE, Modifier.SYNCHRONIZED), type(boolean.class), "performUpdate");
-            ex.addParameter(new CodeVariableElement(type(long.class), "encoding"));
+            ex.addParameter(new CodeVariableElement(type(long.class), "maskedEncoding"));
             ex.getModifiers().add(Modifier.SYNCHRONIZED);
             CodeTreeBuilder b = ex.createBuilder();
 
             b.declaration(type(long.class), "oldEncoding", "this.encoding");
-            b.declaration(type(long.class), "newEncoding", "encoding | oldEncoding");
+            b.declaration(type(long.class), "newEncoding", "maskedEncoding | oldEncoding");
             b.startIf().string("(oldEncoding | newEncoding) == oldEncoding").end().startBlock();
             b.lineComment("double checked locking");
             b.returnFalse();

diff --git a/...e.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/model/BytecodeDSLModel.java b/...e.dsl.processor/src/com/oracle/truffle/dsl/processor/bytecode/model/BytecodeDSLModel.java
@@ -261,7 +261,7 @@ public void addDefault() {
                         .setOperationArguments(new OperationArgument(types.BytecodeLocal, "local", "the local to store to")) //
                         .setInstruction(instruction(InstructionKind.STORE_LOCAL_MATERIALIZED, "store.local.mat",
                                         signature(void.class, Object.class, Object.class)) //
-                                                        .addImmediate(ImmediateKind.INTEGER, "index"));
+                                        .addImmediate(ImmediateKind.INTEGER, "index"));
         operation(OperationKind.RETURN, "Return") //
                         .setNumChildren(1) //
                         .setChildrenMustBeValues(true) //