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

8160699: java.lang.VerifyError: Inconsistent stackmap frames at branch target

Browse Source 
Ensure out of scope locals are not treated as being alive

Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2016-09-14 20:00:20 +05:30
parent e4870c84e3
commit 83dbcb5c1b
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
View File

@ -1232,7 +1232,7 @@ public class Gen extends JCTree.Visitor {
Chain exit = switchEnv.info.exit;
if (exit != null) {
code.resolve(exit);
exit.state.defined.excludeFrom(code.nextreg);
exit.state.defined.excludeFrom(limit);
}
// If we have not set the default offset, we do so now.

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

@ -0,0 +1,49 @@
/*
* Copyright (c) 2016, 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 8160699
* @summary Verify that having finished executing a switch statement live locals are exactly the same as it was upon entry of the switch.
* @run main SwitchExitStateTest
*/
public class SwitchExitStateTest {
public static void main(String[] args) throws Exception {
switch (0) {
case 0:
String a = "";
break;
default:
throw new Exception("Unknown ");
}
switch (0) {
case 0:
String b = "";
break;
default:
throw new Exception("Unknown ");
}
}
}