diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-08-13 11:22:05 +0200 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-08-13 11:22:19 +0200 |
commit | 945fefb6c6e54ccfd660314bf8c74fca7ee8496a (patch) | |
tree | e35f20f8d67c7466acd6de7488ced1329b3e0ba0 /src/dotty | |
parent | 96dfb35b58bb7cf59f5ef55a4c1735ec0e1f5557 (diff) | |
download | dotty-945fefb6c6e54ccfd660314bf8c74fca7ee8496a.tar.gz dotty-945fefb6c6e54ccfd660314bf8c74fca7ee8496a.tar.bz2 dotty-945fefb6c6e54ccfd660314bf8c74fca7ee8496a.zip |
Do not emit static forwarders in non-static modules.
Diffstat (limited to 'src/dotty')
-rw-r--r-- | src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index d0993a73b..916ab3298 100644 --- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -622,8 +622,8 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{ def isSynchronized: Boolean = sym is Flags.Synchronized def isNonBottomSubClass(other: Symbol): Boolean = sym.derivesFrom(other) def hasAnnotation(ann: Symbol): Boolean = toDenot(sym).hasAnnotation(ann) - def shouldEmitForwarders: Boolean = //exitingPickler { !(sym.name.toString contains '$') - (sym is Flags.Module) && !(sym is Flags.ImplClass) /// !sym.isNestedClass + def shouldEmitForwarders: Boolean = + (sym is Flags.Module) && !(sym is Flags.ImplClass) && sym.isStatic def isJavaEntryPoint: Boolean = CollectEntryPoints.isJavaEntryPoint(sym) def isClassConstructor: Boolean = toDenot(sym).isClassConstructor |