fixed #1500 and #1501

1 files changed, 13 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Variances.scala b/src/compiler/scala/tools/nsc/typechecker/Variances.scala
index b5efa7035d..e0cbc99fa0 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Variances.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Variances.scala
@@ -64,6 +64,18 @@ trait Variances {
     v
   }
 
+  /** Compute variance of type parameter `tparam' in all type annotations `attribs'. */
+  def varianceInAttribs(attribs: List[AnnotationInfo])(tparam: Symbol): Int = {
+    (VARIANCES /: attribs) ((v, attrib) => v & varianceInAttrib(attrib)(tparam))
+  }
+
+  /** Compute variance of type parameter `tparam' in type annotation `attrib'. */
+  def varianceInAttrib(attrib: AnnotationInfo)(tparam: Symbol): Int = {
+    varianceInType(attrib.atp)(tparam)
+  }
+
+
+
   /** Compute variance of type parameter <code>tparam</code> in type <code>tp</code>. */
   def varianceInType(tp: Type)(tparam: Symbol): Int = tp match {
     case ErrorType | WildcardType | NoType | NoPrefix | ThisType(_) | ConstantType(_) =>
@@ -84,6 +96,6 @@ trait Variances {
     case ExistentialType(tparams, restpe) =>
       varianceInSyms(tparams)(tparam) & varianceInType(restpe)(tparam)
     case AnnotatedType(attribs, tp, _) =>
-      varianceInType(tp)(tparam)
+      varianceInAttribs(attribs)(tparam) & varianceInType(tp)(tparam)
   }
 }