Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-master

* merge-wip-into-2.10.x: (44 commits)
  Cleanups of reifyBoundTerm and reifyBoundType
  SI-5841 reification of renamed imports
  Share the empty LinkedList between first0/last0.
  SI-4922 Show default in Scaladoc for generic methods.
  SI-6614 Test case for fixed ArrayStack misconduct.
  SI-6690 Release reference to last dequeued element.
  SI-5789 Use the ReplTest framework in the test
  SI-5789 Checks in the right version of the test
  SI-5789 Removes assertion about implclass flag in Mixin.scala
  SI-6766 Makes the -Pcontinuations:enable flag a project specific preference
  more ListOfNil => Nil
  DummyTree => CannotHaveAttrs
  evicts assert(false) from the compiler
  introduces global.pendingSuperCall
  refactors handling of parent types
  unifies approaches to call analysis in TreeInfo
  TypeApply + Select and their type-level twins
  SI-6696 removes "helper" tree factory methods
  SI-6766 Create a continuations project in eclipse
  Now the test suite runs MIMA for compatibility testing.
  ...

Conflicts:
	src/compiler/scala/reflect/reify/codegen/GenUtils.scala
	src/compiler/scala/tools/nsc/ast/Trees.scala
	src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/Namers.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/eclipse/scala-compiler/.classpath
	src/eclipse/scalap/.classpath
	src/reflect/scala/reflect/internal/StdNames.scala
	src/reflect/scala/reflect/internal/TreeInfo.scala

1 files changed, 2 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index 6953647513..39b894fbef 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -266,7 +266,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
 
     /** Mix in members of implementation class mixinClass into class clazz */
     def mixinImplClassMembers(mixinClass: Symbol, mixinInterface: Symbol) {
-      assert(mixinClass.isImplClass, "Not an impl class:" +
+      if (!mixinClass.isImplClass) debugwarn ("Impl class flag is not set " +
         ((mixinClass.debugLocationString, mixinInterface.debugLocationString)))
 
       for (member <- mixinClass.info.decls ; if isForwarded(member)) {
@@ -357,7 +357,6 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
     // first complete the superclass with mixed in members
     addMixedinMembers(clazz.superClass, unit)
 
-    //Console.println("adding members of " + clazz.info.baseClasses.tail.takeWhile(superclazz !=) + " to " + clazz);//DEBUG
     for (mc <- clazz.mixinClasses ; if mc hasFlag lateINTERFACE) {
       // @SEAN: adding trait tracking so we don't have to recompile transitive closures
       unit.depends += mc
@@ -868,8 +867,7 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL {
             val cond                    = Apply(Select(moduleVarRef, Object_eq), List(NULL))
             mkFastPathBody(clazz, moduleSym, cond, List(assign), List(NULL), returnTree, attrThis, args)
           case _ =>
-            assert(false, "Invalid getter " + rhs + " for module in class " + clazz)
-            EmptyTree
+            abort("Invalid getter " + rhs + " for module in class " + clazz)
         }
 
       def mkCheckedAccessor(clazz: Symbol, retVal: Tree, offset: Int, pos: Position, fieldSym: Symbol): Tree = {