diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2016-05-23 18:34:53 +0200 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-05-23 18:34:53 +0200 |
| commit | 7645c7fae2367fa74036c85ef994b3e65a89defa (patch) | |
| tree | 904383c24366e3776854fc9f0238e325a3ff3260 /src | |
| parent | 82d9551773b56730df8cfcfc7a40a0d1c7fb2bf9 (diff) | |
| parent | 03d2de20047ad853d80c5c1aae68298082af27d3 (diff) | |
| download | scala-7645c7fae2367fa74036c85ef994b3e65a89defa.tar.gz scala-7645c7fae2367fa74036c85ef994b3e65a89defa.tar.bz2 scala-7645c7fae2367fa74036c85ef994b3e65a89defa.zip | |
Merge pull request #5122 from lrytz/t9121
SI-9121 test case (fixed in new optimizer), SI-9179 test case
Diffstat (limited to 'src')
| -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 } } } |