Merge branch 'development' of github.com:HaxeFoundation/haxe into development

main.ml

@@ -1243,7 +1243,6 @@ try
 			Codegen.check_remove_metadata;
 			Codegen.check_void_field;
 		] in
-		let type_filters = if ctx.com.platform = Java then Codegen.promote_abstract_parameters :: type_filters else type_filters in
 		List.iter (fun t -> List.iter (fun f -> f tctx t) type_filters) com.types;
 		if ctx.has_error then raise Abort;
 		(match !xml_out with
@@ -1253,6 +1252,7 @@ try
 		| Some file ->
 			Common.log com ("Generating xml : " ^ file);
 			Genxml.generate com file);
+		if com.platform = Java then List.iter (Codegen.promote_abstract_parameters com) com.types;
 		if com.platform = Flash || com.platform = Cpp then List.iter (Codegen.fix_overrides com) com.types;
 		if Common.defined com Define.Dump then Codegen.dump_types com;
 		if Common.defined com Define.DumpDependencies then Codegen.dump_dependencies com;

std/haxe/rtti/XmlParser.hx

@@ -186,6 +186,7 @@ class XmlParser {
 		for( i in 0...a.supers.length )
 			if( !TypeApi.typeEq(a.supers[i],a2.supers[i]) )
 				return false;
+		if (a2.impl != null) mergeClasses(a.impl, a2.impl);
 		a.platforms.add(curplatform);
 		return true;
 	}