diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-04 10:29:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-04 10:29:23 +0000 |
| commit | 87896b3a1f97c815fe02c7490c1f27951c58bbbf (patch) | |
| tree | f3756060991a216202201890f11cb63bfd2ec205 | |
| parent | 44d95a22b2d9127f9b803a70dbe00d0816e922ad (diff) | |
| parent | de0eb6f59853f08d94fe42088d959b88f8448123 (diff) | |
| download | android_art-87896b3a1f97c815fe02c7490c1f27951c58bbbf.tar.gz android_art-87896b3a1f97c815fe02c7490c1f27951c58bbbf.tar.bz2 android_art-87896b3a1f97c815fe02c7490c1f27951c58bbbf.zip | |
Merge "Fix arm64 build."
| -rw-r--r-- | compiler/optimizing/common_arm64.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h index 007324eb68..9447d3b816 100644 --- a/compiler/optimizing/common_arm64.h +++ b/compiler/optimizing/common_arm64.h @@ -118,8 +118,14 @@ static inline vixl::CPURegister InputCPURegisterAt(HInstruction* instr, int inde static inline int64_t Int64ConstantFrom(Location location) { HConstant* instr = location.GetConstant(); - return instr->IsIntConstant() ? instr->AsIntConstant()->GetValue() - : instr->AsLongConstant()->GetValue(); + if (instr->IsIntConstant()) { + return instr->AsIntConstant()->GetValue(); + } else if (instr->IsNullConstant()) { + return 0; + } else { + DCHECK(instr->IsLongConstant()); + return instr->AsLongConstant()->GetValue(); + } } static inline vixl::Operand OperandFrom(Location location, Primitive::Type type) { |