Remove unused variants of make_dynamic_error_code. NFC.

make_dynamic_error_code was used to create a std::error_code with
a std::string message.  Now that we are migrating to llvm::Error,
there are no calls to these make_dynamic_error_code methods.

There is one single call to make_dynamic_error_code remaining, the one
inside GenericError::convertToErrorCode().  That method is only called
from File::doParse() which should be a temporary situation.  We need
to work out how to deal with File::parse() caching the error result from
doParse().  Caching errors isn't supported in the new scheme, and probably
isn't needed here, but we need to work that out.

Once thats done, dynamic error and all utilities around it can be deleted.

llvm-svn: 264982

diff --git a/lld/include/lld/Core/Error.h b/lld/include/lld/Core/Error.h
index 8150ab8..b0bf73b 100644 (file)
--- a/lld/include/lld/Core/Error.h
+++ b/lld/include/lld/Core/Error.h
@@ -38,9 +38,7 @@ inline std::error_code make_error_code(YamlReaderError e) {
 /// supplied error string.
 /// Note:  Once ErrorOr<> is updated to work with errors other than error_code,
 /// this can be updated to return some other kind of error.
-std::error_code make_dynamic_error_code(const char *msg);
 std::error_code make_dynamic_error_code(StringRef msg);
-std::error_code make_dynamic_error_code(const Twine &msg);
 
 /// Generic error.
 ///
@@ -54,7 +52,7 @@ public:
   void log(llvm::raw_ostream &OS) const override;
 
   std::error_code convertToErrorCode() const override {
-    return make_dynamic_error_code(StringRef(getMessage()));
+    return make_dynamic_error_code(getMessage());
   }
 
 private:

diff --git a/lld/lib/Core/Error.cpp b/lld/lib/Core/Error.cpp
index 097318e..4df1ce1 100644 (file)
--- a/lld/lib/Core/Error.cpp
+++ b/lld/lib/Core/Error.cpp
@@ -76,18 +76,10 @@ private:
 
 static dynamic_error_category categorySingleton;
 
-std::error_code make_dynamic_error_code(const char *msg) {
-  return make_dynamic_error_code(StringRef(msg));
-}
-
 std::error_code make_dynamic_error_code(StringRef msg) {
   return std::error_code(categorySingleton.add(msg), categorySingleton);
 }
 
-std::error_code make_dynamic_error_code(const Twine &msg) {
-  return std::error_code(categorySingleton.add(msg.str()), categorySingleton);
-}
-
 char GenericError::ID = 0;
 
 GenericError::GenericError(Twine Msg) : Msg(Msg.str()) { }