CLJS-3027: sorted-map can no longer be returned by a macro unless it has keyword keys

Author: mfikes

src/main/clojure/cljs/analyzer.cljc

@@ -3495,12 +3495,16 @@
 ;; TODO: analyzed analyzed? should take pass name as qualified keyword arg
 ;; then compiler passes can mark/check individually - David
 
+(defn- unsorted-map? [x]
+  (and (map? x)
+       (not (sorted? x))))
+
 (defn analyzed
   "Mark a form as being analyzed. Assumes x satisfies IMeta. Useful to suppress
   warnings that will have been caught by a first compiler pass."
   [x]
   (cond
-    (map? x) (assoc x ::analyzed true)
+    (unsorted-map? x) (assoc x ::analyzed true)
     :else (vary-meta x assoc ::analyzed true)))
 
 (defn analyzed?
@@ -3509,7 +3513,7 @@
   [x]
   (boolean
     (cond
-      (map? x) (::analyzed x)
+      (unsorted-map? x) (::analyzed x)
       :else (::analyzed (meta x)))))
 
 (defn- all-values?

src/test/cljs/cljs/macro_test.cljs

@@ -9,7 +9,7 @@
 (ns cljs.macro-test
   (:refer-clojure :exclude [==])
   (:require [cljs.test :refer-macros [deftest is]])
-  (:use-macros [cljs.macro-test.macros :only [==]])
+  (:use-macros [cljs.macro-test.macros :only [== sm-cljs-3027]])
   (:require-macros [cljs.macro-test.cljs2852]))
 
 (deftest test-macros
@@ -28,3 +28,6 @@
   (is (= '([x])) (cljs.macro-test.cljs2852/beta))
   (is (= '([x] [x y])) (cljs.macro-test.cljs2852/delta))
   (is (= '([x] [x & xs])) (cljs.macro-test.cljs2852/zeta)))
+
+(deftest test-cljs-3027
+  (is (= {"a" "b"} (sm-cljs-3027))))

src/test/cljs/cljs/macro_test/macros.clj

@@ -10,4 +10,7 @@
   (:refer-clojure :exclude [==]))
 
 (defmacro == [a b]
-  `(+ ~a ~b))
+  `(+ ~a ~b))
+
+(defmacro sm-cljs-3027 []
+  (sorted-map "a" "b"))