Skip to content

Commit 9ff7869

Browse files
adriaanmadriaanm
committed
benign, though rough check file updates
1 parent 90af847 commit 9ff7869

15 files changed

+133
-167
lines changed

‎test/files/jvm/t7006.check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[running phase patmat on Foo_1.scala]
66
[running phase superaccessors on Foo_1.scala]
77
[running phase extmethods on Foo_1.scala]
8+
[running phase fields on Foo_1.scala]
89
[running phase pickler on Foo_1.scala]
910
[running phase refchecks on Foo_1.scala]
1011
[running phase uncurry on Foo_1.scala]

‎test/files/neg/t6446-additional.check

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,23 @@ packageobjects 3 load package objects
77
patmat 5 translate match expressions
88
superaccessors 6 add super accessors in traits and nested classes
99
extmethods 7 add extension methods for inline classes
10-
pickler 8 serialize symbol tables
11-
refchecks 9 reference/override checking, translate nested objects
12-
uncurry 10 uncurry, translate function values to anonymous classes
13-
tailcalls 11 replace tail calls by jumps
14-
specialize 12 @specialized-driven class and method specialization
15-
explicitouter 13 this refs to outer pointers
16-
erasure 14 erase types, add interfaces for traits
17-
posterasure 15 clean up erased inline classes
18-
lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs
19-
lambdalift 17 move nested functions to top level
20-
constructors 18 move field definitions into constructors
21-
flatten 19 eliminate inner classes
22-
mixin 20 mixin composition
23-
cleanup 21 platform-specific cleanups, generate reflective calls
24-
delambdafy 22 remove lambdas
25-
icode 23 generate portable intermediate code
26-
#partest -optimise
27-
inliner 24 optimization: do inlining
28-
inlinehandlers 25 optimization: inline exception handlers
29-
closelim 26 optimization: eliminate uncalled closures
30-
constopt 27 optimization: optimize null and other constants
31-
dce 28 optimization: eliminate dead code
32-
jvm 29 generate JVM bytecode
33-
ploogin 30 A sample phase that does so many things it's kind of hard...
34-
terminal 31 the last phase during a compilation run
35-
#partest !-optimise
36-
jvm 24 generate JVM bytecode
37-
ploogin 25 A sample phase that does so many things it's kind of hard...
38-
terminal 26 the last phase during a compilation run
39-
#partest
10+
fields 8 synthesize accessors and fields
11+
pickler 9 serialize symbol tables
12+
refchecks 10 reference/override checking, translate nested objects
13+
uncurry 11 uncurry, translate function values to anonymous classes
14+
tailcalls 12 replace tail calls by jumps
15+
specialize 13 @specialized-driven class and method specialization
16+
explicitouter 14 this refs to outer pointers
17+
erasure 15 erase types, add interfaces for traits
18+
posterasure 16 clean up erased inline classes
19+
lazyvals 17 allocate bitmaps, translate lazy vals into lazified defs
20+
lambdalift 18 move nested functions to top level
21+
constructors 19 move field definitions into constructors
22+
flatten 20 eliminate inner classes
23+
mixin 21 mixin composition
24+
cleanup 22 platform-specific cleanups, generate reflective calls
25+
delambdafy 23 remove lambdas
26+
icode 24 generate portable intermediate code
27+
jvm 25 generate JVM bytecode
28+
ploogin 26 A sample phase that does so many things it's kind of hard...
29+
terminal 27 the last phase during a compilation run

‎test/files/neg/t6446-missing.check

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,22 @@ packageobjects 3 load package objects
88
patmat 5 translate match expressions
99
superaccessors 6 add super accessors in traits and nested classes
1010
extmethods 7 add extension methods for inline classes
11-
pickler 8 serialize symbol tables
12-
refchecks 9 reference/override checking, translate nested objects
13-
uncurry 10 uncurry, translate function values to anonymous classes
14-
tailcalls 11 replace tail calls by jumps
15-
specialize 12 @specialized-driven class and method specialization
16-
explicitouter 13 this refs to outer pointers
17-
erasure 14 erase types, add interfaces for traits
18-
posterasure 15 clean up erased inline classes
19-
lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs
20-
lambdalift 17 move nested functions to top level
21-
constructors 18 move field definitions into constructors
22-
flatten 19 eliminate inner classes
23-
mixin 20 mixin composition
24-
cleanup 21 platform-specific cleanups, generate reflective calls
25-
delambdafy 22 remove lambdas
26-
icode 23 generate portable intermediate code
27-
#partest !-optimise
28-
jvm 24 generate JVM bytecode
29-
terminal 25 the last phase during a compilation run
30-
#partest -optimise
31-
inliner 24 optimization: do inlining
32-
inlinehandlers 25 optimization: inline exception handlers
33-
closelim 26 optimization: eliminate uncalled closures
34-
constopt 27 optimization: optimize null and other constants
35-
dce 28 optimization: eliminate dead code
36-
jvm 29 generate JVM bytecode
37-
terminal 30 the last phase during a compilation run
38-
#partest
11+
fields 8 synthesize accessors and fields
12+
pickler 9 serialize symbol tables
13+
refchecks 10 reference/override checking, translate nested objects
14+
uncurry 11 uncurry, translate function values to anonymous classes
15+
tailcalls 12 replace tail calls by jumps
16+
specialize 13 @specialized-driven class and method specialization
17+
explicitouter 14 this refs to outer pointers
18+
erasure 15 erase types, add interfaces for traits
19+
posterasure 16 clean up erased inline classes
20+
lazyvals 17 allocate bitmaps, translate lazy vals into lazified defs
21+
lambdalift 18 move nested functions to top level
22+
constructors 19 move field definitions into constructors
23+
flatten 20 eliminate inner classes
24+
mixin 21 mixin composition
25+
cleanup 22 platform-specific cleanups, generate reflective calls
26+
delambdafy 23 remove lambdas
27+
icode 24 generate portable intermediate code
28+
jvm 25 generate JVM bytecode
29+
terminal 26 the last phase during a compilation run

‎test/files/neg/t6446-show-phases.check

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,22 @@ packageobjects 3 load package objects
77
patmat 5 translate match expressions
88
superaccessors 6 add super accessors in traits and nested classes
99
extmethods 7 add extension methods for inline classes
10-
pickler 8 serialize symbol tables
11-
refchecks 9 reference/override checking, translate nested objects
12-
uncurry 10 uncurry, translate function values to anonymous classes
13-
tailcalls 11 replace tail calls by jumps
14-
specialize 12 @specialized-driven class and method specialization
15-
explicitouter 13 this refs to outer pointers
16-
erasure 14 erase types, add interfaces for traits
17-
posterasure 15 clean up erased inline classes
18-
lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs
19-
lambdalift 17 move nested functions to top level
20-
constructors 18 move field definitions into constructors
21-
flatten 19 eliminate inner classes
22-
mixin 20 mixin composition
23-
cleanup 21 platform-specific cleanups, generate reflective calls
24-
delambdafy 22 remove lambdas
25-
icode 23 generate portable intermediate code
26-
#partest !-optimise
27-
jvm 24 generate JVM bytecode
28-
terminal 25 the last phase during a compilation run
29-
#partest -optimise
30-
inliner 24 optimization: do inlining
31-
inlinehandlers 25 optimization: inline exception handlers
32-
closelim 26 optimization: eliminate uncalled closures
33-
constopt 27 optimization: optimize null and other constants
34-
dce 28 optimization: eliminate dead code
35-
jvm 29 generate JVM bytecode
36-
terminal 30 the last phase during a compilation run
37-
#partest
10+
fields 8 synthesize accessors and fields
11+
pickler 9 serialize symbol tables
12+
refchecks 10 reference/override checking, translate nested objects
13+
uncurry 11 uncurry, translate function values to anonymous classes
14+
tailcalls 12 replace tail calls by jumps
15+
specialize 13 @specialized-driven class and method specialization
16+
explicitouter 14 this refs to outer pointers
17+
erasure 15 erase types, add interfaces for traits
18+
posterasure 16 clean up erased inline classes
19+
lazyvals 17 allocate bitmaps, translate lazy vals into lazified defs
20+
lambdalift 18 move nested functions to top level
21+
constructors 19 move field definitions into constructors
22+
flatten 20 eliminate inner classes
23+
mixin 21 mixin composition
24+
cleanup 22 platform-specific cleanups, generate reflective calls
25+
delambdafy 23 remove lambdas
26+
icode 24 generate portable intermediate code
27+
jvm 25 generate JVM bytecode
28+
terminal 26 the last phase during a compilation run

‎test/files/neg/t6829.check

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@ t6829.scala:49: error: not found: value nextState
1717
^
1818
t6829.scala:50: error: type mismatch;
1919
found : s.type (with underlying type Any)
20-
required: _53.State where val _53: G
20+
required: _50.State where val _50: G
2121
val r = rewards(agent).r(s,a,s2)
2222
^
2323
t6829.scala:50: error: type mismatch;
2424
found : a.type (with underlying type Any)
25-
required: _53.Action where val _53: G
25+
required: _50.Action where val _50: G
2626
val r = rewards(agent).r(s,a,s2)
2727
^
2828
t6829.scala:50: error: type mismatch;
2929
found : s2.type (with underlying type Any)
30-
required: _53.State where val _53: G
30+
required: _50.State where val _50: G
3131
val r = rewards(agent).r(s,a,s2)
3232
^
3333
t6829.scala:51: error: type mismatch;
3434
found : s.type (with underlying type Any)
35-
required: _50.State
35+
required: _47.State
3636
agent.learn(s,a,s2,r): G#Agent
3737
^
3838
t6829.scala:51: error: type mismatch;
3939
found : a.type (with underlying type Any)
40-
required: _50.Action
40+
required: _47.Action
4141
agent.learn(s,a,s2,r): G#Agent
4242
^
4343
t6829.scala:51: error: type mismatch;
4444
found : s2.type (with underlying type Any)
45-
required: _50.State
45+
required: _47.State
4646
agent.learn(s,a,s2,r): G#Agent
4747
^
4848
t6829.scala:53: error: not found: value nextState

‎test/files/neg/t7494-no-options.check

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,23 @@ packageobjects 3 load package objects
88
patmat 5 translate match expressions
99
superaccessors 6 add super accessors in traits and nested classes
1010
extmethods 7 add extension methods for inline classes
11-
pickler 8 serialize symbol tables
12-
refchecks 9 reference/override checking, translate nested objects
13-
uncurry 10 uncurry, translate function values to anonymous classes
14-
tailcalls 11 replace tail calls by jumps
15-
specialize 12 @specialized-driven class and method specialization
16-
explicitouter 13 this refs to outer pointers
17-
erasure 14 erase types, add interfaces for traits
18-
posterasure 15 clean up erased inline classes
19-
lazyvals 16 allocate bitmaps, translate lazy vals into lazified defs
20-
lambdalift 17 move nested functions to top level
21-
constructors 18 move field definitions into constructors
22-
flatten 19 eliminate inner classes
23-
mixin 20 mixin composition
24-
cleanup 21 platform-specific cleanups, generate reflective calls
25-
delambdafy 22 remove lambdas
26-
icode 23 generate portable intermediate code
27-
#partest !-optimise
28-
jvm 24 generate JVM bytecode
29-
ploogin 25 A sample phase that does so many things it's kind of hard...
30-
terminal 26 the last phase during a compilation run
31-
#partest -optimise
32-
inliner 24 optimization: do inlining
33-
inlinehandlers 25 optimization: inline exception handlers
34-
closelim 26 optimization: eliminate uncalled closures
35-
constopt 27 optimization: optimize null and other constants
36-
dce 28 optimization: eliminate dead code
37-
jvm 29 generate JVM bytecode
38-
ploogin 30 A sample phase that does so many things it's kind of hard...
39-
terminal 31 the last phase during a compilation run
40-
#partest
11+
fields 8 synthesize accessors and fields
12+
pickler 9 serialize symbol tables
13+
refchecks 10 reference/override checking, translate nested objects
14+
uncurry 11 uncurry, translate function values to anonymous classes
15+
tailcalls 12 replace tail calls by jumps
16+
specialize 13 @specialized-driven class and method specialization
17+
explicitouter 14 this refs to outer pointers
18+
erasure 15 erase types, add interfaces for traits
19+
posterasure 16 clean up erased inline classes
20+
lazyvals 17 allocate bitmaps, translate lazy vals into lazified defs
21+
lambdalift 18 move nested functions to top level
22+
constructors 19 move field definitions into constructors
23+
flatten 20 eliminate inner classes
24+
mixin 21 mixin composition
25+
cleanup 22 platform-specific cleanups, generate reflective calls
26+
delambdafy 23 remove lambdas
27+
icode 24 generate portable intermediate code
28+
jvm 25 generate JVM bytecode
29+
ploogin 26 A sample phase that does so many things it's kind of hard...
30+
terminal 27 the last phase during a compilation run

‎test/files/neg/warn-unused-privates.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ warn-unused-privates.scala:14: warning: private val in object Bippy is never use
1616
warn-unused-privates.scala:36: warning: private val in class Boppy is never used
1717
private val hummer = "def" // warn
1818
^
19-
warn-unused-privates.scala:43: warning: private var in trait Accessors is never used
19+
warn-unused-privates.scala:43: warning: private method in trait Accessors is never used
2020
private var v1: Int = 0 // warn
2121
^
2222
warn-unused-privates.scala:43: warning: private setter in trait Accessors is never used
@@ -25,7 +25,7 @@ warn-unused-privates.scala:43: warning: private setter in trait Accessors is nev
2525
warn-unused-privates.scala:44: warning: private setter in trait Accessors is never used
2626
private var v2: Int = 0 // warn, never set
2727
^
28-
warn-unused-privates.scala:45: warning: private var in trait Accessors is never used
28+
warn-unused-privates.scala:45: warning: private method in trait Accessors is never used
2929
private var v3: Int = 0 // warn, never got
3030
^
3131
warn-unused-privates.scala:57: warning: private default argument in trait DefaultArgs is never used

‎test/files/run/analyzerPlugins.check

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
adaptBoundsToAnnots(List( <: Int), List(type T), List(Int @testAnn)) [2]
22
annotationsConform(Boolean @testAnn, Boolean) [1]
3-
annotationsConform(Boolean(false), Boolean @testAnn) [1]
3+
annotationsConform(Boolean(false), Boolean @testAnn) [2]
44
annotationsConform(Int @testAnn, ?A) [1]
55
annotationsConform(Int @testAnn, Any) [1]
66
annotationsConform(Int @testAnn, Int) [2]
77
annotationsConform(Int(1) @testAnn, Int) [1]
88
annotationsConform(Int(1), Int @testAnn) [1]
99
annotationsConform(Nothing, Int @testAnn) [2]
1010
annotationsConform(String @testAnn, String) [2]
11+
annotationsConform(String("str") @testAnn, String @testAnn) [1]
1112
canAdaptAnnotations(Trees$Ident, String) [1]
12-
canAdaptAnnotations(Trees$Select, ?) [1]
13+
canAdaptAnnotations(Trees$Select, ?) [3]
1314
canAdaptAnnotations(Trees$Select, Boolean @testAnn) [1]
1415
canAdaptAnnotations(Trees$Select, Boolean) [1]
1516
canAdaptAnnotations(Trees$Select, String @testAnn) [1]
1617
canAdaptAnnotations(Trees$TypeTree, ?) [10]
1718
canAdaptAnnotations(Trees$Typed, ?) [3]
1819
canAdaptAnnotations(Trees$Typed, Any) [1]
1920
canAdaptAnnotations(Trees$Typed, Int) [1]
21+
canAdaptAnnotations(Trees$Typed, String @testAnn) [1]
2022
lub(List(Int @testAnn, Int)) [1]
2123
pluginsPt(?, Trees$Annotated) [7]
2224
pluginsPt(?, Trees$Apply) [11]
@@ -43,27 +45,26 @@ pluginsPt(?, Trees$ValDef) [21]
4345
pluginsPt(Any, Trees$Literal) [2]
4446
pluginsPt(Any, Trees$Typed) [1]
4547
pluginsPt(Array[Any], Trees$ArrayValue) [1]
46-
pluginsPt(Boolean @testAnn, Trees$Literal) [1]
48+
pluginsPt(Boolean @testAnn, Trees$Literal) [2]
4749
pluginsPt(Boolean @testAnn, Trees$Select) [1]
4850
pluginsPt(Boolean, Trees$Apply) [1]
4951
pluginsPt(Boolean, Trees$Ident) [1]
50-
pluginsPt(Boolean, Trees$Literal) [1]
5152
pluginsPt(Double, Trees$Select) [1]
5253
pluginsPt(Int @testAnn, Trees$Literal) [1]
5354
pluginsPt(Int, Trees$Apply) [1]
5455
pluginsPt(Int, Trees$Ident) [2]
5556
pluginsPt(Int, Trees$If) [1]
5657
pluginsPt(Int, Trees$Literal) [5]
5758
pluginsPt(Int, Trees$Select) [3]
58-
pluginsPt(List, Trees$Apply) [1]
59+
pluginsPt(List[Any], Trees$Apply) [1]
5960
pluginsPt(List[Any], Trees$Select) [1]
6061
pluginsPt(String @testAnn, Trees$Select) [1]
62+
pluginsPt(String @testAnn, Trees$Typed) [1]
6163
pluginsPt(String, Trees$Apply) [1]
6264
pluginsPt(String, Trees$Block) [2]
6365
pluginsPt(String, Trees$Ident) [4]
6466
pluginsPt(String, Trees$Literal) [1]
6567
pluginsPt(String, Trees$Select) [1]
66-
pluginsPt(String, Trees$Typed) [1]
6768
pluginsPt(Unit, Trees$Assign) [1]
6869
pluginsPt(testAnn, Trees$Apply) [5]
6970
pluginsTypeSig(<none>, Trees$Template) [2]
@@ -119,18 +120,18 @@ pluginsTyped(=> Int, Trees$TypeApply) [1]
119120
pluginsTyped(=> String @testAnn, Trees$Select) [1]
120121
pluginsTyped(A, Trees$Apply) [1]
121122
pluginsTyped(A, Trees$Ident) [2]
122-
pluginsTyped(A, Trees$This) [8]
123+
pluginsTyped(A, Trees$This) [3]
123124
pluginsTyped(A, Trees$TypeTree) [4]
124125
pluginsTyped(A.super.type, Trees$Super) [1]
125-
pluginsTyped(A.this.type, Trees$This) [11]
126+
pluginsTyped(A.this.type, Trees$This) [16]
126127
pluginsTyped(Any, Trees$TypeTree) [1]
127128
pluginsTyped(AnyRef, Trees$Select) [4]
128129
pluginsTyped(Array[Any], Trees$ArrayValue) [1]
129-
pluginsTyped(Boolean @testAnn, Trees$Select) [1]
130+
pluginsTyped(Boolean @testAnn, Trees$Select) [2]
130131
pluginsTyped(Boolean @testAnn, Trees$TypeTree) [4]
131132
pluginsTyped(Boolean(false), Trees$Literal) [2]
132133
pluginsTyped(Boolean, Trees$Apply) [1]
133-
pluginsTyped(Boolean, Trees$Select) [4]
134+
pluginsTyped(Boolean, Trees$Select) [3]
134135
pluginsTyped(Char('c'), Trees$Literal) [2]
135136
pluginsTyped(Double, Trees$Apply) [3]
136137
pluginsTyped(Double, Trees$Select) [6]
@@ -145,26 +146,23 @@ pluginsTyped(Int, Trees$Ident) [2]
145146
pluginsTyped(Int, Trees$If) [2]
146147
pluginsTyped(Int, Trees$Select) [15]
147148
pluginsTyped(Int, Trees$TypeTree) [13]
148-
pluginsTyped(List, Trees$Apply) [1]
149-
pluginsTyped(List, Trees$Select) [1]
150-
pluginsTyped(List[Any], Trees$Apply) [1]
151-
pluginsTyped(List[Any], Trees$Select) [1]
149+
pluginsTyped(List[Any], Trees$Apply) [2]
150+
pluginsTyped(List[Any], Trees$Select) [2]
152151
pluginsTyped(List[Any], Trees$TypeTree) [3]
153152
pluginsTyped(Nothing, Trees$Return) [1]
154153
pluginsTyped(Object, Trees$Apply) [1]
155154
pluginsTyped(String @testAnn, Trees$Ident) [1]
156-
pluginsTyped(String @testAnn, Trees$Select) [1]
155+
pluginsTyped(String @testAnn, Trees$Select) [2]
157156
pluginsTyped(String @testAnn, Trees$TypeTree) [4]
158157
pluginsTyped(String(""), Trees$Literal) [2]
159158
pluginsTyped(String("huhu"), Trees$Literal) [1]
160-
pluginsTyped(String("str") @testAnn, Trees$Typed) [1]
159+
pluginsTyped(String("str") @testAnn, Trees$Typed) [2]
161160
pluginsTyped(String("str"), Trees$Literal) [1]
162-
pluginsTyped(String("str"), Trees$Typed) [1]
163161
pluginsTyped(String("two"), Trees$Literal) [2]
164162
pluginsTyped(String, Trees$Apply) [2]
165163
pluginsTyped(String, Trees$Block) [2]
166164
pluginsTyped(String, Trees$Ident) [1]
167-
pluginsTyped(String, Trees$Select) [9]
165+
pluginsTyped(String, Trees$Select) [8]
168166
pluginsTyped(String, Trees$TypeTree) [7]
169167
pluginsTyped(Unit, Trees$Apply) [2]
170168
pluginsTyped(Unit, Trees$Assign) [8]

‎test/files/run/delambdafy_t6028.check

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ package <empty> {
66
T.super.<init>();
77
()
88
};
9-
private[this] val field: String = "";
9+
private[this] val field: String = _;
10+
T.this.field = "";
1011
<stable> <accessor> def field(): String = T.this.field;
1112
def foo(methodParam: String): Function0 = {
1213
val methodLocal: String = "";

0 commit comments

Comments
 (0)