Merge bleeding_edge@1868 to 0.3 branch.

src/heap-inl.h

Index: src/heap-inl.h
===================================================================
--- src/heap-inl.h	(revision 1877)
+++ src/heap-inl.h	(working copy)
@@ -237,11 +237,11 @@
       __object__ = FUNCTION_CALL;                                         \
     }                                                                     \
     if (!__object__->IsFailure()) return 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 RETURN_EMPTY;                                                  \
   } while (false)