yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-23 04:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Fix generated code when flat union has member 'kind'

Browse source 
A flat union's tag member gets renamed to 'kind' in the generated
code. Breaks when another member named 'kind' exists.

Example, adapted from qapi-schema-test.json:

{ 'struct': 'UserDefUnionBase',
'data': { 'kind': 'str', 'enum1': 'EnumOne' } }

We generate:

struct UserDefFlatUnion
{
EnumOne kind;
union {
void *data;
UserDefA *value1;
UserDefB *value2;
UserDefB *value3;
};
char *kind;
};

Kill the silly rename.

Backports commit 0f61af3eb396ae163cd1572ce12e05f5d08d7c15 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 16:13:05 -05:00 committed by Lioncash
parent b190e4887e
commit 8b7252d8c8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qemu/scripts/qapi-types.py
View file

@ -198,11 +198,12 @@ def generate_union(expr, meta):
ret = mcgen(''' ret = mcgen('''
struct %(name)s struct %(name)s
{ {
%(discriminator_type_name)s kind; %(discriminator_type_name)s %(discriminator)s;
union { union {
void *data; void *data;
''', ''',
name=name, name=name,
discriminator=c_name(discriminator or 'kind'),
discriminator_type_name=c_name(discriminator_type_name)) discriminator_type_name=c_name(discriminator_type_name))
for key in typeinfo: for key in typeinfo:

7
qemu/scripts/qapi-visit.py
View file

@ -289,20 +289,23 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e
name=c_name(name)) name=c_name(name))
if not discriminator: if not discriminator:
tag = 'kind'
disc_key = "type" disc_key = "type"
else: else:
tag = discriminator
disc_key = discriminator disc_key = discriminator
ret += mcgen(''' ret += mcgen('''
visit_type_%(disc_type)s(m, &(*obj)->kind, "%(disc_key)s", &err); visit_type_%(disc_type)s(m, &(*obj)->%(c_tag)s, "%(disc_key)s", &err);
if (err) { if (err) {
goto out_obj; goto out_obj;
} }
if (!visit_start_union(m, !!(*obj)->data, &err) || err) { if (!visit_start_union(m, !!(*obj)->data, &err) || err) {
goto out_obj; goto out_obj;
} }
switch ((*obj)->kind) { switch ((*obj)->%(c_tag)s) {
''', ''',
disc_type = disc_type, disc_type = disc_type,
c_tag=c_name(tag),
disc_key = disc_key) disc_key = disc_key)
for key in members: for key in members: