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

fix ad-hoc hash-ref optimizaiton

Browse Source 
Optimization to convert `(hash-ref <ht> <key> (lambda () <constant>))`
to `(hash-ref <ht> <key> <constant>)` didn't check that the `lambda`
for had zero argument.

Closes #1648
This commit is contained in:
Matthew Flatt 2017-03-30 18:45:26 -04:00
parent 92a0dcbcb0
commit 5fb86dc55e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3198,6 +3198,26 @@
(hash-ref '#hash((x . y)) x add1)) (hash-ref '#hash((x . y)) x add1))
#f) #f)
(test-comp '(lambda ()
(hash-ref #hash()
'missing
(λ ()
'UNEXPECTED!)))
'(lambda ()
(hash-ref #hash()
'missing
'UNEXPECTED!)))
(test-comp '(lambda ()
(hash-ref #hash()
'missing
(λ (required-arg)
'UNEXPECTED!)))
'(lambda ()
(hash-ref #hash()
'missing
'UNEXPECTED!))
#f)
;; Check elimination of ignored structure predicate ;; Check elimination of ignored structure predicate
;; and constructor applications: ;; and constructor applications:

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

@ -3812,6 +3812,7 @@ static Scheme_Object *optimize_application(Scheme_Object *o, Optimize_Info *info
&& SAME_OBJ(scheme_hash_ref_proc, app->args[0]) && SAME_OBJ(scheme_hash_ref_proc, app->args[0])
&& SCHEME_HASHTRP(app->args[1]) && SCHEME_HASHTRP(app->args[1])
&& SAME_TYPE(scheme_ir_lambda_type, SCHEME_TYPE(app->args[3])) && SAME_TYPE(scheme_ir_lambda_type, SCHEME_TYPE(app->args[3]))
&& (((Scheme_Lambda *)(app->args[3]))->num_params == 0)
&& (SCHEME_TYPE(((Scheme_Lambda *)app->args[3])->body) > _scheme_ir_values_types_) && (SCHEME_TYPE(((Scheme_Lambda *)app->args[3])->body) > _scheme_ir_values_types_)
&& !SCHEME_PROCP(((Scheme_Lambda *)app->args[3])->body)) { && !SCHEME_PROCP(((Scheme_Lambda *)app->args[3])->body)) {
app->args[3] = ((Scheme_Lambda *)app->args[3])->body; app->args[3] = ((Scheme_Lambda *)app->args[3])->body;