Skip to content
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

[3.0] fix is_explicit_nested in abi generator gen.hpp #23

Merged
merged 2 commits into from
Aug 30, 2022
Merged

[3.0] fix is_explicit_nested in abi generator gen.hpp #23

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f011ec0
fix is_explicit_nested in abi generator gen.hpp
linh2931 Aug 29, 2022
2b6faec
Merge branch 'release/3.0' into fix_nested_container
Aug 30, 2022
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
28 changes: 27 additions & 1 deletion tools/include/eosio/gen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,11 +807,37 @@ struct generation_utils {
return get_base_type_name(t).compare(get_type_alias_string(t)) != 0;
}

inline bool is_primitive_eventually(const clang::QualType& type ){
if (is_template_specialization( type, {"map", "pair","tuple", "array", "variant", "optional"} )) {
return false;
} else if (is_template_specialization( type, {"vector", "set","deque", "list"} )) {
auto t = get_template_argument_as_string( type );
if ( t=="int8" || t=="uint8" ) {
// vector<int8>, vector<uint8>, set<int8>, ... will be converted to "bytes", so they are primitive
return true;
} else {
return false;
}
} else {
return true;
}
}

inline bool is_explicit_nested(const clang::QualType& t ){
std::string tstr = t.getAsString();
if(tstr.find("decay_t") != std::string::npos || tstr.find("decltype") != std::string::npos || tstr.find("ignore") != std::string::npos ||
tstr.find("invoke") != std::string::npos || tstr.find("index") != std::string::npos || tstr.find("declval") != std::string::npos ) return false;
return std::count (tstr.begin(), tstr.end(), '<') >= 2;
if(std::count (tstr.begin(), tstr.end(), '<') < 2) return false;

if (is_template_specialization( t, {"vector", "set", "deque", "list", "map", "pair","tuple", "array","variant", "optional"} )) {
auto pt = llvm::dyn_cast<clang::ElaboratedType>(t.getTypePtr());
auto tst = llvm::dyn_cast<clang::TemplateSpecializationType>(pt ? pt->desugar().getTypePtr() : t.getTypePtr());
for(int i = 0; i < tst->getNumArgs(); ++i){
// a type is nested only when one of the next level template arguments is eventually not primitive
if (!is_primitive_eventually( std::get<clang::QualType>(get_template_argument(t, i)) )) return true;
}
}
return false;
}

inline bool is_explicit_container(const clang::QualType& t ){
Expand Down