[llvm] 2eb80a9 - Make StringRef's std::string conversion operator explicit

[Sylvestre Ledru via llvm-commits]

Author: Sylvestre Ledru
Date: 2020-02-01T15:43:45+01:00
New Revision: 2eb80a99a2c6f8e2f090a2bc8cd2760fe1e1f267

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

LOG: Make StringRef's std::string conversion operator explicit
The build is currenly broken when perf or ffi are enabled for llvm

Just like in https://reviews.llvm.org/rG777180a32b61070a10dd330b4f038bf24e916af1

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
    llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 71b7f893d712..cb1b35d62388 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -274,7 +274,7 @@ GenericValue Interpreter::callExternalFunction(Function *F,
   RawFunc RawFn;
   if (RF == RawFunctions->end()) {
     RawFn = (RawFunc)(intptr_t)
-      sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName());
+      sys::DynamicLibrary::SearchForAddressOfSymbol(std::string(F->getName()));
     if (!RawFn)
       RawFn = (RawFunc)(intptr_t)getPointerToGlobalIfAvailable(F);
     if (RawFn != 0)

diff  --git a/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp b/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
index cc196df3b2fa..ba9e7476e294 100644
--- a/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
+++ b/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp
@@ -328,7 +328,7 @@ bool PerfJITEventListener::InitDebuggingDir() {
     return false;
   }
 
-  JitPath = UniqueDebugDir.str();
+  JitPath = std::string(UniqueDebugDir.str());
 
   return true;
 }