Revert "[DWARFLinker] Capitalize type names (NFC)"

This reverts commit 3fce5ea7ce663410d3fb533528158bdab3a3604e.

`make check` broken.

diff --git a/llvm/include/llvm/DWARFLinker/DWARFLinker.h b/llvm/include/llvm/DWARFLinker/DWARFLinker.h
index bac2be8..2fb61b9 100644 (file)
--- a/llvm/include/llvm/DWARFLinker/DWARFLinker.h
+++ b/llvm/include/llvm/DWARFLinker/DWARFLinker.h
@@ -221,12 +221,12 @@ public:
 
 typedef std::function<void(const Twine &Warning, StringRef Context,
                            const DWARFDie *DIE)>
-    MessageHandler;
+    messageHandler;
 typedef std::function<ErrorOr<DWARFFile &>(StringRef ContainerName,
                                            StringRef Path)>
-    ObjectFileLoader;
-typedef std::map<std::string, std::string> SwiftInterfaceMap;
-typedef std::map<std::string, std::string> ObjectPrefixMap;
+    objFileLoader;
+typedef std::map<std::string, std::string> swiftInterfacesMap;
+typedef std::map<std::string, std::string> objectPrefixMap;
 
 /// The core of the Dwarf linking logic.
 ///
@@ -295,28 +295,28 @@ public:
   }
 
   /// Set warning handler which would be used to report warnings.
-  void setWarningHandler(MessageHandler Handler) {
+  void setWarningHandler(messageHandler Handler) {
     Options.WarningHandler = Handler;
   }
 
   /// Set error handler which would be used to report errors.
-  void setErrorHandler(MessageHandler Handler) {
+  void setErrorHandler(messageHandler Handler) {
     Options.ErrorHandler = Handler;
   }
 
   /// Set object files loader which would be used to load
   /// additional objects for splitted dwarf.
-  void setObjFileLoader(ObjectFileLoader Loader) {
+  void setObjFileLoader(objFileLoader Loader) {
     Options.ObjFileLoader = Loader;
   }
 
   /// Set map for Swift interfaces.
-  void setSwiftInterfaceMap(SwiftInterfaceMap *Map) {
+  void setSwiftInterfacesMap(swiftInterfacesMap *Map) {
     Options.ParseableSwiftInterfaces = Map;
   }
 
   /// Set prefix map for objects.
-  void setObjectPrefixMap(ObjectPrefixMap *Map) {
+  void setObjectPrefixMap(objectPrefixMap *Map) {
     Options.ObjectPrefixMap = Map;
   }
 
@@ -783,22 +783,22 @@ private:
     std::string PrependPath;
 
     // warning handler
-    MessageHandler WarningHandler = nullptr;
+    messageHandler WarningHandler = nullptr;
 
     // error handler
-    MessageHandler ErrorHandler = nullptr;
+    messageHandler ErrorHandler = nullptr;
 
-    ObjectFileLoader ObjFileLoader = nullptr;
+    objFileLoader ObjFileLoader = nullptr;
 
     /// A list of all .swiftinterface files referenced by the debug
     /// info, mapping Module name to path on disk. The entries need to
     /// be uniqued and sorted and there are only few entries expected
     /// per compile unit, which is why this is a std::map.
     /// this is dsymutil specific fag.
-    SwiftInterfaceMap *ParseableSwiftInterfaces = nullptr;
+    swiftInterfacesMap *ParseableSwiftInterfaces = nullptr;
 
     /// A list of remappings to apply to file paths.
-    ObjectPrefixMap *ObjectPrefixMap = nullptr;
+    objectPrefixMap *ObjectPrefixMap = nullptr;
   } Options;
 };
 

diff --git a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h b/llvm/include/llvm/DWARFLinker/DWARFStreamer.h
index 326a9db..de58f5d 100644 (file)
--- a/llvm/include/llvm/DWARFLinker/DWARFStreamer.h
+++ b/llvm/include/llvm/DWARFLinker/DWARFStreamer.h
@@ -44,7 +44,7 @@ class DwarfStreamer : public DwarfEmitter {
 public:
   DwarfStreamer(OutputFileType OutFileType, raw_pwrite_stream &OutFile,
                 std::function<StringRef(StringRef Input)> Translator,
-                bool Minimize, MessageHandler Error, MessageHandler Warning)
+                bool Minimize, messageHandler Error, messageHandler Warning)
       : OutFile(OutFile), OutFileType(OutFileType), Translator(Translator),
         Minimize(Minimize), ErrorHandler(Error), WarningHandler(Warning) {}
 
@@ -210,8 +210,8 @@ private:
                              const CompileUnit &Unit,
                              const std::vector<CompileUnit::AccelInfo> &Names);
 
-  MessageHandler ErrorHandler;
-  MessageHandler WarningHandler;
+  messageHandler ErrorHandler = nullptr;
+  messageHandler WarningHandler = nullptr;
 };
 
 } // end namespace llvm

diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp
index 352e65d..2b12274 100644 (file)
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp
@@ -207,7 +207,7 @@ static void resolveRelativeObjectPath(SmallVectorImpl<char> &Buf, DWARFDie CU) {
 /// DW_TAG_module blocks.
 static void analyzeImportedModule(
     const DWARFDie &DIE, CompileUnit &CU,
-    SwiftInterfaceMap *ParseableSwiftInterfaces,
+    swiftInterfacesMap *ParseableSwiftInterfaces,
     std::function<void(const Twine &, const DWARFDie &)> ReportWarning) {
   if (CU.getLanguage() != dwarf::DW_LANG_Swift)
     return;
@@ -252,7 +252,7 @@ static bool analyzeContextInfo(
     const DWARFDie &DIE, unsigned ParentIdx, CompileUnit &CU,
     DeclContext *CurrentDeclContext, UniquingStringPool &StringPool,
     DeclContextTree &Contexts, uint64_t ModulesEndOffset,
-    SwiftInterfaceMap *ParseableSwiftInterfaces,
+    swiftInterfacesMap *ParseableSwiftInterfaces,
     std::function<void(const Twine &, const DWARFDie &)> ReportWarning,
     bool InImportedModule = false) {
   unsigned MyIdx = CU.getOrigUnit().getDIEIndex(DIE);
@@ -1940,7 +1940,7 @@ static uint64_t getDwoId(const DWARFDie &CUDie, const DWARFUnit &Unit) {
 }
 
 static std::string remapPath(StringRef Path,
-                             const ObjectPrefixMap &ObjectPrefixMap) {
+                             const objectPrefixMap &ObjectPrefixMap) {
   if (ObjectPrefixMap.empty())
     return Path.str();
 

diff --git a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
index c6bd886..3c71567 100644 (file)
--- a/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
+++ b/llvm/tools/dsymutil/DwarfLinkerForBinary.cpp
@@ -384,7 +384,7 @@ bool DwarfLinkerForBinary::link(const DebugMap &Map) {
 
         llvm_unreachable("Unhandled DebugMap object");
       });
-  GeneralLinker.setSwiftInterfaceMap(&ParseableSwiftInterfaces);
+  GeneralLinker.setSwiftInterfacesMap(&ParseableSwiftInterfaces);
 
   for (const auto &Obj : Map.objects()) {
     // N_AST objects (swiftmodule files) should get dumped directly into the