1. Pypy
  2. Untitled project
  3. pypy


Armin Rigo  committed 8565283 Merge

hg merge remove-globals-in-jit

  • Participants
  • Parent commits 03f18cc, 693c4c1
  • Branches stm-thread-2

Comments (0)

Files changed (2)

File pypy/jit/metainterp/compile.py

View file
  • Ignore whitespace
 from pypy.jit.metainterp.history import TreeLoop, Box, History, JitCellToken, TargetToken
 from pypy.jit.metainterp.history import AbstractFailDescr, BoxInt
 from pypy.jit.metainterp.history import BoxPtr, BoxObj, BoxFloat, Const, ConstInt
-from pypy.jit.metainterp import history
+from pypy.jit.metainterp import history, resume
 from pypy.jit.metainterp.typesystem import llhelper, oohelper
 from pypy.jit.metainterp.optimize import InvalidLoop
 from pypy.jit.metainterp.inliner import Inliner
         return res
 class AllVirtuals:
+    list = [resume.ResumeDataDirectReader.virtual_default]   # annotation hack
     def __init__(self, list):
         self.list = list
     def hide(self, cpu):

File pypy/jit/metainterp/resume.py

View file
  • Ignore whitespace
         # allocate() methods must fill in the cache as soon as they
         # have the object, before they fill its fields.
         assert self.virtuals_cache is not None
+        assert self.rd_virtuals is not None
         v = self.virtuals_cache[index]
         if not v:
             v = self.rd_virtuals[index].allocate(self, index)