Skip to content
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

Do not treat inline methods or functions as ghost #1481

Merged
merged 1 commit into from
Nov 10, 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
15 changes: 15 additions & 0 deletions frontends/benchmarks/dotty-specific/invalid/i1479.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
object i1479 {
case class MyClass(var x: BigInt, var y: BigInt, var isValid: Boolean = true) {
require(!isValid || x <= y)
}

inline def changeMyClass(m: MyClass)(inline body: => Unit): Unit =
m.isValid = false // Note that we may not have mc.x <= mc.y so this is invalid
body
m.isValid = true

def inc(m: MyClass): Unit =
changeMyClass(m):
m.x += 1
m.y += 1
}
17 changes: 17 additions & 0 deletions frontends/benchmarks/dotty-specific/valid/i1479.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
object i1479 {
case class MyClass(var x: BigInt, var y: BigInt, var isValid: Boolean = true) {
require(!isValid || x <= y)
}

inline def changeMyClass(m: MyClass)(inline body: => Unit): Unit =
require(m.isValid)
m.isValid = false
body
m.isValid = true

def inc(m: MyClass): Unit =
require(m.isValid)
changeMyClass(m):
m.x += 1
m.y += 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ trait ASTExtractors {
if (sym eq NoSymbol)
return Seq.empty

val erased = if (sym.isEffectivelyErased) Seq(("ghost", Seq.empty[tpd.Tree])) else Seq()
val erased = if (sym.isEffectivelyErased && !(sym is Inline)) Seq(("ghost", Seq.empty[tpd.Tree])) else Seq()
val selfs = sym.annotations
val owners =
if (ignoreOwner) List.empty[Annotation]
Expand Down