Commits

Alex Gaynor committed 1cada6d

Removed some more references to ootypesystem.

Comments (0)

Files changed (1)

rpython/rtyper/test/test_rvirtualizable2.py

         block = graph.startblock
         op_promote = block.operations[-2]
         op_getfield = block.operations[-1]
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         v_inst = op_getfield.args[0]
         assert op_promote.opname == 'jit_force_virtualizable'
         assert op_promote.args[0] is v_inst
         block = graph.startblock
         op_promote = block.operations[-2]
         op_getfield = block.operations[-1]
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         v_inst = op_getfield.args[0]
         assert op_promote.opname == 'jit_force_virtualizable'
         assert op_promote.args[0] is v_inst
         block = graph.startblock
         op_getfield = block.operations[-1]
         op_call = block.operations[-2]
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         assert op_call.opname == 'direct_call'    # to V.__init__
 
     def test_generate_force_virtualizable_array(self):
         op_getfield = block.operations[-2]
         op_getarrayitem = block.operations[-1]
         assert op_getarrayitem.opname == 'direct_call'  # to ll_getitem_xxx
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         v_inst = op_getfield.args[0]
         assert op_promote.opname == 'jit_force_virtualizable'
         assert op_promote.args[0] is v_inst
         _, rtyper, graph = self.gengraph(fn, [int])
         block = graph.startblock
         op_getfield = block.operations[-1]
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         funcptr = self.replace_force_virtualizable(rtyper, [graph])
         if getattr(option, 'view', False):
             graph.show()
         op_promote = block.operations[-2]
         op_getfield = block.operations[-1]
-        assert op_getfield.opname in ('getfield', 'oogetfield')
+        assert op_getfield.opname == 'getfield'
         assert op_promote.opname == 'direct_call'
         assert op_promote.args[0].value == funcptr
         assert op_promote.args[1] == op_getfield.args[0]