commit 0eb882bfc5d260e8014c26adfda11602065aa5d8
author Vladimir Marko <vmarko@google.com> Mon May 15 13:39:18 2017 +0100
committer Vladimir Marko <vmarko@google.com> Wed Jun 07 15:39:24 2017 +0100
tree e66dbebfb1e9a254c20954a2f2f98541aebfd5af
parent b5f5d746ac3f2c3088292395603cb1470e7749d2

Use ArtMethod* .bss entries for HInvokeStaticOrDirect.

Test: m test-art-host-gtest
Test: testrunner.py --host
Test: testrunner.py --target
Test: Nexus 6P boots.
Test: Build aosp_mips64-userdebug.
Bug: 30627598
Change-Id: I0e54fdd2e91e983d475b7a04d40815ba89ae3d4f

compiler/compiled_method_test.cc

diff --git a/compiler/compiled_method_test.cc b/compiler/compiled_method_test.cc
index 72b2282..f4a72cf 100644
--- a/compiler/compiled_method_test.cc
+++ b/compiler/compiled_method_test.cc
@@ -58,6 +58,14 @@
       LinkerPatch::RelativeMethodPatch(16u, dex_file2, 3001u, 1000u),
       LinkerPatch::RelativeMethodPatch(16u, dex_file2, 3000u, 1001u),
       LinkerPatch::RelativeMethodPatch(16u, dex_file2, 3001u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file1, 3000u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file1, 3001u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file1, 3000u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file1, 3001u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file2, 3000u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file2, 3001u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file2, 3000u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(16u, dex_file2, 3001u, 1001u),
       LinkerPatch::CodePatch(16u, dex_file1, 1000u),
       LinkerPatch::CodePatch(16u, dex_file1, 1001u),
       LinkerPatch::CodePatch(16u, dex_file2, 1000u),
@@ -98,14 +106,6 @@
       LinkerPatch::StringBssEntryPatch(16u, dex_file2, 3001u, 1000u),
       LinkerPatch::StringBssEntryPatch(16u, dex_file2, 3000u, 1001u),
       LinkerPatch::StringBssEntryPatch(16u, dex_file2, 3001u, 1001u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file1, 3000u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file1, 3001u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file1, 3000u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file1, 3001u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file2, 3000u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file2, 3001u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file2, 3000u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(16u, dex_file2, 3001u, 2001u),
       LinkerPatch::BakerReadBarrierBranchPatch(16u, 0u, 0u),
       LinkerPatch::BakerReadBarrierBranchPatch(16u, 0u, 1u),
       LinkerPatch::BakerReadBarrierBranchPatch(16u, 1u, 0u),
@@ -119,6 +119,14 @@
       LinkerPatch::RelativeMethodPatch(32u, dex_file2, 3001u, 1000u),
       LinkerPatch::RelativeMethodPatch(32u, dex_file2, 3000u, 1001u),
       LinkerPatch::RelativeMethodPatch(32u, dex_file2, 3001u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file1, 3000u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file1, 3001u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file1, 3000u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file1, 3001u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file2, 3000u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file2, 3001u, 1000u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file2, 3000u, 1001u),
+      LinkerPatch::MethodBssEntryPatch(32u, dex_file2, 3001u, 1001u),
       LinkerPatch::CodePatch(32u, dex_file1, 1000u),
       LinkerPatch::CodePatch(32u, dex_file1, 1001u),
       LinkerPatch::CodePatch(32u, dex_file2, 1000u),
@@ -159,14 +167,6 @@
       LinkerPatch::StringBssEntryPatch(32u, dex_file2, 3001u, 1000u),
       LinkerPatch::StringBssEntryPatch(32u, dex_file2, 3000u, 1001u),
       LinkerPatch::StringBssEntryPatch(32u, dex_file2, 3001u, 1001u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file1, 3000u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file1, 3001u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file1, 3000u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file1, 3001u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file2, 3000u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file2, 3001u, 2000u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file2, 3000u, 2001u),
-      LinkerPatch::DexCacheArrayPatch(32u, dex_file2, 3001u, 2001u),
       LinkerPatch::BakerReadBarrierBranchPatch(32u, 0u, 0u),
       LinkerPatch::BakerReadBarrierBranchPatch(32u, 0u, 1u),
       LinkerPatch::BakerReadBarrierBranchPatch(32u, 1u, 0u),