From fe1d952a9912bf597174dc636d0f87db06a8d925 Mon Sep 17 00:00:00 2001
From: David Srbecky <dsrbecky@google.com>
Date: Mon, 25 Mar 2019 17:19:11 +0000
Subject: Use generic name for JNI trampolines.

JNI trampolines tend to be deduplicated which seems to lead to confusion.

Bug: 32949969
Test: test.py -b --host -r -t 137-cfi
Change-Id: Ic39998448a05f98fc1e068c4f384f35085121911
---
 compiler/optimizing/optimizing_compiler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/optimizing/optimizing_compiler.cc')

diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 795c367c0d..f4bf11d3d3 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -1313,7 +1313,7 @@ bool OptimizingCompiler::JitCompile(Thread* self,
       const auto* method_header = reinterpret_cast<const OatQuickMethodHeader*>(code);
       const uintptr_t code_address = reinterpret_cast<uintptr_t>(method_header->GetCode());
       debug::MethodDebugInfo info = {};
-      DCHECK(info.custom_name.empty());
+      info.custom_name = "art_jni_trampoline";
       info.dex_file = dex_file;
       info.class_def_index = class_def_idx;
       info.dex_method_index = method_idx;
-- 
cgit v1.2.3-59-g8ed1b