File tree Expand file tree Collapse file tree 3 files changed +16
-8
lines changed Expand file tree Collapse file tree 3 files changed +16
-8
lines changed Original file line number Diff line number Diff line change 1515 container : lampepfl/dotty:2020-04-24
1616
1717 steps :
18- - name : Set up JDK version
18+ - name : Set JDK 11 as default
1919 run : echo "::add-path::/usr/lib/jvm/java-11-openjdk-amd64/bin"
2020
2121 - name : Checkout cleanup script
5858 container : lampepfl/dotty:2020-04-24
5959
6060 steps :
61- - name : Set up JDK version
61+ - name : Set JDK 11 as default
6262 run : echo "::add-path::/usr/lib/jvm/java-11-openjdk-amd64/bin"
6363
6464 - name : Checkout cleanup script
@@ -190,6 +190,9 @@ jobs:
190190 github.event_name == 'schedule'
191191
192192 steps :
193+ - name : Set JDK 8 as default
194+ run : echo "::add-path::/usr/lib/jvm/java-1.8.0-openjdk-amd64/bin"
195+
193196 - name : Checkout cleanup script
194197 uses : actions/checkout@v2
195198
@@ -221,9 +224,7 @@ jobs:
221224 restore-keys : ${{ runner.os }}-general-
222225
223226 - 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"
227228
228229 publish_nightly :
229230 runs-on : self-hosted
Original file line number Diff line number Diff line change @@ -131,7 +131,14 @@ object DottyBackendInterface {
131131
132132 def isStaticConstructor (using Context ): Boolean = (sym.isStaticMember && sym.isClassConstructor) || (sym.name eq nme.STATIC_CONSTRUCTOR )
133133
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+ */
135142 def isStaticModuleField (using Context ): Boolean =
136143 sym.owner.isStaticModuleClass && sym.isField && ! sym.name.is(LazyBitMapName )
137144
Original file line number Diff line number Diff line change @@ -830,9 +830,9 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
830830
831831 /** Return a pair consisting of (supercall, rest)
832832 *
833- * - supercall: the of superclass call, excluding trait constr calls
833+ * - supercall: the superclass call, excluding trait constr calls
834834 *
835- * The supercall is always the first statement (if exists)
835+ * The supercall is always the first statement (if it exists)
836836 */
837837 final def splitAtSuper (constrStats : List [Tree ])(implicit ctx : Context ): (List [Tree ], List [Tree ]) =
838838 constrStats.toList match {
You can’t perform that action at this time.
0 commit comments