From bcbf26128c605d98a1971a23b82e8bd9fb6c97ce Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Wed, 13 Feb 2013 17:24:50 -0800
Subject: [PATCH] Implement JSOP_CALLEE in JM (bug 794427, r=bhackett).

--HG--
extra : rebase_source : 6aa85c3434a70d93fcf409bdb4cc2baaf024896e
---
 js/src/jsanalyze.cpp          | 1 +
 js/src/methodjit/Compiler.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 146a52bf7bd0..571bb0be8c08 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -457,6 +457,7 @@ ScriptAnalysis::analyzeBytecode(JSContext *cx)
           /* Additional opcodes which can be compiled but which can't be inlined. */
           case JSOP_ARGUMENTS:
           case JSOP_FUNAPPLY:
+          case JSOP_CALLEE:
             isJaegerInlineable = false;
             break;
           case JSOP_THROW:
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index 114ccabbef3d..8d6b17eccae6 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -2816,6 +2816,10 @@ mjit::Compiler::generateMethod()
             frame.push(NullValue());
           END_CASE(JSOP_NULL)
 
+          BEGIN_CASE(JSOP_CALLEE)
+            frame.pushCallee();
+          END_CASE(JSOP_CALLEE)
+
           BEGIN_CASE(JSOP_THIS)
             jsop_this();
           END_CASE(JSOP_THIS)