diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-07 14:43:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-07 14:43:53 +0000 |
| commit | 86fe4e41720cab85e3e40c45c0436521e56b25d5 (patch) | |
| tree | 913101e647d8ec3c0284d98c49e6dad88d11f612 /compiler/optimizing/code_generator_arm.cc | |
| parent | a07dcd90b54ba708616b0d5d06238d491bf671ed (diff) | |
| parent | f43083d560565aea46c602adb86423daeefe589d (diff) | |
| download | art-86fe4e41720cab85e3e40c45c0436521e56b25d5.tar.gz art-86fe4e41720cab85e3e40c45c0436521e56b25d5.tar.bz2 art-86fe4e41720cab85e3e40c45c0436521e56b25d5.zip | |
Merge "Do not update Out after it has a valid location."
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()) { |