diff options
| author | 2018-03-23 14:25:08 -0700 | |
|---|---|---|
| committer | 2018-03-24 12:11:40 -0700 | |
| commit | 743aac3fbad3bbafeb5ad98e157726f740feb725 (patch) | |
| tree | ac394a05bd788935e49c637ec9e3d2496c9c1047 /compiler/driver/compiler_driver.cc | |
| parent | d456d9e4c303e3472a2306698d87411a2bbf8b81 (diff) | |
Disable encoded static initialization
Encoded static initialization currently requires fixing up intered
strings. This fix up process causes app startup to be ~10ms longer.
Disable the initialization and fixup process until there is a faster
way to fix up the interned strings.
Bug: 70734839
Test: test-art-host
(cherry picked from commit 0933cc54c52054ab384d9a426448cd2004aa8968)
Merged-In: I847d0bd9a362243241c93b115081a67faab7bfc1
Change-Id: I11ffbba8538656b84fd5df5ab970633d90d86530
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index bd3a145368..53604761d1 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -2317,6 +2317,7 @@ class InitializeClassVisitor : public CompilationVisitor { // The boot image case doesn't need to recursively initialize the dependencies with // special logic since the class linker already does this. can_init_static_fields = + ClassLinker::kAppImageMayContainStrings && !soa.Self()->IsExceptionPending() && is_superclass_initialized && NoClinitInDependency(klass, soa.Self(), &class_loader); |