Merged: [heap] Properly propagate allocated space during new space evacuaton in MC

src/heap/mark-compact.cc

 // 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.
 
 #include "src/heap/mark-compact.h"
 
 #include "src/base/atomicops.h"
 #include "src/base/bits.h"
 #include "src/base/sys-info.h"
 #include "src/code-stubs.h"
@@ skipping 1727 matching lines @@
   enum NewSpaceAllocationMode {
     kNonstickyBailoutOldSpace,
     kStickyBailoutOldSpace,
   };
 
   inline AllocationSpace AllocateTargetObject(HeapObject* old_object,
                                               HeapObject** target_object) {
     const int size = old_object->Size();
     AllocationAlignment alignment = old_object->RequiredAlignment();
     AllocationResult allocation;
+    AllocationSpace space_allocated_in = space_to_allocate_;
     if (space_to_allocate_ == NEW_SPACE) {
       if (size > kMaxLabObjectSize) {
         allocation =
             AllocateInNewSpace(size, alignment, kNonstickyBailoutOldSpace);
       } else {
         allocation = AllocateInLab(size, alignment);
       }
     }
     if (allocation.IsRetry() || (space_to_allocate_ == OLD_SPACE)) {
       allocation = AllocateInOldSpace(size, alignment);
+      space_allocated_in = OLD_SPACE;
     }
     bool ok = allocation.To(target_object);
     DCHECK(ok);
     USE(ok);
-    return space_to_allocate_;
+    return space_allocated_in;
   }
 
   inline bool NewLocalAllocationBuffer() {
     AllocationResult result =
         AllocateInNewSpace(kLabSize, kWordAligned, kStickyBailoutOldSpace);
     LocalAllocationBuffer saved_old_buffer = buffer_;
     buffer_ = LocalAllocationBuffer::FromResult(heap_, result, kLabSize);
     if (buffer_.IsValid()) {
       buffer_.TryMerge(&saved_old_buffer);
       return true;
@@ skipping 2260 matching lines @@
       // The target is always in old space, we don't have to record the slot in
       // the old-to-new remembered set.
       DCHECK(!heap()->InNewSpace(target));
       RecordRelocSlot(host, &rinfo, target);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8