[vm, aot] Ensure fixups applied after the world has been compiled are applied to closures in finall…

runtime/vm/precompiler.cc

Index: runtime/vm/precompiler.cc
diff --git a/runtime/vm/precompiler.cc b/runtime/vm/precompiler.cc
index 787b4b28b454340fe8a56bcb5bad1bb9f9fbf9d2..85e00851d1dc3d1f75ce2f98aea0bc1b57e4861a 100644
--- a/runtime/vm/precompiler.cc
+++ b/runtime/vm/precompiler.cc
@@ -2186,7 +2186,17 @@ void Precompiler::BindStaticCalls() {
   };
 
   BindStaticCallsVisitor visitor(Z);
+
+  // We need both iterations to ensure we visit all the functions that might end
+  // up in the snapshot. The ProgramVisitor will miss closures from duplicated
+  // finally clauses, and not all functions are compiled through the
+  // tree-shaker's queue
   ProgramVisitor::VisitFunctions(&visitor);
+  FunctionSet::Iterator it(enqueued_functions_.GetIterator());
+  for (const Function** current = it.Next(); current != NULL;
+       current = it.Next()) {
+    visitor.Visit(**current);
+  }
 }
 
 void Precompiler::SwitchICCalls() {
@@ -2274,7 +2284,17 @@ void Precompiler::SwitchICCalls() {
 
   ASSERT(!I->compilation_allowed());
   SwitchICCallsVisitor visitor(Z);
+
+  // We need both iterations to ensure we visit all the functions that might end
+  // up in the snapshot. The ProgramVisitor will miss closures from duplicated
+  // finally clauses, and not all functions are compiled through the
+  // tree-shaker's queue
   ProgramVisitor::VisitFunctions(&visitor);
+  FunctionSet::Iterator it(enqueued_functions_.GetIterator());
+  for (const Function** current = it.Next(); current != NULL;
+       current = it.Next()) {
+    visitor.Visit(**current);
+  }
 #endif
 }