File tree 3 files changed +16
-8
lines changed
3 files changed +16
-8
lines changed Original file line number Diff line number Diff line change 15
15
container : lampepfl/dotty:2020-04-24
16
16
17
17
steps :
18
- - name : Set up JDK version
18
+ - name : Set JDK 11 as default
19
19
run : echo "::add-path::/usr/lib/jvm/java-11-openjdk-amd64/bin"
20
20
21
21
- name : Checkout cleanup script
58
58
container : lampepfl/dotty:2020-04-24
59
59
60
60
steps :
61
- - name : Set up JDK version
61
+ - name : Set JDK 11 as default
62
62
run : echo "::add-path::/usr/lib/jvm/java-11-openjdk-amd64/bin"
63
63
64
64
- name : Checkout cleanup script
@@ -190,6 +190,9 @@ jobs:
190
190
github.event_name == 'schedule'
191
191
192
192
steps :
193
+ - name : Set JDK 8 as default
194
+ run : echo "::add-path::/usr/lib/jvm/java-1.8.0-openjdk-amd64/bin"
195
+
193
196
- name : Checkout cleanup script
194
197
uses : actions/checkout@v2
195
198
@@ -221,9 +224,7 @@ jobs:
221
224
restore-keys : ${{ runner.os }}-general-
222
225
223
226
- name : Test
224
- run : |
225
- export PATH="/usr/lib/jvm/java-1.8.0-openjdk-amd64/bin:$PATH"
226
- ./project/scripts/sbt ";compile ;test"
227
+ run : ./project/scripts/sbt ";compile ;test"
227
228
228
229
publish_nightly :
229
230
runs-on : self-hosted
Original file line number Diff line number Diff line change @@ -131,7 +131,14 @@ object DottyBackendInterface {
131
131
132
132
def isStaticConstructor (using Context ): Boolean = (sym.isStaticMember && sym.isClassConstructor) || (sym.name eq nme.STATIC_CONSTRUCTOR )
133
133
134
- /** Fields of static modules will be static at backend */
134
+ /** Fields of static modules will be static at backend
135
+ *
136
+ * Note that lazy val encoding assumes bitmap fields are non-static.
137
+ * See also `genPlainClass` in `BCodeSkelBuilder.scala`.
138
+ *
139
+ * TODO: remove the special handing of `LazyBitMapName` once we swtich to
140
+ * the new lazy val encoding: https://github.com/lampepfl/dotty/issues/7140
141
+ */
135
142
def isStaticModuleField (using Context ): Boolean =
136
143
sym.owner.isStaticModuleClass && sym.isField && ! sym.name.is(LazyBitMapName )
137
144
Original file line number Diff line number Diff line change @@ -830,9 +830,9 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
830
830
831
831
/** Return a pair consisting of (supercall, rest)
832
832
*
833
- * - supercall: the of superclass call, excluding trait constr calls
833
+ * - supercall: the superclass call, excluding trait constr calls
834
834
*
835
- * The supercall is always the first statement (if exists)
835
+ * The supercall is always the first statement (if it exists)
836
836
*/
837
837
final def splitAtSuper (constrStats : List [Tree ])(implicit ctx : Context ): (List [Tree ], List [Tree ]) =
838
838
constrStats.toList match {
You can’t perform that action at this time.
0 commit comments