Add optional message to assert in Dart2js - continued

pkg/compiler/lib/src/universe/selector.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.selector;
 
 import '../common/names.dart' show
     Names;
 import '../diagnostics/spannable.dart' show
     SpannableAssertionFailure;
@@ skipping 182 matching lines @@
   bool get isSetter => kind == SelectorKind.SETTER;
   bool get isCall => kind == SelectorKind.CALL;
   bool get isClosureCall => isCall && memberName == Names.CALL_NAME;
 
   bool get isIndex => kind == SelectorKind.INDEX && argumentCount == 1;
   bool get isIndexSet => kind == SelectorKind.INDEX && argumentCount == 2;
 
   bool get isOperator => kind == SelectorKind.OPERATOR;
   bool get isUnaryOperator => isOperator && argumentCount == 0;
 
-  /** Check whether this is a call to 'assert'. */
-  bool get isAssert => isCall && identical(name, "assert");
-
   /**
    * The member name for invocation mirrors created from this selector.
    */
   String get invocationMirrorMemberName =>
       isSetter ? '$name=' : name;
 
   int get invocationMirrorKind {
     const int METHOD = 0;
     const int GETTER = 1;
     const int SETTER = 2;
@@ skipping 32 matching lines @@
     return signatureApplies(element);
   }
 
   bool signatureApplies(FunctionElement function) {
     if (Elements.isUnresolved(function)) return false;
     return callStructure.signatureApplies(function.functionSignature);
   }
 
   bool sameNameHack(Element element, World world) {
     // TODO(ngeoffray): Remove workaround checks.
-    return element.isConstructor ||
-           name == element.name ||
-           name == 'assert' && world.isAssertMethod(element);
+    return element.isConstructor || name == element.name;
   }
 
   bool applies(Element element, World world) {
     if (!sameNameHack(element, world)) return false;
     return appliesUnnamed(element, world);
   }
 
   bool match(SelectorKind kind,
              Name memberName,
              CallStructure callStructure) {
@@ skipping 10 matching lines @@
     // Add bits from the call structure.
     return Hashing.mixHashCodeBits(hash, callStructure.hashCode);
   }
 
   String toString() {
     return 'Selector($kind, $name, ${callStructure.structureToString()})';
   }
 
   Selector toCallSelector() => new Selector.callClosureFrom(this);
 }