wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 495907: use more reliable code to get outermost tree script nest level, r=gal

Browse Source
This commit is contained in:
David Mandelin 2009-06-02 11:52:24 -07:00
parent 497c7b443a
commit 5ffad30282
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jstracer.cpp
View File

@ -1886,7 +1886,7 @@ js_GetUpvarOnTrace(JSContext* cx, uint32 level, uint32 cookie, uint32 callDepth,
}
}
if (cx->fp->fun && cx->fp->fun->u.i.script->staticLevel == upvarLevel) {
if (state->outermostTree->script->staticLevel == upvarLevel) {
return GetUpvarOnTraceTail(state, cookie, 0,
state->outermostTree->stackTypeMap(), result);
}

69
js/tests/js1_8_1/regress/regress-495907.js Normal file
View File

@ -0,0 +1,69 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is JavaScript Engine testing utilities.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2007
* the Initial Developer. All Rights Reserved.
*
* Contributor(s): Dave Mandelin
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
var gTestfile = 'regress-495907.js';
//-----------------------------------------------------------------------------
var BUGNUMBER = 495907;
var summary = 'Read upvar from trace-entry frame when created with top-level let';
var actual = ''
var expect = '00112233';
//-----------------------------------------------------------------------------
// The test code needs to run at top level in order to expose the bug.
start_test();
var o = [];
for (let a = 0; a < 4; ++a) {
(function () {for (var b = 0; b < 2; ++b) {o.push(a);}}());
}
actual = o.join("");
finish_test();
//-----------------------------------------------------------------------------
function start_test() {
enterFunc ('test');
printBugNumber(BUGNUMBER);
printStatus (summary);
jit(true);
}
function finish_test() {
jit(false);
reportCompare(expect, actual, summary);
exitFunc ('test');
}