From 73314eaa9f6cadb233743e3566a2d7d95ccc2726 Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Fri, 31 Dec 2004 09:00:41 +0000 Subject: [PATCH] Preserve TCF_HAS_DEFXMLNS out of FunctionBody; don't turn comments and cdata into text when folding; disable JSOP_XMLOBJECT optimization for now (246441). --- js/src/jsparse.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/src/jsparse.c b/js/src/jsparse.c index 3e7f3ae9c565..93faca48c380 100644 --- a/js/src/jsparse.c +++ b/js/src/jsparse.c @@ -657,7 +657,7 @@ FunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun, } cx->fp = fp; - tc->flags = oldflags | (tc->flags & TCF_FUN_FLAGS); + tc->flags = oldflags | (tc->flags & (TCF_FUN_FLAGS | TCF_HAS_DEFXMLNS)); return pn; } @@ -4266,8 +4266,6 @@ FoldXMLConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc) case TOK_XMLATTR: case TOK_XMLSPACE: case TOK_XMLTEXT: - case TOK_XMLCDATA: - case TOK_XMLCOMMENT: case TOK_STRING: str = ATOM_TO_STRING(pn2->pn_atom); break; @@ -4388,7 +4386,7 @@ js_FoldConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc) } case PN_LIST: -#if JS_HAS_XML_SUPPORT +#if 0 /* JS_HAS_XML_SUPPORT */ switch (pn->pn_type) { case TOK_XMLELEM: case TOK_XMLLIST: