correctly emit internal-methods on deftypes too

Author: bronsa

src/main/clojure/clojure/tools/emitter/jvm/emit.clj

@@ -924,7 +924,7 @@
 
 ;; addAnnotations
 (defmethod -emit :method
-  [{:keys [this params name bridges tag fixed-arity variadic? body env]}
+  [{:keys [this params name bridges tag fixed-arity variadic? body env internal-methods]}
    {:keys [class] :as frame}]
 
   (let [method-name name
@@ -945,7 +945,8 @@
                     :o-tag (or (:tag body) Object))
                   (assoc frame
                     :loop-label  loop-label
-                    :loop-locals params))
+                    :loop-locals params
+                    :params      params))
           [:mark ~end-label]
           [:return-value]
           [:end-method]]]
@@ -964,7 +965,9 @@
                      [:load-args]
                      [:invoke-virtual ~@target]
                      [:return-value]
-                     [:end-method]]}))]))
+                     [:end-method]]}))
+      ~@(when internal-methods
+          (emit-internal-methods internal-methods (assoc frame :params params)))]))
 
 (defmethod -emit :local
   [{:keys [to-clear? local name tag o-tag arg-id]}

src/main/clojure/clojure/tools/emitter/passes/jvm/collect_internal_methods.clj

@@ -15,18 +15,18 @@
   {:pass-info {:walk :none :depends #{} :compiler true}} ;; ensure it's run last
   [ast]
   (case (:op ast)
-   :fn-method
-   (binding [*internal-methods* (atom [])]
-     (let [ast (update-children ast collect-internal-methods)]
-       (merge ast
-              (when-let [m (seq @*internal-methods*)]
-                {:internal-methods m}))))
+    (:method :fn-method)
+    (binding [*internal-methods* (atom [])]
+      (let [ast (update-children ast collect-internal-methods)]
+        (merge ast
+               (when-let [m (seq @*internal-methods*)]
+                 {:internal-methods m}))))
 
-   (:try :loop)
-   (let [ast (update-children (assoc ast :internal-method-name
-                                     (or (:loop-id ast) (gensym "try__")))
-                              collect-internal-methods)]
-     (swap! *internal-methods* conj ast)
-     ast)
+    (:try :loop)
+    (let [ast (update-children (assoc ast :internal-method-name
+                                      (or (:loop-id ast) (gensym "try__")))
+                               collect-internal-methods)]
+      (swap! *internal-methods* conj ast)
+      ast)
 
-   (update-children ast collect-internal-methods)))
+    (update-children ast collect-internal-methods)))