Skip to content

Update GetFunctionReturnType API for template functions #218

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
Apr 7, 2024
Merged

Update GetFunctionReturnType API for template functions #218

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
7fb0ae1
Update GetFunctionReturnType
aaronj0 Apr 5, 2024
173fea8
Update unittests
aaronj0 Apr 5, 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
4 changes: 4 additions & 0 deletions lib/Interpreter/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,10 @@ namespace Cpp {
return FD->getReturnType().getAsOpaquePtr();
}

if (auto* FD = llvm::dyn_cast_or_null<clang::FunctionTemplateDecl>(D)) {
Copy link
Contributor

@vgvassilev vgvassilev Apr 5, 2024

Choose a reason for hiding this comment

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

Can D be null here? If not we need to drop the _or_null part.

return (FD->getTemplatedDecl())->getReturnType().getAsOpaquePtr();
}

return 0;
}

Expand Down
51 changes: 42 additions & 9 deletions unittests/CppInterOp/FunctionReflectionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ TEST(FunctionReflectionTest, GetFunctionsUsingName) {
}

TEST(FunctionReflectionTest, GetFunctionReturnType) {
std::vector<Decl*> Decls, SubDecls;
std::vector<Decl*> Decls, SubDecls, TemplateSubDecls;
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: variable 'Decls' is not initialized [cppcoreguidelines-init-variables]

Suggested change
std::vector<Decl*> Decls, SubDecls, TemplateSubDecls;
std::vector<Decl*> Decls = 0, SubDecls, TemplateSubDecls;

std::string code = R"(
namespace N { class C {}; }
enum Switch { OFF, ON };
Expand All @@ -238,7 +238,6 @@ TEST(FunctionReflectionTest, GetFunctionReturnType) {
int f () { return 0; }
};


void f1() {}
double f2() { return 0.2; }
Switch f3() { return ON; }
Expand All @@ -248,22 +247,56 @@ TEST(FunctionReflectionTest, GetFunctionReturnType) {
volatile N::C f7() { return N::C(); }
const volatile N::C f8() { return N::C(); }
int n;

class MyTemplatedMethodClass {
template<class A>
char get_string(A) {
return 'A';
}

template<class A>
void get_size() {}

template<class A>
long add_size (int i) {
return sizeof(A) + i;
}
};
)";

GetAllTopLevelDecls(code, Decls, true);
GetAllSubDecls(Decls[2], SubDecls);
GetAllSubDecls(Decls[12], TemplateSubDecls);

// #include <string>

EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[3])), "void");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[4])), "double");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[5])), "Switch");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[4])),
"double");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[5])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 5 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[5])),
                                                                  ^

"Switch");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[6])), "N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[7])), "N::C *");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[8])), "const N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[9])), "volatile N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[10])), "const volatile N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[11])), "NULL TYPE");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[7])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 7 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[7])),
                                                                  ^

"N::C *");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[8])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 8 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[8])),
                                                                  ^

"const N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[9])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 9 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[9])),
                                                                  ^

"volatile N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[10])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 10 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[10])),
                                                                  ^

"const volatile N::C");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[11])),
Copy link
Contributor

@github-actions github-actions bot Apr 5, 2024

Choose a reason for hiding this comment

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

warning: 11 is a magic number; consider replacing it with a named constant [readability-magic-numbers]

  EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(Decls[11])),
                                                                  ^

"NULL TYPE");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(SubDecls[1])), "void");
EXPECT_EQ(Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(SubDecls[2])), "int");
EXPECT_EQ(
Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(TemplateSubDecls[1])),
"char");
EXPECT_EQ(
Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(TemplateSubDecls[2])),
"void");
EXPECT_EQ(
Cpp::GetTypeAsString(Cpp::GetFunctionReturnType(TemplateSubDecls[3])),
"long");
}

TEST(FunctionReflectionTest, GetFunctionNumArgs) {
Expand Down