Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8274161: Cleanup redundant casts in jdk.compiler 
Reviewed-by: vromero
  • Loading branch information
@turbanoff
turbanoff authored and Vicente Romero committed Nov 24, 2021
1 parent 951247c commit 077b2de
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
12 changes: 6 additions & 6 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View file
Expand Up @@ -3954,14 +3954,14 @@ public void visitUnary(JCUnary tree) {
: chk.checkNonVoid(tree.arg.pos(), attribExpr(tree.arg, env));

// Find operator.
Symbol operator = tree.operator = operators.resolveUnary(tree, tree.getTag(), argtype);
OperatorSymbol operator = tree.operator = operators.resolveUnary(tree, tree.getTag(), argtype);
Type owntype = types.createErrorType(tree.type);
if (operator != operators.noOpSymbol &&
!argtype.isErroneous()) {
owntype = (tree.getTag().isIncOrDecUnaryOp())
? tree.arg.type
: operator.type.getReturnType();
int opc = ((OperatorSymbol)operator).opcode;
int opc = operator.opcode;

// If the argument is constant, fold it.
if (argtype.constValue() != null) {
Expand Down Expand Up @@ -4008,13 +4008,13 @@ public void visitBinary(JCBinary tree) {
matchBindings = matchBindingsComputer.binary(tree, lhsBindings, matchBindings);

// Find operator.
Symbol operator = tree.operator = operators.resolveBinary(tree, tree.getTag(), left, right);
OperatorSymbol operator = tree.operator = operators.resolveBinary(tree, tree.getTag(), left, right);
Type owntype = types.createErrorType(tree.type);
if (operator != operators.noOpSymbol &&
!left.isErroneous() &&
!right.isErroneous()) {
owntype = operator.type.getReturnType();
int opc = ((OperatorSymbol)operator).opcode;
int opc = operator.opcode;
// If both arguments are constants, fold them.
if (left.constValue() != null && right.constValue() != null) {
Type ctype = cfolder.fold2(opc, left, right);
Expand Down Expand Up @@ -5498,11 +5498,11 @@ private void attribClassBody(Env<AttrContext> env, ClassSymbol c) {
c.owner.kind != PCK &&
((c.flags() & STATIC) == 0 || c.name == names.empty) &&
(TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
Symbol sym = null;
VarSymbol sym = null;
if (l.head.hasTag(VARDEF)) sym = ((JCVariableDecl) l.head).sym;
if (sym == null ||
sym.kind != VAR ||
((VarSymbol) sym).getConstValue() == null)
sym.getConstValue() == null)
log.error(l.head.pos(), Errors.IclsCantHaveStaticDecl(c));
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
View file
Expand Up @@ -424,14 +424,14 @@ public void visitLambda(JCLambda tree) {
//add captured locals
for (Symbol fv : localContext.getSymbolMap(CAPTURED_VAR).keySet()) {
if (fv != localContext.self) {
JCTree captured_local = make.Ident(fv).setType(fv.type);
syntheticInits.append((JCExpression) captured_local);
JCExpression captured_local = make.Ident(fv).setType(fv.type);
syntheticInits.append(captured_local);
}
}
// add captured outer this instances (used only when `this' capture itself is illegal)
for (Symbol fv : localContext.getSymbolMap(CAPTURED_OUTER_THIS).keySet()) {
JCTree captured_local = make.QualThis(fv.type);
syntheticInits.append((JCExpression) captured_local);
JCExpression captured_local = make.QualThis(fv.type);
syntheticInits.append(captured_local);
}

//then, determine the arguments to the indy call
Expand Down Expand Up @@ -1184,13 +1184,13 @@ private JCExpression makeIndyCall(DiagnosticPosition pos, Type site, Name bsmNam
syms.stringType,
syms.methodTypeType).appendList(staticArgs.map(types::constantType));

Symbol bsm = rs.resolveInternalMethod(pos, attrEnv, site,
MethodSymbol bsm = rs.resolveInternalMethod(pos, attrEnv, site,
bsmName, bsm_staticArgs, List.nil());

DynamicMethodSymbol dynSym =
new DynamicMethodSymbol(methName,
syms.noSymbol,
((MethodSymbol)bsm).asHandle(),
bsm.asHandle(),
indyType,
staticArgs.toArray(new LoadableConstant[staticArgs.length()]));
JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), bsmName);
Expand Down
8 changes: 4 additions & 4 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
View file
Expand Up @@ -2369,7 +2369,7 @@ private void visitEnumDef(JCClassDecl tree) {
enumDefs.append(make.VarDef(valuesVar, make.App(make.QualIdent(valuesMethod))));
tree.sym.members().enter(valuesVar);

Symbol valuesSym = lookupMethod(tree.pos(), names.values,
MethodSymbol valuesSym = lookupMethod(tree.pos(), names.values,
tree.type, List.nil());
List<JCStatement> valuesBody;
if (useClone()) {
Expand Down Expand Up @@ -2420,7 +2420,7 @@ private void visitEnumDef(JCClassDecl tree) {
}

JCMethodDecl valuesDef =
make.MethodDef((MethodSymbol)valuesSym, make.Block(0, valuesBody));
make.MethodDef(valuesSym, make.Block(0, valuesBody));

enumDefs.append(valuesDef);

Expand Down Expand Up @@ -2635,7 +2635,7 @@ JCFieldAccess makeIndyQualifier(
Name bootstrapName,
Name argName,
boolean isStatic) {
Symbol bsm = rs.resolveInternalMethod(tree.pos(), attrEnv, site,
MethodSymbol bsm = rs.resolveInternalMethod(tree.pos(), attrEnv, site,
bootstrapName, staticArgTypes, List.nil());

MethodType indyType = msym.type.asMethodType();
Expand All @@ -2647,7 +2647,7 @@ JCFieldAccess makeIndyQualifier(
);
DynamicMethodSymbol dynSym = new DynamicMethodSymbol(argName,
syms.noSymbol,
((MethodSymbol)bsm).asHandle(),
bsm.asHandle(),
indyType,
staticArgValues);
JCFieldAccess qualifier = make.Select(make.QualIdent(site.tsym), argName);
Expand Down
4 changes: 2 additions & 2 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
View file
Expand Up @@ -371,7 +371,7 @@ private void handleSwitch(JCTree tree,

boolean enumSelector = seltype.tsym.isEnum();
Name bootstrapName = enumSelector ? names.enumSwitch : names.typeSwitch;
Symbol bsm = rs.resolveInternalMethod(tree.pos(), env, syms.switchBootstrapsType,
MethodSymbol bsm = rs.resolveInternalMethod(tree.pos(), env, syms.switchBootstrapsType,
bootstrapName, staticArgTypes, List.nil());

MethodType indyType = new MethodType(
Expand All @@ -382,7 +382,7 @@ private void handleSwitch(JCTree tree,
);
DynamicMethodSymbol dynSym = new DynamicMethodSymbol(bootstrapName,
syms.noSymbol,
((MethodSymbol)bsm).asHandle(),
bsm.asHandle(),
indyType,
staticArgValues);

Expand Down
8 changes: 4 additions & 4 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
View file
Expand Up @@ -371,7 +371,7 @@ private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, List<Type> d
syms.stringType,
syms.methodTypeType);

Symbol bsm = rs.resolveInternalMethod(pos,
MethodSymbol bsm = rs.resolveInternalMethod(pos,
gen.getAttrEnv(),
syms.stringConcatFactory,
names.makeConcat,
Expand All @@ -380,7 +380,7 @@ private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, List<Type> d

Symbol.DynamicMethodSymbol dynSym = new Symbol.DynamicMethodSymbol(names.makeConcat,
syms.noSymbol,
((MethodSymbol)bsm).asHandle(),
bsm.asHandle(),
indyType,
List.nil().toArray(new LoadableConstant[0]));

Expand Down Expand Up @@ -487,7 +487,7 @@ private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, String recip
.append(syms.stringType)
.appendList(constTypes);

Symbol bsm = rs.resolveInternalMethod(pos,
MethodSymbol bsm = rs.resolveInternalMethod(pos,
gen.getAttrEnv(),
syms.stringConcatFactory,
names.makeConcatWithConstants,
Expand All @@ -496,7 +496,7 @@ private void doCall(Type type, JCDiagnostic.DiagnosticPosition pos, String recip

Symbol.DynamicMethodSymbol dynSym = new Symbol.DynamicMethodSymbol(names.makeConcatWithConstants,
syms.noSymbol,
((MethodSymbol)bsm).asHandle(),
bsm.asHandle(),
indyType,
List.of(LoadableConstant.String(recipe))
.appendList(constants).toArray(new LoadableConstant[constants.size()]));
Expand Down

1 comment on commit 077b2de

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.