diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-09-06 04:47:17 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-09-06 04:47:17 +0200 |
| commit | a661bed267745d5f19f967712462b3f038ad8dcd (patch) | |
| tree | d19a17df334100dcf0ed9eda056b019c064aedaf | |
| parent | c0b69bb4b51605cbd0230e672cd4d026011c0e8d (diff) | |
| download | dotty-a661bed267745d5f19f967712462b3f038ad8dcd.tar.gz dotty-a661bed267745d5f19f967712462b3f038ad8dcd.tar.bz2 dotty-a661bed267745d5f19f967712462b3f038ad8dcd.zip | |
Bring back blockescapes test...
... by reverting a premature optimization in Erasure.
| -rw-r--r-- | src/dotty/tools/dotc/transform/Erasure.scala | 3 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 2 | ||||
| -rw-r--r-- | tests/pos/blockescapes.scala (renamed from tests/pending/pos/blockescapes.scala) | 0 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/transform/Erasure.scala b/src/dotty/tools/dotc/transform/Erasure.scala index d22fdc669..a5679d598 100644 --- a/src/dotty/tools/dotc/transform/Erasure.scala +++ b/src/dotty/tools/dotc/transform/Erasure.scala @@ -318,9 +318,6 @@ object Erasure { } } - override def ensureNoLocalRefs(block: Block, pt: Type, forcedDefined: Boolean = false)(implicit ctx: Context): Tree = - block // optimization, no checking needed, as block symbols do not change. - override def typedDefDef(ddef: untpd.DefDef, sym: Symbol)(implicit ctx: Context) = { val ddef1 = untpd.cpy.DefDef(ddef)( tparams = Nil, diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 35b762780..843489df9 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -26,7 +26,7 @@ class tests extends CompilerTest { @Test def pos_erasure = compileFile(posDir, "erasure", doErase) @Test def pos_Coder() = compileFile(posDir, "Coder", doErase) - // @Test def pos_blockescapes() = compileFile(posDir, "blockescapes", doErase) + @Test def pos_blockescapes() = compileFile(posDir, "blockescapes", doErase) @Test def pos_collections() = compileFile(posDir, "collections", doErase) @Test def pos_functions1() = compileFile(posDir, "functions1", doErase) @Test def pos_implicits1() = compileFile(posDir, "implicits1", doErase) diff --git a/tests/pending/pos/blockescapes.scala b/tests/pos/blockescapes.scala index 35d40974b..35d40974b 100644 --- a/tests/pending/pos/blockescapes.scala +++ b/tests/pos/blockescapes.scala |