Stop resolving classes prematurely in the vm (issue 11023).

runtime/vm/mirrors_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_mirrors_api.h"
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
@@ skipping 164 matching lines @@
 }
 
 
 DART_EXPORT bool Dart_ClassIsFunctionType(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
   if (!obj.IsType() && !obj.IsClass()) {
     RETURN_TYPE_ERROR(isolate, object, Class/Type);
   }
+  // Ensure all classes are finalized.
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
+  }
   const Class& cls = (obj.IsType()) ?
       Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
   // A class represents a function type when it is a canonical
   // signature class.
   return cls.IsCanonicalSignatureClass();
 }
 
 
 DART_EXPORT Dart_Handle Dart_ClassGetFunctionTypeSignature(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
@@ skipping 298 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_FunctionReturnType(Dart_Handle function) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Function& func = Api::UnwrapFunctionHandle(isolate, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function, Function);
   }
-
+  // Ensure all classes are finalized.
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
+  }
   if (func.kind() == RawFunction::kConstructor) {
     // Special case the return type for constructors.  Inside the vm
     // we mark them as returning dynamic, but for the purposes of
     // reflection, they return the type of the class being
     // constructed.
     return Api::NewHandle(isolate, func.Owner());
   } else {
     const AbstractType& return_type =
         AbstractType::Handle(isolate, func.result_type());
     return TypeToHandle(isolate, "Dart_FunctionReturnType", return_type);
@@ skipping 34 matching lines @@
 
 
 DART_EXPORT Dart_Handle Dart_FunctionParameterType(Dart_Handle function,
                                                    int parameter_index) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Function& func = Api::UnwrapFunctionHandle(isolate, function);
   if (func.IsNull()) {
     RETURN_TYPE_ERROR(isolate, function, Function);
   }
-
+  // Ensure all classes are finalized.
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
+  }
   const intptr_t num_implicit_params = func.NumImplicitParameters();
   const intptr_t num_params = func.NumParameters() - num_implicit_params;
   if (parameter_index < 0 || parameter_index >= num_params) {
     return Api::NewError(
         "%s: argument 'parameter_index' out of range. "
         "Expected 0..%"Pd" but saw %d.",
         CURRENT_FUNC, num_params, parameter_index);
   }
   const AbstractType& param_type =
       AbstractType::Handle(isolate, func.ParameterTypeAt(
@@ skipping 133 matching lines @@
 }
 
 
 DART_EXPORT Dart_Handle Dart_VariableType(Dart_Handle variable) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Field& var = Api::UnwrapFieldHandle(isolate, variable);
   if (var.IsNull()) {
     RETURN_TYPE_ERROR(isolate, variable, Field);
   }
-
+  // Ensure all classes are finalized.
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
+  }
   const AbstractType& type = AbstractType::Handle(isolate, var.type());
   return TypeToHandle(isolate, "Dart_VariableType", type);
 }
 
 
 DART_EXPORT Dart_Handle Dart_GetTypeVariableNames(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
   if (!obj.IsType() && !obj.IsClass()) {
     RETURN_TYPE_ERROR(isolate, object, Class/Type);
   }
+  // Ensure all classes are finalized.
+  Dart_Handle state = Api::CheckIsolateState(isolate);
+  if (::Dart_IsError(state)) {
+    return state;
+  }
   const Class& cls = (obj.IsType()) ?
       Class::Handle(Type::Cast(obj).type_class()) : Class::Cast(obj);
   const intptr_t num_type_params = cls.NumTypeParameters();
   const TypeArguments& type_params =
       TypeArguments::Handle(cls.type_parameters());
 
   const GrowableObjectArray& names =
       GrowableObjectArray::Handle(isolate, GrowableObjectArray::New());
   TypeParameter& type_param = TypeParameter::Handle(isolate);
   String& name = String::Handle(isolate);
@@ skipping 160 matching lines @@
   } else if (obj.IsField()) {
     cls = Field::Cast(obj).origin();
   } else {
     return Api::NewHandle(isolate, Object::empty_array().raw());
   }
   const Library& lib = Library::Handle(cls.library());
   return Api::NewHandle(isolate, lib.GetMetadata(obj));
 }
 
 }  // namespace dart