Merge m-c to fx-team. a=merge

content/canvas/test/webgl-conformance/failing_tests_android_x86.txt

@@ -1,10 +1,5 @@
-# Failures for our x86 emulator test environment.
+# Failures for our android x86 and arm emulator test environments.
 
 conformance/extensions/oes-texture-float.html
-conformance/misc/error-reporting.html
-conformance/misc/object-deletion-behaviour.html
-conformance/misc/type-conversion-test.html
 conformance/programs/get-active-test.html
 conformance/textures/texture-npot.html
-conformance/textures/texture-size.html
-conformance/textures/texture-size-cube-maps.html

content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt

@@ -13,5 +13,12 @@ conformance/misc/object-deletion-behaviour.html
 conformance/misc/type-conversion-test.html
 conformance/reading/read-pixels-test.html
 conformance/renderbuffers/framebuffer-object-attachment.html
+conformance/textures/gl-teximage.html
+conformance/textures/origin-clean-conformance.html
+conformance/textures/tex-image-and-sub-image-2d-with-image.html
 conformance/textures/tex-image-and-sub-image-2d-with-video.html
+conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html
+conformance/textures/texture-mips.html
 conformance/textures/texture-npot-video.html
+conformance/textures/texture-size.html
+conformance/textures/texture-size-cube-maps.html

js/src/jit/IonFrames.cpp

@@ -1296,10 +1296,13 @@ void UpdateJitActivationsForMinorGC(PerThreadData *ptd, JSTracer *trc)
 template
 void UpdateJitActivationsForMinorGC<Nursery>(PerThreadData *ptd, JSTracer *trc);
 
+#ifdef JSGC_FJGENERATIONAL
 template
 void UpdateJitActivationsForMinorGC<gc::ForkJoinNursery>(PerThreadData *ptd, JSTracer *trc);
 #endif
 
+#endif
+
 void
 AutoTempAllocatorRooter::trace(JSTracer *trc)
 {

js/src/jsgc.cpp

@@ -5056,8 +5056,10 @@ GCRuntime::collect(bool incremental, int64_t budget, JSGCInvocationKind gckind,
     /* If we attempt to invoke the GC while we are running in the GC, assert. */
     MOZ_ASSERT(!rt->isHeapBusy());
 
+#ifdef JS_THREADSAFE
     /* The engine never locks across anything that could GC. */
     MOZ_ASSERT(!rt->currentThreadHasExclusiveAccess());
+#endif
 
     if (rt->mainThread.suppressGC)
         return;