From f6077b02f121c4300a761de4f5f2f1a18c361d7e Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 2 Jul 2010 11:47:51 -0400 Subject: [PATCH] Fixed some tests that used to test for an invalid optimization that is now valid. --- .../typed-scheme/optimizer/generic/invalid-vector-ref.rkt | 4 +++- .../typed-scheme/optimizer/generic/invalid-vector-set.rkt | 4 +++- collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt | 3 +++ collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt | 3 +++ .../optimizer/hand-optimized/invalid-vector-ref.rkt | 4 +++- .../optimizer/hand-optimized/invalid-vector-set.rkt | 4 +++- .../typed-scheme/optimizer/hand-optimized/vector-ref2.rkt | 3 +++ .../typed-scheme/optimizer/hand-optimized/vector-set2.rkt | 3 +++ 8 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt create mode 100644 collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt create mode 100644 collects/tests/typed-scheme/optimizer/hand-optimized/vector-ref2.rkt create mode 100644 collects/tests/typed-scheme/optimizer/hand-optimized/vector-set2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt index 0336e1097d..7471440524 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt @@ -1,2 +1,4 @@ (module invalid-vector-ref typed/scheme #:optimize - (vector-ref (vector 1 2 3) 0)) ; type is (Vectorof Integer), length is unknown, can't optimize + (: f ((Vectorof Integer) -> Integer)) + (define (f x) + (vector-ref x 0))) ; type is (Vectorof Integer), length is unknown, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt index 91f333c7a4..b02fbdc011 100644 --- a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt +++ b/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt @@ -1,2 +1,4 @@ (module invalid-vector-set typed/scheme #:optimize - (vector-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize + (: f ((Vectorof Integer) -> Void)) + (define (f x) + (vector-set! x 0 2))) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt new file mode 100644 index 0000000000..434fa07c1b --- /dev/null +++ b/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt @@ -0,0 +1,3 @@ +(module vector-ref2 typed/scheme #:optimize + (require racket/unsafe/ops) + (vector-ref (vector 1 2 3) 0)) diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt new file mode 100644 index 0000000000..910575d5da --- /dev/null +++ b/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt @@ -0,0 +1,3 @@ +(module invalid-vector-set typed/scheme #:optimize + (require racket/unsafe/ops) + (vector-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt index f531dc1429..94efc33b99 100644 --- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt +++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt @@ -1,2 +1,4 @@ (module invalid-vector-ref typed/scheme - (vector-ref (vector 1 2 3) 0)) ; type is (Vectorof Integer), length is unknown, can't optimize + (: f ((Vectorof Integer) -> Integer)) + (define f + (#%plain-lambda (x) (vector-ref x 0)))) ; type is (Vectorof Integer), length is unknown, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt index af5fe91f4e..3fbd72d0b8 100644 --- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt +++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt @@ -1,2 +1,4 @@ (module invalid-vector-set typed/scheme - (vector-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize + (: f ((Vectorof Integer) -> Void)) + (define f + (#%plain-lambda (x) (vector-set! x 0 2)))) ; type is (Vectorof Integer), length is ot known, can't optimize diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/vector-ref2.rkt new file mode 100644 index 0000000000..d57a98a8fc --- /dev/null +++ b/collects/tests/typed-scheme/optimizer/hand-optimized/vector-ref2.rkt @@ -0,0 +1,3 @@ +(module vector-ref2 typed/scheme #:optimize + (require racket/unsafe/ops) + (unsafe-vector*-ref (vector 1 2 3) 0)) diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/vector-set2.rkt new file mode 100644 index 0000000000..a5e255d0bf --- /dev/null +++ b/collects/tests/typed-scheme/optimizer/hand-optimized/vector-set2.rkt @@ -0,0 +1,3 @@ +(module invalid-vector-set typed/scheme #:optimize + (require racket/unsafe/ops) + (unsafe-vector*-set! (vector 1 2) 0 2)) ; type is (Vectorof Integer), length is ot known, can't optimize