diff --git a/langtools/src/share/classes/com/sun/source/tree/VariableTree.java b/langtools/src/share/classes/com/sun/source/tree/VariableTree.java index 7fba7df2b58..86fce994cb9 100644 --- a/langtools/src/share/classes/com/sun/source/tree/VariableTree.java +++ b/langtools/src/share/classes/com/sun/source/tree/VariableTree.java @@ -33,6 +33,7 @@ import javax.lang.model.element.Name; * For example: *
  *   modifiers type name initializer ;
+ *   modifiers type qualified-name.this
  * 
* * @jls sections 8.3 and 14.4 @@ -45,6 +46,7 @@ import javax.lang.model.element.Name; public interface VariableTree extends StatementTree { ModifiersTree getModifiers(); Name getName(); + ExpressionTree getNameExpression(); Tree getType(); ExpressionTree getInitializer(); } diff --git a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java index ee05b228b32..a6d0466a729 100644 --- a/langtools/src/share/classes/com/sun/source/util/TreeScanner.java +++ b/langtools/src/share/classes/com/sun/source/util/TreeScanner.java @@ -149,6 +149,7 @@ public class TreeScanner implements TreeVisitor { public R visitVariable(VariableTree node, P p) { R r = scan(node.getModifiers(), p); r = scanAndReduce(node.getType(), p, r); + r = scanAndReduce(node.getNameExpression(), p, r); r = scanAndReduce(node.getInitializer(), p, r); return r; } diff --git a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java index 1b60abf4f70..e4cc3f851bd 100644 --- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java +++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java @@ -36,7 +36,6 @@ /* * @test * @bug 6923080 - * @ignore 8014323: Add VariableTree.getNameExpression * @summary TreeScanner.visitNewClass should scan tree.typeargs * @build AbstractTreeScannerTest SourceTreeScannerTest * @run main SourceTreeScannerTest -q -r .