• Skylot's avatar
    Merge branch 'master' into type-inference-wip · 84cb6b95
    Skylot authored
    # Conflicts:
    #	jadx-core/src/main/java/jadx/core/codegen/NameGen.java
    #	jadx-core/src/main/java/jadx/core/dex/attributes/AttributeStorage.java
    #	jadx-core/src/main/java/jadx/core/dex/attributes/nodes/PhiListAttr.java
    #	jadx-core/src/main/java/jadx/core/dex/instructions/IndexInsnNode.java
    #	jadx-core/src/main/java/jadx/core/dex/instructions/InsnDecoder.java
    #	jadx-core/src/main/java/jadx/core/dex/instructions/args/ArgType.java
    #	jadx-core/src/main/java/jadx/core/dex/instructions/args/RegisterArg.java
    #	jadx-core/src/main/java/jadx/core/dex/instructions/args/SSAVar.java
    #	jadx-core/src/main/java/jadx/core/dex/regions/conditions/IfRegion.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/ModVisitor.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksPair.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/helpers/BlocksRemoveInfo.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/debuginfo/LocalVar.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessVariables.java
    #	jadx-core/src/main/java/jadx/core/dex/visitors/shrink/CodeShrinkVisitor.java
    #	jadx-core/src/main/java/jadx/core/xmlgen/entry/EntryConfig.java
    84cb6b95
RunTests.java 2.97 KB