Remove obsolete code related to quickening.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I5e3b819d5dcee20f3cf8ae8175769115f88af027
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 5583858..428baf4 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -713,7 +713,6 @@
self._checker.check_art_test_data('art-gtest-jars-ForClassLoaderD.jar')
self._checker.check_art_test_data('art-gtest-jars-ForClassLoaderC.jar')
self._checker.check_art_test_data('art-gtest-jars-ErroneousA.jar')
- self._checker.check_art_test_data('art-gtest-jars-DexToDexDecompiler.jar')
self._checker.check_art_test_data('art-gtest-jars-HiddenApiSignatures.jar')
self._checker.check_art_test_data('art-gtest-jars-ForClassLoaderB.jar')
self._checker.check_art_test_data('art-gtest-jars-LinkageTest.dex')
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index a31be3f..7830924 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -486,7 +486,6 @@
const std::vector<std::string>* passes_to_run_;
friend class Dex2Oat;
- friend class DexToDexDecompilerTest;
friend class CommonCompilerDriverTest;
friend class CommonCompilerTestImpl;
friend class jit::JitCompiler;
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 6d94767..26cbd51 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -460,7 +460,6 @@
data: [
":art-gtest-jars-AbstractMethod",
":art-gtest-jars-DefaultMethods",
- ":art-gtest-jars-DexToDexDecompiler",
":art-gtest-jars-Dex2oatVdexPublicSdkDex",
":art-gtest-jars-Dex2oatVdexTestDex",
":art-gtest-jars-ImageLayoutA",
diff --git a/dex2oat/art_standalone_dex2oat_tests.xml b/dex2oat/art_standalone_dex2oat_tests.xml
index c117a02..32346f2 100644
--- a/dex2oat/art_standalone_dex2oat_tests.xml
+++ b/dex2oat/art_standalone_dex2oat_tests.xml
@@ -24,7 +24,6 @@
<option name="cleanup" value="true" />
<option name="push" value="art-gtest-jars-AbstractMethod.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-AbstractMethod.jar" />
<option name="push" value="art-gtest-jars-DefaultMethods.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-DefaultMethods.jar" />
- <option name="push" value="art-gtest-jars-DexToDexDecompiler.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-DexToDexDecompiler.jar" />
<option name="push" value="art-gtest-jars-Dex2oatVdexPublicSdkDex.dex->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-Dex2oatVdexPublicSdkDex.dex" />
<option name="push" value="art-gtest-jars-Dex2oatVdexTestDex.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-Dex2oatVdexTestDex.jar" />
<option name="push" value="art-gtest-jars-ImageLayoutA.jar->/data/local/tmp/art_standalone_dex2oat_tests/art-gtest-jars-ImageLayoutA.jar" />
diff --git a/dex2oat/driver/compiler_driver.h b/dex2oat/driver/compiler_driver.h
index 3da8c3a..d7781a9 100644
--- a/dex2oat/driver/compiler_driver.h
+++ b/dex2oat/driver/compiler_driver.h
@@ -326,7 +326,6 @@
friend class CommonCompilerDriverTest;
friend class CompileClassVisitor;
- friend class DexToDexDecompilerTest;
friend class InitializeClassVisitor;
friend class verifier::VerifierDepsTest;
DISALLOW_COPY_AND_ASSIGN(CompilerDriver);
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc
index c7e6c09..e69b32a 100644
--- a/oatdump/oatdump.cc
+++ b/oatdump/oatdump.cc
@@ -1214,10 +1214,7 @@
(method_header == nullptr) ? 0 : method_header->GetCodeInfoOffset();
vios->Stream() << StringPrintf("(offset=0x%08x)\n", vmap_table_offset);
- size_t vmap_table_offset_limit =
- IsMethodGeneratedByDexToDexCompiler(oat_method, code_item_accessor)
- ? oat_file_.GetVdexFile()->Size()
- : method_header->GetCode() - oat_file_.Begin();
+ size_t vmap_table_offset_limit = method_header->GetCode() - oat_file_.Begin();
if (vmap_table_offset >= vmap_table_offset_limit) {
vios->Stream() << StringPrintf("WARNING: "
"vmap table offset 0x%08x is past end of file 0x%08zx. ",
@@ -1345,11 +1342,6 @@
ScopedIndentation indent1(vios);
DumpCodeInfo(vios, code_info, oat_method);
}
- } else if (IsMethodGeneratedByDexToDexCompiler(oat_method, code_item_accessor)) {
- // We don't encode the size in the table, so just emit that we have quickened
- // information.
- ScopedIndentation indent(vios);
- vios->Stream() << "quickened data\n";
} else {
// Otherwise, there is nothing to display.
}
@@ -1467,19 +1459,6 @@
code_item_accessor.HasCodeItem();
}
- // Has `oat_method` -- corresponding to the Dex `code_item` -- been compiled by
- // the dextodex compiler?
- static bool IsMethodGeneratedByDexToDexCompiler(
- const OatFile::OatMethod& oat_method,
- const CodeItemDataAccessor& code_item_accessor) {
- // If the quick code is null, the Dex `code_item` is not
- // null, and the vmap table is not null, then this method has been compiled
- // with the dextodex compiler.
- return oat_method.GetQuickCode() == nullptr &&
- oat_method.GetVmapTable() != nullptr &&
- code_item_accessor.HasCodeItem();
- }
-
verifier::MethodVerifier* DumpVerifier(VariableIndentationOutputStream* vios,
StackHandleScope<1>* hs,
uint32_t dex_method_idx,
diff --git a/runtime/base/locks.h b/runtime/base/locks.h
index 4449cd0..829adff 100644
--- a/runtime/base/locks.h
+++ b/runtime/base/locks.h
@@ -106,7 +106,6 @@
kAllocatedThreadIdsLock,
kMonitorPoolLock,
kClassLinkerClassesLock, // TODO rename.
- kDexToDexCompilerLock,
kSubtypeCheckLock,
kBreakpointLock,
// This is a generic lock level for a lock meant to be gained after having a
diff --git a/test/Android.bp b/test/Android.bp
index dcf6cad..5bbd45a 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1373,7 +1373,6 @@
":art-gtest-jars-AbstractMethod",
":art-gtest-jars-AllFields",
":art-gtest-jars-DefaultMethods",
- ":art-gtest-jars-DexToDexDecompiler",
":art-gtest-jars-ErroneousA",
":art-gtest-jars-ErroneousB",
":art-gtest-jars-ErroneousInit",
@@ -1456,12 +1455,6 @@
}
java_library {
- name: "art-gtest-jars-DexToDexDecompiler",
- srcs: ["DexToDexDecompiler/**/*.java"],
- defaults: ["art-gtest-jars-defaults"],
-}
-
-java_library {
name: "art-gtest-jars-ErroneousA",
srcs: ["ErroneousA/**/*.java"],
defaults: ["art-gtest-jars-defaults"],
diff --git a/test/DexToDexDecompiler/Main.java b/test/DexToDexDecompiler/Main.java
deleted file mode 100644
index 60f3049..0000000
--- a/test/DexToDexDecompiler/Main.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class Main {
- Main() {
- }
-
- public static void main() {
- Main m = new Main();
- Object o = m;
- // The call and field accesses will be quickened.
- m.foo(m.a);
-
- // The checkcast will be quickened.
- m.foo(((Main)o).a);
- }
-
- int a;
- void foo(int a) {}
-}