Attachment 106710 Details for Bug 239758 – Proposed patch

[patch] Proposed patch

239578.txt (text/plain), 4.91 KB, created by Philipe Mulet

on 2008-07-07 07:44:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philipe Mulet

Created: 2008-07-07 07:44:43 EDT

Size: 4.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v
>retrieving revision 1.6574
>diff -u -r1.6574 buildnotes_jdt-core.html
>--- buildnotes_jdt-core.html	4 Jul 2008 10:16:10 -0000	1.6574
>+++ buildnotes_jdt-core.html	7 Jul 2008 11:43:49 -0000
>@@ -49,7 +49,9 @@
> <h2>What's new in this drop</h2>
> 
> <h3>Problem Reports Fixed</h3>
>-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=239305">239305</a>
>+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=239578">239578</a>
>+Update eRCP core to sync Eclipse 3.4
>+<br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=239305">239305</a>
> [compiler] VerifyError caused by casting long to long to int
> <br><a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=239198">239198</a>
> [compiler] NegativeArraySizeException thrown for triple quotes
>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.336
>diff -u -r1.336 Scope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	27 Jun 2008 21:44:07 -0000	1.336
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	7 Jul 2008 11:43:50 -0000
>@@ -3528,25 +3528,26 @@
> 							continue nextSpecific; // choose original2 instead
> 						}
> 						if (shouldIntersectExceptions && original2.declaringClass.isInterface()) {
>-							if (original.thrownExceptions != original2.thrownExceptions) {
>-								if (original2.thrownExceptions == Binding.NO_EXCEPTIONS) {
>+							if (current.thrownExceptions != next.thrownExceptions) {
>+								if (next.thrownExceptions == Binding.NO_EXCEPTIONS) {
> 									mostSpecificExceptions = Binding.NO_EXCEPTIONS;
> 								} else {
> 									if (mostSpecificExceptions == null) {
>-										mostSpecificExceptions = original.thrownExceptions;
>+										mostSpecificExceptions = current.thrownExceptions;
> 									}
> 									int mostSpecificLength = mostSpecificExceptions.length;
>-									int original2Length = original2.thrownExceptions.length;
>+									int nextLength = next.thrownExceptions.length;
> 									SimpleSet temp = new SimpleSet(mostSpecificLength);
> 									boolean changed = false;
> 									nextException : for (int t = 0; t < mostSpecificLength; t++) {
> 										ReferenceBinding exception = mostSpecificExceptions[t];
>-										for (int s = 0; s < original2Length; s++) {
>-											if (exception.isCompatibleWith(original2.thrownExceptions[s])) {
>+										for (int s = 0; s < nextLength; s++) {
>+											ReferenceBinding nextException = next.thrownExceptions[s];
>+											if (exception.isCompatibleWith(nextException)) {
> 												temp.add(exception);
> 												continue nextException;
>-											} else if (original2.thrownExceptions[s].isCompatibleWith(exception)) {
>-												temp.add(original2.thrownExceptions[s]);
>+											} else if (nextException.isCompatibleWith(exception)) {
>+												temp.add(nextException);
> 												changed = true;
> 												continue nextException;
> 											} else {
>#P org.eclipse.jdt.core.tests.compiler
>Index: src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java,v
>retrieving revision 1.742
>diff -u -r1.742 GenericTypeTest.java
>--- src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	3 Jul 2008 08:31:44 -0000	1.742
>+++ src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java	7 Jul 2008 11:43:59 -0000
>@@ -45847,4 +45847,29 @@
> 			},
> 			"");
> }
>+//https://bugs.eclipse.org/bugs/show_bug.cgi?id=239758
>+public void test1366() {
>+	this.runConformTest(
>+			new String[] {
>+				"X.java", // =================
>+				"import java.io.IOException;\n" + 
>+				"\n" + 
>+				"interface IServiceAction<Response, Request, Fault extends Exception> {\n" + 
>+				"	Response execute(Request parameter) throws Fault;\n" + 
>+				"}\n" + 
>+				"\n" + 
>+				"interface IServiceOperation<Response, Request, Fault extends Exception> extends IServiceAction<Response, Request, Fault> {\n" + 
>+				"	Response execute(Request parameter) throws Fault;\n" + 
>+				"}\n" + 
>+				"\n" + 
>+				"public class X {\n" + 
>+				"	public String execute(String parameter) throws IOException {\n" + 
>+				"		return serviceOperation.execute(parameter);\n" + 
>+				"	}\n" + 
>+				"\n" + 
>+				"	private final IServiceOperation<String, String, IOException> serviceOperation = null;\n" + 
>+				"}\n", // =================
>+			},
>+			"");
>+}
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 239758: 106686 | 106709 | 106710