[Lldb-commits] [lldb] bf414cf - [lldb] Fix the build after 8b3b66ea63d6

Jonas Devlieghere via lldb-commits lldb-commits at lists.llvm.org
Thu Mar 3 13:57:39 PST 2022


Author: Jonas Devlieghere
Date: 2022-03-03T13:57:33-08:00
New Revision: bf414cfbf70570eaba282ae0561324794269d2d1

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

LOG: [lldb] Fix the build after 8b3b66ea63d6

Remove remaining calls to FileSystem::Collect.

Added: 
    

Modified: 
    lldb/source/Host/windows/FileSystem.cpp
    lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/Host/windows/FileSystem.cpp b/lldb/source/Host/windows/FileSystem.cpp
index 94872c99b15ec..cbd1915bdb448 100644
--- a/lldb/source/Host/windows/FileSystem.cpp
+++ b/lldb/source/Host/windows/FileSystem.cpp
@@ -86,7 +86,6 @@ Status FileSystem::ResolveSymbolicLink(const FileSpec &src, FileSpec &dst) {
 }
 
 FILE *FileSystem::Fopen(const char *path, const char *mode) {
-  Collect(path);
   std::wstring wpath, wmode;
   if (!llvm::ConvertUTF8toWide(path, wpath))
     return nullptr;
@@ -99,7 +98,6 @@ FILE *FileSystem::Fopen(const char *path, const char *mode) {
 }
 
 int FileSystem::Open(const char *path, int flags, int mode) {
-  Collect(path);
   std::wstring wpath;
   if (!llvm::ConvertUTF8toWide(path, wpath))
     return -1;

diff  --git a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
index c677abfaa5f20..5b9d1b7c1520f 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
@@ -217,7 +217,6 @@ bool ScriptInterpreterLua::LoadScriptingModule(
     lldb_private::Status &error, StructuredData::ObjectSP *module_sp,
     FileSpec extra_search_dir) {
 
-  FileSystem::Instance().Collect(filename);
   if (llvm::Error e = m_lua->LoadModule(filename)) {
     error.SetErrorStringWithFormatv("lua failed to import '{0}': {1}\n",
                                     filename, llvm::toString(std::move(e)));


        


More information about the lldb-commits mailing list