Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fast followup to last checkin (bug 293782) to unregress 238881.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173461 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org
2005-05-15 22:38:12 +00:00
parent 3a9187cb46
commit 28e9ee6cb0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/js/src/jsemit.c
View File

@@ -1460,6 +1460,7 @@ js_LookupCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
obj = fp->varobj;
if (obj == fp->scopeChain &&
OBJ_IS_NATIVE(obj) &&
!js_InWithStatement(&cg->treeContext) &&
!js_InCatchBlock(&cg->treeContext, atom)) {
ATOM_LIST_SEARCH(ale, &cg->constList, atom);
@@ -1476,7 +1477,8 @@ js_LookupCompileTimeConstant(JSContext *cx, JSCodeGenerator *cg, JSAtom *atom,
* nor can prop be deleted.
*/
prop = NULL;
ok = OBJ_LOOKUP_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &pobj, &prop);
ok = js_LookupPropertyWithFlags(cx, obj, ATOM_TO_JSID(atom),
JSLOOKUP_HIDDEN, &pobj, &prop);
if (ok) {
if (pobj == obj &&
(fp->flags & (JSFRAME_EVAL | JSFRAME_COMPILE_N_GO))) {