Fix dynamic as bottom uses in front end and dart2js.

Re-enable the dynamic as bottom hint in analysis_options.yaml and fix
the code to be hint clean again.

Fixes #30589
Fixes #30590

Bug:
Change-Id: Idb7910b3ab1c6d931a3ead3eed885d8bd172e621
Reviewed-on: https://dart-review.googlesource.com/17062
Commit-Queue: Leaf Petersen <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: leafpetersen

pkg/compiler/analysis_options.yaml

@@ -8,7 +8,4 @@ analyzer:
     enableSuperMixins: false
   errors:
     todo: ignore
-    # https://github.com/dart-lang/sdk/issues/30589
-    # TODO(leafp): remove once #30589 is resolved
-    uses_dynamic_as_bottom: ignore
     deprecated_member_use: ignore

pkg/compiler/lib/src/dart2js.dart

@@ -43,14 +43,18 @@ String BUILD_ID = null;
  * string argument, or the arguments iterator for multiple arguments
  * handlers.
  */
-typedef void HandleOption(data);
+typedef void HandleOption(Null data);
 
 class OptionHandler {
   final String pattern;
-  final HandleOption handle;
+  final HandleOption _handle;
   final bool multipleArguments;
 
-  OptionHandler(this.pattern, this.handle, {this.multipleArguments: false});
+  void handle(argument) {
+    (_handle as dynamic)(argument);
+  }
+
+  OptionHandler(this.pattern, this._handle, {this.multipleArguments: false});
 }
 
 /**

pkg/compiler/lib/src/helpers/track_map.dart

@@ -14,7 +14,7 @@
  * is printed but only when running in verbose mode.
  */
 class TrackMap<K, V> implements Map<K, V> {
-  final Map _map;
+  final Map<K, V> _map;
   final List _counts;
   static final Map<String, List<int>> _countsMap = {};
 

pkg/compiler/lib/src/js_backend/backend_serialization.dart

@@ -231,10 +231,10 @@ class NativeBehaviorSerialization {
 
   /// Returns a list of the names of the [SpecialType]s in [types].
   static List<String> filterSpecialTypes(List types) {
-    return types
-        .where((type) => getTypeKind(type) == SPECIAL_TYPE)
-        .map((SpecialType type) => type.name)
-        .toList();
+    return types.where((type) => getTypeKind(type) == SPECIAL_TYPE).map((t) {
+      SpecialType type = t;
+      return type.name;
+    }).toList();
   }
 
   static void serializeNativeBehavior(

pkg/compiler/lib/src/js_emitter/constant_ordering.dart

@@ -43,14 +43,14 @@ class _ConstantOrdering
     return a.accept(this, b);
   }
 
-  static int compareNullable(int compare(a, b), a, b) {
+  static int compareNullable<T>(int compare(T a, T b), T a, T b) {
     if (a == null && b == null) return 0;
     if (a == null) return -1;
     if (b == null) return 1;
     return compare(a, b);
   }
 
-  static int compareLists(int compare(a, b), List a, List b) {
+  static int compareLists<S, T>(int compare(S a, T b), List<S> a, List<T> b) {
     int r = a.length.compareTo(b.length);
     if (r != 0) return r;
     for (int i = 0; i < a.length; i++) {

pkg/compiler/lib/src/serialization/equivalence.dart

@@ -39,8 +39,8 @@ bool equality(a, b) => a == b;
 
 /// Returns `true` if the elements in [a] and [b] are pair-wise equivalent
 /// according to [elementEquivalence].
-bool areListsEquivalent(List a, List b,
-    [bool elementEquivalence(a, b) = equality]) {
+bool areListsEquivalent<T>(List<T> a, List<T> b,
+    [bool elementEquivalence(T a, T b) = equality]) {
   if (a.length != b.length) return false;
   for (int i = 0; i < a.length && i < b.length; i++) {
     if (!elementEquivalence(a[i], b[i])) {
@@ -52,9 +52,9 @@ bool areListsEquivalent(List a, List b,
 
 /// Returns `true` if the elements in [a] and [b] are equivalent as sets using
 /// [elementEquivalence] to determine element equivalence.
-bool areSetsEquivalent(Iterable set1, Iterable set2,
-    [bool elementEquivalence(a, b) = equality]) {
-  Set remaining = set2.toSet();
+bool areSetsEquivalent<E>(Iterable<E> set1, Iterable<E> set2,
+    [bool elementEquivalence(E a, E b) = equality]) {
+  Set<E> remaining = set2.toSet();
   for (dynamic element1 in set1) {
     bool found = false;
     for (dynamic element2 in set2) {
@@ -73,9 +73,9 @@ bool areSetsEquivalent(Iterable set1, Iterable set2,
 
 /// Returns `true` if the content of [map1] and [map2] is equivalent using
 /// [keyEquivalence] and [valueEquivalence] to determine key/value equivalence.
-bool areMapsEquivalent(Map map1, Map map2,
-    [bool keyEquivalence(a, b) = equality,
-    bool valueEquivalence(a, b) = equality]) {
+bool areMapsEquivalent<K, V>(Map<K, V> map1, Map<K, V> map2,
+    [bool keyEquivalence(K a, K b) = equality,
+    bool valueEquivalence(V a, V b) = equality]) {
   Set remaining = map2.keys.toSet();
   for (dynamic key1 in map1.keys) {
     bool found = false;
@@ -369,9 +369,9 @@ class TestStrategy {
   /// An equivalence [TestStrategy] that doesn't throw on inequivalence.
   TestStrategy get testOnly => this;
 
-  bool test(dynamic object1, dynamic object2, String property, dynamic value1,
-      dynamic value2,
-      [bool equivalence(a, b) = equality]) {
+  bool test<T>(
+      dynamic object1, dynamic object2, String property, T value1, T value2,
+      [bool equivalence(T a, T b) = equality]) {
     return equivalence(value1, value2);
   }
 
@@ -381,16 +381,16 @@ class TestStrategy {
     return areListsEquivalent(list1, list2, elementEquivalence);
   }
 
-  bool testSets(dynamic object1, dynamic object2, String property,
-      Iterable set1, Iterable set2,
-      [bool elementEquivalence(a, b) = equality]) {
+  bool testSets<E>(dynamic object1, dynamic object2, String property,
+      Iterable<E> set1, Iterable<E> set2,
+      [bool elementEquivalence(E a, E b) = equality]) {
     return areSetsEquivalent(set1, set2, elementEquivalence);
   }
 
-  bool testMaps(
-      dynamic object1, dynamic object2, String property, Map map1, Map map2,
-      [bool keyEquivalence(a, b) = equality,
-      bool valueEquivalence(a, b) = equality]) {
+  bool testMaps<K, V>(dynamic object1, dynamic object2, String property,
+      Map<K, V> map1, Map<K, V> map2,
+      [bool keyEquivalence(K a, K b) = equality,
+      bool valueEquivalence(V a, V b) = equality]) {
     return areMapsEquivalent(map1, map2, keyEquivalence, valueEquivalence);
   }
 

pkg/compiler/lib/src/serialization/modelz.dart

@@ -790,7 +790,7 @@ abstract class ParametersMixin
     if (_functionSignature == null) {
       List<Element> requiredParameters = [];
       List<Element> optionalParameters = [];
-      List orderedOptionalParameters = [];
+      List<Element> orderedOptionalParameters = [];
       int requiredParameterCount = 0;
       int optionalParameterCount = 0;
       bool optionalParametersAreNamed = false;

pkg/compiler/lib/src/serialization/serialization.dart

@@ -382,7 +382,7 @@ abstract class AbstractDecoder<M, K> {
   /// If no value is associated with [key], then if [isOptional] is `true`,
   /// and empty [List] is returned, otherwise an exception is thrown.
   List<Element> getElements(K key, {bool isOptional: false}) {
-    List list = _map[_getKeyValue(key)];
+    List<int> list = _map[_getKeyValue(key)];
     if (list == null) {
       if (isOptional) {
         return const [];
@@ -414,7 +414,7 @@ abstract class AbstractDecoder<M, K> {
   /// If no value is associated with [key], then if [isOptional] is `true`,
   /// and empty [List] is returned, otherwise an exception is thrown.
   List<ConstantExpression> getConstants(K key, {bool isOptional: false}) {
-    List list = _map[_getKeyValue(key)];
+    List<int> list = _map[_getKeyValue(key)];
     if (list == null) {
       if (isOptional) {
         return const [];
@@ -446,7 +446,7 @@ abstract class AbstractDecoder<M, K> {
   /// If no value is associated with [key], then if [isOptional] is `true`,
   /// and empty [List] is returned, otherwise an exception is thrown.
   List<ResolutionDartType> getTypes(K key, {bool isOptional: false}) {
-    List list = _map[_getKeyValue(key)];
+    List<int> list = _map[_getKeyValue(key)];
     if (list == null) {
       if (isOptional) {
         return const [];

pkg/compiler/tool/track_memory.dart

@@ -76,7 +76,7 @@ Future _sendMessage(String method, [Map args = const {}]) {
 }
 
 /// Handle all responses
-_handleResponse(String s) {
+void _handleResponse(Object s) {
   var json = JSON.decode(s);
   if (json['method'] != 'streamNotify') {
     var id = json['id'];

pkg/front_end/analysis_options.yaml

@@ -16,10 +16,6 @@ analyzer:
     # Allow having TODOs in the code
     todo: ignore
 
-    # https://github.com/dart-lang/sdk/issues/30590
-    # TODO(leafp): remove once #30590 is resolved
-    uses_dynamic_as_bottom: ignore
-
     # Allow deprecated calls (although it would be nice to have a distinction
     # between internal and external deprecated calls).
     deprecated_member_use: ignore

pkg/front_end/lib/src/byte_store/file_byte_store.dart

@@ -91,7 +91,8 @@ class EvictingFileByteStore implements ByteStore {
    * This function is started in a new isolate, receives cache folder clean up
    * requests and evicts older files from the folder.
    */
-  static void _cacheCleanUpFunction(SendPort initialReplyTo) {
+  static void _cacheCleanUpFunction(message) {
+    SendPort initialReplyTo = message;
     ReceivePort port = new ReceivePort();
     initialReplyTo.send(port.sendPort);
     port.listen((request) async {

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -461,7 +461,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
       _typeInferrer.inferMetadata(annotations);
       Field field = fields.first.target;
       // The first (and often only field) will not get a clone.
-      annotations.forEach(field.addAnnotation);
+      annotations.forEach((annotation) => field.addAnnotation(annotation));
       for (int i = 1; i < fields.length; i++) {
         // We have to clone the annotations on the remaining fields.
         field = fields[i].target;

pkg/front_end/lib/src/multi_root_file_system.dart

@@ -79,5 +79,7 @@ class MultiRootFileSystemEntity implements FileSystemEntity {
   Future<String> readAsString() async => (await delegate).readAsString();
 }
 
-_normalize(Uri uri) =>
-    uri.path.endsWith('/') ? uri : uri.replace(path: '${uri.path}/');
+_normalize(root) {
+  Uri uri = root;
+  return uri.path.endsWith('/') ? uri : uri.replace(path: '${uri.path}/');
+}

pkg/js_ast/lib/src/printer.dart

@@ -4,7 +4,7 @@
 
 part of js_ast;
 
-typedef String Renamer(Name);
+typedef String Renamer(Name name);
 
 class JavaScriptPrintingOptions {
   final bool shouldCompressOutput;

tests/compiler/dart2js/analysis_options.yaml

@@ -10,9 +10,6 @@ analyzer:
 
   errors:
     todo: ignore
-    # https://github.com/dart-lang/sdk/issues/30589
-    # TODO(leafp): remove once #30589 is resolved
-    uses_dynamic_as_bottom: ignore
     deprecated_member_use: ignore
 
   exclude:

tests/compiler/dart2js/constant_expression_evaluate_test.dart

@@ -32,7 +32,7 @@ class TestData {
   final String declarations;
 
   /// Tested constants.
-  final List constants;
+  final List<ConstantData> constants;
 
   const TestData(this.name, this.declarations, this.constants);
 }
@@ -446,7 +446,7 @@ main() {
 Future testData(TestData data) async {
   StringBuffer sb = new StringBuffer();
   sb.write('${data.declarations}\n');
-  Map constants = {};
+  Map<String, ConstantData> constants = {};
   data.constants.forEach((ConstantData constantData) {
     String name = 'c${constants.length}';
     sb.write('const $name = ${constantData.code};\n');

tests/compiler/dart2js/constant_expression_test.dart

@@ -19,7 +19,7 @@ class TestData {
   final String declarations;
 
   /// Tested constants.
-  final List constants;
+  final List<ConstantData> constants;
 
   const TestData(this.declarations, this.constants);
 }
@@ -192,7 +192,7 @@ main() {
 Future testData(TestData data) async {
   StringBuffer sb = new StringBuffer();
   sb.write('${data.declarations}\n');
-  Map constants = {};
+  Map<String, ConstantData> constants = {};
   data.constants.forEach((ConstantData constantData) {
     String name = 'c${constants.length}';
     sb.write('const $name = ${constantData.code};\n');

tests/compiler/dart2js/dart2js_batch2_test.dart

@@ -49,7 +49,7 @@ void cleanUp() {
   tmpDir.deleteSync(recursive: true);
 }
 
-Future launchDart2Js(_) {
+Future<Process> launchDart2Js(_) {
   String ext = Platform.isWindows ? '.bat' : '';
   String command = path.normalize(path.join(
       path.fromUri(Platform.script), '../../../../sdk/bin/dart2js${ext}'));

tests/compiler/dart2js/dart2js_batch_test.dart

@@ -52,7 +52,7 @@ void cleanUp() {
   tmpDir.deleteSync(recursive: true);
 }
 
-Future launchDart2Js(_) {
+Future<Process> launchDart2Js(_) {
   return Process.start(
       // Use an absolute path because we are changing the cwd below.
       path.fromUri(Uri.base.resolve(Platform.executable)),