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

Swap unsafe and chaperone-unsafe vector ops in the TR optimizer.

Browse Source 
Closes PR12969.
This commit is contained in:
Vincent St-Amour 2012-08-04 09:45:34 -04:00
parent 3573d61636
commit aba046a92d
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
collects/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt Normal file
View File

@ -0,0 +1,7 @@
#;
(
)
#lang racket
(define v (vector 'b 'a))
(provide v)

13
collects/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt Normal file
View File

@ -0,0 +1,13 @@
#;
(
TR opt: vector-chaperone2.rkt 12:10 (vector-ref v i) -- vector partial bounds checking elimination
'b
)
#lang typed/racket
(require/typed "vector-chaperone1.rkt"
(v (Vectorof Symbol)))
(: i Fixnum)
(define i 0)
(: x Symbol)
(define x (vector-ref v i))
x

6
collects/typed-racket/optimizer/vector.rkt
View File

@ -14,7 +14,7 @@
(define-syntax-class vector-op (define-syntax-class vector-op
#:commit #:commit
;; we need the * versions of these unsafe operations to be chaperone-safe ;; we need the non-* versions of these unsafe operations to be chaperone-safe
(pattern (~literal vector-ref) #:with unsafe #'unsafe-vector-ref #:with unsafe-no-impersonator #'unsafe-vector*-ref) (pattern (~literal vector-ref) #:with unsafe #'unsafe-vector-ref #:with unsafe-no-impersonator #'unsafe-vector*-ref)
(pattern (~literal vector-set!) #:with unsafe #'unsafe-vector-set! #:with unsafe-no-impersonator #'unsafe-vector*-set!)) (pattern (~literal vector-set!) #:with unsafe #'unsafe-vector-set! #:with unsafe-no-impersonator #'unsafe-vector*-set!))
(define-syntax-class flvector-op (define-syntax-class flvector-op
@ -95,7 +95,7 @@
one-sided one-sided
#`(and (unsafe-fx>= new-i 0) #`(and (unsafe-fx>= new-i 0)
#,one-sided))) #,one-sided)))
(op.unsafe-no-impersonator new-v new-i #,@(syntax-map (optimize) #'(new ...))) (op.unsafe new-v new-i #,@(syntax-map (optimize) #'(new ...)))
#,safe-fallback) ; will error. to give the right error message #,safe-fallback) ; will error. to give the right error message
;; not an impersonator, can use unsafe-vector* ops ;; not an impersonator, can use unsafe-vector* ops
(if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector-length v))]) (if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector-length v))])
@ -103,7 +103,7 @@
one-sided one-sided
#`(and (unsafe-fx>= new-i 0) #`(and (unsafe-fx>= new-i 0)
#,one-sided))) #,one-sided)))
(op.unsafe new-v new-i #,@(syntax-map (optimize) #'(new ...))) (op.unsafe-no-impersonator new-v new-i #,@(syntax-map (optimize) #'(new ...)))
#,safe-fallback)))))) #,safe-fallback))))))
;; similarly for flvectors ;; similarly for flvectors
(pattern (#%plain-app op:flvector-op v:expr i:fixnum-expr new:expr ...) (pattern (#%plain-app op:flvector-op v:expr i:fixnum-expr new:expr ...)