Skip to content

CompleteTypeBindingsSteps.INTEGRATE_ANNOTATIONS_IN_HIERARCHY violates TypeBinding's protocol by direct updation of fields in various places #4842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srikanth-sankaran wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CompleteTypeBindingsSteps.INTEGRATE_ANNOTATIONS_IN_HIERARCHY violates TypeBinding's protocol by direct updation of fields in various places #4842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...se.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,7 @@ public void updateSupertypesWithAnnotations(Map<ReferenceBinding,ReferenceBindin
}
}
if (this.superclass != null) {
this.binding.superclass = updateWithAnnotations(this.superclass, this.binding.superclass, outerUpdates, updates);
this.binding.setSuperClass(updateWithAnnotations(this.superclass, this.binding.superclass, outerUpdates, updates)); // don't assign directly to superclass!
}
if (this.superInterfaces != null) {
ReferenceBinding[] superIfcBindings = this.binding.superInterfaces;
Expand Down
4 changes: 2 additions & 2 deletions ...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/TypeParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ public void updateWithAnnotations(ClassScope scope) {
this.type.updateWithAnnotations(scope, Binding.DefaultLocationTypeBound);
if (this.type.resolvedType instanceof ReferenceBinding && prevType != this.type.resolvedType) { //$IDENTITY-COMPARISON$
ReferenceBinding newType = (ReferenceBinding) this.type.resolvedType;
this.binding.firstBound = newType;
this.binding.setFirstBound(newType); // do not assign to firstBound directly!
if (newType.isClass())
this.binding.superclass = newType;
this.binding.setSuperClass(newType); // do not assign to superclass directly!
}
}
if (this.bounds != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ SourceTypeBinding buildType(SourceTypeBinding enclosingType, PackageBinding pack
}

TypeParameter[] typeParameters = this.referenceContext.typeParameters;
sourceType.typeVariables = typeParameters == null || typeParameters.length == 0 ? Binding.NO_TYPE_VARIABLES : null;
sourceType.setTypeVariables(typeParameters == null || typeParameters.length == 0 ? Binding.NO_TYPE_VARIABLES : null); // don't assign directly!
sourceType.fPackage.addType(sourceType);
checkAndSetModifiers();
buildTypeVariables();
Expand Down Expand Up @@ -1376,7 +1376,7 @@ void buildComponents() {
}
if (count != rcbs.length) // remove duplicate or broken components
System.arraycopy(rcbs, 0, rcbs = count == 0 ? Binding.NO_COMPONENTS : new RecordComponentBinding[count], 0, count);
sourceType.components = rcbs;
sourceType.setComponents(rcbs); // don't assign directly to components!
}
ReferenceBinding[] memberTypes = sourceType.memberTypes;
if (memberTypes != null) {
Expand Down
4 changes: 4 additions & 0 deletions ...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,6 +2547,10 @@ private void setImplicitPermittedType(SourceTypeBinding permittedType) {
if (sz == 0) {
typesPermitted = new ReferenceBinding[] { permittedType };
} else {
for (int i = 0; i < sz; i++) {
if (TypeBinding.equalsEquals(typesPermitted[i], permittedType))
return; // don't include twice once without and once with annotations.
}
System.arraycopy(typesPermitted, 0, typesPermitted = new ReferenceBinding[sz + 1], 0, sz);
typesPermitted[sz] = permittedType;
}
Expand Down
Loading