Make backup logic as a function

LSPosed · Aug 6, 2024 · 897c70b · 897c70b
1 parent 68f8a63
commit 897c70b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lsplant/src/main/jni/art/runtime/art_method.cxx b/lsplant/src/main/jni/art/runtime/art_method.cxx
@@ -155,6 +155,17 @@ export class ArtMethod {
             reinterpret_cast<uintptr_t>(this) + declaring_class_offset));
     }
 
+    void BackupTo(ArtMethod *backup) {
+        SetNonCompilable();
+
+        // copy after setNonCompilable
+        backup->CopyFrom(this);
+
+        ClearFastInterpretFlag();
+
+        if (!backup->IsStatic()) backup->SetPrivate();
+    }
+
     static art::ArtMethod *FromReflectedMethod(JNIEnv *env, jobject method) {
         if (art_method_field) [[likely]] {
             return reinterpret_cast<art::ArtMethod *>(

diff --git a/lsplant/src/main/jni/lsplant.cc b/lsplant/src/main/jni/lsplant.cc
@@ -592,18 +592,12 @@ bool DoHook(ArtMethod *target, ArtMethod *hook, ArtMethod *backup) {
     } else {
         LOGV("Generated trampoline %p", entrypoint);
 
-        target->SetNonCompilable();
         hook->SetNonCompilable();
 
-        // copy after setNonCompilable
-        backup->CopyFrom(target);
-
-        target->ClearFastInterpretFlag();
+        target->BackupTo(backup);
 
         target->SetEntryPoint(entrypoint);
 
-        if (!backup->IsStatic()) backup->SetPrivate();
-
         LOGV("Done hook: target(%p:0x%x) -> %p; backup(%p:0x%x) -> %p; hook(%p:0x%x) -> %p", target,
              target->GetAccessFlags(), target->GetEntryPoint(), backup, backup->GetAccessFlags(),
              backup->GetEntryPoint(), hook, hook->GetAccessFlags(), hook->GetEntryPoint());