From 03f335335d1f401318434ae7a424c8aca204ddd2 Mon Sep 17 00:00:00 2001
From: Robert Sayre <sayrer@gmail.com>
Date: Tue, 1 Dec 2009 15:54:01 -0500
Subject: [PATCH] Relanding Tolerate race condition or broken resolve hook
 (530507, r=jorendorff). Backed out changeset fb34a7163a43

---
 js/src/jsobj.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index c8ac745f847..f713010aa86 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -4759,7 +4759,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
             }
         }
 
-        sprop = scope->addProperty(cx, id, getter, setter, SPROP_INVALID_SLOT,
+        sprop = scope->putProperty(cx, id, getter, setter, SPROP_INVALID_SLOT,
                                    attrs, flags, shortid);
         if (!sprop) {
             JS_UNLOCK_SCOPE(cx, scope);