diff options
| author | 2015-10-01 14:16:40 +0000 | |
|---|---|---|
| committer | 2015-10-01 14:16:40 +0000 | |
| commit | b3577f0ab8f1765d3554f575d99adbc65bfaf1b6 (patch) | |
| tree | da686105f2382f4c4db58bfb1429ff544bbbd694 /compiler/optimizing/nodes.h | |
| parent | 9664c08964c7db92151335023c6ea595f75f4033 (diff) | |
| parent | 9f389d4d00f34a6c76e55b183b8c3d106e314261 (diff) | |
Merge "ART: Fix a static_cast int32_t -> uint64_t bug."
Diffstat (limited to 'compiler/optimizing/nodes.h')
| -rw-r--r-- | compiler/optimizing/nodes.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 84bde8ea5f..d52f5927de 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -2239,7 +2239,9 @@ class HIntConstant : public HConstant { public: int32_t GetValue() const { return value_; } - uint64_t GetValueAsUint64() const OVERRIDE { return static_cast<uint64_t>(value_); } + uint64_t GetValueAsUint64() const OVERRIDE { + return static_cast<uint64_t>(static_cast<uint32_t>(value_)); + } bool InstructionDataEquals(HInstruction* other) const OVERRIDE { DCHECK(other->IsIntConstant()); |