[llvm] df813dc - Error.h - GenericBinaryError - pass Twine arg by reference not value.

[Simon Pilgrim via llvm-commits]

Author: Simon Pilgrim
Date: 2020-06-27T10:12:20+01:00
New Revision: df813dc09e1bf5260d8f5cce3643ec90c68cd426

URL: https://github.com/llvm/llvm-project/commit/df813dc09e1bf5260d8f5cce3643ec90c68cd426
DIFF: https://github.com/llvm/llvm-project/commit/df813dc09e1bf5260d8f5cce3643ec90c68cd426.diff

LOG: Error.h - GenericBinaryError - pass Twine arg by reference not value.

This allows us to reduce the Twine.h include to a forward declaration.

Added: 
    

Modified: 
    llvm/include/llvm/Object/Error.h
    llvm/lib/Object/Error.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Object/Error.h b/llvm/include/llvm/Object/Error.h
index b7bbf06fc86d..1e109fa131c8 100644
--- a/llvm/include/llvm/Object/Error.h
+++ b/llvm/include/llvm/Object/Error.h
@@ -13,11 +13,13 @@
 #ifndef LLVM_OBJECT_ERROR_H
 #define LLVM_OBJECT_ERROR_H
 
-#include "llvm/ADT/Twine.h"
 #include "llvm/Support/Error.h"
 #include <system_error>
 
 namespace llvm {
+
+class Twine;
+
 namespace object {
 
 class Binary;
@@ -65,8 +67,8 @@ class BinaryError : public ErrorInfo<BinaryError, ECError> {
 class GenericBinaryError : public ErrorInfo<GenericBinaryError, BinaryError> {
 public:
   static char ID;
-  GenericBinaryError(Twine Msg);
-  GenericBinaryError(Twine Msg, object_error ECOverride);
+  GenericBinaryError(const Twine &Msg);
+  GenericBinaryError(const Twine &Msg, object_error ECOverride);
   const std::string &getMessage() const { return Msg; }
   void log(raw_ostream &OS) const override;
 private:

diff  --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp
index 010c5b42dac2..bc75bc6c0445 100644
--- a/llvm/lib/Object/Error.cpp
+++ b/llvm/lib/Object/Error.cpp
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Object/Error.h"
+#include "llvm/ADT/Twine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/ManagedStatic.h"
 
@@ -60,9 +61,10 @@ void BinaryError::anchor() {}
 char BinaryError::ID = 0;
 char GenericBinaryError::ID = 0;
 
-GenericBinaryError::GenericBinaryError(Twine Msg) : Msg(Msg.str()) {}
+GenericBinaryError::GenericBinaryError(const Twine &Msg) : Msg(Msg.str()) {}
 
-GenericBinaryError::GenericBinaryError(Twine Msg, object_error ECOverride)
+GenericBinaryError::GenericBinaryError(const Twine &Msg,
+                                       object_error ECOverride)
     : Msg(Msg.str()) {
   setErrorCode(make_error_code(ECOverride));
 }