From 92241d2f4813eb5a46d335eea6da6c651f75c3ee Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Sun, 1 Sep 2019 15:08:20 +0300
Subject: [PATCH] Backed out changeset 97ec7ec089c4 (bug 1576748) for bustage
 in symbolstore.py

---
 toolkit/crashreporter/tools/symbolstore.py | 32 ++--------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py
index bd0c70182b09..321889b3707a 100755
--- a/toolkit/crashreporter/tools/symbolstore.py
+++ b/toolkit/crashreporter/tools/symbolstore.py
@@ -524,21 +524,9 @@ class Dumper:
         try:
             cmd = self.dump_syms_cmdline(file, arch, dsymbundle=dsymbundle)
             print(' '.join(cmd), file=sys.stderr)
-            # We're interested in `stderr` in the case that something goes
-            # wrong with dump_syms, but we don't want to use
-            # `stderr=subprocess.PIPE` here, as that can land us in a
-            # deadlock when we try to read only from `stdout`, below.  The
-            # Python documentation recommends using `communicate()` in such
-            # cases, but `stderr` can be rather large, and we don't want to
-            # waste time accumulating all of it in the non-error case.  So we
-            # completely ignore `stderr` here and capture it separately,
-            # below.
             proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                     stderr=open(os.devnull, 'wb'))
-            try:
-                module_line = proc.stdout.next()
-            except StopIteration:
-                module_line = ''
+            module_line = proc.stdout.next()
             if module_line.startswith("MODULE"):
                 # MODULE os cpu guid debug_file
                 (guid, debug_file) = (module_line.split())[3:5]
@@ -618,22 +606,8 @@ class Dumper:
                 if self.copy_debug and arch_num == 0:
                     self.CopyDebug(file, debug_file, guid,
                                    code_file, code_id)
-            else:
-                # For some reason, we didn't see the MODULE line as the first
-                # line of output.  It's very possible that the interesting error
-                # message(s) are on stderr, so let's re-execute the process and
-                # capture the entirety of stderr.
-                proc = subprocess.Popen(cmd, stdout=open(os.devnull, 'wb'),
-                                        stderr=subprocess.PIPE)
-                (_, dumperr) = proc.communicate()
-                retcode = proc.returncode
-                message = [
-                    "dump_syms failed to produce the expected output",
-                    "return code: %d" % retcode,
-                    "first line of output: %s" % module_line,
-                    "stderr: %s" % dumperr
-                ]
-                raise RuntimeError('\n----------\n'.join(message))
+        except StopIteration:
+            pass
         except Exception as e:
             print("Unexpected error: %s" % str(e), file=sys.stderr)
             raise