Reviewers: Mikhail Naganov, Description: Merge bleeding_edge revision 2961 to trunk to fix test shell tests.
Please review this at http://codereview.chromium.org/220004 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: src/heap-profiler.cc src/version.cc Index: src/heap-profiler.cc =================================================================== --- src/heap-profiler.cc (revision 2957) +++ src/heap-profiler.cc (working copy) @@ -67,10 +67,9 @@ if (obj->IsJSObject()) { JSObject* js_obj = JSObject::cast(obj); String* constructor = JSObject::cast(js_obj)->constructor_name(); - // Differentiate Array, Function, and Object instances. + // Differentiate Object and Array instances. if (fine_grain && (constructor == Heap::Object_symbol() || - constructor == Heap::Array_symbol() || - constructor == Heap::function_class_symbol())) { + constructor == Heap::Array_symbol())) { return JSObjectsCluster(constructor, obj); } else { return JSObjectsCluster(constructor); Index: src/version.cc =================================================================== --- src/version.cc (revision 2957) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 3 #define BUILD_NUMBER 13 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
