Move @TruffleBoundary deeper into the call tree

Author: Adam Hrbac

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ContextvarsModuleBuiltins.java

@@ -50,7 +50,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.contextvars.PContextVar;
-import com.oracle.graal.python.builtins.objects.contextvars.PContextVarsContext;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/Hamt.java

@@ -56,7 +56,6 @@
 
 public final class Hamt {
 
-    @CompilerDirectives.TruffleBoundary
     public String dump() {
         return dumpPart(this.root, 0);
     }
@@ -65,28 +64,6 @@ private static String dumpPart(TreePart i, int indent) {
         return i == null ? " ".repeat(indent) + "null\n" : i.dump(indent);
     }
 
-    private interface TreePart {
-        String dump(int indent);
-    }
-
-    @CompilerDirectives.ValueType
-    public static final class Entry implements TreePart {
-        final Object key;
-        final int hash;
-        final Object value;
-
-        public Entry(Object key, int hash, Object value) {
-            this.key = key;
-            this.hash = hash & 0x3FFFFFFF; // 30 bits
-            this.value = value;
-        }
-
-        @Override
-        public String dump(int indent) {
-            return " ".repeat(indent) + String.format("%s : %s (%d)\n", key, value, hash);
-        }
-    }
-
     // TODO: track size on the Hamt.
     private final TreePart root;
 
@@ -135,6 +112,7 @@ private static BitmapPart bitmapPartsForPair(TreePart one, int hashOne, TreePart
         return new BitmapPart(oneIdx > twoIdx ? new TreePart[]{one, two} : new TreePart[]{two, one}, idxToBit(twoIdx) | idxToBit(oneIdx));
     }
 
+    @CompilerDirectives.TruffleBoundary
     private static TreePart partWithEntry(TreePart original, Entry newEntry, int hashShift) {
         assert hashShift <= 25;
         if (original == null) {
@@ -219,6 +197,7 @@ public Hamt withEntry(Entry newEntry) {
         return new Hamt(root);
     }
 
+    @CompilerDirectives.TruffleBoundary
     private static Object lookupKeyInPart(TreePart part, Object key, int hash, int hashShift) {
         assert hashShift <= 25;
         if (part == null) {
@@ -314,6 +293,7 @@ private static TreePart bitmapWithoutKey(BitmapPart existing, Object key, int ha
         return new BitmapPart(newElems, existing.bitmap);
     }
 
+    @CompilerDirectives.TruffleBoundary
     private static TreePart partWithoutKey(TreePart root, Object key, int hash, int hashShift) {
         if (root == null) {
             return null;
@@ -391,6 +371,10 @@ public Hamt without(Object key, int hash) {
         return new Hamt(partWithoutKey(root, key, hash, 0));
     }
 
+    private interface TreePart {
+        String dump(int indent);
+    }
+
     private static final class BitmapPart implements TreePart {
         final int bitmap;
         final TreePart[] elems;
@@ -459,4 +443,22 @@ public String dump(int indent) {
             return result.toString();
         }
     }
+
+    @CompilerDirectives.ValueType
+    public static final class Entry implements TreePart {
+        final Object key;
+        final int hash;
+        final Object value;
+
+        public Entry(Object key, int hash, Object value) {
+            this.key = key;
+            this.hash = hash & 0x3FFFFFFF; // 30 bits
+            this.value = value;
+        }
+
+        @Override
+        public String dump(int indent) {
+            return " ".repeat(indent) + String.format("%s : %s (%d)\n", key, value, hash);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/PContextVar.java

@@ -42,7 +42,6 @@
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -72,12 +71,10 @@ public Object getDefault() {
         return def;
     }
 
-    @TruffleBoundary
     public Object getValue(PythonContext.PythonThreadState state) {
         return state.getContextVarsContext().contextVarValues.lookup(this, getHash());
     }
 
-    @TruffleBoundary
     public void setValue(PythonContext.PythonThreadState state, Object value) {
         PContextVarsContext current = state.getContextVarsContext();
         current.contextVarValues = current.contextVarValues.withEntry(new Hamt.Entry(this, getHash(), value));