Version 2.12.0-111.0.dev

Merge commit 'a9d212b94aa73472824f4218a567a8e004575112' into 'dev'

Author: Dart CI

.dart_tool/package_config.json

@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2020-11-30T16:23:50.740805",
+  "generated": "2020-11-15T14:18:10.587065",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -101,7 +101,7 @@
       "name": "args",
       "rootUri": "../third_party/pkg/args",
       "packageUri": "lib/",
-      "languageVersion": "2.12"
+      "languageVersion": "2.3"
     },
     {
       "name": "async",

DEPS

@@ -68,7 +68,7 @@ vars = {
   "gperftools_revision": "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb",
 
   # Revisions of /third_party/* dependencies.
-  "args_rev": "139140125126661fac88c9aa5882165936d01c91",
+  "args_tag": "1.6.0",
   "async_rev": "695b3ac280f107c84adf7488743abfdfaaeea68f",
   "bazel_worker_rev": "060c55a933d39798681a4f533b161b81dc48d77e",
   "benchmark_harness_rev": "ec6b646f5443faa871e126ac1ba248c94ca06257",
@@ -301,7 +301,7 @@ deps = {
       "@" + Var("gperftools_revision"),
 
   Var("dart_root") + "/third_party/pkg/args":
-      Var("dart_git") + "args.git" + "@" + Var("args_rev"),
+      Var("dart_git") + "args.git" + "@" + Var("args_tag"),
   Var("dart_root") + "/third_party/pkg/async":
       Var("dart_git") + "async.git" + "@" + Var("async_rev"),
   Var("dart_root") + "/third_party/pkg/bazel_worker":

pkg/native_stack_traces/bin/decode.dart

@@ -300,12 +300,12 @@ Future<void> main(List<String> arguments) async {
   if (options['help']) return print(_usages[options.command?.name]);
   if (options.command == null) return errorWithUsage('no command provided');
 
-  switch (options.command!.name) {
+  switch (options.command.name) {
     case 'help':
-      return help(options.command!);
+      return help(options.command);
     case 'find':
-      return find(options.command!);
+      return find(options.command);
     case 'translate':
-      return await translate(options.command!);
+      return await translate(options.command);
   }
 }

runtime/lib/mirrors.cc

@@ -435,12 +435,11 @@ static InstancePtr CreateLibraryDependencyMirror(Thread* thread,
                                                  const LibraryPrefix& prefix,
                                                  const bool is_import,
                                                  const bool is_deferred) {
-  const Library& importee = Library::Handle(ns.target());
+  const Library& importee = Library::Handle(ns.library());
   const Array& show_names = Array::Handle(ns.show_names());
   const Array& hide_names = Array::Handle(ns.hide_names());
 
-  const Library& owner = Library::Handle(ns.owner());
-  Object& metadata = Object::Handle(owner.GetMetadata(ns));
+  Object& metadata = Object::Handle(ns.GetMetadata());
   if (metadata.IsError()) {
     Exceptions::PropagateError(Error::Cast(metadata));
     UNREACHABLE();

runtime/vm/canonical_tables.h

@@ -254,38 +254,6 @@ class CanonicalTypeArgumentsTraits {
 typedef UnorderedHashSet<CanonicalTypeArgumentsTraits>
     CanonicalTypeArgumentsSet;
 
-class MetadataMapTraits {
- public:
-  static const char* Name() { return "MetadataMapTraits"; }
-  static bool ReportStats() { return false; }
-  static bool IsMatch(const Object& key, const Object& candidate) {
-    return key.raw() == candidate.raw();
-  }
-  static uword Hash(const Object& key) {
-#if !defined(DART_PRECOMPILED_RUNTIME)
-    if (key.IsLibrary()) {
-      return String::Hash(Library::Cast(key).url());
-    } else if (key.IsClass()) {
-      return String::Hash(Class::Cast(key).Name());
-    } else if (key.IsPatchClass()) {
-      return Hash(Object::Handle(PatchClass::Cast(key).patched_class()));
-    } else if (key.IsFunction()) {
-      return CombineHashes(String::Hash(Function::Cast(key).name()),
-                           Hash(Object::Handle(Function::Cast(key).Owner())));
-    } else if (key.IsField()) {
-      return CombineHashes(String::Hash(Field::Cast(key).name()),
-                           Hash(Object::Handle(Field::Cast(key).Owner())));
-    } else if (key.IsTypeParameter()) {
-      return TypeParameter::Cast(key).Hash();
-    } else if (key.IsNamespace()) {
-      return Hash(Library::Handle(Namespace::Cast(key).target()));
-    }
-#endif
-    UNREACHABLE();
-  }
-};
-typedef UnorderedHashMap<MetadataMapTraits> MetadataMap;
-
 }  // namespace dart
 
 #endif  // RUNTIME_VM_CANONICAL_TABLES_H_

runtime/vm/clustered_snapshot.cc

@@ -5836,12 +5836,7 @@ ZoneGrowableArray<Object*>* Serializer::Serialize(SerializationRoots* roots) {
   WriteUnsigned(num_objects);
   WriteUnsigned(canonical_clusters.length());
   WriteUnsigned(clusters.length());
-  // TODO(dartbug.com/36097): Not every snapshot carries the field table.
-  if (current_loading_unit_id_ <= LoadingUnit::kRootId) {
-    WriteUnsigned(initial_field_table_->NumFieldIds());
-  } else {
-    WriteUnsigned(0);
-  }
+  WriteUnsigned(initial_field_table_->NumFieldIds());
 
   for (SerializationCluster* cluster : canonical_clusters) {
     cluster->WriteAndMeasureAlloc(this);
@@ -6577,8 +6572,8 @@ void Deserializer::Deserialize(DeserializationRoots* roots) {
   refs_ = Array::New(num_objects_ + kFirstReference, Heap::kOld);
   if (initial_field_table_len > 0) {
     initial_field_table_->AllocateIndex(initial_field_table_len - 1);
-    ASSERT_EQUAL(initial_field_table_->NumFieldIds(), initial_field_table_len);
   }
+  ASSERT_EQUAL(initial_field_table_->NumFieldIds(), initial_field_table_len);
 
   {
     NoSafepointScope no_safepoint;

runtime/vm/compiler/aot/precompiler.cc

@@ -2117,9 +2117,47 @@ void Precompiler::TraceTypesFromRetainedClasses() {
 
 void Precompiler::DropMetadata() {
   Library& lib = Library::Handle(Z);
+  const GrowableObjectArray& null_growable_list =
+      GrowableObjectArray::Handle(Z);
+  Array& dependencies = Array::Handle(Z);
+  Namespace& ns = Namespace::Handle(Z);
+  const Field& null_field = Field::Handle(Z);
+  GrowableObjectArray& metadata = GrowableObjectArray::Handle(Z);
+  Field& metadata_field = Field::Handle(Z);
+
   for (intptr_t i = 0; i < libraries_.Length(); i++) {
     lib ^= libraries_.At(i);
-    lib.set_metadata(Array::null_array());
+    metadata ^= lib.metadata();
+    for (intptr_t j = 0; j < metadata.Length(); j++) {
+      metadata_field ^= metadata.At(j);
+      if (metadata_field.is_static()) {
+        // Although this field will become garbage after clearing the list
+        // below, we also need to clear its value from the field table.
+        // The value may be an instance of an otherwise dead class, and if
+        // it remains in the field table we can get an instance on the heap
+        // with a deleted class.
+        metadata_field.SetStaticValue(Object::null_instance(),
+                                      /*save_initial_value=*/true);
+      }
+    }
+
+    lib.set_metadata(null_growable_list);
+
+    dependencies = lib.imports();
+    for (intptr_t j = 0; j < dependencies.Length(); j++) {
+      ns ^= dependencies.At(j);
+      if (!ns.IsNull()) {
+        ns.set_metadata_field(null_field);
+      }
+    }
+
+    dependencies = lib.exports();
+    for (intptr_t j = 0; j < dependencies.Length(); j++) {
+      ns ^= dependencies.At(j);
+      if (!ns.IsNull()) {
+        ns.set_metadata_field(null_field);
+      }
+    }
   }
 }
 

runtime/vm/dart_api_impl.cc

@@ -6007,7 +6007,7 @@ DART_EXPORT Dart_Handle Dart_GetImportsOfScheme(Dart_Handle scheme) {
     for (intptr_t j = 0; j < imports.Length(); j++) {
       ns ^= imports.At(j);
       if (ns.IsNull()) continue;
-      importee = ns.target();
+      importee = ns.library();
       importee_uri = importee.url();
       if (importee_uri.StartsWith(scheme_vm)) {
         result.Add(importer);

runtime/vm/isolate_reload.cc

@@ -961,7 +961,7 @@ void IsolateGroupReloadContext::BuildModifiedLibrariesClosure(
     for (intptr_t import_idx = 0; import_idx < ports.Length(); import_idx++) {
       ns ^= ports.At(import_idx);
       if (!ns.IsNull()) {
-        target = ns.target();
+        target = ns.library();
         target_url = target.url();
         if (!target_url.StartsWith(Symbols::DartExtensionScheme())) {
           (*imported_by)[target.index()]->Add(lib.index());
@@ -974,7 +974,7 @@ void IsolateGroupReloadContext::BuildModifiedLibrariesClosure(
     for (intptr_t export_idx = 0; export_idx < ports.Length(); export_idx++) {
       ns ^= ports.At(export_idx);
       if (!ns.IsNull()) {
-        target = ns.target();
+        target = ns.library();
         (*imported_by)[target.index()]->Add(lib.index());
       }
     }
@@ -992,7 +992,7 @@ void IsolateGroupReloadContext::BuildModifiedLibrariesClosure(
              import_idx++) {
           ns ^= ports.At(import_idx);
           if (!ns.IsNull()) {
-            target = ns.target();
+            target = ns.library();
             (*imported_by)[target.index()]->Add(lib.index());
           }
         }

runtime/vm/kernel.cc

@@ -430,28 +430,26 @@ class MetadataEvaluator : public KernelReaderHelper {
   DISALLOW_COPY_AND_ASSIGN(MetadataEvaluator);
 };
 
-ObjectPtr EvaluateMetadata(const Library& library,
-                           intptr_t kernel_offset,
+ObjectPtr EvaluateMetadata(const Field& metadata_field,
                            bool is_annotations_offset) {
   LongJumpScope jump;
   if (setjmp(*jump.Set()) == 0) {
     Thread* thread = Thread::Current();
     Zone* zone = thread->zone();
     TranslationHelper helper(thread);
-    Script& script = Script::Handle(
-        zone, Class::Handle(zone, library.toplevel_class()).script());
+    Script& script = Script::Handle(zone, metadata_field.Script());
     helper.InitFromScript(script);
 
-    const Class& owner_class = Class::Handle(zone, library.toplevel_class());
+    const Class& owner_class = Class::Handle(zone, metadata_field.Owner());
     ActiveClass active_class;
     ActiveClassScope active_class_scope(&active_class, &owner_class);
 
     MetadataEvaluator metadata_evaluator(
         zone, &helper, script,
-        ExternalTypedData::Handle(zone, library.kernel_data()),
-        library.kernel_offset(), &active_class);
+        ExternalTypedData::Handle(zone, metadata_field.KernelData()),
+        metadata_field.KernelDataProgramOffset(), &active_class);
 
-    return metadata_evaluator.EvaluateMetadata(kernel_offset,
+    return metadata_evaluator.EvaluateMetadata(metadata_field.kernel_offset(),
                                                is_annotations_offset);
 
   } else {