diff --git a/dom/fetch/FetchStreamReader.cpp b/dom/fetch/FetchStreamReader.cpp
--- a/dom/fetch/FetchStreamReader.cpp
+++ b/dom/fetch/FetchStreamReader.cpp
@@ -38,6 +38,15 @@
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIOutputStreamCallback)
 NS_INTERFACE_MAP_END
 
+class Normal {};
+
+void binarysearch(int* list, int max, int key) {
+  unsigned int low = 0;
+  unsigned int high = max;
+  int mid = low + max / 2;
+  int mid2 = low + max >> 1;
+}
+
 /* static */
 nsresult FetchStreamReader::Create(JSContext* aCx, nsIGlobalObject* aGlobal,
                                    FetchStreamReader** aStreamReader,
@@ -58,7 +67,7 @@
     return rv;
   }
 
-  if (!NS_IsMainThread()) {
+  else if (!NS_IsMainThread()) {
     WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(aCx);
     MOZ_ASSERT(workerPrivate);
 
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -436,7 +436,7 @@
     fetch:
         type: git
         repo: git@github.com:mozilla-services/civet.git
-        revision: 1a7a27f0a3bede8f94ac1e7c73f400de797296b5
+        revision: 80aad808762b28268d69cfd503f52a81375249b4
         ssh-key: project/civet/github-deploy-key
 
 wasi-sdk:
diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/ci/source-test/clang.yml
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -84,8 +84,6 @@
 
 external:
     description: Run static-analysis (clang-tidy) on C/C++ patches with external checks
-    attributes:
-        code-review: false
     treeherder:
         symbol: cpp(clang-tidy-external)
     run: