Merge pull request scala#4049 from lrytz/t8900

gkossakowski · gkossakowski · commit 850899b1c934 · 2014-10-20T22:03:39.000+02:00
SI-8900 Don't assert !isDelambdafyFunction, it may not be accurate
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeAsmCommon.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeAsmCommon.scala
@@ -30,10 +30,10 @@ final class BCodeAsmCommon[G <: Global](val global: G) {
    */
   def isAnonymousOrLocalClass(classSym: Symbol): Boolean = {
     assert(classSym.isClass, s"not a class: $classSym")
-    val res = (classSym.isAnonymousClass || !classSym.originalOwner.isClass)
-    // lambda classes are always top-level classes.
-    if (res) assert(!classSym.isDelambdafyFunction)
-    res
+    // Here used to be an `assert(!classSym.isDelambdafyFunction)`: delambdafy lambda classes are
+    // always top-level. However, SI-8900 shows an example where the weak name-based implementation
+    // of isDelambdafyFunction failed (for a function declared in a package named "lambda").
+    classSym.isAnonymousClass || !classSym.originalOwner.isClass
   }
 
   /**
diff --git a/test/files/pos/t8900.scala b/test/files/pos/t8900.scala
@@ -0,0 +1,11 @@
+package foo
+package lambdaking
+
+class Test {
+  def byname(b: => Any) = ???
+  def foo: Any = {
+    def bar: Any = {
+      byname(bar)
+    }
+  }
+}
