Swap order of arguments in annotations for Tasty

Author: VladimirNik

src/dotty/tools/dotc/core/tasty/TastyFormat.scala

@@ -131,7 +131,7 @@ Standard-Section: "ASTs" TopLevelStat*
                   APPLIEDtype    Length tycon_Type arg_Type*
                   TYPEBOUNDS     Length low_Type high_Type
                   TYPEALIAS      Length alias_Type (COVARIANT | CONTRAVARIANT)?
-                  ANNOTATED      Length fullAnnotation_Term underlying_Type
+                  ANNOTATED      Length underlying_Type fullAnnotation_Term
                   ANDtype        Length left_Type right_Type
                   ORtype         Length left_Type right_Type
                   BIND           Length boundName_NameRef bounds_Type

src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -239,7 +239,7 @@ class TreePickler(pickler: TastyPickler) {
         withLength { pickleType(tpe.lo, richTypes); pickleType(tpe.hi, richTypes) }
       case tpe: AnnotatedType =>
         writeByte(ANNOTATED)
-        withLength { pickleTree(tpe.annot.tree); pickleType(tpe.tpe, richTypes) }
+        withLength { pickleType(tpe.tpe, richTypes); pickleTree(tpe.annot.tree) }
       case tpe: AndOrType =>
         writeByte(if (tpe.isAnd) ANDtype else ORtype)
         withLength { pickleType(tpe.tp1, richTypes); pickleType(tpe.tp2, richTypes) }

src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -199,8 +199,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
                 else 0
               TypeAlias(alias, variance)
             case ANNOTATED =>
-              val annot = Annotation(readTerm())
-              AnnotatedType(readType(), annot)
+              AnnotatedType(readType(), Annotation(readTerm()))
             case ANDtype =>
               AndType(readType(), readType())
             case ORtype =>