--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 02 11:06:20 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 02 15:39:10 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -509,9 +509,9 @@
 
             //merge thrown types - form the intersection of all the thrown types in
             //all the signatures in the list
-            boolean toErase = !bestSoFar.type.hasTag(FORALL);
             List<Type> thrown = null;
             Type mt1 = memberType(origin.type, bestSoFar);
+            boolean toErase = !mt1.hasTag(FORALL);
             for (Symbol msym2 : methodSyms) {
                 Type mt2 = memberType(origin.type, msym2);
                 List<Type> thrown_mt2 = mt2.getThrownTypes();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8037947/CCEForFunctionalInterExtedingRawSuperInterTest.java	Thu Jun 02 15:39:10 2016 -0400
@@ -0,0 +1,38 @@
+/*
+ * 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 8037947
+ * @summary functional interface causes ClassCastException when extending raw superinterface
+ * @modules jdk.compiler/com.sun.tools.javac.util
+ * @compile CCEForFunctionalInterExtedingRawSuperInterTest.java
+ */
+
+public class CCEForFunctionalInterExtedingRawSuperInterTest {
+    interface X<A> { <T extends A> void execute(int a); }
+    interface Y<B> { <S extends B> void execute(int a); }
+
+    @FunctionalInterface
+    interface Exec<A> extends Y, X<A> { }
+}