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

diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit
index e2422aa..50e4563 100644
--- a/src/rapid_type_analysis.nit
+++ b/src/rapid_type_analysis.nit
@@ -60,7 +60,7 @@ class RapidTypeAnalysis
 	var live_classes = new HashSet[MClass]
 
 	# The pool of types used to perform type checks (isa and as).
-	var live_cast_types = new HashSet[MClassType]
+	var live_cast_types = new HashSet[MType]
 
 	# The pool of undesolved types used to perform type checks (isa and as).
 	# They are globally resolved at the end of the analaysis
@@ -158,7 +158,7 @@ class RapidTypeAnalysis
 				var auto_super_inits = npropdef.auto_super_inits
 				if auto_super_inits != null then
 					for auto_super_init in auto_super_inits do
-						v.add_monomorphic_send(v.receiver, auto_super_init)
+						v.add_callsite(auto_super_init)
 					end
 				end
 			else if npropdef isa AInternMethPropdef or
@@ -207,8 +207,6 @@ class RapidTypeAnalysis
 			for t in live_types do
 				if not ot.can_resolve_for(t, t, mainmodule) then continue
 				var rt = ot.anchor_to(mainmodule, t)
-				if rt isa MNullableType then rt = rt.mtype
-				assert rt isa MClassType
 				live_cast_types.add(rt)
 				#print "  {ot}/{t} -> {rt}"
 			end
@@ -261,11 +259,9 @@ class RapidTypeAnalysis
 
 	fun add_cast(mtype: MType)
 	do
-		if mtype isa MNullableType then mtype = mtype.mtype
 		if mtype.need_anchor then
 			live_open_cast_types.add(mtype)
 		else
-			assert mtype isa MClassType
 			live_cast_types.add(mtype)
 		end
 	end
@@ -391,6 +387,8 @@ class RapidTypeVisitor
 	fun add_send(mtype: MType, mproperty: MMethod) do analysis.add_send(mtype, mproperty)
 
 	fun add_cast_type(mtype: MType) do analysis.add_cast(mtype)
+
+	fun add_callsite(callsite: nullable CallSite) do if callsite != null then analysis.add_send(callsite.recv, callsite.mproperty)
 end
 
 ###
@@ -509,9 +507,7 @@ end
 redef class ASendExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mproperty = self.mproperty.as(not null)
-		var recvtype = self.n_expr.mtype.as(not null)
-		v.add_send(recvtype, mproperty)
+		v.add_callsite(callsite)
 	end
 end
 
@@ -519,44 +515,36 @@ end
 redef class ASendReassignFormExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		v.add_send(self.read_type.as(not null), self.reassign_property.mproperty)
-		var mproperty = self.mproperty.as(not null)
-		var write_mproperty = self.write_mproperty.as(not null)
-		if n_expr isa ASelfExpr then
-			v.add_monomorphic_send(v.receiver, mproperty)
-			v.add_monomorphic_send(v.receiver, write_mproperty)
-		else
-			var recvtype = self.n_expr.mtype.as(not null)
-			v.add_send(recvtype, mproperty)
-			v.add_send(recvtype, write_mproperty)
-		end
+		v.add_callsite(callsite)
+		v.add_callsite(reassign_callsite)
+		v.add_callsite(write_callsite)
 	end
 end
 
 redef class AVarReassignExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		v.add_send(self.read_type.as(not null), self.reassign_property.mproperty)
+		v.add_callsite(reassign_callsite)
 	end
 end
 
 redef class AAttrReassignExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		v.add_send(self.read_type.as(not null), self.reassign_property.mproperty)
+		v.add_callsite(reassign_callsite)
 	end
 end
 
 redef class ASuperExpr
 	redef fun accept_rapid_type_visitor(v)
 	do
-		var mproperty = self.mproperty
-		if mproperty != null then
-			v.add_monomorphic_send(v.receiver, mproperty)
+		var callsite = self.callsite
+		if callsite != null then
+			v.add_callsite(callsite)
 			return
 		end
 
-		v.analysis.add_super_send(v.receiver, v.mpropdef.as(MMethodDef))
+		v.analysis.add_super_send(v.receiver, mpropdef.as(not null))
 	end
 end
 
@@ -587,7 +575,6 @@ redef class ANewExpr
 	do
 		var mtype = self.mtype.as(MClassType)
 		v.add_type(mtype)
-		var mproperty = self.mproperty.as(not null)
-		v.add_monomorphic_send(mtype, mproperty)
+		v.add_callsite(callsite)
 	end
 end