Fix HideAccessTransformer

java-deobfuscator · Jul 29, 2020 · 127947a · 127947a
1 parent 8ab6965
commit 127947a
Showing 1 changed file with 53 additions and 48 deletions.
diff --git a/...javadeobfuscator/deobfuscator/transformers/stringer/HideAccessObfuscationTransformer.java b/...javadeobfuscator/deobfuscator/transformers/stringer/HideAccessObfuscationTransformer.java
@@ -589,52 +589,57 @@ private String getPrimitiveFromClass(String clazz) {
     }
 
     private class MyInterpreter extends BasicInterpreter
-	{
-		@Override
-	    public BasicValue newValue(final Type type)
-		{
-	        if(type == null)
-	            return new BasicValue(Type.getType("Ljava/lang/Object;"));
-	        switch(type.getSort())
-	        {
-	        	case Type.VOID:
-	        		return null;
-	        	case Type.BOOLEAN:
-	        	case Type.CHAR:
-	        	case Type.BYTE:
-	        	case Type.SHORT:
-	        	case Type.INT:
-	        		return BasicValue.INT_VALUE;
-	        	case Type.FLOAT:
-	        		return BasicValue.FLOAT_VALUE;
-	        	case Type.LONG:
-	        		return BasicValue.LONG_VALUE;
-	        	case Type.DOUBLE:
-	        		return BasicValue.DOUBLE_VALUE;
-	        	case Type.ARRAY:
-	        	case Type.OBJECT:
-	        		return new BasicValue(type);
-	        	default:
-	        		throw new Error("Internal error");
-	        }
-		}
-
-		@Override
-	    public BasicValue binaryOperation(final AbstractInsnNode insn,
-	    	final BasicValue value1, final BasicValue value2)
-	    		throws AnalyzerException
-		{
-			if(insn.getOpcode() == Opcodes.AALOAD)
-				return new BasicValue(value1.getType().getElementType());
-			return super.binaryOperation(insn, value1, value2);
-		}
-
-	    @Override
-	    public BasicValue merge(final BasicValue v, final BasicValue w)
-	    {
-	        if(!v.equals(w))
-	            return new BasicValue(Type.getType("Ljava/lang/Object;"));
-	        return v;
-	    }
-	}
+    {
+    	public MyInterpreter()
+    	{
+    		super(Opcodes.ASM8);
+    	}
+
+    	@Override
+    	public BasicValue newValue(final Type type)
+    	{
+    		if(type == null)
+    			return new BasicValue(Type.getType("Ljava/lang/Object;"));
+    		switch(type.getSort())
+    		{
+    			case Type.VOID:
+    				return null;
+    			case Type.BOOLEAN:
+    			case Type.CHAR:
+    			case Type.BYTE:
+    			case Type.SHORT:
+    			case Type.INT:
+    				return BasicValue.INT_VALUE;
+    			case Type.FLOAT:
+    				return BasicValue.FLOAT_VALUE;
+    			case Type.LONG:
+    				return BasicValue.LONG_VALUE;
+    			case Type.DOUBLE:
+    				return BasicValue.DOUBLE_VALUE;
+    			case Type.ARRAY:
+    			case Type.OBJECT:
+    				return new BasicValue(type);
+    			default:
+    				throw new Error("Internal error");
+    		}
+    	}
+
+    	@Override
+    	public BasicValue binaryOperation(final AbstractInsnNode insn,
+    		final BasicValue value1, final BasicValue value2)
+    			throws AnalyzerException
+    	{
+    		if(insn.getOpcode() == Opcodes.AALOAD)
+    			return new BasicValue(value1.getType().getElementType());
+    		return super.binaryOperation(insn, value1, value2);
+    	}
+
+    	@Override
+    	public BasicValue merge(final BasicValue v, final BasicValue w)
+    	{
+    		if(!v.equals(w))
+    			return new BasicValue(Type.getType("Ljava/lang/Object;"));
+    		return v;
+    	}
+    }
 }