Mercurial > hg > jdk9-shenandoah > langtools
changeset 2685:7b80aafb5b76
8059453: javac crashes with -Xjcov and union types
Reviewed-by: jlahoda, vromero
Contributed-by: Liam Miller-Cushon <cushon@google.com>
author | jfranck |
---|---|
date | Thu, 25 Sep 2014 14:38:29 -0700 |
parents | 478972d90f7b |
children | 82acac4e6d0d |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java test/tools/javac/options/XjcovUnionTypeTest.java |
diffstat | 2 files changed, 45 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java Mon Oct 27 10:43:09 2014 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/CRTable.java Thu Sep 25 14:38:29 2014 -0700 @@ -517,6 +517,13 @@ result = sr; } + @Override + public void visitTypeUnion(JCTypeUnion tree) { + SourceRange sr = new SourceRange(startPos(tree), endPos(tree)); + sr.mergeWith(csp(tree.alternatives)); + result = sr; + } + public void visitWildcard(JCWildcard tree) { result = null; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/options/XjcovUnionTypeTest.java Thu Sep 25 14:38:29 2014 -0700 @@ -0,0 +1,38 @@ +/* + * 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 8059453 + * @summary -Xjcov causes crash with union types + * @compile -Xjcov XjcovUnionTypeTest.java + */ + +public class XjcovUnionTypeTest { + public static void main(String[] args) { + try { + return; + } catch (IllegalStateException | IllegalArgumentException e) { + } + } +}