From a4fb77332cf641b023b46af5533b6007948b766e Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Mon, 11 Mar 2013 11:15:49 +0100
Subject: SI-7240 fixes language feature lookup

As I discovered today, Definitions.getMember have a fallback clause,
which accounts for the phases which have inner classes flattened.

This fallback uses nme.flattenedName to compute a flattened name, but
unfortunately nme.flattenedName produces a TermName, not a TypeName,
which means that the fallback will commence search in a wrong namespace
with predictable results.

The commit also changes another usage of nme.flattenedName in a type name
context. That one was correctly converting a TermName result to TypeName,
so this is not a bugfix, but just a refactoring for the sake of being
consistent.
---
 .../scala/reflect/internal/Definitions.scala       |  2 +-
 src/reflect/scala/reflect/internal/Symbols.scala   |  2 +-
 test/files/run/t7240.check                         |  0
 test/files/run/t7240/Macros_1.scala                | 48 ++++++++++++++++++++++
 test/files/run/t7240/Test_2.scala                  |  3 ++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 test/files/run/t7240.check
 create mode 100644 test/files/run/t7240/Macros_1.scala
 create mode 100644 test/files/run/t7240/Test_2.scala

diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 6e4ca76382..e5d9e54a16 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -1046,7 +1046,7 @@ trait Definitions extends api.StandardDefinitions {
       getMemberIfDefined(owner, name) orElse {
         if (phase.flatClasses && name.isTypeName && !owner.isPackageObjectOrClass) {
           val pkg = owner.owner
-          val flatname = nme.flattenedName(owner.name, name)
+          val flatname = tpnme.flattenedName(owner.name, name)
           getMember(pkg, flatname)
         }
         else fatalMissingSymbol(owner, name)
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index d9eb48ff2d..45c16b7302 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -3022,7 +3022,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
       if (Statistics.canEnable) Statistics.incCounter(nameCount)
       if (needsFlatClasses) {
         if (flatname eq null)
-          flatname = nme.flattenedName(rawowner.name, rawname).toTypeName
+          flatname = tpnme.flattenedName(rawowner.name, rawname)
 
         flatname
       }
diff --git a/test/files/run/t7240.check b/test/files/run/t7240.check
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/files/run/t7240/Macros_1.scala b/test/files/run/t7240/Macros_1.scala
new file mode 100644
index 0000000000..6465e18760
--- /dev/null
+++ b/test/files/run/t7240/Macros_1.scala
@@ -0,0 +1,48 @@
+package bakery
+
+import scala.language.experimental.macros
+import scala.reflect.macros.Context
+
+trait FailureCake {
+  implicit def liftAnyFails[T: Manifest]: Any = ???
+
+  // This works
+  // implicit def liftAny[T]: Any = ???
+}
+
+object Bakery {
+
+  def failure: Any = macro failureImpl
+  def failureImpl(c: Context): c.Expr[Any] = {
+    import c.universe._
+
+    def dslTrait(dslName: String) = {
+      val names = dslName.split("\\.").toList.reverse
+      assert(names.length >= 1, "DSL trait name must be in the valid format. DSL trait name is " + dslName)
+
+      val tpeName = newTypeName(names.head)
+      names.tail.reverse match {
+        case head :: tail ⇒
+          Select(tail.foldLeft[Tree](Ident(newTermName(head)))((tree, name) ⇒ Select(tree, newTermName(name))), tpeName)
+        case Nil ⇒
+          Ident(tpeName)
+      }
+    }
+
+    def composeDSL(transformedBody: Tree) =
+      ClassDef(Modifiers(), newTypeName("eval"), List(), Template(
+        List(dslTrait("bakery.FailureCake")),
+        emptyValDef,
+        List(
+          DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(),
+            Block(List(Apply(Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), nme.CONSTRUCTOR), List())), Literal(Constant(())))),
+          DefDef(Modifiers(), newTermName("main"), List(), List(List()), Ident(newTypeName("Any")), transformedBody))))
+
+    def constructor = Apply(Select(New(Ident(newTypeName("eval"))), nme.CONSTRUCTOR), List())
+
+    c.eval(c.Expr[Any](
+      c.resetAllAttrs(Block(composeDSL(Literal(Constant(1))), constructor))))
+
+    c.Expr[Any](Literal(Constant(1)))
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t7240/Test_2.scala b/test/files/run/t7240/Test_2.scala
new file mode 100644
index 0000000000..2450bdabf9
--- /dev/null
+++ b/test/files/run/t7240/Test_2.scala
@@ -0,0 +1,3 @@
+object Test extends App {
+  bakery.Bakery.failure
+}
\ No newline at end of file
-- 
cgit v1.2.3