Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77904:40cba7408802
Date: 2015-06-05 13:35 +0200
http://bitbucket.org/pypy/pypy/changeset/40cba7408802/
Log: one potential stupid segfault
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py
b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -481,7 +481,10 @@
else:
cls0 = info0.get_known_class(self.optimizer.cpu)
if cls0 is not None:
- cls1 = info1.get_known_class(self.optimizer.cpu)
+ if info1 is None:
+ cls1 = None
+ else:
+ cls1 = info1.get_known_class(self.optimizer.cpu)
if cls1 is not None and not cls0.same_constant(cls1):
# cannot be the same object, as we know that their
# class is different
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
