[analyzer] do not propagate Null<T> away

SlavaRa · Jun 19, 2015 · 12a52b2 · 12a52b2
1 parent 0bc86e6
commit 12a52b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/analyzer.ml b/analyzer.ml
@@ -1041,7 +1041,7 @@ module ConstPropagation = struct
 		with Not_found ->
 			-1
 
-	let rec can_be_inlined com v0 e = type_iseq v0.v_type e.etype && match e.eexpr with
+	let rec can_be_inlined com v0 e = type_iseq_strict v0.v_type e.etype && match e.eexpr with
 		| TConst ct ->
 			begin match ct with
 				| TThis | TSuper -> false

diff --git a/tests/optimization/src/TestAnalyzer.hx b/tests/optimization/src/TestAnalyzer.hx
@@ -677,7 +677,7 @@ class TestAnalyzer extends TestBase {
 		var b = B(0);
 		switch (b) {
 			case B(i):
-				assertEqualsConst(0, i);
+				assertEquals(0, i);
 			case A(_):
 		}
 	}

diff --git a/type.ml b/type.ml
@@ -489,7 +489,7 @@ let map loop t =
 				a.a_fields <- fields;
 				t
 			| _ ->
-	 			TAnon {
+				TAnon {
 					a_fields = fields;
 					a_status = a.a_status;
 				}
@@ -559,7 +559,7 @@ let apply_params cparams params t =
 					a.a_fields <- fields;
 					t
 				| _ ->
-		 			TAnon {
+					TAnon {
 						a_fields = fields;
 						a_status = a.a_status;
 					}
@@ -1447,6 +1447,13 @@ let type_iseq a b =
 	with
 		Unify_error _ -> false
 
+let type_iseq_strict a b =
+	try
+		type_eq EqDoNotFollowNull a b;
+		true
+	with Unify_error _ ->
+		false
+
 let unify_stack = ref []
 let abstract_cast_stack = ref []
 let unify_new_monos = ref []