Reviewers: Mads Ager, Description: Move STATIC_ASSERT to IsShortcutCandidate to fix the broken build.
[email protected] Please review this at http://codereview.chromium.org/67126 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/heap.cc M src/objects.h Index: src/heap.cc =================================================================== --- src/heap.cc (revision 1699) +++ src/heap.cc (working copy) @@ -839,6 +839,7 @@ static inline bool IsShortcutCandidate(HeapObject* object, Map* map) { + STATIC_ASSERT(kNotStringTag != 0 && kSymbolTag != 0); ASSERT(object->map() == map); InstanceType type = map->instance_type(); if ((type & kShortcutTypeMask) != kShortcutTypeTag) return false; Index: src/objects.h =================================================================== --- src/objects.h (revision 1699) +++ src/objects.h (working copy) @@ -447,7 +447,6 @@ // symbol. It's not common to have non-flat symbols, so we do not // shortcut them thereby avoiding turning symbols into strings. See // heap.cc and mark-compact.cc. -STATIC_ASSERT(kNotStringTag != 0 && kSymbolTag != 0); const uint32_t kShortcutTypeMask = kIsNotStringMask | kIsSymbolMask | --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
