Author: Spenser Bauman <[email protected]>
Branch: value-classes
Changeset: r87409:c5b9c438b580
Date: 2016-09-27 00:46 -0400
http://bitbucket.org/pypy/pypy/changeset/c5b9c438b580/
Log: Fix handling of intbounds in virtuastate
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
@@ -226,10 +226,8 @@
if not known_class.is_value_class():
raise VirtualStatesCantMatch("different kinds of structs")
+ raise VirtualStatesCantMatch("different kinds of structs")
# import pdb; pdb.set_trace()
- raise VirtualStatesCantMatch("different kinds of structs")
-
- import pdb; pdb.set_trace()
# TODO: Probably should rename state.extra_guards to extra_ops
extra_guards = state.extra_guards
@@ -561,9 +559,8 @@
other_intbound = other.intbound
if self.intbound is None:
return
- if other.intbound is None:
- return
- if self.intbound.contains_bound(other_intbound):
+ if (other_intbound is not None and
+ self.intbound.contains_bound(other_intbound)):
return
if (runtime_box is not None and
self.intbound.contains(runtime_box.getint())):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
