Author: Remi Meier <[email protected]>
Branch: stmgc-c8-gcc
Changeset: r79646:322e4fe034c6
Date: 2015-09-15 14:48 +0200
http://bitbucket.org/pypy/pypy/changeset/322e4fe034c6/
Log: fix merge with renamed llop/resop
diff --git a/rpython/jit/backend/llsupport/stmrewrite.py
b/rpython/jit/backend/llsupport/stmrewrite.py
--- a/rpython/jit/backend/llsupport/stmrewrite.py
+++ b/rpython/jit/backend/llsupport/stmrewrite.py
@@ -88,7 +88,7 @@
rop.ENTER_PORTAL_FRAME, rop.LEAVE_PORTAL_FRAME,
rop.MARK_OPAQUE_PTR,
rop.JIT_DEBUG, rop.KEEPALIVE,
- rop.QUASIIMMUT_FIELD, rop.RECORD_KNOWN_CLASS,
+ rop.QUASIIMMUT_FIELD, rop.RECORD_EXACT_CLASS,
):
self.newop(op)
return
diff --git a/rpython/translator/stm/inevitable.py
b/rpython/translator/stm/inevitable.py
--- a/rpython/translator/stm/inevitable.py
+++ b/rpython/translator/stm/inevitable.py
@@ -19,7 +19,7 @@
'stack_current', 'gc_stack_bottom', 'cast_ptr_to_int',
'jit_force_virtual', 'jit_force_virtualizable',
'jit_force_quasi_immutable', 'jit_marker', 'jit_is_virtual',
- 'jit_record_known_class', 'jit_ffi_save_result',
+ 'jit_record_exact_class', 'jit_ffi_save_result',
'gc_identityhash', 'gc_id', 'gc_can_move', 'gc__collect',
'gc_adr_of_root_stack_top', 'gc_add_memory_pressure',
'gc_pin', 'gc_unpin', 'gc__is_pinned',
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
