commit 476e13a5e9f577daecc254221dba7bc3258a78bc
author Daco Harkes <dacoharkes@google.com> Wed Jan 18 21:08:38 2023 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 18 21:08:38 2023 +0000
tree 0dabbc6977375ffa955a1adb10c4da9748d40910
parent 5d18663a7da3b389f33f77f6613f1f04133a6379

[vm] Enable annotations on libraries in AOT

We have no use cases for this until the dependent CL.
TEST=dependent CL

Closes: https://github.com/dart-lang/sdk/issues/50539

Change-Id: Iee91f90ddd474cef3b7218def4d3e716ab2639ab
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/272421
Reviewed-by: Martin Kustermann <kustermann@google.com>

runtime/vm/kernel_loader.cc

diff --git a/runtime/vm/kernel_loader.cc b/runtime/vm/kernel_loader.cc
index 8b281b3..bb75cf5 100644
--- a/runtime/vm/kernel_loader.cc
+++ b/runtime/vm/kernel_loader.cc
@@ -1027,7 +1027,9 @@
     FinishTopLevelClassLoading(toplevel_class, library, library_index);
   }
 
-  if (FLAG_enable_mirrors && annotation_count > 0) {
+  // Used for mirrors and allows VM to recognize @pragma annotations on
+  // libraries.
+  if (annotation_count > 0) {
     ASSERT(annotations_kernel_offset > 0);
     library.AddMetadata(library, annotations_kernel_offset);
   }

runtime/vm/object.cc

diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index a0757bb..8226044 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -4017,7 +4017,9 @@
   auto Z = T->zone();
   auto& lib = Library::Handle(Z);
 
-  if (obj.IsClass()) {
+  if (obj.IsLibrary()) {
+    lib = Library::Cast(obj).ptr();
+  } else if (obj.IsClass()) {
     auto& klass = Class::Cast(obj);
     if (!klass.has_pragma()) return false;
     lib = klass.library();