qapi: Fix code generated for optional conditional struct member
commit713d921aed52a802c62f02dadd59da5a9f9466b1
authorMarkus Armbruster <armbru@redhat.com>
Thu, 16 Mar 2023 07:13:24 +0000 (16 08:13 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Mon, 24 Apr 2023 13:21:39 +0000 (24 15:21 +0200)
treec88d000c995986dccbbe092102381aafbf8613c7
parentfa32eb909524486834c85f06ebaf5b9aa3f4b11f
qapi: Fix code generated for optional conditional struct member

The generated member visit neglects to emit #if around a conditional
struct member's has_ variable.  For instance,
tests/qapi-schema/qapi-schema-test.json generates

    #if defined(TEST_IF_STRUCT)
    bool visit_type_TestIfStruct_members(Visitor *v, TestIfStruct *obj, Error **errp)
    {
---> bool has_baz = !!obj->baz;

if (!visit_type_int(v, "foo", &obj->foo, errp)) {
    return false;
}
    #if defined(TEST_IF_STRUCT_MEMBER)
if (!visit_type_int(v, "bar", &obj->bar, errp)) {
    return false;
}
    #endif /* defined(TEST_IF_STRUCT_MEMBER) */
    #if defined(TEST_IF_STRUCT_MEMBER)
if (visit_optional(v, "baz", &has_baz)) {
    if (!visit_type_str(v, "baz", &obj->baz, errp)) {
return false;
    }
}
    #endif /* defined(TEST_IF_STRUCT_MEMBER) */
return true;
    }
    [...]
    #endif /* defined(TEST_IF_STRUCT) */

Won't compile when TEST_IF_STRUCT is defined and TEST_IF_STRUCT_MEMBER
isn't.

Fix that the obvious way:

    #if defined(TEST_IF_STRUCT_MEMBER)
bool has_baz = !!obj->baz;
    #endif /* defined(TEST_IF_STRUCT_MEMBER) */

Fixes: 44ea9d9be33c (qapi: Start to elide redundant has_FOO in generated C)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-14-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
scripts/qapi/visit.py