From 5f1353bc72847cbf1d29029d5d331d4793e4660b Mon Sep 17 00:00:00 2001 From: "timeless@mozdev.org" Date: Mon, 5 Apr 2010 15:37:33 -0500 Subject: [PATCH] Bug 555687 - OBJ_SCOPE(obj) is unused in TraceRecorder::setProp. r=jorendorff. --HG-- extra : rebase_source : 7a63d5edfb25a8b4ecacc2b069d9ad5da561ec3a --- js/src/jstracer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp index 800a9f64274d..2fb0fb11fdc0 100644 --- a/js/src/jstracer.cpp +++ b/js/src/jstracer.cpp @@ -11245,9 +11245,8 @@ TraceRecorder::setProp(jsval &l, PropertyCacheEntry* entry, JSScopeProperty* spr JS_ASSERT(!JSVAL_IS_PRIMITIVE(l)); JSObject* obj = JSVAL_TO_OBJECT(l); LIns* obj_ins = get(&l); - JSScope* scope = OBJ_SCOPE(obj); - JS_ASSERT_IF(entry->directHit(), scope->hasProperty(sprop)); + JS_ASSERT_IF(entry->directHit(), OBJ_SCOPE(obj)->hasProperty(sprop)); // Fast path for CallClass. This is about 20% faster than the general case. v_ins = get(&v); @@ -11260,7 +11259,7 @@ TraceRecorder::setProp(jsval &l, PropertyCacheEntry* entry, JSScopeProperty* spr obj2 = obj2->getParent(); for (jsuword j = entry->protoIndex(); j; j--) obj2 = obj2->getProto(); - scope = OBJ_SCOPE(obj2); + JSScope *scope = OBJ_SCOPE(obj2); JS_ASSERT_IF(entry->adding(), obj2 == obj); // Guard before anything else.