Fix compiler error

Author: SahilPatidar

interpreter/llvm-project/llvm/include/llvm/ExecutionEngine/Orc/Shared/AutoLoadDylibUtils.h

@@ -30,7 +30,6 @@ constexpr uint32_t log2u(std::uint32_t n) {
   return (n > 1) ? 1 + log2u(n >> 1) : 0;
 }
 
-// namespace platform {
 /// Platform specific delimiter for splitting environment variables.
 /// ':' on Unix, and ';' on Windows
 extern const char *const kEnvDelim;
@@ -41,10 +40,14 @@ enum class SplitMode {
   AllowNonExistant  ///< Add all paths whether they exist or not
 };
 
-bool SplitPaths(StringRef PathStr, SmallVectorImpl<StringRef> &Paths,
-                SplitMode Mode, StringRef Delim, bool Verbose = false);
+/// Collect the constituant paths from a PATH string.
+/// /bin:/usr/bin:/usr/local/bin -> {/bin, /usr/bin, /usr/local/bin}
+bool SplitPaths(llvm::StringRef PathStr,
+                llvm::SmallVectorImpl<llvm::StringRef> &Paths,
+                SplitMode Mode = SplitMode::PruneNonExistant,
+                llvm::StringRef Delim = kEnvDelim,
+                bool Verbose = false);
 
-///
 bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string> &Paths);
 
 /// Returns a normalized version of the given Path
@@ -58,7 +61,6 @@ void *DLSym(const std::string &Name, std::string *Err = nullptr);
 
 /// Close a handle to a shared library.
 void DLClose(void *Lib, std::string *Err = nullptr);
-// } // namespace platform
 
 class BloomFilter {
 private:

interpreter/llvm-project/llvm/lib/ExecutionEngine/Orc/Shared/AutoLoadDylibUtils.cpp

@@ -50,47 +50,6 @@ bool Popen(const std::string &Cmd, llvm::SmallVectorImpl<char> &Buf, bool RdE) {
 }
 #endif
 
-bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string> &Paths) {
-#if defined(__APPLE__) || defined(__CYGWIN__)
-  Paths.push_back("/usr/local/lib/");
-  Paths.push_back("/usr/X11R6/lib/");
-  Paths.push_back("/usr/lib/");
-  Paths.push_back("/lib/");
-
-#ifndef __APPLE__
-  Paths.push_back("/lib/x86_64-linux-gnu/");
-  Paths.push_back("/usr/local/lib64/");
-  Paths.push_back("/usr/lib64/");
-  Paths.push_back("/lib64/");
-#endif
-#elif defined(LLVM_ON_UNIX)
-  llvm::SmallString<1024> Buf;
-  platform::Popen("LD_DEBUG=libs LD_PRELOAD=DOESNOTEXIST ls", Buf, true);
-  const llvm::StringRef Result = Buf.str();
-
-  const std::size_t NPos = std::string::npos;
-  const std::size_t LD = Result.find("(LD_LIBRARY_PATH)");
-  std::size_t From = Result.find("search path=", LD == NPos ? 0 : LD);
-  if (From != NPos) {
-    std::size_t To = Result.find("(system search path)", From);
-    if (To != NPos) {
-      From += 12;
-      while (To > From && isspace(Result[To - 1]))
-        --To;
-      std::string SysPath = Result.substr(From, To - From).str();
-      SysPath.erase(std::remove_if(SysPath.begin(), SysPath.end(), ::isspace),
-                    SysPath.end());
-
-      llvm::SmallVector<llvm::StringRef, 10> CurPaths;
-      SplitPaths(SysPath, CurPaths);
-      for (const auto &Path : CurPaths)
-        Paths.push_back(Path.str());
-    }
-  }
-#endif
-  return true;
-}
-
 std::string NormalizePath(const std::string &Path) {
 
   llvm::SmallString<256> Buffer;
@@ -241,5 +200,46 @@ bool SplitPaths(StringRef PathStr, SmallVectorImpl<StringRef> &Paths,
 #undef DEBUG_TYPE
 }
 
+bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string> &Paths) {
+#if defined(__APPLE__) || defined(__CYGWIN__)
+  Paths.push_back("/usr/local/lib/");
+  Paths.push_back("/usr/X11R6/lib/");
+  Paths.push_back("/usr/lib/");
+  Paths.push_back("/lib/");
+
+#ifndef __APPLE__
+  Paths.push_back("/lib/x86_64-linux-gnu/");
+  Paths.push_back("/usr/local/lib64/");
+  Paths.push_back("/usr/lib64/");
+  Paths.push_back("/lib64/");
+#endif
+#elif defined(LLVM_ON_UNIX)
+  llvm::SmallString<1024> Buf;
+  Popen("LD_DEBUG=libs LD_PRELOAD=DOESNOTEXIST ls", Buf, true);
+  const llvm::StringRef Result = Buf.str();
+
+  const std::size_t NPos = std::string::npos;
+  const std::size_t LD = Result.find("(LD_LIBRARY_PATH)");
+  std::size_t From = Result.find("search path=", LD == NPos ? 0 : LD);
+  if (From != NPos) {
+    std::size_t To = Result.find("(system search path)", From);
+    if (To != NPos) {
+      From += 12;
+      while (To > From && isspace(Result[To - 1]))
+        --To;
+      std::string SysPath = Result.substr(From, To - From).str();
+      SysPath.erase(std::remove_if(SysPath.begin(), SysPath.end(), ::isspace),
+                    SysPath.end());
+
+      llvm::SmallVector<llvm::StringRef, 10> CurPaths;
+      SplitPaths(SysPath, CurPaths);
+      for (const auto &Path : CurPaths)
+        Paths.push_back(Path.str());
+    }
+  }
+#endif
+  return true;
+}
+
 } // namespace orc
 } // namespace llvm

interpreter/llvm-project/llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleExecutorDylibManager.cpp

@@ -11,7 +11,9 @@
 #include "llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h"
 #include "llvm/Support/FormatVariadic.h"
 
+#if defined(LLVM_ON_UNIX)
 #include <dlfcn.h>
+#endif
 
 #define DEBUG_TYPE "orc"