Conditional branches in orange, fix the custom error

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Optimization flags that were applied to a function during compilation are available in JitInfo.optimizations
 * All optimizations are now runtime flags instead of compile-time features.
 * Unboxing PGC errors will raise pyjion.PyjionUnboxingError (ValueError) instead of ValueError
+* Instruction graphs will show conditional branches (in orange)
 
 ## 1.0.0 (rc1)
 

Tests/Tests.cpp

@@ -42,7 +42,7 @@ int main(int argc, char* const argv[]) {
     g_pyjionSettings.debug = true;
     g_pyjionSettings.tracing = true;
     g_pyjionSettings.codeObjectSizeLimit = 1000000;
-    setOptimizationLevel(1);
+    setOptimizationLevel(0);
     int result = Catch::Session().run(argc, argv);
 
     Py_Finalize();

src/pyjion/instructions.cpp

@@ -316,12 +316,15 @@ PyObject* InstructionGraph::makeGraph(const char* name) {
                 PyUnicode_AppendAndDel(&g,PyUnicode_FromFormat("\tOP%u -> OP%u [label=\"Jump\" color=yellow];\n", node.second.index, node.second.index + node.second.oparg));
                 break;
             case JUMP_ABSOLUTE:
+                PyUnicode_AppendAndDel(&g,PyUnicode_FromFormat("\tOP%u -> OP%u [label=\"Jump\" color=yellow];\n", node.second.index, node.second.oparg));
+                break;
             case JUMP_IF_FALSE_OR_POP:
             case JUMP_IF_TRUE_OR_POP:
             case JUMP_IF_NOT_EXC_MATCH:
             case POP_JUMP_IF_TRUE:
             case POP_JUMP_IF_FALSE:
-                PyUnicode_AppendAndDel(&g,PyUnicode_FromFormat("\tOP%u -> OP%u [label=\"Jump\" color=yellow];\n", node.second.index, node.second.oparg));
+                PyUnicode_AppendAndDel(&g,PyUnicode_FromFormat("\tOP%u -> OP%u [label=\"Jump (conditional)\" color=orange];\n", node.second.index, node.second.index + 2));
+                PyUnicode_AppendAndDel(&g,PyUnicode_FromFormat("\tOP%u -> OP%u [label=\"Jump (conditional)\" color=orange];\n", node.second.index, node.second.oparg));
                 break;
         }
     }

src/pyjion/intrins.cpp

@@ -2794,6 +2794,7 @@ long long PyJit_LongAsLongLong(PyObject* vv){
 }
 
 void PyJit_PgcGuardException(PyObject* obj, const char* expected) {
+    assert(PyjionUnboxingError != nullptr);
     PyErr_Format(PyjionUnboxingError,
                  "Pyjion PGC expected %s, but %s is a %s.",
                  expected,

src/pyjion/pyjit.cpp

@@ -817,7 +817,7 @@ static struct PyModuleDef pyjionmodule = {
 			  or -1 if the module keeps state in global variables. */
 	PyjionMethods
 }; 
-
+PyObject* PyjionUnboxingError;
 PyMODINIT_FUNC PyInit__pyjion(void)
 {
 	// Install our frame evaluation function

src/pyjion/pyjit.h

@@ -185,7 +185,7 @@ class PyjionJittedCode {
 };
 
 void setOptimizationLevel(unsigned short level);
-static PyObject* PyjionUnboxingError;
+extern PyObject* PyjionUnboxingError;
 #ifdef WINDOWS
 HMODULE GetClrJit();
 #endif