diff options
author | 2018-03-23 14:25:08 -0700 | |
---|---|---|
committer | 2018-03-23 14:33:50 -0700 | |
commit | 0933cc54c52054ab384d9a426448cd2004aa8968 (patch) | |
tree | a2669d2467b6c056910505e601872f62d02d83e2 /compiler/driver/compiler_driver.cc | |
parent | 224219cc4e7c60a5e28ea9a869163f17f65de79c (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
Change-Id: I847d0bd9a362243241c93b115081a67faab7bfc1
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); |