Distinguish between malformed and malbounded types more efficiently using the

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 44 matching lines @@
     "Show names of internal classes (e.g. \"OneByteString\") in error messages "
     "instead of showing the corresponding interface names (e.g. \"String\")");
 DEFINE_FLAG(bool, trace_disabling_optimized_code, false,
     "Trace disabling optimized code.");
 DEFINE_FLAG(bool, throw_on_javascript_int_overflow, false,
     "Throw an exception when the result of an integer calculation will not "
     "fit into a javascript integer.");
 DECLARE_FLAG(bool, eliminate_type_checks);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, error_on_bad_override);
-DECLARE_FLAG(bool, error_on_bad_type);
 DECLARE_FLAG(bool, trace_compiler);
 DECLARE_FLAG(bool, trace_deoptimization);
 DECLARE_FLAG(bool, trace_deoptimization_verbose);
 DECLARE_FLAG(bool, verbose_stacktrace);
 DECLARE_FLAG(charp, coverage_dir);
 
 static const char* kGetterPrefix = "get:";
 static const intptr_t kGetterPrefixLength = strlen(kGetterPrefix);
 static const char* kSetterPrefix = "set:";
 static const intptr_t kSetterPrefixLength = strlen(kSetterPrefix);
@@ skipping 2770 matching lines @@
     Error& error = Error::Handle();
     for (intptr_t i = 0; i < interfaces.Length(); i++) {
       interface ^= interfaces.At(i);
       if (!interface.IsFinalized()) {
         // We may be checking bounds at finalization time and can encounter
         // a still unfinalized interface.
         ClassFinalizer::FinalizeType(
             thsi, interface, ClassFinalizer::kCanonicalize);
         interfaces.SetAt(i, interface);
       }
-      error = Error::null();
-      if (interface.IsMalboundedWithError(&error)) {
+      if (interface.IsMalbounded()) {
         // Return the first bound error to the caller if it requests it.
         if ((bound_error != NULL) && bound_error->IsNull()) {
-          ASSERT(!error.IsNull());
-          *bound_error = error.raw();
+          *bound_error = interface.error();
         }
         continue;  // Another interface may work better.
       }
       interface_class = interface.type_class();
       interface_args = interface.arguments();
       if (!interface_args.IsNull() && !interface_args.IsInstantiated()) {
         // This type class implements an interface that is parameterized with
         // generic type(s), e.g. it implements List<T>.
         // The uninstantiated type T must be instantiated using the type
         // parameters of this type before performing the type test.
@@ skipping 8533 matching lines @@
 }
 
 
 bool AbstractType::IsMalformed() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return false;
 }
 
 
-bool AbstractType::IsMalboundedWithError(Error* bound_error) const {
+bool AbstractType::IsMalbounded() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return false;
 }
 
 
-RawError* AbstractType::malformed_error() const {
+bool AbstractType::IsMalformedOrMalbounded() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
-  return Error::null();
+  return false;
 }
 
 
-void AbstractType::set_malformed_error(const Error& value) const {
+RawLanguageError* AbstractType::error() const {
+  // AbstractType is an abstract class.
+  UNREACHABLE();
+  return LanguageError::null();
+}
+
+
+void AbstractType::set_error(const LanguageError& value) const {
   // AbstractType is an abstract class.
   UNREACHABLE();
 }
 
 
 bool AbstractType::Equals(const Instance& other) const {
   // AbstractType is an abstract class.
   ASSERT(raw() == AbstractType::null());
   return other.IsNull();
 }
@@ skipping 208 matching lines @@
     return false;
   }
   // In case the type checked in a type test is malbounded, the code generator
   // may compile a throw instead of a run time call performing the type check.
   // However, in checked mode, a function type may include malbounded result
   // type and/or malbounded parameter types, which will then be encountered here
   // at run time.
   if (IsMalbounded()) {
     ASSERT(FLAG_enable_type_checks);
     if ((bound_error != NULL) && bound_error->IsNull()) {
-      const bool is_malbounded = IsMalboundedWithError(bound_error);
-      ASSERT(is_malbounded);
+      *bound_error = error();
     }
     return false;
   }
   if (other.IsMalbounded()) {
     ASSERT(FLAG_enable_type_checks);
     if ((bound_error != NULL) && bound_error->IsNull()) {
-      const bool other_is_malbounded = other.IsMalboundedWithError(bound_error);
-      ASSERT(other_is_malbounded);
+      *bound_error = other.error();
     }
     return false;
   }
   if (IsBoundedType() || other.IsBoundedType()) {
     if (Equals(other)) {
       return true;
     }
     return false;  // TODO(regis): We should return "maybe after instantiation".
   }
   // Type parameters cannot be handled by Class::TypeTest().
@@ skipping 158 matching lines @@
 }
 
 
 void Type::set_is_being_finalized() const {
   ASSERT(!IsFinalized() && !IsBeingFinalized());
   set_type_state(RawType::kBeingFinalized);
 }
 
 
 bool Type::IsMalformed() const {
-  return raw_ptr()->malformed_error_ != Error::null();
+  if (raw_ptr()->error_ == LanguageError::null()) {
+    return false;
+  }
+  const LanguageError& type_error = LanguageError::Handle(error());
+  return type_error.kind() == LanguageError::kMalformedType;
 }
 
 
-bool Type::IsMalboundedWithError(Error* bound_error) const {
-  if (!FLAG_enable_type_checks && !FLAG_error_on_bad_type) {
+bool Type::IsMalbounded() const {
+  if (!FLAG_enable_type_checks) {
     return false;
   }
-  ASSERT(IsResolved());
-  ASSERT(!IsMalformed());  // Must be checked first.
-  if (arguments() == AbstractTypeArguments::null()) {
+  if (raw_ptr()->error_ == LanguageError::null()) {
     return false;
   }
-  const AbstractTypeArguments& type_arguments =
-      AbstractTypeArguments::Handle(arguments());
-  const intptr_t num_type_args = type_arguments.Length();
-  AbstractType& type_arg = AbstractType::Handle();
-  for (intptr_t i = 0; i < num_type_args; i++) {
-    type_arg = type_arguments.TypeAt(i);
-    ASSERT(!type_arg.IsNull());
-    if (type_arg.IsMalboundedWithError(bound_error)) {
-      return true;
-    }
-  }
-  return false;
+  const LanguageError& type_error = LanguageError::Handle(error());
+  return type_error.kind() == LanguageError::kMalboundedType;
 }
 
 
-void Type::set_malformed_error(const Error& value) const {
-  StorePointer(&raw_ptr()->malformed_error_, value.raw());
+bool Type::IsMalformedOrMalbounded() const {
+  if (raw_ptr()->error_ == LanguageError::null()) {
+    return false;
+  }
+  const LanguageError& type_error = LanguageError::Handle(error());
+  if (type_error.kind() == LanguageError::kMalformedType) {
+    return true;
+  }
+  ASSERT(type_error.kind() == LanguageError::kMalboundedType);
+  return FLAG_enable_type_checks;
 }
 
 
-RawError* Type::malformed_error() const {
-  ASSERT(IsMalformed());
-  return raw_ptr()->malformed_error_;
+void Type::set_error(const LanguageError& value) const {
+  StorePointer(&raw_ptr()->error_, value.raw());
 }
 
 
 bool Type::IsResolved() const {
   if (IsFinalized()) {
     return true;
   }
   if (!HasResolvedTypeClass()) {
     return false;
   }
@@ skipping 483 matching lines @@
 void TypeParameter::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 bool BoundedType::IsMalformed() const {
   return AbstractType::Handle(type()).IsMalformed();
 }
 
 
-bool BoundedType::IsMalboundedWithError(Error* bound_error) const {
-  if (FLAG_enable_type_checks || FLAG_error_on_bad_type) {
-    const AbstractType& upper_bound = AbstractType::Handle(bound());
-    if (upper_bound.IsMalformed()) {
-      if (bound_error != NULL) {
-        *bound_error = upper_bound.malformed_error();
-        ASSERT(!bound_error->IsNull());
-      }
-      return true;
-    }
-  }
-  return AbstractType::Handle(type()).IsMalboundedWithError(bound_error);
+bool BoundedType::IsMalbounded() const {
+  return AbstractType::Handle(type()).IsMalbounded();
 }
 
 
-RawError* BoundedType::malformed_error() const {
-  return AbstractType::Handle(type()).malformed_error();
+bool BoundedType::IsMalformedOrMalbounded() const {
+  return AbstractType::Handle(type()).IsMalformedOrMalbounded();
+}
+
+
+RawLanguageError* BoundedType::error() const {
+  return AbstractType::Handle(type()).error();
 }
 
 
 bool BoundedType::Equals(const Instance& other) const {
   // BoundedType are not canonicalized, because their bound may get finalized
   // after the BoundedType is created and initialized.
   if (raw() == other.raw()) {
     return true;
   }
   if (!other.IsBoundedType()) {
@@ skipping 126 matching lines @@
   const BoundedType& result = BoundedType::Handle(BoundedType::New());
   result.set_type(type);
   result.set_bound(bound);
   result.set_type_parameter(type_parameter);
   result.set_is_being_checked(false);
   return result.raw();
 }
 
 
 const char* BoundedType::ToCString() const {
-  const char* format = "BoundedType: type %s; bound: %s; type param: %s%s%s";
+  const char* format = "BoundedType: type %s; bound: %s; type param: %s of %s";
   const char* type_cstr = String::Handle(AbstractType::Handle(
       type()).Name()).ToCString();
   const char* bound_cstr = String::Handle(AbstractType::Handle(
       bound()).Name()).ToCString();
   const TypeParameter& type_param = TypeParameter::Handle(type_parameter());
-  const char* type_param_cstr = "null";
-  const char* of_cstr = "";
-  const char* cls_cstr = "";
-  if (!type_param.IsNull()) {
-    type_param_cstr = String::Handle(type_param.name()).ToCString();
-    const Class& cls = Class::Handle(type_param.parameterized_class());
-    if (!cls.IsNull()) {
-      of_cstr = " of ";
-      cls_cstr = String::Handle(cls.Name()).ToCString();
-    }
-  }
-  intptr_t len = OS::SNPrint(NULL, 0, format, type_cstr, bound_cstr,
-                             type_param_cstr, of_cstr, cls_cstr) + 1;
+  const char* type_param_cstr = String::Handle(type_param.name()).ToCString();
+  const Class& cls = Class::Handle(type_param.parameterized_class());
+  const char* cls_cstr = String::Handle(cls.Name()).ToCString();
+  intptr_t len = OS::SNPrint(
+      NULL, 0, format, type_cstr, bound_cstr, type_param_cstr, cls_cstr) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
-  OS::SNPrint(chars, len, format, type_cstr, bound_cstr, type_param_cstr,
-              of_cstr, cls_cstr);
+  OS::SNPrint(
+      chars, len, format, type_cstr, bound_cstr, type_param_cstr, cls_cstr);
   return chars;
 }
 
 
 void BoundedType::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 intptr_t MixinAppType::token_pos() const {
@@ skipping 3348 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart