[jvm] please our Dynamic overlords

closes #8872
HaxeFoundation · Oct 31, 2019 · d2bba9a · d2bba9a
1 parent a239449
commit d2bba9a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/generators/genjvm.ml b/src/generators/genjvm.ml
@@ -577,11 +577,8 @@ class texpr_to_jvm gctx (jc : JvmClass.builder) (jm : JvmMethod.builder) (return
 	method expect_reference_type = jm#expect_reference_type
 
 	method cast t =
-		if follow t != t_dynamic then begin
-			let vt = self#vtype t in
-			jm#cast vt
-		end else
-			self#expect_reference_type
+		let vt = self#vtype t in
+		jm#cast vt
 
 	method cast_expect ret t = match ret with
 		| RValue (Some jsig) -> jm#cast jsig

diff --git a/tests/unit/src/unit/issues/Issue8872.hx b/tests/unit/src/unit/issues/Issue8872.hx
@@ -0,0 +1,13 @@
+package unit.issues;
+
+class Issue8872 extends unit.Test {
+	function test() {
+		var d:Array<Dynamic> = [];
+		d.push(getTrue() ? (0 : Dynamic) : ("foo" : Dynamic));
+		eq(0, d[0]);
+	}
+
+	static function getTrue() {
+		return true;
+	}
+}