diff options
| author | Roland Levillain <rpl@google.com> | 2016-10-28 14:15:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-28 14:15:10 +0000 |
| commit | 5edd9510b5f39e2f6d758954ae2ac78e17f21735 (patch) | |
| tree | 41233bf579429e3cc057eefdbd8ad35e091d8055 /compiler/optimizing/code_generator_arm.cc | |
| parent | 270b6aeb11d973dc1b339ccf892468e0ad3989e3 (diff) | |
| parent | 00468f3b4b4741be407169a4f21054ebdcccb2b1 (diff) | |
Merge "Remove default argument values in GenerateGcRootFieldLoad."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index dfdb4190de..be65f89ef1 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -5956,7 +5956,7 @@ void InstructionCodeGeneratorARM::VisitLoadString(HLoadString* load) { __ movt(temp, /* placeholder */ 0u); __ BindTrackedLabel(&labels->add_pc_label); __ add(temp, temp, ShifterOperand(PC)); - GenerateGcRootFieldLoad(load, out_loc, temp, 0); + GenerateGcRootFieldLoad(load, out_loc, temp, /* offset */ 0, kEmitCompilerReadBarrier); SlowPathCode* slow_path = new (GetGraph()->GetArena()) LoadStringSlowPathARM(load); codegen_->AddSlowPath(slow_path); __ CompareAndBranchIfZero(out, slow_path->GetEntryLabel()); |