commit c0b601b5e4c1add5eefd45f2f4d2c376a20ba4d4
author David Brazdil <dbrazdil@google.com> Mon Feb 08 14:20:45 2016 +0000
committer David Brazdil <dbrazdil@google.com> Mon Feb 15 13:11:04 2016 +0000
tree 5afda879812dd7984f2d5970d4ff4ab3bc22a7d0
parent b3ba4ec3fac34f0a45aa654ef88033b2f34c3640

ART: Implement HSelect with CSEL/FCSEL on arm64

Change-Id: I549af0cba3c5048066a2d1206b78a70b496d349e

compiler/optimizing/nodes.h

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 2697af3..323cfae 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -5997,9 +5997,14 @@
 };
 
 inline int64_t Int64FromConstant(HConstant* constant) {
-  DCHECK(constant->IsIntConstant() || constant->IsLongConstant());
-  return constant->IsIntConstant() ? constant->AsIntConstant()->GetValue()
-                                   : constant->AsLongConstant()->GetValue();
+  if (constant->IsIntConstant()) {
+    return constant->AsIntConstant()->GetValue();
+  } else if (constant->IsLongConstant()) {
+    return constant->AsLongConstant()->GetValue();
+  } else {
+    DCHECK(constant->IsNullConstant());
+    return 0;
+  }
 }
 
 inline bool IsSameDexFile(const DexFile& lhs, const DexFile& rhs) {