From 3d02a92acd903b8b9b5bbbb64c23183cce1c179b Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 2 Dec 2020 16:22:40 +0000
Subject: [PATCH] Bug 1680159 - Do not collect source code during automated
 hazard analysis. r=jonco

Differential Revision: https://phabricator.services.mozilla.com/D98409
---
 js/src/devtools/rootAnalysis/analyze.py       | 22 ++-----------------
 js/src/devtools/rootAnalysis/mach_commands.py |  3 +++
 .../misc/build-gcc-sixgill-plugin-linux.sh    |  2 +-
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/js/src/devtools/rootAnalysis/analyze.py b/js/src/devtools/rootAnalysis/analyze.py
index 34637089160f..594e65a1c566 100755
--- a/js/src/devtools/rootAnalysis/analyze.py
+++ b/js/src/devtools/rootAnalysis/analyze.py
@@ -362,29 +362,11 @@ else:
 if "ANALYZED_OBJDIR" in os.environ:
     data["objdir"] = os.environ["ANALYZED_OBJDIR"]
 
+if "GECKO_PATH" in os.environ:
+    data["source"] = os.environ["GECKO_PATH"]
 if "SOURCE" in os.environ:
     data["source"] = os.environ["SOURCE"]
 
-if data.get("sixgill_bin"):
-    if not data.get("source"):
-        path = subprocess.check_output(
-            [
-                "sh",
-                "-c",
-                data["sixgill_bin"] + "/xdbkeys file_source.xdb | grep jsapi.cpp",
-            ]
-        ).decode()
-        data["source"] = path.replace("\n", "").replace("/js/src/jsapi.cpp", "")
-    if not data.get("objdir"):
-        path = subprocess.check_output(
-            [
-                "sh",
-                "-c",
-                data["sixgill_bin"] + "/xdbkeys file_source.xdb | grep jsapi.h",
-            ]
-        ).decode()
-        data["objdir"] = path.replace("\n", "").replace("/jsapi.h", "")
-
 steps = [
     "dbs",
     "gcTypes",
diff --git a/js/src/devtools/rootAnalysis/mach_commands.py b/js/src/devtools/rootAnalysis/mach_commands.py
index 535aaa92a6b7..de38df738816 100644
--- a/js/src/devtools/rootAnalysis/mach_commands.py
+++ b/js/src/devtools/rootAnalysis/mach_commands.py
@@ -318,6 +318,9 @@ no shell found in %s -- must build the JS shell with `mach hazards build-shell`
         # hazard mozconfigs need to find binaries in .mozbuild
         env["MOZBUILD_STATE_PATH"] = self.state_dir
 
+        # Suppress the gathering of sources, to save disk space and memory.
+        env["XGILL_NO_SOURCE"] = "1"
+
         self.setup_env_for_tools(env)
 
         if "haz_objdir" in kwargs:
diff --git a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
index 09e29cb989cf..b3d15b3c8b4c 100755
--- a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
@@ -11,7 +11,7 @@ root_dir=$MOZ_FETCHES_DIR
 build_dir=$GECKO_PATH/build
 data_dir=$GECKO_PATH/build/unix/build-gcc
 
-sixgill_rev=e21b1fa688ce
+sixgill_rev=88d1a251c92a
 sixgill_repo=https://hg.mozilla.org/users/sfink_mozilla.com/sixgill
 
 . $data_dir/build-gcc.sh