Skip to content

Fix #5386: Normalize unary operator expressions #5479

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 4 commits into from
Nov 21, 2018
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
20 changes: 18 additions & 2 deletions compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
def isIdempotentRef(tree: Tree)(implicit ctx: Context): Boolean =
refPurity(tree) >= Idempotent

/** If `tree` is a constant expression, its value as a Literal,
/** (1) If `tree` is a constant expression, its value as a Literal,
* or `tree` itself otherwise.
*
* Note: Demanding idempotency instead of purity in literalize is strictly speaking too loose.
Expand Down Expand Up @@ -485,11 +485,27 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
* Ident
* Select
* TypeApply
*
* (2) A primitive unary operator expression `pre.op` where `op` is one of `+`, `-`, `~`, `!`
* that has a constant type `ConstantType(v)` but that is not a constant expression
* (i.e. `pre` has side-effects) is translated to
*
* { pre; v }
*
* This avoids the situation where we have a Select node that does not have a symbol.
*/
def constToLiteral(tree: Tree)(implicit ctx: Context): Tree = {
val tree1 = ConstFold(tree)
tree1.tpe.widenTermRefExpr match {
case ConstantType(value) if isIdempotentExpr(tree1) => Literal(value)
case ConstantType(value) =>
if (isIdempotentExpr(tree1)) Literal(value)
else tree1 match {
case Select(qual, _) if tree1.tpe.isInstanceOf[ConstantType] =>
// it's a primitive unary operator; Simplify `pre.op` to `{ pre; v }` where `v` is the value of `pre.op`
Block(qual :: Nil, Literal(value))
case _ =>
tree1
}
case _ => tree1
}
}
Expand Down
8 changes: 8 additions & 0 deletions tests/run/i5386.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
!
!
!
!
1
2
!
1
34 changes: 34 additions & 0 deletions tests/run/i5386.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
object Test extends App {

~{
println("!")
1
}

+{
println("!")
1
}

-{
println("!")
1
}

!{
println("!")
true
}

{ println("1"); 1 } + { println("2"); 2}

!(try true finally{()})


class C {
def foo: 1 = { println("1"); 1 }
}

{ println("!"); new C }.foo

}