[GR-35958] Remove PythonLanguage#singleContextAssumption.

PullRequest: graalpython/2133

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -183,8 +183,6 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
 
     private static final LanguageReference<PythonLanguage> REFERENCE = LanguageReference.create(PythonLanguage.class);
 
-    public final Assumption singleContextAssumption = Truffle.getRuntime().createAssumption("Only a single context is active");
-
     @CompilationFinal private boolean singleContext = true;
 
     public boolean isSingleContext() {
@@ -732,7 +730,6 @@ private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder) th
     @Override
     protected void initializeMultipleContexts() {
         super.initializeMultipleContexts();
-        singleContextAssumption.invalidate();
         singleContext = false;
     }
 
@@ -795,7 +792,7 @@ public Shape getEmptyShape() {
     }
 
     public Shape getShapeForClass(PythonAbstractClass klass) {
-        if (singleContextAssumption.isValid()) {
+        if (isSingleContext()) {
             return Shape.newBuilder(getEmptyShape()).addConstantProperty(HiddenAttributes.CLASS, klass, 0).build();
         } else {
             return getEmptyShape();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PNodeWithContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -45,8 +45,6 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.ExceptionUtils;
-import com.oracle.truffle.api.Assumption;
-import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.nodes.Node;
@@ -55,11 +53,6 @@
 @ImportStatic({PGuards.class, PythonOptions.class, SpecialMethodNames.class, SpecialAttributeNames.class, SpecialMethodSlot.class, BuiltinNames.class})
 public abstract class PNodeWithContext extends Node {
 
-    protected static Assumption singleContextAssumption() {
-        CompilerAsserts.neverPartOfCompilation("the singleContextAssumption should only be retrieved in the interpreter");
-        return PythonLanguage.get(null).singleContextAssumption;
-    }
-
     /**
      * @return {@code true} if this node can be shared statically.
      */