Make AlwaysAllocateScope imply DisallowAllocationFailure.

src/heap.h

Index: src/heap.h
diff --git a/src/heap.h b/src/heap.h
index af6207dc9a6e5f7e6d8b406cd539db430dcd8087..918e25efb5a98a3f84a2acd4090db364af93028c 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -2149,10 +2149,28 @@ class HeapStats {
 };
 
 
+#ifdef DEBUG
+class DisallowAllocationFailure {
+ public:
+  inline DisallowAllocationFailure();
+  inline ~DisallowAllocationFailure();
+
+ private:
+  bool old_state_;
+};
+#endif
+
+
 class AlwaysAllocateScope {
  public:
   inline AlwaysAllocateScope();
   inline ~AlwaysAllocateScope();
+
+#ifdef DEBUG
+ private:
+  // Implicitly disable artificial allocation failures.
+  DisallowAllocationFailure disallow_allocation_failure_;
+#endif
 };
 
 
@@ -2397,18 +2415,6 @@ class DescriptorLookupCache {
 };
 
 
-#ifdef DEBUG
-class DisallowAllocationFailure {
- public:
-  inline DisallowAllocationFailure();
-  inline ~DisallowAllocationFailure();
-
- private:
-  bool old_state_;
-};
-#endif
-
-
 // A helper class to document/test C++ scopes where we do not
 // expect a GC. Usage:
 //