diff options
| author | Paul Phillips <paulp@improving.org> | 2012-10-09 07:53:38 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-10-09 07:53:38 -0700 |
| commit | c61c18e042d0fa41a09fea29a8dcaa2e08a40a63 (patch) | |
| tree | d80e302ca3d0caceb53e54cb26ddf38b65ec1478 /src/compiler | |
| parent | 6d6e328bfe0a458b556e91a99019c81673860db5 (diff) | |
| parent | d1a35ccf001301881dac2baca972234d8e4d8d25 (diff) | |
| download | scala-c61c18e042d0fa41a09fea29a8dcaa2e08a40a63.tar.gz scala-c61c18e042d0fa41a09fea29a8dcaa2e08a40a63.tar.bz2 scala-c61c18e042d0fa41a09fea29a8dcaa2e08a40a63.zip | |
Merge pull request #1477 from paulp/continuations-inference-bug
Possible fix for continuations bug.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index c832987de5..688b4b5160 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -194,7 +194,7 @@ trait Typers extends Modes with Adaptations with Tags { case PolyType(_, _) => EmptyTree case _ => def wrapImplicit(from: Type): Tree = { - val result = inferImplicit(tree, functionType(from :: Nil, to), reportAmbiguous, true, context, saveErrors) + val result = inferImplicit(tree, functionType(from.withoutAnnotations :: Nil, to), reportAmbiguous, true, context, saveErrors) if (result.subst != EmptyTreeTypeSubstituter) { result.subst traverse tree notifyUndetparamsInferred(result.subst.from, result.subst.to) |