diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-06-02 11:06:07 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-06-02 11:13:55 +0200 |
| commit | 4afa3ffe68f450c1f47018892489a0f2a9b4b9b5 (patch) | |
| tree | b8648b8bfe2475e72338d57a53164b49eb93725e /src/dotty/tools/dotc/Compiler.scala | |
| parent | f0787353e407a01a4b0a5f814c3d0feeff7cd87e (diff) | |
| download | dotty-4afa3ffe68f450c1f47018892489a0f2a9b4b9b5.tar.gz dotty-4afa3ffe68f450c1f47018892489a0f2a9b4b9b5.tar.bz2 dotty-4afa3ffe68f450c1f47018892489a0f2a9b4b9b5.zip | |
Revert "Fix ElimStaticThis#transformIdent"
This reverts commit 3d240ad40ccfb570174ec9758bfe68ba4e91eefb.
This commit got in without succeding the review.
It broke what already was working(inner static objects),
and made impossible moving static methods from companion object to companion class.
Additionally, commenting or removing assertions is not the way to go, and should not pass review.
See discussion here: https://github.com/dotty-staging/dotty/commit/3d240ad40ccfb570174ec9758bfe68ba4e91eefb
Diffstat (limited to 'src/dotty/tools/dotc/Compiler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/Compiler.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala index 41e77c61f..d7ef44144 100644 --- a/src/dotty/tools/dotc/Compiler.scala +++ b/src/dotty/tools/dotc/Compiler.scala @@ -67,8 +67,8 @@ class Compiler { new Constructors, new FunctionalInterfaces), List(new LambdaLift, // in this mini-phase block scopes are incorrect. No phases that rely on scopes should be here - new Flatten, new ElimStaticThis, + new Flatten, new RestoreScopes), List(/*new PrivateToStatic,*/ new ExpandPrivate, |