Author: Matti Picus <[email protected]>
Branch: win32-cleanup2
Changeset: r54975:e02f2e6e70f1
Date: 2012-05-08 23:10 +0300
http://bitbucket.org/pypy/pypy/changeset/e02f2e6e70f1/
Log: merge default into branch
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py
b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -208,7 +208,7 @@
box = value.box
assert isinstance(box, Const)
if not box.same_constant(constbox):
- raise InvalidLoop('A GURAD_{VALUE,TRUE,FALSE} was proven to' +
+ raise InvalidLoop('A GUARD_{VALUE,TRUE,FALSE} was proven to' +
'always fail')
return
if emit_operation:
diff --git a/pypy/rlib/jit.py b/pypy/rlib/jit.py
--- a/pypy/rlib/jit.py
+++ b/pypy/rlib/jit.py
@@ -413,8 +413,8 @@
'retrace_limit': 'how many times we can try retracing before giving up',
'max_retrace_guards': 'number of extra guards a retrace can cause',
'max_unroll_loops': 'number of extra unrollings a loop can cause',
- 'enable_opts': 'INTERNAL USE ONLY: optimizations to enable, or all = %s' %
- ENABLE_ALL_OPTS,
+ 'enable_opts': 'INTERNAL USE ONLY (MAY NOT WORK OR LEAD TO CRASHES): '
+ 'optimizations to enable, or all = %s' % ENABLE_ALL_OPTS,
}
PARAMETERS = {'threshold': 1039, # just above 1024, prime
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
