Skip to content

Backport "Don't generate a super accessor for an inline method call" to LTS #18974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,11 @@ class SuperAccessors(thisPhase: DenotTransformer) {
}
}

val needAccessor = name.isTermName && (
clazz != currentClass || !validCurrentClass || mix.name.isEmpty && clazz.is(Trait))
val needAccessor =
name.isTermName // Types don't need super accessors
&& !sym.isEffectivelyErased // Erased and concrete inline methods are not called at runtime
&& !sym.isInlineMethod // so they don't need superaccessors.
&& (clazz != currentClass || !validCurrentClass || mix.name.isEmpty && clazz.is(Trait))

if (needAccessor) atPhase(thisPhase.next)(superAccessorCall(sel, mix.name))
else sel
Expand Down
7 changes: 7 additions & 0 deletions tests/pos/i17584a.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

import language.experimental.erasedDefinitions
trait A:
erased def g = 1
trait B extends A:
erased def f = super.g
class C extends B
10 changes: 10 additions & 0 deletions tests/run/i17584.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
trait A:
inline def g = 1
trait B extends A:
def f = super.g
class C extends B

@main def Test =
val c = C()
assert(c.f == 1)

11 changes: 11 additions & 0 deletions tests/run/i17584a.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
trait T:
def g = 2
trait A extends T:
inline override def g = 1
trait B extends A:
def f = super.g
class C extends B

@main def Test =
val c = C()
assert(c.f == 1)