diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index b4dea33ed1a..821481943a5 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -8071,16 +8071,11 @@ Parser::primaryExpr(TokenKind tt, JSBool afterDot)
return NULL;
if (PN_TYPE(pn->pn_kid) == TOK_USESHARP ||
PN_TYPE(pn->pn_kid) == TOK_DEFSHARP ||
-#if JS_HAS_XML_SUPPORT
- PN_TYPE(pn->pn_kid) == TOK_XMLCOMMENT ||
- PN_TYPE(pn->pn_kid) == TOK_XMLCDATA ||
- PN_TYPE(pn->pn_kid) == TOK_XMLPTAGC ||
- PN_TYPE(pn->pn_kid) == TOK_XMLELEM ||
-#endif
PN_TYPE(pn->pn_kid) == TOK_STRING ||
PN_TYPE(pn->pn_kid) == TOK_NUMBER ||
PN_TYPE(pn->pn_kid) == TOK_PRIMARY) {
- reportErrorNumber(pn->pn_kid, JSREPORT_ERROR, JSMSG_BAD_SHARP_VAR_DEF);
+ ReportCompileErrorNumber(context, &tokenStream, pn->pn_kid, JSREPORT_ERROR,
+ JSMSG_BAD_SHARP_VAR_DEF);
return NULL;
}
if (!tc->ensureSharpSlots())
diff --git a/js/src/tests/e4x/extensions/regress-335051.js b/js/src/tests/e4x/extensions/regress-335051.js
index 6ca5a909108..a8460de9a93 100644
--- a/js/src/tests/e4x/extensions/regress-335051.js
+++ b/js/src/tests/e4x/extensions/regress-335051.js
@@ -9,7 +9,7 @@
var gTestfile = 'regress-335051.js';
//-----------------------------------------------------------------------------
var BUGNUMBER = 335051;
-var summary = 'E4X literals should be acceptable values for sharp variables';
+var summary = '';
var actual = '';
var expect = '';
@@ -47,12 +47,12 @@ function test()
testSyntax("#1=function() { }", true);
testSyntax("#1=(new Date())", true);
- testSyntax("#1=", false);
- testSyntax("#1=", false);
- testSyntax("#1=b", false);
- testSyntax("[#1=b, #1#]", false);
- testSyntax("#1=()", false);
- testSyntax("#1=()", false);
+ testSyntax("#1=", true);
+ testSyntax("#1=", true);
+ testSyntax("#1=b", true);
+ testSyntax("[#1=b, #1#]", true);
+ testSyntax("#1=()", true);
+ testSyntax("#1=()", true);
testSyntax("#1=123", false);
testSyntax("#1='foo'", false);