Skip to content

Commit da6ec39

Browse files
committed
[GR-46726] Fix infinite recursion in factory() helper methods.
PullRequest: graalpython/2842
2 parents 7b65335 + 6d073a3 commit da6ec39

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ClearNativeWrapperNode;
9696
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
9797
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
98-
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
9998
import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.PExternalFunctionWrapper;
10099
import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
101100
import com.oracle.graal.python.builtins.objects.cext.capi.PySequenceArrayWrapper;
102101
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativePointer;
103102
import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
103+
import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.TransformExceptionToNativeNodeGen;
104104
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor;
105105
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTiming;
106106
import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
@@ -314,7 +314,7 @@ protected final PythonObjectFactory factory() {
314314
if (isAdoptable()) {
315315
objectFactory = insert(PythonObjectFactory.create());
316316
} else {
317-
objectFactory = factory();
317+
objectFactory = getCore().factory();
318318
}
319319
}
320320
return objectFactory;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/PythonBuiltinBaseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected final PythonObjectFactory factory() {
6565
if (isAdoptable()) {
6666
objectFactory = insert(PythonObjectFactory.create());
6767
} else {
68-
objectFactory = factory();
68+
objectFactory = getCore().factory();
6969
}
7070
}
7171
return objectFactory;

0 commit comments

Comments
 (0)