changeset 1527:0586afeb2caa jdk7u40-b30

Merge
author asaha
date Mon, 17 Jun 2013 22:29:34 -0700
parents 8bf76605342a d69d7e2d56ee
children 849b17bc6e9a 801dc43b8a8f c7024dda4ff3 2a790207cfbb
files
diffstat 2 files changed, 48 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Jun 13 17:38:21 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Mon Jun 17 22:29:34 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -340,9 +340,10 @@
      */
     void markThrown(JCTree tree, Type exc) {
         if (!chk.isUnchecked(tree.pos(), exc)) {
-            if (!chk.isHandled(exc, caught))
+            if (!chk.isHandled(exc, caught)) {
                 pendingExits.append(new PendingExit(tree, exc));
-                thrown = chk.incl(exc, thrown);
+            }
+            thrown = chk.incl(exc, thrown);
         }
     }
 
@@ -1039,8 +1040,9 @@
                             names.close,
                             List.<Type>nil(),
                             List.<Type>nil());
+                    Type mt = types.memberType(resource.type, closeMethod);
                     if (closeMethod.kind == MTH) {
-                        for (Type t : ((MethodSymbol)closeMethod).getThrownTypes()) {
+                        for (Type t : mt.getThrownTypes()) {
                             markThrown(resource, t);
                         }
                     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/T7179353/GenericsAndTWRCompileErrorTest.java	Mon Jun 17 22:29:34 2013 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 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.
+ */
+
+/*
+ * @test
+ * @bug 7179353
+ * @summary try-with-resources fails to compile with generic exception parameters
+ * @compile GenericsAndTWRCompileErrorTest.java
+ */
+
+public class GenericsAndTWRCompileErrorTest {
+
+    public static class Resource<E extends Exception> implements AutoCloseable {
+        public void close() throws E { }
+    }
+
+    public <E extends Exception> void test() throws E {
+        try (Resource<E> r = new Resource<E>()) {
+
+        }
+    }
+}