Reviewers: Kasper Lund, Description: Merge bleeding_edge revision 1868 to 1.1 branch. This change contains a fix for out of memory reporting.
Please review this at http://codereview.chromium.org/113020 SVN Base: http://v8.googlecode.com/svn/branches/1.1/ Affected files: M src/api.cc M src/heap-inl.h Index: src/api.cc =================================================================== --- src/api.cc (revision 1857) +++ src/api.cc (working copy) @@ -2373,7 +2373,7 @@ const char* v8::V8::GetVersion() { - return "1.1.10.8"; + return "1.1.10.9"; } Index: src/heap-inl.h =================================================================== --- src/heap-inl.h (revision 1857) +++ src/heap-inl.h (working copy) @@ -251,11 +251,11 @@ __object__ = FUNCTION_CALL; \ } \ if (!__object__->IsFailure()) RETURN_VALUE; \ - if (__object__->IsOutOfMemoryFailure()) { \ + if (__object__->IsOutOfMemoryFailure() || \ + __object__->IsRetryAfterGC()) { \ /* TODO(1181417): Fix this. */ \ v8::internal::V8::FatalProcessOutOfMemory("CALL_AND_RETRY_2"); \ } \ - ASSERT(!__object__->IsRetryAfterGC()); \ RETURN_EMPTY; \ } while (false) --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
