[Support] Use absolute paths for include filenames

[tcwzxx]

Since the LSP file URL requires an absolute path, ensure that all include files use absolute paths

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: tcwzxx (tcwzxx)

Changes

Since the LSP file URL requires an absolute path, ensure that all include files use absolute paths

---

Full diff: https://github.com/llvm/llvm-project/pull/136687.diff

1 Files Affected:

• (modified) llvm/lib/Support/SourceMgr.cpp (+6-2)

diff --git a/llvm/lib/Support/SourceMgr.cpp b/llvm/lib/Support/SourceMgr.cpp
index 3f97213d86c05..1a6389737c1fb 100644
--- a/llvm/lib/Support/SourceMgr.cpp
+++ b/llvm/lib/Support/SourceMgr.cpp
@@ -20,6 +20,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/ErrorOr.h"
+#include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Locale.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
@@ -52,15 +53,18 @@ unsigned SourceMgr::AddIncludeFile(const std::string &Filename,
 ErrorOr<std::unique_ptr<MemoryBuffer>>
 SourceMgr::OpenIncludeFile(const std::string &Filename,
                            std::string &IncludedFile) {
+  SmallString<128> Path{Filename};
+  sys::fs::make_absolute(Path);
   ErrorOr<std::unique_ptr<MemoryBuffer>> NewBufOrErr =
-      MemoryBuffer::getFile(Filename);
+      MemoryBuffer::getFile(Path);
 
-  SmallString<64> Buffer(Filename);
+  SmallString<64> Buffer(Path);
   // If the file didn't exist directly, see if it's in an include path.
   for (unsigned i = 0, e = IncludeDirectories.size(); i != e && !NewBufOrErr;
        ++i) {
     Buffer = IncludeDirectories[i];
     sys::path::append(Buffer, Filename);
+    sys::fs::make_absolute(Buffer);
     NewBufOrErr = MemoryBuffer::getFile(Buffer);
   }
 

[zero9178]

Not super familiar with the LSP spec unfortunately, but assuming there is no better place to convert to absolute paths it makes sense.

Could this be tested in some way? E.g. that a URI now contains more components of a path that it previously didn't

[tcwzxx]

Thanks,

but assuming there is no better place

But after a file is opened, transforming the file path is problematic if the cwd has changed