CLJS-2807: Macroexpand failure with set literal

Author: frenchy64

src/main/clojure/cljs/analyzer.cljc

@@ -3543,7 +3543,7 @@
     (analyze-wrap-meta {:op :vector :env env :form form :items items :children [:items] :tag 'cljs.core/IVector})))
 
 (defn analyze-set
-  [env form ]
+  [env form]
   (let [expr-env (assoc env :context :expr)
         items (disallowing-recur (mapv #(analyze expr-env %) form))]
     (analyze-wrap-meta {:op :set :env env :form form :items items :children [:items] :tag 'cljs.core/ISet})))

src/main/clojure/cljs/compiler.cljc

@@ -235,21 +235,24 @@
 (declare emit-map emit-list emit-vector emit-set emit-js-object emit-js-array
          emit-with-meta emit-constants-comma-sep emit-constant)
 
+(defn all-distinct? [xs]
+  (apply distinct? xs))
+
 #?(:clj
    (defn emit-constant-no-meta [x]
      (cond
        (seq? x) (emit-list x emit-constants-comma-sep)
-       (map? x) (emit-map (keys x) (vals x) emit-constants-comma-sep #(apply distinct? %))
+       (map? x) (emit-map (keys x) (vals x) emit-constants-comma-sep all-distinct?)
        (vector? x) (emit-vector x emit-constants-comma-sep)
-       (set? x) (emit-set x emit-constants-comma-sep)
+       (set? x) (emit-set x emit-constants-comma-sep all-distinct?)
        :else (emit-constant* x)))
    :cljs
    (defn emit-constant-no-meta [x]
      (cond
        (ana/cljs-seq? x) (emit-list x emit-constants-comma-sep)
-       (ana/cljs-map? x) (emit-map (keys x) (vals x) emit-constants-comma-sep #(apply distinct? %))
+       (ana/cljs-map? x) (emit-map (keys x) (vals x) emit-constants-comma-sep all-distinct?)
        (ana/cljs-vector? x) (emit-vector x emit-constants-comma-sep)
-       (ana/cljs-set? x) (emit-set x emit-constants-comma-sep)
+       (ana/cljs-set? x) (emit-set x emit-constants-comma-sep all-distinct?)
        :else (emit-constant* x))))
 
 (defn emit-constant [v]
@@ -513,7 +516,7 @@
     (and (every? #(= (:op %) :const) items)
          (= (count (into #{} items)) (count items)))))
 
-(defn emit-set [items comma-sep]
+(defn emit-set [items comma-sep distinct-constants?]
   (cond
     (empty? items)
     (emits "cljs.core.PersistentHashSet.EMPTY")
@@ -527,15 +530,7 @@
 (defmethod emit* :set
   [{:keys [items env]}]
   (emit-wrap env
-    (cond
-      (empty? items)
-      (emits "cljs.core.PersistentHashSet.EMPTY")
-
-      (distinct-constants? items)
-      (emits "new cljs.core.PersistentHashSet(null, new cljs.core.PersistentArrayMap(null, " (count items) ", ["
-        (comma-sep (interleave items (repeat "null"))) "], null), null)")
-
-      :else (emits "cljs.core.PersistentHashSet.createAsIfByAssoc([" (comma-sep items) "])"))))
+    (emit-set items comma-sep distinct-constants?)))
 
 (defn emit-js-object [items emit-js-object-val]
   (emits "({")

src/test/cljs/cljs/core_test.cljs

@@ -1607,3 +1607,7 @@
   (let [x (map->CLJS-2787 {1 2})
         y (map->CLJS-2787 x)]
     (is (= x y))))
+
+(deftest test-cljs-2807
+  (testing "Quoted sets should work"
+    (is (macroexpand '(fn [x] #{(into [] x)})))))