Attachment 40693 Details for Bug 140643 – Proposed patch

[patch] Proposed patch

140643.txt (text/plain), 3.30 KB, created by Philipe Mulet

on 2006-05-09 05:13:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philipe Mulet

Created: 2006-05-09 05:13:19 EDT

Size: 3.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java,v
>retrieving revision 1.122
>diff -u -r1.122 TypeDeclaration.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	4 Apr 2006 07:43:11 -0000	1.122
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	9 May 2006 09:15:03 -0000
>@@ -328,7 +328,7 @@
> 		constructor.constructorCall.sourceEnd = this.sourceEnd;
> 	}
> 
>-	//adding the constructor in the methods list
>+	//adding the constructor in the methods list: rank is not critical since bindings will be sorted
> 	if (needToInsert) {
> 		if (this.methods == null) {
> 			this.methods = new AbstractMethodDeclaration[] { constructor };
>@@ -347,7 +347,7 @@
> 	return constructor;
> }
> 
>-// anonymous type constructor creation
>+// anonymous type constructor creation: rank is important since bindings already got sorted
> public MethodBinding createDefaultConstructorWithBinding(MethodBinding inheritedConstructorBinding) {
> 	//Add to method'set, the default constuctor that just recall the
> 	//super constructor with the same arguments
>@@ -390,37 +390,29 @@
> 		this.methods = new AbstractMethodDeclaration[] { constructor };
> 	} else {
> 		AbstractMethodDeclaration[] newMethods;
>-		System.arraycopy(
>-			this.methods,
>-			0,
>-			newMethods = new AbstractMethodDeclaration[this.methods.length + 1],
>-			1,
>-			this.methods.length);
>+		System.arraycopy(this.methods, 0, newMethods = new AbstractMethodDeclaration[this.methods.length + 1], 1, this.methods.length);
> 		newMethods[0] = constructor;
> 		this.methods = newMethods;
> 	}
> 
> 	//============BINDING UPDATE==========================
>+	SourceTypeBinding sourceType = this.binding;
> 	constructor.binding = new MethodBinding(
> 			constructor.modifiers, //methodDeclaration
> 			argumentsLength == 0 ? Binding.NO_PARAMETERS : argumentTypes, //arguments bindings
> 			inheritedConstructorBinding.thrownExceptions, //exceptions
>-			this.binding); //declaringClass
>+			sourceType); //declaringClass
> 			
> 	constructor.scope = new MethodScope(this.scope, constructor, true);
> 	constructor.bindArguments();
> 	constructor.constructorCall.resolve(constructor.scope);
> 
>-	MethodBinding[] oldMethods = this.binding.methods(); // trigger sorting
>+	MethodBinding[] oldMethods = sourceType.methods(); // trigger sorting
> 	MethodBinding[] newMethods;
>-	System.arraycopy(
>-		this.binding.methods(),
>-		0,
>-		newMethods = new MethodBinding[oldMethods.length + 1],
>-		1,
>-		oldMethods.length);
>-	newMethods[0] = constructor.binding; // position 0 is important, since if sorted, constructor will still be ahead
>-	this.binding.setMethods(newMethods);
>+	System.arraycopy(oldMethods, 0, 	newMethods = new MethodBinding[oldMethods.length + 1], 1, oldMethods.length);
>+	newMethods[0] = constructor.binding; 
>+	sourceType.tagBits &= ~(TagBits.AreMethodsComplete|TagBits.AreMethodsSorted); // still need to resort, since could be valid methods ahead (140643)
>+	sourceType.setMethods(newMethods);
> 	//===================================================
> 
> 	return constructor.binding;

Actions: View | Diff

Attachments on bug 140643: 40693 | 40932 | 40964