Commit bbda942d authored by Luke Wagner's avatar Luke Wagner
Browse files

Bug 832063 - unify Assembler::flush/finish (r=mrosenberg)

parent 1d39e4bd

js/src/ion/IonLinker.h

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ class Linker 


    IonCode *newCode(JSContext *cx, IonCompartment *comp) {

        AssertCanGC();

#ifndef JS_CPU_ARM

        masm.flush();

#endif

        if (masm.oom())

            return fail(cx);

js/src/ion/shared/Assembler-x86-shared.h

+0 −3
Original line number Diff line number Diff line
@@ -1198,9 +1198,6 @@ class AssemblerX86Shared 
    void flushBuffer() {

    }



    void finish() {

    }



    // Patching.



    static size_t patchWrite_NearCallSize() {

js/src/ion/x64/Assembler-x64.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Assembler::PatchJumpEntry(uint8_t *entry, uint8_t *target) 
}



void

Assembler::flush()

Assembler::finish()

{

    if (!jumps_.length() || oom())

        return;

js/src/ion/x64/Assembler-x64.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ class Assembler : public AssemblerX86Shared 


    // The buffer is about to be linked, make sure any constant pools or excess

    // bookkeeping has been flushed to the instruction stream.

    void flush();

    void finish();



    // Copy the assembly code to the given buffer, and perform any pending

    // relocations relying on the target address.

js/src/ion/x86/Assembler-x86.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ class Assembler : public AssemblerX86Shared 


    // The buffer is about to be linked, make sure any constant pools or excess

    // bookkeeping has been flushed to the instruction stream.

    void flush() { }

    void finish() { }



    // Copy the assembly code to the given buffer, and perform any pending

    // relocations relying on the target address.