Merging various fixes and improvements

Directory.Build.props

@@ -43,7 +43,7 @@
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>ClangSharp</Product>
     <VersionPrefix>12.0.0</VersionPrefix>
-    <VersionSuffix>beta2</VersionSuffix>
+    <VersionSuffix Condition="'$(PackAsTool)' != 'true'">beta3</VersionSuffix>
     <VersionSuffix Condition="'$(BUILD_REASON)' == 'PullRequest'">pr</VersionSuffix>
   </PropertyGroup>
 

Directory.Build.targets

@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <!-- Settings that allow testing and packing to work by default -->
-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' AND '$(Contin)' != 'true'">
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
     <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
     <RuntimeIdentifier Condition="'$(OVERRIDE_RUNTIME_IDENTIFIER)' != ''">$(OVERRIDE_RUNTIME_IDENTIFIER)</RuntimeIdentifier>
   </PropertyGroup>

scripts/azure-pipelines.yml

@@ -29,6 +29,14 @@ jobs:
     architecture: x64
     testwin32metadata: false
 
+- template: azure-windows.yml
+  parameters:
+    name: windows_release_x64
+    pool: windows-latest
+    configuration: Release
+    architecture: x64
+    testwin32metadata: false
+
 - template: azure-windows.yml
   parameters:
     name: test_win32metadata

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

@@ -952,7 +952,27 @@ void ForFunctionDecl(ParmVarDecl parmVarDecl, FunctionDecl functionDecl)
                 if (parmVarDecl.HasDefaultArg)
                 {
                     _outputBuilder.BeginParameterDefault();
-                    UncheckStmt(typeName, parmVarDecl.DefaultArg);
+
+                    var defaultArg = parmVarDecl.DefaultArg;
+
+                    if (parmVarDecl.Type.CanonicalType.IsPointerType && (defaultArg.Handle.Evaluate.Kind == CXEvalResultKind.CXEval_UnExposed))
+                    {
+                        if (!IsStmtAsWritten<CXXNullPtrLiteralExpr>(defaultArg, out _, removeParens: true) &&
+                           (!IsStmtAsWritten<CastExpr>(defaultArg, out var castExpr, removeParens: true) || (castExpr.CastKind != CX_CastKind.CX_CK_NullToPointer)) &&
+                           (!IsStmtAsWritten<IntegerLiteral>(defaultArg, out var integerLiteral, removeParens: true) || (integerLiteral.Value != 0)))
+                        {
+                            AddDiagnostic(DiagnosticLevel.Info, $"Unsupported default parameter: '{name}'. Generated bindings may be incomplete.", defaultArg);
+                        }
+
+                        var outputBuilder = StartCSharpCode();
+                        outputBuilder.Write("null");
+                        StopCSharpCode();
+                    }
+                    else
+                    {
+                        UncheckStmt(typeName, parmVarDecl.DefaultArg);
+                    }
+
                     _outputBuilder.EndParameterDefault();
                 }
 
@@ -2521,12 +2541,12 @@ void ForUnderlyingType(TypedefDecl typedefDecl, Type underlyingType)
                     if (_config.LogPotentialTypedefRemappings)
                     {
                         var typedefName = typedefDecl.UnderlyingDecl.Name;
-                        var possibleNamesToRemap = new string[] {"_" + typedefName, "_tag" + typedefName, "tag" + typedefName};
+                        var possibleNamesToRemap = new string[] {"_" + typedefName, "_tag" + typedefName, "tag" + typedefName, typedefName + "_tag" };
                         var underlyingName = underlyingTagType.AsString;
 
                         foreach (var possibleNameToRemap in possibleNamesToRemap)
                         {
-                            if (!_config.RemappedNames.ContainsKey(possibleNameToRemap))
+                            if (!_config.RemappedNames.ContainsKey(possibleNameToRemap) && !_config.RemappedNames.ContainsKey(possibleNameToRemap + "*"))
                             {
                                 if (possibleNameToRemap == underlyingName)
                                 {
@@ -2704,7 +2724,7 @@ private void VisitVarDecl(VarDecl varDecl)
                         }
                     }
                 }
-                else if ((type.IsLocalConstQualified || isMacroDefinitionRecord) && CanBeConstant(type, varDecl.Init))
+                else if ((type.IsLocalConstQualified || isMacroDefinitionRecord) && CanBeConstant(type, typeName, varDecl.Init))
                 {
                     kind |= ConstantKind.PrimitiveConstant;
                 }
@@ -2820,15 +2840,15 @@ void ForDeclStmt(VarDecl varDecl, DeclStmt declStmt)
                 StopCSharpCode();
             }
 
-            bool CanBeConstant(Type type, Expr initExpr)
+            bool CanBeConstant(Type type, string targetTypeName, Expr initExpr)
             {
                 if (type is AttributedType attributedType)
                 {
-                    return CanBeConstant(attributedType.ModifiedType, initExpr);
+                    return CanBeConstant(attributedType.ModifiedType, targetTypeName, initExpr);
                 }
                 else if (type is AutoType autoType)
                 {
-                    return CanBeConstant(autoType.CanonicalType, initExpr);
+                    return CanBeConstant(autoType.CanonicalType, targetTypeName, initExpr);
                 }
                 else if (type is BuiltinType builtinType)
                 {
@@ -2852,28 +2872,28 @@ bool CanBeConstant(Type type, Expr initExpr)
                         case CXTypeKind.CXType_Float:
                         case CXTypeKind.CXType_Double:
                         {
-                            return IsConstant(initExpr);
+                            return IsConstant(targetTypeName, initExpr);
                         }
                     }
                 }
                 else if (type is ElaboratedType elaboratedType)
                 {
-                    return CanBeConstant(elaboratedType.NamedType, initExpr);
+                    return CanBeConstant(elaboratedType.NamedType, targetTypeName, initExpr);
                 }
                 else if (type is EnumType enumType)
                 {
-                    return CanBeConstant(enumType.Decl.IntegerType, initExpr);
+                    return CanBeConstant(enumType.Decl.IntegerType, targetTypeName, initExpr);
                 }
                 else if (type is TypedefType typedefType)
                 {
-                    return CanBeConstant(typedefType.Decl.UnderlyingType, initExpr);
+                    return CanBeConstant(typedefType.Decl.UnderlyingType, targetTypeName, initExpr);
                 }
 
                 return false;
             }
         }
 
-        private bool IsConstant(Expr initExpr)
+        private bool IsConstant(string targetTypeName, Expr initExpr)
         {
             switch (initExpr.StmtClass)
             {
@@ -2882,7 +2902,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_ConditionalOperator:
                 {
                     var conditionalOperator = (ConditionalOperator)initExpr;
-                    return IsConstant(conditionalOperator.Cond) && IsConstant(conditionalOperator.LHS) && IsConstant(conditionalOperator.RHS);
+                    return IsConstant(targetTypeName, conditionalOperator.Cond) && IsConstant(targetTypeName, conditionalOperator.LHS) && IsConstant(targetTypeName, conditionalOperator.RHS);
                 }
 
                 // case CX_StmtClass.CX_StmtClass_AddrLabelExpr:
@@ -2901,7 +2921,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_BinaryOperator:
                 {
                     var binaryOperator = (BinaryOperator)initExpr;
-                    return IsConstant(binaryOperator.LHS) && IsConstant(binaryOperator.RHS);
+                    return IsConstant(targetTypeName, binaryOperator.LHS) && IsConstant(targetTypeName, binaryOperator.RHS);
                 }
 
                 // case CX_StmtClass.CX_StmtClass_CompoundAssignOperator:
@@ -2982,7 +3002,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_CXXFunctionalCastExpr:
                 {
                     var cxxFunctionalCastExpr = (ExplicitCastExpr)initExpr;
-                    return IsConstant(cxxFunctionalCastExpr.SubExprAsWritten);
+                    return IsConstant(targetTypeName, cxxFunctionalCastExpr.SubExprAsWritten);
                 }
 
                 // case CX_StmtClass.CX_StmtClass_CXXConstCastExpr:
@@ -2993,7 +3013,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_ImplicitCastExpr:
                 {
                     var implicitCastExpr = (ImplicitCastExpr)initExpr;
-                    return IsConstant(implicitCastExpr.SubExprAsWritten);
+                    return IsConstant(targetTypeName, implicitCastExpr.SubExprAsWritten);
                 }
 
                 case CX_StmtClass.CX_StmtClass_CharacterLiteral:
@@ -3012,7 +3032,7 @@ private bool IsConstant(Expr initExpr)
                 {
                     var declRefExpr = (DeclRefExpr)initExpr;
                     return (declRefExpr.Decl is EnumConstantDecl) ||
-                           ((declRefExpr.Decl is VarDecl varDecl) && varDecl.HasInit && IsConstant(varDecl.Init));
+                           ((declRefExpr.Decl is VarDecl varDecl) && varDecl.HasInit && IsConstant(targetTypeName, varDecl.Init));
                 }
 
                 // case CX_StmtClass.CX_StmtClass_DependentCoawaitExpr:
@@ -3033,7 +3053,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_ExprWithCleanups:
                 {
                     var exprWithCleanups = (ExprWithCleanups)initExpr;
-                    return IsConstant(exprWithCleanups.SubExpr);
+                    return IsConstant(targetTypeName, exprWithCleanups.SubExpr);
                 }
 
                 // case CX_StmtClass.CX_StmtClass_FunctionParmPackExpr:
@@ -3089,7 +3109,7 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_ParenExpr:
                 {
                     var parenExpr = (ParenExpr)initExpr;
-                    return IsConstant(parenExpr.SubExpr);
+                    return IsConstant(targetTypeName, parenExpr.SubExpr);
                 }
 
                 case CX_StmtClass.CX_StmtClass_ParenListExpr:
@@ -3098,7 +3118,7 @@ private bool IsConstant(Expr initExpr)
 
                     foreach (var expr in parenListExpr.Exprs)
                     {
-                        if (IsConstant(expr))
+                        if (IsConstant(targetTypeName, expr))
                         {
                             return true;
                         }
@@ -3159,7 +3179,18 @@ private bool IsConstant(Expr initExpr)
                 case CX_StmtClass.CX_StmtClass_UnaryOperator:
                 {
                     var unaryOperator = (UnaryOperator)initExpr;
-                    return IsConstant(unaryOperator.SubExpr);
+
+                    if (!IsConstant(targetTypeName, unaryOperator.SubExpr))
+                    {
+                        return false;
+                    }
+
+                    if (unaryOperator.Opcode != CX_UnaryOperatorKind.CX_UO_Minus)
+                    {
+                        return true;
+                    }
+
+                    return targetTypeName is not "IntPtr" and not "nint" and not "nuint" and not "UIntPtr";
                 }
 
                 // case CX_StmtClass.CX_StmtClass_VAArgExpr:

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs

@@ -192,7 +192,7 @@ private void VisitCharacterLiteral(CharacterLiteral characterLiteral)
 
                         if (!isPreviousExplicitCast)
                         {
-                            outputBuilder.Write("(byte)(");
+                            outputBuilder.Write("(sbyte)(");
                         }
 
                         outputBuilder.Write('\'');
@@ -634,6 +634,7 @@ private void VisitDoStmt(DoStmt doStmt)
         private void VisitExplicitCastExpr(ExplicitCastExpr explicitCastExpr)
         {
             var outputBuilder = StartCSharpCode();
+
             if (IsPrevContextDecl<EnumConstantDecl>(out _) && explicitCastExpr.Type is EnumType enumType)
             {
                 outputBuilder.Write('(');
@@ -643,10 +644,17 @@ private void VisitExplicitCastExpr(ExplicitCastExpr explicitCastExpr)
             }
 
             var type = explicitCastExpr.Type;
-
-
             var typeName = GetRemappedTypeName(explicitCastExpr, context: null, type, out _);
 
+            if (typeName == "IntPtr")
+            {
+                typeName = "nint";
+            }
+            else if (typeName == "UIntPtr")
+            {
+                typeName = "nuint";
+            }
+
             outputBuilder.Write('(');
             outputBuilder.Write(typeName);
             outputBuilder.Write(')');
@@ -832,7 +840,7 @@ private void VisitImplicitCastExpr(ImplicitCastExpr implicitCastExpr)
 
                 default:
                 {
-                    if ((subExpr is DeclRefExpr declRefExpr) && (declRefExpr.Decl is EnumConstantDecl enumConstantDecl))
+                    if (IsStmtAsWritten<DeclRefExpr>(subExpr, out var declRefExpr, removeParens: true) && (declRefExpr.Decl is EnumConstantDecl enumConstantDecl))
                     {
                         ForEnumConstantDecl(implicitCastExpr, enumConstantDecl);
                     }
@@ -1901,7 +1909,7 @@ private void VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr unaryExprOrT
                             {
                                 var arg = args[i];
 
-                                if (IsStmtAsWritten(arg, unaryExprOrTypeTraitExpr))
+                                if (IsStmtAsWritten(arg, unaryExprOrTypeTraitExpr, removeParens: true))
                                 {
                                     index = i;
                                     break;
@@ -2026,7 +2034,18 @@ private void VisitUnaryOperator(UnaryOperator unaryOperator)
 
                     if (canonicalType.IsIntegerType && (canonicalType.Kind != CXTypeKind.CXType_Bool))
                     {
+                        var needsParens = IsStmtAsWritten<BinaryOperator>(subExpr, out _);
+
+                        if (needsParens)
+                        {
+                            outputBuilder.Write('(');
+                        }
                         Visit(subExpr);
+
+                        if (needsParens)
+                        {
+                            outputBuilder.Write(')');
+                        }
                         outputBuilder.Write(" == 0");
                     }
                     else if (canonicalType is PointerType or ReferenceType)