#1086. @compile-errors replaced by static errors in multitests
diff --git a/Language/Expressions/Identifier_Reference/syntax_t06.dart b/Language/Expressions/Identifier_Reference/syntax_t06.dart
index 2a86195..5251dca 100644
--- a/Language/Expressions/Identifier_Reference/syntax_t06.dart
+++ b/Language/Expressions/Identifier_Reference/syntax_t06.dart
@@ -34,13 +34,24 @@
 ///   ‘A’ ..‘Z’

 /// ;

 /// @description Checks that identifier can't contain '@' symbol.

-/// @compile-error

 /// @author msyabro

 

-

 main() {

-  int? a@                      //# 01: compile-time error

-  String b@ = "It's wrong!";    //# 02: compile-time error

-  var c@;                       //# 03: compile-time error

-  d@;                           //# 04: compile-time error

-}

+  int? a@;

+//^^^^^^^^

+// [analyzer] unspecified

+// [cfe] unspecified

+

+  String b@ = "It's wrong!";

+//^^

+// [analyzer] unspecified

+// [cfe] unspecified

+

+  var c@;

+//    ^^^

+// [analyzer] unspecified

+// [cfe] unspecified

+  }

+//^

+// [analyzer] unspecified

+// [cfe] unspecified

diff --git a/Language/Generics/typedef_A01_t05.dart b/Language/Generics/typedef_A01_t05.dart
index 63f0de3..a9173dc 100644
--- a/Language/Generics/typedef_A01_t05.dart
+++ b/Language/Generics/typedef_A01_t05.dart
@@ -12,7 +12,6 @@
 ///   T
 /// ...
 /// @description Checks that exception is thrown if generic metadata is incorrect
-/// @compile-error
 /// @author iarkh@unipro.ru
 
 // SharedOptions=--enable-experiment=nonfunction-type-aliases
@@ -20,19 +19,53 @@
 int i = 1;
 class C<T> {}
 
-@i typedef CAlias<T> = Function();                               //# 01: compile-time error
+  @i typedef CAlias<T> = Function();
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
 
-@i typedef Alias1<T> = Function<T1 extends T>();                 //# 02: compile-time error
-@i typedef Alias2<T> = void Function<T1 extends T>(T);           //# 03: compile-time error
-@i typedef Alias3<T> = T Function<T1 extends T>(T);              //# 04: compile-time error
-@i typedef Alias4<T> = String Function<T1 extends T>(T);         //# 05: compile-time error
-@i typedef Alias5<T> = Function<T1 extends T>(int, int, T);      //# 06: compile-time error
-@i typedef Alias6<T> = Function<T1 extends T>(int, int, T, [T]); //# 07: compile-time error
-@i typedef Alias7<T> = Function<T1 extends T>(int, [T, T, T]);   //# 08: compile-time error
+  @i typedef Alias1<T> = Function<T1 extends T>();
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @i typedef Alias2<T> = void Function<T1 extends T>(T);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
 
-@A() typedef Alias9<T1, T2>  = T1 Function<TT1 extends T1, TT2 extends T2>();               //# 09: compile-time error
-@A() typedef Alias10<T1, T2> = T1 Function<TT1 extends T1, TT2 extends T2>(T2, {int a});    //# 10: compile-time error
-@A() typedef Alias11<T1, T2> = T1 Function<TT1 extends T1, TT2 extends T2>([T1 a1, T2 a2]); //# 11: compile-time error
+  @i typedef Alias3<T> = T Function<T1 extends T>(T);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @i typedef Alias4<T> = String Function<T1 extends T>(T);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @i typedef Alias5<T> = Function<T1 extends T>(int, int, T);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @i typedef Alias6<T> = Function<T1 extends T>(int, int, T, [T]);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @i typedef Alias7<T> = Function<T1 extends T>(int, [T, T, T]);
+//^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  @A() typedef Alias9<T1, T2>  = T1 Function<TT1 extends T1, TT2 extends T2>();
+//^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @A() typedef Alias10<T1, T2> = T1 Function<TT1 extends T1, TT2 extends T2>(T2, {int a});
+//^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  @A() typedef Alias11<T1, T2> = T1 Function<TT1 extends T1, TT2 extends T2>([T1 a1, T2 a2]);
+//^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 
 main() {
 }
diff --git a/LanguageFeatures/Extension-methods/scope_t02.dart b/LanguageFeatures/Extension-methods/scope_t02.dart
index b3e4dc7..87cdad6 100644
--- a/LanguageFeatures/Extension-methods/scope_t02.dart
+++ b/LanguageFeatures/Extension-methods/scope_t02.dart
@@ -7,15 +7,20 @@
 ///
 /// @description Check that it is a compile error if extensions have name
 /// conflict
-/// @compile-error
 /// @author sgrekhov@unipro.ru
 
-
 import "scope_all_lib.dart";
 import "scope_bar_lib.dart";
 
 main() {
   List<String> list = ["Lily", "was", "here"];
-  Bar(list).bar();      //# 01: compile-time error
-  Bar.staticBar;        //# 02: compile-time error
+  Bar(list).bar();
+//^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+
+  Bar.staticBar;
+//^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 }
diff --git a/LanguageFeatures/int-to-double/assignment_fail_t01.dart b/LanguageFeatures/int-to-double/assignment_fail_t01.dart
index d0f2724..80d8afc 100644
--- a/LanguageFeatures/int-to-double/assignment_fail_t01.dart
+++ b/LanguageFeatures/int-to-double/assignment_fail_t01.dart
@@ -6,16 +6,19 @@
 /// @description Checks that the static type of a double valued integer literal
 /// is [double]. Test that it is a compile error if int is not assignable to type
 /// X with is not [double]
-/// @compile-error
 /// @author sgrekhov@unipro.ru
 
-
-
 class C<X extends num> {
-  X x = 42;     //# 01: compile-time error
-  X x = 0x42;   //# 02: compile-time error
+  X x1 = 42;
+//       ^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  X x2 = 0x42;
+//       ^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 }
 
 main() {
-  C<double> c = new C<double>();
+  new C<double>();
 }
diff --git a/LanguageFeatures/int-to-double/assignment_fail_t02.dart b/LanguageFeatures/int-to-double/assignment_fail_t02.dart
index c0c6901..0decfbc 100644
--- a/LanguageFeatures/int-to-double/assignment_fail_t02.dart
+++ b/LanguageFeatures/int-to-double/assignment_fail_t02.dart
@@ -6,16 +6,19 @@
 /// @description Checks that the static type of a double valued integer literal
 /// is [double]. Test that it is a compile error if int is not assignable to type
 /// X with extends [double]
-/// @compile-error
 /// @author sgrekhov@unipro.ru
 
-
-
 class C<X extends double> {
-  X x = 42;     //# 01: compile-time error
-  X x = 0x42;   //# 02: compile-time error
+  X x1 = 42;
+//       ^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  X x = 0x42;
+//      ^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 }
 
 main() {
-  C<double> c = new C<double>();
+  new C<double>();
 }
diff --git a/LanguageFeatures/int-to-double/return_value_fail_t01.dart b/LanguageFeatures/int-to-double/return_value_fail_t01.dart
index f61971d..7e5e299 100644
--- a/LanguageFeatures/int-to-double/return_value_fail_t01.dart
+++ b/LanguageFeatures/int-to-double/return_value_fail_t01.dart
@@ -6,22 +6,38 @@
 /// @description Checks that the static type of a double valued integer literal
 /// is [double]. Test that it is a compile error if int is not assignable to
 /// type X
-/// @compile-error
 /// @author sgrekhov@unipro.ru
 
-
 class C<X extends num> {
-  X get instanceGetter => 42;       //# 01: compile-time error
-  X get instanceGetter => 0x42;     //# 02: compile-time error
-  X instanceMethod() => 42;         //# 03: compile-time error
-  X instanceMethod() => 0x42;       //# 04: compile-time error
+  X get instanceGetter1 => 42;
+//                         ^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  X get instanceGetter2 => 0x42;
+//                         ^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  X instanceMethod1() => 42;
+//                       ^^
+// [analyzer] unspecified
+// [cfe] unspecified
+  X instanceMethod2() => 0x42;
+//                       ^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 }
 
-X foo<X extends num>() => 42;       //# 05: compile-time error
-X foo<X extends num>() => 0x42;     //# 06: compile-time error
+X foo1<X extends num>() => 42;
+//                         ^^
+// [analyzer] unspecified
+// [cfe] unspecified
+X foo2<X extends num>() => 0x42;
+//                         ^^^^
+// [analyzer] unspecified
+// [cfe] unspecified
 
 main() {
   C<double> c = new C<double>();
-  foo<double>();                    //# 05: compile-time error
-  foo<double>();                    //# 06: compile-time error
+  foo1<double>();
+  foo2<double>();
 }