stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8204610: Compiler confused by parenthesized "this" in final fields assignments

Browse Source 
Parenthesis are not skipped consistently in DA/DU, forward reference analysis

Reviewed-by: vromero
This commit is contained in:
Maurizio Cimadamore 2018-06-08 16:33:40 +01:00
parent b6fd68564b
commit 824b2d53ac
4 changed files with 130 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -291,7 +291,7 @@ public class Attr extends JCTree.Visitor {
((v.flags() & HASINIT) != 0
||
!((base == null ||
(base.hasTag(IDENT) && TreeInfo.name(base) == names._this)) &&
TreeInfo.isThisQualifier(base)) &&
isAssignableAsBlankFinal(v, env)))) {
if (v.isResourceVariable()) { //TWR resource
log.error(pos, Errors.TryResourceMayNotBeAssigned(v));

21
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
View File

@ -2391,31 +2391,18 @@ public class Flow {
}
public void visitAssign(JCAssign tree) {
JCTree lhs = TreeInfo.skipParens(tree.lhs);
if (!isIdentOrThisDotIdent(lhs))
scanExpr(lhs);
if (!TreeInfo.isIdentOrThisDotIdent(tree.lhs))
scanExpr(tree.lhs);
scanExpr(tree.rhs);
letInit(lhs);
}
private boolean isIdentOrThisDotIdent(JCTree lhs) {
if (lhs.hasTag(IDENT))
return true;
if (!lhs.hasTag(SELECT))
return false;
JCFieldAccess fa = (JCFieldAccess)lhs;
return fa.selected.hasTag(IDENT) &&
((JCIdent)fa.selected).name == names._this;
letInit(tree.lhs);
}
// check fields accessed through this.<field> are definitely
// assigned before reading their value
public void visitSelect(JCFieldAccess tree) {
super.visitSelect(tree);
JCTree sel = TreeInfo.skipParens(tree.selected);
if (enforceThisDotInit &&
sel.hasTag(IDENT) &&
((JCIdent)sel).name == names._this &&
TreeInfo.isThisQualifier(tree.selected) &&
tree.sym.kind == VAR) {
checkInit(tree.pos(), (VarSymbol)tree.sym);
}

30
src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
View File

@ -148,6 +148,36 @@ public class TreeInfo {
}
}
/** Is this tree a 'this' identifier?
*/
public static boolean isThisQualifier(JCTree tree) {
switch (tree.getTag()) {
case PARENS:
return isThisQualifier(skipParens(tree));
case IDENT: {
JCIdent id = (JCIdent)tree;
return id.name == id.name.table.names._this;
}
default:
return false;
}
}
/** Is this tree an identifier, possibly qualified by 'this'?
*/
public static boolean isIdentOrThisDotIdent(JCTree tree) {
switch (tree.getTag()) {
case PARENS:
return isIdentOrThisDotIdent(skipParens(tree));
case IDENT:
return true;
case SELECT:
return isThisQualifier(((JCFieldAccess)tree).selected);
default:
return false;
}
}
/** Is this a call to super?
*/
public static boolean isSuperCall(JCTree tree) {

95
test/langtools/tools/javac/DefiniteAssignment/T8204610.java Normal file
View File

@ -0,0 +1,95 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8204610
* @summary Compiler confused by parenthesized "this" in final fields assignments
* @library /tools/javac/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.comp
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
* @build combo.ComboTestHelper
* @run main T8204610
*/
import combo.ComboInstance;
import combo.ComboParameter;
import combo.ComboTask.Result;
import combo.ComboTestHelper;
public class T8204610 extends ComboInstance<T8204610> {
enum ParenKind implements ComboParameter {
NONE(""),
ONE("#P"),
TWO("#P#P"),
THREE("#P#P#P");
String parensTemplate;
ParenKind(String parensTemplate) {
this.parensTemplate = parensTemplate;
}
@Override
public String expand(String optParameter) {
return parensTemplate.replaceAll("#P", optParameter.equals("OPEN") ? "(" : ")");
}
}
public static void main(String... args) {
new ComboTestHelper<T8204610>()
.withArrayDimension("PAREN", (x, pk, idx) -> x.parenKinds[idx] = pk, 3, ParenKind.values())
.run(T8204610::new);
}
ParenKind[] parenKinds = new ParenKind[3];
@Override
public void doWork() {
newCompilationTask()
.withSourceFromTemplate(bodyTemplate)
.analyze(this::check);
}
String bodyTemplate = "class Test {\n" +
" final int x;\n" +
" Test() {\n" +
" #{PAREN[0].OPEN} #{PAREN[1].OPEN} this #{PAREN[1].CLOSE} . #{PAREN[2].OPEN} x #{PAREN[2].CLOSE} #{PAREN[0].CLOSE} = 1;\n" +
" } }";
void check(Result<?> res) {
boolean expectedFail = parenKinds[2] != ParenKind.NONE;
if (expectedFail != res.hasErrors()) {
fail("unexpected compilation result for source:\n" +
res.compilationInfo());
}
}
}