Auto merge of #172 - servo:smup66, r=asajeffrey

Update to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/172)
<!-- Reviewable:end -->

Author: bors-servo

.cargo/config

@@ -0,0 +1,5 @@
+[target.x86_64-pc-windows-msvc]
+linker = "lld-link.exe"
+
+[target.i686-pc-windows-msvc]
+linker = "lld-link.exe"

.travis.yml

@@ -20,6 +20,10 @@ addons:
       - gcc-6
       - g++-6
       - clang-5.0
+  homebrew:
+    packages:
+      - python
+      - python@2
 
 env:
   - FEATURES=""
@@ -31,7 +35,7 @@ before_script:
 
 script:
   - ccache -z
-  - CCACHE=$(which ccache) travis_wait cargo build --verbose $FEATURES
+  - CCACHE=$(which ccache) travis_wait 30 cargo build --verbose $FEATURES
   - CCACHE=$(which ccache) RUST_BACKTRACE=1 cargo test --lib --verbose $FEATURES
   - ccache -s
 

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository = "https://github.com/servo/mozjs/"
-version = "0.61.13"
+version = "0.66.0"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"
@@ -21,6 +21,9 @@ profilemozjs = []
 
 [lib]
 name = "mozjs_sys"
+# The generated jsapi.rs contains #[doc] strings which look like
+# doctests but are definitely not.
+doctest = false
 
 [dependencies]
 libc = "0.2"

appveyor.yml

@@ -5,6 +5,8 @@ matrix:
   fast_finish: true
 
 environment:
+  LINKER: "lld-link.exe"
+  PYTHON3: "C:\\Python37-x64\\python.exe"
   # The appveyor image we use has a pretty huge set of things installed... we make the
   # initial PATH something sane so we know what to expect
   PATH: "C:\\windows\\system32;\

build.rs

@@ -19,32 +19,6 @@ fn main() {
         panic!("Rustc doesn't support MSVC debug runtime.");
     }
 
-    if target.contains("windows") && host != target {
-        assert_eq!(host, "x86_64-pc-windows-msvc",
-                   "Only cross-compiling from x64 is supported");
-        assert_eq!(target, "i686-pc-windows-msvc",
-                   "Only cross-compiling to x86 is supported");
-        assert!(env::var("VSINSTALLDIR").is_err());
-        // When cross-compiling on Windows, we need to ensure that the PATH is
-        // set up appropriately for the target before invoking make.
-        if env::var("VCVARSALL_PATH").is_err() {
-            panic!("Need to provide VCVARSALL_PATH value with path to \
-                    vcvarsall.bat from Visual Studio installation");
-        }
-
-        let vcvars = Command::new("vcvars.bat").output().unwrap();
-        assert!(vcvars.status.success());
-        let output = str::from_utf8(&vcvars.stdout).unwrap();
-        for line in output.lines() {
-	    let mut parts = line.splitn(2, '=');
-	    if let Some(name) = parts.next() {
-	        if let Some(value) = parts.next() {
-		    env::set_var(name, value);
-	        }
-	    }
-        }
-    }
-
     build_jsapi();
     build_jsglue();
     build_jsapi_bindings();
@@ -91,6 +65,7 @@ fn cc_flags() -> Vec<&'static str> {
             "-fno-sized-deallocation",
             "-Wno-unused-parameter",
             "-Wno-invalid-offsetof",
+            "-Wno-unused-private-field",
         ]);
     }
 
@@ -142,8 +117,6 @@ fn build_jsapi() {
     assert!(result.success());
     println!("cargo:rustc-link-search=native={}/js/src/build", out_dir);
     println!("cargo:rustc-link-lib=static=js_static"); // Must come before c++
-    println!("cargo:rustc-link-search=native={}/mozglue/build", out_dir);
-    println!("cargo:rustc-link-lib=static=mozglue");
     if target.contains("windows") {
         println!("cargo:rustc-link-search=native={}/dist/bin", out_dir);
         println!("cargo:rustc-link-lib=winmm");
@@ -161,6 +134,7 @@ fn build_jsapi() {
         println!("cargo:rustc-link-lib=stdc++");
     }
     println!("cargo:outdir={}", out_dir);
+    println!("cargo:rerun-if-changed=makefile.cargo");
 }
 
 
@@ -312,7 +286,6 @@ const WHITELIST_VARS: &'static [&'static str] = &[
     "JSCLASS_.*",
     "JSFUN_.*",
     "JSITER_.*",
-    "JSID_VOID",
     "JSPROP_.*",
     "JS_.*",
 ];
@@ -340,13 +313,13 @@ const OPAQUE_TYPES: &'static [&'static str] = &[
     "JS::ReadOnlyCompileOptions",
     "JS::Rooted<JS::Auto.*Vector.*>",
     "JS::detail::CallArgsBase.*",
-    "js::HashMap.*",
     "js::detail::UniqueSelector.*",
-    "js::detail::HashTable.*",
     "mozilla::BufferList",
     "mozilla::Maybe.*",
     "mozilla::UniquePtr.*",
     "mozilla::Variant",
+    "mozilla::Hash.*",
+    "mozilla::detail::Hash.*",
     "RefPtr_Proxy.*",
 ];
 
@@ -372,5 +345,4 @@ const MODULE_RAW_LINES: &'static [(&'static str, &'static str)] = &[
     ("root", "pub type JSJitInfo = ::jsjit::JSJitInfo;"),
     ("root::JS", "pub type Heap<T> = ::jsgc::Heap<T>;"),
     ("root::JS", "pub type Rooted<T> = ::jsgc::Rooted<T>;"),
-    ("root::JS", "pub type AutoGCRooterTag = AutoGCRooter__bindgen_ty_1;"),
 ];

etc/COMMIT

@@ -1 +1 @@
-ac4fbb7aaca0
+9c35dcbaa8999f989f14f1e98a4a40a43f234131