Skip to content

Commit

Permalink
more
Browse files Browse the repository at this point in the history
  • Loading branch information
@srikanth-sankaran
srikanth-sankaran committed Nov 3, 2024
1 parent 6ba3a7b commit f73f367
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 50 deletions.
2 changes: 1 addition & 1 deletion ...eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Expression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ public boolean forcedToBeRaw(ReferenceContext referenceContext) {
}
} else if (this instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression) this;
for (Expression e : se.resultExpressions) {
for (Expression e : se.resultExpressions()) {
if (e.forcedToBeRaw(referenceContext))
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions ....core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ else if (expression instanceof ConditionalExpression) {
return getMoreUnsafeFromBranches((ConditionalExpression)expression, flowInfo,
branch -> getCloseTrackingVariable(branch, flowInfo, flowContext, useAnnotations));
} else if (expression instanceof SwitchExpression) {
for (Expression re : ((SwitchExpression) expression).resultExpressions) {
for (Expression re : ((SwitchExpression) expression).resultExpressions()) {
FakedTrackingVariable fakedTrackingVariable = getCloseTrackingVariable(re, flowInfo, flowContext, useAnnotations);
if (fakedTrackingVariable != null) {
return fakedTrackingVariable;
Expand Down Expand Up @@ -344,7 +344,7 @@ public static FakedTrackingVariable preConnectTrackerAcrossAssignment(ASTNode lo
}

private static boolean containsAllocation(SwitchExpression location) {
for (Expression re : location.resultExpressions) {
for (Expression re : location.resultExpressions()) {
if (containsAllocation(re))
return true;
}
Expand Down Expand Up @@ -391,7 +391,7 @@ private static void preConnectTrackerAcrossAssignment(ASTNode location, LocalVar

private static void preConnectTrackerAcrossAssignment(ASTNode location, LocalVariableBinding local, FlowInfo flowInfo,
SwitchExpression se, FakedTrackingVariable closeTracker, boolean useAnnotations) {
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
preConnectTrackerAcrossAssignment(location, local, flowInfo, closeTracker, re, useAnnotations);
}
}
Expand Down Expand Up @@ -887,7 +887,7 @@ else if (expression instanceof CastExpression)
local, location, branch, previousTracker));
} else if (expression instanceof SwitchExpression) {
FakedTrackingVariable mostRisky = null;
for (Expression result : ((SwitchExpression) expression).resultExpressions) {
for (Expression result : ((SwitchExpression) expression).resultExpressions()) {
FakedTrackingVariable current = analyseCloseableExpression(scope, flowInfo, flowContext, useAnnotations,
local, location, result, previousTracker);
if (mostRisky == null)
Expand Down
2 changes: 1 addition & 1 deletion ...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/LocalDeclaration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ private static Expression findPolyExpression(Expression e) {
}
if (e instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression)e;
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
Expression candidate = findPolyExpression(re);
if (candidate != null) return candidate;
}
Expand Down
2 changes: 1 addition & 1 deletion ...core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/NullAnnotationMatching.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public static int checkAssignment(BlockScope currentScope, FlowContext flowConte
} else if (expression instanceof SwitchExpression && expression.isPolyExpression()) {
// drill into all the branches:
SwitchExpression se = ((SwitchExpression) expression);
Expression[] resExprs = se.resultExpressions.toArray(new Expression[0]);
Expression[] resExprs = se.resultExpressions().toArray(new Expression[0]);
Expression re = resExprs[0];
int status0 = NullAnnotationMatching.checkAssignment(currentScope, flowContext, var, flowInfo, re.nullStatus(flowInfo, flowContext), re, re.resolvedType);
boolean identicalStatus = true;
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/Statement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void analyseOneArgument18(BlockScope currentScope, FlowContext flowContext, Flow
return;
} else if (argument instanceof SwitchExpression && argument.isPolyExpression()) {
SwitchExpression se = (SwitchExpression) argument;
for (int i = 0; i < se.resultExpressions.size(); i++) {
for (int i = 0; i < se.resultExpressions().size(); i++) {
se.internalAnalyseOneArgument18(currentScope, flowContext, expectedType,
se.resultExpressions.get(i), flowInfo,
se.resultExpressionNullStatus.get(i), expectedNonNullness, originalExpected);
Expand Down Expand Up @@ -261,7 +261,7 @@ protected void checkAgainstNullTypeAnnotation(BlockScope scope, TypeBinding requ
return;
} else if (expression instanceof SwitchExpression && expression.isPolyExpression()) {
SwitchExpression se = (SwitchExpression) expression;
for (int i = 0; i < se.resultExpressions.size(); i++) {
for (int i = 0; i < se.resultExpressions().size(); i++) {
internalCheckAgainstNullTypeAnnotation(scope, requiredType,
se.resultExpressions.get(i),
se.resultExpressionNullStatus.get(i), flowContext, flowInfo);
Expand Down
55 changes: 25 additions & 30 deletions ...e.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/SwitchExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ public class SwitchExpression extends SwitchStatement implements IPolyExpression

/* package */ TypeBinding expectedType;
ExpressionContext expressionContext = VANILLA_CONTEXT;
private TypeBinding[] originalValueResultExpressionTypes;
private TypeBinding[] finalValueResultExpressionTypes;

private int nullStatus = FlowInfo.UNKNOWN;
public List<Expression> resultExpressions = new ArrayList<>(0);
Expand Down Expand Up @@ -132,7 +130,11 @@ private TypeBinding resultType() {
* @return a flag indicating the overall well-formedness of result expression set.
*/
public boolean add(/*@NonNull*/ Expression rxpression) {
this.rExpressions.add(rxpression);

if (!this.rExpressions.contains(rxpression)) {
this.rExpressions.add(rxpression);
SwitchExpression.this.resultExpressions.add(rxpression); // dual book keeping now for external references
}

TypeBinding rxpressionType = rxpression.resolvedType;
if (rxpressionType == null || !rxpressionType.isValidBinding())
Expand Down Expand Up @@ -212,7 +214,7 @@ private void computeNullStatus(FlowInfo flowInfo, FlowContext flowContext) {
this.resultExpressionNullStatus.add(this.resultExpressions.get(0).nullStatus(flowInfo, flowContext)); int status = this.resultExpressions.get(0).nullStatus(flowInfo, flowContext);
int combinedStatus = status;
boolean identicalStatus = true;
for (int i = 1, l = this.resultExpressions.size(); i < l; ++i) {
for (int i = 1, l = this.resultExpressions().size(); i < l; ++i) {
if (!precomputed)
this.resultExpressionNullStatus.add(this.resultExpressions.get(i).nullStatus(flowInfo, flowContext));
int tmp = this.resultExpressions.get(i).nullStatus(flowInfo, flowContext);
Expand All @@ -236,7 +238,7 @@ protected boolean needToCheckFlowInAbsenceOfDefaultBranch() { // JLS 12 16.1.8
@Override
public Expression[] getPolyExpressions() {
List<Expression> polys = new ArrayList<>();
for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
Expression[] ea = e.getPolyExpressions();
if (ea == null || ea.length ==0) continue;
polys.addAll(Arrays.asList(ea));
Expand All @@ -245,23 +247,23 @@ public Expression[] getPolyExpressions() {
}
@Override
public boolean isPertinentToApplicability(TypeBinding targetType, MethodBinding method) {
for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (!e.isPertinentToApplicability(targetType, method))
return false;
}
return true;
}
@Override
public boolean isPotentiallyCompatibleWith(TypeBinding targetType, Scope scope1) {
for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (!e.isPotentiallyCompatibleWith(targetType, scope1))
return false;
}
return true;
}
@Override
public boolean isFunctionalType() {
for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (e.isFunctionalType()) // return true even for one functional type
return true;
}
Expand Down Expand Up @@ -395,40 +397,29 @@ public void resolve(BlockScope upperScope) {
@Override
public TypeBinding resolveType(BlockScope upperScope) {
try {
int resultExpressionsCount;
if (this.constant != Constant.NotAConstant) {
this.constant = Constant.NotAConstant;

super.resolve(upperScope);

resultExpressionsCount = this.resultExpressions.size();
if (resultExpressionsCount == 0) {
if (this.results.rExpressions.size() == 0) {
upperScope.problemReporter().unyieldingSwitchExpression(this);
return this.resolvedType = null;
}

this.originalValueResultExpressionTypes = new TypeBinding[resultExpressionsCount];
this.finalValueResultExpressionTypes = new TypeBinding[resultExpressionsCount];
for (int i = 0; i < resultExpressionsCount; ++i) {
this.finalValueResultExpressionTypes[i] = this.originalValueResultExpressionTypes[i] = this.resultExpressions.get(i).resolvedType;
}

if (isPolyExpression()) { //The type of a poly switch expression is the same as its target type.
if (isPolyExpression()) {
if (this.expectedType == null || !this.expectedType.isProperType(true)) {
return new PolyTypeBinding(this);
}
return this.resolvedType = computeConversions(this.scope, this.expectedType) ? this.expectedType : null;
}
} else { // re-resolving of poly expression:
resultExpressionsCount = this.resultExpressions.size();
boolean yieldErrors = false;
for (int i = 0; i < resultExpressionsCount; i++) {
Expression resultExpr = this.resultExpressions.get(i);
if (resultExpr.isPolyExpression()) {
this.finalValueResultExpressionTypes[i] = this.originalValueResultExpressionTypes[i] =
resultExpr.resolveTypeExpecting(upperScope, this.expectedType);
for (Expression rExpression : this.results.rExpressions) {
if (rExpression.isPolyExpression()) {
rExpression.resolveTypeExpecting(upperScope, this.expectedType);
}
if (resultExpr.resolvedType == null || !resultExpr.resolvedType.isValidBinding())
if (rExpression.resolvedType == null || !rExpression.resolvedType.isValidBinding())
yieldErrors = true;
}
if (yieldErrors)
Expand All @@ -441,7 +432,7 @@ public TypeBinding resolveType(BlockScope upperScope) {

this.resolvedType = this.results.resultType();
if (this.resolvedType != null) {
for (Expression rExpression : this.resultExpressions)
for (Expression rExpression : this.results.rExpressions)
rExpression.computeConversion(upperScope, this.resolvedType, rExpression.resolvedType);
}
return this.resolvedType;
Expand Down Expand Up @@ -499,7 +490,7 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
this.resultExpressionNullStatus = new ArrayList<>(0);
final CompilerOptions compilerOptions = currentScope.compilerOptions();
if (compilerOptions.enableSyntacticNullAnalysisForFields) {
for (Expression re : this.resultExpressions) {
for (Expression re : this.results.rExpressions) {
this.resultExpressionNullStatus.add(re.nullStatus(flowInfo, flowContext));
// wipe information that was meant only for this result expression:
flowContext.expireNullCheckedFieldInfo();
Expand All @@ -522,7 +513,7 @@ public boolean isCompatibleWith(TypeBinding left, Scope skope) {
if (!isPolyExpression())
return super.isCompatibleWith(left, skope);

for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (!e.isCompatibleWith(left, skope))
return false;
}
Expand All @@ -533,7 +524,7 @@ public boolean isBoxingCompatibleWith(TypeBinding targetType, Scope skope) {
if (!isPolyExpression())
return super.isBoxingCompatibleWith(targetType, skope);

for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (!(e.isCompatibleWith(targetType, skope) || e.isBoxingCompatibleWith(targetType, skope)))
return false;
}
Expand All @@ -545,7 +536,7 @@ public boolean sIsMoreSpecific(TypeBinding s, TypeBinding t, Scope skope) {
return true;
if (!isPolyExpression())
return false;
for (Expression e : this.resultExpressions) {
for (Expression e : this.results.rExpressions) {
if (!e.sIsMoreSpecific(s, t, skope))
return false;
}
Expand All @@ -566,4 +557,8 @@ public StringBuilder printExpression(int tab, StringBuilder output, boolean make
public TypeBinding expectedType() {
return this.expectedType;
}

public Set<Expression> resultExpressions() {
return this.results.rExpressions;
}
}
1 change: 0 additions & 1 deletion ...pse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/YieldStatement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ public void resolve(BlockScope scope) {

this.expression.resolveType(scope);
if (this.switchExpression != null) {
this.switchExpression.resultExpressions.add(this.expression);
this.switchExpression.results.add(this.expression);
}

Expand Down
6 changes: 3 additions & 3 deletions ...piler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ConstraintExpressionFormula.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ public Object reduce(InferenceContext18 inferenceContext) throws InferenceFailur
};
} else if (this.left instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression) this.left;
ConstraintFormula[] cfs = new ConstraintFormula[se.resultExpressions.size()];
ConstraintFormula[] cfs = new ConstraintFormula[se.resultExpressions().size()];
int i = 0;
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
cfs[i++] = new ConstraintExpressionFormula(re, this.right, this.relation, this.isSoft);
}
return cfs;
Expand Down Expand Up @@ -542,7 +542,7 @@ Collection<InferenceVariable> inputVariables(final InferenceContext18 context) {
} else if (this.left instanceof SwitchExpression && this.left.isPolyExpression()) {
SwitchExpression expr = (SwitchExpression) this.left;
Set<InferenceVariable> variables = new LinkedHashSet<>();
for (Expression re : expr.resultExpressions) {
for (Expression re : expr.resultExpressions()) {
variables.addAll(new ConstraintExpressionFormula(re, this.right, COMPATIBLE).inputVariables(context));
}
return variables;
Expand Down
6 changes: 3 additions & 3 deletions ....core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/InferenceContext18.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ private ReductionResult addJDK_8153748ConstraintsFromExpression(Expression argum
} else if (argument instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression) argument;
ReductionResult result = ReductionResult.FALSE;
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
result = addJDK_8153748ConstraintsFromExpression(re, parameter, method, substitution);
if (result == ReductionResult.FALSE)
break;
Expand Down Expand Up @@ -723,7 +723,7 @@ private boolean addConstraintsToC_OneExpr(Expression expri, Set<ConstraintFormul
&& addConstraintsToC_OneExpr(ce.valueIfFalse, c, fsi, substF, method);
} else if (expri instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression) expri;
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
if (!addConstraintsToC_OneExpr(re, c, fsi, substF, method))
return false;
}
Expand Down Expand Up @@ -973,7 +973,7 @@ private boolean checkExpression(Expression expri, TypeBinding[] u, TypeBinding r
return checkExpression(cond.valueIfTrue, u, r1, v, r2) && checkExpression(cond.valueIfFalse, u, r1, v, r2);
} else if (expri instanceof SwitchExpression) {
SwitchExpression se = (SwitchExpression) expri;
for (Expression re : se.resultExpressions) {
for (Expression re : se.resultExpressions()) {
if (!checkExpression(re, u, r1, v, r2))
return false;
}
Expand Down
5 changes: 2 additions & 3 deletions ...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11669,11 +11669,10 @@ public void moduleDoesNotReadOther(ImportReference importReference, ModuleBindin
importReference.sourceEnd);
}
public void incompatibleSwitchExpressionResults(SwitchExpression expression) {
TypeBinding type = expression.resultExpressions.get(0).resolvedType;
this.handle(
IProblem.SwitchExpressionsYieldIncompatibleResultExpressionTypes,
new String[] {new String(type.readableName())},
new String[] {new String(type.shortReadableName())},
NoArgument,
NoArgument,
expression.sourceStart,
expression.sourceEnd);
}
Expand Down
2 changes: 1 addition & 1 deletion ...jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@
###[obsolete] 1612 = 'continue' or 'return' cannot be the last statement in a Switch expression case body

# Switch-Expressions Java 14
1700 = Incompatible switch results expressions {0}
1700 = Incompatible results expressions in switch
###[obsolete] 1701 = A switch expression should have a non-empty switch block
1702 = A switch expression should have at least one result expression
1703 = A switch labeled block in a switch expression should not complete normally
Expand Down

0 comments on commit f73f367

Please sign in to comment.