merge main into amd-staging

.github/workflows/build-ci-container-tooling.yml

@@ -45,6 +45,9 @@ jobs:
             test-command: 'true'
             target: github-automation
             context: llvm/utils/git/
+          - container-name: ids-checks
+            test-command: 'idt --help'
+            target: ids-checks
 
     steps:
       - name: Checkout LLVM

.github/workflows/containers/github-action-ci-tooling/Dockerfile

@@ -128,3 +128,54 @@ RUN apt-get update && \
 USER gha
 
 ADD github-automation.py /usr/local/bin/
+
+FROM docker.io/library/ubuntu:24.04@sha256:c4a8d5503dfb2a3eb8ab5f807da5bc69a85730fb49b5cfca2330194ebcc41c7b AS ids-builder
+ARG LLVM_VERSION_MAJOR
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y wget gpg python3 python3-pip git cmake
+
+RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/keyrings/llvm.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/llvm.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-${LLVM_VERSION_MAJOR} main" | tee /etc/apt/sources.list.d/llvm.list && \
+    apt-get update && \
+    apt-get install -y clang-${LLVM_VERSION_MAJOR} lld-${LLVM_VERSION_MAJOR} ninja-build libclang-${LLVM_VERSION_MAJOR}-dev
+
+COPY llvm/utils/git/requirements_formatting.txt requirements_formatting.txt
+RUN pip install --require-hashes -r requirements_formatting.txt --break-system-packages && \
+    rm requirements_formatting.txt
+
+RUN git clone https://github.com/compnerd/ids && cd ids && \
+    git checkout 6d9b77c89107743159fccaea109e8feb81959844
+
+RUN cd ids && \
+    cmake -B ./build \
+      -S .\
+      -D CMAKE_BUILD_TYPE=Release \
+      -D CMAKE_C_COMPILER=clang-${LLVM_VERSION_MAJOR} \
+      -D CMAKE_CXX_COMPILER=clang++-${LLVM_VERSION_MAJOR} \
+      -D CMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld \
+      -D LLVM_DIR=/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/cmake/llvm/ \
+      -D Clang_DIR=/usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/cmake/clang/ \
+      -D FILECHECK_EXECUTABLE=$(which FileCheck-${LLVM_VERSION_MAJOR}) \
+      -D LIT_EXECUTABLE=$(which lit) \
+      -G Ninja && \
+    ninja -C ./build
+
+FROM ci-container-build-tools AS ci-container-ids-checks
+ARG LLVM_VERSION_MAJOR
+
+COPY llvm/utils/git/requirements.txt requirements.txt
+RUN pip install --require-hashes -r requirements.txt --break-system-packages && \
+    rm requirements.txt
+
+RUN apt-get update && \
+    apt-get install -y libz3-4 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY --from=ids-builder /ids/build/bin/idt \
+                        /usr/bin/idt
+# Copy over the LLVM SO since getting ids to statically link against the distro
+# provided libLLVM is difficult for now.
+# TODO(boomanaiden154): Get static linking working and remove this.
+COPY --from=ids-builder /usr/lib/llvm-${LLVM_VERSION_MAJOR}/lib/libLLVM.so.${LLVM_VERSION_MAJOR}.1 \
+                        /usr/lib/libLLVM.so.${LLVM_VERSION_MAJOR}.1

.github/workflows/containers/github-action-ci-windows/Dockerfile

@@ -93,7 +93,7 @@ RUN powershell -Command \
     New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" \
     -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
 
-ARG RUNNER_VERSION=2.335.0
+ARG RUNNER_VERSION=2.335.1
 ENV RUNNER_VERSION=$RUNNER_VERSION
 
 RUN powershell -Command \

.github/workflows/containers/github-action-ci/Dockerfile

@@ -100,7 +100,7 @@ WORKDIR /home/gha
 
 FROM ci-container AS ci-container-agent
 
-ENV GITHUB_RUNNER_VERSION=2.335.0
+ENV GITHUB_RUNNER_VERSION=2.335.1
 
 RUN mkdir actions-runner && \
     cd actions-runner && \

.github/workflows/ids-check.yml

@@ -15,16 +15,11 @@ jobs:
     if: github.repository_owner == 'llvm'
     name: Check LLVM_ABI annotations with ids
     runs-on: ubuntu-24.04
+    container:
+      image: 'ghcr.io/llvm/ci-ubuntu-24.04-ids-checks:latest@sha256:c80bc0f562592a850f4460bcec6cba339fe21b29bb80763cc621fb01ed0e3883'
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-          repository: compnerd/ids
-          path: ${{ github.workspace }}/ids
-          ref: 6d9b77c89107743159fccaea109e8feb81959844 # main, pinned at the --main-file landing
-
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
@@ -41,27 +36,13 @@ jobs:
           base_sha: 'HEAD~1'
           sha: 'HEAD'
 
-      - name: Install dependencies
-        run: |
-          # Pull a recent clang from LLVM's apt repo so idt's parser stays in
-          # sync with the C++ language features used by current LLVM source.
-          sudo install -d -m 0755 /etc/apt/keyrings
-          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key \
-            | sudo gpg --dearmor -o /etc/apt/keyrings/llvm.gpg
-          echo "deb [signed-by=/etc/apt/keyrings/llvm.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" \
-            | sudo tee /etc/apt/sources.list.d/llvm.list
-          sudo apt update
-          # oprofile provides opagent.h, used by llvm/ExecutionEngine/OProfileWrapper.h
-          sudo apt install -y clang-22 lld-22 ninja-build libclang-22-dev oprofile
-          pip install --require-hashes -r ${{ github.workspace }}/llvm-project/llvm/utils/git/requirements.txt
-
       - name: Configure and build minimal LLVM for use by ids
         run: |
-          cmake -B ${{ github.workspace }}/llvm-project/build/ \
-                -S ${{ github.workspace }}/llvm-project/llvm/ \
+          cmake -B ./llvm-project/build/ \
+                -S ./llvm-project/llvm/ \
                 -D CMAKE_BUILD_TYPE=Release \
-                -D CMAKE_C_COMPILER=clang-22 \
-                -D CMAKE_CXX_COMPILER=clang++-22 \
+                -D CMAKE_C_COMPILER=clang \
+                -D CMAKE_CXX_COMPILER=clang++ \
                 -D LLVM_ENABLE_PROJECTS=clang \
                 -D LLVM_TARGETS_TO_BUILD="host" \
                 -D LLVM_INCLUDE_TESTS=OFF \
@@ -72,7 +53,7 @@ jobs:
 
           # Build the generated-header prerequisites that idt needs to parse
           # LLVM source.
-          BUILD_DIR=${{ github.workspace }}/llvm-project/build
+          BUILD_DIR=./llvm-project/build
           ninja -C "$BUILD_DIR" \
             llvm_vcsrevision_h \
             intrinsics_gen omp_gen acc_gen analysis_gen target_parser_gen vt_gen \
@@ -93,33 +74,17 @@ jobs:
                 }')
           ninja -C "$BUILD_DIR" $TABLEGEN_TARGETS
 
-      - name: Configure and build ids
-        run: |
-          cmake -B ${{ github.workspace }}/ids/build/ \
-                -S ${{ github.workspace }}/ids/ \
-                -D CMAKE_BUILD_TYPE=Release \
-                -D CMAKE_C_COMPILER=clang-22 \
-                -D CMAKE_CXX_COMPILER=clang++-22 \
-                -D CMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld \
-                -D LLVM_DIR=/usr/lib/llvm-22/lib/cmake/llvm/ \
-                -D Clang_DIR=/usr/lib/llvm-22/lib/cmake/clang/ \
-                -D FILECHECK_EXECUTABLE=$(which FileCheck-22) \
-                -D LIT_EXECUTABLE=$(which lit) \
-                -G Ninja
-          ninja -C ${{ github.workspace }}/ids/build/
-
       - name: Run ids check
         env:
           GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
           CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
-        working-directory: ${{ github.workspace }}/llvm-project
         run: |
           echo "[]" > comments &&
-          python llvm/utils/git/ids-check-helper.py \
+          python ./llvm-project/llvm/utils/git/ids-check-helper.py \
             --token ${{ secrets.GITHUB_TOKEN }} \
             --issue-number $GITHUB_PR_NUMBER \
-            --idt-path ${{ github.workspace }}/ids/build/bin/idt \
-            --compile-commands ${{ github.workspace }}/llvm-project/build/compile_commands.json \
+            --idt-path $(which idt) \
+            --compile-commands ./llvm-project/build/compile_commands.json \
             --start-rev HEAD~1 \
             --end-rev HEAD \
             --changed-files "$CHANGED_FILES" \

bolt/include/bolt/Rewrite/RewriteInstance.h

@@ -136,6 +136,11 @@ class RewriteInstance {
   /// Read relocations from a given RELR section.
   void readDynamicRelrRelocations(BinarySection &Section);
 
+  /// Process relative dynamic relocations targeting code. This happens in code
+  /// using indirect goto.
+  void handleRelativeDynamicRelocation(uint64_t RelOffset,
+                                       uint64_t ReferencedAddress);
+
   /// Print relocation information.
   void printRelocationInfo(const RelocationRef &Rel, StringRef SymbolName,
                            uint64_t SymbolAddress, uint64_t Addend,

bolt/lib/Rewrite/RewriteInstance.cpp

@@ -2808,30 +2808,13 @@ void RewriteInstance::readDynamicRelocations(const SectionRef &Section,
     // Check if this relocation targets an address within a function. This
     // happens with indirect goto.
     const uint64_t ReferencedAddress = SymbolAddress + Addend;
-    BinaryFunction *Func =
-        BC->getBinaryFunctionContainingAddress(ReferencedAddress);
-
-    if (Relocation::isRelative(RType) && SymbolAddress == 0) {
-      if (Func) {
-        if (!Func->isInConstantIsland(ReferencedAddress)) {
-          if (const uint64_t ReferenceOffset =
-                  ReferencedAddress - Func->getAddress()) {
-            assert(!BC->getBinaryFunctionContainingAddress(Rel.getOffset()) &&
-                   "Relative relocation to code only from data");
-            Func->registerInternalRefDataRelocation(ReferenceOffset,
-                                                    Rel.getOffset());
-          }
-        } else {
-          BC->errs() << "BOLT-ERROR: referenced address at 0x"
-                     << Twine::utohexstr(ReferencedAddress)
-                     << " is in constant island of function " << *Func << "\n";
-          exit(1);
-        }
+    if (Relocation::isRelative(RType)) {
+      if (SymbolAddress != 0) {
+        BC->errs() << "BOLT-ERROR: symbol address non zero for RELATIVE "
+                      "relocation type\n";
+        exit(1);
       }
-    } else if (Relocation::isRelative(RType) && SymbolAddress != 0) {
-      BC->errs() << "BOLT-ERROR: symbol address non zero for RELATIVE "
-                    "relocation type\n";
-      exit(1);
+      handleRelativeDynamicRelocation(Rel.getOffset(), ReferencedAddress);
     }
 
     BC->addDynamicRelocation(Rel.getOffset(), Symbol, RType, Addend);
@@ -2864,6 +2847,7 @@ void RewriteInstance::readDynamicRelrRelocations(BinarySection &Section) {
     LLVM_DEBUG(dbgs() << "BOLT-DEBUG: R_*_RELATIVE relocation at 0x"
                       << Twine::utohexstr(Address) << " to 0x"
                       << Twine::utohexstr(Addend) << '\n';);
+    handleRelativeDynamicRelocation(Address, Addend);
     BC->addDynamicRelocation(Address, nullptr, RType, Addend, /*Value=*/0,
                              /*IsRELR=*/true);
   };
@@ -2891,6 +2875,27 @@ void RewriteInstance::readDynamicRelrRelocations(BinarySection &Section) {
   }
 }
 
+void RewriteInstance::handleRelativeDynamicRelocation(
+    uint64_t RelOffset, uint64_t ReferencedAddress) {
+  BinaryFunction *Func =
+      BC->getBinaryFunctionContainingAddress(ReferencedAddress);
+  if (!Func)
+    return;
+
+  if (Func->isInConstantIsland(ReferencedAddress)) {
+    BC->errs() << "BOLT-ERROR: referenced address at 0x"
+               << Twine::utohexstr(ReferencedAddress)
+               << " is in constant island of function " << *Func << "\n";
+    exit(1);
+  }
+
+  if (const uint64_t ReferenceOffset = ReferencedAddress - Func->getAddress()) {
+    assert(!BC->getBinaryFunctionContainingAddress(RelOffset) &&
+           "Relative relocation to code only from data");
+    Func->registerInternalRefDataRelocation(ReferenceOffset, RelOffset);
+  }
+}
+
 void RewriteInstance::printRelocationInfo(const RelocationRef &Rel,
                                           StringRef SymbolName,
                                           uint64_t SymbolAddress,

bolt/test/X86/indirect-goto.test

@@ -10,6 +10,13 @@ RUN: llvm-bolt %t.pie -o %t.pie.null --relocs=1 --print-cfg --print-only=main \
 RUN:   --strict \
 RUN:   2>&1 | FileCheck %s
 
+## Check indirect goto works in binaries linked with relr
+RUN: %clang %cflags -fPIE -pie %S/../Inputs/indirect_goto.c -o %t.relr \
+RUN:   -Wl,-z,pack-relative-relocs -Wl,-q
+RUN: llvm-bolt %t.relr -o %t.relr.null --relocs=1 --print-cfg --print-only=main \
+RUN:   --strict \
+RUN:   2>&1 | FileCheck %s
+
 ## Check that all possible destinations are included as successors.
 CHECK:  jmpq    *%rax # UNKNOWN CONTROL FLOW
 CHECK:  Successors: .Ltmp0, .Ltmp1, .Ltmp2

clang-tools-extra/clang-doc/BitcodeWriter.cpp

@@ -551,7 +551,6 @@ void ClangDocBitcodeWriter::emitBlock(const MemberTypeInfo &T) {
   emitRecord(T.IsStatic, MEMBER_TYPE_IS_STATIC);
   emitRecord(T.IsBuiltIn, MEMBER_TYPE_IS_BUILTIN);
   emitRecord(T.IsTemplate, MEMBER_TYPE_IS_TEMPLATE);
-  // emitRecord(T.IsTemplate, MEMBER_TYPE_IS_TEMPLATE);
   for (const auto &CI : T.Description)
     emitBlock(*CI.Ptr);
 }

clang-tools-extra/clang-doc/Representation.cpp

@@ -485,11 +485,6 @@ void NamespaceInfo::merge(NamespaceInfo &&Other) {
 RecordInfo::RecordInfo(SymbolID USR, StringRef Name, StringRef Path)
     : SymbolInfo(InfoType::IT_record, USR, Name, Path) {}
 
-// FIXME: This constructor is currently unsafe for cross-arena copies of
-// populated records. Because a default copy of ScopeChildren will shallow-copy
-// the intrusive pointers, leading to a use-after-free when the TransientArena
-// is reset. Subsequent patches will address this by deep-copying children
-// individually via reduceChildren.
 RecordInfo::RecordInfo(const RecordInfo &Other, llvm::BumpPtrAllocator &Arena)
     : SymbolInfo(Other, Arena), TagType(Other.TagType),
       IsTypeDef(Other.IsTypeDef) {

clang-tools-extra/clang-doc/support/File.h

@@ -11,8 +11,8 @@
 /// such as creating directories and writing output files.
 ///
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_FILE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_FILE_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_FILE_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_FILE_H
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Error.h"
@@ -28,4 +28,4 @@ llvm::SmallString<128> computeRelativePath(llvm::StringRef Destination,
 } // namespace doc
 } // namespace clang
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_FILE_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_FILE_H

clang-tools-extra/clang-doc/support/Utils.h

@@ -13,8 +13,8 @@
 /// data model.
 ///
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_FILE_H
-#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_FILE_H
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_UTILS_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_UTILS_H
 
 #include "../Representation.h"
 #include "llvm/ADT/SmallString.h"
@@ -33,4 +33,4 @@ void getHtmlFiles(llvm::StringRef AssetsPath,
 
 void getMdFiles(llvm::StringRef AssetsPath, clang::doc::ClangDocContext &CDCtx);
 
-#endif
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_SUPPORT_UTILS_H

clang-tools-extra/clangd/index/remote/marshalling/Marshalling.cpp

@@ -59,14 +59,16 @@ Marshaller::Marshaller(llvm::StringRef RemoteIndexRoot,
     : Strings(Arena) {
   llvm::StringRef PosixSeparator = get_separator(Style::posix);
   if (!RemoteIndexRoot.empty()) {
-    assert(is_absolute(RemoteIndexRoot));
+    assert(is_absolute(RemoteIndexRoot, Style::posix) ||
+           is_absolute(RemoteIndexRoot, Style::windows));
     this->RemoteIndexRoot = convert_to_slash(RemoteIndexRoot, Style::windows);
     llvm::StringRef Path(this->RemoteIndexRoot);
     if (!is_separator(this->RemoteIndexRoot.back(), Style::posix))
       this->RemoteIndexRoot += PosixSeparator;
   }
   if (!LocalIndexRoot.empty()) {
-    assert(is_absolute(LocalIndexRoot));
+    assert(is_absolute(LocalIndexRoot, Style::posix) ||
+           is_absolute(LocalIndexRoot, Style::windows));
     this->LocalIndexRoot = convert_to_slash(LocalIndexRoot, Style::windows);
     llvm::StringRef Path(this->LocalIndexRoot);
     if (!is_separator(this->LocalIndexRoot.back(), Style::posix))
@@ -395,7 +397,7 @@ llvm::Expected<std::string> Marshaller::uriToRelativePath(llvm::StringRef URI) {
   llvm::StringRef Path(Result);
   // Check for Windows paths (URI=file:///X:/path => Body=/X:/path)
   if (is_absolute(Path.substr(1), Style::windows))
-    Result = Path.drop_front();
+    Result = Path.drop_front().str();
   if (!replace_path_prefix(Result, RemoteIndexRoot, ""))
     return error("File path '{0}' doesn't start with '{1}'.", Result.str(),
                  RemoteIndexRoot);

clang-tools-extra/clangd/index/remote/server/Server.cpp

@@ -589,7 +589,9 @@ int main(int argc, char *argv[]) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
   llvm::sys::SetInterruptFunction(&clang::clangd::requestShutdown);
 
-  if (!llvm::sys::path::is_absolute(IndexRoot)) {
+  if (!llvm::sys::path::is_absolute(IndexRoot, llvm::sys::path::Style::posix) &&
+      !llvm::sys::path::is_absolute(IndexRoot,
+                                    llvm::sys::path::Style::windows)) {
     llvm::errs() << "Index root should be an absolute path.\n";
     return -1;
   }

clang-tools-extra/clangd/test/remote-index/cross-platform-root.test

@@ -0,0 +1,8 @@
+# Verify that clangd-index-server accepts Windows-style absolute paths as
+# project root, allowing the server to run on Linux with a Windows-built index.
+# "C:/project" is absolute in Windows style but not POSIX style.
+# REQUIRES: clangd-remote-index
+# RUN: not clangd-index-server --server-address=localhost:0 %t.idx "C:\\project" 2>&1 | FileCheck %s
+# The server should pass the path validation and fail later on missing index.
+# CHECK-NOT: Index root should be an absolute path
+# CHECK: does not exist