[pypy-commit] pypy default: prevent merging of those attributes

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r75157:8e37109904c6
Date: 2014-12-30 12:52 +0200
http://bitbucket.org/pypy/pypy/changeset/8e37109904c6/

Log:	prevent merging of those attributes

diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -346,9 +346,7 @@
             if other.level == LEVEL_UNKNOWN:
                 if (box and box.nonnull() and
                         self.known_class.same_constant(cpu.ts.cls_of_box(box))):
-                    op = ResOperation(rop.GUARD_NONNULL, [box], None)
-                    extra_guards.append(op)
-                    op = ResOperation(rop.GUARD_CLASS, [box, self.known_class], None)
+                    op = ResOperation(rop.GUARD_NONNULL_CLASS, [box, self.known_class], None)
                     extra_guards.append(op)
                     return
                 else: