commit 2ee98f2172df27c0e57738e214d7a1f0739ac916
author Mathieu Chartier <mathieuc@google.com> Wed Aug 10 10:08:58 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Aug 10 10:46:23 2016 -0700
tree f8d7d9fd0a831fb65447ee38f4f6ef54471495a0
parent 0ed44f95955f48b21763dd32cbd510886e9bb2e1

Fix negative array size checking

Mask out the alignment after the size check. Was broken in previous
CL.

Test: target test 412 --64 with CC + baker

Bug: 30162165
Change-Id: Ic4eb7229fb742490cd9193baf0faa2be6b454f38

tools/cpp-define-generator/constant_globals.def

diff --git a/tools/cpp-define-generator/constant_globals.def b/tools/cpp-define-generator/constant_globals.def
index 1e24d64..a3ccc72 100644
--- a/tools/cpp-define-generator/constant_globals.def
+++ b/tools/cpp-define-generator/constant_globals.def
@@ -25,6 +25,7 @@
 
 DEFINE_OBJECT_EXPR(ALIGNMENT_MASK,         size_t,   art::kObjectAlignment - 1)
 DEFINE_OBJECT_EXPR(ALIGNMENT_MASK_TOGGLED, uint32_t, ~static_cast<uint32_t>(art::kObjectAlignment - 1))
+DEFINE_OBJECT_EXPR(ALIGNMENT_MASK_TOGGLED64, uint64_t, ~static_cast<uint64_t>(art::kObjectAlignment - 1))
 
 #undef DEFINE_OBJECT_EXPR