From 54c32b1f3362129d79e512581d4932aec92425eb Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 7 Jun 2017 08:13:06 +0000 Subject: Revert "Fixed installation time regression when compile." bug: 62337922 This reverts commit 8f987427cedef5d07783254ac16632ce02fd8f75. Change-Id: Ieea7921dfd7f589054e3b1f1d50078ede09bee4b --- compiler/driver/compiler_driver.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 93f678c64a..0097f55e53 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2292,18 +2292,9 @@ class InitializeClassVisitor : public CompilationVisitor { ObjectLock lock(soa.Self(), h_klass); // Attempt to initialize allowing initialization of parent classes but still not static // fields. - bool is_superclass_initialized = true; - if (!manager_->GetCompiler()->GetCompilerOptions().IsAppImage()) { - // If not an app image case, the compiler won't initialize too much things and do a fast - // fail, don't check dependencies. + bool is_superclass_initialized = InitializeDependencies(klass, class_loader, soa.Self()); + if (is_superclass_initialized) { manager_->GetClassLinker()->EnsureInitialized(soa.Self(), klass, false, true); - } else { - // For app images, do the initialization recursively and resolve types encountered to make - // sure the compiler runs without error. - is_superclass_initialized = InitializeDependencies(klass, class_loader, soa.Self()); - if (is_superclass_initialized) { - manager_->GetClassLinker()->EnsureInitialized(soa.Self(), klass, false, true); - } } old_status = klass->GetStatus(); // If superclass cannot be initialized, no need to proceed. -- cgit v1.2.3-59-g8ed1b