diff options
author | Roland Levillain <rpl@google.com> | 2014-11-12 11:33:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-12 11:33:42 +0000 |
commit | 15136cb06f0a0fd5f60a832c33870de53c74696a (patch) | |
tree | ce01322ba56b4678f2a0320a3a5a45115511d89e /compiler/optimizing/builder.cc | |
parent | 9ffeab50f7675ba69c98efdf3815540eafe79a0e (diff) | |
parent | 946e143941d456a4ec666f7f54719c65c5aa3f5d (diff) | |
download | android_art-15136cb06f0a0fd5f60a832c33870de53c74696a.tar.gz android_art-15136cb06f0a0fd5f60a832c33870de53c74696a.tar.bz2 android_art-15136cb06f0a0fd5f60a832c33870de53c74696a.zip |
Merge "Revert "Revert "Add support for long-to-int in the optimizing compiler."""
Diffstat (limited to 'compiler/optimizing/builder.cc')
-rw-r--r-- | compiler/optimizing/builder.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 76a2be927e..11dd0f39f9 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -961,6 +961,11 @@ bool HGraphBuilder::AnalyzeDexInstruction(const Instruction& instruction, uint32 break; } + case Instruction::LONG_TO_INT: { + Conversion_12x(instruction, Primitive::kPrimLong, Primitive::kPrimInt); + break; + } + case Instruction::ADD_INT: { Binop_23x<HAdd>(instruction, Primitive::kPrimInt); break; |