Skip to content

A couple fixes for the win32metadata project #218

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 4 commits into from
Mar 24, 2021
Merged

A couple fixes for the win32metadata project #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1430c
Merge pull request #1 from microsoft/master
sotteson1 Mar 18, 2021
497e666
Required fix for win32metadata project.
Mar 18, 2021
be9f550
Merge pull request #2 from microsoft/main
sotteson1 Mar 23, 2021
7491722
If we can't find an expression in the args of its parent, try looking…
Mar 23, 2021
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
5 changes: 5 additions & 0 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,11 @@ private void VisitEnumConstantDecl(EnumConstantDecl enumConstantDecl)

private void VisitIndirectFieldDecl(IndirectFieldDecl indirectFieldDecl)
{
if (_config.ExcludeAnonymousFieldHelpers)
{
return;
}

if (IsPrevContextDecl<RecordDecl>(out var prevContext) && prevContext.IsAnonymousStructOrUnion)
{
// We shouldn't process indirect fields where the prev context is an anonymous record decl
Expand Down
15 changes: 15 additions & 0 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,21 @@ private void VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr unaryExprOrT
if (IsPrevContextStmt<CallExpr>(out var callExpr))
{
var index = callExpr.Args.IndexOf(unaryExprOrTypeTraitExpr);

// If we didn't find the expression, try and find it under an implicit cast
if (index == -1)
{
for (int i = 0; i < callExpr.Args.Count; i++)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be better to write this as a single loop:

var args = callExpr.Args;
var index = -1;

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

    if (IsStmtAsWritten(arg, unaryExprOrTypeTraitExpr))
    {
        index = i;
        break;
    }

    if (index == -1)
    {
        AddDiagnostic(DiagnosticLevel.Error, $"Failed to locate index of '{unaryExprOrTypeTraitExpr}' in callee declaration. Generated bindings may be incomplete.", calleeDecl);
    }
}

We can then have:

private bool IsStmtAsWritten(Stmt stmt, Stmt expectedStmt, bool removeParens = false)
{
    if (stmt == expectedStmt)
    {
        return true;
    }

    if (stmt is not Expr expr)
    {
        return false;
    }

    expr = GetExprAsWritten(expr, removeParens);
    return expr == expectedStmt;
}

This will make it easier to cover more cases in the future and to consistently look into an expr to remove implicit casts or other bits as necessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have an existing IsStmtAsWritten that does a type check, rather than a value check, and it follows roughly this pattern.

{
var arg = callExpr.Args[i];
if (arg is ImplicitCastExpr implicitCastExpr && implicitCastExpr.SubExprAsWritten == unaryExprOrTypeTraitExpr)
{
index = i;
break;
}
}
}

var calleeDecl = callExpr.CalleeDecl;

if (calleeDecl is FunctionDecl functionDecl)
Expand Down