Merge commit '81d8f9d3da' into merge-210

* excluded from merge:

  [nomerge] SI-6667 Demote a new ambiguity error to a lint warning.
  Revert "SI-6422: add missing Fractional and Integral alias in scala package"
  [backport] SI-6482, lost bounds in extension methods.

* commit '81d8f9d3da': (31 commits)
  reflecting @throws defined in Scala code
  pullrequest feedback
  SI-5833 Fixes tail-of-Nil problem in RefinedType#normalizeImpl
  SI-6017 Scaladoc: Show all letters without dangling links
  SI-6017 Generate Scaladoc's index links in Scala side
  SI-5313 Minor code cleanup for store clobbering
  SI-5313 Test clobbers on the back edge of a loop
  SI-7033 Be symful when creating factory methods.
  SI-7022 Additional test case for value class w. bounds
  SI-7039 unapplySeq result type independent of subpattern count
  evicts javac-artifacts.jar
  SI-7008 @throws annotations are now populated in reflect
  Fix SI-6578. Deprecated `askType` because of possible race conditions in type checker.
  SI-7029 - Make test more robust
  SI-7029 - Makes sure that uncaught exceptions are propagated to the UEH for the global ExecutionContext
  SI-6941 tests
  SI-6686 drop valdef unused in flatMapCond's block
  ...

Conflicts:
	src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
	src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala
	src/reflect/scala/reflect/internal/Definitions.scala

3 files changed, 7 insertions, 0 deletions

diff --git a/test/scaladoc/run/SI-6017.scala b/test/scaladoc/run/SI-6017.scala
index a4950e48d8..9951534c6d 100644
--- a/test/scaladoc/run/SI-6017.scala
+++ b/test/scaladoc/run/SI-6017.scala
@@ -16,6 +16,11 @@ object Test extends ScaladocModelTest {
         val index = IndexModelFactory.makeIndex(universe)
         // Because "STAR" and "Star" are different
         assert(index.firstLetterIndex('s').keys.toSeq.length == 2)
+
+        val indexPage = new Index(universe, index)
+        val letters = indexPage.letters
+        assert(letters.length > 1)
+        assert(letters(0).toString == "<span>#</span>")
       }
       case _ => assert(false)
     }
diff --git a/test/scaladoc/run/package-object.check b/test/scaladoc/run/package-object.check
index 01dbcc682f..7da897a4f2 100644
--- a/test/scaladoc/run/package-object.check
+++ b/test/scaladoc/run/package-object.check
@@ -1,3 +1,4 @@
 List(test.B, test.A, scala.AnyRef, scala.Any)
 List(B, A, AnyRef, Any)
+Some((newSource,10))
 Done.
diff --git a/test/scaladoc/run/package-object.scala b/test/scaladoc/run/package-object.scala
index 5fb5a4ddf1..f5c79b1332 100644
--- a/test/scaladoc/run/package-object.scala
+++ b/test/scaladoc/run/package-object.scala
@@ -11,6 +11,7 @@ object Test extends ScaladocModelTest {
     val p = root._package("test")
     println(p.linearizationTemplates)
     println(p.linearizationTypes)
+    println(p.inSource)
   }
 }