Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r75974:6478158e32cd
Date: 2015-02-18 10:05 +0100
http://bitbucket.org/pypy/pypy/changeset/6478158e32cd/
Log: mention revision
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -185,7 +185,7 @@
if level == LEVEL_KNOWNCLASS:
return self.known_class
# stmgc: added "and not self.is_null()" here, it's also in default
- # but the method was moved. Ignore the conflict.
+ # but the method was moved. Ignore the conflict. (97c2a0a39120)
elif level == LEVEL_CONSTANT and not self.is_null():
return cpu.ts.cls_of_box(self.box)
else:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
