commit d87f3eaa80139564969433fd47c0f6abf8dc46ba
author David Brazdil <dbrazdil@google.com> Mon Jan 04 15:55:10 2016 +0000
committer David Brazdil <dbrazdil@google.com> Mon Jan 04 15:55:10 2016 +0000
tree 45830e3ae4fa04e9dd2da2e4df554718d32a7790
parent f196a43051547e777fac9a27f1148999688fd3c5

ART: Use Primitive::Is64BitType in SsaBuilder::TypePhiFromInputs

Accidentally submitted CL Ib39f3da2b92bc5be5d76f4240a77567d82c6bebe
without this.

Bug: 26208284
Change-Id: I2e69ca2fde72171f2ce645304c4835d8d57f4e0b

compiler/optimizing/ssa_builder.cc

diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc
index 9e869e1..9ea352d 100644
--- a/compiler/optimizing/ssa_builder.cc
+++ b/compiler/optimizing/ssa_builder.cc
@@ -154,7 +154,7 @@
     Primitive::Type input_type = HPhi::ToPhiType(input->GetType());
     if (common_type == input_type) {
       // No change in type.
-    } else if (Primitive::ComponentSize(common_type) != Primitive::ComponentSize(input_type)) {
+    } else if (Primitive::Is64BitType(common_type) != Primitive::Is64BitType(input_type)) {
       // Types are of different sizes, e.g. int vs. long. Must be a conflict.
       return false;
     } else if (Primitive::IsIntegralType(common_type)) {