Merge pull request #610 from kmod/disable_deopt

Temporarily disable type speculation

src/analysis/type_analysis.cpp

@@ -115,6 +115,10 @@ private:
         assert(old_type);
         assert(speculation != TypeAnalysis::NONE);
 
+        if (VERBOSITY() >= 3)
+            printf("Would maybe try to speculate but deopt is currently broken\n");
+        return old_type;
+
         if (speculated_cls != NULL && speculated_cls->is_constant) {
             ConcreteCompilerType* speculated_type = unboxedType(typeFromClass(speculated_cls));
             if (VERBOSITY() >= 2) {

src/codegen/irgen/hooks.cpp

@@ -739,7 +739,7 @@ void CompiledFunction::speculationFailed() {
                 printf("%p\n", clfunc->versions[i]);
             }
         }
-        assert(found);
+        RELEASE_ASSERT(found, "");
     }
 }
 

src/runtime/objmodel.cpp

@@ -165,6 +165,14 @@ extern "C" Box* deopt(AST_expr* expr, Box* value) {
     static StatCounter num_deopt("num_deopt");
     num_deopt.log();
 
+    printf("Deopt!\n");
+    print_ast(expr);
+    printf("\n");
+    dump(value);
+    printf("\n");
+
+    RELEASE_ASSERT(0, "deopt is currently broken...");
+
     FrameStackState frame_state = getFrameStackState();
     auto execution_point = getExecutionPoint();
 

test/tests/deopt_generator_tests.py

 # skip-if: '-O' in EXTRA_JIT_ARGS
+# expected: statfail
 # statcheck: 4 <= noninit_count('num_deopt') < 50
 # statcheck: 1 <= stats["num_osr_exits"] <= 2
 

test/tests/deopt_namescope_tests.py

 # skip-if: '-O' in EXTRA_JIT_ARGS
+# expected: statfail
 # statcheck: 4 <= noninit_count('num_deopt') < 50
 # statcheck: 1 <= stats["num_osr_exits"] <= 2
 

test/tests/deopt_tests.py

 # skip-if: '-O' in EXTRA_JIT_ARGS
+# expected: statfail
 # statcheck: 4 <= noninit_count('num_deopt') < 50
 # statcheck: 1 <= stats["num_osr_exits"] <= 2
 
@@ -81,3 +82,25 @@ def main():
         if i == 1500:
             c.pid = 1.0
 main()
+
+
+# This test tries to OSR up to the highest tier and then deopt from there:
+def test_deopt_from_maximal(C):
+    c = C()
+    c.a = 1
+    def f(c):
+        n = 1000000
+        while n:
+            c.a
+            n -= 1
+    f(c)
+    c.a = None
+    f(c)
+
+# Test for both old-style and new-style classes:
+class C:
+    pass
+class D(object):
+    pass
+test_deopt_from_maximal(C)
+test_deopt_from_maximal(D)