diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-10-23 10:31:26 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-10-23 10:31:26 +0200 |
| commit | 344f8499be5f4705c8bd7c9aad45d04d760d3dda (patch) | |
| tree | 63961649fafa4a1ad5b36774d7ee45835c2b53ea | |
| parent | 50fe6eb3f1edbbecd4c5f750ac61a9396c3f3852 (diff) | |
| parent | 7384b8d90431d09178c532925f7db3408be550fc (diff) | |
| download | dotty-344f8499be5f4705c8bd7c9aad45d04d760d3dda.tar.gz dotty-344f8499be5f4705c8bd7c9aad45d04d760d3dda.tar.bz2 dotty-344f8499be5f4705c8bd7c9aad45d04d760d3dda.zip | |
Merge pull request #842 from dotty-staging/fix-838
Fix #838. Fixes to non-local modules& static forwarders.
| -rw-r--r-- | project/Build.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index cc8fbfb69..be39358ff 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -42,7 +42,7 @@ object DottyBuild extends Build { resolvers += Resolver.sonatypeRepo("releases"), // get libraries onboard - partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20150714-145300-2ad68448c5", + partestDeps := Seq("me.d-d" % "scala-compiler" % "2.11.5-20151022-113908-7fb0e653fd", "org.scala-lang" % "scala-reflect" % scalaVersion.value, "org.scala-lang" % "scala-library" % scalaVersion.value % "test"), libraryDependencies ++= partestDeps.value, diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index 916ab3298..f92abe906 100644 --- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -640,7 +640,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{ val original = toDenot(sym).initial val validity = original.validFor val shiftedContext = ctx.withPhase(validity.phaseId) - toDenot(sym)(shiftedContext).isStatic + toDenot(sym)(shiftedContext).isStatic(shiftedContext) } def isStaticConstructor: Boolean = isStaticMember && isClassConstructor |