8047166: 'do with({}) break ; while(0);' crashes in CodeGenerator
Reviewed-by: hannesw, jlaskey
This commit is contained in:
parent
c6dda4ed20
commit
d9cdc6efec
@ -1181,7 +1181,12 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
assert count > 0; // together with count == 0 check, asserts nonnegative count
|
assert count > 0; // together with count == 0 check, asserts nonnegative count
|
||||||
assert method.hasScope();
|
if (!method.hasScope()) {
|
||||||
|
// We can sometimes invoke this method even if the method has no slot for the scope object. Typical example:
|
||||||
|
// for(;;) { with({}) { break; } }. WithNode normally creates a scope, but if it uses no identifiers and
|
||||||
|
// nothing else forces creation of a scope in the method, we just won't have the :scope local variable.
|
||||||
|
return;
|
||||||
|
}
|
||||||
method.loadCompilerConstant(SCOPE);
|
method.loadCompilerConstant(SCOPE);
|
||||||
for(int i = 0; i < count; ++i) {
|
for(int i = 0; i < count; ++i) {
|
||||||
method.invoke(ScriptObject.GET_PROTO);
|
method.invoke(ScriptObject.GET_PROTO);
|
||||||
|
31
nashorn/test/script/basic/JDK-8047166.js
Normal file
31
nashorn/test/script/basic/JDK-8047166.js
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
*
|
||||||
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* JDK-8047166: 'do with({}) break ; while(0);' crashes in CodeGenerator
|
||||||
|
*
|
||||||
|
* @test
|
||||||
|
* @run
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function(){do with({}) break ; while(0);})();
|
Loading…
x
Reference in New Issue
Block a user