suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix over-eager "optimization" of some unsafe-fx operations

Browse Source 
As reported by Vincent.
This commit is contained in:
Matthew Flatt 2013-03-29 14:42:21 -06:00
parent 06315bf0fa
commit ba270cde48
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collects/tests/racket/unsafe.rktl
View File

@ -72,21 +72,26 @@
(test-bin -21 'unsafe-fx* -21 1) (test-bin -21 'unsafe-fx* -21 1)
(test-bin 0 'unsafe-fx* 0 -2) (test-bin 0 'unsafe-fx* 0 -2)
(test-bin 0 'unsafe-fx* -21 0) (test-bin 0 'unsafe-fx* -21 0)
(err/rt-test (unsafe-fx* 0 (error "bad")) exn:fail?) ; not 0
(err/rt-test (unsafe-fx* (error "bad") 0) exn:fail?) ; not 0
(test-bin 3 'unsafe-fxquotient 17 5) (test-bin 3 'unsafe-fxquotient 17 5)
(test-bin -3 'unsafe-fxquotient 17 -5) (test-bin -3 'unsafe-fxquotient 17 -5)
(test-bin 0 'unsafe-fxquotient 0 -5) (test-bin 0 'unsafe-fxquotient 0 -5)
(test-bin 18 'unsafe-fxquotient 18 1) (test-bin 18 'unsafe-fxquotient 18 1)
(err/rt-test (unsafe-fxquotient 0 (error "bad")) exn:fail?) ; not 0
(test-bin 2 'unsafe-fxremainder 17 5) (test-bin 2 'unsafe-fxremainder 17 5)
(test-bin 2 'unsafe-fxremainder 17 -5) (test-bin 2 'unsafe-fxremainder 17 -5)
(test-bin 0 'unsafe-fxremainder 0 -5) (test-bin 0 'unsafe-fxremainder 0 -5)
(test-bin 0 'unsafe-fxremainder 10 1) (test-bin 0 'unsafe-fxremainder 10 1)
(err/rt-test (unsafe-fxremainder (error "bad") 1) exn:fail?) ; not 0
(test-bin 2 'unsafe-fxmodulo 17 5) (test-bin 2 'unsafe-fxmodulo 17 5)
(test-bin -3 'unsafe-fxmodulo 17 -5) (test-bin -3 'unsafe-fxmodulo 17 -5)
(test-bin 0 'unsafe-fxmodulo 0 -5) (test-bin 0 'unsafe-fxmodulo 0 -5)
(test-bin 0 'unsafe-fxmodulo 10 1) (test-bin 0 'unsafe-fxmodulo 10 1)
(err/rt-test (unsafe-fxmodulo (error "bad") 1) exn:fail?) ; not 0
(test-bin 3.4 'unsafe-fl+ 1.4 2.0) (test-bin 3.4 'unsafe-fl+ 1.4 2.0)
(test-bin -1.1 'unsafe-fl+ 1.0 -2.1) (test-bin -1.1 'unsafe-fl+ 1.0 -2.1)

25
src/racket/src/optimize.c
View File

@ -2625,15 +2625,18 @@ static Scheme_Object *finish_optimize_application3(Scheme_App3_Rec *app, Optimiz
if (z2) if (z2)
return app->rand1; return app->rand1;
} else if (IS_NAMED_PRIM(app->rator, "unsafe-fx*")) { } else if (IS_NAMED_PRIM(app->rator, "unsafe-fx*")) {
if (z1 || z2) if (z1 || z2) {
if ((z1 && z2)
|| (!z1 && scheme_omittable_expr(app->rand1, 1, 20, 0, info, NULL, -1, 0))
|| (!z2 && scheme_omittable_expr(app->rand2, 1, 20, 0, info, NULL, -1, 0)))
return scheme_make_integer(0); return scheme_make_integer(0);
}
if (SAME_OBJ(app->rand1, scheme_make_integer(1))) if (SAME_OBJ(app->rand1, scheme_make_integer(1)))
return app->rand2; return app->rand2;
if (SAME_OBJ(app->rand2, scheme_make_integer(1))) if (SAME_OBJ(app->rand2, scheme_make_integer(1)))
return app->rand1; return app->rand1;
} else if (IS_NAMED_PRIM(app->rator, "unsafe-fx/") } else if (IS_NAMED_PRIM(app->rator, "unsafe-fxquotient")) {
|| IS_NAMED_PRIM(app->rator, "unsafe-fxquotient")) { if (z1 && scheme_omittable_expr(app->rand2, 1, 20, 0, info, NULL, -1, 0))
if (z1)
return scheme_make_integer(0); return scheme_make_integer(0);
if (SAME_OBJ(app->rand2, scheme_make_integer(1))) if (SAME_OBJ(app->rand2, scheme_make_integer(1)))
return app->rand1; return app->rand1;
@ -2641,7 +2644,8 @@ static Scheme_Object *finish_optimize_application3(Scheme_App3_Rec *app, Optimiz
|| IS_NAMED_PRIM(app->rator, "unsafe-fxmodulo")) { || IS_NAMED_PRIM(app->rator, "unsafe-fxmodulo")) {
if (z1) if (z1)
return scheme_make_integer(0); return scheme_make_integer(0);
if (SAME_OBJ(app->rand2, scheme_make_integer(1))) if (SAME_OBJ(app->rand2, scheme_make_integer(1))
&& scheme_omittable_expr(app->rand1, 1, 20, 0, info, NULL, -1, 0))
return scheme_make_integer(0); return scheme_make_integer(0);
} }
@ -2661,14 +2665,9 @@ static Scheme_Object *finish_optimize_application3(Scheme_App3_Rec *app, Optimiz
return app->rand2; return app->rand2;
if (SCHEME_FLOATP(app->rand2) && (SCHEME_FLOAT_VAL(app->rand2) == 1.0)) if (SCHEME_FLOATP(app->rand2) && (SCHEME_FLOAT_VAL(app->rand2) == 1.0))
return app->rand1; return app->rand1;
} else if (IS_NAMED_PRIM(app->rator, "unsafe-fl/") } else if (IS_NAMED_PRIM(app->rator, "unsafe-fl/")) {
|| IS_NAMED_PRIM(app->rator, "unsafe-flquotient")) {
if (SCHEME_FLOATP(app->rand2) && (SCHEME_FLOAT_VAL(app->rand2) == 1.0)) if (SCHEME_FLOATP(app->rand2) && (SCHEME_FLOAT_VAL(app->rand2) == 1.0))
return app->rand1; return app->rand1;
} else if (IS_NAMED_PRIM(app->rator, "unsafe-flremainder")
|| IS_NAMED_PRIM(app->rator, "unsafe-flmodulo")) {
if (SCHEME_FLOATP(app->rand2) && (SCHEME_FLOAT_VAL(app->rand2) == 1.0))
return scheme_make_double(0.0);
} }
#ifdef MZ_LONG_DOUBLE #ifdef MZ_LONG_DOUBLE
z1 = (SCHEME_LONG_DBLP(app->rand1) && long_double_is_zero(SCHEME_LONG_DBL_VAL(app->rand1))); z1 = (SCHEME_LONG_DBLP(app->rand1) && long_double_is_zero(SCHEME_LONG_DBL_VAL(app->rand1)));
@ -2690,10 +2689,6 @@ static Scheme_Object *finish_optimize_application3(Scheme_App3_Rec *app, Optimiz
} else if (IS_NAMED_PRIM(app->rator, "unsafe-extfl/")) { } else if (IS_NAMED_PRIM(app->rator, "unsafe-extfl/")) {
if (SCHEME_LONG_DBLP(app->rand2) && long_double_is_1(SCHEME_LONG_DBL_VAL(app->rand2))) if (SCHEME_LONG_DBLP(app->rand2) && long_double_is_1(SCHEME_LONG_DBL_VAL(app->rand2)))
return app->rand1; return app->rand1;
} else if (IS_NAMED_PRIM(app->rator, "unsafe-extflremainder")
|| IS_NAMED_PRIM(app->rator, "unsafe-extflmodulo")) {
if (SCHEME_LONG_DBLP(app->rand2) && long_double_is_1(SCHEME_LONG_DBL_VAL(app->rand2)))
return scheme_make_long_double(get_long_double_zero());
} }
#endif #endif
} }