From 63bf3be32ce67ef8168e818bdc05f85fe2c97c0c Mon Sep 17 00:00:00 2001
From: Lars T Hansen <lhansen@mozilla.com>
Date: Wed, 16 Nov 2016 11:24:34 +0100
Subject: [PATCH] Bug 1316850 - make sure we don't fall through into
 endFunction. r=bbouvier

--HG--
extra : rebase_source : 79b84aae64e7a58a6b79d82d424ad21645f6307e
extra : histedit_source : 2aef3ae9bf85f5c4761fb440e1bba1afdb3c287a%2Cef6d9d8ec0593d8b29f471d37fbd0f4da3ba5250
---
 js/src/wasm/WasmBaselineCompile.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/src/wasm/WasmBaselineCompile.cpp b/js/src/wasm/WasmBaselineCompile.cpp
index e6ab27b6e621..17a6d426eeed 100644
--- a/js/src/wasm/WasmBaselineCompile.cpp
+++ b/js/src/wasm/WasmBaselineCompile.cpp
@@ -2051,6 +2051,9 @@ class BaseCompiler
     }
 
     bool endFunction() {
+        // Always branch to outOfLinePrologue_ or returnLabel_.
+        masm.breakpoint();
+
         // Out-of-line prologue.  Assumes that the in-line prologue has
         // been executed and that a frame of size = localSize_ + sizeof(Frame)
         // has been allocated.