Merge m-c to inbound. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 27 Jun 2014 15:56:35 -0400
changeset 191275 1a324f5f9eaeda402d6f56aed0c1eb9de6c424e6
parent 191274 f6c363f922fb07e9d85ff7b1bc6426c4c12974f3 (current diff)
parent 191187 c90b38c47a1d13fe99dbf7eb5a4e42359301e49e (diff)
child 191276 e06666a58463268b7bd9bf805969a2a2a46f930f
push id8446
push userkwierso@gmail.com
push dateSat, 28 Jun 2014 00:53:07 +0000
treeherderb2g-inbound@4c01e8759555 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone33.0a1
Merge m-c to inbound. a=merge
--- a/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt
+++ b/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
--- a/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
+++ b/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt
@@ -8,10 +8,17 @@ conformance/glsl/functions/glsl-function
 conformance/glsl/functions/glsl-function-smoothstep-float.html
 conformance/limits/gl-max-texture-dimensions.html
 conformance/limits/gl-min-textures.html
 conformance/misc/error-reporting.html
 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
--- a/js/src/jit/IonFrames.cpp
+++ b/js/src/jit/IonFrames.cpp
@@ -1291,20 +1291,23 @@ void UpdateJitActivationsForMinorGC(PerT
                 UpdateIonJSFrameForMinorGC<T>(trc, frames);
         }
     }
 }
 
 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)
 {
     for (CompilerRootNode *root = temp->rootList(); root != nullptr; root = root->next)
         gc::MarkGCThingRoot(trc, root->address(), "ion-compiler-root");
 }
 
 void
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -5051,18 +5051,20 @@ GCRuntime::collect(bool incremental, int
     /* GC shouldn't be running in parallel execution mode */
     MOZ_ASSERT(!InParallelSection());
 
     JS_AbortIfWrongThread(rt);
 
     /* 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;
 
     TraceLogger *logger = TraceLoggerForMainThread(rt);
     AutoTraceLog logGC(logger, TraceLogger::GC);
 
 #ifdef JS_GC_ZEAL