Author: Hakan Ardo <[email protected]>
Branch: jit-usable_retrace_3
Changeset: r59624:1fd30ab79cd3
Date: 2012-12-29 18:04 +0100
http://bitbucket.org/pypy/pypy/changeset/1fd30ab79cd3/
Log: simplify this a bit
diff --git a/pypy/jit/metainterp/optimizeopt/virtualstate.py
b/pypy/jit/metainterp/optimizeopt/virtualstate.py
--- a/pypy/jit/metainterp/optimizeopt/virtualstate.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualstate.py
@@ -109,14 +109,10 @@
return False
i += 1
j += 1
- elif other.fielddescrs[j].sort_key() >
self.fielddescrs[i].sort_key():
+ else:
if not self.fieldstate[i].generalization_of_null(renum, bad):
return False
i += 1
- else:
- # The only generalization of the constant null would be the
constant null
- # in which case the fielddescr would not show up om either
state
- return False
if j < len(other.fielddescrs):
return False
while i < len(self.fielddescrs):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
