[pypy-commit] pypy core-only-tracing: (antocuni, arigo): if we are in core mode, we know for sure that the jitcode we are tracing is_core

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: core-only-tracing
Changeset: r51535:d82aeadcfb55
Date: 2012-01-20 15:11 +0100
http://bitbucket.org/pypy/pypy/changeset/d82aeadcfb55/

Log:	(antocuni, arigo): if we are in core mode, we know for sure that the
	jitcode we are tracing is_core

diff --git a/pypy/jit/metainterp/pyjitpl.py b/pypy/jit/metainterp/pyjitpl.py
--- a/pypy/jit/metainterp/pyjitpl.py
+++ b/pypy/jit/metainterp/pyjitpl.py
@@ -781,7 +781,8 @@
     def perform_call_maybe(self, jitcode, argboxes):
         core_only_mode = (self.metainterp.jitdriver_sd.warmstate.jitmode == 'core-only')
         # in core_only_mode, don't inline calls from core to non-core graphs
-        if core_only_mode and self.jitcode.is_core and not jitcode.is_core:
+        if core_only_mode and not jitcode.is_core:
+            assert self.jitcode.is_core
             funcbox = ConstInt(jitcode.get_fnaddr_as_int())
             # jitcode always has a calldescr, but it might not have the
             # correct effectinfo. The result is that we might generate a