Reviewers: Erik Corry, Description: Rewrites a ternary choice operator to fix a compiler linkage bug.
Please review this at http://codereview.chromium.org/8189 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/objects.cc M src/runtime.cc Index: src/objects.cc =================================================================== --- src/objects.cc (revision 601) +++ src/objects.cc (working copy) @@ -6789,6 +6789,4 @@ } -const int FunctionTemplateInfo::kSize; -const int ObjectTemplateInfo::kSize; } } // namespace v8::internal Index: src/runtime.cc =================================================================== --- src/runtime.cc (revision 601) +++ src/runtime.cc (working copy) @@ -327,8 +327,11 @@ RUNTIME_ASSERT(type == FUNCTION_TEMPLATE_INFO_TYPE || type == OBJECT_TEMPLATE_INFO_TYPE); RUNTIME_ASSERT(offset > 0); - RUNTIME_ASSERT(offset < ((type == FUNCTION_TEMPLATE_INFO_TYPE) ? - FunctionTemplateInfo::kSize : ObjectTemplateInfo::kSize)); + if (type == FUNCTION_TEMPLATE_INFO_TYPE) { + RUNTIME_ASSERT(offset < FunctionTemplateInfo::kSize); + } else { + RUNTIME_ASSERT(offset < ObjectTemplateInfo::kSize); + } return HeapObject::RawField(templ, offset); } --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
