Fix enum conversion #170
Merged
Fix enum conversion #170
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
mihaibudiu
requested changes
Dec 7, 2016
| @@ -9,10 +9,15 @@ const IR::Node* DoConvertEnums::preorder(IR::Type_Enum* type) { | |||
| return type; | |||
| unsigned count = type->members->size(); | |||
| unsigned width = policy->enumSize(count); | |||
| LOG1("Converting enum " << type->name << " to " << "bit<" << width << ">"); | |||
There was a problem hiding this comment.
getType(t) is Type_Type if and only if t is a Type.
Otherwise the result is a Type.
| BUG_CHECK(count >= (1U << width), | ||
| "%1%: not enough bits to represent %2%", width, type); | ||
| auto r = new EnumRepresentation(type->srcInfo, width); | ||
| auto canontype = typeMap->getType(getOriginal(), true); | ||
| if (auto tt = canontype->to<IR::Type_Type>()) |
There was a problem hiding this comment.
So this should be replaced with typeMap->getTypeType(getOriginal(), true);
| @@ -21,6 +26,8 @@ const IR::Node* DoConvertEnums::preorder(IR::Type_Enum* type) { | |||
|
|
|||
| const IR::Node* DoConvertEnums::postorder(IR::Type_Name* type) { | |||
| auto canontype = typeMap->getType(getOriginal(), true); | |||
| if (auto tt = canontype->to<IR::Type_Type>()) | |||
There was a problem hiding this comment.
same here: this should be typeMap->getTypeType(getOriginal(), true);
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.
I'm not sure if the enum types in the typemap will always be Type_Types that need to be dereferenced or only sometimes, so this code will work either way. Previously we weren't really testing this code, as only test files ending in bmv2.p4 (not bmv.p4) will be run...