I'm putting this on hold for a few minutes... On Wed, Jul 29, 2009 at 11:26 AM, <[email protected]> wrote: > Reviewers: Yury Semikhatsky, > > Description: > Merge r2568 to branches/1.2. > > Please review this at http://codereview.chromium.org/159582 > > SVN Base: http://v8.googlecode.com/svn/branches/1.2/ > > Affected files: > M src/debug.cc > M src/version.cc > A + test/mjsunit/debug-stepin-builtin.js > M test/mjsunit/mjsunit.status > > > Index: test/mjsunit/mjsunit.status > =================================================================== > --- test/mjsunit/mjsunit.status (revision 2567) > +++ test/mjsunit/mjsunit.status (working copy) > @@ -59,6 +59,7 @@ > debug-setbreakpoint: CRASH || FAIL || PASS > debug-step-stub-callfunction: SKIP > debug-stepin-accessor: CRASH || FAIL > +debug-stepin-builtin: CRASH || FAIL > debug-stepin-constructor: CRASH, FAIL > debug-stepin-function-call: CRASH || FAIL > debug-step: SKIP > > Index: test/mjsunit/debug-stepin-builtin.js > Index: src/debug.cc > =================================================================== > --- src/debug.cc (revision 2567) > +++ src/debug.cc (working copy) > @@ -1310,7 +1310,9 @@ > // function to be called and not the code for > Builtins::FunctionApply or > // Builtins::FunctionCall. The receiver of call/apply is the target > // function. > - if (!holder.is_null() && holder->IsJSFunction()) { > + if (!holder.is_null() && holder->IsJSFunction() && > + JSFunction::cast(*holder)->context()->global() != > + Top::context()->builtins()) { > Handle<SharedFunctionInfo> shared_info( > JSFunction::cast(*holder)->shared()); > Debug::FloodWithOneShot(shared_info); > Index: src/version.cc > =================================================================== > --- src/version.cc (revision 2571) > +++ src/version.cc (working copy) > @@ -35,7 +35,7 @@ > #define MAJOR_VERSION 1 > #define MINOR_VERSION 2 > #define BUILD_NUMBER 14 > -#define PATCH_LEVEL 12 > +#define PATCH_LEVEL 13 > #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 -~----------~----~----~----~------~----~------~--~---
