Upgraded to Clang 14.0.4.

* ClangSharp has joined the .NET Foundation since we last updated. In the process its license and copyright notice changed.
* ClangSharp no longer supports .NET 5, as such we no longer support .NET 5. (See MochiLibraries/Biohazrd#241 (comment))
* Fixed minor race condition in LibClangSharpResolver found while testing these changes.

Author: PathogenDavid

.github/workflows/ClangSharp.Pathogen.yml

@@ -147,7 +147,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       - name: Configure versioning
         run: python .github/workflows/configure-build.py
@@ -235,7 +235,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       # ----------------------------------------------------------------------- Configure Versioning
       - name: Configure build
@@ -373,7 +373,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       # ----------------------------------------------------------------------- Download built packages
       - name: Download built packages
@@ -418,7 +418,7 @@ jobs:
 
       # ----------------------------------------------------------------------- Push to GitHub Packages
       - name: Push to GitHub Packages
-        run: dotnet nuget push "*.nupkg" --skip-duplicate --no-symbols true --api-key ${{secrets.GITHUB_TOKEN}} --source https://nuget.pkg.github.com/${{github.repository_owner}}
+        run: dotnet nuget push "*.nupkg" --skip-duplicate --no-symbols --api-key ${{secrets.GITHUB_TOKEN}} --source https://nuget.pkg.github.com/${{github.repository_owner}}
         env:
           # This is a workaround for https://github.com/NuGet/Home/issues/9775
           DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER: 0
@@ -439,7 +439,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
 
       # ----------------------------------------------------------------------- Download built packages
       - name: Download built packages

ClangSharp.Pathogen.Native/ClangSharp.Pathogen.Native.csproj

@@ -20,20 +20,21 @@
     Package Info
     =============================================================================================================== -->
     <PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageLicenseFile>LICENSE-COMBINED.md</PackageLicenseFile>
     <Description>Native runtime support package for ClangSharp.Pathogen on $(RuntimeIdentifier).&#10;&#10;This package exists primarily to support Biohazrd and should only be used as instructed.</Description>
     <!-- Microsoft is here because we embed components of libClangSharp -->
-    <Authors>LLVM Team, Microsoft, David Maas, and Contributors</Authors>
+    <Authors>LLVM Team, .NET Foundation, David Maas, and Contributors</Authors>
     <!-- LLVM does not have a good canonical copyright string. They're supposed to put it in their source file as part of Apache 2.0 but they don't. -->
-    <Copyright>Pathogen extensions copyright David Maas and Contributors. libClangSharp copyright © Microsoft and Contributors. LLVM copyright (c) 2003-2019 University of Illinois at Urbana-Champaign, LLVM Team.</Copyright>
+    <Copyright>Pathogen extensions copyright David Maas and Contributors. libClangSharp copyright © .NET Foundation and Contributors. LLVM copyright (c) 2003-2019 University of Illinois at Urbana-Champaign, LLVM Team.</Copyright>
 
     <!-- This package is only for native runtime, don't try to build/pack the .NET assembly or specify a framework dependency -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
   </PropertyGroup>
   <ItemGroup>
     <None Condition="Exists('$(PathogenExtensionsCppPath)')" Include="$(PathogenExtensionsCppPath)" Link="PathogenExtensions.cpp" />
-    <None Condition="Exists('$(ClangLicensePath)')" Include="$(ClangLicensePath)" Link="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
+    <None Condition="Exists('$(ClangLicensePath)')" Include="$(ClangLicensePath)" Link="LICENSE-LLVM.txt" Pack="true" PackagePath="LICENSE-LLVM.txt" />
+    <None Condition="Exists('$(LibClangSharpLicensePath)')" Include="$(LibClangSharpLicensePath)" Link="LICENSE-LIBCLANGSHARP.md" Pack="true" PackagePath="LICENSE-LIBCLANGSHARP.md" />
     <None Include="$(LibClangPath)" Link="$(LibClangPathogenFileName)" Condition="Exists('$(LibClangPath)')">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Pack>true</Pack>
@@ -45,8 +46,51 @@
     <!-- PathogenExtensions.cpp is only used to check if LLVM is cloned and it's our fork. Don't check for it on CI where we might not actually clone LLVM. -->
     <Error Text="PathogenExtensions.cpp is missing, ensure Git submodules are up-to-date." Condition="!Exists('$(PathogenExtensionsCppPath)') and '$(ContinuousIntegrationBuild)' != 'true'" />
     <Error Text="Clang LICENSE.TXT is missing, ensure Git submodules are up-to-date." Condition="!Exists('$(ClangLicensePath)')" />
+    <Error Text="libClangSharp LICENSE.md is missing, ensure Git submodules are up-to-date." Condition="!Exists('$(LibClangSharpLicensePath)')" />
     <Error Text="Could not automatically determine LibClangSubPath based on runtime identifier '$(RuntimeIdentifier)'" Condition="'$(LibClangSubPath)' == ''" />
     <Error Text="Could not automatically determine LibClangPathogenFileName based on runtime identifier '$(RuntimeIdentifier)'" Condition="'$(LibClangPathogenFileName)' == ''" />
     <Error Text="Could not locate native runtime for '$(RuntimeIdentifier)' at '$(LibClangPath)', did you run build-native.cmd/sh?" Condition="!Exists('$(LibClangPath)')" />
   </Target>
+  <UsingTask TaskName="_GenerateCombinedLicenseFileTask" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <PackageId ParameterType="System.String" Required="true" />
+      <Path ParameterType="System.String" Required="true" />
+      <ClangLicensePath ParameterType="System.String" Required="true" />
+      <LibClangSharpLicensePath ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Linq" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+        string[] clangLicense = File.ReadAllLines(ClangLicensePath);
+        string[] libClangSharpLicense = File.ReadAllLines(LibClangSharpLicensePath);
+        
+        using StreamWriter f = new(Path);
+        f.WriteLine($"{PackageId} incorporates multiple components licensed as follows.");
+        f.WriteLine();
+        f.WriteLine("# The LLVM Project");
+        f.WriteLine();
+        f.WriteLine("```");
+        foreach (string line in clangLicense)
+        { f.WriteLine(line); }
+        f.WriteLine("```");
+        f.WriteLine();
+        f.WriteLine("# libClangSharp");
+        f.WriteLine();
+        foreach (string line in libClangSharpLicense)
+        { f.WriteLine($"> {line}"); }
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <Target Name="_GenerateCombinedLicenseFile" DependsOnTargets="_NativeRuntimeChecks" BeforeTargets="GetCopyToOutputDirectoryItems;Build;GenerateNuspec;Pack;_GetPackageFiles">
+    <PropertyGroup>
+      <_CombinedLicenseFile>$(IntermediateOutputPath)LICENSE-COMBINED.md</_CombinedLicenseFile>
+    </PropertyGroup>
+    <_GenerateCombinedLicenseFileTask PackageId="$(PackageId)" Path="$(_CombinedLicenseFile)" ClangLicensePath="$(ClangLicensePath)" LibClangSharpLicensePath="$(LibClangSharpLicensePath)" />
+    <ItemGroup>
+      <None Include="$(_CombinedLicenseFile)" Visible="false" Pack="true" PackagePath="LICENSE-COMBINED.md" />
+    </ItemGroup>
+  </Target>
 </Project>

ClangSharp.Pathogen/ClangSharp.Pathogen.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <!-- Package Info -->
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -10,8 +10,8 @@
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <!-- This is pinned to a specific version since ClangSharp.Pathogen.Runtime includes libClangSharp -->
-    <PackageReference Include="ClangSharp" Version="[12.0.0-beta2]" />
+    <!-- This is pinned to a specific version since ClangSharp.Pathogen.Native includes libClangSharp -->
+    <PackageReference Include="ClangSharp" Version="[14.0.0-beta2]" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\LICENSE.txt" Pack="true" PackagePath="" Visible="false" />

ClangSharp.Pathogen/LibClangSharpResolver.cs

@@ -62,7 +62,8 @@ public static void OverrideNativeRuntime(IntPtr nativeRuntimeHandle)
             if (NativeRuntimeHandle == nativeRuntimeHandle)
             { return; }
 
-            if (Interlocked.CompareExchange(ref NativeRuntimeHandle, nativeRuntimeHandle, IntPtr.Zero) != IntPtr.Zero)
+            IntPtr oldHandle = Interlocked.CompareExchange(ref NativeRuntimeHandle, nativeRuntimeHandle, IntPtr.Zero);
+            if (oldHandle != IntPtr.Zero && oldHandle != nativeRuntimeHandle)
             { throw new InvalidOperationException("The native libclang-pathogen runtime has already previously been loaded or overridden."); }
         }
 

ClangSharp.Pathogen/PathogenClangCallingConventionKind.cs

@@ -17,6 +17,7 @@ public enum PathogenClangCallingConventionKind : byte
         SpirFunction,
         OpenCLKernel,
         Swift,
+        SwiftAsync,
         PreserveMost,
         PreserveAll,
         AArch64VectorCall,

ClangSharp.Pathogen/PathogenLlvmCallingConventionKind.cs

@@ -15,6 +15,7 @@ public enum PathogenLlvmCallingConventionKind : byte
         CXX_FAST_TLS = 17,
         Tail = 18,
         CFGuard_Check = 19,
+        SwiftTail = 20,
         FirstTargetCC = 64,
         X86_StdCall = 64,
         X86_FastCall = 65,
@@ -49,6 +50,8 @@ public enum PathogenLlvmCallingConventionKind : byte
         AMDGPU_ES = 96,
         AArch64_VectorCall = 97,
         AArch64_SVE_VectorCall = 98,
-        WASM_EmscriptenInvoke = 99
+        WASM_EmscriptenInvoke = 99,
+        AMDGPU_Gfx = 100,
+        M68k_INTR = 101,
     }
 }

THIRD-PARTY-NOTICES.md

@@ -9,20 +9,26 @@ ClangSharp.Pathogen incorporates third-party libraries licensed as follows.
 
 # ClangSharp
 
-```
-University of Illinois/NCSA Open Source License
-Copyright (c) Microsoft and Contributors
-All rights reserved.
-
-Developed by: Microsoft and Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-Neither the names of Microsoft, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-```
+> # The MIT License (MIT)
+> 
+> Copyright © .NET Foundation and Contributors. All Rights Reserved.
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy of
+> this software and associated documentation files (the "Software"), to deal in
+> the Software without restriction, including without limitation the rights to
+> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+> the Software, and to permit persons to whom the Software is furnished to do so,
+> subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+> FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+> COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+> IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+> CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # The LLVM Project
 

external/llvm-project

@@ -23,9 +23,10 @@
 
     <!-- ClangSharp.Pathogen-specific -->
     <LlvmBuildOutputRoot>$(MSBuildThisFileDirectory)../bin/llvm/</LlvmBuildOutputRoot>
-    <LlvmVersion>12.0.1</LlvmVersion>
+    <LlvmVersion>14.0.4</LlvmVersion>
     <LlvmSourceRoot>$(MSBuildThisFileDirectory)../external/llvm-project/</LlvmSourceRoot>
     <ClangLicensePath>$(LlvmSourceRoot)clang/LICENSE.TXT</ClangLicensePath>
+    <LibClangSharpLicensePath>$(LlvmSourceRoot)clang/tools/libclang/libClangSharp/LICENSE.md</LibClangSharpLicensePath>
   </PropertyGroup>
   <ItemGroup>
     <!-- Enable Source Link -->