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

diff --git a/src/ssa.nit b/src/ssa.nit
index a45ac5b..65a4de6 100644
--- a/src/ssa.nit
+++ b/src/ssa.nit
@@ -208,6 +208,15 @@ redef class APropdef
 	# Generate all basic blocks for this code
 	fun generate_basic_blocks(ssa: SSA) is abstract
 
+	# Contain all AST-parts related to object mechanisms the propdef has:
+	# instantiation, method dispatch, attribute access, subtyping-test
+	var object_sites: Array[AExpr] = new Array[AExpr]
+
+	# The return variable of the propdef
+	# Create an empty variable for the return of the method
+	# and treat returns like variable assignments
+	var returnvar: Variable = new Variable("returnvar")
+
 	# Compute the three steps of SSA-algorithm
 	# `ssa` A new instance of SSA class initialized with `self`
 	fun compute_ssa(ssa: SSA)
@@ -466,6 +475,9 @@ redef class AAttrPropdef
 		basic_block.first = self
 		basic_block.last = self
 
+		# Add the return variable
+		variables.add(returnvar)
+
 		# Add the self variable
 		if self.selfvariable != null then variables.add(selfvariable.as(not null))
 
@@ -478,12 +490,6 @@ redef class AAttrPropdef
 end
 
 redef class AMethPropdef
-
-	# The return variable of the propdef
-	# Create an empty variable for the return of the method
-	# and treat returns like variable assignments
-	var returnvar: Variable = new Variable("returnvar")
-
 	redef fun generate_basic_blocks(ssa: SSA)
 	do
 		basic_block = new BasicBlock
@@ -674,9 +680,7 @@ redef class AReturnExpr
 			old_block = self.n_expr.generate_basic_blocks(ssa, old_block)
 
 			# Store the return expression in the dependences of the dedicated returnvar
-			if ssa.propdef isa AMethPropdef then
-				ssa.propdef.as(AMethPropdef).returnvar.dep_exprs.add(n_expr.as(not null))
-			end
+			ssa.propdef.returnvar.dep_exprs.add(n_expr.as(not null))
 		end
 
 		old_block.last = self
@@ -702,7 +706,7 @@ redef class AAssertExpr
 			self.n_else.generate_basic_blocks(ssa, block_false)
 		else
 			block_false.first = self
-			block_false.first = self
+			block_false.last = self
 		end
 
 		old_block.link(block_false)
@@ -796,6 +800,8 @@ end
 redef class AIsaExpr
 	redef fun generate_basic_blocks(ssa, old_block)
 	do
+		ssa.propdef.object_sites.add(self)
+
 		return self.n_expr.generate_basic_blocks(ssa, old_block)
 	end
 end
@@ -803,6 +809,8 @@ end
 redef class AAsCastExpr
 	redef fun generate_basic_blocks(ssa, old_block)
 	do
+		ssa.propdef.object_sites.add(self)
+
 		return self.n_expr.generate_basic_blocks(ssa, old_block)
 	end
 end
@@ -834,6 +842,8 @@ redef class ASendExpr
 		# A call does not finish the current block,
 		# because we create intra-procedural basic blocks here
 
+		ssa.propdef.object_sites.add(self)
+
 		# Recursively goes into arguments to find variables if any
 		for e in self.raw_arguments do e.generate_basic_blocks(ssa, old_block)
 
@@ -846,6 +856,8 @@ redef class ASendReassignFormExpr
 	do
 		self.n_expr.generate_basic_blocks(ssa, old_block)
 
+		ssa.propdef.object_sites.add(self)
+
 		# Recursively goes into arguments to find variables if any
 		for e in self.raw_arguments do e.generate_basic_blocks(ssa, old_block)
 
@@ -868,6 +880,8 @@ redef class ANewExpr
 	do
 		for e in self.n_args.n_exprs do e.generate_basic_blocks(ssa, old_block)
 
+		ssa.propdef.object_sites.add(self)
+
 		return old_block
 	end
 end
@@ -875,6 +889,8 @@ end
 redef class AAttrExpr
 	redef fun generate_basic_blocks(ssa, old_block)
 	do
+		ssa.propdef.object_sites.add(self)
+
 		return self.n_expr.generate_basic_blocks(ssa, old_block)
 	end
 end
@@ -882,6 +898,8 @@ end
 redef class AAttrAssignExpr
 	redef fun generate_basic_blocks(ssa, old_block)
 	do
+		ssa.propdef.object_sites.add(self)
+
 		return self.n_expr.generate_basic_blocks(ssa, old_block)
 	end
 end
@@ -889,6 +907,8 @@ end
 redef class AAttrReassignExpr
 	redef fun generate_basic_blocks(ssa, old_block)
 	do
+		ssa.propdef.object_sites.add(self)
+
 		return self.n_expr.generate_basic_blocks(ssa, old_block)
 	end
 end
@@ -1056,13 +1076,15 @@ redef class AWhileExpr
 		old_block.link(block)
 
 		self.n_expr.generate_basic_blocks(ssa, old_block)
-		var inside_block = self.n_block.generate_basic_blocks(ssa, block)
+		self.n_block.generate_basic_blocks(ssa, block)
 
 		# Link the inside of the block to the previous block
 		block.link_special(old_block)
 
 		# Create a new Block after the while
 		var new_block = new BasicBlock
+		new_block.first = self
+		new_block.last = self
 		new_block.need_update = true
 
 		old_block.link_special(new_block)
@@ -1111,6 +1133,9 @@ redef class AForExpr
 		block.link(old_block)
 
 		var new_block = new BasicBlock
+		new_block.first = self
+		new_block.last = self
+
 		new_block.need_update = true
 
 		return new_block