Skip to content

Few misc fixups to better handle some C++ patterns #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 13, 2022
Merged

Few misc fixups to better handle some C++ patterns #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ffadf3
Fixing how a few names are resolved
tannergooding Aug 19, 2022
adecda7
Ensure the various Create APIs handle newer kinds
tannergooding Aug 19, 2022
e43c650
Ensure UsingType is handled so we can emit `volatile` fields for `std…
tannergooding Aug 19, 2022
cd91ec5
Specially handle certain memset as default assignment
tannergooding Aug 19, 2022
d730501
Better handle some call expressions and unused values
tannergooding Aug 26, 2022
ed7ab98
Fixing a couple reference type stmt handling issues
tannergooding Aug 27, 2022
e309ab1
Fixing a couple places where unchecked is needed
tannergooding Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,11 +673,19 @@ private void VisitFunctionDecl(FunctionDecl functionDecl)
outputBuilder.Write("return ");
}

var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == cxxMethodDecl.Parent).Single();
var baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == cxxMethodDecl.Parent).SingleOrDefault();

outputBuilder.Write(baseFieldName);
if (cxxBaseSpecifier != null)
{
var baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
outputBuilder.Write(baseFieldName);
}
else
{
outputBuilder.Write("Base");
}

outputBuilder.Write('.');
outputBuilder.Write(name);
outputBuilder.Write('(');
Expand Down Expand Up @@ -3504,7 +3512,12 @@ private bool IsConstant(string targetTypeName, Expr initExpr)

// case CX_StmtClass.CX_StmtClass_CXXTemporaryObjectExpr:
// case CX_StmtClass.CX_StmtClass_CXXDefaultArgExpr:
// case CX_StmtClass.CX_StmtClass_CXXDefaultInitExpr:

case CX_StmtClass.CX_StmtClass_CXXDefaultInitExpr:
{
return false;
}

// case CX_StmtClass.CX_StmtClass_CXXDeleteExpr:

case CX_StmtClass.CX_StmtClass_CXXDependentScopeMemberExpr:
Expand Down Expand Up @@ -3669,7 +3682,11 @@ private bool IsConstant(string targetTypeName, Expr initExpr)
return true;
}

// case CX_StmtClass.CX_StmtClass_LambdaExpr:
case CX_StmtClass.CX_StmtClass_LambdaExpr:
{
return false;
}

// case CX_StmtClass.CX_StmtClass_MSPropertyRefExpr:
// case CX_StmtClass.CX_StmtClass_MSPropertySubscriptExpr:
// case CX_StmtClass.CX_StmtClass_MaterializeTemporaryExpr:
Expand Down Expand Up @@ -3741,7 +3758,11 @@ private bool IsConstant(string targetTypeName, Expr initExpr)
return true;
}

// case CX_StmtClass.CX_StmtClass_SubstNonTypeTemplateParmExpr:
case CX_StmtClass.CX_StmtClass_SubstNonTypeTemplateParmExpr:
{
return false;
}

// case CX_StmtClass.CX_StmtClass_SubstNonTypeTemplateParmPackExpr:
// case CX_StmtClass.CX_StmtClass_TypeTraitExpr:
// case CX_StmtClass.CX_StmtClass_TypoExpr:
Expand Down
187 changes: 170 additions & 17 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,24 @@ private void VisitCallExpr(CallExpr callExpr)
}
}

var isUnusedValue = false;

if (callExpr.Type.CanonicalType.Kind != CXTypeKind.CXType_Void)
{
isUnusedValue = IsPrevContextStmt<CompoundStmt>(out _, out _)
|| IsPrevContextStmt<IfStmt>(out _, out _);

if ((calleeDecl is FunctionDecl functionDecl) && (functionDecl.Name is "memcpy" or "memset"))
{
isUnusedValue = false;
}
}

if (isUnusedValue)
{
outputBuilder.Write("_ = ");
}

if (calleeDecl is null)
{
Visit(callExpr.Callee);
Expand All @@ -139,22 +157,64 @@ private void VisitCallExpr(CallExpr callExpr)

case "memset":
{
NamedDecl namedDecl = null;

if (callExpr.NumArgs == 3)
{
if (IsStmtAsWritten<IntegerLiteral>(callExpr.Args[1], out var integerLiteralExpr, removeParens: true) && (integerLiteralExpr.Value == 0) &&
IsStmtAsWritten<UnaryExprOrTypeTraitExpr>(callExpr.Args[2], out var unaryExprOrTypeTraitExpr, removeParens: true) && (unaryExprOrTypeTraitExpr.Kind == CX_UnaryExprOrTypeTrait.CX_UETT_SizeOf))
{
var typeOfArgument = unaryExprOrTypeTraitExpr.TypeOfArgument.CanonicalType;
var expr = callExpr.Args[0];

if (IsStmtAsWritten<UnaryOperator>(expr, out var unaryOperator, removeParens: true) && (unaryOperator.Opcode == CX_UnaryOperatorKind.CX_UO_AddrOf))
{
expr = unaryOperator.SubExpr;
}

if (IsStmtAsWritten<DeclRefExpr>(expr, out var declRefExpr, removeParens: true) && (typeOfArgument == declRefExpr.Type.CanonicalType))
{
namedDecl = declRefExpr.Decl;
}
else if (IsStmtAsWritten<MemberExpr>(expr, out var memberExpr, removeParens: true) && (typeOfArgument == memberExpr.Type.CanonicalType))
{
namedDecl = memberExpr.MemberDecl;
}
}

if (namedDecl is not null)
{
outputBuilder.Write(GetRemappedCursorName(namedDecl));
outputBuilder.Write(" = default");
break;
}
}

outputBuilder.AddUsingDirective("System.Runtime.CompilerServices");
outputBuilder.Write("Unsafe.InitBlockUnaligned");
VisitArgs(callExpr);
break;
}

default:
case "wcslen":
{
if ((functionDecl.ReturnType.CanonicalType.Kind != CXTypeKind.CXType_Void) && IsPrevContextStmt<CompoundStmt>(out _, out _))
if (_config.GenerateCompatibleCode)
{
outputBuilder.Write("_ = ");
goto default;
}

Visit(callExpr.Callee);
outputBuilder.AddUsingDirective("System.Runtime.InteropServices");
outputBuilder.Write("MemoryMarshal.CreateReadOnlySpanFromNullTerminated");

VisitArgs(callExpr);
outputBuilder.Write(".Length");
break;
}

default:
{
Visit(callExpr.Callee);
VisitArgs(callExpr);
break;
}
}
Expand All @@ -176,19 +236,53 @@ private void VisitCallExpr(CallExpr callExpr)

void VisitArgs(CallExpr callExpr)
{
var callExprType = (callExpr.Callee is MemberExpr memberExpr)
? memberExpr.MemberDecl.Type.CanonicalType
: callExpr.Callee.Type.CanonicalType;

if (callExprType is PointerType pointerType)
{
callExprType = pointerType.PointeeType.CanonicalType;
}

outputBuilder.Write('(');

var args = callExpr.Args;
var needsComma = false;

for (var i = 0; i < args.Count; i++)
{
if (needsComma)
var arg = args[i];

if (needsComma && (arg is not CXXDefaultArgExpr))
{
outputBuilder.Write(", ");
}

var arg = args[i];
if (callExprType is FunctionProtoType functionProtoType)
{
var paramType = functionProtoType.ParamTypes[i].CanonicalType;

if (paramType is ReferenceType)
{
if (IsStmtAsWritten<UnaryOperator>(arg, out var unaryOperator, removeParens: true) && (unaryOperator.Opcode == CX_UnaryOperatorKind.CX_UO_Deref))
{
arg = unaryOperator.SubExpr;
}
else if (IsStmtAsWritten<DeclRefExpr>(arg, out var declRefExpr, removeParens: true))
{
if (declRefExpr.Decl.Type.CanonicalType is not ReferenceType and not PointerType)
{
outputBuilder.Write('&');
}
}
else if (arg.Type.CanonicalType is not ReferenceType and not PointerType)
{
outputBuilder.Write('&');
}
}
}

Visit(arg);

if (arg is not CXXDefaultArgExpr)
Expand Down Expand Up @@ -651,14 +745,14 @@ private void VisitDeclRefExpr(DeclRefExpr declRefExpr)
{
var className = GetClass(enumName);

if (outputBuilder.Name != className)
if ((outputBuilder.Name != className) && (namedDecl.Parent is not TagDecl))
{
outputBuilder.AddUsingDirective($"static {GetNamespace(enumName)}.{className}");
outputBuilder.AddUsingDirective($"static {GetNamespace(enumName, namedDecl)}.{className}");
}
}
else
{
outputBuilder.AddUsingDirective($"static {GetNamespace(enumName)}.{enumName}");
outputBuilder.AddUsingDirective($"static {GetNamespace(enumName, namedDecl)}.{enumName}");
}
}
else
Expand Down Expand Up @@ -1003,12 +1097,33 @@ void ForEnumConstantDecl(ImplicitCastExpr implicitCastExpr, EnumConstantDecl enu
if (IsPrevContextStmt<BinaryOperator>(out var binaryOperator, out _) && ((binaryOperator.Opcode == CX_BinaryOperatorKind.CX_BO_EQ) || (binaryOperator.Opcode == CX_BinaryOperatorKind.CX_BO_NE)))
{
Visit(subExpr);
subExpr = null;
}
else if (IsPrevContextStmt<CaseStmt>(out _, out _))
{
var previousContext = _context.Last.Previous;

do
{
previousContext = previousContext.Previous;
}
while (previousContext.Value.Cursor is ParenExpr or ImplicitCastExpr or CaseStmt or CompoundStmt);

var value = previousContext.Value;

if ((value.Cursor is SwitchStmt switchStmt) && (switchStmt.Cond.IgnoreImplicit.Type.CanonicalType is EnumType))
{
Visit(subExpr);
subExpr = null;
}
}
else if (IsPrevContextDecl<EnumConstantDecl>(out _, out _))
{
Visit(subExpr);
subExpr = null;
}
else

if (subExpr is not null)
{
var type = implicitCastExpr.Type;

Expand Down Expand Up @@ -1272,7 +1387,7 @@ void ForType(InitListExpr initListExpr, Type type)
}
else
{
AddDiagnostic(DiagnosticLevel.Error, $"Unsupported init list expression type: '{type.KindSpelling}'. Generated bindings may be incomplete.", initListExpr);
AddDiagnostic(DiagnosticLevel.Error, $"Unsupported init list expression type: '{type.TypeClassSpelling}'. Generated bindings may be incomplete.", initListExpr);
}
}

Expand Down Expand Up @@ -1335,6 +1450,14 @@ void HandleInitStmt(Stmt init)
break;
}

case CXEvalResultKind.CXEval_StrLiteral:
{
outputBuilder.Write('"');
outputBuilder.Write(evaluation.AsStr);
outputBuilder.Write('"');
break;
}

default:
{
AddDiagnostic(DiagnosticLevel.Error, $"Unsupported evaluation kind: '{evaluation.Kind}'. Generated bindings may be incomplete.", init);
Expand Down Expand Up @@ -1605,18 +1728,26 @@ private void VisitMemberExpr(MemberExpr memberExpr)
{
if ((_cxxRecordDeclContext is not null) && (_cxxRecordDeclContext != cxxMethodDecl.Parent) && HasField(cxxMethodDecl.Parent))
{
var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == cxxMethodDecl.Parent).Single();
baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == cxxMethodDecl.Parent).SingleOrDefault();

if (cxxBaseSpecifier is not null)
{
baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
}
}
}
else if (memberExpr.MemberDecl is FieldDecl fieldDecl)
{
if ((_cxxRecordDeclContext is not null) && (_cxxRecordDeclContext != fieldDecl.Parent))
{
var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == fieldDecl.Parent).Single();
baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
var cxxBaseSpecifier = _cxxRecordDeclContext.Bases.Where((baseSpecifier) => baseSpecifier.Referenced == fieldDecl.Parent).SingleOrDefault();

if (cxxBaseSpecifier is not null)
{
baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);
}
}
}
}
Expand Down Expand Up @@ -1710,6 +1841,15 @@ private void VisitReturnStmt(ReturnStmt returnStmt)
if (returnStmt.RetValue != null)
{
outputBuilder.Write(' ');

if (functionDecl.ReturnType.CanonicalType is not ReferenceType and not PointerType)
{
if (returnStmt.RetValue.Type.CanonicalType is ReferenceType)
{
outputBuilder.Write('*');
}
}

Visit(returnStmt.RetValue);
}
}
Expand Down Expand Up @@ -2609,8 +2749,21 @@ private void VisitUnaryOperator(UnaryOperator unaryOperator)
}
else if (canonicalType is PointerType or ReferenceType)
{
var needsParens = !IsPrevContextStmt<ParenExpr>(out _, out _, preserveParen: true) &&
!IsPrevContextStmt<IfStmt>(out _, out _, preserveParen: true);

if (needsParens)
{
outputBuilder.Write('(');
}

Visit(subExpr);
outputBuilder.Write(" == null");

if (needsParens)
{
outputBuilder.Write(')');
}
}
else
{
Expand Down
Loading