diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-25 13:51:02 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-05-23 10:52:23 +0200 |
| commit | 03d2de20047ad853d80c5c1aae68298082af27d3 (patch) | |
| tree | c4afd29a2d3157173099a28ead2152a3de946180 /src/compiler/scala/tools/nsc/backend | |
| parent | 2e40aa5871859b9ab6bdc03d56a81746fa90b1e5 (diff) | |
| download | scala-03d2de20047ad853d80c5c1aae68298082af27d3.tar.gz scala-03d2de20047ad853d80c5c1aae68298082af27d3.tar.bz2 scala-03d2de20047ad853d80c5c1aae68298082af27d3.zip | |
SI-9121 test case (fixed in new optimizer), SI-9179 test case
Also adds a mising phase travel in the backend. A comment already
points out why it's necessary, but it was actually forgotten.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala index a32c21795d..a5744983b2 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala @@ -76,7 +76,7 @@ abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { val origOwner = sym.originalOwner // phase travel necessary: after flatten, the name includes the name of outer classes. // if some outer name contains $anon, a non-anon class is considered anon. - if (delambdafyInline() && sym.rawowner.isAnonymousFunction) { + if (delambdafyInline() && exitingPickler(sym.rawowner.isAnonymousFunction)) { // SI-9105: special handling for anonymous functions under delambdafy:inline. // // class C { def t = () => { def f { class Z } } } |