Merge remote-tracking branch 'dotnet/main'

Author: tannergooding

README.md

@@ -84,18 +84,18 @@ cd artifacts/bin
 cmake -DCMAKE_INSTALL_PREFIX=../install -DLLVM_ENABLE_PROJECTS=clang -G "Visual Studio 17 2022" -A x64 -Thost=x64 ../../llvm
 ```
 
-You can then open `LLVM.sln` in Visual Studio, change the configuration to `Release` and build the `install` project.
+You can then open `LLVM.sln` in Visual Studio, change the configuration to `Release` and build the `INSTALL` project. You may need to build the `ALL_BUILD` first.
 
 Afterwards, you can then build `libClangSharp` where the process followed is roughly:
 ```cmd
 git clone https://github.com/dotnet/clangsharp
 cd clangsharp
 mkdir artifacts/bin/native
 cd artifacts/bin/native
-cmake -DCMAKE_INSTALL_PREFIX=../install -DPATH_TO_LLVM=../../../../llvm-project/artifacts/install -G "Visual Studio 17 2022" -A x64 -Thost=x64 ../../..
+cmake -DCMAKE_INSTALL_PREFIX=../install -DPATH_TO_LLVM=absolute/path/to/repos/llvm-project/artifacts/install -G "Visual Studio 17 2022" -A x64 -Thost=x64 ../../..
 ```
 
-You can then open `libClangSharp.sln` in Visual Studio, change the configuration to `Release` and build the `install` project.
+You can then open `libClangSharp.sln` in Visual Studio, change the configuration to `Release` and build the `INSTALL` project.
 
 #### Linux
 

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

@@ -3121,6 +3121,7 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
 
                 if (arraySize == 1)
                 {
+                    code.AddUsingDirective("System.Runtime.CompilerServices");
                     code.Write("Unsafe.Add(ref e0, index)");
                 }
                 else

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs

@@ -41,7 +41,60 @@ private void VisitBinaryOperator(BinaryOperator binaryOperator)
         outputBuilder.Write(' ');
         outputBuilder.Write(binaryOperator.OpcodeStr);
         outputBuilder.Write(' ');
-        Visit(binaryOperator.RHS);
+
+        if (binaryOperator.IsShiftOp || binaryOperator.IsShiftAssignOp)
+        {
+            // RHS of shift operation in C# must be an int
+
+            // Negative shifts are undefined behavior in C/C++, but still needs to have a compilable output
+            var isNegated = binaryOperator.RHS is UnaryOperator { Opcode: CXUnaryOperator_Minus };
+            var sign = isNegated ? -1 : 1;
+
+            var rhs = isNegated ? ((UnaryOperator)binaryOperator.RHS).SubExpr : binaryOperator.RHS;
+            switch (rhs)
+            {
+                case IntegerLiteral literal:
+                {
+                    var value = sign * literal.Value;
+                    if (value is > int.MaxValue or < int.MinValue)
+                    {
+                        // Literal is in int32 range
+                        outputBuilder.Write("(int)(");
+                        outputBuilder.Write(sign * literal.Value);
+                        outputBuilder.Write(")");
+                    }
+                    else
+                    {
+                        // Literal is not in int32 range
+                        outputBuilder.Write(sign * literal.Value);
+                    }
+
+                    break;
+                }
+                // Already the correct type or implicitly castable
+                case { Type.Kind: CXType_Int or CXType_UShort or CXType_Short or CXType_Char_U or CXType_Char_S or CXType_UChar or CXType_SChar }:
+                case { Type.Kind: CXType_Long } when _config is { GenerateUnixTypes: false }:
+                case { Type.Kind: CXType_Char16 } when _config is { GenerateDisableRuntimeMarshalling: false }:
+                case { Type.Kind: CXType_WChar } when _config is { GenerateDisableRuntimeMarshalling: false, GenerateUnixTypes: false }:
+                {
+                    Visit(binaryOperator.RHS);
+                    break;
+                }
+                // Fallback
+                default:
+                {
+                    outputBuilder.Write("(int)(");
+                    Visit(binaryOperator.RHS);
+                    outputBuilder.Write(")");
+                    break;
+                }
+            }
+        }
+        else
+        {
+            Visit(binaryOperator.RHS);
+        }
+
         StopCSharpCode();
     }
 

sources/ClangSharpPInvokeGenerator/ClangSharpPInvokeGenerator.csproj

@@ -14,8 +14,6 @@
     <None Include="Properties/GenerateClang-LICENSE.txt" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Properties/GenerateClangSharp.rsp" />
     <None Include="Properties/GenerateClangSharp-LICENSE.txt" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="Properties/GenerateLLVM.rsp" />
-    <None Include="Properties/GenerateLLVM-LICENSE.txt" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Properties/launchsettings.json" />
   </ItemGroup>
 
@@ -30,7 +28,6 @@
   <PropertyGroup>
     <LibClangName Condition="'$(LibClangName)' == ''">libclang</LibClangName>
     <LibClangSharpName Condition="'$(LibClangSharpName)' == ''">libClangSharp</LibClangSharpName>
-    <LibLLVMName Condition="'$(LibLLVMName)' == ''">libLLVM</LibLLVMName>
   </PropertyGroup>
 
   <!-- Auto-detect LLVM... more or less -->

sources/ClangSharpPInvokeGenerator/Properties/GenerateLLVM-LICENSE.txt

@@ -9,10 +9,6 @@
       "commandName": "Project",
       "commandLineArgs": "\"@$(MSBuildProjectDirectory)/Properties/GenerateClangSharp.rsp\" --file-directory \"$(MSBuildProjectDirectory)/..\" --include-directory \"$(LLVMIncludePath)\" --libraryPath $(LibClangSharpName)"
     },
-    "GenerateLLVM": {
-      "commandName": "Project",
-      "commandLineArgs": "\"@$(MSBuildProjectDirectory)/Properties/GenerateLLVM.rsp\" --file-directory \"$(LLVMIncludePath)\" --include-directory \"$(LLVMIncludePath)\" --libraryPath $(LibLLVMName)"
-    },
     "GenerateLocal": {
       "commandName": "Project",
       "commandLineArgs": "@generate.rsp",

sources/ClangSharpPInvokeGenerator/Properties/GenerateLLVM.rsp

@@ -21,6 +21,7 @@ protected override Task IncompleteArraySizeTestImpl(string nativeType, string ex
 
         var expectedOutputContents = $@"using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace ClangSharp.Test

sources/ClangSharpPInvokeGenerator/Properties/launchSettings.json

@@ -21,6 +21,7 @@ protected override Task IncompleteArraySizeTestImpl(string nativeType, string ex
 
         var expectedOutputContents = $@"using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace ClangSharp.Test

tests/ClangSharp.PInvokeGenerator.UnitTests/CSharpLatestUnix/StructDeclarationTest.cs

@@ -21,6 +21,7 @@ protected override Task IncompleteArraySizeTestImpl(string nativeType, string ex
 
         var expectedOutputContents = $@"using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace ClangSharp.Test