author | jlahoda |
Mon, 12 Dec 2016 13:27:39 +0100 | |
changeset 42499 | 49b675740462 |
permissions | -rw-r--r-- |
42499
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
1 |
/* |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
4 |
* |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
8 |
* |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
13 |
* accompanied this code). |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
14 |
* |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
18 |
* |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
21 |
* questions. |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
22 |
*/ |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
23 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
24 |
/** |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
25 |
* @test |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
26 |
* @library /tools/lib |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
27 |
* @modules jdk.compiler/com.sun.tools.javac.api |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
28 |
* jdk.compiler/com.sun.tools.javac.code |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
29 |
* jdk.compiler/com.sun.tools.javac.comp |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.tree |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.util |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
32 |
*/ |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
33 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
34 |
import java.io.StringWriter; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
35 |
import java.nio.file.Files; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
36 |
import java.nio.file.Path; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
37 |
import java.nio.file.Paths; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
38 |
import java.util.Arrays; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
39 |
import java.util.Comparator; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
40 |
import java.util.HashMap; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
41 |
import java.util.HashSet; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
42 |
import java.util.Map; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
43 |
import java.util.Set; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
44 |
import java.util.TreeSet; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
45 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
46 |
import javax.tools.JavaFileObject; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
47 |
import javax.tools.ToolProvider; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
48 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
49 |
import com.sun.source.tree.IdentifierTree; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
50 |
import com.sun.source.tree.Tree; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
51 |
import com.sun.source.tree.VariableTree; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
52 |
import com.sun.source.util.JavacTask; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
53 |
import com.sun.tools.javac.api.JavacTool; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
54 |
import com.sun.tools.javac.code.Symbol; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
55 |
import com.sun.tools.javac.comp.AttrContext; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
56 |
import com.sun.tools.javac.comp.Env; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
57 |
import com.sun.tools.javac.comp.Lower; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
58 |
import com.sun.tools.javac.tree.JCTree; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
59 |
import com.sun.tools.javac.tree.JCTree.JCBlock; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
60 |
import com.sun.tools.javac.tree.JCTree.JCExpression; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
61 |
import com.sun.tools.javac.tree.JCTree.JCMethodDecl; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
62 |
import com.sun.tools.javac.tree.JCTree.JCMethodInvocation; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
63 |
import com.sun.tools.javac.tree.JCTree.JCModifiers; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
64 |
import com.sun.tools.javac.tree.JCTree.JCVariableDecl; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
65 |
import com.sun.tools.javac.tree.JCTree.LetExpr; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
66 |
import com.sun.tools.javac.tree.JCTree.Tag; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
67 |
import com.sun.tools.javac.tree.TreeCopier; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
68 |
import com.sun.tools.javac.tree.TreeInfo; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
69 |
import com.sun.tools.javac.tree.TreeMaker; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
70 |
import com.sun.tools.javac.tree.TreeScanner; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
71 |
import com.sun.tools.javac.util.Context; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
72 |
import com.sun.tools.javac.util.List; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
73 |
import com.sun.tools.javac.util.Log; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
74 |
import com.sun.tools.javac.util.Log.WriterKind; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
75 |
import com.sun.tools.javac.util.Names; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
76 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
77 |
import toolbox.ToolBox; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
78 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
79 |
public class BoxingAndSuper { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
80 |
public static void main(String... args) throws Exception { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
81 |
new BoxingAndSuper().testSuper(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
82 |
new BoxingAndSuper().testThis(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
83 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
84 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
85 |
public void testSuper() throws Exception { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
86 |
//super, same package: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
87 |
runTest("package p;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
88 |
"class Test extends Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
89 |
" protected Integer i=20;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
90 |
" private Integer dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
91 |
" return super.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
92 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
93 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
94 |
"---" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
95 |
"package p;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
96 |
"class Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
97 |
" protected Integer i=10;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
98 |
"} ", |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
99 |
"p.Test.dump()java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
100 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
101 |
" return (let /*synthetic*/ final Integer $le0 = (Integer)super.i " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
102 |
"in (let /*synthetic*/ final Integer $le1 = super.i = Integer.valueOf((int)(super.i.intValue() + 1)) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
103 |
"in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
104 |
"}\n"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
105 |
//qualified super, same package: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
106 |
runTest("package p;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
107 |
"class Test extends Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
108 |
" protected Integer i=20;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
109 |
" class Inner {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
110 |
" private Integer dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
111 |
" return Test.super.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
112 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
113 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
114 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
115 |
"---" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
116 |
"package p;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
117 |
"class Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
118 |
" protected Integer i=10;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
119 |
"} ", |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
120 |
"p.Test.Inner.dump()java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
121 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
122 |
" return (let /*synthetic*/ final Integer $le0 = (Integer)Test.access$001(this$0) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
123 |
"in (let /*synthetic*/ final Integer $le1 = Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
124 |
"in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
125 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
126 |
"p.Test.access$001(p.Test)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
127 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
128 |
" return x0.i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
129 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
130 |
"p.Test.access$103(p.Test,java.lang.Integer)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
131 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
132 |
" return x0.i = x1;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
133 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
134 |
"p.Test.access$201(p.Test)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
135 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
136 |
" return x0.i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
137 |
"}\n"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
138 |
//super, different packages: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
139 |
runTest("package p1;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
140 |
"class Test extends p2.Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
141 |
" protected Integer i=20;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
142 |
" private Integer dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
143 |
" return super.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
144 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
145 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
146 |
"---" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
147 |
"package p2;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
148 |
"public class Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
149 |
" protected Integer i=10;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
150 |
"} ", |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
151 |
"p1.Test.dump()java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
152 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
153 |
" return (let /*synthetic*/ final Integer $le0 = (Integer)super.i " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
154 |
"in (let /*synthetic*/ final Integer $le1 = super.i = Integer.valueOf((int)(super.i.intValue() + 1)) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
155 |
"in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
156 |
"}\n"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
157 |
//qualified super, different packages: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
158 |
runTest("package p1;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
159 |
"class Test extends p2.Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
160 |
" protected Integer i=20;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
161 |
" class Inner {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
162 |
" private Integer dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
163 |
" return Test.super.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
164 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
165 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
166 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
167 |
"---" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
168 |
"package p2;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
169 |
"public class Parent {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
170 |
" protected Integer i=10;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
171 |
"} ", |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
172 |
"p1.Test.Inner.dump()java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
173 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
174 |
" return (let /*synthetic*/ final Integer $le0 = (Integer)Test.access$001(this$0) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
175 |
"in (let /*synthetic*/ final Integer $le1 = Test.access$103(this$0, Integer.valueOf((int)(Test.access$201(this$0).intValue() + 1))) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
176 |
"in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
177 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
178 |
"p1.Test.access$001(p1.Test)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
179 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
180 |
" return x0.i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
181 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
182 |
"p1.Test.access$103(p1.Test,java.lang.Integer)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
183 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
184 |
" return x0.i = x1;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
185 |
"}\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
186 |
"p1.Test.access$201(p1.Test)java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
187 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
188 |
" return x0.i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
189 |
"}\n"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
190 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
191 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
192 |
public void testThis() throws Exception { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
193 |
String code = "public class Test {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
194 |
" Integer i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
195 |
" private void dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
196 |
" i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
197 |
" this.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
198 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
199 |
"}"; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
200 |
String expected = |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
201 |
"Test.dump()void\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
202 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
203 |
" (let /*synthetic*/ final Integer $le0 = i in (let /*synthetic*/ final Integer $le1 = i = Integer.valueOf((int)(i.intValue() + 1)) in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
204 |
" (let /*synthetic*/ final Integer $le2 = (Integer)this.i in (let /*synthetic*/ final Integer $le3 = this.i = Integer.valueOf((int)(this.i.intValue() + 1)) in $le2));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
205 |
"}\n"; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
206 |
runTest(code, expected); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
207 |
//qualified this: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
208 |
runTest("public class Test {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
209 |
" Integer i;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
210 |
" class Inner1 {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
211 |
" class Inner2 {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
212 |
" private Integer dump() {\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
213 |
" return Test.this.i++;\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
214 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
215 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
216 |
" }\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
217 |
"}", |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
218 |
"Test.Inner1.Inner2.dump()java.lang.Integer\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
219 |
"{\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
220 |
" return (let /*synthetic*/ final Integer $le0 = (Integer)this$1.this$0.i" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
221 |
" in (let /*synthetic*/ final Integer $le1 = this$1.this$0.i = " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
222 |
"Integer.valueOf((int)(this$1.this$0.i.intValue() + 1)) " + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
223 |
"in $le0));\n" + |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
224 |
"}\n" |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
225 |
); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
226 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
227 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
228 |
private final ToolBox tb = new ToolBox(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
229 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
230 |
private void runTest(String code, String expectedDesugar) throws Exception { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
231 |
List<JavaFileObject> files = List.nil(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
232 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
233 |
for (String file : code.split("---")) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
234 |
files = files.prepend(new ToolBox.JavaSource(file)); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
235 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
236 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
237 |
Path classes = Paths.get("classes"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
238 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
239 |
if (Files.exists(classes)) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
240 |
tb.cleanDirectory(classes); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
241 |
} else { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
242 |
Files.createDirectories(classes); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
243 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
244 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
245 |
JavacTool compiler = (JavacTool) ToolProvider.getSystemJavaCompiler(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
246 |
StringWriter out = new StringWriter(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
247 |
Context context = new Context(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
248 |
TestLower.preRegister(context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
249 |
Iterable<String> options = Arrays.asList("-d", classes.toString()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
250 |
JavacTask task = (JavacTask) compiler.getTask(out, null, null, options, null, files, context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
251 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
252 |
task.generate(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
253 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
254 |
out.flush(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
255 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
256 |
String actual = out.toString().replace(System.getProperty("line.separator"), "\n"); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
257 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
258 |
if (!expectedDesugar.equals(actual)) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
259 |
throw new IllegalStateException("Actual does not match expected: " + actual); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
260 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
261 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
262 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
263 |
private static final class TestLower extends Lower { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
264 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
265 |
public static void preRegister(Context context) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
266 |
context.put(lowerKey, new Context.Factory<Lower>() { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
267 |
public Lower make(Context c) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
268 |
return new TestLower(c); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
269 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
270 |
}); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
271 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
272 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
273 |
private final TreeMaker make; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
274 |
private final Names names; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
275 |
private final Log log; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
276 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
277 |
public TestLower(Context context) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
278 |
super(context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
279 |
make = TreeMaker.instance(context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
280 |
names = Names.instance(context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
281 |
log = Log.instance(context); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
282 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
283 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
284 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
285 |
public List<JCTree> translateTopLevelClass(Env<AttrContext> env, JCTree cdef, TreeMaker make) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
286 |
List<JCTree> result = super.translateTopLevelClass(env, cdef, make); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
287 |
Map<Symbol, JCMethodDecl> declarations = new HashMap<>(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
288 |
Set<Symbol> toDump = new TreeSet<>(symbolComparator); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
289 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
290 |
new TreeScanner() { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
291 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
292 |
public void visitMethodDef(JCMethodDecl tree) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
293 |
if (tree.name.toString().startsWith("dump")) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
294 |
toDump.add(tree.sym); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
295 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
296 |
declarations.put(tree.sym, tree); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
297 |
super.visitMethodDef(tree); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
298 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
299 |
}.scan(result); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
300 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
301 |
for (Symbol d : toDump) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
302 |
dump(d, declarations, new HashSet<>()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
303 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
304 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
305 |
return result; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
306 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
307 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
308 |
private void dump(Symbol methodSym, Map<Symbol, JCMethodDecl> declarations, Set<Symbol> alreadyPrinted) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
309 |
if (!alreadyPrinted.add(methodSym)) |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
310 |
return ; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
311 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
312 |
JCMethodDecl method = declarations.get(methodSym); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
313 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
314 |
if (method == null) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
315 |
return ; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
316 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
317 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
318 |
log.getWriter(WriterKind.NOTICE).println(symbol2String(methodSym)); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
319 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
320 |
JCBlock body = new TreeCopier<Void>(make) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
321 |
private final Map<String, String> letExprRemap = new HashMap<>(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
322 |
private int i; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
323 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
324 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
325 |
public JCTree visitOther(Tree node, Void p) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
326 |
JCTree tree = (JCTree) node; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
327 |
if (tree.hasTag(Tag.LETEXPR)) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
328 |
LetExpr le = (LetExpr) tree; |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
329 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
330 |
for (JCVariableDecl var : le.defs) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
331 |
letExprRemap.put(var.name.toString(), "$le" + i++); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
332 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
333 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
334 |
return super.visitOther(node, p); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
335 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
336 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
337 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
338 |
public JCTree visitVariable(VariableTree node, Void p) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
339 |
String newName = letExprRemap.get(node.getName().toString()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
340 |
if (newName != null) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
341 |
node = make.VarDef((JCModifiers) node.getModifiers(), names.fromString(newName), (JCExpression) node.getType(), (JCExpression) node.getInitializer()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
342 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
343 |
return super.visitVariable(node, p); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
344 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
345 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
346 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
347 |
public JCTree visitIdentifier(IdentifierTree node, Void p) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
348 |
String newName = letExprRemap.get(node.getName().toString()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
349 |
if (newName != null) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
350 |
node = make.Ident(names.fromString(newName)); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
351 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
352 |
return super.visitIdentifier(node, p); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
353 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
354 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
355 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
356 |
public <T extends JCTree> T copy(T tree, Void p) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
357 |
if (tree.hasTag(Tag.LETEXPR)) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
358 |
return (T) visitOther(tree, p); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
359 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
360 |
return super.copy(tree, p); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
361 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
362 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
363 |
}.copy(method.body); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
364 |
log.getWriter(WriterKind.NOTICE).println(body.toString()); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
365 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
366 |
Set<Symbol> invoked = new TreeSet<>(symbolComparator); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
367 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
368 |
new TreeScanner() { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
369 |
@Override |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
370 |
public void visitApply(JCMethodInvocation tree) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
371 |
invoked.add(TreeInfo.symbol(tree.meth)); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
372 |
super.visitApply(tree); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
373 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
374 |
}.scan(method); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
375 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
376 |
for (Symbol search : invoked) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
377 |
dump(search, declarations, alreadyPrinted); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
378 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
379 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
380 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
381 |
private String symbol2String(Symbol sym) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
382 |
switch (sym.kind) { |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
383 |
case TYP: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
384 |
return sym.getQualifiedName().toString(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
385 |
case MTH: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
386 |
return symbol2String(sym.owner) + "." + sym.name + sym.type.toString(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
387 |
default: |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
388 |
throw new UnsupportedOperationException(); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
389 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
390 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
391 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
392 |
private final Comparator<Symbol> symbolComparator = (s1, s2) -> symbol2String(s1).compareTo(symbol2String(s2)); |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
393 |
} |
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
394 |
|
49b675740462
8147527: Wrong code generated for postfix unary operators
jlahoda
parents:
diff
changeset
|
395 |
} |