Unify numeric types API across all targets

src/generators/genhl.ml

@@ -314,7 +314,15 @@ let member_fun c t =
 
 let rec unsigned t =
 	match follow t with
-	| TAbstract ({ a_path = ["haxe"],"UInt32" },_) -> true
+	(* haxe.UInt32 is intentionally not listed here. Its operations (division, comparison,
+	   shift) are handled via @:op abstract operators that call Int32Helper/Int32Direct
+	   functions. These helpers use `v < 0` to detect the high bit for unsigned conversion
+	   (e.g. utoFloat). After Haxe inlines these helpers with a UInt32 argument, the
+	   comparison `v < 0` retains UInt32 as the type of `v`. If unsigned returned true for
+	   UInt32, that comparison would be emitted as an unsigned `jugte` (always false),
+	   breaking the conversion. To enable native HL unsigned opcodes for UInt32 in the
+	   future, the helper functions would need native HL overrides that use unsigned opcodes
+	   directly rather than sign-based Int tricks. *)
 	| TAbstract (a,pl) -> unsigned (Abstract.get_underlying_type a pl)
 	| _ -> false
 
@@ -462,7 +470,7 @@ let rec to_type ?tref ctx t =
 		if Meta.has Meta.CoreType a.a_meta then
 			(match a.a_path with
 			| [], "Void" -> HVoid
-			| [], "Int" | ["haxe"], "UInt32" -> HI32
+			| [], "Int" -> HI32
 			| [], "Float" -> HF64
 			| [], "Single" -> HF32
 			| [], "Bool" -> HBool

src/generators/genjvm.ml

@@ -1681,30 +1681,6 @@ class texpr_to_jvm
 			let tl,tr = self#call_arguments cf.cf_type el in
 			jm#invokestatic c.cl_path (String.sub cf.cf_name 1 (String.length cf.cf_name - 1)) (method_sig tl tr);
 			tr
-		| TField(_,FStatic({cl_path = (["haxe"],"Int64$Int64_Impl_")},{cf_name = "make"})) ->
-			begin match el with
-			| [{eexpr = TConst (TInt i1)};{eexpr = TConst (TInt i2)}] ->
-				let high = Int64.of_int32 i1 in
-				let high = Int64.shift_left high 32 in
-				let low = Int64.of_int32 i2 in
-				let low = Int64.logand low (Int64.of_string "0xFFFFFFFF") in
-				let i = Int64.logor high low in
-				jm#get_code#lconst i;
-				Some TLong
-			| [e1;e2] ->
-				self#texpr (rvalue_sig TLong) e1;
-				jm#cast TLong;
-				jm#get_code#iconst (Int32.of_int 32);
-				jm#get_code#lshl;
-				self#texpr (rvalue_sig TLong) e2;
-				jm#cast TLong;
-				jm#get_code#lconst (Int64.of_string "0xFFFFFFFF");
-				jm#get_code#land_;
-				jm#get_code#lor_;
-				Some TLong
-			| _ ->
-				die "" __LOC__
-			end
 		| TIdent "__array__" | TField(_,FStatic({cl_path = (["jvm"],"NativeArray")},{cf_name = "make"})) ->
 			begin match follow tr with
 			| TInst({cl_path = (["jvm"],"NativeArray")},[t]) ->

src/optimization/inline.ml

@@ -56,6 +56,10 @@ let api_inline2 basic platform c field params p =
 			Some (stringv())
 		| TAbstract ({ a_path = [],"UInt" }, []) ->
 			Some (stringv())
+		| TAbstract ({ a_path = ["haxe"],"UInt32" }, []) ->
+			(* Note: Std.string(v:UInt32) is rewritten to v.toString() during typing,
+			   so this case is never reached in practice. Kept for completeness. *)
+			Some (stringv())
 		| TAbstract ({ a_path = [],"Bool" }, []) ->
 			Some (stringv())
 		| _ ->