Skip to content

Fix GetFunctionSignature to work for FunctionTemplateDecls #536

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
aaronj0 merged 2 commits into from
Mar 24, 2025
Merged

Fix GetFunctionSignature to work for FunctionTemplateDecls #536

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
b84a608
Fix `GetFunctionSignature` to return signatures for FunctionTemplateD…
aaronj0 Mar 24, 2025
4d2b9b7
Add tests
aaronj0 Mar 24, 2025
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
31 changes: 18 additions & 13 deletions lib/Interpreter/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,20 +958,25 @@ namespace Cpp {
return "<unknown>";

auto *D = (clang::Decl *) func;
if (auto *FD = llvm::dyn_cast<FunctionDecl>(D)) {
std::string Signature;
raw_string_ostream SS(Signature);
PrintingPolicy Policy = getASTContext().getPrintingPolicy();
// Skip printing the body
Policy.TerseOutput = true;
Policy.FullyQualifiedName = true;
Policy.SuppressDefaultTemplateArgs = false;
FD->print(SS, Policy);
SS.flush();
return Signature;
}
clang::FunctionDecl* FD;

if (llvm::dyn_cast<FunctionDecl>(D))
Copy link
Contributor

@github-actions github-actions bot Mar 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: return value from dyn_cast<> not used [llvm-prefer-isa-or-dyn-cast-in-conditionals]

Suggested change
if (llvm::dyn_cast<FunctionDecl>(D))
if (isa::dyn_cast<FunctionDecl>(D))

FD = llvm::dyn_cast<FunctionDecl>(D);
else if (auto* FTD = llvm::dyn_cast<clang::FunctionTemplateDecl>(D))
FD = FTD->getTemplatedDecl();
else
return "<unknown>";

return "<unknown>";
std::string Signature;
raw_string_ostream SS(Signature);
PrintingPolicy Policy = getASTContext().getPrintingPolicy();
// Skip printing the body
Policy.TerseOutput = true;
Policy.FullyQualifiedName = true;
Policy.SuppressDefaultTemplateArgs = false;
FD->print(SS, Policy);
SS.flush();
return Signature;
}

// Internal functions that are not needed outside the library are
Expand Down
21 changes: 13 additions & 8 deletions unittests/CppInterOp/FunctionReflectionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,17 @@ TEST(FunctionReflectionTest, GetFunctionSignature) {
std::string code = R"(
class C {
void f(int i, double d, long l = 0, char ch = 'a') {}
template<typename T>
void ft(T a) {}
};

namespace N
{
void f(int i, double d, long l = 0, char ch = 'a') {}
}

template<typename T>
void ft(T a) {}
void f1() {}
C f2(int i, double d, long l = 0, char ch = 'a') { return C(); }
C *f3(int i, double d, long l = 0, char ch = 'a') { return new C(); }
Expand All @@ -482,18 +486,19 @@ TEST(FunctionReflectionTest, GetFunctionSignature) {
GetAllSubDecls(Decls[0], Decls);
GetAllSubDecls(Decls[1], Decls);

EXPECT_EQ(Cpp::GetFunctionSignature(Decls[2]), "void f1()");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[3]),
"C f2(int i, double d, long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[2]), "void ft(T a)");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[3]), "void f1()");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[4]),
"C *f3(int i, double d, long l = 0, char ch = 'a')");
"C f2(int i, double d, long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[5]),
"void f4(int i = 0, double d = 0., long l = 0, char ch = 'a')");
"C *f3(int i, double d, long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[6]),
"<unknown>");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[8]),
"void f4(int i = 0, double d = 0., long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[7]), "<unknown>");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[9]),
"void C::f(int i, double d, long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[13]),
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[10]), "void C::ft(T a)");
EXPECT_EQ(Cpp::GetFunctionSignature(Decls[15]),
"void N::f(int i, double d, long l = 0, char ch = 'a')");
EXPECT_EQ(Cpp::GetFunctionSignature(nullptr), "<unknown>");
}
Expand Down
Loading