Add _PyTraceback_Add

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/traceback.c

@@ -47,3 +47,8 @@ UPCALL_ID(PyTraceBack_Here);
 int PyTraceBack_Here(PyFrameObject *frame) {
     return UPCALL_CEXT_I(_jls_PyTraceBack_Here, native_to_java((PyObject*)frame));
 }
+
+UPCALL_ID(_PyTraceback_Add)
+void _PyTraceback_Add(const char *funcname, const char *filename, int lineno) {
+    return UPCALL_CEXT_VOID(_jls__PyTraceback_Add, polyglot_from_string(funcname, SRC_CS), polyglot_from_string(filename, SRC_CS), lineno);
+}

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

@@ -50,6 +50,8 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
+import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;
+import static com.oracle.graal.python.util.PythonUtils.EMPTY_OBJECT_ARRAY;
 
 import java.io.PrintWriter;
 import java.math.BigInteger;
@@ -165,6 +167,7 @@
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext.Store;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtParseArgumentsNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtParseArgumentsNode.SplitFormatStringNode;
+import com.oracle.graal.python.builtins.objects.code.CodeNodes;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes.GetCodeCallTargetNode;
 import com.oracle.graal.python.builtins.objects.code.CodeNodes.GetCodeSignatureNode;
 import com.oracle.graal.python.builtins.objects.code.PCode;
@@ -1488,6 +1491,22 @@ int tbHere(PFrame frame,
         }
     }
 
+    @Builtin(name = "_PyTraceback_Add", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class PyTracebackAdd extends PythonTernaryBuiltinNode {
+        @Specialization
+        Object tbHere(String funcname, String filename, int lineno,
+                        @Cached CodeNodes.CreateCodeNode createCodeNode,
+                        @Cached PyTraceBackHereNode pyTraceBackHereNode) {
+            PCode code = createCodeNode.execute(null, 0, 0, 0, 0, 0, 0,
+                            EMPTY_BYTE_ARRAY, EMPTY_OBJECT_ARRAY, EMPTY_OBJECT_ARRAY, EMPTY_OBJECT_ARRAY, EMPTY_OBJECT_ARRAY, EMPTY_OBJECT_ARRAY,
+                            filename, funcname, lineno, EMPTY_BYTE_ARRAY);
+            PFrame frame = factory().createPFrame(null, code, factory().createDict(), factory().createDict());
+            pyTraceBackHereNode.execute(null, frame);
+            return PNone.NONE;
+        }
+    }
+
     @Builtin(name = "PyTruffle_Set_SulongType", minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
     abstract static class PyTruffle_Set_SulongType extends NativeBuiltin {
@@ -2879,7 +2898,7 @@ abstract static class CastArgsNode extends Node {
         @SuppressWarnings("unused")
         static Object[] doNull(VirtualFrame frame, Object argsObj,
                         @Shared("lib") @CachedLibrary(limit = "3") InteropLibrary lib) {
-            return PythonUtils.EMPTY_OBJECT_ARRAY;
+            return EMPTY_OBJECT_ARRAY;
         }
 
         @Specialization(guards = "!lib.isNull(argsObj)")
@@ -4068,14 +4087,14 @@ static GetSetDescriptor createGetSet(String name, Object clazz, Object getter, O
             PBuiltinFunction get = null;
             if (!interopLibrary.isNull(getter)) {
                 RootCallTarget getterCT = getterCallTarget(name, language);
-                get = factory.createGetSetBuiltinFunction(name, cls, PythonUtils.EMPTY_OBJECT_ARRAY, ExternalFunctionNodes.createKwDefaults(getter, closure), getterCT);
+                get = factory.createGetSetBuiltinFunction(name, cls, EMPTY_OBJECT_ARRAY, ExternalFunctionNodes.createKwDefaults(getter, closure), getterCT);
             }
 
             PBuiltinFunction set = null;
             boolean hasSetter = !interopLibrary.isNull(setter);
             if (hasSetter) {
                 RootCallTarget setterCT = setterCallTarget(name, language);
-                set = factory.createGetSetBuiltinFunction(name, cls, PythonUtils.EMPTY_OBJECT_ARRAY, ExternalFunctionNodes.createKwDefaults(setter, closure), setterCT);
+                set = factory.createGetSetBuiltinFunction(name, cls, EMPTY_OBJECT_ARRAY, ExternalFunctionNodes.createKwDefaults(setter, closure), setterCT);
             }
 
             // create get-set descriptor
@@ -4350,7 +4369,7 @@ Object doGeneric(Object clsPtr,
                 Object realSizeObj = readRealSizeNode.execute(cls, StructSequence.N_FIELDS);
                 Object res;
                 if (realSizeObj == PNone.NO_VALUE) {
-                    PRaiseNativeNode.raiseNative(null, SystemError, ErrorMessages.BAD_ARG_TO_INTERNAL_FUNC, PythonUtils.EMPTY_OBJECT_ARRAY, getRaiseNode(), transformExceptionToNativeNode);
+                    PRaiseNativeNode.raiseNative(null, SystemError, ErrorMessages.BAD_ARG_TO_INTERNAL_FUNC, EMPTY_OBJECT_ARRAY, getRaiseNode(), transformExceptionToNativeNode);
                     res = getNativeNullNode.execute();
                 } else {
                     int realSize = castToIntNode.execute(realSizeObj);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

@@ -119,13 +119,13 @@ private static PCode createCode(PythonLanguage language, PythonContext context,
 
             RootCallTarget ct;
             if (codedata.length == 0) {
-                ct = language.createCachedCallTarget(l -> new BadOPCodeNode(l, name), BadOPCodeNode.class, name);
+                ct = language.createCachedCallTarget(l -> new BadOPCodeNode(l, name), BadOPCodeNode.class, filename, name);
             } else {
                 RootNode rootNode = context.getSerializer().deserialize(context, codedata, toStringArray(cellvars), toStringArray(freevars));
                 ct = PythonUtils.getOrCreateCallTarget(rootNode);
-                if (filename != null) {
-                    context.setCodeFilename(ct, filename);
-                }
+            }
+            if (filename != null) {
+                context.setCodeFilename(ct, filename);
             }
             PythonObjectFactory factory = context.factory();
             return factory.createCode(ct, ((PRootNode) ct.getRootNode()).getSignature(), nlocals, stacksize, flags, constants, names, varnames, freevars, cellvars, filename, name,