Snap for 11390602 from e90bad14591692a1a55ae4655112e25915513d26 to mainline-art-releaseaml_art_341711000aml_art_341615020

Change-Id: If58d311e85ba79ed86be0f13d10663b6a55351ba

1 files changed, 18 insertions, 3 deletions

diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 4ea71ad1..fef62e13 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -34,6 +34,7 @@
 #include <android-base/test_utils.h>
 
 #include "ETMRecorder.h"
+#include "JITDebugReader.h"
 #include "ProbeEvents.h"
 #include "cmd_record_impl.h"
 #include "command.h"
@@ -907,6 +908,7 @@ TEST(record_cmd, check_trampoline_after_art_jni_methods) {
   auto reader = RecordFileReader::CreateInstance(helper.GetDataPath());
   ASSERT_TRUE(reader);
   ThreadTree thread_tree;
+  ASSERT_TRUE(reader->LoadBuildIdAndFileFeatures(thread_tree));
 
   auto get_symbol_name = [&](ThreadEntry* thread, uint64_t ip) -> std::string {
     const MapEntry* map = thread_tree.FindMap(thread, ip, false);
@@ -928,10 +930,23 @@ TEST(record_cmd, check_trampoline_after_art_jni_methods) {
         if (android::base::StartsWith(sym_name, "art::Method_invoke") && i + 1 < ips.size()) {
           has_check = true;
           std::string name = get_symbol_name(thread, ips[i + 1]);
-          if (!android::base::EndsWith(name, "jni_trampoline")) {
-            GTEST_LOG_(ERROR) << "unexpected symbol after art::Method_invoke: " << name;
-            return false;
+          if (android::base::EndsWith(name, "jni_trampoline")) {
+            continue;
           }
+          // When the jni_trampoline function is from JIT cache, we may not get map info in time.
+          // To avoid test flakiness, we accept this.
+          // Case 1: It doesn't hit any maps.
+          if (name == "unknown") {
+            continue;
+          }
+          // Case 2: It hits an old map for JIT cache.
+          if (const MapEntry* map = thread_tree.FindMap(thread, ips[i + 1], false);
+              JITDebugReader::IsPathInJITSymFile(map->dso->Path())) {
+            continue;
+          }
+
+          GTEST_LOG_(ERROR) << "unexpected symbol after art::Method_invoke: " << name;
+          return false;
         }
       }
     }