Upgrade LLVM to 18.1.8

Bug: b/385208338
google · Dec 20, 2024 · ab11291 · ab11291
1 parent a5f44f3
commit ab11291
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/base/cvd/MODULE.bazel b/base/cvd/MODULE.bazel
@@ -39,7 +39,7 @@ bazel_dep(name = "toolchains_llvm", version = "1.2.0")
 # Configure and register the toolchain.
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
 llvm.toolchain(
-   llvm_version = "16.0.0",
+   llvm_version = "18.1.8",
 )
 
 use_repo(llvm, "llvm_toolchain")

diff --git a/base/cvd/MODULE.bazel.lock b/base/cvd/MODULE.bazel.lock
diff --git a/base/cvd/cuttlefish/common/libs/fs/shared_fd.cpp b/base/cvd/cuttlefish/common/libs/fs/shared_fd.cpp
@@ -912,7 +912,7 @@ int FileInstance::LinkAtCwd(const std::string& path) {
   name += std::to_string(fd_);
   errno = 0;
   int rval =
-      linkat(-1, name.c_str(), AT_FDCWD, path.c_str(), AT_SYMLINK_FOLLOW);
+      linkat(AT_FDCWD, name.c_str(), AT_FDCWD, path.c_str(), AT_SYMLINK_FOLLOW);
   errno_ = errno;
   return rval;
 }

diff --git a/base/cvd/cuttlefish/common/libs/utils/files.cpp b/base/cvd/cuttlefish/common/libs/utils/files.cpp
@@ -536,13 +536,17 @@ Result<std::string> ReadFileContents(const std::string& filepath) {
 }
 
 std::string CurrentDirectory() {
-  std::unique_ptr<char, void (*)(void*)> cwd(getcwd(nullptr, 0), &free);
-  std::string process_cwd(cwd.get());
-  if (!cwd) {
-    PLOG(ERROR) << "`getcwd(nullptr, 0)` failed";
-    return "";
+  std::vector<char> process_wd(1 << 12, ' ');
+  while (getcwd(process_wd.data(), process_wd.size()) == nullptr) {
+    if (errno == ERANGE) {
+      process_wd.resize(process_wd.size() * 2, ' ');
+    } else {
+      PLOG(ERROR) << "getcwd failed";
+      return "";
+    }
   }
-  return process_cwd;
+  // Will find the null terminator and size the string appropriately.
+  return process_wd.data();
 }
 
 FileSizes SparseFileSizes(const std::string& path) {