Skip to content

Fieldregion descript name #112313

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
steakhal merged 5 commits into from
Oct 25, 2024
Merged

Fieldregion descript name #112313

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd562bb
Handle FieldRegions with ElementRegions as SuperRegions in getDescrip…
Oct 15, 2024
d8837ca
Remove unneeded include
Oct 15, 2024
b2b269f
Include test case with multi-dim array
Oct 15, 2024
565de60
Function to enclose in quotes if needed
Oct 15, 2024
ca8f5f3
Update clang/lib/StaticAnalyzer/Core/MemRegion.cpp
T-Gruber Oct 23, 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
25 changes: 20 additions & 5 deletions clang/lib/StaticAnalyzer/Core/MemRegion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,12 +751,27 @@ std::string MemRegion::getDescriptiveName(bool UseQuotes) const {
}

// Get variable name.
if (R && R->canPrintPrettyAsExpr()) {
R->printPrettyAsExpr(os);
if (UseQuotes)
return (llvm::Twine("'") + os.str() + ArrayIndices + "'").str();
else
if (R) {
// MemRegion can be pretty printed.
if (R->canPrintPrettyAsExpr()) {
R->printPrettyAsExpr(os);
if (UseQuotes)
return (llvm::Twine("'") + os.str() + ArrayIndices + "'").str();
return (llvm::Twine(os.str()) + ArrayIndices).str();
}

// FieldRegion may have ElementRegion as SuperRegion.
if (const clang::ento::FieldRegion *FR =
R->getAs<clang::ento::FieldRegion>()) {
std::string Super = FR->getSuperRegion()->getDescriptiveName(false);
if (Super.empty())
return "";

if (UseQuotes)
return (llvm::Twine("'") + Super + "." + FR->getDecl()->getName() + "'")
.str();
return (llvm::Twine(Super) + "." + FR->getDecl()->getName()).str();
}
}

return VariableName;
Expand Down
15 changes: 14 additions & 1 deletion clang/unittests/StaticAnalyzer/MemRegionDescriptiveNameTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
#include "clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h"
#include "gtest/gtest.h"
#include <fstream>

using namespace clang;
using namespace ento;
Expand Down Expand Up @@ -143,4 +142,18 @@ void top() {
EXPECT_EQ(Output, "DescriptiveNameChecker: array[x]\n");
}

TEST(MemRegionDescriptiveNameTest, FieldRegWithSuperElementReg) {
StringRef Code = R"cpp(
void reportDescriptiveName(int *p);
struct val_struct { int val; };
extern struct val_struct val_struct_array[3];
void top() {
reportDescriptiveName(&val_struct_array[0].val);
})cpp";

std::string Output;
ASSERT_TRUE(runChecker(Code, Output));
EXPECT_EQ(Output, "DescriptiveNameChecker: val_struct_array[0].val\n");
}

} // namespace