Merge branch 'pr/merge-2.10.2' into master

* pr/merge-2.10.2:
  SI-7375 ClassTag for value class aliases
  SI-7507 Fix lookup of private[this] member in presence of self type.
  SI-7532 Fix regression in Java inner classfile reader
  SI-7517 Fix higher kinded type inference regression
  SI-7516 Revert "SI-7234 Make named args play nice w. depmet types"
  A test case for a recent LUB progression.
  SI-7421 remove unneeded extra-attachement in maven deploy
  SI-7486 Regressions in implicit search.
  SI-7509 Avoid crasher as erronous args flow through NamesDefaults
  SI-6138 Centralize and refine detection of `getClass` calls
  SI-7497 Fix scala.util.Properties.isMac
  SI-7473 Bad for expr crashes postfix
  Increase build.number to 2.10.3
  SI-7391 Always use ForkJoin in Scala actors on ... ... Java 6 and above (except when the porperty actors.enableForkJoin says otherwise)
  Reimplementing much of the DefaultPromise methods Optimizations: 1) Avoiding to call 'synchronized' in tryComplete and in tryAwait 2) Implementing blocking by using an optimized latch so no blocking ops for non-blockers 3) Reducing method size of isCompleted to be cheaper to inline 4) 'result' to use Try.get instead of patmat
  c.typeCheck(silent = true) now suppresses ambiguous errors

Conflicts:
	bincompat-backward.whitelist.conf
	bincompat-forward.whitelist.conf
	src/compiler/scala/reflect/macros/contexts/Typers.scala
	src/compiler/scala/reflect/reify/package.scala
	src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
	src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/compiler/scala/tools/reflect/ToolBoxFactory.scala
	src/library/scala/concurrent/impl/Promise.scala
	src/reflect/scala/reflect/internal/Types.scala

3 files changed, 43 insertions, 0 deletions

diff --git a/test/pending/pos/t7234.scala b/test/pending/pos/t7234.scala
new file mode 100644
index 0000000000..59a233d835
--- /dev/null
+++ b/test/pending/pos/t7234.scala
@@ -0,0 +1,15 @@
+trait Main {
+  trait A {
+    type B
+  }
+  trait C {
+    def c(a: A, x: Int = 0)(b: a.B)
+  }
+  def c: C
+  def d(a: A, x: Int = 0)(b: a.B)
+
+  def ok1(a: A)(b: a.B) = c.c(a, 42)(b)
+  def ok2(a: A)(b: a.B) = d(a)(b)
+
+  def fail(a: A)(b: a.B) = c.c(a)(b)
+}
diff --git a/test/pending/pos/t7234b.scala b/test/pending/pos/t7234b.scala
new file mode 100644
index 0000000000..fee98e87a8
--- /dev/null
+++ b/test/pending/pos/t7234b.scala
@@ -0,0 +1,20 @@
+trait Main {
+  trait A {
+    type B
+    def b: B
+  }
+  trait C {
+    def c(a: A, x: Int = 0)(b: => a.B, bs: a.B*)
+    def d(a: A = null, x: Int = 0)(b1: => a.B = a.b, b2: a.B = a.b)
+  }
+  def c: C
+  def ok(a: A)(b: a.B) = c.c(a, 42)(b)
+  def fail(a: A)(b: a.B) = c.c(a)(b)
+  def fail2(a: A)(b: a.B) = c.c(a)(b, b)
+  def fail3(a: A)(b: a.B) = c.c(a)(b, Seq[a.B](b): _*)
+
+  def fail4(a: A)(b: a.B) = c.d(a)()
+  def fail5(a: A)(b: a.B) = c.d(a)(b1 = a.b)
+  def fail6(a: A)(b: a.B) = c.d(a)(b2 = a.b)
+  def fail7(a: A)(b: a.B) = c.d()()
+}
diff --git a/test/pending/pos/t7486.scala b/test/pending/pos/t7486.scala
new file mode 100644
index 0000000000..6dd7f4c4ac
--- /dev/null
+++ b/test/pending/pos/t7486.scala
@@ -0,0 +1,8 @@
+object Test{
+  var locker = 0
+  // remove implicit, or change to `locker = locker + 1` to make it compile.
+  implicit val davyJones0 = {
+    locker += 0
+    0
+  }
+}