Commit 5decd39b authored by kasperl@chromium.org's avatar kasperl@chromium.org

Move STATIC_ASSERT to IsShortcutCandidate to fix the

broken build.

TBR=ager@chromium.org
Review URL: http://codereview.chromium.org/67126

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1700 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent bca37da6
...@@ -839,6 +839,7 @@ void Heap::ScavengeObject(HeapObject** p, HeapObject* object) { ...@@ -839,6 +839,7 @@ void Heap::ScavengeObject(HeapObject** p, HeapObject* object) {
static inline bool IsShortcutCandidate(HeapObject* object, Map* map) { static inline bool IsShortcutCandidate(HeapObject* object, Map* map) {
STATIC_ASSERT(kNotStringTag != 0 && kSymbolTag != 0);
ASSERT(object->map() == map); ASSERT(object->map() == map);
InstanceType type = map->instance_type(); InstanceType type = map->instance_type();
if ((type & kShortcutTypeMask) != kShortcutTypeTag) return false; if ((type & kShortcutTypeMask) != kShortcutTypeTag) return false;
......
...@@ -447,7 +447,6 @@ enum StringRepresentationTag { ...@@ -447,7 +447,6 @@ enum StringRepresentationTag {
// symbol. It's not common to have non-flat symbols, so we do not // symbol. It's not common to have non-flat symbols, so we do not
// shortcut them thereby avoiding turning symbols into strings. See // shortcut them thereby avoiding turning symbols into strings. See
// heap.cc and mark-compact.cc. // heap.cc and mark-compact.cc.
STATIC_ASSERT(kNotStringTag != 0 && kSymbolTag != 0);
const uint32_t kShortcutTypeMask = const uint32_t kShortcutTypeMask =
kIsNotStringMask | kIsNotStringMask |
kIsSymbolMask | kIsSymbolMask |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment