diff options
| author | 2019-07-04 10:00:12 +0000 | |
|---|---|---|
| committer | 2019-07-05 00:20:19 +0000 | |
| commit | e81f10a3f672a8bcc421cab812e6435749181566 (patch) | |
| tree | 076df5318e4bfdb6148fd6bb0faf5ea8de1d3336 /oatdump/oatdump_app_test.cc | |
| parent | 9690542a9ed7740110459d3167708e6edc1a2686 (diff) | |
Revert "Remove ShadowFrame::dex_pc_ (but keep dex_pc_ptr_)"
This reverts commit 50bc8fb89c79874e731f245abda3b9e48a541cfe.
Reason for revert: Performance regression
Change-Id: Ib39ceb9e1f2753c518dd24fd193a824211fd5795
Diffstat (limited to 'oatdump/oatdump_app_test.cc')
| -rw-r--r-- | oatdump/oatdump_app_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/oatdump/oatdump_app_test.cc b/oatdump/oatdump_app_test.cc index bbd0e3d34c..4490647d2c 100644 --- a/oatdump/oatdump_app_test.cc +++ b/oatdump/oatdump_app_test.cc @@ -19,27 +19,27 @@ namespace art { TEST_F(OatDumpTest, TestAppWithBootImage) { - ASSERT_TRUE(GenerateAppOdexFile(kDynamicLinking, {"--runtime-arg", "-Xmx64M"})); - ASSERT_TRUE(Exec(kDynamicLinking, kModeOatWithBootImage, {}, kListAndCode)); + ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {"--runtime-arg", "-Xmx64M"})); + ASSERT_TRUE(Exec(kDynamic, kModeOatWithBootImage, {}, kListAndCode)); } TEST_F(OatDumpTest, TestAppWithBootImageStatic) { TEST_DISABLED_FOR_NON_STATIC_HOST_BUILDS(); - ASSERT_TRUE(GenerateAppOdexFile(kStaticLinking, {"--runtime-arg", "-Xmx64M"})); - ASSERT_TRUE(Exec(kStaticLinking, kModeOatWithBootImage, {}, kListAndCode)); + ASSERT_TRUE(GenerateAppOdexFile(kStatic, {"--runtime-arg", "-Xmx64M"})); + ASSERT_TRUE(Exec(kStatic, kModeOatWithBootImage, {}, kListAndCode)); } TEST_F(OatDumpTest, TestAppImageWithBootImage) { TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS(); // GC bug, b/126305867 const std::string app_image_arg = "--app-image-file=" + GetAppImageName(); - ASSERT_TRUE(GenerateAppOdexFile(kDynamicLinking, {"--runtime-arg", "-Xmx64M", app_image_arg})); - ASSERT_TRUE(Exec(kDynamicLinking, kModeAppImage, {}, kListAndCode)); + ASSERT_TRUE(GenerateAppOdexFile(kDynamic, {"--runtime-arg", "-Xmx64M", app_image_arg})); + ASSERT_TRUE(Exec(kDynamic, kModeAppImage, {}, kListAndCode)); } TEST_F(OatDumpTest, TestAppImageWithBootImageStatic) { TEST_DISABLED_WITHOUT_BAKER_READ_BARRIERS(); // GC bug, b/126305867 TEST_DISABLED_FOR_NON_STATIC_HOST_BUILDS(); const std::string app_image_arg = "--app-image-file=" + GetAppImageName(); - ASSERT_TRUE(GenerateAppOdexFile(kStaticLinking, {"--runtime-arg", "-Xmx64M", app_image_arg})); - ASSERT_TRUE(Exec(kStaticLinking, kModeAppImage, {}, kListAndCode)); + ASSERT_TRUE(GenerateAppOdexFile(kStatic, {"--runtime-arg", "-Xmx64M", app_image_arg})); + ASSERT_TRUE(Exec(kStatic, kModeAppImage, {}, kListAndCode)); } } // namespace art |