Backed out 2 changesets (bug 1360992, bug 1361654) for a 70% failure rate in test_fileReader.html on ASan e10s a=merge
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 05 May 2017 12:35:57 -0700
changeset 356830 ff83fde8be946eabcf27ea97d4676f601c122194
parent 356829 4e16ec1a21440f09f29ce4c83ee048ab77165df5
child 356831 c3d254b2070df7293132766f96ea36795ab7bb8c
child 356842 c273884ffe6bb255399bb15fbad6eb0b66be49eb
child 356934 3633cb2d5260126d77c82fb61bc9e8548032ee38
push id89970
push userkwierso@gmail.com
push dateFri, 05 May 2017 21:20:56 +0000
treeherdermozilla-inbound@c3d254b2070d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
bugs1360992, 1361654
milestone55.0a1
backs outab9fdee3a6a471fd88db5790e8499bdb92a4de58
141c2dfd49ff3b0f2bde1daf2605c2af857b6f01
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1360992, bug 1361654) for a 70% failure rate in test_fileReader.html on ASan e10s a=merge Backed out changeset ab9fdee3a6a4 (bug 1360992) Backed out changeset 141c2dfd49ff (bug 1361654) MozReview-Commit-ID: 3rSzvmc5FPx
dom/file/ipc/IPCBlobInputStreamChild.cpp
xpcom/io/SlicedInputStream.cpp
--- a/dom/file/ipc/IPCBlobInputStreamChild.cpp
+++ b/dom/file/ipc/IPCBlobInputStreamChild.cpp
@@ -162,17 +162,16 @@ IPCBlobInputStreamChild::StreamNeeded(IP
 
   RefPtr<StreamNeededRunnable> runnable = new StreamNeededRunnable(this);
   mOwningThread->Dispatch(runnable, NS_DISPATCH_NORMAL);
 }
 
 mozilla::ipc::IPCResult
 IPCBlobInputStreamChild::RecvStreamReady(const OptionalIPCStream& aStream)
 {
-  MutexAutoLock lock(mMutex);
   MOZ_ASSERT(!mPendingOperations.IsEmpty());
 
   nsCOMPtr<nsIInputStream> stream = DeserializeIPCStream(aStream);
 
   RefPtr<StreamReadyRunnable> runnable =
     new StreamReadyRunnable(mPendingOperations[0].mStream, stream);
   mPendingOperations[0].mEventTarget->Dispatch(runnable, NS_DISPATCH_NORMAL);
 
--- a/xpcom/io/SlicedInputStream.cpp
+++ b/xpcom/io/SlicedInputStream.cpp
@@ -33,34 +33,30 @@ SlicedInputStream::SlicedInputStream(nsI
   : mWeakCloneableInputStream(nullptr)
   , mWeakIPCSerializableInputStream(nullptr)
   , mWeakSeekableInputStream(nullptr)
   , mWeakAsyncInputStream(nullptr)
   , mStart(aStart)
   , mLength(aLength)
   , mCurPos(0)
   , mClosed(false)
-  , mAsyncWaitFlags(0)
-  , mAsyncWaitRequestedCount(0)
 {
   MOZ_ASSERT(aInputStream);
   SetSourceStream(aInputStream);
 }
 
 SlicedInputStream::SlicedInputStream()
   : mWeakCloneableInputStream(nullptr)
   , mWeakIPCSerializableInputStream(nullptr)
   , mWeakSeekableInputStream(nullptr)
   , mWeakAsyncInputStream(nullptr)
   , mStart(0)
   , mLength(0)
   , mCurPos(0)
   , mClosed(false)
-  , mAsyncWaitFlags(0)
-  , mAsyncWaitRequestedCount(0)
 {}
 
 SlicedInputStream::~SlicedInputStream()
 {}
 
 void
 SlicedInputStream::SetSourceStream(nsIInputStream* aInputStream)
 {