commit b7c22314c37bc27557b3052364dc92d520add8ca
author Jonas Devlieghere <jonas@devlieghere.com> Wed Feb 20 01:49:10 2019 +0000
committer Jonas Devlieghere <jonas@devlieghere.com> Wed Feb 20 01:49:10 2019 +0000
tree 8024bfa7f12cf5821e7ead56515436e6afec3b43
parent 20332cc4ea69acb278102be9318b279fb498cc39

[lldb-instr] Group RECORD macros

Group LLDB_RECORD macros per input file.

llvm-svn: 354423

lldb/tools/lldb-instr/Instrument.cpp

diff --git a/lldb/tools/lldb-instr/Instrument.cpp b/lldb/tools/lldb-instr/Instrument.cpp
index 3a5df4bf..476b5e6 100644
--- a/lldb/tools/lldb-instr/Instrument.cpp
+++ b/lldb/tools/lldb-instr/Instrument.cpp
@@ -104,8 +104,7 @@
                                                StringRef Signature) {
   std::string Macro;
   llvm::raw_string_ostream OS(Macro);
-  OS << "LLDB_REGISTER_CONSTRUCTOR(" << Class << ", (" << Signature
-     << "));\n\n";
+  OS << "LLDB_REGISTER_CONSTRUCTOR(" << Class << ", (" << Signature << "));\n";
   return OS.str();
 }
 
@@ -305,10 +304,18 @@
 public:
   SBAction() = default;
 
-  void EndSourceFileAction() override { MyRewriter.overwriteChangedFiles(); }
+  bool BeginSourceFileAction(CompilerInstance &CI) override {
+    llvm::outs() << "{\n";
+    return true;
+  }
+
+  void EndSourceFileAction() override {
+    llvm::outs() << "}\n";
+    MyRewriter.overwriteChangedFiles();
+  }
 
   std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                 StringRef file) override {
+                                                 StringRef File) override {
     MyRewriter.setSourceMgr(CI.getSourceManager(), CI.getLangOpts());
     return llvm::make_unique<SBConsumer>(MyRewriter, CI.getASTContext());
   }