Skip to content

Commit 140e84f

Browse files
committed
[clang][ssaf][NFC] Rename and document makeTU in BuildNamespace
1 parent 97c31ee commit 140e84f

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

clang/include/clang/Analysis/Scalable/Model/BuildNamespace.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ class BuildNamespace {
5555
BuildNamespace(BuildNamespaceKind Kind, llvm::StringRef Name)
5656
: Kind(Kind), Name(Name.str()) {}
5757

58-
static BuildNamespace makeTU(llvm::StringRef CompilationId);
58+
/// Creates a BuildNamespace representing a compilation unit.
59+
///
60+
/// \param CompilationId The unique identifier for the compilation unit.
61+
/// \returns A BuildNamespace with CompilationUnit kind.
62+
static BuildNamespace makeCompilationUnit(llvm::StringRef CompilationId);
5963

6064
bool operator==(const BuildNamespace& Other) const;
6165
bool operator!=(const BuildNamespace& Other) const;
@@ -88,7 +92,12 @@ class NestedBuildNamespace {
8892
Namespaces.push_back(N);
8993
}
9094

91-
static NestedBuildNamespace makeTU(llvm::StringRef CompilationId);
95+
/// Creates a NestedBuildNamespace representing a compilation unit.
96+
///
97+
/// \param CompilationId The unique identifier for the compilation unit.
98+
/// \returns A NestedBuildNamespace containing a single CompilationUnit
99+
/// BuildNamespace.
100+
static NestedBuildNamespace makeCompilationUnit(llvm::StringRef CompilationId);
92101

93102
/// Creates a new NestedBuildNamespace by appending additional namespace.
94103
///

clang/lib/Analysis/Scalable/Model/BuildNamespace.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ std::optional<BuildNamespaceKind> parseBuildNamespaceKind(llvm::StringRef Str) {
2828
return std::nullopt;
2929
}
3030

31-
BuildNamespace BuildNamespace::makeTU(llvm::StringRef CompilationId) {
31+
BuildNamespace BuildNamespace::makeCompilationUnit(llvm::StringRef CompilationId) {
3232
return BuildNamespace{BuildNamespaceKind::CompilationUnit, CompilationId.str()};
3333
}
3434

@@ -44,9 +44,9 @@ bool BuildNamespace::operator<(const BuildNamespace& Other) const {
4444
return asTuple() < Other.asTuple();
4545
}
4646

47-
NestedBuildNamespace NestedBuildNamespace::makeTU(llvm::StringRef CompilationId) {
47+
NestedBuildNamespace NestedBuildNamespace::makeCompilationUnit(llvm::StringRef CompilationId) {
4848
NestedBuildNamespace Result;
49-
Result.Namespaces.push_back(BuildNamespace::makeTU(CompilationId));
49+
Result.Namespaces.push_back(BuildNamespace::makeCompilationUnit(CompilationId));
5050
return Result;
5151
}
5252

clang/unittests/Analysis/Scalable/BuildNamespaceTest.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace clang::ssaf {
1313
namespace {
1414

1515
TEST(BuildNamespaceTest, Equality) {
16-
auto BN1 = BuildNamespace::makeTU("test.cpp");
17-
auto BN2 = BuildNamespace::makeTU("test.cpp");
18-
auto BN3 = BuildNamespace::makeTU("other.cpp");
16+
auto BN1 = BuildNamespace::makeCompilationUnit("test.cpp");
17+
auto BN2 = BuildNamespace::makeCompilationUnit("test.cpp");
18+
auto BN3 = BuildNamespace::makeCompilationUnit("other.cpp");
1919

2020
EXPECT_EQ(BN1, BN2);
2121
EXPECT_NE(BN1, BN3);
@@ -54,28 +54,28 @@ TEST(NestedBuildNamespaceTest, DefaultConstruction) {
5454
}
5555

5656
TEST(NestedBuildNamespaceTest, SingleNamespaceConstruction) {
57-
auto BN = BuildNamespace::makeTU("test.cpp");
57+
auto BN = BuildNamespace::makeCompilationUnit("test.cpp");
5858
NestedBuildNamespace NBN(BN);
5959

6060
EXPECT_FALSE(NBN.empty());
6161
}
6262

6363
TEST(NestedBuildNamespaceTest, MakeTU) {
64-
auto NBN = NestedBuildNamespace::makeTU("test.cpp");
64+
auto NBN = NestedBuildNamespace::makeCompilationUnit("test.cpp");
6565
EXPECT_FALSE(NBN.empty());
6666
}
6767

6868
TEST(NestedBuildNamespaceTest, Equality) {
69-
auto NBN1 = NestedBuildNamespace::makeTU("test.cpp");
70-
auto NBN2 = NestedBuildNamespace::makeTU("test.cpp");
71-
auto NBN3 = NestedBuildNamespace::makeTU("other.cpp");
69+
auto NBN1 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
70+
auto NBN2 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
71+
auto NBN3 = NestedBuildNamespace::makeCompilationUnit("other.cpp");
7272

7373
EXPECT_EQ(NBN1, NBN2);
7474
EXPECT_NE(NBN1, NBN3);
7575
}
7676

7777
TEST(NestedBuildNamespaceTest, MakeQualified) {
78-
auto NBN1 = NestedBuildNamespace::makeTU("test.cpp");
78+
auto NBN1 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
7979
BuildNamespace LinkNS(BuildNamespaceKind::LinkUnit, "app");
8080
NestedBuildNamespace NBN2(LinkNS);
8181

@@ -87,7 +87,7 @@ TEST(NestedBuildNamespaceTest, MakeQualified) {
8787

8888
TEST(NestedBuildNamespaceTest, EmptyQualified) {
8989
NestedBuildNamespace Empty;
90-
auto NBN = NestedBuildNamespace::makeTU("test.cpp");
90+
auto NBN = NestedBuildNamespace::makeCompilationUnit("test.cpp");
9191

9292
auto Qualified = Empty.makeQualified(NBN);
9393
EXPECT_EQ(Qualified, NBN);

clang/unittests/Analysis/Scalable/EntityNameTest.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ namespace clang::ssaf {
1414
namespace {
1515

1616
TEST(EntityNameTest, Equality) {
17-
auto NBN1 = NestedBuildNamespace::makeTU("test.cpp");
18-
auto NBN2 = NestedBuildNamespace::makeTU("test.cpp");
17+
auto NBN1 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
18+
auto NBN2 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
1919

2020
EntityName EN1("c:@F@foo", "", NBN1);
2121
EntityName EN2("c:@F@foo", "", NBN2);
@@ -26,7 +26,7 @@ TEST(EntityNameTest, Equality) {
2626
}
2727

2828
TEST(EntityNameTest, EqualityWithDifferentSuffix) {
29-
auto NBN = NestedBuildNamespace::makeTU("test.cpp");
29+
auto NBN = NestedBuildNamespace::makeCompilationUnit("test.cpp");
3030

3131
EntityName EN1("c:@F@foo", "1", NBN);
3232
EntityName EN2("c:@F@foo", "2", NBN);
@@ -35,8 +35,8 @@ TEST(EntityNameTest, EqualityWithDifferentSuffix) {
3535
}
3636

3737
TEST(EntityNameTest, EqualityWithDifferentNamespace) {
38-
auto NBN1 = NestedBuildNamespace::makeTU("test1.cpp");
39-
auto NBN2 = NestedBuildNamespace::makeTU("test2.cpp");
38+
auto NBN1 = NestedBuildNamespace::makeCompilationUnit("test1.cpp");
39+
auto NBN2 = NestedBuildNamespace::makeCompilationUnit("test2.cpp");
4040

4141
EntityName EN1("c:@F@foo", "", NBN1);
4242
EntityName EN2("c:@F@foo", "", NBN2);
@@ -45,7 +45,7 @@ TEST(EntityNameTest, EqualityWithDifferentNamespace) {
4545
}
4646

4747
TEST(EntityNameTest, MakeQualified) {
48-
auto NBN1 = NestedBuildNamespace::makeTU("test.cpp");
48+
auto NBN1 = NestedBuildNamespace::makeCompilationUnit("test.cpp");
4949
EntityName EN("c:@F@foo", "", NBN1);
5050

5151
BuildNamespace LinkNS(BuildNamespaceKind::LinkUnit, "app");

0 commit comments

Comments
 (0)