Skip to content

Update template function selection to use min required args #309

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 2 commits into from
Jul 16, 2024
Merged

Update template function selection to use min required args #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7387021
Update template function selection to use min required args on clang-…
aaronj0 Jul 12, 2024
80440ea
Add FunctionReflectionTest for BestTemplateFunctionMatch
aaronj0 Jul 15, 2024
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
10 changes: 8 additions & 2 deletions lib/Interpreter/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,11 +993,17 @@ namespace Cpp {
// actual types. We make this match solely based on count

const FunctionDecl* func = TFD->getTemplatedDecl();
if (func->getNumParams() != arg_types.size())

#ifdef USE_CLING
if (func->getNumParams() > arg_types.size())
continue;
#else // CLANG_REPL
if (func->getMinRequiredArguments() > arg_types.size())
continue;
#endif

// FIXME : first score based on the type similarity before forcing
// instantiation try instantiating
// instantiation.
TCppFunction_t instantiated =
InstantiateTemplate(candidate, arg_types.data(), arg_types.size());
if (instantiated)
Expand Down
54 changes: 54 additions & 0 deletions unittests/CppInterOp/FunctionReflectionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,60 @@ TEST(FunctionReflectionTest, InstantiateTemplateMethod) {
EXPECT_TRUE(TA1.getAsType()->isIntegerType());
}

TEST(FunctionReflectionTest, BestTemplateFunctionMatch) {
std::vector<Decl*> Decls;
std::string code = R"(
class MyTemplatedMethodClass {
public:
template<class A> long get_size(A&);
template<class A> long get_size();
template<class A, class B> long get_size(A a, B b);
};

template<class A>
long MyTemplatedMethodClass::get_size(A&) {
return sizeof(A);
}

template<class A>
long MyTemplatedMethodClass::get_size() {
return sizeof(A) + 1;
}

template<class A, class B>
long MyTemplatedMethodClass::get_size(A a, B b) {
return sizeof(A) + sizeof(B);
}
)";

GetAllTopLevelDecls(code, Decls);
std::vector<Cpp::TCppFunction_t> candidates;

for (auto decl : Decls)
if (Cpp::IsTemplatedFunction(decl)) candidates.push_back((Cpp::TCppFunction_t)decl);

ASTContext& C = Interp->getCI()->getASTContext();

std::vector<Cpp::TemplateArgInfo> args0;
std::vector<Cpp::TemplateArgInfo> args1 = {C.IntTy.getAsOpaquePtr()};
std::vector<Cpp::TemplateArgInfo> args2 = {C.CharTy.getAsOpaquePtr(), C.FloatTy.getAsOpaquePtr()};

std::vector<Cpp::TemplateArgInfo> explicit_args0;
std::vector<Cpp::TemplateArgInfo> explicit_args1 = {C.IntTy.getAsOpaquePtr()};


Cpp::TCppFunction_t func1 = Cpp::BestTemplateFunctionMatch(candidates, explicit_args0, args1);
Cpp::TCppFunction_t func2 = Cpp::BestTemplateFunctionMatch(candidates, explicit_args1, args0);
Cpp::TCppFunction_t func3 = Cpp::BestTemplateFunctionMatch(candidates, explicit_args0, args2);

EXPECT_EQ(Cpp::GetFunctionSignature(func1),
"template<> long MyTemplatedMethodClass::get_size<int>(int &)");
EXPECT_EQ(Cpp::GetFunctionSignature(func2),
"template<> long MyTemplatedMethodClass::get_size<int>()");
EXPECT_EQ(Cpp::GetFunctionSignature(func3),
"template<> long MyTemplatedMethodClass::get_size<char, float>(char a, float b)");
}

TEST(FunctionReflectionTest, IsPublicMethod) {
std::vector<Decl *> Decls, SubDecls;
std::string code = R"(
Expand Down