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

Fix handling of impersonated vectors when bounds are fixnums.

Browse Source
This commit is contained in:
Vincent St-Amour 2011-08-15 15:31:35 -04:00
parent a6e633ae2f
commit ff0d843a09
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/typed-scheme/optimizer/vector.rkt
View File

@ -89,21 +89,21 @@
[new-v #,((optimize) #'v)]) [new-v #,((optimize) #'v)])
;; do the impersonator check up front, to avoid doing it twice (length and op) ;; do the impersonator check up front, to avoid doing it twice (length and op)
(if (impersonator? new-v) (if (impersonator? new-v)
(if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector-length v))]) (if #,(let ([one-sided #'(unsafe-fx< new-i (unsafe-vector*-length v))])
(if i-known-nonneg? (if i-known-nonneg?
;; we know it's nonnegative, one-sided check ;; we know it's nonnegative, one-sided check
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) ; 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))])
(if i-known-nonneg? (if i-known-nonneg?
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)))))) #,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 ...)