diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-06-06 13:34:18 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-06-06 13:34:18 +1000 |
| commit | 3bb735823f6815002895b1a335c6d105ddbe3e9e (patch) | |
| tree | 5136e824612af0aa0a11675845713fd8a5101a70 /src/reflect | |
| parent | 361f3f1540c755e36aaed22484924bb44eabc83b (diff) | |
| parent | f07019ffa56ec2dfab8ab0d9a83133005761a877 (diff) | |
| download | scala-3bb735823f6815002895b1a335c6d105ddbe3e9e.tar.gz scala-3bb735823f6815002895b1a335c6d105ddbe3e9e.tar.bz2 scala-3bb735823f6815002895b1a335c6d105ddbe3e9e.zip | |
Merge pull request #5099 from retronym/ticket/9390
SI-9390 Emit local defs that don't capture this as static
Diffstat (limited to 'src/reflect')
4 files changed, 10 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/StdAttachments.scala b/src/reflect/scala/reflect/internal/StdAttachments.scala index ef95b38843..76e34153c9 100644 --- a/src/reflect/scala/reflect/internal/StdAttachments.scala +++ b/src/reflect/scala/reflect/internal/StdAttachments.scala @@ -71,4 +71,9 @@ trait StdAttachments { abstract class InlineAnnotatedAttachment case object NoInlineCallsiteAttachment extends InlineAnnotatedAttachment case object InlineCallsiteAttachment extends InlineAnnotatedAttachment + + /** Attached to a local class that has its outer field elided. A `null` constant may be passed + * in place of the outer parameter, can help callers to avoid capturing the outer instance. + */ + case object OuterArgCanBeElided extends PlainAttachment } diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 20a485469d..4f5a545c95 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -365,6 +365,7 @@ trait StdNames { val MODULE_INSTANCE_FIELD: NameType = NameTransformer.MODULE_INSTANCE_NAME // "MODULE$" val OUTER: NameType = "$outer" val OUTER_LOCAL: NameType = OUTER.localName + val OUTER_ARG: NameType = "arg" + OUTER val OUTER_SYNTH: NameType = "<outer>" // emitted by virtual pattern matcher, replaced by outer accessor in explicitouter val ROOTPKG: NameType = "_root_" val SELECTOR_DUMMY: NameType = "<unapply-selector>" diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index ba195363c1..6f2d8d802a 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -914,6 +914,9 @@ trait Symbols extends api.Symbols { self: SymbolTable => /** Is this symbol an accessor method for outer? */ final def isOuterField = isArtifact && (unexpandedName == nme.OUTER_LOCAL) + /** Is this symbol an outer parameter in a constructor */ + final def isOuterParam = isParameter && owner.isConstructor && (name == nme.OUTER_ARG || name == nme.OUTER) + /** Does this symbol denote a stable value, ignoring volatility? * * Stability and volatility are checked separately to allow volatile paths in patterns that amount to equality checks. SI-6815 diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index 28222cf9a7..0a90a141d3 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -45,6 +45,7 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => this.SubpatternsAttachment this.NoInlineCallsiteAttachment this.InlineCallsiteAttachment + this.OuterArgCanBeElided this.noPrint this.typeDebug this.Range |