Code generator updates and fix for a union with a discriminator referencing an enum type. #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If a union uses a field as a discriminator but that field is defined as an enum type, then we have to reference it by name differently. This is because enum names have a different conversion from a QAPI name to a Java name. Sometimes, this name cannot easily be derived from the known information so far. Concretely, the following bug introduced this: 1. The type "SysEmuTarget" is defined as an enum. One of its values is "x86_64". 2. The type "CpuInfoFast" uses a field of the above type as a discriminator. 3. In Java generated code, it was trying to reference SysEmuType.x8664. This type did not exist in the enum. It only has "x86_64". Now we save all enum fields and check if a union is referencing an enum explicitly. If it is, then we use the enum name for that field.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The QAPI has changed again. More fields have been added since April 23.
This also exposed a bug in the way that CpuInfoFast was being generated. The bug has to do with the way Java names are generated when there is a union with a discriminator referencing an enum type. So there's a commit in here to handle that case.
Also, this added more parameters to some options, so I had to go and fix some tests to add the new parameters.