From d19c3ad47f607ea8a415a2c49cdc92aed57a1382 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Fri, 28 Jun 2013 19:22:15 +0200
Subject: [PATCH] Bug 887521 - Fix OnUnknownMethod to not modify vp if there's
 no __noSuchMethod__ method. r=jwalden

---
 js/src/vm/Interpreter.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 2dc7c567c0a..800688f3853 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -212,9 +212,7 @@ js::OnUnknownMethod(JSContext *cx, HandleObject obj, Value idval_, MutableHandle
 
     TypeScript::MonitorUnknown(cx);
 
-    if (value.get().isPrimitive()) {
-        vp.set(value);
-    } else {
+    if (value.isObject()) {
         JSObject *obj = NewObjectWithClassProto(cx, &js_NoSuchMethodClass, NULL, NULL);
         if (!obj)
             return false;