chore: bump LLVM commit hash to 9c5217c

Author: sdkrystian

.github/workflows/ci.yml

@@ -63,7 +63,7 @@ jobs:
             clang: git build-essential pkg-config python3 curl openjdk-11-jdk pkg-config libncurses-dev libxml2-utils libxml2-dev
             msvc: ''
           extra-values: |
-            llvm-hash: e1065370aaacb1b1cb48e77d37d376bf024f4a39
+            llvm-hash: 9c5217c4edf945838ecf70ebc6004cc40c097232
             llvm-id: {{ substr llvm-hash 0 7 }}
             llvm-build-preset-prefix: {{#if optimized-debug}}debwithopt{{else}}{{lowercase build-type}}{{/if}}
             llvm-build-preset-suffix: {{#if (ieq os 'windows') }}win{{else}}unix{{/if}}
@@ -74,10 +74,6 @@ jobs:
             llvm-archive-basename: llvm-{{ os }}-{{ llvm-build-preset-prefix }}-{{ llvm-id }}
             llvm-archive-extension: {{#if (ieq os 'windows') }}7z{{else}}tar.bz2{{/if}}
             llvm-archive-filename: {{ llvm-archive-basename }}.{{ llvm-archive-extension }}
-            libcxx-runtimes: libcxx;libcxxabi{{#if (ine os 'windows') }};libunwind{{/if}}
-            libcxx-targets: cxx {{#if (ine os 'windows') }}cxxabi unwind{{/if}} install-cxx {{#if (ine os 'windows') }}install-cxxabi install-unwind{{/if}}
-            libcxx-cxxflags: {{#if (ieq os 'windows') }}-D__ORDER_LITTLE_ENDIAN__=1234 -D__ORDER_BIG_ENDIAN__=4321 -D__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__{{/if}}
-            libcxx-cmake-args: -D LLVM_ENABLE_RUNTIMES="{{ libcxx-runtimes }}" {{#if (ieq os 'windows') }}-D LIBCXXABI_USE_LLVM_UNWINDER=OFF -D LIBCXXABI_ENABLE_SHARED=OFF -D LIBCXXABI_ENABLE_STATIC=ON -D LIBCXX_ENABLE_SHARED=OFF -D LIBCXX_NO_VCRUNTIME=ON{{/if}} {{#if (ieq os 'macos') }}-D CMAKE_OSX_ARCHITECTURES=""{{/if}} 
             mrdocs-ccflags: {{ ccflags }} {{#if (eq compiler 'gcc') }}-static{{/if}} {{#if asan }}-static-libasan{{/if}} {{#if tsan }}-static-libtsan{{/if}}
             mrdocs-cxxflags: {{ cxxflags }} {{#if (eq compiler 'gcc') }}-static{{/if}} {{#if asan }}-static-libasan{{/if}} {{#if tsan }}-static-libtsan{{/if}}
             mrdocs-package-generators: {{#if (ieq os 'windows') }}7Z ZIP WIX{{else}}TGZ TXZ{{/if}}
@@ -337,25 +333,7 @@ jobs:
           build-type: ${{ matrix.build-type }}
           cc: ${{ steps.setup-cpp.outputs.cc }}
           cxx: ${{ steps.setup-cpp.outputs.cxx }}
-          install: true
-          install-prefix: ${sourceDir}/../install
-          run-tests: false
-          trace-commands: true
-
-      - name: Install LibC++
-        uses: alandefreitas/cpp-actions/[email protected]
-        if: steps.llvm-cache.outputs.cache-hit != 'true' && steps.llvm-download.outputs.found != 'true'
-        with:
-          cmake-version: '>=3.26'
-          source-dir: ../third-party/llvm-project/runtimes
-          build-dir: ${sourceDir}/build-libcxx
-          build-target: ${{ matrix.libcxx-targets }}
-          # MrDocs will only use the LibC++ headers: any compiler that works in this workflow will do
-          cc: ${{ runner.os == 'macOS' && steps.setup-cpp.outputs.cc || '../third-party/llvm-project/install/bin/clang' }}
-          cxx: ${{ runner.os == 'macOS' && steps.setup-cpp.outputs.cxx || '../third-party/llvm-project/install/bin/clang++' }}
-          cxxflags: ${{ matrix.libcxx-cxxflags }}
           generator: Ninja
-          extra-args: ${{ matrix.libcxx-cmake-args }}
           install: true
           install-prefix: ${sourceDir}/../install
           run-tests: false

docs/modules/ROOT/pages/install.adoc

@@ -297,7 +297,7 @@ NOTE: These examples assume VcPkg is already installed in the `third-party/vcpkg
 === LLVM
 
 MrDocs uses LLVM to parse C++ code and extract documentation from it.
-It depends on a recent version of LLVM: https://github.com/llvm/llvm-project/tree/e1065370aaacb1b1cb48e77d37d376bf024f4a39[e1065370]
+It depends on a recent version of LLVM: https://github.com/llvm/llvm-project/tree/9c5217c4edf945838ecf70ebc6004cc40c097232[9c5217c]
 
 **Download**:
 
@@ -310,7 +310,7 @@ mkdir -p llvm-project <.>
 cd llvm-project
 git init <.>
 git remote add origin https://github.com/llvm/llvm-project.git <.>
-git fetch --depth 1 origin e1065370aaacb1b1cb48e77d37d376bf024f4a39 <.>
+git fetch --depth 1 origin 9c5217c4edf945838ecf70ebc6004cc40c097232 <.>
 git checkout FETCH_HEAD <.>
 ----
 

src/lib/AST/ASTVisitor.cpp

@@ -1697,15 +1697,15 @@ class ASTVisitor
                 template_params, sfinae_info->Arguments, param_idx);
             if(! param_arg)
                 return std::nullopt;
-            unsigned ParamIdx = FindParam(ATD->getInjectedTemplateArgs(), *param_arg);
+            unsigned ParamIdx = FindParam(ATD->getInjectedTemplateArgs(context_), *param_arg);
             return std::make_tuple(ATD->getTemplateParameters(), std::move(controlling_params), ParamIdx);
         }
 
         auto* CTD = dyn_cast<ClassTemplateDecl>(TD);
         if(! CTD)
             return std::nullopt;
 
-        auto PrimaryArgs = CTD->getInjectedTemplateArgs();
+        auto PrimaryArgs = CTD->getInjectedTemplateArgs(context_);
         llvm::SmallBitVector ControllingParams(PrimaryArgs.size());
 
         QualType MemberType;

test-files/golden-tests/requires-clause.adoc

@@ -9,7 +9,10 @@
 |===
 | Name | Description 
 
-| <<#A,`A`>> 
+| <<#A-09,`A`>> 
+| 
+
+| <<#A-05,`A`>> 
 | 
 
 |===
@@ -34,21 +37,30 @@ Declared in `<pass:[requires-clause.cpp]>`
 ----
 template<typename T>
 void
-<<#f-05,f>>() requires pass:[(sizeof(T) == 4)];
+<<#f-04,f>>() requires pass:[(sizeof(T) == 4)];
 ----
 
-[.small]#<<#f-05,_» more..._>>#
+[.small]#<<#f-04,_» more..._>>#
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
 template<typename T>
 void
-<<#f-08,f>>() requires pass:[(sizeof(T) == 2)];
+<<#f-0b,f>>() requires pass:[(sizeof(T) == 2)];
+----
+
+[.small]#<<#f-0b,_» more..._>>#
+
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+template<typename U>
+void
+<<#f-02,f>>() requires pass:[(sizeof(U) == 2)];
 ----
 
-[.small]#<<#f-08,_» more..._>>#
+[.small]#<<#f-02,_» more..._>>#
 
-[#f-05]
+[#f-04]
 == f
 
 === Synopsis
@@ -61,7 +73,7 @@ void
 f() requires pass:[(sizeof(T) == 4)];
 ----
 
-[#f-08]
+[#f-0b]
 == f
 
 === Synopsis
@@ -74,6 +86,19 @@ void
 f() requires pass:[(sizeof(T) == 2)];
 ----
 
+[#f-02]
+== f
+
+=== Synopsis
+
+Declared in `<pass:[requires-clause.cpp]>`
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+template<typename U>
+void
+f() requires pass:[(sizeof(U) == 2)];
+----
+
 [#g]
 == g
 
@@ -84,21 +109,30 @@ Declared in `<pass:[requires-clause.cpp]>`
 ----
 template<typename T> requires pass:[(sizeof(T) == 4)]
 void
-<<#g-0a,g>>();
+<<#g-00,g>>();
+----
+
+[.small]#<<#g-00,_» more..._>>#
+
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+template<typename T> requires pass:[(sizeof(T) == 2)]
+void
+<<#g-04,g>>();
 ----
 
-[.small]#<<#g-0a,_» more..._>>#
+[.small]#<<#g-04,_» more..._>>#
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-template<typename T> requires pass:[(sizeof(U) == 2)]
+template<typename U> requires pass:[(sizeof(U) == 2)]
 void
-<<#g-0c,g>>();
+<<#g-03,g>>();
 ----
 
-[.small]#<<#g-0c,_» more..._>>#
+[.small]#<<#g-03,_» more..._>>#
 
-[#g-0a]
+[#g-00]
 == g
 
 === Synopsis
@@ -111,28 +145,56 @@ void
 g();
 ----
 
-[#g-0c]
+[#g-04]
 == g
 
 === Synopsis
 
 Declared in `<pass:[requires-clause.cpp]>`
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-template<typename T> requires pass:[(sizeof(U) == 2)]
+template<typename T> requires pass:[(sizeof(T) == 2)]
 void
 g();
 ----
 
-[#A]
+[#g-03]
+== g
+
+=== Synopsis
+
+Declared in `<pass:[requires-clause.cpp]>`
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+template<typename U> requires pass:[(sizeof(U) == 2)]
+void
+g();
+----
+
+[#A-09]
+== A
+
+=== Synopsis
+
+Declared in `<pass:[requires-clause.cpp]>`
+[source,cpp,subs="verbatim,macros,-callouts"]
+----
+template<typename T> requires pass:[(sizeof(T) == 2)]
+struct A;
+----
+
+
+
+
+[#A-05]
 == A
 
 === Synopsis
 
 Declared in `<pass:[requires-clause.cpp]>`
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
-template<typename T> requires pass:[(sizeof(U) == 2)]
+template<typename U> requires pass:[(sizeof(U) == 2)]
 struct A;
 ----