Commit 6ce6769b authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

merge mozilla-central to mozilla-inbound. r=merge a=merge

parents f3bd79bb 6d3d62f7

js/src/builtin/RegExp.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ js::RegExpPrototypeOptimizable(JSContext* cx, unsigned argc, Value* vp) 
bool

js::RegExpPrototypeOptimizableRaw(JSContext* cx, JSObject* proto)

{

    AutoUnsafeCallWithABI unsafe;

    JS::AutoCheckCannotGC nogc;

    AutoAssertNoPendingException aanpe(cx);

    if (!proto->isNative())

        return false;
@@ -1666,7 +1666,7 @@ js::RegExpInstanceOptimizable(JSContext* cx, unsigned argc, Value* vp) 
bool

js::RegExpInstanceOptimizableRaw(JSContext* cx, JSObject* obj, JSObject* proto)

{

    AutoUnsafeCallWithABI unsafe;

    JS::AutoCheckCannotGC nogc;

    AutoAssertNoPendingException aanpe(cx);



    RegExpObject* rx = &obj->as<RegExpObject>();

js/src/irregexp/RegExpMacroAssembler.cpp

+0 −4
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ int 
irregexp::CaseInsensitiveCompareStrings(const CharT* substring1, const CharT* substring2,

					size_t byteLength)

{

    AutoUnsafeCallWithABI unsafe;



    MOZ_ASSERT(byteLength % sizeof(CharT) == 0);

    size_t length = byteLength / sizeof(CharT);
@@ -72,8 +70,6 @@ int 
irregexp::CaseInsensitiveCompareUCStrings(const CharT* substring1, const CharT* substring2,

                                          size_t byteLength)

{

    AutoUnsafeCallWithABI unsafe;



    MOZ_ASSERT(byteLength % sizeof(CharT) == 0);

    size_t length = byteLength / sizeof(CharT);

js/src/irregexp/RegExpStack.cpp

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ RegExpStackScope::~RegExpStackScope() 
int

irregexp::GrowBacktrackStack(JSRuntime* rt)

{

    AutoUnsafeCallWithABI unsafe;

    return TlsContext.get()->regexpStack.ref().grow();

}

js/src/jit-test/tests/wasm/integer.js

+0 −5
Original line number Diff line number Diff line
@@ -153,11 +153,6 @@ testComparison32('gt_u', 40, 40, 0); 
testComparison32('ge_s', 40, 40, 1);

testComparison32('ge_u', 40, 40, 1);



// On 32-bit debug builds, with --ion-eager, this test can run into our

// per-process JIT code limits and OOM. Trigger a GC to discard code.

if (getJitCompilerOptions()["ion.warmup.trigger"] === 0)

    gc();



// Test MTest's GVN branch inversion.

var testTrunc = wasmEvalText(`(module (func (param f32) (result i32) (if i32 (i32.eqz (i32.trunc_s/f32 (get_local 0))) (i32.const 0) (i32.const 1))) (export "" 0))`).exports[""];

assertEq(testTrunc(0), 0);

js/src/jit/Bailouts.cpp

+0 −4
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ using mozilla::IsInRange; 
uint32_t

jit::Bailout(BailoutStack* sp, BaselineBailoutInfo** bailoutInfo)

{

    AutoUnsafeCallWithABI unsafe;



    JSContext* cx = TlsContext.get();

    MOZ_ASSERT(bailoutInfo);
@@ -106,8 +104,6 @@ uint32_t 
jit::InvalidationBailout(InvalidationBailoutStack* sp, size_t* frameSizeOut,

                         BaselineBailoutInfo** bailoutInfo)

{

    AutoUnsafeCallWithABI unsafe;



    sp->checkInvariants();



    JSContext* cx = TlsContext.get();