Revert "Fix OOM errors by processing files individually (#32)" (#33)

This reverts commit 667f2a9.

Author: androidacy-user

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/Analyzer.kt

@@ -36,7 +36,7 @@ class Analyzer(private val grip: Grip, private val classFilter: ((className: Str
       { it },
       { createObfuscationConfiguration(it) }
     )
-    return AnalysisResult(obfuscationConfigurationsByType.toMutableMap(), typesToObfuscate.toMutableSet())
+    return AnalysisResult(obfuscationConfigurationsByType)
   }
 
   private fun findTypesToObfuscate(inputs: List<Path>): Set<Type.Object> {

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/DeobfuscatorGenerator.kt

@@ -29,22 +29,18 @@ import org.objectweb.asm.Opcodes.ACC_SUPER
 import org.objectweb.asm.Type
 import org.objectweb.asm.commons.Method
 
-// MEMORY FIX: Remove FileRegistry dependency.
-// IMPACT: Simplifies the generator, avoids holding file paths in memory.
 class DeobfuscatorGenerator(
-    private val deobfuscator: Deobfuscator,
-    private val stringRegistry: StringRegistry,
-    private val classRegistry: ClassRegistry
+  private val deobfuscator: Deobfuscator,
+  private val stringRegistry: StringRegistry,
+  private val classRegistry: ClassRegistry,
+  private val fileRegistry: FileRegistry
 ) {
 
-    fun generateDeobfuscator(): ByteArray {
-        val writer = StandaloneClassWriter(
-            ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES,
-            classRegistry
-        )
-        writer.visit(
-            Opcodes.V1_6,
-            ACC_PUBLIC or ACC_SUPER,
+  fun generateDeobfuscator(): ByteArray {
+    val writer = StandaloneClassWriter(ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES, classRegistry, fileRegistry)
+    writer.visit(
+      Opcodes.V1_6,
+      ACC_PUBLIC or ACC_SUPER,
       deobfuscator.type.internalName,
       null,
       OBJECT_TYPE.internalName,

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/Model.kt

@@ -19,14 +19,11 @@ package org.lsposed.lsparanoid.processor
 
 import com.joom.grip.mirrors.Type
 
-// MEMORY FIX: Immutable map -> Mutable map.
-// IMPACT: Avoids creating new map instances, reducing GC overhead.
 data class AnalysisResult(
-    val configurationsByType: MutableMap<Type.Object, ClassConfiguration>,
-    val obfuscatedTypes: MutableSet<Type.Object>
+  val configurationsByType: Map<Type.Object, ClassConfiguration>
 )
 
 data class ClassConfiguration(
-    val container: Type.Object,
-    val constantStringsByFieldName: Map<String, String>
+  val container: Type.Object,
+  val constantStringsByFieldName: Map<String, String>
 )

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/ParanoidProcessor.kt

@@ -31,11 +31,9 @@ import org.objectweb.asm.commons.Method
 import java.nio.file.Path
 import java.util.jar.JarOutputStream
 
-// MEMORY FIX: Loading all inputs at once -> Processing inputs individually.
-// IMPACT: Memory usage is proportional to the largest input, not all of them.
 class ParanoidProcessor(
-    private val seed: Int,
-    private val classpath: Set<Path>,
+    seed: Int,
+    classpath: Set<Path>,
     private val inputs: List<Path>,
     private val output: JarOutputStream,
     private val asmApi: Int = Opcodes.ASM9,
@@ -45,18 +43,13 @@ class ParanoidProcessor(
 
     private val logger = getLogger()
 
+    private val grip: Grip = GripFactory.newInstance(asmApi).create(classpath + inputs)
     private val stringRegistry = StringRegistryImpl(seed)
 
     fun process() {
         dumpConfiguration()
 
-        val analysisResult = AnalysisResult(mutableMapOf(), mutableSetOf())
-        inputs.forEach { input ->
-            val grip = GripFactory.newInstance(asmApi).create(classpath + input)
-            val result = Analyzer(grip, classFilter).analyze(listOf(input))
-            analysisResult.configurationsByType.putAll(result.configurationsByType)
-            analysisResult.obfuscatedTypes.addAll(result.obfuscatedTypes)
-        }
+        val analysisResult = Analyzer(grip, classFilter).analyze(inputs)
         analysisResult.dump()
 
         val deobfuscator = createDeobfuscator()
@@ -67,19 +60,20 @@ class ParanoidProcessor(
         }
 
         try {
-            val grip = GripFactory.newInstance(asmApi).create(classpath + inputs)
             Patcher(
                 deobfuscator,
                 stringRegistry,
                 analysisResult,
                 grip.classRegistry,
+                grip.fileRegistry,
                 asmApi
             ).copyAndPatchClasses(sources, output)
             val deobfuscatorBytes =
                 DeobfuscatorGenerator(
                     deobfuscator,
                     stringRegistry,
-                    grip.classRegistry
+                    grip.classRegistry,
+                    grip.fileRegistry
                 ).generateDeobfuscator()
             output.createFile("${deobfuscator.type.internalName}.class", deobfuscatorBytes)
         } finally {

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/Patcher.kt

@@ -32,13 +32,12 @@ import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.Opcodes
 import java.util.jar.JarOutputStream
 
-// MEMORY FIX: Decouple Patcher from global Grip instance.
-// IMPACT: Patcher operates on a per-file basis, reducing memory load.
 class Patcher(
     private val deobfuscator: Deobfuscator,
     private val stringRegistry: StringRegistry,
     private val analysisResult: AnalysisResult,
     private val classRegistry: ClassRegistry,
+    private val fileRegistry: FileRegistry,
     private val asmApi: Int,
 ) {
 
@@ -94,7 +93,8 @@ class Patcher(
         val reader = ClassReader(source.readFile(name))
         val writer = StandaloneClassWriter(
             ClassWriter.COMPUTE_MAXS or ClassWriter.COMPUTE_FRAMES,
-            classRegistry
+            classRegistry,
+            fileRegistry
         )
         val shouldObfuscateLiterals = reader.access and Opcodes.ACC_INTERFACE == 0
         val patcher =

processor/src/main/kotlin/org/lsposed/lsparanoid/processor/StandaloneClassWriter.kt

@@ -27,25 +27,28 @@ import org.lsposed.lsparanoid.processor.logging.getLogger
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassWriter
 
-// MEMORY FIX: Remove FileRegistry dependency.
-// IMPACT: Simplifies the class writer, avoids holding file paths in memory.
 class StandaloneClassWriter : ClassWriter {
     private val logger = getLogger()
     private val classRegistry: ClassRegistry
+    private val fileRegistry: FileRegistry
 
     constructor(
         flags: Int,
-        classRegistry: ClassRegistry
+        classRegistry: ClassRegistry,
+        fileRegistry: FileRegistry
     ) : super(flags) {
         this.classRegistry = classRegistry
+        this.fileRegistry = fileRegistry
     }
 
     constructor(
         classReader: ClassReader,
         flags: Int,
-        classRegistry: ClassRegistry
+        classRegistry: ClassRegistry,
+        fileRegistry: FileRegistry
     ) : super(classReader, flags) {
         this.classRegistry = classRegistry
+        this.fileRegistry = fileRegistry
     }
 
     override fun getCommonSuperClass(type1: String, type2: String): String {
@@ -72,9 +75,9 @@ class StandaloneClassWriter : ClassWriter {
     }
 
     private fun ClassRegistry.getClassMirrorOrObject(type: Type.Object): ClassMirror {
-        return try {
+        return fileRegistry.findPathForType(type)?.let { _ ->
             getClassMirror(type)
-        } catch (exception: Exception) {
+        } ?: run {
             logger.info("[getClassMirrorOrObject]: {} not found", type)
             getClassMirror(OBJECT_TYPE)
         }