summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2018-01-25 10:47:41 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2018-01-25 10:47:41 +0000
commit0be8cabf16ee5fa5186bc90471911336f6c01f19 (patch)
tree0ff068df6465b52458ecca3de96d119234415def /compiler/driver/compiler_driver.h
parent718e8319c728e9ee2ec15b1d56ca96baa4393028 (diff)
Revert "ART: Use the bitstring type check for AOT app compilation."
Test failures: http://build.chromium.org/p/client.art/builders/fugu-debug/builds/4875 01-25 02:05:28.357 23732 23732 F /data/local/tmp/system/bin/../bin/dalvikvm: quick_throw_entrypoints.cc:132] Check failed: !dest_type->IsAssignableFrom(src_type) This reverts commit 718e8319c728e9ee2ec15b1d56ca96baa4393028. Change-Id: I022f88cd81ae99143e5670ae29eae326ecc83cc2
Diffstat (limited to 'compiler/driver/compiler_driver.h')
-rw-r--r--compiler/driver/compiler_driver.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h
index 30042751b3..4b5916d572 100644
--- a/compiler/driver/compiler_driver.h
+++ b/compiler/driver/compiler_driver.h
@@ -385,17 +385,12 @@ class CompilerDriver {
return dex_to_dex_compiler_;
}
- bool IsBootImageClassWithAssignedBitstring(ObjPtr<mirror::Class> klass)
- REQUIRES_SHARED(Locks::mutator_lock_);
-
private:
void PreCompile(jobject class_loader,
const std::vector<const DexFile*>& dex_files,
TimingLogger* timings)
REQUIRES(!Locks::mutator_lock_);
- void RecordBootImageClassesWithAssignedBitstring() REQUIRES(!Locks::mutator_lock_);
-
void LoadImageClasses(TimingLogger* timings) REQUIRES(!Locks::mutator_lock_);
// Attempt to resolve all type, methods, fields, and strings
@@ -518,12 +513,6 @@ class CompilerDriver {
// This option may be restricted to the boot image, depending on a flag in the implementation.
std::unique_ptr<std::unordered_set<std::string>> methods_to_compile_;
- // For AOT app compilation, we keep the set of boot image classes with assigned type check
- // bitstring. We need to retrieve this set before we initialize app image classes as the
- // initialization can cause more boot image bitstrings to be assigned.
- // Note that boot image classes are non-moveable, so it's OK to keep raw pointers.
- std::unique_ptr<std::unordered_set<mirror::Class*>> boot_image_classes_with_assigned_bitstring_;
-
std::atomic<uint32_t> number_of_soft_verifier_failures_;
bool had_hard_verifier_failure_;