Revert "Retry^2 "[ProfileData] (llvm) Use Error in InstrProf and Coverage, NFC""

This reverts commit r269694. MSVC says:

error C2086: 'char llvm::ProfErrorInfoBase<enum llvm::instrprof_error>::ID' : redefinition

llvm-svn: 269700

1 files changed, 2 insertions, 2 deletions

diff --git a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
index 11369d6f70d..930001fd684 100644
--- a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
@@ -374,9 +374,9 @@ void InstrProfiling::emitNameData() {
     return;
 
   std::string CompressedNameStr;
-  if (Error E = collectPGOFuncNameStrings(ReferencedNames, CompressedNameStr,
+  if (auto EC = collectPGOFuncNameStrings(ReferencedNames, CompressedNameStr,
                                           DoNameCompression)) {
-    llvm::report_fatal_error(toString(std::move(E)), false);
+    llvm::report_fatal_error(EC.message(), false);
   }
 
   auto &Ctx = M->getContext();