Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/src/heap/array-buffer-tracker.cc b/src/heap/array-buffer-tracker.cc
index bbe3c6b..6e389c1 100644
--- a/src/heap/array-buffer-tracker.cc
+++ b/src/heap/array-buffer-tracker.cc
@@ -77,6 +77,7 @@
void ArrayBufferTracker::MarkLive(JSArrayBuffer* buffer) {
+ base::LockGuard<base::Mutex> guard(&mutex_);
void* data = buffer->backing_store();
// ArrayBuffer might be in the middle of being constructed.
@@ -123,6 +124,8 @@
void ArrayBufferTracker::Promote(JSArrayBuffer* buffer) {
+ base::LockGuard<base::Mutex> guard(&mutex_);
+
if (buffer->is_external()) return;
void* data = buffer->backing_store();
if (!data) return;