edfink234
diff --git a/‎.github/CODEOWNERS
Lines changed: 0 additions & 1 deletion b/‎.github/CODEOWNERS
Lines changed: 0 additions & 1 deletion
diff --git a/‎.github/workflows/cppinterop-diff.yml
Lines changed: 7 additions & 1 deletion b/‎.github/workflows/cppinterop-diff.yml
Lines changed: 7 additions & 1 deletion
diff --git a/‎.github/workflows/root-ci-config/buildconfig/global.txt
Lines changed: 0 additions & 1 deletion b/‎.github/workflows/root-ci-config/buildconfig/global.txt
Lines changed: 0 additions & 1 deletion
diff --git a/‎README/ReleaseNotes/v636/index.md
Lines changed: 2 additions & 2 deletions b/‎README/ReleaseNotes/v636/index.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
Lines changed: 6 additions & 2 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/CMakeLists.txt
Lines changed: 6 additions & 2 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPOperator.cxx
Lines changed: 6 additions & 8 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPOperator.cxx
Lines changed: 6 additions & 8 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
Lines changed: 1 addition & 4 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPOverload.cxx
Lines changed: 1 addition & 4 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx
Lines changed: 1 addition & 2 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/CPPScope.cxx
Lines changed: 1 addition & 2 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx
Lines changed: 4 additions & 7 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/Converters.cxx
Lines changed: 4 additions & 7 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/PyException.cxx
Lines changed: 13 additions & 3 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/PyException.cxx
Lines changed: 13 additions & 3 deletions
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/Pythonize.cxx
Lines changed: 15 additions & 1 deletion b/‎bindings/pyroot/cppyy/CPyCppyy/src/Pythonize.cxx
Lines changed: 15 additions & 1 deletion
diff --git a/‎bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx
Lines changed: 4 additions & 11 deletions b/‎bindings/pyroot/cppyy/CPyCppyy/src/TemplateProxy.cxx
Lines changed: 4 additions & 11 deletions
@@ -61,7 +61,6 @@ interpreter/cling/tools/packaging @vgvassilev
 /js/ @linev
 /gui/webdisplay/ @linev
 /gui/cefdisplay/ @linev
-/gui/qt5webdisplay/ @linev
 /gui/qt6webdisplay/ @linev
 /gui/webgui6/ @linev
 /gui/fitpanelv7/ @linev
 
@@ -12,11 +12,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: root
+      - name: Determine tag that CppInterOp in ROOT is based
+        id: determine-tag
+        run: |
+          tag_file=root/interpreter/CppInterOp/cppinterop-version.tag
+          echo "tag=$(cat $tag_file)" >> $GITHUB_OUTPUT
+          rm $tag_file
       - name: Check out CppInterOp
         uses: actions/checkout@v4
         with:
           repository: compiler-research/CppInterOp
-          ref: 33bfa391c9322bd7cb79f954e54eedef486c999a
+          ref: ${{ steps.determine-tag.outputs.tag }}
           path: CppInterOp
       - name: Drop directories that are not added to ROOT
         working-directory: CppInterOp
 
@@ -67,7 +67,6 @@ mpi=OFF
 opengl=ON
 pyroot=ON
 pythia8=ON
-qt5web=OFF
 qt6web=OFF
 r=OFF
 roofit=ON
 
@@ -38,8 +38,8 @@ The following people have contributed to this new version:
 * The `RooDataSet` constructors to construct a dataset from a part of an existing dataset are deprecated and will be removed in ROOT 6.38. This is to avoid interface duplication. Please use `RooAbsData::reduce()` instead, or if you need to change the weight column, use the universal constructor with the `Import()`, `Cut()`, and `WeightVar()` arguments.
 * The ROOT splash screen was removed for Linux and macOS
 * Proof support has been completely removed form RooFit and RooStats, after it was already not working anymore for several releases
-* The build options `mysql`, `odbc`, `pgsql` and `qt5web` have been deprecated. Please complain with [email protected] should you still need one!
-* The build option `html` has been removed.
+* The build options `mysql`, `odbc`, `pgsql` have been deprecated. Please complain with [email protected] should you still need one!
+* The build options `html` and `qt5web` have been removed.
 * The ClassImp macro and derived macros have no effect now and will be deprecated in ROOT 6.38.
 * The default TTreeFormula constructor (without arguments) is now deleted, since it lead to an unusable and unsafe object. Instead, this implementation has been reserved now for ROOT I/O exclusively via the TRootIOCtor argument tag.
 * The `RooStats::HLFactory` class was deprecated will be removed in ROOT 6.38. It provided little advantage over using the RooWorkspace directly or any of the other higher-level frameworks that exist in the RooFit ecosystem.
 
@@ -73,8 +73,12 @@ if(NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND NOT MSVC)
     -Wno-unused-but-set-parameter)
 endif()
 
-# Disables warnings coming from PyCFunction casts
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 8)
+# Avoid warnings due to invalid function casts from C++ functions in CPyCppyy
+# to CPython API function typedefs (e.g. PyCFunction). This is a common pattern
+# in CPython extension implementations, explicitly encouraged by the official
+# CPython docs for C/C++ extensions. see
+# https://docs.python.org/3/extending/extending.html#keyword-parameters-for-extension-functions
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   target_compile_options(${libname} PRIVATE -Wno-cast-function-type)
 endif()
 
 
@@ -2,6 +2,7 @@
 #include "CPyCppyy.h"
 #include "CPPOperator.h"
 #include "CPPInstance.h"
+#include "Utility.h"
 
 
 //- constructor --------------------------------------------------------------
@@ -49,17 +50,14 @@ PyObject* CPyCppyy::CPPOperator::Call(CPPInstance*& self,
         return result;
     }
 
-    PyObject* pytype = 0, *pyvalue = 0, *pytrace = 0;
-    PyErr_Fetch(&pytype, &pyvalue, &pytrace);
+// fetch the current error, resetting the error buffer
+    auto error = CPyCppyy::Utility::FetchPyError();
 
     result = fStub((PyObject*)self, CPyCppyy_PyArgs_GET_ITEM(args, idx_other));
 
-    if (!result)
-        PyErr_Restore(pytype, pyvalue, pytrace);
-    else {
-        Py_XDECREF(pytype);
-        Py_XDECREF(pyvalue);
-        Py_XDECREF(pytrace);
+// if there was still a problem, restore the Python error buffer
+    if (!result) {
+        CPyCppyy::Utility::RestorePyError(error);
     }
 
     return result;
 
@@ -712,9 +712,6 @@ static PyObject* mp_call(CPPOverload* pymeth, PyObject* args, PyObject* kwds)
                     }
                 }
 
-            // clear collected errors
-                if (!errors.empty())
-                    std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);
                 return HandleReturn(pymeth, im_self, result);
             }
 
@@ -758,7 +755,7 @@ static PyObject* mp_call(CPPOverload* pymeth, PyObject* args, PyObject* kwds)
 // first summarize, then add details
     PyObject* topmsg = CPyCppyy_PyText_FromFormat(
         "none of the %d overloaded methods succeeded. Full details:", (int)nMethods);
-    SetDetailedException(errors, topmsg /* steals */, PyExc_TypeError /* default error */);
+    SetDetailedException(std::move(errors), topmsg /* steals */, PyExc_TypeError /* default error */);
 
 // report failure
     return nullptr;
 
@@ -504,7 +504,6 @@ static PyObject* meta_getattro(PyObject* pyclass, PyObject* pyname)
     }
 
     if (attr) {
-        std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);
         PyErr_Clear();
     } else {
     // not found: prepare a full error report
@@ -518,7 +517,7 @@ static PyObject* meta_getattro(PyObject* pyclass, PyObject* pyname)
             topmsg = CPyCppyy_PyText_FromFormat("no such attribute \'%s\'. Full details:",
                 CPyCppyy_PyText_AsString(pyname));
         }
-        SetDetailedException(errors, topmsg /* steals */, PyExc_AttributeError /* default error */);
+        SetDetailedException(std::move(errors), topmsg /* steals */, PyExc_AttributeError /* default error */);
     }
 
     return attr;
 
@@ -535,10 +535,9 @@ bool CPyCppyy::Converter::ToMemory(PyObject*, void*, PyObject* /* ctxt */)
     if (val == (type)-1 && PyErr_Occurred()) {                               \
         static PyTypeObject* ctypes_type = nullptr;                          \
         if (!ctypes_type) {                                                  \
-            PyObject* pytype = 0, *pyvalue = 0, *pytrace = 0;                \
-            PyErr_Fetch(&pytype, &pyvalue, &pytrace);                        \
+            auto error = CPyCppyy::Utility::FetchPyError();                  \
             ctypes_type = GetCTypesType(ct_##ctype);                         \
-            PyErr_Restore(pytype, pyvalue, pytrace);                         \
+            CPyCppyy::Utility::RestorePyError(error);                        \
         }                                                                    \
         if (Py_TYPE(pyobject) == ctypes_type) {                              \
             PyErr_Clear();                                                   \
@@ -1258,16 +1257,14 @@ bool CPyCppyy::CStringConverter::SetArg(
     const char* cstr = CPyCppyy_PyText_AsStringAndSize(pyobject, &len);
     if (!cstr) {
     // special case: allow ctypes c_char_p
-        PyObject* pytype = 0, *pyvalue = 0, *pytrace = 0;
-        PyErr_Fetch(&pytype, &pyvalue, &pytrace);
+        auto error = CPyCppyy::Utility::FetchPyError();
         if (Py_TYPE(pyobject) == GetCTypesType(ct_c_char_p)) {
             SetLifeLine(ctxt->fPyContext, pyobject, (intptr_t)this);
             para.fValue.fVoidp = (void*)((CPyCppyy_tagCDataObject*)pyobject)->b_ptr;
             para.fTypeCode = 'V';
-            Py_XDECREF(pytype); Py_XDECREF(pyvalue); Py_XDECREF(pytrace);
             return true;
         }
-        PyErr_Restore(pytype, pyvalue, pytrace);
+        CPyCppyy::Utility::RestorePyError(error);
         return false;
     }
 
 
@@ -28,8 +28,17 @@ CPyCppyy::PyException::PyException()
     PyGILState_STATE state = PyGILState_Ensure();
 #endif
 
+#if PY_VERSION_HEX >= 0x030c0000
+    PyObject *pyvalue = PyErr_GetRaisedException();
+    PyObject *pytype = pyvalue ? (PyObject *)Py_TYPE(pyvalue) : nullptr;
+    PyObject* traceback = pyvalue ? PyException_GetTraceback(pyvalue) : nullptr;
+#else
     PyObject* pytype = nullptr, *pyvalue = nullptr, *pytrace = nullptr;
     PyErr_Fetch(&pytype, &pyvalue, &pytrace);
+    PyObject* traceback = pytrace; // to keep the original unchanged
+    Py_XINCREF(traceback);
+#endif
+
     if (pytype && pyvalue) {
         const char* tname = PyExceptionClass_Name(pytype);
         if (tname) {
@@ -46,9 +55,6 @@ CPyCppyy::PyException::PyException()
         }
     }
 
-    PyObject* traceback = pytrace; // to keep the original unchanged
-    Py_XINCREF(traceback);
-
     std::string locName;
     std::string locFile;
     int locLine = 0;
@@ -88,7 +94,11 @@ CPyCppyy::PyException::PyException()
 
     Py_XDECREF(traceback);
 
+#if PY_VERSION_HEX >= 0x030c0000
+    PyErr_SetRaisedException(pyvalue);
+#else
     PyErr_Restore(pytype, pyvalue, pytrace);
+#endif
 
     if (fMsg.empty())
         fMsg = "python exception";
 
@@ -527,6 +527,13 @@ PyObject* VectorData(PyObject* self, PyObject*)
 }
 
 
+// This function implements __array__, added to std::vector python proxies and causes
+// a bug (see explanation at Utility::AddToClass(pyclass, "__array__"...) in CPyCppyy::Pythonize)
+// The recursive nature of this function, passes each subarray (pydata) to the next call and only
+// the final buffer is cast to a lowlevel view and resized (in VectorData), resulting in only the
+// first 1D array to be returned. See https://github.com/root-project/root/issues/17729
+// It is temporarily removed to prevent errors due to -Wunused-function, since it is no longer added.
+#if 0
 //---------------------------------------------------------------------------
 PyObject* VectorArray(PyObject* self, PyObject* args, PyObject* kwargs)
 {
@@ -537,7 +544,7 @@ PyObject* VectorArray(PyObject* self, PyObject* args, PyObject* kwargs)
     Py_DECREF(pydata);
     return newarr;
 }
-
+#endif
 
 //-----------------------------------------------------------------------------
 static PyObject* vector_iter(PyObject* v) {
@@ -1810,8 +1817,15 @@ bool CPyCppyy::Pythonize(PyObject* pyclass, const std::string& name)
             Utility::AddToClass(pyclass, "__real_data", "data");
             Utility::AddToClass(pyclass, "data", (PyCFunction)VectorData);
 
+        // The addition of the __array__ utility to std::vector Python proxies causes a
+        // bug where the resulting array is a single dimension, causing loss of data when
+        // converting to numpy arrays, for >1dim vectors. Since this C++ pythonization
+        // was added with the upgrade in 6.32, and is only defined and used recursively,
+        // the safe option is to disable this function and no longer add it.
+#if 0
         // numpy array conversion
             Utility::AddToClass(pyclass, "__array__", (PyCFunction)VectorArray, METH_VARARGS | METH_KEYWORDS /* unused */);
+#endif
 
         // checked getitem
             if (HasAttrDirect(pyclass, PyStrings::gLen)) {
 
@@ -437,8 +437,7 @@ static int tpp_doc_set(TemplateProxy* pytmpl, PyObject *val, void *)
 //= CPyCppyy template proxy callable behavior ================================
 
 #define TPPCALL_RETURN                                                       \
-{ if (!errors.empty())                                                       \
-      std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);\
+{ errors.clear();                                                            \
   return result; }
 
 static inline std::string targs2str(TemplateProxy* pytmpl)
@@ -645,7 +644,7 @@ static PyObject* tpp_call(TemplateProxy* pytmpl, PyObject* args, PyObject* kwds)
         PyObject* topmsg = CPyCppyy_PyText_FromFormat(
             "Could not find \"%s\" (set cppyy.set_debug() for C++ errors):", CPyCppyy_PyText_AsString(pyfullname));
         Py_DECREF(pyfullname);
-        Utility::SetDetailedException(errors, topmsg /* steals */, PyExc_TypeError /* default error */);
+        Utility::SetDetailedException(std::move(errors), topmsg /* steals */, PyExc_TypeError /* default error */);
 
         return nullptr;
     }
@@ -686,7 +685,7 @@ static PyObject* tpp_call(TemplateProxy* pytmpl, PyObject* args, PyObject* kwds)
 // error reporting is fraud, given the numerous steps taken, but more details seems better
     if (!errors.empty()) {
         PyObject* topmsg = CPyCppyy_PyText_FromString("Template method resolution failed:");
-        Utility::SetDetailedException(errors, topmsg /* steals */, PyExc_TypeError /* default error */);
+        Utility::SetDetailedException(std::move(errors), topmsg /* steals */, PyExc_TypeError /* default error */);
     } else {
         PyErr_Format(PyExc_TypeError, "cannot resolve method template call for \'%s\'",
             pytmpl->fTI->fCppName.c_str());
@@ -853,17 +852,11 @@ static PyObject* tpp_overload(TemplateProxy* pytmpl, PyObject* args)
     }
 
 // else attempt instantiation
-    PyObject* pytype = 0, *pyvalue = 0, *pytrace = 0;
-    PyErr_Fetch(&pytype, &pyvalue, &pytrace);
-
     if (!cppmeth) {
-        PyErr_Restore(pytype, pyvalue, pytrace);
         return nullptr;
     }
 
-    Py_XDECREF(pytype);
-    Py_XDECREF(pyvalue);
-    Py_XDECREF(pytrace);
+    PyErr_Clear();
 
     // TODO: the next step should be consolidated with Instantiate()
     PyCallable* meth = nullptr;
Original file line number	Diff line number	Diff line change
`@@ -712,9 +712,6 @@ static PyObject* mp_call(CPPOverload* pymeth, PyObject* args, PyObject* kwds)`
`712`	`712`	`}`
`713`	`713`	`}`
`714`	`714`
`715`		`- // clear collected errors`
`716`		`- if (!errors.empty())`
`717`		`- std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);`
`718`	`715`	`return HandleReturn(pymeth, im_self, result);`
`719`	`716`	`}`
`720`	`717`
`@@ -758,7 +755,7 @@ static PyObject* mp_call(CPPOverload* pymeth, PyObject* args, PyObject* kwds)`
`758`	`755`	`// first summarize, then add details`
`759`	`756`	`PyObject* topmsg = CPyCppyy_PyText_FromFormat(`
`760`	`757`	`"none of the %d overloaded methods succeeded. Full details:", (int)nMethods);`
`761`		`- SetDetailedException(errors, topmsg /* steals /, PyExc_TypeError / default error */);`
	`758`	`+ SetDetailedException(std::move(errors), topmsg /* steals /, PyExc_TypeError / default error */);`
`762`	`759`
`763`	`760`	`// report failure`
`764`	`761`	`return nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,6 @@ static PyObject* meta_getattro(PyObject* pyclass, PyObject* pyname)`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`if (attr) {`
`507`		`- std::for_each(errors.begin(), errors.end(), Utility::PyError_t::Clear);`
`508`	`507`	`PyErr_Clear();`
`509`	`508`	`} else {`
`510`	`509`	`// not found: prepare a full error report`
`@@ -518,7 +517,7 @@ static PyObject* meta_getattro(PyObject* pyclass, PyObject* pyname)`
`518`	`517`	`topmsg = CPyCppyy_PyText_FromFormat("no such attribute \'%s\'. Full details:",`
`519`	`518`	`CPyCppyy_PyText_AsString(pyname));`
`520`	`519`	`}`
`521`		`- SetDetailedException(errors, topmsg /* steals /, PyExc_AttributeError / default error */);`
	`520`	`+ SetDetailedException(std::move(errors), topmsg /* steals /, PyExc_AttributeError / default error */);`
`522`	`521`	`}`
`523`	`522`
`524`	`523`	`return attr;`