X-Git-Url: http://nitlanguage.org

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index a6adfee..f63034c 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -237,13 +237,16 @@ class RapidTypeAnalysis
 
 			if not modelbuilder.mpropdef2npropdef.has_key(mmethoddef) then
 				# It is an init for a class?
-				if mmeth.name == "init" then
+				if mmeth.is_root_init then
 					var nclassdef = self.modelbuilder.mclassdef2nclassdef[mmethoddef.mclassdef]
 					assert mmethoddef == nclassdef.mfree_init
 
 					if mmethoddef.mproperty.is_root_init and not mmethoddef.is_intro then
 						self.add_super_send(v.receiver, mmethoddef)
 					end
+				else if mmethoddef.constant_value != null then
+					# Make the return type live
+					v.add_type(mmethoddef.msignature.return_mtype.as(MClassType))
 				else
 					abort
 				end
@@ -264,9 +267,7 @@ class RapidTypeAnalysis
 				end
 			end
 
-			if mmeth.is_new then
-				v.add_type(v.receiver)
-			else if mmethoddef.is_intern or mmethoddef.is_extern then
+			if mmethoddef.is_intern or mmethoddef.is_extern then
 				# UGLY: We force the "instantation" of the concrete return type if any
 				var ret = mmethoddef.msignature.return_mtype
 				if ret != null and ret isa MClassType and ret.mclass.kind != abstract_kind and ret.mclass.kind != interface_kind then
@@ -675,6 +676,8 @@ redef class AForExpr
 			abort
 		end
 		v.add_callsite(self.method_next)
+		var mf = self.method_finish
+		if mf != null then v.add_callsite(mf)
 	end
 end