Merge inbound to mozilla-central. a=merge

mozilla · Dec 6, 2018 · adec563 · adec563
2 parents ef8f962 + a2850b8
commit adec563
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 27 deletions.
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -7431,7 +7431,7 @@ const gAccessibilityServiceIndicator = {
       let a11yServicesSupportURL =
         Services.urlFormatter.formatURLPref("accessibility.support.url");
       // This is a known URL coming from trusted UI
-      gBrowser.selectedTab = gBrowser.addTrustedTab(a11yServicesSupportURL);
+      openTrustedLinkIn(a11yServicesSupportURL, "tab");
       Services.telemetry.scalarSet("a11y.indicator_acted_on", true);
     }
   },

diff --git a/browser/components/aboutconfig/test/browser/browser_search.js b/browser/components/aboutconfig/test/browser/browser_search.js
@@ -24,19 +24,26 @@ add_task(async function test_search() {
 
     // Test page loaded with correct number of prefs.
     await ContentTask.spawn(browser, prefArray, aPrefArray => {
-      Assert.equal(content.document.getElementById("prefs").childElementCount,
-                   aPrefArray.length);
+      // The total number of preferences may change at any time because of
+      // operations running in the background, so we only test approximately.
+      // The change in count would be because of one or two added preferences,
+      // but we tolerate a difference of up to 50 preferences just to be safe.
+      // We want thousands of prefs instead of a few dozen that are filtered.
+      Assert.greater(content.document.getElementById("prefs").childElementCount,
+                     aPrefArray.length - 50);
 
-      // Test page search of "button" returns correct number of preferences.
+      // Filter a subset of preferences. The "browser.download." branch is
+      // chosen because it is very unlikely that its preferences would be
+      // modified by other code during the execution of this test.
       let search = content.document.getElementById("search");
-      search.value = "button   ";
+      search.value = "wser.down   ";
       search.focus();
     });
 
     EventUtils.sendKey("return");
     await ContentTask.spawn(browser, prefArray, aPrefArray => {
       let filteredPrefArray =
-          aPrefArray.filter(pref => pref.includes("button"));
+          aPrefArray.filter(pref => pref.includes("wser.down"));
       // Adding +1 to the list since button does not match an exact
       // preference name then a row is added for the user to add a
       // new button preference if desired
@@ -51,8 +58,13 @@ add_task(async function test_search() {
 
     EventUtils.sendKey("return");
     await ContentTask.spawn(browser, prefArray, aPrefArray => {
-      Assert.equal(content.document.getElementById("prefs").childElementCount,
-                   aPrefArray.length);
+      // The total number of preferences may change at any time because of
+      // operations running in the background, so we only test approximately.
+      // The change in count would be because of one or two added preferences,
+      // but we tolerate a difference of up to 50 preferences just to be safe.
+      // We want thousands of prefs instead of a few dozen that are filtered.
+      Assert.greater(content.document.getElementById("prefs").childElementCount,
+                     aPrefArray.length - 50);
 
       // Test invalid search returns no preferences.
       let search = content.document.getElementById("search");

diff --git a/browser/config/mozconfigs/win32/mingwclang b/browser/config/mozconfigs/win32/mingwclang
@@ -48,17 +48,12 @@ HOST_CXX="$TOOLTOOL_DIR/clang/bin/clang++"
 CC="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang"
 CXX="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang++"
 CXXFLAGS="-fms-extensions"
-CPP="$TOOLTOOL_DIR/clang/bin/i686-w64-mingw32-clang -E"
 AR=llvm-ar
 RANLIB=llvm-ranlib
 
 # For Stylo
 BINDGEN_CFLAGS="-I$TOOLTOOL_DIR/clang/i686-w64-mingw32/include/c++/v1 -I$TOOLTOOL_DIR/clang/lib/clang/8.0.0/include -I$TOOLTOOL_DIR/clang/i686-w64-mingw32/include"
 
-# Since we use windres from binutils without the rest of tools (like cpp), we need to
-# explicitly specify clang as a preprocessor.
-WINDRES="i686-w64-mingw32-windres --preprocessor=\"$CPP -xc\" -DRC_INVOKED"
-
 # Bug 1471698 - Work around binutils corrupting mingw clang binaries.
 LDFLAGS="-Wl,-S"
 STRIP=/bin/true

diff --git a/browser/config/mozconfigs/win64/mingwclang b/browser/config/mozconfigs/win64/mingwclang
@@ -48,17 +48,12 @@ HOST_CXX="$TOOLTOOL_DIR/clang/bin/clang++"
 CC="$TOOLTOOL_DIR/clang/bin/x86_64-w64-mingw32-clang"
 CXX="$TOOLTOOL_DIR/clang/bin/x86_64-w64-mingw32-clang++"
 CXXFLAGS="-fms-extensions"
-CPP="$TOOLTOOL_DIR/clang/bin/x86_64-w64-mingw32-clang -E"
 AR=llvm-ar
 RANLIB=llvm-ranlib
 
 # For Stylo
 BINDGEN_CFLAGS="-I$TOOLTOOL_DIR/clang/x86_64-w64-mingw32/include/c++/v1 -I$TOOLTOOL_DIR/clang/lib/clang/8.0.0/include -I$TOOLTOOL_DIR/clang/x86_64-w64-mingw32/include"
 
-# Since we use windres from binutils without the rest of tools (like cpp), we need to
-# explicitly specify clang as a preprocessor.
-WINDRES="x86_64-w64-mingw32-windres --preprocessor=\"$CPP -xc\" -DRC_INVOKED"
-
 # Bug 1471698 - Work around binutils corrupting mingw clang binaries.
 LDFLAGS="-Wl,-S"
 STRIP=/bin/true

diff --git a/build/build-clang/clang-trunk-mingw.json b/build/build-clang/clang-trunk-mingw.json
@@ -1,5 +1,5 @@
 {
-    "llvm_revision": "342383",
+    "llvm_revision": "348363",
     "stages": "3",
     "build_libcxx": true,
     "build_type": "Release",

diff --git a/js/src/builtin/Module.js b/js/src/builtin/Module.js
@@ -53,7 +53,7 @@ function ModuleGetExportedNames(exportStarSet = [])
     for (let i = 0; i < starExportEntries.length; i++) {
         let e = starExportEntries[i];
         let requestedModule = CallModuleResolveHook(module, e.moduleRequest,
-                                                    MODULE_STATUS_INSTANTIATING);
+                                                    MODULE_STATUS_UNINSTANTIATED);
         let starNames = callFunction(requestedModule.getExportedNames, requestedModule,
                                      exportStarSet);
         for (let j = 0; j < starNames.length; j++) {

diff --git a/js/src/tests/non262/module/bug1488117-empty.js b/js/src/tests/non262/module/bug1488117-empty.js
@@ -0,0 +1,3 @@
+// |reftest| skip -- support file
+
+// Intentionally left empty.
diff --git a/js/src/tests/non262/module/bug1488117-import-namespace.js b/js/src/tests/non262/module/bug1488117-import-namespace.js
@@ -0,0 +1,3 @@
+// |reftest| skip -- support file
+
+import* as ns from "./bug1488117.js";
diff --git a/js/src/tests/non262/module/bug1488117.js b/js/src/tests/non262/module/bug1488117.js
@@ -0,0 +1,14 @@
+// |reftest| module
+
+// Load and instantiate "bug1488117-import-namespace.js". "bug1488117-import-namespace.js"
+// contains an |import*| request for the current module, which triggers GetModuleNamespace for
+// this module. GetModuleNamespace calls GetExportedNames on the current module, which in turn
+// resolves and calls GetExportedNames on all |export*| entries.
+// And that means HostResolveImportedModule is called for "bug1488117-empty.js" before
+// InnerModuleInstantiation for "bug1488117.js" has resolved that module file.
+
+import "./bug1488117-import-namespace.js";
+export* from "./bug1488117-empty.js";
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0);
diff --git a/taskcluster/scripts/misc/build-clang-trunk-mingw.sh b/taskcluster/scripts/misc/build-clang-trunk-mingw.sh
@@ -32,8 +32,9 @@ SRC_DIR=$TOOLCHAIN_DIR/src
 
 make_flags="-j$(nproc)"
 
-mingw_version=70860d945e6be713af352ee62820bccb653589c2
+mingw_version=d66350ea60d043a8992ada752040fc4ea48537c3
 libunwind_version=1f89d78bb488bc71cfdee8281fc0834e9fbe5dce
+llvm_mingw_version=53db1c3a4c9c81972b70556a5ba5cd6ccd8e6e7d
 
 binutils_version=2.27
 binutils_ext=bz2
@@ -64,6 +65,11 @@ prepare() {
   git checkout $libunwind_version
   popd
 
+  git clone https://github.com/mstorsjo/llvm-mingw.git
+  pushd llvm-mingw
+  git checkout $llvm_mingw_version
+  popd
+
   wget -c --progress=dot:mega ftp://ftp.gnu.org/gnu/binutils/binutils-$binutils_version.tar.$binutils_ext
   if [ "$(sha256sum binutils-$binutils_version.tar.$binutils_ext)" != "$binutils_sha  binutils-$binutils_version.tar.$binutils_ext" ];
   then
@@ -268,8 +274,7 @@ build_libcxx() {
   popd
 }
 
-build_windres() {
-  # we build whole binutils, but use only windres in our toolchain
+build_utils() {
   mkdir binutils
   pushd binutils
   $SRC_DIR/binutils-$binutils_version/configure --prefix=$INSTALL_DIR \
@@ -278,12 +283,12 @@ build_windres() {
                                                 --target=$machine-w64-mingw32
   make $make_flags
 
-  # Manually install only nm and windres
-  cp binutils/windres $INSTALL_DIR/bin/$machine-w64-mingw32-windres
+  # Manually install only nm
   cp binutils/nm-new $INSTALL_DIR/bin/$machine-w64-mingw32-nm
 
   pushd $INSTALL_DIR/bin/
   ln -s llvm-readobj $machine-w64-mingw32-readobj
+  ./clang $SRC_DIR/llvm-mingw/wrappers/windres-wrapper.c -O2 -Wl,-s -o $machine-w64-mingw32-windres
   popd
 
   popd
@@ -308,7 +313,7 @@ install_wrappers
 build_mingw
 build_compiler_rt
 build_libcxx
-build_windres
+build_utils
 
 popd
 

diff --git a/tools/tryselect/test/test_fuzzy.t b/tools/tryselect/test/test_fuzzy.t
@@ -14,6 +14,11 @@ Test fuzzy selector
           "test/foo-debug",
           "test/foo-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
   
@@ -30,6 +35,11 @@ Test fuzzy selector
           "test/bar-debug",
           "test/bar-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 
@@ -49,6 +59,11 @@ Test multiple selectors
           "test/foo-debug",
           "test/foo-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 
@@ -69,6 +84,9 @@ Test templates
       "templates": {
           "artifact": {
               "enabled": "1"
+          },
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
           }
       },
       "version": 1
@@ -88,7 +106,8 @@ Test templates
       "templates": {
           "env": {
               "BAR": "baz",
-              "FOO": "1"
+              "FOO": "1",
+              "TRY_SELECTOR": "fuzzy"
           }
       },
       "version": 1

diff --git a/tools/tryselect/test/test_message.t b/tools/tryselect/test/test_message.t
@@ -16,6 +16,11 @@ Test custom commit messages with fuzzy selector
           "test/foo-debug",
           "test/foo-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 
@@ -30,6 +35,11 @@ Test custom commit messages with fuzzy selector
           "test/foo-debug",
           "test/foo-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 

diff --git a/tools/tryselect/test/test_preset.t b/tools/tryselect/test/test_preset.t
@@ -76,6 +76,11 @@ Test preset with fuzzy subcommand
       "tasks": [
           "build-baz"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
   
@@ -89,6 +94,11 @@ Test preset with fuzzy subcommand
       "tasks": [
           "build-baz"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 
@@ -105,6 +115,11 @@ Test preset with fuzzy subcommand
           "test/foo-debug",
           "test/foo-opt"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }
 
@@ -118,6 +133,11 @@ Test preset with fuzzy subcommand
       "tasks": [
           "build-baz"
       ],
+      "templates": {
+          "env": {
+              "TRY_SELECTOR": "fuzzy"
+          }
+      },
       "version": 1
   }