Preserve TCF_HAS_DEFXMLNS out of FunctionBody; don't turn comments and cdata into text when folding; disable JSOP_XMLOBJECT optimization for now (246441).

This commit is contained in:
brendan%mozilla.org 2004-12-31 09:00:41 +00:00
Родитель 3b9a4510d8
Коммит 73314eaa9f
1 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -657,7 +657,7 @@ FunctionBody(JSContext *cx, JSTokenStream *ts, JSFunction *fun,
} }
cx->fp = fp; cx->fp = fp;
tc->flags = oldflags | (tc->flags & TCF_FUN_FLAGS); tc->flags = oldflags | (tc->flags & (TCF_FUN_FLAGS | TCF_HAS_DEFXMLNS));
return pn; return pn;
} }
@ -4266,8 +4266,6 @@ FoldXMLConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc)
case TOK_XMLATTR: case TOK_XMLATTR:
case TOK_XMLSPACE: case TOK_XMLSPACE:
case TOK_XMLTEXT: case TOK_XMLTEXT:
case TOK_XMLCDATA:
case TOK_XMLCOMMENT:
case TOK_STRING: case TOK_STRING:
str = ATOM_TO_STRING(pn2->pn_atom); str = ATOM_TO_STRING(pn2->pn_atom);
break; break;
@ -4388,7 +4386,7 @@ js_FoldConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc)
} }
case PN_LIST: case PN_LIST:
#if JS_HAS_XML_SUPPORT #if 0 /* JS_HAS_XML_SUPPORT */
switch (pn->pn_type) { switch (pn->pn_type) {
case TOK_XMLELEM: case TOK_XMLELEM:
case TOK_XMLLIST: case TOK_XMLLIST: