stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8049305: Verification error due to a bad stackmap frame generated by javac

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Vicente Romero 2014-07-14 13:36:30 -04:00
parent 603d592a91
commit 1e87b47b2a
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
View File

@ -1072,7 +1072,8 @@ public class Gen extends JCTree.Visitor {
boolean testFirst) {
Env<GenContext> loopEnv = env.dup(loop, new GenContext());
int startpc = code.entryPoint();
if (testFirst) {
boolean recalculateState = false;
if (testFirst) { //while or for loop
CondItem c;
if (cond != null) {
code.statBegin(cond.pos);
@ -1081,6 +1082,9 @@ public class Gen extends JCTree.Visitor {
c = items.makeCondItem(goto_);
}
Chain loopDone = c.jumpFalse();
if (loopDone == null) {
recalculateState = true;
}
code.resolve(c.trueJumps);
genStat(body, loopEnv, CRT_STATEMENT | CRT_FLOW_TARGET);
if (varDebugInfo) {
@ -1117,6 +1121,9 @@ public class Gen extends JCTree.Visitor {
code.resolve(c.jumpTrue(), startpc);
code.resolve(c.falseJumps);
}
if (recalculateState && loopEnv.info.exit != null) {
loopEnv.info.exit.state.defined = code.state.defined.dup();
}
code.resolve(loopEnv.info.exit);
}

49
langtools/test/tools/javac/T8049305/WrongStackframeGenerationTest.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright (c) 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.
*/
/*
* @test
* @bug 8049305
* @summary Verification error due to a bad stackmap frame generated by javac
*/
public class WrongStackframeGenerationTest {
public static void main(String[] args) {
foo();
}
static void foo(){
while (true) {
int i = 0;
break;
}
switch (1) {
case 1:
int j = 0;
case 2:
bar();
}
}
static void bar() {}
}