[BOLT][NFC] Add make_string_error

[Amir]

Summary

Provide a wrapper for make_error<StringError>(..., inconvertibleErrorCode())

bolt/include/bolt/Utils/Utils.h

 namespace bolt {
 
 /// Free memory allocated for \p List.
 template <typename T> void clearList(T &List) {
   T TempList;
   TempList.swap(List);
 }
 
+Error make_string_error(const Twine &Message);
+
 void report_error(StringRef Message, std::error_code EC);
 
 void report_error(StringRef Message, Error E);
 
 void check_error(std::error_code EC, StringRef Message);
 
 void check_error(Error E, Twine Message);
 

bolt/lib/Profile/YAMLProfileReader.cpp

Error YAMLProfileReader::preprocessProfile(BinaryContext &BC) {
   if (YamlInput.error()) {
     errs() << "BOLT-ERROR: syntax error parsing profile in " << Filename
            << " : " << YamlInput.error().message() << '\n';
     return errorCodeToError(YamlInput.error());
   }
 
   // Sanity check.
   if (YamlBP.Header.Version != 1)
-    return make_error<StringError>(
-        Twine("cannot read profile : unsupported version"),
-        inconvertibleErrorCode());
+    return make_string_error(Twine("cannot read profile: unsupported version"));
 
   if (YamlBP.Header.EventNames.find(',') != StringRef::npos)
-    return make_error<StringError>(
-        Twine("multiple events in profile are not supported"),
-        inconvertibleErrorCode());
+    return make_string_error(
+        Twine("multiple events in profile are not supported"));
 
   // Match profile to function based on a function name.
   buildNameMaps(BC.getBinaryFunctions());
 
   // Preliminary assign function execution count.
   for (auto &KV : BC.getBinaryFunctions()) {
     BinaryFunction &BF = KV.second;
     for (StringRef Name : BF.getNames()) {

bolt/lib/Rewrite/MachORewriteInstance.cpp

 }
 
 Error MachORewriteInstance::setProfile(StringRef Filename) {
   if (!sys::fs::exists(Filename))
     return errorCodeToError(make_error_code(errc::no_such_file_or_directory));
 
   if (ProfileReader) {
     // Already exists
-    return make_error<StringError>(
-        Twine("multiple profiles specified: ") + ProfileReader->getFilename() +
-        " and " + Filename, inconvertibleErrorCode());
+    return make_string_error(Twine("multiple profiles specified: ") +
+                             ProfileReader->getFilename() + " and " + Filename);
   }
 
   ProfileReader = std::make_unique<DataReader>(Filename);
   return Error::success();
 }
 
 void MachORewriteInstance::preprocessProfileData() {
   if (!ProfileReader)

bolt/lib/Rewrite/RewriteInstance.cpp

 RewriteInstance::~RewriteInstance() {}
 
 Error RewriteInstance::setProfile(StringRef Filename) {
   if (!sys::fs::exists(Filename))
     return errorCodeToError(make_error_code(errc::no_such_file_or_directory));
 
   if (ProfileReader) {
     // Already exists
-    return make_error<StringError>(Twine("multiple profiles specified: ") +
-                                       ProfileReader->getFilename() + " and " +
-                                       Filename,
-                                   inconvertibleErrorCode());
+    return make_string_error(Twine("multiple profiles specified: ") +
+                             ProfileReader->getFilename() + " and " + Filename);
   }
 
   // Spawn a profile reader based on file contents.
   if (DataAggregator::checkPerfDataMagic(Filename))
     ProfileReader = std::make_unique<DataAggregator>(Filename);
   else if (YAMLProfileReader::isYAML(Filename))
     ProfileReader = std::make_unique<YAMLProfileReader>(Filename);
   else
if (BC.EFMM->ObjectsLoaded) {
         std::string SymName = Symbol.str();
         LLVM_DEBUG(dbgs() << "BOLT: looking for " << SymName << "\n");
         // Resolve to a PLT entry if possible
         if (const BinaryData *I = BC.getPLTBinaryDataByName(SymName)) {
           AllResults[Symbol] =
               JITEvaluatedSymbol(I->getAddress(), JITSymbolFlags());
           continue;
         }
-        OnResolved(make_error<StringError>(
-            "Symbol not found required by runtime: " + Symbol,
-            inconvertibleErrorCode()));
+        OnResolved(make_string_error("Symbol not found required by runtime: " +
+                                     Symbol));
         return;
       }
       OnResolved(std::move(AllResults));
       return;
     }
 
     for (const StringRef &Symbol : Symbols) {
       std::string SymName = Symbol.str();

bolt/lib/Utils/Utils.cpp

 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 namespace bolt {
 
+Error make_string_error(const Twine &Message) {
+  return make_error<StringError>(Message, inconvertibleErrorCode());
+}
+
 void report_error(StringRef Message, std::error_code EC) {
   assert(EC);
   errs() << "BOLT-ERROR: '" << Message << "': " << EC.message() << ".\n";
   exit(1);
 }
 
 void report_error(StringRef Message, Error E) {
   assert(E);