Revision: 24955
Author:   [email protected]
Date:     Tue Oct 28 16:43:34 2014 UTC
Log: Revert r24737 "Read object pointer atomically while updating slots"

That broke webkit_unit_tests on ARM64.

BUG=chromium:427746
LOG=Y
[email protected]

Review URL: https://codereview.chromium.org/683113003
https://code.google.com/p/v8/source/detail?r=24955

Modified:
 /branches/bleeding_edge/src/heap/mark-compact.cc

=======================================
--- /branches/bleeding_edge/src/heap/mark-compact.cc Mon Oct 27 11:57:58 2014 UTC +++ /branches/bleeding_edge/src/heap/mark-compact.cc Tue Oct 28 16:43:34 2014 UTC
@@ -2926,8 +2926,7 @@
   }

   static inline void UpdateSlot(Heap* heap, Object** slot) {
-    Object* obj = reinterpret_cast<Object*>(
-        base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot)));
+    Object* obj = *slot;

     if (!obj->IsHeapObject()) return;

@@ -2938,10 +2937,7 @@
       DCHECK(heap->InFromSpace(heap_obj) ||
              MarkCompactCollector::IsOnEvacuationCandidate(heap_obj));
       HeapObject* target = map_word.ToForwardingAddress();
-      base::NoBarrier_CompareAndSwap(
-          reinterpret_cast<base::AtomicWord*>(slot),
-          reinterpret_cast<base::AtomicWord>(obj),
-          reinterpret_cast<base::AtomicWord>(target));
+      *slot = target;
       DCHECK(!heap->InFromSpace(target) &&
              !MarkCompactCollector::IsOnEvacuationCandidate(target));
     }

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to