[pypy-commit] pypy optresult-unroll: an awkward translation workaround

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: optresult-unroll
Changeset: r79369:a50415baecc8
Date: 2015-09-02 11:46 +0200
http://bitbucket.org/pypy/pypy/changeset/a50415baecc8/

Log:	an awkward translation workaround

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
@@ -158,7 +158,7 @@
         for i in range(len(self.fielddescrs)):
             if other.fielddescrs[i] is not self.fielddescrs[i]:
                 raise VirtualStatesCantMatch("field descrs don't match")
-            if runtime_box is not None:
+            if runtime_box is not None and opinfo is not None:
                 fieldbox = opinfo._fields[self.fielddescrs[i].get_index()]
                 # must be there
                 fieldbox_runtime = state.get_runtime_field(runtime_box,