Fix memory leaks

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java

@@ -78,6 +78,7 @@
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
+import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonSenaryBuiltinNode;
@@ -595,15 +596,15 @@ abstract static class CreateMatchFromTRegexResultNode extends PNodeWithContext {
 
         @Specialization
         static Object createMatch(VirtualFrame frame, Node inliningTarget, Object pattern, int pos, int endPos, Object regexResult, Object input,
-                        @Cached("lookupMatchConstructor()") Object matchConstructor,
+                        @Cached GetMatchConstructorNode getConstructor,
                         @Cached InlinedConditionProfile matchProfile,
                         @CachedLibrary(limit = "1") InteropLibrary libResult,
                         @Cached PyObjectLookupAttr lookupIndexGroupNode,
                         @Cached(inline = false) CallNode constructResultNode) {
             try {
                 if (matchProfile.profile(inliningTarget, (boolean) libResult.readMember(regexResult, "isMatch"))) {
                     Object indexGroup = lookupIndexGroupNode.execute(frame, inliningTarget, pattern, T__PATTERN__INDEXGROUP);
-                    return constructResultNode.execute(frame, matchConstructor, pattern, pos, endPos, regexResult, input, indexGroup);
+                    return constructResultNode.execute(frame, getConstructor.execute(inliningTarget), pattern, pos, endPos, regexResult, input, indexGroup);
                 } else {
                     return PNone.NONE;
                 }
@@ -612,11 +613,31 @@ static Object createMatch(VirtualFrame frame, Node inliningTarget, Object patter
             }
         }
 
-        @TruffleBoundary
-        @NeverDefault
-        protected Object lookupMatchConstructor() {
-            PythonModule module = getContext().lookupBuiltinModule(BuiltinNames.T__SRE);
-            return PyObjectLookupAttr.executeUncached(module, T_MATCH_CONSTRUCTOR);
+        @GenerateInline
+        @GenerateCached(false)
+        abstract static class GetMatchConstructorNode extends PNodeWithContext {
+            public abstract Object execute(Node inliningTarget);
+
+            @Specialization(guards = "isSingleContext()")
+            static Object doSingleContext(
+                            @Cached("lookupMatchConstructor()") Object constructor) {
+                return constructor;
+            }
+
+            @Specialization(replaces = "doSingleContext")
+            static Object doRead(
+                            @Bind PythonContext context,
+                            @Cached ReadAttributeFromObjectNode read) {
+                PythonModule module = context.lookupBuiltinModule(BuiltinNames.T__SRE);
+                return read.execute(module, T_MATCH_CONSTRUCTOR);
+            }
+
+            @TruffleBoundary
+            @NeverDefault
+            protected static Object lookupMatchConstructor() {
+                PythonModule module = PythonContext.get(null).lookupBuiltinModule(BuiltinNames.T__SRE);
+                return PyObjectLookupAttr.executeUncached(module, T_MATCH_CONSTRUCTOR);
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/CallDispatchers.java

@@ -188,7 +188,6 @@ static Object callBuiltinFunctionCached(VirtualFrame frame, Node inliningTarget,
 
         @Specialization(guards = "sameCallTarget(callee.getCallTarget(), callNode)", limit = "getCallSiteInlineCacheMaxDepth()")
         static Object callBuiltinFunctionCachedCt(VirtualFrame frame, Node inliningTarget, @SuppressWarnings("unused") PBuiltinFunction callee, Object[] arguments,
-                        @SuppressWarnings("unused") @Cached("callee") PBuiltinFunction cachedCallee,
                         @Cached("createDirectCallNodeFor(callee)") DirectCallNode callNode,
                         @Cached SimpleDirectInvokeNode invoke) {
             return invoke.execute(frame, inliningTarget, callNode, arguments);
@@ -254,7 +253,7 @@ public abstract static class FunctionInvokeNode extends PNodeWithContext {
         // We only have a single context and this function never changed its code
         @Specialization(guards = {"isSingleContext()", "callee == cachedCallee"}, limit = "getCallSiteInlineCacheMaxDepth()", assumptions = "cachedCallee.getCodeStableAssumption()")
         static Object callFunctionCached(VirtualFrame frame, Node inliningTarget, @SuppressWarnings("unused") PFunction callee, Object[] arguments,
-                        @SuppressWarnings("unused") @Cached("callee") PFunction cachedCallee,
+                        @SuppressWarnings("unused") @Cached(value = "callee", weak = true) PFunction cachedCallee,
                         @Cached("createDirectCallNodeFor(callee)") DirectCallNode callNode,
                         @Cached FunctionDirectInvokeNode invoke) {
             return invoke.execute(frame, inliningTarget, callNode, cachedCallee, arguments);