Skip to content

Commit 344f849

Browse files
committed
Merge pull request #842 from dotty-staging/fix-838
Fix #838. Fixes to non-local modules& static forwarders.
2 parents 50fe6eb + 7384b8d commit 344f849

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object DottyBuild extends Build {
4242
resolvers += Resolver.sonatypeRepo("releases"),
4343

4444
// get libraries onboard
45-
partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20150714-145300-2ad68448c5",
45+
partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20151022-113908-7fb0e653fd",
4646
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
4747
"org.scala-lang" % "scala-library" % scalaVersion.value % "test"),
4848
libraryDependencies ++= partestDeps.value,

src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
640640
val original = toDenot(sym).initial
641641
val validity = original.validFor
642642
val shiftedContext = ctx.withPhase(validity.phaseId)
643-
toDenot(sym)(shiftedContext).isStatic
643+
toDenot(sym)(shiftedContext).isStatic(shiftedContext)
644644
}
645645

646646
def isStaticConstructor: Boolean = isStaticMember && isClassConstructor

0 commit comments

Comments
 (0)