change field type parameter storing to something more awkward and efficient

src-json/meta.json

@@ -518,6 +518,12 @@
 		"platforms": ["hl"],
 		"targets": ["TClass", "TClassField"]
 	},
+	{
+		"name": "HxbId",
+		"metadata": ":hxb.id",
+		"doc": "Internally used by hxb",
+		"internal": true
+	},
 	{
 		"name": "HxCompletion",
 		"metadata": ":hx.completion",

src/codegen/genxml.ml

@@ -81,7 +81,7 @@ let rec follow_param t =
 		t
 
 let gen_meta meta =
-	let meta = List.filter (fun (m,_,_) -> match m with Meta.Used | Meta.RealPath | Meta.Pure -> false | _ -> true) meta in
+	let meta = List.filter (fun (m,_,_) -> match m with Meta.Used | Meta.RealPath | Meta.Pure | Meta.HxbId -> false | _ -> true) meta in
 	match meta with
 	| [] -> []
 	| _ ->

src/compiler/hxb/hxbReader.ml

@@ -28,6 +28,40 @@ let create_hxb_reader_stats () = {
 	modules_partially_restored = ref 0;
 }
 
+module ClassFieldInfo = struct
+	type t = {
+		type_parameters : typed_type_param array;
+	}
+
+	let create params = {
+		type_parameters = params;
+	}
+end
+
+module ClassFieldInfos = struct
+	type t = {
+		infos : ClassFieldInfo.t DynArray.t;
+	}
+
+	let meta = Meta.HxbId
+
+	let create () = {
+		infos = DynArray.create ()
+	}
+
+	let get infos cf =
+		let _,_,p = Meta.get meta cf.cf_meta in
+		DynArray.get infos.infos p.pmin
+
+	let unset infos cf =
+		cf.cf_meta <- Meta.remove meta cf.cf_meta
+
+	let set infos info cf =
+		let index = DynArray.length infos.infos in
+		DynArray.add infos.infos info;
+		cf.cf_meta <- (meta,[],{null_pos with pmin = index}) :: cf.cf_meta
+end
+
 module BytesWithPosition = struct
 	type t = {
 		bytes : bytes;
@@ -1338,11 +1372,10 @@ class hxb_reader
 		let e_unopt = self#read_option (fun () -> self#read_texpr fctx) in
 		e,e_unopt
 
-	val mutable awful = []
+	val class_field_infos = ClassFieldInfos.create ()
 
 	method read_class_field_data (cf : tclass_field) : unit =
 		let params = self#read_field_type_parameters in
-		awful <- (cf,field_type_parameters) :: awful;
 
 		let t = self#read_type_instance in
 
@@ -1370,6 +1403,11 @@ class hxb_reader
 		cf.cf_params <- params;
 		cf.cf_flags <- flags;
 
+		(* store type parameter info for EXD *)
+		let info = ClassFieldInfo.create field_type_parameters in
+		ClassFieldInfos.set class_field_infos info cf;
+
+
 	method read_class_field_and_overloads_data (cf : tclass_field) =
 		let rec loop depth cfl = match cfl with
 			| cf :: cfl ->
@@ -1625,7 +1663,8 @@ class hxb_reader
 				let ch_cf = BytesWithPosition.create bytes in
 				let read_expressions () =
 					self#select_class_type_parameters c;
-					field_type_parameters <- List.assq cf awful;
+					field_type_parameters <- (ClassFieldInfos.get class_field_infos cf).type_parameters;
+					ClassFieldInfos.unset class_field_infos cf;
 					field_type_parameter_offset <- 0;
 					let old = ch in
 					ch <- ch_cf;