diff options
| author | Roland Levillain <rpl@google.com> | 2015-12-16 17:08:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-16 17:08:26 +0000 |
| commit | 27f114df49c5e99bb7712310f153eae089ae15a2 (patch) | |
| tree | 104d67a406808b9952cd0b177c3aa44f2393c19d /compiler/optimizing/code_generator_mips.cc | |
| parent | cbf8af898e758cef27687c20c8cf9ac75280026d (diff) | |
| parent | 698fa975c10e244fd181e2ffb4bb67a88851e1d7 (diff) | |
Merge "Remove spurious references to kEmitCompilerReadBarrier in MIPS."
Diffstat (limited to 'compiler/optimizing/code_generator_mips.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_mips.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc index 99a0982fe2..5dc101b199 100644 --- a/compiler/optimizing/code_generator_mips.cc +++ b/compiler/optimizing/code_generator_mips.cc @@ -3902,9 +3902,9 @@ void InstructionCodeGeneratorMIPS::VisitLoadLocal(HLoadLocal* load ATTRIBUTE_UNU } void LocationsBuilderMIPS::VisitLoadString(HLoadString* load) { - LocationSummary::CallKind call_kind = (!load->IsInDexCache() || kEmitCompilerReadBarrier) - ? LocationSummary::kCallOnSlowPath - : LocationSummary::kNoCall; + LocationSummary::CallKind call_kind = load->IsInDexCache() + ? LocationSummary::kNoCall + : LocationSummary::kCallOnSlowPath; LocationSummary* locations = new (GetGraph()->GetArena()) LocationSummary(load, call_kind); locations->SetInAt(0, Location::RequiresRegister()); locations->SetOut(Location::RequiresRegister()); |