gui: fix sync with editor

Add support for dx 1.8 library

.travis.yml

@@ -3,10 +3,18 @@ jdk:
     - oraclejdk7
     - openjdk7
     - openjdk6
+env:
+    - TERM=dumb
+
 before_install:
     - chmod +x gradlew
+
 script:
-    - TERM=dumb ./gradlew clean build dist
+    - ./gradlew clean build dist
+
+after_success:
+    - ./gradlew jacocoTestReport coveralls
+
 notifications:
     email:
         - skylot@gmail.com

README.md

@@ -1,24 +1,26 @@
-## JADX 
+## JADX
+
+[![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx)
+[![Build Status](https://drone.io/github.com/skylot/jadx/status.png)](https://drone.io/github.com/skylot/jadx/latest)
+[![Coverage Status](https://coveralls.io/repos/skylot/jadx/badge.png)](https://coveralls.io/r/skylot/jadx)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/2166/badge.svg)](https://scan.coverity.com/projects/2166)
+
 **jadx** - Dex to Java decompiler
 
 Command line and GUI tools for produce Java source code from Android Dex and Apk files
 
-Note: jadx-gui now in experimental stage
-
 
 ### Downloads
 - [unstable](https://drone.io/github.com/skylot/jadx/files)
-[![Build Status](https://drone.io/github.com/skylot/jadx/status.png)](https://drone.io/github.com/skylot/jadx/latest)
-[![Build Status](https://travis-ci.org/skylot/jadx.png?branch=master)](https://travis-ci.org/skylot/jadx)
 - from [github](https://github.com/skylot/jadx/releases)
-- from [sourceforge](http://sourceforge.net/projects/jadx/files/) 
+- from [sourceforge](http://sourceforge.net/projects/jadx/files/)
 
 
-### Building from source  
+### Building from source
     git clone https://github.com/skylot/jadx.git
     cd jadx
     ./gradlew dist
-    
+
 (on Windows, use `gradlew.bat` instead of `./gradlew`)
 
 Scripts for run jadx will be placed in `build/jadx/bin`
@@ -51,4 +53,4 @@ Example:
 
 *Licensed under the Apache 2.0 License*
 
-*Copyright 2013 by Skylot*
+*Copyright 2014 by Skylot*

build.gradle

@@ -1,41 +1,63 @@
 ext.jadxVersion = file('version').readLines().get(0)
+version = jadxVersion
 
 apply plugin: 'sonar-runner'
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'idea'
-    apply plugin: 'eclipse'
-
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
+    apply plugin: 'groovy'
+    apply plugin: 'jacoco'
+    apply plugin: 'coveralls'
 
     version = jadxVersion
 
-    gradle.projectsEvaluated {
-        tasks.withType(Compile) {
-            if (!"${it}".contains(":jadx-samples:")) {
-                options.compilerArgs << "-Xlint" << "-Xlint:unchecked" << "-Xlint:deprecation"
-            }
+    tasks.withType(JavaCompile) {
+        sourceCompatibility = JavaVersion.VERSION_1_6
+        targetCompatibility = JavaVersion.VERSION_1_6
+
+        if (!"$it".contains(':jadx-samples:')) {
+            options.compilerArgs << '-Xlint' << '-Xlint:unchecked' << '-Xlint:deprecation'
         }
     }
 
     jar {
         version = jadxVersion
         manifest {
-            mainAttributes('jadx-version' : jadxVersion)
+            mainAttributes('jadx-version': jadxVersion)
         }
     }
 
     dependencies {
-        compile 'org.slf4j:slf4j-api:1.7.5'
+        compile 'org.slf4j:slf4j-api:1.7.7'
+
+        testCompile 'ch.qos.logback:logback-classic:1.1.2'
         testCompile 'junit:junit:4.11'
-        testCompile "org.mockito:mockito-core:1.9.5"
+        testCompile 'org.mockito:mockito-core:1.9.5'
+        testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
+        testCompile 'cglib:cglib-nodep:3.1'
     }
 
     repositories {
         mavenCentral()
     }
+
+    jacocoTestReport {
+        reports {
+            xml.enabled = true // coveralls plugin depends on xml format report
+            html.enabled = true
+        }
+    }
+}
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        // setup coveralls (http://coveralls.io/) see http://github.com/kt3k/coveralls-gradle-plugin
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.4.0'
+    }
 }
 
 task copyArtifacts(type: Sync, dependsOn: ['jadx-cli:installApp', 'jadx-gui:installApp']) {
@@ -66,5 +88,5 @@ task clean(type: Delete) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.9'
+    gradleVersion = '1.12'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

jadx-cli/build.gradle

@@ -5,7 +5,8 @@ applicationName = 'jadx'
 
 dependencies {
     compile(project(':jadx-core'))
-    compile 'com.beust:jcommander:1.30'
+    compile 'com.beust:jcommander:1.35'
+    compile 'ch.qos.logback:logback-classic:1.1.2'
 }
 
 startScripts {

jadx-cli/src/main/java/jadx/cli/JadxCLI.java

@@ -1,6 +1,6 @@
 package jadx.cli;
 
-import jadx.api.Decompiler;
+import jadx.api.JadxDecompiler;
 import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.exceptions.JadxException;
 
@@ -14,37 +14,41 @@ public class JadxCLI {
 
 	public static void main(String[] args) {
 		try {
-			JadxCLIArgs jadxArgs = new JadxCLIArgs(args);
-			checkArgs(jadxArgs);
-			processAndSave(jadxArgs);
-		} catch (Exception e) {
+			JadxCLIArgs jadxArgs = new JadxCLIArgs();
+			if (processArgs(jadxArgs, args)) {
+				processAndSave(jadxArgs);
+			}
+		} catch (JadxException e) {
 			LOG.error(e.getMessage());
 			System.exit(1);
 		}
 	}
 
-	private static void processAndSave(JadxCLIArgs jadxArgs) {
+	static void processAndSave(JadxCLIArgs jadxArgs) throws JadxException {
 		try {
-			Decompiler jadx = new Decompiler(jadxArgs);
+			JadxDecompiler jadx = new JadxDecompiler(jadxArgs);
 			jadx.loadFiles(jadxArgs.getInput());
 			jadx.setOutputDir(jadxArgs.getOutDir());
 			jadx.save();
-			LOG.info("done");
 		} catch (Throwable e) {
-			LOG.error("jadx error:", e);
+			throw new JadxException("jadx error: " + e.getMessage(), e);
 		}
-		int errorsCount = ErrorsCounter.getErrorCount();
-		if (errorsCount != 0) {
+		if (ErrorsCounter.getErrorCount() != 0) {
 			ErrorsCounter.printReport();
+			throw new JadxException("finished with errors");
 		}
-		System.exit(errorsCount);
+		LOG.info("done");
+
 	}
 
-	private static void checkArgs(JadxCLIArgs jadxArgs) throws JadxException {
+	static boolean processArgs(JadxCLIArgs jadxArgs, String[] args) throws JadxException {
+		if (!jadxArgs.processArgs(args)) {
+			return false;
+		}
 		if (jadxArgs.getInput().isEmpty()) {
 			LOG.error("Please specify input file");
 			jadxArgs.printUsage();
-			System.exit(1);
+			return false;
 		}
 		File outputDir = jadxArgs.getOutDir();
 		if (outputDir == null) {
@@ -64,5 +68,6 @@ public class JadxCLI {
 		if (outputDir.exists() && !outputDir.isDirectory()) {
 			throw new JadxException("Output directory exists as file " + outputDir);
 		}
+		return true;
 	}
 }

jadx-cli/src/main/java/jadx/cli/JadxCLIArgs.java

@@ -47,46 +47,46 @@ public final class JadxCLIArgs implements IJadxArgs {
 	private final List<File> input = new ArrayList<File>(1);
 	private File outputDir;
 
-	public JadxCLIArgs(String[] args) {
-		parse(args);
-		processArgs();
+	public boolean processArgs(String[] args) {
+		return parse(args) && process();
 	}
 
-	private void parse(String[] args) {
+	private boolean parse(String[] args) {
 		try {
 			new JCommander(this, args);
+			return true;
 		} catch (ParameterException e) {
 			System.err.println("Arguments parse error: " + e.getMessage());
 			printUsage();
-			System.exit(1);
+			return false;
 		}
 	}
 
-	public void processArgs() {
+	private boolean process() {
 		if (isPrintHelp()) {
 			printUsage();
-			System.exit(0);
+			return false;
 		}
 		try {
-			if (threadsCount <= 0)
+			if (threadsCount <= 0) {
 				throw new JadxException("Threads count must be positive");
-
+			}
 			if (files != null) {
 				for (String fileName : files) {
 					File file = new File(fileName);
-					if (file.exists())
+					if (file.exists()) {
 						input.add(file);
-					else
+					} else {
 						throw new JadxException("File not found: " + file);
+					}
 				}
 			}
-
-			if (input.size() > 1)
+			if (input.size() > 1) {
 				throw new JadxException("Only one input file is supported");
-
-			if (outDirName != null)
+			}
+			if (outDirName != null) {
 				outputDir = new File(outDirName);
-
+			}
 			if (isVerbose()) {
 				ch.qos.logback.classic.Logger rootLogger =
 						(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
@@ -95,8 +95,9 @@ public final class JadxCLIArgs implements IJadxArgs {
 		} catch (JadxException e) {
 			System.err.println("ERROR: " + e.getMessage());
 			printUsage();
-			System.exit(1);
+			return false;
 		}
+		return true;
 	}
 
 	public void printUsage() {
@@ -114,8 +115,9 @@ public final class JadxCLIArgs implements IJadxArgs {
 		int maxNamesLen = 0;
 		for (ParameterDescription p : params) {
 			int len = p.getNames().length();
-			if (len > maxNamesLen)
+			if (len > maxNamesLen) {
 				maxNamesLen = len;
+			}
 		}
 
 		Field[] fields = this.getClass().getDeclaredFields();
@@ -137,8 +139,9 @@ public final class JadxCLIArgs implements IJadxArgs {
 	}
 
 	private static void addSpaces(StringBuilder str, int count) {
-		for (int i = 0; i < count; i++)
+		for (int i = 0; i < count; i++) {
 			str.append(' ');
+		}
 	}
 
 	public List<File> getInput() {

jadx-core/build.gradle

@@ -1,9 +1,12 @@
 ext.jadxClasspath = 'clsp-data/android-4.3.jar'
 
 dependencies {
-    compile 'com.google.android.tools:dx:1.7'
-    compile 'ch.qos.logback:logback-classic:1.0.13'
-
+    compile files('lib/dx-1.8.jar')
     runtime files(jadxClasspath)
 }
 
+task packTests(type: Jar) {
+    classifier = 'tests'
+    from sourceSets.test.output
+}
+

jadx-core/src/main/java/jadx/api/CodePosition.java

@@ -0,0 +1,58 @@
+package jadx.api;
+
+public final class CodePosition {
+
+	private final JavaClass cls;
+	private final int line;
+	private final int offset;
+
+	public CodePosition(JavaClass cls, int line, int offset) {
+		this.cls = cls;
+		this.line = line;
+		this.offset = offset;
+	}
+
+	public CodePosition(int line, int offset) {
+		this.cls = null;
+		this.line = line;
+		this.offset = offset;
+	}
+
+	public JavaClass getJavaClass() {
+		return cls;
+	}
+
+	public int getLine() {
+		return line;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+
+	public boolean isSet() {
+		return line != 0 || offset != 0;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		CodePosition that = (CodePosition) o;
+		return line == that.line && offset == that.offset;
+	}
+
+	@Override
+	public int hashCode() {
+		return line + 31 * offset;
+	}
+
+	@Override
+	public String toString() {
+		return line + ":" + offset + (cls != null ? " " + cls : "");
+	}
+}

jadx-core/src/main/java/jadx/api/JadxDecompiler.java

@@ -8,15 +8,14 @@ import jadx.core.dex.nodes.RootNode;
 import jadx.core.dex.visitors.IDexTreeVisitor;
 import jadx.core.dex.visitors.SaveCode;
 import jadx.core.utils.ErrorsCounter;
-import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.DecodeException;
+import jadx.core.utils.exceptions.JadxException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 import jadx.core.utils.files.InputFile;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -24,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
@@ -33,7 +31,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Jadx API usage example:
  * <pre><code>
- *  Decompiler jadx = new Decompiler();
+ *  JadxDecompiler jadx = new JadxDecompiler();
  *  jadx.loadFile(new File("classes.dex"));
  *  jadx.setOutputDir(new File("out"));
  *  jadx.save();
@@ -46,8 +44,8 @@ import org.slf4j.LoggerFactory;
  *  }
  * </code></pre>
  */
-public final class Decompiler {
-	private static final Logger LOG = LoggerFactory.getLogger(Decompiler.class);
+public final class JadxDecompiler {
+	private static final Logger LOG = LoggerFactory.getLogger(JadxDecompiler.class);
 
 	private final IJadxArgs args;
 	private final List<InputFile> inputFiles = new ArrayList<InputFile>();
@@ -56,13 +54,14 @@ public final class Decompiler {
 
 	private RootNode root;
 	private List<IDexTreeVisitor> passes;
+	private List<JavaClass> classes;
 
-	public Decompiler() {
+	public JadxDecompiler() {
 		this.args = new DefaultJadxArgs();
 		init();
 	}
 
-	public Decompiler(IJadxArgs jadxArgs) {
+	public JadxDecompiler(IJadxArgs jadxArgs) {
 		this.args = jadxArgs;
 		init();
 	}
@@ -73,23 +72,34 @@ public final class Decompiler {
 	}
 
 	void init() {
+		reset();
 		if (outDir == null) {
 			outDir = new File("jadx-output");
 		}
 		this.passes = Jadx.getPassesList(args, outDir);
 	}
 
-	public void loadFile(File file) throws IOException, DecodeException {
-		loadFiles(Arrays.asList(file));
+	void reset() {
+		ClassInfo.clearCache();
+		ErrorsCounter.reset();
+		classes = null;
 	}
 
-	public void loadFiles(List<File> files) throws IOException, DecodeException {
+	public void loadFile(File file) throws JadxException {
+		loadFiles(Collections.singletonList(file));
+	}
+
+	public void loadFiles(List<File> files) throws JadxException {
 		if (files.isEmpty()) {
-			throw new JadxRuntimeException("Empty file list");
+			throw new JadxException("Empty file list");
 		}
 		inputFiles.clear();
 		for (File file : files) {
-			inputFiles.add(new InputFile(file));
+			try {
+				inputFiles.add(new InputFile(file));
+			} catch (IOException e) {
+				throw new JadxException("Error load file: " + file, e);
+			}
 		}
 		parse();
 	}
@@ -97,54 +107,56 @@ public final class Decompiler {
 	public void save() {
 		try {
 			ExecutorService ex = getSaveExecutor();
+			ex.shutdown();
 			ex.awaitTermination(1, TimeUnit.DAYS);
 		} catch (InterruptedException e) {
-			LOG.error("Save interrupted", e);
+			throw new JadxRuntimeException("Save interrupted", e);
 		}
 	}
 
-	public ThreadPoolExecutor getSaveExecutor() {
+	public ExecutorService getSaveExecutor() {
 		if (root == null) {
 			throw new JadxRuntimeException("No loaded files");
 		}
 		int threadsCount = args.getThreadsCount();
 		LOG.debug("processing threads count: {}", threadsCount);
 
-		ArrayList<IDexTreeVisitor> passList = new ArrayList<IDexTreeVisitor>(passes);
-		SaveCode savePass = new SaveCode(outDir, args);
-		passList.add(savePass);
-
 		LOG.info("processing ...");
-		ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(threadsCount);
-		for (ClassNode cls : root.getClasses(false)) {
-			if (cls.getCode() == null) {
-				ProcessClass job = new ProcessClass(cls, passList);
-				executor.execute(job);
-			} else {
-				try {
-					savePass.visit(cls);
-				} catch (CodegenException e) {
-					LOG.error("Can't save class {}", cls, e);
+		ExecutorService executor = Executors.newFixedThreadPool(threadsCount);
+		for (final JavaClass cls : getClasses()) {
+			executor.execute(new Runnable() {
+				@Override
+				public void run() {
+					cls.decompile();
+					SaveCode.save(outDir, args, cls.getClassNode());
 				}
-			}
+			});
 		}
-		executor.shutdown();
 		return executor;
 	}
 
 	public List<JavaClass> getClasses() {
-		List<ClassNode> classNodeList = root.getClasses(false);
-		List<JavaClass> classes = new ArrayList<JavaClass>(classNodeList.size());
-		for (ClassNode classNode : classNodeList) {
-			classes.add(new JavaClass(this, classNode));
+		if (root == null) {
+			return Collections.emptyList();
 		}
-		return Collections.unmodifiableList(classes);
+		if (classes == null) {
+			List<ClassNode> classNodeList = root.getClasses(false);
+			List<JavaClass> clsList = new ArrayList<JavaClass>(classNodeList.size());
+			for (ClassNode classNode : classNodeList) {
+				clsList.add(new JavaClass(classNode, this));
+			}
+			classes = Collections.unmodifiableList(clsList);
+		}
+		return classes;
 	}
 
 	public List<JavaPackage> getPackages() {
-		List<JavaClass> classes = getClasses();
+		List<JavaClass> classList = getClasses();
+		if (classList.isEmpty()) {
+			return Collections.emptyList();
+		}
 		Map<String, List<JavaClass>> map = new HashMap<String, List<JavaClass>>();
-		for (JavaClass javaClass : classes) {
+		for (JavaClass javaClass : classList) {
 			String pkg = javaClass.getPackage();
 			List<JavaClass> clsList = map.get(pkg);
 			if (clsList == null) {
@@ -162,7 +174,7 @@ public final class Decompiler {
 			Collections.sort(pkg.getClasses(), new Comparator<JavaClass>() {
 				@Override
 				public int compare(JavaClass o1, JavaClass o2) {
-					return o1.getShortName().compareTo(o2.getShortName());
+					return o1.getName().compareTo(o2.getName());
 				}
 			});
 		}
@@ -174,25 +186,34 @@ public final class Decompiler {
 	}
 
 	void parse() throws DecodeException {
-		ClassInfo.clearCache();
-		ErrorsCounter.reset();
-
+		reset();
 		root = new RootNode();
 		LOG.info("loading ...");
 		root.load(inputFiles);
 	}
 
 	void processClass(ClassNode cls) {
-		try {
-			ProcessClass job = new ProcessClass(cls, passes);
-			LOG.info("processing class {} ...", cls);
-			job.run();
-		} catch (Throwable e) {
-			LOG.error("Process class error", e);
-		}
+		ProcessClass.process(cls, passes);
 	}
 
 	RootNode getRoot() {
 		return root;
 	}
+
+	JavaClass findJavaClass(ClassNode cls) {
+		if (cls == null) {
+			return null;
+		}
+		for (JavaClass javaClass : getClasses()) {
+			if (javaClass.getClassNode().equals(cls)) {
+				return javaClass;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String toString() {
+		return "jadx decompiler";
+	}
 }

jadx-core/src/main/java/jadx/api/JavaClass.java

@@ -1,6 +1,8 @@
 package jadx.api;
 
 import jadx.core.codegen.CodeWriter;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.FieldNode;
@@ -10,49 +12,90 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
-public final class JavaClass {
+public final class JavaClass implements JavaNode {
 
-	private final Decompiler decompiler;
+	private final JadxDecompiler decompiler;
 	private final ClassNode cls;
-	private final List<JavaClass> innerClasses;
-	private final List<JavaField> fields;
-	private final List<JavaMethod> methods;
+	private final JavaClass parent;
 
-	JavaClass(Decompiler decompiler, ClassNode classNode) {
+	private List<JavaClass> innerClasses = Collections.emptyList();
+	private List<JavaField> fields = Collections.emptyList();
+	private List<JavaMethod> methods = Collections.emptyList();
+
+	JavaClass(ClassNode classNode, JadxDecompiler decompiler) {
 		this.decompiler = decompiler;
 		this.cls = classNode;
+		this.parent = null;
+	}
 
+	/**
+	 * Inner classes constructor
+	 */
+	JavaClass(ClassNode classNode, JavaClass parent) {
+		this.decompiler = null;
+		this.cls = classNode;
+		this.parent = parent;
+	}
+
+	public String getCode() {
+		CodeWriter code = cls.getCode();
+		if (code == null) {
+			decompile();
+			code = cls.getCode();
+		}
+		if (code == null) {
+			return "";
+		}
+		return code.toString();
+	}
+
+	public void decompile() {
+		if (decompiler == null) {
+			return;
+		}
+		if (cls.getCode() == null) {
+			decompiler.processClass(cls);
+			load();
+		}
+	}
+
+	ClassNode getClassNode() {
+		return cls;
+	}
+
+	private void load() {
 		int inClsCount = cls.getInnerClasses().size();
-		if (inClsCount == 0) {
-			this.innerClasses = Collections.emptyList();
-		} else {
+		if (inClsCount != 0) {
 			List<JavaClass> list = new ArrayList<JavaClass>(inClsCount);
 			for (ClassNode inner : cls.getInnerClasses()) {
-				list.add(new JavaClass(decompiler, inner));
+				if (!inner.contains(AFlag.DONT_GENERATE)) {
+					JavaClass javaClass = new JavaClass(inner, this);
+					javaClass.load();
+					list.add(javaClass);
+				}
 			}
 			this.innerClasses = Collections.unmodifiableList(list);
 		}
 
 		int fieldsCount = cls.getFields().size();
-		if (fieldsCount == 0) {
-			this.fields = Collections.emptyList();
-		} else {
+		if (fieldsCount != 0) {
 			List<JavaField> flds = new ArrayList<JavaField>(fieldsCount);
 			for (FieldNode f : cls.getFields()) {
-				flds.add(new JavaField(f));
+				if (!f.contains(AFlag.DONT_GENERATE)) {
+					flds.add(new JavaField(f, this));
+				}
 			}
 			this.fields = Collections.unmodifiableList(flds);
 		}
 
 		int methodsCount = cls.getMethods().size();
-		if (methodsCount == 0) {
-			this.methods = Collections.emptyList();
-		} else {
+		if (methodsCount != 0) {
 			List<JavaMethod> mths = new ArrayList<JavaMethod>(methodsCount);
 			for (MethodNode m : cls.getMethods()) {
-				if (!m.getAccessFlags().isSynthetic()) {
-					mths.add(new JavaMethod(m));
+				if (!m.contains(AFlag.DONT_GENERATE)) {
+					mths.add(new JavaMethod(this, m));
 				}
 			}
 			Collections.sort(mths, new Comparator<JavaMethod>() {
@@ -65,49 +108,97 @@ public final class JavaClass {
 		}
 	}
 
-	public String getCode() {
-		CodeWriter code = cls.getCode();
-		if (code == null) {
-			decompiler.processClass(cls);
-			code = cls.getCode();
-		}
-		return code != null ? code.toString() : "error processing class";
+	private Map<CodePosition, Object> getCodeAnnotations() {
+		decompile();
+		return cls.getCode().getAnnotations();
 	}
 
+	public CodePosition getDefinitionPosition(int line, int offset) {
+		Map<CodePosition, Object> map = getCodeAnnotations();
+		Object obj = map.get(new CodePosition(line, offset));
+		if (obj instanceof LineAttrNode) {
+			ClassNode clsNode = null;
+			if (obj instanceof ClassNode) {
+				clsNode = (ClassNode) obj;
+			} else if (obj instanceof MethodNode) {
+				clsNode = ((MethodNode) obj).getParentClass();
+			} else if (obj instanceof FieldNode) {
+				clsNode = ((FieldNode) obj).getParentClass();
+			}
+			if (clsNode == null) {
+				return null;
+			}
+			clsNode = clsNode.getParentClass();
+			JavaClass jCls = decompiler.findJavaClass(clsNode);
+			if (jCls == null) {
+				return null;
+			}
+			jCls.decompile();
+			int defLine = ((LineAttrNode) obj).getDecompiledLine();
+			return new CodePosition(jCls, defLine, 0);
+		}
+		return null;
+	}
+
+	public Integer getSourceLine(int decompiledLine) {
+		decompile();
+		return cls.getCode().getLineMapping().get(decompiledLine);
+	}
+
+	@Override
+	public String getName() {
+		return cls.getShortName();
+	}
+
+	@Override
 	public String getFullName() {
 		return cls.getFullName();
 	}
 
-	public String getShortName() {
-		return cls.getShortName();
-	}
-
 	public String getPackage() {
 		return cls.getPackage();
 	}
 
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
+	}
+
 	public AccessInfo getAccessInfo() {
 		return cls.getAccessFlags();
 	}
 
 	public List<JavaClass> getInnerClasses() {
+		decompile();
 		return innerClasses;
 	}
 
 	public List<JavaField> getFields() {
+		decompile();
 		return fields;
 	}
 
 	public List<JavaMethod> getMethods() {
+		decompile();
 		return methods;
 	}
 
+	public int getDecompiledLine() {
+		return cls.getDecompiledLine();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return this == o || o instanceof JavaClass && cls.equals(((JavaClass) o).cls);
+	}
+
+	@Override
+	public int hashCode() {
+		return cls.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return getFullName();
 	}
-
-	public int getDecompiledLine() {
-		return cls.getDecompiledLine();
-	}
 }

jadx-core/src/main/java/jadx/api/JavaField.java

@@ -4,18 +4,31 @@ import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.FieldNode;
 
-public final class JavaField {
+public final class JavaField implements JavaNode {
 
 	private final FieldNode field;
+	private final JavaClass parent;
 
-	public JavaField(FieldNode f) {
+	JavaField(FieldNode f, JavaClass cls) {
 		this.field = f;
+		this.parent = cls;
 	}
 
+	@Override
 	public String getName() {
 		return field.getName();
 	}
 
+	@Override
+	public String getFullName() {
+		return parent.getFullName() + "." + field.getName();
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
+	}
+
 	public AccessInfo getAccessFlags() {
 		return field.getAccessFlags();
 	}

jadx-core/src/main/java/jadx/api/JavaMethod.java

@@ -1,27 +1,33 @@
 package jadx.api;
 
 import jadx.core.dex.info.AccessInfo;
-import jadx.core.dex.info.MethodInfo;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.MethodNode;
 
 import java.util.List;
 
-public final class JavaMethod {
+public final class JavaMethod implements JavaNode {
 	private final MethodNode mth;
+	private final JavaClass parent;
 
-	public JavaMethod(MethodNode m) {
+	JavaMethod(JavaClass cls, MethodNode m) {
+		this.parent = cls;
 		this.mth = m;
 	}
 
+	@Override
 	public String getName() {
-		MethodInfo mi = mth.getMethodInfo();
-		if (mi.isConstructor()) {
-			return mth.getParentClass().getShortName();
-		} else if (mi.isClassInit()) {
-			return "static";
-		}
-		return mi.getName();
+		return mth.getName();
+	}
+
+	@Override
+	public String getFullName() {
+		return mth.getMethodInfo().getFullName();
+	}
+
+	@Override
+	public JavaClass getDeclaringClass() {
+		return parent;
 	}
 
 	public AccessInfo getAccessFlags() {

jadx-core/src/main/java/jadx/api/JavaNode.java

@@ -0,0 +1,10 @@
+package jadx.api;
+
+public interface JavaNode {
+
+	String getName();
+
+	String getFullName();
+
+	JavaClass getDeclaringClass();
+}

jadx-core/src/main/java/jadx/api/JavaPackage.java

@@ -2,7 +2,7 @@ package jadx.api;
 
 import java.util.List;
 
-public final class JavaPackage implements Comparable<JavaPackage> {
+public final class JavaPackage implements JavaNode, Comparable<JavaPackage> {
 	private final String name;
 	private final List<JavaClass> classes;
 
@@ -11,14 +11,26 @@ public final class JavaPackage implements Comparable<JavaPackage> {
 		this.classes = classes;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
+	public String getFullName() {
+		// TODO: store full package name
+		return name;
+	}
+
 	public List<JavaClass> getClasses() {
 		return classes;
 	}
 
+	@Override
+	public JavaClass getDeclaringClass() {
+		return null;
+	}
+
 	@Override
 	public int compareTo(JavaPackage o) {
 		return name.compareTo(o.name);
@@ -26,11 +38,14 @@ public final class JavaPackage implements Comparable<JavaPackage> {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		JavaPackage that = (JavaPackage) o;
-		if (!name.equals(that.name)) return false;
-		return true;
+		return name.equals(that.name);
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/Consts.java

@@ -21,4 +21,6 @@ public class Consts {
 
 	public static final String DEFAULT_PACKAGE_NAME = "defpackage";
 	public static final String ANONYMOUS_CLASS_PREFIX = "AnonymousClass_";
+
+	public static final String MTH_TOSTRING_SIGNATURE = "toString()Ljava/lang/String;";
 }

jadx-core/src/main/java/jadx/core/Jadx.java

@@ -6,24 +6,27 @@ import jadx.core.dex.visitors.BlockMakerVisitor;
 import jadx.core.dex.visitors.ClassModifier;
 import jadx.core.dex.visitors.CodeShrinker;
 import jadx.core.dex.visitors.ConstInlinerVisitor;
+import jadx.core.dex.visitors.DebugInfoVisitor;
 import jadx.core.dex.visitors.DotGraphVisitor;
 import jadx.core.dex.visitors.EnumVisitor;
 import jadx.core.dex.visitors.FallbackModeVisitor;
 import jadx.core.dex.visitors.IDexTreeVisitor;
-import jadx.core.dex.visitors.MethodInlinerVisitor;
+import jadx.core.dex.visitors.MethodInlineVisitor;
 import jadx.core.dex.visitors.ModVisitor;
+import jadx.core.dex.visitors.PrepareForCodeGen;
 import jadx.core.dex.visitors.SimplifyVisitor;
 import jadx.core.dex.visitors.regions.CheckRegions;
-import jadx.core.dex.visitors.regions.CleanRegions;
-import jadx.core.dex.visitors.regions.PostRegionVisitor;
+import jadx.core.dex.visitors.regions.IfRegionVisitor;
 import jadx.core.dex.visitors.regions.ProcessVariables;
 import jadx.core.dex.visitors.regions.RegionMakerVisitor;
-import jadx.core.dex.visitors.typeresolver.FinishTypeResolver;
-import jadx.core.dex.visitors.typeresolver.TypeResolver;
+import jadx.core.dex.visitors.regions.ReturnVisitor;
+import jadx.core.dex.visitors.ssa.EliminatePhiNodes;
+import jadx.core.dex.visitors.ssa.SSATransform;
+import jadx.core.dex.visitors.typeinference.FinishTypeInference;
+import jadx.core.dex.visitors.typeinference.TypeInference;
 import jadx.core.utils.Utils;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -37,10 +40,12 @@ public class Jadx {
 	private static final Logger LOG = LoggerFactory.getLogger(Jadx.class);
 
 	static {
-		if (Consts.DEBUG)
+		if (Consts.DEBUG) {
 			LOG.info("debug enabled");
-		if (Jadx.class.desiredAssertionStatus())
+		}
+		if (Jadx.class.desiredAssertionStatus()) {
 			LOG.info("assertions enabled");
+		}
 	}
 
 	public static List<IDexTreeVisitor> getPassesList(IJadxArgs args, File outDir) {
@@ -49,34 +54,43 @@ public class Jadx {
 			passes.add(new FallbackModeVisitor());
 		} else {
 			passes.add(new BlockMakerVisitor());
-
-			passes.add(new TypeResolver());
-
-			if (args.isRawCFGOutput())
-				passes.add(new DotGraphVisitor(outDir, false, true));
+			passes.add(new SSATransform());
+			passes.add(new DebugInfoVisitor());
+			passes.add(new TypeInference());
 
 			passes.add(new ConstInlinerVisitor());
-			passes.add(new FinishTypeResolver());
+			passes.add(new FinishTypeInference());
+
+			if (args.isRawCFGOutput()) {
+				passes.add(new DotGraphVisitor(outDir, false, true));
+			}
+
+			passes.add(new EliminatePhiNodes());
 
 			passes.add(new ModVisitor());
 			passes.add(new EnumVisitor());
 
-			if (args.isCFGOutput())
-				passes.add(new DotGraphVisitor(outDir, false));
-
+			passes.add(new CodeShrinker());
 			passes.add(new RegionMakerVisitor());
-			passes.add(new PostRegionVisitor());
+			passes.add(new IfRegionVisitor());
+			passes.add(new ReturnVisitor());
 
 			passes.add(new CodeShrinker());
 			passes.add(new SimplifyVisitor());
 			passes.add(new ProcessVariables());
 			passes.add(new CheckRegions());
-			if (args.isCFGOutput())
-				passes.add(new DotGraphVisitor(outDir, true));
 
-			passes.add(new MethodInlinerVisitor());
+			if (args.isCFGOutput()) {
+				passes.add(new DotGraphVisitor(outDir, true));
+			}
+
+			passes.add(new MethodInlineVisitor());
 			passes.add(new ClassModifier());
-			passes.add(new CleanRegions());
+			passes.add(new PrepareForCodeGen());
+
+			if (args.isCFGOutput()) {
+				passes.add(new DotGraphVisitor(outDir, false));
+			}
 		}
 		passes.add(new CodeGen(args));
 		return passes;
@@ -84,14 +98,18 @@ public class Jadx {
 
 	public static String getVersion() {
 		try {
-			Enumeration<URL> resources = Utils.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
-			while (resources.hasMoreElements()) {
-				Manifest manifest = new Manifest(resources.nextElement().openStream());
-				String ver = manifest.getMainAttributes().getValue("jadx-version");
-				if (ver != null)
-					return ver;
+			ClassLoader classLoader = Utils.class.getClassLoader();
+			if (classLoader != null) {
+				Enumeration<URL> resources = classLoader.getResources("META-INF/MANIFEST.MF");
+				while (resources.hasMoreElements()) {
+					Manifest manifest = new Manifest(resources.nextElement().openStream());
+					String ver = manifest.getMainAttributes().getValue("jadx-version");
+					if (ver != null) {
+						return ver;
+					}
+				}
 			}
-		} catch (IOException e) {
+		} catch (Exception e) {
 			LOG.error("Can't get manifest file", e);
 		}
 		return "dev";

jadx-core/src/main/java/jadx/core/ProcessClass.java

@@ -1,35 +1,28 @@
 package jadx.core;
 
 import jadx.core.dex.nodes.ClassNode;
-import jadx.core.dex.visitors.DepthTraverser;
+import jadx.core.dex.visitors.DepthTraversal;
 import jadx.core.dex.visitors.IDexTreeVisitor;
-import jadx.core.utils.exceptions.DecodeException;
 
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class ProcessClass implements Runnable {
+public final class ProcessClass {
 	private static final Logger LOG = LoggerFactory.getLogger(ProcessClass.class);
 
-	private final ClassNode cls;
-	private final List<IDexTreeVisitor> passes;
-
-	public ProcessClass(ClassNode cls, List<IDexTreeVisitor> passes) {
-		this.cls = cls;
-		this.passes = passes;
+	private ProcessClass() {
 	}
 
-	@Override
-	public void run() {
+	public static void process(ClassNode cls, List<IDexTreeVisitor> passes) {
 		try {
 			cls.load();
 			for (IDexTreeVisitor visitor : passes) {
-				DepthTraverser.visit(visitor, cls);
+				DepthTraversal.visit(visitor, cls);
 			}
-		} catch (DecodeException e) {
-			LOG.error("Decode exception: " + cls, e);
+		} catch (Exception e) {
+			LOG.error("Class process exception: " + cls, e);
 		} finally {
 			cls.unload();
 		}

jadx-core/src/main/java/jadx/core/clsp/ClsSet.java

@@ -65,6 +65,9 @@ public class ClsSet {
 		for (ClassNode cls : list) {
 			if (cls.getAccessFlags().isPublic()) {
 				NClass nClass = getCls(cls.getRawName(), names);
+				if (nClass == null) {
+					throw new JadxRuntimeException("Missing class: " + cls);
+				}
 				nClass.setParents(makeParentsArray(cls, names));
 				classes[k] = nClass;
 				k++;
@@ -102,40 +105,47 @@ public class ClsSet {
 		Utils.makeDirsForFile(output);
 
 		BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(output));
-		String outputName = output.getName();
-		if (outputName.endsWith(CLST_EXTENSION)) {
-			save(outputStream);
-		} else if (outputName.endsWith(".jar")) {
-			ZipOutputStream out = new ZipOutputStream(outputStream);
-			try {
-				out.putNextEntry(new ZipEntry(CLST_PKG_PATH + "/" + CLST_FILENAME));
-				save(out);
-				out.closeEntry();
-			} finally {
-				out.close();
-				outputStream.close();
+		try {
+			String outputName = output.getName();
+			if (outputName.endsWith(CLST_EXTENSION)) {
+				save(outputStream);
+			} else if (outputName.endsWith(".jar")) {
+				ZipOutputStream out = new ZipOutputStream(outputStream);
+				try {
+					out.putNextEntry(new ZipEntry(CLST_PKG_PATH + "/" + CLST_FILENAME));
+					save(out);
+					out.closeEntry();
+				} finally {
+					out.close();
+				}
+			} else {
+				throw new JadxRuntimeException("Unknown file format: " + outputName);
 			}
-		} else {
-			throw new JadxRuntimeException("Unknown file format: " + outputName);
+		} finally {
+			outputStream.close();
 		}
 	}
 
 	public void save(OutputStream output) throws IOException {
 		DataOutputStream out = new DataOutputStream(output);
-		out.writeBytes(JADX_CLS_SET_HEADER);
-		out.writeByte(VERSION);
+		try {
+			out.writeBytes(JADX_CLS_SET_HEADER);
+			out.writeByte(VERSION);
 
-		LOG.info("Classes count: " + classes.length);
-		out.writeInt(classes.length);
-		for (NClass cls : classes) {
-			writeString(out, cls.getName());
-		}
-		for (NClass cls : classes) {
-			NClass[] parents = cls.getParents();
-			out.writeByte(parents.length);
-			for (NClass parent : parents) {
-				out.writeInt(parent.getId());
+			LOG.info("Classes count: " + classes.length);
+			out.writeInt(classes.length);
+			for (NClass cls : classes) {
+				writeString(out, cls.getName());
 			}
+			for (NClass cls : classes) {
+				NClass[] parents = cls.getParents();
+				out.writeByte(parents.length);
+				for (NClass parent : parents) {
+					out.writeInt(parent.getId());
+				}
+			}
+		} finally {
+			out.close();
 		}
 	}
 
@@ -144,55 +154,67 @@ public class ClsSet {
 		if (input == null) {
 			throw new JadxRuntimeException("Can't load classpath file: " + CLST_FILENAME);
 		}
-		load(input);
+		try {
+			load(input);
+		} finally {
+			input.close();
+		}
 	}
 
 	public void load(File input) throws IOException, DecodeException {
 		String name = input.getName();
 		InputStream inputStream = new FileInputStream(input);
-		if (name.endsWith(CLST_EXTENSION)) {
-			load(inputStream);
-		} else if (name.endsWith(".jar")) {
-			ZipInputStream in = new ZipInputStream(inputStream);
-			try {
-				ZipEntry entry = in.getNextEntry();
-				while (entry != null) {
-					if (entry.getName().endsWith(CLST_EXTENSION)) {
-						load(in);
+		try {
+			if (name.endsWith(CLST_EXTENSION)) {
+				load(inputStream);
+			} else if (name.endsWith(".jar")) {
+				ZipInputStream in = new ZipInputStream(inputStream);
+				try {
+					ZipEntry entry = in.getNextEntry();
+					while (entry != null) {
+						if (entry.getName().endsWith(CLST_EXTENSION)) {
+							load(in);
+						}
+						entry = in.getNextEntry();
 					}
-					entry = in.getNextEntry();
+				} finally {
+					in.close();
 				}
-			} finally {
-				in.close();
+			} else {
+				throw new JadxRuntimeException("Unknown file format: " + name);
 			}
-		} else {
-			throw new JadxRuntimeException("Unknown file format: " + name);
+		} finally {
+			inputStream.close();
 		}
 	}
 
 	public void load(InputStream input) throws IOException, DecodeException {
 		DataInputStream in = new DataInputStream(input);
-		byte[] header = new byte[JADX_CLS_SET_HEADER.length()];
-		int readHeaderLength = in.read(header);
-		int version = in.readByte();
-		if (readHeaderLength != JADX_CLS_SET_HEADER.length()
-				|| !JADX_CLS_SET_HEADER.equals(new String(header, STRING_CHARSET))
-				|| version != VERSION) {
-			throw new DecodeException("Wrong jadx class set header");
-		}
-		int count = in.readInt();
-		classes = new NClass[count];
-		for (int i = 0; i < count; i++) {
-			String name = readString(in);
-			classes[i] = new NClass(name, i);
-		}
-		for (int i = 0; i < count; i++) {
-			int pCount = in.readByte();
-			NClass[] parents = new NClass[pCount];
-			for (int j = 0; j < pCount; j++) {
-				parents[j] = classes[in.readInt()];
+		try {
+			byte[] header = new byte[JADX_CLS_SET_HEADER.length()];
+			int readHeaderLength = in.read(header);
+			int version = in.readByte();
+			if (readHeaderLength != JADX_CLS_SET_HEADER.length()
+					|| !JADX_CLS_SET_HEADER.equals(new String(header, STRING_CHARSET))
+					|| version != VERSION) {
+				throw new DecodeException("Wrong jadx class set header");
 			}
-			classes[i].setParents(parents);
+			int count = in.readInt();
+			classes = new NClass[count];
+			for (int i = 0; i < count; i++) {
+				String name = readString(in);
+				classes[i] = new NClass(name, i);
+			}
+			for (int i = 0; i < count; i++) {
+				int pCount = in.readByte();
+				NClass[] parents = new NClass[pCount];
+				for (int j = 0; j < pCount; j++) {
+					parents[j] = classes[in.readInt()];
+				}
+				classes[i].setParents(parents);
+			}
+		} finally {
+			in.close();
 		}
 	}
 

jadx-core/src/main/java/jadx/core/clsp/ClspGraph.java

@@ -5,6 +5,7 @@ import jadx.core.utils.exceptions.DecodeException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -44,35 +45,47 @@ public class ClspGraph {
 			throw new JadxRuntimeException("Classpath must be loaded first");
 		}
 		int size = classes.size();
+		for (ClassNode cls : classes) {
+			size += cls.getInnerClasses().size();
+		}
 		NClass[] nClasses = new NClass[size];
-		for (int i = 0; i < size; i++) {
-			ClassNode cls = classes.get(i);
-			NClass nClass = new NClass(cls.getRawName(), -1);
-			nClasses[i] = nClass;
-			nameMap.put(cls.getRawName(), nClass);
+		int k = 0;
+		for (ClassNode cls : classes) {
+			nClasses[k++] = addClass(cls);
+			for (ClassNode inner : cls.getInnerClasses()) {
+				nClasses[k++] = addClass(inner);
+			}
 		}
 		for (int i = 0; i < size; i++) {
 			nClasses[i].setParents(ClsSet.makeParentsArray(classes.get(i), nameMap));
 		}
 	}
 
+	private NClass addClass(ClassNode cls) {
+		NClass nClass = new NClass(cls.getRawName(), -1);
+		nameMap.put(cls.getRawName(), nClass);
+		return nClass;
+	}
+
 	public boolean isImplements(String clsName, String implClsName) {
 		Set<String> anc = getAncestors(clsName);
 		return anc.contains(implClsName);
 	}
 
 	public String getCommonAncestor(String clsName, String implClsName) {
-		if (isImplements(clsName, implClsName)) {
-			return implClsName;
+		if (clsName.equals(implClsName)) {
+			return clsName;
 		}
-		Set<String> anc = getAncestors(clsName);
 		NClass cls = nameMap.get(implClsName);
 		if (cls != null) {
+			if (isImplements(clsName, implClsName)) {
+				return implClsName;
+			}
+			Set<String> anc = getAncestors(clsName);
 			return searchCommonParent(anc, cls);
-		} else {
-			LOG.debug("Missing class: {}", implClsName);
-			return null;
 		}
+		LOG.debug("Missing class: {}", implClsName);
+		return null;
 	}
 
 	private String searchCommonParent(Set<String> anc, NClass cls) {
@@ -82,8 +95,9 @@ public class ClspGraph {
 				return name;
 			} else {
 				String r = searchCommonParent(anc, p);
-				if (r != null)
+				if (r != null) {
 					return r;
+				}
 			}
 		}
 		return null;
@@ -91,17 +105,21 @@ public class ClspGraph {
 
 	private Set<String> getAncestors(String clsName) {
 		Set<String> result = ancestorCache.get(clsName);
-		if (result == null) {
-			result = new HashSet<String>();
-			ancestorCache.put(clsName, result);
-			NClass cls = nameMap.get(clsName);
-			if (cls != null) {
-				addAncestorsNames(cls, result);
-			} else {
-				LOG.debug("Missing class: {}", clsName);
-			}
+		if (result != null) {
+			return result;
 		}
-		return result;
+		NClass cls = nameMap.get(clsName);
+		if (cls != null) {
+			result = new HashSet<String>();
+			addAncestorsNames(cls, result);
+			if (result.isEmpty()) {
+				result = Collections.emptySet();
+			}
+			ancestorCache.put(clsName, result);
+			return result;
+		}
+		LOG.debug("Missing class: {}", clsName);
+		return Collections.emptySet();
 	}
 
 	private void addAncestorsNames(NClass cls, Set<String> result) {

jadx-core/src/main/java/jadx/core/clsp/ConvertToClsSet.java

@@ -54,6 +54,9 @@ public class ConvertToClsSet {
 
 	private static void addFilesFromDirectory(File dir, List<InputFile> inputFiles) throws IOException, DecodeException {
 		File[] files = dir.listFiles();
+		if (files == null) {
+			return;
+		}
 		for (File file : files) {
 			if (file.isDirectory()) {
 				addFilesFromDirectory(file, inputFiles);

jadx-core/src/main/java/jadx/core/clsp/NClass.java

@@ -41,11 +41,14 @@ public class NClass {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		NClass nClass = (NClass) o;
-		if (!name.equals(nClass.name)) return false;
-		return true;
+		return name.equals(nClass.name);
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/codegen/AnnotationGen.java

@@ -1,7 +1,7 @@
 package jadx.core.codegen;
 
 import jadx.core.Consts;
-import jadx.core.dex.attributes.AttributeType;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttributeNode;
 import jadx.core.dex.attributes.annotations.Annotation;
 import jadx.core.dex.attributes.annotations.AnnotationsList;
@@ -43,20 +43,20 @@ public class AnnotationGen {
 
 	public void addForParameter(CodeWriter code, MethodParameters paramsAnnotations, int n) {
 		AnnotationsList aList = paramsAnnotations.getParamList().get(n);
-		if (aList == null || aList.size() == 0)
+		if (aList == null || aList.size() == 0) {
 			return;
-
+		}
 		for (Annotation a : aList.getAll()) {
-			code.add(formatAnnotation(a));
+			formatAnnotation(code, a);
 			code.add(' ');
 		}
 	}
 
 	private void add(IAttributeNode node, CodeWriter code) {
-		AnnotationsList aList = (AnnotationsList) node.getAttributes().get(AttributeType.ANNOTATION_LIST);
-		if (aList == null || aList.size() == 0)
+		AnnotationsList aList = node.get(AType.ANNOTATION_LIST);
+		if (aList == null || aList.size() == 0) {
 			return;
-
+		}
 		for (Annotation a : aList.getAll()) {
 			String aCls = a.getAnnotationClass();
 			if (aCls.startsWith(Consts.DALVIK_ANNOTATION_PKG)) {
@@ -66,52 +66,52 @@ public class AnnotationGen {
 				}
 			} else {
 				code.startLine();
-				code.add(formatAnnotation(a));
+				formatAnnotation(code, a);
 			}
 		}
 	}
 
-	private CodeWriter formatAnnotation(Annotation a) {
-		CodeWriter code = new CodeWriter();
+	private void formatAnnotation(CodeWriter code, Annotation a) {
 		code.add('@');
-		code.add(classGen.useClass(a.getType()));
+		classGen.useType(code, a.getType());
 		Map<String, Object> vl = a.getValues();
-		if (vl.size() != 0) {
+		if (!vl.isEmpty()) {
 			code.add('(');
 			if (vl.size() == 1 && vl.containsKey("value")) {
-				code.add(encValueToString(vl.get("value")));
+				encodeValue(code, vl.get("value"));
 			} else {
 				for (Iterator<Entry<String, Object>> it = vl.entrySet().iterator(); it.hasNext(); ) {
 					Entry<String, Object> e = it.next();
 					code.add(e.getKey());
 					code.add(" = ");
-					code.add(encValueToString(e.getValue()));
-					if (it.hasNext())
+					encodeValue(code, e.getValue());
+					if (it.hasNext()) {
 						code.add(", ");
+					}
 				}
 			}
 			code.add(')');
 		}
-		return code;
 	}
 
 	@SuppressWarnings("unchecked")
 	public void addThrows(MethodNode mth, CodeWriter code) {
-		Annotation an = mth.getAttributes().getAnnotation(Consts.DALVIK_THROWS);
+		Annotation an = mth.getAnnotation(Consts.DALVIK_THROWS);
 		if (an != null) {
 			Object exs = an.getDefaultValue();
 			code.add(" throws ");
 			for (Iterator<ArgType> it = ((List<ArgType>) exs).iterator(); it.hasNext(); ) {
 				ArgType ex = it.next();
-				code.add(TypeGen.translate(classGen, ex));
-				if (it.hasNext())
+				classGen.useType(code, ex);
+				if (it.hasNext()) {
 					code.add(", ");
+				}
 			}
 		}
 	}
 
 	public Object getAnnotationDefaultValue(String name) {
-		Annotation an = cls.getAttributes().getAnnotation(Consts.DALVIK_ANNOTATION_DEFAULT);
+		Annotation an = cls.getAnnotation(Consts.DALVIK_ANNOTATION_DEFAULT);
 		if (an != null) {
 			Annotation defAnnotation = (Annotation) an.getDefaultValue();
 			return defAnnotation.getValues().get(name);
@@ -120,65 +120,52 @@ public class AnnotationGen {
 	}
 
 	// TODO: refactor this boilerplate code
-	@SuppressWarnings("unchecked")
-	public String encValueToString(Object val) {
-		if (val == null)
-			return "null";
-
-		if (val instanceof String)
-			return StringUtils.unescapeString((String) val);
-		if (val instanceof Integer)
-			return TypeGen.formatInteger((Integer) val);
-		if (val instanceof Character)
-			return StringUtils.unescapeChar((Character) val);
-		if (val instanceof Boolean)
-			return Boolean.TRUE.equals(val) ? "true" : "false";
-		if (val instanceof Float)
-			return TypeGen.formatFloat((Float) val);
-		if (val instanceof Double)
-			return TypeGen.formatDouble((Double) val);
-		if (val instanceof Long)
-			return TypeGen.formatLong((Long) val);
-		if (val instanceof Short)
-			return TypeGen.formatShort((Short) val);
-		if (val instanceof Byte)
-			return TypeGen.formatByte((Byte) val);
-
-		if (val instanceof ArgType)
-			return TypeGen.translate(classGen, (ArgType) val) + ".class";
-
-		if (val instanceof FieldInfo) {
+	public void encodeValue(CodeWriter code, Object val) {
+		if (val == null) {
+			code.add("null");
+			return;
+		}
+		if (val instanceof String) {
+			code.add(StringUtils.unescapeString((String) val));
+		} else if (val instanceof Integer) {
+			code.add(TypeGen.formatInteger((Integer) val));
+		} else if (val instanceof Character) {
+			code.add(StringUtils.unescapeChar((Character) val));
+		} else if (val instanceof Boolean) {
+			code.add(Boolean.TRUE.equals(val) ? "true" : "false");
+		} else if (val instanceof Float) {
+			code.add(TypeGen.formatFloat((Float) val));
+		} else if (val instanceof Double) {
+			code.add(TypeGen.formatDouble((Double) val));
+		} else if (val instanceof Long) {
+			code.add(TypeGen.formatLong((Long) val));
+		} else if (val instanceof Short) {
+			code.add(TypeGen.formatShort((Short) val));
+		} else if (val instanceof Byte) {
+			code.add(TypeGen.formatByte((Byte) val));
+		} else if (val instanceof ArgType) {
+			classGen.useType(code, (ArgType) val);
+			code.add(".class");
+		} else if (val instanceof FieldInfo) {
 			// must be a static field
 			FieldInfo field = (FieldInfo) val;
-			// FIXME: !!code from InsnGen.sfield
-			String thisClass = cls.getFullName();
-			if (field.getDeclClass().getFullName().equals(thisClass)) {
-				return field.getName();
-			} else {
-				return classGen.useClass(field.getDeclClass()) + '.' + field.getName();
-			}
-		}
-
-		if (val instanceof List) {
-			StringBuilder str = new StringBuilder();
-			str.append('{');
-			List<Object> list = (List<Object>) val;
-			for (Iterator<Object> it = list.iterator(); it.hasNext(); ) {
+			InsnGen.makeStaticFieldAccess(code, field, classGen);
+		} else if (val instanceof List) {
+			code.add('{');
+			Iterator<?> it = ((List) val).iterator();
+			while (it.hasNext()) {
 				Object obj = it.next();
-				str.append(encValueToString(obj));
-				if (it.hasNext())
-					str.append(", ");
+				encodeValue(code, obj);
+				if (it.hasNext()) {
+					code.add(", ");
+				}
 			}
-			str.append('}');
-			return str.toString();
+			code.add('}');
+		} else if (val instanceof Annotation) {
+			formatAnnotation(code, (Annotation) val);
+		} else {
+			// TODO: also can be method values
+			throw new JadxRuntimeException("Can't decode value: " + val + " (" + val.getClass() + ")");
 		}
-
-		if (val instanceof Annotation) {
-			return formatAnnotation((Annotation) val).toString();
-		}
-
-		// TODO: also can be method values
-
-		throw new JadxRuntimeException("Can't decode value: " + val + " (" + val.getClass() + ")");
 	}
 }

jadx-core/src/main/java/jadx/core/codegen/ClassGen.java

@@ -1,17 +1,17 @@
 package jadx.core.codegen;
 
 import jadx.core.Consts;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.AttrNode;
-import jadx.core.dex.attributes.AttributeFlag;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.EnumClassAttr;
-import jadx.core.dex.attributes.EnumClassAttr.EnumField;
-import jadx.core.dex.attributes.IAttribute;
-import jadx.core.dex.attributes.SourceFileAttr;
+import jadx.core.dex.attributes.nodes.EnumClassAttr;
+import jadx.core.dex.attributes.nodes.EnumClassAttr.EnumField;
+import jadx.core.dex.attributes.nodes.SourceFileAttr;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.info.ClassInfo;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.PrimitiveType;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.FieldNode;
@@ -44,6 +44,7 @@ public class ClassGen {
 	private final boolean fallback;
 
 	private final Set<ClassInfo> imports = new HashSet<ClassInfo>();
+	private int clsDeclLine = 0;
 
 	public ClassGen(ClassNode cls, ClassGen parentClsGen, boolean fallback) {
 		this.cls = cls;
@@ -62,12 +63,10 @@ public class ClassGen {
 		addClassCode(clsBody);
 
 		CodeWriter clsCode = new CodeWriter();
-
 		if (!"".equals(cls.getPackage())) {
 			clsCode.add("package ").add(cls.getPackage()).add(';');
 			clsCode.newLine();
 		}
-
 		int importsCount = imports.size();
 		if (importsCount != 0) {
 			List<String> sortImports = new ArrayList<String>(importsCount);
@@ -84,24 +83,22 @@ public class ClassGen {
 			sortImports.clear();
 			imports.clear();
 		}
-
 		clsCode.add(clsBody);
 		return clsCode;
 	}
 
 	public void addClassCode(CodeWriter code) throws CodegenException {
-		if (cls.getAttributes().contains(AttributeFlag.DONT_GENERATE))
+		if (cls.contains(AFlag.DONT_GENERATE)) {
 			return;
-
-		if (cls.getAttributes().contains(AttributeFlag.INCONSISTENT_CODE))
+		}
+		if (cls.contains(AFlag.INCONSISTENT_CODE)) {
 			code.startLine("// jadx: inconsistent code");
-
-		makeClassDeclaration(code);
-		makeClassBody(code);
-		code.newLine();
+		}
+		addClassDeclaration(code);
+		addClassBody(code);
 	}
 
-	public void makeClassDeclaration(CodeWriter clsCode) {
+	public void addClassDeclaration(CodeWriter clsCode) {
 		AccessInfo af = cls.getAccessFlags();
 		if (af.isInterface()) {
 			af = af.remove(AccessFlags.ACC_ABSTRACT);
@@ -113,8 +110,9 @@ public class ClassGen {
 		insertSourceFileInfo(clsCode, cls);
 		clsCode.startLine(af.makeString());
 		if (af.isInterface()) {
-			if (af.isAnnotation())
+			if (af.isAnnotation()) {
 				clsCode.add('@');
+			}
 			clsCode.add("interface ");
 		} else if (af.isEnum()) {
 			clsCode.add("enum ");
@@ -123,39 +121,42 @@ public class ClassGen {
 		}
 		clsCode.add(cls.getShortName());
 
-		makeGenericMap(clsCode, cls.getGenericMap());
+		addGenericMap(clsCode, cls.getGenericMap());
 		clsCode.add(' ');
 
 		ClassInfo sup = cls.getSuperClass();
 		if (sup != null
 				&& !sup.getFullName().equals(Consts.CLASS_OBJECT)
 				&& !sup.getFullName().equals(Consts.CLASS_ENUM)) {
-			clsCode.add("extends ").add(useClass(sup)).add(' ');
+			clsCode.add("extends ");
+			useClass(clsCode, sup);
+			clsCode.add(' ');
 		}
 
 		if (cls.getInterfaces().size() > 0 && !af.isAnnotation()) {
-			if (cls.getAccessFlags().isInterface())
+			if (cls.getAccessFlags().isInterface()) {
 				clsCode.add("extends ");
-			else
+			} else {
 				clsCode.add("implements ");
-
+			}
 			for (Iterator<ClassInfo> it = cls.getInterfaces().iterator(); it.hasNext(); ) {
 				ClassInfo interf = it.next();
-				clsCode.add(useClass(interf));
-				if (it.hasNext())
+				useClass(clsCode, interf);
+				if (it.hasNext()) {
 					clsCode.add(", ");
+				}
 			}
-			if (!cls.getInterfaces().isEmpty())
+			if (!cls.getInterfaces().isEmpty()) {
 				clsCode.add(' ');
+			}
 		}
-
-		clsCode.attachAnnotation(cls);
+		clsCode.attachDefinition(cls);
 	}
 
-	public boolean makeGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
-		if (gmap == null || gmap.isEmpty())
+	public boolean addGenericMap(CodeWriter code, Map<ArgType, List<ArgType>> gmap) {
+		if (gmap == null || gmap.isEmpty()) {
 			return false;
-
+		}
 		code.add('<');
 		int i = 0;
 		for (Entry<ArgType, List<ArgType>> e : gmap.entrySet()) {
@@ -164,12 +165,20 @@ public class ClassGen {
 			if (i != 0) {
 				code.add(", ");
 			}
-			code.add(useClass(type));
+			if (type.isGenericType()) {
+				code.add(type.getObject());
+			} else {
+				useClass(code, ClassInfo.fromType(type));
+			}
 			if (list != null && !list.isEmpty()) {
 				code.add(" extends ");
 				for (Iterator<ArgType> it = list.iterator(); it.hasNext(); ) {
 					ArgType g = it.next();
-					code.add(useClass(g));
+					if (g.isGenericType()) {
+						code.add(g.getObject());
+					} else {
+						useClass(code, ClassInfo.fromType(g));
+					}
 					if (it.hasNext()) {
 						code.add(" & ");
 					}
@@ -181,182 +190,193 @@ public class ClassGen {
 		return true;
 	}
 
-	public void makeClassBody(CodeWriter clsCode) throws CodegenException {
+	public void addClassBody(CodeWriter clsCode) throws CodegenException {
 		clsCode.add('{');
-		CodeWriter mthsCode = makeMethods(clsCode, cls.getMethods());
-		CodeWriter fieldsCode = makeFields(clsCode, cls, cls.getFields());
-		clsCode.add(fieldsCode);
-		if (fieldsCode.notEmpty() && mthsCode.notEmpty())
-			clsCode.newLine();
-
-		// insert inner classes code
-		if (cls.getInnerClasses().size() != 0) {
-			clsCode.add(makeInnerClasses(cls, clsCode.getIndent()));
-			if (mthsCode.notEmpty())
-				clsCode.newLine();
-		}
-		clsCode.add(mthsCode);
+		clsDeclLine = clsCode.getLine();
+		clsCode.incIndent();
+		addFields(clsCode);
+		addInnerClasses(clsCode, cls);
+		addMethods(clsCode);
+		clsCode.decIndent();
 		clsCode.startLine('}');
 	}
 
-	private CodeWriter makeInnerClasses(ClassNode cls, int indent) throws CodegenException {
-		CodeWriter innerClsCode = new CodeWriter(indent + 1);
-		for (ClassNode inCls : cls.getInnerClasses()) {
-			if (inCls.isAnonymous())
-				continue;
-
-			ClassGen inClGen = new ClassGen(inCls, parentGen == null ? this : parentGen, fallback);
-			inClGen.addClassCode(innerClsCode);
-			imports.addAll(inClGen.getImports());
-		}
-		return innerClsCode;
-	}
-
-	private CodeWriter makeMethods(CodeWriter clsCode, List<MethodNode> mthList) {
-		CodeWriter code = new CodeWriter(clsCode.getIndent() + 1);
-		for (Iterator<MethodNode> it = mthList.iterator(); it.hasNext(); ) {
-			MethodNode mth = it.next();
-			if (mth.getAttributes().contains(AttributeFlag.DONT_GENERATE))
-				continue;
-
-			try {
-				if (mth.getAccessFlags().isAbstract() || mth.getAccessFlags().isNative()) {
-					MethodGen mthGen = new MethodGen(this, mth);
-					mthGen.addDefinition(code);
-					if (cls.getAccessFlags().isAnnotation()) {
-						Object def = annotationGen.getAnnotationDefaultValue(mth.getName());
-						if (def != null) {
-							String v = annotationGen.encValueToString(def);
-							code.add(" default ").add(v);
-						}
-					}
-					code.add(';');
-				} else {
-					if (mth.isNoCode())
-						continue;
-
-					MethodGen mthGen = new MethodGen(this, mth);
-					if (mth.getAttributes().contains(AttributeFlag.INCONSISTENT_CODE)) {
-						code.startLine("/* JADX WARNING: inconsistent code */");
-						LOG.error(ErrorsCounter.formatErrorMsg(mth, " Inconsistent code"));
-						mthGen.makeMethodDump(code);
-					}
-					if (mthGen.addDefinition(code)) {
-						code.add(' ');
-					}
-					code.add('{');
-					insertSourceFileInfo(code, mth);
-					code.add(mthGen.makeInstructions(code.getIndent()));
-					code.startLine('}');
-				}
-			} catch (Throwable e) {
-				String msg = ErrorsCounter.methodError(mth, "Method generation error", e);
-				code.startLine("/* " + msg + CodeWriter.NL + Utils.getStackTrace(e) + " */");
-			}
-
-			if (it.hasNext())
+	private void addInnerClasses(CodeWriter code, ClassNode cls) throws CodegenException {
+		for (ClassNode innerCls : cls.getInnerClasses()) {
+			if (!innerCls.isAnonymous()) {
+				ClassGen inClGen = new ClassGen(innerCls, getParentGen(), fallback);
 				code.newLine();
+				inClGen.addClassCode(code);
+				imports.addAll(inClGen.getImports());
+			}
 		}
-		return code;
 	}
 
-	private CodeWriter makeFields(CodeWriter clsCode, ClassNode cls, List<FieldNode> fields) throws CodegenException {
-		CodeWriter code = new CodeWriter(clsCode.getIndent() + 1);
-
-		EnumClassAttr enumFields = (EnumClassAttr) cls.getAttributes().get(AttributeType.ENUM_CLASS);
-		if (enumFields != null) {
-			InsnGen igen = null;
-			for (Iterator<EnumField> it = enumFields.getFields().iterator(); it.hasNext(); ) {
-				EnumField f = it.next();
-				code.startLine(f.getName());
-				if (f.getArgs().size() != 0) {
-					code.add('(');
-					for (Iterator<InsnArg> aIt = f.getArgs().iterator(); aIt.hasNext(); ) {
-						InsnArg arg = aIt.next();
-						if (igen == null) {
-							// don't init mth gen if this is simple enum
-							MethodGen mthGen = new MethodGen(this, enumFields.getStaticMethod());
-							igen = new InsnGen(mthGen, enumFields.getStaticMethod(), false);
-						}
-						code.add(igen.arg(arg));
-						if (aIt.hasNext())
-							code.add(", ");
+	private void addMethods(CodeWriter code) {
+		for (MethodNode mth : cls.getMethods()) {
+			if (!mth.contains(AFlag.DONT_GENERATE)) {
+				try {
+					if (code.getLine() != clsDeclLine) {
+						code.newLine();
 					}
-					code.add(')');
+					addMethod(code, mth);
+				} catch (Exception e) {
+					String msg = ErrorsCounter.methodError(mth, "Method generation error", e);
+					code.startLine("/* " + msg + CodeWriter.NL + Utils.getStackTrace(e) + " */");
 				}
-				if (f.getCls() != null) {
-					new ClassGen(f.getCls(), this, fallback).makeClassBody(code);
-				}
-				if (it.hasNext())
-					code.add(',');
 			}
-			if (enumFields.getFields().isEmpty())
-				code.startLine();
-
-			code.add(';');
-			code.newLine();
 		}
+	}
 
-		for (FieldNode f : fields) {
-			if(f.getAttributes().contains(AttributeFlag.DONT_GENERATE)) {
+	private void addMethod(CodeWriter code, MethodNode mth) throws CodegenException {
+		MethodGen mthGen = new MethodGen(this, mth);
+		if (mth.getAccessFlags().isAbstract() || mth.getAccessFlags().isNative()) {
+			mthGen.addDefinition(code);
+			if (cls.getAccessFlags().isAnnotation()) {
+				Object def = annotationGen.getAnnotationDefaultValue(mth.getName());
+				if (def != null) {
+					code.add(" default ");
+					annotationGen.encodeValue(code, def);
+				}
+			}
+			code.add(';');
+		} else {
+			boolean badCode = mth.contains(AFlag.INCONSISTENT_CODE);
+			if (badCode) {
+				code.startLine("/* JADX WARNING: inconsistent code. */");
+				code.startLine("/* Code decompiled incorrectly, please refer to instructions dump. */");
+				ErrorsCounter.methodError(mth, "Inconsistent code");
+			}
+			if (mthGen.addDefinition(code)) {
+				code.add(' ');
+			}
+			code.add('{');
+			code.incIndent();
+			insertSourceFileInfo(code, mth);
+			mthGen.addInstructions(code);
+			code.decIndent();
+			code.startLine('}');
+		}
+	}
+
+	private void addFields(CodeWriter code) throws CodegenException {
+		addEnumFields(code);
+		for (FieldNode f : cls.getFields()) {
+			if (f.contains(AFlag.DONT_GENERATE)) {
 				continue;
 			}
 			annotationGen.addForField(code, f);
 			code.startLine(f.getAccessFlags().makeString());
-			code.add(TypeGen.translate(this, f.getType()));
+			useType(code, f.getType());
 			code.add(' ');
 			code.add(f.getName());
-			FieldValueAttr fv = (FieldValueAttr) f.getAttributes().get(AttributeType.FIELD_VALUE);
+			FieldValueAttr fv = f.get(AType.FIELD_VALUE);
 			if (fv != null) {
 				code.add(" = ");
 				if (fv.getValue() == null) {
 					code.add(TypeGen.literalToString(0, f.getType()));
 				} else {
-					code.add(annotationGen.encValueToString(fv.getValue()));
+					annotationGen.encodeValue(code, fv.getValue());
 				}
 			}
 			code.add(';');
-			code.attachAnnotation(f);
+			code.attachDefinition(f);
 		}
-		return code;
 	}
 
-	public String useClass(ArgType clsType) {
-		if (clsType.isGenericType()) {
-			return clsType.getObject();
+	private void addEnumFields(CodeWriter code) throws CodegenException {
+		EnumClassAttr enumFields = cls.get(AType.ENUM_CLASS);
+		if (enumFields == null) {
+			return;
 		}
-		return useClass(ClassInfo.fromType(clsType));
+		InsnGen igen = null;
+		for (Iterator<EnumField> it = enumFields.getFields().iterator(); it.hasNext(); ) {
+			EnumField f = it.next();
+			code.startLine(f.getName());
+			if (f.getArgs().size() != 0) {
+				code.add('(');
+				for (Iterator<InsnArg> aIt = f.getArgs().iterator(); aIt.hasNext(); ) {
+					InsnArg arg = aIt.next();
+					if (igen == null) {
+						// don't init mth gen if this is simple enum
+						MethodGen mthGen = new MethodGen(this, enumFields.getStaticMethod());
+						igen = new InsnGen(mthGen, false);
+					}
+					igen.addArg(code, arg);
+					if (aIt.hasNext()) {
+						code.add(", ");
+					}
+				}
+				code.add(')');
+			}
+			if (f.getCls() != null) {
+				new ClassGen(f.getCls(), this, fallback).addClassBody(code);
+			}
+			if (it.hasNext()) {
+				code.add(',');
+			}
+		}
+		if (enumFields.getFields().isEmpty()) {
+			code.startLine();
+		}
+		code.add(';');
+		code.newLine();
 	}
 
-	public String useClass(ClassInfo classInfo) {
+	public void useType(CodeWriter code, ArgType type) {
+		final PrimitiveType stype = type.getPrimitiveType();
+		if (stype == null) {
+			code.add(type.toString());
+		} else if (stype == PrimitiveType.OBJECT) {
+			if (type.isGenericType()) {
+				code.add(type.getObject());
+			} else {
+				useClass(code, ClassInfo.fromType(type));
+			}
+		} else if (stype == PrimitiveType.ARRAY) {
+			useType(code, type.getArrayElement());
+			code.add("[]");
+		} else {
+			code.add(stype.getLongName());
+		}
+	}
+
+	public void useClass(CodeWriter code, ClassInfo classInfo) {
+		ClassNode classNode = cls.dex().resolveClass(classInfo);
+		if (classNode != null) {
+			code.attachAnnotation(classNode);
+		}
 		String baseClass = useClassInternal(cls.getClassInfo(), classInfo);
 		ArgType[] generics = classInfo.getType().getGenericTypes();
+		code.add(baseClass);
 		if (generics != null) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(baseClass);
-			sb.append('<');
+			code.add('<');
 			int len = generics.length;
 			for (int i = 0; i < len; i++) {
 				if (i != 0) {
-					sb.append(", ");
+					code.add(", ");
 				}
 				ArgType gt = generics[i];
-				if (gt.isTypeKnown())
-					sb.append(TypeGen.translate(this, gt));
-				else
-					sb.append('?');
+				ArgType wt = gt.getWildcardType();
+				if (wt != null) {
+					code.add('?');
+					int bounds = gt.getWildcardBounds();
+					if (bounds != 0) {
+						code.add(bounds == -1 ? " super " : " extends ");
+						useType(code, wt);
+					}
+				} else {
+					useType(code, gt);
+				}
 			}
-			sb.append('>');
-			return sb.toString();
-		} else {
-			return baseClass;
+			code.add('>');
 		}
 	}
 
 	private String useClassInternal(ClassInfo useCls, ClassInfo classInfo) {
-		String clsStr = classInfo.getFullName();
+		String fullName = classInfo.getFullName();
 		if (fallback) {
-			return clsStr;
+			return fullName;
 		}
 		String shortName = classInfo.getShortName();
 		if (classInfo.getPackage().equals("java.lang") && classInfo.getParentClass() == null) {
@@ -370,16 +390,25 @@ public class ClassGen {
 			if (classInfo.getPackage().equals(useCls.getPackage()) && !classInfo.isInner()) {
 				return shortName;
 			}
-			if (classInfo.getPackage().equals(useCls.getPackage())) {
-				clsStr = classInfo.getNameWithoutPackage();
+			// don't add import if class not public (must be accessed using inheritance)
+			ClassNode classNode = cls.dex().resolveClass(classInfo);
+			if (classNode != null && !classNode.getAccessFlags().isPublic()) {
+				return shortName;
 			}
 			if (searchCollision(cls.dex(), useCls, shortName)) {
-				return clsStr;
+				return fullName;
 			}
-			for (ClassInfo cls : imports) {
-				if (!cls.equals(classInfo)) {
-					if (cls.getShortName().equals(shortName)) {
-						return clsStr;
+			if (classInfo.getPackage().equals(useCls.getPackage())) {
+				fullName = classInfo.getNameWithoutPackage();
+			}
+			for (ClassInfo importCls : getImports()) {
+				if (!importCls.equals(classInfo)
+						&& importCls.getShortName().equals(shortName)) {
+					if (classInfo.isInner()) {
+						String parent = useClassInternal(useCls, classInfo.getParentClass());
+						return parent + "." + shortName;
+					} else {
+						return fullName;
 					}
 				}
 			}
@@ -396,6 +425,14 @@ public class ClassGen {
 		}
 	}
 
+	private Set<ClassInfo> getImports() {
+		if (parentGen != null) {
+			return parentGen.getImports();
+		} else {
+			return imports;
+		}
+	}
+
 	private static boolean isClassInnerFor(ClassInfo inner, ClassInfo parent) {
 		if (inner.isInner()) {
 			ClassInfo p = inner.getParentClass();
@@ -423,19 +460,14 @@ public class ClassGen {
 	}
 
 	private void insertSourceFileInfo(CodeWriter code, AttrNode node) {
-		IAttribute sourceFileAttr = node.getAttributes().get(AttributeType.SOURCE_FILE);
+		SourceFileAttr sourceFileAttr = node.get(AType.SOURCE_FILE);
 		if (sourceFileAttr != null) {
-			code.startLine("// compiled from: ");
-			code.add(((SourceFileAttr) sourceFileAttr).getFileName());
+			code.startLine("// compiled from: ").add(sourceFileAttr.getFileName());
 		}
 	}
 
-	public Set<ClassInfo> getImports() {
-		return imports;
-	}
-
 	public ClassGen getParentGen() {
-		return parentGen;
+		return parentGen == null ? this : parentGen;
 	}
 
 	public AnnotationGen getAnnotationGen() {

jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java

@@ -1,13 +1,16 @@
 package jadx.core.codegen;
 
-import jadx.core.dex.attributes.LineAttrNode;
+import jadx.api.CodePosition;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.utils.Utils;
 
 import java.io.File;
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,105 +20,9 @@ public class CodeWriter {
 	private static final int MAX_FILENAME_LENGTH = 128;
 
 	public static final String NL = System.getProperty("line.separator");
-	private static final String INDENT = "\t";
+	public static final String INDENT = "    ";
 
-	private final StringBuilder buf = new StringBuilder();
-	private String indentStr;
-	private int indent;
-
-	private int line = 1;
-	private Map<Object, Integer> annotations = Collections.emptyMap();
-
-	public CodeWriter() {
-		this.indent = 0;
-		this.indentStr = "";
-	}
-
-	public CodeWriter(int indent) {
-		this.indent = indent;
-		updateIndent();
-	}
-
-	public CodeWriter startLine() {
-		addLine();
-		buf.append(indentStr);
-		return this;
-	}
-
-	public CodeWriter startLine(char c) {
-		addLine();
-		buf.append(indentStr);
-		buf.append(c);
-		return this;
-	}
-
-	public CodeWriter startLine(String str) {
-		addLine();
-		buf.append(indentStr);
-		buf.append(str);
-		return this;
-	}
-
-	public CodeWriter startLine(int ind, String str) {
-		addLine();
-		buf.append(indentStr);
-		for (int i = 0; i < ind; i++)
-			buf.append(INDENT);
-		buf.append(str);
-		return this;
-	}
-
-	public CodeWriter add(String str) {
-		buf.append(str);
-		return this;
-	}
-
-	public CodeWriter add(char c) {
-		buf.append(c);
-		return this;
-	}
-
-	public CodeWriter add(CodeWriter code) {
-		line--;
-		for (Map.Entry<Object, Integer> entry : code.annotations.entrySet()) {
-			attachAnnotation(entry.getKey(), line + entry.getValue());
-		}
-		line += code.line;
-		buf.append(code.toString());
-		return this;
-	}
-
-	public CodeWriter newLine() {
-		addLine();
-		return this;
-	}
-
-	private void addLine() {
-		buf.append(NL);
-		line++;
-	}
-
-	public int getLine() {
-		return line;
-	}
-
-	public Object attachAnnotation(Object obj) {
-		return attachAnnotation(obj, line);
-	}
-
-	public Object attachAnnotation(Object obj, int line) {
-		if (annotations.isEmpty()) {
-			annotations = new HashMap<Object, Integer>();
-		}
-		return annotations.put(obj, line);
-	}
-
-	public CodeWriter indent() {
-		buf.append(indentStr);
-		return this;
-	}
-
-	private static final String[] INDENT_CACHE = new String[]{
+	private static final String[] INDENT_CACHE = {
 			"",
 			INDENT,
 			INDENT + INDENT,
@@ -124,9 +31,92 @@ public class CodeWriter {
 			INDENT + INDENT + INDENT + INDENT + INDENT,
 	};
 
+	private final StringBuilder buf = new StringBuilder();
+	private String indentStr;
+	private int indent;
+
+	private int line = 1;
+	private int offset = 0;
+	private Map<CodePosition, Object> annotations = Collections.emptyMap();
+	private Map<Integer, Integer> lineMap = Collections.emptyMap();
+
+	public CodeWriter() {
+		this.indent = 0;
+		this.indentStr = "";
+	}
+
+	public CodeWriter startLine() {
+		addLine();
+		addLineIndent();
+		return this;
+	}
+
+	public CodeWriter startLine(char c) {
+		addLine();
+		addLineIndent();
+		add(c);
+		return this;
+	}
+
+	public CodeWriter startLine(String str) {
+		addLine();
+		addLineIndent();
+		add(str);
+		return this;
+	}
+
+	public CodeWriter add(String str) {
+		buf.append(str);
+		offset += str.length();
+		return this;
+	}
+
+	public CodeWriter add(char c) {
+		buf.append(c);
+		offset++;
+		return this;
+	}
+
+	CodeWriter add(CodeWriter code) {
+		line--;
+		for (Map.Entry<CodePosition, Object> entry : code.annotations.entrySet()) {
+			CodePosition pos = entry.getKey();
+			attachAnnotation(entry.getValue(), new CodePosition(line + pos.getLine(), pos.getOffset()));
+		}
+		for (Map.Entry<Integer, Integer> entry : code.lineMap.entrySet()) {
+			attachSourceLine(line + entry.getKey(), entry.getValue());
+		}
+		line += code.line;
+		offset = code.offset;
+		buf.append(code);
+		return this;
+	}
+
+	public CodeWriter newLine() {
+		addLine();
+		return this;
+	}
+
+	public CodeWriter addIndent() {
+		add(INDENT);
+		return this;
+	}
+
+	private void addLine() {
+		buf.append(NL);
+		line++;
+		offset = 0;
+	}
+
+	private CodeWriter addLineIndent() {
+		buf.append(indentStr);
+		offset += indentStr.length();
+		return this;
+	}
+
 	private void updateIndent() {
 		int curIndent = indent;
-		if (curIndent < 6) {
+		if (curIndent < INDENT_CACHE.length) {
 			this.indentStr = INDENT_CACHE[curIndent];
 		} else {
 			StringBuilder s = new StringBuilder(curIndent * INDENT.length());
@@ -137,10 +127,6 @@ public class CodeWriter {
 		}
 	}
 
-	public int getIndent() {
-		return indent;
-	}
-
 	public void incIndent() {
 		incIndent(1);
 	}
@@ -163,24 +149,86 @@ public class CodeWriter {
 		updateIndent();
 	}
 
+	public int getLine() {
+		return line;
+	}
+
+	private static class DefinitionWrapper {
+		private final LineAttrNode node;
+
+		private DefinitionWrapper(LineAttrNode node) {
+			this.node = node;
+		}
+
+		public LineAttrNode getNode() {
+			return node;
+		}
+	}
+
+	public Object attachDefinition(LineAttrNode obj) {
+		return attachAnnotation(new DefinitionWrapper(obj), new CodePosition(line, offset));
+	}
+
+	public Object attachAnnotation(Object obj) {
+		return attachAnnotation(obj, new CodePosition(line, offset + 1));
+	}
+
+	private Object attachAnnotation(Object obj, CodePosition pos) {
+		if (annotations.isEmpty()) {
+			annotations = new HashMap<CodePosition, Object>();
+		}
+		return annotations.put(pos, obj);
+	}
+
+	public Map<CodePosition, Object> getAnnotations() {
+		return annotations;
+	}
+
+	public void attachSourceLine(int sourceLine) {
+		if (sourceLine == 0) {
+			return;
+		}
+		attachSourceLine(line, sourceLine);
+	}
+
+	private void attachSourceLine(int decompiledLine, int sourceLine) {
+		if (lineMap.isEmpty()) {
+			lineMap = new TreeMap<Integer, Integer>();
+		}
+		lineMap.put(decompiledLine, sourceLine);
+	}
+
+	public Map<Integer, Integer> getLineMapping() {
+		return lineMap;
+	}
+
 	public void finish() {
 		buf.trimToSize();
-		for (Map.Entry<Object, Integer> entry : annotations.entrySet()) {
-			Object v = entry.getKey();
-			if (v instanceof LineAttrNode) {
-				LineAttrNode l = (LineAttrNode) v;
-				l.setDecompiledLine(entry.getValue());
+		Iterator<Map.Entry<CodePosition, Object>> it = annotations.entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry<CodePosition, Object> entry = it.next();
+			Object v = entry.getValue();
+			if (v instanceof DefinitionWrapper) {
+				LineAttrNode l = ((DefinitionWrapper) v).getNode();
+				l.setDecompiledLine(entry.getKey().getLine());
+				it.remove();
 			}
 		}
-		annotations.clear();
 	}
 
 	private static String removeFirstEmptyLine(String str) {
 		if (str.startsWith(NL)) {
 			return str.substring(NL.length());
-		} else {
-			return str;
 		}
+		return str;
+	}
+
+	public int length() {
+		return buf.length();
+	}
+
+	public boolean isEmpty() {
+		return buf.length() == 0;
 	}
 
 	public boolean notEmpty() {
@@ -205,10 +253,11 @@ public class CodeWriter {
 		if (name.length() > MAX_FILENAME_LENGTH) {
 			int dotIndex = name.indexOf('.');
 			int cutAt = MAX_FILENAME_LENGTH - name.length() + dotIndex - 1;
-			if (cutAt <= 0)
+			if (cutAt <= 0) {
 				name = name.substring(0, MAX_FILENAME_LENGTH - 1);
-			else
+			} else {
 				name = name.substring(0, cutAt) + name.substring(dotIndex);
+			}
 			file = new File(file.getParentFile(), name);
 		}
 
@@ -222,9 +271,26 @@ public class CodeWriter {
 		} catch (Exception e) {
 			LOG.error("Save file error", e);
 		} finally {
-			if (out != null)
+			if (out != null) {
 				out.close();
+			}
 		}
 	}
 
+	@Override
+	public int hashCode() {
+		return buf.toString().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof CodeWriter)) {
+			return false;
+		}
+		CodeWriter that = (CodeWriter) o;
+		return buf.toString().equals(that.buf.toString());
+	}
 }

jadx-core/src/main/java/jadx/core/codegen/ConditionGen.java

@@ -0,0 +1,135 @@
+package jadx.core.codegen;
+
+import jadx.core.dex.instructions.ArithNode;
+import jadx.core.dex.instructions.IfOp;
+import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.InsnWrapArg;
+import jadx.core.dex.instructions.args.LiteralArg;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.regions.Compare;
+import jadx.core.dex.regions.IfCondition;
+import jadx.core.utils.ErrorsCounter;
+import jadx.core.utils.exceptions.CodegenException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+import java.util.Iterator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ConditionGen extends InsnGen {
+	private static final Logger LOG = LoggerFactory.getLogger(ConditionGen.class);
+
+	public ConditionGen(InsnGen insnGen) {
+		super(insnGen.mgen, insnGen.fallback);
+	}
+
+	void add(CodeWriter code, IfCondition condition) throws CodegenException {
+		switch (condition.getMode()) {
+			case COMPARE:
+				addCompare(code, condition.getCompare());
+				break;
+
+			case NOT:
+				addNot(code, condition);
+				break;
+
+			case AND:
+			case OR:
+				addAndOr(code, condition);
+				break;
+
+			default:
+				throw new JadxRuntimeException("Unknown condition mode: " + condition);
+		}
+	}
+
+	void wrap(CodeWriter code, IfCondition cond) throws CodegenException {
+		boolean wrap = isWrapNeeded(cond);
+		if (wrap) {
+			code.add('(');
+		}
+		add(code, cond);
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void addCompare(CodeWriter code, Compare compare) throws CodegenException {
+		IfOp op = compare.getOp();
+		InsnArg firstArg = compare.getA();
+		InsnArg secondArg = compare.getB();
+		if (firstArg.getType().equals(ArgType.BOOLEAN)
+				&& secondArg.isLiteral()
+				&& secondArg.getType().equals(ArgType.BOOLEAN)) {
+			LiteralArg lit = (LiteralArg) secondArg;
+			if (lit.getLiteral() == 0) {
+				op = op.invert();
+			}
+			if (op == IfOp.EQ) {
+				// == true
+				addArg(code, firstArg, false);
+				return;
+			} else if (op == IfOp.NE) {
+				// != true
+				code.add('!');
+				boolean wrap = isWrapNeeded(firstArg);
+				if (wrap) {
+					code.add('(');
+				}
+				addArg(code, firstArg, false);
+				if (wrap) {
+					code.add(')');
+				}
+				return;
+			}
+			LOG.warn(ErrorsCounter.formatErrorMsg(mth, "Unsupported boolean condition " + op.getSymbol()));
+		}
+
+		addArg(code, firstArg, isWrapNeeded(firstArg));
+		code.add(' ').add(op.getSymbol()).add(' ');
+		addArg(code, secondArg, isWrapNeeded(secondArg));
+	}
+
+	private void addNot(CodeWriter code, IfCondition condition) throws CodegenException {
+		code.add('!');
+		wrap(code, condition.getArgs().get(0));
+	}
+
+	private void addAndOr(CodeWriter code, IfCondition condition) throws CodegenException {
+		String mode = condition.getMode() == IfCondition.Mode.AND ? " && " : " || ";
+		Iterator<IfCondition> it = condition.getArgs().iterator();
+		while (it.hasNext()) {
+			wrap(code, it.next());
+			if (it.hasNext()) {
+				code.add(mode);
+			}
+		}
+	}
+
+	private boolean isWrapNeeded(IfCondition condition) {
+		return !condition.isCompare();
+	}
+
+	private static boolean isWrapNeeded(InsnArg arg) {
+		if (!arg.isInsnWrap()) {
+			return false;
+		}
+		InsnNode insn = ((InsnWrapArg) arg).getWrapInsn();
+		if (insn.getType() == InsnType.ARITH) {
+			switch (((ArithNode) insn).getOp()) {
+				case ADD:
+				case SUB:
+				case MUL:
+				case DIV:
+				case REM:
+					return false;
+			}
+		} else if (insn.getType() == InsnType.INVOKE) {
+			return false;
+		}
+		return true;
+	}
+}

jadx-core/src/main/java/jadx/core/codegen/InsnGen.java

@@ -1,9 +1,9 @@
 package jadx.core.codegen;
 
-import jadx.core.dex.attributes.AttributeFlag;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.IAttribute;
-import jadx.core.dex.attributes.MethodInlineAttr;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.nodes.FieldReplaceAttr;
+import jadx.core.dex.attributes.nodes.MethodInlineAttr;
 import jadx.core.dex.info.ClassInfo;
 import jadx.core.dex.info.FieldInfo;
 import jadx.core.dex.info.MethodInfo;
@@ -15,6 +15,7 @@ import jadx.core.dex.instructions.FillArrayNode;
 import jadx.core.dex.instructions.GotoNode;
 import jadx.core.dex.instructions.IfNode;
 import jadx.core.dex.instructions.IndexInsnNode;
+import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.InvokeNode;
 import jadx.core.dex.instructions.InvokeType;
 import jadx.core.dex.instructions.SwitchNode;
@@ -26,6 +27,7 @@ import jadx.core.dex.instructions.args.LiteralArg;
 import jadx.core.dex.instructions.args.NamedArg;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.instructions.mods.ConstructorInsn;
+import jadx.core.dex.instructions.mods.TernaryInsn;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.FieldNode;
 import jadx.core.dex.nodes.InsnNode;
@@ -36,6 +38,7 @@ import jadx.core.utils.InsnUtils;
 import jadx.core.utils.RegionUtils;
 import jadx.core.utils.StringUtils;
 import jadx.core.utils.exceptions.CodegenException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -43,7 +46,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,21 +56,16 @@ public class InsnGen {
 	protected final MethodGen mgen;
 	protected final MethodNode mth;
 	protected final RootNode root;
-	private final boolean fallback;
-
-	private static enum IGState {
-		SKIP,
-
-		NO_SEMICOLON,
-		NO_RESULT,
+	protected final boolean fallback;
 
+	private static enum Flags {
 		BODY_ONLY,
 		BODY_ONLY_NOWRAP,
 	}
 
-	public InsnGen(MethodGen mgen, MethodNode mth, boolean fallback) {
+	public InsnGen(MethodGen mgen, boolean fallback) {
 		this.mgen = mgen;
-		this.mth = mth;
+		this.mth = mgen.getMethodNode();
 		this.root = mth.dex().root();
 		this.fallback = fallback;
 	}
@@ -77,144 +74,138 @@ public class InsnGen {
 		return fallback;
 	}
 
-	public String arg(InsnNode insn, int arg) throws CodegenException {
-		return arg(insn.getArg(arg));
+	public void addArgDot(CodeWriter code, InsnArg arg) throws CodegenException {
+		int len = code.length();
+		addArg(code, arg, true);
+		if (len != code.length()) {
+			code.add('.');
+		}
 	}
 
-	public String arg(InsnArg arg) throws CodegenException {
-		return arg(arg, true);
+	public void addArg(CodeWriter code, InsnArg arg) throws CodegenException {
+		addArg(code, arg, true);
 	}
 
-	public String arg(InsnArg arg, boolean wrap) throws CodegenException {
+	public void addArg(CodeWriter code, InsnArg arg, boolean wrap) throws CodegenException {
 		if (arg.isRegister()) {
-			return mgen.makeArgName((RegisterArg) arg);
+			code.add(mgen.getNameGen().useArg((RegisterArg) arg));
 		} else if (arg.isLiteral()) {
-			return lit((LiteralArg) arg);
+			code.add(lit((LiteralArg) arg));
 		} else if (arg.isInsnWrap()) {
-			CodeWriter code = new CodeWriter();
-			IGState flag = wrap ? IGState.BODY_ONLY : IGState.BODY_ONLY_NOWRAP;
+			Flags flag = wrap ? Flags.BODY_ONLY : Flags.BODY_ONLY_NOWRAP;
 			makeInsn(((InsnWrapArg) arg).getWrapInsn(), code, flag);
-			return code.toString();
 		} else if (arg.isNamed()) {
-			return ((NamedArg) arg).getName();
+			code.add(((NamedArg) arg).getName());
 		} else if (arg.isField()) {
 			FieldArg f = (FieldArg) arg;
 			if (f.isStatic()) {
-				return sfield(f.getField());
+				staticField(code, f.getField());
 			} else {
-				RegisterArg regArg = new RegisterArg(f.getRegNum());
-				regArg.replaceTypedVar(f);
-				return ifield(f.getField(), regArg);
+				instanceField(code, f.getField(), f.getInstanceArg());
 			}
 		} else {
 			throw new CodegenException("Unknown arg type " + arg);
 		}
 	}
 
-	public String assignVar(InsnNode insn) throws CodegenException {
+	public void assignVar(CodeWriter code, InsnNode insn) throws CodegenException {
 		RegisterArg arg = insn.getResult();
-		if (insn.getAttributes().contains(AttributeType.DECLARE_VARIABLE)) {
-			return declareVar(arg);
+		if (insn.contains(AFlag.DECLARE_VAR)) {
+			declareVar(code, arg);
 		} else {
-			return arg(arg);
+			addArg(code, arg, false);
 		}
 	}
 
-	public String declareVar(RegisterArg arg) {
-		return useType(arg.getType()) + " " + mgen.assignArg(arg);
+	public void declareVar(CodeWriter code, RegisterArg arg) {
+		useType(code, arg.getType());
+		code.add(' ');
+		code.add(mgen.getNameGen().assignArg(arg));
 	}
 
-	private String lit(LiteralArg arg) {
+	private static String lit(LiteralArg arg) {
 		return TypeGen.literalToString(arg.getLiteral(), arg.getType());
 	}
 
-	private String ifield(FieldInfo field, InsnArg arg) throws CodegenException {
+	private void instanceField(CodeWriter code, FieldInfo field, InsnArg arg) throws CodegenException {
 		FieldNode fieldNode = mth.getParentClass().searchField(field);
-		if(fieldNode != null && fieldNode.getAttributes().contains(AttributeFlag.DONT_GENERATE)) {
-			return "";
-		}
-		String name = field.getName();
-		// TODO: add jadx argument "add this"
-		// FIXME: check variable names in scope
-		if (false && arg.isThis()) {
-			boolean useShort = true;
-			List<RegisterArg> args = mth.getArguments(false);
-			for (RegisterArg param : args) {
-				String paramName = param.getTypedVar().getName();
-				if (paramName != null && paramName.equals(name)) {
-					useShort = false;
+		if (fieldNode != null) {
+			FieldReplaceAttr replace = fieldNode.get(AType.FIELD_REPLACE);
+			if (replace != null) {
+				FieldInfo info = replace.getFieldInfo();
+				if (replace.isOuterClass()) {
+					useClass(code, info.getDeclClass());
+					code.add(".this");
 				}
-			}
-			if (useShort) {
-				return name;
+				return;
 			}
 		}
-		String argStr = arg(arg);
-		return argStr.isEmpty() ? name : argStr + "." + name;
+		addArgDot(code, arg);
+		fieldNode = mth.dex().resolveField(field);
+		if (fieldNode != null) {
+			code.attachAnnotation(fieldNode);
+		}
+		code.add(field.getName());
 	}
 
-	protected String sfield(FieldInfo field) {
-		String thisClass = mth.getParentClass().getFullName();
+	public static void makeStaticFieldAccess(CodeWriter code, FieldInfo field, ClassGen clsGen) {
 		ClassInfo declClass = field.getDeclClass();
-		if (thisClass.startsWith(declClass.getFullName())) {
-			return field.getName();
+		boolean fieldFromThisClass = clsGen.getClassNode().getFullName().startsWith(declClass.getFullName());
+		if (!fieldFromThisClass) {
+			// Android specific resources class handler
+			ClassInfo parentClass = declClass.getParentClass();
+			if (parentClass != null && parentClass.getShortName().equals("R")) {
+				clsGen.useClass(code, parentClass);
+				code.add('.');
+				code.add(declClass.getShortName());
+			} else {
+				clsGen.useClass(code, declClass);
+			}
+			code.add('.');
 		}
-		// Android specific resources class handler
-		ClassInfo parentClass = declClass.getParentClass();
-		if (parentClass != null && parentClass.getShortName().equals("R")) {
-			return  useClass(parentClass) + "." + declClass.getShortName() + "." + field.getName();
+		FieldNode fieldNode = clsGen.getClassNode().dex().resolveField(field);
+		if (fieldNode != null) {
+			code.attachAnnotation(fieldNode);
 		}
-		return useClass(declClass) + '.' + field.getName();
+		code.add(field.getName());
 	}
 
-	private void fieldPut(IndexInsnNode insn) {
-		FieldInfo field = (FieldInfo) insn.getIndex();
-		String thisClass = mth.getParentClass().getFullName();
-		if (field.getDeclClass().getFullName().equals(thisClass)) {
-			// if we generate this field - don't init if its final and used
-			FieldNode fn = mth.getParentClass().searchField(field);
-			if (fn != null && fn.getAccessFlags().isFinal())
-				fn.getAttributes().remove(AttributeType.FIELD_VALUE);
-		}
+	protected void staticField(CodeWriter code, FieldInfo field) {
+		makeStaticFieldAccess(code, field, mgen.getClassGen());
 	}
 
-	public String useClass(ClassInfo cls) {
-		return mgen.getClassGen().useClass(cls);
+	public void useClass(CodeWriter code, ClassInfo cls) {
+		mgen.getClassGen().useClass(code, cls);
 	}
 
-	private String useType(ArgType type) {
-		return TypeGen.translate(mgen.getClassGen(), type);
+	private void useType(CodeWriter code, ArgType type) {
+		mgen.getClassGen().useType(code, type);
 	}
 
 	public boolean makeInsn(InsnNode insn, CodeWriter code) throws CodegenException {
 		return makeInsn(insn, code, null);
 	}
 
-	private boolean makeInsn(InsnNode insn, CodeWriter code, IGState flag) throws CodegenException {
+	private boolean makeInsn(InsnNode insn, CodeWriter code, Flags flag) throws CodegenException {
 		try {
-			EnumSet<IGState> state = EnumSet.noneOf(IGState.class);
-			if (flag == IGState.BODY_ONLY || flag == IGState.BODY_ONLY_NOWRAP) {
+			if (insn.getType() == InsnType.NOP) {
+				return false;
+			}
+			EnumSet<Flags> state = EnumSet.noneOf(Flags.class);
+			if (flag == Flags.BODY_ONLY || flag == Flags.BODY_ONLY_NOWRAP) {
 				state.add(flag);
 				makeInsnBody(code, insn, state);
 			} else {
-				CodeWriter body = new CodeWriter(code.getIndent());
-				makeInsnBody(body, insn, state);
-				if (state.contains(IGState.SKIP)) {
-					return false;
-				}
-
 				code.startLine();
 				if (insn.getSourceLine() != 0) {
-					code.attachAnnotation(insn.getSourceLine());
+					code.attachSourceLine(insn.getSourceLine());
 				}
-				if (insn.getResult() != null && !state.contains(IGState.NO_RESULT)) {
-					code.add(assignVar(insn)).add(" = ");
-				}
-				code.add(body);
-
-				if (!state.contains(IGState.NO_SEMICOLON)) {
-					code.add(';');
+				if (insn.getResult() != null && insn.getType() != InsnType.ARITH_ONEARG) {
+					assignVar(code, insn);
+					code.add(" = ");
 				}
+				makeInsnBody(code, insn, state);
+				code.add(';');
 			}
 		} catch (Throwable th) {
 			throw new CodegenException(mth, "Error generate insn: " + insn, th);
@@ -222,7 +213,7 @@ public class InsnGen {
 		return true;
 	}
 
-	private void makeInsnBody(CodeWriter code, InsnNode insn, EnumSet<IGState> state) throws CodegenException {
+	private void makeInsnBody(CodeWriter code, InsnNode insn, EnumSet<Flags> state) throws CodegenException {
 		switch (insn.getType()) {
 			case CONST_STR:
 				String str = ((ConstStringNode) insn).getString();
@@ -231,7 +222,8 @@ public class InsnGen {
 
 			case CONST_CLASS:
 				ArgType clsType = ((ConstClassNode) insn).getClsType();
-				code.add(useType(clsType)).add(".class");
+				useType(code, clsType);
+				code.add(".class");
 				break;
 
 			case CONST:
@@ -240,40 +232,53 @@ public class InsnGen {
 				break;
 
 			case MOVE:
-				code.add(arg(insn.getArg(0), false));
+				addArg(code, insn.getArg(0), false);
 				break;
 
 			case CHECK_CAST:
 			case CAST: {
-				boolean wrap = state.contains(IGState.BODY_ONLY);
-				if (wrap)
-					code.add("(");
-				code.add("(");
-				code.add(useType(((ArgType) ((IndexInsnNode) insn).getIndex())));
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
+				code.add('(');
+				useType(code, (ArgType) ((IndexInsnNode) insn).getIndex());
 				code.add(") ");
-				code.add(arg(insn.getArg(0)));
-				if (wrap)
-					code.add(")");
+				addArg(code, insn.getArg(0), true);
+				if (wrap) {
+					code.add(')');
+				}
 				break;
 			}
+
 			case ARITH:
 				makeArith((ArithNode) insn, code, state);
 				break;
 
-			case NEG:
-				String base = "-" + arg(insn.getArg(0));
-				if (state.contains(IGState.BODY_ONLY)) {
-					code.add('(').add(base).add(')');
-				} else {
-					code.add(base);
-				}
+			case ARITH_ONEARG:
+				makeArithOneArg((ArithNode) insn, code);
 				break;
 
+			case NEG: {
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
+				code.add('-');
+				addArg(code, insn.getArg(0));
+				if (wrap) {
+					code.add(')');
+				}
+				break;
+			}
+
 			case RETURN:
-				if (insn.getArgsCount() != 0)
-					code.add("return ").add(arg(insn.getArg(0), false));
-				else
+				if (insn.getArgsCount() != 0) {
+					code.add("return ");
+					addArg(code, insn.getArg(0), false);
+				} else {
 					code.add("return");
+				}
 				break;
 
 			case BREAK:
@@ -285,29 +290,38 @@ public class InsnGen {
 				break;
 
 			case THROW:
-				code.add("throw ").add(arg(insn.getArg(0), true));
+				code.add("throw ");
+				addArg(code, insn.getArg(0), true);
 				break;
 
 			case CMP_L:
 			case CMP_G:
-				code.add(String.format("(%1$s > %2$s ? 1 : (%1$s == %2$s ? 0 : -1))", arg(insn, 0), arg(insn, 1)));
+				code.add('(');
+				addArg(code, insn.getArg(0));
+				code.add(" > ");
+				addArg(code, insn.getArg(1));
+				code.add(" ? 1 : (");
+				addArg(code, insn.getArg(0));
+				code.add(" == ");
+				addArg(code, insn.getArg(1));
+				code.add("? 0 : -1))");
 				break;
 
 			case INSTANCE_OF: {
-				boolean wrap = state.contains(IGState.BODY_ONLY);
+				boolean wrap = state.contains(Flags.BODY_ONLY);
 				if (wrap) {
 					code.add('(');
 				}
-				code.add(arg(insn, 0));
+				addArg(code, insn.getArg(0));
 				code.add(" instanceof ");
-				code.add(useType((ArgType) ((IndexInsnNode) insn).getIndex()));
+				useType(code, (ArgType) ((IndexInsnNode) insn).getIndex());
 				if (wrap) {
 					code.add(')');
 				}
 				break;
 			}
 			case CONSTRUCTOR:
-				makeConstructor((ConstructorInsn) insn, code, state);
+				makeConstructor((ConstructorInsn) insn, code);
 				break;
 
 			case INVOKE:
@@ -316,15 +330,21 @@ public class InsnGen {
 
 			case NEW_ARRAY: {
 				ArgType arrayType = insn.getResult().getType();
+				code.add("new ");
+				useType(code, arrayType.getArrayRootElement());
+				code.add('[');
+				addArg(code, insn.getArg(0));
+				code.add(']');
 				int dim = arrayType.getArrayDimension();
-				code.add("new ").add(useType(arrayType.getArrayRootElement())).add('[').add(arg(insn, 0)).add(']');
-				for (int i = 0; i < dim - 1; i++)
+				for (int i = 0; i < dim - 1; i++) {
 					code.add("[]");
+				}
 				break;
 			}
 
 			case ARRAY_LENGTH:
-				code.add(arg(insn, 0)).add(".length");
+				addArg(code, insn.getArg(0));
+				code.add(".length");
 				break;
 
 			case FILL_ARRAY:
@@ -336,62 +356,72 @@ public class InsnGen {
 				break;
 
 			case AGET:
-				code.add(arg(insn.getArg(0))).add('[').add(arg(insn.getArg(1), false)).add(']');
+				addArg(code, insn.getArg(0));
+				code.add('[');
+				addArg(code, insn.getArg(1), false);
+				code.add(']');
 				break;
 
 			case APUT:
-				code.add(arg(insn, 0)).add('[').add(arg(insn.getArg(1), false)).add("] = ").add(arg(insn.getArg(2), false));
+				addArg(code, insn.getArg(0));
+				code.add('[');
+				addArg(code, insn.getArg(1), false);
+				code.add("] = ");
+				addArg(code, insn.getArg(2), false);
 				break;
 
 			case IGET: {
 				FieldInfo fieldInfo = (FieldInfo) ((IndexInsnNode) insn).getIndex();
-				code.add(ifield(fieldInfo, insn.getArg(0)));
+				instanceField(code, fieldInfo, insn.getArg(0));
 				break;
 			}
 			case IPUT: {
 				FieldInfo fieldInfo = (FieldInfo) ((IndexInsnNode) insn).getIndex();
-				code.add(ifield(fieldInfo, insn.getArg(1))).add(" = ").add(arg(insn.getArg(0), false));
+				instanceField(code, fieldInfo, insn.getArg(1));
+				code.add(" = ");
+				addArg(code, insn.getArg(0), false);
 				break;
 			}
 
 			case SGET:
-				code.add(sfield((FieldInfo) ((IndexInsnNode) insn).getIndex()));
+				staticField(code, (FieldInfo) ((IndexInsnNode) insn).getIndex());
 				break;
 			case SPUT:
-				IndexInsnNode node = (IndexInsnNode) insn;
-				fieldPut(node);
-				code.add(sfield((FieldInfo) node.getIndex())).add(" = ").add(arg(node.getArg(0), false));
+				FieldInfo field = (FieldInfo) ((IndexInsnNode) insn).getIndex();
+				staticField(code, field);
+				code.add(" = ");
+				addArg(code, insn.getArg(0), false);
 				break;
 
 			case STR_CONCAT:
-				StringBuilder sb = new StringBuilder();
+				boolean wrap = state.contains(Flags.BODY_ONLY);
+				if (wrap) {
+					code.add('(');
+				}
 				for (Iterator<InsnArg> it = insn.getArguments().iterator(); it.hasNext(); ) {
-					sb.append(arg(it.next()));
+					addArg(code, it.next());
 					if (it.hasNext()) {
-						sb.append(" + ");
+						code.add(" + ");
 					}
 				}
-				// TODO: wrap in braces only if necessary
-				if (state.contains(IGState.BODY_ONLY)) {
-					code.add('(').add(sb.toString()).add(')');
-				} else {
-					code.add(sb.toString());
+				if (wrap) {
+					code.add(')');
 				}
 				break;
 
 			case MONITOR_ENTER:
 				if (isFallback()) {
-					code.add("monitor-enter(").add(arg(insn.getArg(0))).add(')');
-				} else {
-					state.add(IGState.SKIP);
+					code.add("monitor-enter(");
+					addArg(code, insn.getArg(0));
+					code.add(')');
 				}
 				break;
 
 			case MONITOR_EXIT:
 				if (isFallback()) {
-					code.add("monitor-exit(").add(arg(insn, 0)).add(')');
-				} else {
-					state.add(IGState.SKIP);
+					code.add("monitor-exit(");
+					addArg(code, insn.getArg(0));
+					code.add(')');
 				}
 				break;
 
@@ -399,28 +429,31 @@ public class InsnGen {
 				if (isFallback()) {
 					code.add("move-exception");
 				} else {
-					code.add(arg(insn, 0));
+					addArg(code, insn.getArg(0));
 				}
 				break;
 
 			case TERNARY:
+				makeTernary((TernaryInsn) insn, code, state);
 				break;
 
 			case ARGS:
-				code.add(arg(insn, 0));
+				addArg(code, insn.getArg(0));
 				break;
 
-			case NOP:
-				state.add(IGState.SKIP);
+			case PHI:
 				break;
 
 			/* fallback mode instructions */
 			case IF:
 				assert isFallback() : "if insn in not fallback mode";
 				IfNode ifInsn = (IfNode) insn;
-				String cond = arg(insn.getArg(0)) + " " + ifInsn.getOp().getSymbol() + " "
-						+ (ifInsn.isZeroCmp() ? "0" : arg(insn.getArg(1)));
-				code.add("if (").add(cond).add(") goto ").add(MethodGen.getLabelName(ifInsn.getTarget()));
+				code.add("if (");
+				addArg(code, insn.getArg(0));
+				code.add(' ');
+				code.add(ifInsn.getOp().getSymbol()).add(' ');
+				addArg(code, insn.getArg(1));
+				code.add(") goto ").add(MethodGen.getLabelName(ifInsn.getTarget()));
 				break;
 
 			case GOTO:
@@ -431,16 +464,19 @@ public class InsnGen {
 			case SWITCH:
 				assert isFallback();
 				SwitchNode sw = (SwitchNode) insn;
-				code.add("switch(").add(arg(insn, 0)).add(") {");
+				code.add("switch(");
+				addArg(code, insn.getArg(0));
+				code.add(") {");
 				code.incIndent();
 				for (int i = 0; i < sw.getCasesCount(); i++) {
-					code.startLine("case " + sw.getKeys()[i]
-							+ ": goto " + MethodGen.getLabelName(sw.getTargets()[i]) + ";");
+					String key = sw.getKeys()[i].toString();
+					code.startLine("case ").add(key).add(": goto ");
+					code.add(MethodGen.getLabelName(sw.getTargets()[i])).add(';');
 				}
-				code.startLine("default: goto " + MethodGen.getLabelName(sw.getDefaultCaseOffset()) + ";");
+				code.startLine("default: goto ");
+				code.add(MethodGen.getLabelName(sw.getDefaultCaseOffset())).add(';');
 				code.decIndent();
 				code.startLine('}');
-				state.add(IGState.NO_SEMICOLON);
 				break;
 
 			case NEW_INSTANCE:
@@ -456,12 +492,14 @@ public class InsnGen {
 
 	private void filledNewArray(InsnNode insn, CodeWriter code) throws CodegenException {
 		int c = insn.getArgsCount();
-		code.add("new ").add(useType(insn.getResult().getType()));
+		code.add("new ");
+		useType(code, insn.getResult().getType());
 		code.add('{');
 		for (int i = 0; i < c; i++) {
-			code.add(arg(insn, i));
-			if (i + 1 < c)
+			addArg(code, insn.getArg(i));
+			if (i + 1 < c) {
 				code.add(", ");
+			}
 		}
 		code.add('}');
 	}
@@ -473,7 +511,8 @@ public class InsnGen {
 		if (!elType.equals(insnElementType) && !insnArrayType.equals(ArgType.OBJECT)) {
 			ErrorsCounter.methodError(mth,
 					"Incorrect type for fill-array insn " + InsnUtils.formatOffset(insn.getOffset())
-							+ ", element type: " + elType + ", insn element type: " + insnElementType);
+							+ ", element type: " + elType + ", insn element type: " + insnElementType
+			);
 			if (!elType.isTypeKnown()) {
 				elType = insnElementType.isTypeKnown() ? insnElementType : elType.selectFirst();
 			}
@@ -519,10 +558,12 @@ public class InsnGen {
 		}
 		int len = str.length();
 		str.delete(len - 2, len);
-		code.add("new ").add(useType(elType)).add("[]{").add(str.toString()).add('}');
+		code.add("new ");
+		useType(code, elType);
+		code.add("[]{").add(str.toString()).add('}');
 	}
 
-	private void makeConstructor(ConstructorInsn insn, CodeWriter code, EnumSet<IGState> state)
+	private void makeConstructor(ConstructorInsn insn, CodeWriter code)
 			throws CodegenException {
 		ClassNode cls = mth.dex().resolveClass(insn.getClassType());
 		if (cls != null && cls.isAnonymous()) {
@@ -533,29 +574,35 @@ public class InsnGen {
 			} else {
 				parent = cls.getSuperClass();
 			}
+			cls.add(AFlag.DONT_GENERATE);
 			MethodNode defCtr = cls.getDefaultConstructor();
-			if (RegionUtils.notEmpty(defCtr.getRegion())) {
-				defCtr.getAttributes().add(AttributeFlag.ANONYMOUS_CONSTRUCTOR);
-			} else {
-				defCtr.getAttributes().add(AttributeFlag.DONT_GENERATE);
+			if (defCtr != null) {
+				if (RegionUtils.notEmpty(defCtr.getRegion())) {
+					defCtr.add(AFlag.ANONYMOUS_CONSTRUCTOR);
+				} else {
+					defCtr.add(AFlag.DONT_GENERATE);
+				}
 			}
-			code.add("new ").add(parent == null ? "Object" : useClass(parent)).add("() ");
-			code.incIndent(2);
-			new ClassGen(cls, mgen.getClassGen().getParentGen(), fallback).makeClassBody(code);
-			code.decIndent(2);
+			code.add("new ");
+			if (parent == null) {
+				code.add("Object");
+			} else {
+				useClass(code, parent);
+			}
+			code.add("() ");
+			new ClassGen(cls, mgen.getClassGen().getParentGen(), fallback).addClassBody(code);
 			return;
 		}
 		if (insn.isSelf()) {
-			// skip
-			state.add(IGState.SKIP);
-			return;
+			throw new JadxRuntimeException("Constructor 'self' invoke must be removed!");
 		}
 		if (insn.isSuper()) {
 			code.add("super");
 		} else if (insn.isThis()) {
 			code.add("this");
 		} else {
-			code.add("new ").add(useClass(insn.getClassType()));
+			code.add("new ");
+			useClass(code, insn.getClassType());
 		}
 		generateArguments(code, insn, 0, mth.dex().resolveMethod(insn.getCallMth()));
 	}
@@ -565,9 +612,7 @@ public class InsnGen {
 
 		// inline method
 		MethodNode callMthNode = mth.dex().resolveMethod(callMth);
-		if (callMthNode != null
-				&& callMthNode.getAttributes().contains(AttributeType.METHOD_INLINE)) {
-			inlineMethod(callMthNode, insn, code);
+		if (callMthNode != null && inlineMethod(callMthNode, insn, code)) {
 			return;
 		}
 
@@ -580,10 +625,7 @@ public class InsnGen {
 				InsnArg arg = insn.getArg(0);
 				// FIXME: add 'this' for equals methods in scope
 				if (!arg.isThis()) {
-					String argStr = arg(arg);
-					if(!argStr.isEmpty()) {
-						code.add(argStr).add('.');
-					}
+					addArgDot(code, arg);
 				}
 				k++;
 				break;
@@ -598,16 +640,20 @@ public class InsnGen {
 				ClassInfo insnCls = mth.getParentClass().getClassInfo();
 				ClassInfo declClass = callMth.getDeclClass();
 				if (!insnCls.equals(declClass)) {
-					code.add(useClass(declClass)).add('.');
+					useClass(code, declClass);
+					code.add('.');
 				}
 				break;
 		}
+		if (callMthNode != null) {
+			code.attachAnnotation(callMthNode);
+		}
 		code.add(callMth.getName());
 		generateArguments(code, insn, k, callMthNode);
 	}
 
 	private void generateArguments(CodeWriter code, InsnNode insn, int k, MethodNode callMth) throws CodegenException {
-		if (callMth != null && callMth.getAttributes().contains(AttributeFlag.SKIP_FIRST_ARG)) {
+		if (callMth != null && callMth.contains(AFlag.SKIP_FIRST_ARG)) {
 			k++;
 		}
 		int argsCount = insn.getArgsCount();
@@ -620,9 +666,12 @@ public class InsnGen {
 				InsnArg arg = insn.getArg(i);
 				ArgType origType = originalType.get(origPos);
 				if (!arg.getType().equals(origType)) {
-					code.add('(').add(useType(origType)).add(')').add(arg(arg, true));
+					code.add('(');
+					useType(code, origType);
+					code.add(')');
+					addArg(code, arg, true);
 				} else {
-					code.add(arg(arg, false));
+					addArg(code, arg, false);
 				}
 				if (i < argsCount - 1) {
 					code.add(", ");
@@ -633,21 +682,24 @@ public class InsnGen {
 		} else {
 			code.add('(');
 			if (k < argsCount) {
-				code.add(arg(insn.getArg(k), false));
+				addArg(code, insn.getArg(k), false);
 				for (int i = k + 1; i < argsCount; i++) {
 					code.add(", ");
-					code.add(arg(insn.getArg(i), false));
+					addArg(code, insn.getArg(i), false);
 				}
 			}
 			code.add(')');
 		}
 	}
 
-	private void inlineMethod(MethodNode callMthNode, InvokeNode insn, CodeWriter code) throws CodegenException {
-		IAttribute mia = callMthNode.getAttributes().get(AttributeType.METHOD_INLINE);
-		InsnNode inl = ((MethodInlineAttr) mia).getInsn();
+	private boolean inlineMethod(MethodNode callMthNode, InvokeNode insn, CodeWriter code) throws CodegenException {
+		MethodInlineAttr mia = callMthNode.get(AType.METHOD_INLINE);
+		if (mia == null) {
+			return false;
+		}
+		InsnNode inl = mia.getInsn();
 		if (callMthNode.getMethodInfo().getArgumentsTypes().isEmpty()) {
-			makeInsn(inl, code, IGState.BODY_ONLY);
+			makeInsn(inl, code, Flags.BODY_ONLY);
 		} else {
 			// remap args
 			InsnArg[] regs = new InsnArg[callMthNode.getRegsCount()];
@@ -662,53 +714,82 @@ public class InsnGen {
 			inl.getRegisterArgs(inlArgs);
 			Map<RegisterArg, InsnArg> toRevert = new HashMap<RegisterArg, InsnArg>();
 			for (RegisterArg r : inlArgs) {
-				if (r.getRegNum() >= regs.length) {
-					LOG.warn("Unknown register number {} in method call: {}, {}", r, callMthNode, mth);
+				int regNum = r.getRegNum();
+				if (regNum >= regs.length) {
+					LOG.warn("Unknown register number {} in method call: {} from {}", r, callMthNode, mth);
 				} else {
-					InsnArg repl = regs[r.getRegNum()];
+					InsnArg repl = regs[regNum];
 					if (repl == null) {
-						LOG.warn("Not passed register {} in method call: {}, {}", r, callMthNode, mth);
+						LOG.warn("Not passed register {} in method call: {} from {}", r, callMthNode, mth);
 					} else {
 						inl.replaceArg(r, repl);
 						toRevert.put(r, repl);
 					}
 				}
 			}
-			makeInsn(inl, code, IGState.BODY_ONLY);
-			// revert changes
-			for (Entry<RegisterArg, InsnArg> e : toRevert.entrySet()) {
+			makeInsn(inl, code, Flags.BODY_ONLY);
+			// revert changes in 'MethodInlineAttr'
+			for (Map.Entry<RegisterArg, InsnArg> e : toRevert.entrySet()) {
 				inl.replaceArg(e.getValue(), e.getKey());
 			}
 		}
+		return true;
 	}
 
-	private void makeArith(ArithNode insn, CodeWriter code, EnumSet<IGState> state) throws CodegenException {
-		ArithOp op = insn.getOp();
-		String v1 = arg(insn.getArg(0));
-		String v2 = arg(insn.getArg(1));
-		if (state.contains(IGState.BODY_ONLY)) {
-			// wrap insn in brackets for save correct operation order
-			code.add('(').add(v1).add(' ').add(op.getSymbol()).add(' ').add(v2).add(')');
-		} else if (state.contains(IGState.BODY_ONLY_NOWRAP)) {
-			code.add(v1).add(' ').add(op.getSymbol()).add(' ').add(v2);
+	private void makeTernary(TernaryInsn insn, CodeWriter code, EnumSet<Flags> state) throws CodegenException {
+		boolean wrap = state.contains(Flags.BODY_ONLY);
+		if (wrap) {
+			code.add('(');
+		}
+		InsnArg first = insn.getArg(0);
+		InsnArg second = insn.getArg(1);
+		ConditionGen condGen = new ConditionGen(this);
+		if (first.equals(LiteralArg.TRUE) && second.equals(LiteralArg.FALSE)) {
+			condGen.add(code, insn.getCondition());
 		} else {
-			String res = arg(insn.getResult());
-			if (res.equals(v1) && insn.getResult().equals(insn.getArg(0))) {
-				state.add(IGState.NO_RESULT);
-				// "++" or "--"
-				if (insn.getArg(1).isLiteral() && (op == ArithOp.ADD || op == ArithOp.SUB)) {
-					LiteralArg lit = (LiteralArg) insn.getArg(1);
-					if (lit.isInteger() && lit.getLiteral() == 1) {
-						code.add(assignVar(insn)).add(op.getSymbol()).add(op.getSymbol());
-						return;
-					}
-				}
-				// +=, -= ...
-				v2 = arg(insn.getArg(1), false);
-				code.add(assignVar(insn)).add(' ').add(op.getSymbol()).add("= ").add(v2);
-			} else {
-				code.add(v1).add(' ').add(op.getSymbol()).add(' ').add(v2);
-			}
+			condGen.wrap(code, insn.getCondition());
+			code.add(" ? ");
+			addArg(code, first, false);
+			code.add(" : ");
+			addArg(code, second, false);
+		}
+		if (wrap) {
+			code.add(')');
 		}
 	}
+
+	private void makeArith(ArithNode insn, CodeWriter code, EnumSet<Flags> state) throws CodegenException {
+		// wrap insn in brackets for save correct operation order
+		boolean wrap = state.contains(Flags.BODY_ONLY) && !insn.contains(AFlag.DONT_WRAP);
+		if (wrap) {
+			code.add('(');
+		}
+		addArg(code, insn.getArg(0));
+		code.add(' ');
+		code.add(insn.getOp().getSymbol());
+		code.add(' ');
+		addArg(code, insn.getArg(1));
+		if (wrap) {
+			code.add(')');
+		}
+	}
+
+	private void makeArithOneArg(ArithNode insn, CodeWriter code) throws CodegenException {
+		ArithOp op = insn.getOp();
+		InsnArg arg = insn.getArg(0);
+		// "++" or "--"
+		if (arg.isLiteral() && (op == ArithOp.ADD || op == ArithOp.SUB)) {
+			LiteralArg lit = (LiteralArg) arg;
+			if (lit.isInteger() && lit.getLiteral() == 1) {
+				assignVar(code, insn);
+				String opSymbol = op.getSymbol();
+				code.add(opSymbol).add(opSymbol);
+				return;
+			}
+		}
+		// +=, -= ...
+		assignVar(code, insn);
+		code.add(' ').add(op.getSymbol()).add("= ");
+		addArg(code, arg, false);
+	}
 }

jadx-core/src/main/java/jadx/core/codegen/MethodGen.java

@@ -1,19 +1,17 @@
 package jadx.core.codegen;
 
-import jadx.core.Consts;
-import jadx.core.dex.attributes.AttributeFlag;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.AttributesList;
-import jadx.core.dex.attributes.JadxErrorAttr;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.annotations.MethodParameters;
+import jadx.core.dex.attributes.nodes.JadxErrorAttr;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.instructions.args.ArgType;
-import jadx.core.dex.instructions.args.NamedArg;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.dex.nodes.MethodNode;
+import jadx.core.dex.regions.Region;
 import jadx.core.dex.trycatch.CatchAttr;
-import jadx.core.dex.visitors.DepthTraverser;
+import jadx.core.dex.visitors.DepthTraversal;
 import jadx.core.dex.visitors.FallbackModeVisitor;
 import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.InsnUtils;
@@ -21,10 +19,8 @@ import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.CodegenException;
 import jadx.core.utils.exceptions.DecodeException;
 
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,60 +32,63 @@ public class MethodGen {
 
 	private final MethodNode mth;
 	private final ClassGen classGen;
-	private final boolean fallback;
 	private final AnnotationGen annotationGen;
-
-	private final Set<String> varNames = new HashSet<String>();
+	private final NameGen nameGen;
 
 	public MethodGen(ClassGen classGen, MethodNode mth) {
 		this.mth = mth;
 		this.classGen = classGen;
-		this.fallback = classGen.isFallbackMode();
 		this.annotationGen = classGen.getAnnotationGen();
-
-		List<RegisterArg> args = mth.getArguments(true);
-		for (RegisterArg arg : args) {
-			varNames.add(makeArgName(arg));
-		}
+		this.nameGen = new NameGen(classGen.isFallbackMode());
 	}
 
 	public ClassGen getClassGen() {
 		return classGen;
 	}
 
+	public NameGen getNameGen() {
+		return nameGen;
+	}
+
+	public MethodNode getMethodNode() {
+		return mth;
+	}
+
 	public boolean addDefinition(CodeWriter code) {
 		if (mth.getMethodInfo().isClassInit()) {
 			code.startLine("static");
-			code.attachAnnotation(mth);
+			code.attachDefinition(mth);
 			return true;
 		}
-		if (mth.getAttributes().contains(AttributeFlag.ANONYMOUS_CONSTRUCTOR)) {
+		if (mth.contains(AFlag.ANONYMOUS_CONSTRUCTOR)) {
 			// don't add method name and arguments
 			code.startLine();
-			code.attachAnnotation(mth);
+			code.attachDefinition(mth);
 			return false;
 		}
 		annotationGen.addForMethod(code, mth);
 
 		AccessInfo clsAccFlags = mth.getParentClass().getAccessFlags();
 		AccessInfo ai = mth.getAccessFlags();
-		// don't add 'abstract' to methods in interface
+		// don't add 'abstract' and 'public' to methods in interface
 		if (clsAccFlags.isInterface()) {
 			ai = ai.remove(AccessFlags.ACC_ABSTRACT);
+			ai = ai.remove(AccessFlags.ACC_PUBLIC);
 		}
 		// don't add 'public' for annotations
 		if (clsAccFlags.isAnnotation()) {
 			ai = ai.remove(AccessFlags.ACC_PUBLIC);
 		}
 		code.startLine(ai.makeString());
+		code.attachSourceLine(mth.getSourceLine());
 
-		if (classGen.makeGenericMap(code, mth.getGenericMap())) {
+		if (classGen.addGenericMap(code, mth.getGenericMap())) {
 			code.add(' ');
 		}
 		if (mth.getAccessFlags().isConstructor()) {
 			code.add(classGen.getClassNode().getShortName()); // constructor
 		} else {
-			code.add(TypeGen.translate(classGen, mth.getReturnType()));
+			classGen.useType(code, mth.getReturnType());
 			code.add(' ');
 			code.add(mth.getName());
 		}
@@ -97,7 +96,7 @@ public class MethodGen {
 
 		List<RegisterArg> args = mth.getArguments(false);
 		if (mth.getMethodInfo().isConstructor()
-				&& mth.getParentClass().getAttributes().contains(AttributeType.ENUM_CLASS)) {
+				&& mth.getParentClass().contains(AType.ENUM_CLASS)) {
 			if (args.size() == 2) {
 				args.clear();
 			} else if (args.size() > 2) {
@@ -105,133 +104,60 @@ public class MethodGen {
 			} else {
 				LOG.warn(ErrorsCounter.formatErrorMsg(mth,
 						"Incorrect number of args for enum constructor: " + args.size()
-								+ " (expected >= 2)"));
+								+ " (expected >= 2)"
+				));
 			}
 		}
-		code.add(makeArguments(args));
-		code.add(")");
+		addMethodArguments(code, args);
+		code.add(')');
 
 		annotationGen.addThrows(mth, code);
-		code.attachAnnotation(mth);
+		code.attachDefinition(mth);
 		return true;
 	}
 
-	public CodeWriter makeArguments(List<RegisterArg> args) {
-		CodeWriter argsCode = new CodeWriter();
-
-		MethodParameters paramsAnnotation =
-				(MethodParameters) mth.getAttributes().get(AttributeType.ANNOTATION_MTH_PARAMETERS);
-
+	private void addMethodArguments(CodeWriter argsCode, List<RegisterArg> args) {
+		MethodParameters paramsAnnotation = mth.get(AType.ANNOTATION_MTH_PARAMETERS);
 		int i = 0;
 		for (Iterator<RegisterArg> it = args.iterator(); it.hasNext(); ) {
 			RegisterArg arg = it.next();
 
 			// add argument annotation
-			if (paramsAnnotation != null)
+			if (paramsAnnotation != null) {
 				annotationGen.addForParameter(argsCode, paramsAnnotation, i);
-
+			}
 			if (!it.hasNext() && mth.getAccessFlags().isVarArgs()) {
 				// change last array argument to varargs
 				ArgType type = arg.getType();
 				if (type.isArray()) {
 					ArgType elType = type.getArrayElement();
-					argsCode.add(TypeGen.translate(classGen, elType));
+					classGen.useType(argsCode, elType);
 					argsCode.add(" ...");
 				} else {
 					LOG.warn(ErrorsCounter.formatErrorMsg(mth, "Last argument in varargs method not array"));
-					argsCode.add(TypeGen.translate(classGen, arg.getType()));
+					classGen.useType(argsCode, arg.getType());
 				}
 			} else {
-				argsCode.add(TypeGen.translate(classGen, arg.getType()));
+				classGen.useType(argsCode, arg.getType());
 			}
 			argsCode.add(' ');
-			argsCode.add(makeArgName(arg));
+			argsCode.add(nameGen.assignArg(arg));
 
 			i++;
-			if (it.hasNext())
+			if (it.hasNext()) {
 				argsCode.add(", ");
-		}
-		return argsCode;
-	}
-
-	/**
-	 * Make variable name for register,
-	 * Name contains register number and
-	 * variable type or name (if debug info available)
-	 */
-	public String makeArgName(RegisterArg arg) {
-		String name = arg.getTypedVar().getName();
-		String base = "r" + arg.getRegNum();
-		if (fallback) {
-			if (name != null)
-				return base + "_" + name;
-			else
-				return base;
-		} else {
-			if (name != null) {
-				if (name.equals("this"))
-					return name;
-				else if (Consts.DEBUG)
-					return name + "_" + base;
-				else
-					return name;
-			} else {
-				ArgType type = arg.getType();
-				if (type.isPrimitive())
-					return base + type.getPrimitiveType().getShortName().toLowerCase();
-				else
-					return base + "_" + Utils.escape(TypeGen.translate(classGen, arg.getType()));
 			}
 		}
 	}
 
-	/**
-	 * Put variable declaration and return variable name (used for assignments)
-	 *
-	 * @param arg register variable
-	 * @return variable name
-	 */
-	public String assignArg(RegisterArg arg) {
-		String name = makeArgName(arg);
-		if (varNames.add(name) || fallback)
-			return name;
-
-		name = getUniqVarName(name);
-		arg.getTypedVar().setName(name);
-		return name;
-	}
-
-	public String assignNamedArg(NamedArg arg) {
-		String name = arg.getName();
-		if (varNames.add(name) || fallback)
-			return name;
-
-		name = getUniqVarName(name);
-		arg.setName(name);
-		return name;
-	}
-
-	private String getUniqVarName(String name) {
-		String r;
-		int i = 2;
-		do {
-			r = name + "_" + i;
-			i++;
-		} while (varNames.contains(r));
-		varNames.add(r);
-		return r;
-	}
-
-	public CodeWriter makeInstructions(int mthIndent) throws CodegenException {
-		CodeWriter code = new CodeWriter(mthIndent + 1);
-
-		if (mth.getAttributes().contains(AttributeType.JADX_ERROR)) {
+	public void addInstructions(CodeWriter code) throws CodegenException {
+		if (mth.contains(AType.JADX_ERROR)) {
 			code.startLine("throw new UnsupportedOperationException(\"Method not decompiled: ");
 			code.add(mth.toString());
 			code.add("\");");
 
-			JadxErrorAttr err = (JadxErrorAttr) mth.getAttributes().get(AttributeType.JADX_ERROR);
-			code.startLine("// jadx: method processing error");
+			JadxErrorAttr err = mth.get(AType.JADX_ERROR);
+			code.startLine("/* JADX: method processing error */");
 			Throwable cause = err.getCause();
 			if (cause != null) {
 				code.newLine();
@@ -240,56 +166,66 @@ public class MethodGen {
 				code.add("*/");
 			}
 			makeMethodDump(code);
+		} else if (mth.contains(AFlag.INCONSISTENT_CODE)) {
+			code.startLine("/*");
+			addFallbackMethodCode(code);
+			code.startLine("*/");
+			code.newLine();
 		} else {
-			if (mth.getRegion() != null) {
-				CodeWriter insns = new CodeWriter(mthIndent + 1);
-				(new RegionGen(this, mth)).makeRegion(insns, mth.getRegion());
-				code.add(insns);
+			Region startRegion = mth.getRegion();
+			if (startRegion != null) {
+				(new RegionGen(this)).makeRegion(code, startRegion);
 			} else {
-				makeFallbackMethod(code, mth);
+				addFallbackMethodCode(code);
 			}
 		}
-		return code;
 	}
 
-	public void makeMethodDump(CodeWriter code) {
+	private void makeMethodDump(CodeWriter code) {
 		code.startLine("/*");
 		getFallbackMethodGen(mth).addDefinition(code);
 		code.add(" {");
 		code.incIndent();
 
-		makeFallbackMethod(code, mth);
+		addFallbackMethodCode(code);
 
 		code.decIndent();
 		code.startLine('}');
 		code.startLine("*/");
 	}
 
-	private void makeFallbackMethod(CodeWriter code, MethodNode mth) {
+	public void addFallbackMethodCode(CodeWriter code) {
 		if (mth.getInstructions() == null) {
-			// loadFile original instructions
+			// load original instructions
 			try {
 				mth.load();
-				DepthTraverser.visit(new FallbackModeVisitor(), mth);
+				DepthTraversal.visit(new FallbackModeVisitor(), mth);
 			} catch (DecodeException e) {
-				// ignore
-				code.startLine("Can't loadFile method instructions");
+				LOG.error("Error reload instructions in fallback mode:", e);
+				code.startLine("// Can't loadFile method instructions: " + e.getMessage());
 				return;
 			}
 		}
-		if (mth.getThisArg() != null) {
-			code.startLine(getFallbackMethodGen(mth).makeArgName(mth.getThisArg())).add(" = this;");
+		InsnNode[] insnArr = mth.getInstructions();
+		if (insnArr == null) {
+			code.startLine("// Can't load method instructions.");
+			return;
 		}
-		makeFallbackInsns(code, mth, mth.getInstructions(), true);
+		if (mth.getThisArg() != null) {
+			code.startLine(getFallbackMethodGen(mth).nameGen.useArg(mth.getThisArg())).add(" = this;");
+		}
+		addFallbackInsns(code, mth, insnArr, true);
 	}
 
-	public static void makeFallbackInsns(CodeWriter code, MethodNode mth, List<InsnNode> insns, boolean addLabels) {
-		InsnGen insnGen = new InsnGen(getFallbackMethodGen(mth), mth, true);
-		for (InsnNode insn : insns) {
-			AttributesList attrs = insn.getAttributes();
+	public static void addFallbackInsns(CodeWriter code, MethodNode mth, InsnNode[] insnArr, boolean addLabels) {
+		InsnGen insnGen = new InsnGen(getFallbackMethodGen(mth), true);
+		for (InsnNode insn : insnArr) {
+			if (insn == null) {
+				continue;
+			}
 			if (addLabels) {
-				if (attrs.contains(AttributeType.JUMP)
-						|| attrs.contains(AttributeType.EXC_HANDLER)) {
+				if (insn.contains(AType.JUMP)
+						|| insn.contains(AType.EXC_HANDLER)) {
 					code.decIndent();
 					code.startLine(getLabelName(insn.getOffset()) + ":");
 					code.incIndent();
@@ -297,11 +233,13 @@ public class MethodGen {
 			}
 			try {
 				if (insnGen.makeInsn(insn, code)) {
-					CatchAttr catchAttr = (CatchAttr) attrs.get(AttributeType.CATCH_BLOCK);
-					if (catchAttr != null)
-						code.add("\t //" + catchAttr);
+					CatchAttr catchAttr = insn.get(AType.CATCH_BLOCK);
+					if (catchAttr != null) {
+						code.add("\t " + catchAttr);
+					}
 				}
 			} catch (CodegenException e) {
+				LOG.debug("Error generate fallback instruction: ", e.getCause());
 				code.startLine("// error: " + insn);
 			}
 		}

jadx-core/src/main/java/jadx/core/codegen/NameGen.java

@@ -0,0 +1,218 @@
+package jadx.core.codegen;
+
+import jadx.core.Consts;
+import jadx.core.deobf.NameMapper;
+import jadx.core.dex.info.ClassInfo;
+import jadx.core.dex.instructions.InvokeNode;
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.InsnWrapArg;
+import jadx.core.dex.instructions.args.NamedArg;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.instructions.args.SSAVar;
+import jadx.core.dex.instructions.mods.ConstructorInsn;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.Utils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class NameGen {
+
+	private static final Map<String, String> OBJ_ALIAS;
+
+	private final Set<String> varNames = new HashSet<String>();
+	private final boolean fallback;
+
+	static {
+		OBJ_ALIAS = new HashMap<String, String>();
+		OBJ_ALIAS.put(Consts.CLASS_STRING, "str");
+		OBJ_ALIAS.put(Consts.CLASS_CLASS, "cls");
+		OBJ_ALIAS.put(Consts.CLASS_THROWABLE, "th");
+		OBJ_ALIAS.put(Consts.CLASS_OBJECT, "obj");
+		OBJ_ALIAS.put("java.util.Iterator", "it");
+		OBJ_ALIAS.put("java.lang.Boolean", "bool");
+		OBJ_ALIAS.put("java.lang.Short", "sh");
+		OBJ_ALIAS.put("java.lang.Integer", "num");
+		OBJ_ALIAS.put("java.lang.Character", "ch");
+		OBJ_ALIAS.put("java.lang.Byte", "b");
+		OBJ_ALIAS.put("java.lang.Float", "f");
+		OBJ_ALIAS.put("java.lang.Long", "l");
+		OBJ_ALIAS.put("java.lang.Double", "d");
+	}
+
+	public NameGen(boolean fallback) {
+		this.fallback = fallback;
+	}
+
+	public String assignArg(RegisterArg arg) {
+		String name = makeArgName(arg);
+		if (fallback) {
+			return name;
+		}
+		name = getUniqueVarName(name);
+		SSAVar sVar = arg.getSVar();
+		if (sVar != null) {
+			sVar.setName(name);
+		}
+		return name;
+	}
+
+	public String assignNamedArg(NamedArg arg) {
+		String name = arg.getName();
+		if (fallback) {
+			return name;
+		}
+		name = getUniqueVarName(name);
+		arg.setName(name);
+		return name;
+	}
+
+	public String useArg(RegisterArg arg) {
+		String name = makeArgName(arg);
+		varNames.add(name);
+		return name;
+	}
+
+	private String getUniqueVarName(String name) {
+		String r = name;
+		int i = 2;
+		while (varNames.contains(r)) {
+			r = name + i;
+			i++;
+		}
+		varNames.add(r);
+		return r;
+	}
+
+	private String makeArgName(RegisterArg arg) {
+		String name = arg.getName();
+		if (fallback) {
+			String base = "r" + arg.getRegNum();
+			if (name != null) {
+				return base + "_" + name;
+			}
+			return base;
+		}
+		String varName;
+		if (name != null) {
+			if ("this".equals(name)) {
+				return name;
+			}
+			varName = name;
+		} else {
+			varName = makeNameForType(arg.getType());
+		}
+		if (NameMapper.isReserved(varName)) {
+			return varName + "R";
+		}
+		return varName;
+	}
+
+	private static String makeNameForType(ArgType type) {
+		if (type.isPrimitive()) {
+			return makeNameForPrimitive(type);
+		} else if (type.isArray()) {
+			return makeNameForType(type.getArrayRootElement()) + "Arr";
+		} else {
+			return makeNameForObject(type);
+		}
+	}
+
+	private static String makeNameForPrimitive(ArgType type) {
+		return type.getPrimitiveType().getShortName().toLowerCase();
+	}
+
+	private static String makeNameForObject(ArgType type) {
+		if (type.isObject()) {
+			String alias = getAliasForObject(type.getObject());
+			if (alias != null) {
+				return alias;
+			}
+			ClassInfo clsInfo = ClassInfo.fromType(type);
+			String shortName = clsInfo.getShortName();
+			String vName = fromName(shortName);
+			if (vName != null) {
+				return vName;
+			}
+		}
+		return Utils.escape(type.toString());
+	}
+
+	private static String fromName(String name) {
+		if (name == null || name.isEmpty()) {
+			return null;
+		}
+		if (name.toUpperCase().equals(name)) {
+			// all characters are upper case
+			return name.toLowerCase();
+		}
+		String v1 = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+		if (!v1.equals(name)) {
+			return v1;
+		}
+		if (name.length() < 3) {
+			return name + "Var";
+		}
+		return null;
+	}
+
+	public static void guessName(RegisterArg arg) {
+		SSAVar sVar = arg.getSVar();
+		if (sVar == null || sVar.getName() != null) {
+			return;
+		}
+		RegisterArg assignArg = sVar.getAssign();
+		InsnNode assignInsn = assignArg.getParentInsn();
+		String name = makeNameFromInsn(assignInsn);
+		if (name != null && !NameMapper.isReserved(name)) {
+			assignArg.setName(name);
+		}
+	}
+
+	public static String getAliasForObject(String name) {
+		return OBJ_ALIAS.get(name);
+	}
+
+	private static String makeNameFromInsn(InsnNode insn) {
+		switch (insn.getType()) {
+			case INVOKE:
+				InvokeNode inv = (InvokeNode) insn;
+				String name = inv.getCallMth().getName();
+				if (name.startsWith("get") || name.startsWith("set")) {
+					return fromName(name.substring(3));
+				}
+				if ("iterator".equals(name)) {
+					return "it";
+				}
+				return name;
+
+			case CONSTRUCTOR:
+				ConstructorInsn co = (ConstructorInsn) insn;
+				return makeNameForObject(co.getClassType().getType());
+
+			case ARRAY_LENGTH:
+				return "length";
+
+			case ARITH:
+			case TERNARY:
+			case CAST:
+				for (InsnArg arg : insn.getArguments()) {
+					if (arg.isInsnWrap()) {
+						InsnNode wrapInsn = ((InsnWrapArg) arg).getWrapInsn();
+						String wName = makeNameFromInsn(wrapInsn);
+						if (wName != null) {
+							return wName;
+						}
+					}
+				}
+				break;
+
+			default:
+				break;
+		}
+		return null;
+	}
+}

jadx-core/src/main/java/jadx/core/codegen/RegionGen.java

@@ -1,27 +1,19 @@
 package jadx.core.codegen;
 
-import jadx.core.dex.attributes.AttributeFlag;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.DeclareVariableAttr;
-import jadx.core.dex.attributes.ForceReturnAttr;
-import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.nodes.DeclareVariablesAttr;
+import jadx.core.dex.attributes.nodes.ForceReturnAttr;
 import jadx.core.dex.info.FieldInfo;
-import jadx.core.dex.instructions.ArithNode;
-import jadx.core.dex.instructions.IfOp;
 import jadx.core.dex.instructions.IndexInsnNode;
-import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.SwitchNode;
-import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
-import jadx.core.dex.instructions.args.InsnWrapArg;
-import jadx.core.dex.instructions.args.LiteralArg;
 import jadx.core.dex.instructions.args.RegisterArg;
 import jadx.core.dex.nodes.BlockNode;
 import jadx.core.dex.nodes.IBlock;
 import jadx.core.dex.nodes.IContainer;
 import jadx.core.dex.nodes.IRegion;
 import jadx.core.dex.nodes.InsnNode;
-import jadx.core.dex.nodes.MethodNode;
 import jadx.core.dex.regions.IfCondition;
 import jadx.core.dex.regions.IfRegion;
 import jadx.core.dex.regions.LoopRegion;
@@ -31,7 +23,6 @@ import jadx.core.dex.regions.SynchronizedRegion;
 import jadx.core.dex.trycatch.CatchAttr;
 import jadx.core.dex.trycatch.ExceptionHandler;
 import jadx.core.dex.trycatch.TryCatchBlock;
-import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.RegionUtils;
 import jadx.core.utils.exceptions.CodegenException;
 
@@ -43,47 +34,52 @@ import org.slf4j.LoggerFactory;
 public class RegionGen extends InsnGen {
 	private static final Logger LOG = LoggerFactory.getLogger(RegionGen.class);
 
-	public RegionGen(MethodGen mgen, MethodNode mth) {
-		super(mgen, mth, false);
+	public RegionGen(MethodGen mgen) {
+		super(mgen, false);
 	}
 
 	public void makeRegion(CodeWriter code, IContainer cont) throws CodegenException {
-		assert cont != null;
-
 		if (cont instanceof IBlock) {
 			makeSimpleBlock((IBlock) cont, code);
 		} else if (cont instanceof IRegion) {
-			declareVars(code, cont);
 			if (cont instanceof Region) {
-				Region r = (Region) cont;
-				CatchAttr tc = (CatchAttr) r.getAttributes().get(AttributeType.CATCH_BLOCK);
-				if (tc != null) {
-					makeTryCatch(cont, tc.getTryBlock(), code);
-				} else {
-					for (IContainer c : r.getSubBlocks())
-						makeRegion(code, c);
+				makeSimpleRegion(code, (Region) cont);
+			} else {
+				declareVars(code, cont);
+				if (cont instanceof IfRegion) {
+					makeIf((IfRegion) cont, code, true);
+				} else if (cont instanceof SwitchRegion) {
+					makeSwitch((SwitchRegion) cont, code);
+				} else if (cont instanceof LoopRegion) {
+					makeLoop((LoopRegion) cont, code);
+				} else if (cont instanceof SynchronizedRegion) {
+					makeSynchronizedRegion((SynchronizedRegion) cont, code);
 				}
-			} else if (cont instanceof IfRegion) {
-				code.startLine();
-				makeIf((IfRegion) cont, code);
-			} else if (cont instanceof SwitchRegion) {
-				makeSwitch((SwitchRegion) cont, code);
-			} else if (cont instanceof LoopRegion) {
-				makeLoop((LoopRegion) cont, code);
-			} else if (cont instanceof SynchronizedRegion) {
-				makeSynchronizedRegion((SynchronizedRegion) cont, code);
 			}
 		} else {
-			throw new CodegenException("Not processed container: " + cont.toString());
+			throw new CodegenException("Not processed container: " + cont);
 		}
 	}
 
 	private void declareVars(CodeWriter code, IContainer cont) {
-		DeclareVariableAttr declVars =
-				(DeclareVariableAttr) cont.getAttributes().get(AttributeType.DECLARE_VARIABLE);
+		DeclareVariablesAttr declVars = cont.get(AType.DECLARE_VARIABLES);
 		if (declVars != null) {
 			for (RegisterArg v : declVars.getVars()) {
-				code.startLine(declareVar(v)).add(';');
+				code.startLine();
+				declareVar(code, v);
+				code.add(';');
+			}
+		}
+	}
+
+	private void makeSimpleRegion(CodeWriter code, Region region) throws CodegenException {
+		CatchAttr tc = region.get(AType.CATCH_BLOCK);
+		if (tc != null) {
+			makeTryCatch(region, tc.getTryBlock(), code);
+		} else {
+			declareVars(code, region);
+			for (IContainer c : region.getSubBlocks()) {
+				makeRegion(code, c);
 			}
 		}
 	}
@@ -98,50 +94,67 @@ public class RegionGen extends InsnGen {
 		for (InsnNode insn : block.getInstructions()) {
 			makeInsn(insn, code);
 		}
-		if (block.getAttributes().contains(AttributeFlag.BREAK)) {
-			code.startLine("break;");
-		} else {
-			IAttribute attr;
-			if ((attr = block.getAttributes().get(AttributeType.FORCE_RETURN)) != null) {
-				ForceReturnAttr retAttr = (ForceReturnAttr) attr;
-				makeInsn(retAttr.getReturnInsn(), code);
-			}
+		ForceReturnAttr retAttr = block.get(AType.FORCE_RETURN);
+		if (retAttr != null) {
+			makeInsn(retAttr.getReturnInsn(), code);
 		}
 	}
 
-	private void makeIf(IfRegion region, CodeWriter code) throws CodegenException {
-		code.add("if (").add(makeCondition(region.getCondition())).add(") {");
+	private void makeIf(IfRegion region, CodeWriter code, boolean newLine) throws CodegenException {
+		if (region.getTernRegion() != null) {
+			makeSimpleBlock(region.getTernRegion().getBlock(), code);
+			return;
+		}
+		if (newLine) {
+			code.startLine();
+		}
+		code.attachSourceLine(region.getSourceLine());
+		code.add("if (");
+		new ConditionGen(this).add(code, region.getCondition());
+		code.add(") {");
 		makeRegionIndent(code, region.getThenRegion());
 		code.startLine('}');
 
 		IContainer els = region.getElseRegion();
 		if (els != null && RegionUtils.notEmpty(els)) {
 			code.add(" else ");
-
-			// connect if-else-if block
-			if (els instanceof Region) {
-				Region re = (Region) els;
-				List<IContainer> subBlocks = re.getSubBlocks();
-				if (subBlocks.size() == 1 && subBlocks.get(0) instanceof IfRegion) {
-					makeIf((IfRegion) subBlocks.get(0), code);
-					return;
-				}
+			if (connectElseIf(code, els)) {
+				return;
 			}
-
 			code.add('{');
 			makeRegionIndent(code, els);
 			code.startLine('}');
 		}
 	}
 
+	/**
+	 * Connect if-else-if block
+	 */
+	private boolean connectElseIf(CodeWriter code, IContainer els) throws CodegenException {
+		if (!els.contains(AFlag.ELSE_IF_CHAIN)) {
+			return false;
+		}
+		if (!(els instanceof Region)) {
+			return false;
+		}
+		List<IContainer> subBlocks = ((Region) els).getSubBlocks();
+		if (subBlocks.size() == 1
+				&& subBlocks.get(0) instanceof IfRegion) {
+			makeIf((IfRegion) subBlocks.get(0), code, false);
+			return true;
+		}
+		return false;
+	}
+
 	private CodeWriter makeLoop(LoopRegion region, CodeWriter code) throws CodegenException {
 		BlockNode header = region.getHeader();
 		if (header != null) {
 			List<InsnNode> headerInsns = header.getInstructions();
 			if (headerInsns.size() > 1) {
 				// write not inlined instructions from header
-				mth.getAttributes().add(AttributeFlag.INCONSISTENT_CODE);
-				for (int i = 0; i < headerInsns.size() - 1; i++) {
+				mth.add(AFlag.INCONSISTENT_CODE);
+				int last = headerInsns.size() - 1;
+				for (int i = 0; i < last; i++) {
 					InsnNode insn = headerInsns.get(i);
 					makeInsn(insn, code);
 				}
@@ -157,12 +170,17 @@ public class RegionGen extends InsnGen {
 			return code;
 		}
 
+		ConditionGen conditionGen = new ConditionGen(this);
 		if (region.isConditionAtEnd()) {
 			code.startLine("do {");
 			makeRegionIndent(code, region.getBody());
-			code.startLine("} while (").add(makeCondition(condition)).add(");");
+			code.startLine("} while (");
+			conditionGen.add(code, condition);
+			code.add(");");
 		} else {
-			code.startLine("while (").add(makeCondition(condition)).add(") {");
+			code.startLine("while (");
+			conditionGen.add(code, condition);
+			code.add(") {");
 			makeRegionIndent(code, region.getBody());
 			code.startLine('}');
 		}
@@ -170,84 +188,20 @@ public class RegionGen extends InsnGen {
 	}
 
 	private void makeSynchronizedRegion(SynchronizedRegion cont, CodeWriter code) throws CodegenException {
-		code.startLine("synchronized(").add(arg(cont.getInsn().getArg(0))).add(") {");
+		code.startLine("synchronized (");
+		addArg(code, cont.getEnterInsn().getArg(0));
+		code.add(") {");
 		makeRegionIndent(code, cont.getRegion());
 		code.startLine('}');
 	}
 
-	private String makeCondition(IfCondition condition) throws CodegenException {
-		switch (condition.getMode()) {
-			case COMPARE:
-				return makeCompare(condition.getCompare());
-			case NOT:
-				return "!" + makeCondition(condition.getArgs().get(0));
-			case AND:
-			case OR:
-				String mode = condition.getMode() == IfCondition.Mode.AND ? " && " : " || ";
-				StringBuilder sb = new StringBuilder();
-				for (IfCondition arg : condition.getArgs()) {
-					if (sb.length() != 0) {
-						sb.append(mode);
-					}
-					String s = makeCondition(arg);
-					if (arg.isCompare()) {
-						sb.append(s);
-					} else {
-						sb.append('(').append(s).append(')');
-					}
-				}
-				return sb.toString();
-			default:
-				return "??" + condition.toString();
-		}
-	}
-
-	private String makeCompare(IfCondition.Compare compare) throws CodegenException {
-		IfOp op = compare.getOp();
-		InsnArg firstArg = compare.getA();
-		InsnArg secondArg = compare.getB();
-		if (firstArg.getType().equals(ArgType.BOOLEAN)
-				&& secondArg.isLiteral()
-				&& secondArg.getType().equals(ArgType.BOOLEAN)) {
-			LiteralArg lit = (LiteralArg) secondArg;
-			if (lit.getLiteral() == 0) {
-				op = op.invert();
-			}
-			if (op == IfOp.EQ) {
-				return arg(firstArg, false); // == true
-			} else if (op == IfOp.NE) {
-				return "!" + arg(firstArg); // != true
-			}
-			LOG.warn(ErrorsCounter.formatErrorMsg(mth, "Unsupported boolean condition " + op.getSymbol()));
-		}
-		return arg(firstArg, isWrapNeeded(firstArg))
-				+ " " + op.getSymbol() + " "
-				+ arg(secondArg, isWrapNeeded(secondArg));
-	}
-
-	private boolean isWrapNeeded(InsnArg arg) {
-		if (!arg.isInsnWrap()) {
-			return false;
-		}
-		InsnNode insn = ((InsnWrapArg) arg).getWrapInsn();
-		if (insn.getType() == InsnType.ARITH) {
-			ArithNode arith = ((ArithNode) insn);
-			switch (arith.getOp()) {
-				case ADD:
-				case SUB:
-				case MUL:
-				case DIV:
-				case REM:
-					return false;
-			}
-		}
-		return true;
-	}
-
 	private CodeWriter makeSwitch(SwitchRegion sw, CodeWriter code) throws CodegenException {
 		SwitchNode insn = (SwitchNode) sw.getHeader().getInstructions().get(0);
 		InsnArg arg = insn.getArg(0);
-		code.startLine("switch(").add(arg(arg)).add(") {");
+		code.startLine("switch (");
+		addArg(code, arg);
+		code.add(") {");
+		code.incIndent();
 
 		int size = sw.getKeys().size();
 		for (int i = 0; i < size; i++) {
@@ -256,9 +210,8 @@ public class RegionGen extends InsnGen {
 			for (Object k : keys) {
 				code.startLine("case ");
 				if (k instanceof IndexInsnNode) {
-					code.add(sfield((FieldInfo) ((IndexInsnNode) k).getIndex()));
-				}
-				else {
+					staticField(code, (FieldInfo) ((IndexInsnNode) k).getIndex());
+				} else {
 					code.add(TypeGen.literalToString((Integer) k, arg.getType()));
 				}
 				code.add(':');
@@ -269,43 +222,46 @@ public class RegionGen extends InsnGen {
 			code.startLine("default:");
 			makeCaseBlock(sw.getDefaultCase(), code);
 		}
-
+		code.decIndent();
 		code.startLine('}');
 		return code;
 	}
 
 	private void makeCaseBlock(IContainer c, CodeWriter code) throws CodegenException {
+		boolean addBreak = true;
 		if (RegionUtils.notEmpty(c)) {
 			makeRegionIndent(code, c);
-			if (RegionUtils.hasExitEdge(c)) {
-				code.startLine(1, "break;");
+			if (!RegionUtils.hasExitEdge(c)) {
+				addBreak = false;
 			}
-		} else {
-			code.startLine(1, "break;");
+		}
+		if (addBreak) {
+			code.startLine().addIndent().add("break;");
 		}
 	}
 
 	private void makeTryCatch(IContainer region, TryCatchBlock tryCatchBlock, CodeWriter code)
 			throws CodegenException {
 		code.startLine("try {");
-		region.getAttributes().remove(AttributeType.CATCH_BLOCK);
+		region.remove(AType.CATCH_BLOCK);
 		makeRegionIndent(code, region);
 		ExceptionHandler allHandler = null;
 		for (ExceptionHandler handler : tryCatchBlock.getHandlers()) {
 			if (!handler.isCatchAll()) {
 				makeCatchBlock(code, handler);
 			} else {
-				if (allHandler != null)
+				if (allHandler != null) {
 					LOG.warn("Several 'all' handlers in try/catch block in " + mth);
+				}
 				allHandler = handler;
 			}
 		}
 		if (allHandler != null) {
 			makeCatchBlock(code, allHandler);
 		}
-		if (tryCatchBlock.getFinalBlock() != null) {
+		if (tryCatchBlock.getFinalRegion() != null) {
 			code.startLine("} finally {");
-			makeRegionIndent(code, tryCatchBlock.getFinalBlock());
+			makeRegionIndent(code, tryCatchBlock.getFinalRegion());
 		}
 		code.startLine('}');
 	}
@@ -313,11 +269,15 @@ public class RegionGen extends InsnGen {
 	private void makeCatchBlock(CodeWriter code, ExceptionHandler handler)
 			throws CodegenException {
 		IContainer region = handler.getHandlerRegion();
-		if (region != null /* && RegionUtils.notEmpty(region) */) {
+		if (region != null) {
 			code.startLine("} catch (");
-			code.add(handler.isCatchAll() ? "Throwable" : useClass(handler.getCatchType()));
+			if (handler.isCatchAll()) {
+				code.add("Throwable");
+			} else {
+				useClass(code, handler.getCatchType());
+			}
 			code.add(' ');
-			code.add(mgen.assignNamedArg(handler.getArg()));
+			code.add(mgen.getNameGen().assignNamedArg(handler.getArg()));
 			code.add(") {");
 			makeRegionIndent(code, region);
 		}

jadx-core/src/main/java/jadx/core/codegen/TypeGen.java

@@ -8,20 +8,6 @@ import jadx.core.utils.exceptions.JadxRuntimeException;
 
 public class TypeGen {
 
-	public static String translate(ClassGen clsGen, ArgType type) {
-		final PrimitiveType stype = type.getPrimitiveType();
-		if (stype == null)
-			return type.toString();
-
-		if (stype == PrimitiveType.OBJECT) {
-			return clsGen.useClass(type);
-		}
-		if (stype == PrimitiveType.ARRAY) {
-			return translate(clsGen, type.getArrayElement()) + "[]";
-		}
-		return stype.getLongName();
-	}
-
 	public static String signature(ArgType type) {
 		final PrimitiveType stype = type.getPrimitiveType();
 		if (stype == PrimitiveType.OBJECT) {
@@ -69,8 +55,9 @@ public class TypeGen {
 
 			case OBJECT:
 			case ARRAY:
-				if (lit != 0)
+				if (lit != 0) {
 					throw new JadxRuntimeException("Wrong object literal: " + type + " = " + lit);
+				}
 				return "null";
 
 			default:
@@ -100,8 +87,9 @@ public class TypeGen {
 
 	public static String formatLong(long lit) {
 		String l = Long.toString(lit);
-		if (lit == Long.MIN_VALUE || Math.abs(lit) >= Integer.MAX_VALUE)
+		if (lit == Long.MIN_VALUE || Math.abs(lit) >= Integer.MAX_VALUE) {
 			l += "L";
+		}
 		return wrapNegNum(lit < 0, l);
 	}
 
@@ -109,6 +97,6 @@ public class TypeGen {
 //		if (lz)
 //			return "(" + str + ")";
 //		else
-			return str;
+		return str;
 	}
 }

jadx-core/src/main/java/jadx/core/deobf/NameMapper.java

@@ -61,7 +61,8 @@ public class NameMapper {
 					"void",
 					"volatile",
 					"while",
-			}));
+			})
+	);
 
 	public static boolean isReserved(String str) {
 		return RESERVED_NAMES.contains(str);

jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java

@@ -1,6 +1,6 @@
 package jadx.core.dex.attributes;
 
-public enum AttributeFlag {
+public enum AFlag {
 	TRY_ENTER,
 	TRY_LEAVE,
 
@@ -9,9 +9,11 @@ public enum AttributeFlag {
 
 	SYNTHETIC,
 
-	BREAK,
 	RETURN, // block contains only return instruction
 
+	DECLARE_VAR,
+	DONT_WRAP,
+
 	DONT_SHRINK,
 	DONT_GENERATE,
 	SKIP,
@@ -19,5 +21,7 @@ public enum AttributeFlag {
 	SKIP_FIRST_ARG,
 	ANONYMOUS_CONSTRUCTOR,
 
+	ELSE_IF_CHAIN,
+
 	INCONSISTENT_CODE, // warning about incorrect decompilation
 }

jadx-core/src/main/java/jadx/core/dex/attributes/AType.java

@@ -0,0 +1,45 @@
+package jadx.core.dex.attributes;
+
+import jadx.core.dex.attributes.annotations.AnnotationsList;
+import jadx.core.dex.attributes.annotations.MethodParameters;
+import jadx.core.dex.attributes.nodes.DeclareVariablesAttr;
+import jadx.core.dex.attributes.nodes.EnumClassAttr;
+import jadx.core.dex.attributes.nodes.FieldReplaceAttr;
+import jadx.core.dex.attributes.nodes.ForceReturnAttr;
+import jadx.core.dex.attributes.nodes.JadxErrorAttr;
+import jadx.core.dex.attributes.nodes.JumpInfo;
+import jadx.core.dex.attributes.nodes.LoopInfo;
+import jadx.core.dex.attributes.nodes.MethodInlineAttr;
+import jadx.core.dex.attributes.nodes.PhiListAttr;
+import jadx.core.dex.attributes.nodes.SourceFileAttr;
+import jadx.core.dex.nodes.parser.FieldValueAttr;
+import jadx.core.dex.trycatch.CatchAttr;
+import jadx.core.dex.trycatch.ExcHandlerAttr;
+import jadx.core.dex.trycatch.SplitterBlockAttr;
+
+/**
+ * Attribute types enumeration,
+ * uses generic type for omit cast after in 'AttributeStorage.get' method
+ *
+ * @param <T> attribute class implementation
+ */
+public class AType<T extends IAttribute> {
+
+	public static final AType<AttrList<JumpInfo>> JUMP = new AType<AttrList<JumpInfo>>();
+	public static final AType<AttrList<LoopInfo>> LOOP = new AType<AttrList<LoopInfo>>();
+
+	public static final AType<ExcHandlerAttr> EXC_HANDLER = new AType<ExcHandlerAttr>();
+	public static final AType<CatchAttr> CATCH_BLOCK = new AType<CatchAttr>();
+	public static final AType<SplitterBlockAttr> SPLITTER_BLOCK = new AType<SplitterBlockAttr>();
+	public static final AType<ForceReturnAttr> FORCE_RETURN = new AType<ForceReturnAttr>();
+	public static final AType<FieldValueAttr> FIELD_VALUE = new AType<FieldValueAttr>();
+	public static final AType<FieldReplaceAttr> FIELD_REPLACE = new AType<FieldReplaceAttr>();
+	public static final AType<JadxErrorAttr> JADX_ERROR = new AType<JadxErrorAttr>();
+	public static final AType<MethodInlineAttr> METHOD_INLINE = new AType<MethodInlineAttr>();
+	public static final AType<EnumClassAttr> ENUM_CLASS = new AType<EnumClassAttr>();
+	public static final AType<AnnotationsList> ANNOTATION_LIST = new AType<AnnotationsList>();
+	public static final AType<MethodParameters> ANNOTATION_MTH_PARAMETERS = new AType<MethodParameters>();
+	public static final AType<PhiListAttr> PHI_LIST = new AType<PhiListAttr>();
+	public static final AType<SourceFileAttr> SOURCE_FILE = new AType<SourceFileAttr>();
+	public static final AType<DeclareVariablesAttr> DECLARE_VARIABLES = new AType<DeclareVariablesAttr>();
+}

jadx-core/src/main/java/jadx/core/dex/attributes/AttrList.java

@@ -0,0 +1,30 @@
+package jadx.core.dex.attributes;
+
+import jadx.core.utils.Utils;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class AttrList<T> implements IAttribute {
+
+	private final AType<AttrList<T>> type;
+	private final List<T> list = new LinkedList<T>();
+
+	public AttrList(AType<AttrList<T>> type) {
+		this.type = type;
+	}
+
+	public List<T> getList() {
+		return list;
+	}
+
+	@Override
+	public AType<AttrList<T>> getType() {
+		return type;
+	}
+
+	@Override
+	public String toString() {
+		return Utils.listToString(list);
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/AttrNode.java

@@ -1,14 +1,96 @@
 package jadx.core.dex.attributes;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+
+import java.util.List;
+
 public abstract class AttrNode implements IAttributeNode {
 
-	private AttributesList attributesList;
+	private static final AttributeStorage EMPTY_ATTR_STORAGE = new EmptyAttrStorage();
+
+	private AttributeStorage storage = EMPTY_ATTR_STORAGE;
 
 	@Override
-	public AttributesList getAttributes() {
-		if (attributesList == null)
-			attributesList = new AttributesList();
-		return attributesList;
+	public void add(AFlag flag) {
+		getStorage().add(flag);
 	}
 
+	@Override
+	public void addAttr(IAttribute attr) {
+		getStorage().add(attr);
+	}
+
+	@Override
+	public <T> void addAttr(AType<AttrList<T>> type, T obj) {
+		getStorage().add(type, obj);
+	}
+
+	@Override
+	public void copyAttributesFrom(AttrNode attrNode) {
+		getStorage().addAll(attrNode.storage);
+	}
+
+	AttributeStorage getStorage() {
+		AttributeStorage store = storage;
+		if (store == EMPTY_ATTR_STORAGE) {
+			store = new AttributeStorage();
+			storage = store;
+		}
+		return store;
+	}
+
+	@Override
+	public boolean contains(AFlag flag) {
+		return storage.contains(flag);
+	}
+
+	@Override
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return storage.contains(type);
+	}
+
+	@Override
+	public <T extends IAttribute> T get(AType<T> type) {
+		return storage.get(type);
+	}
+
+	@Override
+	public Annotation getAnnotation(String cls) {
+		return storage.getAnnotation(cls);
+	}
+
+	@Override
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		return storage.getAll(type);
+	}
+
+	@Override
+	public void remove(AFlag flag) {
+		storage.remove(flag);
+	}
+
+	@Override
+	public <T extends IAttribute> void remove(AType<T> type) {
+		storage.remove(type);
+	}
+
+	@Override
+	public void removeAttr(IAttribute attr) {
+		storage.remove(attr);
+	}
+
+	@Override
+	public void clearAttributes() {
+		storage.clear();
+	}
+
+	@Override
+	public List<String> getAttributesStringsList() {
+		return storage.getAttributeStrings();
+	}
+
+	@Override
+	public String getAttributesString() {
+		return storage.toString();
+	}
 }

jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java

@@ -0,0 +1,122 @@
+package jadx.core.dex.attributes;
+
+import jadx.core.dex.attributes.annotations.Annotation;
+import jadx.core.dex.attributes.annotations.AnnotationsList;
+import jadx.core.utils.Utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Storage for different attribute types:
+ * 1. flags - boolean attribute (set or not)
+ * 2. attribute - class instance associated with attribute type.
+ */
+public class AttributeStorage {
+
+	private final Set<AFlag> flags;
+	private final Map<AType<?>, IAttribute> attributes;
+
+	public AttributeStorage() {
+		flags = EnumSet.noneOf(AFlag.class);
+		attributes = new HashMap<AType<?>, IAttribute>(2);
+	}
+
+	public void add(AFlag flag) {
+		flags.add(flag);
+	}
+
+	public void add(IAttribute attr) {
+		attributes.put(attr.getType(), attr);
+	}
+
+	public <T> void add(AType<AttrList<T>> type, T obj) {
+		AttrList<T> list = get(type);
+		if (list == null) {
+			list = new AttrList<T>(type);
+			add(list);
+		}
+		list.getList().add(obj);
+	}
+
+	public void addAll(AttributeStorage otherList) {
+		flags.addAll(otherList.flags);
+		attributes.putAll(otherList.attributes);
+	}
+
+	public boolean contains(AFlag flag) {
+		return flags.contains(flag);
+	}
+
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return attributes.containsKey(type);
+	}
+
+	@SuppressWarnings("unchecked")
+	public <T extends IAttribute> T get(AType<T> type) {
+		return (T) attributes.get(type);
+	}
+
+	public Annotation getAnnotation(String cls) {
+		AnnotationsList aList = get(AType.ANNOTATION_LIST);
+		return aList == null ? null : aList.get(cls);
+	}
+
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		AttrList<T> attrList = get(type);
+		if (attrList == null) {
+			return Collections.emptyList();
+		}
+		return attrList.getList();
+	}
+
+	public void remove(AFlag flag) {
+		flags.remove(flag);
+	}
+
+	public <T extends IAttribute> void remove(AType<T> type) {
+		attributes.remove(type);
+	}
+
+	public void remove(IAttribute attr) {
+		AType<?> type = attr.getType();
+		IAttribute a = attributes.get(type);
+		if (a == attr) {
+			attributes.remove(type);
+		}
+	}
+
+	public void clear() {
+		flags.clear();
+		attributes.clear();
+	}
+
+	public List<String> getAttributeStrings() {
+		int size = flags.size() + attributes.size() + attributes.size();
+		if (size == 0) {
+			return Collections.emptyList();
+		}
+		List<String> list = new ArrayList<String>(size);
+		for (AFlag a : flags) {
+			list.add(a.toString());
+		}
+		for (IAttribute a : attributes.values()) {
+			list.add(a.toString());
+		}
+		return list;
+	}
+
+	@Override
+	public String toString() {
+		List<String> list = getAttributeStrings();
+		if (list.isEmpty()) {
+			return "";
+		}
+		return "A:{" + Utils.listToString(list) + "}";
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/AttributeType.java

@@ -1,62 +0,0 @@
-package jadx.core.dex.attributes;
-
-public enum AttributeType {
-
-	/* Multi attributes */
-
-	JUMP(false),
-
-	LOOP(false),
-	CATCH_BLOCK(false),
-
-	/* Uniq attributes */
-
-	EXC_HANDLER(true),
-	SPLITTER_BLOCK(true),
-	FORCE_RETURN(true),
-
-	FIELD_VALUE(true),
-
-	JADX_ERROR(true),
-	METHOD_INLINE(true),
-
-	ENUM_CLASS(true),
-
-	ANNOTATION_LIST(true),
-	ANNOTATION_MTH_PARAMETERS(true),
-
-	SOURCE_FILE(true),
-
-	DECLARE_VARIABLE(true);
-
-	private static final int NOT_UNIQ_COUNT;
-	private final boolean uniq;
-
-	static {
-		// place all not unique attributes at first
-		int last = -1;
-		AttributeType[] vals = AttributeType.values();
-		for (int i = 0; i < vals.length; i++) {
-			AttributeType type = vals[i];
-			if (type.notUniq())
-				last = i;
-		}
-		NOT_UNIQ_COUNT = last + 1;
-	}
-
-	public static int getNotUniqCount() {
-		return NOT_UNIQ_COUNT;
-	}
-
-	private AttributeType(boolean isUniq) {
-		this.uniq = isUniq;
-	}
-
-	public boolean isUniq() {
-		return uniq;
-	}
-
-	public boolean notUniq() {
-		return !uniq;
-	}
-}

jadx-core/src/main/java/jadx/core/dex/attributes/AttributesList.java

@@ -1,192 +0,0 @@
-package jadx.core.dex.attributes;
-
-import jadx.core.dex.attributes.annotations.Annotation;
-import jadx.core.dex.attributes.annotations.AnnotationsList;
-import jadx.core.utils.Utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Storage for different attribute types:
- * 1. flags - boolean attribute (set or not)
- * 2. attribute - class instance associated for attribute type,
- * only one attached to node for unique attributes, multiple for others
- */
-public final class AttributesList {
-
-	private final Set<AttributeFlag> flags;
-	private final Map<AttributeType, IAttribute> uniqAttr;
-	private final List<IAttribute> attributes;
-	private final int[] attrCount;
-
-	public AttributesList() {
-		flags = EnumSet.noneOf(AttributeFlag.class);
-		uniqAttr = new EnumMap<AttributeType, IAttribute>(AttributeType.class);
-		attributes = new ArrayList<IAttribute>(0);
-		attrCount = new int[AttributeType.getNotUniqCount()];
-	}
-
-	// Flags
-
-	public void add(AttributeFlag flag) {
-		flags.add(flag);
-	}
-
-	public boolean contains(AttributeFlag flag) {
-		return flags.contains(flag);
-	}
-
-	public void remove(AttributeFlag flag) {
-		flags.remove(flag);
-	}
-
-	// Attributes
-
-	public void add(IAttribute attr) {
-		if (attr.getType().isUniq())
-			uniqAttr.put(attr.getType(), attr);
-		else
-			addMultiAttribute(attr);
-	}
-
-	private void addMultiAttribute(IAttribute attr) {
-		attributes.add(attr);
-		attrCount[attr.getType().ordinal()]++;
-	}
-
-	private int getMultiCountInternal(AttributeType type) {
-		return attrCount[type.ordinal()];
-	}
-
-	public void addAll(AttributesList otherList) {
-		flags.addAll(otherList.flags);
-		uniqAttr.putAll(otherList.uniqAttr);
-		for (IAttribute attr : otherList.attributes)
-			addMultiAttribute(attr);
-	}
-
-	public boolean contains(AttributeType type) {
-		if (type.isUniq())
-			return uniqAttr.containsKey(type);
-		else
-			return getMultiCountInternal(type) != 0;
-	}
-
-	public IAttribute get(AttributeType type) {
-		if (type.isUniq()) {
-			return uniqAttr.get(type);
-		} else {
-			if (getMultiCountInternal(type) != 0) {
-				for (IAttribute attr : attributes)
-					if (attr.getType() == type)
-						return attr;
-			}
-			return null;
-		}
-	}
-
-	public int getCount(AttributeType type) {
-		if (type.isUniq()) {
-			return uniqAttr.containsKey(type) ? 1 : 0;
-		} else {
-			return getMultiCountInternal(type);
-		}
-	}
-
-	public Annotation getAnnotation(String cls) {
-		AnnotationsList aList = (AnnotationsList) get(AttributeType.ANNOTATION_LIST);
-		if (aList == null || aList.size() == 0)
-			return null;
-
-		return aList.get(cls);
-	}
-
-	public List<IAttribute> getAll(AttributeType type) {
-		assert type.notUniq();
-
-		int count = getMultiCountInternal(type);
-		if (count == 0) {
-			return Collections.emptyList();
-		} else {
-			List<IAttribute> attrs = new ArrayList<IAttribute>(count);
-			for (IAttribute attr : attributes) {
-				if (attr.getType() == type)
-					attrs.add(attr);
-			}
-			return attrs;
-		}
-	}
-
-	public void remove(AttributeType type) {
-		if (type.isUniq()) {
-			uniqAttr.remove(type);
-		} else {
-			for (Iterator<IAttribute> it = attributes.iterator(); it.hasNext(); ) {
-				IAttribute attr = it.next();
-				if (attr.getType() == type)
-					it.remove();
-			}
-			attrCount[type.ordinal()] = 0;
-		}
-	}
-
-	public void remove(IAttribute attr) {
-		AttributeType type = attr.getType();
-		if (type.isUniq()) {
-			IAttribute a = uniqAttr.get(type);
-			if (a == attr)
-				uniqAttr.remove(type);
-		} else {
-			if (getMultiCountInternal(type) == 0)
-				return;
-
-			for (Iterator<IAttribute> it = attributes.iterator(); it.hasNext(); ) {
-				IAttribute a = it.next();
-				if (a == attr) {
-					it.remove();
-					attrCount[type.ordinal()]--;
-				}
-			}
-		}
-	}
-
-	public void clear() {
-		flags.clear();
-		uniqAttr.clear();
-		attributes.clear();
-		Arrays.fill(attrCount, 0);
-	}
-
-	public List<String> getAttributeStrings() {
-		int size = flags.size() + uniqAttr.size() + attributes.size();
-		if (size == 0)
-			return Collections.emptyList();
-
-		List<String> list = new ArrayList<String>(size);
-		for (AttributeFlag a : flags)
-			list.add(a.toString());
-		for (IAttribute a : uniqAttr.values())
-			list.add(a.toString());
-		for (IAttribute a : attributes)
-			list.add(a.toString());
-		return list;
-	}
-
-	@Override
-	public String toString() {
-		List<String> list = getAttributeStrings();
-		if (list.isEmpty())
-			return "";
-
-		return "A:{" + Utils.listToString(list) + "}";
-	}
-
-}

jadx-core/src/main/java/jadx/core/dex/attributes/BlockRegState.java

@@ -1,55 +0,0 @@
-package jadx.core.dex.attributes;
-
-import jadx.core.dex.instructions.args.RegisterArg;
-import jadx.core.dex.instructions.args.TypedVar;
-import jadx.core.dex.nodes.MethodNode;
-
-public final class BlockRegState {
-
-	private final RegisterArg[] regs;
-
-	public BlockRegState(MethodNode mth) {
-		this.regs = new RegisterArg[mth.getRegsCount()];
-		for (int i = 0; i < regs.length; i++) {
-			regs[i] = new RegisterArg(i);
-		}
-	}
-
-	public BlockRegState(BlockRegState state) {
-		this.regs = new RegisterArg[state.regs.length];
-		System.arraycopy(state.regs, 0, regs, 0, state.regs.length);
-	}
-
-	public void assignReg(RegisterArg arg) {
-		regs[arg.getRegNum()] = arg;
-		arg.getTypedVar().getUseList().add(arg);
-	}
-
-	public void use(RegisterArg arg) {
-		RegisterArg reg = regs[arg.getRegNum()];
-		TypedVar regType = reg.getTypedVar();
-		if (regType == null) {
-			regType = new TypedVar(arg.getType());
-			reg.forceSetTypedVar(regType);
-		}
-		arg.replaceTypedVar(reg);
-		reg.getTypedVar().getUseList().add(arg);
-	}
-
-	public RegisterArg getRegister(int r) {
-		return regs[r];
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder str = new StringBuilder();
-		for (RegisterArg reg : regs) {
-			if (reg.getTypedVar() != null) {
-				if (str.length() != 0)
-					str.append(", ");
-				str.append(reg.toString());
-			}
-		}
-		return str.toString();
-	}
-}

jadx-core/src/main/java/jadx/core/dex/attributes/DeclareVariableAttr.java

@@ -1,42 +0,0 @@
-package jadx.core.dex.attributes;
-
-import jadx.core.dex.instructions.args.RegisterArg;
-import jadx.core.utils.Utils;
-
-import java.util.List;
-
-public class DeclareVariableAttr implements IAttribute {
-
-	private final List<RegisterArg> vars;
-
-	public DeclareVariableAttr() {
-		this.vars = null; // for instruction use result
-	}
-
-	public DeclareVariableAttr(List<RegisterArg> vars) {
-		this.vars = vars; // for regions
-	}
-
-	public List<RegisterArg> getVars() {
-		return vars;
-	}
-
-	public void addVar(RegisterArg arg) {
-		int i;
-		if ((i = vars.indexOf(arg)) != -1) {
-			if (vars.get(i).getType().equals(arg.getType()))
-				return;
-		}
-		vars.add(arg);
-	}
-
-	@Override
-	public AttributeType getType() {
-		return AttributeType.DECLARE_VARIABLE;
-	}
-
-	@Override
-	public String toString() {
-		return "DECL_VAR: " + Utils.listToString(vars);
-	}
-}

jadx-core/src/main/java/jadx/core/dex/attributes/EmptyAttrStorage.java

@@ -0,0 +1,55 @@
+package jadx.core.dex.attributes;
+
+import jadx.core.dex.attributes.annotations.Annotation;
+
+import java.util.Collections;
+import java.util.List;
+
+public class EmptyAttrStorage extends AttributeStorage {
+
+	@Override
+	public boolean contains(AFlag flag) {
+		return false;
+	}
+
+	@Override
+	public <T extends IAttribute> boolean contains(AType<T> type) {
+		return false;
+	}
+
+	@Override
+	public <T extends IAttribute> T get(AType<T> type) {
+		return null;
+	}
+
+	@Override
+	public Annotation getAnnotation(String cls) {
+		return null;
+	}
+
+	@Override
+	public <T> List<T> getAll(AType<AttrList<T>> type) {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public void clear() {
+	}
+
+	@Override
+	public void remove(AFlag flag) {
+	}
+
+	@Override
+	public <T extends IAttribute> void remove(AType<T> type) {
+	}
+
+	@Override
+	public void remove(IAttribute attr) {
+	}
+
+	@Override
+	public List<String> getAttributeStrings() {
+		return Collections.emptyList();
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/IAttribute.java

@@ -2,6 +2,6 @@ package jadx.core.dex.attributes;
 
 public interface IAttribute {
 
-	AttributeType getType();
+	AType<?> getType();
 
 }

jadx-core/src/main/java/jadx/core/dex/attributes/IAttributeNode.java

@@ -1,7 +1,38 @@
 package jadx.core.dex.attributes;
 
+import jadx.core.dex.attributes.annotations.Annotation;
+
+import java.util.List;
+
 public interface IAttributeNode {
 
-	AttributesList getAttributes();
+	void add(AFlag flag);
 
+	void addAttr(IAttribute attr);
+
+	<T> void addAttr(AType<AttrList<T>> type, T obj);
+
+	void copyAttributesFrom(AttrNode attrNode);
+
+	boolean contains(AFlag flag);
+
+	<T extends IAttribute> boolean contains(AType<T> type);
+
+	<T extends IAttribute> T get(AType<T> type);
+
+	Annotation getAnnotation(String cls);
+
+	<T> List<T> getAll(AType<AttrList<T>> type);
+
+	void remove(AFlag flag);
+
+	<T extends IAttribute> void remove(AType<T> type);
+
+	void removeAttr(IAttribute attr);
+
+	void clearAttributes();
+
+	List<String> getAttributesStringsList();
+
+	String getAttributesString();
 }

jadx-core/src/main/java/jadx/core/dex/attributes/JumpAttribute.java

@@ -1,50 +0,0 @@
-package jadx.core.dex.attributes;
-
-import jadx.core.utils.InsnUtils;
-
-public class JumpAttribute implements IAttribute {
-
-	private final int src;
-	private final int dest;
-
-	public JumpAttribute(int src, int dest) {
-		this.src = src;
-		this.dest = dest;
-	}
-
-	@Override
-	public AttributeType getType() {
-		return AttributeType.JUMP;
-	}
-
-	public int getSrc() {
-		return src;
-	}
-
-	public int getDest() {
-		return dest;
-	}
-
-	@Override
-	public String toString() {
-		return "JUMP: " + InsnUtils.formatOffset(src) + " -> " + InsnUtils.formatOffset(dest);
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + dest;
-		result = prime * result + src;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
-		JumpAttribute other = (JumpAttribute) obj;
-		return dest == other.dest && src == other.src;
-	}
-}

jadx-core/src/main/java/jadx/core/dex/attributes/annotations/AnnotationsList.java

@@ -1,6 +1,6 @@
 package jadx.core.dex.attributes.annotations;
 
-import jadx.core.dex.attributes.AttributeType;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.utils.Utils;
 
@@ -33,8 +33,8 @@ public class AnnotationsList implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.ANNOTATION_LIST;
+	public AType<AnnotationsList> getType() {
+		return AType.ANNOTATION_LIST;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/annotations/MethodParameters.java

@@ -1,6 +1,6 @@
 package jadx.core.dex.attributes.annotations;
 
-import jadx.core.dex.attributes.AttributeType;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.IAttribute;
 import jadx.core.utils.Utils;
 
@@ -20,8 +20,8 @@ public class MethodParameters implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.ANNOTATION_MTH_PARAMETERS;
+	public AType<MethodParameters> getType() {
+		return AType.ANNOTATION_MTH_PARAMETERS;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/DeclareVariablesAttr.java

@@ -0,0 +1,35 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.utils.Utils;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * List of variables to be declared at region start.
+ */
+public class DeclareVariablesAttr implements IAttribute {
+
+	private final List<RegisterArg> vars = new LinkedList<RegisterArg>();
+
+	public Iterable<RegisterArg> getVars() {
+		return vars;
+	}
+
+	public void addVar(RegisterArg arg) {
+		vars.add(arg);
+	}
+
+	@Override
+	public AType<DeclareVariablesAttr> getType() {
+		return AType.DECLARE_VARIABLES;
+	}
+
+	@Override
+	public String toString() {
+		return "DECL_VAR: " + Utils.listToString(vars);
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/EnumClassAttr.java

@@ -1,5 +1,7 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.instructions.args.InsnArg;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.MethodNode;
@@ -18,10 +20,11 @@ public class EnumClassAttr implements IAttribute {
 
 		public EnumField(String name, int argsCount) {
 			this.name = name;
-			if (argsCount != 0)
+			if (argsCount != 0) {
 				this.args = new ArrayList<InsnArg>(argsCount);
-			else
+			} else {
 				this.args = Collections.emptyList();
+			}
 		}
 
 		public String getName() {
@@ -66,8 +69,8 @@ public class EnumClassAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.ENUM_CLASS;
+	public AType<EnumClassAttr> getType() {
+		return AType.ENUM_CLASS;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/FieldReplaceAttr.java

@@ -0,0 +1,34 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.info.FieldInfo;
+
+public class FieldReplaceAttr implements IAttribute {
+
+	private final FieldInfo fieldInfo;
+	private final boolean isOuterClass;
+
+	public FieldReplaceAttr(FieldInfo fieldInfo, boolean isOuterClass) {
+		this.fieldInfo = fieldInfo;
+		this.isOuterClass = isOuterClass;
+	}
+
+	public FieldInfo getFieldInfo() {
+		return fieldInfo;
+	}
+
+	public boolean isOuterClass() {
+		return isOuterClass;
+	}
+
+	@Override
+	public AType<FieldReplaceAttr> getType() {
+		return AType.FIELD_REPLACE;
+	}
+
+	@Override
+	public String toString() {
+		return "REPLACE: " + fieldInfo;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/ForceReturnAttr.java

@@ -1,5 +1,7 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.Utils;
 
@@ -16,8 +18,8 @@ public class ForceReturnAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.FORCE_RETURN;
+	public AType<ForceReturnAttr> getType() {
+		return AType.FORCE_RETURN;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JadxErrorAttr.java

@@ -1,5 +1,7 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 import jadx.core.utils.Utils;
 
 public class JadxErrorAttr implements IAttribute {
@@ -15,8 +17,8 @@ public class JadxErrorAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.JADX_ERROR;
+	public AType<JadxErrorAttr> getType() {
+		return AType.JADX_ERROR;
 	}
 
 	@Override
@@ -26,7 +28,7 @@ public class JadxErrorAttr implements IAttribute {
 		if (cause == null) {
 			str.append("null");
 		} else {
-			str.append(cause.getClass().toString());
+			str.append(cause.getClass());
 			str.append(":");
 			str.append(cause.getMessage());
 			str.append("\n");

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/JumpInfo.java

@@ -0,0 +1,47 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.utils.InsnUtils;
+
+public class JumpInfo {
+
+	private final int src;
+	private final int dest;
+
+	public JumpInfo(int src, int dest) {
+		this.src = src;
+		this.dest = dest;
+	}
+
+	public int getSrc() {
+		return src;
+	}
+
+	public int getDest() {
+		return dest;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * dest + src;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		JumpInfo other = (JumpInfo) obj;
+		return dest == other.dest && src == other.src;
+	}
+
+	@Override
+	public String toString() {
+		return "JUMP: " + InsnUtils.formatOffset(src) + " -> " + InsnUtils.formatOffset(dest);
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LineAttrNode.java

@@ -1,4 +1,6 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AttrNode;
 
 public abstract class LineAttrNode extends AttrNode {
 

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/LoopInfo.java

@@ -1,19 +1,23 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.nodes.BlockNode;
+import jadx.core.dex.nodes.Edge;
 import jadx.core.utils.BlockUtils;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 
-public class LoopAttr implements IAttribute {
+public class LoopInfo {
 
 	private final BlockNode start;
 	private final BlockNode end;
 	private final Set<BlockNode> loopBlocks;
 
-	public LoopAttr(BlockNode start, BlockNode end) {
+	public LoopInfo(BlockNode start, BlockNode end) {
 		this.start = start;
 		this.end = end;
 		this.loopBlocks = Collections.unmodifiableSet(BlockUtils.getAllPathsBlocks(start, end));
@@ -27,31 +31,44 @@ public class LoopAttr implements IAttribute {
 		return end;
 	}
 
-	@Override
-	public AttributeType getType() {
-		return AttributeType.LOOP;
-	}
-
 	public Set<BlockNode> getLoopBlocks() {
 		return loopBlocks;
 	}
 
 	/**
-	 * Return block nodes with exit edges from loop <br>
+	 * Return source blocks of exit edges. <br>
 	 * Exit nodes belongs to loop (contains in {@code loopBlocks})
 	 */
 	public Set<BlockNode> getExitNodes() {
 		Set<BlockNode> nodes = new HashSet<BlockNode>();
-		Set<BlockNode> inloop = getLoopBlocks();
-		for (BlockNode block : inloop) {
+		Set<BlockNode> blocks = getLoopBlocks();
+		for (BlockNode block : blocks) {
 			// exit: successor node not from this loop, (don't change to getCleanSuccessors)
-			for (BlockNode s : block.getSuccessors())
-				if (!inloop.contains(s) && !s.getAttributes().contains(AttributeType.EXC_HANDLER))
+			for (BlockNode s : block.getSuccessors()) {
+				if (!blocks.contains(s) && !s.contains(AType.EXC_HANDLER)) {
 					nodes.add(block);
+				}
+			}
 		}
 		return nodes;
 	}
 
+	/**
+	 * Return loop exit edges.
+	 */
+	public List<Edge> getExitEdges() {
+		List<Edge> edges = new LinkedList<Edge>();
+		Set<BlockNode> blocks = getLoopBlocks();
+		for (BlockNode block : blocks) {
+			for (BlockNode s : block.getSuccessors()) {
+				if (!blocks.contains(s) && !s.contains(AType.EXC_HANDLER)) {
+					edges.add(new Edge(block, s));
+				}
+			}
+		}
+		return edges;
+	}
+
 	@Override
 	public String toString() {
 		return "LOOP: " + start + "->" + end;

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/MethodInlineAttr.java

@@ -1,5 +1,7 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
 
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 import jadx.core.dex.nodes.InsnNode;
 
 public class MethodInlineAttr implements IAttribute {
@@ -15,8 +17,8 @@ public class MethodInlineAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.METHOD_INLINE;
+	public AType<MethodInlineAttr> getType() {
+		return AType.METHOD_INLINE;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java

@@ -0,0 +1,32 @@
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
+import jadx.core.dex.instructions.PhiInsn;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class PhiListAttr implements IAttribute {
+
+	private final List<PhiInsn> list = new LinkedList<PhiInsn>();
+
+	@Override
+	public AType<PhiListAttr> getType() {
+		return AType.PHI_LIST;
+	}
+
+	public List<PhiInsn> getList() {
+		return list;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("PHI: ");
+		for (PhiInsn phiInsn : list) {
+			sb.append('r').append(phiInsn.getResult().getRegNum()).append(" ");
+		}
+		return sb.toString();
+	}
+}

jadx-core/src/main/java/jadx/core/dex/attributes/nodes/SourceFileAttr.java

@@ -1,4 +1,7 @@
-package jadx.core.dex.attributes;
+package jadx.core.dex.attributes.nodes;
+
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.IAttribute;
 
 public class SourceFileAttr implements IAttribute {
 
@@ -13,8 +16,8 @@ public class SourceFileAttr implements IAttribute {
 	}
 
 	@Override
-	public AttributeType getType() {
-		return AttributeType.SOURCE_FILE;
+	public AType<SourceFileAttr> getType() {
+		return AType.SOURCE_FILE;
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/info/AccessInfo.java

@@ -24,10 +24,11 @@ public class AccessInfo {
 	}
 
 	public AccessInfo remove(int flag) {
-		if (containsFlag(flag))
+		if (containsFlag(flag)) {
 			return new AccessInfo(accFlags - flag, type);
-		else
+		} else {
 			return this;
+		}
 	}
 
 	public AccessInfo getVisibility() {
@@ -111,71 +112,73 @@ public class AccessInfo {
 
 	public String makeString() {
 		StringBuilder code = new StringBuilder();
-		if (isPublic())
+		if (isPublic()) {
 			code.append("public ");
-
-		if (isPrivate())
+		}
+		if (isPrivate()) {
 			code.append("private ");
-
-		if (isProtected())
+		}
+		if (isProtected()) {
 			code.append("protected ");
-
-		if (isStatic())
+		}
+		if (isStatic()) {
 			code.append("static ");
-
-		if (isFinal())
+		}
+		if (isFinal()) {
 			code.append("final ");
-
-		if (isAbstract())
+		}
+		if (isAbstract()) {
 			code.append("abstract ");
-
-		if (isNative())
+		}
+		if (isNative()) {
 			code.append("native ");
-
+		}
 		switch (type) {
 			case METHOD:
-				if (isSynchronized())
+				if (isSynchronized()) {
 					code.append("synchronized ");
-
-				if (isBridge())
+				}
+				if (isBridge()) {
 					code.append("/* bridge */ ");
-
+				}
 				if (Consts.DEBUG) {
-					if (isVarArgs())
+					if (isVarArgs()) {
 						code.append("/* varargs */ ");
+					}
 				}
 				break;
 
 			case FIELD:
-				if (isVolatile())
+				if (isVolatile()) {
 					code.append("volatile ");
-
-				if (isTransient())
+				}
+				if (isTransient()) {
 					code.append("transient ");
+				}
 				break;
 
 			case CLASS:
-				if ((accFlags & AccessFlags.ACC_STRICT) != 0)
+				if ((accFlags & AccessFlags.ACC_STRICT) != 0) {
 					code.append("strict ");
-
+				}
 				if (Consts.DEBUG) {
-					if ((accFlags & AccessFlags.ACC_SUPER) != 0)
+					if ((accFlags & AccessFlags.ACC_SUPER) != 0) {
 						code.append("/* super */ ");
-
-					if ((accFlags & AccessFlags.ACC_ENUM) != 0)
+					}
+					if ((accFlags & AccessFlags.ACC_ENUM) != 0) {
 						code.append("/* enum */ ");
+					}
 				}
 				break;
 		}
-
-		if (isSynthetic())
+		if (isSynthetic()) {
 			code.append("/* synthetic */ ");
-
+		}
 		return code.toString();
 	}
 
 	public String rawString() {
-		switch (type){
+		switch (type) {
 			case CLASS:
 				return AccessFlags.classString(accFlags);
 			case FIELD:

jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java

@@ -13,14 +13,28 @@ public final class ClassInfo {
 
 	private static final Map<ArgType, ClassInfo> CLASSINFO_CACHE = new WeakHashMap<ArgType, ClassInfo>();
 
+	private final ArgType type;
+	private String pkg;
+	private String name;
+	private String fullName;
+	// for inner class not equals null
+	private ClassInfo parentClass;
+
+	private ClassInfo(ArgType type) {
+		assert type.isObject() : "Not class type: " + type;
+		this.type = type;
+
+		splitNames(true);
+	}
+
 	public static ClassInfo fromDex(DexNode dex, int clsIndex) {
-		if (clsIndex == DexNode.NO_INDEX)
+		if (clsIndex == DexNode.NO_INDEX) {
 			return null;
-
+		}
 		ArgType type = dex.getType(clsIndex);
-		if (type.isArray())
+		if (type.isArray()) {
 			type = ArgType.OBJECT;
-
+		}
 		return fromType(type);
 	}
 
@@ -41,54 +55,41 @@ public final class ClassInfo {
 		CLASSINFO_CACHE.clear();
 	}
 
-	private final ArgType type;
-	private String pkg;
-	private String name;
-	private String fullName;
-	private ClassInfo parentClass; // not equals null if this is inner class
-
-	private ClassInfo(ArgType type) {
-		assert type.isObject() : "Not class type: " + type;
-		this.type = type;
-
-		splitNames(true);
-	}
-
 	private void splitNames(boolean canBeInner) {
 		String fullObjectName = type.getObject();
 		assert fullObjectName.indexOf('/') == -1 : "Raw type: " + type;
 
-		String name;
+		String clsName;
 		int dot = fullObjectName.lastIndexOf('.');
 		if (dot == -1) {
 			// rename default package if it used from class with package (often for obfuscated apps),
 			pkg = Consts.DEFAULT_PACKAGE_NAME;
-			name = fullObjectName;
+			clsName = fullObjectName;
 		} else {
 			pkg = fullObjectName.substring(0, dot);
-			name = fullObjectName.substring(dot + 1);
+			clsName = fullObjectName.substring(dot + 1);
 		}
 
-		int sep = name.lastIndexOf('$');
-		if (canBeInner && sep > 0 && sep != name.length() - 1) {
-			String parClsName = pkg + '.' + name.substring(0, sep);
+		int sep = clsName.lastIndexOf('$');
+		if (canBeInner && sep > 0 && sep != clsName.length() - 1) {
+			String parClsName = pkg + "." + clsName.substring(0, sep);
 			parentClass = fromName(parClsName);
-			name = name.substring(sep + 1);
+			clsName = clsName.substring(sep + 1);
 		} else {
 			parentClass = null;
 		}
 
-		char firstChar = name.charAt(0);
+		char firstChar = clsName.charAt(0);
 		if (Character.isDigit(firstChar)) {
-			name = Consts.ANONYMOUS_CLASS_PREFIX + name;
+			clsName = Consts.ANONYMOUS_CLASS_PREFIX + clsName;
 		} else if (firstChar == '$') {
-			name = "_" + name;
+			clsName = "_" + clsName;
 		}
-		if (NameMapper.isReserved(name)) {
-			name += "_";
+		if (NameMapper.isReserved(clsName)) {
+			clsName += "_";
 		}
-		this.fullName = (parentClass != null ? parentClass.getFullName() : pkg) + "." + name;
-		this.name = name;
+		this.fullName = (parentClass != null ? parentClass.getFullName() : pkg) + "." + clsName;
+		this.name = clsName;
 	}
 
 	public String getFullPath() {
@@ -153,7 +154,9 @@ public final class ClassInfo {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) return true;
+		if (this == obj) {
+			return true;
+		}
 		if (obj instanceof ClassInfo) {
 			ClassInfo other = (ClassInfo) obj;
 			return this.getFullName().equals(other.getFullName());

jadx-core/src/main/java/jadx/core/dex/info/FieldInfo.java

@@ -3,24 +3,26 @@ package jadx.core.dex.info;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.DexNode;
 
-import com.android.dx.io.FieldId;
+import com.android.dex.FieldId;
 
 public class FieldInfo {
 
+	private final ClassInfo declClass;
 	private final String name;
 	private final ArgType type;
 
-	private final ClassInfo declClass;
-
-	public static FieldInfo fromDex(DexNode dex, int index) {
-		return new FieldInfo(dex, index);
+	public FieldInfo(ClassInfo declClass, String name, ArgType type) {
+		this.declClass = declClass;
+		this.name = name;
+		this.type = type;
 	}
 
-	private FieldInfo(DexNode dex, int ind) {
-		FieldId field = dex.getFieldId(ind);
-		this.name = dex.getString(field.getNameIndex());
-		this.type = dex.getType(field.getTypeIndex());
-		this.declClass = ClassInfo.fromDex(dex, field.getDeclaringClassIndex());
+	public static FieldInfo fromDex(DexNode dex, int index) {
+		FieldId field = dex.getFieldId(index);
+		return new FieldInfo(
+				ClassInfo.fromDex(dex, field.getDeclaringClassIndex()),
+				dex.getString(field.getNameIndex()),
+				dex.getType(field.getTypeIndex()));
 	}
 
 	public static String getNameById(DexNode dex, int ind) {
@@ -41,13 +43,22 @@ public class FieldInfo {
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 		FieldInfo fieldInfo = (FieldInfo) o;
-		if (!name.equals(fieldInfo.name)) return false;
-		if (!type.equals(fieldInfo.type)) return false;
-		if (!declClass.equals(fieldInfo.declClass)) return false;
+		if (!name.equals(fieldInfo.name)) {
+			return false;
+		}
+		if (!type.equals(fieldInfo.type)) {
+			return false;
+		}
+		if (!declClass.equals(fieldInfo.declClass)) {
+			return false;
+		}
 		return true;
 	}
 

jadx-core/src/main/java/jadx/core/dex/info/MethodInfo.java

@@ -7,8 +7,8 @@ import jadx.core.utils.Utils;
 
 import java.util.List;
 
-import com.android.dx.io.MethodId;
-import com.android.dx.io.ProtoId;
+import com.android.dex.MethodId;
+import com.android.dex.ProtoId;
 
 public final class MethodInfo {
 
@@ -18,10 +18,6 @@ public final class MethodInfo {
 	private final ClassInfo declClass;
 	private final String shortId;
 
-	public static MethodInfo fromDex(DexNode dex, int mthIndex) {
-		return new MethodInfo(dex, mthIndex);
-	}
-
 	private MethodInfo(DexNode dex, int mthIndex) {
 		MethodId mthId = dex.getMethodId(mthIndex);
 		name = dex.getString(mthId.getNameIndex());
@@ -31,14 +27,20 @@ public final class MethodInfo {
 		retType = dex.getType(proto.getReturnTypeIndex());
 		args = dex.readParamList(proto.getParametersOffset());
 
-		StringBuilder strArg = new StringBuilder();
-		strArg.append('(');
-		for (ArgType arg : args)
-			strArg.append(TypeGen.signature(arg));
-		strArg.append(')');
-		// strArg.append(TypeGen.signature(retType));
+		StringBuilder signature = new StringBuilder();
+		signature.append(name);
+		signature.append('(');
+		for (ArgType arg : args) {
+			signature.append(TypeGen.signature(arg));
+		}
+		signature.append(')');
+		signature.append(TypeGen.signature(retType));
 
-		shortId = name + strArg;
+		shortId = signature.toString();
+	}
+
+	public static MethodInfo fromDex(DexNode dex, int mthIndex) {
+		return new MethodInfo(dex, mthIndex);
 	}
 
 	public String getName() {
@@ -86,30 +88,40 @@ public final class MethodInfo {
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + declClass.hashCode();
-		result = prime * result + retType.hashCode();
-		result = prime * result + shortId.hashCode();
+		int result = declClass.hashCode();
+		result = 31 * result + retType.hashCode();
+		result = 31 * result + shortId.hashCode();
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
 		MethodInfo other = (MethodInfo) obj;
-		if (!shortId.equals(other.shortId)) return false;
-		if (!retType.equals(other.retType)) return false;
-		if (!declClass.equals(other.declClass)) return false;
+		if (!shortId.equals(other.shortId)) {
+			return false;
+		}
+		if (!retType.equals(other.retType)) {
+			return false;
+		}
+		if (!declClass.equals(other.declClass)) {
+			return false;
+		}
 		return true;
 	}
 
 	@Override
 	public String toString() {
-		return retType + " " + declClass.getFullName() + "." + name
-				+ "(" + Utils.listToString(args) + ")";
+		return declClass.getFullName() + "." + name
+				+ "(" + Utils.listToString(args) + "):" + retType;
 	}
 
 }

jadx-core/src/main/java/jadx/core/dex/instructions/ArithNode.java

@@ -51,7 +51,7 @@ public class ArithNode extends InsnNode {
 	}
 
 	public ArithNode(ArithOp op, RegisterArg res, InsnArg a) {
-		super(InsnType.ARITH, 1);
+		super(InsnType.ARITH_ONEARG, 1);
 		this.op = op;
 		setResult(res);
 		addArg(a);
@@ -61,6 +61,23 @@ public class ArithNode extends InsnNode {
 		return op;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ArithNode) || !super.equals(obj)) {
+			return false;
+		}
+		ArithNode that = (ArithNode) obj;
+		return op == that.op;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + op.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return InsnUtils.formatOffset(offset) + ": "

jadx-core/src/main/java/jadx/core/dex/instructions/ArithOp.java

@@ -15,12 +15,12 @@ public enum ArithOp {
 	SHR(">>"),
 	USHR(">>>");
 
+	private final String symbol;
+
 	private ArithOp(String symbol) {
 		this.symbol = symbol;
 	}
 
-	private final String symbol;
-
 	public String getSymbol() {
 		return this.symbol;
 	}

jadx-core/src/main/java/jadx/core/dex/instructions/ConstClassNode.java

@@ -3,7 +3,7 @@ package jadx.core.dex.instructions;
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.nodes.InsnNode;
 
-public class ConstClassNode extends InsnNode {
+public final class ConstClassNode extends InsnNode {
 
 	private final ArgType clsType;
 
@@ -16,6 +16,23 @@ public class ConstClassNode extends InsnNode {
 		return clsType;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ConstClassNode) || !super.equals(obj)) {
+			return false;
+		}
+		ConstClassNode that = (ConstClassNode) obj;
+		return clsType.equals(that.clsType);
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + clsType.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return super.toString() + " " + clsType;

jadx-core/src/main/java/jadx/core/dex/instructions/ConstStringNode.java

@@ -2,7 +2,7 @@ package jadx.core.dex.instructions;
 
 import jadx.core.dex.nodes.InsnNode;
 
-public class ConstStringNode extends InsnNode {
+public final class ConstStringNode extends InsnNode {
 
 	private final String str;
 
@@ -15,6 +15,23 @@ public class ConstStringNode extends InsnNode {
 		return str;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ConstStringNode) || !super.equals(obj)) {
+			return false;
+		}
+		ConstStringNode that = (ConstStringNode) obj;
+		return str.equals(that.str);
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + str.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return super.toString() + " \"" + str + "\"";

jadx-core/src/main/java/jadx/core/dex/instructions/FillArrayNode.java

@@ -8,7 +8,7 @@ import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import com.android.dx.io.instructions.FillArrayDataPayloadDecodedInstruction;
 
-public class FillArrayNode extends InsnNode {
+public final class FillArrayNode extends InsnNode {
 
 	private final Object data;
 	private ArgType elemType;
@@ -53,4 +53,21 @@ public class FillArrayNode extends InsnNode {
 			elemType = r;
 		}
 	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof FillArrayNode) || !super.equals(obj)) {
+			return false;
+		}
+		FillArrayNode that = (FillArrayNode) obj;
+		return elemType.equals(that.elemType) && data == that.data;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + elemType.hashCode() + data.hashCode();
+	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/GotoNode.java

@@ -8,11 +8,11 @@ public class GotoNode extends InsnNode {
 	protected int target;
 
 	public GotoNode(int target) {
-		this(InsnType.GOTO, target);
+		this(InsnType.GOTO, target, 0);
 	}
 
-	protected GotoNode(InsnType type, int target) {
-		super(type);
+	protected GotoNode(InsnType type, int target, int argsCount) {
+		super(type, argsCount);
 		this.target = target;
 	}
 
@@ -20,6 +20,23 @@ public class GotoNode extends InsnNode {
 		return target;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof GotoNode) || !super.equals(obj)) {
+			return false;
+		}
+		GotoNode gotoNode = (GotoNode) obj;
+		return target == gotoNode.target;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + target;
+	}
+
 	@Override
 	public String toString() {
 		return super.toString() + "-> " + InsnUtils.formatOffset(target);

jadx-core/src/main/java/jadx/core/dex/instructions/IfNode.java

@@ -2,7 +2,6 @@ package jadx.core.dex.instructions;
 
 import jadx.core.dex.instructions.args.ArgType;
 import jadx.core.dex.instructions.args.InsnArg;
-import jadx.core.dex.instructions.args.LiteralArg;
 import jadx.core.dex.instructions.args.PrimitiveType;
 import jadx.core.dex.nodes.BlockNode;
 import jadx.core.utils.InsnUtils;
@@ -14,48 +13,32 @@ import static jadx.core.utils.BlockUtils.selectOther;
 
 public class IfNode extends GotoNode {
 
-	protected boolean zeroCmp;
+	private static final ArgType ARG_TYPE = ArgType.unknown(
+			PrimitiveType.INT, PrimitiveType.OBJECT, PrimitiveType.ARRAY,
+			PrimitiveType.BOOLEAN, PrimitiveType.SHORT, PrimitiveType.CHAR);
+
 	protected IfOp op;
 
 	private BlockNode thenBlock;
 	private BlockNode elseBlock;
 
-	public IfNode(int targ, InsnArg then, InsnArg els) {
-		super(InsnType.IF, targ);
-		addArg(then);
-		if (els == null) {
-			zeroCmp = true;
-		} else {
-			zeroCmp = false;
-			addArg(els);
-		}
+	public IfNode(DecodedInstruction insn, IfOp op) {
+		this(op, insn.getTarget(),
+				InsnArg.reg(insn, 0, ARG_TYPE),
+				insn.getRegisterCount() == 1 ? InsnArg.lit(0, ARG_TYPE) : InsnArg.reg(insn, 1, ARG_TYPE));
 	}
 
-	public IfNode(DecodedInstruction insn, IfOp op) {
-		super(InsnType.IF, insn.getTarget());
+	public IfNode(IfOp op, int targetOffset, InsnArg arg1, InsnArg arg2) {
+		super(InsnType.IF, targetOffset, 2);
 		this.op = op;
-
-		ArgType type = ArgType.unknown(
-				PrimitiveType.INT, PrimitiveType.OBJECT, PrimitiveType.ARRAY,
-				PrimitiveType.BOOLEAN, PrimitiveType.SHORT, PrimitiveType.CHAR);
-
-		addReg(insn, 0, type);
-		if (insn.getRegisterCount() == 1) {
-			zeroCmp = true;
-		} else {
-			zeroCmp = false;
-			addReg(insn, 1, type);
-		}
+		addArg(arg1);
+		addArg(arg2);
 	}
 
 	public IfOp getOp() {
 		return op;
 	}
 
-	public boolean isZeroCmp() {
-		return zeroCmp;
-	}
-
 	public void invertCondition() {
 		op = op.invert();
 		BlockNode tmp = thenBlock;
@@ -64,17 +47,10 @@ public class IfNode extends GotoNode {
 		target = thenBlock.getStartOffset();
 	}
 
-	public void changeCondition(InsnArg arg1, InsnArg arg2, IfOp op) {
+	public void changeCondition(IfOp op, InsnArg arg1, InsnArg arg2) {
 		this.op = op;
-		this.zeroCmp = arg2.isLiteral() && ((LiteralArg) arg2).getLiteral() == 0;
 		setArg(0, arg1);
-		if (!zeroCmp) {
-			if (getArgsCount() == 2) {
-				setArg(1, arg2);
-			} else {
-				addArg(arg2);
-			}
-		}
+		setArg(1, arg2);
 	}
 
 	public void initBlocks(BlockNode curBlock) {
@@ -84,7 +60,6 @@ public class IfNode extends GotoNode {
 		} else {
 			elseBlock = selectOther(thenBlock, curBlock.getSuccessors());
 		}
-		target = thenBlock.getStartOffset();
 	}
 
 	public BlockNode getThenBlock() {
@@ -95,12 +70,28 @@ public class IfNode extends GotoNode {
 		return elseBlock;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof IfNode) || !super.equals(obj)) {
+			return false;
+		}
+		IfNode ifNode = (IfNode) obj;
+		return op == ifNode.op;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + op.hashCode();
+	}
+
 	@Override
 	public String toString() {
 		return InsnUtils.formatOffset(offset) + ": "
 				+ InsnUtils.insnTypeToString(insnType)
-				+ getArg(0) + " " + op.getSymbol()
-				+ " " + (zeroCmp ? "0" : getArg(1))
+				+ getArg(0) + " " + op.getSymbol() + " " + getArg(1)
 				+ "  -> " + (thenBlock != null ? thenBlock : InsnUtils.formatOffset(target));
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java

@@ -16,6 +16,23 @@ public class IndexInsnNode extends InsnNode {
 		return index;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof IndexInsnNode) || !super.equals(obj)) {
+			return false;
+		}
+		IndexInsnNode that = (IndexInsnNode) obj;
+		return index == null ? that.index == null : index.equals(that.index);
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + (index != null ? index.hashCode() : 0);
+	}
+
 	@Override
 	public String toString() {
 		return super.toString() + " " + InsnUtils.indexToString(index);

jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java

@@ -12,29 +12,46 @@ import jadx.core.dex.nodes.InsnNode;
 import jadx.core.dex.nodes.MethodNode;
 import jadx.core.utils.exceptions.DecodeException;
 
-import com.android.dx.io.Code;
+import java.io.EOFException;
+
+import com.android.dex.Code;
 import com.android.dx.io.OpcodeInfo;
 import com.android.dx.io.Opcodes;
 import com.android.dx.io.instructions.DecodedInstruction;
 import com.android.dx.io.instructions.FillArrayDataPayloadDecodedInstruction;
 import com.android.dx.io.instructions.PackedSwitchPayloadDecodedInstruction;
+import com.android.dx.io.instructions.ShortArrayCodeInput;
 import com.android.dx.io.instructions.SparseSwitchPayloadDecodedInstruction;
 
 public class InsnDecoder {
 
 	private final MethodNode method;
-	private final DecodedInstruction[] insnArr;
 	private final DexNode dex;
+	private DecodedInstruction[] insnArr;
 
-	public InsnDecoder(MethodNode mthNode, Code mthCode) {
+	public InsnDecoder(MethodNode mthNode) {
 		this.method = mthNode;
 		this.dex = method.dex();
-		this.insnArr = DecodedInstruction.decodeAll(mthCode.getInstructions());
 	}
 
-	public InsnNode[] run() throws DecodeException {
-		InsnNode[] instructions = new InsnNode[insnArr.length];
+	public void decodeInsns(Code mthCode) throws DecodeException {
+		short[] encodedInstructions = mthCode.getInstructions();
+		int size = encodedInstructions.length;
+		DecodedInstruction[] decoded = new DecodedInstruction[size];
+		ShortArrayCodeInput in = new ShortArrayCodeInput(encodedInstructions);
 
+		try {
+			while (in.hasMore()) {
+				decoded[in.cursor()] = DecodedInstruction.decode(in);
+			}
+		} catch (EOFException e) {
+			throw new DecodeException(method, "", e);
+		}
+		insnArr = decoded;
+	}
+
+	public InsnNode[] process() throws DecodeException {
+		InsnNode[] instructions = new InsnNode[insnArr.length];
 		for (int i = 0; i < insnArr.length; i++) {
 			DecodedInstruction rawInsn = insnArr[i];
 			if (rawInsn != null) {
@@ -48,6 +65,7 @@ public class InsnDecoder {
 				instructions[i] = null;
 			}
 		}
+		insnArr = null;
 		return instructions;
 	}
 
@@ -473,7 +491,7 @@ public class InsnDecoder {
 			case Opcodes.ARRAY_LENGTH: {
 				InsnNode node = new InsnNode(InsnType.ARRAY_LENGTH, 1);
 				node.setResult(InsnArg.reg(insn, 0, ArgType.INT));
-				node.addArg(InsnArg.reg(insn, 1, ArgType.unknown(PrimitiveType.ARRAY)));
+				node.addArg(InsnArg.reg(insn, 1, ArgType.array(ArgType.UNKNOWN)));
 				return node;
 			}
 
@@ -578,14 +596,16 @@ public class InsnDecoder {
 			targets = ps.getTargets();
 			keys = new Object[targets.length];
 			int k = ps.getFirstKey();
-			for (int i = 0; i < keys.length; i++)
+			for (int i = 0; i < keys.length; i++) {
 				keys[i] = k++;
+			}
 		} else {
 			SparseSwitchPayloadDecodedInstruction ss = (SparseSwitchPayloadDecodedInstruction) payload;
 			targets = ss.getTargets();
 			keys = new Object[targets.length];
-			for (int i = 0; i < keys.length; i++)
+			for (int i = 0; i < keys.length; i++) {
 				keys[i] = ss.getKeys()[i];
+			}
 		}
 		// convert from relative to absolute offsets
 		for (int i = 0; i < targets.length; i++) {
@@ -612,8 +632,9 @@ public class InsnDecoder {
 				r++;
 			}
 		} else {
-			for (int i = 0; i < insn.getRegisterCount(); i++)
+			for (int i = 0; i < insn.getRegisterCount(); i++) {
 				regs[i] = InsnArg.reg(insn, i, elType);
+			}
 		}
 		return insn(InsnType.FILLED_NEW_ARRAY,
 				resReg == -1 ? null : InsnArg.reg(resReg, arrType),
@@ -689,8 +710,9 @@ public class InsnDecoder {
 		InsnNode node = new InsnNode(type, args == null ? 0 : args.length);
 		node.setResult(res);
 		if (args != null) {
-			for (InsnArg arg : args)
+			for (InsnArg arg : args) {
 				node.addArg(arg);
+			}
 		}
 		return node;
 	}
@@ -711,19 +733,23 @@ public class InsnDecoder {
 
 	public static int getPrevInsnOffset(Object[] insnArr, int offset) {
 		int i = offset - 1;
-		while (i >= 0 && insnArr[i] == null)
+		while (i >= 0 && insnArr[i] == null) {
 			i--;
-		if (i < 0)
+		}
+		if (i < 0) {
 			return -1;
+		}
 		return i;
 	}
 
 	public static int getNextInsnOffset(Object[] insnArr, int offset) {
 		int i = offset + 1;
-		while (i < insnArr.length && insnArr[i] == null)
+		while (i < insnArr.length && insnArr[i] == null) {
 			i++;
-		if (i >= insnArr.length)
+		}
+		if (i >= insnArr.length) {
 			return -1;
+		}
 		return i;
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/InsnType.java

@@ -54,9 +54,11 @@ public enum InsnType {
 	CONTINUE,
 
 	STR_CONCAT, // strings concatenation
+	ARITH_ONEARG,
 
 	TERNARY,
 	ARGS, // just generate arguments
+	PHI,
 
 	NEW_MULTIDIM_ARRAY // TODO: now multidimensional arrays created using Array.newInstance function
 }

jadx-core/src/main/java/jadx/core/dex/instructions/InvokeNode.java

@@ -19,8 +19,9 @@ public class InvokeNode extends InsnNode {
 		this.mth = mth;
 		this.type = type;
 
-		if (resReg >= 0)
+		if (resReg >= 0) {
 			setResult(InsnArg.reg(resReg, mth.getReturnType()));
+		}
 
 		int k = isRange ? insn.getA() : 0;
 		if (type != InvokeType.STATIC) {
@@ -43,6 +44,26 @@ public class InvokeNode extends InsnNode {
 		return mth;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof InvokeNode) || !super.equals(obj)) {
+			return false;
+		}
+		InvokeNode that = (InvokeNode) obj;
+		return type == that.type && mth.equals(that.mth);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + type.hashCode();
+		result = 31 * result + mth.hashCode();
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		return InsnUtils.formatOffset(offset) + ": "

jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java

@@ -0,0 +1,28 @@
+package jadx.core.dex.instructions;
+
+import jadx.core.dex.instructions.args.ArgType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.utils.Utils;
+
+public class PhiInsn extends InsnNode {
+
+	public PhiInsn(int regNum, int predecessors) {
+		super(InsnType.PHI, predecessors);
+		setResult(InsnArg.reg(regNum, ArgType.UNKNOWN));
+		for (int i = 0; i < predecessors; i++) {
+			addReg(regNum, ArgType.UNKNOWN);
+		}
+	}
+
+	@Override
+	public RegisterArg getArg(int n) {
+		return (RegisterArg) super.getArg(n);
+	}
+
+	@Override
+	public String toString() {
+		return "PHI: " + getResult() + " = " + Utils.listToString(getArguments());
+	}
+}

jadx-core/src/main/java/jadx/core/dex/instructions/SwitchNode.java

@@ -36,14 +36,38 @@ public class SwitchNode extends InsnNode {
 		return def;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof SwitchNode) || !super.equals(obj)) {
+			return false;
+		}
+		SwitchNode that = (SwitchNode) obj;
+		return def == that.def
+				&& Arrays.equals(keys, that.keys)
+				&& Arrays.equals(targets, that.targets);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + Arrays.hashCode(keys);
+		result = 31 * result + Arrays.hashCode(targets);
+		result = 31 * result + def;
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder targ = new StringBuilder();
 		targ.append('[');
 		for (int i = 0; i < targets.length; i++) {
 			targ.append(InsnUtils.formatOffset(targets[i]));
-			if (i < targets.length - 1)
+			if (i < targets.length - 1) {
 				targ.append(", ");
+			}
 		}
 		targ.append(']');
 		return super.toString() + " k:" + Arrays.toString(keys) + " t:" + targ;

jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java

@@ -2,20 +2,14 @@ package jadx.core.dex.instructions.args;
 
 import jadx.core.Consts;
 import jadx.core.clsp.ClspGraph;
+import jadx.core.dex.nodes.parser.SignatureParser;
 import jadx.core.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class ArgType {
-	private static final Logger LOG = LoggerFactory.getLogger(ArgType.class);
 
 	public static final ArgType INT = primitive(PrimitiveType.INT);
 	public static final ArgType BOOLEAN = primitive(PrimitiveType.BOOLEAN);
@@ -59,19 +53,31 @@ public abstract class ArgType {
 	}
 
 	public static ArgType object(String obj) {
-		return new ObjectArg(obj);
+		return new ObjectType(obj);
 	}
 
 	public static ArgType genericType(String type) {
-		return new GenericTypeArg(type);
+		return new GenericType(type);
+	}
+
+	public static ArgType wildcard() {
+		return new WildcardType(OBJECT, 0);
+	}
+
+	public static ArgType wildcard(ArgType obj, int bound) {
+		return new WildcardType(obj, bound);
 	}
 
 	public static ArgType generic(String sign) {
-		return parseSignature(sign);
+		return new SignatureParser(sign).consumeType();
 	}
 
 	public static ArgType generic(String obj, ArgType[] generics) {
-		return new GenericObjectArg(obj, generics);
+		return new GenericObject(obj, generics);
+	}
+
+	public static ArgType genericInner(ArgType genericType, String innerName, ArgType[] generics) {
+		return new GenericObject((GenericObject) genericType, innerName, generics);
 	}
 
 	public static ArgType array(ArgType vtype) {
@@ -82,14 +88,14 @@ public abstract class ArgType {
 		return new UnknownArg(types);
 	}
 
-	private abstract static class KnownTypeArg extends ArgType {
+	private abstract static class KnownType extends ArgType {
 		@Override
 		public boolean isTypeKnown() {
 			return true;
 		}
 	}
 
-	private static final class PrimitiveArg extends KnownTypeArg {
+	private static final class PrimitiveArg extends KnownType {
 		private final PrimitiveType type;
 
 		public PrimitiveArg(PrimitiveType type) {
@@ -118,10 +124,10 @@ public abstract class ArgType {
 		}
 	}
 
-	private static class ObjectArg extends KnownTypeArg {
+	private static class ObjectType extends KnownType {
 		private final String object;
 
-		public ObjectArg(String obj) {
+		public ObjectType(String obj) {
 			this.object = Utils.cleanObjectName(obj);
 			this.hash = object.hashCode();
 		}
@@ -143,7 +149,7 @@ public abstract class ArgType {
 
 		@Override
 		boolean internalEquals(Object obj) {
-			return object.equals(((ObjectArg) obj).object);
+			return object.equals(((ObjectType) obj).object);
 		}
 
 		@Override
@@ -152,8 +158,8 @@ public abstract class ArgType {
 		}
 	}
 
-	private static final class GenericTypeArg extends ObjectArg {
-		public GenericTypeArg(String obj) {
+	private static final class GenericType extends ObjectType {
+		public GenericType(String obj) {
 			super(obj);
 		}
 
@@ -163,24 +169,93 @@ public abstract class ArgType {
 		}
 	}
 
-	private static final class GenericObjectArg extends ObjectArg {
-		private final ArgType[] generics;
+	private static final class WildcardType extends ObjectType {
+		private final ArgType type;
+		private final int bounds;
 
-		public GenericObjectArg(String obj, ArgType[] generics) {
+		public WildcardType(ArgType obj, int bound) {
+			super(ArgType.OBJECT.getObject());
+			this.type = obj;
+			this.bounds = bound;
+		}
+
+		@Override
+		public boolean isGeneric() {
+			return true;
+		}
+
+		@Override
+		public ArgType getWildcardType() {
+			return type;
+		}
+
+		/**
+		 * Return wildcard bounds:
+		 * <ul>
+		 * <li> 1 for upper bound (? extends A) </li>
+		 * <li> 0  no bounds (?) </li>
+		 * <li>-1  for lower bound (? super A) </li>
+		 * </ul>
+		 */
+		@Override
+		public int getWildcardBounds() {
+			return bounds;
+		}
+
+		@Override
+		boolean internalEquals(Object obj) {
+			return super.internalEquals(obj)
+					&& bounds == ((WildcardType) obj).bounds
+					&& type.equals(((WildcardType) obj).type);
+		}
+
+		@Override
+		public String toString() {
+			if (bounds == 0) {
+				return "?";
+			}
+			return "? " + (bounds == -1 ? "super" : "extends") + " " + type.toString();
+		}
+	}
+
+	private static class GenericObject extends ObjectType {
+		private final ArgType[] generics;
+		private final GenericObject outerType;
+
+		public GenericObject(String obj, ArgType[] generics) {
 			super(obj);
+			this.outerType = null;
 			this.generics = generics;
 			this.hash = obj.hashCode() + 31 * Arrays.hashCode(generics);
 		}
 
+		public GenericObject(GenericObject outerType, String innerName, ArgType[] generics) {
+			super(outerType.getObject() + "$" + innerName);
+			this.outerType = outerType;
+			this.generics = generics;
+			this.hash = outerType.hashCode() + 31 * innerName.hashCode()
+					+ 31 * 31 * Arrays.hashCode(generics);
+		}
+
+		@Override
+		public boolean isGeneric() {
+			return true;
+		}
+
 		@Override
 		public ArgType[] getGenericTypes() {
 			return generics;
 		}
 
+		@Override
+		public ArgType getOuterType() {
+			return outerType;
+		}
+
 		@Override
 		boolean internalEquals(Object obj) {
 			return super.internalEquals(obj)
-					&& Arrays.equals(generics, ((GenericObjectArg) obj).generics);
+					&& Arrays.equals(generics, ((GenericObject) obj).generics);
 		}
 
 		@Override
@@ -189,7 +264,7 @@ public abstract class ArgType {
 		}
 	}
 
-	private static final class ArrayArg extends KnownTypeArg {
+	private static final class ArrayArg extends KnownType {
 		private final ArgType arrayElement;
 
 		public ArrayArg(ArgType arrayElement) {
@@ -229,7 +304,7 @@ public abstract class ArgType {
 
 		@Override
 		public String toString() {
-			return arrayElement.toString() + "[]";
+			return arrayElement + "[]";
 		}
 	}
 
@@ -299,13 +374,17 @@ public abstract class ArgType {
 	}
 
 	public String getObject() {
-		throw new UnsupportedOperationException();
+		throw new UnsupportedOperationException("ArgType.getObject(), call class: " + this.getClass());
 	}
 
 	public boolean isObject() {
 		return false;
 	}
 
+	public boolean isGeneric() {
+		return false;
+	}
+
 	public boolean isGenericType() {
 		return false;
 	}
@@ -314,6 +393,21 @@ public abstract class ArgType {
 		return null;
 	}
 
+	public ArgType getWildcardType() {
+		return null;
+	}
+
+	/**
+	 * @see jadx.core.dex.instructions.args.ArgType.WildcardType#getWildcardBounds()
+	 */
+	public int getWildcardBounds() {
+		return 0;
+	}
+
+	public ArgType getOuterType() {
+		return null;
+	}
+
 	public boolean isArray() {
 		return false;
 	}
@@ -343,7 +437,7 @@ public abstract class ArgType {
 	}
 
 	public static ArgType merge(ArgType a, ArgType b) {
-		if (b == null || a == null) {
+		if (a == null || b == null) {
 			return null;
 		}
 		if (a.equals(b)) {
@@ -375,7 +469,7 @@ public abstract class ArgType {
 						types.add(type);
 					}
 				}
-				if (types.size() == 0) {
+				if (types.isEmpty()) {
 					return null;
 				} else if (types.size() == 1) {
 					PrimitiveType nt = types.get(0);
@@ -400,7 +494,7 @@ public abstract class ArgType {
 				String aObj = a.getObject();
 				String bObj = b.getObject();
 				if (aObj.equals(bObj)) {
-					return (a.getGenericTypes() != null ? a : b);
+					return a.getGenericTypes() != null ? a : b;
 				} else if (aObj.equals(Consts.CLASS_OBJECT)) {
 					return b;
 				} else if (bObj.equals(Consts.CLASS_OBJECT)) {
@@ -408,7 +502,7 @@ public abstract class ArgType {
 				} else {
 					// different objects
 					String obj = clsp.getCommonAncestor(aObj, bObj);
-					return (obj == null ? null : object(obj));
+					return obj == null ? null : object(obj);
 				}
 			}
 			if (a.isArray()) {
@@ -419,7 +513,7 @@ public abstract class ArgType {
 						return OBJECT;
 					} else {
 						ArgType res = merge(ea, eb);
-						return (res == null ? null : ArgType.array(res));
+						return res == null ? null : ArgType.array(res);
 					}
 				} else if (b.equals(OBJECT)) {
 					return OBJECT;
@@ -459,148 +553,7 @@ public abstract class ArgType {
 		}
 	}
 
-	public static ArgType parseSignature(String sign) {
-		int b = sign.indexOf('<');
-		if (b == -1) {
-			return parse(sign);
-		}
-		if (sign.charAt(0) == '[') {
-			return array(parseSignature(sign.substring(1)));
-		}
-		String obj = sign.substring(0, b) + ";";
-		String genericsStr = sign.substring(b + 1, sign.length() - 2);
-		List<ArgType> generics = parseSignatureList(genericsStr);
-		if (generics != null) {
-			return generic(obj, generics.toArray(new ArgType[generics.size()]));
-		} else {
-			return object(obj);
-		}
-	}
-
-	public static List<ArgType> parseSignatureList(String str) {
-		try {
-			return parseSignatureListInner(str, true);
-		} catch (Throwable e) {
-			LOG.warn("Signature parse exception: {}", str, e);
-			return null;
-		}
-	}
-
-	private static List<ArgType> parseSignatureListInner(String str, boolean parsePrimitives) {
-		if (str.isEmpty()) {
-			return Collections.emptyList();
-		}
-		if (str.equals("*")) {
-			return Arrays.asList(UNKNOWN);
-		}
-		List<ArgType> signs = new ArrayList<ArgType>(3);
-		int obj = 0;
-		int objStart = 0;
-		int gen = 0;
-		int arr = 0;
-
-		int pos = 0;
-		ArgType type = null;
-		while (pos < str.length()) {
-			char c = str.charAt(pos);
-			switch (c) {
-				case 'L':
-				case 'T':
-					if (obj == 0 && gen == 0) {
-						obj++;
-						objStart = pos;
-					}
-					break;
-
-				case ';':
-					if (obj == 1 && gen == 0) {
-						obj--;
-						String o = str.substring(objStart, pos + 1);
-						type = parseSignature(o);
-					}
-					break;
-
-				case ':': // generic types map separator
-					if (gen == 0) {
-						obj = 0;
-						String o = str.substring(objStart, pos);
-						if (o.length() > 0) {
-							type = genericType(o);
-						}
-					}
-					break;
-
-				case '<':
-					gen++;
-					break;
-				case '>':
-					gen--;
-					break;
-
-				case '[':
-					if (obj == 0 && gen == 0) {
-						arr++;
-					}
-					break;
-
-				default:
-					if (parsePrimitives && obj == 0 && gen == 0) {
-						type = parse(c);
-					}
-					break;
-			}
-
-			if (type != null) {
-				if (arr == 0) {
-					signs.add(type);
-				} else {
-					for (int i = 0; i < arr; i++) {
-						type = array(type);
-					}
-					signs.add(type);
-					arr = 0;
-				}
-				type = null;
-				objStart = pos + 1;
-			}
-			pos++;
-		}
-		return signs;
-	}
-
-	public static Map<ArgType, List<ArgType>> parseGenericMap(String gen) {
-		try {
-			Map<ArgType, List<ArgType>> genericMap = null;
-			List<ArgType> genTypes = parseSignatureListInner(gen, false);
-			if (genTypes != null) {
-				genericMap = new LinkedHashMap<ArgType, List<ArgType>>(2);
-				ArgType prev = null;
-				List<ArgType> genList = new ArrayList<ArgType>(2);
-				for (ArgType arg : genTypes) {
-					if (arg.isGenericType()) {
-						if (prev != null) {
-							genericMap.put(prev, genList);
-							genList = new ArrayList<ArgType>();
-						}
-						prev = arg;
-					} else {
-						if (!arg.getObject().equals(Consts.CLASS_OBJECT)) {
-							genList.add(arg);
-						}
-					}
-				}
-				if (prev != null) {
-					genericMap.put(prev, genList);
-				}
-			}
-			return genericMap;
-		} catch (Throwable e) {
-			LOG.warn("Generic map parse exception: {}", gen, e);
-			return null;
-		}
-	}
-
-	private static ArgType parse(char f) {
+	public static ArgType parse(char f) {
 		switch (f) {
 			case 'Z':
 				return BOOLEAN;

jadx-core/src/main/java/jadx/core/dex/instructions/args/FieldArg.java

@@ -2,12 +2,16 @@ package jadx.core.dex.instructions.args;
 
 import jadx.core.dex.info.FieldInfo;
 
+// TODO: don't extend RegisterArg (now used as a result of instruction)
 public final class FieldArg extends RegisterArg {
 
 	private final FieldInfo field;
+	// instArg equal 'null' for static fields
+	private final InsnArg instArg;
 
-	public FieldArg(FieldInfo field, int regNum) {
-		super(regNum, field.getType());
+	public FieldArg(FieldInfo field, InsnArg reg) {
+		super(-1);
+		this.instArg = reg;
 		this.field = field;
 	}
 
@@ -15,8 +19,12 @@ public final class FieldArg extends RegisterArg {
 		return field;
 	}
 
+	public InsnArg getInstanceArg() {
+		return instArg;
+	}
+
 	public boolean isStatic() {
-		return regNum == -1;
+		return instArg == null;
 	}
 
 	@Override
@@ -29,6 +37,37 @@ public final class FieldArg extends RegisterArg {
 		return false;
 	}
 
+	@Override
+	public void setType(ArgType type) {
+		this.type = type;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof FieldArg) || !super.equals(obj)) {
+			return false;
+		}
+		FieldArg fieldArg = (FieldArg) obj;
+		if (!field.equals(fieldArg.field)) {
+			return false;
+		}
+		if (instArg != null ? !instArg.equals(fieldArg.instArg) : fieldArg.instArg != null) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + field.hashCode();
+		result = 31 * result + (instArg != null ? instArg.hashCode() : 0);
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		return "(" + field + ")";

jadx-core/src/main/java/jadx/core/dex/instructions/args/ImmutableTypedVar.java

@@ -1,27 +0,0 @@
-package jadx.core.dex.instructions.args;
-
-public class ImmutableTypedVar extends TypedVar {
-
-	public ImmutableTypedVar(ArgType type) {
-		super(type);
-	}
-
-	@Override
-	public boolean isImmutable() {
-		return true;
-	}
-
-	@Override
-	public void forceSetType(ArgType newType) {
-	}
-
-	@Override
-	public boolean merge(TypedVar typedVar) {
-		return false;
-	}
-
-	@Override
-	public boolean merge(ArgType type) {
-		return false;
-	}
-}

jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnArg.java

@@ -3,6 +3,9 @@ package jadx.core.dex.instructions.args;
 import jadx.core.dex.nodes.InsnNode;
 import jadx.core.utils.InsnUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.android.dx.io.instructions.DecodedInstruction;
 
 /**
@@ -11,6 +14,8 @@ import com.android.dx.io.instructions.DecodedInstruction;
  */
 public abstract class InsnArg extends Typed {
 
+	private static final Logger LOG = LoggerFactory.getLogger(InsnArg.class);
+
 	protected InsnNode parentInsn;
 
 	public static RegisterArg reg(int regNum, ArgType type) {
@@ -21,10 +26,8 @@ public abstract class InsnArg extends Typed {
 		return reg(InsnUtils.getArg(insn, argNum), type);
 	}
 
-	public static RegisterArg immutableReg(int regNum, ArgType type) {
-		RegisterArg r = new RegisterArg(regNum);
-		r.forceSetTypedVar(new ImmutableTypedVar(type));
-		return r;
+	public static MthParameterArg parameterReg(int regNum, ArgType type) {
+		return new MthParameterArg(regNum, type);
 	}
 
 	public static LiteralArg lit(long literal, ArgType type) {
@@ -69,7 +72,13 @@ public abstract class InsnArg extends Typed {
 
 	public InsnArg wrapInstruction(InsnNode insn) {
 		InsnNode parent = parentInsn;
-		assert parent != insn : "Can't wrap instruction info itself";
+		if (parent == null) {
+			return null;
+		}
+		if (parent == insn) {
+			LOG.debug("Can't wrap instruction info itself: " + insn);
+			return null;
+		}
 		int count = parent.getArgsCount();
 		for (int i = 0; i < count; i++) {
 			if (parent.getArg(i) == this) {
@@ -90,11 +99,11 @@ public abstract class InsnArg extends Typed {
 				break;
 			case CONST_STR:
 				arg = wrap(insn);
-				arg.getTypedVar().forceSetType(ArgType.STRING);
+				arg.setType(ArgType.STRING);
 				break;
 			case CONST_CLASS:
 				arg = wrap(insn);
-				arg.getTypedVar().forceSetType(ArgType.CLASS);
+				arg.setType(ArgType.CLASS);
 				break;
 			default:
 				arg = wrap(insn);
@@ -104,7 +113,7 @@ public abstract class InsnArg extends Typed {
 	}
 
 	public boolean isThis() {
-		// must be implemented in RegisterArg
+		// must be implemented in RegisterArg and MthParameterArg
 		return false;
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/InsnWrapArg.java

@@ -7,8 +7,8 @@ public final class InsnWrapArg extends InsnArg {
 	private final InsnNode wrappedInsn;
 
 	public InsnWrapArg(InsnNode insn) {
-		ArgType type = (insn.getResult() == null ? ArgType.VOID : insn.getResult().getType());
-		this.typedVar = new TypedVar(type);
+		RegisterArg result = insn.getResult();
+		this.type = result != null ? result.getType() : ArgType.VOID;
 		this.wrappedInsn = insn;
 	}
 
@@ -29,6 +29,6 @@ public final class InsnWrapArg extends InsnArg {
 
 	@Override
 	public String toString() {
-		return "(wrap: " + typedVar + "\n  " + wrappedInsn + ")";
+		return "(wrap: " + type + "\n  " + wrappedInsn + ")";
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/LiteralArg.java

@@ -5,6 +5,9 @@ import jadx.core.utils.exceptions.JadxRuntimeException;
 
 public final class LiteralArg extends InsnArg {
 
+	public static final LiteralArg TRUE = new LiteralArg(1, ArgType.BOOLEAN);
+	public static final LiteralArg FALSE = new LiteralArg(0, ArgType.BOOLEAN);
+
 	private final long literal;
 
 	public LiteralArg(long value, ArgType type) {
@@ -21,7 +24,7 @@ public final class LiteralArg extends InsnArg {
 			}
 		}
 		this.literal = value;
-		this.typedVar = new TypedVar(type);
+		this.type = type;
 	}
 
 	public long getLiteral() {
@@ -34,7 +37,7 @@ public final class LiteralArg extends InsnArg {
 	}
 
 	public boolean isInteger() {
-		PrimitiveType type = typedVar.getType().getPrimitiveType();
+		PrimitiveType type = this.type.getPrimitiveType();
 		return (type == PrimitiveType.INT
 				|| type == PrimitiveType.BYTE
 				|| type == PrimitiveType.CHAR
@@ -42,13 +45,34 @@ public final class LiteralArg extends InsnArg {
 				|| type == PrimitiveType.LONG);
 	}
 
+	@Override
+	public int hashCode() {
+		return (int) (literal ^ (literal >>> 32)) + 31 * getType().hashCode();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		LiteralArg that = (LiteralArg) o;
+		return literal == that.literal && getType().equals(that.getType());
+	}
+
 	@Override
 	public String toString() {
 		try {
-			return "(" + TypeGen.literalToString(literal, getType()) + " " + typedVar + ")";
+			String value = TypeGen.literalToString(literal, getType());
+			if (getType().equals(ArgType.BOOLEAN) && (value.equals("true") || value.equals("false"))) {
+				return value;
+			}
+			return "(" + value + " " + type + ")";
 		} catch (JadxRuntimeException ex) {
 			// can't convert literal to string
-			return "(" + literal + " " + typedVar + ")";
+			return "(" + literal + " " + type + ")";
 		}
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/MthParameterArg.java

@@ -0,0 +1,64 @@
+package jadx.core.dex.instructions.args;
+
+public class MthParameterArg extends RegisterArg {
+
+	private boolean isThis = false;
+
+	public MthParameterArg(int rn, ArgType type) {
+		super(rn, type);
+	}
+
+	@Override
+	public boolean isTypeImmutable() {
+		return true;
+	}
+
+	@Override
+	public void setType(ArgType type) {
+	}
+
+	public void markAsThis() {
+		this.isThis = true;
+	}
+
+	@Override
+	public boolean isThis() {
+		return isThis;
+	}
+
+	@Override
+	public String getName() {
+		if (isThis) {
+			return "this";
+		}
+		return super.getName();
+	}
+
+	@Override
+	void setSVar(SSAVar sVar) {
+		if (isThis) {
+			sVar.setName("this");
+		}
+		super.setSVar(sVar);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof MthParameterArg)) {
+			return false;
+		}
+		if (!super.equals(obj)) {
+			return false;
+		}
+		MthParameterArg that = (MthParameterArg) obj;
+		return isThis == that.isThis;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + (isThis ? 1 : 0);
+	}
+}

jadx-core/src/main/java/jadx/core/dex/instructions/args/Named.java

@@ -0,0 +1,8 @@
+package jadx.core.dex.instructions.args;
+
+public interface Named {
+
+	String getName();
+
+	void setName(String name);
+}

jadx-core/src/main/java/jadx/core/dex/instructions/args/NamedArg.java

@@ -1,12 +1,12 @@
 package jadx.core.dex.instructions.args;
 
-public final class NamedArg extends InsnArg {
+public final class NamedArg extends InsnArg implements Named {
 
 	private String name;
 
 	public NamedArg(String name, ArgType type) {
 		this.name = name;
-		this.typedVar = new TypedVar(type);
+		this.type = type;
 	}
 
 	public String getName() {
@@ -24,6 +24,6 @@ public final class NamedArg extends InsnArg {
 
 	@Override
 	public String toString() {
-		return "(" + name + " " + typedVar + ")";
+		return "(" + name + " " + type + ")";
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/PrimitiveType.java

@@ -30,17 +30,19 @@ public enum PrimitiveType {
 	}
 
 	public static PrimitiveType getWidest(PrimitiveType a, PrimitiveType b) {
-		if (a.ordinal() > b.ordinal())
+		if (a.ordinal() > b.ordinal()) {
 			return a;
-		else
+		} else {
 			return b;
+		}
 	}
 
 	public static PrimitiveType getSmaller(PrimitiveType a, PrimitiveType b) {
-		if (a.ordinal() < b.ordinal())
+		if (a.ordinal() < b.ordinal()) {
 			return a;
-		else
+		} else {
 			return b;
+		}
 	}
 
 	@Override

jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java

@@ -1,11 +1,12 @@
 package jadx.core.dex.instructions.args;
 
-import jadx.core.dex.attributes.AttributeType;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.info.FieldInfo;
 import jadx.core.dex.instructions.ConstClassNode;
 import jadx.core.dex.instructions.ConstStringNode;
 import jadx.core.dex.instructions.IndexInsnNode;
 import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.PhiInsn;
 import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.FieldNode;
 import jadx.core.dex.nodes.InsnNode;
@@ -14,17 +15,18 @@ import jadx.core.dex.nodes.parser.FieldValueAttr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RegisterArg extends InsnArg {
+public class RegisterArg extends InsnArg implements Named {
 	private static final Logger LOG = LoggerFactory.getLogger(RegisterArg.class);
 
 	protected final int regNum;
+	protected SSAVar sVar;
 
 	public RegisterArg(int rn) {
 		this.regNum = rn;
 	}
 
 	public RegisterArg(int rn, ArgType type) {
-		this.typedVar = new TypedVar(type);
+		this.type = type;
 		this.regNum = rn;
 	}
 
@@ -37,17 +39,49 @@ public class RegisterArg extends InsnArg {
 		return true;
 	}
 
-	public InsnNode getAssignInsn() {
-		for (InsnArg arg : getTypedVar().getUseList()) {
-			InsnNode assignInsn = arg.getParentInsn();
-			if (assignInsn == null)
-				// assign as function argument
-				return null;
-			else if (assignInsn.getResult() != null
-					&& assignInsn.getResult().getRegNum() == regNum)
-				return assignInsn;
+	public SSAVar getSVar() {
+		return sVar;
+	}
+
+	void setSVar(SSAVar sVar) {
+		this.sVar = sVar;
+	}
+
+	public String getName() {
+		if (sVar == null) {
+			return null;
 		}
-		return null;
+		return sVar.getName();
+	}
+
+	public void setName(String name) {
+		if (sVar != null) {
+			sVar.setName(name);
+		}
+	}
+
+	public boolean isNameEquals(InsnArg arg) {
+		String n = getName();
+		if (n == null || !(arg instanceof Named)) {
+			return false;
+		}
+		return n.equals(((Named) arg).getName());
+	}
+
+	@Override
+	public void setType(ArgType type) {
+		if (sVar != null) {
+			sVar.setType(type);
+		}
+	}
+
+	public void mergeDebugInfo(ArgType type, String name) {
+		setType(type);
+		setName(name);
+	}
+
+	public void forceType(ArgType type) {
+		this.type = type;
 	}
 
 	/**
@@ -57,69 +91,122 @@ public class RegisterArg extends InsnArg {
 	 */
 	public Object getConstValue(DexNode dex) {
 		InsnNode parInsn = getAssignInsn();
-		if (parInsn != null) {
-			InsnType insnType = parInsn.getType();
-			switch (insnType) {
-				case CONST:
-					return parInsn.getArg(0);
-				case CONST_STR:
-					return ((ConstStringNode) parInsn).getString();
-				case CONST_CLASS:
-					return ((ConstClassNode) parInsn).getClsType();
-				case SGET:
-					FieldInfo f = (FieldInfo) ((IndexInsnNode) parInsn).getIndex();
-					FieldNode fieldNode = dex.resolveField(f);
-					if (fieldNode != null) {
-						FieldValueAttr attr = (FieldValueAttr) fieldNode.getAttributes().get(AttributeType.FIELD_VALUE);
-						if (attr != null) {
-							return attr.getValue();
-						}
-					} else {
-						LOG.warn("Field {} not found in dex {}", f, dex);
+		if (parInsn == null) {
+			return null;
+		}
+		InsnType insnType = parInsn.getType();
+		switch (insnType) {
+			case CONST:
+				return parInsn.getArg(0);
+			case CONST_STR:
+				return ((ConstStringNode) parInsn).getString();
+			case CONST_CLASS:
+				return ((ConstClassNode) parInsn).getClsType();
+			case SGET:
+				FieldInfo f = (FieldInfo) ((IndexInsnNode) parInsn).getIndex();
+				FieldNode fieldNode = dex.resolveField(f);
+				if (fieldNode != null) {
+					FieldValueAttr attr = fieldNode.get(AType.FIELD_VALUE);
+					if (attr != null) {
+						return attr.getValue();
 					}
-					break;
-			}
+				} else {
+					LOG.warn("Field {} not found in dex {}", f, dex);
+				}
+				break;
 		}
 		return null;
 	}
 
 	@Override
 	public boolean isThis() {
-		if (isRegister()) {
-			String name = getTypedVar().getName();
-			if (name != null && name.equals("this")) {
-				return true;
-			}
-			// maybe it was moved from 'this' register
-			InsnNode ai = getAssignInsn();
-			if (ai != null && ai.getType() == InsnType.MOVE) {
-				InsnArg arg = ai.getArg(0);
-				if (arg != this && arg.isThis()) {
-					return true;
-				}
+		if ("this".equals(getName())) {
+			return true;
+		}
+		// maybe it was moved from 'this' register
+		InsnNode ai = getAssignInsn();
+		if (ai != null && ai.getType() == InsnType.MOVE) {
+			InsnArg arg = ai.getArg(0);
+			if (arg != this) {
+				return arg.isThis();
 			}
 		}
 		return false;
 	}
 
+	public InsnNode getAssignInsn() {
+		if (sVar == null) {
+			return null;
+		}
+		RegisterArg assign = sVar.getAssign();
+		if (assign != null) {
+			return assign.getParentInsn();
+		}
+		return null;
+	}
+
+	public InsnNode getPhiAssignInsn() {
+		PhiInsn usePhi = sVar.getUsedInPhi();
+		if (usePhi != null) {
+			return usePhi;
+		}
+		RegisterArg assign = sVar.getAssign();
+		if (assign != null) {
+			InsnNode parent = assign.getParentInsn();
+			if (parent != null && parent.getType() == InsnType.PHI) {
+				return parent;
+			}
+		}
+		return null;
+	}
+
+	public boolean equalRegisterAndType(RegisterArg arg) {
+		return regNum == arg.regNum && type.equals(arg.type);
+	}
+
 	@Override
 	public int hashCode() {
-		return regNum * 31 + typedVar.hashCode();
+		return (regNum * 31 + type.hashCode()) * 31 + (sVar != null ? sVar.hashCode() : 0);
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (getClass() != obj.getClass()) return false;
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof RegisterArg)) {
+			return false;
+		}
 		RegisterArg other = (RegisterArg) obj;
-		if (regNum != other.regNum) return false;
-		if (!typedVar.equals(other.typedVar)) return false;
+		if (regNum != other.regNum) {
+			return false;
+		}
+		if (!type.equals(other.type)) {
+			return false;
+		}
+		if (sVar != null && !sVar.equals(other.getSVar())) {
+			return false;
+		}
 		return true;
 	}
 
 	@Override
 	public String toString() {
-		return "(r" + regNum + " " + typedVar + ")";
+		StringBuilder sb = new StringBuilder();
+		sb.append("(r");
+		sb.append(regNum);
+		if (sVar != null) {
+			sb.append("_").append(sVar.getVersion());
+		}
+		if (getName() != null) {
+			sb.append(" '").append(getName()).append("'");
+		}
+		sb.append(" ");
+		sb.append(type);
+		sb.append(")");
+		return sb.toString();
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java

@@ -0,0 +1,149 @@
+package jadx.core.dex.instructions.args;
+
+import jadx.core.dex.instructions.PhiInsn;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SSAVar {
+
+	private final int regNum;
+	private final int version;
+	private VarName varName;
+
+	private RegisterArg assign;
+	private final List<RegisterArg> useList = new ArrayList<RegisterArg>(2);
+	private PhiInsn usedInPhi;
+
+	private ArgType type;
+
+	public SSAVar(int regNum, int v, RegisterArg assign) {
+		this.regNum = regNum;
+		this.version = v;
+		this.assign = assign;
+
+		if (assign != null) {
+			assign.setSVar(this);
+		}
+	}
+
+	public int getRegNum() {
+		return regNum;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public RegisterArg getAssign() {
+		return assign;
+	}
+
+	public void setAssign(RegisterArg assign) {
+		this.assign = assign;
+	}
+
+	public List<RegisterArg> getUseList() {
+		return useList;
+	}
+
+	public int getUseCount() {
+		return useList.size();
+	}
+
+	public void use(RegisterArg arg) {
+		if (arg.getSVar() != null) {
+			arg.getSVar().removeUse(arg);
+		}
+		arg.setSVar(this);
+		useList.add(arg);
+	}
+
+	public void removeUse(RegisterArg arg) {
+		for (int i = 0, useListSize = useList.size(); i < useListSize; i++) {
+			if (useList.get(i) == arg) {
+				useList.remove(i);
+				break;
+			}
+		}
+	}
+
+	public void setUsedInPhi(PhiInsn usedInPhi) {
+		this.usedInPhi = usedInPhi;
+	}
+
+	public PhiInsn getUsedInPhi() {
+		return usedInPhi;
+	}
+
+	public boolean isUsedInPhi() {
+		return usedInPhi != null;
+	}
+
+	public int getVariableUseCount() {
+		if (!isUsedInPhi()) {
+			return useList.size();
+		}
+		return useList.size() + usedInPhi.getResult().getSVar().getUseCount();
+	}
+
+	public ArgType getType() {
+		return type;
+	}
+
+	public void setType(ArgType type) {
+		this.type = type;
+		if (assign != null) {
+			assign.type = type;
+		}
+		for (int i = 0, useListSize = useList.size(); i < useListSize; i++) {
+			useList.get(i).type = type;
+		}
+	}
+
+	public void setName(String name) {
+		if (name != null) {
+			if (varName == null) {
+				varName = new VarName();
+			}
+			varName.setName(name);
+		}
+	}
+
+	public String getName() {
+		if (varName == null) {
+			return null;
+		}
+		return varName.getName();
+	}
+
+	public VarName getVarName() {
+		return varName;
+	}
+
+	public void setVarName(VarName varName) {
+		this.varName = varName;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof SSAVar)) {
+			return false;
+		}
+		SSAVar ssaVar = (SSAVar) o;
+		return regNum == ssaVar.regNum && version == ssaVar.version;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * regNum + version;
+	}
+
+	@Override
+	public String toString() {
+		return "r" + regNum + "_" + version;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/instructions/args/Typed.java

@@ -1,71 +1,31 @@
 package jadx.core.dex.instructions.args;
 
-import java.util.List;
-
 public abstract class Typed {
 
-	TypedVar typedVar;
-
-	public TypedVar getTypedVar() {
-		return typedVar;
-	}
+	protected ArgType type;
 
 	public ArgType getType() {
-		return typedVar.getType();
+		return type;
 	}
 
-	public boolean merge(Typed var) {
-		return typedVar.merge(var.getTypedVar());
+	public void setType(ArgType type) {
+		this.type = type;
 	}
 
-	public boolean merge(ArgType var) {
-		return typedVar.merge(var);
+	public boolean isTypeImmutable() {
+		return false;
 	}
 
-	public void forceSetTypedVar(TypedVar arg) {
-		this.typedVar = arg;
-	}
-
-	public void mergeDebugInfo(Typed arg) {
-		merge(arg);
-		mergeName(arg);
-	}
-
-	protected void mergeName(Typed arg) {
-		getTypedVar().mergeName(arg.getTypedVar());
-	}
-
-	public boolean replaceTypedVar(Typed var) {
-		TypedVar curVar = this.typedVar;
-		TypedVar newVar = var.typedVar;
-		if (curVar == newVar) {
-			return false;
+	public boolean merge(ArgType newType) {
+		ArgType m = ArgType.merge(type, newType);
+		if (m != null && !m.equals(type)) {
+			setType(m);
+			return true;
 		}
-		if (curVar != null) {
-			if (curVar.isImmutable()) {
-				moveInternals(newVar, curVar);
-			} else {
-				newVar.merge(curVar);
-				moveInternals(curVar, newVar);
-				this.typedVar = newVar;
-			}
-		} else {
-			this.typedVar = newVar;
-		}
-		return true;
+		return false;
 	}
 
-	private void moveInternals(TypedVar from, TypedVar to) {
-		List<InsnArg> curUseList = from.getUseList();
-		if (curUseList.size() != 0) {
-			for (InsnArg arg : curUseList) {
-				if (arg != this) {
-					arg.forceSetTypedVar(to);
-				}
-			}
-			to.getUseList().addAll(curUseList);
-			curUseList.clear();
-		}
-		to.mergeName(from);
+	public boolean merge(InsnArg arg) {
+		return merge(arg.getType());
 	}
 }

jadx-core/src/main/java/jadx/core/dex/instructions/args/TypedVar.java

@@ -1,94 +0,0 @@
-package jadx.core.dex.instructions.args;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TypedVar {
-
-	private ArgType type;
-	private final List<InsnArg> useList = new ArrayList<InsnArg>(2);
-	private String name;
-
-	public TypedVar(ArgType initType) {
-		this.type = initType;
-	}
-
-	public ArgType getType() {
-		return type;
-	}
-
-	/**
-	 * This method must be used very carefully
-	 */
-	public void forceSetType(ArgType newType) {
-		type = newType;
-	}
-
-	public boolean merge(TypedVar typedVar) {
-		return merge(typedVar.getType());
-	}
-
-	public boolean merge(ArgType mtype) {
-		ArgType res = ArgType.merge(type, mtype);
-		if (res != null && !type.equals(res)) {
-			this.type = res;
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public List<InsnArg> getUseList() {
-		return useList;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void mergeName(TypedVar arg) {
-		String name = arg.getName();
-		if (name != null) {
-			setName(name);
-		} else if (getName() != null) {
-			arg.setName(getName());
-		}
-	}
-
-	public boolean isImmutable() {
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return type.hashCode() * 31 + (name == null ? 0 : name.hashCode());
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (!(obj instanceof TypedVar)) return false;
-		TypedVar other = (TypedVar) obj;
-		if (!type.equals(other.type)) return false;
-		if (name == null) {
-			if (other.name != null) return false;
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		if (name != null)
-			sb.append('\'').append(name).append("' ");
-		sb.append(type);
-		return sb.toString();
-	}
-}

jadx-core/src/main/java/jadx/core/dex/instructions/args/VarName.java

@@ -0,0 +1,18 @@
+package jadx.core.dex.instructions.args;
+
+public class VarName {
+	private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/instructions/mods/ConstructorInsn.java

@@ -26,7 +26,6 @@ public class ConstructorInsn extends InsnNode {
 		this.callMth = invoke.getCallMth();
 		ClassInfo classType = callMth.getDeclClass();
 		instanceArg = (RegisterArg) invoke.getArg(0);
-		instanceArg.setParentInsn(this);
 
 		if (instanceArg.isThis()) {
 			if (classType.equals(mth.getParentClass().getClassInfo())) {
@@ -42,11 +41,15 @@ public class ConstructorInsn extends InsnNode {
 		} else {
 			callType = CallType.CONSTRUCTOR;
 			setResult(instanceArg);
+			// convert from 'use' to 'assign'
+			instanceArg.getSVar().setAssign(instanceArg);
 		}
+		instanceArg.getSVar().removeUse(instanceArg);
 		for (int i = 1; i < invoke.getArgsCount(); i++) {
 			addArg(invoke.getArg(i));
 		}
 		offset = invoke.getOffset();
+		setSourceLine(invoke.getSourceLine());
 	}
 
 	public MethodInfo getCallMth() {
@@ -73,6 +76,29 @@ public class ConstructorInsn extends InsnNode {
 		return callType == CallType.SELF;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof ConstructorInsn) || !super.equals(o)) {
+			return false;
+		}
+		ConstructorInsn that = (ConstructorInsn) o;
+		return callMth.equals(that.callMth)
+				&& callType == that.callType
+				&& instanceArg.equals(that.instanceArg);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + callMth.hashCode();
+		result = 31 * result + callType.hashCode();
+		result = 31 * result + instanceArg.hashCode();
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		return super.toString() + " " + callMth + " " + callType;

jadx-core/src/main/java/jadx/core/dex/instructions/mods/TernaryInsn.java

@@ -0,0 +1,59 @@
+package jadx.core.dex.instructions.mods;
+
+import jadx.core.dex.instructions.InsnType;
+import jadx.core.dex.instructions.args.InsnArg;
+import jadx.core.dex.instructions.args.LiteralArg;
+import jadx.core.dex.instructions.args.RegisterArg;
+import jadx.core.dex.nodes.InsnNode;
+import jadx.core.dex.regions.IfCondition;
+import jadx.core.utils.InsnUtils;
+import jadx.core.utils.Utils;
+
+public class TernaryInsn extends InsnNode {
+
+	private final IfCondition condition;
+
+	public TernaryInsn(IfCondition condition, RegisterArg result, InsnArg th, InsnArg els) {
+		super(InsnType.TERNARY, 2);
+		setResult(result);
+
+		if (th.equals(LiteralArg.FALSE) && els.equals(LiteralArg.TRUE)) {
+			// inverted
+			this.condition = IfCondition.invert(condition);
+			addArg(els);
+			addArg(th);
+		} else {
+			this.condition = condition;
+			addArg(th);
+			addArg(els);
+		}
+	}
+
+	public IfCondition getCondition() {
+		return condition;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof TernaryInsn) || !super.equals(obj)) {
+			return false;
+		}
+		TernaryInsn that = (TernaryInsn) obj;
+		return condition.equals(that.condition);
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * super.hashCode() + condition.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return InsnUtils.formatOffset(offset) + ": TERNARY"
+				+ getResult() + " = "
+				+ Utils.listToString(getArguments());
+	}
+}

jadx-core/src/main/java/jadx/core/dex/nodes/BlockNode.java

@@ -1,14 +1,15 @@
 package jadx.core.dex.nodes;
 
+import jadx.core.dex.attributes.AFlag;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.AttrNode;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.BlockRegState;
-import jadx.core.dex.attributes.LoopAttr;
+import jadx.core.dex.attributes.nodes.LoopInfo;
 import jadx.core.utils.InsnUtils;
 
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 public class BlockNode extends AttrNode implements IBlock {
@@ -21,12 +22,14 @@ public class BlockNode extends AttrNode implements IBlock {
 	private List<BlockNode> successors = new ArrayList<BlockNode>(1);
 	private List<BlockNode> cleanSuccessors;
 
-	private BitSet doms; // all dominators
-	private BlockNode idom; // immediate dominator
-	private final List<BlockNode> dominatesOn = new ArrayList<BlockNode>(1);
-
-	private BlockRegState startState;
-	private BlockRegState endState;
+	// all dominators
+	private BitSet doms;
+	// dominance frontier
+	private BitSet domFrontier;
+	// immediate dominator
+	private BlockNode idom;
+	// blocks on which dominates this block
+	private List<BlockNode> dominatesOn = Collections.emptyList();
 
 	public BlockNode(int id, int offset) {
 		this.id = id;
@@ -58,9 +61,17 @@ public class BlockNode extends AttrNode implements IBlock {
 	}
 
 	public void lock() {
-		cleanSuccessors = Collections.unmodifiableList(cleanSuccessors);
-		successors = Collections.unmodifiableList(successors);
-		predecessors = Collections.unmodifiableList(predecessors);
+		cleanSuccessors = lockList(cleanSuccessors);
+		successors = lockList(successors);
+		predecessors = lockList(predecessors);
+		dominatesOn = lockList(dominatesOn);
+	}
+
+	List<BlockNode> lockList(List<BlockNode> list) {
+		if (list.isEmpty()) {
+			return Collections.emptyList();
+		}
+		return Collections.unmodifiableList(list);
 	}
 
 	/**
@@ -68,24 +79,27 @@ public class BlockNode extends AttrNode implements IBlock {
 	 */
 	private static List<BlockNode> cleanSuccessors(BlockNode block) {
 		List<BlockNode> sucList = block.getSuccessors();
-		List<BlockNode> nodes = new ArrayList<BlockNode>(sucList.size());
-		LoopAttr loop = (LoopAttr) block.getAttributes().get(AttributeType.LOOP);
-		if (loop == null) {
-			for (BlockNode b : sucList) {
-				if (!b.getAttributes().contains(AttributeType.EXC_HANDLER))
-					nodes.add(b);
-			}
-		} else {
-			for (BlockNode b : sucList) {
-				if (!b.getAttributes().contains(AttributeType.EXC_HANDLER)) {
-					// don't follow back edge
-					if (loop.getStart() == b && loop.getEnd() == block)
-						continue;
-					nodes.add(b);
-				}
+		if (sucList.isEmpty()) {
+			return sucList;
+		}
+		List<BlockNode> toRemove = new LinkedList<BlockNode>();
+		for (BlockNode b : sucList) {
+			if (b.contains(AType.EXC_HANDLER)) {
+				toRemove.add(b);
 			}
 		}
-		return (nodes.size() == sucList.size() ? sucList : nodes);
+		if (block.contains(AFlag.LOOP_END)) {
+			List<LoopInfo> loops = block.getAll(AType.LOOP);
+			for (LoopInfo loop : loops) {
+				toRemove.add(loop.getStart());
+			}
+		}
+		if (toRemove.isEmpty()) {
+			return sucList;
+		}
+		List<BlockNode> result = new ArrayList<BlockNode>(sucList);
+		result.removeAll(toRemove);
+		return result;
 	}
 
 	@Override
@@ -115,6 +129,14 @@ public class BlockNode extends AttrNode implements IBlock {
 		this.doms = doms;
 	}
 
+	public BitSet getDomFrontier() {
+		return domFrontier;
+	}
+
+	public void setDomFrontier(BitSet domFrontier) {
+		this.domFrontier = domFrontier;
+	}
+
 	/**
 	 * Immediate dominator
 	 */
@@ -130,20 +152,19 @@ public class BlockNode extends AttrNode implements IBlock {
 		return dominatesOn;
 	}
 
-	public BlockRegState getStartState() {
-		return startState;
+	public void addDominatesOn(BlockNode block) {
+		if (dominatesOn.isEmpty()) {
+			dominatesOn = new LinkedList<BlockNode>();
+		}
+		dominatesOn.add(block);
 	}
 
-	public void setStartState(BlockRegState startState) {
-		this.startState = startState;
+	public boolean isSynthetic() {
+		return contains(AFlag.SYNTHETIC);
 	}
 
-	public BlockRegState getEndState() {
-		return endState;
-	}
-
-	public void setEndState(BlockRegState endState) {
-		this.endState = endState;
+	public boolean isReturnBlock() {
+		return contains(AFlag.RETURN);
 	}
 
 	@Override
@@ -153,16 +174,33 @@ public class BlockNode extends AttrNode implements IBlock {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null) return false;
-		if (hashCode() != obj.hashCode()) return false;
-		if (!(obj instanceof BlockNode)) return false;
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (hashCode() != obj.hashCode()) {
+			return false;
+		}
+		if (!(obj instanceof BlockNode)) {
+			return false;
+		}
 		BlockNode other = (BlockNode) obj;
-		if (id != other.id) return false;
-		if (startOffset != other.startOffset) return false;
+		if (id != other.id) {
+			return false;
+		}
+		if (startOffset != other.startOffset) {
+			return false;
+		}
 		return true;
 	}
 
+	@Override
+	public String baseString() {
+		return Integer.toString(id);
+	}
+
 	@Override
 	public String toString() {
 		return "B:" + id + ":" + InsnUtils.formatOffset(startOffset);

jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java

@@ -2,10 +2,11 @@ package jadx.core.dex.nodes;
 
 import jadx.core.Consts;
 import jadx.core.codegen.CodeWriter;
-import jadx.core.dex.attributes.AttributeType;
-import jadx.core.dex.attributes.LineAttrNode;
-import jadx.core.dex.attributes.SourceFileAttr;
+import jadx.core.dex.attributes.AType;
 import jadx.core.dex.attributes.annotations.Annotation;
+import jadx.core.dex.attributes.nodes.JadxErrorAttr;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
+import jadx.core.dex.attributes.nodes.SourceFileAttr;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.info.AccessInfo.AFType;
 import jadx.core.dex.info.ClassInfo;
@@ -16,72 +17,83 @@ import jadx.core.dex.instructions.args.LiteralArg;
 import jadx.core.dex.instructions.args.PrimitiveType;
 import jadx.core.dex.nodes.parser.AnnotationsParser;
 import jadx.core.dex.nodes.parser.FieldValueAttr;
+import jadx.core.dex.nodes.parser.SignatureParser;
 import jadx.core.dex.nodes.parser.StaticValuesParser;
-import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.DecodeException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.android.dx.io.ClassData;
-import com.android.dx.io.ClassData.Field;
-import com.android.dx.io.ClassData.Method;
-import com.android.dx.io.ClassDef;
+import com.android.dex.ClassData;
+import com.android.dex.ClassData.Field;
+import com.android.dex.ClassData.Method;
+import com.android.dex.ClassDef;
 
 public class ClassNode extends LineAttrNode implements ILoadable {
 	private static final Logger LOG = LoggerFactory.getLogger(ClassNode.class);
 
 	private final DexNode dex;
 	private final ClassInfo clsInfo;
+	private final AccessInfo accessFlags;
 	private ClassInfo superClass;
 	private List<ClassInfo> interfaces;
 	private Map<ArgType, List<ArgType>> genericMap;
 
-	private final List<MethodNode> methods = new ArrayList<MethodNode>();
-	private final List<FieldNode> fields = new ArrayList<FieldNode>();
-
-	private final AccessInfo accessFlags;
+	private final List<MethodNode> methods;
+	private final List<FieldNode> fields;
+	private Map<Object, FieldNode> constFields = Collections.emptyMap();
 	private List<ClassNode> innerClasses = Collections.emptyList();
 
-	private final Map<Object, FieldNode> constFields = new HashMap<Object, FieldNode>();
-
-	private CodeWriter code; // generated code
+	// store decompiled code
+	private CodeWriter code;
+	// store parent for inner classes or 'this' otherwise
+	private ClassNode parentClass;
 
 	public ClassNode(DexNode dex, ClassDef cls) throws DecodeException {
 		this.dex = dex;
 		this.clsInfo = ClassInfo.fromDex(dex, cls.getTypeIndex());
 		try {
-			this.superClass = cls.getSupertypeIndex() == DexNode.NO_INDEX
-					? null
-					: ClassInfo.fromDex(dex, cls.getSupertypeIndex());
-
+			if (cls.getSupertypeIndex() == DexNode.NO_INDEX) {
+				this.superClass = null;
+			} else {
+				this.superClass = ClassInfo.fromDex(dex, cls.getSupertypeIndex());
+			}
 			this.interfaces = new ArrayList<ClassInfo>(cls.getInterfaces().length);
 			for (short interfaceIdx : cls.getInterfaces()) {
 				this.interfaces.add(ClassInfo.fromDex(dex, interfaceIdx));
 			}
-
 			if (cls.getClassDataOffset() != 0) {
 				ClassData clsData = dex.readClassData(cls);
+				int mthsCount = clsData.getDirectMethods().length + clsData.getVirtualMethods().length;
+				int fieldsCount = clsData.getStaticFields().length + clsData.getInstanceFields().length;
 
-				for (Method mth : clsData.getDirectMethods())
+				methods = new ArrayList<MethodNode>(mthsCount);
+				fields = new ArrayList<FieldNode>(fieldsCount);
+
+				for (Method mth : clsData.getDirectMethods()) {
 					methods.add(new MethodNode(this, mth));
-
-				for (Method mth : clsData.getVirtualMethods())
+				}
+				for (Method mth : clsData.getVirtualMethods()) {
 					methods.add(new MethodNode(this, mth));
+				}
 
-				for (Field f : clsData.getStaticFields())
+				for (Field f : clsData.getStaticFields()) {
 					fields.add(new FieldNode(this, f));
-
+				}
 				loadStaticValues(cls, fields);
-
-				for (Field f : clsData.getInstanceFields())
+				for (Field f : clsData.getInstanceFields()) {
 					fields.add(new FieldNode(this, f));
+				}
+			} else {
+				methods = Collections.emptyList();
+				fields = Collections.emptyList();
 			}
 
 			loadAnnotations(cls);
@@ -92,19 +104,21 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 			int sfIdx = cls.getSourceFileIndex();
 			if (sfIdx != DexNode.NO_INDEX) {
 				String fileName = dex.getString(sfIdx);
-				if (!this.getFullName().contains(fileName.replace(".java", ""))) {
-					this.getAttributes().add(new SourceFileAttr(fileName));
+				if (!this.getFullName().contains(fileName.replace(".java", ""))
+						&& !fileName.equals("SourceFile")) {
+					this.addAttr(new SourceFileAttr(fileName));
 					LOG.debug("Class '{}' compiled from '{}'", this, fileName);
 				}
 			}
 
+			// restore original access flags from dalvik annotation if present
 			int accFlagsValue;
-			Annotation a = getAttributes().getAnnotation(Consts.DALVIK_INNER_CLASS);
-			if (a != null)
+			Annotation a = getAnnotation(Consts.DALVIK_INNER_CLASS);
+			if (a != null) {
 				accFlagsValue = (Integer) a.getValues().get("accessFlags");
-			else
+			} else {
 				accFlagsValue = cls.getAccessFlags();
-
+			}
 			this.accessFlags = new AccessInfo(accFlagsValue, AFType.CLASS);
 
 		} catch (Exception e) {
@@ -116,7 +130,7 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 		int offset = cls.getAnnotationsOffset();
 		if (offset != 0) {
 			try {
-				new AnnotationsParser(this, offset);
+				new AnnotationsParser(this).parse(offset);
 			} catch (DecodeException e) {
 				LOG.error("Error parsing annotations in " + this, e);
 			}
@@ -126,20 +140,19 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 	private void loadStaticValues(ClassDef cls, List<FieldNode> staticFields) throws DecodeException {
 		for (FieldNode f : staticFields) {
 			if (f.getAccessFlags().isFinal()) {
-				FieldValueAttr nullValue = new FieldValueAttr(null);
-				f.getAttributes().add(nullValue);
+				f.addAttr(new FieldValueAttr(null));
 			}
 		}
 
 		int offset = cls.getStaticValuesOffset();
 		if (offset != 0) {
 			StaticValuesParser parser = new StaticValuesParser(dex, dex.openSection(offset));
-			parser.processFields(staticFields);
-
+			int count = parser.processFields(staticFields);
+			constFields = new LinkedHashMap<Object, FieldNode>(count);
 			for (FieldNode f : staticFields) {
 				AccessInfo accFlags = f.getAccessFlags();
 				if (accFlags.isStatic() && accFlags.isFinal()) {
-					FieldValueAttr fv = (FieldValueAttr) f.getAttributes().get(AttributeType.FIELD_VALUE);
+					FieldValueAttr fv = f.get(AType.FIELD_VALUE);
 					if (fv != null && fv.getValue() != null) {
 						if (accFlags.isPublic()) {
 							dex.getConstFields().put(fv.getValue(), f);
@@ -151,57 +164,55 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	private void parseClassSignature() {
-		Annotation a = this.getAttributes().getAnnotation(Consts.DALVIK_SIGNATURE);
-		if (a == null)
+		SignatureParser sp = SignatureParser.fromNode(this);
+		if (sp == null) {
 			return;
-
-		String sign = Utils.mergeSignature((List<String>) a.getDefaultValue());
-		// parse generic map
-		int end = Utils.getGenericEnd(sign);
-		if (end != -1) {
-			String gen = sign.substring(1, end);
-			genericMap = ArgType.parseGenericMap(gen);
-			sign = sign.substring(end + 1);
 		}
-
-		// parse super class signature and interfaces
-		List<ArgType> list = ArgType.parseSignatureList(sign);
-		if (list != null && !list.isEmpty()) {
-			try {
-				ArgType st = list.remove(0);
-				this.superClass = ClassInfo.fromType(st);
-				int i = 0;
-				for (ArgType it : list) {
-					ClassInfo interf = ClassInfo.fromType(it);
-					interfaces.set(i, interf);
-					i++;
+		try {
+			// parse class generic map
+			genericMap = sp.consumeGenericMap();
+			// parse super class signature
+			superClass = ClassInfo.fromType(sp.consumeType());
+			// parse interfaces signatures
+			for (int i = 0; i < interfaces.size(); i++) {
+				ArgType type = sp.consumeType();
+				if (type != null) {
+					interfaces.set(i, ClassInfo.fromType(type));
+				} else {
+					break;
+				}
+			}
+		} catch (JadxRuntimeException e) {
+			LOG.error("Class signature parse error: " + this, e);
+		}
+	}
+
+	private void setFieldsTypesFromSignature() {
+		for (FieldNode field : fields) {
+			SignatureParser sp = SignatureParser.fromNode(field);
+			if (sp != null) {
+				try {
+					ArgType gType = sp.consumeType();
+					if (gType != null) {
+						field.setType(gType);
+					}
+				} catch (JadxRuntimeException e) {
+					LOG.error("Field signature parse error: " + field, e);
 				}
-			} catch (Throwable e) {
-				LOG.warn("Can't set signatures for class: {}, sign: {}", this, sign, e);
 			}
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private void setFieldsTypesFromSignature() {
-		for (FieldNode field : fields) {
-			Annotation a = field.getAttributes().getAnnotation(Consts.DALVIK_SIGNATURE);
-			if (a == null)
-				continue;
-
-			String sign = Utils.mergeSignature((List<String>) a.getDefaultValue());
-			ArgType gType = ArgType.parseSignature(sign);
-			if (gType != null)
-				field.setType(gType);
-		}
-	}
-
 	@Override
-	public void load() throws DecodeException {
+	public void load() {
 		for (MethodNode mth : getMethods()) {
-			mth.load();
+			try {
+				mth.load();
+			} catch (DecodeException e) {
+				LOG.error("Method load error", e);
+				mth.addAttr(new JadxErrorAttr(e));
+			}
 		}
 		for (ClassNode innerCls : getInnerClasses()) {
 			innerCls.load();
@@ -288,33 +299,40 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 	public FieldNode searchFieldById(int id) {
 		String name = FieldInfo.getNameById(dex, id);
 		for (FieldNode f : fields) {
-			if (f.getName().equals(name))
+			if (f.getName().equals(name)) {
 				return f;
+			}
 		}
 		return null;
 	}
 
 	public FieldNode searchField(FieldInfo field) {
-		String name = field.getName();
+		return searchFieldByName(field.getName());
+	}
+
+	public FieldNode searchFieldByName(String name) {
 		for (FieldNode f : fields) {
-			if (f.getName().equals(name))
+			if (f.getName().equals(name)) {
 				return f;
+			}
 		}
 		return null;
 	}
 
 	public MethodNode searchMethod(MethodInfo mth) {
 		for (MethodNode m : methods) {
-			if (m.getMethodInfo().equals(mth))
+			if (m.getMethodInfo().equals(mth)) {
 				return m;
+			}
 		}
 		return null;
 	}
 
 	public MethodNode searchMethodByName(String shortId) {
 		for (MethodNode m : methods) {
-			if (m.getMethodInfo().getShortId().equals(shortId))
+			if (m.getMethodInfo().getShortId().equals(shortId)) {
 				return m;
+			}
 		}
 		return null;
 	}
@@ -323,13 +341,27 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 		return searchMethodByName(MethodInfo.fromDex(dex, id).getShortId());
 	}
 
+	public ClassNode getParentClass() {
+		if (parentClass == null) {
+			if (clsInfo.isInner()) {
+				ClassNode parent = dex().resolveClass(clsInfo.getParentClass());
+				parent = parent == null ? this : parent;
+				parentClass = parent;
+			} else {
+				parentClass = this;
+			}
+		}
+		return parentClass;
+	}
+
 	public List<ClassNode> getInnerClasses() {
 		return innerClasses;
 	}
 
 	public void addInnerClass(ClassNode cls) {
-		if (innerClasses.isEmpty())
+		if (innerClasses.isEmpty()) {
 			innerClasses = new ArrayList<ClassNode>(3);
+		}
 		innerClasses.add(cls);
 	}
 
@@ -348,7 +380,7 @@ public class ClassNode extends LineAttrNode implements ILoadable {
 			if (mth.getAccessFlags().isConstructor()
 					&& mth.getMethodInfo().isConstructor()
 					&& (mth.getMethodInfo().getArgsCount() == 0
-						|| (mth.getArguments(false) != null && mth.getArguments(false).isEmpty()))) {
+					|| (mth.getArguments(false) != null && mth.getArguments(false).isEmpty()))) {
 				return mth;
 			}
 		}

jadx-core/src/main/java/jadx/core/dex/nodes/DexNode.java

@@ -13,23 +13,23 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.android.dx.io.ClassData;
-import com.android.dx.io.ClassData.Method;
-import com.android.dx.io.ClassDef;
-import com.android.dx.io.Code;
-import com.android.dx.io.DexBuffer;
-import com.android.dx.io.DexBuffer.Section;
-import com.android.dx.io.FieldId;
-import com.android.dx.io.MethodId;
-import com.android.dx.io.ProtoId;
-import com.android.dx.merge.TypeList;
+import com.android.dex.ClassData;
+import com.android.dex.ClassData.Method;
+import com.android.dex.ClassDef;
+import com.android.dex.Code;
+import com.android.dex.Dex;
+import com.android.dex.Dex.Section;
+import com.android.dex.FieldId;
+import com.android.dex.MethodId;
+import com.android.dex.ProtoId;
+import com.android.dex.TypeList;
 
 public class DexNode {
 
 	public static final int NO_INDEX = -1;
 
 	private final RootNode root;
-	private final DexBuffer dexBuf;
+	private final Dex dexBuf;
 	private final List<ClassNode> classes = new ArrayList<ClassNode>();
 	private final String[] strings;
 

jadx-core/src/main/java/jadx/core/dex/nodes/Edge.java

@@ -0,0 +1,42 @@
+package jadx.core.dex.nodes;
+
+public class Edge {
+	private final BlockNode source;
+	private final BlockNode target;
+
+	public Edge(BlockNode source, BlockNode target) {
+		this.source = source;
+		this.target = target;
+	}
+
+	public BlockNode getSource() {
+		return source;
+	}
+
+	public BlockNode getTarget() {
+		return target;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		Edge edge = (Edge) o;
+		return source.equals(edge.source) && target.equals(edge.target);
+
+	}
+
+	@Override
+	public int hashCode() {
+		return source.hashCode() + 31 * target.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return "Edge: " + source + " -> " + target;
+	}
+}

jadx-core/src/main/java/jadx/core/dex/nodes/FieldNode.java

@@ -1,21 +1,23 @@
 package jadx.core.dex.nodes;
 
-import jadx.core.dex.attributes.LineAttrNode;
+import jadx.core.dex.attributes.nodes.LineAttrNode;
 import jadx.core.dex.info.AccessInfo;
 import jadx.core.dex.info.AccessInfo.AFType;
 import jadx.core.dex.info.FieldInfo;
 import jadx.core.dex.instructions.args.ArgType;
 
-import com.android.dx.io.ClassData.Field;
+import com.android.dex.ClassData.Field;
 
 public class FieldNode extends LineAttrNode {
 
+	private final ClassNode parent;
 	private final FieldInfo fieldInfo;
 	private final AccessInfo accFlags;
 
 	private ArgType type; // store signature
 
 	public FieldNode(ClassNode cls, Field field) {
+		this.parent = cls;
 		this.fieldInfo = FieldInfo.fromDex(cls.dex(), field.getFieldIndex());
 		this.type = fieldInfo.getType();
 		this.accFlags = new AccessInfo(field.getAccessFlags(), AFType.FIELD);
@@ -41,6 +43,10 @@ public class FieldNode extends LineAttrNode {
 		this.type = type;
 	}
 
+	public ClassNode getParentClass() {
+		return parent;
+	}
+
 	@Override
 	public int hashCode() {
 		return fieldInfo.hashCode();
@@ -48,14 +54,18 @@ public class FieldNode extends LineAttrNode {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj) return true;
-		if (obj == null || getClass() != obj.getClass()) return false;
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null || getClass() != obj.getClass()) {
+			return false;
+		}
 		FieldNode other = (FieldNode) obj;
 		return fieldInfo.equals(other.fieldInfo);
 	}
 
 	@Override
 	public String toString() {
-		return fieldInfo.getDeclClass() + "." + fieldInfo.getName() + " " + type;
+		return fieldInfo.getDeclClass() + "." + fieldInfo.getName() + " :" + type;
 	}
 }

jadx-core/src/main/java/jadx/core/dex/nodes/IContainer.java

@@ -3,4 +3,7 @@ package jadx.core.dex.nodes;
 import jadx.core.dex.attributes.IAttributeNode;
 
 public interface IContainer extends IAttributeNode {
+
+	// unique id for use in 'toString()' method
+	String baseString();
 }