Propagate the result of traces that raise errors.

tonybaloney · Mar 15, 2021 · 543a24c · 543a24c
1 parent 416fbdf
commit 543a24c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/pyjion/absint.cpp b/src/pyjion/absint.cpp
@@ -1683,6 +1683,7 @@ AbstactInterpreterCompileResult AbstractInterpreter::compileWorker(PgcStatus pgc
         if (!canSkipLastiUpdate(curByte)) {
             if (mTracingEnabled){
                 m_comp->emit_trace_line(mTracingInstrLowerBound, mTracingInstrUpperBound, mTracingLastInstr);
+                intErrorCheck("trace line failed");
             }
         }
 

diff --git a/src/pyjion/intrins.cpp b/src/pyjion/intrins.cpp
@@ -2614,7 +2614,7 @@ inline int trace(PyThreadState *tstate, PyFrameObject *f, int ty, PyObject *args
     return result;
 }
 
-void PyJit_TraceLine(PyFrameObject* f, int* instr_lb, int* instr_ub, int* instr_prev){
+int PyJit_TraceLine(PyFrameObject* f, int* instr_lb, int* instr_ub, int* instr_prev){
     auto tstate = PyThreadState_GET();
     if (tstate->c_tracefunc != nullptr && !tstate->tracing) {
         int result = 0;
@@ -2638,22 +2638,24 @@ void PyJit_TraceLine(PyFrameObject* f, int* instr_lb, int* instr_ub, int* instr_
             f->f_lineno = line;
             if (f->f_trace_lines) {
                 if (tstate->tracing)
-                    return;
+                    return 0;
                 result = trace(tstate, f, PyTrace_LINE, Py_None, tstate->c_tracefunc, tstate->c_traceobj);
             }
         }
         /* Always emit an opcode event if we're tracing all opcodes. */
         if (f->f_trace_opcodes) {
             if (tstate->tracing)
-                return;
+                return 0;
             result = trace(tstate, f, PyTrace_OPCODE, Py_None, tstate->c_tracefunc, tstate->c_traceobj);
         }
         *instr_prev = f->f_lasti;
 
         // TODO : Handle possible change of instruction address
         //  should lookup jump address and branch (f->f_lasti);
-        // TODO : Handle error in call trace function
+        return result;
     }
+
+    return 0;
 }
 
 inline int protected_trace(PyThreadState* tstate, PyFrameObject* f, int ty, PyObject* arg, Py_tracefunc func, PyObject* tracearg){

diff --git a/src/pyjion/intrins.h b/src/pyjion/intrins.h
@@ -276,7 +276,7 @@ int PyJit_IsNot_Bool(PyObject* lhs, PyObject* rhs);
 inline int trace(PyThreadState *tstate, PyFrameObject *f, int ty, PyObject *args, Py_tracefunc func, PyObject* tracearg);
 inline int protected_trace(PyThreadState* tstate, PyFrameObject* f, int ty, PyObject* arg, Py_tracefunc func, PyObject* tracearg);
 
-void PyJit_TraceLine(PyFrameObject* f, int* instr_lb, int* instr_ub, int* instr_prev);
+int PyJit_TraceLine(PyFrameObject* f, int* instr_lb, int* instr_ub, int* instr_prev);
 void PyJit_TraceFrameEntry(PyFrameObject* f);
 void PyJit_TraceFrameExit(PyFrameObject* f);
 void PyJit_ProfileFrameEntry(PyFrameObject* f);

diff --git a/src/pyjion/pycomp.cpp b/src/pyjion/pycomp.cpp
@@ -2104,7 +2104,7 @@ GLOBAL_METHOD(METHOD_LOAD_ASSERTION_ERROR, &PyJit_LoadAssertionError, CORINFO_TY
 GLOBAL_METHOD(METHOD_DEALLOC_OBJECT, &_Py_Dealloc, CORINFO_TYPE_VOID, Parameter(CORINFO_TYPE_NATIVEINT));
 
 
-GLOBAL_METHOD(METHOD_TRACE_LINE, &PyJit_TraceLine, CORINFO_TYPE_VOID, Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT));
+GLOBAL_METHOD(METHOD_TRACE_LINE, &PyJit_TraceLine, CORINFO_TYPE_INT, Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT), Parameter(CORINFO_TYPE_NATIVEINT));
 GLOBAL_METHOD(METHOD_TRACE_FRAME_ENTRY, &PyJit_TraceFrameEntry, CORINFO_TYPE_VOID, Parameter(CORINFO_TYPE_NATIVEINT), );
 GLOBAL_METHOD(METHOD_TRACE_FRAME_EXIT, &PyJit_TraceFrameExit, CORINFO_TYPE_VOID, Parameter(CORINFO_TYPE_NATIVEINT), );
 GLOBAL_METHOD(METHOD_TRACE_EXCEPTION, &PyJit_TraceFrameException, CORINFO_TYPE_VOID, Parameter(CORINFO_TYPE_NATIVEINT), );