Mon, 27 May 2013 13:44:14 +0100
7030476: Fix conflicting use of JCTree/JCExpression
Reviewed-by: mcimadamore
1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Fri May 24 11:26:17 2013 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon May 27 13:44:14 2013 +0100 1.3 @@ -2002,7 +2002,7 @@ 1.4 JCStatement rethrow; 1.5 if (target.hasInitCause()) { 1.6 // rethrow = "throw new NoClassDefFoundError().initCause(e); 1.7 - JCTree throwExpr = 1.8 + JCExpression throwExpr = 1.9 makeCall(makeNewClass(syms.noClassDefFoundErrorType, 1.10 List.<JCExpression>nil()), 1.11 names.initCause,
2.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java Fri May 24 11:26:17 2013 -0700 2.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java Mon May 27 13:44:14 2013 +0100 2.3 @@ -700,7 +700,7 @@ 2.4 public List<JCTypeParameter> getTypeParameters() { 2.5 return typarams; 2.6 } 2.7 - public JCTree getExtendsClause() { return extending; } 2.8 + public JCExpression getExtendsClause() { return extending; } 2.9 public List<JCExpression> getImplementsClause() { 2.10 return implementing; 2.11 } 2.12 @@ -1175,7 +1175,7 @@ 2.13 return v.visitTry(this, d); 2.14 } 2.15 @Override 2.16 - public List<? extends JCTree> getResources() { 2.17 + public List<JCTree> getResources() { 2.18 return resources; 2.19 } 2.20 @Override 2.21 @@ -1392,8 +1392,8 @@ 2.22 */ 2.23 public static class JCThrow extends JCStatement implements ThrowTree { 2.24 public JCExpression expr; 2.25 - protected JCThrow(JCTree expr) { 2.26 - this.expr = (JCExpression)expr; 2.27 + protected JCThrow(JCExpression expr) { 2.28 + this.expr = expr; 2.29 } 2.30 @Override 2.31 public void accept(Visitor v) { v.visitThrow(this); } 2.32 @@ -2466,7 +2466,7 @@ 2.33 JCBreak Break(Name label); 2.34 JCContinue Continue(Name label); 2.35 JCReturn Return(JCExpression expr); 2.36 - JCThrow Throw(JCTree expr); 2.37 + JCThrow Throw(JCExpression expr); 2.38 JCAssert Assert(JCExpression cond, JCExpression detail); 2.39 JCMethodInvocation Apply(List<JCExpression> typeargs, 2.40 JCExpression fn,
3.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Fri May 24 11:26:17 2013 -0700 3.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Mon May 27 13:44:14 2013 +0100 3.3 @@ -340,7 +340,7 @@ 3.4 3.5 public JCTree visitThrow(ThrowTree node, P p) { 3.6 JCThrow t = (JCThrow) node; 3.7 - JCTree expr = copy(t.expr, p); 3.8 + JCExpression expr = copy(t.expr, p); 3.9 return M.at(t.pos).Throw(expr); 3.10 } 3.11
4.1 --- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Fri May 24 11:26:17 2013 -0700 4.2 +++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Mon May 27 13:44:14 2013 +0100 4.3 @@ -332,7 +332,7 @@ 4.4 return tree; 4.5 } 4.6 4.7 - public JCThrow Throw(JCTree expr) { 4.8 + public JCThrow Throw(JCExpression expr) { 4.9 JCThrow tree = new JCThrow(expr); 4.10 tree.pos = pos; 4.11 return tree;