Fix TFor when ctx.allow_transform = false

HaxeFoundation · Jan 22, 2025 · 0b2b0da · 0b2b0da
1 parent 8b3bc18
commit 0b2b0da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/core/texpr.ml b/src/core/texpr.ml
@@ -624,11 +624,11 @@ let rec type_constant_value basic (e,p) =
 let is_constant_value basic e =
 	try (ignore (type_constant_value basic e); true) with Error {err_message = Custom _} -> false
 
-let for_remap basic v e1 e2 p =
-	let v' = alloc_var v.v_kind v.v_name e1.etype e1.epos in
-	let ev' = mk (TLocal v') e1.etype e1.epos in
-	let t1 = (Abstract.follow_with_abstracts e1.etype) in
-	let ehasnext = mk (TField(ev',try quick_field t1 "hasNext" with Not_found -> raise_typing_error (s_type (print_context()) t1 ^ "has no field hasNext()") p)) (tfun [] basic.tbool) e1.epos in
+let for_remap basic v etype e1 e2 p =
+	let v' = alloc_var v.v_kind v.v_name etype e1.epos in
+	let ev' = mk (TLocal v') etype e1.epos in
+	let t1 = (Abstract.follow_with_abstracts etype) in
+	let ehasnext = mk (TField(ev',try quick_field t1 "hasNext" with Not_found -> raise_typing_error (s_type (print_context()) t1 ^ " has no field hasNext()") p)) (tfun [] basic.tbool) e1.epos in
 	let ehasnext = mk (TCall(ehasnext,[])) basic.tbool ehasnext.epos in
 	let enext = mk (TField(ev',quick_field t1 "next")) (tfun [] v.v_type) e1.epos in
 	let enext = mk (TCall(enext,[])) v.v_type e1.epos in

diff --git a/src/typing/forLoop.ml b/src/typing/forLoop.ml
@@ -33,7 +33,7 @@ let optimize_for_loop_iterator ctx v e1 e2 p =
 		get_class_and_params e1
 	in
 	let _, _, fhasnext = (try raw_class_field (fun cf -> apply_params c.cl_params tl cf.cf_type) c tl "hasNext" with Not_found -> raise Exit) in
-	if fhasnext.cf_kind <> Method MethInline then raise Exit;
+	if not ctx.allow_inline || fhasnext.cf_kind <> Method MethInline then raise Exit;
 	let it_type = TInst(c,tl) in
 	let tmp = gen_local ctx it_type e1.epos in
 	let eit = mk (TLocal tmp) it_type p in
@@ -284,7 +284,7 @@ module IterationKind = struct
 		{
 			it_kind = it;
 			it_type = pt;
-			it_expr = if not ctx.allow_transform then e else e1;
+			it_expr = e1;
 		}
 
 	let to_texpr ctx v iterator e2 p =
@@ -414,7 +414,7 @@ module IterationKind = struct
 			begin try
 				optimize_for_loop_iterator ctx v e1 e2 p
 			with Exit ->
-				Texpr.for_remap ctx.t v e1 e2 p
+				Texpr.for_remap ctx.t v (ctx.t.titerator pt) e1 e2 p
 			end
 		| IteratorGenericStack c ->
 			let tcell = (try (PMap.find "head" c.cl_fields).cf_type with Not_found -> die "" __LOC__) in