Fixup libClang and libClangSharp to use versions that target the downlevel C runtimes for portability

tannergooding · tannergooding · commit fb4e9ddd32b4 · 2024-05-03T17:10:09.000-07:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -12,8 +12,8 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageVersion Include="libClang" Version="18.1.3.1" />
-    <PackageVersion Include="libClangSharp" Version="18.1.3" />
+    <PackageVersion Include="libClang" Version="18.1.3.2" />
+    <PackageVersion Include="libClangSharp" Version="18.1.3.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/packages/libClangSharp/libClangSharp.runtime.linux-arm64/libClangSharp.runtime.linux-arm64.nuspec b/packages/libClangSharp/libClangSharp.runtime.linux-arm64/libClangSharp.runtime.linux-arm64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.linux-arm64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp.runtime.linux-x64/libClangSharp.runtime.linux-x64.nuspec b/packages/libClangSharp/libClangSharp.runtime.linux-x64/libClangSharp.runtime.linux-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.linux-x64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp.runtime.osx-arm64/libClangSharp.runtime.osx-arm64.nuspec b/packages/libClangSharp/libClangSharp.runtime.osx-arm64/libClangSharp.runtime.osx-arm64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.osx-arm64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp.runtime.osx-x64/libClangSharp.runtime.osx-x64.nuspec b/packages/libClangSharp/libClangSharp.runtime.osx-x64/libClangSharp.runtime.osx-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.osx-x64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp.runtime.win-arm64/libClangSharp.runtime.win-arm64.nuspec b/packages/libClangSharp/libClangSharp.runtime.win-arm64/libClangSharp.runtime.win-arm64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.win-arm64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp.runtime.win-x64/libClangSharp.runtime.win-x64.nuspec b/packages/libClangSharp/libClangSharp.runtime.win-x64/libClangSharp.runtime.win-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.win-x64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp/libClangSharp.nuspec b/packages/libClangSharp/libClangSharp/libClangSharp.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp</id>
-    <version>18.1.3</version>
+    <version>18.1.3.1</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libClangSharp/libClangSharp/runtime.json b/packages/libClangSharp/libClangSharp/runtime.json
@@ -2,32 +2,32 @@
   "runtimes": {
     "linux-arm64": {
       "libClangSharp": {
-        "libClangSharp.runtime.linux-arm64": "18.1.3"
+        "libClangSharp.runtime.linux-arm64": "18.1.3.1"
       }
     },
     "linux-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.linux-x64": "18.1.3"
+        "libClangSharp.runtime.linux-x64": "18.1.3.1"
       }
     },
     "osx-arm64": {
       "libClangSharp": {
-        "libClangSharp.runtime.osx-arm64": "18.1.3"
+        "libClangSharp.runtime.osx-arm64": "18.1.3.1"
       }
     },
     "osx-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.osx-x64": "18.1.3"
+        "libClangSharp.runtime.osx-x64": "18.1.3.1"
       }
     },
     "win-arm64": {
       "libClangSharp": {
-        "libClangSharp.runtime.win-arm64": "18.1.3"
+        "libClangSharp.runtime.win-arm64": "18.1.3.1"
       }
     },
     "win-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.win-x64": "18.1.3"
+        "libClangSharp.runtime.win-x64": "18.1.3.1"
       }
     }
   }
diff --git a/packages/libclang/libclang.runtime.linux-arm64/libclang.runtime.linux-arm64.nuspec b/packages/libclang/libclang.runtime.linux-arm64/libclang.runtime.linux-arm64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libclang.runtime.linux-arm64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.2</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libclang/libclang.runtime.linux-x64/libclang.runtime.linux-x64.nuspec b/packages/libclang/libclang.runtime.linux-x64/libclang.runtime.linux-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libclang.runtime.linux-x64</id>
-    <version>18.1.3</version>
+    <version>18.1.3.2</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libclang/libclang.runtime.win-x64/libclang.runtime.win-x64.nuspec b/packages/libclang/libclang.runtime.win-x64/libclang.runtime.win-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libclang.runtime.win-x64</id>
-    <version>18.1.3.1</version>
+    <version>18.1.3.2</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libclang/libclang/libclang.nuspec b/packages/libclang/libclang/libclang.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libclang</id>
-    <version>18.1.3.1</version>
+    <version>18.1.3.2</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
diff --git a/packages/libclang/libclang/runtime.json b/packages/libclang/libclang/runtime.json
@@ -2,12 +2,12 @@
   "runtimes": {
     "linux-arm64": {
       "libclang": {
-        "libclang.runtime.linux-arm64": "18.1.3"
+        "libclang.runtime.linux-arm64": "18.1.3.2"
       }
     },
     "linux-x64": {
       "libclang": {
-        "libclang.runtime.linux-x64": "18.1.3"
+        "libclang.runtime.linux-x64": "18.1.3.2"
       }
     },
     "osx-arm64": {
@@ -27,7 +27,7 @@
     },
     "win-x64": {
       "libclang": {
-        "libclang.runtime.win-x64": "18.1.3.1"
+        "libclang.runtime.win-x64": "18.1.3.2"
       }
     }
   }
diff --git a/sources/ClangSharp.Interop/Extensions/CXCursor.cs b/sources/ClangSharp.Interop/Extensions/CXCursor.cs
@@ -802,7 +802,20 @@ public readonly string DeclKindSpelling
 
     public readonly CXCursor DecomposedDecl => clangsharp.Cursor_getDecomposedDecl(this);
 
-    public readonly CXCursor DefaultArg => clangsharp.Cursor_getDefaultArg(this);
+    public readonly CXCursor DefaultArg
+    {
+        get
+        {
+            if (DeclKind == CX_DeclKind_ParmVar)
+            {
+                if (HasUnparsedDefaultArg || HasUninstantiatedDefaultArg)
+                {
+                    return CXCursor.Null;
+                }
+            }
+            return clangsharp.Cursor_getDefaultArg(this);
+        }
+    }
 
     public readonly CXType DefaultArgType => clangsharp.Cursor_getDefaultArgType(this);
 
@@ -888,6 +901,10 @@ public readonly string DeclKindSpelling
 
     public readonly bool HasTemplateKeyword => clangsharp.Cursor_getHasTemplateKeyword(this) != 0;
 
+    public readonly bool HasUninstantiatedDefaultArg => clangsharp.Cursor_getHasUninstantiatedDefaultArg(this) != 0;
+
+    public readonly bool HasUnparsedDefaultArg => clangsharp.Cursor_getHasUnparsedDefaultArg(this) != 0;
+
     public readonly bool HasUserDeclaredConstructor => clangsharp.Cursor_getHasUserDeclaredConstructor(this) != 0;
 
     public readonly bool HasUserDeclaredCopyAssignment => clangsharp.Cursor_getHasUserDeclaredCopyAssignment(this) != 0;
diff --git a/sources/ClangSharp.Interop/clangsharp/clangsharp.cs b/sources/ClangSharp.Interop/clangsharp/clangsharp.cs
@@ -270,6 +270,14 @@ public static partial class @clangsharp
     [return: NativeTypeName("unsigned int")]
     public static extern uint Cursor_getHasDefaultArg(CXCursor C);
 
+    [DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasUnparsedDefaultArg", ExactSpelling = true)]
+    [return: NativeTypeName("unsigned int")]
+    public static extern uint Cursor_getHasUnparsedDefaultArg(CXCursor C);
+
+    [DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasUninstantiatedDefaultArg", ExactSpelling = true)]
+    [return: NativeTypeName("unsigned int")]
+    public static extern uint Cursor_getHasUninstantiatedDefaultArg(CXCursor C);
+
     [DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasElseStorage", ExactSpelling = true)]
     [return: NativeTypeName("unsigned int")]
     public static extern uint Cursor_getHasElseStorage(CXCursor C);

Original file line number	Diff line number	Diff line change
`@@ -2,32 +2,32 @@`
`2`	`2`	`"runtimes": {`
`3`	`3`	`"linux-arm64": {`
`4`	`4`	`"libClangSharp": {`
`5`		`- "libClangSharp.runtime.linux-arm64": "18.1.3"`
	`5`	`+ "libClangSharp.runtime.linux-arm64": "18.1.3.1"`
`6`	`6`	`}`
`7`	`7`	`},`
`8`	`8`	`"linux-x64": {`
`9`	`9`	`"libClangSharp": {`
`10`		`- "libClangSharp.runtime.linux-x64": "18.1.3"`
	`10`	`+ "libClangSharp.runtime.linux-x64": "18.1.3.1"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`"osx-arm64": {`
`14`	`14`	`"libClangSharp": {`
`15`		`- "libClangSharp.runtime.osx-arm64": "18.1.3"`
	`15`	`+ "libClangSharp.runtime.osx-arm64": "18.1.3.1"`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`"osx-x64": {`
`19`	`19`	`"libClangSharp": {`
`20`		`- "libClangSharp.runtime.osx-x64": "18.1.3"`
	`20`	`+ "libClangSharp.runtime.osx-x64": "18.1.3.1"`
`21`	`21`	`}`
`22`	`22`	`},`
`23`	`23`	`"win-arm64": {`
`24`	`24`	`"libClangSharp": {`
`25`		`- "libClangSharp.runtime.win-arm64": "18.1.3"`
	`25`	`+ "libClangSharp.runtime.win-arm64": "18.1.3.1"`
`26`	`26`	`}`
`27`	`27`	`},`
`28`	`28`	`"win-x64": {`
`29`	`29`	`"libClangSharp": {`
`30`		`- "libClangSharp.runtime.win-x64": "18.1.3"`
	`30`	`+ "libClangSharp.runtime.win-x64": "18.1.3.1"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`