Author: a...@chromium.org
Date: Tue May 5 23:22:44 2009
New Revision: 1873
Modified:
branches/1.1/src/api.cc
branches/1.1/src/heap-inl.h
Log:
Merge bleeding_edge revision 1868 to 1.1 branch. This change contains
a fix for out of memory reporting.
Review URL: http://codereview.chromium.org/113020
Modified: branches/1.1/src/api.cc
==============================================================================
--- branches/1.1/src/api.cc (original)
+++ branches/1.1/src/api.cc Tue May 5 23:22:44 2009
@@ -2373,7 +2373,7 @@
const char* v8::V8::GetVersion() {
- return "1.1.10.8";
+ return "1.1.10.9";
}
Modified: branches/1.1/src/heap-inl.h
==============================================================================
--- branches/1.1/src/heap-inl.h (original)
+++ branches/1.1/src/heap-inl.h Tue May 5 23:22:44 2009
@@ -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
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
