Bug 1199719 mips - Add missing return in Assembler::haltingAlign. r=hev
☠☠ backed out by f11cf71a5cca ☠ ☠
authorNicolas B. Pierron <nicolas.b.pierron@mozilla.com>
Thu, 10 Sep 2015 22:36:06 +0200
changeset 296167 c7b1feca53f98a4d5c8dbf3a6358c60f834245cb
parent 296166 9e9aa9cd952ce157e332377bc1bc9862879f4a29
child 296168 05774944054d46c9b97818ba3aed9b79a0144587
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershev
bugs1199719
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1199719 mips - Add missing return in Assembler::haltingAlign. r=hev
js/src/jit/mips32/Assembler-mips32.cpp
--- a/js/src/jit/mips32/Assembler-mips32.cpp
+++ b/js/src/jit/mips32/Assembler-mips32.cpp
@@ -555,17 +555,17 @@ Assembler::WriteInstStatic(uint32_t x, u
     MOZ_ASSERT(dest != nullptr);
     *dest = x;
 }
 
 BufferOffset
 Assembler::haltingAlign(int alignment)
 {
     // TODO: Implement a proper halting align.
-    nopAlign(alignment);
+    return nopAlign(alignment);
 }
 
 BufferOffset
 Assembler::nopAlign(int alignment)
 {
     BufferOffset ret;
     MOZ_ASSERT(m_buffer.isAligned(4));
     if (alignment == 8) {