Fix various nefarious problems with the script table used in source reports.

runtime/vm/source_report.h

 // Copyright (c) 2015, 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.
 
 #ifndef VM_SOURCE_REPORT_H_
 #define VM_SOURCE_REPORT_H_
 
 #include "vm/allocation.h"
 #include "vm/flags.h"
 #include "vm/hash_map.h"
@@ skipping 22 matching lines @@
 
   enum CompileMode {
     kNoCompile,
     kForceCompile
   };
 
   // report_set is a bitvector indicating which reports to generate
   // (e.g. kCallSites | kCoverage).
   explicit SourceReport(intptr_t report_set,
                         CompileMode compile = kNoCompile);
+  ~SourceReport();
 
   // Generate a source report for (some subrange of) a script.
   //
   // If script is null, then the report is generated for all scripts
   // in the isolate.
   void PrintJSON(JSONStream* js, const Script& script,
                  TokenPosition start_pos = TokenPosition::kNoSource,
                  TokenPosition end_pos = TokenPosition::kNoSource);
 
  private:
+  void ClearScriptTable();
   void Init(Thread* thread, const Script* script,
             TokenPosition start_pos, TokenPosition end_pos);
 
   Thread* thread() const { return thread_; }
   Zone* zone() const { return thread_->zone(); }
   Isolate* isolate() const { return thread_->isolate(); }
 
   bool IsReportRequested(ReportKind report_kind);
   bool ShouldSkipFunction(const Function& func);
   intptr_t GetScriptIndex(const Script& script);
   bool ScriptIsLoadedByLibrary(const Script& script, const Library& lib);
 
   void PrintCallSitesData(JSONObject* jsobj,
                           const Function& func, const Code& code);
   void PrintCoverageData(JSONObject* jsobj,
                          const Function& func, const Code& code);
   void PrintPossibleBreakpointsData(JSONObject* jsobj,
                                     const Function& func, const Code& code);
   void PrintProfileData(JSONObject* jsobj, ProfileFunction* profile_function);
+#if defined(DEBUG)
+  void VerifyScriptTable();
+#endif
   void PrintScriptTable(JSONArray* jsarr);
 
   void VisitFunction(JSONArray* jsarr, const Function& func);
   void VisitLibrary(JSONArray* jsarr, const Library& lib);
   void VisitClosures(JSONArray* jsarr);
 
   // An entry in the script table.
   struct ScriptTableEntry {
     ScriptTableEntry() : key(NULL), index(-1), script(NULL) {}
 
@@ skipping 25 matching lines @@
     }
   };
 
   intptr_t report_set_;
   CompileMode compile_mode_;
   Thread* thread_;
   const Script* script_;
   TokenPosition start_pos_;
   TokenPosition end_pos_;
   Profile profile_;
-  GrowableArray<ScriptTableEntry> script_table_entries_;
+  GrowableArray<ScriptTableEntry*> script_table_entries_;
   DirectChainedHashMap<ScriptTableTrait> script_table_;
   intptr_t next_script_index_;
 };
 
 }  // namespace dart
 
 #endif  // VM_SOURCE_REPORT_H_