Merge branch 'TRUNK' into ARE-5.0

1 files changed, 19 insertions, 0 deletions

diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index fd85ec00e..53254718c 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -1253,6 +1253,25 @@ BaselineCompiler::emit_JSOP_IFNE()
 }
 
 bool
+BaselineCompiler::emit_JSOP_COALESCE() {
+    // COALESCE leaves the original value on the stack.
+    frame.syncStack(0);
+
+    masm.loadValue(frame.addressOfStackValue(frame.peek(-1)), R0);
+
+    Label undefinedOrNull;
+
+    masm.branchTestUndefined(Assembler::Equal, R0, &undefinedOrNull);
+    masm.branchTestNull(Assembler::Equal, R0, &undefinedOrNull);
+
+    jsbytecode* target = pc + GET_JUMP_OFFSET(pc);
+    masm.jump(labelOf(target));
+
+    masm.bind(&undefinedOrNull);
+    return true;
+}
+
+bool
 BaselineCompiler::emitAndOr(bool branchIfTrue)
 {
     bool knownBoolean = frame.peek(-1)->isKnownBoolean();