diff options
author | liu fengyun <liu@fengy.me> | 2017-03-18 11:57:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-18 11:57:08 +0100 |
commit | 8b2d315936149efb15ded478fcc1d95ac9650e56 (patch) | |
tree | c6224496eccb39860f9b5d08fceb9055b6e15cbc /compiler/src/dotty/tools/dotc/Compiler.scala | |
parent | d0621108bad55f9fc66c1c5ade9a0b7edb3117e7 (diff) | |
parent | d45c09acb49c862f38d1de588abac3412876e32e (diff) | |
download | dotty-8b2d315936149efb15ded478fcc1d95ac9650e56.tar.gz dotty-8b2d315936149efb15ded478fcc1d95ac9650e56.tar.bz2 dotty-8b2d315936149efb15ded478fcc1d95ac9650e56.zip |
Merge pull request #2058 from dotty-staging/fix-2054
Fix #2054
Diffstat (limited to 'compiler/src/dotty/tools/dotc/Compiler.scala')
-rw-r--r-- | compiler/src/dotty/tools/dotc/Compiler.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index f413fc902..efde897cd 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -92,12 +92,12 @@ class Compiler { new ElimStaticThis, // Replace `this` references to static objects by global identifiers new Flatten, // Lift all inner classes to package scope new RestoreScopes), // Repair scopes rendered invalid by moving definitions in prior phases of the group - List(new ExpandPrivate, // Widen private definitions accessed from nested classes + List(new MoveStatics, // Move static methods to companion classes + new ExpandPrivate, // Widen private definitions accessed from nested classes new SelectStatic, // get rid of selects that would be compiled into GetStatic new CollectEntryPoints, // Find classes with main methods new CollectSuperCalls, // Find classes that are called with super new DropInlined, // Drop Inlined nodes, since backend has no use for them - new MoveStatics, // Move static methods to companion classes new LabelDefs), // Converts calls to labels to jumps List(new GenBCode) // Generate JVM bytecode ) |