diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-30 11:45:27 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-30 11:45:27 -0700 |
| commit | c9e254ec27b8153c9b9921abb308b2e3a2c07599 (patch) | |
| tree | d39e5f4d12c7ee2c172f18ca6a3dc075c9405962 | |
| parent | fc177075b332ac645facf6287427bc5dbd082c76 (diff) | |
| download | scala-c9e254ec27b8153c9b9921abb308b2e3a2c07599.tar.gz scala-c9e254ec27b8153c9b9921abb308b2e3a2c07599.tar.bz2 scala-c9e254ec27b8153c9b9921abb308b2e3a2c07599.zip | |
Backport fix for SI-4545, SI-5633.
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Definitions.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala index cbf73463f3..264df8b700 100644 --- a/src/compiler/scala/tools/nsc/symtab/Definitions.scala +++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala @@ -471,8 +471,8 @@ trait Definitions extends reflect.generic.StandardDefinitions { def isFunctionType(tp: Type): Boolean = tp.normalize match { case TypeRef(_, sym, args) if args.nonEmpty => - val len = args.length - len < MaxFunctionArity && sym == FunctionClass(len - 1) + val arity = args.length - 1 // -1 is the return type + arity <= MaxFunctionArity && sym == FunctionClass(arity) case _ => false } |