[GR-44178] Add patch for cmake

PullRequest: graalpython/2630

Author: msimacek

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

@@ -206,6 +206,7 @@ long getStackSize(long stackSize) {
     }
 
     @Builtin(name = "start_new_thread", minNumOfPositionalArgs = 3, maxNumOfPositionalArgs = 4, constructsClass = PythonBuiltinClassType.PThread)
+    @Builtin(name = "start_new", minNumOfPositionalArgs = 3, maxNumOfPositionalArgs = 4)
     @GenerateNodeFactory
     abstract static class StartNewThreadNode extends PythonBuiltinNode {
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -2278,7 +2278,11 @@ private Object bytecodeLoop(VirtualFrame virtualFrame, Frame localFrame, Bytecod
                     CompilerAsserts.partialEvaluationConstant(targetIndex);
                     chainPythonExceptions(virtualFrame, mutableData, pe);
                     if (targetIndex == -1) {
-                        throw reraiseUnhandledException(virtualFrame, localFrame, initialStackTop, isGeneratorOrCoroutine, mutableData, bciSlot, beginBci, pe, tracingEnabled, profilingEnabled);
+                        reraiseUnhandledException(virtualFrame, localFrame, initialStackTop, isGeneratorOrCoroutine, mutableData, bciSlot, beginBci, pe, tracingEnabled, profilingEnabled);
+                        if (pe != null) {
+                            throw pe;
+                        }
+                        throw e;
                     }
                     if (pe != null) {
                         pe.setCatchingFrameReference(virtualFrame, this, beginBci);
@@ -3042,7 +3046,7 @@ private void unboxVariables(Frame localFrame) {
     }
 
     @InliningCutoff
-    private PException reraiseUnhandledException(VirtualFrame virtualFrame, Frame localFrame, int initialStackTop, boolean isGeneratorOrCoroutine, MutableLoopData mutableData, int bciSlot,
+    private void reraiseUnhandledException(VirtualFrame virtualFrame, Frame localFrame, int initialStackTop, boolean isGeneratorOrCoroutine, MutableLoopData mutableData, int bciSlot,
                     int beginBci, PException pe, boolean tracingEnabled, boolean profilingEnabled) {
         // For tracebacks
         setCurrentBci(virtualFrame, bciSlot, beginBci);
@@ -3059,7 +3063,6 @@ private PException reraiseUnhandledException(VirtualFrame virtualFrame, Frame lo
             LoopNode.reportLoopCount(this, mutableData.loopCount);
         }
         traceOrProfileReturn(virtualFrame, mutableData, PNone.NONE, tracingEnabled, profilingEnabled);
-        throw pe;
     }
 
     @InliningCutoff

graalpython/lib-graalpython/patches/cmake/sdist/cmake.patch

@@ -0,0 +1,26 @@
+From 65894588b0355350f69774df8cd9873153c8bf27 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <[email protected]>
+Date: Thu, 9 Feb 2023 16:33:15 +0100
+Subject: [PATCH] Use prebuilt cmake by default
+
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a3a134..89bf75e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,8 @@ if(CMakePythonDistributions_SUPERBUILD)
+ 
+   #-----------------------------------------------------------------------------
+   # Options
+-  set(default ON)
++  # GraalPy change
++  set(default OFF)
+   if(WIN32 OR APPLE)
+     set(default OFF)
+   endif()
+-- 
+2.39.1
+