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

fix bad interaction among JIT, 3-D macro, and bytecode reader

Browse Source 
Closes PR 14186
This commit is contained in:
Matthew Flatt 2014-01-07 09:40:51 -07:00
parent 6e36795523
commit 331825700b
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/racket-pkgs/racket-test/tests/racket/optimize.rktl
View File

@ -3207,6 +3207,27 @@
;; Should succeed, as opposed to a validation error:
(eval (read (open-input-bytes (get-output-bytes o))))))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Check interaciton of 3-D macros, non-empty closures, JIT, and bytecode:
(let ([o (open-output-bytes)])
(write (compile
#'(module 3D-eval-macro racket/base
(require (for-syntax racket/base syntax/parse))
(provide phase1-eval)
(define-syntax (phase1-eval stx)
#'((let-syntax ([go (lambda (stx) #`#,(lambda () #'(void)))])
(go))))))
o)
(eval (parameterize ([read-accept-compiled #t])
(read (open-input-bytes (get-output-bytes o))))))
(require '3D-eval-macro)
(define f (lambda ()
(phase1-eval)))
(test #t syntax? (f))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

12
racket/src/racket/src/jit.c
View File

@ -3099,10 +3099,20 @@ int scheme_generate(Scheme_Object *obj, mz_jit_state *jitter, int is_tail, int w
/* Avoid compiling closures multiple times: */
if (jitter->retain_start) {
if (type == scheme_closure_type) {
/* Empty closure? If so, compile the code and get a native closure: */
/* Compile the code and get a native closure: */
Scheme_Closure *c = (Scheme_Closure *)obj;
if (ZERO_SIZED_CLOSUREP(c))
obj = scheme_jit_closure((Scheme_Object *)c->code, NULL);
else {
/* Strange case that can happen if a 3-D macro injects a closure
into an expression: */
int i;
obj = scheme_jit_closure((Scheme_Object *)c->code, NULL);
obj = scheme_make_native_closure(((Scheme_Closure_Data *)obj)->u.native_code);
for (i = c->code->closure_size; i--; ) {
((Scheme_Native_Closure *)obj)->vals[i] = c->vals[i];
}
}
} else if (type == scheme_case_closure_type) {
/* Empty case closure? Turn in into a JITted empty case closure. */
obj = scheme_unclose_case_lambda(obj, 1);