[GR-26640] [GR-26642] Fix more memory leaks and remove slow getInstanceShape method

PullRequest: graalpython/1378

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -434,10 +434,10 @@ static Object doSingleton(@SuppressWarnings("unused") CExtContext cextContext, @
             return nativeWrapper;
         }
 
-        @Specialization(guards = "object == cachedObject", limit = "3")
+        @Specialization(guards = "object == cachedObject", limit = "3", assumptions = "singleContextAssumption()")
         static Object doPythonClass(@SuppressWarnings("unused") CExtContext cextContext, @SuppressWarnings("unused") PythonManagedClass object,
-                        @SuppressWarnings("unused") @Cached("object") PythonManagedClass cachedObject,
-                        @Cached("wrapNativeClass(object)") PythonClassNativeWrapper wrapper) {
+                        @SuppressWarnings("unused") @Cached(value = "object", weak = true) PythonManagedClass cachedObject,
+                        @Cached(value = "wrapNativeClass(object)", weak = true) PythonClassNativeWrapper wrapper) {
             return wrapper;
         }
 
@@ -690,10 +690,10 @@ static Object doSingleton(@SuppressWarnings("unused") CExtContext cextContext, @
             return nativeWrapper;
         }
 
-        @Specialization(guards = "object == cachedObject", limit = "3")
+        @Specialization(guards = "object == cachedObject", limit = "3", assumptions = "singleContextAssumption()")
         static Object doPythonClass(@SuppressWarnings("unused") CExtContext cextContext, @SuppressWarnings("unused") PythonManagedClass object,
-                        @SuppressWarnings("unused") @Cached("object") PythonManagedClass cachedObject,
-                        @Cached("wrapNativeClass(object)") PythonClassNativeWrapper wrapper) {
+                        @SuppressWarnings("unused") @Cached(value = "object", weak = true) PythonManagedClass cachedObject,
+                        @Cached(value = "wrapNativeClass(object)", weak = true) PythonClassNativeWrapper wrapper) {
             wrapper.increaseRefCount();
             return wrapper;
         }
@@ -873,10 +873,10 @@ static Object doSingleton(CExtContext cextContext, PythonAbstractObject object,
             return ToNewRefNode.doSingleton(cextContext, object, contextRef);
         }
 
-        @Specialization(guards = "object == cachedObject", limit = "3")
+        @Specialization(guards = "object == cachedObject", limit = "3", assumptions = "singleContextAssumption()")
         static Object doPythonClass(@SuppressWarnings("unused") CExtContext cextContext, @SuppressWarnings("unused") PythonManagedClass object,
-                        @SuppressWarnings("unused") @Cached("object") PythonManagedClass cachedObject,
-                        @Cached("wrapNativeClass(object)") PythonClassNativeWrapper wrapper) {
+                        @SuppressWarnings("unused") @Cached(value = "object", weak = true) PythonManagedClass cachedObject,
+                        @Cached(value = "wrapNativeClass(object)", weak = true) PythonClassNativeWrapper wrapper) {
             wrapper.increaseRefCount();
             return wrapper;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -207,7 +207,7 @@ protected static AllocationReporter getAllocationReporter(ContextReference<Pytho
         return contextRef.get().getEnv().lookup(AllocationReporter.class);
     }
 
-    private PythonLanguage getLanguage() {
+    public PythonLanguage getLanguage() {
         return executeGetLanguage(true, 0.0);
     }
 

mx.graalpython/mx_graalpython.py

@@ -213,7 +213,6 @@ def punittest(ars):
                 # test leaks with shared engine Python code only
                 run_leak_launcher(common_args + ["--shared-engine", "--code", "pass"]),
                 # test leaks with shared engine when some C module code is involved
-                # Not working due to GR-26175
                 # run_leak_launcher(common_args + ["--shared-engine", "--code", "import _testcapi, mmap, bz2; print(memoryview(b'').nbytes)"])
         ]):
             mx.abort(1)
@@ -2025,7 +2024,7 @@ def run_leak_launcher(input_args, out=None):
         # rerun once with heap dumping enabled
         out = mx.OutputCapture()
         run_leak_launcher(["--keep-dump"] + input_args, out=out)
-        path = out.data.strip().split("Dump file:")[2].strip()
+        path = out.data.strip().partition("Dump file:")[2].strip()
         if path:
             save_path = os.path.join(SUITE.dir, "dumps", "leak_test")
             try: