commit 946e143941d456a4ec666f7f54719c65c5aa3f5d
author Roland Levillain <rpl@google.com> Tue Nov 11 17:35:19 2014 +0000
committer Roland Levillain <rpl@google.com> Tue Nov 11 17:35:19 2014 +0000
tree 4535eb320a60043b18735a8496a288f6f8377cb7
parent d6425d7bb909b668341d9781c567f35f6d10ea16

Revert "Revert "Add support for long-to-int in the optimizing compiler.""

This reverts commit 3adfd1b4fb20ac2b0217b5d2737bfe30ad90257a.

Change-Id: Iacf0c6492d49267e24f1b727dbf6379b21fd02db

compiler/optimizing/builder.cc

diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index 8418ab0..e95dbb8 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -922,6 +922,11 @@
       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;