Skip to content

Fixed freeing union members when only default need be freed. #228

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 1 commit into from
Jan 20, 2022
Merged

Fixed freeing union members when only default need be freed. #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions erpcgen/src/CGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2682,6 +2682,7 @@ data_map CGenerator::getEncodeDecodeCall(const string &name, Group *group, DataT

data_list unionCases;
data_list unionCasesToFree;
bool needCaseEmptyFreeingCall = false;
// call free function for this union, default not call any free function
templateData["freeingCall"] = make_template("", &params);
for (auto unionCase : unionType->getCases())
Expand Down Expand Up @@ -2731,6 +2732,7 @@ data_map CGenerator::getEncodeDecodeCall(const string &name, Group *group, DataT
{
// current member don't need free memory
memberData["isNeedFreeingCall"] = false;
needCaseEmptyFreeingCall = true;
}
caseMembers.push_back(memberData);
if (casesNeedTempVariable)
Expand All @@ -2743,6 +2745,7 @@ data_map CGenerator::getEncodeDecodeCall(const string &name, Group *group, DataT
unionCases.push_back(caseData);
}
templateData["cases"] = unionCases;
templateData["needCaseEmptyFreeingCall"] = needCaseEmptyFreeingCall;
templateData["encode"] = m_templateData["encodeUnionType"];
templateData["decode"] = m_templateData["decodeUnionType"];
}
Expand Down
12 changes: 2 additions & 10 deletions erpcgen/src/templates/c_coders.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,7 @@ codec->startReadUnion({% if info.castDiscriminator %}{% if info.dataLiteral != "
switch ({% if info.dataLiteral != "" %}{$info.dataLiteral}{% else %}*{% endif %}{$info.discriminatorName})
{
{% for case in info.cases %}
{% if case.name == "default" %}
default:
{% else %}
case {% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{% endif -- default or case %}
{% if case.name != "default" %}case {% endif %}{% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{
{% for member in case.members %}
{% if source == "server" %}
Expand Down Expand Up @@ -295,11 +291,7 @@ codec->startWriteUnion({% if info.castDiscriminator %}static_cast<int32_t>({% en
switch ({$info.dataLiteral}{$info.discriminatorName})
{
{% for case in info.cases %}
{% if case.name == "default" %}
default:
{% else %}
case {% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{% endif -- default or case %}
{% if case.name != "default" %}case {% endif %}{% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{
{% for member in case.members %}
{$> addIndent(" ", member.coderCall.encode(member.coderCall))}
Expand Down
14 changes: 9 additions & 5 deletions erpcgen/src/templates/c_common_functions.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,17 @@ for (uint32_t {$info.forLoopCount} = 0; {$info.forLoopCount} < {$info.size}; ++{
{% def freeUnion(info) %}
switch ({$info.dataLiteral}{$info.discriminatorName})
{
{%if info.needCaseEmptyFreeingCall %}{% for case in info.cases %}
{% if case.needCaseFreeingCall == false %}
{% if case.name != "default" %}case {% endif%}{% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{% endif %}
{% endfor -- cases %}
{
break;
}{% endif -- needCaseEmptyFreeingCall %}
{% for case in info.cases %}
{% if case.needCaseFreeingCall == true %}
{% if case.name == "default" %}
default:
{% else %}
case {% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{% endif -- default or case %}
{% if case.name != "default" %}case {% endif%}{% if case.name != "" %}{$case.name}{% else %}{$case.value}{% endif %}:
{
{% for member in case.members %}
{% if member.isNeedFreeingCall %}
Expand Down
12 changes: 9 additions & 3 deletions erpcgen/test/test_union_c.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ idl: |
binary rawString
}

// const int32 returnVal = 10;

union unionType
{
case apple:
Expand Down Expand Up @@ -203,6 +201,14 @@ test_server.cpp:
- "{"
- switch (discriminator)
- "{"
- "case banana:"
- not: "break;"
- "case papaya:"
- "case returnVal:"
- "default:"
- "{"
- "break;"
- "}"
- "case apple:"
- "{"
- free_foobar_struct(&data->myFoobar);
Expand Down Expand Up @@ -277,4 +283,4 @@ test_server.cpp:

#test_server.cpp:
# - static int32_t read_unionType_union(erpc::Codec * codec, int32_t discriminator, unionType * data);
# - static int32_t read_unionType_union(erpc::Codec * codec, int32_t discriminator, unionType * data)
# - static int32_t read_unionType_union(erpc::Codec * codec, int32_t discriminator, unionType * data)