diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-03 21:36:10 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-04 18:40:08 -0800 |
| commit | 277ccbd200ea43590dfc06a93ae184a765327ad0 (patch) | |
| tree | d89712e93da5fb2748989353c9ee071102cf3f33 /runtime/instruction_set.h | |
| parent | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (diff) | |
| download | art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.gz art-277ccbd200ea43590dfc06a93ae184a765327ad0.tar.bz2 art-277ccbd200ea43590dfc06a93ae184a765327ad0.zip | |
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Diffstat (limited to 'runtime/instruction_set.h')
| -rw-r--r-- | runtime/instruction_set.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h index 529fa0c05..84a3e8063 100644 --- a/runtime/instruction_set.h +++ b/runtime/instruction_set.h @@ -370,7 +370,8 @@ static inline constexpr TwoWordReturn GetTwoWordFailureValue() { // Use the lower 32b for the method pointer and the upper 32b for the code pointer. static inline TwoWordReturn GetTwoWordSuccessValue(uintptr_t hi, uintptr_t lo) { - uint32_t lo32 = static_cast<uint32_t>(lo); + static_assert(sizeof(uint32_t) == sizeof(uintptr_t), "Unexpected size difference"); + uint32_t lo32 = lo; uint64_t hi64 = static_cast<uint64_t>(hi); return ((hi64 << 32) | lo32); } |