diff options
| author | Vladimir Marko <vmarko@google.com> | 2019-03-06 18:04:14 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2019-03-12 14:11:25 +0000 |
| commit | 403aafa9f286e13ee2a64748514d33af39b55ab0 (patch) | |
| tree | fe9e5a5eed0081c2ac03dec0d616ed32d162b99c /compiler/optimizing/code_generator_mips.cc | |
| parent | 8809c9cd8d7f477e0a74f68537c864e3b7a35db3 (diff) | |
Fix non-deterministic compilation for const-string...
... in inlined methods that are not in the boot profile.
If such string is not in the boot image for other reasons,
do not resolve the string and use the kBssEntry load kind.
Boot image sizes for aosp_taimen-userdebug:
- before:
arm/boot*.art: 12349440
arm/boot*.oat: 19862024
arm64/boot*.art: 16609280
arm64/boot*.oat: 23568592
- after:
arm/boot*.art: 12324864 (-24KiB)
arm/boot*.oat: 19936612 (+73KiB)
arm64/boot*.art: 16580608 (-28KiB)
arm64/boot*.oat: 23642120 (+72KiB)
Test: aosp_taimen-userdebug boots.
Test: m test-art-host-gtest
Bug: 26687569
Change-Id: I3e0b72cd5e8c67904517856208f25a6c379ab601
Diffstat (limited to 'compiler/optimizing/code_generator_mips.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_mips.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc index f7f37db26a..72334afa40 100644 --- a/compiler/optimizing/code_generator_mips.cc +++ b/compiler/optimizing/code_generator_mips.cc @@ -8449,7 +8449,6 @@ void InstructionCodeGeneratorMIPS::VisitLoadString(HLoadString* load) NO_THREAD_ return; } case HLoadString::LoadKind::kBssEntry: { - DCHECK(!codegen_->GetCompilerOptions().IsBootImage()); CodeGeneratorMIPS::PcRelativePatchInfo* info_high = codegen_->NewStringBssEntryPatch(load->GetDexFile(), load->GetStringIndex()); CodeGeneratorMIPS::PcRelativePatchInfo* info_low = |