Merge pull request #92 from bantonsson/wip-ban-add-test-for-anonymous-lambdas

Ignore added/removed and changed anonymous lambdas for Scala 2.12.x

Author: SethTisue

core/src/main/scala/com/typesafe/tools/mima/core/ClassfileParser.scala

@@ -378,4 +378,8 @@ object ClassfileParser {
     (flags & JAVA_ACC_ABSTRACT) != 0
   @inline final def isFinal(flags: Int) =
     (flags & JAVA_ACC_FINAL) != 0
+  @inline final def isSynthetic(flags: Int) =
+    (flags & JAVA_ACC_SYNTHETIC) != 0
+  @inline final def isBridge(flags: Int) =
+    (flags & JAVA_ACC_BRIDGE) != 0
 }

core/src/main/scala/com/typesafe/tools/mima/core/MemberInfo.scala

@@ -66,7 +66,9 @@ class MemberInfo(val owner: ClassInfo, val bytecodeName: String, override val fl
 
   def hasSyntheticName: Boolean = decodedName contains '$'
 
-  def isAccessible: Boolean = isPublic && !hasSyntheticName
+  def isAccessible: Boolean = isPublic && !isSynthetic && !hasSyntheticName
+
+  def nonAccessible: Boolean = !isAccessible
 
   /** The name of the getter corresponding to this setter */
   private def getterName: String = {

core/src/main/scala/com/typesafe/tools/mima/core/PackageInfo.scala

@@ -72,10 +72,14 @@ abstract class PackageInfo(val owner: PackageInfo) {
     }
 
     def isAccessible(clazz: ClassInfo, prefix: Set[ClassInfo]) = {
-      val idx = clazz.decodedName.lastIndexOf("$")
-      lazy val isReachable =
-      	if (idx < 0) prefix.isEmpty // class name contains no $
-      	else (prefix exists (_.decodedName == clazz.decodedName.substring(0, idx))) // prefix before dollar is an accessible class detected previously
+      def isReachable = {
+        if (clazz.isSynthetic) false
+        else {
+          val idx = clazz.decodedName.lastIndexOf("$")
+          if (idx < 0) prefix.isEmpty // class name contains no $
+          else prefix exists (_.decodedName == clazz.decodedName.substring(0, idx)) // prefix before dollar is an accessible class detected previously
+        }
+      }
       clazz.isPublic && isReachable
     }
 

core/src/main/scala/com/typesafe/tools/mima/core/WithLocalModifier.scala

@@ -8,4 +8,10 @@ trait WithLocalModifier extends HasAccessFlags {
   def isFinal: Boolean = ClassfileParser.isFinal(flags)
 
   def nonFinal: Boolean = !isFinal
-}
+
+  def isSynthetic: Boolean = ClassfileParser.isSynthetic(flags)
+
+  def isBridge: Boolean = ClassfileParser.isBridge(flags)
+
+  def nonBridge: Boolean = !isBridge
+}

reporter/functional-tests/src/test/case-class-concrete-becomes-abstract-nok/problems.txt

@@ -1,4 +1,3 @@
 class A was concrete; is declared abstract in new version
-method apply()java.lang.Object in object A does not have a correspondent in new version
 method apply()A in object A does not have a correspondent in new version
 the type hierarchy of object A has changed in new version. Missing types {scala.runtime.AbstractFunction0}

reporter/functional-tests/src/test/ignore-changed-and-added-anonymous-lambdas-ok/problems.txt

@@ -0,0 +1,7 @@
+class A {
+  private var a = 5
+  def foo() {
+    val f1 = () => a.toString
+    val f2 = (x: Int) => x * a
+  }
+}

reporter/functional-tests/src/test/ignore-changed-and-added-anonymous-lambdas-ok/v1/A.scala

@@ -0,0 +1,8 @@
+class A {
+  private var a = 5
+  def foo() {
+    val f1 = () => a
+    val f2 = (x: Int) => (x * a).toString
+    val f3 = (x: Float) => x * a.toFloat
+  }
+}

reporter/functional-tests/src/test/ignore-changed-and-added-anonymous-lambdas-ok/v2/A.scala

@@ -0,0 +1,8 @@
+class A {
+  private var a = 5
+  def foo() {
+    val f1 = () => a.toString
+    val f2 = (x: Int) => x * a
+    val f3 = (x: Float) => x * a.toFloat
+  }
+}

reporter/functional-tests/src/test/ignore-changed-and-removed-anonymous-lambdas-ok/problems.txt

@@ -0,0 +1,7 @@
+class A {
+  private var a = 5
+  def foo() {
+    val f1 = () => a
+    val f2 = (x: Int) => (x * a).toString
+  }
+}

reporter/functional-tests/src/test/ignore-changed-and-removed-anonymous-lambdas-ok/v1/A.scala

@@ -37,7 +37,9 @@ private[analyze] abstract class BaseMethodChecker extends Checker[MemberInfo, Cl
 
 private[analyze] class ClassMethodChecker extends BaseMethodChecker {
   def check(method: MemberInfo, inclazz: ClassInfo): Option[Problem] = {
-    if (method.isDeferred)
+    if (method.nonAccessible)
+      None
+    else if (method.isDeferred)
       super.check(method, inclazz.lookupMethods(method.bytecodeName))
     else
       super.check(method, inclazz.lookupClassMethods(method.bytecodeName))
@@ -46,11 +48,12 @@ private[analyze] class ClassMethodChecker extends BaseMethodChecker {
 
 private[analyze] class TraitMethodChecker extends BaseMethodChecker {
   def check(method: MemberInfo, inclazz: ClassInfo): Option[Problem] = {
-    if (method.owner.hasStaticImpl(method)) {
+    if (method.nonAccessible)
+      None
+    else if (method.owner.hasStaticImpl(method))
       checkStaticImplMethod(method, inclazz)
-    } else {
+    else
       super.check(method, inclazz.lookupMethods(method.bytecodeName))
-    }
   }
 
   private def checkStaticImplMethod(method: MemberInfo, inclazz: ClassInfo) = {