commit 73ecedc8ce14906a9f8b51c35e5b993167c36fc1
author Yabin Cui <yabinc@google.com> Tue Jan 31 01:35:25 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 31 01:35:25 2023 +0000
tree 202e3698792d10139286231478adebcb817c5cda
parent 2f635f8bb5251fd08b86d99b5d6c6dbad7d83325
parent afb02237c63bfdb4c2f20064e1e720967a25f46d

Merge "simpleperf: fix deobfuscating Java symbols."

simpleperf/report_utils.cpp

diff --git a/simpleperf/report_utils.cpp b/simpleperf/report_utils.cpp
index ef482c7..b495ef20 100644
--- a/simpleperf/report_utils.cpp
+++ b/simpleperf/report_utils.cpp
@@ -242,6 +242,11 @@
             method_it != proguard_class.method_map.end()) {
           std::string new_symbol_name = proguard_class.original_classname + "." + method_it->second;
           entry.symbol->SetDemangledName(new_symbol_name);
+        } else {
+          // Only the classname is obfuscated.
+          std::string new_symbol_name =
+              proguard_class.original_classname + "." + obfuscated_methodname;
+          entry.symbol->SetDemangledName(new_symbol_name);
         }
       }
     }

simpleperf/report_utils_test.cpp

diff --git a/simpleperf/report_utils_test.cpp b/simpleperf/report_utils_test.cpp
index 6fa3378..6b7d867 100644
--- a/simpleperf/report_utils_test.cpp
+++ b/simpleperf/report_utils_test.cpp
@@ -65,6 +65,7 @@
                    Symbol("java_method2", 0x3000, 0x100),
                    Symbol("java_method3", 0x3100, 0x100),
                    Symbol("obfuscated_class.obfuscated_java_method2", 0x3200, 0x100),
+                   Symbol("obfuscated_class.java_method4", 0x3300, 0x100),
                });
 
     // Add map layout for libraries used in the thread:
@@ -265,11 +266,12 @@
   std::vector<uint64_t> fake_ips = {
       0x2200,  // 2200,  // obfuscated_class.obfuscated_java_method
       0x3200,  // 3200,  // obfuscated_class.obfuscated_java_method2
+      0x3300,  // 3300,  // obfuscated_class.java_method4
   };
   CallChainReportBuilder builder(thread_tree);
   // Symbol names aren't changed when not given proguard mapping files.
   std::vector<CallChainReportEntry> entries = builder.Build(thread, fake_ips, 0);
-  ASSERT_EQ(entries.size(), 2);
+  ASSERT_EQ(entries.size(), 3);
   ASSERT_EQ(entries[0].ip, 0x2200);
   ASSERT_STREQ(entries[0].symbol->DemangledName(), "obfuscated_class.obfuscated_java_method");
   ASSERT_EQ(entries[0].dso->Path(), fake_dex_file_path);
@@ -280,6 +282,11 @@
   ASSERT_EQ(entries[1].dso->Path(), fake_jit_cache_path);
   ASSERT_EQ(entries[1].vaddr_in_file, 0x3200);
   ASSERT_EQ(entries[1].execution_type, CallChainExecutionType::JIT_JVM_METHOD);
+  ASSERT_EQ(entries[2].ip, 0x3300);
+  ASSERT_STREQ(entries[2].symbol->DemangledName(), "obfuscated_class.java_method4");
+  ASSERT_EQ(entries[2].dso->Path(), fake_jit_cache_path);
+  ASSERT_EQ(entries[2].vaddr_in_file, 0x3300);
+  ASSERT_EQ(entries[2].execution_type, CallChainExecutionType::JIT_JVM_METHOD);
 
   // Symbol names are changed when given a proguard mapping file.
   TemporaryFile tmpfile;
@@ -294,7 +301,7 @@
       tmpfile.path));
   builder.AddProguardMappingFile(tmpfile.path);
   entries = builder.Build(thread, fake_ips, 0);
-  ASSERT_EQ(entries.size(), 2);
+  ASSERT_EQ(entries.size(), 3);
   ASSERT_EQ(entries[0].ip, 0x2200);
   ASSERT_STREQ(entries[0].symbol->DemangledName(),
                "android.support.v4.app.RemoteActionCompatParcelizer.read");
@@ -307,6 +314,11 @@
   ASSERT_EQ(entries[1].dso->Path(), fake_jit_cache_path);
   ASSERT_EQ(entries[1].vaddr_in_file, 0x3200);
   ASSERT_EQ(entries[1].execution_type, CallChainExecutionType::JIT_JVM_METHOD);
+  ASSERT_STREQ(entries[2].symbol->DemangledName(),
+               "android.support.v4.app.RemoteActionCompatParcelizer.java_method4");
+  ASSERT_EQ(entries[2].dso->Path(), fake_jit_cache_path);
+  ASSERT_EQ(entries[2].vaddr_in_file, 0x3300);
+  ASSERT_EQ(entries[2].execution_type, CallChainExecutionType::JIT_JVM_METHOD);
 }
 
 TEST_F(CallChainReportBuilderTest, add_proguard_mapping_file_for_jit_method_with_signature) {