14 files changed, 30 insertions, 35 deletions
diff --git a/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h b/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
index a5d07fbeda92..32fc54b14796 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/DwarfTransformer.h
@@ -88,4 +88,4 @@ private:
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_DWARFTRANSFORMER_H
+#endif // LLVM_DEBUGINFO_GSYM_DWARFTRANSFORMER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
index 49e7fc9c4291..8e00c5f01c8e 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h
@@ -13,7 +13,6 @@
 #include "llvm/ADT/Hashing.h"
 #include <functional>
 #include <stdint.h>
-#include <utility>
 
 namespace llvm {
 namespace gsym {
@@ -64,4 +63,4 @@ template <> struct DenseMapInfo<gsym::FileEntry> {
 };
 
 } // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FILEENTRY_H
+#endif // LLVM_DEBUGINFO_GSYM_FILEENTRY_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h b/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
index cd568765a4f2..84b568759722 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FileWriter.h
@@ -121,4 +121,4 @@ private:
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FILEWRITER_H
+#endif // LLVM_DEBUGINFO_GSYM_FILEWRITER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h b/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
index 893cfc1eb07c..552337f54390 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/FunctionInfo.h
@@ -15,11 +15,12 @@
 #include "llvm/DebugInfo/GSYM/LookupResult.h"
 #include "llvm/DebugInfo/GSYM/Range.h"
 #include "llvm/DebugInfo/GSYM/StringTable.h"
+#include <cstdint>
 #include <tuple>
-#include <vector>
 
 namespace llvm {
 class raw_ostream;
+
 namespace gsym {
 
 class GsymReader;
@@ -213,4 +214,4 @@ raw_ostream &operator<<(raw_ostream &OS, const FunctionInfo &R);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_FUNCTIONINFO_H
+#endif // LLVM_DEBUGINFO_GSYM_FUNCTIONINFO_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h b/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
index f29a147d4403..872ccd4a0b6a 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/GsymCreator.h
@@ -12,7 +12,6 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <string>
 #include <thread>
 
 #include "llvm/ADT/ArrayRef.h"
@@ -133,7 +132,7 @@ class FileWriter;
 /// of FunctionInfo objects, see "llvm/DebugInfo/GSYM/FunctionInfo.h".
 class GsymCreator {
   // Private member variables require Mutex protections
-  mutable std::recursive_mutex Mutex;
+  mutable std::mutex Mutex;
   std::vector<FunctionInfo> Funcs;
   StringTableBuilder StrTab;
   StringSet<> StringStorage;
@@ -144,10 +143,10 @@ class GsymCreator {
   AddressRanges Ranges;
   llvm::Optional<uint64_t> BaseAddress;
   bool Finalized = false;
+  bool Quiet;
 
 public:
-
-  GsymCreator();
+  GsymCreator(bool Quiet = false);
 
   /// Save a GSYM file to a stand alone file.
   ///
@@ -289,9 +288,12 @@ public:
   void setBaseAddress(uint64_t Addr) {
     BaseAddress = Addr;
   }
+
+  /// Whether the transformation should be quiet, i.e. not output warnings.
+  bool isQuiet() const { return Quiet; }
 };
 
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_GSYMCREATOR_H
+#endif // LLVM_DEBUGINFO_GSYM_GSYMCREATOR_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h b/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
index 2a4eac77d946..4ad9990c372f 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/GsymReader.h
@@ -9,7 +9,6 @@
 #ifndef LLVM_DEBUGINFO_GSYM_GSYMREADER_H
 #define LLVM_DEBUGINFO_GSYM_GSYMREADER_H
 
-
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/DebugInfo/GSYM/FileEntry.h"
 #include "llvm/DebugInfo/GSYM/FunctionInfo.h"
@@ -19,11 +18,9 @@
 #include "llvm/Support/DataExtractor.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/ErrorOr.h"
-
 #include <inttypes.h>
 #include <memory>
 #include <stdint.h>
-#include <string>
 #include <vector>
 
 namespace llvm {
@@ -310,4 +307,4 @@ protected:
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_GSYMREADER_H
+#endif // LLVM_DEBUGINFO_GSYM_GSYMREADER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/Header.h b/llvm/include/llvm/DebugInfo/GSYM/Header.h
index 6652c59c97a6..9ca32d25985e 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/Header.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/Header.h
@@ -126,4 +126,4 @@ raw_ostream &operator<<(raw_ostream &OS, const llvm::gsym::Header &H);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_HEADER_H
+#endif // LLVM_DEBUGINFO_GSYM_HEADER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h b/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
index 06126da7d007..9bcfa5935180 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/InlineInfo.h
@@ -179,4 +179,4 @@ raw_ostream &operator<<(raw_ostream &OS, const InlineInfo &FI);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_INLINEINFO_H
+#endif // LLVM_DEBUGINFO_GSYM_INLINEINFO_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h b/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
index aac7c48e067e..b4e7587fc5ee 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LineEntry.h
@@ -44,4 +44,4 @@ inline bool operator<(const LineEntry &LHS, const LineEntry &RHS) {
 }
 } // namespace gsym
 } // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LINEENTRY_H
+#endif // LLVM_DEBUGINFO_GSYM_LINEENTRY_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LineTable.h b/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
index fba9b2c79735..efb7b8dfd43b 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LineTable.h
@@ -230,4 +230,4 @@ raw_ostream &operator<<(raw_ostream &OS, const gsym::LineTable &LT);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LINETABLE_H
+#endif // LLVM_DEBUGINFO_GSYM_LINETABLE_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h b/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
index 693a02c50f16..211a352595fd 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/LookupResult.h
@@ -9,8 +9,8 @@
 #ifndef LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
 #define LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
 
-#include "llvm/DebugInfo/GSYM/Range.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/DebugInfo/GSYM/Range.h"
 #include <inttypes.h>
 #include <vector>
 
@@ -20,27 +20,25 @@ namespace gsym {
 struct FileEntry;
 
 struct SourceLocation {
-  StringRef Name; ///< Function or symbol name.
-  StringRef Dir; ///< Line entry source file directory path.
-  StringRef Base; ///< Line entry source file basename.
-  uint32_t Line = 0; ///< Source file line number.
+  StringRef Name;      ///< Function or symbol name.
+  StringRef Dir;       ///< Line entry source file directory path.
+  StringRef Base;      ///< Line entry source file basename.
+  uint32_t Line = 0;   ///< Source file line number.
   uint32_t Offset = 0; ///< Byte size offset within the named function.
 };
 
 inline bool operator==(const SourceLocation &LHS, const SourceLocation &RHS) {
-  return LHS.Name == RHS.Name && LHS.Dir == RHS.Dir &&
-         LHS.Base == RHS.Base && LHS.Line == RHS.Line &&
-         LHS.Offset == RHS.Offset;
+  return LHS.Name == RHS.Name && LHS.Dir == RHS.Dir && LHS.Base == RHS.Base &&
+         LHS.Line == RHS.Line && LHS.Offset == RHS.Offset;
 }
 
 raw_ostream &operator<<(raw_ostream &OS, const SourceLocation &R);
 
 using SourceLocations = std::vector<SourceLocation>;
 
-
 struct LookupResult {
   uint64_t LookupAddr = 0; ///< The address that this lookup pertains to.
-  AddressRange FuncRange; ///< The concrete function address range.
+  AddressRange FuncRange;  ///< The concrete function address range.
   StringRef FuncName; ///< The concrete function name that contains LookupAddr.
   /// The source locations that match this address. This information will only
   /// be filled in if the FunctionInfo contains a line table. If an address is
@@ -60,4 +58,4 @@ raw_ostream &operator<<(raw_ostream &OS, const LookupResult &R);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
+#endif // LLVM_DEBUGINFO_GSYM_LOOKUPRESULT_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h b/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
index 84a8d98fe365..bcde92e94fc5 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/ObjectFileTransformer.h
@@ -48,4 +48,4 @@ public:
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_OBJECTFILETRANSFORMER_H
+#endif // LLVM_DEBUGINFO_GSYM_OBJECTFILETRANSFORMER_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/Range.h b/llvm/include/llvm/DebugInfo/GSYM/Range.h
index b3e7692543bf..36ad95602d14 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/Range.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/Range.h
@@ -127,4 +127,4 @@ raw_ostream &operator<<(raw_ostream &OS, const AddressRanges &AR);
 } // namespace gsym
 } // namespace llvm
 
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_RANGE_H
+#endif // LLVM_DEBUGINFO_GSYM_RANGE_H
diff --git a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
index a96ae5899da3..f7f800d01647 100644
--- a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
+++ b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h
@@ -13,8 +13,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/GSYM/Range.h"
 #include <stdint.h>
-#include <string>
-
 
 namespace llvm {
 namespace gsym {
@@ -50,4 +48,4 @@ inline raw_ostream &operator<<(raw_ostream &OS, const StringTable &S) {
 
 } // namespace gsym
 } // namespace llvm
-#endif // #ifndef LLVM_DEBUGINFO_GSYM_STRINGTABLE_H
+#endif // LLVM_DEBUGINFO_GSYM_STRINGTABLE_H