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

advance the vclock for a values with 0 or more than 1 argument

Browse Source 
To avoid moving expressions that may have a side effect, the optimizer must
recognize that in this position this will cause an error and advance
the virtual clock.

Currently the only primitive that is flagged as SCHEME_PRIM_IS_OMITABLE and
may have multiple return values is `values`.

Thanks to Robby for finding the original version of the test.
This commit is contained in:
Gustavo Massaccesi 2017-01-27 18:09:42 -03:00
parent a5118f7525
commit 0a5c510b72
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/racket-test-core/tests/racket/optimize.rktl
View File

@ -1724,6 +1724,15 @@
(let loop ([n 0] [m 9]) (let loop ([n 0] [m 9])
(loop (+ m 10) (+ n 9)))))) (loop (+ m 10) (+ n 9))))))
;; Don't reorder pass a `values` with the wrong nunmber of arguments.
;; `values` is the only primitive that is omitable and may return multiple values.
(test-comp '(lambda (b)
(let ([x (unbox b)])
(+ (values 2 2) x)))
'(lambda (b)
(+ (values 2 2) (unbox b)))
#f)
(test-comp '(lambda (z) (test-comp '(lambda (z)
(let-values ([(x y) (let-values ([(x y)
(if z (if z

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

@ -2987,7 +2987,8 @@ static int is_nonmutating_nondependant_primitive(Scheme_Object *rator, int n)
{ {
if (SCHEME_PRIMP(rator) if (SCHEME_PRIMP(rator)
&& ((SCHEME_PRIM_PROC_OPT_FLAGS(rator) & (SCHEME_PRIM_IS_OMITABLE | SCHEME_PRIM_IS_OMITABLE_ALLOCATION)) && ((SCHEME_PRIM_PROC_OPT_FLAGS(rator) & (SCHEME_PRIM_IS_OMITABLE | SCHEME_PRIM_IS_OMITABLE_ALLOCATION))
&& !(SCHEME_PRIM_PROC_OPT_FLAGS(rator) & (SCHEME_PRIM_IS_UNSAFE_OMITABLE))) && !(SCHEME_PRIM_PROC_OPT_FLAGS(rator) & (SCHEME_PRIM_IS_UNSAFE_OMITABLE))
&& !((SAME_OBJ(scheme_values_proc, rator) && (n != 1))))
&& (n >= ((Scheme_Primitive_Proc *)rator)->mina) && (n >= ((Scheme_Primitive_Proc *)rator)->mina)
&& (n <= ((Scheme_Primitive_Proc *)rator)->mu.maxa)) && (n <= ((Scheme_Primitive_Proc *)rator)->mu.maxa))
return 1; return 1;