Browse Source

[jvm] remove some class loader code that breaks everything

closes #9116
Simon Krajewski 5 years ago
parent
commit
0d206ab2c6
2 changed files with 2 additions and 12 deletions
  1. 0 10
      src/codegen/java.ml
  2. 2 2
      std/jvm/Enum.hx

+ 0 - 10
src/codegen/java.ml

@@ -176,15 +176,6 @@ let convert_constant ctx p const =
 		| ConstFloat f | ConstDouble f -> Some (EConst (Float (Printf.sprintf "%E" f)), p)
 		| _ -> None) None const
 
-let rec same_sig parent jsig =
-	match jsig with
-	| TObject (p,targs) -> parent = p || List.exists (function | TType (_,s) -> same_sig parent s | _ -> false) targs
-	| TObjectInner(p, ntargs) ->
-			parent = (p, String.concat "$" (List.map fst ntargs)) ||
-			List.exists (fun (_,targs) -> List.exists (function | TType(_,s) -> same_sig parent s | _ -> false) targs) ntargs
-	| TArray(s,_) -> same_sig parent s
-	| _ -> false
-
 let convert_constraints ctx p tl = match tl with
 	| [] -> None
 	| [t] -> Some (convert_signature ctx p t,null_pos)
@@ -197,7 +188,6 @@ let convert_param ctx p parent param =
 		| (name, None, implemem_sig) ->
 			name, implemem_sig
 		in
-		let constraints = List.map (fun s -> if same_sig parent s then (TObject( (["java";"lang"], "Object"), [])) else s) constraints in
 		{
 			tp_name = jname_to_hx name,null_pos;
 			tp_params = [];

+ 2 - 2
std/jvm/Enum.hx

@@ -26,12 +26,12 @@ import java.NativeArray;
 
 @:keep
 @:native('haxe.jvm.Enum')
-class Enum<T> extends java.lang.Enum<T> {
+class Enum<T:EnumValue> extends java.lang.Enum<T> {
 	@:nativeGen public function new(index:Int, name:String) {
 		super(name, index);
 	}
 
-	@:overload public function equals<T>(other:Enum<T>) {
+	@:overload public function equals<T:EnumValue>(other:Enum<T>) {
 		return super.equals(other);
 	}