Upgrade clang to 18.1.0

xoofx · Oct 16, 2024 · 8c5212e · 8c5212e
1 parent a78f00f
commit 8c5212e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ CppAst provides a C/C++ parser for header files with access to the full AST, com
 
 - Compatible with `net8.0`
     - For `netstandard2.0` use `0.14.0` version.
-- Using `Clang/libclang 17.0.1`
+- Using `Clang/libclang 18.1.0`
 - Allow to parse *in-memory* C/C++ text and C/C++ files from the disk
 - Simple AST model
 - Full type system

diff --git a/src/CppAst.Tests/CppAst.Tests.csproj b/src/CppAst.Tests/CppAst.Tests.csproj
@@ -26,12 +26,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="4.0.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
+    <PackageReference Include="nunit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CppAst/CppAst.csproj b/src/CppAst/CppAst.csproj
@@ -27,12 +27,12 @@
     <None Include="../../img/cppast.png" Pack="true" PackagePath="/logo.png" />
     <None Include="../../readme.md" Pack="true" PackagePath="/" />
 
-    <PackageReference Include="ClangSharp" Version="17.0.1" />
+    <PackageReference Include="ClangSharp" Version="18.1.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Irony" Version="1.2.0" />
-    <PackageReference Include="MinVer" Version="4.3.0">
+    <PackageReference Include="Irony" Version="1.5.3" />
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/CppAst/CppModelBuilder.cs b/src/CppAst/CppModelBuilder.cs
@@ -86,6 +86,11 @@ private CppType TryToCreateTemplateParameters(CXCursor cursor, void* data)
 
         private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, void* data)
         {
+            while (cursor.Kind == CXCursorKind.CXCursor_LinkageSpec)
+            {
+                cursor = cursor.SemanticParent;
+            }
+
             var typeAsCString = CXUtil.GetCursorUsrString(cursor);
             if (string.IsNullOrEmpty(typeAsCString))
             {
@@ -427,6 +432,11 @@ private CXChildVisitResult VisitMember(CXCursor cursor, CXCursor parent, void* d
                 case CXCursorKind.CXCursor_AnnotateAttr:
                     // Don't emit warning
                     break;
+
+                case CXCursorKind.CXCursor_LinkageSpec:
+                    cursor.VisitChildren(VisitMember, new CXClientData((IntPtr)data));
+                    break;
+
                 default:
                     WarningUnhandled(cursor, parent);
                     break;