don't cache return values for lookup in multi-context

timfel · timfel · commit 259655e102b7 · 2020-10-09T13:07:39.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java
@@ -183,7 +183,7 @@ protected static Object findAttr(PythonCore core, PythonBuiltinClassType klass,
         return ReadAttributeFromDynamicObjectNode.getUncached().execute(core.lookupType(current).getStorage(), key);
     }
 
-    @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()")
+    @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")
     protected static Object lookupPBCTCached(@SuppressWarnings("unused") PythonBuiltinClassType klass,
                     @Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,
                     @Cached("findAttr(getCore(), cachedKlass, key)") Object cachedValue) {

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ protected static Object findAttr(PythonCore core, PythonBuiltinClassType klass,`
`183`	`183`	`return ReadAttributeFromDynamicObjectNode.getUncached().execute(core.lookupType(current).getStorage(), key);`
`184`	`184`	`}`
`185`	`185`
`186`		`- @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()")`
	`186`	`+ @Specialization(guards = {"klass == cachedKlass"}, limit = "getAttributeAccessInlineCacheMaxDepth()", assumptions = "singleContextAssumption()")`
`187`	`187`	`protected static Object lookupPBCTCached(@SuppressWarnings("unused") PythonBuiltinClassType klass,`
`188`	`188`	`@Cached("klass") @SuppressWarnings("unused") PythonBuiltinClassType cachedKlass,`
`189`	`189`	`@Cached("findAttr(getCore(), cachedKlass, key)") Object cachedValue) {`