diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-03 23:32:26 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-03 23:32:26 -0800 |
commit | f482d5bdd0722e54cb3cfc2219df93da5f435bac (patch) | |
tree | 75649efafadabd20d2bb68c931e24c0ccc9303b0 /src/reflect | |
parent | 2cf6c5d7e5cfbd60958eac0a545f5c2978a8e5cd (diff) | |
parent | 33e32179fd6dcf06554b817f54b97ac5a6e052ab (diff) | |
download | scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.tar.gz scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.tar.bz2 scala-f482d5bdd0722e54cb3cfc2219df93da5f435bac.zip |
Merge 2.10.1 into 2.10.x
The fix for SI-7183 in 440bf0a8c2 was forward ported in f73d50f46c.
Conflicts:
src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 546df8a207..f5f577677c 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -3183,12 +3183,19 @@ trait Types extends api.Types { self: SymbolTable => * ?TC[?T] <: Any * }}} */ - def unifySimple = ( - (params.isEmpty || tp.typeSymbol == NothingClass || tp.typeSymbol == AnyClass) && { + def unifySimple = { + val sym = tp.typeSymbol + if (sym == NothingClass || sym == AnyClass) { // kind-polymorphic + // SI-7126 if we register some type alias `T=Any`, we can later end + // with malformed types like `T[T]` during type inference in + // `handlePolymorphicCall`. No such problem if we register `Any`. + addBound(sym.tpe) + true + } else if (params.isEmpty) { addBound(tp) true - } - ) + } else false + } /** Full case: involving a check of the form * {{{ |