Skip to content

Commit 4fe2b4b

Browse files
eric-milleseric-milles
committed
minor fix-ups
1 parent 3ac04bf commit 4fe2b4b

File tree

12 files changed

+67
-51
lines changed

12 files changed

+67
-51
lines changed

‎jdt-patch/e410/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e411/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e412/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e413/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e414/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e415/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public void testBug536037a() {
375375
},
376376
null,
377377
"");
378+
this.verifier.shutDown();
378379
}
379380
public void testBug536037b() {
380381
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e416/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ public void testBug536037a() {
377377
},
378378
null,
379379
"");
380+
this.verifier.shutDown();
380381
}
381382
public void testBug536037b() {
382383
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e416/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,26 +132,27 @@ public class SourceTypeBinding extends ReferenceBinding {
132132
private SourceTypeBinding nestHost;
133133
public HashSet<SourceTypeBinding> nestMembers;
134134

135-
private boolean isRecordDeclaration = false;
135+
private boolean isRecordDeclaration;
136136
private RecordComponentBinding[] components; // for Java 14 record declaration - preview
137137
private FieldBinding[] implicitComponentFields; // cache
138-
private MethodBinding[] recordComponentAccessors = null; // hash maybe an overkill
138+
private MethodBinding[] recordComponentAccessors; // hash maybe an overkill
139139

140140
public SourceTypeBinding(char[][] compoundName, PackageBinding fPackage, ClassScope scope) {
141141
this.compoundName = compoundName;
142142
this.fPackage = fPackage;
143+
this.scope = scope;
144+
143145
this.fileName = scope.referenceCompilationUnit().getFileName();
144146
this.modifiers = scope.referenceContext.modifiers;
145147
this.sourceName = scope.referenceContext.name;
146-
this.scope = scope;
147148
this.environment = scope.environment();
148149

149150
// expect the fields & methods to be initialized correctly later
150151
this.fields = Binding.UNINITIALIZED_FIELDS;
151152
this.methods = Binding.UNINITIALIZED_METHODS;
152153
this.components = Binding.UNINITIALIZED_COMPONENTS;
153-
this.prototype = this;
154154
this.isRecordDeclaration = scope.referenceContext.isRecord();
155+
this.prototype = this;
155156
computeId();
156157
}
157158

@@ -959,8 +960,8 @@ public List<MethodBinding> checkAndAddSyntheticRecordComponentAccessors(MethodBi
959960
int missingCount = filteredComponents.size();
960961
for (int i = 0; i < missingCount; ++i) {
961962
RecordComponentBinding rcb = this.getRecordComponent(filteredComponents.get(i).toCharArray());
962-
assert rcb != null;
963-
implicitMethods.add(addSyntheticRecordComponentAccessor(rcb, i));
963+
if (rcb != null)
964+
implicitMethods.add(addSyntheticRecordComponentAccessor(rcb, i));
964965
}
965966
accessors.addAll(implicitMethods);
966967
this.recordComponentAccessors = accessors.toArray(new MethodBinding[0]);
@@ -972,6 +973,7 @@ public List<MethodBinding> checkAndAddSyntheticRecordComponentAccessors(MethodBi
972973
*/
973974
public SyntheticMethodBinding addSyntheticRecordComponentAccessor(RecordComponentBinding rcb, int index) {
974975
if (!isPrototype()) throw new IllegalStateException();
976+
975977
if (this.synthetics == null)
976978
this.synthetics = new HashMap[MAX_SYNTHETICS];
977979
if (this.synthetics[SourceTypeBinding.METHOD_EMUL] == null)
@@ -1126,7 +1128,6 @@ void faultInTypesForFieldsAndMethods() {
11261128
}
11271129

11281130
public RecordComponentBinding[] components() {
1129-
11301131
if (!this.isRecordDeclaration)
11311132
return null;
11321133
if (!isPrototype()) {
@@ -2036,9 +2037,12 @@ public MethodBinding[] methods() {
20362037
// find & report collision cases
20372038
boolean complyTo15OrAbove = this.scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;
20382039
boolean compliance16 = this.scope.compilerOptions().complianceLevel == ClassFileConstants.JDK1_6;
2039-
int recordCanonIndex = getImplicitCanonicalConstructor();
2040-
computeRecordComponents();
2041-
checkAndGetExplicitCanonicalConstructors();
2040+
int recordCanonIndex = -1;
2041+
if (this.isRecordDeclaration) {
2042+
recordCanonIndex = getImplicitCanonicalConstructor();
2043+
computeRecordComponents();
2044+
checkAndGetExplicitCanonicalConstructors();
2045+
}
20422046
int recordEqualsIndex = getImplicitMethod(TypeConstants.EQUALS);
20432047

20442048
for (int i = 0, length = this.methods.length; i < length; i++) {
@@ -2377,9 +2381,9 @@ public FieldBinding resolveTypeFor(FieldBinding field) {
23772381
// copy annotations from record component if applicable
23782382
if (field.isRecordComponent()) {
23792383
RecordComponentBinding rcb = getRecordComponent(field.name);
2380-
assert rcb != null;
2381-
relevantRecordComponentAnnotations = ASTNode.copyRecordComponentAnnotations(initializationScope,
2382-
field, rcb.sourceRecordComponent().annotations);
2384+
if (rcb != null)
2385+
relevantRecordComponentAnnotations = ASTNode.copyRecordComponentAnnotations(initializationScope,
2386+
field, rcb.sourceRecordComponent().annotations);
23832387
}
23842388
}
23852389
if (sourceLevel >= ClassFileConstants.JDK1_8) {
@@ -2870,7 +2874,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
28702874
/**
28712875
* Propagates writes to all annotated variants so the clones evolve along.
28722876
*/
2873-
public FieldBinding [] setFields(FieldBinding[] fields) {
2877+
public FieldBinding[] setFields(FieldBinding[] fields) {
28742878
if (!isPrototype())
28752879
return this.prototype.setFields(fields);
28762880

@@ -2885,7 +2889,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
28852889
}
28862890

28872891
// We need to specialize member types, can't just propagate. Can't specialize here, clones could created post setMemberTypes()
2888-
public ReferenceBinding [] setMemberTypes(ReferenceBinding[] memberTypes) {
2892+
public ReferenceBinding[] setMemberTypes(ReferenceBinding[] memberTypes) {
28892893
if (!isPrototype())
28902894
return this.prototype.setMemberTypes(memberTypes);
28912895

@@ -2905,7 +2909,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
29052909
/**
29062910
* Propagates writes to all annotated variants so the clones evolve along.
29072911
*/
2908-
public MethodBinding [] setMethods(MethodBinding[] methods) {
2912+
public MethodBinding[] setMethods(MethodBinding[] methods) {
29092913
if (!isPrototype())
29102914
return this.prototype.setMethods(methods);
29112915

@@ -2939,7 +2943,7 @@ public ReferenceBinding setSuperClass(ReferenceBinding superClass) {
29392943
/**
29402944
* Propagates writes to all annotated variants so the clones evolve along.
29412945
*/
2942-
public ReferenceBinding [] setSuperInterfaces(ReferenceBinding [] superInterfaces) {
2946+
public ReferenceBinding[] setSuperInterfaces(ReferenceBinding [] superInterfaces) {
29432947
if (!isPrototype())
29442948
return this.prototype.setSuperInterfaces(superInterfaces);
29452949

@@ -2956,7 +2960,7 @@ public ReferenceBinding setSuperClass(ReferenceBinding superClass) {
29562960
/**
29572961
* Propagates writes to all annotated variants so the clones evolve along.
29582962
*/
2959-
public TypeVariableBinding [] setTypeVariables(TypeVariableBinding [] typeVariables) {
2963+
public TypeVariableBinding[] setTypeVariables(TypeVariableBinding [] typeVariables) {
29602964
if (!isPrototype())
29612965
return this.prototype.setTypeVariables(typeVariables);
29622966

‎jdt-patch/e417/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullAnnotationTests9.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ public void testBug536037a() {
377377
},
378378
null,
379379
"");
380+
this.verifier.shutDown();
380381
}
381382
public void testBug536037b() {
382383
// tests combination of declaration null-annotations & 'var':

‎jdt-patch/e417/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,26 +132,27 @@ public class SourceTypeBinding extends ReferenceBinding {
132132
private SourceTypeBinding nestHost;
133133
public HashSet<SourceTypeBinding> nestMembers;
134134

135-
private boolean isRecordDeclaration = false;
135+
private boolean isRecordDeclaration;
136136
private RecordComponentBinding[] components; // for Java 14 record declaration - preview
137137
private FieldBinding[] implicitComponentFields; // cache
138-
private MethodBinding[] recordComponentAccessors = null; // hash maybe an overkill
138+
private MethodBinding[] recordComponentAccessors; // hash maybe an overkill
139139

140140
public SourceTypeBinding(char[][] compoundName, PackageBinding fPackage, ClassScope scope) {
141141
this.compoundName = compoundName;
142142
this.fPackage = fPackage;
143+
this.scope = scope;
144+
143145
this.fileName = scope.referenceCompilationUnit().getFileName();
144146
this.modifiers = scope.referenceContext.modifiers;
145147
this.sourceName = scope.referenceContext.name;
146-
this.scope = scope;
147148
this.environment = scope.environment();
148149

149150
// expect the fields & methods to be initialized correctly later
150151
this.fields = Binding.UNINITIALIZED_FIELDS;
151152
this.methods = Binding.UNINITIALIZED_METHODS;
152153
this.components = Binding.UNINITIALIZED_COMPONENTS;
153-
this.prototype = this;
154154
this.isRecordDeclaration = scope.referenceContext.isRecord();
155+
this.prototype = this;
155156
computeId();
156157
}
157158

@@ -959,8 +960,8 @@ public List<MethodBinding> checkAndAddSyntheticRecordComponentAccessors(MethodBi
959960
int missingCount = filteredComponents.size();
960961
for (int i = 0; i < missingCount; ++i) {
961962
RecordComponentBinding rcb = this.getRecordComponent(filteredComponents.get(i).toCharArray());
962-
assert rcb != null;
963-
implicitMethods.add(addSyntheticRecordComponentAccessor(rcb, i));
963+
if (rcb != null)
964+
implicitMethods.add(addSyntheticRecordComponentAccessor(rcb, i));
964965
}
965966
accessors.addAll(implicitMethods);
966967
this.recordComponentAccessors = accessors.toArray(new MethodBinding[0]);
@@ -972,6 +973,7 @@ public List<MethodBinding> checkAndAddSyntheticRecordComponentAccessors(MethodBi
972973
*/
973974
public SyntheticMethodBinding addSyntheticRecordComponentAccessor(RecordComponentBinding rcb, int index) {
974975
if (!isPrototype()) throw new IllegalStateException();
976+
975977
if (this.synthetics == null)
976978
this.synthetics = new HashMap[MAX_SYNTHETICS];
977979
if (this.synthetics[SourceTypeBinding.METHOD_EMUL] == null)
@@ -1126,7 +1128,6 @@ void faultInTypesForFieldsAndMethods() {
11261128
}
11271129

11281130
public RecordComponentBinding[] components() {
1129-
11301131
if (!this.isRecordDeclaration)
11311132
return null;
11321133
if (!isPrototype()) {
@@ -2036,9 +2037,12 @@ public MethodBinding[] methods() {
20362037
// find & report collision cases
20372038
boolean complyTo15OrAbove = this.scope.compilerOptions().sourceLevel >= ClassFileConstants.JDK1_5;
20382039
boolean compliance16 = this.scope.compilerOptions().complianceLevel == ClassFileConstants.JDK1_6;
2039-
int recordCanonIndex = getImplicitCanonicalConstructor();
2040-
computeRecordComponents();
2041-
checkAndGetExplicitCanonicalConstructors();
2040+
int recordCanonIndex = -1;
2041+
if (this.isRecordDeclaration) {
2042+
recordCanonIndex = getImplicitCanonicalConstructor();
2043+
computeRecordComponents();
2044+
checkAndGetExplicitCanonicalConstructors();
2045+
}
20422046
int recordEqualsIndex = getImplicitMethod(TypeConstants.EQUALS);
20432047

20442048
for (int i = 0, length = this.methods.length; i < length; i++) {
@@ -2377,9 +2381,9 @@ public FieldBinding resolveTypeFor(FieldBinding field) {
23772381
// copy annotations from record component if applicable
23782382
if (field.isRecordComponent()) {
23792383
RecordComponentBinding rcb = getRecordComponent(field.name);
2380-
assert rcb != null;
2381-
relevantRecordComponentAnnotations = ASTNode.copyRecordComponentAnnotations(initializationScope,
2382-
field, rcb.sourceRecordComponent().annotations);
2384+
if (rcb != null)
2385+
relevantRecordComponentAnnotations = ASTNode.copyRecordComponentAnnotations(initializationScope,
2386+
field, rcb.sourceRecordComponent().annotations);
23832387
}
23842388
}
23852389
if (sourceLevel >= ClassFileConstants.JDK1_8) {
@@ -2870,7 +2874,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
28702874
/**
28712875
* Propagates writes to all annotated variants so the clones evolve along.
28722876
*/
2873-
public FieldBinding [] setFields(FieldBinding[] fields) {
2877+
public FieldBinding[] setFields(FieldBinding[] fields) {
28742878
if (!isPrototype())
28752879
return this.prototype.setFields(fields);
28762880

@@ -2885,7 +2889,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
28852889
}
28862890

28872891
// We need to specialize member types, can't just propagate. Can't specialize here, clones could created post setMemberTypes()
2888-
public ReferenceBinding [] setMemberTypes(ReferenceBinding[] memberTypes) {
2892+
public ReferenceBinding[] setMemberTypes(ReferenceBinding[] memberTypes) {
28892893
if (!isPrototype())
28902894
return this.prototype.setMemberTypes(memberTypes);
28912895

@@ -2905,7 +2909,7 @@ public RecordComponentBinding[] setComponents(RecordComponentBinding[] comps) {
29052909
/**
29062910
* Propagates writes to all annotated variants so the clones evolve along.
29072911
*/
2908-
public MethodBinding [] setMethods(MethodBinding[] methods) {
2912+
public MethodBinding[] setMethods(MethodBinding[] methods) {
29092913
if (!isPrototype())
29102914
return this.prototype.setMethods(methods);
29112915

@@ -2939,7 +2943,7 @@ public ReferenceBinding setSuperClass(ReferenceBinding superClass) {
29392943
/**
29402944
* Propagates writes to all annotated variants so the clones evolve along.
29412945
*/
2942-
public ReferenceBinding [] setSuperInterfaces(ReferenceBinding [] superInterfaces) {
2946+
public ReferenceBinding[] setSuperInterfaces(ReferenceBinding [] superInterfaces) {
29432947
if (!isPrototype())
29442948
return this.prototype.setSuperInterfaces(superInterfaces);
29452949

@@ -2956,7 +2960,7 @@ public ReferenceBinding setSuperClass(ReferenceBinding superClass) {
29562960
/**
29572961
* Propagates writes to all annotated variants so the clones evolve along.
29582962
*/
2959-
public TypeVariableBinding [] setTypeVariables(TypeVariableBinding [] typeVariables) {
2963+
public TypeVariableBinding[] setTypeVariables(TypeVariableBinding [] typeVariables) {
29602964
if (!isPrototype())
29612965
return this.prototype.setTypeVariables(typeVariables);
29622966

0 commit comments

Comments
 (0)