Reland "Merge old data and pointer space."

src/x87/macro-assembler-x87.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_X87_MACRO_ASSEMBLER_X87_H_
 #define V8_X87_MACRO_ASSEMBLER_X87_H_
 
 #include "src/assembler.h"
 #include "src/bailout-reason.h"
 #include "src/frames.h"
@@ skipping 548 matching lines @@
                                 Register key,
                                 Register r0,
                                 Register r1,
                                 Register r2,
                                 Register result);
 
 
   // ---------------------------------------------------------------------------
   // Allocation support
 
-  // Allocate an object in new space or old pointer space. If the given space
+  // Allocate an object in new space or old space. If the given space
   // is exhausted control continues at the gc_required label. The allocated
   // object is returned in result and end of the new object is returned in
   // result_end. The register scratch can be passed as no_reg in which case
   // an additional object reference will be added to the reloc info. The
   // returned pointers in result and result_end have not yet been tagged as
   // heap objects. If result_contains_top_on_entry is true the content of
   // result is known to be the allocation top on entry (could be result_end
   // from a previous call). If result_contains_top_on_entry is true scratch
   // should be no_reg as it is never used.
   void Allocate(int object_size,
@@ skipping 471 matching lines @@
   }                                                                       \
   masm->
 #else
 #define ACCESS_MASM(masm) masm->
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_X87_MACRO_ASSEMBLER_X87_H_