From 26aef1213dbdd7ab03688d898cf802c8c8d7e610 Mon Sep 17 00:00:00 2001
From: Mythri Alle <mythria@google.com>
Date: Wed, 13 Jul 2022 07:17:56 +0000
Subject: Revert "Introduce a flag to check if JITed code has instrumentation
 support"

This reverts commit fc067a360d14db5f84fd4b58e0dee6cb04ee759b.

Reason for revert: test failures on jit-on-first-use: https://android-build.googleplex.com/builds/submitted/8821659/art-jit-on-first-use/latest/view/logs/build_error.log

Change-Id: Ie9bc243baac777ecc4f47cc961494ca6ab3ef4c6
---
 compiler/optimizing/stack_map_test.cc | 56 +++++------------------------------
 1 file changed, 8 insertions(+), 48 deletions(-)

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

diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc
index 23af1f7fa1..f6a739e15a 100644
--- a/compiler/optimizing/stack_map_test.cc
+++ b/compiler/optimizing/stack_map_test.cc
@@ -52,12 +52,7 @@ TEST(StackMapTest, Test1) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
 
   ArenaBitVector sp_mask(&allocator, 0, false);
   size_t number_of_dex_registers = 2;
@@ -111,12 +106,7 @@ TEST(StackMapTest, Test2) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
   ArtMethod art_method;
 
   ArenaBitVector sp_mask1(&allocator, 0, true);
@@ -310,12 +300,7 @@ TEST(StackMapTest, TestDeduplicateInlineInfoDexRegisterMap) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
   ArtMethod art_method;
 
   ArenaBitVector sp_mask1(&allocator, 0, true);
@@ -378,12 +363,7 @@ TEST(StackMapTest, TestNonLiveDexRegisters) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
 
   ArenaBitVector sp_mask(&allocator, 0, false);
   uint32_t number_of_dex_registers = 2;
@@ -431,12 +411,7 @@ TEST(StackMapTest, TestShareDexRegisterMap) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
 
   ArenaBitVector sp_mask(&allocator, 0, false);
   uint32_t number_of_dex_registers = 2;
@@ -492,12 +467,7 @@ TEST(StackMapTest, TestNoDexRegisterMap) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 1,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 1);
 
   ArenaBitVector sp_mask(&allocator, 0, false);
   stream.BeginStackMapEntry(0, 64 * kPcAlign, 0x3, &sp_mask);
@@ -542,12 +512,7 @@ TEST(StackMapTest, InlineTest) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 2,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 2);
   ArtMethod art_method;
 
   ArenaBitVector sp_mask1(&allocator, 0, true);
@@ -737,12 +702,7 @@ TEST(StackMapTest, TestDeduplicateStackMask) {
   ArenaStack arena_stack(&pool);
   ScopedArenaAllocator allocator(&arena_stack);
   StackMapStream stream(&allocator, kRuntimeISA);
-  stream.BeginMethod(/* frame_size_in_bytes= */ 32,
-                     /* core_spill_mask= */ 0,
-                     /* fp_spill_mask= */ 0,
-                     /* num_dex_registers= */ 0,
-                     /* baseline= */ false,
-                     /* debuggable= */ false);
+  stream.BeginMethod(32, 0, 0, 0);
 
   ArenaBitVector sp_mask(&allocator, 0, true);
   sp_mask.SetBit(1);
-- 
cgit v1.2.3-59-g8ed1b