changeset 1973:f55c889a51a5

8011028: lang/INFR/infr001/infr00101md/infr00101md.java fails to compile after switch to JDK8-b82
author mcimadamore
date Thu, 28 Mar 2013 20:43:11 +0000
parents 979d8e77ec90
children 1e3da0f9c87e
files src/share/classes/com/sun/tools/javac/code/Types.java test/tools/javac/lambda/TargetType69.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Mar 28 15:28:03 2013 +0000
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Mar 28 20:43:11 2013 +0000
@@ -589,7 +589,7 @@
                             CapturedType capVar = (CapturedType)capturedTypeargs.head;
                             //use declared bound if it doesn't depend on formal type-args
                             bound = capVar.bound.containsAny(capturedSite.getTypeArguments()) ?
-                                    syms.objectType : capVar.bound;
+                                    wt.type : capVar.bound;
                             break;
                         default:
                             bound = wt.type;
--- a/test/tools/javac/lambda/TargetType69.java	Thu Mar 28 15:28:03 2013 +0000
+++ b/test/tools/javac/lambda/TargetType69.java	Thu Mar 28 20:43:11 2013 +0000
@@ -25,7 +25,7 @@
  * @test
  * @bug 8010303
  * @summary Graph inference: missing incorporation step causes spurious inference error
- * @compile TargetType68.java
+ * @compile TargetType69.java
  */
 import java.util.*;