Revert "Enable full type-checks in checked mode."

sdk/lib/_internal/compiler/implementation/js_backend/backend.dart

 // Copyright (c) 2012, 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.
 
 part of js_backend;
 
 typedef void Recompile(Element element);
 
 class ReturnInfo {
   HType returnType;
@@ skipping 1211 matching lines @@
 
   void registerTypeVariableExpression(TreeElements elements) {
     registerRuntimeType(elements);
     enqueueInResolution(getRuntimeTypeToString(), elements);
     enqueueInResolution(getCreateRuntimeType(), elements);
   }
 
   void registerIsCheck(DartType type, Enqueuer world, TreeElements elements) {
     world.registerInstantiatedClass(compiler.boolClass, elements);
     bool isTypeVariable = type.kind == TypeKind.TYPE_VARIABLE;
-    bool inCheckedMode = compiler.enableTypeAssertions;
     if (!type.isRaw || isTypeVariable) {
       enqueueInResolution(getSetRuntimeTypeInfo(), elements);
       enqueueInResolution(getGetRuntimeTypeInfo(), elements);
       enqueueInResolution(getGetRuntimeTypeArgument(), elements);
-      if (inCheckedMode) {
-        enqueueInResolution(getAssertSubtype(), elements);
-      }
       enqueueInResolution(getCheckSubtype(), elements);
       if (isTypeVariable) {
-        enqueueInResolution(getCheckSubtypeOfRuntimeType(), elements);
-        if (inCheckedMode) {
-          enqueueInResolution(getAssertSubtypeOfRuntimeType(), elements);
-        }
+        enqueueInResolution(getGetObjectIsSubtype(), elements);
       }
       world.registerInstantiatedClass(compiler.listClass, elements);
     }
     // [registerIsCheck] is also called for checked mode checks, so we
     // need to register checked mode helpers.
-    if (inCheckedMode) {
+    if (compiler.enableTypeAssertions) {
       Element e = getCheckedModeHelper(type, typeCast: false);
       if (e != null) world.addToWorkList(e);
       // We also need the native variant of the check (for DOM types).
       e = getNativeCheckedModeHelper(type, typeCast: false);
       if (e != null) world.addToWorkList(e);
     }
     if (type.element.isNative()) {
       // We will neeed to add the "$is" and "$as" properties on the
       // JavaScript object prototype, so we make sure
       // [:defineProperty:] is compiled.
@@ skipping 65 matching lines @@
       });
     }
     // TODO(ngeoffray): Also handle T a (in checked mode).
   }
 
   void registerClassUsingVariableExpression(ClassElement cls) {
     rti.classesUsingTypeVariableExpression.add(cls);
   }
 
   bool needsRti(ClassElement cls) {
-    return rti.classesNeedingRti.contains(cls.declaration) ||
-        compiler.enabledRuntimeType;
+    return rti.classesNeedingRti.contains(cls.declaration)
+        || compiler.enabledRuntimeType;
   }
 
   bool isDefaultNoSuchMethodImplementation(Element element) {
     assert(element.name == Compiler.NO_SUCH_METHOD);
     ClassElement classElement = element.getEnclosingClass();
     return classElement == compiler.objectClass
         || classElement == jsInterceptorClass;
   }
 
   bool isDefaultEqualityImplementation(Element element) {
@@ skipping 244 matching lines @@
     }
   }
 
   /**
    * Returns the checked mode helper that will be needed to do a type check/type
    * cast on [type] at runtime. Note that this method is being called both by
    * the resolver with interface types (int, String, ...), and by the SSA
    * backend with implementation types (JSInt, JSString, ...).
    */
   Element getCheckedModeHelper(DartType type, {bool typeCast}) {
-    SourceString name = getCheckedModeHelperName(
-        type, typeCast: typeCast, nativeCheckOnly: false);
-    return compiler.findHelper(name);
+    return compiler.findHelper(getCheckedModeHelperName(
+        type, typeCast: typeCast, nativeCheckOnly: false));
   }
 
   /**
    * Returns the native checked mode helper that will be needed to do a type
    * check/type cast on [type] at runtime. If no native helper exists for
    * [type], [:null:] is returned.
    */
   Element getNativeCheckedModeHelper(DartType type, {bool typeCast}) {
     SourceString sourceName = getCheckedModeHelperName(
         type, typeCast: typeCast, nativeCheckOnly: true);
@@ skipping 78 matching lines @@
           return typeCast
               ? const SourceString("listSuperNativeTypeCast")
               : const SourceString('listSuperNativeTypeCheck');
         } else {
           return typeCast
               ? const SourceString("listSuperTypeCast")
               : const SourceString('listSuperTypeCheck');
         }
       } else {
         if (nativeCheck) {
-          // TODO(karlklose): can we get rid of this branch when we use
-          // interceptors?
           return typeCast
               ? const SourceString("interceptedTypeCast")
               : const SourceString('interceptedTypeCheck');
         } else {
-          if (typeCast) {
-            return const SourceString("propertyTypeCast");
-          }
-          if (type.kind == TypeKind.INTERFACE && !type.isRaw) {
-            return const SourceString('assertSubtype');
-          } else if (type.kind == TypeKind.TYPE_VARIABLE) {
-            return const SourceString('assertSubtypeOfRuntimeType');
-          } else {
-            return const SourceString('propertyTypeCheck');
-          }
+          return typeCast
+              ? const SourceString("propertyTypeCast")
+              : const SourceString('propertyTypeCheck');
         }
       }
     }
   }
 
   void dumpInferredTypes() {
     print("Inferred argument types:");
     print("------------------------");
     argumentTypes.dump();
     print("");
@@ skipping 62 matching lines @@
   }
 
   Element getRuntimeTypeToString() {
     return compiler.findHelper(const SourceString('runtimeTypeToString'));
   }
 
   Element getCheckSubtype() {
     return compiler.findHelper(const SourceString('checkSubtype'));
   }
 
-  Element getAssertSubtype() {
-    return compiler.findHelper(const SourceString('assertSubtype'));
-  }
-
-  Element getCheckSubtypeOfRuntimeType() {
-    return compiler.findHelper(const SourceString('checkSubtypeOfRuntimeType'));
-  }
-
-  Element getAssertSubtypeOfRuntimeType() {
-    return compiler.findHelper(
-        const SourceString('assertSubtypeOfRuntimeType'));
+  Element getGetObjectIsSubtype() {
+    return compiler.findHelper(const SourceString('objectIsSubtype'));
   }
 
   Element getThrowNoSuchMethod() {
     return compiler.findHelper(const SourceString('throwNoSuchMethod'));
   }
 
   Element getCreateRuntimeType() {
     return compiler.findHelper(const SourceString('createRuntimeType'));
   }
 
@@ skipping 33 matching lines @@
   ClassElement get listImplementation => jsArrayClass;
   ClassElement get constListImplementation => jsArrayClass;
   ClassElement get fixedListImplementation => jsFixedArrayClass;
   ClassElement get growableListImplementation => jsExtendableArrayClass;
   ClassElement get mapImplementation => mapLiteralClass;
   ClassElement get constMapImplementation => constMapLiteralClass;
   ClassElement get typeImplementation => typeLiteralClass;
   ClassElement get boolImplementation => jsBoolClass;
   ClassElement get nullImplementation => jsNullClass;
 }