Merge commit 'ec05aeb' into topic/merge-2.10.x

1 files changed, 10 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala
index 0731d78a9b..689e6405d0 100644
--- a/src/compiler/scala/tools/nsc/ast/TreeInfo.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala
@@ -74,6 +74,11 @@ abstract class TreeInfo extends scala.reflect.internal.TreeInfo {
     }
   }
 
+  // TODO these overrides, and the slow trickle of bugs that they solve (e.g. SI-8479),
+  //      suggest that we should pursue an alternative design in which the DocDef nodes
+  //      are eliminated from the tree before typer, and instead are modelled as tree
+  //      attachments.
+
   /** Is tree legal as a member definition of an interface?
    */
   override def isInterfaceMember(tree: Tree): Boolean = tree match {
@@ -81,6 +86,11 @@ abstract class TreeInfo extends scala.reflect.internal.TreeInfo {
     case _ => super.isInterfaceMember(tree)
   }
 
+  override def isConstructorWithDefault(t: Tree) = t match {
+    case DocDef(_, definition) => isConstructorWithDefault(definition)
+    case _ => super.isConstructorWithDefault(t)
+  }
+
   /** Is tree a pure (i.e. non-side-effecting) definition?
    */
   override def isPureDef(tree: Tree): Boolean = tree match {