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

improved test for non-conversion

Browse Source 
svn: r5452
This commit is contained in:
Matthew Flatt 2007-01-25 06:19:00 +00:00
parent cf3da5cf7d
commit a746e33058
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
collects/compiler/private/xform.ss
View File

@ -748,6 +748,7 @@
pushed-vars pushed-vars
num-calls num-calls
num-noreturn-calls num-noreturn-calls
num-empty-calls
nonempty-calls?)) nonempty-calls?))
;; A function prototype record: ;; A function prototype record:
@ -926,6 +927,7 @@
(live-var-info-pushed-vars live-vars) (live-var-info-pushed-vars live-vars)
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars))) (live-var-info-nonempty-calls? live-vars)))
(define gentag-count 0) (define gentag-count 0)
@ -2289,7 +2291,7 @@
null) null)
(lambda () null) (lambda () null)
;; Initially, no live vars, no introduiced vars, etc.: ;; Initially, no live vars, no introduiced vars, etc.:
(make-live-var-info #f -1 0 null null null 0 0 #f) (make-live-var-info #f -1 0 null null null 0 0 0 #f)
;; Add PREPARE_VAR_STACK and ensure result return: ;; Add PREPARE_VAR_STACK and ensure result return:
(parse-proto-information (parse-proto-information
e e
@ -2314,7 +2316,8 @@
(zero? (live-var-info-maxpush live-vars)) (zero? (live-var-info-maxpush live-vars))
(or (<= (live-var-info-num-calls live-vars) 1) (or (<= (live-var-info-num-calls live-vars) 1)
(= (live-var-info-num-calls live-vars) (= (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars)))))) (+ (live-var-info-num-empty-calls live-vars)
(live-var-info-num-noreturn-calls live-vars)))))))
;; No conversion necessary. (Lack of `call' records means no GC-setup ;; No conversion necessary. (Lack of `call' records means no GC-setup
;; work when printing out the function.) ;; work when printing out the function.)
(list->seq (list->seq
@ -2624,6 +2627,7 @@
(live-var-info-pushed-vars live-vars) (live-var-info-pushed-vars live-vars)
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars)))] (live-var-info-nonempty-calls? live-vars)))]
[(eq? (tok-n (caar body)) START_XFORM_SKIP) [(eq? (tok-n (caar body)) START_XFORM_SKIP)
(let skip-loop ([body (cdr body)]) (let skip-loop ([body (cdr body)])
@ -2825,6 +2829,7 @@
(live-var-info-pushed-vars live-vars) (live-var-info-pushed-vars live-vars)
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars))))))))))) (live-var-info-nonempty-calls? live-vars)))))))))))
(define (body-var-decl? e) (define (body-var-decl? e)
@ -2988,6 +2993,7 @@
(live-var-info-pushed-vars live-vars) (live-var-info-pushed-vars live-vars)
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars)))) (live-var-info-nonempty-calls? live-vars))))
(loop (cdr el) (cons (wrap e) new-args) setups new-vars (loop (cdr el) (cons (wrap e) new-args) setups new-vars
(if must-convert? (if must-convert?
@ -3356,8 +3362,10 @@
(append new-pushed old-pushed)) (append new-pushed old-pushed))
(+ (if non-gcing-call? 0 1) (+ (if non-gcing-call? 0 1)
(live-var-info-num-calls live-vars)) (live-var-info-num-calls live-vars))
(+ (if non-returning? 1 0) (+ (if non-gcing-call? 0 (if non-returning? 1 0))
(live-var-info-num-noreturn-calls live-vars)) (live-var-info-num-noreturn-calls live-vars))
(+ (if (or non-gcing-call? non-returning?) 0 (if this-nonempty? 0 1))
(live-var-info-num-empty-calls live-vars))
(or (and this-nonempty? (not non-gcing-call?)) (or (and this-nonempty? (not non-gcing-call?))
(live-var-info-nonempty-calls? live-vars))) (live-var-info-nonempty-calls? live-vars)))
(or converted-sub? (or converted-sub?
@ -3416,6 +3424,7 @@
(live-var-info-pushed-vars live-vars) (live-var-info-pushed-vars live-vars)
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars)) (live-var-info-nonempty-calls? live-vars))
#t)) #t))
(begin (begin
@ -3489,6 +3498,7 @@
new-pushed-vars new-pushed-vars
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars))))] (live-var-info-nonempty-calls? live-vars))))]
[(restore-new-vars) [(restore-new-vars)
(lambda (live-vars) (lambda (live-vars)
@ -3500,6 +3510,7 @@
orig-pushed-vars orig-pushed-vars
(live-var-info-num-calls live-vars) (live-var-info-num-calls live-vars)
(live-var-info-num-noreturn-calls live-vars) (live-var-info-num-noreturn-calls live-vars)
(live-var-info-num-empty-calls live-vars)
(live-var-info-nonempty-calls? live-vars)))] (live-var-info-nonempty-calls? live-vars)))]
[(e live-vars rest extra) [(e live-vars rest extra)
(cond (cond