diff --git a/mozilla/js/src/jsparse.c b/mozilla/js/src/jsparse.c
index db422e61240..2891fe408d0 100644
--- a/mozilla/js/src/jsparse.c
+++ b/mozilla/js/src/jsparse.c
@@ -5351,8 +5351,11 @@ FoldXMLConstants(JSContext *cx, JSParseNode *pn, JSTreeContext *tc)
         /* The parser already rejected end-tags with attributes. */
         JS_ASSERT(tt != TOK_XMLETAGO || i == 0);
         switch (pn2->pn_type) {
-          case TOK_XMLNAME:
           case TOK_XMLATTR:
+            if (!accum)
+                goto cantfold;
+            /* FALL THROUGH */
+          case TOK_XMLNAME:
           case TOK_XMLSPACE:
           case TOK_XMLTEXT:
           case TOK_STRING: