Make sure to report out-of-memory situations when the

heap returns RetryAfterGC even when forced to always
allocate. 
Review URL: http://codereview.chromium.org/109023

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1868 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/heap-inl.h

@@ -251,11 +251,11 @@ void Heap::SetLastScriptId(Object* last_script_id) {
       __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)