diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-07 10:48:10 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-07 14:43:19 +0000 |
| commit | f43083d560565aea46c602adb86423daeefe589d (patch) | |
| tree | 6c812e88723c40ee77ab5c9ba38625a10cc9b364 /compiler/optimizing/code_generator_arm.cc | |
| parent | de87f405a5f8a4ffd57f01d0d667188e8f0ca8cd (diff) | |
| download | android_art-f43083d560565aea46c602adb86423daeefe589d.tar.gz android_art-f43083d560565aea46c602adb86423daeefe589d.tar.bz2 android_art-f43083d560565aea46c602adb86423daeefe589d.zip | |
Do not update Out after it has a valid location.
Slow paths use LocationSummary to know where to move
things around, and they are executed at the end of the
code generation.
This fix is needed for https://android-review.googlesource.com/#/c/113345/.
Change-Id: Id336c6409479b1de6dc839b736a7234d08a7774a
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index a031ce3389..91b28c4d99 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -766,6 +766,9 @@ void CodeGeneratorARM::Move(HInstruction* instruction, Location location, HInstr default: LOG(FATAL) << "Unexpected type " << instruction->GetType(); } + } else if (instruction->IsTemporary()) { + Location temp_location = GetTemporaryLocation(instruction->AsTemporary()); + Move32(location, temp_location); } else { DCHECK((instruction->GetNext() == move_for) || instruction->GetNext()->IsTemporary()); switch (instruction->GetType()) { |