diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-04-15 14:10:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-15 14:10:29 +0000 |
| commit | a76a08fed88bd081bcc4d240f1ba3472a2acbbab (patch) | |
| tree | cd016bb007c3757ab2a6df28bc1a65d6a8e78e44 /compiler/optimizing/register_allocator.cc | |
| parent | acf9b7b7616a9b104e6f2146051d8e14d9cb9030 (diff) | |
| parent | 9021825d1e73998b99c81e89c73796f6f2845471 (diff) | |
| download | art-a76a08fed88bd081bcc4d240f1ba3472a2acbbab.tar.gz art-a76a08fed88bd081bcc4d240f1ba3472a2acbbab.tar.bz2 art-a76a08fed88bd081bcc4d240f1ba3472a2acbbab.zip | |
Merge "Type MoveOperands."
Diffstat (limited to 'compiler/optimizing/register_allocator.cc')
| -rw-r--r-- | compiler/optimizing/register_allocator.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc index 5e283437d1..2fbd051c03 100644 --- a/compiler/optimizing/register_allocator.cc +++ b/compiler/optimizing/register_allocator.cc @@ -1227,10 +1227,10 @@ void RegisterAllocator::AddMove(HParallelMove* move, && codegen_->ShouldSplitLongMoves() // The parallel move resolver knows how to deal with long constants. && !source.IsConstant()) { - move->AddMove(source.ToLow(), destination.ToLow(), instruction); - move->AddMove(source.ToHigh(), destination.ToHigh(), nullptr); + move->AddMove(source.ToLow(), destination.ToLow(), Primitive::kPrimInt, instruction); + move->AddMove(source.ToHigh(), destination.ToHigh(), Primitive::kPrimInt, nullptr); } else { - move->AddMove(source, destination, instruction); + move->AddMove(source, destination, type, instruction); } } |