From 46bb7a6e6f7036dc3724664af2d01de229dd8434 Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Thu, 17 May 2001 04:55:49 +0000 Subject: [PATCH] Reverting bogus assert. r/sr=brendan,jband git-svn-id: svn://10.0.0.236/trunk@95209 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsscope.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/mozilla/js/src/jsscope.c b/mozilla/js/src/jsscope.c index 1e06d8e2f3a..0f5f6d7fa29 100644 --- a/mozilla/js/src/jsscope.c +++ b/mozilla/js/src/jsscope.c @@ -146,26 +146,13 @@ js_hash_scope_lookup(JSContext *cx, JSScope *scope, jsid id, JSHashNumber hash) return sym; } -#ifdef DEBUG -#define REDEFINING_SYMBOL(sym) (!(sym)->scope) -#define START_REDEFINING_SYMBOL(sym) ((sym)->scope = NULL) -#define END_REDEFINING_SYMBOL(sym) ((sym)->scope = scope) -#else -#define REDEFINING_SYMBOL(sym) JS_FALSE -#define START_REDEFINING_SYMBOL(sym) /* nothing */ -#define END_REDEFINING_SYMBOL(sym) /* nothing */ -#endif - #define SCOPE_ADD(PRIV, CLASS_SPECIFIC_CODE) \ JS_BEGIN_MACRO \ if (sym) { \ if (sym->entry.value == sprop) \ return sym; \ - if (sym->entry.value) { \ - START_REDEFINING_SYMBOL(sym); \ + if (sym->entry.value) \ js_free_symbol(PRIV, &sym->entry, HT_FREE_VALUE); \ - END_REDEFINING_SYMBOL(sym); \ - } \ } else { \ CLASS_SPECIFIC_CODE \ sym->scope = scope; \ @@ -598,9 +585,6 @@ js_DropScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop) if (sprop) { JS_ASSERT(sprop->nrefs > 0); if (--sprop->nrefs == 0) { - JS_ASSERT(REDEFINING_SYMBOL(sprop->symbols) || - !scope->ops->lookup(cx, scope, sym_id(sprop->symbols), - js_HashId(sym_id(sprop->symbols)))); js_DestroyScopeProperty(cx, scope, sprop); sprop = NULL; }