Merge bleeding_edge@1868 to 0.3 branch.

src/heap-inl.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 219 matching lines @@
       v8::internal::V8::FatalProcessOutOfMemory("CALL_AND_RETRY_1");      \
     }                                                                     \
     if (!__object__->IsRetryAfterGC()) return RETURN_EMPTY;               \
     Counters::gc_last_resort_from_handles.Increment();                    \
     Heap::CollectAllGarbage();                                            \
     {                                                                     \
       AlwaysAllocateScope __scope__;                                      \
       __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)
 
 
 #define CALL_HEAP_FUNCTION(FUNCTION_CALL, TYPE)         \
   CALL_AND_RETRY(FUNCTION_CALL,                         \
                  Handle<TYPE>(TYPE::cast(__object__)),  \
                  Handle<TYPE>())
 
 
 #define CALL_HEAP_FUNCTION_VOID(FUNCTION_CALL) \
   CALL_AND_RETRY(FUNCTION_CALL, , )
 
 
 #ifdef DEBUG
 
 inline bool Heap::allow_allocation(bool new_state) {
   bool old = allocation_allowed_;
   allocation_allowed_ = new_state;
   return old;
 }
 
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_HEAP_INL_H_