[vm/bytecode] Clean component metadata except bytecode when dropping AST

alexmarkov · commit-bot@chromium.org · commit 0d93a8591626 · 2019-03-27T21:07:50.000Z
Change-Id: If0a7894406458b0cb6f4e1c5e4d60a6377b2459b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/98044 Commit-Queue: Ryan Macnak <rmacnak@google.com> Auto-Submit: Alexander Markov <alexmarkov@google.com> Reviewed-by: Ryan Macnak <rmacnak@google.com>
diff --git a/pkg/vm/lib/bytecode/ast_remover.dart b/pkg/vm/lib/bytecode/ast_remover.dart
@@ -15,8 +15,10 @@ class ASTRemover extends Transformer {
 
   ASTRemover(Component component)
       : metadata = component.metadata[new BytecodeMetadataRepository().tag] {
-    stashes[component] = new _ComponentStash(component.mainMethod);
+    stashes[component] = new _ComponentStash(component.mainMethod,
+        new Map<String, MetadataRepository<dynamic>>.from(component.metadata));
     component.mainMethod = null;
+    component.metadata.removeWhere((tag, md) => tag != metadata.tag);
   }
 
   @override
@@ -100,6 +102,7 @@ class ASTRemover extends Transformer {
       if (node is Component) {
         _ComponentStash componentStash = stash as _ComponentStash;
         node.mainMethod = componentStash.mainMethod;
+        node.metadata.addAll(componentStash.metadata);
       } else if (node is Library) {
         _LibraryStash libraryStash = stash as _LibraryStash;
         node.annotations.addAll(libraryStash.annotations);
@@ -172,6 +175,7 @@ class _VariableDeclarationStash extends _Stash {
 
 class _ComponentStash extends _Stash {
   final Procedure mainMethod;
+  final Map<String, MetadataRepository<dynamic>> metadata;
 
-  _ComponentStash(this.mainMethod);
+  _ComponentStash(this.mainMethod, this.metadata);
 }
