From 2324be56376aed8cd168e712001485f2202cdda6 Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Sun, 16 Apr 2017 18:48:53 +0200
Subject: Fix constant type val value inline in constructors.

---
 compiler/src/dotty/tools/dotc/ast/TreeInfo.scala   | 13 +++++++++++--
 compiler/src/dotty/tools/dotc/core/Constants.scala | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'compiler/src')

diff --git a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
index cac0e4b91..46af1f1b4 100644
--- a/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
+++ b/compiler/src/dotty/tools/dotc/ast/TreeInfo.scala
@@ -3,7 +3,7 @@ package dotc
 package ast
 
 import core._
-import Flags._, Trees._, Types._, Contexts._
+import Flags._, Trees._, Types._, Contexts._, Constants._
 import Names._, StdNames._, NameOps._, Decorators._, Symbols._
 import util.HashSet
 import typer.ConstFold
@@ -426,8 +426,17 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
    */
   def constToLiteral(tree: Tree)(implicit ctx: Context): Tree = {
     val tree1 = ConstFold(tree)
+    def canInlineConstant(value: Constant): Boolean = {
+      isIdempotentExpr(tree1) && // see note in documentation
+      // lazy value must be initialized (would not be needed with isPureExpr)
+      !tree1.symbol.is(Lazy) &&
+      // could hide initialization order issues (ex. val with constant type read before initialized)
+      (!ctx.owner.isLocalDummy || (tree1.symbol.is(Method) || value.isZero) ||
+        ctx.scala2Mode // ignore in Scala 2 because of inlined `final val` values
+      )
+    }
     tree1.tpe.widenTermRefExpr match {
-      case ConstantType(value) if isIdempotentExpr(tree1) && !tree1.symbol.is(Lazy) => Literal(value)
+      case ConstantType(value) if canInlineConstant(value) => Literal(value)
       case _ => tree1
     }
   }
diff --git a/compiler/src/dotty/tools/dotc/core/Constants.scala b/compiler/src/dotty/tools/dotc/core/Constants.scala
index ed388b7ec..8ea285c8d 100644
--- a/compiler/src/dotty/tools/dotc/core/Constants.scala
+++ b/compiler/src/dotty/tools/dotc/core/Constants.scala
@@ -53,6 +53,20 @@ object Constants {
     def isNonUnitAnyVal       = BooleanTag <= tag && tag <= DoubleTag
     def isAnyVal              = UnitTag <= tag && tag <= DoubleTag
 
+    /** Is the zero or un-initialized value of the type */
+    def isZero(implicit ctx: Context): Boolean = tag match {
+      case BooleanTag => !value.asInstanceOf[Boolean]
+      case ByteTag    => value.asInstanceOf[Byte] == 0
+      case ShortTag   => value.asInstanceOf[Short] == 0
+      case CharTag    => value.asInstanceOf[Char] == 0
+      case IntTag     => value.asInstanceOf[Int] == 0
+      case LongTag    => value.asInstanceOf[Long] == 0L
+      case FloatTag   => value.asInstanceOf[Float] == 0.0
+      case DoubleTag  => value.asInstanceOf[Double] == 0.0
+      case NullTag    => true
+      case _          => false
+    }
+
     def tpe(implicit ctx: Context): Type = tag match {
       case UnitTag    => defn.UnitType
       case BooleanTag => defn.BooleanType
-- 
cgit v1.2.3