Use a better name for context in PythonThreadState

Author: Adam Hrbac

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

@@ -57,13 +57,13 @@ public void enter(PythonContext.PythonThreadState threadState) {
         }
         previousContext = threadState.getContextVarsContext();
         assert previousContext != null : "ThreadState had null Context. This should not happen";
-        threadState.setContext(this);
+        threadState.setContextVarsContext(this);
     }
 
     public void leave(PythonContext.PythonThreadState threadState) {
         assert threadState.getContextVarsContext() == this : "leaving a context which is not currently entered";
         assert previousContext != null : "entered context has no previous context";
-        threadState.setContext(previousContext);
+        threadState.setContextVarsContext(previousContext);
         previousContext = null;
     }
 

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

@@ -87,7 +87,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 
-import com.oracle.graal.python.builtins.objects.contextvars.PContextVarsContext;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.options.OptionKey;
 
@@ -109,6 +108,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.contextvars.PContextVarsContext;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.frame.PFrame.Reference;
@@ -247,9 +247,13 @@ public static final class PythonThreadState {
         /* The event currently being traced, only useful if tracing is true. */
         TraceEvent tracingWhat;
 
-        boolean contextInitialized = false;
+        /*
+         * tracks whether a contextVarsContext was ever set. This is useful to make bugs where
+         * contextVarsContext gets set to null noticable.
+         */
+        boolean contextVarsContextInitialized = false;
 
-        PContextVarsContext context;
+        PContextVarsContext contextVarsContext;
 
         /*
          * The constructor needs to have this particular signature such that we can use it for
@@ -335,15 +339,16 @@ public void setNativeWrapper(PThreadState nativeWrapper) {
         }
 
         public PContextVarsContext getContextVarsContext() {
-            if (!contextInitialized) {
-                context = PythonObjectFactory.getUncached().createContextVarsContext();
-                contextInitialized = true;
+            if (!contextVarsContextInitialized) {
+                contextVarsContext = PythonObjectFactory.getUncached().createContextVarsContext();
+                contextVarsContextInitialized = true;
             }
-            return context;
+            return contextVarsContext;
         }
 
-        public void setContext(PContextVarsContext context) {
-            this.context = context;
+        public void setContextVarsContext(PContextVarsContext contextVarsContext) {
+            this.contextVarsContext = contextVarsContext;
+            this.contextVarsContextInitialized = true;
         }
 
         public void dispose() {