Fix compilation failure in contextvars builtins

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextContextBuiltins.java

@@ -113,7 +113,7 @@ static Object doGeneric(Object var, Object def, Object marker,
                 return raiseNative.get(inliningTarget).raise(null, marker, PythonBuiltinClassType.TypeError, ErrorMessages.INSTANCE_OF_CONTEXTVAR_EXPECTED);
             }
             PythonContext.PythonThreadState threadState = context.getThreadState(context.getLanguage(inliningTarget));
-            Object result = ((PContextVar) var).getValue(threadState);
+            Object result = ((PContextVar) var).getValue(inliningTarget, threadState);
             if (result == null) {
                 if (def == PNone.NO_VALUE) {
                     if (((PContextVar) var).getDefault() == PContextVar.NO_DEFAULT) {
@@ -141,8 +141,8 @@ static Object doGeneric(Object var, Object val,
             }
             PythonLanguage language = pythonContext.getLanguage(inliningTarget);
             PythonContext.PythonThreadState threadState = pythonContext.getThreadState(language);
-            Object oldValue = pvar.getValue(threadState);
-            pvar.setValue(threadState, val);
+            Object oldValue = pvar.getValue(inliningTarget, threadState);
+            pvar.setValue(inliningTarget, threadState, val);
             return PFactory.createContextVarsToken(language, pvar, oldValue);
         }
     }

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

@@ -122,7 +122,7 @@ static Object get(PContextVar self, Object def,
             Object defValue = defIsNoValueProfile.profile(inliningTarget, isNoValue(def)) ? PContextVar.NO_DEFAULT : def;
             PythonContext context = PythonContext.get(inliningTarget);
             PythonContext.PythonThreadState threadState = context.getThreadState(context.getLanguage(inliningTarget));
-            Object value = self.get(threadState, defValue);
+            Object value = self.get(inliningTarget, threadState, defValue);
             if (value != null) {
                 return value;
             }
@@ -139,8 +139,8 @@ static Object set(PContextVar self, Object value,
                         @Bind PythonContext context) {
             PythonLanguage language = context.getLanguage(inliningTarget);
             PythonContext.PythonThreadState threadState = context.getThreadState(language);
-            Object oldValue = self.getValue(threadState);
-            self.setValue(threadState, value);
+            Object oldValue = self.getValue(inliningTarget, threadState);
+            self.setValue(inliningTarget, threadState, value);
             return PFactory.createContextVarsToken(language, self, oldValue);
         }
     }
@@ -157,10 +157,10 @@ static Object reset(PContextVar self, PContextVarsToken token,
                 token.use(inliningTarget, raise);
                 PythonContext.PythonThreadState threadState = pythonContext.getThreadState(pythonContext.getLanguage(inliningTarget));
                 if (token.getOldValue() == null) {
-                    PContextVarsContext context = threadState.getContextVarsContext();
+                    PContextVarsContext context = threadState.getContextVarsContext(inliningTarget);
                     context.contextVarValues = context.contextVarValues.without(self, self.getHash());
                 } else {
-                    self.setValue(threadState, token.getOldValue());
+                    self.setValue(inliningTarget, threadState, token.getOldValue());
                 }
             } else {
                 throw raise.raise(inliningTarget, ValueError, ErrorMessages.TOKEN_FOR_DIFFERENT_CONTEXTVAR, token);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.strings.TruffleString;
 
@@ -71,17 +72,17 @@ public Object getDefault() {
         return def;
     }
 
-    public Object getValue(PythonContext.PythonThreadState state) {
-        return state.getContextVarsContext().contextVarValues.lookup(this, getHash());
+    public Object getValue(Node node, PythonContext.PythonThreadState state) {
+        return state.getContextVarsContext(node).contextVarValues.lookup(this, getHash());
     }
 
-    public void setValue(PythonContext.PythonThreadState state, Object value) {
-        PContextVarsContext current = state.getContextVarsContext();
+    public void setValue(Node node, PythonContext.PythonThreadState state, Object value) {
+        PContextVarsContext current = state.getContextVarsContext(node);
         current.contextVarValues = current.contextVarValues.withEntry(new Hamt.Entry(this, getHash(), value));
     }
 
-    public Object get(PythonContext.PythonThreadState state, Object defaultValue) {
-        Object result = getValue(state);
+    public Object get(Node node, PythonContext.PythonThreadState state, Object defaultValue) {
+        Object result = getValue(node, state);
         if (result != null) {
             return result;
         }

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

@@ -56,13 +56,13 @@ public void enter(Node inliningTarget, PythonContext.PythonThreadState threadSta
         if (previousContext != null) {
             throw raise.raise(inliningTarget, PythonBuiltinClassType.RuntimeError, ErrorMessages.CANNOT_ENTER_CONTEXT_ALREADY_ENTERED, this);
         }
-        previousContext = threadState.getContextVarsContext();
+        previousContext = threadState.getContextVarsContext(inliningTarget);
         assert previousContext != null : "ThreadState had null Context. This should not happen";
         threadState.setContextVarsContext(this);
     }
 
     public void leave(PythonContext.PythonThreadState threadState) {
-        assert threadState.getContextVarsContext() == this : "leaving a context which is not currently entered";
+        assert threadState.getContextVarsContext(null) == this : "leaving a context which is not currently entered";
         assert previousContext != null : "entered context has no previous context";
         threadState.setContextVarsContext(previousContext);
         previousContext = null;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyContextCopyCurrent.java

@@ -63,6 +63,6 @@ static PContextVarsContext doIt(Node inliningTarget) {
         PythonContext context = PythonContext.get(inliningTarget);
         PythonLanguage language = context.getLanguage(inliningTarget);
         PythonContext.PythonThreadState threadState = context.getThreadState(language);
-        return PFactory.copyContextVarsContext(language, threadState.getContextVarsContext());
+        return PFactory.copyContextVarsContext(language, threadState.getContextVarsContext(inliningTarget));
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -460,9 +460,9 @@ public void setNativeWrapper(PThreadState nativeWrapper) {
             this.nativeWrapper = nativeWrapper;
         }
 
-        public PContextVarsContext getContextVarsContext() {
+        public PContextVarsContext getContextVarsContext(Node node) {
             if (contextVarsContext == null) {
-                contextVarsContext = PFactory.createContextVarsContext(PythonLanguage.get(null));
+                contextVarsContext = PFactory.createContextVarsContext(PythonLanguage.get(node));
             }
             return contextVarsContext;
         }