8025090: 'while' statement with 'test' using var before being declared in body results in VerifyError

Reviewed-by: jlaskey
This commit is contained in:
Athijegannathan Sundararajan 2013-09-19 23:48:37 +05:30
parent d6f64ae009
commit 996bf0feef
2 changed files with 39 additions and 5 deletions

View File

@ -79,13 +79,12 @@ public final class WhileNode extends LoopNode {
if (visitor.enterWhileNode(this)) {
if (isDoWhile()) {
return visitor.leaveWhileNode(
setTest(lc, (Expression)test.accept(visitor)).
setBody(lc, (Block)body.accept(visitor)));
setBody(lc, (Block)body.accept(visitor)).
setTest(lc, (Expression)test.accept(visitor)));
}
return visitor.leaveWhileNode(
setBody(lc, (Block)body.accept(visitor)).
setTest(lc, (Expression)test.accept(visitor)));
setTest(lc, (Expression)test.accept(visitor)).
setBody(lc, (Block)body.accept(visitor)));
}
return this;
}

View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2010, 2013, 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-8025090: 'while' statement with 'test' using var before being declared in body results in VerifyError
*
* @test
* @run
*/
// The following used to result in VerifyError
function f() {
while (x += 2) { var x = 44 }
}