Author: Armin Rigo <[email protected]>
Branch: better-jit-hooks
Changeset: r51245:dcd30a900b17
Date: 2012-01-11 20:07 +0100
http://bitbucket.org/pypy/pypy/changeset/dcd30a900b17/
Log: follow fijal's suggestion and raise an explicit exception instead.
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -623,8 +623,7 @@
# This case should be prevented by the logic in compile.py:
# look for CNT_BUSY_FLAG, which disables tracing from a guard
# when another tracing from the same guard is already in progress.
- raise AssertionError("bug: the front-end asks us to compile a "
- "bridge from the same guard twice")
+ raise BridgeAlreadyCompiled
# follow the JMP/Jcond
p = rffi.cast(rffi.INTP, adr_jump_offset)
adr_target = adr_jump_offset + 4 + rffi.cast(lltype.Signed, p[0])
@@ -2556,3 +2555,6 @@
def not_implemented(msg):
os.write(2, '[x86/asm] %s\n' % msg)
raise NotImplementedError(msg)
+
+class BridgeAlreadyCompiled(Exception):
+ pass
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
