Auto merge of #186 - jdm:smup67, r=asajeffrey

Upgrade to SpiderMonkey 67

<!-- 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/186)
<!-- Reviewable:end -->

Author: bors-servo

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.66.1"
+version = "0.67.0"
 authors = ["Mozilla"]
 links = "mozjs"
 build = "build.rs"

etc/COMMIT

@@ -1 +1 @@
-9c35dcbaa8999f989f14f1e98a4a40a43f234131
+455c1065dcbe14b73771df2db56aae43a44dfcf8

etc/patches/broken-sdk.patch

@@ -82,6 +82,6 @@ index 66cf3e16ad..8f0b0582b3 100644
 +    if value:
 +        return value[0]
 +
-     llvm_path = '%s/toolchains/llvm/prebuilt/%s-%s/bin' % (ndk,
-                                                            host.kernel.lower(),
-                                                            host.cpu)
+     llvm_format = '%s/toolchains/llvm/prebuilt/%s-%s/bin'
+     llvm_path = llvm_format % (ndk, host.kernel.lower(), host.cpu)
+     if not isdir(llvm_path) and host.cpu == 'x86_64':

etc/patches/configure-override-android-ndk-paths.patch

@@ -0,0 +1,14 @@
+diff --git a/mozjs/build/moz.configure/bindgen.configure b/mozjs/build/moz.configure/bindgen.configure
+index 1658c8f93e..f7082ea6d4 100644
+--- a/mozjs/build/moz.configure/bindgen.configure
++++ b/mozjs/build/moz.configure/bindgen.configure
+@@ -246,6 +246,9 @@ set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
+ @depends(target, target_is_unix, cxx_compiler, bindgen_cflags_android,
+          bindgen_config_paths.clang_path)
+ def basic_bindgen_cflags(target, is_unix, compiler_info, android_cflags, clang_path):
++    if not clang_path:
++        return []
++
+     args = [
+         '-x', 'c++', '-fno-sized-deallocation',
+         '-DTRACING=1', '-DIMPL_LIBXUL', '-DMOZILLA_INTERNAL_API',

etc/patches/no_bindgen_in_configure.patch

@@ -42,7 +42,7 @@ def remove_cargo_tomls():
         os.path.join("mozjs", "testing"),
     ]
     exclude = [
-        os.path.join("mozjs", "js", "src", "frontend", "binsource"),
+        os.path.join("mozjs", "js", "src", "frontend", "binast"),
     ]
     for dir in problem_dirs:
         for root, dirs, files in os.walk(dir):

etc/update.py

@@ -17,6 +17,11 @@ git = "https://github.com/froydnj/winapi-rs"
 branch = "aarch64"
 replace-with = "vendored-sources"
 
+[source."https://github.com/alexcrichton/cc-rs"]
+git = "https://github.com/glandium/cc-rs"
+branch = "1.0.23-clang-cl-aarch64"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 directory = '@top_srcdir@/third_party/rust'
 

mozjs/.cargo/config.in

@@ -163,8 +163,19 @@ binaries::
 	@$(MAKE) install-manifests install_manifests=dist/include
 endif
 
+# Host binaries are not produced for macOS consumers: that is, there's
+# no macOS-hosted job to produce them at this time.  Therefore we
+# enable --host-bins only for automation builds, which only require Linux and
+# Windows host binaries.
 recurse_artifact:
-	$(topsrcdir)/mach --log-no-times artifact install
+	$(topsrcdir)/mach --log-no-times artifact install$(if $(MOZ_ARTIFACT_BUILD_SYMBOLS), --symbols$(addprefix =,$(filter full,$(MOZ_ARTIFACT_BUILD_SYMBOLS))))$(if $(MOZ_AUTOMATION), --host-bins)
+
+ifdef MOZ_EME_WIN32_ARTIFACT
+recurse_win32-artifact:
+	rm -rf $(DIST)/i686
+	$(topsrcdir)/mach --log-no-times artifact install --job $(if $(MOZ_PGO),win32-pgo,win32-opt) --no-tests --distdir $(DIST)/i686
+	mv $(DIST)/i686/bin/* $(DIST)/i686
+endif
 
 ifdef MOZ_WIDGET_TOOLKIT
 ifdef ENABLE_TESTS
@@ -180,7 +191,7 @@ default all::
 profiledbuild::
 	$(call BUILDSTATUS,TIERS pgo_profile_generate pgo_package pgo_profile pgo_clobber pgo_profile_use)
 	$(call BUILDSTATUS,TIER_START pgo_profile_generate)
-	$(MAKE) default MOZ_PROFILE_GENERATE=1
+	$(MAKE) default MOZ_PROFILE_GENERATE=1 MOZ_LTO=
 	$(call BUILDSTATUS,TIER_FINISH pgo_profile_generate)
 	$(call BUILDSTATUS,TIER_START pgo_package)
 	$(MAKE) package MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
@@ -272,22 +283,15 @@ update-packaging:
 package-generated-sources:
 	$(call py_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')
 
-#XXX: this is a hack, since we don't want to clobber for MSVC
 # PGO support, but we can't do this test in client.mk
 # No point in clobbering if PGO has been explicitly disabled.
 ifdef NO_PROFILE_GUIDED_OPTIMIZE
 maybe_clobber_profiledbuild:
 else
-ifneq ($(CC_TYPE),msvc)
 maybe_clobber_profiledbuild: clean
 ifneq (,$(findstring clang,$(CC_TYPE)))
 	$(LLVM_PROFDATA) merge -o $(DEPTH)/merged.profdata $(DEPTH)/*.profraw
 endif
-else
-maybe_clobber_profiledbuild:
-	$(RM) $(DIST)/bin/*.pgc
-	find $(DIST)/$(MOZ_APP_NAME) -name '*.pgc' -exec mv {} $(DIST)/bin \;
-endif # msvc
 endif # NO_PROFILE_GUIDED_OPTIMIZE
 
 .PHONY: maybe_clobber_profiledbuild

mozjs/Makefile.in

@@ -1,8 +1,8 @@
-This directory contains SpiderMonkey 66.
+This directory contains SpiderMonkey 67.
 
-This release is based on a revision of Mozilla 66:
+This release is based on a revision of Mozilla 67:
   https://hg.mozilla.org/releases/
 The changes in the patches/ directory were applied.
 
-MDN hosts the latest SpiderMonkey 66 release notes:
-  https://developer.mozilla.org/en-US/docs/SpiderMonkey/66
+MDN hosts the latest SpiderMonkey 67 release notes:
+  https://developer.mozilla.org/en-US/docs/SpiderMonkey/67

mozjs/README

@@ -47,5 +47,11 @@ AC_EGREP_HEADER(valloc, unistd.h,
                 AC_MSG_RESULT([yes]),
                 AC_MSG_RESULT([no]))
 
+AC_MSG_CHECKING([for _aligned_malloc in malloc.h])
+AC_EGREP_HEADER(_aligned_malloc, malloc.h,
+                AC_DEFINE(HAVE_ALIGNED_MALLOC)
+                AC_MSG_RESULT([yes]),
+                AC_MSG_RESULT([no]))
+
 
 ])