Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r57575:f2fb216e3114
Date: 2012-09-25 14:18 +0200
http://bitbucket.org/pypy/pypy/changeset/f2fb216e3114/
Log: minor fix
diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py
b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -266,8 +266,8 @@
CONST_1 = ConstInt(1)
CVAL_ZERO = ConstantValue(CONST_0)
CVAL_ZERO_FLOAT = ConstantValue(ConstFloat(0.0))
-llhelper.CVAL_NULLREF = ConstantValue(llhelper.CONST_NULL)
-#oohelper.CVAL_NULLREF = ConstantValue(oohelper.CONST_NULL)
+CVAL_NULLREF = ConstantValue(llhelper.CONST_NULL)
+llhelper.CVAL_NULLREF = CVAL_NULLREF
REMOVED = AbstractResOp()
@@ -425,6 +425,8 @@
def getvalue(self, box):
if box.is_constant():
if box.type == REF:
+ if not box.getref_base():
+ return CVAL_NULLREF
try:
return self.interned_refs[box.getref_base()]
except KeyError:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
