Attachment 70019 Details for Bug 189933 – Proposed patch

[patch] Proposed patch

patch.txt (text/plain), 1.91 KB, created by Kent Johnson

on 2007-06-04 15:17:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kent Johnson

Created: 2007-06-04 15:17:00 EDT

Size: 1.91 KB

patch

obsolete

>Index: src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java,v
>retrieving revision 1.46
>diff -u -r1.46 AmbiguousMethodTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	30 May 2007 14:55:43 -0000	1.46
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java	4 Jun 2007 19:14:30 -0000
>@@ -2091,7 +2091,7 @@
> 	);
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=189933
>-public void _test060() {
>+public void test060() {
> 	this.runConformTest(
> 		new String[] {
> 			"X.java",
>@@ -2120,7 +2120,7 @@
> }
> // https://bugs.eclipse.org/bugs/show_bug.cgi?id=189933
> // variant
>-public void _test061() {
>+public void test061() {
> 	this.runNegativeTest(
> 		new String[] {
> 			"X.java",
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java,v
>retrieving revision 1.309
>diff -u -r1.309 Scope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	24 May 2007 14:29:32 -0000	1.309
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	4 Jun 2007 19:14:31 -0000
>@@ -2581,7 +2581,8 @@
> 				if (oneParam.isCompatibleWith(twoParam)) {
> 					if (oneParam.leafComponentType().isRawType()) {
> 						// A#RAW is not more specific than a rawified A<T>
>-						if (oneParam.needsUncheckedConversion(two.original().parameters[i]))
>+						TypeBinding toCheck = two.declaringClass.isRawType() ? twoParam : two.original().parameters[i];
>+						if (oneParam.needsUncheckedConversion(toCheck))
> 							return false;
> 					}
> 				} else {

Actions: View | Diff

Attachments on bug 189933: 69682 | 70019 | 70140 | 70148