diff options
| author | 2018-03-24 19:11:05 +0000 | |
|---|---|---|
| committer | 2018-03-24 19:11:05 +0000 | |
| commit | 2410a88a94b57247a1096562564c2f23528b3e46 (patch) | |
| tree | 8e60b42a363ab9b1a0a6877b6124210179abc210 /compiler/driver/compiler_driver.cc | |
| parent | 0386f71e67cdeb05ef209828837cf0991036ba35 (diff) | |
| parent | 0933cc54c52054ab384d9a426448cd2004aa8968 (diff) | |
Merge "Disable encoded static initialization"
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); |