Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r68394:cfdd81db7953
Date: 2013-12-07 10:22 +0100
http://bitbucket.org/pypy/pypy/changeset/cfdd81db7953/
Log: merge heads
diff --git a/pypy/module/pypyjit/test_pypy_c/test_math.py
b/pypy/module/pypyjit/test_pypy_c/test_math.py
--- a/pypy/module/pypyjit/test_pypy_c/test_math.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_math.py
@@ -52,8 +52,8 @@
f1 = cast_int_to_float(i0)
i6 = --ISINF--(f1)
guard_false(i6, descr=...)
- f2 = call(ConstClass(sin), f1, descr=<Callf . f EF=2>)
- f3 = call(ConstClass(cos), f1, descr=<Callf . f EF=2>)
+ f2 = call(ConstClass(sin), f1, descr=<Callf . f EF=0>)
+ f3 = call(ConstClass(cos), f1, descr=<Callf . f EF=0>)
f4 = float_sub(f2, f3)
f5 = float_add(f0, f4)
i7 = int_add(i0, f1)
diff --git a/rpython/rtyper/lltypesystem/module/ll_math.py
b/rpython/rtyper/lltypesystem/module/ll_math.py
--- a/rpython/rtyper/lltypesystem/module/ll_math.py
+++ b/rpython/rtyper/lltypesystem/module/ll_math.py
@@ -72,8 +72,8 @@
[rffi.DOUBLE, rffi.DOUBLE], rffi.DOUBLE)
math_floor = llexternal('floor', [rffi.DOUBLE], rffi.DOUBLE,
elidable_function=True)
math_sqrt = llexternal('sqrt', [rffi.DOUBLE], rffi.DOUBLE)
-math_sin = llexternal('sin', [rffi.DOUBLE], rffi.DOUBLE)
-math_cos = llexternal('cos', [rffi.DOUBLE], rffi.DOUBLE)
+math_sin = llexternal('sin', [rffi.DOUBLE], rffi.DOUBLE,
elidable_function=True)
+math_cos = llexternal('cos', [rffi.DOUBLE], rffi.DOUBLE,
elidable_function=True)
@jit.elidable
def sqrt_nonneg(x):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
