CS: more reliable inlining of vector-immutable

Closes racket#4584
kjinho · Feb 20, 2023 · 0a88cde · 0a88cde
1 parent 01b025c
commit 0a88cde
Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/racket/src/cs/rumble.sls b/racket/src/cs/rumble.sls
@@ -375,7 +375,7 @@
                   [inline:vector-set! vector-set!])
           vector-copy
           vector-copy!
-          vector-immutable
+          (rename [inline:vector-immutable vector-immutable])
           vector->values
           vector-fill!
           vector->immutable-vector

diff --git a/racket/src/cs/rumble/vector.ss b/racket/src/cs/rumble/vector.ss
@@ -9,12 +9,23 @@
 
 ;; ----------------------------------------
 
-(define (vector-immutable . args)
-  (if (null? args)
-      (vector->immutable-vector '#())
-      (let ([vec (apply vector args)])
-        (#%$vector-set-immutable! vec)
-        vec)))
+(define vector-immutable
+  (case-lambda
+   [() (vector->immutable-vector '#())]
+   [args (let ([vec (apply vector args)])
+           (#%$vector-set-immutable! vec)
+           vec)]))
+
+(define-syntax (inline:vector-immutable stx)
+  (syntax-case stx ()
+    [(_) #'(vector->immutable-vector '#())]
+    [(_ arg ...)
+     #'(let ([vec (vector arg ...)])
+         (#%$vector-set-immutable! vec)
+         vec)]
+    [(_ . args)
+     #'(vector-immutable . args)]
+    [_ #'vector-immutable]))
 
 ;; ----------------------------------------