Skip to content

Improve codegen for a few expression kinds #514

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 3 commits into from
Dec 15, 2023
Merged

Improve codegen for a few expression kinds #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b37095c
Improve codegen for a few expression kinds
tannergooding Dec 15, 2023
efd8c1a
Fixing some tests to no longer expect a diagnostic
tannergooding Dec 15, 2023
9e0b661
Ensure suffixes are correctly handled for ui32 and ui64
tannergooding Dec 15, 2023
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
76 changes: 60 additions & 16 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using static ClangSharp.Interop.CXUnaryOperatorKind;
using static ClangSharp.Interop.CXEvalResultKind;
using static ClangSharp.Interop.CXTypeKind;
using ClangSharp.Interop;

namespace ClangSharp;

Expand Down Expand Up @@ -822,13 +823,33 @@ void VisitCtorInitializers(CXXConstructorDecl cxxConstructorDecl, int firstCtorI
memberInitName = GetRemappedCursorName(declRefExpr.Decl);
}

_outputBuilder.BeginConstructorInitializer(memberRefName, memberInitName);
var skipInitializer = false;
var typeName = "";

if (memberInit is InitListExpr initListExpr)
{
typeName = GetRemappedTypeName(initListExpr, context: null, initListExpr.Type, out _);
}

if (string.Equals(memberRefName, typeName, StringComparison.Ordinal))
{
skipInitializer = true;
}
else
{
_outputBuilder.BeginConstructorInitializer(memberRefName, memberInitName);
}

var memberRefTypeName = GetRemappedTypeName(memberRef, context: null, memberRef.Type, out var memberRefNativeTypeName);

_ = _context.AddLast((cxxConstructorDecl, skipInitializer));
UncheckStmt(memberRefTypeName, memberInit);
_context.RemoveLast();

_outputBuilder.EndConstructorInitializer();
if (!skipInitializer)
{
_outputBuilder.EndConstructorInitializer();
}
}
}
}
Expand Down Expand Up @@ -1083,15 +1104,32 @@ private void VisitIndirectFieldDecl(IndirectFieldDecl indirectFieldDecl)

if (isFixedSizedBuffer)
{
var arraySize = IsType<ConstantArrayType>(indirectFieldDecl, type, out var constantArrayType) ? constantArrayType.Size : 0;
arraySize = Math.Max(arraySize, 1);

if (isSupportedFixedSizedBufferType)
{
code.Write("[0], ");
code.Write(Math.Max(IsType<ConstantArrayType>(indirectFieldDecl, type, out var constantArrayType) ? constantArrayType.Size : 0, 1));
code.Write(arraySize);
code.Write(')');
}
else if (!_config.GenerateLatestCode)
else if (!_config.GenerateLatestCode || arraySize == 1)
{
code.Write(".AsSpan()");
code.Write(".AsSpan(");

if (arraySize == 1)
{
if (TryGetRemappedValue(indirectFieldDecl, _config.WithLengths, out var length))
{
code.Write(length);
}
else
{
AddDiagnostic(DiagnosticLevel.Warning, $"Found variable length array: '{GetCursorQualifiedName(indirectFieldDecl)}'. Please specify the length using `--with-length <string>`.", indirectFieldDecl);
}
}

code.Write(')');
}
}
else
Expand Down Expand Up @@ -1639,11 +1677,9 @@ private void VisitRecordDecl(RecordDecl recordDecl)
var cxxBaseSpecifier = cxxRecordDecl.Bases[index];
var baseCxxRecordDecl = GetRecordDecl(cxxBaseSpecifier);

if (HasField(baseCxxRecordDecl))
if (HasField(baseCxxRecordDecl) && !IsBaseExcluded(cxxRecordDecl, baseCxxRecordDecl, cxxBaseSpecifier, out var baseFieldName))
{
var parent = GetRemappedCursorName(baseCxxRecordDecl);
var baseFieldName = GetAnonymousName(cxxBaseSpecifier, "Base");
baseFieldName = GetRemappedName(baseFieldName, cxxBaseSpecifier, tryRemapOperatorName: true, out var wasRemapped, skipUsing: true);

var fieldDesc = new FieldDesc {
AccessSpecifier = GetAccessSpecifier(baseCxxRecordDecl, matchStar: true),
Expand Down Expand Up @@ -1771,14 +1807,22 @@ private void VisitRecordDecl(RecordDecl recordDecl)
{
foreach (var cxxConstructorDecl in cxxRecordDecl.Ctors)
{
Visit(cxxConstructorDecl);
_outputBuilder.WriteDivider();
if (!IsExcluded(cxxConstructorDecl))
{
Visit(cxxConstructorDecl);
_outputBuilder.WriteDivider();
}
}

if (cxxRecordDecl.HasUserDeclaredDestructor && !cxxRecordDecl.Destructor.IsVirtual)
if (cxxRecordDecl.HasUserDeclaredDestructor)
{
Visit(cxxRecordDecl.Destructor);
_outputBuilder.WriteDivider();
var cxxDestructorDecl = cxxRecordDecl.Destructor;

if (!cxxDestructorDecl.IsVirtual && !IsExcluded(cxxDestructorDecl))
{
Visit(cxxDestructorDecl);
_outputBuilder.WriteDivider();
}
}

if (hasVtbl || hasBaseVtbl)
Expand Down Expand Up @@ -3714,14 +3758,14 @@ private bool IsConstant(string targetTypeName, Expr initExpr)
case CX_StmtClass_CStyleCastExpr:
case CX_StmtClass_CXXStaticCastExpr:
case CX_StmtClass_CXXFunctionalCastExpr:
case CX_StmtClass_CXXConstCastExpr:
case CX_StmtClass_CXXDynamicCastExpr:
case CX_StmtClass_CXXReinterpretCastExpr:
{
var cxxFunctionalCastExpr = (ExplicitCastExpr)initExpr;
return IsConstant(targetTypeName, cxxFunctionalCastExpr.SubExprAsWritten);
}

// case CX_StmtClass_CXXConstCastExpr:
// case CX_StmtClass_CXXDynamicCastExpr:
// case CX_StmtClass_CXXReinterpretCastExpr:
// case CX_StmtClass_ObjCBridgedCastExpr:

case CX_StmtClass_ImplicitCastExpr:
Expand Down
Loading