From 9e4f1ac70f135dfd90bcbfc8bac28570dbcb2b93 Mon Sep 17 00:00:00 2001 From: Jan de Mooij Date: Fri, 27 Jun 2014 16:33:07 +0200 Subject: [PATCH 1/2] No bug - Fix --disable-threadsafe shell builds to unbreak JS fuzzers. r=jorendorff,jonco, a=Tomcat --- js/src/jit/IonFrames.cpp | 3 +++ js/src/jsgc.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/js/src/jit/IonFrames.cpp b/js/src/jit/IonFrames.cpp index bb8ea7b03ad..6011ade8785 100644 --- a/js/src/jit/IonFrames.cpp +++ b/js/src/jit/IonFrames.cpp @@ -1296,10 +1296,13 @@ void UpdateJitActivationsForMinorGC(PerThreadData *ptd, JSTracer *trc) template void UpdateJitActivationsForMinorGC(PerThreadData *ptd, JSTracer *trc); +#ifdef JSGC_FJGENERATIONAL template void UpdateJitActivationsForMinorGC(PerThreadData *ptd, JSTracer *trc); #endif +#endif + void AutoTempAllocatorRooter::trace(JSTracer *trc) { diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 2234a3c5635..7d541362175 100644 --- a/js/src/jsgc.cpp +++ b/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; From 3fb8b5fe74a0761f4c921e654f32be36c06f1c1a Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Fri, 27 Jun 2014 10:34:17 -0600 Subject: [PATCH 2/2] Bug 1031097 - Skip more webgl-conformance tests on Android 2.3. a=bustage-fix --- .../test/webgl-conformance/failing_tests_android_x86.txt | 7 +------ .../test/webgl-conformance/skipped_tests_android_x86.txt | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt b/content/canvas/test/webgl-conformance/failing_tests_android_x86.txt index 206c850321c..e782ab33ed8 100644 --- 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 diff --git a/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt b/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt index 50d697a147b..43b7ae201f4 100644 --- a/content/canvas/test/webgl-conformance/skipped_tests_android_x86.txt +++ b/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